Browse Source

统计模块

zxh 2 years ago
parent
commit
b5bdf7fca9

+ 2 - 0
config/evn.dev.js

@@ -1,6 +1,8 @@
 /**开发地址配置 */
 export default {
     BASE_URL: 'http://117.174.10.73:1111',
+    // BASE_URL: 'http://10.6.67.88:1111',
     // BASE_URL: 'http://localhost:1111',
     ISERVER_BASE_URL: 'http://117.174.10.73:8090/'
+    // ISERVER_BASE_URL: 'http://10.6.67.88:8088/'
 }

+ 9 - 0
src/api/kxc/serviceConfig.js

@@ -82,4 +82,13 @@ export function modifySource(data) {
         method: 'put',
         data
     })
+}
+
+// 更新服务
+export function execUpdate(data) {
+    return request({
+        url: '/dataImport/dataImport/execUpdate',
+        method: 'post',
+        data
+    })
 }

+ 9 - 0
src/api/systemStatistical.js

@@ -48,4 +48,13 @@ export function userOperateCountNum(params) {
         method: 'get',
         params
     })
+}
+
+// 获取异常ip
+export function getAbnormalIp(params) {
+    return request({
+        url: '/base/countCenter/userLegalAddressPage',
+        method: 'get',
+        params
+    })
 }

+ 1 - 1
src/views/currentSystem/authorityManagement/dictManagement/widgets/dicValue.vue

