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

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

@@ -55,7 +55,14 @@ export interface ModuleData {
     link: string;
   };
   /** 模块的布局，使用规定的枚举组合为一个数组，代表着从上到下所应展示的元素 */
-  layout: ('board' | 'list' | 'chart' | 'table' | 'gallery' | 'complex_list' | 'gallery_list' | 'blast_delta' | 'fire_control' | 'fire_warn')[];
+  layout: ('board' | 'list' | 'chart' | 'table' | 'gallery' | 'complex_list' | 'gallery_list' | 'blast_delta')[];
+  /** 模块内容的分区 */
+  slice: {
+    /** 分区方向 */
+    direction: 'column' | 'row';
+    /** 分区大小，该数组的数量应该和 layout 数量一致 */
+    basis: string[];
+  };
   preset: ModuleDataPreset[];
   board: ModuleDataBoard[];
   chart: ModuleDataChart[];

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

@@ -442,12 +442,12 @@ export const SUMMARY_COLUMN = [
 
 // 预警总览相关的内容配置项
 export const WARNING_CONFIG = [
-  { src: '', text: '监测总数', prop: 'total', prop2: 'total', id: 'warning_cfg_000' },
-  { src: SafetyIcon, text: '安全监测', prop: 'safety', prop2: 'safetyRisk', id: 'warning_cfg_005' },
-  { src: VentIcon, text: '通风', prop: 'vent', prop2: 'ventRisk', id: 'warning_cfg_004' },
-  { src: DustIcon, text: '粉尘', prop: 'dust', prop2: 'dustRisk', id: 'warning_cfg_003' },
-  { src: GasIcon, text: '瓦斯', prop: 'gas', prop2: 'gasRisk', id: 'warning_cfg_001' },
-  { src: FireIcon, text: '火灾', prop: 'fire', prop2: 'fireRisk', id: 'warning_cfg_002' },
+  { src: '', text: '监测总数', prop1: 'allNum', prop2: 'allNum', id: 'warning_cfg_000' },
+  { src: SafetyIcon, text: '安全监测', prop1: 'synthesizeSWarnInfo.totalNum', prop2: 'synthesizeSWarnInfo.maxWarnLevel', id: 'warning_cfg_005' },
+  { src: VentIcon, text: '通风', prop1: 'ventSWarnInfo.totalNum', prop2: 'ventSWarnInfo.maxWarnLevel', id: 'warning_cfg_004' },
+  { src: DustIcon, text: '粉尘', prop1: 'dustSWarnInfo.totalNum', prop2: 'dustSWarnInfo.maxWarnLevel', id: 'warning_cfg_003' },
+  { src: GasIcon, text: '瓦斯', prop1: 'gasSWarnInfo.totalNum', prop2: 'gasSWarnInfo.maxWarnLevel', id: 'warning_cfg_001' },
+  { src: FireIcon, text: '火灾', prop1: 'fireSWarnInfo.totalNum', prop2: 'fireSWarnInfo.maxWarnLevel', id: 'warning_cfg_002' },
 ];
 
 export const DEFAULT_TEST_DATA = {
@@ -617,19 +617,13 @@ export const DEFAULT_TEST_DATA = {
       },
     },
   },
