Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/views/vent/gas/gasReport/gas-report.data.ts

@@ -11,8 +11,8 @@ export const columns: BasicColumn[] = [
                         children: [
                             {
                                 title: '区队',
-                                dataIndex: 'districtTeam',
-                                key: 'districtTeam',
+                                dataIndex: 'districtTeam_dictText',
+                                key: 'districtTeam_dictText',
                                 width: 160,
                                 align: 'center'
                             },

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

@@ -1416,6 +1416,54 @@ const BDdustMock = {
       windSpeed: '10.5', //风速
       atomState: '打开', //喷雾状态
     },
+    {
+      strinstallpos: '81202工作面', //安装位置
+      temp: '23.3', //温度
+      windSpeed: '10.5', //风速
+      atomState: '打开', //喷雾状态
+    },
+    {
+      strinstallpos: '81202工作面', //安装位置
+      temp: '23.3', //温度
+      windSpeed: '10.5', //风速
+      atomState: '打开', //喷雾状态
+    },
+    {
+      strinstallpos: '81202工作面', //安装位置
+      temp: '23.3', //温度
+      windSpeed: '10.5', //风速
+      atomState: '打开', //喷雾状态
+    },
+    {
+      strinstallpos: '81202工作面', //安装位置
+      temp: '23.3', //温度
+      windSpeed: '10.5', //风速
+      atomState: '打开', //喷雾状态
+    },
+    {
+      strinstallpos: '81202工作面', //安装位置
+      temp: '23.3', //温度
+      windSpeed: '10.5', //风速
+      atomState: '打开', //喷雾状态
+    },
+    {
+      strinstallpos: '81202工作面', //安装位置
+      temp: '23.3', //温度
+      windSpeed: '10.5', //风速
+      atomState: '打开', //喷雾状态
+    },
+    {
+      strinstallpos: '81202工作面', //安装位置
+      temp: '23.3', //温度
+      windSpeed: '10.5', //风速
+      atomState: '打开', //喷雾状态
+    },
+    {
+      strinstallpos: '81202工作面', //安装位置
+      temp: '23.3', //温度
+      windSpeed: '10.5', //风速
+      atomState: '打开', //喷雾状态
+    },
   ],
 };
 export const testConfigBDDust: Config[] = [
@@ -2143,7 +2191,7 @@ export const testConfigBDFire: Config[] = [
   },
   {
     deviceType: '',
-    moduleName: '工作面束管监测 | 工作面光纤监测',
+    moduleName: '工作面束管监测',
     pageType: '',
     moduleData: {
       header: {
@@ -2379,7 +2427,7 @@ export const testConfigBDFire: Config[] = [
             {
               label: '烟雾预警',
               info: '最高浓度',
-              value: '${[2].val}ppm',
+              value: '${[2].val}',
               color: 'blue',
             },
           ],
@@ -2477,7 +2525,7 @@ export const testConfigBDFire: Config[] = [
             {
               label: '烟雾预警',
               info: '最高浓度',
-              value: '${[2].val}ppm',
+              value: '${[2].val}',
               color: 'blue',
             },
           ],