From 27a95d62a5e7980cda97185f5f5e3507ae52a223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com> Date: Thu, 9 Jun 2022 16:46:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=AF=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package-lock.json b/package-lock.json index e0e6f843..8a21e6a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "zhgdyun", "version": "0.1.0", "dependencies": { "axios": "^0.19.2", From f15217316583ab3ace492d1e5e11637ef213027b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com> Date: Thu, 9 Jun 2022 19:40:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epidemicPrevention/visitorsManage.vue | 10 ++++++ .../personModule/administration.vue | 36 +++++++++++++++++-- .../personModule/laborComponent.vue | 28 ++++++++++++++- 3 files changed, 71 insertions(+), 3 deletions(-) diff --git a/src/views/projectFront/epidemicPrevention/visitorsManage.vue b/src/views/projectFront/epidemicPrevention/visitorsManage.vue index 139e12bd..2521feec 100644 --- a/src/views/projectFront/epidemicPrevention/visitorsManage.vue +++ b/src/views/projectFront/epidemicPrevention/visitorsManage.vue @@ -101,6 +101,15 @@ + + + + + + + {{ $t("message.laborMange.aKeyIssued") }} -
+
{ + if(item.actionList){ + item.actionList.forEach((item2)=>{ + if(item2.status==1){ + this.key == 1 ; + } + }) + } + }) + // console.log('key',this.key) if (sessionStorage.getItem("personPage2")) { this.page = JSON.parse(sessionStorage.getItem("personPage2")); } diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue index bf1b8e0f..0fb85434 100644 --- a/src/views/projectFront/laborManage/personModule/laborComponent.vue +++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue @@ -471,7 +471,8 @@ >{{ $t("message.laborMange.aKeyIssued") }}
-
+ +
+ {{ $t("message.laborDev.uploadToGover") }}
@@ -2253,6 +2267,7 @@ export default { data() { return { radio: "", + key:'',//判断是否显示一件下发按钮 COMPANY: COMPANY, isCheckeedData: true, //判断一键下发是否有数据选中 ufaceDevAllList: [], //所有人脸设备 @@ -2430,6 +2445,17 @@ export default { this.projectSn = this.$store.state.projectSn; this.uploadUrl = this.$store.state.UPLOADURL; this.fileUrl = this.$store.state.FILEURL; + let data = JSON.parse(sessionStorage.getItem("vuex")); + // console.log('vuex信息',data) + data.menuList.forEach((item)=>{ + if(item.actionList){ + item.actionList.forEach((item2)=>{ + if(item2.status==1){ + this.key == 1 ; + } + }) + } + }) if (sessionStorage.getItem("personPage")) { this.page = JSON.parse(sessionStorage.getItem("personPage")); }