提交文件

src/views/vent/home/dustInfoTj/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="dustInfoTj">
-    <customHeader>安全监控新增列表</customHeader>
+    <customHeader>单位信息管理</customHeader>
     <div class="tj-content">
       <div class="mine-content">
         <div class="content-tabs">

src/views/vent/monitorManager/alarmFire/alarmFire.api.ts

@@ -0,0 +1,23 @@
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+  systemList = '/monitor/device',
+  list = '/monitor/system',
+  baseList = '/safety/ventanalyManageSystem/list',
+  deviceList = '/safety/ventanalyDeviceInfo/list',
+}
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.post({ url: Api.list, params });
+
+export const systemList = (params) => defHttp.post({ url: Api.systemList, params });
+
+/**
+ * 保存或者更新用户
+ * @param params
+ */
+export const getTableList = (params) => defHttp.get({ url: Api.baseList, params });
+
+export const getDeviceList = (params) => defHttp.get({ url: Api.deviceList, params });

src/views/vent/monitorManager/comment/HistoryTable.vue

@@ -235,16 +235,13 @@
     await getForm().setFieldsValue({ gdeviceid: props.deviceId ? props.deviceId : deviceOptions.value[0] ? deviceOptions.value[0]['value'] : '' });
   }
 
-  async function getDataSource() {
-    dataSource.value = [];
-    setLoading(true);
+  function resetFormParam() {
     const stationTypeStr = stationType.value;
     const formData = getForm().getFieldsValue();
     const pagination = getPaginationRef();
     formData['pageNo'] = pagination['current'];
     formData['pageSize'] = pagination['pageSize'];
     formData['column'] = 'createTime';
-    debugger;
     if (stationTypeStr !== 'redis') {
       formData['strtype'] = deviceTypeStr.value
         ? deviceTypeStr.value
@@ -254,15 +251,7 @@
       if (props.sysId) {
         formData['sysId'] = props.sysId;
       }
-      const result = await defHttp.get({ url: '/safety/ventanalyMonitorData/listdays', params: formData });
-      setPagination({ total: Math.abs(result['datalist']['total']) || 0 });
-      if (result['datalist']['records'].length > 0) {
-        dataSource.value = result['datalist']['records'].map((item: any) => {
-          return Object.assign(item, item['readData']);
-        });
-      } else {
-        dataSource.value = [];
-      }
+      return formData;
     } else {
       const params = {
         pageNum: pagination['current'],
@@ -276,6 +265,26 @@
         interval: intervalMap.get(formData['skip']) ? intervalMap.get(formData['skip']) : '1h',
         isEmployee: props.deviceType.startsWith('vehicle') ? false : true,
       };
+      return params;
+    }
+  }
+
+  async function getDataSource() {
+    const stationTypeStr = stationType.value;
+    dataSource.value = [];
+    setLoading(true);
+    const params = await resetFormParam();
+    if (stationTypeStr !== 'redis') {
+      const result = await defHttp.get({ url: '/safety/ventanalyMonitorData/listdays', params: params });
+      setPagination({ total: Math.abs(result['datalist']['total']) || 0 });
+      if (result['datalist']['records'].length > 0) {
+        dataSource.value = result['datalist']['records'].map((item: any) => {
+          return Object.assign(item, item['readData']);
+        });
+      } else {
+        dataSource.value = [];
+      }
+    } else {
       const result = await defHttp.post({ url: '/monitor/history/getHistoryData', params: params });
       setPagination({ total: Math.abs(result['total']) || 0 });
       dataSource.value = result['records'] || [];
@@ -427,17 +436,10 @@
         pageSizeOptions: ['10', '30', '50', '100'],
         showQuickJumper: false,
       },
-      // beforeFetch(params) {
-      //   params.strtype = deviceTypeStr.value
-      //     ? deviceTypeStr.value
-      //     : deviceOptions.value[0]['strtype']
-      //     ? deviceOptions.value[0]['strtype']
-      //     : props.deviceType + '*';
-      //   if (props.sysId) {
-      //     params.sysId = props.sysId;
-      //   }
-      //   return params;
-      // },
+      beforeFetch() {
+        const newParams = resetFormParam();
+        return newParams;
+      },
       // afterFetch(result) {
       //   const resultItems = result['records'];
       //   resultItems.map((item) => {