From 5657b2d80601a636b2863a5dbfbcff3ca1ae5aa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Tue, 20 May 2025 22:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/device/DevTowerDataCollideMapper.xml          | 5 ++---
 .../resources/mapper/device/DevTowerDataLimitMapper.xml  | 5 ++---
 .../resources/mapper/device/DevTowerDataLocalMapper.xml  | 7 +++----
 .../resources/mapper/device/DevTowerDataRoundMapper.xml  | 7 +++----
 .../resources/mapper/device/DevTowerDataRunMapper.xml    | 8 +++-----
 .../mapper/device/DevTowerDataWarningMapper.xml          | 7 +++----
 .../mapper/device/DevTowerProjectConfigMapper.xml        | 7 +++----
 .../src/views/device/towerDataCollide/index.vue          | 9 +++------
 yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue | 9 +++------
 yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue | 9 +++------
 yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue   | 9 +++------
 11 files changed, 31 insertions(+), 51 deletions(-)

diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml
index dee40cbb..f494b019 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml
@@ -59,12 +59,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDevTowerDataCollideVo">
-        select dtdc.id, dtdc.cfg_id, dtdc.project_id, dtdc.com_id, sp.dept_name projectName, sd.dept_name com_name,dtdc.dept_id,pd.sub_dept_name dept_name,
+        select dtdc.id, dtdc.cfg_id, dtdc.project_id, dtdc.com_id, sp.project_name as projectName, sd.dept_name as com_name, dtdc.dept_id,
                dtdc.device_key, dtdc.device_source, dtdc.tower_id, dtdc.coordinate_x, dtdc.coordinate_y, dtdc.front_brachium, dtdc.after_brachium, dtdc.tower_body_height, dtdc.height, dtdc.angle, dtdc.range, dtdc.early_warning_distance, dtdc.alarm_warning_distance, dtdc.contour_value, dtdc.is_del, dtdc.create_by, dtdc.create_time, dtdc.update_by, dtdc.update_time, dtdc.remark
         from dev_tower_data_collide dtdc
-                 left join sys_dept sp on sp.dept_id = dtdc.project_id
+                 left join pro_project_info sp on sp.id = dtdc.project_id
                  left join sys_dept sd on sd.dept_id = dtdc.com_id
-                 left join pro_project_info_subdepts pd on pd.id=dtdc.dept_id
     </sql>
 
     <select id="selectDevTowerDataCollideList" parameterType="DevTowerDataCollide" resultMap="DevTowerDataCollideResult">
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml
index 282d9bf7..1ea8f06c 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml
@@ -59,12 +59,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDevTowerDataLimitVo">
-        select dtdl.id, dtdl.cfg_id, dtdl.project_id, dtdl.com_id, sp.dept_name projectName, sd.dept_name com_name,dtdl.dept_id,pd.sub_dept_name dept_name,
+        select dtdl.id, dtdl.cfg_id, dtdl.project_id, dtdl.com_id, sp.project_name as projectName, sd.dept_name as com_name, dtdl.dept_id,
                dtdl.device_key, dtdl.device_source, dtdl.tower_id, dtdl.wind_speed_warning, dtdl.wind_speed_alarm, dtdl.load_warning, dtdl.load_alarm, dtdl.moment_warning, dtdl.moment_alarm, dtdl.high_limit_warning, dtdl.high_limit_alarm, dtdl.low_limit_warning, dtdl.low_limit_alarm, dtdl.left_limit_warning, dtdl.left_limit_alarm, dtdl.right_limit_warning, dtdl.right_limit_alarm, dtdl.front_limit_warning, dtdl.front_limit_alarm, dtdl.back_limit_warning, dtdl.back_limit_alarm, dtdl.collision_angle_warning, dtdl.collision_angle_alarm, dtdl.collision_distance_warning, dtdl.collision_distance_alarm, dtdl.h_distance_warning, dtdl.h_distance_alarm, dtdl.v_distance_warning, dtdl.v_distance_alarm, dtdl.lean_warning, dtdl.lean_alarm, dtdl.range_limit_start, dtdl.range_limit_end, dtdl.height_limit_start, dtdl.height_limit_end, dtdl.rotation_limit_start, dtdl.rotation_limit_end, dtdl.is_del, dtdl.create_by, dtdl.create_time, dtdl.update_by, dtdl.update_time, dtdl.remark
         from dev_tower_data_limit dtdl
