From af0aaf0fe19dc69369ee2f7e5ca001c24353a22e Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Wed, 16 Feb 2022 17:22:52 +0800
Subject: [PATCH] 冲突
---
src/views/onSiteInspection/securityStaff.vue | 26 ++++----------------------
1 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/src/views/onSiteInspection/securityStaff.vue b/src/views/onSiteInspection/securityStaff.vue
index 886fe77..2b1fb32 100644
--- a/src/views/onSiteInspection/securityStaff.vue
+++ b/src/views/onSiteInspection/securityStaff.vue
@@ -52,7 +52,7 @@
remove,
} from "@/api/onSiteInspection/securityStaff";
import { mapGetters } from "vuex";
-import { datasing } from "./securityStaffdata";
+import { getToken } from "@/util/auth";
import Qs from "qs";
export default {
@@ -343,30 +343,12 @@
jurisdiction: this.userInfo.jurisdiction,
};
//导出
- // if (
- // this.userInfo.role_name == "保安公司管理员" ||
- // this.userInfo.role_name == "保安"
- // ) {
- // //如果是保安公司管理员
- // data["deptId"] = this.userInfo.dept_id;
- // }
- // if (this.userInfo.role_name == "培训公司管理员") {
- // //如果是培训公司管理员
- // data["trainUnitId"] = this.userInfo.dept_id;
- // }
- // data["examType"] = 2;
//序列号url形式，用&拼接
data = Qs.stringify(data);
- window.open(`/api/seinspect/export-seinspect?` + data);
+ window.open(`/api/seinspect/export-seinspect?${
+ this.website.tokenHeader
+ }=${getToken()}&` + data);
})
- .catch((action) => {
- // this.$message({
- // type: 'info',
- // message: action === 'cancel'
- // ? '放弃保存并离开页面'
- // : '停留在当前页面'
- // })
- });
},
getStartTime() {
if (
--
Gitblit v1.9.3