-  warnInfo: {
-    total: 5,
-    vent: 1,
-    ventRisk: '低风险',
-    gas: 1,
-    gasRisk: '低风险',
-    dust: 1,
-    dustRisk: '低风险',
-    fire: 1,
-    fireRisk: '低风险',
-    safety: 1,
-    safetyRisk: '低风险',
-    maxLevel: 5,
+  warn: {
+    allNum: 19,
+    synthesizeSWarnInfo: { totalNum: '2', maxWarnLevel: '安全的' }, //安全监控
+    ventSWarnInfo: { totalNum: '2', maxWarnLevel: '安全的' }, //通风
+    dustSWarnInfo: { totalNum: '2', maxWarnLevel: '安全的' }, //粉尘
+    gasSWarnInfo: { totalNum: '2', maxWarnLevel: '安全的' }, //瓦斯
+    fireSWarnInfo: { totalNum: '2', maxWarnLevel: '安全的' }, //火灾
   },
   orgname: '/',
   orgcode: '/',

src/views/vent/home/billboard/components/Warning.vue

@@ -5,8 +5,8 @@
       <div class="img"> <img :src="item.src" alt="" /> </div>
       <div class="text">{{ item.text }}</div>
       <div class="extra">监测数量</div>
-      <div class="num" :class="`warning-level_${warnData.maxLevel}`">{{ warnData[item.prop] }}</div>
-      <div class="risk" :class="`warning-level_${warnData.maxLevel}`">{{ warnData[item.prop2] }}</div>
+      <div class="num">{{ get(warnData, item.prop1) }}</div>
+      <div class="risk" :class="`warning-level_${get(warnData, item.prop2)}`">{{ get(warnData, item.prop2) }}</div>
     </div>
   </div>
 </template>
@@ -14,6 +14,7 @@
   import { shallowRef, onMounted } from 'vue';
   import { BillboardType, DEFAULT_TEST_DATA, WARNING_CONFIG } from '../billboard.data';
   import _ from 'lodash-es';
+  import { get } from '../utils';
 
   const props = withDefaults(
     defineProps<{
@@ -25,23 +26,17 @@
   );
   defineEmits(['click']);
 
-  const warnData = shallowRef<BillboardType['warningInfo']>({
-    total: 5,
-    vent: 1,
-    ventRisk: '低风险',
-    gas: 1,
-    gasRisk: '低风险',
-    dust: 1,
-    dustRisk: '低风险',
-    fire: 1,
-    fireRisk: '低风险',
-    safety: 1,
-    safetyRisk: '低风险',
-    maxLevel: 5,
+  const warnData = shallowRef<BillboardType['warn']>({
+    allNum: 19,
+    synthesizeSWarnInfo: { totalNum: '预警总数', maxWarnLevel: '最高预警级别' }, //安全监控
+    ventSWarnInfo: { totalNum: '预警总数', maxWarnLevel: '最高预警级别' }, //通风
+    dustSWarnInfo: { totalNum: '预警总数', maxWarnLevel: '最高预警级别' }, //粉尘
+    gasSWarnInfo: { totalNum: '预警总数', maxWarnLevel: '最高预警级别' }, //瓦斯
+    fireSWarnInfo: { totalNum: '预警总数', maxWarnLevel: '最高预警级别' }, //火灾
   });
 
   function fetchData() {
-    const info = props.data.warnInfo;
+    const info = props.data.warn;
     if (!info) return;
     warnData.value = info;
   }

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

@@ -102,7 +102,7 @@
     fetchDevices({ init: true });
     interval = setInterval(() => {
       fetchDevices();
-    }, 600000);
+    }, 60000);
   });
 
   onUnmounted(() => {

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

@@ -15,57 +15,61 @@
       <source :src="background.link" />
       Not Supportted Link Or Browser
     </video>
-    <template v-for="config in layoutConfig" :key="config.key">
-      <!-- 告示板部分 -->
-      <div v-if="config.key === 'board'" class="content__module flex flex-justify-around pt-10px pb-10px">
-        <MiniBoard
-          v-for="item in config.items"
-          :key="item.prop"
-          :label="item.label"
-          :value="item.value"
-          :type="config.type"
-          :layout="config.layout"
-        />
-      </div>
-      <!-- 图表部分，这部分通常需要填充，有告示板、Header等内容需要填充父级 -->
-      <template v-if="config.key === 'chart'">
-        <CustomChart class="content__module flex-grow" :chart-config="config.config" :chart-data="config.data" />
-      </template>
-      <!-- 通常列表部分 -->
-      <template v-if="config.key === 'list'">
-        <template v-if="config.type === 'timeline'">
-          <TimelineList class="content__module" :list-config="config.items" />
+    <div class="flex flex-wrap 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'">
+          <div class="content__module flex flex-justify-around pt-10px pb-10px">
+            <MiniBoard
+              v-for="item in config.items"
+              :key="item.prop"
+              :label="item.label"
+              :value="item.value"
+              :type="config.type"
+              :layout="config.layout"
+            />
+          </div>
         </template>
-        <template v-else>
-          <CustomList class="content__module" :type="config.type" :list-config="config.items" />
+        <!-- 图表部分，这部分通常需要填充，有告示板、Header等内容需要填充父级 -->
+        <template v-if="config.key === 'chart'">
+          <CustomChart class="content__module" :chart-config="config.config" :chart-data="config.data" />
         </template>
-      </template>
-      <!-- 画廊部分 -->
-      <template v-if="config.key === 'gallery'">
-        <CustomGallery class="content__module" :type="config.type" :gallery-config="config.items" />
-      </template>
-      <!-- 复杂列表部分 -->
-      <template v-if="config.key === 'gallery_list'">
-        <GalleryList class="content__module" :type="config.type" :list-config="config.items" :gallery-config="config.galleryItems" />
-      </template>
-      <!-- 复杂列表部分 -->
-      <template v-if="config.key === 'complex_list'">
-        <ComplexList class="content__module" :type="config.type" :list-config="config.items" />
-      </template>
-      <!-- 表格部分，这部分通常是占一整个模块的 -->
-      <template v-if="config.key === 'table'">
-        <CustomTable :type="config.type" :columns="config.columns" :data="config.data" class="content__module text-center flex-grow overflow-auto" />
-      </template>
-      <template v-if="config.key === 'blast_delta'">
-        <BlastDelta class="content__module" :pos-monitor="config.config.mock" :canvas-size="{ width: 250, height: 137 }" />
-      </template>
-      <template v-if="config.key === 'fire_control'">
+        <!-- 通常列表部分 -->
+        <template v-if="config.key === 'list'">
+          <template v-if="config.type === 'timeline'">
+            <TimelineList class="content__module" :list-config="config.items" />
+          </template>
+          <template v-else>
+            <CustomList class="content__module" :type="config.type" :list-config="config.items" />
+          </template>
+        </template>
+        <!-- 画廊部分 -->
+        <template v-if="config.key === 'gallery'">
+          <CustomGallery class="content__module" :type="config.type" :gallery-config="config.items" />
+        </template>
+        <!-- 复杂列表部分 -->
+        <template v-if="config.key === 'gallery_list'">
+          <GalleryList class="content__module" :type="config.type" :list-config="config.items" :gallery-config="config.galleryItems" />
+        </template>
+        <!-- 复杂列表部分 -->
+        <template v-if="config.key === 'complex_list'">
+          <ComplexList class="content__module" :type="config.type" :list-config="config.items" />
+        </template>
+        <!-- 表格部分，这部分通常是占一整个模块的 -->
+        <template v-if="config.key === 'table'">
+          <CustomTable class="content__module text-center overflow-auto" :type="config.type" :columns="config.columns" :data="config.data" />
+        </template>
+        <template v-if="config.key === 'blast_delta'">
+          <BlastDelta class="content__module" :pos-monitor="config.config.mock" :canvas-size="{ width: 250, height: 137 }" />
+        </template>
+        <!-- <template v-if="config.key === 'fire_control'">
         <FIreControl class="content__module" />
       </template>
       <template v-if="config.key === 'fire_warn'">
         <FIreWarn class="content__module" />
-      </template>
-    </template>
+      </template> -->
+      </div>
+    </div>
   </div>
 </template>
 <script lang="ts" setup>
@@ -89,15 +93,15 @@
   import { get, clone } from 'lodash-es';
   import { getFormattedText } from '../../../deviceManager/configurationTable/adapters';
   import BlastDelta from '../../../monitorManager/deviceMonitor/components/device/modal/blastDelta.vue';
-  import FIreWarn from './preset/FIreWarn.vue';
-  import FIreControl from './preset/FIreControl.vue';
+  // import FIreWarn from './preset/FIreWarn.vue';
+  // import FIreControl from './preset/FIreControl.vue';
 
   const props = defineProps<{
     data: any;
     moduleData: Config['moduleData'];
   }>();
 
-  const { background, layout } = props.moduleData;
+  const { background, layout, slice } = props.moduleData;
 
   // 额外的 header 相关的变量
 
@@ -304,8 +308,10 @@
     object-fit: fill;
   }
   .content__module {
-    margin-top: 5px;
-    margin-bottom: 5px;
+    // margin-top: 5px;
+    // margin-bottom: 5px;
+    width: 100%;
+    height: 100%;
   }
   // .content__module:first-of-type {
   //   margin-top: 0;

src/views/vent/home/configurable/components/detail/ComplexList.vue

@@ -153,7 +153,7 @@
       font-size: 11px;
     }
     .list-item__value {
-      font-size: 21px;
+      font-size: 18px;
       margin-left: 5px;
     }
     .list-item__content_B {

src/views/vent/home/configurable/components/detail/CustomGallery.vue

@@ -236,9 +236,6 @@
 
   // .gallery-item_center_F {
   // }
-  .gallery_F {
-    height: 150px;
-  }
   .gallery > .gallery-item_F {
     width: 120px;
     height: 60px;
@@ -288,9 +285,6 @@
     padding-top: 5px;
   }
 
-  .gallery_G {
-    height: 300px;
-  }
   .gallery > .gallery-item_G {
     width: 120px;
     height: 120px;

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

@@ -1348,76 +1348,76 @@ export const testConfigA: Config[] = [
   },
 ];
 
-// const BDdustMock = {
-//   allMineWarn: '低风险', //全矿井风险级别
-//   dustManageInfo: {
-//     //工作面风险监测
-//     totalNum: '5', //工作面总数
-//     dfxNum: '5', //工作面低风险数
-//     ybNum: '5', //工作面一般风险数
-//     jdNum: '5', //工作面较大风险数
-//     zdNum: '5', //工作面重大风险
-//     sysList: [
-//       {
-//         sysNamme: '工作面名称1', //工作面名称
-//         warnLevel: '低风险', //预警级别
-//         maxVal: '1.88', //最高粉尘浓度
-//       },
-//       {
-//         sysNamme: '工作面名称2', //工作面名称
-//         warnLevel: '低风险', //预警级别
-//         maxVal: '1.88', //最高粉尘浓度
-//       },
-//     ],
-//   },
-//   dustDustGraph: [
-//     //粉尘传感器曲线图（综放工作面粉尘浓度）
-//     {
-//       strinstallpos: '81202工作面', //安装位置
-//       historyList: [
-//         //历史数据
-//         {
-//           dustval: '0.86', //粉尘浓度值
-//           time: '2024-09-12 15:33:50', //时间
-//         },
-//         {
-//           dustval: '0.96', //粉尘浓度值
-//           time: '2024-09-12 15:34:50', //时间
-//         },
-//       ],
-//     },
-//     {
-//       strinstallpos: '81203工作面', //安装位置
-//       historyList: [
-//         //历史数据
-//         {
-//           dustval: '0.86', //粉尘浓度值
-//           time: '2024-09-12 15:33:50', //时间
-//         },
-//         {
-//           dustval: '1.00', //粉尘浓度值
-//           time: '2024-09-12 15:34:50', //时间
-//         },
-//       ],
-//     },
-//   ],
-//   atomObj: {
-//     //智能喷雾降尘装置
-//     totalNum: '5', //喷雾设备总数
-//     openNum: '5', //喷雾设备连接数
-//     breakNum: '0', //喷雾设备断开数
-//     atomOpenNum: '1', //喷雾设备开启数
-//   },
-//   dustRelArray: [
-//     //粉尘关联指标
-//     {
-//       strinstallpos: '81202工作面', //安装位置
-//       temp: '23.3', //温度
-//       windSpeed: '10.5', //风速
-//       atomState: '打开', //喷雾状态
-//     },
-//   ],
-// };
+const BDdustMock = {
+  allMineWarn: '低风险', //全矿井风险级别
+  dustManageInfo: {
+    //工作面风险监测
+    totalNum: '5', //工作面总数
+    dfxNum: '5', //工作面低风险数
+    ybNum: '5', //工作面一般风险数
+    jdNum: '5', //工作面较大风险数
+    zdNum: '5', //工作面重大风险
+    sysList: [
+      {
+        sysNamme: '工作面名称1', //工作面名称
+        warnLevel: '低风险', //预警级别
+        maxVal: '1.88', //最高粉尘浓度
+      },
+      {
+        sysNamme: '工作面名称2', //工作面名称
+        warnLevel: '低风险', //预警级别
+        maxVal: '1.88', //最高粉尘浓度
+      },
+    ],
+  },
+  dustDustGraph: [
+    //粉尘传感器曲线图（综放工作面粉尘浓度）
+    {
+      strinstallpos: '81202工作面', //安装位置
+      historyList: [
+        //历史数据
+        {
+          dustval: '0.86', //粉尘浓度值
+          time: '2024-09-12 15:33:50', //时间
+        },
+        {
+          dustval: '0.96', //粉尘浓度值
+          time: '2024-09-12 15:34:50', //时间
+        },
+      ],
+    },
+    {
+      strinstallpos: '81203工作面', //安装位置
+      historyList: [
+        //历史数据
+        {
+          dustval: '0.86', //粉尘浓度值
+          time: '2024-09-12 15:33:50', //时间
+        },
+        {
+          dustval: '1.00', //粉尘浓度值
+          time: '2024-09-12 15:34:50', //时间
+        },
+      ],
+    },
+  ],
+  atomObj: {
+    //智能喷雾降尘装置
+    totalNum: '5', //喷雾设备总数
+    openNum: '5', //喷雾设备连接数
+    breakNum: '0', //喷雾设备断开数
+    atomOpenNum: '1', //喷雾设备开启数
+  },
+  dustRelArray: [
+    //粉尘关联指标
+    {
+      strinstallpos: '81202工作面', //安装位置
+      temp: '23.3', //温度
+      windSpeed: '10.5', //风速
+      atomState: '打开', //喷雾状态
+    },
+  ],
+};
 export const testConfigBDDust: Config[] = [
   {
     deviceType: '',
@@ -1440,6 +1440,10 @@ export const testConfigBDDust: Config[] = [
         type: 'video',
         link: '',
       },
+      slice: {
+        direction: 'column',
+        basis: ['20%', '80%'],
+      },
       layout: ['gallery', 'complex_list'],
       board: [],
       chart: [],
@@ -1518,23 +1522,23 @@ export const testConfigBDDust: Config[] = [
                 },
               ],
             },
-            {
-              title: '${[2].sysNamme}',
-              contents: [
-                {
-                  label: '风险监测',
-                  value: '${[2].warnLevel}',
-                  color: 'blue',
-                  info: '',
-                },
-                {
-                  label: '最高粉尘浓度',
-                  value: '${[2].maxVal}',
-                  color: 'blue',
-                  info: '',
-                },
-              ],
-            },
+            // {
+            //   title: '${[2].sysNamme}',
+            //   contents: [
+            //     {
+            //       label: '风险监测',
+            //       value: '${[2].warnLevel}',
+            //       color: 'blue',
+            //       info: '',
+            //     },
+            //     {
+            //       label: '最高粉尘浓度',
+            //       value: '${[2].maxVal}',
+            //       color: 'blue',
+            //       info: '',
+            //     },
+            //   ],
+            // },
           ],
         },
       ],
