Переглянути джерело

Merge branch 'dev' of git.sagacloud.cn:yunxing/wanda-bm-guide-h5 into dev

zhangyu 4 роки тому
батько
коміт
e756c6ef2b

+ 9 - 5
src/components/equipmentFacilities/Card.vue

@@ -81,21 +81,24 @@ export default {
     height: 100%;
     border-radius: 4px;
     background-size: cover !important;
-    padding: 15px 0 15px 13px;
+    padding: 15px 0 15px 15px;
     line-height: 25px;
     display: flex;
     flex-direction: column;
     position: relative;
     .name,
     .number {
-        font-size: 13px;
+        font-size: 14px;
         font-weight: 500;
         color: #333333;
         flex: 1;
     }
-    .number > i {
-        font-size: 12px;
-        color: #666;
+    .number {
+        font-size: 20px;
+        i {
+            font-size: 12px;
+            color: #666;
+        }
     }
     .type {
         font-size: 13px;
@@ -143,6 +146,7 @@ export default {
 .type-4 {
     display: flex;
     padding: 0;
+    font-size: 14px;
     justify-content: center;
     align-items: center;
     background: url('../../assets/images/more.png');

+ 1 - 0
src/views/equipmentFacilities/LowVoltageCabinetDetail.vue

@@ -92,6 +92,7 @@ export default {
             font-size: 14px;
             font-weight: 400;
             line-height: 20px;
+            margin-bottom: 8px;
         }
         .label {
             color: #666;

+ 16 - 2
src/views/equipmentFacilities/MainEquipmentDetail.vue

@@ -144,9 +144,23 @@ export default {
         //  manufacturer, 生产厂商  如果没有传递‘--’
         // sbxh,    设备类型  如果没有传递‘--’
         // type_code    自定义分类内码
+        /*  classqc: "供配电系统/高压配电柜/进线柜"
+        classstructureid: "1511"
+        floorcode: "B2"
+        importance: 1
+        is_detecting: false
+        is_exception: false
+        manufacturer: "上海中发电气(集团)股份有限公司"
+        sbxh: "GCS"
+        sl: 4
+        type_code: "gd011"
+        type_name: "高压进线柜" */
         // TODO: 参数修改
-        let { type_code, brand, classstructureid, manufacturer, sbxh } = this.$route.params
-        this.title = '高压进线柜(4)'
+        console.log(this.$route)
+        let { type_name, sl, type_code, brand, classstructureid, manufacturer, sbxh } = this.$route.params
+        type_name = type_name || '高压进线柜'
+        sl = sl || (Math.random() * 100).toFixed(0)
+        this.title = `${type_name}(${sl})`
         this.type_code = type_code || 'nt011'
         this.brand = brand || '--'
         this.classstructureid = classstructureid || '1700'

+ 4 - 1
src/views/equipmentFacilities/MoreEquipmentList.vue

@@ -177,8 +177,11 @@ export default {
         ...mapGetters(['plazaId', 'smsxt', 'categoryId']),
     },
     created() {
-       console.log(this.$route.params.type)
         this.system_code = this.smsxt
+        // 从全局搜索跳转到该页面
+        if (this.$route.params.type === 'all') {
+            this.system_code = '全部'
+        }
         this.onLoad()
     },
     beforeMount() {},

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

@@ -601,7 +601,7 @@ export default {
         }
         .divider {
             border-bottom: 1px solid #e6e6e6;
-            margin: 20px 0;
+            margin: 20px 0 10px 0;
         }
         .card-container {
             width: 100%;
@@ -611,7 +611,7 @@ export default {
             .card {
                 flex: 1;
                 width: 50%;
-                margin: 2% 0;
+                margin: 0 0 5px 0;
                 min-width: 50%; // 加入这两个后每个item的宽度就生效了
                 max-width: 50%; // 加入这两个后每个item的宽度就生效了
                 height: 110px;

+ 4 - 1
src/views/overview/index.vue

@@ -12,7 +12,7 @@
             </van-swipe>
         </div>
         <!-- tab页签 -->
-        <van-tabs class='overview-tabs' v-model='active' color='#025BAA' title-active-color='#025BAA' :line-width='80' :line-height='2'>
+        <van-tabs class='overview-tabs' v-model='active' color='#025BAA' title-active-color='#025BAA' :line-width='110' :line-height='2'>
             <!-- 建筑综合信息 -->
             <van-tab class='buiding-tab' title='建筑综合信息'>
                 <div class='building-info'>
@@ -417,6 +417,9 @@ export default {
                 width: 80%;
                 margin: 0 auto;
             }
+            .van-tab__text {
+                font-size: 16px;
+            }
         }
 
         // 建筑综合信息