diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosAlarmMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosAlarmMapper.xml
index b2b39bf7..f4c59909 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosAlarmMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosAlarmMapper.xml
@@ -42,7 +42,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="deptName"/>
         <result property="prjName" column="prjName"/>
         <result property="projectId" column="projectId"/>
-        <result property="subDeptId" column=""/>
     </resultMap>
 
     <sql id="selectDevPitmonitSouthsmosAlarmVo">
@@ -51,12 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDevPitmonitSouthsmosAlarmList" parameterType="PitmonitSouthsmosAlarm" resultMap="PitmonitSouthsmosAlarmResult">
-        SELECT a.*,c.unitName AS deptName,b.project_id as projectId,p.projectName prjName,c.unitName as deptName,b.sub_dept_id subDeptId
+        SELECT a.*,b.project_id as projectId,pi.project_name as prjName
         FROM dev_pitmonit_southsmos_alarm a
         JOIN sur_project_pit_monit_cfg b ON a.cfgId = b.id
-        JOIN sur_project p on b.project_id =p.id
-        JOIN sur_project_unit_info c ON b.sub_dept_id = c.unitId AND b.project_id = c.projectId
-        WHERE  a.is_del = 0
+        JOIN pro_project_info pi on pi.id=b.project_id
+        <where>
             <if test="cfgId != null "> and a.cfgId = #{cfgId}</if>
             <if test="srvId != null "> and  a.srvId = #{srvId}</if>
             <if test="alarmInfo != null  and alarmInfo != ''"> and  a.alarmInfo = #{alarmInfo}</if>
@@ -85,7 +83,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="variety != null  and variety != ''"> and  a.variety = #{variety}</if>
             <if test="state != null "> and  a.state = #{state}</if>
             <if test="projectId != null and projectId>0 "> and  b.project_id= #{projectId}</if>
-            <if test="subDeptId != null and subDeptId>0 "> and  b.sub_dept_id= #{subDeptId}</if>
+            and a.is_del = 0
+        </where>
     </select>
     
     <select id="selectDevPitmonitSouthsmosAlarmById" parameterType="Long" resultMap="PitmonitSouthsmosAlarmResult">
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosDataMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosDataMapper.xml
index 67f1638b..9d021c26 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosDataMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosDataMapper.xml
@@ -29,7 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="deptName" column="deptName"/>
         <result property="projectId" column="projectId"/>
-        <result property="subDeptId" column="subDeptId"/>
         <result property="prjName" column="prjName"/>
     </resultMap>
 
@@ -38,12 +37,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDevPitmonitSouthsmosDataList" parameterType="PitmonitSouthsmosData" resultMap="PitmonitSouthsmosDataResult">
-        SELECT a.*,c.unitName AS deptName,b.project_id AS projectId,p.projectName prjName,c.unitName AS deptName,b.sub_dept_id subDeptId
+        SELECT a.*, b.project_id AS projectId, pi.project_name as prjName
         FROM dev_pitmonit_southsmos_data a
         JOIN sur_project_pit_monit_cfg b ON a.cfgId = b.id
-        JOIN sur_project p ON b.project_id =p.id
-        JOIN sur_project_unit_info c ON b.sub_dept_id = c.unitId AND b.project_id = c.projectId
-        WHERE  a.is_del = 0
+        JOIN pro_project_info pi on pi.id=b.project_id
+        <where>
             <if test="cfgId != null "> and a.cfgId = #{cfgId}</if>
             <if test="dataType != null  and dataType != ''"> and a.dataType = #{dataType}</if>
             <if test="dataId != null "> and a.dataId = #{dataId}</if>
