Merge remote-tracking branch 'origin/czks-地图合并' into czks-cmt-gwj地图合并

src/views/map/dialog/index.vue

@@ -47,6 +47,7 @@
       <breakgroundCfdD v-if="type === 'BREAKGROUND' && corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/>
       <hoistingCfdD v-if="type === 'HOISTING' && corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/>
       <peoplePositionCfdD v-if="type === 'peoplePosition'" :id="id" :type="type" :infoname="infoname"/>
+      <peoplePositionCzks v-if="type === 'peoplePositionCzks' && id === 'f8da1790b1034058ae2efefd69af3284'" :id="id" :type="type" />
       <peoplePositionCmt v-if="type === 'peoplePositionCmt'" :id="id" :type="type" :infoname="infoname"/>
       <carPositionCfdD v-if="type === 'carPosition'" :id="id" :type="type" :infoname="infoname"/>
       <!--曹妃甸东 八项作业 曹实业详细页面 end-->
@@ -95,6 +96,7 @@ import cutroadCfdD from './cutroadCfdD.vue'
 import breakgroundCfdD from './breakgroundCfdD.vue'
 import hoistingCfdD from './hoistingCfdD.vue'
 import peoplePositionCfdD from './peoplePositionCfdD.vue'
+import peoplePositionCzks from './peoplePositionCzks.vue'
 import peoplePositionCmt from './peoplePositionCmt.vue'
 import carPositionCfdD from './carPositionCfdD.vue'
 import peoplePositionOne from './peoplePositionOne.vue'
@@ -135,6 +137,7 @@ export default {
     breakgroundCfdD,
     hoistingCfdD,
     MkGateMachineCfd,
+    peoplePositionCzks,
     peoplePositionCfdD,
     peoplePositionCmt,
     carPositionCfdD,

src/views/map/dialog/peoplePositionCzks.vue

@@ -0,0 +1,80 @@
+<template>
+  <div class="app-container print-work" style="width: 100%">
+    <div class="level-title">
+      <h1>人员信息</h1>
+    </div>
+    <table class="table-ui">
+      <tr>
+        <td class="bbg-transparent">照片</td>
+        <td><img :src="'http://172.16.130.86/gateway-service/fileStatic/'+personPhoto" alt="" width="50" height="50">
+        </td>
+        <td class="bbg-transparent">姓名</td>
+        <td>{{ info ? info.NAME : '' }}</td>
+      </tr>
+      <tr>
+        <td class="bbg-transparent">部门</td>
+        <td>{{ info ? info.DEPARTMENT_NAME : '' }}</td>
+        <td class="bbg-transparent">岗位</td>
+        <td>{{ info ? info.POST_NAME : '' }}</td>
+      </tr>
+      <tr>
+        <td class="bbg-transparent">人员类型</td>
+        <td>{{ info ? info.PERSON_TYPE : '' }}</td>
+        <td class="bbg-transparent">是否为隐患确认人</td>
+        <td>{{ info.IS_HAZARDCONFIRMER == 0 ? '否' : '是' }}</td>
+      </tr>
+    </table>
+  </div>
+</template>
+
+<script>
+import {requestFN} from '@/utils/request'
+
+export default {
+  props: {
+    id: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    type: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    personPhoto: {
+      type: String,
+      default() {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      config: config,
+      info: {}
+    }
+  },
+  created() {
+    console.log('进来了')
+    this.getData()
+  },
+  methods: {
+    getData() {
+      requestFN(
+        '/map/getPersonByCardNo',
+        {
+          CARDNO: this.id
+        }
+      ).then((data) => {
+        this.info = data.pd
+      }).catch(() => {
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+</style>

src/views/map/index.vue

@@ -1393,6 +1393,16 @@ export default {
             id = pick.id.id
             this.bubble(id)
           }
+          if (this.gangkouActive === '00002' && point_type === 'peoplePositionCzks') {
+            const { label, point_type, id, corpInfoId, name, infoname } = pick.id._monitoItems.data
+            this.dialog.visible = true
+            this.dialog.title = label
+            this.dialog.type = point_type
+            this.dialog.id = id
+            this.dialog.name = name
+            this.dialog.infoname = infoname
+            this.dialog.corpInfoId = corpInfoId
+          }
           if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && (point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '3' || point_id.substring(0, 3) === '1_2' || point_id.substring(0, 3) === '2_8')) {
             // if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '5') {
 
@@ -2452,7 +2462,7 @@ export default {
                 ry_drag.getPosition(czksPerLoc[index])
               } else {
                 const perLoc = {
-                  id: item.cardId,
+                  id: item.cardId + '',
                   name: item.realName,
                   idNumber: item.idNumber,
                   x: item.longitude,