Bladeren bron

[Feat 0000] 适配同一layout下多种同类型module的情况

houzekong 6 maanden geleden
bovenliggende
commit
2e6bb29a31

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

@@ -50,7 +50,7 @@
     background-repeat: no-repeat;
     width: 100%;
     height: 100%;
-    background-size: auto 100%;
+    background-size: 100% 100%;
     background-image: url(/@/assets/images/home-container/configurable/list_bg_default.png);
   }
 
@@ -106,7 +106,6 @@
   }
 
   .list_D {
-    background-size: 100% auto;
     background-image: url(/@/assets/images/home-container/configurable/list_bg_defflip.png);
   }
   .list__wrapper_D {

+ 0 - 1
src/views/vent/home/configurable/components/content.vue

@@ -174,7 +174,6 @@
           const cfg = list.shift();
           if (!cfg) break;
           const data = mock || cfg.readFrom ? get(refData, cfg.readFrom) : refData;
-          console.log('debug ', data);
           arr.push({
             ...cfg,
             key,

+ 15 - 9
src/views/vent/home/configurable/configurable.data.ts

@@ -535,7 +535,7 @@ export const testConfigA: Config[] = [
         type: 'video',
         link: '',
       },
-      layout: ['list'],
+      layout: ['list', 'list'],
       // layout: ['blast_delta'],
       board: [],
       gallery: [],
@@ -592,27 +592,33 @@ export const testConfigA: Config[] = [
               color: 'blue',
               info: '',
             },
+          ],
+        },
+        {
+          type: 'E',
+          readFrom: 'sys_wind[0]',
+          items: [
             {
-              label: '告警标识',
-              prop: 'warnFlag',
+              label: '面积',
+              prop: 'fsectarea',
               color: 'blue',
               info: '',
             },
             {
-              label: '告警等级',
-              prop: 'warnLevel',
+              label: '分站名称',
+              prop: 'stationname',
               color: 'blue',
               info: '',
             },
             {
-              label: '告警描述',
-              prop: 'warnLevel_str',
+              label: '分站类别',
+              prop: 'stationtype',
               color: 'blue',
               info: '',
             },
             {
-              label: '错误记录',
-              prop: 'warnLogNotOkCount',
+              label: '分类',
+              prop: 'typeName',
               color: 'blue',
               info: '',
             },