From 6d45661f24b6b20dad3d3f47952421939055be95 Mon Sep 17 00:00:00 2001
From: dqjdda <201507802@qq.com>
Date: Thu, 22 Aug 2019 13:47:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=8A=A0=E5=85=A5=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5IP=E6=9D=A5=E6=BA=90=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=A4=9A=E5=AD=97=E6=AE=B5=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=EF=BC=8C=E5=8D=87=E7=BA=A7=E4=B8=83=E7=89=9B=E4=BA=91=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/monitor/log/errorLog.vue    |  4 ++--
 src/views/monitor/log/index.vue       |  4 ++--
 src/views/monitor/log/search.vue      | 13 +------------
 src/views/system/dict/index.vue       |  8 ++------
 src/views/system/menu/index.vue       |  4 ++--
 src/views/system/permission/index.vue |  4 ++--
 src/views/system/role/index.vue       |  4 ++--
 src/views/system/user/center.vue      |  1 +
 src/views/system/user/index.vue       | 14 +++-----------
 9 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue
index d266339..3a4e7ef 100644
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -5,6 +5,7 @@
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="username" label="用户名"/>
       <el-table-column prop="requestIp" label="IP"/>
+      <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源"/>
       <el-table-column prop="description" label="描述"/>
       <el-table-column :show-overflow-tooltip="true" prop="method" label="方法名称"/>
       <el-table-column :show-overflow-tooltip="true" prop="params" label="参数"/>
@@ -59,10 +60,9 @@ export default {
       this.url = 'api/logs/error'
       const sort = 'id,desc'
       const query = this.query
-      const type = query.type
       const value = query.value
       this.params = { page: this.page, size: this.size, sort: sort }
-      if (type && value) { this.params[type] = value }
+      if (value) { this.params['blurry'] = value }
       return true
     },
     info(id) {
diff --git a/src/views/monitor/log/index.vue b/src/views/monitor/log/index.vue
index 855a684..366f631 100644
--- a/src/views/monitor/log/index.vue
+++ b/src/views/monitor/log/index.vue
@@ -5,6 +5,7 @@
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="username" label="用户名"/>
       <el-table-column prop="requestIp" label="IP"/>
+      <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源"/>
       <el-table-column prop="description" label="描述"/>
       <el-table-column :show-overflow-tooltip="true" prop="method" label="方法名称"/>
       <el-table-column :show-overflow-tooltip="true" prop="params" label="参数"/>
@@ -50,10 +51,9 @@ export default {
       this.url = 'api/logs'
       const sort = 'id,desc'
       const query = this.query
-      const type = query.type
       const value = query.value
       this.params = { page: this.page, size: this.size, sort: sort }
-      if (type && value) { this.params[type] = value }
+      if (value) { this.params['blurry'] = value }
       return true
     }
   }
diff --git a/src/views/monitor/log/search.vue b/src/views/monitor/log/search.vue
index ba818a0..f975e12 100644
--- a/src/views/monitor/log/search.vue
+++ b/src/views/monitor/log/search.vue
@@ -1,9 +1,6 @@
 <template>
   <div class="head-container">
-    <el-input v-model="query.value" clearable placeholder="请输入搜索内容" style="width: 150px;" class="filter-item" @keyup.enter.native="toQuery"/>
-    <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
-      <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
-    </el-select>
+    <el-input v-model="query.value" clearable placeholder="请输入你要搜索的内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
     <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="$parent.toQuery">搜索</el-button>
   </div>
 </template>
@@ -15,14 +12,6 @@ export default {
       type: Object,
       required: true
     }
-  },
-  data() {
-    return {
-      queryTypeOptions: [
-        { key: 'username', display_name: '用户名' },
-        { key: 'description', display_name: '描述' }
-      ]
-    }
   }
 }
 </script>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 97b4dff..e49699c 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -19,10 +19,7 @@
           <!--工具栏-->
           <div class="head-container">
             <!-- 搜索 -->
-            <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-            <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
-              <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
-            </el-select>
+            <el-input v-model="query.value" clearable placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
             <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
           </div>
           <!--表格渲染-->
