fix：放开之前写好的导入导出，待联调后端导入导出接口

fengtao
1 parent b26d9310
Showing 4 changed files with 59 additions and 52 deletions
src/api/device/model/deviceConfigModel.ts
src/components/Excel/src/ExportExcelModal.vue
src/views/device/list/index.vue
src/views/device/profiles/index.vue
--- a/src/api/device/model/deviceConfigModel.ts
View file @f292db4
+++ b/src/api/device/model/deviceConfigModel.ts
View file @f292db4
@@ -3,6 +3,8 @@ import { BasicPageParams } from '/@/api/model/baseModel';
 export type TDeviceConfigPageQueryParam = BasicPageParams & TDeviceConfigParams;
 export type TDeviceConfigParams = {
+  page?: any;
+  pageSize?: any;
   name?: string;
   transportType?: string;
   orderFiled?: string;
--- a/src/components/Excel/src/ExportExcelModal.vue
View file @f292db4
+++ b/src/components/Excel/src/ExportExcelModal.vue
View file @f292db4
@@ -15,7 +15,7 @@
 </template>
 <script lang="ts">
   import type { ExportModalResult } from './typing';
-  import { defineComponent } from 'vue';
+  import { defineComponent, nextTick } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
@@ -66,7 +66,7 @@
     components: { BasicModal, BasicForm },
     emits: ['success', 'register'],
     setup(_, { emit }) {
-      const [registerForm, { validateFields }] = useForm();
+      const [registerForm, { validateFields, resetFields }] = useForm();
       const [registerModal, { closeModal }] = useModalInner();
       async function handleOk() {
@@ -79,12 +79,15 @@
         closeModal();
       }
+      const clearFieldFunc = () => nextTick(() => resetFields());
+
       return {
         schemas,
         handleOk,
         registerForm,
         registerModal,
         t,
+        clearFieldFunc,
       };
     },
   });
--- a/src/views/device/list/index.vue
View file @f292db4
+++ b/src/views/device/list/index.vue
View file @f292db4
@@ -8,12 +8,12 @@
       />
       <BasicTable @register="registerTable" class="w-5/6 xl:w-4/5">
         <template #toolbar>
-          <Authority value="api:yt:admin:addDeviceList">
+          <Authority value="api:yt:device:post">
             <a-button type="primary" @click="handleCreate" v-if="authBtn(role)">
               新增设备
             </a-button>
           </Authority>
-          <Authority value="api:yt:admin:deleteDeviceList">
+          <Authority value="api:yt:device:delete">
             <a-button
               color="error"
               v-if="authBtn(role)"
--- a/src/views/device/profiles/index.vue
View file @f292db4
+++ b/src/views/device/profiles/index.vue
View file @f292db4
@@ -12,7 +12,7 @@
           <a-button type="primary" @click="handleCreate"> 新增设备配置 </a-button>
         </Authority>
         <ImpExcel @success="loadDataSuccess" dateFormat="YYYY-MM-DD">
-          <a-button disabled @click="handleImport"> 导入设备配置 </a-button>
+          <a-button @click="handleImport"> 导入设备配置 </a-button>
         </ImpExcel>
         <Authority value="api:yt:admin:deleteDeviceConfig">
           <a-button
@@ -83,7 +83,11 @@
       </template>
     </BasicTable>
     <DeviceProfileModal @register="registerModal" @success="handleSuccess" />
-    <!-- <ExpExcelModal @register="register1" @success="defaultHeader" /> -->
+    <ExpExcelModal
+      ref="expExcelModalRef"
+      @register="registerExportModal"
+      @success="defaultHeader"
+    />
   </div>
 </template>
 <script lang="ts">
@@ -99,14 +103,24 @@
   import { useModal } from '/@/components/Modal';
   import DeviceProfileModal from '/@/views/device/profiles/DeviceProfileModal.vue';
   import { ImpExcel, ExcelData } from '/@/components/Excel';
