Merge remote-tracking branch 'origin/dev' into dev

src/asyncRouter.js

@@ -47,10 +47,14 @@ router.beforeEach((to, from, next) => {
   } else {
     if (to.path == `/login` || to.path == '/apiBI' || to.path == '/apivideomanager') {
       next()
+    } else {
+      if (to.path == '/map' && to.query.userId) {
+        next()
       } else {
         next(`/login`)
       }
     }
+  }
 })
 
 function formatRoutes(routes, baseUrl) {

src/views/map/dialog/index.vue

@@ -62,8 +62,28 @@
       <carPositionCfdD v-if="type === 'carPosition'" :id="id" :type="type" :infoname="infoname"/>
       <!--曹妃甸东 八项作业 曹实业详细页面 end-->
       <peoplePositionNine v-if="type === 'peoplePositionNine'" :id="id" :type="type" :infoname="infoname"/>
-      <peoplePositionOne v-if="type === 'peoplePositionOne' && !(corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId ==='033549ed3bd648e49c8a65eb4993ec2f' || !corpInfoId)" :id="id" :type="type" />
+      <peoplePositionOne
-      <peoplePositionYGS v-if="type === 'peoplePositionOne' && (corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26' || corpInfoId ==='033549ed3bd648e49c8a65eb4993ec2f' || !corpInfoId)" :id="id" :type="type" :corp-id="corpInfoId" />
+        v-if="type === 'peoplePositionOne' && !(
+          corpInfoId === '035958e685cf4850bc40151c5e0617a6'
+          || corpInfoId === '17973964c87346e7a4a737cf252557d9'
+          || corpInfoId === '97b87eba9f9c49a0a917c1f412016fb1'
+          || corpInfoId === '286dcae730aa43ba82c97a676f9d8ee2'
+          || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26'
+
+        )"
+        :id="id"
+        :type="type" />
+      <peoplePositionYGS
+        v-if="type === 'peoplePositionOne' && (corpInfoId === '035958e685cf4850bc40151c5e0617a6'
+          || corpInfoId === '17973964c87346e7a4a737cf252557d9'
+          || corpInfoId === '97b87eba9f9c49a0a917c1f412016fb1'
+          || corpInfoId === '286dcae730aa43ba82c97a676f9d8ee2'
+          || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26'
+          || corpInfoId === '033549ed3bd648e49c8a65eb4993ec2f'
+        )"
+        :id="id"
+        :type="type"
+        :corp-id="corpInfoId" />
       <!-- 重点工程 start -->
       <outSourceInfo v-if="type === 'PROJECT'" :id="id" :type="type" />
       <outSourceVideoInfo v-if="type === 'VIDEO'" :id="id" :type="type" />

src/views/map/index.vue

@@ -23,7 +23,9 @@
         <!--          @dragAreaEntity="dragAreaEntity"-->
         <!--        />-->
         <info v-if="!gangkouActive"/>
-        <gangkou-index v-if="gangkouActive === '00003' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && !CORP_INFO_ID" :area="area"/>
+        <gangkou-index
+          v-if="gangkouActive === '00003' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && !CORP_INFO_ID"
+          :area="area"/>
         <fengongsi-index
           v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && CORP_INFO_ID"
           :corp-info-id="CORP_INFO_ID"
@@ -308,6 +310,7 @@ import loadMapBoxCzks from './js/mapboxCzks'
 import loadMapBox from './js/mapbox'
 import AnquanCfd from './components/anquanCfd'
 import mqtt from 'mqtt'
+
 let viewer = null
 let drag = null
 let ry_drag = null
