Merge remote-tracking branch 'origin/main'

src/api/system/log.js

@@ -30,7 +30,7 @@ export function getSysLogs(data) {
 //备份系统日志列表
 export function downloadSysLogs(data) {
   return request({
-    url: '/sys/sysLog/downloadSysLogs',
+    url: '/system/sys/sysLog/downloadSysLogs',
     method: 'get',
     params: data,
     responseType: 'blob'

src/utils/configure.js

@@ -21,9 +21,9 @@ export function generateUUID() {
   });
 }
 
-// 使用示例
-const uuid = generateUUID();
-console.log(uuid);
+// // 使用示例
+// const uuid = generateUUID();
+// console.log(uuid);
 module.exports = {
   SM_CONFIG,
   AES_CONFIG,

src/views/system/log/abnormalLog/index.vue

@@ -39,9 +39,9 @@
       <el-button style="margin-left: 20px" class="filter-item"  @click="resetFilter">
         重置
       </el-button>
-      <!-- <el-button @click="handleBackups" class="filter-item" style="margin-left: 20px" type="warning">
+      <el-button @click="handleBackups" class="filter-item" style="margin-left: 20px" type="warning">
         备份
-      </el-button> -->
+      </el-button>
     </div>
 
     <el-table

src/views/system/log/businessLog/index.vue

@@ -42,9 +42,9 @@
         <el-button style="margin-left: 20px" class="filter-item"  @click="resetFilter">
           重置
         </el-button>
-       <!-- <el-button @click="handleBackups" class="filter-item" style="margin-left: 20px" type="warning">
+       <el-button @click="handleBackups" class="filter-item" style="margin-left: 20px" type="warning">
           备份
-        </el-button> -->
+        </el-button>
       </div>
 
       <el-table

src/views/system/log/logAnalyse/index.vue

@@ -14,6 +14,7 @@
         <el-radio-group v-model="listQuery.type" class="toptype">
             <el-radio label="1">日志类型</el-radio>
             <el-radio label="2">操作类型</el-radio>
+            <el-radio label="3">操作人</el-radio>
         </el-radio-group>
         <el-button style="margin-left: 20px" class="filter-item" type="primary" @click="handleFilter">
           查询

src/views/system/log/systemLog/index.vue

@@ -42,9 +42,9 @@
       <el-button style="margin-left: 20px" class="filter-item"  @click="resetFilter">
         重置
       </el-button>
-      <!-- <el-button @click="handleBackups" class="filter-item" style="margin-left: 20px" type="warning">
+      <el-button @click="handleBackups" class="filter-item" style="margin-left: 20px" type="warning">
         备份
-      </el-button> -->
+      </el-button>
     </div>
 
     <el-table
@@ -125,7 +125,7 @@ export default {
       listLoading: false,
       tableHeight: 650,
       operateList: operateList,
-      timeList:[{id:1,name:'时间'},{id:2,name:'操作人'},{id:3,name:'操作模块'},{id:4,name:'ip'},],
+      timeList:[{id:1,name:'时间'},{id:2,name:'操作人'},{id:3,name:'操作模块'},{id:4,name:'ip'},{id:5,name:'操作类型'},],
       sortList:[{id:1,name:'倒序'},{id:2,name:'升序'}],
       listQuery: {
         pageNum: 1,