diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 94cdda54..fc8aec57 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -34,8 +34,8 @@ module.exports = {
     open: true,
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
-        //target: `http://127.0.0.1:8090/jhapi`, 
-        target: `http://192.168.126.20:808/jhapi`, 
+        target: `http://127.0.0.1:8090/jhapi`, 
+        //target: `http://192.168.126.20:808/jhapi`, 
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java
index 326355c9..b8694627 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java
@@ -187,7 +187,7 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi
         if(StringUtils.isNotEmpty(zlDataList)){
             for(Map<String, Object> map:zlDataList){
                 String state = Convert.toStr(map.get("checkState"));
-                if(Objects.equals(state,"0") || Objects.equals(state,"1")){
+                if(Objects.equals(state,"0") || Objects.equals(state,"1") || Objects.equals(state,"3")){
                     zlCount += Convert.toInt(map.get("total"));
                 }
             }
@@ -198,7 +198,7 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi
         if(StringUtils.isNotEmpty(aqDataList)){
             for(Map<String, Object> map:aqDataList){
                 String state = Convert.toStr(map.get("checkState"));
-                if(Objects.equals(state,"0") || Objects.equals(state,"1")){
+                if(Objects.equals(state,"0") || Objects.equals(state,"1") || Objects.equals(state,"3")){
                     aqCount += Convert.toInt(map.get("total"));
                 }
             }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java
index fe8cefe3..795881bd 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java
@@ -262,7 +262,7 @@ PublicsController extends BaseController {
         flowTaskEntity.setNowUser(Convert.toStr(SecurityUtils.getUserId()));
         flowTaskEntity.setRoleIds(SecurityUtils.getLoginUser().getUser().getRoles().stream().map(role -> role.getRoleId()).collect(Collectors.toList()));
         flowTaskEntity.setNowUserName(getUsername());
-        flowTaskEntity.setActiveName("await");
+        flowTaskEntity.setActiveName("awaitSum");
         return success(surProjectAuditinfoService.findMyTask(flowTaskEntity));
     }
 
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml
index 5c1a9e63..fc6be592 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml
@@ -70,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!--管理员放开查询条件-->
         <if test='nowRole != "1" and nowRole != "2"'> and a.witness_user like concat('%', #{nowUserName}, '%')</if>
         <if test='activeName == "await"'> and a.approve_status='1'</if>
+        <if test='activeName == "awaitSum"'> and a.approve_status in ('1','3') or a.approve_status is null</if>
         <if test='activeName == "finished"'> and a.approve_status in ('3','4')</if>
         <if test="businessKey != null  and businessKey != ''"> and sp.id = #{businessKey}</if>
         <if test="businessKeyName != null  and businessKeyName != ''"> and sp.projectName like concat('%', #{businessKeyName}, '%')</if>
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
index d8fe3a9e..b8a66377 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml
@@ -71,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="detectionResult != null  and detectionResult != ''"> and spcd.detection_result = #{detectionResult}</if>
             <!-- 查询条件-项目部门 -->
             <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
+            <if test="projectName != null  and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
             <!--子部门数据-->
             <if test='nowRole == "4"'> and sp.deptId = #{nowDept}</if>
             <!--监理单位/总包公司/分包单位查询当前关联数据-->
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
index 4aa9bc73..3cd58dac 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMaterialSealMapper.xml
@@ -56,6 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialResult != null  and materialResult != ''"> and spme.material_result = #{materialResult}</if>
             <if test="approveStatus != null  and approveStatus != ''"> and spme.approve_status = #{approveStatus}</if>
             <if test="witnessUser != null  and witnessUser != ''"> and (spme.witness_user like concat('%', #{witnessUser}, '%') or spme.witness_user_name like concat('%', #{witnessUser}, '%'))</if>
+
+            <if test="projectName != null  and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
             <!-- 查询条件-项目部门 -->
             <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
             <!--子部门数据-->
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
index b6ed2a13..b3a357f6 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml
@@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveStatus != null  and approveStatus != ''"> and spm.approve_status = #{approveStatus}</if>
             <!-- 查询条件-项目部门 -->
             <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
+            <if test="projectName != null  and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
             <!--子部门数据-->
             <if test='nowRole == "4"'> and sp.deptId = #{nowDept}</if>
             <!--监理单位/总包公司/分包单位查询当前关联数据-->