@@ -62,7 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime!=null">and  date(a.collectTime) &gt;= date(#{createTime})</if>
             <if test="updateTime!=null">and date(a.collectTime) &lt;= date(#{updateTime})</if>
             <if test="projectId != null and projectId>0 "> and  b.project_id= #{projectId}</if>
-            <if test="subDeptId != null and subDeptId>0 "> and  b.sub_dept_id= #{subDeptId}</if>
+            and a.is_del = 0
+        </where>
         order by a.collectTime desc
     </select>
     
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml
index e63c5a8e..bde78218 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml
@@ -38,7 +38,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="deptName" column="deptName"/>
         <result property="projectId" column="projectId"/>
-        <result property="subDeptId" column="subDeptId"/>
         <result property="prjName" column="prjName"/>
         <collection property="surveypoints" ofType="pitmonitSouthsmosSurveypoint">
             <id property="spId" column="spId"></id>
@@ -56,15 +55,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDevPitmonitSouthsmosDeviceList" parameterType="PitmonitSouthsmosDevice" resultMap="PitmonitSouthsmosDeviceResult">
-        SELECT a.*,c.unitName AS deptName,b.project_id AS projectId,p.projectName prjName,c.unitName AS deptName,b.sub_dept_id subDeptId,
-               sp.meName,sp.meNameEn,sp.name spName,sp.position spPosition,sp.groupName
+        SELECT a.*, b.project_id AS projectId,pi.project_name as prjName, sp.meName, sp.meNameEn, sp.name as spName, sp.position as spPosition, sp.groupName
         FROM dev_pitmonit_southsmos_device a
         JOIN sur_project_pit_monit_cfg b ON a.cfgId = b.id
-        JOIN sur_project p ON b.project_id =p.id
-        JOIN sur_project_unit_info c ON b.sub_dept_id = c.unitId AND b.project_id = c.projectId
+        JOIN pro_project_info pi on pi.id=b.project_id
         left join dev_pitmonit_southsmos_dev_sp ds on a.devId=ds.devId
         left Join dev_pitmonit_southsmos_surveypoint sp on ds.spId=sp.spId
-        WHERE  a.is_del = 0
+        <where>
             <if test="cfgId != null "> and a.cfgId = #{cfgId}</if>
             <if test="devId != null "> and a.devId = #{devId}</if>
             <if test="autoType != null  and autoType != ''"> and a.autoType = #{autoType}</if>
@@ -90,7 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="verifyDate != null  and verifyDate != ''"> and a.verifyDate = #{verifyDate}</if>
             <if test="state != null "> and a.state = #{state}</if>
             <if test="projectId != null and projectId>0 "> and  b.project_id= #{projectId}</if>
-            <if test="subDeptId != null and subDeptId>0 "> and  b.sub_dept_id= #{subDeptId}</if>
+            and a.is_del = 0
+        </where>
     </select>
     
     <select id="selectDevPitmonitSouthsmosDeviceById" parameterType="Long" resultMap="PitmonitSouthsmosDeviceResult">
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosElementMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosElementMapper.xml
index 5b1280ac..ff3bbe72 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosElementMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosElementMapper.xml
@@ -22,7 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="deptName" column="deptName"/>
         <result property="projectId" column="projectId"/>
-        <result property="subDeptId" column="subDeptId"/>
         <result property="prjName" column="prjName"/>
         <collection property="children" ofType="pitmonitSouthsmosElementItem">
             <id property="id" column="itemId"/>
@@ -40,14 +39,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDevPitmonitSouthsmosElementList" parameterType="PitmonitSouthsmosElement" resultMap="PitmonitSouthsmosElementResult">
-        SELECT a.*,c.unitName AS deptName,b.project_id AS projectId,p.projectName prjName,c.unitName AS deptName,b.sub_dept_id subDeptId,
-        it.id itemId,it.name itemName,it.step itemStep,it.unit itemUnit,it.valueRange itemValueRange,it.gmtCreate itemGmtCreate,it.gmtModified itemGmtModified
+        SELECT a.*, b.project_id AS projectId, pi.project_name as prjName,
+        it.id as itemId,it.name as itemName,it.step as itemStep,it.unit as itemUnit,it.valueRange as itemValueRange,it.gmtCreate as itemGmtCreate,it.gmtModified as itemGmtModified
         FROM dev_pitmonit_southsmos_element a
         JOIN sur_project_pit_monit_cfg b ON a.cfgId = b.id
-        JOIN sur_project p ON b.project_id =p.id
-        JOIN sur_project_unit_info c ON b.sub_dept_id = c.unitId AND b.project_id = c.projectId
+        JOIN pro_project_info pi on pi.id=b.project_id
         JOIN dev_pitmonit_southsmos_element_item it ON a.srvId=monitorElementId AND it.is_del=0
-        WHERE  a.is_del = 0
+        <where>
             <if test="cfgId != null "> and a.cfgId = #{cfgId}</if>
             <if test="srvId != null "> and a.srvId = #{srvId}</if>
             <if test="maxSp != null  and maxSp != ''"> and a.maxSp = #{maxSp}</if>
@@ -58,6 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="state != null "> and a.state = #{state}</if>
             <if test="projectId != null and projectId>0 "> and  b.project_id= #{projectId}</if>
             <if test="subDeptId != null and subDeptId>0 "> and  b.sub_dept_id= #{subDeptId}</if>
+            and a.is_del = 0
+        </where>
         order by srvId desc
     </select>
     
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosSurveypointMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosSurveypointMapper.xml
index 3eb8298c..f9025f55 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosSurveypointMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosSurveypointMapper.xml
@@ -27,7 +27,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="deptName" column="deptName"/>
         <result property="projectId" column="projectId"/>
-        <result property="subDeptId" column="subDeptId"/>
         <result property="prjName" column="prjName"/>
     </resultMap>
 
@@ -37,12 +36,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDevPitmonitSouthsmosSurveypointList" parameterType="PitmonitSouthsmosSurveypoint" resultMap="PitmonitSouthsmosSurveypointResult">
-        SELECT a.*,c.unitName AS deptName,b.project_id AS projectId,p.projectName prjName,c.unitName AS deptName,b.sub_dept_id subDeptId
+        SELECT a.*, b.project_id AS projectId, pi.project_name prjName
         FROM dev_pitmonit_southsmos_surveypoint a
         JOIN sur_project_pit_monit_cfg b ON a.cfgId = b.id
-        JOIN sur_project p ON b.project_id =p.id
-        JOIN sur_project_unit_info c ON b.sub_dept_id = c.unitId AND b.project_id = c.projectId
-        WHERE  a.is_del = 0
+        JOIN pro_project_info pi on pi.id=b.project_id
+        <where>
             <if test="cfgId != null "> and a.cfgId = #{cfgId}</if>
             <if test="spId != null "> and a.spId = #{spId}</if>
             <if test="groupId != null "> and a.groupId = #{groupId}</if>
@@ -55,8 +53,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="position != null  and position != ''"> and a.position = #{position}</if>
             <if test="status != null  and status != ''"> and a.status = #{status}</if>
             <if test="state != null "> and a.state = #{state}</if>
-        <if test="projectId != null and projectId>0 "> and  b.project_id= #{projectId}</if>
-        <if test="subDeptId != null and subDeptId>0 "> and  b.sub_dept_id= #{subDeptId}</if>
+            <if test="projectId != null and projectId>0 "> and  b.project_id= #{projectId}</if>
+            and a.is_del = 0
+        </where>
         order by spId
     </select>
     
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosThresholdMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosThresholdMapper.xml
index 95d4bc8d..550e0886 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosThresholdMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/PitmonitSouthsmosThresholdMapper.xml
@@ -39,13 +39,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDevPitmonitSouthsmosThresholdList" parameterType="PitmonitSouthsmosThreshold" resultMap="PitmonitSouthsmosThresholdResult">
-        SELECT a.*,e.name AS elName,c.unitName AS deptName,b.project_id AS projectId,p.projectName prjName,c.unitName AS deptName,b.sub_dept_id subDeptId
+        SELECT a.*, e.name AS elName, b.project_id AS projectId, pi.project_name as prjName
         FROM dev_pitmonit_southsmos_threshold a
         JOIN sur_project_pit_monit_cfg b ON a.cfgId = b.id
-        JOIN sur_project p ON b.project_id =p.id
-        JOIN sur_project_unit_info c ON b.sub_dept_id = c.unitId AND b.project_id = c.projectId
+        JOIN pro_project_info pi on pi.id=b.project_id
         JOIN dev_pitmonit_southsmos_element e ON e.srvId=a.monitorElementId
-        WHERE  a.is_del=0
+        <where>
             <if test="cfgId != null "> and a.cfgId = #{cfgId}</if>
             <if test="srvId != null "> and a.srvId = #{srvId}</if>
             <if test="alarmInfo != null  and alarmInfo != ''"> and a.alarmInfo = #{alarmInfo}</if>
@@ -61,8 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="type != null  and type != ''"> and a.type = #{type}</if>
             <if test="unit != null  and unit != ''"> and a.unit = #{unit}</if>
             <if test="state != null "> and a.state = #{state}</if>
-            <if test="projectId != null and projectId>0 "> and  b.project_id= #{projectId}</if>
-            <if test="subDeptId != null and subDeptId>0 "> and  b.sub_dept_id= #{subDeptId}</if>
+            <if test="projectId != null and projectId>0 "> and b.project_id= #{projectId}</if>
+            and a.is_del=0
+        </where>
     </select>
     
     <select id="selectDevPitmonitSouthsmosThresholdById" parameterType="Long" resultMap="PitmonitSouthsmosThresholdResult">
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml
index 24272ff5..c733ac3d 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml
@@ -23,12 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSurProjectPitMonitCfgVo">
-        select id, project_id, sub_dept_id, vendor_code, vendor_paramter, enabled, state, remark, is_del, create_by, create_time, update_by, update_time,projectName,deptName
+        select id, project_id, sub_dept_id, vendor_code, vendor_paramter, enabled, state, remark, is_del, create_by, create_time, update_by, update_time, projectName, deptName
         from  (
-                  select a.*,p.projectName,b.unitName as deptName
+                  select a.*, pi.project_name as projectName, b.dept_name as deptName
                   from sur_project_pit_monit_cfg a
-                           JOIN sur_project p on a.project_id =p.id
-                           join  sur_project_unit_info b on a.sub_dept_id=b.unitId and a.project_id=b.projectId ) sur_project_pit_monit_cfg
+                  JOIN pro_project_info pi on pi.id=a.project_id
+                  join sys_dept b on b.dept_id = a.sub_dept_id ) sur_project_pit_monit_cfg
     </sql>
 
     <select id="selectSurProjectPitMonitCfgList" parameterType="ProjectPitMonitCfg" resultMap="ProjectPitMonitCfgResult">
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java
index 8c0ab848..44ceb0f8 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java
@@ -141,8 +141,6 @@ public class ProPlanController extends BaseController
         plan.setTaskDuation(task.getDuration().toDouble());
         plan.setPlanStartDate(task.getStart());
         plan.setPlanFinishDate(task.getFinish());
