diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/ZftkTaskController.java b/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/ZftkTaskController.java
index 18d8b6be..c02565fd 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/ZftkTaskController.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/ZftkTaskController.java
@@ -2,15 +2,18 @@ package com.ruoyi.cxxm.controller.web;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.cxxm.domain.entity.zftk.*;
+import com.ruoyi.cxxm.domain.entity.zttb.ZttbTask;
 import com.ruoyi.cxxm.service.IZftkCheckAuditService;
 import com.ruoyi.cxxm.service.IZftkCheckService;
 import com.ruoyi.cxxm.service.IZftkCheckVerifyService;
@@ -62,6 +65,29 @@ public class ZftkTaskController extends BaseController {
         return getDataTableByPage(page);
     }
 
+    @ApiOperation("查询项目名称列表")
+    @GetMapping("/xmmc/list")
+    public TableDataInfo xmmcList(ZftkTask task, PageDomain pageDomain) {
+        IPage<Map<String, Object>> page = this.taskService.getXmmcList(task, pageDomain);
+        // 返回查询结果
+        return getDataTableByPage((Page<?>) page);
+    }
+
+    /**
+     * 州级已经下发的
+     *
+     * @param task
+     * @param pageDomain
+     * @return
+     */
+    @ApiOperation("查询项目名称列表")
+    @GetMapping("/xmmc/list2")
+    public TableDataInfo xmmcList2(ZftkTask task, PageDomain pageDomain) {
+        IPage<Map<String, Object>> page = this.taskService.getXmmcList2(task, pageDomain);
+        // 返回查询结果
+        return getDataTableByPage((Page<?>) page);
+    }
+
     /**
      * 导出任务列表
      */
