From 0c79d1a6191c0ac755a5c7a54491f814ee43b58f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 25 三月 2022 11:13:36 +0800
Subject: [PATCH] fix 修正 用户行为监听 日志编写错误问题

---
 ruoyi-ui/src/views/system/role/index.vue |   38 ++++++++++++++++----------------------
 1 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index 2ad1cdb..a120245 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -1,12 +1,11 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="瑙掕壊鍚嶇О" prop="roleName">
         <el-input
           v-model="queryParams.roleName"
           placeholder="璇疯緭鍏ヨ鑹插悕绉�"
           clearable
-          size="small"
           style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
@@ -16,7 +15,6 @@
           v-model="queryParams.roleKey"
           placeholder="璇疯緭鍏ユ潈闄愬瓧绗�"
           clearable
-          size="small"
           style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
@@ -26,7 +24,6 @@
           v-model="queryParams.status"
           placeholder="瑙掕壊鐘舵��"
           clearable
-          size="small"
           style="width: 240px"
         >
           <el-option
@@ -40,7 +37,6 @@
       <el-form-item label="鍒涘缓鏃堕棿">
         <el-date-picker
           v-model="dateRange"
-          size="small"
           style="width: 240px"
           value-format="yyyy-MM-dd"
           type="daterange"
@@ -94,7 +90,6 @@
           plain
           icon="el-icon-download"
           size="mini"
-          :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['system:role:export']"
         >瀵煎嚭</el-button>
@@ -192,15 +187,15 @@
         <el-form-item label="鑿滃崟鏉冮檺">
           <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">灞曞紑/鎶樺彔</el-checkbox>
           <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">鍏ㄩ��/鍏ㄤ笉閫�</el-checkbox>
-          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">鐖跺瓙鑱斿姩</el-checkbox>
+          <el-checkbox v-model="form.menuCheckStrictly == 1" @change="handleCheckedTreeConnect($event, 'menu')">鐖跺瓙鑱斿姩</el-checkbox>
           <el-tree
             class="tree-border"
             :data="menuOptions"
             show-checkbox
             ref="menu"
             node-key="id"
-            :check-strictly="!form.menuCheckStrictly"
-            empty-text="鍔犺浇涓紝璇风◢鍚�"
+            :check-strictly="!form.menuCheckStrictly == 1"
+            empty-text="鍔犺浇涓紝璇风◢鍊�"
             :props="defaultProps"
           ></el-tree>
         </el-form-item>
@@ -236,7 +231,7 @@
         <el-form-item label="鏁版嵁鏉冮檺" v-show="form.dataScope == 2">
           <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">灞曞紑/鎶樺彔</el-checkbox>
           <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">鍏ㄩ��/鍏ㄤ笉閫�</el-checkbox>
-          <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">鐖跺瓙鑱斿姩</el-checkbox>
+          <el-checkbox v-model="form.deptCheckStrictly == 1" @change="handleCheckedTreeConnect($event, 'dept')">鐖跺瓙鑱斿姩</el-checkbox>
           <el-tree
             class="tree-border"
             :data="deptOptions"
@@ -244,8 +239,8 @@
             default-expand-all
             ref="dept"
             node-key="id"
-            :check-strictly="!form.deptCheckStrictly"
-            empty-text="鍔犺浇涓紝璇风◢鍚�"
+            :check-strictly="!form.deptCheckStrictly == 1"
+            empty-text="鍔犺浇涓紝璇风◢鍊�"
             :props="defaultProps"
           ></el-tree>
         </el-form-item>
@@ -270,8 +265,6 @@
     return {
       // 閬僵灞�
       loading: true,
-      // 瀵煎嚭閬僵灞�
-      exportLoading: false,
       // 閫変腑鏁扮粍
       ids: [],
       // 闈炲崟涓鐢�
@@ -358,8 +351,7 @@
     /** 鏌ヨ瑙掕壊鍒楄〃 */
     getList() {
       this.loading = true;
-      listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
-        response => {
+      listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
           this.roleList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -448,8 +440,8 @@
         status: "0",
         menuIds: [],
         deptIds: [],
-        menuCheckStrictly: true,
-        deptCheckStrictly: true,
+        menuCheckStrictly: 1,
+        deptCheckStrictly: 1,
         remark: undefined
       };
       this.resetForm("form");
@@ -509,9 +501,9 @@
     // 鏍戞潈闄愶紙鐖跺瓙鑱斿姩锛�
     handleCheckedTreeConnect(value, type) {
       if (type == 'menu') {
-        this.form.menuCheckStrictly = value ? true: false;
+        this.form.menuCheckStrictly = value ? 1: 0;
       } else if (type == 'dept') {
-        this.form.deptCheckStrictly = value ? true: false;
+        this.form.deptCheckStrictly = value ? 1: 0;
       }
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -613,8 +605,10 @@
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
-      this.downLoadExcel('/system/role/export', this.queryParams);
+      this.download('system/role/export', {
+        ...this.queryParams
+      }, `role_${new Date().getTime()}.xlsx`)
     }
   }
 };
-</script>
\ No newline at end of file
+</script>

--
Gitblit v1.9.3