@@ -136,7 +136,7 @@ export default {
       rules: {
         codeValue: [
           { required: true, message: '请输入字典值编码', trigger: 'blur' },
-          { pattern: '^[0-9a-zA-Z]+$', message: '字典值不合法' }
+          { pattern: '^[0-9a-zA-Z.]+$', message: '字典值不合法' }
         ],
         notes: [
           { required: true, message: '请输入字典值名称', trigger: 'blur' }

+ 8 - 2
src/views/currentSystem/authorityManagement/serviceConfig/index.vue

@@ -12,6 +12,7 @@
               <el-button type="primary" size="small" style="width:3rem;padding:0.5rem 0.1rem;" @click="getSourcedic">查 询</el-button>
               <el-button type="primary" size="small" style="width:3rem;padding:0.5rem 0.1rem;" @click="openForm1(1,null)">新 增</el-button>
               <el-button type="primary" size="small" style="width:3rem;padding:0.5rem 0.1rem;" @click="removeDics">删 除</el-button>
+              <el-button type="primary" size="small" style="padding:0.5rem 0.5rem;" @click="execUpdate">GIS服务更新</el-button>
               <!-- <el-button type="primary" size="small" style="width:80px" @click="cancel">取消</el-button> -->
             </el-form-item>
           </el-form>
@@ -267,7 +268,7 @@ import {
   modifySourcedic,
   addSource,
   removeSource,
-  modifySource} from '@/api/kxc/serviceConfig'
+  modifySource, execUpdate} from '@/api/kxc/serviceConfig'
 import { getCompany } from '@/api/base'
 export default {
   name: 'ServiceConfig',
@@ -298,7 +299,7 @@ export default {
       sourceDicList: [],
       dicList: [],
       currentGroup: {}, // 选择的当前的分组
-      deptTreeData:[]
+      deptTreeData: []
     }
   },
   created() {
@@ -324,6 +325,11 @@ export default {
 
   },
   methods: {
+    execUpdate() {
+      execUpdate().then(res => {
+        if(res.code==1) this.$message.success("更新成功")
+      })
+    },
     /***
         * 设置部门树数据
        */

+ 8 - 4
src/views/kxcSystem/systemStatistical/safetyAuditor/adminChange/index.vue

@@ -34,20 +34,20 @@
     <div class="table-container" v-show="showType==1">
       <el-table :data="tableData3" border :header-cell-style="{
             height:'40px',backgroundColor:'#e1f0fd',color:'#606266'}" style="width: 100%" height="calc(100% - 35px)">
-        <el-table-column prop="序号" label="序号" width="200">
+        <el-table-column prop="序号" label="序号" width="100">
           <template slot-scope="scope">{{scope.$index+1}}</template>
         </el-table-column>
         <el-table-column prop="createTime" label="操作时间" width="200">
           <template
-                    slot-scope="{row}">{{new Date(parseInt(row.createTime)).toLocaleDateString().replace(new RegExp('/',"g"),"-")}}</template>
+                    slot-scope="{row}">{{getDate(row.createTime)}}</template>
         </el-table-column>
         <el-table-column prop="remoteAddr" label="IP地址"></el-table-column>
         <el-table-column prop="userAgent" label="浏览器" show-overflow-tooltip></el-table-column>
         <el-table-column prop="osName " label="设备"></el-table-column>
         <el-table-column prop="createBy" label="操作者"></el-table-column>
-        <el-table-column prop="serviceId" label="系统模块" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column prop="serviceId" label="系统模块" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="requestUri" label="日志登记" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="content" label="日志内容"></el-table-column>
+        <el-table-column prop="title" label="日志内容"></el-table-column>
         <el-table-column prop="operateType" label="日志类型">
 
         </el-table-column>
@@ -92,6 +92,10 @@ export default {
     this.loginCountByDepartmentPage()
   },
   methods: {
+    getData(n) {
+      n = new Date(n)
+      return n.toLocaleDateString().replace(/\//g, "-") + " " + n.toTimeString().substr(0, 8)
+    },
     loginCountByDepartmentPage() {
       let params = JSON.parse(JSON.stringify(this.pagination))
       params['roleType'] = '4,5,6' // 统计对象

+ 8 - 4
src/views/kxcSystem/systemStatistical/safetyAuditor/adminLoginAndOut/index.vue

@@ -25,20 +25,20 @@
     <div class="table-container" v-show="showType==1">
       <el-table :data="tableData3" border :header-cell-style="{
             height:'40px',backgroundColor:'#e1f0fd',color:'#606266'}" style="width: 100%" height="calc(100% - 35px)">
-        <el-table-column prop="序号" label="序号" width="200">
+        <el-table-column prop="序号" label="序号" width="100">
           <template slot-scope="scope">{{scope.$index+1}}</template>
         </el-table-column>
         <el-table-column prop="createTime" label="操作时间" width="200">
           <template
-                    slot-scope="{row}">{{new Date(parseInt(row.createTime)).toLocaleDateString().replace(new RegExp('/',"g"),"-")}}</template>
+                    slot-scope="{row}">{{getDate(row.createTime)}}</template>
         </el-table-column>
         <el-table-column prop="remoteAddr" label="IP地址"></el-table-column>
         <el-table-column prop="userAgent" label="浏览器" show-overflow-tooltip></el-table-column>
         <el-table-column prop="osName " label="设备"></el-table-column>
         <el-table-column prop="createBy" label="操作者"></el-table-column>
-        <el-table-column prop="serviceId" label="系统模块" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column prop="serviceId" label="系统模块" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="requestUri" label="日志登记" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="content" label="日志内容"></el-table-column>
+        <el-table-column prop="title" label="日志内容"></el-table-column>
         <el-table-column prop="operateType" label="日志类型">
 
         </el-table-column>
@@ -87,6 +87,10 @@ export default {
     this.loginCountByDepartmentPage()
   },
   methods: {
+    getData(n) {
+      n = new Date(n)
+      return n.toLocaleDateString().replace(/\//g, "-") + " " + n.toTimeString().substr(0, 8)
+    },
     loginCountByDepartmentPage() {
       let params = JSON.parse(JSON.stringify(this.pagination))
       params['operateType'] = this.form.operateType ? this.form.operateType : '1,2'

+ 1 - 1
src/views/kxcSystem/systemStatistical/safetyAuditor/jobsChange/index.vue

@@ -38,7 +38,7 @@
         <el-table-column prop="userAgent" label="浏览器" show-overflow-tooltip></el-table-column>
         <el-table-column prop="osName " label="设备"></el-table-column>
         <el-table-column prop="createBy" label="操作者"></el-table-column>
-        <el-table-column prop="serviceId" label="系统模块" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column prop="serviceId" label="系统模块" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="requestUri" label="日志登记" show-overflow-tooltip></el-table-column>
         <el-table-column prop="content" label="日志内容"></el-table-column>
         <el-table-column prop="operateType" label="日志类型">

+ 8 - 4
src/views/kxcSystem/systemStatistical/safetyAuditor/organizationalChange/index.vue

@@ -28,20 +28,20 @@
     <div class="table-container" v-show="showType==1">
       <el-table :data="tableData3" border :header-cell-style="{
             height:'40px',backgroundColor:'#e1f0fd',color:'#606266'}" style="width: 100%" height="calc(100% - 35px)">
-        <el-table-column prop="序号" label="序号" width="200">
+        <el-table-column prop="序号" label="序号" width="100">
           <template slot-scope="scope">{{scope.$index+1}}</template>
         </el-table-column>
         <el-table-column prop="createTime" label="操作时间" width="200">
           <template
-                    slot-scope="{row}">{{new Date(parseInt(row.createTime)).toLocaleDateString().replace(new RegExp('/',"g"),"-")}}</template>
+                    slot-scope="{row}">{{getDate(row.createTime)}}</template>
         </el-table-column>
         <el-table-column prop="remoteAddr" label="IP地址"></el-table-column>
         <el-table-column prop="userAgent" label="浏览器" show-overflow-tooltip></el-table-column>
         <el-table-column prop="osName " label="设备"></el-table-column>
         <el-table-column prop="createBy" label="操作者"></el-table-column>
-        <el-table-column prop="serviceId" label="系统模块" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column prop="serviceId" label="系统模块" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="requestUri" label="日志登记" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="content" label="日志内容"></el-table-column>
+        <el-table-column prop="title" label="日志内容"></el-table-column>
         <el-table-column prop="operateType" label="日志类型">
 
         </el-table-column>
@@ -86,6 +86,10 @@ export default {
     this.loginCountByDepartmentPage()
   },
   methods: {
+    getData(n) {
+      n = new Date(n)
+      return n.toLocaleDateString().replace(/\//g, "-") + " " + n.toTimeString().substr(0, 8)
+    },
     loginCountByDepartmentPage() {
       let params = JSON.parse(JSON.stringify(this.pagination))
        params['moduleName'] = "department"

+ 7 - 3
src/views/kxcSystem/systemStatistical/safetyAuditor/permissionChange/index.vue

@@ -19,7 +19,7 @@
     <div class="table-container" v-show="showType==1">
       <el-table :data="tableData3" border :header-cell-style="{
             height:'40px',backgroundColor:'#e1f0fd',color:'#606266'}" style="width: 100%" height="calc(100% - 35px)">
-        <el-table-column prop="序号" label="序号" width="200">
+        <el-table-column prop="序号" label="序号" width="100">
           <template slot-scope="scope">{{scope.$index+1}}</template>
         </el-table-column>
         <el-table-column prop="createTime" label="操作时间" width="200">
@@ -30,9 +30,9 @@
         <el-table-column prop="userAgent" label="浏览器" show-overflow-tooltip></el-table-column>
         <el-table-column prop="osName " label="设备"></el-table-column>
         <el-table-column prop="createBy" label="操作者"></el-table-column>
-        <el-table-column prop="serviceId" label="系统模块" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column prop="serviceId" label="系统模块" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="requestUri" label="日志登记" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="content" label="日志内容"></el-table-column>
+        <el-table-column prop="title" label="日志内容"></el-table-column>
         <el-table-column prop="operateType" label="日志类型">
 
         </el-table-column>
@@ -81,6 +81,10 @@ export default {
     this.loginCountByDepartmentPage()
   },
   methods: {
+    getData(n) {
+      n = new Date(n)
+      return n.toLocaleDateString().replace(/\//g, "-") + " " + n.toTimeString().substr(0, 8)
+    },
     loginCountByDepartmentPage() {
       let params = JSON.parse(JSON.stringify(this.pagination))
       if (this.form.time && this.form.time.length == 2) {

+ 8 - 4
src/views/kxcSystem/systemStatistical/safetyAuditor/userChange/index.vue

@@ -28,20 +28,20 @@
     <div class="table-container" v-show="showType==1">
       <el-table :data="tableData3" border :header-cell-style="{
             height:'40px',backgroundColor:'#e1f0fd',color:'#606266'}" style="width: 100%" height="calc(100% - 35px)">
-        <el-table-column prop="序号" label="序号" width="200">
+        <el-table-column prop="序号" label="序号" width="100">
           <template slot-scope="scope">{{scope.$index+1}}</template>
         </el-table-column>
         <el-table-column prop="createTime" label="操作时间" width="200">
           <template
-                    slot-scope="{row}">{{new Date(parseInt(row.createTime)).toLocaleDateString().replace(new RegExp('/',"g"),"-")}}</template>
+                    slot-scope="{row}">{{getDate(row.createTime)}}</template>
         </el-table-column>
         <el-table-column prop="remoteAddr" label="IP地址"></el-table-column>
         <el-table-column prop="userAgent" label="浏览器" show-overflow-tooltip></el-table-column>
         <el-table-column prop="osName " label="设备"></el-table-column>
         <el-table-column prop="createBy" label="操作者"></el-table-column>
-        <el-table-column prop="serviceId" label="系统模块" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column prop="serviceId" label="系统模块" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="requestUri" label="日志登记" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="content" label="日志内容"></el-table-column>
+        <el-table-column prop="title" label="日志内容"></el-table-column>
         <el-table-column prop="operateType" label="日志类型">
 
         </el-table-column>
@@ -86,6 +86,10 @@ export default {
     this.loginCountByDepartmentPage()
   },
   methods: {
+    getData(n) {
+      n = new Date(n)
+      return n.toLocaleDateString().replace(/\//g, "-") + " " + n.toTimeString().substr(0, 8)
+    },
     loginCountByDepartmentPage() {
       let params = JSON.parse(JSON.stringify(this.pagination))
       params['roleType'] = '1,2,3' // 统计对象

+ 41 - 37
src/views/kxcSystem/systemStatistical/secrecyAdmin/abnormalIp/index.vue

@@ -3,39 +3,40 @@
     <div class="page-top">
       <el-form ref="form" :inline="true" :model="form">
         <el-form-item label="起止时间" label-width="auto">
-          <el-date-picker v-model="form.time" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" size="small" value-format="yyyy-MM-dd">
+          <el-date-picker v-model="form.time" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+                          size="small" value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="合法IP段" label-width="auto">
+        <!-- <el-form-item label="合法IP段" label-width="auto">
           <el-input v-model="form.ip1" placeholder="起止" size="small" clearable></el-input>
         </el-form-item>-
         <el-form-item label-width="0">
           <el-input v-model="form.ip2" placeholder="终止" size="small" clearable></el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="内容" label-width="auto">
-          <el-select v-model="form.userLevel" placeholder="选择内容" size="small" clearable multiple collapse-tags>
+          <el-select v-model="form.isLegal" placeholder="选择内容" size="small">
             <el-option label="合法IP" value="1"></el-option>
             <el-option label="非法IP" value="2"></el-option>
           </el-select>
         </el-form-item>
         <el-button type="primary" icon="el-icon-search" size="small" style="margin-top: 4px;" @click="query()">查询</el-button>
-        <el-form-item style="margin-left:20px">
+        <!-- <el-form-item style="margin-left:20px">
           <el-switch style="display: block;margin-top: 10px;" v-model="showType" active-color="#2d74e7" inactive-color="#2d74e7"
                      active-text="统计表格" inactive-text="数据表格" :inactive-value="1" :active-value="2">
           </el-switch>
-        </el-form-item>
+        </el-form-item> -->
 
       </el-form>
     </div>
     <div class="table-container" v-show="showType==1">
       <el-table :data="tableData3" border :header-cell-style="{
             height:'40px',backgroundColor:'#e1f0fd',color:'#606266'}" style="width: 100%" height="calc(100% - 35px)">
-        <el-table-column prop="序号" label="序号" width="200">
+        <el-table-column prop="序号" label="序号" width="100">
           <template slot-scope="scope">{{scope.$index+1}}</template>
         </el-table-column>
-        <el-table-column prop="createTime" label="操作时间" width="200">
+        <el-table-column prop="createTime" label="操作时间" width="300">
           <template
-                    slot-scope="{row}">{{new Date(parseInt(row.createTime)).toLocaleDateString().replace(new RegExp('/',"g"),"-")}}</template>
+                    slot-scope="{row}">{{getData(row.createTime)}}</template>
         </el-table-column>
         <el-table-column prop="remoteAddr" label="IP地址"></el-table-column>
       </el-table>
@@ -56,13 +57,15 @@
 </template>
 
 <script>
-import { loginCountByDepartmentPage, userOperateCountPage } from '@/api/systemStatistical';
+import { getAbnormalIp } from '@/api/systemStatistical';
 import { getCompany } from '@/api/base'
 export default {
   data() {
     return {
       cycle: 'y',
-      form: {},
+      form: {
+        isLegal:'2'
+      },
       tableData3: [],
       pagination: { current: 1, size: 20, total: 0 },
       deptTreeData: [],
@@ -76,59 +79,60 @@ export default {
     }
   },
   mounted() {
-    // this.loginCountByDepartmentPage()
+    this.getAbnormalIp()
   },
   methods: {
-    loginCountByDepartmentPage() {
+    getData(n) {
+      n = new Date(n)
+      return n.toLocaleDateString().replace(/\//g, "-") + " " + n.toTimeString().substr(0, 8)
+    },
+    getAbnormalIp() {
       let params = JSON.parse(JSON.stringify(this.pagination))
-      if (this.form.operateType&&this.form.operateType.length>0) {
-        params['operateType'] = this.form.operateType.join(',')
-      }
-      if (this.form.userLevel&&this.form.userLevel.length>0) {
-        params['userLevel'] = this.form.userLevel.join(',')
+      if (this.form.isLegal) {
+        params['isLegal'] = this.form.isLegal
       }
       if (this.form.time && this.form.time.length == 2) {
         params['countStartTime'] = this.form.time[0]
         params['countEndTime'] = this.form.time[1]
       }
-      params['roleType'] = '1,2,3' // 用户
+      // params['roleType'] = '1,2,3' // 用户
 
-      userOperateCountPage(params).then(res => {
+      getAbnormalIp(params).then(res => {
         // console.log('输出:renyuan{>>单位', res)
-        let sData = []
-        let sDataObj = {}
+        // let sData = []
+        // let sDataObj = {}
         let data = res.result.records
         this.tableData3 = data.map(item => {
           let optype = this.operateType.find(titem => titem.code == item.operateType)
           item.operateType = optype.value
-          if (!sDataObj.hasOwnProperty(optype.value)) sDataObj[optype.value] = 1
-          else sDataObj[optype.value] += 1
+          // if (!sDataObj.hasOwnProperty(optype.value)) sDataObj[optype.value] = 1
+          // else sDataObj[optype.value] += 1
           return item
         })
-        for (const key in sDataObj) {
-          sData.push({
-            optype: key,
-            time: this.form.time && this.form.time.length == 2 ? this.form.time.join('-') : '全部',
-            num: sDataObj[key]
-          })
-        }
-        this.sTableData = sData
+        // for (const key in sDataObj) {
+        //   sData.push({
+        //     optype: key,
+        //     time: this.form.time && this.form.time.length == 2 ? this.form.time.join('-') : '全部',
+        //     num: sDataObj[key]
+        //   })
+        // }
+        // this.sTableData = sData
         this.tableData3 = res.result.records
         this.pagination.total = res.result.total
       })
     },
     query() {
-      // this.pagination.current = 1
-      // this.pagination.size = 20
-      // this.loginCountByDepartmentPage()
+      this.pagination.current = 1
+      this.pagination.size = 20
+      this.getAbnormalIp()
     },
     handleSizeChange(size) {
       this.pagination.size = size
-      this.loginCountByDepartmentPage()
+      this.getAbnormalIp()
     },
     handleCurrentChange(current) {
       this.pagination.current = current
-      this.loginCountByDepartmentPage()
+      this.getAbnormalIp()
     },
     companyChange(val) {
       this.form.departmentIds = val.length > 0 ? val.at(-1) : ''

+ 8 - 4
src/views/kxcSystem/systemStatistical/secrecyAdmin/loginAndOut/index.vue

@@ -25,20 +25,20 @@
     <div class="table-container" v-show="showType==1">
       <el-table :data="tableData3" border :header-cell-style="{
             height:'40px',backgroundColor:'#e1f0fd',color:'#606266'}" style="width: 100%" height="calc(100% - 35px)">
-        <el-table-column prop="序号" label="序号" width="200">
+        <el-table-column prop="序号" label="序号" width="100">
           <template slot-scope="scope">{{scope.$index+1}}</template>
         </el-table-column>
         <el-table-column prop="createTime" label="操作时间" width="200">
           <template
-                    slot-scope="{row}">{{new Date(parseInt(row.createTime)).toLocaleDateString().replace(new RegExp('/',"g"),"-")}}</template>
+                    slot-scope="{row}">{{getData(row.createTime)}}</template>
         </el-table-column>
         <el-table-column prop="remoteAddr" label="IP地址"></el-table-column>
         <el-table-column prop="userAgent" label="浏览器" show-overflow-tooltip></el-table-column>
         <el-table-column prop="osName " label="设备"></el-table-column>
         <el-table-column prop="createBy" label="操作者"></el-table-column>
-        <el-table-column prop="serviceId" label="系统模块" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column prop="serviceId" label="系统模块" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="requestUri" label="日志登记" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="content" label="日志内容"></el-table-column>
+        <el-table-column prop="title" label="日志内容"></el-table-column>
         <el-table-column prop="operateType" label="日志类型">
 
         </el-table-column>
@@ -83,6 +83,10 @@ export default {
     this.loginCountByDepartmentPage()
   },
   methods: {
+    getData(n) {
+      n = new Date(n)
+      return n.toLocaleDateString().replace(/\//g, "-") + " " + n.toTimeString().substr(0, 8)
+    },
     loginCountByDepartmentPage() {
       let params = JSON.parse(JSON.stringify(this.pagination))
       params['operateType'] = this.form.operateType ? this.form.operateType : '1,2'

+ 8 - 4
src/views/kxcSystem/systemStatistical/secrecyAdmin/userBehavior/index.vue

@@ -54,20 +54,20 @@
     <div class="table-container" v-show="showType==1">
       <el-table :data="tableData3" border :header-cell-style="{
             height:'40px',backgroundColor:'#e1f0fd',color:'#606266'}" style="width: 100%" height="calc(100% - 35px)">
-        <el-table-column prop="序号" label="序号" width="200">
+        <el-table-column prop="序号" label="序号" width="100">
           <template slot-scope="scope">{{scope.$index+1}}</template>
         </el-table-column>
         <el-table-column prop="createTime" label="操作时间" width="200">
           <template
-                    slot-scope="{row}">{{new Date(parseInt(row.createTime)).toLocaleDateString().replace(new RegExp('/',"g"),"-")}}</template>
+                    slot-scope="{row}">{{getData(row.createTime)}}</template>
         </el-table-column>
         <el-table-column prop="remoteAddr" label="IP地址"></el-table-column>
         <el-table-column prop="userAgent" label="浏览器" show-overflow-tooltip></el-table-column>
         <el-table-column prop="osName " label="设备"></el-table-column>
         <el-table-column prop="createBy" label="操作者"></el-table-column>
-        <el-table-column prop="serviceId" label="系统模块" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column prop="serviceId" label="系统模块" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="requestUri" label="日志登记" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="content" label="日志内容"></el-table-column>
+        <el-table-column prop="title" label="日志内容"></el-table-column>
         <el-table-column prop="operateType" label="日志类型"></el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pagination.current"
@@ -110,6 +110,10 @@ export default {
     this.loginCountByDepartmentPage()
   },
   methods: {
+    getData(n) {
+      n = new Date(n)
+      return n.toLocaleDateString().replace(/\//g, "-") + " " + n.toTimeString().substr(0, 8)
+    },
     loginCountByDepartmentPage() {
       let params = JSON.parse(JSON.stringify(this.pagination))
       if (this.form.operateType && this.form.operateType.length > 0) {