冲突

liuyg

2021-11-10 61a386154bb1f5bab87d1e05de92316a53b5d6cf

 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");