From 4aae0157dd2fee2b5a72a7fb0e2aecb34bf9fc2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Thu, 30 Dec 2021 20:52:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E5=85=B8=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Vue/src/views/monitor/logininfor/index.vue | 10 +++++++---
 ZR.Vue/src/views/monitor/operlog/index.vue    | 20 +++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ZR.Vue/src/views/monitor/logininfor/index.vue b/ZR.Vue/src/views/monitor/logininfor/index.vue
index 4aca6f9..d052138 100644
--- a/ZR.Vue/src/views/monitor/logininfor/index.vue
+++ b/ZR.Vue/src/views/monitor/logininfor/index.vue
@@ -29,7 +29,7 @@
         <el-button type="danger" plain icon="el-icon-delete" size="mini" @click="handleClean" v-hasPermi="['monitor:logininfor:remove']">清空</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:logininfor:export']">导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:logininfor:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -42,7 +42,11 @@
       <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
       <el-table-column label="浏览器" align="center" prop="browser" />
       <el-table-column label="操作系统" align="center" prop="os" />
-      <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />
+      <el-table-column label="操作状态" align="center" prop="status">
+        <template slot-scope="{row}">
+          <dict-tag :options="statusOptions" :value="row.status"></dict-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="操作信息" align="center" prop="msg" />
       <el-table-column label="登录日期" align="center" prop="loginTime" width="180">
         <template slot-scope="scope">
@@ -64,7 +68,7 @@ import {
 } from "@/api/monitor/logininfor";
 
 export default {
-  name: "Logininfor",
+  name: "logininfor",
   data() {
     return {
       // 遮罩层
diff --git a/ZR.Vue/src/views/monitor/operlog/index.vue b/ZR.Vue/src/views/monitor/operlog/index.vue
index 5bcc43d..71c07e4 100644
--- a/ZR.Vue/src/views/monitor/operlog/index.vue
+++ b/ZR.Vue/src/views/monitor/operlog/index.vue
@@ -5,8 +5,7 @@
         <el-input v-model="queryParams.title" placeholder="请输入系统模块" clearable style="width: 200px;" size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="操作人员" prop="operName">
-        <el-input v-model="queryParams.operName" placeholder="请输入操作人员" clearable style="width: 160px;" size="small"
-          @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.operName" placeholder="请输入操作人员" clearable style="width: 160px;" size="small" @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="类型" prop="businessType">
         <el-select v-model="queryParams.businessType" placeholder="操作类型" clearable size="small" style="width: 240px">
@@ -19,8 +18,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="操作时间">
-        <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -30,8 +28,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['monitor:operlog:remove']">删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['monitor:operlog:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-delete" size="mini" @click="handleClean" v-hasPermi="['monitor:operlog:remove']">清空</el-button>
@@ -52,7 +49,11 @@
       <el-table-column label="操作人员" align="center" prop="operName" />
       <el-table-column label="主机" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
       <el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />
-      <el-table-column label="操作状态" align="center" prop="status" :formatter="statusFormat" />
+      <el-table-column label="操作状态" align="center" prop="status">
+        <template slot-scope="{row}">
+          <dict-tag :options="statusOptions" :value="row.status"></dict-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="用时" align="center" prop="elapsed">
         <template slot-scope="scope">
           <span :style="scope.row.elapsed < 1000 ? 'color:green':scope.row.elapsed <3000 ?'color:orange':'color:red'">{{ scope.row.elapsed }}
@@ -103,8 +104,7 @@
           </el-col>
           <el-col :lg="12">
             <el-form-item label="操作状态：">
-              <div v-if="form.status === 0">正常</div>
-              <div v-else-if="form.status === 1">失败</div>
+              <dict-tag :options="statusOptions" :value="form.status"></dict-tag>
             </el-form-item>
           </el-col>
           <el-col :lg="12">
@@ -131,7 +131,7 @@ import {
 } from "@/api/monitor/operlog";
 
 export default {
-  name: "Operlog",
+  name: "operlog",
   data() {
     return {
       // 遮罩层