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/dispatch/dispatchChildoperable.vue |   72 ++++++++++++++++++++++++------------
 1 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index d858ed2..0d8db0c 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -29,8 +29,9 @@
   update1,
   remove1,
   getDispatcherUnitByDeptId,
+  overDispatcher,
 } from "@/api/dispatch/dispatch";
-import { getListByDeptId } from "@/api/system/user";
+import { update, getListByDeptId } from "@/api/system/user";
 import { mapState } from "vuex";
 
 export default {
@@ -136,7 +137,8 @@
               label: "realName",
               value: "id",
             },
-            dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
+            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
+            dicUrl: `/api/blade-user/page-security-units?status=1&deptId={{key}}`,
             dicData: [],
             rules: [
               {
@@ -155,11 +157,11 @@
             addDisplay: false,
             editDisplay: false,
             // hide: true,
-            props: {
-              label: "realName",
-              value: "id",
-            },
-            dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
+            // props: {
+            //   label: "realName",
+            //   value: "id",
+            // },
+            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
             dicData: [],
             rules: [
               {
@@ -273,15 +275,33 @@
           },
         ],
       },
+      useifid: 266,
     };
   },
   created() {
+    var that = this;
     if (this.userInfo.role_name == "保安公司管理员") {
+      console.log("保安公司管理员登入");
       const deptColumn = this.findObject(this.option1.column, "deptId");
       deptColumn.search = false;
-    }else{
-      const deptColumn = this.findObject(this.option1.column, "dispatcherUnitId");
+      deptColumn.hide = true;
+      this.useifid = this.userInfo.dept_id;
+    } else {
+      const deptColumn = this.findObject(
+        this.option1.column,
+        "dispatcherUnitId"
+      );
       deptColumn.search = false;
+    }
+
+    //公安局进入
+    if (this.userInfo.role_name == "公安管理员") {
+      that.option1.column[1].dicUrl =
+        "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
+        that.userInfo.jurisdiction;
+    } else {
+      that.option1.column[1].dicUrl =
+        "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
     }
   },
   computed: {
@@ -332,7 +352,9 @@
       //   const userColumn = this.findObject(this.option1.column, "userIds");
       //   userColumn.dicUrl = "/api/blade-user/page-security-units?deptId="+this.userInfo.dept_id;
       // }
-
+      if (this.useifid != 266) {
+        form["deptId"] = this.useifid;
+      }
       adddata1(form).then(
         (res) => {
           this.onLoad1(this.page1);
@@ -364,6 +386,9 @@
       //   const userColumn = this.findObject(this.option1.column, "userIds");
       //   userColumn.dicUrl = "/api/blade-user/page-security-units?deptId="+this.userInfo.dept_id;
       // }
+      if (this.useifid != 266) {
+        row["deptId"] = this.useifid;
+      }
       update1(row).then(
         () => {
           this.onLoad1(this.page1);
@@ -380,13 +405,13 @@
       );
     },
     rowDel1(row) {
-      this.$confirm("确定将选择数据删除?", {
+      this.$confirm("确定结束当前派遣?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          return remove1(row.id);
+          return overDispatcher(row);
         })
         .then(() => {
           this.onLoad1(this.page1);
@@ -429,15 +454,6 @@
     },
 
     beforeOpen(done, type) {
-      var that = this;
-      if (["add", "edit", "view"].includes(type)) {
-        if (this.userInfo.role_name == "保安公司管理员") {
-          getListByDeptId(that.userInfo.dept_id).then((res) => {
-            const userColumn = that.findObject(this.option1.column, "userIds");
-            userColumn.dicData = res.data.data;
-          });
-        }
-      }
       this.initFlag = true;
       done();
     },
@@ -465,8 +481,9 @@
     //
     onLoad1(page, params = {}) {
       this.loading1 = true;
-      var that = this;
       var values;
+      //默认查询已派遣的，派遣结束，未派遣的不显示
+      params["dispatch"] = 0;
       const { releaseTimeRange } = this.query1;
       if (releaseTimeRange) {
         values = {
@@ -492,6 +509,13 @@
       } else {
         this.initData(1);
       }
+      if (this.useifid != 266) {
+        values["deptId"] = this.useifid;
+      }
+      //公安局进入
+      if (this.userInfo.role_name == "公安管理员") {
+        params["jurisdiction"] = this.userInfo.jurisdiction;
+      }
 
       getdata1(
         page.currentPage,
@@ -515,7 +539,7 @@
             this.option1.column,
             "dispatcherUnitId"
           );
-          console.log(res.data.data,111);
+          // console.log(res.data.data, 111);
           dispatcherUnitIdColumn.dicData = res.data.data;
         });
       }
@@ -527,7 +551,7 @@
           );
           dispatcherUnitIdColumn.dicData = res.data.data;
         });
-        getListByDeptId(that.userInfo.dept_id).then((res) => {
+        getListByDeptId(that.userInfo.dept_id, 1).then((res) => {
           const userIdsColumn = that.findObject(this.option1.column, "userIds");
           userIdsColumn.dicData = res.data.data;
         });

--
Gitblit v1.9.3