[Mod 0000] 新（浅蓝色）首页的相关配置项更改

src/views/vent/deviceManager/configurationTable/types.ts

@@ -124,7 +124,7 @@ export interface ShowStyle {
   /** 模块的宽高，特殊情况下可以自定义宽高 */
   size: string;
   /** 模块的版本，除了新版，只要有一个模块指定为旧版或其他版本，那么整个页面风格将变更为对应版本，优先级 旧版 > 普通版 > 新版 */
-  version: '原版' | '新版' | '普通版' | '保德';
+  version: '原版' | '新版' | '普通版' | '保德' | '淡蓝色' | '翠绿色';
   /** 模块的位置，即定位，特殊情况下可以自定义定位 */
   position: string;
   // 模块位置  根据这个配置决定使用hearder的方式

src/views/vent/home/configurable/configurable.data.New.ts

@@ -103,10 +103,9 @@ export const testConfigNewDust: Config[] = [
       preset: [],
     },
     showStyle: {
-      size: 'width:410px;height:493px;',
-      version: '保德',
-      position: 'top:65px;left:10px;',
-      headerPosition: 'leftTop',
+      size: 'width:450px;height:550px;',
+      version: '淡蓝色',
+      position: 'top:60px;left:0;',
     },
   },
   {
@@ -173,10 +172,9 @@ export const testConfigNewDust: Config[] = [
       preset: [],
     },
     showStyle: {
-      size: 'width:370px;height:360px;',
-      version: '保德',
-      position: 'bottom:40px;left:10px;',
-      headerPosition: 'leftBottom',
+      size: 'width:450px;height:280px;',
+      version: '淡蓝色',
+      position: 'top:620px;left:0;',
     },
   },
   {
@@ -237,10 +235,9 @@ export const testConfigNewDust: Config[] = [
       preset: [],
     },
     showStyle: {
-      size: 'width:1000px;height:280px;',
-      version: '保德',
-      position: 'bottom:8px;left:455px',
-      headerPosition: 'centerBottom',
+      size: 'width:980px;height:300px;',
+      version: '淡蓝色',
+      position: 'bottom:8px;left:470px',
     },
   },
   {
@@ -312,10 +309,9 @@ export const testConfigNewDust: Config[] = [
       to: 'http://10.248.210.154:8801',
     },
     showStyle: {
-      size: 'width:415px;height:300px;',
-      version: '保德',
-      position: 'top:60px;right:10px;',
-      headerPosition: 'rightTop',
+      size: 'width:450px;height: 280px;',
+      version: '淡蓝色',
+      position: 'top:60px;right:0;',
     },
   },
   {
@@ -379,10 +375,9 @@ export const testConfigNewDust: Config[] = [
       preset: [],
     },
     showStyle: {
-      size: 'width:378px;height:260px;',
-      version: '保德',
-      position: 'top:370px;right:10px;',
-      headerPosition: 'rightCenter',
+      size: 'width:450px;height:280px;',
+      version: '淡蓝色',
+      position: 'top:350px;right:0;',
     },
   },
   {
@@ -445,10 +440,9 @@ export const testConfigNewDust: Config[] = [
       preset: [],
     },
     showStyle: {
-      size: 'width:385px;height:280px;',
-      version: '保德',
-      position: 'bottom:20px;right:10px;',
-      headerPosition: 'rightBottom',
+      size: 'width:440px;height:280px;',
+      version: '淡蓝色',
+      position: 'top:640px;right:0;',
     },
   },
 ];

src/views/vent/home/configurable/configurable.data.ts

@@ -282,7 +282,6 @@ export const testConfigVent: Config[] = [
       position: 'top:555px;left:15px;',
     },
   },
