Merge branch 'master' of http://47.111.81.118:3000/yuanMM/ele-usky-admin

src/api/statisManage/operLog.js

@@ -0,0 +1,58 @@
+import request from '@/utils/request'
+
+//单位配置-查询
+export function getOperLogList(params) {
+    return request({
+        url: '/sysOperLog/getOperLogList',
+        method: 'GET',
+        params,
+    })
+}
+
+//单位配置-注销
+export function plannedOutageDel(params) {
+    return request({
+        url: '/wcBlackoutPlan/plannedOutageDel',
+        method: 'GET',
+        params,
+    })
+}
+
+//单位配置-新增
+export function addTenantData(params) {
+    return request({
+        url: '/tenantConfig/addTenantData',
+        method: 'POST',
+        data: params,
+    })
+}
+
+//单位配置-系统平台下拉
+export function getPlatformBoxList(params) {
+    return request({
+        url: '/tenantConfig/getPlatformBoxList',
+        method: 'GET',
+        params,
+    })
+}
+
+
+
+//单位配置-修改
+export function updateTenantData(params) {
+    return request({
+        url: '/tenantConfig/updateTenantData',
+        method: 'POST',
+        data: params,
+    })
+}
+
+
+//单位配置-导出
+export function outagePlanListExport(params) {
+    return request({
+        url: 'wcBlackoutPlan/outagePlanListExport',
+        method: 'GET',
+        params,
+    })
+}

src/views/statisManage/operLog/index.vue

@@ -39,15 +39,15 @@
         <div class="filter-item">
           系统模块：
           <el-input
-            v-model="tenantName"
+            v-model="title"
             placeholder="请输入"
             style="width: 150px"
           ></el-input>
         </div>
         <div class="filter-item">
-          操作人员/账号：
+          操作账号：
           <el-input
-            v-model="tenantManager"
+            v-model="operName"
             placeholder="请输入"
             style="width: 150px"
           ></el-input>
@@ -55,13 +55,16 @@
         <div class="filter-item">
           操作类别:
           <el-select
-            v-model="tenantType"
+            v-model="businessType"
             placeholder="请选择"
             style="width: 150px"
             clearable
           >
-            <el-option label="类别1" :value="0"></el-option>
-            <el-option label="类别2" :value="1"></el-option>
+            <el-option label="其他" :value="0"></el-option>
+            <el-option label="新增" :value="1"></el-option>
+             <el-option label="修改" :value="2"></el-option>
+            <el-option label="删除" :value="3"></el-option>
+            
           </el-select>
         </div>
         <div class="filter-item">
@@ -73,7 +76,7 @@
             clearable
           >
             <el-option label="正常" :value="0"></el-option>
-            <el-option label="停用" :value="1"></el-option>
+            <el-option label="异常" :value="1"></el-option>
           </el-select>
         </div>
 
@@ -112,83 +115,86 @@
     >
       <!-- <el-table-column type="index" label="序号" width="50px"></el-table-column> -->
       <el-table-column
-        prop="tenantName"
+        prop="operId"
         label="日志编号"
-        min-width="140px"
       ></el-table-column>
       <el-table-column
-        prop="tenantManager"
+        prop="title"
         label="系统模块"
         min-width="100px"
       ></el-table-column>
+
       <el-table-column
-        prop="phoneNumber"
+        prop="businessType"
         label="操作类型"
-        min-width="125px"
-      ></el-table-column>
+        min-width="110px"
+      >
+      <template #default="scope">
+          <span>
+            {{
+              scope.row.status === '0'
+                ? '其他'
+                : '1'
+                ? '新增'
+                : '2'
+                ? '修改'
+                : '删除'
+            }}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column
-        prop="geoPosition"
+        prop="requestMethod"
         label="请求方式"
-        min-width="160px"
       ></el-table-column>
       <el-table-column
-        prop="platformName"
+        prop="nickName"
         label="操作人员"
-        min-width="140px"
       ></el-table-column>
-      <el-table-column prop="tenantType" label="操作账号" min-width="150px">
-       
-      </el-table-column>
       <el-table-column
-        prop="tenantTerm"
+        prop="operName"
+        label="操作账号"
+      ></el-table-column>
+      <el-table-column
+        prop="operIp"
         label="操作地址"
-        min-width="110px"
-      >
-      </el-table-column>
+        min-width="140px"
+      ></el-table-column>
       <el-table-column
-        prop="tenantTerm"
+        prop="operLocation"
         label="操作地点"
         min-width="110px"
-      >
-      </el-table-column>
-      
-     
-
-      
-      
+      ></el-table-column>
 
