Sfoglia il codice sorgente

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

zhulizhen1111 4 anni fa
parent
commit
eba3cbd597
2 ha cambiato i file con 25 aggiunte e 20 eliminazioni
  1. 1 1
      src/router/index.js
  2. 24 19
      src/views/statistics/index.vue

+ 1 - 1
src/router/index.js

@@ -236,4 +236,4 @@ function redirectGetToken (to) {
     }
     window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
 }
-export default router
+export default router

+ 24 - 19
src/views/statistics/index.vue

@@ -62,8 +62,10 @@
                             <div class='system-equipments' v-if='item.assetTypeList'>
                                 <div class='number' v-for='(equip , index) in item.assetTypeList' :key='index'>
                                     <div class="title">
-                                        <P :title="equip.category_name">{{equip.category_name}}</p>
-                                        <span :style="{right: equip.is_exception_num > 99 ? '-2rem' :  equip.is_exception_num > 9 ? '-1.5rem' :'-1rem'}" v-if='equip.is_exception_num'>{{equip.is_exception_num}}</span>
+                                        <div class="exception" :title="equip.category_name">
+                                            {{equip.category_name}}
+                                            <span style="right:-1rem;" v-if='equip.is_exception_num'>{{equip.is_exception_num}}</span>
+                                        </div>
                                     </div>
                                     <p>
                                         <span>{{equip.asset_num}}</span>
@@ -1247,7 +1249,7 @@ export default {
         }
         
         .system-general {
-            width: 25.4%;
+            width: 29.4%;
             box-sizing: border-box;
             background: white;
             .system-main-title {
@@ -1310,27 +1312,30 @@ export default {
                                 width: 33.3%;
                                 .title{
                                     display: inline-block;
-                                    position: relative;
-                                    p{
-                                        display: inline-block;
+                                    width: 100%;
+                                    white-space: nowrap;
+                                    text-overflow: ellipsis;
+                                    overflow: hidden;
+                                    div.exception{
                                         position: relative;
-                                        width: 12rem;
+                                        display: inline;
                                         color: #1f2429;
                                         font-size: 1.4rem;
-                                        line-height: 2rem;
+                                        line-height: 4rem;
                                         white-space: nowrap;
                                         text-overflow: ellipsis;
                                         overflow: hidden;
-                                    }
-                                    span {
-                                        position: absolute;
-                                        top: -1.6rem;
-                                        right: -2rem;
-                                        padding: 2px 4px;
-                                        border-radius: 0.9rem;
-                                        font-size: 1.2rem;
-                                        color: #f54e45;
-                                        background: #fde3e2;
+                                        span {
+                                            position: absolute;
+                                            top: -1rem;
+                                            right: -1rem;
+                                            line-height: 1.6rem;
+                                            padding: 2px 4px;
+                                            border-radius: 0.9rem;
+                                            font-size: 1.2rem;
+                                            color: #f54e45;
+                                            background: #fde3e2;
+                                        }
                                     }
                                 }
                                 p:nth-of-type(2) {
@@ -1359,7 +1364,7 @@ export default {
             }
         }
         .map-box {
-            width: calc(56.6% - 2.4rem);
+            width: calc(52.6% - 2.4rem);
             margin: 0 12px;
             .cards-list {
                 display: flex;