From c51e0d347ebf6026fcbda5abe262e4076fdce8c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com> Date: Tue, 21 Jun 2022 15:26:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8E=E5=8F=B0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E4=B8=AD=E5=8F=B0=E4=BC=81=E4=B8=9A=E5=89=8D=E5=8F=B0?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=90=8E=E5=8F=B0=E5=88=87=E6=8D=A2=20?= =?UTF-8?q?=E9=AA=86=E4=B9=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 1 + src/components/account.vue | 90 +++++++++++++++----------- src/router/index.js | 6 ++ src/views/projectAdmin/projectList.vue | 14 +--- 4 files changed, 59 insertions(+), 52 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 9090d649..6c39f338 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -30,6 +30,7 @@ function getLang() { } // 环境的切换 if (process.env.NODE_ENV == 'development') { + // axios.defaults.baseURL = 'http://8.142.139.165:7080' // 湖里区 // axios.defaults.baseURL = 'http://124.71.87.250/' // axios.defaults.baseURL = 'http://139.9.66.234:30/' // axios.defaults.baseURL = 'http://14.29.220.211:6023/' diff --git a/src/components/account.vue b/src/components/account.vue index a4176e36..db1a807d 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -25,40 +25,25 @@ 数据中心 --> - + +
- - {{ $t("message.companyDiagram.projectBackEnd") }} -
- - - - +
{{$t('message.companyDiagram.operatingCenter')}} --> 企业后台
- +
+ + {{ $t("message.companyDiagram.projectBackEnd") }} +
+ +
+ + {{ $t("message.companyDiagram.devCenter") }} +
+ + +
{{ $t("message.docManage.fileCenter") }} @@ -108,15 +120,13 @@ export default { data() { return { messageB:'', + msgB:'', seeEquipment: 1, //是否能查看设备中台，0是，1否 }; }, + mounted() { this.seeEquipment = this.$store.state.userInfo.seeEquipment; - this.$EventBus.$on('aMsg',(data)=>{ - this.messageB = data - // console.log('赋值过来的是什么呢',this.messageB) - }) }, methods: { sendMsg2() { @@ -186,7 +196,9 @@ export default { goto4() { window.open("/equipmentCenter.html#/equipmentCenterIndx", "_blank"); }, - + goto5(){ + window.open("/firm/projectManage#/firm/projectManage", "_self"); + }, loginOut() { this.$store.commit("setUserInfo", null); this.$store.commit("setMapBackArr", []); @@ -226,9 +238,9 @@ export default { //去项目后台 goProjectBackstage() { - this.messageB = '1' var url = window.location.href; let routeUrl = ''; + let type = this.$store.state.userInfo.accountType // 判断当前页面是不是设备中台 if (url.indexOf("equipmentCenter.html") != -1) { // 南昌项目打开的是/index.html#/ 的页面 @@ -237,7 +249,9 @@ export default { }else{ window.open("/#/projectList", "_self"); } - } else { + }if( type == 5 || type == 6 || type == 7 ){ + window.open("/index.html#/projectIndex", "_self"); + }else { routeUrl = this.$router.resolve({ path: "/projectList", }); @@ -247,25 +261,23 @@ export default { }, // 去设备中台 goDevcenter(){ - this.messageB = '2' - console.log('改了吗',this.messageB) var url = window.location.href; let routeUrl = ''; // 判断当前页面是不是设备中台 if (url.indexOf("equipmentCenter.html") != -1) { // 南昌项目打开的是/index.html#/ 的页面 if(COMPANY == 'nanchang') { - window.open("/index.html#/projectList", "_self"); + window.open("/index.html#/equipmentCenterIndx", "_self"); }else{ - window.open("/#/projectList", "_self"); + window.open("/#/equipmentCenterIndx", "_self"); } } else { routeUrl = this.$router.resolve({ - path: "/projectList", + path: "/equipmentCenterIndx", }); } window.open(routeUrl.href, "_self"); - window._paq.push(['trackEvent', '点击', '项目后台','进入项目后台' ]) + window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ]) } }, }; diff --git a/src/router/index.js b/src/router/index.js index b423f3b0..4379652e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -379,6 +379,12 @@ const routes2 = [ name: '核酸超时人员列表', component: () => import('@/views/projectFront/nucleicAcidOvertimePersonnel/index.vue'), }, + // 劳务管理--访客管理 + { + path: '/project/labor/visitorsManage', + name: '劳务管理_访客管理', + component: () => import('@/views/projectFront/laborManage/visitorsManage.vue'), + }, //人员定位--卡片管理 { path: '/project/personnelPosition/cardManage', diff --git a/src/views/projectAdmin/projectList.vue b/src/views/projectAdmin/projectList.vue index 1931592a..aa853f5e 100644 --- a/src/views/projectAdmin/projectList.vue +++ b/src/views/projectAdmin/projectList.vue @@ -165,8 +165,6 @@ export default { components: { vhead }, data() { return { - messageA: '1', //进入后台判断条件 - msg:'1', userInfo: "", searchForm: { firstCompanyId: "", @@ -363,16 +361,9 @@ export default { }); window.open(routeUrl.href, "_self"); window._paq.push(['trackEvent', '点击', '项目后台','进入项目后台' ]) - //给一个判断条件 - this.$EventBus.$emit('aMsg',this.messageA) - // console.log('点击操作中项目传入为1',this.messageA) + sessionStorage.setItem('messageA',this.messageA) }, //去设备中台 - // goToDevCenter(value) { - // this.$store.commit("setProjectSn", value.projectSn); - // window.open("/equipmentCenter.html#/equipmentCenterIndx", "_self"); - // window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ]); - // }, goToDevCenter(value) { this.$store.commit("setProjectSn", value.projectSn); let routeUrl = this.$router.resolve({ @@ -380,9 +371,6 @@ export default { }); window.open(routeUrl.href, "_self"); window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ]); - this.messageA = '2' - this.$EventBus.$emit('aMsg',this.messageA) - // console.log('点击操作中项目传入为2',this.messageA) }, }, };