-  // import { jsonToSheetXlsx, ExportModalResult } from '/@/components/Excel';
+  import { jsonToSheetXlsx, ExpExcelModal, ExportModalResult } from '/@/components/Excel';
   import { Authority } from '/@/components/Authority';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   export default defineComponent({
     name: 'DeviceProfileManagement',
-    components: { BasicTable, DeviceProfileModal, TableAction, ImpExcel, TableImg, Authority },
+    components: {
+      BasicTable,
+      DeviceProfileModal,
+      TableAction,
+      ImpExcel,
+      TableImg,
+      Authority,
+      ExpExcelModal,
+    },
     setup() {
+      const exportData: any = ref([]);
+      const expExcelModalRef = ref(null);
       let selectedRowKeys: any = [];
       const deviceDetailRef = ref(null);
       const getPathUrl = ref('');
@@ -114,10 +128,9 @@
       const disabled = ref(true);
       const onCloseVal = ref(0);
       const immediateStatus = ref(false);
-
       const { createMessage } = useMessage();
       const [registerModal, { openModal }] = useModal();
-      const [registerModalDetail] = useModal();
+      const [registerExportModal, { openModal: openModalExcel }] = useModal();
       const [
         registerTable,
         { setProps, reload, getSelectRows, setTableData, getForm, getSelectRowKeys },
@@ -144,8 +157,11 @@
           fixed: 'right',
         },
       });
-      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } =
-        useBatchDelete(deviceConfigDelete, handleSuccess, setProps);
+      const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
+        deviceConfigDelete,
+        handleSuccess,
+        setProps
+      );
       selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
         // Demo:status为1的选择框禁用
         if (record.default === true) {
@@ -271,26 +287,6 @@
           disabled.value = true;
         }
       };
-      // const handleTableDel = () => {
-      //   disabled.value = true;
-      //   deviceConfigDelete(selectedRowKeys)
-      //     .then(() => {
-      //       createMessage.success('删除设备配置成功');
-      //       handleSuccess();
-      //       setTimeout(() => {
-      //         disabled.value = false;
-      //       }, 3000);
-      //       selectedRowKeys.length = 0;
-      //     })
-      //     .catch((e) => {
-      //       selectedRowKeys.length = 0;
-      //       setTimeout(() => {
-      //         disabled.value = false;
-      //       }, 3000);
-      //       createMessage.error(e);
-      //     });
-      //   selectedRowKeys.length = 0;
-      // };
       function handleDelete(record: Recordable) {
         let ids = [record.id];
@@ -300,24 +296,31 @@
         });
       }
-      // function defaultHeader({ filename, bookType }: ExportModalResult) {
-      //   // 默认Object.keys(data[0])作为header
-      //   jsonToSheetXlsx({
-      //     data,
-      //     filename,
-      //     write2excelOpts: {
-      //       bookType,
-      //     },
-      //   });
-      // }
-
-      // const [register1, { openModal: openModalExcel }] = useModal();
+      function defaultHeader({ filename, bookType }: ExportModalResult) {
+        // 默认Object.keys(data[0])作为header
+        const data = exportData.value;
+        jsonToSheetXlsx({
+          data,
+          filename,
+          write2excelOpts: {
+            bookType,
+          },
+        });
+      }
+      //导出
       const handleExport = (record: Recordable) => {
-        console.log(record);
-        // setTimeout(() => {
-        //   openModalExcel();
-        // }, 50);
+        exportData.value = [];
+        exportData.value.push({
+          createTime: record.createTime,
+          description: record.description,
+          name: record.name,
+        });
+        nextTick(() => {
+          openModalExcel();
+          expExcelModalRef.value?.clearFieldFunc();
+        });
       };
+      //导入
       function handleImport() {
         console.log('record');
       }
@@ -354,11 +357,9 @@
         handleSetDefault,
         disabled,
         deviceDetailRef,
-        registerModalDetail,
-        // register1,
-        // defaultHeader,
+        registerExportModal,
+        defaultHeader,
         useSelectionChange,
-        // handleTableDel,
         tableListRef,
         loadDataSuccess,
         handleImport,
@@ -372,6 +373,7 @@
         registerModal,
         hasBatchDelete,
         handleDeleteOrBatchDelete,
+        expExcelModalRef,
       };
     },
   });