Explorar el Código

'还原度修改'

zhangyu hace 4 años
padre
commit
f9ba451dcc

+ 1 - 0
src/components/assetDetail/Information.vue

@@ -71,6 +71,7 @@ export default {
   .info-title {
     font-size: 16px;
     color: #333333;
+    padding-bottom: 4px;
   }
   .cell {
     width: 100%;

+ 1 - 1
src/components/floorMap/canvasFun.vue

@@ -90,8 +90,8 @@ export default {
   align-items: center;
   overflow: hidden;
   .small-block {
-    border-right: 1px solid #e4e5e7;
     padding: 12px;
+    color: #666666;
     position: relative;
     cursor: pointer;
     i {

+ 2 - 2
src/router/index.ts

@@ -143,7 +143,7 @@ const routes: Array<RouteConfig> = [
             hideNarBar: true,
         },
     },
-    // 设备设置 --> 配电室低压柜及出线明细
+    // 设备设置 --> 配电室低压出线柜及出线明细
     {
         path: '/lowVoltageCabinet',
         name: 'LowVoltageCabinet',
@@ -154,7 +154,7 @@ const routes: Array<RouteConfig> = [
             hideNarBar: true,
         },
     },
-    // 设备设置 --> 配电室低压柜及出线明细 --> 详情
+    // 设备设置 --> 配电室低压出线柜及出线明细 --> 详情
     {
         path: '/lowVoltageCabinetDetail',
         name: 'LowVoltageCabinetDetail',

+ 3 - 0
src/style/common.less

@@ -167,3 +167,6 @@ body {
         color: #333333 !important;
     }
 }
+::-webkit-input-placeholder {
+    color: #979797 !important;
+}

+ 5 - 2
src/views/FloorFunc.vue

@@ -209,7 +209,7 @@ export default {
   box-sizing: border-box;
   overflow-y: auto;
   .floor-item {
-    margin-bottom: 12px;
+    margin-bottom: 4px;
     .floor-item-title {
       padding: 0 10px;
       height: 44px;
@@ -234,7 +234,7 @@ export default {
       }
     }
     .floor-item-table {
-      padding: 12px 16px 0;
+      padding: 12px 16px 16px;
       .table-box {
         width: 100%;
         table-layout: fixed;
@@ -266,6 +266,9 @@ export default {
           }
         }
         th {
+          padding: 3px 0;
+          font-weight: normal;
+          color: #666666;
           background: #eff0f1;
         }
         .Url-img {

+ 1 - 1
src/views/equipmentFacilities/LowVoltageCabinet.vue

@@ -95,7 +95,7 @@ export default {
     data() {
         return {
             mock: 2,
-            title: '配电室低压柜及出线明细',
+            title: '配电室低压出线柜及出线明细',
             keyword: '',
             page: 1,
             size: 5,

+ 1 - 1
src/views/equipmentFacilities/LowVoltageCabinet_v0.1.vue

@@ -142,7 +142,7 @@ export default {
     data() {
         return {
             mock: 2,
-            title: '配电室低压柜及出线明细',
+            title: '配电室低压出线柜及出线明细',
             keyword: '',
             page: 1,
             size: 5,

+ 1 - 1
src/views/equipmentFacilities/index.vue

@@ -73,7 +73,7 @@ export default {
                     //供电
                     { text: '供电系统原理图', dataType: 'img', typecode: '2010', count: '无' },
                     { text: '机房平面布置图', dataType: 'room' },
-                    { text: '配电室低压柜及出线明细', dataType: 'dyg' },
+                    { text: '配电室低压出线柜及出线明细', dataType: 'dyg' },
                     { text: '楼层分布', dataType: 'floor', value: ' ' },
                     { text: '电井控制商铺范围', dataType: 'electricWell' },
                     { text: '主要设备清单', dataType: 'mainEquipment' },

+ 8 - 5
src/views/overview/MapOther.vue

@@ -14,7 +14,8 @@
       <floor-list ref="fList" class="bind-floor-list" v-if='floorsArr.length>0' :floorsArr='floorsArr'
         @emitFloor='emitFloor'></floor-list>
       <div class="change-direction" @click='changeOri'>
-        <i class="iconfont wanda-hengshuping"></i>
+        <img src='../../assets/images/screen.png' />
+        <!-- <i class="iconfont wanda-hengshuping"></i> -->
       </div>
     </div>
   </div>
@@ -527,8 +528,9 @@ export default {
       position: fixed;
       bottom: 60px;
       left: 16px;
-      .wanda-hengshuping {
-        font-size: 26px;
+      img {
+        width: 28px;
+        height: 28px;
       }
     }
   }
@@ -554,8 +556,9 @@ export default {
         position: fixed;
         bottom: 15px;
         left: 15px;
-        .wanda-hengshuping {
-          font-size: 26px;
+        img {
+          width: 18px;
+          height: 18px;
         }
       }
     }

+ 3 - 2
src/views/overview/MapView.vue

@@ -552,8 +552,9 @@ export default {
         position: fixed;
         bottom: 15px;
         left: 15px;
-        .wanda-hengshuping {
-          font-size: 26px;
+        img {
+          width: 18px;
+          height: 18px;
         }
       }
     }