@@ -157,8 +183,9 @@ public class ZftkTaskController extends BaseController {
     @ApiOperation("导入任务数据")
     @Log(title = "导入任务数据", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, String rwlx) throws Exception {
-        return AjaxResult.success(taskService.importTask(file, rwlx));
+    public AjaxResult importData(MultipartFile file, String rwlx, String newXmmc) throws Exception {
+        rwlx = "执法踏勘";
+        return AjaxResult.success(taskService.importTask(file, rwlx, newXmmc));
     }
 
     /**
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/ZtTaskController.java b/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/ZtTaskController.java
index ed056005..e0e76bf5 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/ZtTaskController.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/ZtTaskController.java
@@ -1,6 +1,7 @@
 package com.ruoyi.cxxm.controller.web;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -12,7 +13,9 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.cxxm.domain.entity.zftk.ZftkTask;
 import com.ruoyi.cxxm.domain.entity.zt.*;
+import com.ruoyi.cxxm.domain.entity.zttb.ZttbTask;
 import com.ruoyi.cxxm.service.*;
 import com.ruoyi.system.service.ISysUserService;
 import io.swagger.annotations.Api;
@@ -24,6 +27,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -44,6 +48,7 @@ public class ZtTaskController extends BaseController {
     private IZtCheckService checkService;
     @Autowired
     private IZtCheckAuditService checkAuditService;
+
     /**
      * 查询任务列表
      */
@@ -55,6 +60,29 @@ public class ZtTaskController extends BaseController {
         return getDataTableByPage(page);
     }
 
+    @ApiOperation("查询项目名称列表")
+    @GetMapping("/xmmc/list")
+    public TableDataInfo xmmcList(ZtTask task, PageDomain pageDomain) {
+        IPage<Map<String, Object>> page = this.taskService.getXmmcList(task, pageDomain);
+        // 返回查询结果
+        return getDataTableByPage((Page<?>) page);
+    }
+
+    /**
+     * 州级已经下发的
+     *
+     * @param task
+     * @param pageDomain
+     * @return
+     */
+    @ApiOperation("查询项目名称列表")
+    @GetMapping("/xmmc/list2")
+    public TableDataInfo xmmcList2(ZtTask task, PageDomain pageDomain) {
+        IPage<Map<String, Object>> page = this.taskService.getXmmcList2(task, pageDomain);
+        // 返回查询结果
+        return getDataTableByPage((Page<?>) page);
+    }
+
     /**
      * 导出任务列表
      */
@@ -79,7 +107,7 @@ public class ZtTaskController extends BaseController {
                 ztCheckExport.setBz(ztCheck.getRemark());
 
                 // 审核记录
-                ZtCheckAudit checkAudit =  checkAuditService.lambdaQuery().eq(ZtCheckAudit::getTcId, ztCheck.getId()).one();
+                ZtCheckAudit checkAudit = checkAuditService.lambdaQuery().eq(ZtCheckAudit::getTcId, ztCheck.getId()).one();
                 if (Objects.nonNull(checkAudit)) {
                     ztCheckExport.setShry(checkAudit.getCreateBy());
                     ztCheckExport.setShsj(checkAudit.getCreateTime().toString());
@@ -137,8 +165,9 @@ public class ZtTaskController extends BaseController {
     @ApiOperation("导入任务数据")
     @Log(title = "导入任务数据", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, String rwlx) throws Exception {
-        return AjaxResult.success(taskService.importTask(file, rwlx));
+    public AjaxResult importData(MultipartFile file, String rwlx, String newXmmc) throws Exception {
+        rwlx = "持续监管";
+        return AjaxResult.success(taskService.importTask(file, rwlx, newXmmc));
     }
 
     /**
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/ZttbTaskController.java b/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/ZttbTaskController.java
index ed077962..3f5c2617 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/ZttbTaskController.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/ZttbTaskController.java
@@ -2,10 +2,12 @@ package com.ruoyi.cxxm.controller.web;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
@@ -60,13 +62,36 @@ public class ZttbTaskController extends BaseController {
         return getDataTableByPage(page);
     }
 
+    @ApiOperation("查询项目名称列表")
+    @GetMapping("/xmmc/list")
+    public TableDataInfo xmmcList(ZttbTask task, PageDomain pageDomain) {
+        IPage<Map<String, Object>> page = this.taskService.getXmmcList(task, pageDomain);
+        // 返回查询结果
+        return getDataTableByPage((Page<?>) page);
+    }
+
+    /**
+     * 州级已经下发的
+     *
+     * @param task
+     * @param pageDomain
+     * @return
+     */
+    @ApiOperation("查询项目名称列表")
+    @GetMapping("/xmmc/list2")
+    public TableDataInfo xmmcList2(ZttbTask task, PageDomain pageDomain) {
+        IPage<Map<String, Object>> page = this.taskService.getXmmcList2(task, pageDomain);
+        // 返回查询结果
+        return getDataTableByPage((Page<?>) page);
+    }
+
     /**
      * 导出任务列表
      */
     @ApiOperation("导出任务列表")
     @Log(title = "任务", businessType = BusinessType.EXPORT)
     @PostMapping("/export/{ids}")
-    public void export(HttpServletResponse response,@PathVariable List<Long> ids) {
+    public void export(HttpServletResponse response, @PathVariable List<Long> ids) {
         List<ZttbTask> list = taskService.lambdaQuery().in(ZttbTask::getId, ids).list();
         ArrayList<ZttbTaskExport> zttbTaskExports = new ArrayList<>();
         for (ZttbTask task : list) {
@@ -143,8 +168,9 @@ public class ZttbTaskController extends BaseController {
     @ApiOperation("导入任务数据")
     @Log(title = "导入任务数据", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, String rwlx) throws Exception {
-        return AjaxResult.success(taskService.importTask(file, rwlx));
+    public AjaxResult importData(MultipartFile file, String rwlx, String newXmmc) throws Exception {
+        rwlx = "自提图斑";
+        return AjaxResult.success(taskService.importTask(file, rwlx, newXmmc));
     }
 
     /**
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zftk/ZftkTask.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zftk/ZftkTask.java
index b7d94f7a..3a9e141d 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zftk/ZftkTask.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zftk/ZftkTask.java
@@ -58,6 +58,13 @@ public class ZftkTask extends BaseEntity {
     @ApiModelProperty(value = "项目名称")
     private String xmmc;
 
+    /**
+     * 名称
+     */
+    @Excel(name = "名称")
+    @ApiModelProperty(value = "名称")
+    private String mc;
+
 
     /**
      * 地块号
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zt/ZtTask.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zt/ZtTask.java
index e46136b3..06ec1b31 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zt/ZtTask.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zt/ZtTask.java
@@ -126,6 +126,14 @@ public class ZtTask extends BaseEntity {
     private String xmmc;
 
 
+    /**
+     * 名称
+     */
+    @Excel(name = "名称")
+    @ApiModelProperty(value = "名称")
+    private String mc;
+
+
     /**
      * 是否整改到位
      */
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zttb/ZttbTask.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zttb/ZttbTask.java
index 28c967c9..cd3a876f 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zttb/ZttbTask.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/zttb/ZttbTask.java
@@ -126,6 +126,14 @@ public class ZttbTask extends BaseEntity {
     private String xmmc;
 
 
+    /**
+     * 名称
+     */
+    @Excel(name = "名称")
+    @ApiModelProperty(value = "名称")
+    private String mc;
+
+
     /**
      * 存在问题
      */
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/query/TaskQuery.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/query/TaskQuery.java
index 436f718e..2e8d5fa8 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/domain/query/TaskQuery.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/query/TaskQuery.java
@@ -10,8 +10,12 @@ import lombok.Data;
 
 import java.util.Date;
 import java.util.List;
+
+/**
+ * 含zftk zt zttb三个查询对象的字段
+ */
 @Data
-public class TaskQuery{
+public class TaskQuery {
     /**
      * id
      */
@@ -44,6 +48,14 @@ public class TaskQuery{
     private String xmmc;
 
 
+    /**
+     * 名称
+     */
+    @Excel(name = "名称")
+    @ApiModelProperty(value = "名称")
+    private String mc;
+
+
     /**
      * 地块号
      */
@@ -394,5 +406,6 @@ public class TaskQuery{
     @ApiModelProperty(value = "存在问题")
     private String czwt;
 
+
     private Long deptId;
 }
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/IZftkTaskService.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/IZftkTaskService.java
index a7ced266..b9756b86 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/service/IZftkTaskService.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/IZftkTaskService.java
@@ -1,5 +1,6 @@
 package com.ruoyi.cxxm.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.page.PageDomain;
 import com.ruoyi.cxxm.domain.entity.TaskGis;
@@ -11,6 +12,7 @@ import com.ruoyi.cxxm.domain.entity.zftk.ZftkTaskDetail;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.Map;
 
 /**
  * 任务Service接口
@@ -35,7 +37,7 @@ public interface IZftkTaskService extends IService<ZftkTask> {
      * @param rwlx
      * @return
      */
-    TaskImportRes importTask(MultipartFile file, String rwlx) throws IOException;
+    TaskImportRes importTask(MultipartFile file, String rwlx,String newXmmc) throws IOException;
 
     /**
      * 获取任务分页数据
@@ -80,5 +82,10 @@ public interface IZftkTaskService extends IService<ZftkTask> {
      */
     public ZftkTaskDetail getTaskDetail(long id);
 
+
+    public IPage<Map<String, Object>> getXmmcList(ZftkTask task, PageDomain pageDomain);
+
+    public IPage<Map<String, Object>> getXmmcList2(ZftkTask task, PageDomain pageDomain);
+
 }
 
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/IZtTaskService.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/IZtTaskService.java
index 60e09477..b92e87c4 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/service/IZtTaskService.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/IZtTaskService.java
@@ -2,11 +2,14 @@ package com.ruoyi.cxxm.service;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.page.PageDomain;
 import com.ruoyi.cxxm.domain.entity.TaskGis;
+import com.ruoyi.cxxm.domain.entity.zftk.ZftkTask;
 import com.ruoyi.cxxm.domain.entity.zt.ZtTask;
 import com.ruoyi.cxxm.domain.entity.zt.ZtTaskDetail;
 import com.ruoyi.cxxm.domain.entity.zt.ZtTaskQuery;
@@ -19,8 +22,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-06-04
  */
-public interface IZtTaskService extends IService<ZtTask>
-{
+public interface IZtTaskService extends IService<ZtTask> {
     /**
      * 查询图斑空间信息
      *
@@ -36,7 +38,7 @@ public interface IZtTaskService extends IService<ZtTask>
      * @param rwlx
      * @return
      */
-    TaskImportRes importTask(MultipartFile file, String rwlx) throws IOException;
+    TaskImportRes importTask(MultipartFile file, String rwlx,String newXmmc) throws IOException;
 
     /**
      * 获取任务分页数据
@@ -72,13 +74,19 @@ public interface IZtTaskService extends IService<ZtTask>
      * @param pageDomain
      * @return
      */
-    public Page<ZtTask> getPageCheck(ZtTaskQuery task, PageDomain pageDomain) ;
+    public Page<ZtTask> getPageCheck(ZtTaskQuery task, PageDomain pageDomain);
 
     /**
      * 获取任务详细信息
+     *
      * @param id
      * @return
      */
     public ZtTaskDetail getTaskDetail(long id);
+
+
+    public IPage<Map<String, Object>> getXmmcList(ZtTask task, PageDomain pageDomain);
+
+    public IPage<Map<String, Object>> getXmmcList2(ZtTask task, PageDomain pageDomain);
 }
 
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/IZttbTaskService.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/IZttbTaskService.java
index 8310d66d..9e215161 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/service/IZttbTaskService.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/IZttbTaskService.java
@@ -1,10 +1,13 @@
 package com.ruoyi.cxxm.service;
 
 import java.io.IOException;
+import java.util.Map;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.page.PageDomain;
 import com.ruoyi.cxxm.domain.entity.TaskGis;
+import com.ruoyi.cxxm.domain.entity.zftk.ZftkTask;
 import com.ruoyi.cxxm.domain.entity.zttb.ZttbTask;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.cxxm.domain.entity.zttb.ZttbTaskDetail;
@@ -18,8 +21,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-06-01
  */
-public interface IZttbTaskService extends IService<ZttbTask>
-{
+public interface IZttbTaskService extends IService<ZttbTask> {
     /**
      * 查询图斑空间信息
      *
@@ -35,7 +37,7 @@ public interface IZttbTaskService extends IService<ZttbTask>
      * @param rwlx
      * @return
      */
-    TaskImportRes importTask(MultipartFile file, String rwlx) throws IOException;
+    TaskImportRes importTask(MultipartFile file, String rwlx, String newXmmc) throws IOException;
 
     /**
      * 获取任务分页数据
@@ -72,13 +74,19 @@ public interface IZttbTaskService extends IService<ZttbTask>
      * @param pageDomain
      * @return
      */
-    public Page<ZttbTask> getPageCheck(ZttbTaskQuery task, PageDomain pageDomain) ;
+    public Page<ZttbTask> getPageCheck(ZttbTaskQuery task, PageDomain pageDomain);
 
     /**
      * 获取任务详细信息
+     *
      * @param id
      * @return
      */
     public ZttbTaskDetail getTaskDetail(long id);
+
+
+    public IPage<Map<String, Object>> getXmmcList(ZttbTask task, PageDomain pageDomain);
+
+    public IPage<Map<String, Object>> getXmmcList2(ZttbTask task, PageDomain pageDomain);
 }
 
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/ZftkTaskServiceImpl.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/ZftkTaskServiceImpl.java
index 686ea1d2..03a2b774 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/ZftkTaskServiceImpl.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/ZftkTaskServiceImpl.java
@@ -3,6 +3,7 @@ package com.ruoyi.cxxm.service.impl;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -13,6 +14,8 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.cxxm.domain.entity.TaskGis;
 import com.ruoyi.cxxm.domain.entity.zftk.*;
+import com.ruoyi.cxxm.domain.entity.zt.ZtTask;
+import com.ruoyi.cxxm.domain.entity.zttb.ZttbTask;
 import com.ruoyi.cxxm.domain.enums.SFSB;
 import com.ruoyi.cxxm.domain.enums.XCJB;
 import com.ruoyi.cxxm.domain.enums.ZFTK_SDXZ;
@@ -84,7 +87,7 @@ public class ZftkTaskServiceImpl extends ServiceImpl<ZftkTaskMapper, ZftkTask> i
      * @return
      */
     @Transactional
-    public TaskImportRes importTask(MultipartFile file, String rwlx) throws IOException {
+    public TaskImportRes importTask(MultipartFile file, String rwlx, String newXmmc) throws IOException {
         TaskImportRes res = new TaskImportRes();
 
         try (InputStream inputStream = file.getInputStream()) {
@@ -124,7 +127,11 @@ public class ZftkTaskServiceImpl extends ServiceImpl<ZftkTaskMapper, ZftkTask> i
                 }
                 Map taskMap = JSONObject.parseObject(properties.toString(), Map.class);
                 // 校验必填字段是否存在
-                String[] requiredFields = new String[]{"NF", "XMC", "XMMC", "DKH", "GNFQ", "DKMJ", "NYDMJ", "GDMJ", "JSYDMJ", "WLYDMJ", "YJJBNTMJ", "DGZT", "X", "Y", "XDM"};
+                ArrayList<String> requiredFields = new ArrayList<>(Arrays.asList("NF", "XMC", "XZMC", "CJDCQ", "JCBH", "XFSJ", "JCMJ", "GDMJ", "XMMC", "X", "Y"));
+                // 填写新的项目名就修改原项目名称
+                if (!newXmmc.equals("null")) {
+                    taskMap.put("XMMC", newXmmc);
+                }
                 for (String field : requiredFields) {
                     String fieldLowerCase = field.toLowerCase();
                     if (taskMap.containsKey(fieldLowerCase)) {
@@ -134,10 +141,14 @@ public class ZftkTaskServiceImpl extends ServiceImpl<ZftkTaskMapper, ZftkTask> i
                         throw new RuntimeException(StringUtils.format("缺少必须字段:{},请检查导入数据!", field));
                     }
                 }
+                if (taskMap.get("XMMC").toString().trim().isEmpty()) {
+                    throw new RuntimeException(StringUtils.format("XMMC字段内容不能为空！"));
+                }
                 zftkTask.setRwlx(rwlx);
                 zftkTask.setNian(taskMap.get("NF") != null ? taskMap.remove("NF").toString() : "");
                 zftkTask.setXian(taskMap.get("XMC") != null ? taskMap.remove("XMC").toString() : "");
                 zftkTask.setXmmc(taskMap.get("XMMC") != null ? taskMap.remove("XMMC").toString() : "");
+                zftkTask.setMc(taskMap.get("MC") != null ? taskMap.remove("MC").toString() : "");
                 zftkTask.setDkh(taskMap.get("DKH") != null ? taskMap.remove("DKH").toString() : "");
                 zftkTask.setGnfq(taskMap.get("GNFQ") != null ? taskMap.remove("GNFQ").toString() : "");
                 zftkTask.setDkmj(taskMap.get("DKMJ") != null ? taskMap.remove("DKMJ").toString() : "");
@@ -197,12 +208,16 @@ public class ZftkTaskServiceImpl extends ServiceImpl<ZftkTaskMapper, ZftkTask> i
         String dkh = task.getDkh();
         task.setNian(dkh);
         task.setXian(dkh);
-        task.setXmmc(dkh);
         task.setGnfq(dkh);
         task.setDgzt(dkh);
         // 构建查询条件
         LambdaQueryWrapper<ZftkTask> queryWrapper = new LambdaQueryWrapper<>();
-
+        if (Objects.nonNull(task.getXmmc())) {
+            queryWrapper.eq(ZftkTask::getXmmc, task.getXmmc());
+            task.setXmmc(null);
+        } else {
+            task.setXmmc(dkh);
+        }
         // 根据任务类型进行精确查询
         queryWrapper.eq(Objects.nonNull(task.getRwlx()), ZftkTask::getRwlx, task.getRwlx());
         // 根据州级下发情况进行精确查询
@@ -327,7 +342,11 @@ public class ZftkTaskServiceImpl extends ServiceImpl<ZftkTaskMapper, ZftkTask> i
         // 初始化分页对象
         Page<ZftkTask> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
         LambdaQueryWrapper<ZftkTask> queryWrapper = getQueryWrapper(task);
-        // queryWrapper.ge(ZftkTask::getYxccs,1);
+        if (task.getYxccs() != null && task.getYxccs() == 1) {
+            queryWrapper.ge(ZftkTask::getYxccs, 1); // 已巡查
+        } else if (task.getYxccs() != null && task.getYxccs() == 0) {
+            queryWrapper.eq(ZftkTask::getYxccs, 0); // 未巡查
+        }
         // 设置排序条件
         queryWrapper.orderByDesc(ZftkTask::getXcsj);
         queryWrapper.orderByDesc(ZftkTask::getZjxfsj);
@@ -466,5 +485,41 @@ public class ZftkTaskServiceImpl extends ServiceImpl<ZftkTaskMapper, ZftkTask> i
         }
         return taskDetail;
     }
+
+    public Page<Map<String, Object>> getXmmcList(ZftkTask task, PageDomain pageDomain) {
+        if (Objects.isNull(task.getDeptId())) {
+            task.setDeptId(SecurityUtils.getDeptId());
+        }
+        // 初始化分页对象
+        Page<Map<String, Object>> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
+        QueryWrapper<ZftkTask> queryWrapper = new QueryWrapper<>();
+        // 分组查询xmmc,count(id) 作为任务数,返回map
+        LambdaQueryWrapper<ZftkTask> lambdaQueryWrapper = queryWrapper.select("xmmc", "COUNT(*) as nums").groupBy("xmmc").lambda();
+        // 根据部门ID查询该部门及其所有父部门的任务
+        lambdaQueryWrapper.in(Objects.nonNull(task.getDeptId()), ZftkTask::getDeptId, deptMapper.getAllAncestorsByDeptId(task.getDeptId()));
+        return this.pageMaps(page, lambdaQueryWrapper);
+    }
+
+    /**
+     * 已下发的项目列表
+     *
+     * @param task
+     * @param pageDomain
+     * @return
+     */
+    public Page<Map<String, Object>> getXmmcList2(ZftkTask task, PageDomain pageDomain) {
+        if (Objects.isNull(task.getDeptId())) {
+            task.setDeptId(SecurityUtils.getDeptId());
+        }
+        // 初始化分页对象
+        Page<Map<String, Object>> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
+        QueryWrapper<ZftkTask> queryWrapper = new QueryWrapper<>();
+        // 分组查询xmmc,count(id) 作为任务数,返回map
+        LambdaQueryWrapper<ZftkTask> lambdaQueryWrapper = queryWrapper.select("xmmc", "COUNT(*) as nums").groupBy("xmmc").lambda();
+        lambdaQueryWrapper.eq(ZftkTask::getZjxfqk, "1");
+        // 根据部门ID查询该部门及其所有父部门的任务
+        lambdaQueryWrapper.in(Objects.nonNull(task.getDeptId()), ZftkTask::getDeptId, deptMapper.getAllAncestorsByDeptId(task.getDeptId()));
+        return this.pageMaps(page, lambdaQueryWrapper);
+    }
 }
 
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/ZtTaskServiceImpl.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/ZtTaskServiceImpl.java
index 4103714c..ab11288e 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/ZtTaskServiceImpl.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/ZtTaskServiceImpl.java
@@ -3,6 +3,7 @@ package com.ruoyi.cxxm.service.impl;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -14,6 +15,7 @@ import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.cxxm.domain.entity.TaskGis;
 import com.ruoyi.cxxm.domain.entity.zftk.*;
 import com.ruoyi.cxxm.domain.entity.zt.*;
+import com.ruoyi.cxxm.domain.entity.zttb.ZttbTask;
 import com.ruoyi.cxxm.domain.enums.SFSB;
 import com.ruoyi.cxxm.domain.enums.XCJB;
 import com.ruoyi.cxxm.domain.enums.ZFTK_SDXZ;
@@ -85,7 +87,7 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
      * @return
      */
     @Transactional
-    public TaskImportRes importTask(MultipartFile file, String rwlx) throws IOException {
+    public TaskImportRes importTask(MultipartFile file, String rwlx, String newXmmc) throws IOException {
         TaskImportRes res = new TaskImportRes();
 
         try (InputStream inputStream = file.getInputStream()) {
@@ -126,16 +128,23 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
                 Map taskMap = JSONObject.parseObject(properties.toString(), Map.class);
 
                 // 校验必填字段是否存在
-                String[] requiredFields = new String[]{"NF", "XMC", "XZMC", "CJDCQ", "JCBH", "XFSJ", "JCMJ", "GDMJ", "XMMC", "X", "Y"};
+                ArrayList<String> requiredFields = new ArrayList<>(Arrays.asList("NF", "XMC", "XZMC", "CJDCQ", "JCBH", "XFSJ", "JCMJ", "GDMJ", "XMMC", "X", "Y"));
+                // 填写新的项目名就修改原项目名称
+                if (!newXmmc.equals("null")) {
+                    taskMap.put("XMMC", newXmmc);
+                }
                 for (String field : requiredFields) {
                     String fieldLowerCase = field.toLowerCase();
                     if (taskMap.containsKey(fieldLowerCase)) {
-                        throw new RuntimeException(StringUtils.format("字段:{}必须使用大写字母,请纠正为{}!", fieldLowerCase,field));
+                        throw new RuntimeException(StringUtils.format("字段:{}必须使用大写字母,请纠正为{}!", fieldLowerCase, field));
                     }
                     if (taskMap.get(field) == null) {
                         throw new RuntimeException(StringUtils.format("缺少必须字段:{},请检查导入数据!", field));
                     }
                 }
+                if (taskMap.get("XMMC").toString().trim().isEmpty()) {
+                    throw new RuntimeException(StringUtils.format("XMMC字段内容不能为空！"));
+                }
                 ztTask.setRwlx(rwlx);
                 ztTask.setNian(taskMap.get("NF") != null ? taskMap.remove("NF").toString() : "");
                 ztTask.setXian(taskMap.get("XMC") != null ? taskMap.remove("XMC").toString() : "");
@@ -147,6 +156,7 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
                 ztTask.setGdmj(taskMap.get("GDMJ") != null ? taskMap.remove("GDMJ").toString() : "");
                 //ztTask.setJbntmj(taskMap.get("YJJBNTMF") != null ? taskMap.remove("YJJBNTMF").toString() : "");
                 ztTask.setXmmc(taskMap.get("XMMC") != null ? taskMap.remove("XMMC").toString() : "");
+                ztTask.setMc(taskMap.get("MC") != null ? taskMap.remove("MC").toString() : "");
                 ztTask.setX(taskMap.get("X") != null ? taskMap.remove("X").toString() : "");
                 ztTask.setY(taskMap.get("Y") != null ? taskMap.remove("Y").toString() : "");
                 ztTask.setXdm(taskMap.get("XDM") != null ? taskMap.remove("XDM").toString() : "");
@@ -197,13 +207,17 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
         task.setNian(tbbh);
         task.setXian(tbbh);
         task.setXzmc(tbbh);
-        task.setXmmc(tbbh);
         task.setCsmc(tbbh);
         task.setTblx(tbbh);
         task.setCzwt(tbbh);
         // 构建查询条件
         LambdaQueryWrapper<ZtTask> queryWrapper = new LambdaQueryWrapper<>();
-
+        if (Objects.nonNull(task.getXmmc())) {
+            queryWrapper.eq(ZtTask::getXmmc, task.getXmmc());
+            task.setXmmc(null);
+        } else {
+            task.setXmmc(tbbh);
+        }
 
         // 根据任务类型进行精确查询
         queryWrapper.eq(Objects.nonNull(task.getRwlx()), ZtTask::getRwlx, task.getRwlx());
@@ -327,7 +341,11 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
         // 初始化分页对象
         Page<ZtTask> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
         LambdaQueryWrapper<ZtTask> queryWrapper = getQueryWrapper(task);
-        // queryWrapper.ge(ZtTask::getYxccs,1);
+        if (task.getYxccs() != null && task.getYxccs() == 1) {
+            queryWrapper.ge(ZtTask::getYxccs, 1); // 已巡查
+        } else if (task.getYxccs() != null && task.getYxccs() == 0) {
+            queryWrapper.eq(ZtTask::getYxccs, 0); // 未巡查
+        }
         // 设置排序条件
         queryWrapper.orderByDesc(ZtTask::getXcsj);
         queryWrapper.orderByDesc(ZtTask::getZjxfsj);
@@ -462,5 +480,34 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
         return taskDetail;
     }
 
+    public Page<Map<String, Object>> getXmmcList(ZtTask task, PageDomain pageDomain) {
+        if (Objects.isNull(task.getDeptId())) {
+            task.setDeptId(SecurityUtils.getDeptId());
+        }
+        // 初始化分页对象
+        Page<Map<String, Object>> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
+        QueryWrapper<ZtTask> queryWrapper = new QueryWrapper<>();
+        // 分组查询xmmc,count(id) 作为任务数,返回map
+        LambdaQueryWrapper<ZtTask> lambdaQueryWrapper = queryWrapper.select("xmmc", "COUNT(*) as nums").groupBy("xmmc").lambda();
+        // 根据部门ID查询该部门及其所有父部门的任务
+        lambdaQueryWrapper.in(Objects.nonNull(task.getDeptId()), ZtTask::getDeptId, deptMapper.getAllAncestorsByDeptId(task.getDeptId()));
+        return this.pageMaps(page, lambdaQueryWrapper);
+    }
+
+    public Page<Map<String, Object>> getXmmcList2(ZtTask task, PageDomain pageDomain) {
+        if (Objects.isNull(task.getDeptId())) {
+            task.setDeptId(SecurityUtils.getDeptId());
+        }
+        // 初始化分页对象
+        Page<Map<String, Object>> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
+        QueryWrapper<ZtTask> queryWrapper = new QueryWrapper<>();
+        // 分组查询xmmc,count(id) 作为任务数,返回map
+        LambdaQueryWrapper<ZtTask> lambdaQueryWrapper = queryWrapper.select("xmmc", "COUNT(*) as nums").groupBy("xmmc").lambda();
+        lambdaQueryWrapper.eq(ZtTask::getZjxfqk, "1");
+        // 根据部门ID查询该部门及其所有父部门的任务
+        lambdaQueryWrapper.in(Objects.nonNull(task.getDeptId()), ZtTask::getDeptId, deptMapper.getAllAncestorsByDeptId(task.getDeptId()));
+        return this.pageMaps(page, lambdaQueryWrapper);
+    }
+
 }
 
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/ZttbTaskServiceImpl.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/ZttbTaskServiceImpl.java
index 6d9ea8b5..95b250cc 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/ZttbTaskServiceImpl.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/ZttbTaskServiceImpl.java
@@ -3,6 +3,8 @@ package com.ruoyi.cxxm.service.impl;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -83,7 +85,7 @@ public class ZttbTaskServiceImpl extends ServiceImpl<ZttbTaskMapper, ZttbTask> i
      * @return
      */
     @Transactional
-    public TaskImportRes importTask(MultipartFile file, String rwlx) throws IOException {
+    public TaskImportRes importTask(MultipartFile file, String rwlx, String newXmmc) throws IOException {
         TaskImportRes res = new TaskImportRes();
 
         try (InputStream inputStream = file.getInputStream()) {
@@ -123,16 +125,23 @@ public class ZttbTaskServiceImpl extends ServiceImpl<ZttbTaskMapper, ZttbTask> i
                 }
                 Map taskMap = JSONObject.parseObject(properties.toString(), Map.class);
                 // 校验必填字段是否存在
-                String[] requiredFields = new String[]{"NF", "XMC", "XZMC", "CJDCQ", "JCBH", "XFSJ", "JCMJ", "GDMJ", "XMMC", "X", "Y"};
+                ArrayList<String> requiredFields = new ArrayList<>(Arrays.asList("NF", "XMC", "XZMC", "CJDCQ", "JCBH", "XFSJ", "JCMJ", "GDMJ", "XMMC", "X", "Y"));
+                // 填写新的项目名就修改原项目名称
+                if (!newXmmc.equals("null")) {
+                    taskMap.put("XMMC", newXmmc);
+                }
                 for (String field : requiredFields) {
                     String fieldLowerCase = field.toLowerCase();
                     if (taskMap.containsKey(fieldLowerCase)) {
-                        throw new RuntimeException(StringUtils.format("字段:{}必须使用大写字母，请纠正为{}！", fieldLowerCase,field));
+                        throw new RuntimeException(StringUtils.format("字段:{}必须使用大写字母，请纠正为{}！", fieldLowerCase, field));
                     }
                     if (taskMap.get(field) == null) {
                         throw new RuntimeException(StringUtils.format("缺少必须字段:{}，请检查导入数据！", field));
                     }
                 }
+                if (taskMap.get("XMMC").toString().trim().isEmpty()) {
+                    throw new RuntimeException(StringUtils.format("XMMC字段内容不能为空！"));
+                }
                 zttbTask.setRwlx(rwlx);
                 zttbTask.setNian(taskMap.get("NF") != null ? taskMap.remove("NF").toString() : "");
                 zttbTask.setXian(taskMap.get("XMC") != null ? taskMap.remove("XMC").toString() : "");
@@ -144,6 +153,7 @@ public class ZttbTaskServiceImpl extends ServiceImpl<ZttbTaskMapper, ZttbTask> i
                 zttbTask.setGdmj(taskMap.get("GDMJ") != null ? taskMap.remove("GDMJ").toString() : "");
                 //zttbTask.setJbntmj(taskMap.get("YJJBNTMF") != null ? taskMap.remove("YJJBNTMF").toString() : "");
                 zttbTask.setXmmc(taskMap.get("XMMC") != null ? taskMap.remove("XMMC").toString() : "");
+                zttbTask.setMc(taskMap.get("MC") != null ? taskMap.remove("MC").toString() : "");
                 zttbTask.setX(taskMap.get("X") != null ? taskMap.remove("X").toString() : "");
                 zttbTask.setY(taskMap.get("Y") != null ? taskMap.remove("Y").toString() : "");
                 zttbTask.setXdm(taskMap.get("XDM") != null ? taskMap.remove("XDM").toString() : "");
@@ -195,13 +205,17 @@ public class ZttbTaskServiceImpl extends ServiceImpl<ZttbTaskMapper, ZttbTask> i
         task.setNian(tbbh);
         task.setXian(tbbh);
         task.setXzmc(tbbh);
-        task.setXmmc(tbbh);
         task.setCsmc(tbbh);
         task.setTbly(tbbh);
         task.setCzwt(tbbh);
         // 构建查询条件
         LambdaQueryWrapper<ZttbTask> queryWrapper = new LambdaQueryWrapper<>();
-
+        if (Objects.nonNull(task.getXmmc())) {
+            queryWrapper.eq(ZttbTask::getXmmc, task.getXmmc());
+            task.setXmmc(null);
+        } else {
+            task.setXmmc(tbbh);
+        }
         // 根据任务类型进行精确查询
         queryWrapper.eq(Objects.nonNull(task.getRwlx()), ZttbTask::getRwlx, task.getRwlx());
         // 根据州级下发情况进行精确查询
@@ -326,7 +340,11 @@ public class ZttbTaskServiceImpl extends ServiceImpl<ZttbTaskMapper, ZttbTask> i
         // 初始化分页对象
         Page<ZttbTask> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
         LambdaQueryWrapper<ZttbTask> queryWrapper = getQueryWrapper(task);
-        // queryWrapper.ge(ZttbTask::getYxccs,1);
+        if (task.getYxccs() != null && task.getYxccs() == 1) {
+            queryWrapper.ge(ZttbTask::getYxccs, 1); // 已巡查
+        } else if (task.getYxccs() != null && task.getYxccs() == 0) {
+            queryWrapper.eq(ZttbTask::getYxccs, 0); // 未巡查
+        }
         // 设置排序条件
         queryWrapper.orderByDesc(ZttbTask::getXcsj);
         queryWrapper.orderByDesc(ZttbTask::getZjxfsj);
@@ -461,5 +479,35 @@ public class ZttbTaskServiceImpl extends ServiceImpl<ZttbTaskMapper, ZttbTask> i
         }
         return taskDetail;
     }
+
+    public Page<Map<String, Object>> getXmmcList(ZttbTask task, PageDomain pageDomain) {
+        if (Objects.isNull(task.getDeptId())) {
+            task.setDeptId(SecurityUtils.getDeptId());
+        }
+        // 初始化分页对象
+        Page<Map<String, Object>> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
+        QueryWrapper<ZttbTask> queryWrapper = new QueryWrapper<>();
+        // 分组查询xmmc,count(id) 作为任务数,返回map
+        LambdaQueryWrapper<ZttbTask> lambdaQueryWrapper = queryWrapper.select("xmmc", "COUNT(*) as nums").groupBy("xmmc").lambda();
+        // 根据部门ID查询该部门及其所有父部门的任务
+        lambdaQueryWrapper.in(Objects.nonNull(task.getDeptId()), ZttbTask::getDeptId, deptMapper.getAllAncestorsByDeptId(task.getDeptId()));
+        return this.pageMaps(page, lambdaQueryWrapper);
+    }
+
+    public Page<Map<String, Object>> getXmmcList2(ZttbTask task, PageDomain pageDomain) {
+        if (Objects.isNull(task.getDeptId())) {
+            task.setDeptId(SecurityUtils.getDeptId());
+        }
+        // 初始化分页对象
+        Page<Map<String, Object>> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
+        QueryWrapper<ZttbTask> queryWrapper = new QueryWrapper<>();
+        // 分组查询xmmc,count(id) 作为任务数,返回map
+        LambdaQueryWrapper<ZttbTask> lambdaQueryWrapper = queryWrapper.select("xmmc", "COUNT(*) as nums").groupBy("xmmc").lambda();
+        lambdaQueryWrapper.eq(ZttbTask::getZjxfqk, "1");
+        // 根据部门ID查询该部门及其所有父部门的任务
+        lambdaQueryWrapper.in(Objects.nonNull(task.getDeptId()), ZttbTask::getDeptId, deptMapper.getAllAncestorsByDeptId(task.getDeptId()));
+        return this.pageMaps(page, lambdaQueryWrapper);
+    }
+
 }
 
diff --git a/ruoyi-ui/src/api/cxxm/zftk/task.js b/ruoyi-ui/src/api/cxxm/zftk/task.js
index 8ee276f0..5d72867a 100644
--- a/ruoyi-ui/src/api/cxxm/zftk/task.js
+++ b/ruoyi-ui/src/api/cxxm/zftk/task.js
@@ -9,6 +9,22 @@ export function listTask(query) {
   })
 }
 
+export function listTaskXmmc(query) {
+  return request({
+    url: '/cxxm/zftk/task/xmmc/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listTaskXmmc2(query) {
+  return request({
+    url: '/cxxm/zftk/task/xmmc/list2',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询任务详细
 export function getTask(id) {
   return request({
diff --git a/ruoyi-ui/src/api/cxxm/zt/task.js b/ruoyi-ui/src/api/cxxm/zt/task.js
index 4524bc55..d795bbc4 100644
--- a/ruoyi-ui/src/api/cxxm/zt/task.js
+++ b/ruoyi-ui/src/api/cxxm/zt/task.js
@@ -9,6 +9,22 @@ export function listTask(query) {
   })
 }
 
+export function listTaskXmmc(query) {
+  return request({
+    url: '/cxxm/zt/task/xmmc/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listTaskXmmc2(query) {
+  return request({
+    url: '/cxxm/zt/task/xmmc/list2',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询任务详细
 export function getTask(id) {
   return request({
diff --git a/ruoyi-ui/src/api/cxxm/zttb/task.js b/ruoyi-ui/src/api/cxxm/zttb/task.js
index fd1aa4a6..ebf2aa08 100644
--- a/ruoyi-ui/src/api/cxxm/zttb/task.js
+++ b/ruoyi-ui/src/api/cxxm/zttb/task.js
@@ -9,6 +9,22 @@ export function listTask(query) {
   })
 }
 
+export function listTaskXmmc(query) {
+  return request({
+    url: '/cxxm/zttb/task/xmmc/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listTaskXmmc2(query) {
+  return request({
+    url: '/cxxm/zttb/task/xmmc/list2',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询任务详细
 export function getTask(id) {
   return request({
diff --git a/ruoyi-ui/src/components/Map/index.vue b/ruoyi-ui/src/components/Map/index.vue
index f05ba844..8b07d7a9 100644
--- a/ruoyi-ui/src/components/Map/index.vue
+++ b/ruoyi-ui/src/components/Map/index.vue
@@ -160,7 +160,7 @@ export default {
           mapPointsList.push(new window.T.LngLat(Number(item.x), Number(item.y)))
           item.x = Number(item.x)
           item.y = Number(item.y)
-          var deg = Number(item.deg)
+          var deg = Number(item.psfx)
           var optdiv = '<div style="position: relative;display: contents; width: 50px;height: 50px;overflow: hidden;">' +
             '<b style="display: block;  font-size: 15px;background: #007aff;border-radius: 100px;' +
             'width: 20px;' +
@@ -170,7 +170,8 @@ export default {
             'text-align: center;' +
             'left: -10px;line-height: 1.5;' +
             'color: white;">' + newindex + '</b>' +
-            '<img  src="' + imageURL + '" style="position: absolute; opacity: 0.5;z-index: -1;top: 0px; left: 0px;width: 50px;height: 50px; transform: rotate(' + deg + 'deg);"alt=""></div>'
+            '<img  src="' + imageURL + '" style="position: absolute; opacity: 0.5;z-index: -1;top: 0px; left: 0px;width: 50px;height: 50px; transform: rotate(' + deg + 'deg);"alt="">' +
+            '</div>'
           var map_images = new window.T.Label({
             text: optdiv,
             position: new window.T.LngLat(item.x, item.y),
diff --git a/ruoyi-ui/src/views/cxxm/zftkTask/assign/index.vue b/ruoyi-ui/src/views/cxxm/zftkTask/assign/index.vue
index 9a2220ab..4d18efef 100644
--- a/ruoyi-ui/src/views/cxxm/zftkTask/assign/index.vue
+++ b/ruoyi-ui/src/views/cxxm/zftkTask/assign/index.vue
@@ -1,197 +1,213 @@
 <template>
   <div class="app-container">
 
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="68px">
-          <!--          <el-form-item label="年份" prop="nian">-->
-          <!--            <el-input-->
-          <!--              v-model="queryParams.nian"-->
-          <!--              placeholder="请输入年份"-->
-          <!--              clearable-->
-          <!--              @keyup.enter.native="handleQuery"-->
-          <!--            />-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item label="县名称" prop="xian">-->
-          <!--            <el-input-->
-          <!--              v-model="queryParams.xian"-->
-          <!--              placeholder="请输入县名称"-->
-          <!--              clearable-->
-          <!--              @keyup.enter.native="handleQuery"-->
-          <!--            />-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item label="项目名称" prop="xmmc">-->
-          <!--            <el-input-->
-          <!--              v-model="queryParams.xmmc"-->
-          <!--              placeholder="请输入项目名称"-->
-          <!--              clearable-->
-          <!--              @keyup.enter.native="handleQuery"-->
-          <!--            />-->
-          <!--          </el-form-item>-->
-          <el-form-item label="综合搜索" prop="dkh">
-            <el-input
-              v-model="queryParams.dkh"
-              placeholder="请输入搜索内容"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <!--          <el-form-item label="功能分区" prop="gnfq">-->
-          <!--            <el-input-->
-          <!--              v-model="queryParams.gnfq"-->
-          <!--              placeholder="请输入功能分区"-->
-          <!--              clearable-->
-          <!--              @keyup.enter.native="handleQuery"-->
-          <!--            />-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item label="动工状态" prop="dgzt">-->
-          <!--            <el-input-->
-          <!--              v-model="queryParams.dgzt"-->
-          <!--              placeholder="请输入动工状态"-->
-          <!--              clearable-->
-          <!--              @keyup.enter.native="handleQuery"-->
-          <!--            />-->
-          <!--          </el-form-item>-->
-          <!--      <el-form-item label="下发情况" prop="xjxfqk">-->
-          <!--        <el-select v-model="queryParams.xjxfqk" placeholder="请选择下发情况" clearable-->
-          <!--                   @change="handleQuery">-->
-          <!--          <el-option-->
-          <!--            v-for="dict in dict.type.task_xfqk"-->
-          <!--            :key="dict.value"-->
-          <!--            :label="dict.label"-->
-          <!--            :value="dict.value"-->
-          <!--          />-->
-          <!--        </el-select>-->
-          <!--      </el-form-item>-->
-          <el-form-item label="指派情况" prop="xzxfqk">
-            <el-select v-model="queryParams.xzxfqk" placeholder="请选择指派情况" clearable
-                       @change="handleQuery">
-              <el-option key="0" label="未指派" value="0"></el-option>
-              <el-option key="1" label="已指派" value="1"></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="warning"-->
-<!--                  plain-->
-<!--                  icon="el-icon-download"-->
-<!--                  size="mini"-->
-<!--                  @click="openDistributePage"-->
-<!--                >乡镇情况-->
-<!--                </el-button>-->
-        <!--      </el-col>-->
-        <!--    </el-row>-->
-
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-
-
-        <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
-          <!--      <el-table-column type="selection" width="55" align="center" :selectable="selectable" fixed="left"/>-->
-          <el-table-column label="id" align="center" prop="id" fixed="left"/>
-          <el-table-column label="年份" align="center" prop="nian"/>
-          <el-table-column label="县名称" align="center" prop="xian"/>
-          <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
-          <el-table-column label="地块号" align="center" prop="dkh"/>
-          <el-table-column label="功能分区" align="center" prop="gnfq" min-width="180"/>
-          <el-table-column label="地块面积" align="center" prop="dkmj" :show-overflow-tooltip="true"/>
-          <el-table-column label="农用地面积" align="center" prop="nydmj" :show-overflow-tooltip="true"/>
-          <el-table-column label="耕地面积" align="center" prop="gdmj" :show-overflow-tooltip="true"/>
-          <el-table-column label="建设用地面积" align="center" prop="jsydmj" :show-overflow-tooltip="true"/>
-          <el-table-column label="未利用用地面积" align="center" prop="wlydmj" :show-overflow-tooltip="true"/>
-          <el-table-column label="永久基本农田面积" align="center" prop="yjjbntmj" :show-overflow-tooltip="true"/>
-          <el-table-column label="动工状态" align="center" prop="dgzt"/>
-          <el-table-column label="导入人员" align="center" prop="createBy" min-width="120"/>
-          <el-table-column label="导入时间" align="center" prop="drsj" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.drsj, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="州级下发情况" align="center" prop="zjxfqk">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.task_xfqk" :value="scope.row.zjxfqk" v-if="scope.row.zjxfqk=='0'"
-                        style="color: red"/>
-              <dict-tag :options="dict.type.task_xfqk" :value="scope.row.zjxfqk" v-if="scope.row.zjxfqk=='1'"
-                        style="color: green"/>
-            </template>
-          </el-table-column>
-          <el-table-column label="州级下发时间" align="center" prop="zjxfsj" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.zjxfsj, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <!--      <el-table-column label="县级下发情况" align="center" prop="xjxfqk">-->
-          <!--        <template slot-scope="scope">-->
-          <!--          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xjxfqk" v-if="scope.row.xjxfqk=='0'"-->
-          <!--                    style="color: red"/>-->
-          <!--          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xjxfqk" v-if="scope.row.xjxfqk=='1'"-->
-          <!--                    style="color: green"/>-->
-          <!--        </template>-->
-          <!--      </el-table-column>-->
-          <!--      <el-table-column label="县级下发时间" align="center" prop="xjxfsj" width="180">-->
-          <!--        <template slot-scope="scope">-->
-          <!--          <span>{{ parseTime(scope.row.xjxfsj, '{y}-{m}-{d}') }}</span>-->
-          <!--        </template>-->
-          <!--      </el-table-column>-->
-          <el-table-column label="指派情况" align="center" prop="xzxfqk">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.task_xfqk" value="未指派" v-if="scope.row.xzxfqk=='0'"
-                        style="color: red"/>
-              <dict-tag :options="dict.type.task_xfqk" value="已指派" v-if="scope.row.xzxfqk=='1'"
-                        style="color: green"/>
-            </template>
-          </el-table-column>
-          <el-table-column label="指派时间" align="center" prop="xzxfsj" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.xzxfsj, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="180"
-                           fixed="right">
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-view"
-                @click="jump(scope.row.id)"
-              >
-                查看
-              </el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-download"
-                @click="openAssignPage(scope.row)"
-                v-if="scope.row.xzxfqk=='0'"
-              >去指派
-              </el-button>
-              <el-button
-                size="mini"
-                style="color: orangered;border: none"
-                icon="el-icon-download"
-                @click="openAssignPage(scope.row)"
-                v-if="scope.row.xzxfqk=='1'"
-              >改派
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+             label-width="68px">
+      <!--          <el-form-item label="年份" prop="nian">-->
+      <!--            <el-input-->
+      <!--              v-model="queryParams.nian"-->
+      <!--              placeholder="请输入年份"-->
+      <!--              clearable-->
+      <!--              @keyup.enter.native="handleQuery"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <!--          <el-form-item label="县名称" prop="xian">-->
+      <!--            <el-input-->
+      <!--              v-model="queryParams.xian"-->
+      <!--              placeholder="请输入县名称"-->
+      <!--              clearable-->
+      <!--              @keyup.enter.native="handleQuery"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <!--          <el-form-item label="项目名称" prop="xmmc">-->
+      <!--            <el-input-->
+      <!--              v-model="queryParams.xmmc"-->
+      <!--              placeholder="请输入项目名称"-->
+      <!--              clearable-->
+      <!--              @keyup.enter.native="handleQuery"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <el-form-item label="综合搜索" prop="dkh">
+        <el-input
+          v-model="queryParams.dkh"
+          placeholder="请输入搜索内容"
+          clearable
+          @keyup.enter.native="handleQuery"
         />
+      </el-form-item>
+      <!--          <el-form-item label="功能分区" prop="gnfq">-->
+      <!--            <el-input-->
+      <!--              v-model="queryParams.gnfq"-->
+      <!--              placeholder="请输入功能分区"-->
+      <!--              clearable-->
+      <!--              @keyup.enter.native="handleQuery"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <!--          <el-form-item label="动工状态" prop="dgzt">-->
+      <!--            <el-input-->
+      <!--              v-model="queryParams.dgzt"-->
+      <!--              placeholder="请输入动工状态"-->
+      <!--              clearable-->
+      <!--              @keyup.enter.native="handleQuery"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <!--      <el-form-item label="下发情况" prop="xjxfqk">-->
+      <!--        <el-select v-model="queryParams.xjxfqk" placeholder="请选择下发情况" clearable-->
+      <!--                   @change="handleQuery">-->
+      <!--          <el-option-->
+      <!--            v-for="dict in dict.type.task_xfqk"-->
+      <!--            :key="dict.value"-->
+      <!--            :label="dict.label"-->
+      <!--            :value="dict.value"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <el-form-item label="指派情况" prop="xzxfqk">
+        <el-select v-model="queryParams.xzxfqk" placeholder="请选择指派情况" clearable
+                   @change="handleQuery">
+          <el-option key="0" label="未指派" value="0"></el-option>
+          <el-option key="1" label="已指派" value="1"></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>
+
+    <h3 v-if="this.queryParams.xmmc">项目名称：{{ this.queryParams.xmmc }}</h3>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-view"
+          size="mini"
+          @click="handleXmmcList"
+        >查看项目
+        </el-button>
+      </el-col>
+      <!--          <el-col :span="1.5">-->
+      <!--            <el-button-->
+      <!--              type="warning"-->
+      <!--              plain-->
+      <!--              icon="el-icon-download"-->
+      <!--              size="mini"-->
+      <!--              @click="openDistributePage"-->
+      <!--            >乡镇情况-->
+      <!--            </el-button>-->
+      <!--          </el-col>-->
+
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+
+    <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
+      <!--      <el-table-column type="selection" width="55" align="center" :selectable="selectable" fixed="left"/>-->
+      <el-table-column label="id" align="center" prop="id" fixed="left"/>
+      <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+      <el-table-column label="年份" align="center" prop="nian"/>
+      <el-table-column label="县名称" align="center" prop="xian"/>
+      <el-table-column label="地块号" align="center" prop="dkh"/>
+      <el-table-column label="功能分区" align="center" prop="gnfq" min-width="180"/>
+      <el-table-column label="地块面积" align="center" prop="dkmj" :show-overflow-tooltip="true"/>
+      <el-table-column label="农用地面积" align="center" prop="nydmj" :show-overflow-tooltip="true"/>
+      <el-table-column label="耕地面积" align="center" prop="gdmj" :show-overflow-tooltip="true"/>
+      <el-table-column label="建设用地面积" align="center" prop="jsydmj" :show-overflow-tooltip="true"/>
+      <el-table-column label="未利用用地面积" align="center" prop="wlydmj" :show-overflow-tooltip="true"/>
+      <el-table-column label="永久基本农田面积" align="center" prop="yjjbntmj" :show-overflow-tooltip="true"/>
+      <el-table-column label="动工状态" align="center" prop="dgzt"/>
+      <el-table-column label="导入人员" align="center" prop="createBy" min-width="120"/>
+      <el-table-column label="导入时间" align="center" prop="drsj" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.drsj, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="州级下发情况" align="center" prop="zjxfqk">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.zjxfqk" v-if="scope.row.zjxfqk=='0'"
+                    style="color: red"/>
+          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.zjxfqk" v-if="scope.row.zjxfqk=='1'"
+                    style="color: green"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="州级下发时间" align="center" prop="zjxfsj" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.zjxfsj, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <!--      <el-table-column label="县级下发情况" align="center" prop="xjxfqk">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xjxfqk" v-if="scope.row.xjxfqk=='0'"-->
+      <!--                    style="color: red"/>-->
+      <!--          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xjxfqk" v-if="scope.row.xjxfqk=='1'"-->
+      <!--                    style="color: green"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="县级下发时间" align="center" prop="xjxfsj" width="180">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <span>{{ parseTime(scope.row.xjxfsj, '{y}-{m}-{d}') }}</span>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <el-table-column label="指派情况" align="center" prop="xzxfqk">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.task_xfqk" value="未指派" v-if="scope.row.xzxfqk=='0'"
+                    style="color: red"/>
+          <dict-tag :options="dict.type.task_xfqk" value="已指派" v-if="scope.row.xzxfqk=='1'"
+                    style="color: green"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="指派给" align="center" prop="toName"/>
+      <el-table-column label="指派时间" align="center" prop="xzxfsj" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.xzxfsj, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="180"
+                       fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="jump(scope.row.id)"
+          >
+            查看
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-download"
+            @click="openAssignPage(scope.row)"
+            v-if="scope.row.xzxfqk=='0'"
+          >去指派
+          </el-button>
+          <el-button
+            size="mini"
+            style="color: orangered;border: none"
+            icon="el-icon-download"
+            @click="openAssignPage(scope.row)"
+            v-if="scope.row.xzxfqk=='1'"
+          >改派
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改任务对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form-item label="项目名称" prop="xmmc">
+        <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
+      </el-form-item>
       <el-form ref="form" :model="form" :rules="rules" label-width="125px">
         <el-form-item label="年份" prop="nian">
           <el-input v-model="form.nian" placeholder="请输入年份"/>
@@ -199,9 +215,6 @@
         <el-form-item label="县名称" prop="xian">
           <el-input v-model="form.xian" placeholder="请输入县名称"/>
         </el-form-item>
-        <el-form-item label="项目名称" prop="xmmc">
-          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
-        </el-form-item>
         <el-form-item label="地块号" prop="dkh">
           <el-input v-model="form.dkh" placeholder="请输入地块号"/>
         </el-form-item>
@@ -256,22 +269,22 @@
         <el-table-column label="人员总数" align="center" prop="userCount"/>
         <el-table-column label="已指派" align="center" prop="yzpCount"/>
         <el-table-column label="未指派" align="center" prop="wzpCount"/>
-<!--        <el-table-column label="人均任务数" align="center">-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ Math.round(scope.row.taskCount / scope.row.userCount) }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-button-->
-<!--              size="mini"-->
-<!--              type="text"-->
-<!--              icon="el-icon-view"-->
-<!--              @click="handleDistribute(scope.row)"-->
-<!--            >下发至乡镇-->
-<!--            </el-button>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column label="人均任务数" align="center">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ Math.round(scope.row.taskCount / scope.row.userCount) }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-button-->
+        <!--              size="mini"-->
+        <!--              type="text"-->
+        <!--              icon="el-icon-view"-->
+        <!--              @click="handleDistribute(scope.row)"-->
+        <!--            >下发至乡镇-->
+        <!--            </el-button>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
       </el-table>
 
       <!--      <pagination-->
@@ -321,6 +334,33 @@
       <!--        @pagination="getList"-->
       <!--      />-->
     </el-drawer>
+
+
+    <el-dialog title="项目列表" :visible.sync="openXmmcList" width="800px" append-to-body>
+      <el-table v-loading="loading" :data="xmmcList">
+        <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+        <el-table-column label="图斑数量" align="center" prop="nums"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="selectXmmc(scope.row.xmmc)"
+              :disabled="!scope.row.xmmc"
+            >查看项目
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="xmmcTotal>0"
+        :total="xmmcTotal"
+        :page.sync="xmmcQueryParams.pageNum"
+        :limit.sync="xmmcQueryParams.pageSize"
+        @pagination="getTaskXmmcList"/>
+    </el-dialog>
   </div>
 </template>
 
@@ -332,7 +372,8 @@ import {
   addTask,
   updateTask,
   distribute2Task,
-  assignTask
+  assignTask,
+  listTaskXmmc2 as listTaskXmmc
 } from "@/api/cxxm/zftk/task";
 import {getUsers, getGroupNames} from "@/api/cxxm/zftk/user";
 import {getUserProfile} from "@/api/system/user";
@@ -375,6 +416,14 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openXmmcList: false,
+      xmmcList: [],
+      xmmcTotal: 0,
+      xmmcQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        xmmc: null,
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -523,6 +572,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.xmmc = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -658,6 +708,21 @@ export default {
       this.queryParams.deptId = data.id;
       this.handleQuery();
     },
+    getTaskXmmcList() {
+      listTaskXmmc(this.xmmcQueryParams).then(response => {
+        this.xmmcList = response.rows;
+        this.xmmcTotal = response.total;
+      });
+    },
+    handleXmmcList() {
+      this.getTaskXmmcList();
+      this.openXmmcList = true;
+    },
+    selectXmmc(xmmc) {
+      this.queryParams.xmmc = xmmc;
+      this.handleQuery();
+      this.openXmmcList = false;
+    }
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/cxxm/zftkTask/check/index.vue b/ruoyi-ui/src/views/cxxm/zftkTask/check/index.vue
index 0e6eec82..12ff805a 100644
--- a/ruoyi-ui/src/views/cxxm/zftkTask/check/index.vue
+++ b/ruoyi-ui/src/views/cxxm/zftkTask/check/index.vue
@@ -1,128 +1,205 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item label="年份" prop="nian">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.nian"-->
-<!--          placeholder="请输入年份"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="县名称" prop="xian">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.xian"-->
-<!--          placeholder="请输入县名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="项目名称" prop="xmmc">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.xmmc"-->
-<!--          placeholder="请输入项目名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item label="综合搜索" prop="dkh">
-        <el-input
-          v-model="queryParams.dkh"
-          placeholder="请输入搜索内容"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-<!--      <el-form-item label="功能分区" prop="gnfq">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.gnfq"-->
-<!--          placeholder="请输入功能分区"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="动工状态" prop="dgzt">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.dgzt"-->
-<!--          placeholder="请输入动工状态"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </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="20">
+      <el-col :span="4" :xs="24" v-if="checkRole(['zjgly'])">
+        <el-tree
+          :data="deptOptions"
+          :props="defaultProps"
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          ref="tree"
+          node-key="id"
+          default-expand-all
+          highlight-current
+          @node-click="handleNodeClick"/>
+      </el-col>
+      <el-col :span="checkRole(['zjgly']) ? 20:24" :xs="24">
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :disabled="multiple"
-          @click="handleExport"
-        >导出
-        </el-button>
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px">
+          <!--      <el-form-item label="年份" prop="nian">-->
+          <!--        <el-input-->
+          <!--          v-model="queryParams.nian"-->
+          <!--          placeholder="请输入年份"-->
+          <!--          clearable-->
+          <!--          @keyup.enter.native="handleQuery"-->
+          <!--        />-->
+          <!--      </el-form-item>-->
+          <!--      <el-form-item label="县名称" prop="xian">-->
+          <!--        <el-input-->
+          <!--          v-model="queryParams.xian"-->
+          <!--          placeholder="请输入县名称"-->
+          <!--          clearable-->
+          <!--          @keyup.enter.native="handleQuery"-->
+          <!--        />-->
+          <!--      </el-form-item>-->
+          <!--      <el-form-item label="项目名称" prop="xmmc">-->
+          <!--        <el-input-->
+          <!--          v-model="queryParams.xmmc"-->
+          <!--          placeholder="请输入项目名称"-->
+          <!--          clearable-->
+          <!--          @keyup.enter.native="handleQuery"-->
+          <!--        />-->
+          <!--      </el-form-item>-->
+          <el-form-item label="综合搜索" prop="dkh">
+            <el-input
+              v-model="queryParams.dkh"
+              placeholder="请输入搜索内容"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="巡查情况" prop="yxccs">
+            <el-select v-model="queryParams.yxccs" placeholder="请选择巡查情况" clearable
+                       @change="handleQuery">
+              <el-option :key="0" label="未巡查" :value="0"/>
+              <el-option :key="1" label="已巡查" :value="1"/>
+            </el-select>
+          </el-form-item>
+          <!--      <el-form-item label="功能分区" prop="gnfq">-->
+          <!--        <el-input-->
+          <!--          v-model="queryParams.gnfq"-->
+          <!--          placeholder="请输入功能分区"-->
+          <!--          clearable-->
+          <!--          @keyup.enter.native="handleQuery"-->
+          <!--        />-->
+          <!--      </el-form-item>-->
+          <!--      <el-form-item label="动工状态" prop="dgzt">-->
+          <!--        <el-input-->
+          <!--          v-model="queryParams.dgzt"-->
+          <!--          placeholder="请输入动工状态"-->
+          <!--          clearable-->
+          <!--          @keyup.enter.native="handleQuery"-->
+          <!--        />-->
+          <!--      </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>
+
+        <h3 v-if="this.queryParams.xmmc">项目名称：{{ this.queryParams.xmmc }}</h3>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-view"
+              size="mini"
+              @click="handleXmmcList"
+            >查看项目
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              :disabled="multiple"
+              @click="handleExport"
+            >导出
+            </el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+
+        <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" fixed="left"/>
+          <el-table-column label="id" align="center" prop="id" fixed="left"/>
+          <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+          <el-table-column label="年份" align="center" prop="nian"/>
+          <el-table-column label="县名称" align="center" prop="xian"/>
+          <el-table-column label="地块号" align="center" prop="dkh"/>
+          <el-table-column label="已巡查次数" align="center" prop="yxccs"/>
+          <el-table-column label="州级巡查次数" align="center" prop="zjxccs"/>
+          <el-table-column label="县级巡查次数" align="center" prop="xjxccs"/>
+          <el-table-column label="最后巡查时间" align="center" prop="xcsj" min-width="120">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.xcsj, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="功能分区" align="center" prop="gnfq" min-width="180"/>
+          <el-table-column label="地块面积" align="center" prop="dkmj" :show-overflow-tooltip="true"/>
+          <el-table-column label="农用地面积" align="center" prop="nydmj" :show-overflow-tooltip="true"/>
+          <el-table-column label="耕地面积" align="center" prop="gdmj" :show-overflow-tooltip="true"/>
+          <el-table-column label="建设用地面积" align="center" prop="jsydmj" :show-overflow-tooltip="true"/>
+          <el-table-column label="未利用用地面积" align="center" prop="wlydmj" :show-overflow-tooltip="true"/>
+          <el-table-column label="永久基本农田面积" align="center" prop="yjjbntmj" :show-overflow-tooltip="true"/>
+          <el-table-column label="动工状态" align="center" prop="dgzt"/>
+          <el-table-column label="导入人员" align="center" prop="createBy" min-width="120"/>
+          <el-table-column label="导入时间" align="center" prop="drsj" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.drsj, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120"
+                           fixed="right">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-view"
+                @click="jump(scope.row.id)"
+              >
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
-    <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" fixed="left"/>
-      <el-table-column label="id" align="center" prop="id" fixed="left"/>
-      <el-table-column label="年份" align="center" prop="nian"/>
-      <el-table-column label="县名称" align="center" prop="xian"/>
-      <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
-      <el-table-column label="地块号" align="center" prop="dkh"/>
-      <el-table-column label="已巡查次数" align="center" prop="yxccs"/>
-      <el-table-column label="州级巡查次数" align="center" prop="zjxccs"/>
-      <el-table-column label="县级巡查次数" align="center" prop="xjxccs"/>
-      <el-table-column label="最后巡查时间" align="center" prop="xcsj" min-width="120">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.xcsj, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="功能分区" align="center" prop="gnfq" min-width="180"/>
-      <el-table-column label="地块面积" align="center" prop="dkmj" :show-overflow-tooltip="true"/>
-      <el-table-column label="农用地面积" align="center" prop="nydmj" :show-overflow-tooltip="true"/>
-      <el-table-column label="耕地面积" align="center" prop="gdmj" :show-overflow-tooltip="true"/>
-      <el-table-column label="建设用地面积" align="center" prop="jsydmj" :show-overflow-tooltip="true"/>
-      <el-table-column label="未利用用地面积" align="center" prop="wlydmj" :show-overflow-tooltip="true"/>
-      <el-table-column label="永久基本农田面积" align="center" prop="yjjbntmj" :show-overflow-tooltip="true"/>
-      <el-table-column label="动工状态" align="center" prop="dgzt"/>
-      <el-table-column label="导入人员" align="center" prop="createBy" min-width="120"/>
-      <el-table-column label="导入时间" align="center" prop="drsj" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.drsj, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120" fixed="right">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="jump(scope.row.id)"
-          >
-            查看
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <el-dialog title="项目列表" :visible.sync="openXmmcList" width="800px" append-to-body>
+      <el-table v-loading="loading" :data="xmmcList">
+        <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+        <el-table-column label="图斑数量" align="center" prop="nums"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="selectXmmc(scope.row.xmmc)"
+              :disabled="!scope.row.xmmc"
+            >查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="xmmcTotal>0"
+        :total="xmmcTotal"
+        :page.sync="xmmcQueryParams.pageNum"
+        :limit.sync="xmmcQueryParams.pageSize"
+        @pagination="getTaskXmmcList"/>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {listCheckTask as listTask, getTask, delTask, addTask, updateTask} from "@/api/cxxm/zftk/task";
+import {
+  listCheckTask as listTask,
+  getTask,
+  delTask,
+  addTask,
+  updateTask,
+  listTaskXmmc2 as listTaskXmmc
+} from "@/api/cxxm/zftk/task";
+import {deptTreeSelect} from "@/api/system/user";
+import {checkRole} from "../../../../utils/permission";
 
 export default {
   name: "Task",
@@ -146,6 +223,20 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openXmmcList: false,
+      xmmcList: [],
+      xmmcTotal: 0,
+      xmmcQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        xmmc: null,
+      },
+      // 部门树选项
+      deptOptions: null,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -197,8 +288,10 @@ export default {
   },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
+    checkRole,
     /** 查询任务列表 */
     getList() {
       this.loading = true;
@@ -273,6 +366,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.xmmc = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -330,7 +424,40 @@ export default {
       this.download(`/cxxm/zftk/task/export/${id}`, {
         ...this.queryParams
       }, `执法踏勘_${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}.xlsx`)
-    }
+    },
+    handleXmmcList() {
+      this.getTaskXmmcList();
+      this.openXmmcList = true;
+    },
+    selectXmmc(xmmc) {
+      this.queryParams.xmmc = xmmc;
+      this.handleQuery();
+      this.openXmmcList = false;
+    },
+    getTaskXmmcList() {
+      listTaskXmmc(this.xmmcQueryParams).then(response => {
+        this.xmmcList = response.rows;
+        this.xmmcTotal = response.total;
+      });
+    },
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.xmmc = null;
+      this.queryParams.deptId = data.id;
+      this.xmmcQueryParams.deptId = data.id;
+      this.handleQuery();
+    },
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/cxxm/zftkTask/detail/index.vue b/ruoyi-ui/src/views/cxxm/zftkTask/detail/index.vue
index 079d77f2..5c173c0f 100644
--- a/ruoyi-ui/src/views/cxxm/zftkTask/detail/index.vue
+++ b/ruoyi-ui/src/views/cxxm/zftkTask/detail/index.vue
@@ -14,9 +14,9 @@ template
             <el-tab-pane label="基本信息" name="1" style="height: 76vh;overflow: auto">
               <el-descriptions column="2" border :contentStyle="content_style"
                                :labelStyle="label_style">
+                <el-descriptions-item label="项目名称" :span="2">{{ form.xmmc }}</el-descriptions-item>
                 <el-descriptions-item label="年份">{{ form.nian }}</el-descriptions-item>
                 <el-descriptions-item label="县名称">{{ form.xian }}</el-descriptions-item>
-                <el-descriptions-item label="项目名称" :span="2">{{ form.xmmc }}</el-descriptions-item>
                 <el-descriptions-item label="地块号">{{ form.dkh }}</el-descriptions-item>
                 <el-descriptions-item label="功能分区">{{ form.gnfq }}</el-descriptions-item>
                 <el-descriptions-item label="地块面积">{{ form.dkmj }}</el-descriptions-item>
@@ -36,7 +36,7 @@ template
                 <el-descriptions-item label="乡镇指派情况">{{ form.xzxfqk == "0" ? "未指派" : "已指派" }}
                 </el-descriptions-item>
                 <el-descriptions-item label="乡镇指派时间">{{ form.xzxfsj }}</el-descriptions-item>
-                <el-descriptions-item label="指定外业人员">{{ form.toName }}
+                <el-descriptions-item label="指定给">{{ form.toName }}
                 </el-descriptions-item>
                 <!--                <el-descriptions-item label="任务进度" :span="2">-->
                 <!--                  <el-steps :active="activeStep" finish-status="success" align-center>-->
@@ -91,7 +91,7 @@ template
                 <h4>现场图片:</h4>
                 <div v-for="(item,index) in taskCheckSubmitVo.taskCheckImages"
                      style="display: inline-block; width: 100px; height: 100px; margin-right: 10px; margin-bottom: 50px">
-                  <el-image :src="baseUrl+ item.cclj" :preview-src-list="[baseUrl+ item.cclj]"></el-image>
+                  <el-image :src="baseUrl+ item.cclj" :preview-src-list="previewList"></el-image>
                   <el-tag>图片:{{ index + 1 }}</el-tag>
                 </div>
                 <div v-if="taskCheckSubmitVo.taskCheckImages.length==0" style="margin-bottom: 10px">
@@ -257,9 +257,11 @@ template
                   </el-form-item>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
-                  <el-button type="primary" v-if="auditForm.id" @click="submitAuditForm" style="float:right" v-hasRole="['zjgly']">修 改
+                  <el-button type="primary" v-if="auditForm.id" @click="submitAuditForm" style="float:right"
+                             v-hasRole="['zjgly']">修 改
                   </el-button>
-                  <el-button type="primary" v-else @click="submitAuditForm" style="float:right" v-hasRole="['zjgly']">保 存
+                  <el-button type="primary" v-else @click="submitAuditForm" style="float:right" v-hasRole="['zjgly']">保
+                    存
                   </el-button>
                   <!--                  <el-button @click="open = false">取 消</el-button>-->
                 </div>
@@ -381,6 +383,7 @@ export default {
         centerPoint: null,
         images: null
       },
+      previewList: [],
       baseUrl: process.env.VUE_APP_BASE_API,
       title: "",
       open: false,
@@ -406,13 +409,28 @@ export default {
   created() {
     this.getTaskDetail();
   },
+  watch: {
+    // 监听 taskCheckSubmitVo
+    taskCheckSubmitVo: {
+      handler: function (newValue, oldValue) {
+        if (newValue.taskCheckImages != null) {
+          if (newValue.taskCheckImages.length > 0) {
+            for (let item of newValue.taskCheckImages) {
+              this.previewList.push(this.baseUrl + item.cclj);
+            }
+          }
+        }
+      },
+    }
+  },
   computed: {
     readOnly() {
       if (!this.$auth.hasRole("zjgly")) {
         // 查看页面设为只读状态
         return true;
       }
-      return false;    },
+      return false;
+    },
     verifyReadOnly() {
       if (!this.$auth.hasRole("xjgly")) {
         // 查看页面设为只读状态
diff --git a/ruoyi-ui/src/views/cxxm/zftkTask/distribute/index.vue b/ruoyi-ui/src/views/cxxm/zftkTask/distribute/index.vue
index 5e018eee..cf110483 100644
--- a/ruoyi-ui/src/views/cxxm/zftkTask/distribute/index.vue
+++ b/ruoyi-ui/src/views/cxxm/zftkTask/distribute/index.vue
@@ -83,7 +83,19 @@
           </el-form-item>
         </el-form>
 
+        <h3 v-if="this.queryParams.xmmc">项目名称：{{ this.queryParams.xmmc }}</h3>
+
         <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-view"
+              size="mini"
+              @click="handleXmmcList"
+            >查看项目
+            </el-button>
+          </el-col>
           <el-col :span="1.5">
             <el-button
               type="warning"
@@ -124,9 +136,9 @@
         <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" :selectable="selectable" fixed="left"/>
           <el-table-column label="id" align="center" prop="id" fixed="left"/>
+          <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
           <el-table-column label="年份" align="center" prop="nian"/>
           <el-table-column label="县名称" align="center" prop="xian"/>
-          <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
           <el-table-column label="地块号" align="center" prop="dkh"/>
           <el-table-column label="功能分区" align="center" prop="gnfq" min-width="180"/>
           <el-table-column label="地块面积" align="center" prop="dkmj" :show-overflow-tooltip="true"/>
@@ -199,15 +211,15 @@
     <!-- 添加或修改任务对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+        <el-form-item label="项目名称" prop="xmmc">
+          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
+        </el-form-item>
         <el-form-item label="年份" prop="nian">
           <el-input v-model="form.nian" placeholder="请输入年份"/>
         </el-form-item>
         <el-form-item label="县名称" prop="xian">
           <el-input v-model="form.xian" placeholder="请输入县名称"/>
         </el-form-item>
-        <el-form-item label="项目名称" prop="xmmc">
-          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
-        </el-form-item>
         <el-form-item label="地块号" prop="dkh">
           <el-input v-model="form.dkh" placeholder="请输入地块号"/>
         </el-form-item>
@@ -241,9 +253,9 @@
         <el-form-item label="纬度" prop="y">
           <el-input v-model="form.y" placeholder="请输入纬度"/>
         </el-form-item>
-<!--        <el-form-item label="详细信息" prop="info">-->
-<!--          <el-input v-model="form.info" type="textarea" placeholder="请输入内容"/>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="详细信息" prop="info">-->
+        <!--          <el-input v-model="form.info" type="textarea" placeholder="请输入内容"/>-->
+        <!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -251,6 +263,33 @@
       </div>
     </el-dialog>
 
+
+    <el-dialog title="项目列表" :visible.sync="openXmmcList" width="800px" append-to-body>
+      <el-table v-loading="loading" :data="xmmcList">
+        <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+        <el-table-column label="图斑数量" align="center" prop="nums"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="selectXmmc(scope.row.xmmc)"
+              :disabled="!scope.row.xmmc"
+            >查看项目
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="xmmcTotal>0"
+        :total="xmmcTotal"
+        :page.sync="xmmcQueryParams.pageNum"
+        :limit.sync="xmmcQueryParams.pageSize"
+        @pagination="getTaskXmmcList"/>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -261,7 +300,8 @@ import {
   delTask,
   addTask,
   updateTask,
-  distributeTask
+  distributeTask,
+  listTaskXmmc
 } from "@/api/cxxm/zftk/task";
 import {deptTreeSelect} from "@/api/system/user";
 
@@ -288,6 +328,15 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openXmmcList: false,
+      xmmcList: [],
+      xmmcTotal: 0,
+      xmmcQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        xmmc: null,
+        deptId: null
+      },
       // 部门树选项
       deptOptions: null,
       defaultProps: {
@@ -419,6 +468,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.xmmc = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -506,7 +556,9 @@ export default {
     },
     // 节点单击事件
     handleNodeClick(data) {
+      this.queryParams.xmmc = null;
       this.queryParams.deptId = data.id;
+      this.xmmcQueryParams.deptId = data.id;
       this.handleQuery();
     },
     //判断是否可勾选
@@ -528,6 +580,21 @@ export default {
       }).catch(() => {
       });
     },
+    getTaskXmmcList() {
+      listTaskXmmc(this.xmmcQueryParams).then(response => {
+        this.xmmcList = response.rows;
+        this.xmmcTotal = response.total;
+      });
+    },
+    handleXmmcList() {
+      this.getTaskXmmcList();
+      this.openXmmcList = true;
+    },
+    selectXmmc(xmmc) {
+      this.queryParams.xmmc = xmmc;
+      this.handleQuery();
+      this.openXmmcList = false;
+    }
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/cxxm/zftkTask/import/index.vue b/ruoyi-ui/src/views/cxxm/zftkTask/import/index.vue
index 05d3799c..d1e82172 100644
--- a/ruoyi-ui/src/views/cxxm/zftkTask/import/index.vue
+++ b/ruoyi-ui/src/views/cxxm/zftkTask/import/index.vue
@@ -55,7 +55,19 @@
       </el-form-item>
     </el-form>
 
+    <h3 v-if="this.queryParams.xmmc">项目名称：{{ this.queryParams.xmmc }}</h3>
+
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-view"
+          size="mini"
+          @click="handleXmmcList"
+        >查看项目
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="info"
@@ -94,9 +106,9 @@
     <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" :selectable="selectable" fixed="left"/>
       <el-table-column label="id" align="center" prop="id" fixed="left"/>
+      <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
       <el-table-column label="年份" align="center" prop="nian"/>
       <el-table-column label="县名称" align="center" prop="xian"/>
-      <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
       <el-table-column label="地块号" align="center" prop="dkh"/>
       <el-table-column label="功能分区" align="center" prop="gnfq" min-width="180"/>
       <el-table-column label="地块面积" align="center" prop="dkmj" :show-overflow-tooltip="true"/>
@@ -152,15 +164,15 @@
     <!-- 添加或修改任务对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+        <el-form-item label="项目名称" prop="xmmc">
+          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
+        </el-form-item>
         <el-form-item label="年份" prop="nian">
           <el-input v-model="form.nian" placeholder="请输入年份"/>
         </el-form-item>
         <el-form-item label="县名称" prop="xian">
           <el-input v-model="form.xian" placeholder="请输入县名称"/>
         </el-form-item>
-        <el-form-item label="项目名称" prop="xmmc">
-          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
-        </el-form-item>
         <el-form-item label="地块号" prop="dkh">
           <el-input v-model="form.dkh" placeholder="请输入地块号"/>
         </el-form-item>
@@ -211,7 +223,7 @@
         :limit="1"
         accept=".json"
         :headers="upload.headers"
-        :action="upload.url + '?rwlx=' + upload.rwlx"
+        :action="upload.url + '?rwlx=' + upload.rwlx+ '&newXmmc=' + upload.newXmmc"
         :disabled="upload.isUploading"
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"
@@ -234,16 +246,55 @@
           </div>
         </div>
       </el-upload>
+      <div style="margin-top: 20px">
+        <el-form label-width="120px">
+          <el-form-item label="修改项目名称：">
+            <el-radio-group v-model="upload.editXmmc">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="项目名称：" v-if="upload.editXmmc">
+            <el-input v-model="upload.newXmmc" placeholder="请输入新的项目名称"></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFileForm">确 定</el-button>
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="项目列表" :visible.sync="openXmmcList" width="800px" append-to-body>
+      <el-table v-loading="loading" :data="xmmcList">
+        <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+        <el-table-column label="图斑数量" align="center" prop="nums"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="selectXmmc(scope.row.xmmc)"
+              :disabled="!scope.row.xmmc"
+            >查看项目
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="xmmcTotal>0"
+        :total="xmmcTotal"
+        :page.sync="xmmcQueryParams.pageNum"
+        :limit.sync="xmmcQueryParams.pageSize"
+        @pagination="getTaskXmmcList"/>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {listTask, getTask, delTask, addTask, updateTask} from "@/api/cxxm/zftk/task";
+import {listTask, getTask, delTask, addTask, updateTask, listTaskXmmc} from "@/api/cxxm/zftk/task";
 import {getToken} from "@/utils/auth";
 import {Loading} from "element-ui";
 
@@ -269,6 +320,14 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openXmmcList: false,
+      xmmcList: [],
+      xmmcTotal: 0,
+      xmmcQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        xmmc: null,
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -327,6 +386,8 @@ export default {
         title: "",
         // 是否禁用上传
         isUploading: false,
+        editXmmc: false,
+        newXmmc: null,
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
@@ -341,6 +402,16 @@ export default {
   created() {
     this.getList();
   },
+  watch: {
+    // 根据名称筛选任务列表
+    'queryParams.xmmc'(val) {
+      if (val) {
+        this.upload.newXmmc = val;
+      } else {
+        this.upload.newXmmc = null;
+      }
+    }
+  },
   methods: {
     /** 查询任务列表 */
     getList() {
@@ -413,6 +484,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.xmmc = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -523,10 +595,21 @@ export default {
     submitFileForm() {
       this.upload.rwlx = "zftk";
       //判断是否存在已上传文件
-      if(this.$refs.upload.uploadFiles.length === 0){
+      if (this.$refs.upload.uploadFiles.length === 0) {
         this.$message.error("请上传文件");
         return;
       }
+      if (this.upload.editXmmc === true) {
+        if (this.upload.newXmmc == null) {
+          this.$message.error("请输入新的项目名称");
+          return;
+        } else if (this.upload.newXmmc.trim().length === 0) {
+          this.$message.error("新的项目名称不能为空");
+          return;
+        }
+      } else {
+        this.upload.newXmmc = null;
+      }
       if (this.upload.rwlx == null) {
         this.$message.error("请选择任务类型!")
       } else {
@@ -558,6 +641,21 @@ export default {
     jump(id) {
       this.$router.push({path: '/cxxm/zftkTask/detail', query: {'id': id}})
     },
+    getTaskXmmcList() {
+      listTaskXmmc(this.xmmcQueryParams).then(response => {
+        this.xmmcList = response.rows;
+        this.xmmcTotal = response.total;
+      });
+    },
+    handleXmmcList() {
+      this.getTaskXmmcList();
+      this.openXmmcList = true;
+    },
+    selectXmmc(xmmc) {
+      this.queryParams.xmmc = xmmc;
+      this.handleQuery();
+      this.openXmmcList = false;
+    }
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/cxxm/ztTask/assign/index.vue b/ruoyi-ui/src/views/cxxm/ztTask/assign/index.vue
index 34932440..932441c1 100644
--- a/ruoyi-ui/src/views/cxxm/ztTask/assign/index.vue
+++ b/ruoyi-ui/src/views/cxxm/ztTask/assign/index.vue
@@ -74,35 +74,47 @@
       </el-form-item>
     </el-form>
 
-    <!--    <el-row :gutter="10" class="mb8">-->
-<!--          <el-col :span="1.5">-->
-<!--            <el-button-->
-<!--              type="warning"-->
-<!--              plain-->
-<!--              icon="el-icon-download"-->
-<!--              size="mini"-->
-<!--              @click="openDistributePage"-->
-<!--            >乡镇情况-->
-<!--            </el-button>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
+    <h3 v-if="this.queryParams.xmmc">项目名称：{{ this.queryParams.xmmc }}</h3>
 
-    <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-view"
+          size="mini"
+          @click="handleXmmcList"
+        >查看项目
+        </el-button>
+      </el-col>
+      <!--          <el-col :span="1.5">-->
+      <!--            <el-button-->
+      <!--              type="warning"-->
+      <!--              plain-->
+      <!--              icon="el-icon-download"-->
+      <!--              size="mini"-->
+      <!--              @click="openDistributePage"-->
+      <!--            >乡镇情况-->
+      <!--            </el-button>-->
+      <!--          </el-col>-->
+
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
 
     <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" :selectable="selectable" fixed="left"/>
       <el-table-column label="id" align="center" prop="id" fixed="left"/>
+      <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
       <el-table-column label="年份" align="center" prop="nian"/>
       <el-table-column label="县名称" align="center" prop="xian"/>
       <el-table-column label="乡镇名称" align="center" prop="xzmc"/>
       <el-table-column label="村社名称" align="center" prop="csmc" min-width="180"/>
       <el-table-column label="图斑类型" align="center" prop="tblx"/>
-      <el-table-column label="图斑编号" align="center" prop="tbbh"  min-width="180" :show-overflow-tooltip="true"/>
+      <el-table-column label="图斑编号" align="center" prop="tbbh" min-width="180" :show-overflow-tooltip="true"/>
       <el-table-column label="图斑面积" align="center" prop="tbmj" :show-overflow-tooltip="true"/>
       <el-table-column label="耕地面积" align="center" prop="gdmj" :show-overflow-tooltip="true"/>
       <el-table-column label="基本农田面积" align="center" prop="jbntmj" :show-overflow-tooltip="true"/>
-      <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
       <el-table-column label="存在问题" align="center" prop="czwt" min-width="180"/>
       <el-table-column label="导入人员" align="center" prop="createBy" min-width="120"/>
       <el-table-column label="导入时间" align="center" prop="drsj" min-width="120">
@@ -144,6 +156,7 @@
                     style="color: green"/>
         </template>
       </el-table-column>
+      <el-table-column label="指派给" align="center" prop="toName"/>
       <el-table-column label="指派时间" align="center" prop="xzxfsj" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.xzxfsj, '{y}-{m}-{d}') }}</span>
@@ -191,6 +204,9 @@
     <!-- 添加或修改任务对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+        <el-form-item label="项目名称" prop="xmmc">
+          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
+        </el-form-item>
         <el-form-item label="年份" prop="nian">
           <el-input v-model="form.nian" placeholder="请输入年份"/>
         </el-form-item>
@@ -226,9 +242,6 @@
         <el-form-item label="基本农田面积" prop="jbntmj">
           <el-input v-model="form.jbntmj" placeholder="请输入基本农田面积"/>
         </el-form-item>
-        <el-form-item label="项目名称" prop="xmmc">
-          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
-        </el-form-item>
         <el-form-item label="存在问题" prop="czwt">
           <el-input v-model="form.czwt" placeholder="请输入存在问题"/>
         </el-form-item>
@@ -262,22 +275,22 @@
         <el-table-column label="人员总数" align="center" prop="userCount"/>
         <el-table-column label="已指派" align="center" prop="yzpCount"/>
         <el-table-column label="未指派" align="center" prop="wzpCount"/>
-<!--        <el-table-column label="人均任务数" align="center">-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ Math.round(scope.row.taskCount / scope.row.userCount) }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-button-->
-<!--              size="mini"-->
-<!--              type="text"-->
-<!--              icon="el-icon-view"-->
-<!--              @click="handleDistribute(scope.row)"-->
-<!--            >下发至乡镇-->
-<!--            </el-button>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column label="人均任务数" align="center">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ Math.round(scope.row.taskCount / scope.row.userCount) }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-button-->
+        <!--              size="mini"-->
+        <!--              type="text"-->
+        <!--              icon="el-icon-view"-->
+        <!--              @click="handleDistribute(scope.row)"-->
+        <!--            >下发至乡镇-->
+        <!--            </el-button>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
       </el-table>
 
       <!--      <pagination-->
@@ -327,6 +340,32 @@
       <!--        @pagination="getList"-->
       <!--      />-->
     </el-drawer>
+
+    <el-dialog title="项目列表" :visible.sync="openXmmcList" width="800px" append-to-body>
+      <el-table v-loading="loading" :data="xmmcList">
+        <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+        <el-table-column label="图斑数量" align="center" prop="nums"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="selectXmmc(scope.row.xmmc)"
+              :disabled="!scope.row.xmmc"
+            >查看项目
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="xmmcTotal>0"
+        :total="xmmcTotal"
+        :page.sync="xmmcQueryParams.pageNum"
+        :limit.sync="xmmcQueryParams.pageSize"
+        @pagination="getTaskXmmcList"/>
+    </el-dialog>
   </div>
 </template>
 
@@ -338,7 +377,8 @@ import {
   addTask,
   updateTask,
   distribute2Task,
-  assignTask
+  assignTask,
+  listTaskXmmc2 as listTaskXmmc
 } from "@/api/cxxm/zt/task";
 import {getUsers, getGroupNames} from "@/api/cxxm/zt/user";
 import {getUserProfile} from "@/api/system/user";
@@ -373,6 +413,14 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openXmmcList: false,
+      xmmcList: [],
+      xmmcTotal: 0,
+      xmmcQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        xmmc: null,
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -519,6 +567,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.xmmc = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -638,6 +687,21 @@ export default {
       }).catch(() => {
       });
     },
+    getTaskXmmcList() {
+      listTaskXmmc(this.xmmcQueryParams).then(response => {
+        this.xmmcList = response.rows;
+        this.xmmcTotal = response.total;
+      });
+    },
+    handleXmmcList() {
+      this.getTaskXmmcList();
+      this.openXmmcList = true;
+    },
+    selectXmmc(xmmc) {
+      this.queryParams.xmmc = xmmc;
+      this.handleQuery();
+      this.openXmmcList = false;
+    }
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/cxxm/ztTask/check/index.vue b/ruoyi-ui/src/views/cxxm/ztTask/check/index.vue
index 788d2894..7182f365 100644
--- a/ruoyi-ui/src/views/cxxm/ztTask/check/index.vue
+++ b/ruoyi-ui/src/views/cxxm/ztTask/check/index.vue
@@ -1,128 +1,201 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item label="年份" prop="nian">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.nian"-->
-<!--          placeholder="请输入年份"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="县名称" prop="xian">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.xian"-->
-<!--          placeholder="请输入县名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="乡镇名称" prop="xzmc">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.xzmc"-->
-<!--          placeholder="请输入乡镇名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="村社名称" prop="csmc">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.csmc"-->
-<!--          placeholder="请输入村社名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="图斑来源" prop="tbly">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.tbly"-->
-<!--          placeholder="请输入图斑来源"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item label="综合搜索" prop="tbbh">
-        <el-input
-          v-model="queryParams.tbbh"
-          placeholder="请输入搜索内容"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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="20">
+      <el-col :span="4" :xs="24" v-if="checkRole(['zjgly'])">
+        <el-tree
+          :data="deptOptions"
+          :props="defaultProps"
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          ref="tree"
+          node-key="id"
+          default-expand-all
+          highlight-current
+          @node-click="handleNodeClick"/>
+      </el-col>
+      <el-col :span="checkRole(['zjgly']) ? 20:24" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px">
+          <!--      <el-form-item label="年份" prop="nian">-->
+          <!--        <el-input-->
+          <!--          v-model="queryParams.nian"-->
+          <!--          placeholder="请输入年份"-->
+          <!--          clearable-->
+          <!--          @keyup.enter.native="handleQuery"-->
+          <!--        />-->
+          <!--      </el-form-item>-->
+          <!--      <el-form-item label="县名称" prop="xian">-->
+          <!--        <el-input-->
+          <!--          v-model="queryParams.xian"-->
+          <!--          placeholder="请输入县名称"-->
+          <!--          clearable-->
+          <!--          @keyup.enter.native="handleQuery"-->
+          <!--        />-->
+          <!--      </el-form-item>-->
+          <!--      <el-form-item label="乡镇名称" prop="xzmc">-->
+          <!--        <el-input-->
+          <!--          v-model="queryParams.xzmc"-->
+          <!--          placeholder="请输入乡镇名称"-->
+          <!--          clearable-->
+          <!--          @keyup.enter.native="handleQuery"-->
+          <!--        />-->
+          <!--      </el-form-item>-->
+          <!--      <el-form-item label="村社名称" prop="csmc">-->
+          <!--        <el-input-->
+          <!--          v-model="queryParams.csmc"-->
+          <!--          placeholder="请输入村社名称"-->
+          <!--          clearable-->
+          <!--          @keyup.enter.native="handleQuery"-->
+          <!--        />-->
+          <!--      </el-form-item>-->
+          <!--      <el-form-item label="图斑来源" prop="tbly">-->
+          <!--        <el-input-->
+          <!--          v-model="queryParams.tbly"-->
+          <!--          placeholder="请输入图斑来源"-->
+          <!--          clearable-->
+          <!--          @keyup.enter.native="handleQuery"-->
+          <!--        />-->
+          <!--      </el-form-item>-->
+          <el-form-item label="综合搜索" prop="tbbh">
+            <el-input
+              v-model="queryParams.tbbh"
+              placeholder="请输入搜索内容"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="巡查情况" prop="yxccs">
+            <el-select v-model="queryParams.yxccs" placeholder="请选择巡查情况" clearable
+                       @change="handleQuery">
+              <el-option :key="0" label="未巡查" :value="0"/>
+              <el-option :key="1" label="已巡查" :value="1"/>
+            </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="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :disabled="multiple"
-          @click="handleExport"
-        >导出
-        </el-button>
+        <h3 v-if="this.queryParams.xmmc">项目名称：{{ this.queryParams.xmmc }}</h3>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-view"
+              size="mini"
+              @click="handleXmmcList"
+            >查看项目
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              :disabled="multiple"
+              @click="handleExport"
+            >导出
+            </el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" fixed="left"/>
+          <el-table-column label="id" align="center" prop="id" fixed="left"/>
+          <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+          <el-table-column label="年份" align="center" prop="nian"/>
+          <el-table-column label="县名称" align="center" prop="xian"/>
+          <el-table-column label="乡镇名称" align="center" prop="xzmc"/>
+          <el-table-column label="村社名称" align="center" prop="csmc" min-width="180"/>
+          <el-table-column label="图斑类型" align="center" prop="tblx"/>
+          <el-table-column label="图斑编号" align="center" prop="tbbh" min-width="180" :show-overflow-tooltip="true"/>
+          <el-table-column label="已巡查次数" align="center" prop="yxccs"/>
+          <el-table-column label="州级巡查次数" align="center" prop="zjxccs"/>
+          <el-table-column label="县级巡查次数" align="center" prop="xjxccs"/>
+          <el-table-column label="最后巡查时间" align="center" prop="xcsj" min-width="120">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.xcsj, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="图斑面积" align="center" prop="tbmj" :show-overflow-tooltip="true"/>
+          <el-table-column label="耕地面积" align="center" prop="gdmj" :show-overflow-tooltip="true"/>
+          <el-table-column label="基本农田面积" align="center" prop="jbntmj" :show-overflow-tooltip="true"/>
+          <el-table-column label="存在问题" align="center" prop="czwt" min-width="180"/>
+          <el-table-column label="导入人员" align="center" prop="createBy" min-width="120"/>
+          <el-table-column label="导入时间" align="center" prop="drsj" min-width="120">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.drsj, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120"
+                           fixed="right">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-view"
+                @click="jump(scope.row.id)"
+              >
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" :selectable="selectable" fixed="left"/>
-      <el-table-column label="id" align="center" prop="id" fixed="left"/>
-      <el-table-column label="年份" align="center" prop="nian"/>
-      <el-table-column label="县名称" align="center" prop="xian"/>
-      <el-table-column label="乡镇名称" align="center" prop="xzmc"/>
-      <el-table-column label="村社名称" align="center" prop="csmc" min-width="180"/>
-      <el-table-column label="图斑类型" align="center" prop="tblx"/>
-      <el-table-column label="图斑编号" align="center" prop="tbbh" min-width="180" :show-overflow-tooltip="true"/>
-      <el-table-column label="已巡查次数" align="center" prop="yxccs"/>
-      <el-table-column label="州级巡查次数" align="center" prop="zjxccs"/>
-      <el-table-column label="县级巡查次数" align="center" prop="xjxccs"/>
-      <el-table-column label="最后巡查时间" align="center" prop="xcsj" min-width="120">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.xcsj, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="图斑面积" align="center" prop="tbmj" :show-overflow-tooltip="true"/>
-      <el-table-column label="耕地面积" align="center" prop="gdmj" :show-overflow-tooltip="true"/>
-      <el-table-column label="基本农田面积" align="center" prop="jbntmj" :show-overflow-tooltip="true"/>
-      <el-table-column label="项目名称" align="center" prop="xmmc"  min-width="180"/>
-      <el-table-column label="存在问题" align="center" prop="czwt"  min-width="180"/>
-      <el-table-column label="导入人员" align="center" prop="createBy" min-width="120"/>
-      <el-table-column label="导入时间" align="center" prop="drsj" min-width="120">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.drsj, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120" fixed="right">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="jump(scope.row.id)"
-          >
-            查看
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+    <el-dialog title="项目列表" :visible.sync="openXmmcList" width="800px" append-to-body>
+      <el-table v-loading="loading" :data="xmmcList">
+        <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+        <el-table-column label="图斑数量" align="center" prop="nums"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="selectXmmc(scope.row.xmmc)"
+              :disabled="!scope.row.xmmc"
+            >查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <pagination
+        v-show="xmmcTotal>0"
+        :total="xmmcTotal"
+        :page.sync="xmmcQueryParams.pageNum"
+        :limit.sync="xmmcQueryParams.pageSize"
+        @pagination="getTaskXmmcList"/>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {listCheckTask as listTask, getTask, delTask, addTask, updateTask } from "@/api/cxxm/zt/task";
+import {
+  listCheckTask as listTask,
+  getTask,
+  delTask,
+  addTask,
+  updateTask,
+  listTaskXmmc2 as listTaskXmmc
+} from "@/api/cxxm/zt/task";
+import {deptTreeSelect} from "@/api/system/user";
+import {checkRole} from "../../../../utils/permission";
 
 export default {
   name: "Task",
@@ -146,6 +219,20 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openXmmcList: false,
+      xmmcList: [],
+      xmmcTotal: 0,
+      xmmcQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        xmmc: null,
+      },
+      // 部门树选项
+      deptOptions: null,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -193,14 +280,15 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      },
+      rules: {},
     };
   },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
+    checkRole,
     /** 查询任务列表 */
     getList() {
       this.loading = true;
@@ -276,13 +364,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.xmmc = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 修改按钮操作 */
@@ -332,8 +421,41 @@ export default {
       const id = row.id || this.ids
       this.download(`/cxxm/zt/task/export/${id}`, {
         ...this.queryParams
-      }, `部省监管_${new Date().getFullYear()}-${new Date().getMonth()+1}-${new Date().getDate()}.xlsx`)
-    }
+      }, `部省监管_${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}.xlsx`)
+    },
+    handleXmmcList() {
+      this.getTaskXmmcList();
+      this.openXmmcList = true;
+    },
+    selectXmmc(xmmc) {
+      this.queryParams.xmmc = xmmc;
+      this.handleQuery();
+      this.openXmmcList = false;
+    },
+    getTaskXmmcList() {
+      listTaskXmmc(this.xmmcQueryParams).then(response => {
+        this.xmmcList = response.rows;
+        this.xmmcTotal = response.total;
+      });
+    },
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.xmmc = null;
+      this.queryParams.deptId = data.id;
+      this.xmmcQueryParams.deptId = data.id;
+      this.handleQuery();
+    },
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/cxxm/ztTask/detail/index.vue b/ruoyi-ui/src/views/cxxm/ztTask/detail/index.vue
index f15af16e..7595b18c 100644
--- a/ruoyi-ui/src/views/cxxm/ztTask/detail/index.vue
+++ b/ruoyi-ui/src/views/cxxm/ztTask/detail/index.vue
@@ -11,13 +11,13 @@ template
       <el-col :span="11" :offset="13">
         <div class="right-container">
           <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane label="基本信息" name="1"  style="height: 76vh;overflow: auto">
+            <el-tab-pane label="基本信息" name="1" style="height: 76vh;overflow: auto">
               <el-descriptions column="2" border :contentStyle="content_style"
                                :labelStyle="label_style">
-                <el-descriptions-item label="年份">{{ form.nian }}</el-descriptions-item>
-                <el-descriptions-item label="县名称">{{ form.xian }}</el-descriptions-item>
                 <el-descriptions-item label="项目名称" :span="2">{{ form.xmmc }}</el-descriptions-item>
                 <el-descriptions-item label="图斑来源" :span="2">{{ form.tbly }}</el-descriptions-item>
+                <el-descriptions-item label="年份">{{ form.nian }}</el-descriptions-item>
+                <el-descriptions-item label="县名称">{{ form.xian }}</el-descriptions-item>
                 <el-descriptions-item label="乡镇名称">{{ form.xzmc }}</el-descriptions-item>
                 <el-descriptions-item label="村社名称">{{ form.csmc }}</el-descriptions-item>
                 <el-descriptions-item label="图斑编号">{{ form.tbbh }}</el-descriptions-item>
@@ -31,12 +31,13 @@ template
                   }}
                 </el-descriptions-item>
                 <el-descriptions-item label="州级下发时间">{{ form.zjxfsj }}</el-descriptions-item>
-<!--                <el-descriptions-item label="县级下发情况">{{ form.xjxfqk == "0" ? "未下发" : "已下发" }}-->
-<!--                </el-descriptions-item>-->
-<!--                <el-descriptions-item label="县级下发时间">{{ form.xjxfsj }}</el-descriptions-item>-->
+                <!--                <el-descriptions-item label="县级下发情况">{{ form.xjxfqk == "0" ? "未下发" : "已下发" }}-->
+                <!--                </el-descriptions-item>-->
+                <!--                <el-descriptions-item label="县级下发时间">{{ form.xjxfsj }}</el-descriptions-item>-->
                 <el-descriptions-item label="乡镇指派情况">{{ form.xzxfqk == "0" ? "未指派" : "已指派" }}
                 </el-descriptions-item>
                 <el-descriptions-item label="乡镇指派时间">{{ form.xzxfsj }}</el-descriptions-item>
+                <el-descriptions-item label="指派给">{{ form.toName }}</el-descriptions-item>
                 <!--                <el-descriptions-item label="任务进度" :span="2">-->
                 <!--                  <el-steps :active="activeStep" finish-status="success" align-center>-->
                 <!--                    <el-step title="州级下发"></el-step>-->
@@ -47,7 +48,7 @@ template
                 <!--                </el-descriptions-item>-->
               </el-descriptions>
             </el-tab-pane>
-            <el-tab-pane label="扩展字段" name="2"  style="height: 76vh;overflow: auto">
+            <el-tab-pane label="扩展字段" name="2" style="height: 76vh;overflow: auto">
               <el-descriptions column="2" v-if="form.info!=null" border :contentStyle="content_style"
                                :labelStyle="label_style">
                 <el-descriptions-item v-for="(value,key) in JSON.parse(form.info)" :label="key">{{
@@ -56,7 +57,7 @@ template
                 </el-descriptions-item>
               </el-descriptions>
             </el-tab-pane>
-            <el-tab-pane label="巡查记录" name="3"  style="height: 76vh;overflow: auto">
+            <el-tab-pane label="巡查记录" name="3" style="height: 76vh;overflow: auto">
               <div v-if="taskCheckSubmitVo==null">无外业巡查记录</div>
               <div v-if="taskCheckSubmitVo!=null">
                 <h4>巡查统计:</h4>
@@ -90,7 +91,7 @@ template
                 <h4>现场图片:</h4>
                 <div v-for="(item,index) in taskCheckSubmitVo.taskCheckImages"
                      style="display: inline-block; width: 100px; height: 100px; margin-right: 10px; margin-bottom: 50px">
-                  <el-image :src="baseUrl+ item.cclj" :preview-src-list="[baseUrl+ item.cclj]"></el-image>
+                  <el-image :src="baseUrl+ item.cclj" :preview-src-list="previewList"></el-image>
                   <el-tag>图片:{{ index + 1 }}</el-tag>
                 </div>
                 <div v-if="taskCheckSubmitVo.taskCheckImages.length==0" style="margin-bottom: 10px">
@@ -222,7 +223,7 @@ template
             <!--                </div>-->
             <!--              </div>-->
             <!--            </el-tab-pane>-->
-            <el-tab-pane label="审核" name="5"  style="height: 76vh;overflow: auto">
+            <el-tab-pane label="审核" name="5" style="height: 76vh;overflow: auto">
               <div v-if="taskCheckSubmitVo==null">无外业巡查记录</div>
               <div v-if="taskCheckSubmitVo!=null">
                 <el-form ref="form" :model="auditForm" :rules="rules" label-width="100px">
@@ -255,9 +256,11 @@ template
                   </el-form-item>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
-                  <el-button type="primary" v-if="auditForm.id" @click="submitAuditForm" style="float:right" v-hasRole="['zjgly']">修 改
+                  <el-button type="primary" v-if="auditForm.id" @click="submitAuditForm" style="float:right"
+                             v-hasRole="['zjgly']">修 改
                   </el-button>
-                  <el-button type="primary" v-else @click="submitAuditForm" style="float:right" v-hasRole="['zjgly']">保 存
+                  <el-button type="primary" v-else @click="submitAuditForm" style="float:right" v-hasRole="['zjgly']">保
+                    存
                   </el-button>
                   <!--                  <el-button @click="open = false">取 消</el-button>-->
                 </div>
@@ -357,6 +360,7 @@ export default {
   dicts: ["task_zgqk", "task_shjg", "sf", "zt_zgqk", "zftk_ccjd"],
   data() {
     return {
+      previewList: [],
       baseUrl: process.env.VUE_APP_BASE_API,
       activeName: "1",
       activeStep: 0,
@@ -406,6 +410,20 @@ export default {
   created() {
     this.getTaskDetail();
   },
+  watch: {
+    // 监听 taskCheckSubmitVo
+    taskCheckSubmitVo: {
+      handler: function (newValue, oldValue) {
+        if (newValue.taskCheckImages != null) {
+          if (newValue.taskCheckImages.length > 0) {
+            for (let item of newValue.taskCheckImages) {
+              this.previewList.push(this.baseUrl + item.cclj);
+            }
+          }
+        }
+      },
+    }
+  },
   methods: {
     // 表单重置
     resetAuditForm() {
diff --git a/ruoyi-ui/src/views/cxxm/ztTask/distribute/index.vue b/ruoyi-ui/src/views/cxxm/ztTask/distribute/index.vue
index db4823b5..0e0fd1c2 100644
--- a/ruoyi-ui/src/views/cxxm/ztTask/distribute/index.vue
+++ b/ruoyi-ui/src/views/cxxm/ztTask/distribute/index.vue
@@ -17,54 +17,54 @@
       <!--主数据区-->
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-<!--        <el-form-item label="年份" prop="nian">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.nian"-->
-<!--            placeholder="请输入年份"-->
-<!--            clearable-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="县名称" prop="xian">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.xian"-->
-<!--            placeholder="请输入县名称"-->
-<!--            clearable-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="乡镇名称" prop="xzmc">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.xzmc"-->
-<!--            placeholder="请输入乡镇名称"-->
-<!--            clearable-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="村社名称" prop="csmc">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.csmc"-->
-<!--            placeholder="请输入村社名称"-->
-<!--            clearable-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="图斑来源" prop="tbly">-->
-<!--          <el-input-->
-<!--            v-model="queryParams.tbly"-->
-<!--            placeholder="请输入图斑来源"-->
-<!--            clearable-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
-<!--        </el-form-item>-->
-        <el-form-item label="综合搜索" prop="tbbh">
-          <el-input
-            v-model="queryParams.tbbh"
-            placeholder="请输入搜索内容"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+          <!--        <el-form-item label="年份" prop="nian">-->
+          <!--          <el-input-->
+          <!--            v-model="queryParams.nian"-->
+          <!--            placeholder="请输入年份"-->
+          <!--            clearable-->
+          <!--            @keyup.enter.native="handleQuery"-->
+          <!--          />-->
+          <!--        </el-form-item>-->
+          <!--        <el-form-item label="县名称" prop="xian">-->
+          <!--          <el-input-->
+          <!--            v-model="queryParams.xian"-->
+          <!--            placeholder="请输入县名称"-->
+          <!--            clearable-->
+          <!--            @keyup.enter.native="handleQuery"-->
+          <!--          />-->
+          <!--        </el-form-item>-->
+          <!--        <el-form-item label="乡镇名称" prop="xzmc">-->
+          <!--          <el-input-->
+          <!--            v-model="queryParams.xzmc"-->
+          <!--            placeholder="请输入乡镇名称"-->
+          <!--            clearable-->
+          <!--            @keyup.enter.native="handleQuery"-->
+          <!--          />-->
+          <!--        </el-form-item>-->
+          <!--        <el-form-item label="村社名称" prop="csmc">-->
+          <!--          <el-input-->
+          <!--            v-model="queryParams.csmc"-->
+          <!--            placeholder="请输入村社名称"-->
+          <!--            clearable-->
+          <!--            @keyup.enter.native="handleQuery"-->
+          <!--          />-->
+          <!--        </el-form-item>-->
+          <!--        <el-form-item label="图斑来源" prop="tbly">-->
+          <!--          <el-input-->
+          <!--            v-model="queryParams.tbly"-->
+          <!--            placeholder="请输入图斑来源"-->
+          <!--            clearable-->
+          <!--            @keyup.enter.native="handleQuery"-->
+          <!--          />-->
+          <!--        </el-form-item>-->
+          <el-form-item label="综合搜索" prop="tbbh">
+            <el-input
+              v-model="queryParams.tbbh"
+              placeholder="请输入搜索内容"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item label="下发情况" prop="zjxfqk">
             <el-select v-model="queryParams.zjxfqk" placeholder="请选择下发情况" clearable
                        @change="handleQuery">
@@ -82,7 +82,19 @@
           </el-form-item>
         </el-form>
 
+        <h3 v-if="this.queryParams.xmmc">项目名称：{{ this.queryParams.xmmc }}</h3>
+
         <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-view"
+              size="mini"
+              @click="handleXmmcList"
+            >查看项目
+            </el-button>
+          </el-col>
           <el-col :span="1.5">
             <el-button
               type="warning"
@@ -122,6 +134,7 @@
         <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" :selectable="selectable" fixed="left"/>
           <el-table-column label="id" align="center" prop="id" fixed="left"/>
+          <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
           <el-table-column label="年份" align="center" prop="nian"/>
           <el-table-column label="县名称" align="center" prop="xian"/>
           <el-table-column label="乡镇名称" align="center" prop="xzmc"/>
@@ -131,8 +144,7 @@
           <el-table-column label="图斑面积" align="center" prop="tbmj" :show-overflow-tooltip="true"/>
           <el-table-column label="耕地面积" align="center" prop="gdmj" :show-overflow-tooltip="true"/>
           <el-table-column label="基本农田面积" align="center" prop="jbntmj" :show-overflow-tooltip="true"/>
-          <el-table-column label="项目名称" align="center" prop="xmmc"  min-width="180"/>
-          <el-table-column label="存在问题" align="center" prop="czwt"  min-width="180"/>
+          <el-table-column label="存在问题" align="center" prop="czwt" min-width="180"/>
           <el-table-column label="导入人员" align="center" prop="createBy" min-width="120"/>
           <el-table-column label="导入时间" align="center" prop="drsj" min-width="120">
             <template slot-scope="scope">
@@ -196,6 +208,9 @@
     <!-- 添加或修改任务对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+        <el-form-item label="项目名称" prop="xmmc">
+          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
+        </el-form-item>
         <el-form-item label="年份" prop="nian">
           <el-input v-model="form.nian" placeholder="请输入年份"/>
         </el-form-item>
@@ -231,9 +246,6 @@
         <el-form-item label="基本农田面积" prop="jbntmj">
           <el-input v-model="form.jbntmj" placeholder="请输入基本农田面积"/>
         </el-form-item>
-        <el-form-item label="项目名称" prop="xmmc">
-          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
-        </el-form-item>
         <el-form-item label="存在问题" prop="czwt">
           <el-input v-model="form.czwt" placeholder="请输入存在问题"/>
         </el-form-item>
@@ -246,9 +258,9 @@
         <el-form-item label="县代码" prop="xdm">
           <el-input v-model="form.xdm" placeholder="请输入县代码"/>
         </el-form-item>
-<!--        <el-form-item label="详细信息" prop="info">-->
-<!--          <el-input v-model="form.info" type="textarea" placeholder="请输入内容"/>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="详细信息" prop="info">-->
+        <!--          <el-input v-model="form.info" type="textarea" placeholder="请输入内容"/>-->
+        <!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -256,11 +268,46 @@
       </div>
     </el-dialog>
 
+
+    <el-dialog title="项目列表" :visible.sync="openXmmcList" width="800px" append-to-body>
+      <el-table v-loading="loading" :data="xmmcList">
+        <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+        <el-table-column label="图斑数量" align="center" prop="nums"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="selectXmmc(scope.row.xmmc)"
+              :disabled="!scope.row.xmmc"
+            >查看项目
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="xmmcTotal>0"
+        :total="xmmcTotal"
+        :page.sync="xmmcQueryParams.pageNum"
+        :limit.sync="xmmcQueryParams.pageSize"
+        @pagination="getTaskXmmcList"/>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import {listDistributeTask as listTask, getTask, delTask, addTask, updateTask, distributeTask} from "@/api/cxxm/zt/task";
+import {
+  listDistributeTask as listTask,
+  getTask,
+  delTask,
+  addTask,
+  updateTask,
+  distributeTask,
+  listTaskXmmc
+} from "@/api/cxxm/zt/task";
 import {deptTreeSelect} from "@/api/system/user";
 
 export default {
@@ -286,6 +333,15 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openXmmcList: false,
+      xmmcList: [],
+      xmmcTotal: 0,
+      xmmcQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        xmmc: null,
+        deptId: null
+      },
       // 部门树选项
       deptOptions: null,
       defaultProps: {
@@ -419,6 +475,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.xmmc = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -506,7 +563,9 @@ export default {
     },
     // 节点单击事件
     handleNodeClick(data) {
+      this.queryParams.xmmc = null;
       this.queryParams.deptId = data.id;
+      this.xmmcQueryParams.deptId = data.id;
       this.handleQuery();
     },
     //判断是否可勾选
@@ -528,6 +587,21 @@ export default {
       }).catch(() => {
       });
     },
+    getTaskXmmcList() {
+      listTaskXmmc(this.xmmcQueryParams).then(response => {
+        this.xmmcList = response.rows;
+        this.xmmcTotal = response.total;
+      });
+    },
+    handleXmmcList() {
+      this.getTaskXmmcList();
+      this.openXmmcList = true;
+    },
+    selectXmmc(xmmc) {
+      this.queryParams.xmmc = xmmc;
+      this.handleQuery();
+      this.openXmmcList = false;
+    }
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/cxxm/ztTask/import/index.vue b/ruoyi-ui/src/views/cxxm/ztTask/import/index.vue
index 6e99ed84..54173c5e 100644
--- a/ruoyi-ui/src/views/cxxm/ztTask/import/index.vue
+++ b/ruoyi-ui/src/views/cxxm/ztTask/import/index.vue
@@ -1,46 +1,46 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item label="年份" prop="nian">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.nian"-->
-<!--          placeholder="请输入年份"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="县名称" prop="xian">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.xian"-->
-<!--          placeholder="请输入县名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="乡镇名称" prop="xzmc">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.xzmc"-->
-<!--          placeholder="请输入乡镇名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="村社名称" prop="csmc">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.csmc"-->
-<!--          placeholder="请输入村社名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="图斑来源" prop="tbly">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.tbly"-->
-<!--          placeholder="请输入图斑来源"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="年份" prop="nian">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.nian"-->
+      <!--          placeholder="请输入年份"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="县名称" prop="xian">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.xian"-->
+      <!--          placeholder="请输入县名称"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="乡镇名称" prop="xzmc">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.xzmc"-->
+      <!--          placeholder="请输入乡镇名称"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="村社名称" prop="csmc">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.csmc"-->
+      <!--          placeholder="请输入村社名称"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="图斑来源" prop="tbly">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.tbly"-->
+      <!--          placeholder="请输入图斑来源"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item label="综合搜索" prop="tbbh">
         <el-input
           v-model="queryParams.tbbh"
@@ -55,7 +55,19 @@
       </el-form-item>
     </el-form>
 
+    <h3 v-if="this.queryParams.xmmc">项目名称：{{ this.queryParams.xmmc }}</h3>
+
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-view"
+          size="mini"
+          @click="handleXmmcList"
+        >查看项目
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="info"
@@ -74,7 +86,8 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -84,7 +97,8 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -92,6 +106,7 @@
     <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" :selectable="selectable" fixed="left"/>
       <el-table-column label="id" align="center" prop="id" fixed="left"/>
+      <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
       <el-table-column label="年份" align="center" prop="nian"/>
       <el-table-column label="县名称" align="center" prop="xian"/>
       <el-table-column label="乡镇名称" align="center" prop="xzmc"/>
@@ -101,8 +116,7 @@
       <el-table-column label="图斑面积" align="center" prop="tbmj" :show-overflow-tooltip="true"/>
       <el-table-column label="耕地面积" align="center" prop="gdmj" :show-overflow-tooltip="true"/>
       <el-table-column label="基本农田面积" align="center" prop="jbntmj" :show-overflow-tooltip="true"/>
-      <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
-      <el-table-column label="存在问题" align="center" prop="czwt"  min-width="180"/>
+      <el-table-column label="存在问题" align="center" prop="czwt" min-width="180"/>
       <el-table-column label="导入人员" align="center" prop="createBy" min-width="120"/>
       <el-table-column label="导入时间" align="center" prop="drsj" min-width="120">
         <template slot-scope="scope">
@@ -149,6 +163,9 @@
     <!-- 添加或修改任务对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+        <el-form-item label="项目名称" prop="xmmc">
+          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
+        </el-form-item>
         <el-form-item label="年份" prop="nian">
           <el-input v-model="form.nian" placeholder="请输入年份"/>
         </el-form-item>
@@ -184,9 +201,6 @@
         <el-form-item label="基本农田面积" prop="jbntmj">
           <el-input v-model="form.jbntmj" placeholder="请输入基本农田面积"/>
         </el-form-item>
-        <el-form-item label="项目名称" prop="xmmc">
-          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
-        </el-form-item>
         <el-form-item label="存在问题" prop="czwt">
           <el-input v-model="form.czwt" placeholder="请输入存在问题"/>
         </el-form-item>
@@ -199,9 +213,9 @@
         <el-form-item label="县代码" prop="xdm">
           <el-input v-model="form.xdm" placeholder="请输入县代码"/>
         </el-form-item>
-<!--        <el-form-item label="详细信息" prop="info">-->
-<!--          <el-input v-model="form.info" type="textarea" placeholder="请输入内容"/>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="详细信息" prop="info">-->
+        <!--          <el-input v-model="form.info" type="textarea" placeholder="请输入内容"/>-->
+        <!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -216,7 +230,7 @@
         :limit="1"
         accept=".json"
         :headers="upload.headers"
-        :action="upload.url + '?rwlx=' + upload.rwlx"
+        :action="upload.url + '?rwlx=' + upload.rwlx+ '&newXmmc=' + upload.newXmmc"
         :disabled="upload.isUploading"
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"
@@ -239,16 +253,55 @@
           </div>
         </div>
       </el-upload>
+      <div style="margin-top: 20px">
+        <el-form label-width="120px">
+          <el-form-item label="修改项目名称：">
+            <el-radio-group v-model="upload.editXmmc">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="项目名称：" v-if="upload.editXmmc">
+            <el-input v-model="upload.newXmmc" placeholder="请输入新的项目名称"></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFileForm">确 定</el-button>
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="项目列表" :visible.sync="openXmmcList" width="800px" append-to-body>
+      <el-table v-loading="loading" :data="xmmcList">
+        <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+        <el-table-column label="图斑数量" align="center" prop="nums"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="selectXmmc(scope.row.xmmc)"
+              :disabled="!scope.row.xmmc"
+            >查看项目
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="xmmcTotal>0"
+        :total="xmmcTotal"
+        :page.sync="xmmcQueryParams.pageNum"
+        :limit.sync="xmmcQueryParams.pageSize"
+        @pagination="getTaskXmmcList"/>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listTask, getTask, delTask, addTask, updateTask } from "@/api/cxxm/zt/task";
+import {listTask, getTask, delTask, addTask, updateTask, listTaskXmmc} from "@/api/cxxm/zt/task";
 import {getToken} from "@/utils/auth";
 import {Loading} from "element-ui";
 
@@ -274,6 +327,14 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openXmmcList: false,
+      xmmcList: [],
+      xmmcTotal: 0,
+      xmmcQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        xmmc: null,
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -321,8 +382,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      },
+      rules: {},
       // 用户导入模板地址
       importTemplate: process.env.VUE_APP_BASE_API + "/profile/common/部省监管数据要求V1.0.doc",
       // 用户导入参数
@@ -334,6 +394,8 @@ export default {
         title: "",
         // 是否禁用上传
         isUploading: false,
+        editXmmc: false,
+        newXmmc: null,
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
@@ -348,6 +410,16 @@ export default {
   created() {
     this.getList();
   },
+  watch: {
+    // 根据名称筛选任务列表
+    'queryParams.xmmc'(val) {
+      if (val) {
+        this.upload.newXmmc = val;
+      } else {
+        this.upload.newXmmc = null;
+      }
+    }
+  },
   methods: {
     /** 查询任务列表 */
     getList() {
@@ -421,13 +493,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.xmmc = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 修改按钮操作 */
@@ -463,12 +536,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除任务编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除任务编号为"' + ids + '"的数据项？').then(function () {
         return delTask(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导入按钮操作 */
     handleImport() {
@@ -528,12 +602,23 @@ export default {
     },
     // 提交上传文件
     submitFileForm() {
-      this.upload.rwlx="zftk";
+      this.upload.rwlx = "zftk";
       //判断是否存在已上传文件
-      if(this.$refs.upload.uploadFiles.length === 0){
+      if (this.$refs.upload.uploadFiles.length === 0) {
         this.$message.error("请上传文件");
         return;
       }
+      if (this.upload.editXmmc === true) {
+        if (this.upload.newXmmc == null) {
+          this.$message.error("请输入新的项目名称");
+          return;
+        } else if (this.upload.newXmmc.trim().length === 0) {
+          this.$message.error("新的项目名称不能为空");
+          return;
+        }
+      } else {
+        this.upload.newXmmc = null;
+      }
       if (this.upload.rwlx == null) {
         this.$message.error("请选择任务类型!")
       } else {
@@ -565,6 +650,21 @@ export default {
         return false;
       }
     },
+    getTaskXmmcList() {
+      listTaskXmmc(this.xmmcQueryParams).then(response => {
+        this.xmmcList = response.rows;
+        this.xmmcTotal = response.total;
+      });
+    },
+    handleXmmcList() {
+      this.getTaskXmmcList();
+      this.openXmmcList = true;
+    },
+    selectXmmc(xmmc) {
+      this.queryParams.xmmc = xmmc;
+      this.handleQuery();
+      this.openXmmcList = false;
+    }
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/cxxm/zttbTask/assign/index.vue b/ruoyi-ui/src/views/cxxm/zttbTask/assign/index.vue
index 3c14b344..909ce26d 100644
--- a/ruoyi-ui/src/views/cxxm/zttbTask/assign/index.vue
+++ b/ruoyi-ui/src/views/cxxm/zttbTask/assign/index.vue
@@ -1,198 +1,213 @@
 <template>
   <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="68px">
-<!--          <el-form-item label="年份" prop="nian">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.nian"-->
-<!--              placeholder="请输入年份"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="县名称" prop="xian">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.xian"-->
-<!--              placeholder="请输入县名称"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="乡镇名称" prop="xzmc">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.xzmc"-->
-<!--              placeholder="请输入乡镇名称"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="村社名称" prop="csmc">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.csmc"-->
-<!--              placeholder="请输入村社名称"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="图斑来源" prop="tbly">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.tbly"-->
-<!--              placeholder="请输入图斑来源"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-          <el-form-item label="综合搜索" prop="tbbh">
-            <el-input
-              v-model="queryParams.tbbh"
-              placeholder="请输入搜索内容"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <!--      <el-form-item label="下发情况" prop="zjxfqk">-->
-          <!--        <el-select v-model="queryParams.zjxfqk" placeholder="请选择下发情况" clearable-->
-          <!--                   @change="handleQuery">-->
-          <!--          <el-option-->
-          <!--            v-for="dict in dict.type.task_xfqk"-->
-          <!--            :key="dict.value"-->
-          <!--            :label="dict.label"-->
-          <!--            :value="dict.value"-->
-          <!--          />-->
-          <!--        </el-select>-->
-          <!--      </el-form-item>-->
-          <el-form-item label="指派情况" prop="xzxfqk">
-            <el-select v-model="queryParams.xzxfqk" placeholder="请选择指派情况" clearable
-                       @change="handleQuery">
-              <el-option key="0" label="未指派" value="0"></el-option>
-              <el-option key="1" label="已指派" value="1"></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="warning"-->
-<!--                  plain-->
-<!--                  icon="el-icon-download"-->
-<!--                  size="mini"-->
-<!--                  @click="openDistributePage"-->
-<!--                >乡镇情况-->
-<!--                </el-button>-->
-        <!--      </el-col>-->
-        <!--    </el-row>-->
-
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-
-
-        <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
-          <!--      <el-table-column type="selection" width="55" align="center" :selectable="selectable" fixed="left"/>-->
-          <el-table-column type="selection" width="55" align="center" fixed="left"/>
-          <el-table-column label="id" align="center" prop="id" fixed="left"/>
-          <el-table-column label="年份" align="center" prop="nian"/>
-          <el-table-column label="县名称" align="center" prop="xian"/>
-          <el-table-column label="乡镇名称" align="center" prop="xzmc"/>
-          <el-table-column label="村社名称" align="center" prop="csmc" min-width="180"/>
-          <el-table-column label="图斑来源" align="center" prop="tbly"/>
-          <el-table-column label="图斑编号" align="center" prop="tbbh"  min-width="180" :show-overflow-tooltip="true"/>
-          <el-table-column label="图斑面积" align="center" prop="tbmj" :show-overflow-tooltip="true"/>
-          <el-table-column label="耕地面积" align="center" prop="gdmj" :show-overflow-tooltip="true"/>
-          <el-table-column label="基本农田面积" align="center" prop="jbntmj" :show-overflow-tooltip="true"/>
-          <el-table-column label="项目名称" align="center" prop="xmmc"  min-width="180"/>
-          <el-table-column label="存在问题" align="center" prop="czwt"  min-width="180"/>
-          <el-table-column label="导入人员" align="center" prop="createBy"  min-width="180"/>
-          <el-table-column label="导入时间" align="center" prop="drsj" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.drsj, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="州级下发情况" align="center" prop="zjxfqk">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.task_xfqk" :value="scope.row.zjxfqk" v-if="scope.row.zjxfqk=='0'"
-                        style="color: red"/>
-              <dict-tag :options="dict.type.task_xfqk" :value="scope.row.zjxfqk" v-if="scope.row.zjxfqk=='1'"
-                        style="color: green"/>
-            </template>
-          </el-table-column>
-          <el-table-column label="州级下发时间" align="center" prop="zjxfsj" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.zjxfsj, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <!--      <el-table-column label="县级下发情况" align="center" prop="xjxfqk">-->
-          <!--        <template slot-scope="scope">-->
-          <!--          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xjxfqk" v-if="scope.row.xjxfqk=='0'"-->
-          <!--                    style="color: red"/>-->
-          <!--          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xjxfqk" v-if="scope.row.xjxfqk=='1'"-->
-          <!--                    style="color: green"/>-->
-          <!--        </template>-->
-          <!--      </el-table-column>-->
-          <!--      <el-table-column label="县级下发时间" align="center" prop="xjxfsj" width="180">-->
-          <!--        <template slot-scope="scope">-->
-          <!--          <span>{{ parseTime(scope.row.xjxfsj, '{y}-{m}-{d}') }}</span>-->
-          <!--        </template>-->
-          <!--      </el-table-column>-->
-          <el-table-column label="指派情况" align="center" prop="xzxfqk">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.task_xfqk" value="未指派" v-if="scope.row.xzxfqk=='0'"
-                        style="color: red"/>
-              <dict-tag :options="dict.type.task_xfqk" value="已指派" v-if="scope.row.xzxfqk=='1'"
-                        style="color: green"/>
-            </template>
-          </el-table-column>
-          <el-table-column label="指派时间" align="center" prop="xzxfsj" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.xzxfsj, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="180"
-                           fixed="right">
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-view"
-                @click="jump(scope.row.id)"
-              >
-                查看
-              </el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-download"
-                @click="openAssignPage(scope.row)"
-                v-if="scope.row.xzxfqk=='0'"
-              >去指派
-              </el-button>
-              <el-button
-                size="mini"
-                style="color: orangered;border: none"
-                icon="el-icon-download"
-                @click="openAssignPage(scope.row)"
-                v-if="scope.row.xzxfqk=='1'"
-              >改派
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+             label-width="68px">
+      <!--          <el-form-item label="年份" prop="nian">-->
+      <!--            <el-input-->
+      <!--              v-model="queryParams.nian"-->
+      <!--              placeholder="请输入年份"-->
+      <!--              clearable-->
+      <!--              @keyup.enter.native="handleQuery"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <!--          <el-form-item label="县名称" prop="xian">-->
+      <!--            <el-input-->
+      <!--              v-model="queryParams.xian"-->
+      <!--              placeholder="请输入县名称"-->
+      <!--              clearable-->
+      <!--              @keyup.enter.native="handleQuery"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <!--          <el-form-item label="乡镇名称" prop="xzmc">-->
+      <!--            <el-input-->
+      <!--              v-model="queryParams.xzmc"-->
+      <!--              placeholder="请输入乡镇名称"-->
+      <!--              clearable-->
+      <!--              @keyup.enter.native="handleQuery"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <!--          <el-form-item label="村社名称" prop="csmc">-->
+      <!--            <el-input-->
+      <!--              v-model="queryParams.csmc"-->
+      <!--              placeholder="请输入村社名称"-->
+      <!--              clearable-->
+      <!--              @keyup.enter.native="handleQuery"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <!--          <el-form-item label="图斑来源" prop="tbly">-->
+      <!--            <el-input-->
+      <!--              v-model="queryParams.tbly"-->
+      <!--              placeholder="请输入图斑来源"-->
+      <!--              clearable-->
+      <!--              @keyup.enter.native="handleQuery"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <el-form-item label="综合搜索" prop="tbbh">
+        <el-input
+          v-model="queryParams.tbbh"
+          placeholder="请输入搜索内容"
+          clearable
+          @keyup.enter.native="handleQuery"
         />
+      </el-form-item>
+      <!--      <el-form-item label="下发情况" prop="zjxfqk">-->
+      <!--        <el-select v-model="queryParams.zjxfqk" placeholder="请选择下发情况" clearable-->
+      <!--                   @change="handleQuery">-->
+      <!--          <el-option-->
+      <!--            v-for="dict in dict.type.task_xfqk"-->
+      <!--            :key="dict.value"-->
+      <!--            :label="dict.label"-->
+      <!--            :value="dict.value"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <el-form-item label="指派情况" prop="xzxfqk">
+        <el-select v-model="queryParams.xzxfqk" placeholder="请选择指派情况" clearable
+                   @change="handleQuery">
+          <el-option key="0" label="未指派" value="0"></el-option>
+          <el-option key="1" label="已指派" value="1"></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>
+
+    <h3 v-if="this.queryParams.xmmc">项目名称：{{ this.queryParams.xmmc }}</h3>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-view"
+          size="mini"
+          @click="handleXmmcList"
+        >查看项目
+        </el-button>
+      </el-col>
+      <!--              <el-col :span="1.5">-->
+      <!--                <el-button-->
+      <!--                  type="warning"-->
+      <!--                  plain-->
+      <!--                  icon="el-icon-download"-->
+      <!--                  size="mini"-->
+      <!--                  @click="openDistributePage"-->
+      <!--                >乡镇情况-->
+      <!--                </el-button>-->
+      <!--              </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+
+    <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
+      <!--      <el-table-column type="selection" width="55" align="center" :selectable="selectable" fixed="left"/>-->
+      <el-table-column type="selection" width="55" align="center" fixed="left"/>
+      <el-table-column label="id" align="center" prop="id" fixed="left"/>
+      <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+      <el-table-column label="年份" align="center" prop="nian"/>
+      <el-table-column label="县名称" align="center" prop="xian"/>
+      <el-table-column label="乡镇名称" align="center" prop="xzmc"/>
+      <el-table-column label="村社名称" align="center" prop="csmc" min-width="180"/>
+      <el-table-column label="图斑来源" align="center" prop="tbly"/>
+      <el-table-column label="图斑编号" align="center" prop="tbbh" min-width="180" :show-overflow-tooltip="true"/>
+      <el-table-column label="图斑面积" align="center" prop="tbmj" :show-overflow-tooltip="true"/>
+      <el-table-column label="耕地面积" align="center" prop="gdmj" :show-overflow-tooltip="true"/>
+      <el-table-column label="基本农田面积" align="center" prop="jbntmj" :show-overflow-tooltip="true"/>
+      <el-table-column label="存在问题" align="center" prop="czwt" min-width="180"/>
+      <el-table-column label="导入人员" align="center" prop="createBy" min-width="180"/>
+      <el-table-column label="导入时间" align="center" prop="drsj" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.drsj, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="州级下发情况" align="center" prop="zjxfqk">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.zjxfqk" v-if="scope.row.zjxfqk=='0'"
+                    style="color: red"/>
+          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.zjxfqk" v-if="scope.row.zjxfqk=='1'"
+                    style="color: green"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="州级下发时间" align="center" prop="zjxfsj" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.zjxfsj, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <!--      <el-table-column label="县级下发情况" align="center" prop="xjxfqk">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xjxfqk" v-if="scope.row.xjxfqk=='0'"-->
+      <!--                    style="color: red"/>-->
+      <!--          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xjxfqk" v-if="scope.row.xjxfqk=='1'"-->
+      <!--                    style="color: green"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="县级下发时间" align="center" prop="xjxfsj" width="180">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <span>{{ parseTime(scope.row.xjxfsj, '{y}-{m}-{d}') }}</span>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <el-table-column label="指派情况" align="center" prop="xzxfqk">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.task_xfqk" value="未指派" v-if="scope.row.xzxfqk=='0'"
+                    style="color: red"/>
+          <dict-tag :options="dict.type.task_xfqk" value="已指派" v-if="scope.row.xzxfqk=='1'"
+                    style="color: green"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="指派给" align="center" prop="toName"/>
+      <el-table-column label="指派时间" align="center" prop="xzxfsj" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.xzxfsj, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="180"
+                       fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="jump(scope.row.id)"
+          >
+            查看
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-download"
+            @click="openAssignPage(scope.row)"
+            v-if="scope.row.xzxfqk=='0'"
+          >去指派
+          </el-button>
+          <el-button
+            size="mini"
+            style="color: orangered;border: none"
+            icon="el-icon-download"
+            @click="openAssignPage(scope.row)"
+            v-if="scope.row.xzxfqk=='1'"
+          >改派
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
 
     <!-- 添加或修改任务对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+        <el-form-item label="项目名称" prop="xmmc">
+          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
+        </el-form-item>
         <el-form-item label="年份" prop="nian">
           <el-input v-model="form.nian" placeholder="请输入年份"/>
         </el-form-item>
@@ -228,9 +243,6 @@
         <el-form-item label="基本农田面积" prop="jbntmj">
           <el-input v-model="form.jbntmj" placeholder="请输入基本农田面积"/>
         </el-form-item>
-        <el-form-item label="项目名称" prop="xmmc">
-          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
-        </el-form-item>
         <el-form-item label="存在问题" prop="czwt">
           <el-input v-model="form.czwt" placeholder="请输入存在问题"/>
         </el-form-item>
@@ -265,22 +277,22 @@
         <el-table-column label="人员总数" align="center" prop="userCount"/>
         <el-table-column label="已指派" align="center" prop="yzpCount"/>
         <el-table-column label="未指派" align="center" prop="wzpCount"/>
-<!--        <el-table-column label="人均任务数" align="center">-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ Math.round(scope.row.taskCount / scope.row.userCount) }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-button-->
-<!--              size="mini"-->
-<!--              type="text"-->
-<!--              icon="el-icon-view"-->
-<!--              @click="handleDistribute(scope.row)"-->
-<!--            >下发至乡镇-->
-<!--            </el-button>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column label="人均任务数" align="center">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ Math.round(scope.row.taskCount / scope.row.userCount) }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-button-->
+        <!--              size="mini"-->
+        <!--              type="text"-->
+        <!--              icon="el-icon-view"-->
+        <!--              @click="handleDistribute(scope.row)"-->
+        <!--            >下发至乡镇-->
+        <!--            </el-button>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
       </el-table>
 
       <!--      <pagination-->
@@ -330,6 +342,33 @@
       <!--        @pagination="getList"-->
       <!--      />-->
     </el-drawer>
+
+    <!-- 添加或修改任务对话框 -->
+    <el-dialog title="项目列表" :visible.sync="openXmmcList" width="800px" append-to-body>
+      <el-table v-loading="loading" :data="xmmcList">
+        <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+        <el-table-column label="图斑数量" align="center" prop="nums"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="selectXmmc(scope.row.xmmc)"
+              :disabled="!scope.row.xmmc"
+            >查看项目
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="xmmcTotal>0"
+        :total="xmmcTotal"
+        :page.sync="xmmcQueryParams.pageNum"
+        :limit.sync="xmmcQueryParams.pageSize"
+        @pagination="getTaskXmmcList"/>
+    </el-dialog>
   </div>
 </template>
 
@@ -341,7 +380,8 @@ import {
   addTask,
   updateTask,
   distribute2Task,
-  assignTask
+  assignTask,
+  listTaskXmmc2 as listTaskXmmc
 } from "@/api/cxxm/zttb/task";
 import {getUsers, getGroupNames} from "@/api/cxxm/zttb/user";
 import {getUserProfile} from "@/api/system/user";
@@ -378,6 +418,14 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openXmmcList: false,
+      xmmcList: [],
+      xmmcTotal: 0,
+      xmmcQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        xmmc: null,
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -530,6 +578,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.xmmc = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -665,6 +714,21 @@ export default {
       this.queryParams.deptId = data.id;
       this.handleQuery();
     },
+    getTaskXmmcList() {
+      listTaskXmmc(this.xmmcQueryParams).then(response => {
+        this.xmmcList = response.rows;
+        this.xmmcTotal = response.total;
+      });
+    },
+    handleXmmcList() {
+      this.getTaskXmmcList();
+      this.openXmmcList = true;
+    },
+    selectXmmc(xmmc) {
+      this.queryParams.xmmc = xmmc;
+      this.handleQuery();
+      this.openXmmcList = false;
+    }
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/cxxm/zttbTask/check/index.vue b/ruoyi-ui/src/views/cxxm/zttbTask/check/index.vue
index 9466e2f8..8b58eb5a 100644
--- a/ruoyi-ui/src/views/cxxm/zttbTask/check/index.vue
+++ b/ruoyi-ui/src/views/cxxm/zttbTask/check/index.vue
@@ -1,128 +1,204 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item label="年份" prop="nian">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.nian"-->
-<!--          placeholder="请输入年份"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="县名称" prop="xian">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.xian"-->
-<!--          placeholder="请输入县名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="乡镇名称" prop="xzmc">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.xzmc"-->
-<!--          placeholder="请输入乡镇名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="村社名称" prop="csmc">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.csmc"-->
-<!--          placeholder="请输入村社名称"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="图斑来源" prop="tbly">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.tbly"-->
-<!--          placeholder="请输入图斑来源"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-      <el-form-item label="综合搜索" prop="tbbh">
-        <el-input
-          v-model="queryParams.tbbh"
-          placeholder="请输入搜索内容"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :disabled="multiple"
-          @click="handleExport"
-        >导出
-        </el-button>
+    <el-row :gutter="20">
+      <el-col :span="4" :xs="24" v-if="checkRole(['zjgly'])">
+        <el-tree
+          :data="deptOptions"
+          :props="defaultProps"
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          ref="tree"
+          node-key="id"
+          default-expand-all
+          highlight-current
+          @node-click="handleNodeClick"/>
+      </el-col>
+      <el-col :span="checkRole(['zjgly']) ? 20:24" :xs="24">
+
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px">
+          <!--      <el-form-item label="年份" prop="nian">-->
+          <!--        <el-input-->
+          <!--          v-model="queryParams.nian"-->
+          <!--          placeholder="请输入年份"-->
+          <!--          clearable-->
+          <!--          @keyup.enter.native="handleQuery"-->
+          <!--        />-->
+          <!--      </el-form-item>-->
+          <!--      <el-form-item label="县名称" prop="xian">-->
+          <!--        <el-input-->
+          <!--          v-model="queryParams.xian"-->
+          <!--          placeholder="请输入县名称"-->
+          <!--          clearable-->
+          <!--          @keyup.enter.native="handleQuery"-->
+          <!--        />-->
+          <!--      </el-form-item>-->
+          <!--      <el-form-item label="乡镇名称" prop="xzmc">-->
+          <!--        <el-input-->
+          <!--          v-model="queryParams.xzmc"-->
+          <!--          placeholder="请输入乡镇名称"-->
+          <!--          clearable-->
+          <!--          @keyup.enter.native="handleQuery"-->
+          <!--        />-->
+          <!--      </el-form-item>-->
+          <!--      <el-form-item label="村社名称" prop="csmc">-->
+          <!--        <el-input-->
+          <!--          v-model="queryParams.csmc"-->
+          <!--          placeholder="请输入村社名称"-->
+          <!--          clearable-->
+          <!--          @keyup.enter.native="handleQuery"-->
+          <!--        />-->
+          <!--      </el-form-item>-->
+          <!--      <el-form-item label="图斑来源" prop="tbly">-->
+          <!--        <el-input-->
+          <!--          v-model="queryParams.tbly"-->
+          <!--          placeholder="请输入图斑来源"-->
+          <!--          clearable-->
+          <!--          @keyup.enter.native="handleQuery"-->
+          <!--        />-->
+          <!--      </el-form-item>-->
+          <el-form-item label="综合搜索" prop="tbbh">
+            <el-input
+              v-model="queryParams.tbbh"
+              placeholder="请输入搜索内容"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="巡查情况" prop="yxccs">
+            <el-select v-model="queryParams.yxccs" placeholder="请选择巡查情况" clearable
+                       @change="handleQuery">
+              <el-option :key="0" label="未巡查" :value="0"/>
+              <el-option :key="1" label="已巡查" :value="1"/>
+            </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>
+
+        <h3 v-if="this.queryParams.xmmc">项目名称：{{ this.queryParams.xmmc }}</h3>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-view"
+              size="mini"
+              @click="handleXmmcList"
+            >查看项目
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              :disabled="multiple"
+              @click="handleExport"
+            >导出
+            </el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" fixed="left"/>
+          <el-table-column label="id" align="center" prop="id" fixed="left"/>
+          <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+          <el-table-column label="年份" align="center" prop="nian"/>
+          <el-table-column label="县名称" align="center" prop="xian"/>
+          <el-table-column label="乡镇名称" align="center" prop="xzmc"/>
+          <el-table-column label="村社名称" align="center" prop="csmc" min-width="180"/>
+          <el-table-column label="图斑来源" align="center" prop="tbly"/>
+          <el-table-column label="图斑编号" align="center" prop="tbbh" min-width="180" :show-overflow-tooltip="true"/>
+          <el-table-column label="已巡查次数" align="center" prop="yxccs"/>
+          <el-table-column label="州级巡查次数" align="center" prop="zjxccs"/>
+          <el-table-column label="县级巡查次数" align="center" prop="xjxccs"/>
+          <el-table-column label="最后巡查时间" align="center" prop="xcsj" min-width="120">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.xcsj, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="图斑面积" align="center" prop="tbmj" :show-overflow-tooltip="true"/>
+          <el-table-column label="耕地面积" align="center" prop="gdmj" :show-overflow-tooltip="true"/>
+          <el-table-column label="基本农田面积" align="center" prop="jbntmj" :show-overflow-tooltip="true"/>
+          <el-table-column label="存在问题" align="center" prop="czwt" min-width="180"/>
+          <el-table-column label="导入人员" align="center" prop="createBy" width="180"/>
+          <el-table-column label="导入时间" align="center" prop="drsj" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.drsj, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120"
+                           fixed="right">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-view"
+                @click="jump(scope.row.id)"
+              >
+                查看
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" fixed="left"/>
-      <el-table-column label="id" align="center" prop="id" fixed="left"/>
-      <el-table-column label="年份" align="center" prop="nian"/>
-      <el-table-column label="县名称" align="center" prop="xian"/>
-      <el-table-column label="乡镇名称" align="center" prop="xzmc"/>
-      <el-table-column label="村社名称" align="center" prop="csmc" min-width="180"/>
-      <el-table-column label="图斑来源" align="center" prop="tbly"/>
-      <el-table-column label="图斑编号" align="center" prop="tbbh"  min-width="180" :show-overflow-tooltip="true"/>
-      <el-table-column label="已巡查次数" align="center" prop="yxccs"/>
-      <el-table-column label="州级巡查次数" align="center" prop="zjxccs"/>
-      <el-table-column label="县级巡查次数" align="center" prop="xjxccs"/>
-      <el-table-column label="最后巡查时间" align="center" prop="xcsj" min-width="120">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.xcsj, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="图斑面积" align="center" prop="tbmj" :show-overflow-tooltip="true"/>
-      <el-table-column label="耕地面积" align="center" prop="gdmj" :show-overflow-tooltip="true"/>
-      <el-table-column label="基本农田面积" align="center" prop="jbntmj" :show-overflow-tooltip="true"/>
-      <el-table-column label="项目名称" align="center" prop="xmmc"  min-width="180"/>
-      <el-table-column label="存在问题" align="center" prop="czwt"  min-width="180"/>
-      <el-table-column label="导入人员" align="center" prop="createBy" width="180"/>
-      <el-table-column label="导入时间" align="center" prop="drsj" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.drsj, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120" fixed="right">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="jump(scope.row.id)"
-          >
-            查看
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+    <!-- 添加或修改任务对话框 -->
+    <el-dialog title="项目列表" :visible.sync="openXmmcList" width="800px" append-to-body>
+      <el-table v-loading="loading" :data="xmmcList">
+        <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+        <el-table-column label="图斑数量" align="center" prop="nums"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="selectXmmc(scope.row.xmmc)"
+              :disabled="!scope.row.xmmc"
+            >查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <pagination
+        v-show="xmmcTotal>0"
+        :total="xmmcTotal"
+        :page.sync="xmmcQueryParams.pageNum"
+        :limit.sync="xmmcQueryParams.pageSize"
+        @pagination="getTaskXmmcList"/>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {listCheckTask as listTask, getTask, delTask, addTask, updateTask } from "@/api/cxxm/zttb/task";
+import {
+  listCheckTask as listTask,
+  getTask,
+  delTask,
+  addTask,
+  updateTask,
+  listTaskXmmc2 as listTaskXmmc
+} from "@/api/cxxm/zttb/task";
+import {deptTreeSelect} from "@/api/system/user";
+import {checkRole} from "../../../../utils/permission";
 
 export default {
   name: "Task",
@@ -147,6 +223,20 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openXmmcList: false,
+      xmmcList: [],
+      xmmcTotal: 0,
+      xmmcQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        xmmc: null,
+      },
+      // 部门树选项
+      deptOptions: null,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -194,14 +284,15 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      },
+      rules: {},
     };
   },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
+    checkRole,
     /** 查询任务列表 */
     getList() {
       this.loading = true;
@@ -277,13 +368,14 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.xmmc = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 修改按钮操作 */
@@ -333,8 +425,41 @@ export default {
       const id = row.id || this.ids
       this.download(`/cxxm/zttb/task/export/${id}`, {
         ...this.queryParams
-      }, `自提图斑_${new Date().getFullYear()}-${new Date().getMonth()+1}-${new Date().getDate()}.xlsx`)
-    }
+      }, `自提图斑_${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}.xlsx`)
+    },
+    handleXmmcList() {
+      this.getTaskXmmcList();
+      this.openXmmcList = true;
+    },
+    selectXmmc(xmmc) {
+      this.queryParams.xmmc = xmmc;
+      this.handleQuery();
+      this.openXmmcList = false;
+    },
+    getTaskXmmcList() {
+      listTaskXmmc(this.xmmcQueryParams).then(response => {
+        this.xmmcList = response.rows;
+        this.xmmcTotal = response.total;
+      });
+    },
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.xmmc = null;
+      this.queryParams.deptId = data.id;
+      this.xmmcQueryParams.deptId = data.id;
+      this.handleQuery();
+    },
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/cxxm/zttbTask/detail/index.vue b/ruoyi-ui/src/views/cxxm/zttbTask/detail/index.vue
index f4d72008..d5124797 100644
--- a/ruoyi-ui/src/views/cxxm/zttbTask/detail/index.vue
+++ b/ruoyi-ui/src/views/cxxm/zttbTask/detail/index.vue
@@ -14,10 +14,10 @@ template
             <el-tab-pane label="基本信息" name="1" style="height: 76vh;overflow: auto">
               <el-descriptions column="2" border :contentStyle="content_style"
                                :labelStyle="label_style">
-                <el-descriptions-item label="年份">{{ form.nian }}</el-descriptions-item>
-                <el-descriptions-item label="县名称">{{ form.xian }}</el-descriptions-item>
                 <el-descriptions-item label="项目名称" :span="2">{{ form.xmmc }}</el-descriptions-item>
                 <el-descriptions-item label="图斑来源" :span="2">{{ form.tbly }}</el-descriptions-item>
+                <el-descriptions-item label="年份">{{ form.nian }}</el-descriptions-item>
+                <el-descriptions-item label="县名称">{{ form.xian }}</el-descriptions-item>
                 <el-descriptions-item label="乡镇名称">{{ form.xzmc }}</el-descriptions-item>
                 <el-descriptions-item label="村社名称">{{ form.csmc }}</el-descriptions-item>
                 <el-descriptions-item label="图斑编号">{{ form.tbbh }}</el-descriptions-item>
@@ -31,12 +31,13 @@ template
                   }}
                 </el-descriptions-item>
                 <el-descriptions-item label="州级下发时间">{{ form.zjxfsj }}</el-descriptions-item>
-<!--                <el-descriptions-item label="县级下发情况">{{ form.xjxfqk == "0" ? "未下发" : "已下发" }}-->
-<!--                </el-descriptions-item>-->
-<!--                <el-descriptions-item label="县级下发时间">{{ form.xjxfsj }}</el-descriptions-item>-->
+                <!--                <el-descriptions-item label="县级下发情况">{{ form.xjxfqk == "0" ? "未下发" : "已下发" }}-->
+                <!--                </el-descriptions-item>-->
+                <!--                <el-descriptions-item label="县级下发时间">{{ form.xjxfsj }}</el-descriptions-item>-->
                 <el-descriptions-item label="乡镇指派情况">{{ form.xzxfqk == "0" ? "未指派" : "已指派" }}
                 </el-descriptions-item>
                 <el-descriptions-item label="乡镇指派时间">{{ form.xzxfsj }}</el-descriptions-item>
+                <el-descriptions-item label="指派给">{{ form.toName }}</el-descriptions-item>
                 <!--                <el-descriptions-item label="任务进度" :span="2">-->
                 <!--                  <el-steps :active="activeStep" finish-status="success" align-center>-->
                 <!--                    <el-step title="州级下发"></el-step>-->
@@ -90,7 +91,7 @@ template
                 <h4>现场图片:</h4>
                 <div v-for="(item,index) in taskCheckSubmitVo.taskCheckImages"
                      style="display: inline-block; width: 100px; height: 100px; margin-right: 10px; margin-bottom: 50px">
-                  <el-image :src="baseUrl+ item.cclj" :preview-src-list="[baseUrl+ item.cclj]"></el-image>
+                  <el-image :src="baseUrl+ item.cclj" :preview-src-list="previewList"></el-image>
                   <el-tag>图片:{{ index + 1 }}</el-tag>
                 </div>
                 <div v-if="taskCheckSubmitVo.taskCheckImages.length==0" style="margin-bottom: 10px">
@@ -229,7 +230,7 @@ template
                   <el-form-item label="审核结果" prop="shjg">
                     <el-radio-group v-model="auditForm.shjg">
                       <el-radio
-                        v-for="dict in dict.type.task_shjg"
+                        v-for="dict in dict.getDate("")"
                         v-if="dict.value!=0"
                         :key="dict.value"
                         :label="dict.value"
@@ -255,9 +256,11 @@ template
                   </el-form-item>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
-                  <el-button type="primary" v-if="auditForm.id" @click="submitAuditForm" style="float:right" v-hasRole="['zjgly']">修 改
+                  <el-button type="primary" v-if="auditForm.id" @click="submitAuditForm" style="float:right"
+                             v-hasRole="['zjgly']">修 改
                   </el-button>
-                  <el-button type="primary" v-else @click="submitAuditForm" style="float:right" v-hasRole="['zjgly']">保 存
+                  <el-button type="primary" v-else @click="submitAuditForm" style="float:right" v-hasRole="['zjgly']">保
+                    存
                   </el-button>
                   <!--                  <el-button @click="open = false">取 消</el-button>-->
                 </div>
@@ -357,6 +360,7 @@ export default {
   dicts: ["task_zgqk", "task_shjg", "sf", "zftk_sdxz", "zftk_ccjd"],
   data() {
     return {
+      previewList: [],
       baseUrl: process.env.VUE_APP_BASE_API,
       activeName: "1",
       activeStep: 0,
@@ -406,6 +410,22 @@ export default {
   created() {
     this.getTaskDetail();
   },
+  watch: {
+    // 监听 taskCheckSubmitVo
+    taskCheckSubmitVo: {
+      handler: function (newValue, oldValue) {
+        if (newValue.taskCheckImages != null) {
+          if (newValue.taskCheckImages.length > 0) {
+            for (let item of newValue.taskCheckImages) {
+              this.previewList.push(this.baseUrl + item.cclj);
+            }
+          }
+        }
+      },
+      immediate: true,
+      deep: true // 为true，表示深度监听，这时候就能监测到a值变化
+    },
+  },
   methods: {
     // 表单重置
     resetAuditForm() {
diff --git a/ruoyi-ui/src/views/cxxm/zttbTask/distribute/index.vue b/ruoyi-ui/src/views/cxxm/zttbTask/distribute/index.vue
index 2c82f8dc..7fe83618 100644
--- a/ruoyi-ui/src/views/cxxm/zttbTask/distribute/index.vue
+++ b/ruoyi-ui/src/views/cxxm/zttbTask/distribute/index.vue
@@ -18,46 +18,46 @@
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
                  label-width="68px">
-<!--          <el-form-item label="年份" prop="nian">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.nian"-->
-<!--              placeholder="请输入年份"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="县名称" prop="xian">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.xian"-->
-<!--              placeholder="请输入县名称"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="乡镇名称" prop="xzmc">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.xzmc"-->
-<!--              placeholder="请输入乡镇名称"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="村社名称" prop="csmc">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.csmc"-->
-<!--              placeholder="请输入村社名称"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="图斑来源" prop="tbly">-->
-<!--            <el-input-->
-<!--              v-model="queryParams.tbly"-->
-<!--              placeholder="请输入图斑来源"-->
-<!--              clearable-->
-<!--              @keyup.enter.native="handleQuery"-->
-<!--            />-->
-<!--          </el-form-item>-->
+          <!--          <el-form-item label="年份" prop="nian">-->
+          <!--            <el-input-->
+          <!--              v-model="queryParams.nian"-->
+          <!--              placeholder="请输入年份"-->
+          <!--              clearable-->
+          <!--              @keyup.enter.native="handleQuery"-->
+          <!--            />-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="县名称" prop="xian">-->
+          <!--            <el-input-->
+          <!--              v-model="queryParams.xian"-->
+          <!--              placeholder="请输入县名称"-->
+          <!--              clearable-->
+          <!--              @keyup.enter.native="handleQuery"-->
+          <!--            />-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="乡镇名称" prop="xzmc">-->
+          <!--            <el-input-->
+          <!--              v-model="queryParams.xzmc"-->
+          <!--              placeholder="请输入乡镇名称"-->
+          <!--              clearable-->
+          <!--              @keyup.enter.native="handleQuery"-->
+          <!--            />-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="村社名称" prop="csmc">-->
+          <!--            <el-input-->
+          <!--              v-model="queryParams.csmc"-->
+          <!--              placeholder="请输入村社名称"-->
+          <!--              clearable-->
+          <!--              @keyup.enter.native="handleQuery"-->
+          <!--            />-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="图斑来源" prop="tbly">-->
+          <!--            <el-input-->
+          <!--              v-model="queryParams.tbly"-->
+          <!--              placeholder="请输入图斑来源"-->
+          <!--              clearable-->
+          <!--              @keyup.enter.native="handleQuery"-->
+          <!--            />-->
+          <!--          </el-form-item>-->
           <el-form-item label="综合搜索" prop="tbbh">
             <el-input
               v-model="queryParams.tbbh"
@@ -83,7 +83,19 @@
           </el-form-item>
         </el-form>
 
+        <h3 v-if="this.queryParams.xmmc">项目名称：{{ this.queryParams.xmmc }}</h3>
+
         <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-view"
+              size="mini"
+              @click="handleXmmcList"
+            >查看项目
+            </el-button>
+          </el-col>
           <el-col :span="1.5">
             <el-button
               type="warning"
@@ -123,17 +135,17 @@
         <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" :selectable="selectable" fixed="left"/>
           <el-table-column label="id" align="center" prop="id" fixed="left"/>
+          <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
           <el-table-column label="年份" align="center" prop="nian"/>
           <el-table-column label="县名称" align="center" prop="xian"/>
           <el-table-column label="乡镇名称" align="center" prop="xzmc"/>
           <el-table-column label="村社名称" align="center" prop="csmc" min-width="180"/>
           <el-table-column label="图斑来源" align="center" prop="tbly"/>
-          <el-table-column label="图斑编号" align="center" prop="tbbh"  min-width="180" :show-overflow-tooltip="true"/>
+          <el-table-column label="图斑编号" align="center" prop="tbbh" min-width="180" :show-overflow-tooltip="true"/>
           <el-table-column label="图斑面积" align="center" prop="tbmj" :show-overflow-tooltip="true"/>
           <el-table-column label="耕地面积" align="center" prop="gdmj" :show-overflow-tooltip="true"/>
           <el-table-column label="基本农田面积" align="center" prop="jbntmj" :show-overflow-tooltip="true"/>
-          <el-table-column label="项目名称" align="center" prop="xmmc"  min-width="180"/>
-          <el-table-column label="存在问题" align="center" prop="czwt"  min-width="180"/>
+          <el-table-column label="存在问题" align="center" prop="czwt" min-width="180"/>
           <el-table-column label="导入人员" align="center" prop="createBy" width="180"/>
           <el-table-column label="导入时间" align="center" prop="drsj" width="180">
             <template slot-scope="scope">
@@ -197,6 +209,9 @@
     <!-- 添加或修改任务对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+        <el-form-item label="项目名称" prop="xmmc">
+          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
+        </el-form-item>
         <el-form-item label="年份" prop="nian">
           <el-input v-model="form.nian" placeholder="请输入年份"/>
         </el-form-item>
@@ -232,9 +247,6 @@
         <el-form-item label="基本农田面积" prop="jbntmj">
           <el-input v-model="form.jbntmj" placeholder="请输入基本农田面积"/>
         </el-form-item>
-        <el-form-item label="项目名称" prop="xmmc">
-          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
-        </el-form-item>
         <el-form-item label="存在问题" prop="czwt">
           <el-input v-model="form.czwt" placeholder="请输入存在问题"/>
         </el-form-item>
@@ -247,9 +259,9 @@
         <el-form-item label="县代码" prop="xdm">
           <el-input v-model="form.xdm" placeholder="请输入县代码"/>
         </el-form-item>
-<!--        <el-form-item label="详细信息" prop="info">-->
-<!--          <el-input v-model="form.info" type="textarea" placeholder="请输入内容"/>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="详细信息" prop="info">-->
+        <!--          <el-input v-model="form.info" type="textarea" placeholder="请输入内容"/>-->
+        <!--        </el-form-item>-->
       </el-form>
 
       <div slot="footer" class="dialog-footer">
@@ -258,6 +270,33 @@
       </div>
     </el-dialog>
 
+
+    <!-- 添加或修改任务对话框 -->
+    <el-dialog title="项目列表" :visible.sync="openXmmcList" width="800px" append-to-body>
+      <el-table v-loading="loading" :data="xmmcList">
+        <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+        <el-table-column label="图斑数量" align="center" prop="nums"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="selectXmmc(scope.row.xmmc)"
+              :disabled="!scope.row.xmmc"
+            >查看项目
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="xmmcTotal>0"
+        :total="xmmcTotal"
+        :page.sync="xmmcQueryParams.pageNum"
+        :limit.sync="xmmcQueryParams.pageSize"
+        @pagination="getTaskXmmcList"/>
+    </el-dialog>
   </div>
 </template>
 
@@ -268,7 +307,8 @@ import {
   delTask,
   addTask,
   updateTask,
-  distributeTask
+  distributeTask,
+  listTaskXmmc
 } from "@/api/cxxm/zttb/task";
 import {deptTreeSelect} from "@/api/system/user";
 
@@ -295,6 +335,15 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openXmmcList: false,
+      xmmcList: [],
+      xmmcTotal: 0,
+      xmmcQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        xmmc: null,
+        deptId: null
+      },
       // 部门树选项
       deptOptions: null,
       defaultProps: {
@@ -428,6 +477,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.xmmc = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -515,7 +565,9 @@ export default {
     },
     // 节点单击事件
     handleNodeClick(data) {
+      this.queryParams.xmmc = null;
       this.queryParams.deptId = data.id;
+      this.xmmcQueryParams.deptId = data.id;
       this.handleQuery();
     },
     //判断是否可勾选
@@ -540,6 +592,21 @@ export default {
     handleClick(tab, event) {
       console.log(tab, event);
     },
+    getTaskXmmcList() {
+      listTaskXmmc(this.xmmcQueryParams).then(response => {
+        this.xmmcList = response.rows;
+        this.xmmcTotal = response.total;
+      });
+    },
+    handleXmmcList() {
+      this.getTaskXmmcList();
+      this.openXmmcList = true;
+    },
+    selectXmmc(xmmc) {
+      this.queryParams.xmmc = xmmc;
+      this.handleQuery();
+      this.openXmmcList = false;
+    }
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/cxxm/zttbTask/import/index.vue b/ruoyi-ui/src/views/cxxm/zttbTask/import/index.vue
index 87dc8ec4..51c9dfec 100644
--- a/ruoyi-ui/src/views/cxxm/zttbTask/import/index.vue
+++ b/ruoyi-ui/src/views/cxxm/zttbTask/import/index.vue
@@ -55,7 +55,19 @@
       </el-form-item>
     </el-form>
 
+    <h3 v-if="this.queryParams.xmmc">项目名称：{{ this.queryParams.xmmc }}</h3>
+
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-view"
+          size="mini"
+          @click="handleXmmcList"
+        >查看项目
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="info"
@@ -94,17 +106,17 @@
     <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" :selectable="selectable" fixed="left"/>
       <el-table-column label="id" align="center" prop="id" fixed="left"/>
+      <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
       <el-table-column label="年份" align="center" prop="nian"/>
       <el-table-column label="县名称" align="center" prop="xian"/>
       <el-table-column label="乡镇名称" align="center" prop="xzmc"/>
       <el-table-column label="村社名称" align="center" prop="csmc" min-width="180"/>
       <el-table-column label="图斑来源" align="center" prop="tbly"/>
-      <el-table-column label="图斑编号" align="center" prop="tbbh"  min-width="180" :show-overflow-tooltip="true"/>
+      <el-table-column label="图斑编号" align="center" prop="tbbh" min-width="180" :show-overflow-tooltip="true"/>
       <el-table-column label="图斑面积" align="center" prop="tbmj" :show-overflow-tooltip="true"/>
       <el-table-column label="耕地面积" align="center" prop="gdmj" :show-overflow-tooltip="true"/>
       <el-table-column label="基本农田面积" align="center" prop="jbntmj" :show-overflow-tooltip="true"/>
-      <el-table-column label="项目名称" align="center" prop="xmmc"  min-width="180"/>
-      <el-table-column label="存在问题" align="center" prop="czwt"  min-width="180"/>
+      <el-table-column label="存在问题" align="center" prop="czwt" min-width="180"/>
       <el-table-column label="导入人员" align="center" prop="createBy" min-width="120"/>
       <el-table-column label="导入时间" align="center" prop="drsj" min-width="120">
         <template slot-scope="scope">
@@ -151,6 +163,9 @@
     <!-- 添加或修改任务对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+        <el-form-item label="项目名称" prop="xmmc">
+          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
+        </el-form-item>
         <el-form-item label="年份" prop="nian">
           <el-input v-model="form.nian" placeholder="请输入年份"/>
         </el-form-item>
@@ -186,9 +201,6 @@
         <el-form-item label="基本农田面积" prop="jbntmj">
           <el-input v-model="form.jbntmj" placeholder="请输入基本农田面积"/>
         </el-form-item>
-        <el-form-item label="项目名称" prop="xmmc">
-          <el-input v-model="form.xmmc" placeholder="请输入项目名称"/>
-        </el-form-item>
         <el-form-item label="存在问题" prop="czwt">
           <el-input v-model="form.czwt" placeholder="请输入存在问题"/>
         </el-form-item>
@@ -218,7 +230,7 @@
         :limit="1"
         accept=".json"
         :headers="upload.headers"
-        :action="upload.url + '?rwlx=' + upload.rwlx"
+        :action="upload.url + '?rwlx=' + upload.rwlx+ '&newXmmc=' + upload.newXmmc"
         :disabled="upload.isUploading"
         :on-progress="handleFileUploadProgress"
         :on-success="handleFileSuccess"
@@ -241,16 +253,56 @@
           </div>
         </div>
       </el-upload>
+      <div style="margin-top: 20px">
+        <el-form label-width="120px">
+          <el-form-item label="修改项目名称：">
+            <el-radio-group v-model="upload.editXmmc">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="项目名称：" v-if="upload.editXmmc">
+            <el-input v-model="upload.newXmmc" placeholder="请输入新的项目名称"></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFileForm">确 定</el-button>
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 添加或修改任务对话框 -->
+    <el-dialog title="项目列表" :visible.sync="openXmmcList" width="800px" append-to-body>
+      <el-table v-loading="loading" :data="xmmcList">
+        <el-table-column label="项目名称" align="center" prop="xmmc" min-width="180"/>
+        <el-table-column label="图斑数量" align="center" prop="nums"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="selectXmmc(scope.row.xmmc)"
+              :disabled="!scope.row.xmmc"
+            >查看项目
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="xmmcTotal>0"
+        :total="xmmcTotal"
+        :page.sync="xmmcQueryParams.pageNum"
+        :limit.sync="xmmcQueryParams.pageSize"
+        @pagination="getTaskXmmcList"/>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {listTask, getTask, delTask, addTask, updateTask} from "@/api/cxxm/zttb/task";
+import {listTask, getTask, delTask, addTask, updateTask, listTaskXmmc} from "@/api/cxxm/zttb/task";
 import {getToken} from "@/utils/auth";
 import {Loading} from "element-ui";
 
@@ -276,6 +328,14 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      openXmmcList: false,
+      xmmcList: [],
+      xmmcTotal: 0,
+      xmmcQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        xmmc: null,
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -335,6 +395,8 @@ export default {
         title: "",
         // 是否禁用上传
         isUploading: false,
+        editXmmc: false,
+        newXmmc: null,
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
@@ -349,6 +411,16 @@ export default {
   created() {
     this.getList();
   },
+  watch: {
+    // 根据名称筛选任务列表
+    'queryParams.xmmc'(val) {
+      if (val) {
+        this.upload.newXmmc = val;
+      } else {
+        this.upload.newXmmc = null;
+      }
+    }
+  },
   methods: {
     /** 查询任务列表 */
     getList() {
@@ -422,6 +494,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.xmmc = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -532,10 +605,21 @@ export default {
     submitFileForm() {
       this.upload.rwlx = "zftk";
       //判断是否存在已上传文件
-      if(this.$refs.upload.uploadFiles.length === 0){
+      if (this.$refs.upload.uploadFiles.length === 0) {
         this.$message.error("请上传文件");
         return;
       }
+      if (this.upload.editXmmc === true) {
+        if (this.upload.newXmmc == null) {
+          this.$message.error("请输入新的项目名称");
+          return;
+        } else if (this.upload.newXmmc.trim().length === 0) {
+          this.$message.error("新的项目名称不能为空");
+          return;
+        }
+      } else {
+        this.upload.newXmmc = null;
+      }
       if (this.upload.rwlx == null) {
         this.$message.error("请选择任务类型!")
       } else {
@@ -567,6 +651,21 @@ export default {
         return false;
       }
     },
+    getTaskXmmcList() {
+      listTaskXmmc(this.xmmcQueryParams).then(response => {
+        this.xmmcList = response.rows;
+        this.xmmcTotal = response.total;
+      });
+    },
+    handleXmmcList() {
+      this.getTaskXmmcList();
+      this.openXmmcList = true;
+    },
+    selectXmmc(xmmc) {
+      this.queryParams.xmmc = xmmc;
+      this.handleQuery();
+      this.openXmmcList = false;
+    }
   }
 };
 </script>
diff --git a/sql/task_v5.sql b/sql/task_v5.sql
index 04f7af21..e695536f 100644
--- a/sql/task_v5.sql
+++ b/sql/task_v5.sql
@@ -444,4 +444,8 @@ create table zt_check_audit
     dept_id     int(11)      default null comment '部门id',
     primary key (id)
 ) engine = innodb
-  auto_increment = 1 comment ='任务巡查审核表';
\ No newline at end of file
+  auto_increment = 1 comment ='任务巡查审核表';
+
+ALTER TABLE zttb_task ADD `mc` varchar(255) DEFAULT NULL COMMENT '名称';
+ALTER TABLE zt_task ADD `mc` varchar(255) DEFAULT NULL COMMENT '名称';
+ALTER TABLE zftk_task ADD `mc` varchar(255) DEFAULT NULL COMMENT '名称';
\ No newline at end of file