From 7e40d6fe51892de0655483d22ca07973bbd49d6c Mon Sep 17 00:00:00 2001
From: gsy <371279144@qq.com>
Date: Wed, 15 Oct 2025 16:42:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E4=BD=BF=E7=94=A8=E8=AE=BE=E5=A4=87=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zdyh/HiddenDangerAreaInfoMapper.xml       | 18 +++++++--------
 .../src/views/ZDYH/hiddenDangerArea.vue       | 22 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ZcInfoQuery/src/main/java/com/nmgs/mapper/zdyh/HiddenDangerAreaInfoMapper.xml b/ZcInfoQuery/src/main/java/com/nmgs/mapper/zdyh/HiddenDangerAreaInfoMapper.xml
index ee9f1e33..1c783f5f 100644
--- a/ZcInfoQuery/src/main/java/com/nmgs/mapper/zdyh/HiddenDangerAreaInfoMapper.xml
+++ b/ZcInfoQuery/src/main/java/com/nmgs/mapper/zdyh/HiddenDangerAreaInfoMapper.xml
@@ -7,8 +7,8 @@
 
     <select id="getHiddenDeptTop" resultType="java.util.Map">
         select
-            departmentno,
-            departmentname,
+            equipmentid,
+            equipmentname,
             sum(fatiguecount+
             severefatiguecount+
             speedcount+
@@ -25,7 +25,7 @@
             AND classdate &lt; STR_TO_DATE(#{params.classDateEndQuery}, '%Y-%m-%d %H:%i:%s')
         </if>
         </where>
-        GROUP BY departmentno,departmentname
+        GROUP BY equipmentid,equipmentname
         order by count desc
         <if test="params.queryLimit != null and params.queryLimit != '' and params.queryLimit == 5 ">
             limit 5
@@ -38,8 +38,8 @@
 
     <select id="getPiLaoTop" resultType="java.util.Map">
         select
-        departmentno,
-        departmentname,
+        equipmentid,
+        equipmentname,
         sum(fatiguecount) as count,
         sum(truckfatiguecount) as truckfatiguecount,
         sum(dangerfatiguecount) as dangerfatiguecount,
@@ -55,7 +55,7 @@
                 AND classdate &lt; STR_TO_DATE(#{params.classDateEndQuery}, '%Y-%m-%d %H:%i:%s')
             </if>
         </where>
-        GROUP BY departmentno,departmentname
+        GROUP BY equipmentid,equipmentname
         order by count desc
         <if test="params.queryLimit != null and params.queryLimit != '' and params.queryLimit == 5 ">
             limit 5
@@ -70,8 +70,8 @@
         select
             danger.fenceid,
             danger.pilenumber,
-            danger.departmentno,
-            danger.departmentname,
+            danger.equipmentid,
+            danger.equipmentname,
             danger.speedcount,
             danger.truckspeedcount,
             danger.dangerspeedcount,
@@ -96,7 +96,7 @@
 
 
     <select id="getDeptPointByDeptId" resultType="java.util.Map">
-        select * from zdyh_fence_info fen where fen.departmentno = #{departmentno} order by pilenumber
+        select * from zdyh_fence_info fen where fen.equipmentid = #{equipmentid} order by pilenumber
     </select>
 
     <select id="getSpeedPoint" resultType="java.util.Map">
diff --git a/ZcInfoQueryView/src/views/ZDYH/hiddenDangerArea.vue b/ZcInfoQueryView/src/views/ZDYH/hiddenDangerArea.vue
index edb94a92..c28b1835 100644
--- a/ZcInfoQueryView/src/views/ZDYH/hiddenDangerArea.vue
+++ b/ZcInfoQueryView/src/views/ZDYH/hiddenDangerArea.vue
@@ -51,7 +51,7 @@
                                         <el-col style="display: flex;justify-content: space-between;">
                                             <span>{{ index + 1 }}<span
                                                     style="font-size: 14px;font-weight: bold;padding-left: 10px;">{{
-                                                        item.departmentname }}</span></span>
+                                                        item.equipmentname }}</span></span>
                                             <el-icon>
                                                 <ArrowRight />
                                             </el-icon>
@@ -132,10 +132,10 @@
             <el-col style="margin-left: 2%;" :span="24">
                 <el-descriptions :column="1" :size="size">
                     <el-descriptions-item label="部门编号">{{
-                        nowPilaoArea.departmentno }}</el-descriptions-item>
+                        nowPilaoArea.equipmentid }}</el-descriptions-item>
 
                     <el-descriptions-item label="所属部门">{{
-                        nowPilaoArea.departmentname }}</el-descriptions-item>
+                        nowPilaoArea.equipmentname }}</el-descriptions-item>
                 </el-descriptions>
             </el-col>
             <el-row style="margin-left: 2%;">
