人员管理 添加 下发通行设备 以及修复了设备中台跳转 骆乐

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);   //新增合同信息

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(){
+    // goDevcenter(){
-      var url = window.location.href;
+    //   window.open('/equipmentCenter.html#/equipmentCenterIndx', "_self");
-      let routeUrl = '';
+    //   var url = window.location.href;
-      // 判断当前页面是不是设备中台
+    //   let routeUrl = '';
-      if (url.indexOf("equipmentCenter.html") != -1) {
+    //   // 判断当前页面是不是设备中台
-        // 南昌项目打开的是/index.html#/ 的页面
+    //   if (url.indexOf("equipmentCenter.html") != -1) {
-        if(COMPANY == 'nanchang') {
+    //     // 南昌项目打开的是/index.html#/ 的页面
-          window.open("/index.html#/equipmentCenterIndx", "_self");
+    //     if(COMPANY == 'nanchang') {
-        }else{
+    //       window.open("/index.html#/equipmentCenterIndx", "_self");
-          window.open("/#/equipmentCenterIndx", "_self");
+    //     }else{
-        }
+    //       window.open("/#/equipmentCenterIndx", "_self");
-      } else {
+    //     }
-        routeUrl = this.$router.resolve({
+    //   } else {
-          path: "/equipmentCenterIndx",
+    //     routeUrl = this.$router.resolve({
-        });
+    //       path: "/equipmentCenterIndx",
-      }
+    //     });
-      window.open(routeUrl.href, "_self");
+    //   }
-      window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ])
+    //   window.open(routeUrl.href, "_self");
-    }
+    //   window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ])
+    // }
   },
 };
 </script>

src/router/index.js

@@ -1293,11 +1293,11 @@ const routes2 = [
         name: 'projectIndex',
         component: () => import('../views/projectAdmin/projectIndex.vue'),
     },
-    {
+    // {
-        path: '/equipmentCenterIndx',
+    //     path: '/equipmentCenterIndx',
-        name: 'equipmentCenterIndx',
+    //     name: 'equipmentCenterIndx',
-        component: () => import('../views/equipmentCenter/equipmentCenterIndex.vue'),
+    //     component: () => import('../views/equipmentCenter/equipmentCenterIndex.vue'),
-    },
+    // },
     {
         path: '/project/panoramicOverview',
         name: 'panoramicView',

src/views/projectAdmin/projectList.vue

@@ -130,7 +130,7 @@
                 >{{$t('message.companyDiagram.goProjectBackEnd')}}</div>
                 <div v-if="$store.state.userInfo.styleType==1"
                   class="operationText"
-                  @click="goToDevCenter(scope.row)"
+                  @click="goDevCenter(scope.row)"
                 >{{$t('message.companyDiagram.goDevCenter')}}</div>
               </template>
             </el-table-column>
@@ -364,14 +364,12 @@ export default {
       sessionStorage.setItem('messageA',this.messageA)
     },
     //去设备中台
-    goToDevCenter(value) {
+    goDevCenter(value) {
-      this.$store.commit("setProjectSn", value.projectSn);
+      console.log('跳跳跳')
-      let routeUrl = this.$router.resolve({
+       this.$store.commit("setProjectSn", value.projectSn);
-              path: '/equipmentCenterIndx'
+          window.open("/equipmentCenter.html#/equipmentCenterIndx", "_self");
-        });
+          window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ])
-      window.open(routeUrl.href, "_self");
+       },
-      window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ]);
-    },
   },
 };
 </script>

src/views/projectFront/laborManage/personModule/administration.vue

@@ -217,7 +217,7 @@
       </div>
       <div class="laborComponent_table_wrap whiteBlock">
         <div class="search_wrap" :class="{ flex: COMPANY != 'nanchang' }">
-          <el-button
+            <el-button
             type="primary"
             size="medium"
             @click="personnelEntry"
@@ -248,6 +248,8 @@
               $t("message.laborMange.bulkImport")
             }}</el-button>
           </el-upload>
+          <el-button size="medium" @click="passEquipment()" type="primary" style="margin-left:15px">下发通行设备</el-button>
+          <br/>
           <el-form
             style="margin-top: 15px"
             :inline="true"
@@ -1708,7 +1710,8 @@ import {
   checkImgLibraryApi,
   batchSendWorkerInfoApi,
   sendWorkerInfoByIdApi,
-  updateByIdWorkerInfo
+  updateByIdWorkerInfo,
+  sendBatchWokerApi
 } from "@/assets/js/api/laborPerson";
 import { selectUserDevAuthorityByUserIdApi } from "@/assets/js/api/configManage";
 import { getProjectConfigListApi } from "@/assets/js/api/project.js";
@@ -1941,6 +1944,18 @@ export default {
         "xmgl/download/exporExcelWorkerTemplate?projectSn=" +
         this.projectSn;
     },
+    // 下发通行设备
+    passEquipment(){
+      sendBatchWokerApi({projectSn: this.projectSn,personType:'2',userId: this.$store.state.userInfo.userId,enterpriseId: this.checkedId}).then((res)=>{
+        // console.log('下发通行设备',res)
+        if(res.code == 200 ){
+          this.$message({
+          message: '操作成功，已在后台下发，请稍后查看！',
+          type: 'success'
+        });
+        }
+      })
+    },
     handleChangeE(file, fileList) {
       // console.log(file)
       this.fileTemp = file.raw;

src/views/projectFront/laborManage/personModule/laborComponent.vue

@@ -240,6 +240,8 @@
               $t("message.laborMange.bulkImport")
             }}</el-button>
           </el-upload>
+           <el-button size="medium" @click="passEquipment()" type="primary" style="margin-left:10px">下发通行设备</el-button>
+           <br/>
           <el-form
             style="margin-top: 15px"
             :inline="true"
@@ -2255,7 +2257,8 @@ import {
   selectHierarchyEnterpriseListApi,
   ufaceDevList,
   checkImgLibraryApi,
-  updateByIdWorkerInfo
+  updateByIdWorkerInfo,
+  sendBatchWokerApi
 } from "@/assets/js/api/laborPerson";
 import {
   selectUserDevAuthorityByUserIdApi,
@@ -2516,6 +2519,18 @@ export default {
         "xmgl/download/exporExcelWorkerTemplate?projectSn=" +
         this.projectSn;
     },
+    // 下发通行设备
+    passEquipment(){
+      sendBatchWokerApi({projectSn: this.projectSn,personType:'1',userId: this.$store.state.userInfo.userId,enterpriseId: this.checkedId}).then((res)=>{
+        // console.log('下发通行设备',res)
+        if(res.code == 200 ){
+          this.$message({
+          message: '操作成功，已在后台下发，请稍后查看！',
+          type: 'success'
+        });
+        }
+      })
+    },
     handleChangeE(file, fileList) {
       // console.log(file)
       this.fileTemp = file.raw;