From 6b534a43e7278179672422f43f14342dc78b9208 Mon Sep 17 00:00:00 2001
From: Administrator <ailanyin4j@163.com>
Date: Thu, 22 Dec 2022 11:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=99=BB=E5=BD=95/=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/monitor/logininfor.js          | 15 +++++----
 src/api/monitor/operlog.js             | 13 +++++---
 src/views/monitor/logininfor/index.vue | 26 +++++++--------
 src/views/monitor/operlog/index.vue    | 46 +++++++++++++-------------
 4 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/src/api/monitor/logininfor.js b/src/api/monitor/logininfor.js
index c49a40e..7515f49 100644
--- a/src/api/monitor/logininfor.js
+++ b/src/api/monitor/logininfor.js
@@ -3,24 +3,27 @@ import request from '@/utils/request'
 // 查询登录日志列表
 export function list(query) {
   return request({
-    url: '/monitor/logininfor/list',
+    url: '/monitor/loginLog/list',
     method: 'get',
     params: query
   })
 }
 
 // 删除登录日志
-export function delLogininfor(infoId) {
+export function delLogininfor(ids) {
   return request({
-    url: '/monitor/logininfor/' + infoId,
-    method: 'delete'
+    url: '/monitor/loginLog',
+    method: 'delete',
+    data:{
+      ids: ids
+    }
   })
 }
 
 // 解锁用户登录状态
 export function unlockLogininfor(userName) {
   return request({
-    url: '/monitor/logininfor/unlock/' + userName,
+    url: '/monitor/loginLog/unlock/' + userName,
     method: 'get'
   })
 }
@@ -28,7 +31,7 @@ export function unlockLogininfor(userName) {
 // 清空登录日志
 export function cleanLogininfor() {
   return request({
-    url: '/monitor/logininfor/clean',
+    url: '/monitor/loginLog/clean',
     method: 'delete'
   })
 }
diff --git a/src/api/monitor/operlog.js b/src/api/monitor/operlog.js
index 6e881df..3e9ec92 100644
--- a/src/api/monitor/operlog.js
+++ b/src/api/monitor/operlog.js
@@ -3,24 +3,27 @@ import request from '@/utils/request'
 // 查询操作日志列表
 export function list(query) {
   return request({
-    url: '/monitor/operlog/list',
+    url: '/monitor/useLog/list',
     method: 'get',
     params: query
   })
 }
 
 // 删除操作日志
-export function delOperlog(operId) {
+export function delOperlog(ids) {
   return request({
-    url: '/monitor/operlog/' + operId,
-    method: 'delete'
+    url: '/monitor/useLog' ,
+    method: 'delete',
+    data:{
+      ids: ids
+    }
   })
 }
 
 // 清空操作日志
 export function cleanOperlog() {
   return request({
-    url: '/monitor/operlog/clean',
+    url: '/monitor/useLog/clean',
     method: 'delete'
   })
 }
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index 59a5353..e3640e1 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -1,9 +1,9 @@
 <template>
    <div class="app-container">
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-         <el-form-item label="登录地址" prop="ipaddr">
+         <el-form-item label="登录地址" prop="ip">
             <el-input
-               v-model="queryParams.ipaddr"
+               v-model="queryParams.ip"
                placeholder="请输入登录地址"
                clearable
                style="width: 240px;"
@@ -58,7 +58,7 @@
                icon="Delete"
                :disabled="multiple"
                @click="handleDelete"
-               v-hasPermi="['monitor:logininfor:remove']"
+               v-hasPermi="['monitor:loginLog:remove']"
             >删除</el-button>
          </el-col>
          <el-col :span="1.5">
@@ -67,26 +67,26 @@
                plain
                icon="Delete"
                @click="handleClean"
-               v-hasPermi="['monitor:logininfor:remove']"
+               v-hasPermi="['monitor:loginLog:remove']"
             >清空</el-button>
          </el-col>
-         <el-col :span="1.5">
+         <!-- <el-col :span="1.5">
             <el-button
                type="primary"
                plain
                icon="Unlock"
                :disabled="single"
                @click="handleUnlock"
-               v-hasPermi="['monitor:logininfor:unlock']"
+               v-hasPermi="['monitor:loginLog:unlock']"
             >解锁</el-button>
-         </el-col>
+         </el-col> -->
          <el-col :span="1.5">
             <el-button
                type="warning"
                plain
                icon="Download"
                @click="handleExport"
-               v-hasPermi="['monitor:logininfor:export']"
+               v-hasPermi="['monitor:loginLog:export']"
             >导出</el-button>
          </el-col>
          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -96,8 +96,8 @@
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="访问编号" align="center" prop="infoId" />
          <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
-         <el-table-column label="地址" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
-         <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
+         <el-table-column label="地址" align="center" prop="ip" :show-overflow-tooltip="true" />
+         <!-- <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" /> -->
          <el-table-column label="操作系统" align="center" prop="os" :show-overflow-tooltip="true" />
          <el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true" />
          <el-table-column label="登录状态" align="center" prop="status">
@@ -144,7 +144,7 @@ const defaultSort = ref({ prop: "loginTime", order: "descending" });
 const queryParams = ref({
   pageNum: 1,
   pageSize: 10,
-  ipaddr: undefined,
+  ip: undefined,
   userName: undefined,
   status: undefined,
   orderByColumn: undefined,
@@ -215,9 +215,9 @@ function handleUnlock() {
 }
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download("monitor/logininfor/export", {
+  proxy.download("monitor/loginLog/export", {
     ...queryParams.value,
-  }, `config_${new Date().getTime()}.xlsx`);
+  }, `登录日志_${new Date().getTime()}.xlsx`);
 }
 
 getList();
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index 077f20a..89a0ce4 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -10,9 +10,9 @@
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="操作人员" prop="operName">
+         <el-form-item label="操作人员" prop="operatorName">
             <el-input
-               v-model="queryParams.operName"
+               v-model="queryParams.operatorName"
                placeholder="请输入操作人员"
                clearable
                style="width: 240px;"
@@ -73,7 +73,7 @@
                icon="Delete"
                :disabled="multiple"
                @click="handleDelete"
-               v-hasPermi="['monitor:operlog:remove']"
+               v-hasPermi="['monitor:useLog:remove']"
             >删除</el-button>
          </el-col>
          <el-col :span="1.5">
@@ -82,7 +82,7 @@
                plain
                icon="Delete"
                @click="handleClean"
-               v-hasPermi="['monitor:operlog:remove']"
+               v-hasPermi="['monitor:useLog:remove']"
             >清空</el-button>
          </el-col>
          <el-col :span="1.5">
@@ -91,7 +91,7 @@
                plain
                icon="Download"
                @click="handleExport"
-               v-hasPermi="['monitor:operlog:export']"
+               v-hasPermi="['monitor:useLog:export']"
             >导出</el-button>
          </el-col>
          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -99,7 +99,7 @@
 
       <el-table ref="operlogRef" v-loading="loading" :data="operlogList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
          <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="日志编号" align="center" prop="operId" />
+         <el-table-column label="日志编号" align="center" prop="id" />
          <el-table-column label="系统模块" align="center" prop="title" />
          <el-table-column label="操作类型" align="center" prop="businessType">
             <template #default="scope">
@@ -107,21 +107,21 @@
             </template>
          </el-table-column>
          <el-table-column label="请求方式" align="center" prop="requestMethod" />
-         <el-table-column label="操作人员" align="center" prop="operName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" width="100" />
-         <el-table-column label="主机" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
+         <el-table-column label="操作人员" align="center" prop="operatorName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" width="100" />
+         <el-table-column label="主机" align="center" prop="ip" width="130" :show-overflow-tooltip="true" />
          <el-table-column label="操作状态" align="center" prop="status">
             <template #default="scope">
                <dict-tag :options="sys_common_status" :value="scope.row.status" />
             </template>
          </el-table-column>
-         <el-table-column label="操作日期" align="center" prop="operTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
+         <el-table-column label="操作日期" align="center" prop="operationTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
             <template #default="scope">
-               <span>{{ parseTime(scope.row.operTime) }}</span>
+               <span>{{ parseTime(scope.row.operationTime) }}</span>
             </template>
          </el-table-column>
          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template #default="scope">
-               <el-button link type="primary" icon="View" @click="handleView(scope.row, scope.index)" v-hasPermi="['monitor:operlog:query']">详细</el-button>
+               <el-button link type="primary" icon="View" @click="handleView(scope.row, scope.index)" v-hasPermi="['monitor:useLog:query']">详细</el-button>
             </template>
          </el-table-column>
       </el-table>
@@ -142,17 +142,17 @@
                   <el-form-item label="操作模块：">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>
                   <el-form-item
                     label="登录信息："
-                  >{{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }}</el-form-item>
+                  >{{ form.operatorName }} / {{ form.ip }} / {{ form.operLocation }}</el-form-item>
                </el-col>
                <el-col :span="12">
-                  <el-form-item label="请求地址：">{{ form.operUrl }}</el-form-item>
+                  <el-form-item label="请求地址：">{{ form.url }}</el-form-item>
                   <el-form-item label="请求方式：">{{ form.requestMethod }}</el-form-item>
                </el-col>
                <el-col :span="24">
                   <el-form-item label="操作方法：">{{ form.method }}</el-form-item>
                </el-col>
                <el-col :span="24">
-                  <el-form-item label="请求参数：">{{ form.operParam }}</el-form-item>
+                  <el-form-item label="请求参数：">{{ form.operationParam }}</el-form-item>
                </el-col>
                <el-col :span="24">
                   <el-form-item label="返回参数：">{{ form.jsonResult }}</el-form-item>
@@ -164,7 +164,7 @@
                   </el-form-item>
                </el-col>
                <el-col :span="12">
-                  <el-form-item label="操作时间：">{{ parseTime(form.operTime) }}</el-form-item>
+                  <el-form-item label="操作时间：">{{ parseTime(form.operationTime) }}</el-form-item>
                </el-col>
                <el-col :span="24">
                   <el-form-item label="异常信息：" v-if="form.status === 1">{{ form.errorMsg }}</el-form-item>
@@ -196,7 +196,7 @@ const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
 const dateRange = ref([]);
-const defaultSort = ref({ prop: "operTime", order: "descending" });
+const defaultSort = ref({ prop: "operationTime", order: "descending" });
 
 const data = reactive({
   form: {},
@@ -204,7 +204,7 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     title: undefined,
-    operName: undefined,
+    operatorName: undefined,
     businessType: undefined,
     status: undefined
   }
@@ -239,7 +239,7 @@ function resetQuery() {
 }
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.operId);
+  ids.value = selection.map(item => item.id);
   multiple.value = !selection.length;
 }
 /** 排序触发事件 */
@@ -255,9 +255,9 @@ function handleView(row) {
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const operIds = row.operId || ids.value;
-  proxy.$modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项?').then(function () {
-    return delOperlog(operIds);
+  const _ids = row.id || ids.value;
+  proxy.$modal.confirm('是否确认删除日志编号为"' + _ids + '"的数据项?').then(function () {
+    return delOperlog(_ids);
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("删除成功");
@@ -274,9 +274,9 @@ function handleClean() {
 }
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download("monitor/operlog/export",{
+  proxy.download("monitor/useLog/export",{
     ...queryParams.value,
-  }, `config_${new Date().getTime()}.xlsx`);
+  }, `操作日志_${new Date().getTime()}.xlsx`);
 }
 
 getList();