From 61a386154bb1f5bab87d1e05de92316a53b5d6cf Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 10 Nov 2021 16:49:58 +0800
Subject: [PATCH] 冲突
---
src/views/securityGuard/securityGuard.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 1b3912b..cb9f2c5 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -526,7 +526,7 @@
res: "data",
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/blade-user/import-user?deptId=" + this.deptIds,
+ action: "/api/blade-user/import-security?deptId=" + this.deptIds,
},
{
label: "模板下载",
@@ -1083,7 +1083,7 @@
res: "data",
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/blade-user/import-user",
+ action: "/api/blade-user/import-security",
},
// {
// label: "数据覆盖",
@@ -1176,7 +1176,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}`;
}
},
},
@@ -1951,7 +1951,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