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

src/views/vent/deviceManager/comment/warningTabel/index2.vue

@@ -12,12 +12,12 @@
         </a-popconfirm>
       </template>
     </BasicTable>
-    <BaseModal @register="register" @add="onSubmit" @update="onSubmit" :form-schemas="workFaceWarningFormSchemas" />
+    <BaseModal @register="register" @add="onSubmit" @update="onSubmit" :destroy-on-close="true" :form-schemas="workFaceWarningSchemas" />
   </div>
 </template>
 
 <script lang="ts" name="system-user" setup>
-  import { BasicTable, TableAction } from '/@/components/Table';
+  import { BasicTable, FormSchema } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
   import BaseModal from './BaseModal1.vue';
   import { useModal } from '/@/components/Modal';
@@ -79,6 +79,21 @@
     //刷新列表
     reload();
   }
+
+  const workFaceWarningSchemas: FormSchema[] = [
+    ...workFaceWarningFormSchemas,
+    {
+      label: '关联条目',
+      field: 'relatedEntries',
+      component: 'ApiSelect',
+      componentProps: {
+        labelField: 'alarmName',
+        valueField: 'id',
+        resultField: 'records',
+        api: warningLogList.bind(null, { sysId: props.deviceId }),
+      },
+    },
+  ];
 </script>
 
 <style scoped></style>

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

@@ -106,6 +106,16 @@ export const list = (params) => {
         }
       });
     }
+    if (res.windrect) {
+      res.windrect.forEach((e) => {
+        if (e.readData.m3) {
+          e.readData.m3 = e.readData.m3.replace('-', '');
+        }
+        if (e.readData.va) {
+          e.readData.va = e.readData.va.replace('-', '');
+        }
+      });
+    }
 
     return res;
   });