From f1d3b8879ce2cec50bb6d4cbf1a9b78e2b45dc43 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 17:38:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E4=B8=8B=E5=8F=91=E9=80=9A=E8=A1=8C?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=20=20=E4=BB=A5=E5=8F=8A=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86=E8=AE=BE=E5=A4=87=E4=B8=AD=E5=8F=B0=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=20=E9=AA=86=E4=B9=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/api/laborPerson.js | 1 + src/components/account.vue | 45 +++++++++++-------- src/router/index.js | 10 ++--- src/views/projectAdmin/projectList.vue | 16 +++---- .../personModule/administration.vue | 19 +++++++- .../personModule/laborComponent.vue | 17 ++++++- 6 files changed, 72 insertions(+), 36 deletions(-) diff --git a/src/assets/js/api/laborPerson.js b/src/assets/js/api/laborPerson.js index 8ba46a8c..e00329b8 100644 --- a/src/assets/js/api/laborPerson.js +++ b/src/assets/js/api/laborPerson.js @@ -20,6 +20,7 @@ export const updateByIdWorkerInfo = data => put('xmgl/workerInfo/updateById', da export const updateWorkerExit = data => post('xmgl/workerInfo/updateWorkerExit', data); //人员 退场 && 批量 退场 export const updateWorkerTeam = data => post('xmgl/workerInfo/updateWorkerTeam', data); //人员批量移动 export const deleteWorkerInfo = data => post('xmgl/workerInfo/delete', data); //删除 人员 信息 +export const sendBatchWokerApi = data => post('xmgl/ufaceDev/sendBatchWokerDev', data); // 下发通行人员 //详情 export const getWorkerInfoData = data => post('xmgl/workerInfo/viewWorkerInfoDetail', data); //获取 人员 详细所有信息 export const addContractApi = data => post('xmgl/workerContract/add', data); //新增合同信息 diff --git a/src/components/account.vue b/src/components/account.vue index db1a807d..057048b0 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -259,26 +259,33 @@ export default { window.open(routeUrl.href, "_self"); window._paq.push(['trackEvent', '点击', '项目后台','进入项目后台' ]) }, + //去设备中台 + goDevcenter(value) { + this.$store.commit("setProjectSn", value.projectSn); + window.open("/equipmentCenter.html#/equipmentCenterIndx", "_self"); + window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ]) + }, // 去设备中台 - goDevcenter(){ - var url = window.location.href; - let routeUrl = ''; - // 判断当前页面是不是设备中台 - if (url.indexOf("equipmentCenter.html") != -1) { - // 南昌项目打开的是/index.html#/ 的页面 - if(COMPANY == 'nanchang') { - window.open("/index.html#/equipmentCenterIndx", "_self"); - }else{ - window.open("/#/equipmentCenterIndx", "_self"); - } - } else { - routeUrl = this.$router.resolve({ - path: "/equipmentCenterIndx", - }); - } - window.open(routeUrl.href, "_self"); - window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ]) - } + // goDevcenter(){ + // window.open('/equipmentCenter.html#/equipmentCenterIndx', "_self"); + // var url = window.location.href; + // let routeUrl = ''; + // // 判断当前页面是不是设备中台 + // if (url.indexOf("equipmentCenter.html") != -1) { + // // 南昌项目打开的是/index.html#/ 的页面 + // if(COMPANY == 'nanchang') { + // window.open("/index.html#/equipmentCenterIndx", "_self"); + // }else{ + // window.open("/#/equipmentCenterIndx", "_self"); + // } + // } else { + // routeUrl = this.$router.resolve({ + // path: "/equipmentCenterIndx", + // }); + // } + // window.open(routeUrl.href, "_self"); + // window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ]) + // } }, }; diff --git a/src/router/index.js b/src/router/index.js index 4379652e..b20882f8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1293,11 +1293,11 @@ const routes2 = [ name: 'projectIndex', component: () => import('../views/projectAdmin/projectIndex.vue'), }, - { - path: '/equipmentCenterIndx', - name: 'equipmentCenterIndx', - component: () => import('../views/equipmentCenter/equipmentCenterIndex.vue'), - }, + // { + // path: '/equipmentCenterIndx', + // name: 'equipmentCenterIndx', + // component: () => import('../views/equipmentCenter/equipmentCenterIndex.vue'), + // }, { path: '/project/panoramicOverview', name: 'panoramicView', diff --git a/src/views/projectAdmin/projectList.vue b/src/views/projectAdmin/projectList.vue index aa853f5e..ee2cb9ff 100644 --- a/src/views/projectAdmin/projectList.vue +++ b/src/views/projectAdmin/projectList.vue @@ -130,7 +130,7 @@ >{{$t('message.companyDiagram.goProjectBackEnd')}}
{{$t('message.companyDiagram.goDevCenter')}}
@@ -364,14 +364,12 @@ export default { sessionStorage.setItem('messageA',this.messageA) }, //去设备中台 - goToDevCenter(value) { - this.$store.commit("setProjectSn", value.projectSn); - let routeUrl = this.$router.resolve({ - path: '/equipmentCenterIndx' - }); - window.open(routeUrl.href, "_self"); - window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ]); - }, + goDevCenter(value) { + console.log('跳跳跳') + this.$store.commit("setProjectSn", value.projectSn); + window.open("/equipmentCenter.html#/equipmentCenterIndx", "_self"); + window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ]) + }, }, }; diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index c143ea68..27b57616 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -217,7 +217,7 @@
- + 下发通行设备 +
+ 下发通行设备 +