From e1cd9b58eafba52b91e7492c4aa4f3f015b541ec Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 24 十一月 2022 11:26:45 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master

---
 src/views/operate/log/index.vue |   34 ++++++++++++++++------------------
 1 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/views/operate/log/index.vue b/src/views/operate/log/index.vue
index 2b7370d..adb83e7 100644
--- a/src/views/operate/log/index.vue
+++ b/src/views/operate/log/index.vue
@@ -63,7 +63,6 @@
         <!-- 鏁版嵁灞曠ず -->
         <el-table
           ref="multipleTable"
-          :default-sort="{ prop: 'createTime' }"
           :header-cell-style="{
             background: '#06122c',
             'font-size': '12px',
@@ -80,9 +79,10 @@
           <el-table-column type="selection" min-width="5"> </el-table-column>
           <el-table-column
             prop="createTime"
-            sortable
             label="鏃ュ織鏃堕棿"
             min-width="10"
+            :sort-orders="['descending', 'ascending']"
+            sortable="custom"
           >
             <template slot-scope="scope">
               <span>{{ changeTime(scope.row.createTime) }}</span>
@@ -147,6 +147,7 @@
   </div>
 </template>
 <script>
+import {downloadFile, getNowDate} from "@/utils/helper";
 import helper from "@/utils/mydate";
 import { parseTime } from "@/utils/index";
 import { createNamespacedHelpers } from "vuex";
@@ -170,7 +171,7 @@
           label: "鎵归噺鍒犻櫎",
         },
       ],
-      mysort: 0,
+      mysort: 1,
       tempList: [],
       operationType: "鍏ㄩ儴",
       operationTypeList: [],
@@ -198,17 +199,20 @@
     },
     // 瀵煎嚭鏃ュ織
     async handleExport() {
-      const { currentPage, pageSize, context, operationType } = this;
+      const { currentPage, pageSize, context, operationType, mysort, mytime } =
+        this;
       let arr = await this.exportLogs({
         content: context,
         current: currentPage,
-        size: pageSize,
+        endTime: mytime[1] !== "" ? parseTime(mytime[1]) : "",
+        id: "",
+        operationType: operationType === "鍏ㄩ儴" ? "" : operationType,
+        portEquipment: "",
+        size: 50000,
+        startTime: mytime[0] !== "" ? parseTime(mytime[0]) : "",
+        sort: mysort,
       });
-      let fileName = arr.headers["content-disposition"];
-      console.log(fileName);
-      if (fileName) {
-        fileName = fileName.slice(fileName.indexOf("filename=") + 9);
-      }
+      let fileName = getNowDate(new Date());
       const blob = new Blob([arr.data], {
         type: "application/octet-stream",
       });
@@ -218,7 +222,7 @@
       const href = window.URL.createObjectURL(blob);
       downloadElement.href = href;
       // // 涓嬭浇鍚庢枃浠跺悕
-      downloadElement.download = fileName;
+      downloadElement.download = fileName + "鏃ュ織鏁版嵁.xlsx";
       document.body.appendChild(downloadElement);
       // 鐐瑰嚮涓嬭浇
       downloadElement.click();
@@ -226,6 +230,7 @@
       document.body.removeChild(downloadElement);
       // 閲婃斁鎺塨lob瀵硅薄
       window.URL.revokeObjectURL(href);
+      this.setTableData();
     },
     // 璁剧疆鎿嶄綔绫诲瀷
     async setOperationType() {
@@ -278,7 +283,6 @@
     async getLogList() {
       const { currentPage, pageSize, context, operationType, mysort, mytime } =
         this;
-      console.log(mytime);
       let arr = await this.getLogsList({
         content: context,
         current: currentPage,
@@ -290,12 +294,10 @@
         startTime: mytime[0] !== "" ? parseTime(mytime[0]) : "",
         sort: mysort,
       });
-      console.log(arr);
       return arr.data.data;
     },
     // 鎵归噺涓嬫媺妗嗘搷浣�
     async selectChange(list) {
-      console.log(this.tempList);
       if (this.tempList.length !== 0) {
         this.preMyIdx = list;
         if (list === 3) {
@@ -338,11 +340,9 @@
                 message: res.message,
               });
             }
-            console.log(res);
           });
         })
         .catch((err) => {
-          console.log(err);
         });
     },
     // 琛ㄦ牸鐩戝惉
@@ -406,7 +406,6 @@
           done();
         })
         .catch((err) => {
-          console.log(err);
         });
     },
     // 鑷畾涔夊叧闂脊绐�
@@ -417,7 +416,6 @@
     },
     //
     timechange(data) {
-      console.log(data);
     },
   },
 };

--
Gitblit v1.8.0