-                 left join sys_dept sp on sp.dept_id = dtdl.project_id
+                left join pro_project_info sp on sp.id = dtdl.project_id
                  left join sys_dept sd on sd.dept_id = dtdl.com_id
-                 left join pro_project_info_subdepts pd on pd.id=dtdl.dept_id
 
     </sql>
 
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml
index 825456cb..ca311b90 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml
@@ -47,8 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                dtdl.cfg_id,
                dtdl.project_id,
                dtdl.com_id,
-               sp.dept_name projectName,
-               sd.dept_name com_name,dtdl.dept_id,pd.sub_dept_name dept_name,
+               sp.project_name as projectName,
+               sd.dept_name as com_name, dtdl.dept_id
                dtdl.device_key,
                dtdl.device_source,
                dtdl.tower_id,
@@ -77,9 +77,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                dtdl.update_time,
                dtdl.remark
         from dev_tower_data_local dtdl
-                 left join sys_dept sp on sp.dept_id = dtdl.project_id
+        left join pro_project_info sp on sp.id = dtdl.project_id
                  left join sys_dept sd on sd.dept_id = dtdl.com_id
-                 left join pro_project_info_subdepts pd on pd.id=dtdl.dept_id
     </sql>
 
     <select id="selectDevTowerDataLocalList" parameterType="DevTowerDataLocal" resultMap="DevTowerDataLocalResult">
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml
index d0660349..3fafc0c2 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml
@@ -56,8 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                dtdr.cfg_id,
                dtdr.project_id,
                dtdr.com_id,
-               sp.dept_name projectName,
-               sd.dept_name com_name,dtdr.dept_id,pd.sub_dept_name dept_name,
+               sp.project_name as projectName,
+               sd.dept_name as com_name, dtdr.dept_id,
                dtdr.device_key,
                dtdr.device_source,
                dtdr.tower_id,
@@ -94,9 +94,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                dtdr.update_time,
                dtdr.remark
         from dev_tower_data_round dtdr
-                 left join sys_dept sp on sp.dept_id = dtdr.project_id
+        left join pro_project_info sp on sp.id = dtdr.project_id
                  left join sys_dept sd on sd.dept_id = dtdr.com_id
-                 left join pro_project_info_subdepts pd on pd.id=dtdr.dept_id
     </sql>
 
     <select id="selectDevTowerDataRoundList" parameterType="DevTowerDataRound" resultMap="DevTowerDataRoundResult">
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
index 35eed5a0..17146cfb 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
@@ -50,8 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                dtdr.cfg_id,
                dtdr.project_id,
                dtdr.com_id,
-               sp.dept_name projectName,
-               sd.dept_name com_name,dtdr.dept_id,pd.sub_dept_name dept_name,
+               sp.project_name as projectName,
+               sd.dept_name as com_name, dtdr.dept_id,
                dtdr.device_key,
                dtdr.device_source,
                dtdr.height,
@@ -83,10 +83,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                dtdr.update_time,
                dtdr.remark
         from dev_tower_data_run dtdr
-                 left join sys_dept sp on sp.dept_id = dtdr.project_id
+        left join pro_project_info sp on sp.id = dtdr.project_id
                  left join sys_dept sd on sd.dept_id = dtdr.com_id
-                 left join pro_project_info_subdepts pd on pd.id=dtdr.dept_id
-
     </sql>
 
     <select id="selectDevTowerDataRunList" parameterType="DevTowerDataRun" resultMap="DevTowerDataRunResult">
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml
index a2a9a496..fb3b349f 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml
@@ -42,8 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                dtdw.cfg_id,
                dtdw.project_id,
                dtdw.com_id,
-               sp.dept_name projectName,
-               sd.dept_name com_name,dtdw.dept_id,pd.sub_dept_name dept_name,
+               sp.project_name as projectName,
+               sd.dept_name as com_name, dtdw.dept_id,
                dtdw.device_key,
                dtdw.device_source,
                dtdw.tower_id,
@@ -69,8 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from dev_tower_data_warning dtdw
              left join sys_dept sp on sp.dept_id = dtdw.project_id
              left join sys_dept sd on sd.dept_id = dtdw.com_id
-             left join pro_project_info_subdepts pd on pd.id=dtdw.dept_id
-    </sql>
+         </sql>
 
     <select id="selectDevTowerDataWarningList" parameterType="DevTowerDataWarning" resultMap="DevTowerDataWarningResult">
         <include refid="selectDevTowerDataWarningVo"/>
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml
index f93c6794..e8b4beaf 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml
@@ -41,8 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select dtpc.id,
                dtpc.project_id,
                dtpc.com_id,