-        plan.setStartDate(task.getStart());
-        plan.setFinishDate(task.getFinish());
         TaskCollection task_predecessors = task.getPredecessors();
         //4. 获取前置任务（任务流）
         StringBuilder beforeTaskId = new StringBuilder();
diff --git a/yanzhu-ui-vue3/src/api/device/pitAlarm.js b/yanzhu-ui-vue3/src/api/device/pitAlarm.js
index b1664e08..c832c765 100644
--- a/yanzhu-ui-vue3/src/api/device/pitAlarm.js
+++ b/yanzhu-ui-vue3/src/api/device/pitAlarm.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询报警信息列表
 export function listPitAlarm(query) {
   return request({
-    url: '/device/pitAlarm/list',
+    url: '/manage/device/pitAlarm/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listPitAlarm(query) {
 // 查询报警信息详细
 export function getPitAlarm(id) {
   return request({
-    url: '/device/pitAlarm/' + id,
+    url: '/manage/device/pitAlarm/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getPitAlarm(id) {
 // 新增报警信息
 export function addPitAlarm(data) {
   return request({
-    url: '/device/pitAlarm',
+    url: '/manage/device/pitAlarm',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addPitAlarm(data) {
 // 修改报警信息
 export function updatePitAlarm(data) {
   return request({
-    url: '/device/pitAlarm',
+    url: '/manage/device/pitAlarm',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updatePitAlarm(data) {
 // 删除报警信息
 export function delPitAlarm(id) {
   return request({
-    url: '/device/pitAlarm/' + id,
+    url: '/manage/device/pitAlarm/' + id,
     method: 'delete'
   })
 }
diff --git a/yanzhu-ui-vue3/src/api/device/pitConfig.js b/yanzhu-ui-vue3/src/api/device/pitConfig.js
index a6398c6e..67158905 100644
--- a/yanzhu-ui-vue3/src/api/device/pitConfig.js
+++ b/yanzhu-ui-vue3/src/api/device/pitConfig.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询项目基坑监测配置列表
 export function listPitConfig(query) {
   return request({
-    url: '/device/pitConfig/list',
+    url: '/manage/device/pitConfig/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listPitConfig(query) {
 // 查询项目基坑监测配置详细
 export function getPitConfig(id) {
   return request({
-    url: '/device/pitConfig/' + id,
+    url: '/manage/device/pitConfig/' + id,
     method: 'get'
   })
 }
@@ -21,7 +21,7 @@ export function getPitConfig(id) {
 
 export function addPitConfig(data) {
   return request({
-    url: '/device/pitConfig',
+    url: '/manage/device/pitConfig',
     method: 'post',
     data: data
   })
@@ -31,7 +31,7 @@ export function addPitConfig(data) {
 
 export function updatePitConfig(data) {
   return request({
-    url: '/device/pitConfig',
+    url: '/manage/device/pitConfig',
     method: 'put',
     data: data
   })
@@ -41,7 +41,7 @@ export function updatePitConfig(data) {
 
 export function delPitConfig(id) {
   return request({
-    url: '/device/pitConfig/' + id,
+    url: '/manage/device/pitConfig/' + id,
     method: 'delete'
   })
 }
diff --git a/yanzhu-ui-vue3/src/api/device/pitData.js b/yanzhu-ui-vue3/src/api/device/pitData.js
index 5acdb8a1..3d1f85f0 100644
--- a/yanzhu-ui-vue3/src/api/device/pitData.js
+++ b/yanzhu-ui-vue3/src/api/device/pitData.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询测点数据列表
 export function listPitData(query) {
   return request({
-    url: '/device/pitData/list',
+    url: '/manage/device/pitData/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listPitData(query) {
 // 查询测点数据详细
 export function getPitData(id) {
   return request({
-    url: '/device/pitData/' + id,
+    url: '/manage/device/pitData/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getPitData(id) {
 // 新增测点数据
 export function addPitData(data) {
   return request({
-    url: '/device/pitData',
+    url: '/manage/device/pitData',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addPitData(data) {
 // 修改测点数据
 export function updatePitData(data) {
   return request({
-    url: '/device/pitData',
+    url: '/manage/device/pitData',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updatePitData(data) {
 // 删除测点数据
 export function delPitData(id) {
   return request({
-    url: '/device/pitData/' + id,
+    url: '/manage/device/pitData/' + id,
     method: 'delete'
   })
 }
diff --git a/yanzhu-ui-vue3/src/api/device/pitDevice.js b/yanzhu-ui-vue3/src/api/device/pitDevice.js
index e448d91c..f4dd3851 100644
--- a/yanzhu-ui-vue3/src/api/device/pitDevice.js
+++ b/yanzhu-ui-vue3/src/api/device/pitDevice.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询设备管理列表
 export function listPitDevice(query) {
   return request({
-    url: '/device/pitDevice/list',
+    url: '/manage/device/pitDevice/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listPitDevice(query) {
 // 查询设备管理详细
 export function getPitDevice(id) {
   return request({
-    url: '/device/pitDevice/' + id,
+    url: '/manage/device/pitDevice/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getPitDevice(id) {
 // 新增设备管理
 export function addPitDevice(data) {
   return request({
-    url: '/device/pitDevice',
+    url: '/manage/device/pitDevice',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addPitDevice(data) {
 // 修改设备管理
 export function updatePitDevice(data) {
   return request({
-    url: '/device/pitDevice',
+    url: '/manage/device/pitDevice',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updatePitDevice(data) {
 // 删除设备管理
 export function delPitDevice(id) {
   return request({
-    url: '/device/pitDevice/' + id,
+    url: '/manage/device/pitDevice/' + id,
     method: 'delete'
   })
 }
diff --git a/yanzhu-ui-vue3/src/api/device/pitDeviceSurveyPoint.js b/yanzhu-ui-vue3/src/api/device/pitDeviceSurveyPoint.js
index 3e41edb8..22a3a88e 100644
--- a/yanzhu-ui-vue3/src/api/device/pitDeviceSurveyPoint.js
+++ b/yanzhu-ui-vue3/src/api/device/pitDeviceSurveyPoint.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询设测点关系列表
 export function listPitDeviceSurveyPoint(query) {
   return request({
-    url: '/device/pitDeviceSurveyPoint/list',
+    url: '/manage/device/pitDeviceSurveyPoint/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listPitDeviceSurveyPoint(query) {
 // 查询设测点关系详细
 export function getPitDeviceSurveyPoint(id) {
   return request({
-    url: '/device/pitDeviceSurveyPoint/' + id,
+    url: '/manage/device/pitDeviceSurveyPoint/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getPitDeviceSurveyPoint(id) {
 // 新增设测点关系
 export function addPitDeviceSurveyPoint(data) {
   return request({
-    url: '/device/pitDeviceSurveyPoint',
+    url: '/manage/device/pitDeviceSurveyPoint',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addPitDeviceSurveyPoint(data) {
 // 修改设测点关系
 export function updatePitDeviceSurveyPoint(data) {
   return request({
-    url: '/device/pitDeviceSurveyPoint',
+    url: '/manage/device/pitDeviceSurveyPoint',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updatePitDeviceSurveyPoint(data) {
 // 删除设测点关系
 export function delPitDeviceSurveyPoint(id) {
   return request({
-    url: '/device/pitDeviceSurveyPoint/' + id,
+    url: '/manage/device/pitDeviceSurveyPoint/' + id,
     method: 'delete'
   })
 }
diff --git a/yanzhu-ui-vue3/src/api/device/pitElement.js b/yanzhu-ui-vue3/src/api/device/pitElement.js
index bcbf0cbf..8ce1c8a5 100644
--- a/yanzhu-ui-vue3/src/api/device/pitElement.js
+++ b/yanzhu-ui-vue3/src/api/device/pitElement.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询监测项管理列表
 export function listPitElement(query) {
   return request({
-    url: '/device/pitElement/list',
+    url: '/manage/device/pitElement/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listPitElement(query) {
 // 查询监测项管理详细
 export function getPitElement(id) {
   return request({
-    url: '/device/pitElement/' + id,
+    url: '/manage/device/pitElement/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getPitElement(id) {
 // 新增监测项管理
 export function addPitElement(data) {
   return request({
-    url: '/device/pitElement',
+    url: '/manage/device/pitElement',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addPitElement(data) {
 // 修改监测项管理
 export function updatePitElement(data) {
   return request({
-    url: '/device/pitElement',
+    url: '/manage/device/pitElement',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updatePitElement(data) {
 // 删除监测项管理
 export function delPitElement(id) {
   return request({
-    url: '/device/pitElement/' + id,
+    url: '/manage/device/pitElement/' + id,
     method: 'delete'
   })
 }
diff --git a/yanzhu-ui-vue3/src/api/device/pitElementItem.js b/yanzhu-ui-vue3/src/api/device/pitElementItem.js
index 3755fd80..060bfe7f 100644
--- a/yanzhu-ui-vue3/src/api/device/pitElementItem.js
+++ b/yanzhu-ui-vue3/src/api/device/pitElementItem.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询测项明细列表
 export function listPitElementItem(query) {
   return request({
-    url: '/device/pitElementItem/list',
+    url: '/manage/device/pitElementItem/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listPitElementItem(query) {
 // 查询测项明细详细
 export function getPitElementItem(id) {
   return request({
-    url: '/device/pitElementItem/' + id,
+    url: '/manage/device/pitElementItem/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getPitElementItem(id) {
 // 新增测项明细
 export function addPitElementItem(data) {
   return request({
-    url: '/device/pitElementItem',
+    url: '/manage/device/pitElementItem',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addPitElementItem(data) {
 // 修改测项明细
 export function updatePitElementItem(data) {
   return request({
-    url: '/device/pitElementItem',
+    url: '/manage/device/pitElementItem',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updatePitElementItem(data) {
 // 删除测项明细
 export function delPitElementItem(id) {
   return request({
-    url: '/device/pitElementItem/' + id,
+    url: '/manage/device/pitElementItem/' + id,
     method: 'delete'
   })
 }
diff --git a/yanzhu-ui-vue3/src/api/device/pitSurveyPoint.js b/yanzhu-ui-vue3/src/api/device/pitSurveyPoint.js
index 0bdb1885..0fe9c4a3 100644
--- a/yanzhu-ui-vue3/src/api/device/pitSurveyPoint.js
+++ b/yanzhu-ui-vue3/src/api/device/pitSurveyPoint.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询测点管理列表
 export function listPitSurveyPoint(query) {
   return request({
-    url: '/device/pitSurveyPoint/list',
+    url: '/manage/device/pitSurveyPoint/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listPitSurveyPoint(query) {
 // 查询测点管理详细
 export function getPitSurveyPoint(id) {
   return request({
-    url: '/device/pitSurveyPoint/' + id,
+    url: '/manage/device/pitSurveyPoint/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getPitSurveyPoint(id) {
 // 新增测点管理
 export function addPitSurveyPoint(data) {
   return request({
-    url: '/device/pitSurveyPoint',
+    url: '/manage/device/pitSurveyPoint',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addPitSurveyPoint(data) {
 // 修改测点管理
 export function updatePitSurveyPoint(data) {
   return request({
-    url: '/device/pitSurveyPoint',
+    url: '/manage/device/pitSurveyPoint',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updatePitSurveyPoint(data) {
 // 删除测点管理
 export function delPitSurveyPoint(id) {
   return request({
-    url: '/device/pitSurveyPoint/' + id,
+    url: '/manage/device/pitSurveyPoint/' + id,
     method: 'delete'
   })
 }
diff --git a/yanzhu-ui-vue3/src/api/device/pitThreshold.js b/yanzhu-ui-vue3/src/api/device/pitThreshold.js
index e221f7d6..aa5b7b05 100644
--- a/yanzhu-ui-vue3/src/api/device/pitThreshold.js
+++ b/yanzhu-ui-vue3/src/api/device/pitThreshold.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询报警阈值列表
 export function listPitThreshold(query) {
   return request({
-    url: '/device/pitThreshold/list',
+    url: '/manage/device/pitThreshold/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listPitThreshold(query) {
 // 查询报警阈值详细
 export function getPitThreshold(id) {
   return request({
-    url: '/device/pitThreshold/' + id,
+    url: '/manage/device/pitThreshold/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getPitThreshold(id) {
 // 新增报警阈值
 export function addPitThreshold(data) {
   return request({
-    url: '/device/pitThreshold',
+    url: '/manage/device/pitThreshold',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addPitThreshold(data) {
 // 修改报警阈值
 export function updatePitThreshold(data) {
   return request({
-    url: '/device/pitThreshold',
+    url: '/manage/device/pitThreshold',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updatePitThreshold(data) {
 // 删除报警阈值
 export function delPitThreshold(id) {
   return request({
-    url: '/device/pitThreshold/' + id,
+    url: '/manage/device/pitThreshold/' + id,
     method: 'delete'
   })
 }
diff --git a/yanzhu-ui-vue3/src/components/Chart/index.vue b/yanzhu-ui-vue3/src/components/Chart/index.vue
new file mode 100644
index 00000000..0fd867de
--- /dev/null
+++ b/yanzhu-ui-vue3/src/components/Chart/index.vue
@@ -0,0 +1,60 @@
+<template>
+    <div :class="className" :style="{height:height,width:width}" />
+  </template>
+  
+  <script>
+  import * as echarts from 'echarts';
+  require('echarts/theme/macarons')  
+  
+  export default {
+    props: {
+      className: {
+        type: String,
+        default: 'chart'
+      },
+      width: {
+        type: String,
+        default: '100%'
+      },
+      height: {
+        type: String,
+        default: '300px'
+      },
+      opt:{
+        type:Object,
+        default:()=>{}
+      },
+      chgOpt:{
+        type:Function,
+        default:null
+      }
+    },
+    data() {
+      return {
+        chart: null
+      }
+    },
+    mounted() {
+      this.$nextTick(()=>{
+        this.chart = echarts.init(this.$el, 'macarons')
+      });
+    },
+    beforeDestroy() {
+      if (!this.chart) {
+        return
+      }
+      this.chart.dispose()
+      this.chart = null
+    },
+    methods: {
+      initChart() {       
+        if(this.chgOpt){
+            this.chart.setOption(this.chgOpt(this.opt||{}))
+        }else{
+            this.chart.setOption(this.opt||{})
+        }        
+      }
+    }
+  }
+  </script>
+  
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/src/views/device/pitAlarm/index.vue b/yanzhu-ui-vue3/src/views/device/pitAlarm/index.vue
index ae36654e..d57a84e3 100644
--- a/yanzhu-ui-vue3/src/views/device/pitAlarm/index.vue
+++ b/yanzhu-ui-vue3/src/views/device/pitAlarm/index.vue
@@ -1,18 +1,6 @@
 <template>
   <div class="app-container pit-alarm-index">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目名称" prop="projectId">
-        <el-select v-model="queryParams.projectId" filterable placeholder="请选择项目" clearable @change="doQuerySub">
-          <el-option v-for="(item, index) in projectOptions" :key="index" :label="item.projectName" :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="总包单位" prop="subDeptId">
-        <el-select v-model="queryParams.subDeptId" filterable placeholder="请选择总包单位" clearable>
-          <el-option v-for="(item, index) in depts" :key="index" :label="item.deptName" :value="item.deptId">
-          </el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item label="告警状态" prop="status">
         <el-radio-group v-model="queryParams.status" @change="getList">
           <el-radio label="false">未处理</el-radio>
@@ -20,13 +8,12 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="告警原因" prop="type">
-        <el-select v-model="queryParams.type" filterable placeholder="请选择总包单位" clearable>
+        <el-select v-model="queryParams.type" filterable placeholder="请选择告警原因" clearable>
           <el-option v-for="(item, index) in '数据异常,DTU异常,传感器异常,网关异常,节点异常'.split(',')" :key="index" :label="item"
             :value="item">
           </el-option>
         </el-select>
       </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -150,37 +137,6 @@ export default {
     showDetail(row){
       this.$refs.detailDlg.showDialog(row);
     },
-    doQuerySub() {
-      let prjId=this.queryParams.projectId;      
-      let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
-      if (tmps.length > 0 || !prjId) {
-        this.depts = tmps;
-        if (tmps.length == 1) {
-          this.queryParams.subDeptId = tmps[0].deptId;
-        } else {
-          this.queryParams.subDeptId = '';
-        }
-        this.getList();
-        return;
-      }
-      this.$api.publics.queryUnitList({
-        projectId: prjId,
-        unitTypes: "2".split(","),
-      }).then((d) => {
-        let objs = d.rows || [];
-        if (!this.prjDept2) {
-          this.prjDept2 = {};
-        }
-        this.prjDept2[prjId] = objs;
-        this.depts = objs;
-        if (objs.length == 1) {
-          this.queryParams.subDeptId = objs[0].deptId;
-        } else {
-          this.queryParams.subDeptId = '';
-        }
-        this.getList();
-      });
-    },
     init() {
       if (this.projectOptions && this.projectOptions.length > 0) {
         return;
diff --git a/yanzhu-ui-vue3/src/views/device/pitConfig/index.vue b/yanzhu-ui-vue3/src/views/device/pitConfig/index.vue
index cfc2b2da..b3fbd18f 100644
--- a/yanzhu-ui-vue3/src/views/device/pitConfig/index.vue
+++ b/yanzhu-ui-vue3/src/views/device/pitConfig/index.vue
@@ -1,25 +1,5 @@
 <template>
   <div class="app-container prj-pit-config">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目名称" prop="projectId">
-        <el-select v-model="queryParams.projectId" filterable placeholder="请选择项目" clearable
-          @change="doQuerySub('query')">
-          <el-option v-for="(item, index) in projectOptions" :key="index" :label="item.projectName" :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="总包单位" prop="subDeptId">
-        <el-select v-model="queryParams.subDeptId" filterable placeholder="请选择总包单位" clearable>
-          <el-option v-for="(item, index) in depts" :key="index" :label="item.deptName" :value="item.deptId">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
@@ -65,8 +45,7 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
 
-    <!-- 添加或修改项目基坑监测配置
-对话框 -->
+    <!-- 添加或修改项目基坑监测配置对话框 -->
     <el-drawer v-if="open" v-model="open" direction="rtl" size="60%" :title="title">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px" style="padding:0px 20px">
         <el-form-item label="项目名称" prop="projectId">