Browse Source

对光钎测温,束管监测详情界面左侧树选中节点所产生的bug进行修改;为局部风机管控系统添加报表导出功能-提交

lxh 1 year ago
parent
commit
4687f74d6b

+ 25 - 0
src/views/vent/monitorManager/comment/components/reportInfo.vue

@@ -0,0 +1,25 @@
+<template>
+    <BasicModal @register="registerModal" :defaultFullscreen="true" title="报表导出" width="1000px" v-bind="$attrs" :footer="null"
+        :showCancelBtn="false" :showOkBtn="false" destroyOnClose :mask-closable="false">
+        <NormalTable :isReportFan="isReportFan" :columns="columns" :downLoad="downLoad" :list="reportList" designScope="device-tabel" title="报表导出"
+            :showTab="false" />
+    </BasicModal>
+</template>
+
+<script lang="ts" setup>
+import { computed, unref, inject, reactive, ref, watch, defineProps } from 'vue';
+import { BasicModal, useModalInner } from '/@/components/Modal';
+import NormalTable from '../../../reportManager/comment/NormalTable.vue';
+import { columns } from '../../../reportManager/reportManager.data'
+import {downLoad,reportList} from '../../../reportManager/reportManager.api'
+
+let isReportFan=ref(false)
+let [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    //重置表单
+    setModalProps({ confirmLoading: false });
+    // Object.assign(deviceData, data.record);
+
+});
+</script>
+
+<style lang="less" scoped></style>

+ 5 - 4
src/views/vent/monitorManager/deviceMonitor/components/device/modal/ballvalve.modal.vue