-               sp.dept_name projectName,
-               sd.dept_name com_name,dtpc.dept_id,pd.sub_dept_name dept_name,
+               sp.project_name as projectName,
+               sd.dept_name as com_name, dtpc.dept_id
                dtpc.device_sn,
                dtpc.device_name,
                dtpc.device_source,
@@ -67,9 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                dtpc.update_time,
                dtpc.remark
         from dev_tower_project_config dtpc
-                 left join sys_dept sp on sp.dept_id = dtpc.project_id
+        left join sys_dept sp on sp.dept_id = dtpc.project_id
                  left join sys_dept sd on sd.dept_id = dtpc.com_id
-                 left join pro_project_info_subdepts pd on pd.id=dtpc.dept_id
 
     </sql>
 
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue
index 37d99f1a..5fedbc51 100644
--- a/yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue
+++ b/yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue
@@ -39,12 +39,9 @@
             <right-toolbar :showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="towerDataCollideList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="id" align="center" prop="id" width="100" />
-            <el-table-column label="项目名称" align="center" prop="projectName" width="150"
-                v-if="currentPrjId ? false : true" />
-            <el-table-column label="所属单位" align="center" prop="deptName" width="150" />
+        <el-table v-loading="loading" :data="towerDataCollideList">
+            <el-table-column label="编号" align="center" prop="id" width="88" />
+            <el-table-column label="项目名称" align="center" prop="projectName" width="150" />
             <el-table-column label="设备序列号" align="center" prop="deviceKey" width="200" />
             <el-table-column label="塔机坐标x" align="center" prop="coordinateX" width="120" />
             <el-table-column label="塔机坐标y" align="center" prop="coordinateY" width="120" />
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue
index 0f610709..67fbae7b 100644
--- a/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue
+++ b/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue
@@ -38,12 +38,9 @@
             <right-toolbar :showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="towerDataLimitList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="id" align="center" prop="id" width="100" />
-            <el-table-column label="项目名称" align="center" prop="projectName" width="150"
-                v-if="currentPrjId ? false : true" />
-            <el-table-column label="所属单位" align="center" prop="deptName" width="150" />
+        <el-table v-loading="loading" :data="towerDataLimitList">
+            <el-table-column label="编号" align="center" prop="id" width="88" />
+            <el-table-column label="项目名称" align="center" prop="projectName" width="150" />
             <el-table-column label="设备序列号" align="center" prop="deviceKey" width="200" />
             <el-table-column label="风速预警" align="center" prop="windSpeedWarning" width="120" />
             <el-table-column label="风速报警" align="center" prop="windSpeedAlarm" width="120" />
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue
index db0f8b13..29153925 100644
--- a/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue
+++ b/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue
@@ -39,12 +39,9 @@
             <right-toolbar :showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="towerDataRoundList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="id" align="center" prop="id" width="100" />
-            <el-table-column label="项目名称" align="center" prop="projectName" width="200"
-                v-if="currentPrjId ? false : true" />
-            <el-table-column label="所属单位" align="center" prop="deptName" width="150" />
+        <el-table v-loading="loading" :data="towerDataRoundList">
+            <el-table-column label="编号" align="center" prop="id" width="88" />
+            <el-table-column label="项目名称" align="center" prop="projectName" width="150" />
             <el-table-column label="设备序列号" align="center" prop="deviceKey" width="200" />
             <el-table-column label="工作循环开始" align="center" prop="workStartTime" width="180" />
             <el-table-column label="工作循环结束" align="center" prop="workEndTime" width="180" />
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue
index 1c28bf1e..ce35c7f0 100644
--- a/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue
+++ b/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue
@@ -43,12 +43,9 @@
             </el-alert>
         </el-row>
 
-        <el-table v-loading="loading" :data="towerDataRunList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="id" align="center" prop="id" width="100" />
-            <el-table-column label="项目名称" align="center" prop="projectName" width="200"
-                v-if="currentPrjId ? false : true" />
-            <el-table-column label="所属单位" align="center" prop="deptName" width="150" />
+        <el-table v-loading="loading" :data="towerDataRunList">
+            <el-table-column label="编号" align="center" prop="id" width="88" />
+            <el-table-column label="项目名称" align="center" prop="projectName" width="150" />
             <el-table-column label="设备序列号" align="center" prop="deviceKey" width="200" />
             <el-table-column label="警报信息" align="center" prop="warnings" width="200">
                 <template #default="scope">