Browse Source

[Feat 0000] 添加新画廊

houzekong 5 months ago
parent
commit
e9740957dd

BIN
src/assets/images/home-container/configurable/firehome/img-8.png


+ 1 - 1
src/views/vent/deviceManager/configurationTable/types.ts

@@ -216,7 +216,7 @@ export interface ModuleDataPreset {
 
 export interface ModuleDataComplexList {
   /** 列表预设的背景类型 */
-  type: 'A' | 'B';
+  type: 'A' | 'B' | 'C';
   /** 读取数据时的基础路径,如果配置了 header,应接着 Config.deviceType 配取值路径,反之应配置详尽路径 */
   readFrom: string;
   /** 是否需要根据数据来决定所展示的项目数量,需要确保 items 至少有一项,且 readFrom 指向数组 */

+ 54 - 0
src/views/vent/home/configurable/components/detail/ComplexList.vue

@@ -176,6 +176,60 @@
       display: none;
     }
   }
+
+  .list__wrapper_C {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+  }
+
+  .list-item_C {
+    position: relative;
+    height: 140px;
+    width: 190px;
+    background-repeat: no-repeat;
+    background-image: url(/@/assets/images/home-container/configurable/firehome/img-8.png);
+    background-size: 100% 100%;
+    background-position: left center;
+  }
+  .list-item__title_C {
+    position: absolute;
+    left: 90px;
+    // font-size: 14px;
+    top: 15px;
+  }
+  .list-item__content_C:nth-of-type(2) {
+    position: absolute;
+    top: 15px;
+    left: 17px;
+    width: 30%;
+    text-align: center;
+    display: block;
+
+    .list-item__label {
+      // font-size: 18px;
+      margin-bottom: 25px;
+    }
+    .list-item__info {
+      display: none;
+    }
+    .list-item__value {
+      font-size: 18px;
+    }
+  }
+  .list-item__content_C:nth-of-type(3) {
+    position: absolute;
+    left: 90px;
+    top: 55px;
+
+    .list-item__info {
+      display: none;
+    }
+    .list-item__value {
+      font-size: 18px;
+    }
+  }
+
   // .list-item__title_B_O2 {
   //   background-image: url(/@/assets/images/home-container/configurable/firehome/O₂.png);
   // }

+ 7 - 7
src/views/vent/home/configurable/configurable.data.ts

@@ -2631,7 +2631,7 @@ export const testConfigBDFire: Config[] = [
       list: [],
       complex_list: [
         {
-          type: 'A',
+          type: 'C',
           readFrom: 'fireManageInfo.sysList',
           mapFromData: true,
           items: [
@@ -2984,9 +2984,9 @@ export const testConfigBDFire: Config[] = [
       // mock: BDfireMock,
     },
     showStyle: {
-      size: 'width:450px;height:230px;',
+      size: 'width:450px;height:240px;',
       version: '保德',
-      position: 'top:210px;right:0;',
+      position: 'top:160px;right:0;',
     },
   },
   {
@@ -3082,9 +3082,9 @@ export const testConfigBDFire: Config[] = [
       // mock: BDfireMock,
     },
     showStyle: {
-      size: 'width:450px;height:230px;',
+      size: 'width:450px;height:240px;',
       version: '保德',
-      position: 'top:450px;right:0;',
+      position: 'top:410px;right:0;',
     },
   },
   {
@@ -3147,9 +3147,9 @@ export const testConfigBDFire: Config[] = [
       // mock: BDfireMock,
     },
     showStyle: {
-      size: 'width:450px;height:230px;',
+      size: 'width:450px;height:260px;',
       version: '保德',
-      position: 'top:690px;right:0;',
+      position: 'top:660px;right:0;',
     },
   },
 ];

+ 2 - 1
src/views/vent/home/configurable/fireBD.vue

@@ -225,7 +225,8 @@
   }
   .right-t {
     position: absolute;
-    height: 160px;
+    height: 115px;
+    // height: 160px;
     right: 0;
     top: 40px;
     width: 450px;

+ 10 - 9
src/views/vent/home/configurable/index.vue

@@ -251,7 +251,8 @@
   }
   .right-t {
     position: absolute;
-    height: 160px;
+    // height: 160px;
+    height: 115px;
     right: 0;
     top: 40px;
     width: 450px;
@@ -267,8 +268,8 @@
 
     .tcontent-l {
       flex: 1;
-      height: 70%;
-      font-size: 20px;
+      height: 100%;
+      font-size: 16px;
       font-weight: bold;
       background-image: url(/@/assets/images/home-container/configurable/firehome/img-5.png),
         url(/@/assets/images/home-container/configurable/firehome/ggxt.png);
@@ -280,13 +281,13 @@
         center,
         center top;
       text-align: center;
-      padding-top: 40px;
-      line-height: 50px;
+      padding-top: 35px;
+      line-height: 40px;
     }
     .tcontent-r {
       flex: 1;
-      height: 70%;
-      font-size: 20px;
+      height: 100%;
+      font-size: 16px;
       font-weight: bold;
       background-image: url(/@/assets/images/home-container/configurable/firehome/img-5.png),
         url(/@/assets/images/home-container/configurable/firehome/zjxt.png);
@@ -298,8 +299,8 @@
         center,
         center top;
       text-align: center;
-      padding-top: 40px;
-      line-height: 50px;
+      padding-top: 35px;
+      line-height: 40px;
     }
   }