From 5c2f48d14c7606405082a35dd9224983c86b74d5 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 05 十二月 2024 18:04:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/system/log/index.vue |   81 +++++++++++++++++++++++-----------------
 1 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/system/log/index.vue b/Source/plt-web/plt-web-ui/src/views/system/log/index.vue
index d025bfa..cf0cfe1 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/log/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/log/index.vue
@@ -11,6 +11,7 @@
       @search-change="handleSearch"
       @search-reset="handleReset"
       @size-change="sizeChange"
+      @row-click="rowClickHandler"
       @current-change="currentChange"
     >
       <template slot="menuLeft" slot-scope="scope">
@@ -26,71 +27,71 @@
 import func from "@/util/func";
 
 export default {
-name: "index",
+  name: "index",
   data: function () {
     return {
       tableLoading: false,
       tableData: [],
       option: {
         ...basicOption,
-        addBtn:false,
+        addBtn: false,
         editBtn: false,
         delBtn: false,
         calcHeight: -60,
-        align:'left',
-        headerAlign:'center',
-        menu:false,
+        align: 'left',
+        headerAlign: 'center',
+        menu: false,
         searchMenuSpan: 6,
-        searchIcon:false,
+        searchIcon: false,
         column: [
           {
             label: '鐢ㄦ埛鍚�',
             prop: 'truename',
-            search:true,
+            search: true,
             searchSpan: 4,
-            searchLabel:'鎿嶄綔鐢ㄦ埛',
-            type:'select',
-            dicUrl:'/api/loginBasicController/getOperatingUsers',
-            sortable:true,
+            searchLabel: '鎿嶄綔鐢ㄦ埛',
+            type: 'select',
+            dicUrl: '/api/loginBasicController/getOperatingUsers',
+            sortable: true,
             width: 150
           }, {
             label: '濮撳悕',
             prop: 'username',
-            sortable:true,
+            sortable: true,
             width: 150
-          },{
+          }, {
             label: '鐢ㄦ埛IP',
             prop: 'userIp',
-            search:true,
+            search: true,
             searchSpan: 4,
-            sortable:true,
+            sortable: true,
             width: 150
-          },{
+          }, {
             label: '妯″潡',
             prop: 'moduleName',
-            sortable:true,
+            sortable: true,
             overHidden: true,
-          },{
+          }, {
             label: '鎿嶄綔',
             prop: 'type',
-            sortable:true,
+            sortable: true,
             width: 150
-          },{
+          }, {
             label: '鏃堕棿',
             prop: 'date',
-            type:'date',
-            search:true,
+            type: 'date',
+            search: true,
             searchOrder: 1,
             searchSpan: 8,
             searchRange: true,
-            searchLabel:'鏌ヨ鏃ユ湡',
-            valueFormat:'yyyy-MM-dd',
+            searchLabel: '鏌ヨ鏃ユ湡',
+            valueFormat: 'yyyy-MM-dd',
             width: 160
-          },{
+          }, {
             label: '鎻忚堪',
             prop: 'result',
             overHidden: true,
-            width:380,
+            width: 380,
           },
         ]
       },
@@ -100,7 +101,9 @@
         total: 0,
         pageSizes: [10, 30, 50, 100],
       },
-      searchParams: {}
+      searchParams: {},
+      selectList: [],
+
     }
   },
   watch: {
@@ -112,7 +115,7 @@
     // 琛ㄦ牸璇锋眰
     getTableList() {
       this.tableLoading = true;
-      getLogListByContion(this.page.currentPage, this.page.pageSize, {'logType':this.$route.query.logType,...this.searchParams}).then(res => {
+      getLogListByContion(this.page.currentPage, this.page.pageSize, {'logType': this.$route.query.logType,'roleType':this.$route.query.roleType, ...this.searchParams}).then(res => {
         this.tableData = res.data.data;
         this.page.total = res.data.total;
         this.tableLoading = false;
@@ -122,10 +125,10 @@
     // 鎼滅储鏌ヨ
     handleSearch(params, done) {
       this.searchParams = {
-        userName:params.truename,
-        ipText:params.userIp,
-        startDate:params.date[0],
-        endDate:params.date[1]
+        userName: params.truename,
+        ipText: params.userIp,
+        startDate: params.date[0],
+        endDate: params.date[1]
       };
 
       this.getTableList();
@@ -148,19 +151,29 @@
       this.page.currentPage = val;
     },
 
-    handleRefresh(){
+    handleRefresh() {
       this.getTableList();
     },
     // 瀵煎嚭
     exportClickHandler() {
       const loading = this.$loading({});
-      exportLog().then(res => {
+      exportLog({'pageNo':1,'pageSize':-1,'logType': this.$route.query.logType,'roleType':this.$route.query.roleType, ...this.searchParams}).then(res => {
         func.downloadFileByBlobHandler(res);
         this.createdLoading = false
         this.$message.success('瀵煎嚭鎴愬姛');
         loading.close();
       })
     },
+    // 琛屽崟閫�
+    rowClickHandler(row) {
+      func.rowClickHandler(
+        row,
+        this.$refs.logCrud,
+        this.lastIndex,
+        (newIndex) => { this.lastIndex = newIndex; },
+        () => { this.selectList = []; }
+      );
+    },
   }
 }
 </script>

--
Gitblit v1.9.3