登录及操作日志

src/pages/systemSetting/loginLog.vue

@@ -10,11 +10,11 @@
         查询条件
       </div>
       <el-form-item
-        label="昵称"
-        prop="keyWords1">
-        <el-input v-model="form.keyWords1"></el-input>
+        label="登录人id"
+        prop="adminId">
+        <el-input v-model="form.adminId"></el-input>
       </el-form-item>
-      <el-form-item
+      <!-- <el-form-item
         label="手机号"
         prop="keyWords2">
         <el-input v-model="form.keyWords2"></el-input>
@@ -39,14 +39,14 @@
             label="登出">
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item
         label="起始时间"
-        prop="startDate"
+        prop="createTimeStart"
       >
         <el-date-picker
-          v-model="form.startDate"
+          v-model="form.createTimeStart"
           type="datetime"
           placeholder="选择日期时间"
         >
@@ -54,11 +54,11 @@
       </el-form-item>
       <el-form-item
         label="截止时间"
-        prop="endDate"
+        prop="createTimeEnd"
       >
         <el-date-picker
           default-time="23:59:59"
-          v-model="form.endDate"
+          v-model="form.createTimeEnd"
           type="datetime"
           placeholder="选择日期时间"
         >
@@ -91,30 +91,18 @@
         v-loading="loading"
         :data="tableData">
         <el-table-column
-          prop="manager_name"
+          prop="adminName"
           label="操作人"
         >
         </el-table-column>
 
-        <el-table-column
-          prop="manager_nick_name"
-          label="操作人昵称"
-        >
-        </el-table-column>
-
-        <el-table-column
-          prop="phone"
-          label="手机号"
-        >
-        </el-table-column>
-
         <el-table-column
           prop="ip"
           label="IP地址"
         >
         </el-table-column>
 
-        <el-table-column
+        <!-- <el-table-column
           prop="type"
           label="类型"
         >
@@ -123,7 +111,7 @@
               {{ scope.row.type ===0?'登录':'登出' }}
             </el-tag>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           prop="createTime"
           label="操作时间"
@@ -152,9 +140,9 @@ export default {
   data () {
     return {
       form: {
-        startDate: '',
-        endDate: '',
-        keyWords1: '',
+        createTimeStart: '',
+        createTimeEnd: '',
+        adminId: '',
         keyWords2: '',
         keyWords3: '',
         pageNum: 1,
@@ -177,8 +165,8 @@ export default {
       this.loading = true
       goFirst && (this.form.pageNum = 1)
       getLoginLog(this.form).then(res => {
-        this.total = res.total
-        this.tableData = res.list
+        this.total = res.data.total
+        this.tableData = res.data.records
       }).finally(() => {
         this.loading = false
       })

src/pages/systemSetting/operationLog.vue

@@ -10,9 +10,9 @@
         查询条件
       </div>
       <el-form-item
-        label="操作人"
-        prop="keyWords1">
-        <el-select v-model="form.keyWords1">
+        label="操作人ID"
+        prop="adminId">
+        <el-select v-model="form.adminId">
           <el-option
             label="全部"
             value=""></el-option>
@@ -26,16 +26,16 @@
       </el-form-item>
       <el-form-item
         label="操作名称"
-        prop="keyWords2">
-        <el-input v-model="form.keyWords2"></el-input>
+        prop="apiName">
+        <el-input v-model="form.apiName"></el-input>
       </el-form-item>
 
       <el-form-item
         label="起始时间"
-        prop="startDate"
+        prop="createTimeStart"
       >
         <el-date-picker
-          v-model="form.startDate"
+          v-model="form.createTimeStart"
           type="datetime"
           placeholder="选择日期时间"
         >
@@ -43,11 +43,11 @@
       </el-form-item>
       <el-form-item
         label="截止时间"
-        prop="endDate"
+        prop="createTimeEnd"
       >
         <el-date-picker
           default-time="23:59:59"
-          v-model="form.endDate"
+          v-model="form.createTimeEnd"
           type="datetime"
           placeholder="选择日期时间"
         >
@@ -80,24 +80,24 @@
         v-loading="loading"
         :data="tableData">
         <el-table-column
-          prop="manager_name"
+          prop="adminName"
           label="操作人"
         >
         </el-table-column>
 
         <el-table-column
-          prop="operation"
+          prop="apiName"
           label="操作名称"
         >
         </el-table-column>
 
         <el-table-column
-          prop="object_id"
-          label="对象id"
+          prop="time"
+          label="耗时（ms）"
         >
         </el-table-column>
 
-        <el-table-column
+        <!-- <el-table-column
           prop="name"
           label="字段名称"
         >
@@ -113,7 +113,7 @@
           prop="new_value"
           label="新值"
         >
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column
           prop="createTime"
@@ -149,10 +149,10 @@ export default {
     return {
       ticketTypeList: [],
       form: {
-        startDate: '',
-        endDate: '',
-        keyWords1: '',
-        keyWords2: '',
+        createTimeStart: '',
+        createTimeEnd: '',
+        adminId: '',
+        apiName: '',
         pageNum: 1,
         pageSize: 10
       },
@@ -173,8 +173,8 @@ export default {
       this.loading = true
       goFirst && (this.form.pageNum = 1)
       getWebLog(this.form).then(res => {
-        this.total = res.total
-        this.tableData = res.list
+        this.total = res.data.total
+        this.tableData = res.data.records
       }).finally(() => {
         this.loading = false
       })