From 11ad8664a25d07e9811a13446c05ed9772c3b423 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Mon, 13 May 2024 14:02:27 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B-?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=A4=84=E7=BD=9A=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF:=20AI=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=BD=9A=E4=BA=BA=E5=91=98=E4=B8=BAAI?=
 =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E7=9A=84=E5=A4=84=E7=BD=AE=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/keyprojects/outsourced/components/edit.vue | 2 +-
 src/views/keyprojects/outsourced/components/info.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/keyprojects/outsourced/components/edit.vue b/src/views/keyprojects/outsourced/components/edit.vue
index 08b45c6..3ad5d8f 100644
--- a/src/views/keyprojects/outsourced/components/edit.vue
+++ b/src/views/keyprojects/outsourced/components/edit.vue
@@ -338,7 +338,7 @@
 
         <div class="level-line" />
         <div class="level-title">
-          <h1>处罚相关：</h1>
+          <h1>处罚相关：</h1><span style="color: gray; font-size: 12px;">(AI报警的处罚人员为AI报警的处置人)</span>
         </div>
         <el-divider content-position="left">处罚人员 <el-button type="primary" size="mini" @click="addInspector">添加</el-button></el-divider>
         <el-form-item v-for="(item,index) in inspectorList" :key="index + (Math.random() + '').replace('.', '')" :label="(index+1)+'.'" class="is-required">
diff --git a/src/views/keyprojects/outsourced/components/info.vue b/src/views/keyprojects/outsourced/components/info.vue
index 8da1a64..83ecac6 100644
--- a/src/views/keyprojects/outsourced/components/info.vue
+++ b/src/views/keyprojects/outsourced/components/info.vue
@@ -134,7 +134,7 @@
 
         <div class="level-line" />
         <div class="level-title">
-          <h1>处罚相关：</h1>
+          <h1>处罚相关：</h1><span style="color: gray; font-size: 12px;">(AI报警的处罚人员为AI报警的处置人)</span>
         </div>
         <tr v-for="(item,index) in punishThePerson" :key="index">
           <td class="tbg">处罚人员部门</td>

From 1fc75b9d565b11ae646814aa27ebbe4da75ce117 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Tue, 14 May 2024 18:43:46 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B-?=
 =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E9=A1=B5=E9=9D=A2=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84=E6=89=80=E6=9C=89=E5=AD=90=E9=A1=B5=E9=9D=A2=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/keyprojects/aiwarning/components/record-list.vue  | 5 +++++
 src/views/keyprojects/inspection/components/record-list.vue | 5 +++++
 src/views/keyprojects/punish/components/list2.vue           | 5 +++++
 .../keyprojects/videomanager/components/video-list.vue      | 6 +++++-
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/views/keyprojects/aiwarning/components/record-list.vue b/src/views/keyprojects/aiwarning/components/record-list.vue
index 0a1451a..a415cc6 100644
--- a/src/views/keyprojects/aiwarning/components/record-list.vue
+++ b/src/views/keyprojects/aiwarning/components/record-list.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <div class="app-container">
+      <el-page-header content="报警记录" @back="back"/>
       <el-form label-width="100px">
         <el-row>
           <el-col :span="5">