-
   {
     deviceType: 'sys_wind',
     moduleName: '风量监测',
@@ -3311,7 +3310,7 @@ export const testConfigVentNew: Config[] = [
   {
     deviceType: 'fanmain',
     moduleName: '主通风机系统',
-    pageType: 'vent',
+    pageType: 'vent_new',
     moduleData: {
       header: {
         show: true,
@@ -3322,7 +3321,7 @@ export const testConfigVentNew: Config[] = [
         },
         slot: {
           show: true,
-          value: '运行风机：${readData.Fan1StartStatus}',
+          value: '风机：${readData.Fan1StartStatus}',
           trans: {
             '1': '1#风机',
             '0': '2#风机',
@@ -3343,7 +3342,7 @@ export const testConfigVentNew: Config[] = [
           },
           {
             name: 'board',
-            basis: '30%',
+            basis: '33%',
           },
         ],
       },
@@ -3387,16 +3386,15 @@ export const testConfigVentNew: Config[] = [
       ],
     },
     showStyle: {
-      size: 'width:380px;height:280px;',
+      size: 'width:440px;height:280px;',
       version: '原版',
       position: 'top:60px;left:0;',
-      headerPosition: 'leftTop',
     },
   },
   {
     deviceType: '',
     moduleName: '通风设施远程控制',
-    pageType: 'vent',
+    pageType: 'vent_new',
     moduleData: {
       header: {
         show: false,
@@ -3411,7 +3409,7 @@ export const testConfigVentNew: Config[] = [
         },
       },
       background: {
-        show: true,
+        show: false,
         type: 'video',
         link: '/video/fanLocal.webm',
       },
@@ -3436,19 +3434,50 @@ export const testConfigVentNew: Config[] = [
           readFrom: 'device',
         },
       ],
+      mock: {
+        device: {
+          fanmain: {
+            maxLevel: 0,
+            name: '主扇',
+            totalCount: 0,
+            count: 0,
+            netstatus: 0,
+          },
+          fanlocal: {
+            maxLevel: 0,
+            name: '局扇',
+            totalCount: 0,
+            count: 0,
+            netstatus: 0,
+          },
+          gate: {
+            maxLevel: 0,
+            name: '风门',
+            totalCount: 0,
+            count: 0,
+            netstatus: 0,
+          },
+          window: {
+            maxLevel: 0,
+            name: '风窗',
+            totalCount: 0,
+            count: 0,
+            netstatus: 0,
+          },
+        },
+      },
       to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=gate_xinJianFuXieJin',
     },
     showStyle: {
-      size: 'width:377px;height:280px;',
+      size: 'width:440px;height:280px;',
       version: '原版',
       position: 'top:350px;left:0;',
-      headerPosition: 'leftCenter',
     },
   },
   {
     deviceType: 'warn',
     moduleName: '预警监测',
-    pageType: 'vent_realtime',
+    pageType: 'vent_new',
     moduleData: {
       header: {
         show: true,
@@ -3518,16 +3547,15 @@ export const testConfigVentNew: Config[] = [
       to: '/monitorChannel/monitor-alarm-home',
     },
     showStyle: {
-      size: 'width:387px;height:280px;',
+      size: 'width:440px;height:280px;',
       version: '新版',
       position: 'top:640px;left:0;',
-      headerPosition: 'leftBottom',
     },
   },
   {
     deviceType: 'sys_wind',
-    moduleName: '',
-    pageType: 'vent',
+    moduleName: '风量监测',
+    pageType: 'vent_new',
     moduleData: {
       header: {
         show: false,
@@ -3550,8 +3578,8 @@ export const testConfigVentNew: Config[] = [
         direction: 'row',
         items: [
           {
-            name: 'tabs',
-            basis: '65%',
+            name: 'chart',
+            basis: '100%',
           },
         ],
       },
@@ -3562,68 +3590,40 @@ export const testConfigVentNew: Config[] = [
       gallery: [],
       complex_list: [],
       gallery_list: [],
-      chart: [],
-      to: '',
-    },
-    showStyle: {
-      size: 'width:1000px;height:120px;',
-      version: '新版',
-      position: 'top:85px;left:460px;',
-      headerPosition: 'centerTop',
-    },
-  },
-  {
-    deviceType: 'sys_wind',
-    moduleName: '',
-    pageType: 'vent',
-    moduleData: {
-      header: {
-        show: false,
-        readFrom: '',
-        selector: {
-          show: false,
-          value: '',
-        },
-        slot: {
-          show: false,
-          value: '',
+      chart: [
+        {
+          type: 'bar',
+          readFrom: '',
+          legend: { show: true },
+          xAxis: [{ show: true }],
+          yAxis: [
+            { show: true, name: '风量(m³/min)', position: 'left' },
+            { show: true, name: '风速(m/s)', position: 'right' },
+          ],
+          dataZoom: [
+            {
+              show: true,
+              end: 20,
+            },
+          ],
+          series: [
+            { readFrom: 'sys_wind', xprop: 'strinstallpos', yprop: 'readData.m3', label: '风量' },
+            { readFrom: 'sys_wind', xprop: 'strinstallpos', yprop: 'readData.va', label: '风速' },
+          ],
         },
-      },
-      background: {
-        show: false,
-        type: 'video',
-        link: '',
-      },
-      layout: {
-        direction: 'row',
-        items: [
-          {
-            name: 'tabs',
-            basis: '65%',
-          },
-        ],
-      },
-      board: [],
-      list: [],
-      table: [],
-      preset: [],
-      gallery: [],
-      complex_list: [],
-      gallery_list: [],
-      chart: [],
-      to: '',
+      ],
+      to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=windrect',
     },
     showStyle: {
-      size: 'width:1000px;height:100px;',
-      version: '新版',
-      position: 'bottom:0;left:460px;',
-      headerPosition: 'centerBottom',
+      size: 'width:1000px;height:260px;',
+      version: '原版',
+      position: 'bottom:8px;left:460px;',
     },
   },
   {
     deviceType: 'fanlocal',
     moduleName: '局部通风机系统',
-    pageType: 'vent',
+    pageType: 'vent_new',
     moduleData: {
       header: {
         show: true,
@@ -3634,7 +3634,7 @@ export const testConfigVentNew: Config[] = [
         },
         slot: {
           show: true,
-          value: '运行风机：${readData.Fan1StartStatus}',
+          value: '风机：${readData.Fan1StartStatus}',
           trans: {
             '1': '1#风机',
             '0': '2#风机',
@@ -3649,13 +3649,13 @@ export const testConfigVentNew: Config[] = [
       layout: {
         direction: 'column',
         items: [
-          {
-            name: 'board',
-            basis: '25%',
-          },
+          // {
+          //   name: 'board',
+          //   basis: '25%',
+          // },
           {
             name: 'chart',
-            basis: '75%',
+            basis: '100%',
           },
         ],
       },
@@ -3699,16 +3699,15 @@ export const testConfigVentNew: Config[] = [
       to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=fanlocal',
     },
     showStyle: {
-      size: 'width:390px;height:324px;',
+      size: 'width:440px;height:265px;',
       version: '原版',
       position: 'top:60px;right:0;',
-      headerPosition: 'rightTop',
     },
   },
   {
     deviceType: 'sys_majorpath',
     moduleName: '关键通风路线',
-    pageType: 'vent',
+    pageType: 'vent_new',
     moduleData: {
       header: {
         show: true,
@@ -3768,16 +3767,15 @@ export const testConfigVentNew: Config[] = [
       to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=sys_majorpath&deviceid=${deviceID}',
     },
     showStyle: {
-      size: 'width:377px;height:280px;',
+      size: 'width:440px;height:310px;',
       version: '新版',
-      position: 'top:350px;right:0;',
-      headerPosition: 'rightCenter',
+      position: 'top:335px;right:0;',
     },
   },
   {
     deviceType: 'sys_surface_caimei',
     moduleName: '工作面智能监控',
-    pageType: 'vent',
+    pageType: 'vent_new',
     moduleData: {
       header: {
         show: true,
@@ -3801,12 +3799,12 @@ export const testConfigVentNew: Config[] = [
         items: [
           {
             name: 'chart',
-            basis: '75%',
-          },
-          {
-            name: 'board',
-            basis: '25%',
+            basis: '100%',
           },
+          // {
+          //   name: 'board',
+          //   basis: '25%',
+          // },
         ],
       },
       board: [
@@ -3848,10 +3846,9 @@ export const testConfigVentNew: Config[] = [
       to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=sys_surface_caimei&deviceid=${deviceID}',
     },
     showStyle: {
-      size: 'width:377px;height:280px;',
+      size: 'width:440px;height:270px;',
       version: '新版',
-      position: 'top:640px;right:0;',
-      headerPosition: 'rightBottom',
+      position: 'top:650px;right:0;',
     },
   },
 ];