[Mod 0000] 全矿井通风册封列表修改

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

@@ -4,7 +4,7 @@
       <div class="midnumberval">{{ item.value }}</div>
       <div class="infotext1">{{ item.label }}</div>
     </div>
-    <BasicModal title="测风装置列表" @register="register" :destroyOnClose="true">
+    <BasicModal title="测风装置列表" @register="register" :destroyOnClose="true" :width="800" :footer="false">
       <a-table :dataSource="list" :columns="columns" />
     </BasicModal>
   </a-row>
@@ -13,7 +13,7 @@
   import { computed, ref } from 'vue';
   import { getFormattedText } from '../hooks/helper';
   import { useGlobSetting } from '/@/hooks/setting';
-  import { Config } from '../../../deviceManager/configurationTable/types';
+  import { ModuleDataPreset } from '../../../deviceManager/configurationTable/types';
   import { get } from 'lodash-es';
   import { useModal } from '/@/components/Modal';
   import BasicModal from '/@/components/Modal/src/BasicModal.vue';
@@ -21,7 +21,7 @@
   const props = defineProps<{
     isDataRealTime: boolean;
     data: any;
-    config?: Config;
+    config?: ModuleDataPreset;
   }>();
 
   const { sysOrgCode } = useGlobSetting();
@@ -121,21 +121,43 @@
   });
 
   const list = ref<any[]>([]);
-  const columns = ref<any[]>([
-    {
-      title: '安装位置',
-      dataIndex: 'strinstallpos',
-    },
-    {
-      title: '预警等级',
-      dataIndex: 'warnLevel_str',
-    },
-  ]);
+  const columns = ref<any[]>(
+    props.config?.columns
+      ? props.config.columns
+      : [
+          {
+            title: '安装位置',
+            dataIndex: 'strinstallpos',
+          },
+          {
+            title: '风向',
+            dataIndex: 'forward_str',
+          },
+          {
+            title: '风量',
+            dataIndex: 'm3',
+          },
+          {
+            title: '风速',
+            dataIndex: 'va',
+          },
+        ]
+  );
 
   function handleClick(config: any) {
     if (!config) return;
     const { readForm } = config;
-    list.value = get(props.data, readForm);
+    const rawdata = get(props.data, readForm);
+    if (Array.isArray(rawdata)) {
+      list.value = rawdata.map((e: any) => {
+        return {
+          ...e,
+          ...e.readData,
+        };
+      });
+    } else {
+      list.value = [rawdata];
+    }
     openModal();
   }
 </script>