@@ -174,10 +174,10 @@
             <el-col style="margin-left: 2%;" :span="24">
                 <el-descriptions :column="2" :size="size">
                     <el-descriptions-item :span="2" label="部门编号">{{
-                        nowSpeedArea.departmentno }}</el-descriptions-item>
+                        nowSpeedArea.equipmentid }}</el-descriptions-item>
 
                     <el-descriptions-item :span="2" label="所属部门">{{
-                        nowSpeedArea.departmentname }}</el-descriptions-item>
+                        nowSpeedArea.equipmentname }}</el-descriptions-item>
 
                     <el-descriptions-item :span="2" label="桩号">{{
                         nowSpeedArea.pilenumber }}</el-descriptions-item>
@@ -294,7 +294,7 @@ function getHiddenDate() {
             let datasxAxis = [];
             let datasxseries = [];
             for (let item of deptsData) {
-                datasxAxis.push(item.departmentname);
+                datasxAxis.push(item.equipmentname);
                 datasxseries.push(item.count);
             }
             hiddenDeptEachers(datasxAxis, datasxseries);
@@ -305,7 +305,7 @@ function getHiddenDate() {
             let datasxAxis = [];
             let datasxseries = [];
             for (let item of piLaoList.value) {
-                datasxAxis.push(item.departmentname);
+                datasxAxis.push(item.equipmentname);
                 datasxseries.push(item.count);
             }
             piLaoEachers(datasxAxis, datasxseries);
@@ -346,7 +346,7 @@ function reloadDate() {
             let datasxAxis = [];
             let datasxseries = [];
             for (let item of deptsData) {
-                datasxAxis.push(item.departmentname);
+                datasxAxis.push(item.equipmentname);
                 datasxseries.push(item.count);
             }
             hiddenDeptEachers(datasxAxis, datasxseries);
@@ -357,7 +357,7 @@ function reloadDate() {
             let datasxAxis = [];
             let datasxseries = [];
             for (let item of piLaoList.value) {
-                datasxAxis.push(item.departmentname);
+                datasxAxis.push(item.equipmentname);
                 datasxseries.push(item.count);
             }
             piLaoEachers(datasxAxis, datasxseries);
@@ -428,7 +428,7 @@ function addPonit() {
         let deptFill = [];
         let deptLinePoint = [];
         for (let item of piLaoList.value) {
-            let deptPoint = pilaoDeptAreaPointDate.value[item.departmentno];
+            let deptPoint = pilaoDeptAreaPointDate.value[item.equipmentid];
             if (null != deptPoint) {
                 for (let point of deptPoint) {
                     deptFill.push({
@@ -820,7 +820,7 @@ function showPiLaoDetil(item) {
     nowPilaoArea.value = item;
     let matchFill = ["match", ["get", "gid"]];
     let matchPoint = ["match", ["get", "gid"]];
-    let deptPoint = pilaoDeptAreaPointDate.value[item.departmentno];
+    let deptPoint = pilaoDeptAreaPointDate.value[item.equipmentid];
     //计算区域中间下标作为中心点位
     let index = deptPoint.length > 1 ? Math.floor(deptPoint.length / 2) - 1 : 0;
     //设置中心点位