From 01edc5f76607ce4f35aba5e15e7d87771e0e6b77 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 10 Apr 2024 10:42:12 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classMessage/classMessage/components/initClass.vue   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/classMessage/classMessage/components/initClass.vue b/src/views/classMessage/classMessage/components/initClass.vue
index c678474..0174b31 100644
--- a/src/views/classMessage/classMessage/components/initClass.vue
+++ b/src/views/classMessage/classMessage/components/initClass.vue
@@ -232,7 +232,6 @@ export default {
         placeList: [],
         trainingTypeList: [],
         classSizeList: [
-          { DICTIONARIES_ID: '1' },
           { DICTIONARIES_ID: '30' },
           { DICTIONARIES_ID: '50' },
           { DICTIONARIES_ID: '60' },
@@ -370,7 +369,13 @@ export default {
       return row.USER_ID
     },
     getPeopleList() {
-      requestFN('/classMessage/getPeopleList', { BELONG_TO_CORP: this.util.BELONG_TO_CORP }).then((data) => {
+      let pageSize = 10
+      if (!this.form.CLASS_SIZE || this.form.CLASS_SIZE === 0) {
+        pageSize = 10
+      } else {
+        pageSize = this.form.CLASS_SIZE
+      }
+      requestFN('/classMessage/getPeopleList?showCount=' + pageSize + '&currentPage=1', { BELONG_TO_CORP: this.util.BELONG_TO_CORP }).then((data) => {
         this.peopleList = data.varList
         this.loading = false
       }).catch((e) => {

From 6dbd709ab0a0f17f1b27790971be864f64bca606 Mon Sep 17 00:00:00 2001
From: LiuJiaNan <liujianan@zcloudchina.com>
Date: Tue, 16 Apr 2024 11:51:53 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=BD=A8=E8=BF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/index.vue | 53 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 51 insertions(+), 2 deletions(-)

diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 86b2360..f36f9c3 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -1116,6 +1116,7 @@ export default {
       },
       subscription: {
         // '+'是通配符
+        // topic: '+/+/+/alarm',
         topic: '+/UwbBQ/+/prop',
         qos: 0
       },
@@ -1143,7 +1144,8 @@ export default {
         vmport: '7010',
         linkPort: '8093',
         VIIDPort: '8088'
-      }
+      },
+      trajectoryEntityCollection: {}
     }
   },
   mounted() {
@@ -1466,6 +1468,50 @@ export default {
         }
         // var cartesian = this.getCatesian3FromPX(movement.position)
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
+      this.handler.setInputAction(movement => {
+        const pick = viewer.scene.pick(movement.position)
+        if (Cesium.defined(pick) && (pick.id.id)) {
+          if (!pick.id._monitoItems) {
+            this.removeTrajectory()
+            return
+          }
+          const point_type = pick.id._monitoItems.data.point_type
+          const point_id = pick.id._monitoItems.data.id
+          const corpInfoId = pick.id._monitoItems.data.corpInfoId
+          if (point_type === '标记点peoplePositionOne') {
+            this.addTrajectory(point_id, corpInfoId)
+          }
+        } else {
+          this.removeTrajectory()
+        }
+      }, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+    },
+    addTrajectory(point_id, corpInfoId) {
+      requestFN(
+        '/map/getPersonTrace',
+        {
+          id: point_id,
+          corpId: corpInfoId
+        }
+      ).then((data) => {
+        console.log(data.list)
+        const positions = []
+        for (let i = 0; i < data.list.length; i++) {
+          positions.push(Cesium.Cartesian3.fromDegrees(data.list[i].XAxis, data.list[i].YAxis))
+        }
+        const entity = new Cesium.Entity({
+          id: 'trajectory',
+          polyline: { positions, width: 5.0, material: Cesium.Color.RED }
+        })
+        const collection = new Cesium.CustomDataSource('trajectoryEntityCollection')
+        collection.entities.add(entity)
+        viewer.dataSources.add(collection)
+        this.trajectoryEntityCollection = collection
+      })
+    },
+    removeTrajectory() {
+      viewer.dataSources.remove(this.trajectoryEntityCollection)
+      this.trajectoryEntityCollection = {}
     },
 
     getCatesian3FromPX: function(px) {
@@ -1820,6 +1866,7 @@ export default {
         this.destroyConnection()
         this.clearAllBottomOptionsItemsCheck()
         this.clearAllBottomOptionsItemsEntityCollection()
+        this.removeTrajectory()
         this.onePerLocArr = []
         this.perLocArr = []
         this.clearMqttPoint()
@@ -1864,6 +1911,7 @@ export default {
       this.addBranchPoint()
       this.clearAllBottomOptionsItemsCheck()
       this.clearAllBottomOptionsItemsEntityCollection()
+      this.removeTrajectory()
     },
     bottomOptionsClick(index) {
       if (this.bottomClickDisable) return
@@ -1938,6 +1986,7 @@ export default {
       } else if (this.CORP_INFO_ID) {
         this.CORP_INFO_ID = ''
         this.clearAllBottomOptionsItemsEntityCollection()
+        this.removeTrajectory()
         this.dragAreaEntity(this.branchPoint)
         this.toCenter(this.parentCenter)
         this.destroyConnection()
@@ -2010,7 +2059,7 @@ export default {
         }
         if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
           this.doUnSubscribe()
-          this.clearMqttPoint('1698584148364034050/UwbBQ/')
+          this.clearMqttPoint('+/UwbBQ/')
         }
         this.bottomOptionsList[pindex].list[index].check = false
         if (this.gangkouActive === '00004') {

From c863afb393578b29a80cf1197a6c5ef20061ba4a Mon Sep 17 00:00:00 2001
From: LiuJiaNan <liujianan@zcloudchina.com>
Date: Tue, 16 Apr 2024 14:07:33 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=BD=A8=E8=BF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/index.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index f36f9c3..fe409e2 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -1468,6 +1468,11 @@ export default {
         }
         // var cartesian = this.getCatesian3FromPX(movement.position)
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
+      viewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_DOUBLE_CLICK)
+      viewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+      document.addEventListener('contextmenu', function(event) {
+        event.preventDefault()
+      })
       this.handler.setInputAction(movement => {
         const pick = viewer.scene.pick(movement.position)
         if (Cesium.defined(pick) && (pick.id.id)) {
@@ -2060,6 +2065,7 @@ export default {
         if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
           this.doUnSubscribe()
           this.clearMqttPoint('+/UwbBQ/')
+          this.removeTrajectory()
         }
         this.bottomOptionsList[pindex].list[index].check = false
         if (this.gangkouActive === '00004') {

From 718756ad841386cb6d3eab3b5ae5a8eb2a09c010 Mon Sep 17 00:00:00 2001
From: LiuJiaNan <liujianan@zcloudchina.com>
Date: Tue, 16 Apr 2024 15:30:10 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/index.vue | 119 ++++++++++++++++++++++------------------
 1 file changed, 66 insertions(+), 53 deletions(-)

diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index fe409e2..194373d 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -1116,8 +1116,8 @@ export default {
       },
       subscription: {
         // '+'是通配符
-        // topic: '+/+/+/alarm',
         topic: '+/UwbBQ/+/prop',
+        topic1: '+/+/+/alarm',
         qos: 0
       },
 
@@ -1484,6 +1484,7 @@ export default {
           const point_id = pick.id._monitoItems.data.id
           const corpInfoId = pick.id._monitoItems.data.corpInfoId
           if (point_type === '标记点peoplePositionOne') {
+            this.removeTrajectory()
             this.addTrajectory(point_id, corpInfoId)
           }
         } else {
@@ -1499,22 +1500,24 @@ export default {
           corpId: corpInfoId
         }
       ).then((data) => {
-        console.log(data.list)
-        const positions = []
-        for (let i = 0; i < data.list.length; i++) {
-          positions.push(Cesium.Cartesian3.fromDegrees(data.list[i].XAxis, data.list[i].YAxis))
+        if (data.list) {
+          const positions = []
+          for (let i = 0; i < data.list.length; i++) {
+            positions.push(Cesium.Cartesian3.fromDegrees(data.list[i].XAxis, data.list[i].YAxis))
+          }
+          const entity = new Cesium.Entity({
+            id: 'trajectory',
+            polyline: { positions, width: 5.0, material: Cesium.Color.RED }
+          })
+          const collection = new Cesium.CustomDataSource('trajectoryEntityCollection')
+          collection.entities.add(entity)
+          viewer.dataSources.add(collection)
+          this.trajectoryEntityCollection = collection
         }
-        const entity = new Cesium.Entity({
-          id: 'trajectory',
-          polyline: { positions, width: 5.0, material: Cesium.Color.RED }
-        })
-        const collection = new Cesium.CustomDataSource('trajectoryEntityCollection')
-        collection.entities.add(entity)
-        viewer.dataSources.add(collection)
-        this.trajectoryEntityCollection = collection
       })
     },
     removeTrajectory() {
+      if (Object.keys(this.trajectoryEntityCollection).length === 0) return
       viewer.dataSources.remove(this.trajectoryEntityCollection)
       this.trajectoryEntityCollection = {}
     },
@@ -2584,45 +2587,55 @@ export default {
     },
     mqttMessage(CORP_INFO_ID) {
       this.client.on('message', (topic, message) => {
-        // created by liu jun mqtt返回的参数可能是一个数组
-        let peopleList = JSON.parse(message)
-        if (!Array.isArray(peopleList)) {
-          peopleList = [peopleList]
-        }
-        for (let i = 0; i < peopleList.length; i++) {
-          const item = peopleList[i]
-          // 如果不是人员信息则跳过
-          // UwbBQ是人员定位卡的id（UwbJiZhan这是基站的id）
-          if (item.productKey !== 'UwbBQ') {
-            continue
+        if (topic.indexOf('UwbBQ') !== -1 && topic.indexOf('prop') !== -1) {
+          // created by liu jun mqtt返回的参数可能是一个数组
+          let peopleList = JSON.parse(message)
+          if (!Array.isArray(peopleList)) {
+            peopleList = [peopleList]
           }
-          // 将地图上剩余的点与最新的定位人员点进行对比更新地图上已存在的点新增地图上之前没有的点
-          const index = this.onePerLocArr.findIndex(item1 => {
-            return item1.id.toString() === item.deviceCode.toString()
-          })
-          const x = item.properties[2].value
-          const y = item.properties[3].value
-          const pointColor = this.isPointxyWithinTheArea(this.pointBox, x, y)
-          if (index !== -1) {
-            this.onePerLocArr[index].x = x
-            this.onePerLocArr[index].y = y
-            this.onePerLocArr[index].icon_type = 'img4_0' + pointColor
-            ry_drag.getPosition(this.onePerLocArr[index])
-          } else {
-            const perLoc = {
-              id: item.deviceCode,
-              x: x,
-              y: y,
-              icon_type: 'img4_0' + pointColor,
-              data_id: item.deviceCode,
-              point_type: '标记点peoplePositionOne',
-              label: '人员定位',
-              corpInfoId: CORP_INFO_ID
+          for (let i = 0; i < peopleList.length; i++) {
+            const item = peopleList[i]
+            // 如果不是人员信息则跳过
+            // UwbBQ是人员定位卡的id（UwbJiZhan这是基站的id）
+            if (item.productKey !== 'UwbBQ') {
+              continue
+            }
+            // 将地图上剩余的点与最新的定位人员点进行对比更新地图上已存在的点新增地图上之前没有的点
+            const index = this.onePerLocArr.findIndex(item1 => {
+              return item1.id.toString() === item.deviceCode.toString()
+            })
+            const x = item.properties[2].value
+            const y = item.properties[3].value
+            const pointColor = this.isPointxyWithinTheArea(this.pointBox, x, y)
+            if (index !== -1) {
+              this.onePerLocArr[index].x = x
+              this.onePerLocArr[index].y = y
+              this.onePerLocArr[index].icon_type = 'img4_0' + pointColor
+              ry_drag.getPosition(this.onePerLocArr[index])
+            } else {
+              const perLoc = {
+                id: item.deviceCode,
+                x: x,
+                y: y,
+                icon_type: 'img4_0' + pointColor,
+                data_id: item.deviceCode,
+                point_type: '标记点peoplePositionOne',
+                label: '人员定位',
+                corpInfoId: CORP_INFO_ID
+              }
+              this.onePerLocArr.push(perLoc)
+              ry_drag.addEntity(perLoc)
+              this.mqttPoint[this.subscription.topic.substring(0, this.subscription.topic.lastIndexOf('+')) + item.deviceCode] = item.deviceCode
             }
-            this.onePerLocArr.push(perLoc)
-            ry_drag.addEntity(perLoc)
-            this.mqttPoint[this.subscription.topic.substring(0, this.subscription.topic.lastIndexOf('+')) + item.deviceCode] = item.deviceCode
           }
+        } else if (topic.indexOf('alarm') !== -1) {
+          const formatMessage = JSON.parse(message)
+          this.$notify({
+            title: '报警信息',
+            dangerouslyUseHTMLString: true,
+            message: `部门：${formatMessage.deptName}<br/>类型：${formatMessage.identifierName}`,
+            type: 'error'
+          })
         }
       })
     },
@@ -2644,8 +2657,8 @@ export default {
     },
     // 订阅
     doSubscribe() {
-      const { topic, qos } = this.subscription
-      this.client.subscribe(topic, { qos }, (error, res) => {
+      const { topic, topic1, qos } = this.subscription
+      this.client.subscribe([topic, topic1], { qos }, (error, res) => {
         if (error) {
           console.log('Subscribe to topics error', error)
           return
@@ -2656,8 +2669,8 @@ export default {
     },
     // 取消订阅
     doUnSubscribe() {
-      const { topic } = this.subscription
-      this.client.unsubscribe(topic, error => {
+      const { topic, topic1 } = this.subscription
+      this.client.unsubscribe([topic, topic1], error => {
         if (error) {
           console.log('Subscribe to topics error', error)
         }

From 90ae5f50bf0e0b5719702ec98dcbbc5b75db74ab Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 16 Apr 2024 17:22:43 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=E5=9C=B0=E5=9B=BE=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/index.vue             |  2 +-
 src/views/map/dialog/peoplePositionYGS.vue | 27 ++++++++++++++--------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue
index 855fd0e..96d68f2 100644
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@@ -54,7 +54,7 @@
       <!--曹妃甸东 八项作业 曹实业详细页面 end-->
       <peoplePositionNine v-if="type === 'peoplePositionNine'" :id="id" :type="type" :infoname="infoname"/>
       <peoplePositionOne v-if="type === 'peoplePositionOne' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" />
-      <peoplePositionYGS v-if="type === 'peoplePositionOne' && corpInfoId === '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" />
+      <peoplePositionYGS v-if="type === 'peoplePositionOne' && corpInfoId === '035958e685cf4850bc40151c5e0617a6'" :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" />
diff --git a/src/views/map/dialog/peoplePositionYGS.vue b/src/views/map/dialog/peoplePositionYGS.vue
index ea15b25..6e5ad24 100644
--- a/src/views/map/dialog/peoplePositionYGS.vue
+++ b/src/views/map/dialog/peoplePositionYGS.vue
@@ -8,19 +8,19 @@
         <td class="bbg-transparent">照片</td>
         <td ><img src="../../../assets/map/index/touxiang.png" alt="" width="50" height="50"></td>
         <td class="bbg-transparent">姓名</td>
-        <td >{{ info?info.NAME:'' }}</td>
+        <td >{{ info?info.userName:'' }}</td>
       </tr>
       <tr>
+        <td class="bbg-transparent">公司</td>
+        <td >{{ info?info.corpName:'' }}</td>
         <td class="bbg-transparent">部门</td>
-        <td >{{ info?info.DEPARTMENT_NAME:'' }}</td>
-        <td class="bbg-transparent">岗位</td>
-        <td >{{ info?info.POST_NAME:'' }}</td>
+        <td >{{ info?info.departmentName:'' }}</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>
+        <td class="bbg-transparent">设备id</td>
+        <td >{{ info?info.deviceId:'' }}</td>
+        <td class="bbg-transparent">设备名称</td>
+        <td >{{ info?info.deviceName:'' }}</td>
       </tr>
     </table>
   </div>
@@ -42,6 +42,12 @@ export default {
       default() {
         return ''
       }
+    },
+    corpId: {
+      type: String,
+      default() {
+        return ''
+      }
     }
   },
   data() {
@@ -58,10 +64,11 @@ export default {
       requestFN(
         '/map/getPersonByCardNo',
         {
-          CARDNO: this.id
+          CARDNO: this.id,
+          corpId: this.corpId
         }
       ).then((data) => {
-        this.info = data.pd
+        this.info = data.info.required
       }).catch((e) => {
       })
     }

From 6dda995d3eb114fe5ac8350de8a333d19ab5cc45 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 17 Apr 2024 08:57:43 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=E5=9C=B0=E5=9B=BE=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/renyuan.vue       | 88 +++++++++++++++++++++-
 src/views/map/dialog/peoplePositionYGS.vue | 10 ++-
 2 files changed, 93 insertions(+), 5 deletions(-)

diff --git a/src/views/map/components/renyuan.vue b/src/views/map/components/renyuan.vue
index f3bbb76..c74e60b 100644
--- a/src/views/map/components/renyuan.vue
+++ b/src/views/map/components/renyuan.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="renyuan">
-    <div class="block1">
+    <div v-if="false" class="block1">
       <layout-title title="定位基础信息"/>
       <div class="options">
         <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
@@ -15,7 +15,7 @@
         </div>
       </div>
     </div>
-    <div class="block2">
+    <div v-if="false" class="block2">
       <layout-title title="定位状态数据"/>
       <div class="options">
         <div class="bg"/>
@@ -29,7 +29,7 @@
         </div>
       </div>
     </div>
-    <div class="block3">
+    <div v-if="false" class="block3">
       <layout-title title="定位标签状态"/>
       <div class="content">
         <div class="options">
@@ -56,18 +56,42 @@
         </div>
       </div>
     </div>
+    <div class="block4">
+      <layout-title title="报警列表"/>
+      <div class="content">
+        <div class="table">
+          <div class="tr">
+            <div class="td">区域名称</div>
+            <div class="td">报警设备编号</div>
+            <div class="td">异地告警</div>
+          </div>
+          <div v-for="(item,index) in block4List" :key="index" class="tr">
+            <div class="td">{{ item.alarmName }}</div>
+            <div class="td">{{ item.equipmentName }}</div>
+            <div class="td">{{ item.statusName }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
 import layoutTitle from './title.vue'
 import CountTo from 'vue-count-to'
+import { requestFN } from '../../../utils/request'
 
 export default {
   components: {
     CountTo,
     layoutTitle
   },
+  props: {
+    corpInfoId: {
+      type: String,
+      default: ''
+    }
+  },
   data() {
     return {
       block1OptionsList: [
@@ -131,12 +155,26 @@ export default {
           count: '-',
           facount: '-'
         }
-      ]
+      ],
+      block4List: []
     }
   },
+  created() {
+    this.getData()
+  },
   methods: {
     block3OptionsClick(index) {
       this.block3OptionsIndex = index
+    },
+    getData() {
+      requestFN(
+        '/map/getAlarmList',
+        { corpId: this.corpInfoId }
+      ).then((data) => {
+        this.block4List = data.list
+      }).catch((e) => {
+        this.$message.error(e)
+      })
     }
   }
 }
@@ -321,6 +359,48 @@ export default {
       }
     }
   }
+
+  .block4 {
+    margin-top: 10px;
+    width: 410px;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+
+    .content {
+      border: 1px solid;
+      border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
+      border-top: none;
+      padding: 10px;
+
+      .options {
+        display: flex;
+        justify-content: flex-end;
+
+        .title {
+          cursor: pointer;
+        }
+      }
+
+      .table {
+        margin-top: 5px;
+
+        .tr {
+          display: flex;
+
+          &:nth-child(odd) {
+            background-color: rgba(42, 86, 158, 0.53);
+          }
+
+          .td {
+            flex: 1;
+            text-align: center;
+            font-size: 12px;
+            color: #fff;
+            padding: 5px;
+          }
+        }
+      }
+    }
+  }
 }
 
 @keyframes scale {
diff --git a/src/views/map/dialog/peoplePositionYGS.vue b/src/views/map/dialog/peoplePositionYGS.vue
index 6e5ad24..e1b2313 100644
--- a/src/views/map/dialog/peoplePositionYGS.vue
+++ b/src/views/map/dialog/peoplePositionYGS.vue
@@ -22,6 +22,12 @@
         <td class="bbg-transparent">设备名称</td>
         <td >{{ info?info.deviceName:'' }}</td>
       </tr>
+      <tr>
+        <td class="bbg-transparent">人员类型</td>
+        <td>{{ otherInfo?otherInfo.personType:'' }}</td>
+        <td class="bbg-transparent">岗位</td>
+        <td>{{ otherInfo?otherInfo.postName:'' }}</td>
+      </tr>
     </table>
   </div>
 </template>
@@ -53,7 +59,8 @@ export default {
   data() {
     return {
       config: config,
-      info: {}
+      info: {},
+      otherInfo: {}
     }
   },
   created() {
@@ -69,6 +76,7 @@ export default {
         }
       ).then((data) => {
         this.info = data.info.required
+        this.otherInfo = data.otherInfo
       }).catch((e) => {
       })
     }

From a5cda7aa2b9329ed7197d830dec773216a50e527 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 17 Apr 2024 14:22:04 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BEbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/renyuan.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/map/components/renyuan.vue b/src/views/map/components/renyuan.vue
index c74e60b..c66875b 100644
--- a/src/views/map/components/renyuan.vue
+++ b/src/views/map/components/renyuan.vue
@@ -63,7 +63,7 @@
           <div class="tr">
             <div class="td">区域名称</div>
             <div class="td">报警设备编号</div>
-            <div class="td">异地告警</div>
+            <div class="td">状态告警</div>
           </div>
           <div v-for="(item,index) in block4List" :key="index" class="tr">
             <div class="td">{{ item.alarmName }}</div>

From 06f3746c8ab05f9fed5740f559f9058a82961df2 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 17 Apr 2024 15:23:22 +0800
Subject: [PATCH 08/15] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=201=E3=80=81?=
 =?UTF-8?q?=E4=BE=BF=E8=B7=9F=E9=80=89=E6=8B=A9=E5=90=8E=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9C=AA=E5=8F=98=202=E3=80=81=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=80=89=E6=8B=A9=E4=BA=BA=E5=91=98=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classMessage/components/initClass.vue     | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/views/classMessage/classMessage/components/initClass.vue b/src/views/classMessage/classMessage/components/initClass.vue
index 0174b31..d58ac9f 100644
--- a/src/views/classMessage/classMessage/components/initClass.vue
+++ b/src/views/classMessage/classMessage/components/initClass.vue
@@ -104,7 +104,7 @@
                 border
                 fit
                 highlight-current-row
-                @select="updateSelect"
+                @selection-change="updateSelect"
 
               >
                 <el-table-column :reserve-selection="true" type="selection" width="55" align="center"/>
@@ -164,6 +164,7 @@
       </el-col>
       <el-col :span="6">
         <div style="margin-left: 10px">
+          <div>已选择人员数量：{{ ($refs.multipleTable && $refs.multipleTable.selection)?$refs.multipleTable.selection.length:0 }}</div>
           <div class="el-form-item__label">已选择人员名称：</div>
           <el-table
             :data="selectPeopleList"
@@ -270,16 +271,18 @@ export default {
       this.getDic()
     },
     updateSelect(rows, row) {
-      console.log(rows)
-      if (this.form.CLASS_SIZE === '' || !this.form.CLASS_SIZE) {
-        this.$message.error('请先选择班级容量')
-        return
+      if (this.visible) {
+        if (this.form.CLASS_SIZE === '' || !this.form.CLASS_SIZE) {
+          this.$message.error('请先选择班级容量')
+          this.$refs.multipleTable.clearSelection()
+          return
+        }
+        if (rows.length > this.form.CLASS_SIZE) {
+          this.$message.error('已超出班级容量')
+          return
+        }
+        this.selectPeopleList = rows
       }
-      if (rows.length > this.form.CLASS_SIZE) {
-        this.$message.error('已超出班级容量')
-        return
-      }
-      this.selectPeopleList = rows
     },
     confirm() {
       const list = this.$refs.multipleTable.selection
@@ -325,6 +328,7 @@ export default {
       }
       this.selectPeopleList = []
       this.util.BELONG_TO_CORP = ''
+      this.$refs.multipleTable.clearSelection()
     },
     getDic() {
       let i = 0
@@ -474,7 +478,9 @@ export default {
       this.$refs.userPdf.init({ CLASS_MESSAGE_ID: CLASS_MESSAGE_ID })
     },
     changePeopleList() {
-      requestFN('/classMessage/getPeopleList?showCount=' + this.form.CLASS_SIZE + '&currentPage=1').then((data) => {
+      requestFN('/classMessage/getPeopleList?showCount=' + this.form.CLASS_SIZE + '&currentPage=1',
+        { BELONG_TO_CORP: this.util.BELONG_TO_CORP }
+      ).then((data) => {
         this.peopleList = data.varList
         for (let i = 0; i < this.peopleList.length; i++) {
           this.peopleList[i].STATUS = ''

From b91d712a99d1f93aab12e697e68d0a9d1fd3ef7b Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 17 Apr 2024 16:40:54 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E7=8F=AD?=
 =?UTF-8?q?=E7=BA=A7=E5=9F=B9=E8=AE=AD=EF=BC=8C=E5=88=A0=E9=99=A4=E7=8F=AD?=
 =?UTF-8?q?=E7=BA=A7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/classMessage/classMessage/components/list.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/classMessage/classMessage/components/list.vue b/src/views/classMessage/classMessage/components/list.vue
index 8631632..dfaf591 100644
--- a/src/views/classMessage/classMessage/components/list.vue
+++ b/src/views/classMessage/classMessage/components/list.vue
@@ -74,6 +74,7 @@
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.CLASS_MESSAGE_ID)">查看</el-button>
+          <el-button v-show=" row.CLASS_STATUS === '0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.CLASS_MESSAGE_ID)">删除</el-button>
           <el-button v-show=" row.CLASS_STATUS === '1'" type="primary" size="mini" @click="uploadExcel(row)">信息反馈</el-button>
           <el-button v-if="false" v-show="del" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.CLASS_MESSAGE_ID)">删除</el-button>
         </template>

From 66f708e4e62108626e3d212911b4ac6e3d0cca85 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 17 Apr 2024 17:43:29 +0800
Subject: [PATCH 10/15] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E7=8F=AD?=
 =?UTF-8?q?=E7=BA=A7=E5=9F=B9=E8=AE=AD=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=8F=AD?=
 =?UTF-8?q?=E7=BA=A7=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classMessage/components/changeName.vue    | 170 ++++++++++++++++++
 .../classMessage/components/edit.vue          |   3 +-
 .../classMessage/components/list.vue          |  24 ++-
 .../classMessage/components/user_pdf.vue      |   2 +-
 4 files changed, 191 insertions(+), 8 deletions(-)
 create mode 100644 src/views/classMessage/classMessage/components/changeName.vue

diff --git a/src/views/classMessage/classMessage/components/changeName.vue b/src/views/classMessage/classMessage/components/changeName.vue
new file mode 100644
index 0000000..ca4de63
--- /dev/null
+++ b/src/views/classMessage/classMessage/components/changeName.vue
@@ -0,0 +1,170 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" title="修改班级名称" width="700px" destroy-on-close	>
+      <el-form ref="form" :model="form" label-width="110px">
+        <el-form-item label="班级名称" prop="CLASS_NAME">
+          <el-input
+            id="CLASS_NAME"
+            ref="CLASS_NAME"
+            v-model="form.CLASS_NAME"
+            style="width: 400px;"
+            maxlength="255"
+            placeholder="这里输入班级名称..."
+            title="班级名称"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="close">取 消</el-button>
+        <el-button type="primary" @click="confirm">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+import { requestFN } from '@/utils/request'
+
+export default {
+  components: { vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      qrCodeStr: '',
+      form: {
+        CLASS_NAME: '',
+        CLASS_MESSAGE_ID: ''
+      }
+    }
+  },
+  methods: {
+    init(row) {
+      this.visible = true
+      this.form.CLASS_MESSAGE_ID = row.CLASS_MESSAGE_ID
+    },
+    close() {
+      this.visible = false
+      this.form = {
+        CLASS_NAME: '',
+        CLASS_MESSAGE_ID: ''
+      }
+    },
+    confirm() {
+      this.loading = true
+      if (!this.form.CLASS_NAME || this.form.CLASS_NAME === '') {
+        this.$message.error('请输入班级名称')
+        return
+      }
+      requestFN('/classMessage/changeName', this.form).then((data) => {
+        this.$message.success('保存成功')
+        this.visible = false
+        this.close()
+        this.$emit('getResult')
+      }).catch((e) => {
+        this.loading = false
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.name{
+  width: 120px;
+  overflow: hidden;//溢出隐藏
+  white-space: nowrap; // 强制一行显示
+  text-overflow: ellipsis;// 显示。。。省略号
+}
+.red {
+  width: 660px;
+  color: #ff0000;
+  margin-left: 34px;
+  font-size: 24px;
+}
+
+.bg_table {
+  background: url("../../../../assets/tablebg.jpg") no-repeat bottom center;
+  background-size: 100%;
+  width: 660px;
+  height: 430px;
+  border: 4px solid #453d3a;
+  transform: scale(0.5);
+  transform-origin: top left;
+
+  .title {
+    font-size: 28px;
+    text-align: center;
+    margin-top: 34px;
+    font-weight: bold;
+    color: #000000;
+  }
+
+  .table {
+    border-collapse: collapse;
+    width: 590px;
+    color: #453d3a;
+    font-size: 20px;
+    margin: 34px;
+    text-align: left;
+    margin-top: 10px;
+
+    .tcenter {
+      text-align: center
+    }
+
+    .w60 {
+      width: 100px;
+    }
+
+    .w74 {
+      width: 148px
+    }
+
+    th, td {
+      border: 2px solid #453d3a;
+      text-align: left;
+      height: 40px;
+      padding: 0 16px;
+
+      box-sizing: border-box;
+
+      .textone {
+        width: 80px;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: distribute-all-lines;
+        margin: 0 auto;
+      }
+
+      .text1 {
+        width: 60px;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: distribute-all-lines;
+        margin: 0 auto;
+
+      }
+
+      .text2 {
+        width: 50px;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: distribute-all-lines;
+        margin: 0 auto;
+
+      }
+
+      .text {
+
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/classMessage/classMessage/components/edit.vue b/src/views/classMessage/classMessage/components/edit.vue
index 13d8018..fe31e5a 100644
--- a/src/views/classMessage/classMessage/components/edit.vue
+++ b/src/views/classMessage/classMessage/components/edit.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog v-loading="loading" :visible.sync="visible" :title="title" :before-close="close" width="70%">
+  <el-dialog v-loading="loading" :visible.sync="visible" :title="title" :before-close="close" width="70%" top="50px">
     <el-form ref="form" :rules="rules" :model="form" label-width="110px">
       <el-row :gutter="10">
         <el-col :span="12">
@@ -81,6 +81,7 @@
             :data="peopleList"
             :row-key="getRowKey"
             :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+            height="500px"
             tooltip-effect="dark"
             border
             fit
diff --git a/src/views/classMessage/classMessage/components/list.vue b/src/views/classMessage/classMessage/components/list.vue
index dfaf591..fe4fe63 100644
--- a/src/views/classMessage/classMessage/components/list.vue
+++ b/src/views/classMessage/classMessage/components/list.vue
@@ -73,10 +73,17 @@
       </el-table-column>
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="{row}">
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.CLASS_MESSAGE_ID)">查看</el-button>
-          <el-button v-show=" row.CLASS_STATUS === '0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.CLASS_MESSAGE_ID)">删除</el-button>
-          <el-button v-show=" row.CLASS_STATUS === '1'" type="primary" size="mini" @click="uploadExcel(row)">信息反馈</el-button>
-          <el-button v-if="false" v-show="del" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.CLASS_MESSAGE_ID)">删除</el-button>
+          <el-row>
+            <el-col :span="24">
+              <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.CLASS_MESSAGE_ID)">查看</el-button>
+              <el-button v-show=" row.CLASS_STATUS === '0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.CLASS_MESSAGE_ID)">删除</el-button>
+              <el-button v-show=" row.CLASS_STATUS === '1'" type="primary" size="mini" @click="uploadExcel(row)">信息反馈</el-button>
+            </el-col>
+            <el-col v-if="row.CLASS_STATUS === '0'" :span="24" style="margin-top: 10px">
+              <el-button v-show=" row.CLASS_STATUS === '0'" type="primary" icon="el-icon-edit" size="mini" @click="changeName(row)">修改班级名称</el-button>
+            </el-col>
+          </el-row>
+
         </template>
       </el-table-column>
     </el-table>
@@ -90,6 +97,7 @@
     <edit ref="edit" :title="title" :is-show="isShow" @getResult = "getList"/>
     <init-class ref="initClass" :title="title" :is-show="isShow" @getResult = "getList"/>
     <upload-excel ref="uploadExcel" title="上传" append-to-body @getChoose="getFile"/>
+    <change-name ref="changeName" @getResult = "getList"/>
   </div>
 </template>
 <script>
@@ -100,8 +108,9 @@ import edit from './edit.vue'
 import { upload } from '@/utils/upload'
 import uploadExcel from '../../../../components/uploadExcel/index.vue'
 import InitClass from './initClass.vue'
+import ChangeName from './changeName.vue'
 export default {
-  components: { InitClass, uploadExcel, Pagination, edit },
+  components: { ChangeName, InitClass, uploadExcel, Pagination, edit },
   directives: { waves },
   data() {
     return {
@@ -201,7 +210,7 @@ export default {
         requestFN(
           '/classMessage/delete',
           {
-            CLASSMESSAGE_ID: id
+            CLASS_MESSAGE_ID: id
           }
         ).then(() => {
           this.$message({
@@ -336,6 +345,9 @@ export default {
     },
     uploadExcel(row) {
       this.$refs.uploadExcel.init(row)
+    },
+    changeName(row) {
+      this.$refs.changeName.init(row)
     }
   }
 }
diff --git a/src/views/classMessage/classMessage/components/user_pdf.vue b/src/views/classMessage/classMessage/components/user_pdf.vue
index 182db51..fbaa884 100644
--- a/src/views/classMessage/classMessage/components/user_pdf.vue
+++ b/src/views/classMessage/classMessage/components/user_pdf.vue
@@ -166,7 +166,7 @@ export default {
       downloadPdf(dom, '相关方安全告知培训合格证')
     },
     getShowPicture(row) {
-      if (row.PHOTO && row.PHOTO !== '' && (row.PHOTO.indexOf('.jpg') >= 0 || row.PHOTO.indexOf('.png') >= 0 || row.PHOTO.indexOf('.jpeg') >= 0)) {
+      if (row.PHOTO) {
         return true
       }
     },

From 71720df56f83f2124e1fc36d56fdda68dfb2941a Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 17 Apr 2024 17:58:26 +0800
Subject: [PATCH 11/15] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D-=E8=BF=9E=E7=82=B9b?=
 =?UTF-8?q?ug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/sendUtil.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index 2c02c93..8bef0a8 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -153,12 +153,14 @@ export default {
           this.$message.error('请填写完整信息')
         } else {
           if (this.form.TYPE !== '2') {
+            this.loading = true
             requestFN('/xgf/user/approveMax', this.form)
               .then((data) => {
                 this.$message.success('推送成功')
                 this.visible = false
                 this.$emit('refresh', '')
                 this.handleClose()
+                this.loading = false
               })
               .catch((e) => {
                 console.log(e)
@@ -174,12 +176,14 @@ export default {
                 formData.append('weiTuoShu', this.form.APPOINT_ANNEX[i].raw)
               }
             }
+            this.loading = true
             upload('/xgf/user/approveMax', formData)
               .then((data) => {
                 this.$message.success('推送成功')
                 this.visible = false
                 this.$emit('refresh', '')
                 this.handleClose()
+                this.loading = false
               })
               .catch((e) => {
                 console.log(e)

From 77d6ab4f8164722632ebf15ba60b6e94be429e21 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 18 Apr 2024 17:03:13 +0800
Subject: [PATCH 12/15] =?UTF-8?q?15179=20=E8=B0=83=E6=95=B4=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8B=E6=8E=92=E7=89=88=20=E8=B0=83=E6=95=B4=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=80=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classMessage/components/list.vue          | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/views/classMessage/classMessage/components/list.vue b/src/views/classMessage/classMessage/components/list.vue
index fe4fe63..2ef7dfd 100644
--- a/src/views/classMessage/classMessage/components/list.vue
+++ b/src/views/classMessage/classMessage/components/list.vue
@@ -60,10 +60,10 @@
         width="55"
         align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center" />
-      <el-table-column prop="CLASS_NAME" label="班级名称" />
-      <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" />
+      <el-table-column prop="CLASS_NAME" width="300px" label="班级名称" />
+      <el-table-column prop="TRAINING_TYPE_NAME" width="200px" label="培训类型" />
       <el-table-column prop="OPENING_TIME" label="开班时间" />
-      <el-table-column prop="PLACE_NAME" label="培训地点" />
+      <el-table-column prop="PLACE_NAME" width="200px" label="培训地点" />
       <el-table-column prop="CLASS_SIZE" label="班级容量" />
       <el-table-column prop="TRAINEES_NUM" label="培训人员数量" />
       <el-table-column prop="CLASS_STATUS" label="班级状态">
@@ -71,19 +71,12 @@
           {{ row.CLASS_STATUS === '0'?'待开班':(row.CLASS_STATUS === '1'?'已开班':'完成') }}
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="200">
+      <el-table-column label="操作" align="center" width="400" fixed="right">
         <template slot-scope="{row}">
-          <el-row>
-            <el-col :span="24">
-              <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.CLASS_MESSAGE_ID)">查看</el-button>
-              <el-button v-show=" row.CLASS_STATUS === '0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.CLASS_MESSAGE_ID)">删除</el-button>
-              <el-button v-show=" row.CLASS_STATUS === '1'" type="primary" size="mini" @click="uploadExcel(row)">信息反馈</el-button>
-            </el-col>
-            <el-col v-if="row.CLASS_STATUS === '0'" :span="24" style="margin-top: 10px">
-              <el-button v-show=" row.CLASS_STATUS === '0'" type="primary" icon="el-icon-edit" size="mini" @click="changeName(row)">修改班级名称</el-button>
-            </el-col>
-          </el-row>
-
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.CLASS_MESSAGE_ID)">查看</el-button>
+          <el-button v-show=" row.CLASS_STATUS === '0'" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.CLASS_MESSAGE_ID)">删除</el-button>
+          <el-button v-show=" row.CLASS_STATUS === '1'" type="primary" size="mini" @click="uploadExcel(row)">信息反馈</el-button>
+          <el-button v-show=" row.CLASS_STATUS === '0'" type="primary" icon="el-icon-edit" size="mini" @click="changeName(row)">修改班级名称</el-button>
         </template>
       </el-table-column>
     </el-table>

From 63569ba19b98beb7c4249ae9e334c68691b05492 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 18 Apr 2024 17:41:03 +0800
Subject: [PATCH 13/15] =?UTF-8?q?15180=20=E5=A7=94=E6=89=98=E5=AE=8C?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=90=8E=20=E5=A7=94=E6=89=98=E4=B8=8B?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=20=E4=B8=8A=E4=B8=80=E4=B8=AA=E5=A7=94?=
 =?UTF-8?q?=E6=89=98=E4=BF=A1=E6=81=AF=E4=BC=9A=E8=A2=AB=E5=B8=A6=E5=87=BA?=
 =?UTF-8?q?=20=E6=89=B9=E9=87=8F=E5=A7=94=E6=89=98=E4=B9=9F=E6=98=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/entrust.vue | 25 +++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/views/xgf/flow/components/entrust.vue b/src/views/xgf/flow/components/entrust.vue
index c532295..e169e6a 100644
--- a/src/views/xgf/flow/components/entrust.vue
+++ b/src/views/xgf/flow/components/entrust.vue
@@ -140,6 +140,7 @@ export default {
               this.$message.success('推送成功')
               this.visible = false
               this.$emit('refresh', '')
+              this.beforeClose()
             })
             .catch((e) => {
               console.log(e)
@@ -182,28 +183,40 @@ export default {
 
     handleClose() {
       this.form = {
-        STATUS: '',
+        STATUS: '1',
+        APPOINT_CORP_ID: '',
+        APPOINT_CORP_NAME: '',
         APPOINT_DEPARTMENT_ID: null,
         APPOINT_DEPARTMENT_NAME: '',
-        APPOINT_USER_ID: '',
+        APPOINT_USER_ID: null,
         APPOINT_USER_NAME: '',
+        OPINION: '',
         user: '',
+        tm: new Date().getTime(),
         list: [],
-        tm: new Date().getTime()
+        isShow: true,
+        info: {},
+        entrustFlag: '1'
       }
       this.visible = false
     },
     beforeClose() {
       this.visible = false
       this.form = {
-        STATUS: '',
+        STATUS: '1',
+        APPOINT_CORP_ID: '',
+        APPOINT_CORP_NAME: '',
         APPOINT_DEPARTMENT_ID: null,
         APPOINT_DEPARTMENT_NAME: '',
-        APPOINT_USER_ID: '',
+        APPOINT_USER_ID: null,
         APPOINT_USER_NAME: '',
+        OPINION: '',
         user: '',
+        tm: new Date().getTime(),
         list: [],
-        tm: new Date().getTime()
+        isShow: true,
+        info: {},
+        entrustFlag: '1'
       }
     }
   }

From e3a8194c7c548f5e1e28822e81cc5f6f79903fb3 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Fri, 19 Apr 2024 08:44:13 +0800
Subject: [PATCH 14/15] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=B4=E6=8A=A4=EF=BC=9A=201.=E9=A6=96?=
 =?UTF-8?q?=E6=AC=A1=E6=96=B0=E5=A2=9E=E6=8C=87=E6=A0=87=E6=BA=90=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=9A=E4=BD=8D=E5=B7=B2=E5=A1=AB=E5=AE=8C=E4=BD=86?=
 =?UTF-8?q?=E4=BB=8D=E6=98=BE=E7=A4=BA=E5=9D=90=E6=A0=87=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA;=202.=E6=96=B0=E5=A2=9E=E5=85=B3=E6=8E=89?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=90=8E=EF=BC=8C=E5=86=8D=E6=AC=A1=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E6=98=BE=E7=A4=BA=E5=9D=90=E6=A0=87=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/alarm/alarmDeviceMaintenance/components/list.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/alarm/alarmDeviceMaintenance/components/list.vue b/src/views/alarm/alarmDeviceMaintenance/components/list.vue
index 3c75cc2..8b35795 100644
--- a/src/views/alarm/alarmDeviceMaintenance/components/list.vue
+++ b/src/views/alarm/alarmDeviceMaintenance/components/list.vue
@@ -281,8 +281,8 @@ export default {
         dialogVisible: false,
         dialogAlarm: false,
         rules: {
-          LONGITUDE: [{ required: true, message: '不可为空', trigger: 'blur' }],
-          LATITUDE: [{ required: true, message: '不可为空', trigger: 'blur' }],
+          // LONGITUDE: [{ required: true, message: '不可为空', trigger: 'blur' }],
+          // LATITUDE: [{ required: true, message: '不可为空', trigger: 'blur' }],
           RECIPIENT: [{ required: true, message: '不可为空', trigger: 'blur' }],
           INDICATORSOURCE: [{ required: true, message: '不可为空', trigger: 'blur' }],
           ALARMTHRESHOLD: [{ required: true, message: '不可为空', trigger: 'blur' }],
@@ -582,7 +582,8 @@ export default {
         RECIPIENT: '',
         TYPE: '',
         LATITUDE: '',
-        LONGITUDE: ''
+        LONGITUDE: '',
+        LONGTITUDEANDLATITUDE: ''
       }
       this.addForm.dialogType = ''
     },

From 06c706db1ab7b82d0fb0577831c8aacb3a7dea16 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 23 Apr 2024 14:36:30 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/index.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 194373d..c27605f 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -2047,9 +2047,6 @@ export default {
         }
         // 人员定位关闭实时获取定位websocket 并关闭人员对比定时器（曹妃甸使用）
         if (this.gangkouActive === '00004' && urlType === 'peoplePosition') {
-          // if (this.fwebsocket) {
-          //   this.fwebsocket.close()
-          // }
           if (this.timer) {
             clearInterval(this.timer)
           }