Merge branch 'dev' into pet

1. 添加隐患发现时间
2. 在考评过程，查看完隐患详情后点击“返回”，系统直接跳转到隐患列表的首页，缺少页面定位的功能

src/components/KeyProjectHidden/index.vue

@@ -35,6 +35,10 @@
           <td class="tbg">隐患处置</td>
           <td>限期整改</td>
         </tr>
+        <tr>
+          <td class="tbg">发现时间</td>
+          <td>{{ formatDate(pd.CREATTIME,'yyyy-MM-DD HH:mm') }}</td>
+        </tr>
         <tr>
           <td class="tbg">整改期限</td>
           <td>{{ pd.RECTIFICATIONDEADLINE }}</td>
@@ -145,6 +149,7 @@
 import { requestFN } from '@/utils/request'
 import { videoPlayer } from 'vue-video-player'
 import 'video.js/dist/video-js.css'
+import { formatDate } from 'element-ui/src/utils/date-util'
 export default {
   components: { videoPlayer },
   props: {
@@ -184,9 +189,11 @@ export default {
     }
   },
   created() {
+    this.activeName = this.$parent.previousPage
     this.getData()
   },
   methods: {
+    formatDate,
     getData() {
       requestFN(
         '/keyprojectcheck/findHidden',
@@ -206,6 +213,7 @@ export default {
       this.$refs.hdVideoPlayer.player.pause()
     },
     goBack() {
+      this.$parent.previousPage = true
       if (this.activeName) {
         this.$parent.activeName = this.activeName
       } else {

src/views/gatemachine/second/gateDoor/components/edit.vue

@@ -77,14 +77,14 @@ import Pagination from '@/components/Pagination' // 通过 el-pagination二次
 import { requestFN } from '@/utils/request'
 import SelectTree from '@/components/SelectTree'
 import waves from '@/directive/waves'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 
 let viewer = null
 const Cesium = window.Cesium
 Cesium.Ion.defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJkOWQ0MGYwMy0yODUwLTQ1YzktOGM4OC02MTMwY2UyZjNlMzQiLCJpZCI6MTY0NTUwLCJpYXQiOjE2OTM4OTU1Mjd9.1cC0sSzyj79LZv0ILNCcl0Mabw6hl8TNngFNFr7H8f4'
 var subdomains = ['0', '1', '2', '3', '4', '5', '6', '7']
 var tiandituTk = 'e8a16137fd226a62a23cc7ba5c9c78ce'
-const img_h = require('../../../../assets/images/map/h.png')
+const img_h = require('../../../../../assets/images/map/h.png')
 export default {
 
   components: { Pagination, SelectTree, TiandiMap },

src/views/gatemachine/second/gateDoor/components/list.vue

@@ -191,7 +191,8 @@ export default {
       requestFN(
         '/mkmjDoor/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
-          KEYWORDS: this.KEYWORDS
+          KEYWORDS: this.KEYWORDS,
+          AREA_LEVEL: '2'
         }
       ).then((data) => {
         this.listLoading = false

src/views/gatemachine/second/gateDoor/components/videoList.vue

@@ -145,7 +145,7 @@ import Pagination from '@/components/Pagination' // 通过 el-pagination二次
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves'
 import Platformvideo from './platformvideo'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
+import TiandiMap from '../../../../../components/TianMap/TiandiMap'
 
 export default {
   components: { Platformvideo, Pagination, TiandiMap },

src/views/gatemachine/second/index.vue

@@ -0,0 +1,3 @@
+<template>
+  <router-view />
+</template>

src/views/keyproject_evaluation/branch_hazard_assessment/components/evaluation.vue

@@ -335,12 +335,15 @@ export default {
       }
     },
     goBack() {
+      this.$parent.isEvaluationKeepAlive = false
       this.$parent.activeName = 'List'
     },
     fnViewHidden(HIDDEN_ID) {
       // this.visible = true
       // this.HIDDEN_ID = HIDDEN_ID
       this.$parent.HIDDEN_ID = HIDDEN_ID
+      this.$parent.previousPage = this.$parent.activeName
+      this.$parent.isEvaluationKeepAlive = true
       this.$parent.activeName = 'KeyProjectHidden'
     },
     fnEvaluationDialogChangeShow() {

src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue

@@ -126,6 +126,7 @@ export default {
       this.$parent.CORPINFO_ID = CORPINFO_ID
       this.$parent.EVALUATIONCONFIG_ID = EVALUATIONCONFIG_ID
       this.$parent.TYPE = TYPE
+      this.$parent.isEvaluationKeepAlive = true
       this.$parent.activeName = 'Evaluation'
     }
   }

src/views/keyproject_evaluation/branch_hazard_assessment/index.vue

@@ -1,15 +1,19 @@
 <template>
   <div>
-    <List v-show="activeName=='List'"/>
+    <keep-alive>
-    <Evaluation v-if="activeName=='Evaluation'"/>
+      <List v-show="activeName === 'List'"/>
-    <KeyProjectHidden v-if="activeName=='KeyProjectHidden'" active-name="Evaluation"/>
+    </keep-alive>
+    <keep-alive :include="isEvaluationKeepAlive ? 'Evaluation' : ''" :exclude="!isEvaluationKeepAlive ? 'Evaluation' : ''">
+      <Evaluation v-if="activeName === 'Evaluation'"/>
+    </keep-alive>
+    <KeyProjectHidden v-if="activeName === 'KeyProjectHidden'" active-name="Evaluation"/>
   </div>
 </template>
 
+
 <script>
 import List from './components/list'
 import Evaluation from './components/evaluation'
-// import HiddenInfo from './components/hidden_info.vue'
 import KeyProjectHidden from '@/components/KeyProjectHidden/index'
 
 export default {
@@ -24,7 +28,9 @@ export default {
       CORPINFO_ID: '',
       EVALUATIONCONFIG_ID: '',
       HIDDEN_ID: '',
-      TYPE: ''
+      TYPE: '',
+      previousPage: '',
+      isEvaluationKeepAlive: false
     }
   }
 }

src/views/map/components/fengongsi_index.vue

@@ -35,7 +35,7 @@
           <img class="img_bottom" src="../../../assets/map/gangkou_index/img1.png" alt="">
           <div class="label">{{ item.label }}</div>
           <div class="count">
-            <count-to :start-val="0" :end-val="+personPositioningCount[index]" :duration="3600"/>
+            <count-to :start-val="0" :end-val="item.count" :duration="3600"/>
           </div>
         </div>
       </div>
@@ -83,7 +83,6 @@ export default {
       timer: '',
       value: 0,
       riskIdentificationCount: {},
-      personPositioningCount: {},
       doorManagementList: [],
       block1OptionsList: [
         {
@@ -346,15 +345,17 @@ export default {
       })
     },
     getPersonPositioningCount() {
-      // requestFN(
+      requestFN(
-      //   '/map/getPersonPositioningCount',
+        '/map/getPersonPositioningCount',
-      //   {
+        {
-      //     CORPINFO_ID: this.corpInfoId,
+          CORPINFO_ID: this.corpInfoId,
-      //     GANGKOU: this.gangkou
+          GANGKOU: this.gangkou
-      //   }
+        }
-      // ).then((data) => {
+      ).then((data) => {
-      //   this.personPositioningCount = data.personPositioningCount
+        this.block3OptionsList[0].count = data.personPositioningCount[0]
-      // })
+        this.block3OptionsList[1].count = data.personPositioningCount[1]
+        this.block3OptionsList[2].count = data.personPositioningCount[2]
+      })
     }
   }
 }

src/views/map/index.vue

@@ -93,11 +93,11 @@
           :corp-info-id="CORP_INFO_ID"
           :area="area"
           :gangkou="gangkouActive"/>
-        <!--        <renyuan-->
+        <renyuan
-        <!--          v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00002' && gangkouActive !== '00005' && bottomOptionsIndex === 4"-->
+          v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00002' && gangkouActive !== '00005' && bottomOptionsIndex === 4"
-        <!--          :corp-info-id="CORP_INFO_ID"-->
+          :corp-info-id="CORP_INFO_ID"
-        <!--          :area="area"-->
+          :area="area"
-        <!--          :gangkou="gangkouActive"/>-->
+          :gangkou="gangkouActive"/>
         <renyuan-cfd
           v-if="gangkouActive && gangkouActive === '00004' && bottomOptionsIndex === 1"
           :corp-info-id="CORP_INFO_ID"
@@ -147,6 +147,7 @@
           :class="['option','option'+index,{active:centerOptionsIndex === index}]"
           @click="centerOptionsClick(index,item.AREA)"
         >
+          {{ item.label }}
         </div>
       </div>
     </transition>
@@ -1597,7 +1598,7 @@ export default {
           const collection = new Cesium.CustomDataSource('trajectoryEntityCollection')
           collection.entities.add(entity)
           viewer.dataSources.add(collection)
-          trajectoryEntityCollection = collection
+          trajectoryEntityCollection = Object.freeze(collection)
         }
       })
     },
@@ -3000,9 +3001,7 @@ export default {
         const wsUrl = config.noDwSysUrl + '/ltLocation/DW_' + new Date().getTime() + '_98'
         _this.fwebsocket = new WebSocket(encodeURI(wsUrl))
         _this.fwebsocket.onmessage = function(message) {
-          console.info('接收消息')
           const peopleList = JSON.parse(message.data)
-          console.log(peopleList)
           viewer.entities.suspendEvents()
           for (let i = 0; i < peopleList.length; i++) {
             const item = peopleList[i]