@@ -116,6 +117,10 @@ export default {
     this.getList()
   },
   methods: {
+    back() {
+      this.$parent.CORPINFO_ID = ''
+      this.$parent.activeName = 'List'
+    },
     checkboxInit(row, index) {
       if (row.STATUS != '0') {
         return 0 // 不可勾选
diff --git a/src/views/keyprojects/inspection/components/record-list.vue b/src/views/keyprojects/inspection/components/record-list.vue
index c30941c..bd058f9 100644
--- a/src/views/keyprojects/inspection/components/record-list.vue
+++ b/src/views/keyprojects/inspection/components/record-list.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <el-page-header @back="back"/>
     <el-form label-width="100px">
       <el-row>
         <el-col :span="5">
@@ -98,6 +99,10 @@ export default {
     this.getList()
   },
   methods: {
+    back() {
+      this.$parent.CORPINFO_ID = ''
+      this.$parent.activeName = 'list'
+    },
     getRowKey(row) {
       return row.OUTSOURCED_ID
     },
diff --git a/src/views/keyprojects/punish/components/list2.vue b/src/views/keyprojects/punish/components/list2.vue
index 93cb6c8..f1f4fad 100644
--- a/src/views/keyprojects/punish/components/list2.vue
+++ b/src/views/keyprojects/punish/components/list2.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <el-page-header content="处罚记录" @back="back"/>
     <el-form label-width="100px">
       <el-row>
         <el-col :span="4">
@@ -96,6 +97,10 @@ export default {
     this.getList()
   },
   methods: {
+    back() {
+      this.$parent.CORPINFO_ID = ''
+      this.$parent.activeName = 'List'
+    },
     getRowKey(row) {
       return row.OUTSOURCED_ID
     },
diff --git a/src/views/keyprojects/videomanager/components/video-list.vue b/src/views/keyprojects/videomanager/components/video-list.vue
index db0ad9e..80881f7 100644
--- a/src/views/keyprojects/videomanager/components/video-list.vue
+++ b/src/views/keyprojects/videomanager/components/video-list.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <el-page-header content="视频详情" @back="goBack"/>
     <div class="filter-container">
       <el-form label-width="100px">
         <el-row>
@@ -564,7 +565,10 @@ export default {
         this.listLoading = false
       })
     },
-
+    goBack() {
+      this.$parent.CORPINFO_ID = ''
+      this.$parent.activeName = 'list'
+    },
     // 保存
     upload() {
       this.$refs.form.validate(valid => {

From f5053e2200809e738049386672367b0db652a6f7 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Wed, 15 May 2024 11:00:49 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B6=85=E6=9C=9F?=
 =?UTF-8?q?=E6=9C=AA=E5=8A=A8=E7=81=AB=EF=BC=8C=E5=8A=A8=E7=81=AB=E5=90=8E?=
 =?UTF-8?q?=E6=9C=AA=E7=AD=BE=E5=AD=97=EF=BC=8C=E4=BD=86=E5=8D=B4=E6=9C=89?=
 =?UTF-8?q?=E4=B8=AA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/hotwork/hotwork_list/components/detail.vue     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail.vue
index 60ebccb..6e893f6 100644
--- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail.vue
+++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail.vue
@@ -114,8 +114,8 @@
               </td>
             </tr>
             <tr>
-              <td colspan="2">时间：{{ pd.HOT_WORK_PERSON_PRINCIPAL_TIME }}</td>
-              <td colspan="2">时间：{{ pd.HOT_WORK_AFTER_PRINCIPAL_TIME }}</td>
+              <td v-if="pd.HOT_WORK_PERSON_PRINCIPAL" colspan="2">时间：{{ pd.HOT_WORK_PERSON_PRINCIPAL_TIME }}</td>
+              <td v-if="pd.HOT_WORK_AFTER_PRINCIPAL" colspan="2">时间：{{ pd.HOT_WORK_AFTER_PRINCIPAL_TIME }}</td>
             </tr>
             <tr>
               <td class="tbg">延时监火记录</td>

From 2db2046f6e315bdb8fcbcf319defe23c9e775f05 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Wed, 15 May 2024 11:25:20 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B-?=
 =?UTF-8?q?=E5=A4=84=E7=BD=9A=E7=AE=A1=E7=90=86=E4=B8=AD=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=BA=86=E2=80=9C=E5=A4=84=E7=BD=9A=E5=A4=84=E7=90=86=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E2=80=9D=E6=97=A0=E6=95=88=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/keyprojects/punish/components/list.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/views/keyprojects/punish/components/list.vue b/src/views/keyprojects/punish/components/list.vue
index cfd86b6..fecbe8a 100644
--- a/src/views/keyprojects/punish/components/list.vue
+++ b/src/views/keyprojects/punish/components/list.vue
@@ -56,11 +56,6 @@
       <el-table-column v-if="false" prop="CREATOR_NAME" label="下发人" show-overflow-tooltip/>
       <el-table-column v-if="false" prop="OUTSOURCED_NAME" label="被处罚单位" show-overflow-tooltip/>
       <el-table-column v-if="false" prop="PERSON_NAME" label="被处罚人" show-overflow-tooltip/>
-      <el-table-column label="处罚处理状态" show-overflow-tooltip>
-        <template slot-scope="{row}">
-          {{ row.HANDLED === "0" ? "待处理" : "已处理" }}
-        </template>
-      </el-table-column>
       <el-table-column prop="CORP_NAME" label="创建单位" show-overflow-tooltip/>
       <el-table-column prop="FIND_HIDDEN_NUM" label="发现隐患数据" show-overflow-tooltip/>
       <el-table-column prop="END_HIDDEN_NUM" label="处理隐患数" show-overflow-tooltip/>

From 5e6fca9a0ee318268c0ff540354db4f3bd56f05c Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 15 May 2024 13:52:37 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safetyProductionResponsibilitySystem/components/list.vue     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/threeSystems/safetyProductionResponsibilitySystem/components/list.vue b/src/views/threeSystems/safetyProductionResponsibilitySystem/components/list.vue
index 3078763..cf476a0 100644
--- a/src/views/threeSystems/safetyProductionResponsibilitySystem/components/list.vue
+++ b/src/views/threeSystems/safetyProductionResponsibilitySystem/components/list.vue
@@ -49,7 +49,6 @@
       @cell-mouse-enter="enterSelectionRows"
       @cell-mouse-leave="leaveSelectionRows">
       <el-table-column
-        v-if="false"
         :reserve-selection="true"
         type="selection"
         width="55"

From 19bd9b1ab286b376ef378c5d219f21b740c4446f Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Wed, 15 May 2024 14:16:13 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E9=9A=90=E6=82=A3=E8=80=83=E8=AF=84-=E5=88=86=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E9=9A=90=E6=82=A3=E8=80=83=E8=AF=84=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BA=86=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=8E=AF=E4=BF=9D=E5=A5=96=E6=83=A9=E7=9A=84?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=92=8C=E7=9B=91=E7=AE=A1=E7=AB=AF?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E7=B1=BB=E5=88=97=EF=BC=8C=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=80=E5=88=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue b/src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue
index 70c0aa6..9f169ae 100644
--- a/src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue
+++ b/src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue
@@ -50,14 +50,9 @@
           {{ row.checked_count1 }} / {{ row.count1 }}
         </template>
       </el-table-column>
-      <el-table-column label="重点工程安全环保奖惩监管端">
+      <el-table-column label="重点工程安全环保奖惩">
         <template slot-scope="{row}">
-          {{ row.checked_count2 }} / {{ row.count2 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="重点工程安全环保奖惩企业端">
-        <template slot-scope="{row}">
-          {{ row.checked_count3 }} / {{ row.count3 }}
+          {{row.CORP_NAME == '秦港股份有限公司' ? row.checked_count2 : row.checked_count3 }} / {{row.CORP_NAME == '秦港股份有限公司' ? row.count2 : row.checked_count3 }}
         </template>
       </el-table-column>
       <el-table-column prop="CHECK_USER" label="考评组成员"/>

From 0e56d36d7fe1d5a27b61c41c540bd573c2c8203d Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 15 May 2024 19:42:36 +0800
Subject: [PATCH 07/12] =?UTF-8?q?1=E3=80=81=E7=9B=B8=E5=85=B3=E6=96=B9?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=87=AA=E5=8A=A8=E5=B1=95=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index 8bef0a8..914808c 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -17,6 +17,7 @@
                 :options="departmentTree"
                 :normalizer="normalizer"
                 v-model="form.APPOINT_DEPARTMENT_ID"
+                :default-expand-level="3"
                 placeholder="请选择部门"
                 no-options-text="暂无数据"
                 no-children-text="暂无数据"

From da01631b41b0b4e44c0a794887dd4c34db50ee23 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Mon, 20 May 2024 13:44:46 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E7=9B=91?=
 =?UTF-8?q?=E7=AE=A1=E7=AB=AF=E5=9C=B0=E5=9B=BE=E9=97=A8=E5=8F=A3=E9=97=A8?=
 =?UTF-8?q?=E7=A6=81=E5=B1=95=E7=A4=BA=E6=94=B9=E4=B8=BA=E5=92=8C=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E7=AB=AF=E4=B8=80=E8=87=B4?=
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/mkGateMachine.vue |  9 ++++++++-
 src/views/map/index.vue                | 10 ++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue
index 69bd9b9..7f20057 100644
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@@ -11,7 +11,7 @@
       <xf-point v-if="type === 'point'" :id="id" :type="type" :gangkou="gangkou"/>
       <xf-control v-if="type === 'xfbf01' || type ==='xfkzs01' || type ==='xfjyd01' || type ==='xfsy01'" :id="id" :type="type" :gangkou="gangkou"/>
       <alarm-device v-if="type === 'alarm'" :id="id" :type="type" :gangkou="gangkou"/>
-      <mk-gate-machine v-if="type === 'CAR'||type ==='PERSON' || type ==='CAMERA'" :id="id" :type="type" :gangkou="gangkou"/>
+      <mk-gate-machine v-if="type === 'CAR'||type ==='PERSON' || type ==='CAMERA'" :id="id" :type="type" :gangkou="gangkou" :corp-id="corpInfoId"/>
       <mk-gate-machine-cfd v-if="type === 'CAR00004'||type ==='PERSON00004' " :id="id" :type="type" :gangkou="gangkou" :infoname="infoname"/>
       <mk-gate-machine-cmt v-if="type === 'CAR00005'||type ==='PERSON00005' " :id="id" :type="type" :gangkou="gangkou" :infoname="infoname"/>
       <zhong_da_info v-if="type === 'majordangersource'" :id="id" :type="type" :gangkou="gangkou"/>
diff --git a/src/views/map/dialog/mkGateMachine.vue b/src/views/map/dialog/mkGateMachine.vue
index 33d8cbd..2d30780 100644
--- a/src/views/map/dialog/mkGateMachine.vue
+++ b/src/views/map/dialog/mkGateMachine.vue
@@ -79,6 +79,12 @@ export default {
     gangkou: {
       type: String,
       default: ''
+    },
+    corpId: {
+      type: String,
+      default() {
+        return ''
+      }
     }
   },
   data() {
@@ -107,7 +113,8 @@ export default {
         {
           GATE_AREA_ID: this.id,
           TYPE: this.type,
-          GANGKOU: this.gangkou
+          GANGKOU: this.gangkou,
+          CORPINFO_ID: this.corpId
         }
       ).then((data) => {
         Object.assign(this.info, data.pd)
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 4f6f9fd..c052698 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -459,6 +459,16 @@ export default {
           containAuthorization: [],
           eliminateAuthorization: [],
           list: [
+            {
+              label: '人员',
+              dialog_width: '800px',
+              check: false,
+              img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
+              checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
+              type: 'PERSON',
+              containAuthorization: [],
+              eliminateAuthorization: []
+            },
             {
               label: '车辆',
               dialog_width: '600px',

From ece26192aac36f242ad65c7511ebf3bf7276a630 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 20 May 2024 13:51:32 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E4=B9=9D=E5=85=AC=E5=8F=B8=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/index.vue             |  5 +-
 src/views/map/dialog/peoplePositionYGS.vue |  2 +-
 src/views/map/index.vue                    | 70 ++++++++++++++++++++--
 3 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue
index 69bd9b9..bdc983e 100644
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@@ -53,8 +53,8 @@
       <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'" :id="id" :type="type" />
-      <peoplePositionYGS v-if="type === 'peoplePositionOne' && corpInfoId === '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :corp-id="corpInfoId" />
+      <peoplePositionOne v-if="type === 'peoplePositionOne' && !(corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26')" :id="id" :type="type" />
+      <peoplePositionYGS v-if="type === 'peoplePositionOne' && (corpInfoId === '035958e685cf4850bc40151c5e0617a6' || corpInfoId === '21590a00ea5e462e9ee44dd332dddc26')" :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" />
@@ -111,7 +111,6 @@ import outSourceVideoInfo from './outSourceVideoInfo.vue'
 import AlarmDevice from './alarmDevice'
 import meteorologicalMonitoring from './meteorologicalMonitoring.vue'
 
-
 export default {
   components: {
     AlarmDevice,
diff --git a/src/views/map/dialog/peoplePositionYGS.vue b/src/views/map/dialog/peoplePositionYGS.vue
index 71c5673..552186d 100644
--- a/src/views/map/dialog/peoplePositionYGS.vue
+++ b/src/views/map/dialog/peoplePositionYGS.vue
@@ -41,7 +41,7 @@
       </tr>
       <tr>
         <td class="bbg-transparent">定位卡电量</td>
-        <td >{{ info?otherInfo.data[3].currentValBody.val:'' }}</td>
+        <td >{{ info?(otherInfo?otherInfo.data[3].currentValBody.val:'*'):'' }}</td>
       </tr>
       <tr>
         <td class="bbg-transparent">部门</td>
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 4f6f9fd..0f5d6fd 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -1346,15 +1346,14 @@ export default {
         url: '/mapapi/ware/upload/qhdgysh/merge_tile.json'
       })
       viewer.scene.primitives.add(qhdgysh)
-      var czkszhmt = new Cesium.Cesium3DTileset({ //沧州矿石 杂货码头
+      var czkszhmt = new Cesium.Cesium3DTileset({ // 沧州矿石 杂货码头
         url: '/mapapi/ware/upload/%E6%B2%A7%E5%B7%9E%E6%B8%AF%E8%A5%BF/%E6%B2%A7%E5%B7%9E%E6%B8%AF%E8%A5%BF/merge_tile.json'
       })
       viewer.scene.primitives.add(czkszhmt)
-      var czksksmt = new Cesium.Cesium3DTileset({//沧州矿石 矿石码头
+      var czksksmt = new Cesium.Cesium3DTileset({// 沧州矿石 矿石码头
         url: '/mapapi/ware/upload/%E6%B2%A7%E5%B7%9E%E6%B8%AF%E4%B8%9C/%E6%B2%A7%E5%B7%9E%E6%B8%AF%E4%B8%9C/merge_tile.json'
       })
       viewer.scene.primitives.add(czksksmt)
-
     },
 
     leftDownAction() {
@@ -2050,6 +2049,10 @@ export default {
           this.clearMqttPoint('+/UwbBQ/')
           this.removeTrajectory()
         }
+        if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' && urlType === 'peoplePosition') {
+          this.clearRYDWPoint('+/UwbBQ/')
+          this.removeTrajectory()
+        }
         this.bottomOptionsList[pindex].list[index].check = false
         if (this.gangkouActive === '00004') {
           this.cfdBottomOptionsList[pindex].list[index].check = false
@@ -2078,6 +2081,9 @@ 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' && urlType === 'peoplePosition') {
+          // websocket实时获取人员定位
+          this.initRYDWWebsocket('21590a00ea5e462e9ee44dd332dddc26')
         } else {
           requestFN(
             pointUrl,
@@ -2344,7 +2350,7 @@ export default {
     },
 
     // 查询当前点位是否在区域内
-    isPointxyWithinTheArea(pointBox, x, y) {
+    isPointxyWithinTheArea(pointBox = {}, x, y) {
       if (this.forEachIsPointInPolygon(pointBox.redList, x, y)) {
         return '_1'
       } else if (this.forEachIsPointInPolygon(pointBox.orangeList, x, y)) {
@@ -2635,6 +2641,15 @@ export default {
         delete this.mqttPoint[key]
       }
     },
+    clearRYDWPoint(prefix) {
+      this.fwebsocket.close()
+      for (const mqttPointKey in this.mqttPoint) {
+        const key = prefix ? prefix + this.mqttPoint[mqttPointKey] : mqttPointKey
+        viewer.entities.removeById(this.mqttPoint[key])
+        this.onePerLocArr = this.onePerLocArr.filter(item => item.data_id !== this.mqttPoint[key])
+        delete this.mqttPoint[key]
+      }
+    },
     // 删除人员定位点
     clearCmtMqttPoint(prefix) {
       for (const mqttPointKey in this.allOrientationPoint) {
@@ -2806,6 +2821,51 @@ export default {
         }
       }
     },
+    // 九公司人员定位websocket
+    initRYDWWebsocket(CORP_INFO_ID) {
+      // eslint-disable-next-line no-unused-vars
+      const _this = this
+      if (window.WebSocket) {
+        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).data.data
+          console.log(peopleList)
+          for (let i = 0; i < peopleList.length; i++) {
+            const item = peopleList[i]
+            if ((!item) || (item.ts === 1)) continue
+            // 将地图上剩余的点与最新的定位人员点进行对比   更新地图上已存在的点    新增地图上之前没有的点
+            const index = _this.onePerLocArr.findIndex(item1 => {
+              return item1.id.toString() === item.id.toString()
+            })
+            const x = item.lon
+            const y = item.lat
+            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.id,
+                x: x,
+                y: y,
+                icon_type: 'img4_0' + pointColor,
+                data_id: item.id,
+                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.id] = item.id
+            }
+          }
+        }
+      }
+    },
     radomPer(mockData) {
       for (const item of mockData.data) {
         item.longitude += 0.0003 * Math.random()
@@ -3042,7 +3102,7 @@ export default {
     },
 
     //  循环判断某个点是否在某些区域内。只要在任意一个区域内。则返回true
-    forEachIsPointInPolygon(polygonList, lng, lat) {
+    forEachIsPointInPolygon(polygonList = [], lng, lat) {
       return polygonList.some(item => {
         return this.isPointInPolygon(item.position, lng, lat)
       })

From 93ffe2b5af8d6580818874048a4019612cb8c51a Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Mon, 20 May 2024 14:46:11 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E9=97=A8?=
 =?UTF-8?q?=E5=8F=A3=E9=97=A8=E7=A6=81=E5=9C=B0=E5=9B=BE=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E7=82=B9=E4=BD=8D=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/mkGateMachine.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/map/dialog/mkGateMachine.vue b/src/views/map/dialog/mkGateMachine.vue
index 2d30780..aa3ba24 100644
--- a/src/views/map/dialog/mkGateMachine.vue
+++ b/src/views/map/dialog/mkGateMachine.vue
@@ -34,8 +34,8 @@
               <td>{{ item.USERNAME }}</td>
               <td>{{ item.TIME }}</td>
               <td>
-                <span v-if="item.STATE === '0'">进入</span>
-                <span v-if="item.STATE === '1'">出去</span>
+                <span v-if="item.STATE === 0">进入</span>
+                <span v-if="item.STATE === 1">出去</span>
               </td>
             </tr>
           </table>
@@ -150,7 +150,8 @@ export default {
         {
           GATE_AREA_ID: this.id,
           TYPE: this.type,
-          GANGKOU: this.gangkou
+          GANGKOU: this.gangkou,
+          CORPINFO_ID: this.corpId
         }
       ).then((data) => {
         this.recordAllList = data.recordAllList

From 80df79c653020b866b6b097d6ca3806591f2636e Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 20 May 2024 16:08:39 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=95=B0bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 0f5d6fd..8c138e9 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -2834,7 +2834,7 @@ export default {
           console.log(peopleList)
           for (let i = 0; i < peopleList.length; i++) {
             const item = peopleList[i]
-            if ((!item) || (item.ts === 1)) continue
+            if ((!item)) continue
             // 将地图上剩余的点与最新的定位人员点进行对比   更新地图上已存在的点    新增地图上之前没有的点
             const index = _this.onePerLocArr.findIndex(item1 => {
               return item1.id.toString() === item.id.toString()

From 83a324ee44d282d202d74103063b6c51f7101955 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 20 May 2024 18:05:34 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9B=9E=E6=BB=9A?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 6c4aa93..8c138e9 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -459,16 +459,6 @@ export default {
           containAuthorization: [],
           eliminateAuthorization: [],
           list: [
-            {
-              label: '人员',
-              dialog_width: '800px',
-              check: false,
-              img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
-              checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
-              type: 'PERSON',
-              containAuthorization: [],
-              eliminateAuthorization: []
-            },
             {
               label: '车辆',
               dialog_width: '600px',