@@ -107,9 +104,8 @@ export default {
       const sort = 'id,desc'
       this.params = { page: this.page, size: this.size, sort: sort }
       const query = this.query
-      const type = query.type
       const value = query.value
-      if (type && value) { this.params[type] = value }
+      if (value) { this.params['blurry'] = value }
       if (this.$refs.dictDetail) {
         this.$refs.dictDetail.data = []
         this.$refs.dictDetail.dictName = ''
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index b588295..4db9f83 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -3,7 +3,7 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-input v-model="query.value" clearable placeholder="模糊搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
       <div v-permission="['ADMIN','MENU_ALL','MENU_CREATE']" style="display: inline-block;margin: 0px 2px;">
@@ -107,7 +107,7 @@ export default {
       const query = this.query
       const value = query.value
       this.params = { page: this.page, size: this.size, sort: sort }
-      if (value) { this.params['name'] = value }
+      if (value) { this.params['blurry'] = value }
       return true
     },
     subDelete(id) {
diff --git a/src/views/system/permission/index.vue b/src/views/system/permission/index.vue
index 9cc3b06..1159363 100644
--- a/src/views/system/permission/index.vue
+++ b/src/views/system/permission/index.vue
@@ -3,7 +3,7 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-input v-model="query.value" clearable placeholder="输入名称或者别名搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
       <div v-permission="['ADMIN','PERMISSION_ALL','PERMISSION_CREATE']" style="display: inline-block;margin: 0px 2px 0px">
@@ -93,7 +93,7 @@ export default {
       const query = this.query
       const value = query.value
       this.params = { page: this.page, size: this.size, sort: sort }
-      if (value) { this.params['name'] = value }
+      if (value) { this.params['blurry'] = value }
       return true
     },
     subDelete(id) {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 16ca7a6..e0e6c1f 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -5,7 +5,7 @@
     <!--工具栏-->
     <div class="head-container">
       <!-- 搜索 -->
-      <el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
+      <el-input v-model="query.value" clearable placeholder="输入名称或者描述搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
       <div v-permission="['ADMIN','ROLES_ALL','ROLES_CREATE']" style="display: inline-block;margin: 0px 2px;">
@@ -164,7 +164,7 @@ export default {
       const query = this.query
       const value = query.value
       this.params = { page: this.page, size: this.size, sort: sort }
-      if (value) { this.params['name'] = value }
+      if (value) { this.params['blurry'] = value }
       return true
     },
     subDelete(id) {
diff --git a/src/views/system/user/center.vue b/src/views/system/user/center.vue
index 7dcafcb..e4ce5aa 100644
--- a/src/views/system/user/center.vue
+++ b/src/views/system/user/center.vue
@@ -46,6 +46,7 @@
             <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
               <el-table-column prop="description" label="行为"/>
               <el-table-column prop="requestIp" label="IP"/>
+              <el-table-column :show-overflow-tooltip="true" prop="address" label="IP来源"/>
               <el-table-column prop="time" label="请求耗时" align="center">
                 <template slot-scope="scope">
                   <el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 72ef571..dfc59e3 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -15,10 +15,7 @@
         <!--工具栏-->
         <div class="head-container">
           <!-- 搜索 -->
-          <el-input v-model="query.value" clearable placeholder="输入关键字搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
-          <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
-            <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
-          </el-select>
+          <el-input v-model="query.blurry" clearable placeholder="输入名称或者邮箱搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
           <el-select v-model="query.enabled" clearable placeholder="状态" class="filter-item" style="width: 90px" @change="toQuery">
             <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key"/>
           </el-select>
@@ -117,10 +114,6 @@ export default {
         label: 'name'
       },
       downloadLoading: false,
-      queryTypeOptions: [
-        { key: 'username', display_name: '用户名' },
-        { key: 'email', display_name: '邮箱' }
-      ],
       enabledTypeOptions: [
         { key: 'true', display_name: '激活' },
         { key: 'false', display_name: '锁定' }
@@ -148,11 +141,10 @@ export default {
       this.url = 'api/users'
       const sort = 'id,desc'
       const query = this.query
-      const type = query.type
-      const value = query.value
+      const blurry = query.blurry
       const enabled = query.enabled
       this.params = { page: this.page, size: this.size, sort: sort, deptId: this.deptId }
-      if (type && value) { this.params[type] = value }
+      if (blurry) { this.params['blurry'] = blurry }
       if (enabled !== '' && enabled !== null) { this.params['enabled'] = enabled }
       return true
     },