@@ -280,12 +280,13 @@
       }
 
       watch([() => props.dataSource, () => props.activeID], ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
-        if (newActiveID != oldActiveID) {
-          activeDeviceID.value = newActiveID as string;
-        }
+        // if (newActiveID != oldActiveID) {
+        //   activeDeviceID.value = newActiveID as string;
+        // }
+        activeDeviceID.value =  activeDeviceID.value ? activeDeviceID.value :  newActiveID ;
         deviceList.value = newDataSource?.filter((item: any, index) => {
           if ((!activeDeviceID.value && index == 0) || item.deviceID === activeDeviceID.value) {
-            activeDeviceID.value = item.deviceID;
+            // activeDeviceID.value = item.deviceID;
             posMonitor.value = Object.assign(item, item.readData);
             historyList.value = item['history'];
           }

+ 5 - 4
src/views/vent/monitorManager/deviceMonitor/components/device/modal/bundle.modal.vue

@@ -252,12 +252,13 @@
       }
 
       watch([() => props.dataSource, () => props.activeID], ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
-        if (newActiveID != oldActiveID) {
-          activeDeviceID.value = newActiveID as string;
-        }
+        // if (newActiveID != oldActiveID) {
+        //   activeDeviceID.value = newActiveID as string;
+        // }
+        activeDeviceID.value =  activeDeviceID.value ? activeDeviceID.value :  newActiveID ;
         deviceList.value = newDataSource?.filter((item: any, index) => {
           if ((!activeDeviceID.value && index == 0) || item.deviceID === activeDeviceID.value) {
-            activeDeviceID.value = item.deviceID;
+            // activeDeviceID.value = item.deviceID;
             posMonitor.value = Object.assign(item, item.readData);
             historyList.value = item['history'];
           }

+ 5 - 4
src/views/vent/monitorManager/deviceMonitor/components/device/modal/dust.modal.vue

@@ -259,12 +259,13 @@
 
       watch([() => props.dataSource, () => props.activeID], ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
         deviceList.value = newDataSource as any[];
-        if (newActiveID != oldActiveID) {
-          activeDeviceID.value = newActiveID as string;
-        }
+        // if (newActiveID != oldActiveID) {
+        //   activeDeviceID.value = newActiveID as string;
+        // }
+        activeDeviceID.value =  activeDeviceID.value ? activeDeviceID.value :  newActiveID ;
         newDataSource?.forEach((item: any, index) => {
           if ((!activeDeviceID.value && index == 0) || item.deviceID === activeDeviceID.value) {
-            activeDeviceID.value = item.deviceID;
+            // activeDeviceID.value = item.deviceID;
             // const list = item.summaryHour
             // list.filter(data => {
             //   const date = new Date();     //1. js获取当前时间

+ 7 - 4
src/views/vent/monitorManager/deviceMonitor/components/device/modal/fiber.modal.vue

@@ -189,12 +189,13 @@
       watch([() => props.dataSource, () => props.activeID], ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
         console.log(newDataSource, 'newDataSource--------------');
         deviceList.value = newDataSource as any[];
-        if (newActiveID != oldActiveID) {
-          activeDeviceID.value = newActiveID as string;
-        }
+        // if (newActiveID != oldActiveID) {
+        //   activeDeviceID.value = newActiveID as string;
+        // }
+        activeDeviceID.value =  activeDeviceID.value ? activeDeviceID.value :  newActiveID ;
         newDataSource?.forEach((item: any, index) => {
           if ((!activeDeviceID.value && index == 0) || item.deviceID === activeDeviceID.value) {
-            activeDeviceID.value = item.deviceID;
+            // activeDeviceID.value = item.deviceID;
             posList.length = 0;
             posList1.length = 0;
             let counts = Math.ceil((Object.keys(item.readData).length - 2) / 5);
@@ -221,6 +222,8 @@
         });
       });
 
+     
+
       return {
         register,
         model: modelRef,

+ 4 - 5
src/views/vent/monitorManager/deviceMonitor/components/device/modal/fiber.modal1.vue

@@ -104,7 +104,7 @@
       const currentTime = ref(dayjs().format('YYYY-MM-DD HH:mm:ss'));
       const modelRef = ref({});
       const loading = ref(true);
-      const activeDeviceID = ref('');
+      const activeDeviceID = ref<any>('');
       const deviceList = ref<any[]>([]);
       const posList = reactive<any[]>([]);
       const posList1 = reactive<any[]>([]);
@@ -237,12 +237,11 @@
       watch([() => props.dataSource, () => props.activeID], ([newDataSource, newActiveID], [oldDataSource, oldActiveID]) => {
         console.log(newDataSource, 'newDataSource--------------');
         deviceList.value = newDataSource as any[];
-        if (newActiveID != oldActiveID) {
-          activeDeviceID.value = newActiveID as string;
-        }
+       
+        activeDeviceID.value =  activeDeviceID.value ? activeDeviceID.value :  newActiveID ;
         newDataSource?.forEach((item: any, index) => {
           if ((!activeDeviceID.value && index == 0) || item.deviceID === activeDeviceID.value) {
-            activeDeviceID.value = item.deviceID;
+            // activeDeviceID.value = item.deviceID;
             // if (item.readData.fibreTemperature) {
             //   const list = JSON.parse(item.readData.fibreTemperature);
             //   if (list.length > 0) posList.value = list;

+ 13 - 1
src/views/vent/monitorManager/fanLocalMonitor/index.vue

@@ -292,6 +292,9 @@
             </div>
           </a-tab-pane>
         </a-tabs>
+        <a-button type="primary" size="small" preIcon="ant-design:download-outlined" style="position: absolute;right:15px;top:10px" @click="reportDown">
+          报表导出
+        </a-button>
       </dv-border-box8>
     </div>
   </div>
@@ -386,7 +389,8 @@
       </div>
     </div>
   </a-modal>
-  <DeviceBaseInfo @register="registerModal" :device-type="selectData['deviceType']" />
+  <DeviceBaseInfo @register="registerModal"  :device-type="selectData['deviceType']" />
+  <reportInfo @register="registerModal1"></reportInfo>
 </template>
 
 <script setup lang="ts">
@@ -419,11 +423,14 @@
   import { useCamera } from '/@/hooks/system/useCamera';
   import { CaretRightOutlined } from '@ant-design/icons-vue';
   import { usePermission } from '/@/hooks/web/usePermission';
+  import { DownloadOutlined } from '@ant-design/icons-vue';
+  import reportInfo from '../comment/components/reportInfo.vue'
   const { hasPermission } = usePermission();
 
   const globalConfig = inject('globalConfig');
 
   const [registerModal, { openModal, closeModal }] = useModal();
+  const [registerModal1, { openModal:openModal1, closeModal: closeModal1}] = useModal();
   const { currentRoute } = useRouter();
 
   const modalTypeArr = reactive({
@@ -640,6 +647,11 @@
     }
   };
 
+  //报表导出点击
+  function reportDown(){
+    openModal1();
+  }
+
   //详情
   function goDetail() {
     openModal();

+ 243 - 235
src/views/vent/reportManager/comment/NormalTable.vue

@@ -1,250 +1,258 @@
 <template>
-    <div >
-      <BasicTable @register="registerTable" :rowSelection="rowSelection">
-        <template #tableTitle>
-          <a-button preIcon="ant-design:plus-outlined" type="primary" @click="handleAdd">新增</a-button>
-        </template>
-        <template #action="{ record }">
-          <a class="table-action-link" @click="handleEdit(record)">编辑</a>
-          <a-popconfirm
-            title="确定删除?"
-            @confirm="handleDelete(record)"
-          >
-            <a class="table-action-link">删除</a>
-          </a-popconfirm>
-          <a class="table-action-link" @click="handleDownLoad(record)">下载</a>
-          <a class="table-action-link" @click="handleHisrecord(record)">历史记录</a>
-          <slot name="action" v-bind="{ record }"></slot>
-        </template>
-        <template #bodyCell="{ column, record }">
-          <slot name="filterCell" v-bind="{ column, record }"></slot>
-        </template>
-      </BasicTable>
-      <DeviceModal  :editID="editID" :reportId="reportId" :reportLogHis="reportLogHis" :fileType="fileType"  @register="registerModal" :addOredit="addOredit" @saveOrUpdate="saveOrUpdate" />
-   
-     
-    </div>
-  </template>
-  
-  <script lang="ts" setup>
-  //ts语法
-  import { ref, reactive, toRaw, defineExpose, watch } from 'vue';
-  import { BasicTable,  } from '/@/components/Table';
-  import { useModal } from '/@/components/Modal';
-  import DeviceModal from './DeviceModal.vue';
-  import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
-  import { useListPage } from '/@/hooks/system/useListPage';
-  
-  const props = defineProps({
-     //下载文件接口
-     downLoad: {
-      type: Function,
-      required: true,
-    },
-    columns: {
-      type: Array,
-      // required: true,
-      default: () => [],
-    },
-    searchFormSchema: {
-      type: Array,
-      default: () => [],
-    },
-    list: {
-      type: Function,
-      required: true,
-    },
-    deleteById: {
-      type: Function,
-      required: true,
-    },
-    batchDelete: {
-      type: Function,
-    },
-   
-   
-    designScope: {
-      type: String,
-    },
-    title: {
-      type: String,
-    },
-  });
-  
+  <div>
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <template #tableTitle >
+        <a-button v-if="isReportFan" preIcon="ant-design:plus-outlined" type="primary" @click="handleAdd">新增</a-button>
+      </template>
+      <template #action="{ record }">
+        <a  class="table-action-link" @click="handleEdit(record)">编辑</a>
+        <a-popconfirm v-if="isReportFan" title="确定删除?" @confirm="handleDelete(record)">
+          <a class="table-action-link">删除</a>
+        </a-popconfirm>
+        <a class="table-action-link" @click="handleDownLoad(record)">导出</a>
+        <a v-if="isReportFan" class="table-action-link" @click="handleHisrecord(record)"> 历史记录</a>
+        <slot name="action" v-bind="{ record }"></slot>
+      </template>
+      <template #bodyCell="{ column, record }">
+        <slot name="filterCell" v-bind="{ column, record }"></slot>
+      </template>
+    </BasicTable>
+    <DeviceModal :editID="editID" :reportId="reportId" :reportLogHis="reportLogHis" :fileType="fileType"
+      @register="registerModal" :addOredit="addOredit" @saveOrUpdate="saveOrUpdate" />
+
+
+  </div>
+</template>
+
+<script lang="ts" setup>
+//ts语法
+import { ref, reactive, toRaw, defineExpose, watch } from 'vue';
+import { BasicTable, } from '/@/components/Table';
+import { useModal } from '/@/components/Modal';
+import DeviceModal from './DeviceModal.vue';
+import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
+import { useListPage } from '/@/hooks/system/useListPage';
+
+const props = defineProps({
+  //是否显示新增,删除按钮
+  isReportFan: {
+    type: Boolean,
+    default: () => {
+      return true
+    }
+  },
+  //下载文件接口
+  downLoad: {
+    type: Function,
+    required: true,
+  },
+  columns: {
+    type: Array,
+    // required: true,
+    default: () => [],
+  },
+  searchFormSchema: {
+    type: Array,
+    default: () => [],
+  },
+  list: {
+    type: Function,
+    required: true,
+  },
+  deleteById: {
+    type: Function,
+    required: true,
+  },
+  batchDelete: {
+    type: Function,
+  },
+
+
+  designScope: {
+    type: String,
+  },
+  title: {
+    type: String,
+  },
+});
+
 //区分打开编辑或新增弹窗
-let addOredit=ref('')
+let addOredit = ref('')
 //文件ID
-let editID = ref(0); 
+let editID = ref(0);
 let fileType = ref(''); //文件类型
-let  reportLogHis=ref('')//是否为报表记录编辑
-let reportId=ref('')//历史记录列表传参
-
-  const emit = defineEmits(['saveAdd']);
-  
-  const record = reactive({});
-
-  const [registerModal, { openModal, closeModal }] = useModal();
-  
-  const columnList = getTableHeaderColumns('');
-  
-  // 列表页面公共参数、方法
-  const { prefixCls, tableContext, onExportXls, onImportXls, doRequest } = useListPage({
-    designScope: props.designScope,
-    tableProps: {
-      title: props.title,
-      api: props.list,
-      columns: props.columns.length > 0 ? (props.columns as any[]) : columnList,
-      showTableSetting: false,
-      // size: 'small',
-      // bordered: false,
-      formConfig: {
-        showAdvancedButton: true,
-        // labelWidth: 100,
-        labelAlign: 'left',
-        labelCol: {
-          xs: 24,
-          sm: 24,
-          md: 24,
-          lg: 9,
-          xl: 7,
-          xxl: 5,
-        },
-        schemas: props.searchFormSchema as any[],
-      },
-      useSearchForm: props.searchFormSchema.length > 0 ? true : false,
-      striped: true,
-      actionColumn: {
-        width: 180,
-      },
-      beforeFetch: (params) => {
-        return Object.assign(params, { column: 'createTime',});
+let reportLogHis = ref('')//是否为报表记录编辑
+let reportId = ref('')//历史记录列表传参
+
+const emit = defineEmits(['saveAdd']);
+
+const record = reactive({});
+
+const [registerModal, { openModal, closeModal }] = useModal();
+
+const columnList = getTableHeaderColumns('');
+
+// 列表页面公共参数、方法
+const { prefixCls, tableContext, onExportXls, onImportXls, doRequest } = useListPage({
+  designScope: props.designScope,
+  tableProps: {
+    title: props.title,
+    api: props.list,
+    columns: props.columns.length > 0 ? (props.columns as any[]) : columnList,
+    showTableSetting: false,
+    // size: 'small',
+    // bordered: false,
+    formConfig: {
+      showAdvancedButton: true,
+      // labelWidth: 100,
+      labelAlign: 'left',
+      labelCol: {
+        xs: 24,
+        sm: 24,
+        md: 24,
+        lg: 9,
+        xl: 7,
+        xxl: 5,
       },
+      schemas: props.searchFormSchema as any[],
     },
-  });
-  
-
-  
-  //注册table数据
-  const [registerTable, { reload, getForm }, { rowSelection, selectedRowKeys }] = tableContext;
-  
-  
-  /**
-   * 新增事件
-   */
-  function handleAdd() {
-    addOredit.value='add'
-    for (let key in record) {
-      delete record[key];
-    }
-    openModal(true);
-    
-  }
+    useSearchForm: props.searchFormSchema.length > 0 ? true : false,
+    striped: true,
+    actionColumn: {
+      width: 180,
+    },
+    beforeFetch: (params) => {
+      return Object.assign(params, { column: 'createTime', });
+    },
+  },
+});
 
-  //新增保存
-  function saveOrUpdate(param){
-    console.log(param,'新增参数----------')
-    emit('saveAdd',param)
-  }
-  
-  /**
-   * 编辑事件
-   */
-  function handleEdit(data) {
-    addOredit.value='edit'
-    reportLogHis.value=''
-    Object.assign(record, toRaw(data));
-    let index = record.fileName.indexOf('.');
-    fileType.value = record.fileName.substring(index + 1);
-    editID.value = record.id;
-    console.log(editID.value, '编辑文件ID');
-    openModal(true, {
-      record,
-    });
+
+
+//注册table数据
+const [registerTable, { reload, getForm }, { rowSelection, selectedRowKeys }] = tableContext;
+
+
+/**
+ * 新增事件
+ */
+function handleAdd() {
+  addOredit.value = 'add'
+  for (let key in record) {
+    delete record[key];
   }
-  
-  /**
-   * 删除事件
-   */
-  async function handleDelete(record) {
-    await props.deleteById({ id: record.id }, reload);
+  openModal(true);
+
+}
+
+//新增保存
+function saveOrUpdate(param) {
+  console.log(param, '新增参数----------')
+  emit('saveAdd', param)
+}
+
+/**
+ * 编辑事件
+ */
+function handleEdit(data) {
+  addOredit.value = 'edit'
+  reportLogHis.value = ''
+  Object.assign(record, toRaw(data));
+  let index = record.fileName.indexOf('.');
+  fileType.value = record.fileName.substring(index + 1);
+  editID.value = record.id;
+  console.log(editID.value, '编辑文件ID');
+  openModal(true, {
+    record,
+  });
+}
+
+/**
+ * 删除事件
+ */
+async function handleDelete(record) {
+  await props.deleteById({ id: record.id }, reload);
+}
+
+// 历史记录
+function handleHisrecord(data) {
+  addOredit.value = 'hisRecord'
+  Object.assign(record, toRaw(data));
+  reportId.value = record.id
+  console.log(reportId.value, '历史记录列表传参---00000000')
+  openModal(true, {
+    record,
+  });
+}
+
+
+//下载文件
+function handleDownLoad(record) {
+  console.log(record, '下载');
+  props.downLoad({ id: record.id }).then((res) => {
+    console.log(res, '文件下载成功');
+    let filename = `${record.fileName}`;
+    downFilePublic(res, filename);
+  });
+}
+// 下载公用方法
+function downFilePublic(content, fileName) {
+  const blob = new Blob([content], { type: 'application/xlsx;charset=UTF-8' }); // 构造一个blob对象来处理数据
+  // 对于<a>标签,只有 Firefox 和 Chrome(内核) 支持 download 属性
+  // IE10以上支持blob但是依然不支持download
+  if ('download' in document.createElement('a')) {
+    // 支持a标签download的浏览器
+    const link = document.createElement('a'); // 创建a标签
+    link.download = fileName; // a标签添加属性
+    link.style.display = 'none';
+    link.href = URL.createObjectURL(blob);
+    document.body.appendChild(link);
+    link.click(); // 执行下载
+    URL.revokeObjectURL(link.href); // 释放url
+    document.body.removeChild(link); // 释放标签
+  } else {
+    // 其他浏览器
+    navigator.msSaveBlob(blob, fileName);
   }
+}
 
-  // 历史记录
-  function handleHisrecord(data){
-    addOredit.value='hisRecord'
-    Object.assign(record, toRaw(data));
-    reportId.value=record.id
-    console.log(  reportId.value,'历史记录列表传参---00000000')
-    openModal(true, {
-      record,
-    });
+defineExpose({
+  doRequest, onExportXls, onImportXls, reload, getForm
+});
+
+</script>
+
+<style scoped lang="less">
+@ventSpace: zxm;
+@vent-table-no-hover: #00bfff10;
+
+:deep(.@{ventSpace}-table-cell-row-hover) {
+  background: #264d8833 !important;
+}
+
+:deep(.@{ventSpace}-table-row-selected) {
+  background: #268bc522 !important;
+}
+
+:deep(.@{ventSpace}-table-tbody > tr > td) {
+  background-color: #0dc3ff05;
+}
+
+:deep(.jeecg-basic-table-row__striped) {
+  td {
+    background-color: @vent-table-no-hover !important;
   }
+}
 
+:deep(.@{ventSpace}-select-dropdown) {
 
-  //下载文件
-  function handleDownLoad(record) {
-    console.log(record, '下载');
-    props.downLoad({ id: record.id }).then((res) => {
-      console.log(res, '文件下载成功');
-      let filename = `${record.fileName}`;
-      downFilePublic(res, filename);
-    });
+  .@{ventSpace}-select-item-option-selected,
+  .@{ventSpace}-select-item-option-active {
+    background-color: #ffffff33 !important;
   }
-  // 下载公用方法
-  function downFilePublic(content, fileName) {
-    const blob = new Blob([content], { type: 'application/xlsx;charset=UTF-8' }); // 构造一个blob对象来处理数据
-    // 对于<a>标签,只有 Firefox 和 Chrome(内核) 支持 download 属性
-    // IE10以上支持blob但是依然不支持download
-    if ('download' in document.createElement('a')) {
-      // 支持a标签download的浏览器
-      const link = document.createElement('a'); // 创建a标签
-      link.download = fileName; // a标签添加属性
-      link.style.display = 'none';
-      link.href = URL.createObjectURL(blob);
-      document.body.appendChild(link);
-      link.click(); // 执行下载
-      URL.revokeObjectURL(link.href); // 释放url
-      document.body.removeChild(link); // 释放标签
-    } else {
-      // 其他浏览器
-      navigator.msSaveBlob(blob, fileName);
-    }
+
+  .@{ventSpace}-select-item:hover {
+    background-color: #ffffff33 !important;
   }
-  
-  defineExpose({
-    doRequest, onExportXls, onImportXls, reload, getForm
-  });
-  
-  </script>
-  
-  <style scoped lang="less">
-    @ventSpace: zxm;
-    @vent-table-no-hover: #00bfff10;
-  
-    :deep(.@{ventSpace}-table-cell-row-hover) {
-      background: #264d8833 !important;
-    }
-    :deep(.@{ventSpace}-table-row-selected) {
-      background: #268bc522 !important;
-    }
-  
-    :deep(.@{ventSpace}-table-tbody > tr > td) {
-      background-color: #0dc3ff05;
-    }
-    :deep(.jeecg-basic-table-row__striped) {
-      td {
-        background-color: @vent-table-no-hover !important;
-      }
-    }
-    :deep(.@{ventSpace}-select-dropdown) {
-      .@{ventSpace}-select-item-option-selected,
-      .@{ventSpace}-select-item-option-active {
-        background-color: #ffffff33 !important;
-      }
-  
-      .@{ventSpace}-select-item:hover {
-        background-color: #ffffff33 !important;
-      }
-    }
-  </style>
-  
+}
+</style>

+ 4 - 3
src/views/vent/reportManager/index.vue

@@ -2,8 +2,8 @@
     <div class="reportManager">
         <customHeader>报表管理中心</customHeader>
         <div class="content">
-            <NormalTable v-if="refesh"  :columns="columns" :searchFormSchema="searchFormSchema"
-                :deleteById="deleteById" :downLoad="downLoad" :list="list" designScope="device-tabel" title="报表管理"
+            <NormalTable v-if="refesh" :isReportFan="isReportFan" :columns="columns" :searchFormSchema="searchFormSchema"
+                :deleteById="deleteById" :downLoad="downLoad" :list="reportList" designScope="device-tabel" title="报表管理"
                 :showTab="true" @saveAdd="saveAdd" />
         </div>
     </div>
@@ -14,9 +14,10 @@ import { ref, nextTick } from 'vue'
 import customHeader from '/@/views/vent/comment/components/customHeader.vue';
 import NormalTable from './comment/NormalTable.vue';
 import { columns, searchFormSchema } from './reportManager.data';
-import { list, save, deleteById,downLoad } from './reportManager.api'
+import { reportList, save, deleteById,downLoad } from './reportManager.api'
 
 let refesh = ref(true)
+let isReportFan=ref(true)
 
 async function saveAdd(params) {
     let res = await save({ ...params })

+ 2 - 2
src/views/vent/reportManager/reportManager.api.ts

@@ -2,7 +2,7 @@ import { defHttp } from '/@/utils/http/axios';
 import { Modal } from 'ant-design-vue';
 
 enum Api {
-  list = '/safety/reportInfo/list',
+  reportList = '/safety/reportInfo/list',
   save = '/safety/reportInfo/createReportFile',
   deleteById = '/safety/reportInfo/delete',
   downLoad='/safety/reportInfo/download',
@@ -15,7 +15,7 @@ enum Api {
  * 列表接口
  * @param params
  */
-export const list = (params) => defHttp.get({ url: Api.list, params });
+export const reportList = (params) => defHttp.get({ url: Api.reportList, params });
 
 /**
  * 历史记录列表接口