-       <el-table-column prop="status" label="操作状态" width="">
+      <el-table-column prop="status" label="操作状态" width="">
         <template #default="scope">
           <span
             :style="{
               color: scope.row.status == '0' ? '#8DCF6E' : '#FF747B',
             }"
           >
-            {{ scope.row.status === '0' ? '正常' : '停用' }}
+            {{ scope.row.status === '0' ? '正常' : '异常' }}
           </span>
         </template>
       </el-table-column>
 
       <el-table-column
-        prop="tenantTerm"
+        prop="title"
         label="操作业务"
-        min-width="110px"
-      >
-      </el-table-column>
+        min-width="100px"
+      ></el-table-column>
 
       <el-table-column
-        prop="tenantTerm"
+        prop="operIp"
         label="IP"
-        min-width="110px"
-      >
-      </el-table-column>
+        min-width="140px"
+      ></el-table-column>
       <el-table-column
-        prop="tenantTerm"
+        prop="operTime"
         label="操作日期"
-        min-width="110px"
-      >
-      </el-table-column>
-      
+        min-width="160px"
+      ></el-table-column>
+
       <el-table-column fixed="right" label="操作" width="80">
         <template #default="scope">
           <el-button
@@ -198,7 +204,6 @@
           >
             详情
           </el-button>
-          
         </template>
       </el-table-column>
     </el-table>
@@ -235,7 +240,7 @@
 import { useStore } from 'vuex'
 import { defineComponent, onMounted, ref } from 'vue'
 import DialogComponent from './dialogComponent'
-import * as api from '@/api/tenantManage/tenantUnit.js'
+import * as api from '@/api/statisManage/operLog.js'
 import { ElMessage } from 'element-plus'
 
 export default defineComponent({
@@ -255,9 +260,10 @@ export default defineComponent({
     const total = ref(0)
 
     const status = ref(0)
-    const tenantType = ref('')
-    const tenantName = ref('')
-    const tenantManager = ref('')
+    const title = ref('')
+    const operName = ref('')
+    const businessType = ref('')
+
 
     const dateTime = ref('')
     const select = ref(1)
@@ -268,17 +274,17 @@ export default defineComponent({
     // 添加操作
     const addItem = () => {
       tableItem.value = {
-        tenantName: '',
-        tenantManager: '',
+        // tenantName: '',
+        // tenantManager: '',
         tenantTerm: 3,
         geoPosition: '',
-        tenantType: '',
+        // tenantType: '',
         phoneNumber: '',
         systemName: '',
         email: '',
         address: '',
-        status:0,
-        domain:''
+        status: 0,
+        domain: '',
       }
       dialogTitle.value = '新增'
       showDialog.value = true
@@ -287,11 +293,11 @@ export default defineComponent({
     const editRow = (row) => {
       console.log(row)
       tableItem.value = {
-        id:row.id,
+        id: row.id,
         tenantName: row.tenantName,
         tenantManager: row.tenantManager,
-        tenantTerm: row.tenantTerm=='永久有效'?3:4,
-        value1:row.tenantTerm,
+        tenantTerm: row.tenantTerm == '永久有效' ? 3 : 4,
+        value1: row.tenantTerm,
         status: Number(row.status),
         geoPosition: row.geoPosition,
         tenantType: Number(row.tenantType),
@@ -299,8 +305,8 @@ export default defineComponent({
         systemName: Number(row.systemName),
         email: row.email,
         address: row.address,
-        remark:row.remark,
-        domain:row.domain
+        remark: row.remark,
+        domain: row.domain,
       }
       dialogTitle.value = '操作日志详情'
       showDialog.value = true
@@ -341,15 +347,19 @@ export default defineComponent({
       store.commit('TimeAll_function', dateTime.value)
       const time = store.state.Time_Data
       api
-        .getTenantData({
+        .getOperLogList({
           size: pageSize.value,
           page: currentPage.value,
           startTime: time[0] ? time[0] : '',
           endTime: time[1] ? time[1] : '',
           status: status.value,
-          tenantType: tenantType.value,
-          tenantName: tenantName.value,
-          tenantManager: tenantManager.value,
+          title: title.value,
+          operName: operName.value,
+          businessType: businessType.value,
+
+          
+
+ 
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
@@ -446,11 +456,11 @@ export default defineComponent({
       handleSizeChange,
       handleCurrentChange,
 
-      tenantType,
       tableData,
-      tenantName,
-      tenantManager,
       status,
+      operName,
+      businessType ,
+      title,
 
       showDialog,
       select,