From 8c6cf205affbbc8ada74f00a7ca25ebca867e9ed Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 27 Sep 2021 11:44:44 +0800
Subject: [PATCH] 图表颜色

---
 src/views/system/user.vue |   71 ++++++++++++++++++++++++++++-------
 1 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index c3ca953..468169c 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -99,7 +99,7 @@
             <el-tag>{{ row.roleName }}</el-tag>
           </template>
           <template slot-scope="{ row }" slot="deptName">
-            <el-tag>{{ row.deptName }}</el-tag>
+            <el-tag>{{ row.deptName.split(",").join(" ,") }}</el-tag>
           </template>
           <template slot-scope="{ row }" slot="userTypeName">
             <el-tag>{{ row.userTypeName }}</el-tag>
@@ -220,6 +220,7 @@
         callback();
       }
     };
+
     return {
       isguanli: true,
 
@@ -261,19 +262,22 @@
       treeOption: {
         nodeKey: "id",
         lazy: true,
-        treeLoad: function (node, resolve) {
-          const parentId = node.level === 0 ? 0 : node.data.id;
-          getDeptLazyTree(parentId).then((res) => {
-            resolve(
-              res.data.data.map((item) => {
-                return {
-                  ...item,
-                  leaf: !item.hasChildren,
-                };
-              })
-            );
-          });
-        },
+        treeLoad: "", //处理权限  在created中
+        //  function (node, resolve) {
+        //   const parentId = node.level === 0 ? 0 : node.data.id;
+        //   //公安局进入
+
+        //   getDeptLazyTree(parentId, jurisdiction).then((res) => {
+        //     resolve(
+        //       res.data.data.map((item) => {
+        //         return {
+        //           ...item,
+        //           leaf: !item.hasChildren,
+        //         };
+        //       })
+        //     );
+        //   });
+        // },
         addBtn: false,
         menu: false,
         size: "small",
@@ -302,6 +306,7 @@
             label: "登录账号",
             prop: "account",
             search: true,
+            width: 190,
             display: false,
           },
           {
@@ -781,6 +786,39 @@
       this.deptids = null;
       this.sizes = [5, 19];
     }
+
+    //公安局进入
+    var jurisdiction = "";
+    if (this.userInfo.role_name == "公安管理员") {
+      jurisdiction = this.userInfo.jurisdiction;
+      this.treeOption.treeLoad = function (node, resolve) {
+        const parentId = node.level === 0 ? 0 : node.data.id;
+        getDeptLazyTree(parentId, jurisdiction).then((res) => {
+          resolve(
+            res.data.data.map((item) => {
+              return {
+                ...item,
+                leaf: !item.hasChildren,
+              };
+            })
+          );
+        });
+      };
+    } else {
+      this.treeOption.treeLoad = function (node, resolve) {
+        const parentId = node.level === 0 ? 0 : node.data.id;
+        getDeptLazyTree(parentId).then((res) => {
+          resolve(
+            res.data.data.map((item) => {
+              return {
+                ...item,
+                leaf: !item.hasChildren,
+              };
+            })
+          );
+        });
+      };
+    }
   },
   mounted() {
     // 非保安单位模式默认加载管理组数据
@@ -1041,6 +1079,11 @@
     onLoad(page, params = {}) {
       this.loading = true;
       var deptid = this.deptids == null ? this.treeDeptId : this.deptids;
+      //公安局进入
+      if (this.userInfo.role_name == "公安管理员") {
+        params["jurisdiction"] = this.userInfo.jurisdiction;
+      }
+      params['status'] = 1;
       getList(
         page.currentPage,
         page.pageSize,

--
Gitblit v1.9.3