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

src/views/vent/home/configurable/components/content.vue

@@ -15,7 +15,7 @@
       <source :src="background.link" />
       Not Supportted Link Or Browser
     </video>
-    <div class="flex flex-wrap w-full h-full" :style="{ flexDirection: slice.direction }">
+    <div class="flex w-full h-full" :style="{ flexDirection: slice.direction }">
       <div v-for="(config, i) in layoutConfig" :key="config.key" :style="{ flexBasis: slice.basis[i] }">
         <!-- 告示板部分 -->
         <template v-if="config.key === 'board'">

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[] = [
@@ -1935,6 +1983,30 @@ const BDfireMock = {
       warnLevel: '低风险', //预警级别
       time: '2024-09-12 15:33:50', //时间
     },
+    {
+      strinstallpos: '位置2', //安装位置
+      nowVal: '25.0', //温度
+      warnLevel: '低风险', //预警级别
+      time: '2024-09-12 15:33:50', //时间
+    },
+    {
+      strinstallpos: '位置2', //安装位置
+      nowVal: '25.0', //温度
+      warnLevel: '低风险', //预警级别
+      time: '2024-09-12 15:33:50', //时间
+    },
+    {
+      strinstallpos: '位置2', //安装位置
+      nowVal: '25.0', //温度
+      warnLevel: '低风险', //预警级别
+      time: '2024-09-12 15:33:50', //时间
+    },
+    {
+      strinstallpos: '位置2', //安装位置
+      nowVal: '25.0', //温度
+      warnLevel: '低风险', //预警级别
+      time: '2024-09-12 15:33:50', //时间
+    },
   ],
 };
 export const testConfigBDFire: Config[] = [
@@ -2119,7 +2191,7 @@ export const testConfigBDFire: Config[] = [
   },
   {
     deviceType: '',
-    moduleName: '工作面束管监测 | 工作面光纤监测',
+    moduleName: '工作面束管监测',
     pageType: '',
     moduleData: {
       header: {
@@ -2355,7 +2427,7 @@ export const testConfigBDFire: Config[] = [
             {
               label: '烟雾预警',
               info: '最高浓度',
-              value: '${[2].val}ppm',
+              value: '${[2].val}',
               color: 'blue',
             },
           ],
@@ -2453,7 +2525,7 @@ export const testConfigBDFire: Config[] = [
             {
               label: '烟雾预警',
               info: '最高浓度',
-              value: '${[2].val}ppm',
+              value: '${[2].val}',
               color: 'blue',
             },
           ],
@@ -2526,7 +2598,6 @@ export const testConfigBDFire: Config[] = [
       list: [],
       complex_list: [],
       preset: [],
-      // mock: BDfireMock,
     },
     showStyle: {
       size: 'width:450px;height:230px;',