Merge branch 'dev' into limingyu-20240416-一公司动火作业地图

2024-04-25 09:27:59 +08:00 · 2024-04-25 09:27:59 +08:00 · b860054d04
parent 253660e63e a264207157
commit b860054d04
23 changed files with 93 additions and 25 deletions
--- a/src/assets/map/renyuan/ico1.png
+++ b/src/assets/map/renyuan/ico1.png
--- a/src/assets/map/renyuan/ico2.png
+++ b/src/assets/map/renyuan/ico2.png
--- a/src/assets/map/renyuan/ico3.png
+++ b/src/assets/map/renyuan/ico3.png
--- a/src/assets/map/renyuan/ico4.png
+++ b/src/assets/map/renyuan/ico4.png
--- a/src/assets/map/renyuan/ico5.png
+++ b/src/assets/map/renyuan/ico5.png
--- a/src/views/map/components/qixiang.vue
+++ b/src/views/map/components/qixiang.vue
@ -150,7 +150,7 @@ export default {
    // 定时器
    start() {
      console.log('定时器开启')
-      this.timer = setInterval(this.getMeteorologicalinfo, 10000) // 注意: 第一个参数为方法名的时候不要加括号;
+      this.timer = setInterval(this.getMeteorologicalinfo, 90000) // 注意: 第一个参数为方法名的时候不要加括号;
    },
    over() {
      clearInterval(this.timer)
--- a/src/views/map/components/renyuan.vue
+++ b/src/views/map/components/renyuan.vue
@ -1,6 +1,6 @@
 <template>
  <div class="renyuan">
-    <div v-if="false" class="block1">
+    <div class="block1">
      <layout-title title="定位基础信息"/>
      <div class="options">
        <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
@ -10,7 +10,6 @@
          <div class="info">
            <div class="label">{{ item.title }}</div>
            <div class="text">{{ item.count }}</div>
-            <!--            <div class="text"><count-to :start-val="0" :end-val="item.count" :duration="3600"/></div>-->
          </div>
        </div>
      </div>
@ -156,7 +155,13 @@ export default {
          facount: '-'
        }
      ],
-      block4List: []
+      block4List: [],
+      message: {
+        onlineDeviceNum: '',
+        UwbBQ: '',
+        UwbJiZhan: '',
+        tklyr: ''
+      }
    }
  },
  created() {
@ -168,10 +173,37 @@ export default {
    },
    getData() {
      requestFN(
-        '/map/getAlarmList',
+        '/map/getAllDwMessage',
        { corpId: this.corpInfoId }
      ).then((data) => {
-        this.block4List = data.list
+        this.block4List = data.alarmList.list
+        this.block1OptionsList = [
+          {
+            title: '在线设备数',
+            img: require('../../../assets/map/renyuan/ico1.png'),
+            count: data.orthermessage.onlineDeviceNum
+          },
+          {
+            title: '在线人员',
+            img: require('../../../assets/map/renyuan/img1ico1.png'),
+            count: data.orthermessage.infoList.UwbBQ.num
+          },
+          {
+            title: '在线基站数',
+            img: require('../../../assets/map/renyuan/ico3.png'),
+            count: data.orthermessage.infoList.UwbJiZhan.num
+          },
+          {
+            title: '在线摄像头数',
+            img: require('../../../assets/map/renyuan/ico4.png'),
+            count: data.orthermessage.infoList.HKcamera.num
+          },
+          {
+            title: '在线报警设备数',
+            img: require('../../../assets/map/renyuan/ico5.png'),
+            count: data.orthermessage.infoList.tklyr.num
+          }
+        ]
      }).catch((e) => {
        this.$message.error(e)
      })
--- a/src/views/map/dialog/blindboard.vue
+++ b/src/views/map/dialog/blindboard.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container print-work">
+  <div class="app-container print-work" style="width: 100%">
    <div class="level-title">
      <h1>盲板抽堵作业许可证</h1>
      <div class="level-btns">编号:{{ info.CHECK_NO }}</div>
--- a/src/views/map/dialog/confinedspace.vue
+++ b/src/views/map/dialog/confinedspace.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container print-work">
+  <div class="app-container print-work" style="width: 100%">
    <div class="level-title">
      <h1>有限空间作业许可证</h1>
      <div class="level-btns">编号:{{ info.CHECK_NO }}</div>
--- a/src/views/map/dialog/electricity.vue
+++ b/src/views/map/dialog/electricity.vue
@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="width: 100%">
    <div class="level-title">
      <h1>临时用电作业许可证</h1>
    </div>
--- a/src/views/map/dialog/highwork.vue
+++ b/src/views/map/dialog/highwork.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container print-work">
+  <div class="app-container print-work" style="width: 100%">
    <div class="level-title">
      <h1>高处作业许可证</h1>
      <div class="level-btns">编号:{{ info.CHECK_NO }}</div>
--- a/src/views/map/dialog/hoisting.vue
+++ b/src/views/map/dialog/hoisting.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container print-work">
+  <div class="app-container print-work" style="width: 100%">
    <div class="level-title">
      <h1>吊装安全作业证</h1>
      <div class="level-btns">编号:{{ info.NUMBERING }}</div>
--- a/src/views/map/dialog/hotworkFirst.vue
+++ b/src/views/map/dialog/hotworkFirst.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container print-work">
+  <div class="app-container print-work" style="width: 100%">
    <div class="level-title">
      <h1>动火安全作业票</h1>
      <div class="level-btns">编号:{{ pd.CHECK_NO }}</div>
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@ -274,6 +274,7 @@ export default {
  }
  .app-container {
    padding: 0px;
+    width: 100%;
  }
 }
 </style>
--- a/src/views/map/dialog/mkGateMachine.vue
+++ b/src/views/map/dialog/mkGateMachine.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container print-work">
+  <div class="app-container print-work" style="width: 100%">
    <div v-if= "type !== 'CAMERA'" class="level-title">
      <h1>区域名称：{{ info.GATE_AREA_NAME }}</h1>
    </div>
--- a/src/views/map/dialog/outSourceInfo.vue
+++ b/src/views/map/dialog/outSourceInfo.vue
@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="width: 100%">
    <div class="level-title">
      <h1>重点工程详情</h1>
    </div>
--- a/src/views/map/dialog/outSourceVideoInfo.vue
+++ b/src/views/map/dialog/outSourceVideoInfo.vue
@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="width: 100%">
    <div class="level-title">
      <h1>视频信息</h1>
    </div>
--- a/src/views/map/dialog/peoplePositionYGS.vue
+++ b/src/views/map/dialog/peoplePositionYGS.vue
@ -3,7 +3,7 @@
    <div class="level-title">
      <h1>人员信息</h1>
    </div>
-    <table class="table-ui">
+    <table v-if="false" class="table-ui">
      <tr>
        <td class="bbg-transparent">照片</td>
        <td ><img src="../../../assets/map/index/touxiang.png" alt="" width="50" height="50"></td>
@ -29,6 +29,25 @@
        <td>{{ otherInfo?otherInfo.postName:'' }}</td>
      </tr>
    </table>
+    <table class="table-ui">
+      <tr>
+        <td class="bbg-transparent">姓名</td>
+        <td >{{ info?info.userName:'' }}</td>
+      </tr>
+
+      <tr>
+        <td class="bbg-transparent">定位卡号:</td>
+        <td >{{ info?info.id:'' }}</td>
+      </tr>
+      <tr>
+        <td class="bbg-transparent">定位卡电量</td>
+        <td >{{ info?otherInfo.data[3].currentValBody.val:'' }}</td>
+      </tr>
+      <tr>
+        <td class="bbg-transparent">部门</td>
+        <td>{{ info?info.departmentName:'' }}</td>
+      </tr>
+    </table>
  </div>
 </template>

@ -69,14 +88,18 @@ export default {
  methods: {
    getData() {
      requestFN(
-        '/map/getPersonByCardNo',
+        '/map/getLastProp',
        {
          CARDNO: this.id,
          corpId: this.corpId
        }
      ).then((data) => {
-        this.info = data.info.required
-        this.otherInfo = data.otherInfo
+        if (data.code === 9999) {
+          this.$message.success(data.msg)
+        } else {
+          this.info = data.userInfo
+          this.otherInfo = data.statusInfo
+        }
      }).catch((e) => {
      })
    }
--- a/src/views/map/dialog/video_play_bianjieruqin.vue
+++ b/src/views/map/dialog/video_play_bianjieruqin.vue
@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="width: 100%">
    <div class="level-title">
      <h1>摄像头名称：{{ info.NAME }}</h1>
    </div>
--- a/src/views/map/dialog/video_play_plat.vue
+++ b/src/views/map/dialog/video_play_plat.vue
@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="width: 100%">
    <div class="level-title">
      <h1>摄像头名称：{{ info.NAME }}</h1>
    </div>
--- a/src/views/map/dialog/xfControl.vue
+++ b/src/views/map/dialog/xfControl.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container print-work">
+  <div class="app-container print-work" style="width: 100%">

    <!--消防泵房-->
    <div v-if="type === 'xfbf01'">
--- a/src/views/map/dialog/xfPoint.vue
+++ b/src/views/map/dialog/xfPoint.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container print-work">
+  <div class="app-container print-work" style="width: 100%">
    <table class="table-ui">
      <tr>
        <td class="bbg-transparent">消防区域</td>
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@ -652,6 +652,16 @@ export default {
              eliminateAuthorization: []
            }
            // {
+            //   label: '摄像头',
+            //   dialog_width: '1200px',
+            //   check: false,
+            //   type: 'platcamera',
+            //   img: require('../../assets/map/gangkou_index/buttom/ico26.png'),
+            //   checkImg: require('../../assets/map/gangkou_index/buttom/ico26_on.png'),
+            //   containAuthorization: [],
+            //   eliminateAuthorization: []
+            // }
+            // {
            //   label: '车辆定位',
            //   dialog_width: '1200px',
            //   check: false,
@ -1225,7 +1235,7 @@ export default {
          }
          const entity = new Cesium.Entity({
            id: 'trajectory',
-            polyline: { positions, width: 5.0, material: Cesium.Color.RED }
+            polyline: { positions, width: 5.0, material: Cesium.Color.RED , clampToGround:true }
          })
          const collection = new Cesium.CustomDataSource('trajectoryEntityCollection')
          collection.entities.add(entity)
@ -1402,7 +1412,6 @@ export default {
      // eslint-disable-next-line no-unused-vars
      var _this = this
      const collection = new Cesium.CustomDataSource('clickEntityCollection')
-      console.info()
      poin.forEach(item => {
        if (!this.poinEntity.hasOwnProperty(item.id)) {
          const entity = drag.addEntity(item)
@ -1464,6 +1473,9 @@ export default {
                cluster.billboard.show = true
                cluster.billboard.id = cluster.label.id
                cluster.billboard.verticalOrigin = Cesium.VerticalOrigin.BOTTOM
+                cluster.billboard.horizontalOrigin = Cesium.HorizontalOrigin.CENTER
+                cluster.billboard.heightReference = Cesium.HeightReference.CLAMP_TO_GROUND
+                cluster.billboard.disableDepthTestDistance = Number.POSITIVE_INFINITY
                if (clusteredEntities.length >= 100) {
                  cluster.billboard.image = pin100
                } else if (clusteredEntities.length >= 50) {