日志修改 和 彻底干掉zt

src/api/banner.js

@@ -43,9 +43,9 @@ export function listRole(query) {
   })
 }
 
-export function queryInAdhibitions() {
-  return request({
-    url: '/authority/system/app/queryInAdhibitions/' + 'zt',
-    method: 'get'
-  })
-}
+// export function queryInAdhibitions() {
+//   return request({
+//     url: '/authority/system/app/queryInAdhibitions/' + 'zt',
+//     method: 'get'
+//   })
+// }

src/api/internal.js

@@ -5,9 +5,9 @@ import request from '@/utils/request'
  * @param params
  * @returns {AxiosPromise}
  */
-export function queryInAdhibitions(params) {
-  return request({
-    url: '/authority/system/app/queryInAdhibitions/' + params.businessId,
-    method: 'get'
-  })
-}
+// export function queryInAdhibitions(params) {
+//   return request({
+//     url: '/authority/system/app/queryInAdhibitions/' + params.businessId,
+//     method: 'get'
+//   })
+// }

src/api/monitor/errorLog.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询异常日志列表
 export function list(query) {
   return request({
-    url: '/authority/monitor/operlog/list',
+    url: '/monitor/operLog/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function list(query) {
 // 删除异常日志
 export function delErrLog(operId) {
   return request({
-    url: '/authority/monitor/operlog/' + operId,
+    url: '/authority/monitor/operLog/' + operId,
     method: 'delete'
   })
 }
@@ -20,7 +20,7 @@ export function delErrLog(operId) {
 // 清空异常日志
 export function cleanErrLog() {
   return request({
-    url: '/authority/monitor/operlog/clean/1',
+    url: '/authority/monitor/operLog/clean/1',
     method: 'delete'
   })
 }
@@ -28,7 +28,7 @@ export function cleanErrLog() {
 // 导出异常日志
 export function exportErrLog(query) {
   return request({
-    url: '/authority/monitor/operlog/export',
+    url: '/authority/monitor/operLog/export',
     method: 'get',
     params: query
   })

src/api/monitor/loginInfo.js

@@ -3,32 +3,32 @@ import request from '@/utils/request'
 // 查询登录日志列表
 export function list(query) {
   return request({
-    url: '/authority/monitor/logininfor/list',
+    url: '/monitor/loginInfo/list',
     method: 'get',
     params: query
   })
 }
 
 // 删除登录日志
-export function delLogininfor(infoId) {
+export function delLogininfo(infoId) {
   return request({
-    url: '/authority/monitor/logininfor/' + infoId,
+    url: '/authority/monitor/logininfo/' + infoId,
     method: 'delete'
   })
 }
 
 // 清空登录日志
-export function cleanLogininfor() {
+export function cleanLogininfo() {
   return request({
-    url: '/authority/monitor/logininfor/clean',
+    url: '/authority/monitor/logininfo/clean',
     method: 'delete'
   })
 }
 
 // 导出登录日志
-export function exportLogininfor(query) {
+export function exportLogininfo(query) {
   return request({
-    url: '/authority/monitor/logininfor/export',
+    url: '/authority/monitor/logininfo/export',
     method: 'get',
     params: query
   })

src/api/monitor/operLog.js

@@ -3,32 +3,32 @@ import request from '@/utils/request'
 // 查询操作日志列表
 export function list(query) {
   return request({
-    url: '/authority/monitor/operlog/list',
+    url: '/monitor/operLog/list',
     method: 'get',
     params: query
   })
 }
 
 // 删除操作日志
-export function delOperlog(operId) {
+export function delOperLog(operId) {
   return request({
-    url: '/authority/monitor/operlog/' + operId,
+    url: '/authority/monitor/operLog/' + operId,
     method: 'delete'
   })
 }
 
 // 清空操作日志
-export function cleanOperlog() {
+export function cleanOperLog() {
   return request({
-    url: '/authority/monitor/operlog/clean/0',
+    url: '/authority/monitor/operLog/clean/0',
     method: 'delete'
   })
 }
 
 // 导出操作日志
-export function exportOperlog(query) {
+export function exportOperLog(query) {
   return request({
-    url: '/authority/monitor/operlog/export',
+    url: '/authority/monitor/operLog/export',
     method: 'get',
     params: query
   })

src/api/system/dict/data.js

@@ -20,7 +20,7 @@ export function getData(dictCode) {
 // 根据字典类型查询字典数据信息
 export function getDicts(dictType) {
   return request({
-    url: '/authority/system/dict/data/type/' + dictType,
+    url: '/system/dict/data/type/' + dictType,
     method: 'get'
   })
 }

src/components/Pagination/index.vue

@@ -5,7 +5,7 @@
       :current-page.sync="currentPage"
       :page-size.sync="pageSize"
       :layout="layout"
-      :page-sizes="pageSizes"
+      :page-sizes="rows"
       :total="total"
       v-bind="$attrs"
       @size-change="handleSizeChange"
@@ -32,7 +32,7 @@ export default {
       type: Number,
       default: 20
     },
-    pageSizes: {
+    rows: {
       type: Array,
       default() {
         return [10, 20, 50, 100]

src/main.js

@@ -66,7 +66,7 @@ Vue.prototype.$parseDate = (value, format) => {
   if (!value || value === '') {
     return '-'
   }
-  return moment(value).format(format || 'YYYY-MM-DD HH:mm')
+  return moment(value).format(format || 'YYYY-MM-DD HH:mm:ss')
 }
 // 如果想要中文版 element-ui，按如下方式声明
 // Vue.use(ElementUI)
@@ -89,5 +89,5 @@ Vue.filter('transformDateByFormat', (value, format) => {
   if (!value || value === '') {
     return '-'
   }
-  return moment(value).format(format || 'YYYY-MM-DD HH:mm')
+  return moment(value).format(format || 'YYYY-MM-DD HH:mm:ss')
 })

src/utils/dictCons.js

+export default {
+  'USER_SEX': 'sys_user_sex', // 用户性别
+  'SHOW_HIDE': 'sys_show_hide', // 菜单状态
+  'NORMAL_DISABLE': 'sys_normal_disable', // 系统开关
+  'OPER_TYPE': 'sys_oper_type', // 操作类型
+  'COMMON_STATUS': 'sys_common_status' // 系统状态
+}

src/views/monitor/errorLog/index.vue

@@ -237,7 +237,7 @@ export default {
         pu: 1,
         ps: 10,
         status: 1,
-        operTime: '',
+        // operTime: '',
         title: undefined,
         operName: undefined
         // businessType: undefined
@@ -245,7 +245,7 @@ export default {
     }
   },
   created() {
-    this.queryParams.operTime = this.$parseDate(new Date(), 'YYYY-MM')
+    // this.queryParams.operTime = this.$parseDate(new Date(), 'YYYY-MM')
     this.getList()
     this.getDicts('sys_oper_type'.toUpperCase()).then(response => {
       this.typeOptions = response.data
@@ -259,9 +259,9 @@ export default {
     getList() {
       this.loading = true
       const query = Object.assign({}, this.queryParams)
-      query.operTime = query.operTime ? this.$parseDate(new Date(query.operTime), 'YYYYMM') : ''
+      // query.operTime = query.operTime ? this.$parseDate(new Date(query.operTime), 'YYYYMM') : ''
       list(query).then(response => {
-        this.list = response.data.sysOperLogs.map(item => {
+        this.list = response.rows.map(item => {
           const title = item.title
           if (title) {
             const temp = title.split('-')
@@ -274,7 +274,7 @@ export default {
           }
           return item
         })
-        this.total = response.data.totals
+        this.total = response.total
         this.loading = false
       }
       )
@@ -337,7 +337,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = Object.assign({}, this.queryParams)
-      queryParams.operTime = queryParams.operTime ? this.$parseDate(new Date(queryParams.operTime), 'YYYYMM') : ''
+      // queryParams.operTime = queryParams.operTime ? this.$parseDate(new Date(queryParams.operTime), 'YYYYMM') : ''
       delete queryParams.pu
       delete queryParams.ps
       queryParams.ids = this.ids.join(',') || null

src/views/monitor/loginInfo/index.vue

 <template>
   <div class="app-container">
-    <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true" label-width="68px">
+    <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true" label-width="68px">
       <!--      <el-form-item label="登录地址" prop="ipaddr">-->
       <!--        <el-input-->
       <!--          v-model="queryParams.ipaddr"-->
@@ -38,36 +38,39 @@
       <!--          />-->
       <!--        </el-select>-->
       <!--      </el-form-item>-->
-      <el-form-item label="登录月份">
+      <el-form-item label="登录时间">
         <el-date-picker
-          v-model="queryParams.loginTime"
+          v-model="dateRange"
           size="small"
           style="width: 240px"
-          type="month"
-          value-format="yyyy-MM"
-          placeholder="请选择月份"
+          type="daterange"
+          range-separator="-"
+          value-format="yyyy-MM-dd"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" @click="handleQuery">查询</el-button>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
       <div style="float: right">
         <el-form-item>
+          <!--          v-hasPermi="['zt:loginlog:delete']"-->
           <el-button
-            v-hasPermi="['zt:loginlog:delete']"
             type="danger"
             size="small"
             :disabled="multiple"
             @click="handleDelete"
           >删除</el-button>
+          <!--          v-hasPermi="['zt:loginlog:clear']"-->
           <el-button
-            v-hasPermi="['zt:loginlog:clear']"
             type="danger"
             size="small"
             @click="handleClean"
           >清空</el-button>
+          <!--          v-hasPermi="['zt:loginlog:export']"-->
           <el-button
-            v-hasPermi="['zt:loginlog:export']"
             type="success"
             size="small"
             @click="handleExport"
@@ -80,39 +83,53 @@
     <div style="padding:10px">
       <div class="mb12 font-small-bold">登录日志列表</div>
       <el-table v-loading="loading" border :data="list" @selection-change="handleSelectionChange">
+<!--        <el-table-column type="selection" width="55" align="center" />-->
+<!--        &lt;!&ndash;      <el-table-column type="index" label="序号" width="50" />&ndash;&gt;-->
+<!--        <el-table-column label="访问编号" width="100" align="center" prop="infoId" show-overflow-tooltip>-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.infoId || '-' }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="用户名称" align="center" prop="userName" show-overflow-tooltip>-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.userName || '-' }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="登录地址" align="center" prop="ipaddr" show-overflow-tooltip>-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.ipaddr || '-' }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="操作信息" align="center" prop="msg" show-overflow-tooltip>-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.msg || '-' }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        &lt;!&ndash;      <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />&ndash;&gt;-->
+<!--        <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />-->
+<!--        &lt;!&ndash;        <el-table-column label="浏览器" align="center" prop="browser" show-overflow-tooltip>&ndash;&gt;-->
+<!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
+<!--        &lt;!&ndash;            {{ scope.row.browser || '-' }}&ndash;&gt;-->
+<!--        &lt;!&ndash;          </template>&ndash;&gt;-->
+<!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
+<!--        &lt;!&ndash;        <el-table-column label="操作系统" align="center" prop="os" show-overflow-tooltip>&ndash;&gt;-->
+<!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
+<!--        &lt;!&ndash;            {{ scope.row.os || '-' }}&ndash;&gt;-->
+<!--        &lt;!&ndash;          </template>&ndash;&gt;-->
+<!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
+<!--        <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />-->
         <el-table-column type="selection" width="55" align="center" />
-        <!--      <el-table-column type="index" label="序号" width="50" />-->
-        <el-table-column label="访问编号" width="100" align="center" prop="infoId" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.infoId || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="用户名称" align="center" prop="userName" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.userName || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作信息" align="center" prop="msg" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.msg || '-' }}
-          </template>
-        </el-table-column>
-        <!--      <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />-->
-        <!--      <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />-->
-        <el-table-column label="浏览器" align="center" prop="browser" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.browser || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作系统" align="center" prop="os" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.os || '-' }}
-          </template>
-        </el-table-column>
-        <!--      <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />-->
+        <el-table-column label="访问编号" align="center" prop="infoId" />
+        <el-table-column label="用户名称" align="center" prop="username" />
+        <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
+        <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="msg" />
         <el-table-column label="登录时间" align="center" prop="loginTime" width="180" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span>{{ scope.row.loginTime | transformDateByFormat('YYYY-MM-DD HH:mm:ss') }}</span>
+            <span>{{ parseTime(scope.row.loginTime) | transformDateByFormat('YYYY-MM-DD HH:mm:ss') }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -120,16 +137,16 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pu"
-      :limit.sync="queryParams.ps"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.rows"
       @pagination="getList"
     />
   </div>
 </template>
 
 <script>
-import { list, delLogininfor, cleanLogininfor, exportLogininfor } from '@/api/monitor/loginInfo'
-
+import { list, delLogininfo, cleanLogininfo, exportLogininfo } from '@/api/monitor/loginInfo'
+import dictCons from '@/utils/dictCons'
 export default {
   name: 'LoginInfo',
   data() {
@@ -140,6 +157,8 @@ export default {
       ids: [],
       // 非多个禁用
       multiple: true,
+      // 显示搜索条件
+      showSearch: true,
       // 总条数
       total: 0,
       // 表格数据
@@ -150,16 +169,16 @@ export default {
       dateRange: '',
       // 查询参数
       queryParams: {
-        pu: 1,
-        ps: 10,
-        loginTime: ''
+        page: 1,
+        rows: 10
+        // loginTime: ''
       }
     }
   },
   created() {
-    this.queryParams.loginTime = this.$parseDate(new Date(), 'YYYY-MM')
+    // this.queryParams.loginTime = this.$parseDate(new Date(), 'YYYY-MM-DD HH:mm:ss')
     this.getList()
-    this.getDicts('sys_common_status'.toUpperCase()).then(response => {
+    this.getDicts(dictCons['COMMON_STATUS']).then(response => {
       this.statusOptions = response.data
     })
   },
@@ -168,10 +187,10 @@ export default {
     getList() {
       this.loading = true
       const query = Object.assign({}, this.queryParams)
-      query.loginTime = query.loginTime ? this.$parseDate(new Date(query.loginTime), 'YYYYMM') : ''
+      // query.loginTime = query.loginTime ? this.$parseDate(new Date(query.loginTime), 'YYYY-MM-DD HH:mm:ss') : ''
       list(query).then(response => {
-        this.list = response.data.logininfors
-        this.total = response.data.totals
+        this.list = response.rows
+        this.total = response.total
         this.loading = false
       })
     },
@@ -181,7 +200,7 @@ export default {
     },
     /** 查询按钮操作 */
     handleQuery() {
-      this.queryParams.pu = 1
+      this.queryParams.page = 1
       this.getList()
     },
     /** 重置按钮操作 */
@@ -202,7 +221,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        return delLogininfor(this.ids)
+        return delLogininfo(this.ids)
       }).then(() => {
         this.getList()
         this.$message.success('删除成功')
@@ -217,7 +236,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        return cleanLogininfor()
+        return cleanLogininfo()
       }).then(() => {
         this.getList()
         this.$message.success('清空成功')
@@ -226,11 +245,11 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = Object.assign({}, this.queryParams)
-      queryParams.loginTime = queryParams.loginTime ? this.$parseDate(new Date(queryParams.loginTime), 'YYYYMM') : ''
-      delete queryParams.pu
-      delete queryParams.ps
+      // queryParams.loginTime = queryParams.loginTime ? this.$parseDate(new Date(queryParams.loginTime), 'YYYY-MM-DD HH:mm:ss') : ''
+      delete queryParams.page
+      delete queryParams.rows
       queryParams.ids = this.ids.join(',') || null
-      exportLogininfor(queryParams).then(response => {
+      exportLogininfo(queryParams).then(response => {
         this.download(response.msg)
       }).catch(function() {})
       // this.$confirm('是否确认导出所有操作日志数据项?', '提示', {
@@ -238,7 +257,7 @@ export default {
       //   cancelButtonText: '取消',
       //   type: 'warning'
       // }).then(function() {
-      //   return exportLogininfor(queryParams)
+      //   return exportLogininfo(queryParams)
       // })
     }
   }

src/views/monitor/operLog/index.vue

@@ -208,7 +208,7 @@
 </template>
 
 <script>
-import { list, delOperlog, cleanOperlog, exportOperlog } from '@/api/monitor/operLog'
+import { list, delOperLog, cleanOperLog, exportOperLog } from '@/api/monitor/operLog'
 
 export default {
   name: 'Operlog',
@@ -237,7 +237,7 @@ export default {
         pu: 1,
         ps: 10,
         status: 0,
-        operTime: '',
+        // operTime: '',
         title: undefined,
         operName: undefined
         // businessType: undefined
@@ -245,7 +245,7 @@ export default {
     }
   },
   created() {
-    this.queryParams.operTime = this.$parseDate(new Date(), 'YYYY-MM')
+    // this.queryParams.operTime = this.$parseDate(new Date(), 'YYYY-MM')
     this.getList()
     this.getDicts('sys_oper_type'.toUpperCase()).then(response => {
       this.typeOptions = response.data
@@ -259,9 +259,9 @@ export default {
     getList() {
       this.loading = true
       const query = Object.assign({}, this.queryParams)
-      query.operTime = query.operTime ? this.$parseDate(new Date(query.operTime), 'YYYYMM') : ''
+      // query.operTime = query.operTime ? this.$parseDate(new Date(query.operTime), 'YYYY-MM-DD HH:mm:ss') : ''
       list(query).then(response => {
-        this.list = response.data.sysOperLogs.map(item => {
+        this.list = response.rows.map(item => {
           const title = item.title
           if (title) {
             const temp = title.split('-')
@@ -274,7 +274,7 @@ export default {
           }
           return item
         })
-        this.total = response.data.totals
+        this.total = response.total
         this.loading = false
       }
       )
@@ -314,7 +314,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        delOperlog(this.ids.join(',')).then(() => {
+        delOperLog(this.ids.join(',')).then(() => {
           this.getList()
           this.$message.success('删除成功')
           this.ids = []
@@ -328,7 +328,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        cleanOperlog().then(() => {
+        cleanOperLog().then(() => {
           this.getList()
           this.$message.success('清空成功')
         }).catch(function() {})
@@ -337,11 +337,11 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = Object.assign({}, this.queryParams)
-      queryParams.operTime = queryParams.operTime ? this.$parseDate(new Date(queryParams.operTime), 'YYYYMM') : ''
+      // queryParams.operTime = queryParams.operTime ? this.$parseDate(new Date(queryParams.operTime), 'YYYY-MM-DD HH:mm:ss') : ''
       delete queryParams.pu
       delete queryParams.ps
       queryParams.ids = this.ids.join(',') || null
-      exportOperlog(queryParams).then(response => {
+      exportOperLog(queryParams).then(response => {
         this.download(response.msg)
       }).catch(function() {})
       // this.$confirm('是否确认导出所有操作日志数据项?', '提示', {
@@ -349,7 +349,7 @@ export default {
       //   cancelButtonText: '取消',
       //   type: 'warning'
       // }).then(() => {
-      //   exportOperlog(queryParams)
+      //   exportOperLog(queryParams)
       // }).catch()
     }
   }