@@ -1568,6 +1572,10 @@ export const testConfigBDDust: Config[] = [
         type: 'video',
         link: '',
       },
+      slice: {
+        direction: 'row',
+        basis: ['100%'],
+      },
       layout: ['chart'],
       board: [],
       chart: [
@@ -1599,7 +1607,7 @@ export const testConfigBDDust: Config[] = [
       list: [],
       complex_list: [],
       preset: [],
-      // mock: BDdustMock,
+      mock: BDdustMock,
     },
     showStyle: {
       size: 'width:1000px;height:280px;',
@@ -1628,6 +1636,10 @@ export const testConfigBDDust: Config[] = [
         type: 'video',
         link: '',
       },
+      slice: {
+        direction: 'row',
+        basis: ['100%'],
+      },
       layout: ['gallery'],
       board: [],
       chart: [],
@@ -1693,6 +1705,10 @@ export const testConfigBDDust: Config[] = [
         type: 'video',
         link: '',
       },
+      slice: {
+        direction: 'row',
+        basis: ['100%'],
+      },
       layout: ['table'],
       board: [],
       chart: [],
@@ -1754,6 +1770,10 @@ export const testConfigBDDust: Config[] = [
         type: 'video',
         link: '',
       },
+      slice: {
+        direction: 'row',
+        basis: ['100%'],
+      },
       layout: ['board'],
       board: [
         {
@@ -1939,6 +1959,10 @@ export const testConfigBDFire: Config[] = [
         type: 'video',
         link: '',
       },
+      slice: {
+        direction: 'column',
+        basis: ['20%', '80%'],
+      },
       layout: ['gallery', 'complex_list'],
       board: [],
       chart: [],
@@ -2030,6 +2054,10 @@ export const testConfigBDFire: Config[] = [
         type: 'video',
         link: '',
       },
+      slice: {
+        direction: 'row',
+        basis: ['100%'],
+      },
       layout: ['gallery'],
       board: [],
       chart: [],
@@ -2110,6 +2138,10 @@ export const testConfigBDFire: Config[] = [
         type: 'video',
         link: '',
       },
+      slice: {
+        direction: 'row',
+        basis: ['100%'],
+      },
       layout: ['complex_list'],
       board: [],
       chart: [],
@@ -2293,6 +2325,10 @@ export const testConfigBDFire: Config[] = [
         type: 'video',
         link: '',
       },
+      slice: {
+        direction: 'row',
+        basis: ['100%'],
+      },
       layout: ['list'],
       board: [],
       chart: [],
@@ -2302,7 +2338,7 @@ export const testConfigBDFire: Config[] = [
       list: [
         {
           type: 'F',
-          readFrom: 'dsArray',
+          readFrom: 'pdArray',
           items: [
             {
               label: '光纤预警',
@@ -2356,6 +2392,10 @@ export const testConfigBDFire: Config[] = [
         type: 'video',
         link: '',
       },
+      slice: {
+        direction: 'row',
+        basis: ['100%'],
+      },
       layout: ['list'],
       board: [],
       chart: [],
@@ -2396,7 +2436,7 @@ export const testConfigBDFire: Config[] = [
       list: [
         {
           type: 'F',
-          readFrom: 'pdArray',
+          readFrom: 'dsArray',
           items: [
             {
               label: '光纤预警',
@@ -2450,6 +2490,10 @@ export const testConfigBDFire: Config[] = [
         type: 'video',
         link: '',
       },
+      slice: {
+        direction: 'row',
+        basis: ['100%'],
+      },
       layout: ['table'],
       board: [],
       chart: [],
@@ -2491,3 +2535,322 @@ export const testConfigBDFire: Config[] = [
     },
   },
 ];
+export const testConfigBDNew: Config[] = [
+  {
+    deviceType: '',
+    moduleName: '束管监测',
+    pageType: '',
+    moduleData: {
+      header: {
+        show: true,
+        showSelector: true,
+        showSlot: false,
+        selector: {
+          value: '',
+        },
+        slot: {
+          value: '',
+        },
+      },
+      background: {
+        show: false,
+        type: 'video',
+        link: '',
+      },
+      slice: {
+        direction: 'row',
+        basis: ['65%', '35%'],
+      },
+      layout: ['list', 'blast_delta'],
+      board: [],
+      chart: [],
+      gallery: [],
+      gallery_list: [],
+      table: [],
+      list: [
+        {
+          type: 'G',
+          readFrom: 'obfObj',
+          items: [
+            {
+              label: 'CO',
+              value: '${maxCo}',
+              color: 'blue',
+              info: '一氧化碳',
+            },
+            {
+              label: 'CO₂',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+            {
+              label: 'CH₄',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+            {
+              label: 'C₂H₂',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+            {
+              label: 'C₂H₄',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+            {
+              label: 'O₂',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+            // {
+            //   label: '温度',
+            //   value: '--',
+            //   color: 'blue',
+            //   info: '--',
+            // },
+            // {
+            //   label: '风险',
+            //   value: '--',
+            //   color: 'blue',
+            //   info: '--',
+            // },
+          ],
+        },
+      ],
+      complex_list: [],
+      preset: [
+        {
+          readFrom: '',
+        },
+      ],
+      mock: BDfireMock,
+    },
+    // showStyle: {
+    //   size: 'width:450px;height:760px;',
+    //   version: '保德',
+    //   position: 'top:160px;left:0;',
+    // },
+    showStyle: {
+      size: 'width:1000px;height:280px;',
+      version: '保德',
+      position: 'top:350px;left:460px',
+    },
+  },
+  {
+    deviceType: '',
+    moduleName: '束管监测',
+    pageType: '',
+    moduleData: {
+      header: {
+        show: true,
+        showSelector: true,
+        showSlot: false,
+        selector: {
+          value: '',
+        },
+        slot: {
+          value: '',
+        },
+      },
+      background: {
+        show: false,
+        type: 'video',
+        link: '',
+      },
+      slice: {
+        direction: 'column',
+        basis: ['65%', '35%'],
+      },
+      layout: ['list', 'blast_delta'],
+      board: [],
+      chart: [],
+      gallery: [],
+      gallery_list: [],
+      table: [],
+      list: [
+        {
+          type: 'G',
+          readFrom: 'dsArray',
+          items: [
+            {
+              label: 'CO',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+            {
+              label: 'CO₂',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+            {
+              label: 'CH₄',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+            {
+              label: 'C₂H₂',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+            {
+              label: 'C₂H₄',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+            {
+              label: 'O₂',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+            {
+              label: '温度',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+            {
+              label: '风险',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+          ],
+        },
+      ],
+      complex_list: [],
+      preset: [
+        {
+          readFrom: '',
+        },
+      ],
+      mock: BDfireMock,
+    },
+    showStyle: {
+      size: 'width:450px;height:760px;',
+      version: '保德',
+      position: 'top:160px;left:0;',
+    },
+  },
+  {
+    deviceType: '',
+    moduleName: '光纤测温',
+    pageType: '',
+    moduleData: {
+      header: {
+        show: true,
+        showSelector: true,
+        showSlot: false,
+        selector: {
+          value: '',
+        },
+        slot: {
+          value: '',
+        },
+      },
+      background: {
+        show: false,
+        type: 'video',
+        link: '',
+      },
+      slice: {
+        direction: 'row',
+        basis: ['50%', '50%'],
+      },
+      layout: ['list', 'chart'],
+      board: [],
+      chart: [
+        {
+          type: 'line',
+          readFrom: 'btArray',
+          xAxis: [{ label: '${strinstallpos}' }],
+          yAxis: [{ label: '值', align: 'left' }],
+          series: [{ prop: 'val', label: '值' }],
+        },
+      ],
+      gallery: [],
+      gallery_list: [],
+      table: [],
+      list: [
+        {
+          type: 'G',
+          readFrom: 'dsArray',
+          items: [
+            {
+              label: 'CO',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+            {
+              label: 'CO₂',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+            {
+              label: 'CH₄',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+            {
+              label: 'C₂H₂',
+              value: '--',
+              color: 'blue',
+              info: '--',
+            },
+            // {
+            //   label: 'C₂H₄',
+            //   value: '--',
+            //   color: 'blue',
+            //   info: '--',
+            // },
+            // {
+            //   label: 'O₂',
+            //   value: '--',
+            //   color: 'blue',
+            //   info: '--',
+            // },
+            // {
+            //   label: '温度',
+            //   value: '--',
+            //   color: 'blue',
+            //   info: '--',
+            // },
+            // {
+            //   label: '风险',
+            //   value: '--',
+            //   color: 'blue',
+            //   info: '--',
+            // },
+          ],
+        },
+      ],
+      complex_list: [],
+      preset: [],
+      mock: BDfireMock,
+    },
+    // showStyle: {
+    //   size: 'width:450px;height:760px;',
+    //   version: '保德',
+    //   position: 'top:160px;left:0;',
+    // },
+    showStyle: {
+      size: 'width:1000px;height:280px;',
+      version: '保德',
+      position: 'top:640px;left:460px',
+    },
+  },
+];

src/views/vent/home/configurable/dustBD.vue

@@ -28,7 +28,7 @@
           <!-- <div style="color: #fff; font-size: 12px">自燃倾向性等级 : 容易自燃</div> -->
         </div>
         <div class="tcontent-r">
-          <div>火灾</div>
+          <div>粉尘</div>
           <div>风险</div>
         </div>
       </div>