From 182aeb6452ac95348047304d419c2b399a4c91fc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 09 Nov 2021 17:03:34 +0800
Subject: [PATCH] 保安员导入接口更换

---
 src/views/securityGuard/securityGuard.vue    |    6 +++---
 src/views/dispatch/dispatchChildoperable.vue |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index f0bad49..8e368a6 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -386,7 +386,7 @@
       done();
     },
     searchReset1() {
-      this.query = {};
+      this.query1 = {};
       this.onLoad1(this.page1);
     },
     rowUpdate1(row, index, done, loading) {
@@ -506,13 +506,13 @@
           ...params,
           beginTime: releaseTimeRange[0],
           overTime: releaseTimeRange[1],
-          ...this.query,
+          ...this.query1,
         };
         values.releaseTimeRange = null;
       } else {
         values = {
           ...params,
-          ...this.query,
+          ...this.query1,
         };
       }
 
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index e5a99d1..57703fc 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -984,7 +984,7 @@
                             res: "data",
                         },
                         tip: "请上传 .xls,.xlsx 标准格式文件",
-                        action: "/api/blade-user/import-user",
+                        action: "/api/blade-user/import-security",
                     },
                     // {
                     //   label: "数据覆盖",
@@ -1034,7 +1034,7 @@
         "excelForm.isCovered" () {
             if (this.excelForm.isCovered !== "") {
                 const column = this.findObject(this.excelOption.column, "excelFile");
-                column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
+                column.action = `/api/blade-user/import-security?isCovered=${this.excelForm.isCovered}`;
             }
         },
     },
@@ -1592,7 +1592,7 @@
                             "excelFile"
                         );
                         importColumn.action =
-                            "/api/blade-user/import-user?deptId=" + this.deptIds;
+                            "/api/blade-user/import-security?deptId=" + this.deptIds;
                     } else if (roleAlias == "公安管理员") {
                         params["jurisdiction"] = that.userInfo.jurisdiction;
                         var columnDept = that.findObject(that.option.column, "deptId");

--
Gitblit v1.9.3