@@ -1256,6 +1259,7 @@ export default {
     }
   },
   mounted() {
+    this.initUser()
     this.initMap()
     this.pointBoxCfd = loadMapBoxCfd()
     this.pointBoxCmt = loadCmtMapBox()
@@ -1268,14 +1272,14 @@ export default {
       function S4() {
         return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1)
       }
+
       return S4() + S4() + '-' + S4() + '-' + S4() + '-' + S4() + '-' + S4() + S4() + S4()
     },
     keepalive(token) {
       // 第二套方案
       requestFN(
         '/map/loginOrKeepAlive',
-        {
+        {}
-        }
       ).then((data) => {
 
       })
@@ -1359,6 +1363,23 @@ export default {
     //     })
     //   })
     // },
+    initUser() {
+      const { userId } = this.$route.query
+      if (!userId) return
+      requestFN(
+        '/admin/v2/login',
+        { userId }
+      ).then((res) => {
+        console.log(res)
+        if (res.result !== 'success') {
+          alert('登录失败')
+          window.close()
+        }
+      }).catch((e) => {
+        alert('登录失败')
+        window.close()
+      })
+    },
     initMap() {
       viewer = new Cesium.Viewer('cesiumContainer', {
         // terrainProvider: Cesium.createWorldTerrain()
@@ -1422,6 +1443,13 @@ export default {
       //     }
       //   }
       // }, 1000)
+      const { id, longitude, latitude, CORP_INFO_ID, type } = this.$route.query
+
+      if (type === 'newToOld') {
+        setTimeout(() => {
+          this.clickPort({ id, longitude, latitude, height: 10000, CORP_INFO_ID })
+        }, 1000)
+      }
     },
 
     loadTilesetHandler() {
@@ -1484,7 +1512,19 @@ export default {
             this.bubble(id)
           }
           if (this.gangkouActive === '00002' && point_type === 'peoplePositionCzks') {
-            const { label, point_type, id, corpInfoId, name, infoname, personPhoto, RyDeptName, RyPostName, RyRealName, personTypeName } = pick.id._monitoItems.data
+            const {
+              label,
+              point_type,
+              id,
+              corpInfoId,
+              name,
+              infoname,
+              personPhoto,
+              RyDeptName,
+              RyPostName,
+              RyRealName,
+              personTypeName
+            } = pick.id._monitoItems.data
             this.dialog.visible = true
             this.dialog.title = label
             this.dialog.type = point_type
@@ -1536,7 +1576,17 @@ export default {
             return
           }
           if (point_type.indexOf('标记点') !== -1) {
-            const { label, point_type, data_id, corpInfoId, dialog_width, infoname, code, video_type, name } = pick.id._monitoItems.data
+            const {
+              label,
+              point_type,
+              data_id,
+              corpInfoId,
+              dialog_width,
+              infoname,
+              code,
+              video_type,
+              name
+            } = pick.id._monitoItems.data
             this.dialog.visible = true
             this.dialog.title = label
             this.dialog.name = name
@@ -1937,6 +1987,10 @@ export default {
     handleClickRightTools(index) {
       if (this.rightOptionsList[index].check !== '') this.rightOptionsList[index].check = !this.rightOptionsList[index].check
       if (index === 0) {
+        if (this.$route.query.userId) {
+          window.close()
+          return
+        }
         if (this.gangkouActive === '00004') {
           // if (this.fwebsocket) {
           //   this.fwebsocket.close()
@@ -2247,7 +2301,12 @@ export default {
         }
         if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
           !this.connecting ? this.createConnection(this.CORP_INFO_ID) : this.doSubscribe()
-        } else if (this.gangkouActive === '00003' && (this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' || this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f' || this.CORP_INFO_ID === '') && urlType === 'peoplePosition') {
+        } else if (this.gangkouActive === '00003' && (this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' ||
+          this.CORP_INFO_ID === '17973964c87346e7a4a737cf252557d9' ||
+          this.CORP_INFO_ID === '97b87eba9f9c49a0a917c1f412016fb1' ||
+          this.CORP_INFO_ID === '286dcae730aa43ba82c97a676f9d8ee2' ||
+          this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f' ||
+          this.CORP_INFO_ID === '') && urlType === 'peoplePosition') {
           // websocket实时获取人员定位
           this.initRYDWWebsocket(this.CORP_INFO_ID)
         } else {
@@ -3070,13 +3129,15 @@ export default {
             // console.info(decodedStr)
             if (decodedStr) {
               // const perTrack = JSON.parse(decodedStr)
-              const perTrack = { 'msg': '000', 'data': [
+              const perTrack = {
+                'msg': '000', 'data': [
                   '8905,118.50022313549867,38.92716921306408,-88.96163116878053,0.15,8905,测试工单',
                   '8001,118.5044033058593,38.926660124965956,-88.96163116878053,0.15,8001,张悦',
                   '8002,118.48886198164132,38.916885738277635,-88.96163116878053,0.15,8002,齐津铖',
                   '8003,118.50289308906841,38.92012841170512,-88.96163116878053,0.15,8003,白伟',
                   '8004,118.48820877892216,38.91690951376236,-88.96163116878053,0.15,8004,孙海官'
-              ] }
+                ]
+              }
               if (perTrack.msg === '000' && perTrack.data && perTrack.data.length > 0) {
                 perTrack.data.forEach(item => {
                   const newPos = item.split(',')
@@ -3122,7 +3183,9 @@ export default {
 
       // Convert binary string to character-number array
 
-      var charData = strData.split('').map(function(x) { return x.charCodeAt(0) })
+      var charData = strData.split('').map(function(x) {
+        return x.charCodeAt(0)
+      })
 
       // Turn number array into byte-array
 
@@ -3239,11 +3302,17 @@ export default {
       _this.perLocArr.forEach((item, index) => {
         // 判断是否存在于四色区域内
         const redFiled = []
-        _this.pointBoxCfd.redList.forEach(item => { redFiled.push(...item['position']) })
+        _this.pointBoxCfd.redList.forEach(item => {
+          redFiled.push(...item['position'])
+        })
         const orangeFiled = []
-        _this.pointBoxCfd.orangeList.forEach(item => { orangeFiled.push(...item['position']) })
+        _this.pointBoxCfd.orangeList.forEach(item => {
+          orangeFiled.push(...item['position'])
+        })
         const yellowFiled = []
-        _this.pointBoxCfd.yellowList.forEach(item => { yellowFiled.push(...item['position']) })
+        _this.pointBoxCfd.yellowList.forEach(item => {
+          yellowFiled.push(...item['position'])
+        })
         if (this.redList.indexOf(item.cardNo) > -1) {
           _this.$set(_this.perLocArr[index], 'color', 'red')
         } else if (redFiled !== [] && _this.forEachIsPointInPolygon(_this.pointBoxCfd.redList, item.position.x, item.position.y)) {
@@ -3747,6 +3816,7 @@ export default {
     transform: translateY(0);
   }
 }
+
 .people_trajectory {
   position: absolute;
   top: -60px;
@@ -3754,11 +3824,13 @@ export default {
   width: 400px;
   padding: 10px;
   background-image: linear-gradient(to right, rgb(31 62 129 / 57%) 0%, rgb(17 93 255 / 40%) 50%, rgb(31 62 129 / 57%) 100%);
+
   .search_btn {
     background-color: #1563e3;
     color: #fff;
     border-color: #1563e3;
   }
+
   .reset_btn {
     background-color: #558be5;
     color: #fff;
@@ -3770,26 +3842,32 @@ export default {
 .cesium-viewer-toolbar, .cesium-viewer-fullscreenContainer, .cesium-infoBox-visible {
   display: none !important;
 }
+
 .people_trajectory .el-input__inner {
   background-color: #100693 !important;
   border-color: #100693 !important;
   color: #fff !important;
 }
+
 .people_trajectory_select {
   background-color: #100693 !important;
   border-color: #100693 !important;
 }
+
 .people_trajectory_select .el-select-dropdown__item {
   color: #fff !important;
 }
+
 .people_trajectory_select .el-select-dropdown__item.hover {
   background-color: #2111ec !important;
   color: #fff !important;
 }
+
 .people_trajectory_select .popper__arrow {
   border-top-color: #100693 !important;
   border-bottom-color: #100693 !important;
 }
+
 .people_trajectory_select .popper__arrow::after {
   border-top-color: #100693 !important;
   border-bottom-color: #100693 !important;