From b15f82e6e8f6b4dcfd977a05188be0bee87fb816 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 17 Sep 2020 11:06:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B8=82=E5=8C=97=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=87=B3=E5=AE=89=E5=AE=81=E3=80=91=E3=80=90?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86=E3=80=91-=E7=8E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=B3=B0-2020-09-17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/sys/log-error.vue     | 21 ++++++++++-------
 src/views/modules/sys/log-login.vue     | 25 ++++++++++++++------
 src/views/modules/sys/log-operation.vue | 31 +++++++++++++++++--------
 3 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/src/views/modules/sys/log-error.vue b/src/views/modules/sys/log-error.vue
index ae0475f..50fd03e 100644
--- a/src/views/modules/sys/log-error.vue
+++ b/src/views/modules/sys/log-error.vue
@@ -1,23 +1,24 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__log-error">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.module" :placeholder="$t('logError.module')" clearable></el-input>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item :label="$t('logError.module')">
+          <el-input v-model="dataForm.module" :placeholder="$t('logError.module')" clearable @keyup.native="btKeyUpModule"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @sort-change="dataListSortChangeHandle" style="width: 100%;">
-        <el-table-column prop="module" :label="$t('logError.module')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="requestUri" :label="$t('logError.requestUri')" header-align="center" align="center"></el-table-column>
+        <el-table-column label="序号" type="index" align="center" width="50"  show-overflow-tooltip></el-table-column>
+        <el-table-column prop="module" :label="$t('logError.module')" header-align="center" align="center" width="200" show-overflow-tooltip ></el-table-column>
+        <el-table-column prop="requestUri" :label="$t('logError.requestUri')" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="requestMethod" :label="$t('logError.requestMethod')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="requestParams" :label="$t('logError.requestParams')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="ip" :label="$t('logError.ip')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="ip" :label="$t('logError.ip')" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column prop="userAgent" :label="$t('logError.userAgent')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column prop="createDate" :label="$t('logError.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
@@ -61,6 +62,10 @@ export default {
       this.$alert(info, this.$t('logError.errorInfo'), {
         customClass: 'mod-sys__log-error-view-info'
       })
+    },
+    btKeyUpModule (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.module = e.target.value
     }
   }
 }
diff --git a/src/views/modules/sys/log-login.vue b/src/views/modules/sys/log-login.vue
index dc76981..d2ce35e 100644
--- a/src/views/modules/sys/log-login.vue
+++ b/src/views/modules/sys/log-login.vue
@@ -1,11 +1,11 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__log-login">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.creatorName" :placeholder="$t('logLogin.creatorName')" clearable></el-input>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item :label="$t('logLogin.creatorName')">
+          <el-input v-model="dataForm.creatorName" :placeholder="$t('logLogin.creatorName')" clearable @keyup.native="btKeyUpCreatorName"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item :label="$t('logLogin.status')">
           <el-select v-model="dataForm.status" :placeholder="$t('logLogin.status')" clearable>
             <el-option :label="$t('logLogin.status0')" :value="0"></el-option>
             <el-option :label="$t('logLogin.status1')" :value="1"></el-option>
@@ -13,14 +13,19 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @sort-change="dataListSortChangeHandle" style="width: 100%;">
-        <el-table-column prop="creatorName" :label="$t('logLogin.creatorName')" header-align="center" align="center"></el-table-column>
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column prop="creatorName" :label="$t('logLogin.creatorName')" header-align="center" align="center" width="200" show-overflow-tooltip ></el-table-column>
         <el-table-column prop="operation" :label="$t('logLogin.operation')" header-align="center" align="center">
           <template slot-scope="scope">
             {{ scope.row.operation === 0 ? $t('logLogin.operation0') : $t('logLogin.operation1') }}
@@ -66,6 +71,12 @@ export default {
         status: ''
       }
     }
+  },
+  methods:{
+    btKeyUpCreatorName (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.creatorName = e.target.value
+    }
   }
 }
 </script>
diff --git a/src/views/modules/sys/log-operation.vue b/src/views/modules/sys/log-operation.vue
index 11c85b8..596533e 100644
--- a/src/views/modules/sys/log-operation.vue
+++ b/src/views/modules/sys/log-operation.vue
@@ -1,31 +1,36 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__log-operation">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.module" :placeholder="$t('logOperation.module')" clearable></el-input>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item :label="$t('logOperation.module')">
+          <el-input v-model="dataForm.module" :placeholder="$t('logOperation.module')" clearable @keyup.native="btKeyUpModule"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item :label="$t('logOperation.status')">
           <el-select v-model="dataForm.status" :placeholder="$t('logOperation.status')" clearable>
             <el-option :label="$t('logOperation.status0')" :value="0"></el-option>
             <el-option :label="$t('logOperation.status1')" :value="1"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button type="success" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @sort-change="dataListSortChangeHandle" style="width: 100%;">
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         align="center"
+                         width="50"></el-table-column>
         <el-table-column prop="creatorName" :label="$t('logOperation.creatorName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="operation" :label="$t('logOperation.operation')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="operation" :label="$t('logOperation.operation')" header-align="center" align="center" width="120"></el-table-column>
         <el-table-column prop="module" :label="$t('logOperation.module')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="requestUri" :label="$t('logOperation.requestUri')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="requestUri" :label="$t('logOperation.requestUri')" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="requestMethod" :label="$t('logOperation.requestMethod')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="requestParams" :label="$t('logOperation.requestParams')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="requestTime" :label="$t('logOperation.requestTime')" sortable="custom" header-align="center" align="center">
+        <el-table-column prop="requestTime" :label="$t('logOperation.requestTime')" sortable="custom" header-align="center" align="center" width="130">
           <template slot-scope="scope">
             {{ `${scope.row.requestTime}ms` }}
           </template>
@@ -36,7 +41,7 @@
             <el-tag v-else size="small" type="success">{{ $t('logOperation.status1') }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="ip" :label="$t('logOperation.ip')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="ip" :label="$t('logOperation.ip')" header-align="center" align="center" min-width="150" show-overflow-tooltip></el-table-column>
         <el-table-column prop="userAgent" :label="$t('logOperation.userAgent')" header-align="center" align="center" width="150" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column prop="createDate" :label="$t('logOperation.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
       </el-table>
@@ -69,6 +74,12 @@ export default {
         status: ''
       }
     }
+  },
+  methods:{
+    btKeyUpModule (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.module = e.target.value
+    }
   }
 }
 </script>