diff --git a/cxxm/pom.xml b/cxxm/pom.xml
new file mode 100644
index 00000000..68bd7959
--- /dev/null
+++ b/cxxm/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi</artifactId>
+        <version>3.8.7</version>
+    </parent>
+
+    <artifactId>cxxm</artifactId>
+
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/Task.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/Task.java
new file mode 100644
index 00000000..e57e61a6
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/Task.java
@@ -0,0 +1,146 @@
+package com.ruoyi.cxxm.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+/**
+ * 任务对象 task
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@Data
+public class Task extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 图斑编号
+     */
+    @Excel(name = "图斑编号")
+    private String tbbh;
+
+
+    /**
+     * 任务类型
+     */
+    @Excel(name = "任务类型")
+    private String rwlx;
+
+
+    /**
+     * 图斑所在县
+     */
+    @Excel(name = "图斑所在县")
+    private String tbszx;
+
+
+    /**
+     * 导入人员id
+     */
+    @Excel(name = "导入人员id")
+    private Long drryId;
+
+
+    /**
+     * 导入时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "导入时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date drsj;
+
+
+    /**
+     * 下发情况
+     */
+    @Excel(name = "下发情况")
+    private String xfqk;
+
+
+    /**
+     * 下发时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "下发时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date xfsj;
+
+
+    /**
+     * 巡查周期选项 1每周 2每月 3自定义
+     */
+    @Excel(name = "巡查周期选项 1每周 2每月 3自定义")
+    private String xczqxx;
+
+
+    /**
+     * 巡查周期 单位(天)
+     */
+    @Excel(name = "巡查周期 单位(天)")
+    private Long xczq;
+
+
+    /**
+     * 需巡查次数
+     */
+    @Excel(name = "需巡查次数")
+    private Long xxccs;
+
+
+    /**
+     * 已巡查次数
+     */
+    @Excel(name = "已巡查次数")
+    private Long yxccs;
+
+
+    /**
+     * 州级巡查次数
+     */
+    @Excel(name = "州级巡查次数")
+    private Long zjxccs;
+
+
+    /**
+     * 县级巡查次数
+     */
+    @Excel(name = "县级巡查次数")
+    private Long xjxccs;
+
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date kssj;
+
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date jssj;
+
+
+    /**
+     * 是否归档
+     */
+    @Excel(name = "是否归档")
+    private String sfgd;
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/TaskCheck.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/TaskCheck.java
new file mode 100644
index 00000000..522a5d42
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/TaskCheck.java
@@ -0,0 +1,73 @@
+package com.ruoyi.cxxm.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+/**
+ * 任务巡查记录对象 task_check
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@Data
+public class TaskCheck {
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 任务id
+     */
+    @Excel(name = "任务id")
+    private Long taskId;
+
+
+    /**
+     * 上报情况
+     */
+    @Excel(name = "上报情况")
+    private String sbqk;
+
+
+    /**
+     * 整改情况
+     */
+    @Excel(name = "整改情况")
+    private String zgqk;
+
+
+    /**
+     * 巡查级别
+     */
+    @Excel(name = "巡查级别")
+    private Long xcjb;
+
+
+    /**
+     * 巡查人员id
+     */
+    @Excel(name = "巡查人员id")
+    private Long xcryId;
+
+
+    /**
+     * 巡查时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "巡查时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date xcsj;
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/TaskCheckAudit.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/TaskCheckAudit.java
new file mode 100644
index 00000000..31841323
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/TaskCheckAudit.java
@@ -0,0 +1,67 @@
+package com.ruoyi.cxxm.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+/**
+ * 任务巡查审核对象 task_check_audit
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@Data
+public class TaskCheckAudit extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 任务巡查记录id
+     */
+    @Excel(name = "任务巡查记录id")
+    private Long tcId;
+
+
+    /**
+     * 审核级别
+     */
+    @Excel(name = "审核级别")
+    private String shjb;
+
+
+    /**
+     * 审核结果
+     */
+    @Excel(name = "审核结果")
+    private String shjg;
+
+
+    /**
+     * 审核时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date shsj;
+
+
+    /**
+     * 审核人员id
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核人员id", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date shryId;
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/TaskCheckImage.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/TaskCheckImage.java
new file mode 100644
index 00000000..fc892033
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/TaskCheckImage.java
@@ -0,0 +1,78 @@
+package com.ruoyi.cxxm.domain;
+
+import com.ruoyi.common.annotation.Excel;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 任务巡查图片对象 task_check_image
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@Data
+public class TaskCheckImage {
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 任务巡查记录id
+     */
+    @Excel(name = "任务巡查记录id")
+    private Long tcId;
+
+
+    /**
+     * 经度
+     */
+    @Excel(name = "经度")
+    private String jd;
+
+
+    /**
+     * 纬度
+     */
+    @Excel(name = "纬度")
+    private String wd;
+
+
+    /**
+     * 拍摄方向
+     */
+    @Excel(name = "拍摄方向")
+    private String psfx;
+
+
+    /**
+     * 存储路径
+     */
+    @Excel(name = "存储路径")
+    private String cclj;
+
+
+    /**
+     * 提交人员id
+     */
+    @Excel(name = "提交人员id")
+    private Long tjryId;
+
+
+    /**
+     * 上传时间
+     */
+    @Excel(name = "上传时间")
+    private String scsj;
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/TaskCheckVideo.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/TaskCheckVideo.java
new file mode 100644
index 00000000..f48bf90f
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/TaskCheckVideo.java
@@ -0,0 +1,55 @@
+package com.ruoyi.cxxm.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+/**
+ * 任务巡查视频对象 task_check_video
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@Data
+public class TaskCheckVideo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 任务巡查记录id
+     */
+    @Excel(name = "任务巡查记录id")
+    private Long tcId;
+
+
+    /**
+     * 存储路径
+     */
+    @Excel(name = "存储路径")
+    private String cclj;
+
+
+    /**
+     * 提交人员id
+     */
+    @Excel(name = "提交人员id")
+    private Long tjryId;
+
+
+    /**
+     * 上传时间
+     */
+    @Excel(name = "上传时间")
+    private String scsj;
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/Tbxx.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/Tbxx.java
new file mode 100644
index 00000000..793388e3
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/Tbxx.java
@@ -0,0 +1,293 @@
+package com.ruoyi.cxxm.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+/**
+ * 图斑信息对象 tbxx
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@Data
+public class Tbxx extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+
+    /**
+     * 图斑编号
+     */
+    @Excel(name = "图斑编号")
+    private String tbbh;
+
+
+    /**
+     * 矿山名称
+     */
+    @Excel(name = "矿山名称")
+    private String ksmc;
+
+
+    /**
+     * 许可证编号
+     */
+    @Excel(name = "许可证编号")
+    private String xkzbh;
+
+
+    /**
+     * 矿权级别
+     */
+    @Excel(name = "矿权级别")
+    private String kqjb;
+
+
+    /**
+     * 省
+     */
+    @Excel(name = "省")
+    private String sheng;
+
+
+    /**
+     * 市
+     */
+    @Excel(name = "市")
+    private String shi;
+
+
+    /**
+     * 县
+     */
+    @Excel(name = "县")
+    private String xian;
+
+
+    /**
+     * 县代码
+     */
+    @Excel(name = "县代码")
+    private String xdm;
+
+
+    /**
+     * 详细地址
+     */
+    @Excel(name = "详细地址")
+    private String xxdz;
+
+
+    /**
+     * 经济类型
+     */
+    @Excel(name = "经济类型")
+    private String jjlx;
+
+
+    /**
+     * 矿种类型
+     */
+    @Excel(name = "矿种类型")
+    private String kzlx;
+
+
+    /**
+     * 开采其他矿种
+     */
+    @Excel(name = "开采其他矿种")
+    private String kcqtkz;
+
+
+    /**
+     * 开采方式
+     */
+    @Excel(name = "开采方式")
+    private String kcfs;
+
+
+    /**
+     * 开采状态
+     */
+    @Excel(name = "开采状态")
+    private String kczt;
+
+
+    /**
+     * 占地面积
+     */
+    @Excel(name = "占地面积")
+    private String zdmj;
+
+
+    /**
+     * 违法面积
+     */
+    @Excel(name = "违法面积")
+    private String wfmj;
+
+
+    /**
+     * 中心点经度
+     */
+    @Excel(name = "中心点经度")
+    private String x;
+
+
+    /**
+     * 纬度
+     */
+    @Excel(name = "纬度")
+    private String y;
+
+
+    /**
+     * 存在问题
+     */
+    @Excel(name = "存在问题")
+    private String czwt;
+
+
+    /**
+     * 对应的上期图斑编号
+     */
+    @Excel(name = "对应的上期图斑编号")
+    private String sqtbbh;
+
+
+    /**
+     * 对应的部下发图斑编号
+     */
+    @Excel(name = "对应的部下发图斑编号")
+    private String bxftbbh;
+
+
+    /**
+     * 本期数据获取时间
+     */
+    @Excel(name = "本期数据获取时间")
+    private String bqsjsj;
+
+
+    /**
+     * 上期数据获取时间
+     */
+    @Excel(name = "上期数据获取时间")
+    private String sqsjsj;
+
+
+    /**
+     * 绿色矿山
+     */
+    @Excel(name = "绿色矿山")
+    private String lsks;
+
+
+    /**
+     * 所在重点矿区名称
+     */
+    @Excel(name = "所在重点矿区名称")
+    private String zdkqmc;
+
+
+    /**
+     * 所在自然保护区名称
+     */
+    @Excel(name = "所在自然保护区名称")
+    private String zrbhqmc;
+
+
+    /**
+     * 所在高原湖泊名称
+     */
+    @Excel(name = "所在高原湖泊名称")
+    private String gyhpmc;
+
+
+    /**
+     * 所在高原湖泊10km范围内
+     */
+    @Excel(name = "所在高原湖泊10km范围内")
+    private String gyhp10;
+
+
+    /**
+     * 所在高原湖泊3km范围内
+     */
+    @Excel(name = "所在高原湖泊3km范围内")
+    private String gyhp03;
+
+
+    /**
+     * 所在长江干支流10km范围内
+     */
+    @Excel(name = "所在长江干支流10km范围内")
+    private String cjgzl10;
+
+
+    /**
+     * 所在长江干支流范围名称
+     */
+    @Excel(name = "所在长江干支流范围名称")
+    private String cjgzmc;
+
+
+    /**
+     * 所在长江干支流3km范围内
+     */
+    @Excel(name = "所在长江干支流3km范围内")
+    private String cjgz03;
+
+
+    /**
+     * 所在风景名胜区名称
+     */
+    @Excel(name = "所在风景名胜区名称")
+    private String fjmsmc;
+
+
+    /**
+     * 所在国家公园名称
+     */
+    @Excel(name = "所在国家公园名称")
+    private String gjgymc;
+
+
+    /**
+     * 所在饮水源源地保护区名称
+     */
+    @Excel(name = "所在饮水源源地保护区名称")
+    private String ysydmc;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    private String bz;
+
+
+    /**
+     * 线索来源:填对应的来源“巡查发现、群众举报、打非治违、卫片执法、铁塔线索、上级交办、其他部门移交（送）”
+     */
+    @Excel(name = "线索来源:填对应的来源“巡查发现、群众举报、打非治违、卫片执法、铁塔线索、上级交办、其他部门移交", readConverterExp = "送=")
+    private String xsly;
+
+
+    /**
+     * 图斑空间信息
+     */
+    @Excel(name = "图斑空间信息")
+    private String gis;
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TaskCheckAuditMapper.java b/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TaskCheckAuditMapper.java
new file mode 100644
index 00000000..84aeebab
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TaskCheckAuditMapper.java
@@ -0,0 +1,15 @@
+package com.ruoyi.cxxm.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.cxxm.domain.TaskCheckAudit;
+
+/**
+ * 任务巡查审核Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+public interface TaskCheckAuditMapper extends BaseMapper<TaskCheckAudit> {
+
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TaskCheckImageMapper.java b/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TaskCheckImageMapper.java
new file mode 100644
index 00000000..5522b420
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TaskCheckImageMapper.java
@@ -0,0 +1,15 @@
+package com.ruoyi.cxxm.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.cxxm.domain.TaskCheckImage;
+
+/**
+ * 任务巡查图片Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+public interface TaskCheckImageMapper extends BaseMapper<TaskCheckImage> {
+
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TaskCheckMapper.java b/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TaskCheckMapper.java
new file mode 100644
index 00000000..7307c150
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TaskCheckMapper.java
@@ -0,0 +1,15 @@
+package com.ruoyi.cxxm.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.cxxm.domain.TaskCheck;
+
+/**
+ * 任务巡查记录Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+public interface TaskCheckMapper extends BaseMapper<TaskCheck> {
+
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TaskCheckVideoMapper.java b/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TaskCheckVideoMapper.java
new file mode 100644
index 00000000..3b7c7cca
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TaskCheckVideoMapper.java
@@ -0,0 +1,15 @@
+package com.ruoyi.cxxm.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.cxxm.domain.TaskCheckVideo;
+
+/**
+ * 任务巡查视频Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+public interface TaskCheckVideoMapper extends BaseMapper<TaskCheckVideo> {
+
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TaskMapper.java b/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TaskMapper.java
new file mode 100644
index 00000000..9309d218
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TaskMapper.java
@@ -0,0 +1,21 @@
+package com.ruoyi.cxxm.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.cxxm.domain.Task;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 任务Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+public interface TaskMapper extends BaseMapper<Task> {
+    @DataScope(deptAlias = "task")
+    List<Task> selectList(@Param("ew") Wrapper<Task> queryWrapper);
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TbxxMapper.java b/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TbxxMapper.java
new file mode 100644
index 00000000..58cbf9e7
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/mapper/TbxxMapper.java
@@ -0,0 +1,15 @@
+package com.ruoyi.cxxm.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.cxxm.domain.Tbxx;
+
+/**
+ * 图斑信息Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+public interface TbxxMapper extends BaseMapper<Tbxx> {
+
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/ITaskCheckAuditService.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/ITaskCheckAuditService.java
new file mode 100644
index 00000000..fe593eef
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/ITaskCheckAuditService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.cxxm.service;
+
+import java.util.List;
+import com.ruoyi.cxxm.domain.TaskCheckAudit;
+import com.baomidou.mybatisplus.extension.service.IService;
+/**
+ * 任务巡查审核Service接口
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+public interface ITaskCheckAuditService extends IService<TaskCheckAudit>
+{
+
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/ITaskCheckImageService.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/ITaskCheckImageService.java
new file mode 100644
index 00000000..2dc31dd6
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/ITaskCheckImageService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.cxxm.service;
+
+import java.util.List;
+import com.ruoyi.cxxm.domain.TaskCheckImage;
+import com.baomidou.mybatisplus.extension.service.IService;
+/**
+ * 任务巡查图片Service接口
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+public interface ITaskCheckImageService extends IService<TaskCheckImage>
+{
+
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/ITaskCheckService.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/ITaskCheckService.java
new file mode 100644
index 00000000..7f807084
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/ITaskCheckService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.cxxm.service;
+
+import java.util.List;
+import com.ruoyi.cxxm.domain.TaskCheck;
+import com.baomidou.mybatisplus.extension.service.IService;
+/**
+ * 任务巡查记录Service接口
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+public interface ITaskCheckService extends IService<TaskCheck>
+{
+
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/ITaskCheckVideoService.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/ITaskCheckVideoService.java
new file mode 100644
index 00000000..974a78bc
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/ITaskCheckVideoService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.cxxm.service;
+
+import java.util.List;
+import com.ruoyi.cxxm.domain.TaskCheckVideo;
+import com.baomidou.mybatisplus.extension.service.IService;
+/**
+ * 任务巡查视频Service接口
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+public interface ITaskCheckVideoService extends IService<TaskCheckVideo>
+{
+
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/ITaskService.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/ITaskService.java
new file mode 100644
index 00000000..e0c3ec6c
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/ITaskService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.cxxm.service;
+
+import java.util.List;
+import com.ruoyi.cxxm.domain.Task;
+import com.baomidou.mybatisplus.extension.service.IService;
+/**
+ * 任务Service接口
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+public interface ITaskService extends IService<Task>
+{
+
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/ITbxxService.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/ITbxxService.java
new file mode 100644
index 00000000..bb4ae24a
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/ITbxxService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.cxxm.service;
+
+import java.util.List;
+import com.ruoyi.cxxm.domain.Tbxx;
+import com.baomidou.mybatisplus.extension.service.IService;
+/**
+ * 图斑信息Service接口
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+public interface ITbxxService extends IService<Tbxx>
+{
+
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskCheckAuditServiceImpl.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskCheckAuditServiceImpl.java
new file mode 100644
index 00000000..ad02270f
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskCheckAuditServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.cxxm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.cxxm.mapper.TaskCheckAuditMapper;
+import com.ruoyi.cxxm.domain.TaskCheckAudit;
+import com.ruoyi.cxxm.service.ITaskCheckAuditService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 任务巡查审核Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@Service
+public class TaskCheckAuditServiceImpl extends ServiceImpl<TaskCheckAuditMapper, TaskCheckAudit> implements ITaskCheckAuditService{
+
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskCheckImageServiceImpl.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskCheckImageServiceImpl.java
new file mode 100644
index 00000000..8f3a0f38
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskCheckImageServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.cxxm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.cxxm.mapper.TaskCheckImageMapper;
+import com.ruoyi.cxxm.domain.TaskCheckImage;
+import com.ruoyi.cxxm.service.ITaskCheckImageService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 任务巡查图片Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@Service
+public class TaskCheckImageServiceImpl extends ServiceImpl<TaskCheckImageMapper, TaskCheckImage> implements ITaskCheckImageService{
+
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskCheckServiceImpl.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskCheckServiceImpl.java
new file mode 100644
index 00000000..0b4e2cdd
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskCheckServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.cxxm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.cxxm.mapper.TaskCheckMapper;
+import com.ruoyi.cxxm.domain.TaskCheck;
+import com.ruoyi.cxxm.service.ITaskCheckService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 任务巡查记录Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@Service
+public class TaskCheckServiceImpl extends ServiceImpl<TaskCheckMapper, TaskCheck> implements ITaskCheckService{
+
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskCheckVideoServiceImpl.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskCheckVideoServiceImpl.java
new file mode 100644
index 00000000..3c58f1d9
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskCheckVideoServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.cxxm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.cxxm.mapper.TaskCheckVideoMapper;
+import com.ruoyi.cxxm.domain.TaskCheckVideo;
+import com.ruoyi.cxxm.service.ITaskCheckVideoService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 任务巡查视频Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@Service
+public class TaskCheckVideoServiceImpl extends ServiceImpl<TaskCheckVideoMapper, TaskCheckVideo> implements ITaskCheckVideoService{
+
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskServiceImpl.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskServiceImpl.java
new file mode 100644
index 00000000..6f5df5c6
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.cxxm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.cxxm.mapper.TaskMapper;
+import com.ruoyi.cxxm.domain.Task;
+import com.ruoyi.cxxm.service.ITaskService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 任务Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@Service
+public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements ITaskService{
+
+}
+
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TbxxServiceImpl.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TbxxServiceImpl.java
new file mode 100644
index 00000000..701746fd
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TbxxServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.cxxm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.cxxm.mapper.TbxxMapper;
+import com.ruoyi.cxxm.domain.Tbxx;
+import com.ruoyi.cxxm.service.ITbxxService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 图斑信息Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@Service
+public class TbxxServiceImpl extends ServiceImpl<TbxxMapper, Tbxx> implements ITbxxService{
+
+}
+
diff --git a/cxxm/src/main/resources/mapper/cxxm/TaskCheckAuditMapper.xml b/cxxm/src/main/resources/mapper/cxxm/TaskCheckAuditMapper.xml
new file mode 100644
index 00000000..a31e78dc
--- /dev/null
+++ b/cxxm/src/main/resources/mapper/cxxm/TaskCheckAuditMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.cxxm.mapper.TaskCheckAuditMapper">
+
+
+</mapper>
diff --git a/cxxm/src/main/resources/mapper/cxxm/TaskCheckImageMapper.xml b/cxxm/src/main/resources/mapper/cxxm/TaskCheckImageMapper.xml
new file mode 100644
index 00000000..f94c27d4
--- /dev/null
+++ b/cxxm/src/main/resources/mapper/cxxm/TaskCheckImageMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.cxxm.mapper.TaskCheckImageMapper">
+
+
+</mapper>
diff --git a/cxxm/src/main/resources/mapper/cxxm/TaskCheckMapper.xml b/cxxm/src/main/resources/mapper/cxxm/TaskCheckMapper.xml
new file mode 100644
index 00000000..76545cb0
--- /dev/null
+++ b/cxxm/src/main/resources/mapper/cxxm/TaskCheckMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.cxxm.mapper.TaskCheckMapper">
+
+
+</mapper>
diff --git a/cxxm/src/main/resources/mapper/cxxm/TaskCheckVideoMapper.xml b/cxxm/src/main/resources/mapper/cxxm/TaskCheckVideoMapper.xml
new file mode 100644
index 00000000..4ca9c0cd
--- /dev/null
+++ b/cxxm/src/main/resources/mapper/cxxm/TaskCheckVideoMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.cxxm.mapper.TaskCheckVideoMapper">
+
+
+</mapper>
diff --git a/cxxm/src/main/resources/mapper/cxxm/TaskMapper.xml b/cxxm/src/main/resources/mapper/cxxm/TaskMapper.xml
new file mode 100644
index 00000000..9d43e749
--- /dev/null
+++ b/cxxm/src/main/resources/mapper/cxxm/TaskMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.cxxm.mapper.TaskMapper">
+
+
+</mapper>
diff --git a/cxxm/src/main/resources/mapper/cxxm/TbxxMapper.xml b/cxxm/src/main/resources/mapper/cxxm/TbxxMapper.xml
new file mode 100644
index 00000000..7d27a27c
--- /dev/null
+++ b/cxxm/src/main/resources/mapper/cxxm/TbxxMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.cxxm.mapper.TbxxMapper">
+
+
+</mapper>
diff --git a/pom.xml b/pom.xml
index eac83f5a..fa603137 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,6 +189,7 @@
         <module>ruoyi-quartz</module>
         <module>ruoyi-generator</module>
         <module>ruoyi-common</module>
+        <module>cxxm</module>
     </modules>
     <packaging>pom</packaging>
 
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index e6c67123..f04815ad 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -61,6 +61,16 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>cxxm</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TaskCheckAuditController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TaskCheckAuditController.java
new file mode 100644
index 00000000..8ab3328d
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TaskCheckAuditController.java
@@ -0,0 +1,108 @@
+package com.ruoyi.web.controller.cxxm;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.cxxm.domain.TaskCheckAudit;
+import com.ruoyi.cxxm.service.ITaskCheckAuditService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 任务巡查审核Controller
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@RestController
+@RequestMapping("/cxxm/audit")
+public class TaskCheckAuditController extends BaseController
+{
+    @Autowired
+    private ITaskCheckAuditService taskCheckAuditService;
+
+/**
+ * 查询任务巡查审核列表
+ */
+@PreAuthorize("@ss.hasPermi('cxxm:audit:list')")
+@GetMapping("/list")
+    public TableDataInfo list(TaskCheckAudit taskCheckAudit, PageDomain pageDomain)
+    {
+        startPage();
+        List<TaskCheckAudit> list = taskCheckAuditService.list(new QueryWrapper<>(taskCheckAudit));
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出任务巡查审核列表
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:audit:export')")
+    @Log(title = "任务巡查审核", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TaskCheckAudit taskCheckAudit)
+    {
+        List<TaskCheckAudit> list = taskCheckAuditService.list(new QueryWrapper<>(taskCheckAudit));
+        ExcelUtil<TaskCheckAudit> util = new ExcelUtil<TaskCheckAudit>(TaskCheckAudit.class);
+        util.exportExcel(response, list, "任务巡查审核数据");
+    }
+
+    /**
+     * 获取任务巡查审核详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:audit:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(taskCheckAuditService.getById(id));
+    }
+
+    /**
+     * 新增任务巡查审核
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:audit:add')")
+    @Log(title = "任务巡查审核", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TaskCheckAudit taskCheckAudit)
+    {
+        return toAjax(taskCheckAuditService.save(taskCheckAudit));
+    }
+
+    /**
+     * 修改任务巡查审核
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:audit:edit')")
+    @Log(title = "任务巡查审核", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TaskCheckAudit taskCheckAudit)
+    {
+        return toAjax(taskCheckAuditService.updateById(taskCheckAudit));
+    }
+
+    /**
+     * 删除任务巡查审核
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:audit:remove')")
+    @Log(title = "任务巡查审核", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids)
+    {
+        return toAjax(taskCheckAuditService.removeByIds(ids));
+    }
+}
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TaskCheckController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TaskCheckController.java
new file mode 100644
index 00000000..f4feb966
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TaskCheckController.java
@@ -0,0 +1,108 @@
+package com.ruoyi.web.controller.cxxm;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.cxxm.domain.TaskCheck;
+import com.ruoyi.cxxm.service.ITaskCheckService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 任务巡查记录Controller
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@RestController
+@RequestMapping("/cxxm/check")
+public class TaskCheckController extends BaseController
+{
+    @Autowired
+    private ITaskCheckService taskCheckService;
+
+/**
+ * 查询任务巡查记录列表
+ */
+@PreAuthorize("@ss.hasPermi('cxxm:check:list')")
+@GetMapping("/list")
+    public TableDataInfo list(TaskCheck taskCheck, PageDomain pageDomain)
+    {
+        startPage();
+        List<TaskCheck> list = taskCheckService.list(new QueryWrapper<>(taskCheck));
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出任务巡查记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:check:export')")
+    @Log(title = "任务巡查记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TaskCheck taskCheck)
+    {
+        List<TaskCheck> list = taskCheckService.list(new QueryWrapper<>(taskCheck));
+        ExcelUtil<TaskCheck> util = new ExcelUtil<TaskCheck>(TaskCheck.class);
+        util.exportExcel(response, list, "任务巡查记录数据");
+    }
+
+    /**
+     * 获取任务巡查记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:check:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(taskCheckService.getById(id));
+    }
+
+    /**
+     * 新增任务巡查记录
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:check:add')")
+    @Log(title = "任务巡查记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TaskCheck taskCheck)
+    {
+        return toAjax(taskCheckService.save(taskCheck));
+    }
+
+    /**
+     * 修改任务巡查记录
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:check:edit')")
+    @Log(title = "任务巡查记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TaskCheck taskCheck)
+    {
+        return toAjax(taskCheckService.updateById(taskCheck));
+    }
+
+    /**
+     * 删除任务巡查记录
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:check:remove')")
+    @Log(title = "任务巡查记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids)
+    {
+        return toAjax(taskCheckService.removeByIds(ids));
+    }
+}
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TaskCheckImageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TaskCheckImageController.java
new file mode 100644
index 00000000..f7907529
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TaskCheckImageController.java
@@ -0,0 +1,108 @@
+package com.ruoyi.web.controller.cxxm;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.cxxm.domain.TaskCheckImage;
+import com.ruoyi.cxxm.service.ITaskCheckImageService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 任务巡查图片Controller
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@RestController
+@RequestMapping("/cxxm/image")
+public class TaskCheckImageController extends BaseController
+{
+    @Autowired
+    private ITaskCheckImageService taskCheckImageService;
+
+/**
+ * 查询任务巡查图片列表
+ */
+@PreAuthorize("@ss.hasPermi('cxxm:image:list')")
+@GetMapping("/list")
+    public TableDataInfo list(TaskCheckImage taskCheckImage, PageDomain pageDomain)
+    {
+        startPage();
+        List<TaskCheckImage> list = taskCheckImageService.list(new QueryWrapper<>(taskCheckImage));
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出任务巡查图片列表
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:image:export')")
+    @Log(title = "任务巡查图片", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TaskCheckImage taskCheckImage)
+    {
+        List<TaskCheckImage> list = taskCheckImageService.list(new QueryWrapper<>(taskCheckImage));
+        ExcelUtil<TaskCheckImage> util = new ExcelUtil<TaskCheckImage>(TaskCheckImage.class);
+        util.exportExcel(response, list, "任务巡查图片数据");
+    }
+
+    /**
+     * 获取任务巡查图片详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:image:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(taskCheckImageService.getById(id));
+    }
+
+    /**
+     * 新增任务巡查图片
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:image:add')")
+    @Log(title = "任务巡查图片", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TaskCheckImage taskCheckImage)
+    {
+        return toAjax(taskCheckImageService.save(taskCheckImage));
+    }
+
+    /**
+     * 修改任务巡查图片
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:image:edit')")
+    @Log(title = "任务巡查图片", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TaskCheckImage taskCheckImage)
+    {
+        return toAjax(taskCheckImageService.updateById(taskCheckImage));
+    }
+
+    /**
+     * 删除任务巡查图片
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:image:remove')")
+    @Log(title = "任务巡查图片", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids)
+    {
+        return toAjax(taskCheckImageService.removeByIds(ids));
+    }
+}
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TaskCheckVideoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TaskCheckVideoController.java
new file mode 100644
index 00000000..01475c53
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TaskCheckVideoController.java
@@ -0,0 +1,108 @@
+package com.ruoyi.web.controller.cxxm;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.cxxm.domain.TaskCheckVideo;
+import com.ruoyi.cxxm.service.ITaskCheckVideoService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 任务巡查视频Controller
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@RestController
+@RequestMapping("/cxxm/video")
+public class TaskCheckVideoController extends BaseController
+{
+    @Autowired
+    private ITaskCheckVideoService taskCheckVideoService;
+
+/**
+ * 查询任务巡查视频列表
+ */
+@PreAuthorize("@ss.hasPermi('cxxm:video:list')")
+@GetMapping("/list")
+    public TableDataInfo list(TaskCheckVideo taskCheckVideo, PageDomain pageDomain)
+    {
+        startPage();
+        List<TaskCheckVideo> list = taskCheckVideoService.list(new QueryWrapper<>(taskCheckVideo));
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出任务巡查视频列表
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:video:export')")
+    @Log(title = "任务巡查视频", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TaskCheckVideo taskCheckVideo)
+    {
+        List<TaskCheckVideo> list = taskCheckVideoService.list(new QueryWrapper<>(taskCheckVideo));
+        ExcelUtil<TaskCheckVideo> util = new ExcelUtil<TaskCheckVideo>(TaskCheckVideo.class);
+        util.exportExcel(response, list, "任务巡查视频数据");
+    }
+
+    /**
+     * 获取任务巡查视频详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:video:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(taskCheckVideoService.getById(id));
+    }
+
+    /**
+     * 新增任务巡查视频
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:video:add')")
+    @Log(title = "任务巡查视频", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TaskCheckVideo taskCheckVideo)
+    {
+        return toAjax(taskCheckVideoService.save(taskCheckVideo));
+    }
+
+    /**
+     * 修改任务巡查视频
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:video:edit')")
+    @Log(title = "任务巡查视频", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TaskCheckVideo taskCheckVideo)
+    {
+        return toAjax(taskCheckVideoService.updateById(taskCheckVideo));
+    }
+
+    /**
+     * 删除任务巡查视频
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:video:remove')")
+    @Log(title = "任务巡查视频", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids)
+    {
+        return toAjax(taskCheckVideoService.removeByIds(ids));
+    }
+}
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TaskController.java
new file mode 100644
index 00000000..7e243186
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TaskController.java
@@ -0,0 +1,108 @@
+package com.ruoyi.web.controller.cxxm;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.cxxm.domain.Task;
+import com.ruoyi.cxxm.service.ITaskService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 任务Controller
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@RestController
+@RequestMapping("/cxxm/task")
+public class TaskController extends BaseController
+{
+    @Autowired
+    private ITaskService taskService;
+
+/**
+ * 查询任务列表
+ */
+@PreAuthorize("@ss.hasPermi('cxxm:task:list')")
+@GetMapping("/list")
+    public TableDataInfo list(Task task, PageDomain pageDomain)
+    {
+        startPage();
+        List<Task> list = taskService.list(new QueryWrapper<>(task));
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出任务列表
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:task:export')")
+    @Log(title = "任务", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Task task)
+    {
+        List<Task> list = taskService.list(new QueryWrapper<>(task));
+        ExcelUtil<Task> util = new ExcelUtil<Task>(Task.class);
+        util.exportExcel(response, list, "任务数据");
+    }
+
+    /**
+     * 获取任务详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:task:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(taskService.getById(id));
+    }
+
+    /**
+     * 新增任务
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:task:add')")
+    @Log(title = "任务", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Task task)
+    {
+        return toAjax(taskService.save(task));
+    }
+
+    /**
+     * 修改任务
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:task:edit')")
+    @Log(title = "任务", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody Task task)
+    {
+        return toAjax(taskService.updateById(task));
+    }
+
+    /**
+     * 删除任务
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:task:remove')")
+    @Log(title = "任务", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids)
+    {
+        return toAjax(taskService.removeByIds(ids));
+    }
+}
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TbxxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TbxxController.java
new file mode 100644
index 00000000..0ab0b2d9
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cxxm/TbxxController.java
@@ -0,0 +1,108 @@
+package com.ruoyi.web.controller.cxxm;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.cxxm.domain.Tbxx;
+import com.ruoyi.cxxm.service.ITbxxService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 图斑信息Controller
+ *
+ * @author ruoyi
+ * @date 2024-03-28
+ */
+@RestController
+@RequestMapping("/cxxm/tbxx")
+public class TbxxController extends BaseController
+{
+    @Autowired
+    private ITbxxService tbxxService;
+
+/**
+ * 查询图斑信息列表
+ */
+@PreAuthorize("@ss.hasPermi('cxxm:tbxx:list')")
+@GetMapping("/list")
+    public TableDataInfo list(Tbxx tbxx, PageDomain pageDomain)
+    {
+        startPage();
+        List<Tbxx> list = tbxxService.list(new QueryWrapper<>(tbxx));
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出图斑信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:tbxx:export')")
+    @Log(title = "图斑信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, Tbxx tbxx)
+    {
+        List<Tbxx> list = tbxxService.list(new QueryWrapper<>(tbxx));
+        ExcelUtil<Tbxx> util = new ExcelUtil<Tbxx>(Tbxx.class);
+        util.exportExcel(response, list, "图斑信息数据");
+    }
+
+    /**
+     * 获取图斑信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:tbxx:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tbxxService.getById(id));
+    }
+
+    /**
+     * 新增图斑信息
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:tbxx:add')")
+    @Log(title = "图斑信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody Tbxx tbxx)
+    {
+        return toAjax(tbxxService.save(tbxx));
+    }
+
+    /**
+     * 修改图斑信息
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:tbxx:edit')")
+    @Log(title = "图斑信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody Tbxx tbxx)
+    {
+        return toAjax(tbxxService.updateById(tbxx));
+    }
+
+    /**
+     * 删除图斑信息
+     */
+    @PreAuthorize("@ss.hasPermi('cxxm:tbxx:remove')")
+    @Log(title = "图斑信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids)
+    {
+        return toAjax(tbxxService.removeByIds(ids));
+    }
+}
+
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index 2ffa493f..5a5f12f2 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -10,116 +10,132 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.common.annotation.Excel;
 
 /**
  * Entity基类
- * 
+ *
  * @author ruoyi
  */
-public class BaseEntity implements Serializable
-{
+public class BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /** 搜索值 */
+    /**
+     * 搜索值
+     */
     @JsonIgnore
+    @TableField(exist = false)
     private String searchValue;
 
-    /** 创建者 */
-    @TableField(value = "createBy", fill = FieldFill.INSERT)
+    /**
+     * 创建者
+     */
+    @TableField(value = "create_by", fill = FieldFill.INSERT)
     private String createBy;
 
-    /** 创建时间 */
+    /**
+     * 创建时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "createTime", fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
-    /** 更新者 */
-    @TableField(value = "updateBy", fill = FieldFill.INSERT_UPDATE)
+    /**
+     * 更新者
+     */
+    @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
     private String updateBy;
 
-    /** 更新时间 */
+    /**
+     * 更新时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "updateTime", fill = FieldFill.INSERT_UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     private String remark;
 
-    /** 请求参数 */
+    /**
+     * 部门id
+     */
+    @Excel(name = "部门id")
+    @TableField(value = "dept_id", fill = FieldFill.INSERT)
+    private Long deptId;
+
+    /**
+     * 请求参数
+     */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
     private Map<String, Object> params;
 
-    public String getSearchValue()
-    {
+    public String getSearchValue() {
         return searchValue;
     }
 
-    public void setSearchValue(String searchValue)
-    {
+    public void setSearchValue(String searchValue) {
         this.searchValue = searchValue;
     }
 
-    public String getCreateBy()
-    {
+    public String getCreateBy() {
         return createBy;
     }
 
-    public void setCreateBy(String createBy)
-    {
+    public void setCreateBy(String createBy) {
         this.createBy = createBy;
     }
 
-    public Date getCreateTime()
-    {
+    public Date getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(Date createTime)
-    {
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
 
-    public String getUpdateBy()
-    {
+    public String getUpdateBy() {
         return updateBy;
     }
 
-    public void setUpdateBy(String updateBy)
-    {
+    public void setUpdateBy(String updateBy) {
         this.updateBy = updateBy;
     }
 
-    public Date getUpdateTime()
-    {
+    public Date getUpdateTime() {
         return updateTime;
     }
 
-    public void setUpdateTime(Date updateTime)
-    {
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
 
-    public String getRemark()
-    {
+    public String getRemark() {
         return remark;
     }
 
-    public void setRemark(String remark)
-    {
+    public void setRemark(String remark) {
         this.remark = remark;
     }
 
-    public Map<String, Object> getParams()
-    {
-        if (params == null)
-        {
+    public Map<String, Object> getParams() {
+        if (params == null) {
             params = new HashMap<>();
         }
         return params;
     }
 
-    public void setParams(Map<String, Object> params)
-    {
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public void setParams(Map<String, Object> params) {
         this.params = params;
     }
 }
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/MyMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/AutoFillMetaObjectHandler.java
similarity index 81%
rename from ruoyi-framework/src/main/java/com/ruoyi/framework/handler/MyMetaObjectHandler.java
rename to ruoyi-framework/src/main/java/com/ruoyi/framework/handler/AutoFillMetaObjectHandler.java
index b528b1ef..867ea961 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/MyMetaObjectHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/AutoFillMetaObjectHandler.java
@@ -10,23 +10,25 @@ import org.springframework.stereotype.Component;
 /**
  * 自动填充处理类
  *
- * @author jishanfeng
- * @date 2024-01-12
  */
 @Slf4j
 @Component
-public class MyMetaObjectHandler implements MetaObjectHandler {
+public class AutoFillMetaObjectHandler implements MetaObjectHandler {
 
     @Override
     public void insertFill(MetaObject metaObject) {
+        log.info("start insert fill ....");
         // 获取当前登录用户
         String userName = SecurityUtils.getUsername();
+        Long deptId = SecurityUtils.getDeptId();
         fillValue("createBy", userName, metaObject);
         fillValue("createTime", DateUtils.getNowDate(), metaObject);
+        fillValue("deptId", deptId, metaObject);
     }
 
     @Override
     public void updateFill(MetaObject metaObject) {
+        log.info("start update fill ....");
         // 获取当前登录用户
         String userName = SecurityUtils.getUsername();
         fillValue("updateBy", userName, metaObject);
@@ -37,7 +39,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
         if (metaObject.hasSetter(fieldName)) {
             // 值为空时设置默认值
             Object sidObj = getFieldValByName(fieldName, metaObject);
-            if (sidObj == null || "updateBy".equals(fieldName) || "updateTime".equals(fieldName)) {
+            if (sidObj == null) {
                 setFieldValByName(fieldName, data, metaObject);
             }
         }
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/DataScopeIntercept.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/DataScopeIntercept.java
index e2cd4101..0cc5d336 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/DataScopeIntercept.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/DataScopeIntercept.java
@@ -27,6 +27,7 @@ import net.sf.jsqlparser.statement.select.SetOperationList;
 import net.sf.jsqlparser.statement.update.Update;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.executor.statement.StatementHandler;
+import org.apache.ibatis.jdbc.SQL;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.session.ResultHandler;
@@ -60,7 +61,7 @@ public class DataScopeIntercept extends JsqlParserSupport implements InnerInterc
             for (Method m : methods) {
                 if (Objects.equals(m.getName(), methodName)) {
                     DataScope controllerDataScope = m.getAnnotation(DataScope.class);
-                    if(controllerDataScope!=null){
+                    if (controllerDataScope != null) {
                         String originalSql = boundSql.getSql();
                         // 检查SQL是否包含count()函数
                         if (!originalSql.toLowerCase().contains("count(")) {
@@ -128,8 +129,8 @@ public class DataScopeIntercept extends JsqlParserSupport implements InnerInterc
         String className = mapperId.substring(0, mapperId.lastIndexOf("."));
         //获取方法名
         String methodName = mapperId.substring(mapperId.lastIndexOf(".") + 1);
-        Table fromItem = (Table) plainSelect.getFromItem();
         // 有别名用别名，无别名用表名，防止字段冲突报错
+        // Table fromItem = (Table) plainSelect.getFromItem();
         // Alias fromItemAlias = fromItem.getAlias();
         // String mainTableName = fromItemAlias == null ? fromItem.getName() : fromItemAlias.getName();
         //获取当前mapper 的方法
@@ -157,11 +158,11 @@ public class DataScopeIntercept extends JsqlParserSupport implements InnerInterc
                             try {
                                 Expression expression = CCJSqlParserUtil.parseExpression(sql);
                                 // 数据权限使用单独的括号 防止与其他条件冲突
-                                Parenthesis parenthesis = new Parenthesis(expression);
+                                // Parenthesis parenthesis = new Parenthesis(expression);
                                 if (null != where) {
-                                    return new AndExpression(where, parenthesis);
+                                    return new AndExpression(where, expression);
                                 } else {
-                                    return parenthesis;
+                                    return expression;
                                 }
                             } catch (Exception e) {
                                 throw new RuntimeException("数据权限解析异常 => " + e.getMessage());
@@ -203,20 +204,20 @@ public class DataScopeIntercept extends JsqlParserSupport implements InnerInterc
                 break;
             } else if (DATA_SCOPE_CUSTOM.equals(dataScope)) {
                 sqlString.append(StringUtils.format(
-                        " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
+                        " {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
                         role.getRoleId()));
             } else if (DATA_SCOPE_DEPT.equals(dataScope)) {
-                sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
+                sqlString.append(StringUtils.format(" {}.dept_id = {} ", deptAlias, user.getDeptId()));
             } else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) {
                 sqlString.append(StringUtils.format(
-                        " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
+                        " {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
                         deptAlias, user.getDeptId(), user.getDeptId()));
             } else if (DATA_SCOPE_SELF.equals(dataScope)) {
                 if (StringUtils.isNotBlank(userAlias)) {
-                    sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
+                    sqlString.append(StringUtils.format(" {}.user_id = {} ", userAlias, user.getUserId()));
                 } else {
                     // 数据权限为仅本人且没有userAlias别名不查询任何数据
-                    sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
+                    sqlString.append(StringUtils.format(" {}.dept_id = 0 ", deptAlias));
                 }
             }
             conditions.add(dataScope);
@@ -224,7 +225,7 @@ public class DataScopeIntercept extends JsqlParserSupport implements InnerInterc
 
         // 多角色情况下，所有角色都不包含传递过来的权限字符，这个时候sqlString也会为空，所以要限制一下,不查询任何数据
         if (StringUtils.isEmpty(conditions)) {
-            sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
+            sqlString.append(StringUtils.format(" {}.dept_id = 0 ", deptAlias));
         }
         return sqlString.toString();
     }
diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm.bak b/ruoyi-generator/src/main/resources/vm/java/bak/controller.java.vm.bak
similarity index 100%
rename from ruoyi-generator/src/main/resources/vm/java/controller.java.vm.bak
rename to ruoyi-generator/src/main/resources/vm/java/bak/controller.java.vm.bak
diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm.bak b/ruoyi-generator/src/main/resources/vm/java/bak/domain.java.vm.bak
similarity index 100%
rename from ruoyi-generator/src/main/resources/vm/java/domain.java.vm.bak
rename to ruoyi-generator/src/main/resources/vm/java/bak/domain.java.vm.bak
diff --git a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm.bak b/ruoyi-generator/src/main/resources/vm/java/bak/mapper.java.vm.bak
similarity index 100%
rename from ruoyi-generator/src/main/resources/vm/java/mapper.java.vm.bak
rename to ruoyi-generator/src/main/resources/vm/java/bak/mapper.java.vm.bak
diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm.bak b/ruoyi-generator/src/main/resources/vm/java/bak/service.java.vm.bak
similarity index 100%
rename from ruoyi-generator/src/main/resources/vm/java/service.java.vm.bak
rename to ruoyi-generator/src/main/resources/vm/java/bak/service.java.vm.bak
diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm.bak b/ruoyi-generator/src/main/resources/vm/java/bak/serviceImpl.java.vm.bak
similarity index 100%
rename from ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm.bak
rename to ruoyi-generator/src/main/resources/vm/java/bak/serviceImpl.java.vm.bak
diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index 65ea26a2..f9bc889f 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -48,7 +48,7 @@ public class ${ClassName}Controller extends BaseController
     #if($table.crud || $table.sub)
     public TableDataInfo list(${ClassName} ${className}, PageDomain pageDomain)
     {
-        startPage(pageDomain);
+        startPage();
         List<${ClassName}> list = ${className}Service.list(new QueryWrapper<>(${className}));
         return getDataTable(list);
     }
diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index a522b13e..e4f61f02 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -4,7 +4,11 @@ package ${packageName}.domain;
     import ${import};
     #end
 import com.ruoyi.common.annotation.Excel;
-
+#if($table.crud || $table.sub)
+import com.ruoyi.common.core.domain.BaseEntity;
+#elseif($table.tree)
+import com.ruoyi.common.core.domain.TreeEntity;
+#end
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -17,7 +21,12 @@ import lombok.Data;
  * @date ${datetime}
  */
 @Data
-public class ${ClassName}
+#if($table.crud || $table.sub)
+    #set($Entity="BaseEntity")
+#elseif($table.tree)
+    #set($Entity="TreeEntity")
+    #end
+public class ${ClassName} extends ${Entity}
 {
 private static final long serialVersionUID = 1L;
 
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 0af11e01..a7ad53b7 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,90 +1,91 @@
-{
-  "name": "ruoyi",
-  "version": "3.8.7",
-  "description": "若依管理系统",
-  "author": "若依",
-  "license": "MIT",
-  "scripts": {
-    "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
-    "preview": "node build/index.js --preview",
-    "lint": "eslint --ext .js,.vue src"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "src/**/*.{js,vue}": [
-      "eslint --fix",
-      "git add"
-    ]
-  },
-  "keywords": [
-    "vue",
-    "admin",
-    "dashboard",
-    "element-ui",
-    "boilerplate",
-    "admin-template",
-    "management-system"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/y_project/RuoYi-Vue.git"
-  },
-  "dependencies": {
-    "@riophae/vue-treeselect": "0.4.0",
-    "axios": "0.24.0",
-    "clipboard": "2.0.8",
-    "core-js": "3.25.3",
-    "echarts": "5.4.0",
-    "element-ui": "2.15.14",
-    "file-saver": "2.0.5",
-    "fuse.js": "6.4.3",
-    "highlight.js": "9.18.5",
-    "js-beautify": "1.13.0",
-    "js-cookie": "3.0.1",
-    "jsencrypt": "3.0.0-rc.1",
-    "nprogress": "0.2.0",
-    "quill": "1.3.7",
-    "screenfull": "5.0.2",
-    "sortablejs": "1.10.2",
-    "vue": "2.6.12",
-    "vue-count-to": "1.0.13",
-    "vue-cropper": "0.5.5",
-    "vue-meta": "2.4.0",
-    "vue-router": "3.4.9",
-    "vuedraggable": "2.24.3",
-    "vuex": "3.6.0"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "4.4.6",
-    "@vue/cli-plugin-eslint": "4.4.6",
-    "@vue/cli-service": "4.4.6",
-    "babel-eslint": "10.1.0",
-    "babel-plugin-dynamic-import-node": "2.3.3",
-    "chalk": "4.1.0",
-    "compression-webpack-plugin": "6.1.2",
-    "connect": "3.6.6",
-    "eslint": "7.15.0",
-    "eslint-plugin-vue": "7.2.0",
-    "lint-staged": "10.5.3",
-    "runjs": "4.4.2",
-    "sass": "1.32.13",
-    "sass-loader": "10.1.1",
-    "script-ext-html-webpack-plugin": "2.1.5",
-    "svg-sprite-loader": "5.1.1",
-    "vue-template-compiler": "2.6.12"
-  },
-  "engines": {
-    "node": ">=8.9",
-    "npm": ">= 3.0.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions"
-  ]
-}
+{
+  "name": "ruoyi",
+  "version": "3.8.7",
+  "description": "若依管理系统",
+  "author": "若依",
+  "license": "MIT",
+  "scripts": {
+    "dev": "vue-cli-service serve",
+    "build:prod": "vue-cli-service build",
+    "build:stage": "vue-cli-service build --mode staging",
+    "preview": "node build/index.js --preview",
+    "lint": "eslint --ext .js,.vue src"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "src/**/*.{js,vue}": [
+      "eslint --fix",
+      "git add"
+    ]
+  },
+  "keywords": [
+    "vue",
+    "admin",
+    "dashboard",
+    "element-ui",
+    "boilerplate",
+    "admin-template",
+    "management-system"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/y_project/RuoYi-Vue.git"
+  },
+  "dependencies": {
+    "@riophae/vue-treeselect": "0.4.0",
+    "axios": "0.24.0",
+    "clipboard": "2.0.8",
+    "core-js": "3.25.3",
+    "echarts": "^4.9.0",
+    "element-ui": "2.15.14",
+    "file-saver": "2.0.5",
+    "fuse.js": "6.4.3",
+    "highlight.js": "9.18.5",
+    "js-beautify": "1.13.0",
+    "js-cookie": "3.0.1",
+    "jsencrypt": "3.0.0-rc.1",
+    "nprogress": "0.2.0",
+    "quill": "1.3.7",
+    "screenfull": "5.0.2",
+    "sortablejs": "1.10.2",
+    "v-echarts": "^1.0.2",
+    "vue": "2.6.12",
+    "vue-count-to": "1.0.13",
+    "vue-cropper": "0.5.5",
+    "vue-meta": "2.4.0",
+    "vue-router": "3.4.9",
+    "vuedraggable": "2.24.3",
+    "vuex": "3.6.0"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "4.4.6",
+    "@vue/cli-plugin-eslint": "4.4.6",
+    "@vue/cli-service": "4.4.6",
+    "babel-eslint": "10.1.0",
+    "babel-plugin-dynamic-import-node": "2.3.3",
+    "chalk": "4.1.0",
+    "compression-webpack-plugin": "6.1.2",
+    "connect": "3.6.6",
+    "eslint": "7.15.0",
+    "eslint-plugin-vue": "7.2.0",
+    "lint-staged": "10.5.3",
+    "runjs": "4.4.2",
+    "sass": "1.32.13",
+    "sass-loader": "10.1.1",
+    "script-ext-html-webpack-plugin": "2.1.5",
+    "svg-sprite-loader": "5.1.1",
+    "vue-template-compiler": "2.6.12"
+  },
+  "engines": {
+    "node": ">=8.9",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions"
+  ]
+}
diff --git a/ruoyi-ui/src/api/cxxm/task.js b/ruoyi-ui/src/api/cxxm/task.js
new file mode 100644
index 00000000..a78527e5
--- /dev/null
+++ b/ruoyi-ui/src/api/cxxm/task.js
@@ -0,0 +1,99 @@
+import request from '@/utils/request'
+
+// 查询任务列表
+export function listTask(query) {
+  return request({
+    url: '/cxxm/task/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询任务详细
+export function getTask(id) {
+  return request({
+    url: '/cxxm/task/' + id,
+    method: 'get'
+  })
+}
+
+// 新增任务
+export function addTask(data) {
+  return request({
+    url: '/cxxm/task',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改任务
+export function updateTask(data) {
+  return request({
+    url: '/cxxm/task',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除任务
+export function delTask(id) {
+  return request({
+    url: '/cxxm/task/' + id,
+    method: 'delete'
+  })
+}
+
+// 下发任务
+export function distributeTask(ids) {
+  return request({
+    url: '/cxxm/task/distribute/' + ids,
+    method: 'put'
+  })
+}
+
+// 指派任务
+export function assignTask(ids, data) {
+  return request({
+    url: '/cxxm/task/assign/' + ids,
+    method: 'put',
+    params: data
+  })
+}
+
+// 撤回指派任务
+export function disAssignTask(ids) {
+  return request({
+    url: '/cxxm/task/disAssign/' + ids,
+    method: 'put',
+  })
+}
+
+export function getTaskingCount(id) {
+  return request({
+    url: '/cxxm/task/taskingCount/' + id,
+    method: 'get'
+  })
+}
+
+export function listAssignTask(query) {
+  return request({
+    url: '/cxxm/task/assign/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listAssignedTask(query) {
+  return request({
+    url: '/cxxm/task/assigned/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getStatistics() {
+  return request({
+    url: '/cxxm/task/statistics',
+    method: 'get',
+  })
+}
diff --git a/ruoyi-ui/src/api/cxxm/taskCheck.js b/ruoyi-ui/src/api/cxxm/taskCheck.js
new file mode 100644
index 00000000..851bc14c
--- /dev/null
+++ b/ruoyi-ui/src/api/cxxm/taskCheck.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 查询任务填报详细
+export function getTaskCheck(taskId) {
+  return request({
+    url: '/cxxm/taskCheck/' + taskId,
+    method: 'get'
+  })
+}
diff --git a/ruoyi-ui/src/components/TianDiTuMap/index.vue b/ruoyi-ui/src/components/TianDiTuMap/index.vue
new file mode 100644
index 00000000..2e39180f
--- /dev/null
+++ b/ruoyi-ui/src/components/TianDiTuMap/index.vue
@@ -0,0 +1,166 @@
+<template>
+  <div id="mapDiv" style="position:absolute;width:100%; height:100%">
+    <!--    <img src="https://img2.baidu.com/it/u=1902529991,495288049&fm=253&fmt=auto&app=120&f=JPEG?w=434&h=500">-->
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'TianDiTuMap',
+  props: ['tbxx', "record"],
+  data() {
+    return {
+      map: null,
+      zoom: 19,
+      centerLngLat: {
+        x: 101.55247228396,
+        y: 25.038860388323
+      },
+      // 替换成你的天地图API密钥
+      tianDiTuApiKey: 'f437a9ce7c0267b53561884a3caf6726'
+    };
+  },
+  watch: {
+    record(newvalue, oldvalue) {
+      var thef = this
+      setTimeout(function (e) {
+        var list = newvalue.taskCheckImages
+        if (list.length > 0) {
+          var mapPointsList = []
+          var imgurllist = []
+          for (var i in list) {
+            list[i].jd = Number(list[i].jd)
+            list[i].wd = Number(list[i].wd)
+            list[i].psfx = Number(list[i].psfx)
+            var imageURL = process.env.VUE_APP_BASE_API + "/profile/common/arow.png"
+            mapPointsList.push(new window.T.LngLat(Number(list[i].jd), Number(list[i].wd)))
+
+            var deg = list[i].psfx
+            var iMgurl = process.env.VUE_APP_BASE_API + list[i].cclj
+            var optdiv = '<div style="position: relative;display: contents; width: 50px;height: 50px;overflow: hidden;">' +
+              '<a target="_blank" href="'+iMgurl+'"><b style="display: block;  font-size: 15px;background: #007aff;border-radius: 100px;' +
+              'width: 20px;' +
+              'margin: 15px;' +
+              'height: 20px;' +
+              'position: relative;' +
+              'text-align: center;' +
+              'left: -10px;line-height: 1.5;' +
+              'color: white;">' + (Number(i) + 1) + '</b>' +
+              '<img  src="' + imageURL + '" style="position: absolute; z-index: -1;top: 0px; left: 0px;width: 50px;height: 50px; transform: rotate(' + deg + 'deg);"alt=""></a></div>'
+            var label = new window.T.Label({
+              text: optdiv,
+              position: new window.T.LngLat(list[i].jd, list[i].wd),
+              offset: new T.Point(-25, -15),
+              images: iMgurl
+            });
+            imgurllist.push(iMgurl)
+
+            // 将标注添加到地图中
+            thef.map.addOverLay(label);
+          }
+          // // 获取合理的中心点
+          // const centerPoint = thef.map.getViewport(mapPointsList)
+          // //------------多个坐标集合获取中心点------------
+          // //中心点给到地图
+          // thef.map.centerAndZoom(
+          //   centerPoint.center,
+          //   centerPoint.zoom,
+          // );
+        }
+      }, 1000)
+    }
+  },
+  mounted() {
+    // 引入天地图API脚本
+
+
+    const charset = 'utf-8'
+    const script = document.createElement('script')
+    script.setAttribute('type', 'text/javascript')
+    script.setAttribute('charset', charset)
+    script.setAttribute('src', 'http://api.tianditu.gov.cn/api?v=4.0&tk=' + this.tianDiTuApiKey)
+    document.getElementsByTagName('head')[0].appendChild(script)
+    var thif = this
+    this.$nextTick(() => {
+      let timer = setInterval(() => {
+        const a = new Promise((resolve, reject) => {
+          if (window.T) {
+            console.log('地图脚本初始化成功...');
+            resolve(window.T);
+          } else {
+            console.log('失败...');
+          }
+        });
+        if (window.T) {
+          thif.initMap();
+          clearTimeout(timer);
+        }
+      }, 1000)
+    });
+  },
+  methods: {
+    initMap() {
+      // 创建地图实例
+      this.map = new T.Map('mapDiv');
+      var maplist = this.tbxx
+      if (maplist.length > 0) {
+        for (var i in maplist) {
+          var marker1 = new window.T.Marker(new window.T.LngLat(maplist[i].x, maplist[i].y), {
+            icon: new window.T.Icon({
+              iconUrl: 'https://img1.baidu.com/it/u=1528868125,4274794029&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500', // 引入自定义图标
+              iconSize: new window.T.Point(30, 30), // 图标大小
+            }),
+          });
+          marker1.addEventListener("click", (e) => {
+              this.map.centerAndZoom(
+                new window.T.LngLat(e.lnglat.lng, e.lnglat.lat),
+                [this.zoom],
+              );
+            }
+          );
+          this.map.addOverLay(marker1);
+          var points = [];
+          var gis = maplist[i].gis
+          if (gis) {
+            var poin = JSON.parse(gis)
+            var poin = poin.coordinates[0]
+            for (var k in poin) {
+              points.push(new T.LngLat(poin[k][0], poin[k][1]));
+            }
+            //创建面对象
+            var polygon = new T.Polygon(points, {
+              color: "blue", weight: 3, opacity: 0.5, fillColor: "#FFFFFF", fillOpacity: 0.5
+            });
+            //向地图上添加面
+            this.map.addOverLay(polygon);
+            // 设置地图中心点和缩放级别
+            this.map.centerAndZoom(new T.LngLat(maplist[i].x, maplist[i].y), 15);
+          }
+        }
+      } else {
+        // 设置地图中心点和缩放级别
+        this.map.centerAndZoom(new T.LngLat(this.centerLngLat.x, this.centerLngLat.y), 15);
+      }
+      //map.setMapType(window.TMAP_NORMAL_MAP); // 此地图类型展示普通街道视图
+      //map.setMapType(window.TMAP_TERRAIN_MAP); //  此地图类型展示地形视图。
+      this.map.setMapType(window.TMAP_HYBRID_MAP); //此地图类型展示卫星和路网的混合视图。
+      //map.setMapType(window.TMAP_SATELLITE_MAP ); //此地图类型展示卫星视图。
+      //map.setMapType(window.TMAP_TERRAIN_HYBRID_MAP); //  此地图类型展示地形和路网的混合视图。
+      //创建比例尺控件对象
+      var scale = new window.T.Control.Scale();
+      //添加比例尺控件
+      this.map.addControl(scale);
+    }
+  },
+};
+</script>
+
+<style>
+.tdt-label {
+  background: none !important;
+  border: none !important;
+  text-shadow: none !important;
+  box-shadow: none !important;
+}
+</style>
diff --git a/ruoyi-ui/src/views/cxxm/task/assign/index.vue b/ruoyi-ui/src/views/cxxm/task/assign/index.vue
new file mode 100644
index 00000000..1b467d4a
--- /dev/null
+++ b/ruoyi-ui/src/views/cxxm/task/assign/index.vue
@@ -0,0 +1,609 @@
+<template>
+  <div class="app-container">
+
+    <el-row :gutter="20">
+      <!--任务数据-->
+      <el-col :span="18" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px">
+          <el-form-item label="图斑编号" prop="tbbh">
+            <el-input style="width:150px"
+                      v-model="queryParams.tbbh"
+                      placeholder="请输入图斑编号"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="指派情况" prop="zpqk">
+            <el-select style="width:150px" v-model="queryParams.zpqk" placeholder="请选择指派情况" clearable>
+              <el-option label="未指派" value="1"/>
+              <el-option label="已指派" value="2"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="导入时间" prop="drsjeQuery">
+            <el-date-picker style="width:200px"
+                            v-model="queryParams.drsjQuery"
+                            type="monthrange"
+                            align="right"
+                            unlink-panels
+                            range-separator="至"
+                            start-placeholder="开始月份"
+                            end-placeholder="结束月份"
+                            value-format="yyyy-MM"
+                            :picker-options="pickerOptions">
+            </el-date-picker>
+          </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-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange" overflow="auto">
+          <el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
+          <el-table-column label="序号" align="center" type="index" :index="indexMethod" fixed="left"/>
+          <el-table-column label="图斑编号" align="center" prop="tbbh" min-width="180" :show-overflow-tooltip="true"/>
+          <el-table-column label="图斑所在县" align="center" prop="tbszx"/>
+          <el-table-column label="指派情况" align="center" prop="zpqk">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.zf_zpqk" :value="scope.row.zpqk" v-if="scope.row.zpqk==1"
+                        style="color: orange"/>
+              <dict-tag :options="dict.type.zf_zpqk" :value="scope.row.zpqk" v-if="scope.row.zpqk==2"
+                        style="color: gray"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="导入时间" align="center" prop="drsj" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.drsj, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="下发时间" align="center" prop="xfsj" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.xfsj, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <!--          <el-table-column label="巡查情况" align="center" prop="xcqk">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <dict-tag :options="dict.type.zf_xcqk" :value="scope.row.xcqk" v-if="scope.row.xcqk==1"-->
+          <!--                        style="color: orange"/>-->
+          <!--              <dict-tag :options="dict.type.zf_xcqk" :value="scope.row.xcqk" v-if="scope.row.xcqk==2"-->
+          <!--                        style="color: gray"/>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleDisAssign(scope.row)"
+                v-if="scope.row.zpqk==2 && scope.row.xcqk==1"
+                v-hasPermi="['cxxm:task:assign']"
+              >撤回
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-view"
+                @click="handleView(scope.row)"
+                v-hasPermi="['cxxm:task:query']"
+              >查看
+              </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-col :span="6" :xs="24">
+        <div class="assign-user">
+          指派巡查人员
+        </div>
+        <div class="assign-user-list" v-for="(item,index) in userOptions" :key="index">
+          <el-radio class="assign-user-name" v-model="userId" :label="item.userId" :show-overflow-tooltip="true">
+            {{ item.userName }}
+          </el-radio>
+          <el-tag type="info" class="assign-user-count-tag">{{ item.taskCount }}</el-tag>
+          <el-button
+            type="primary"
+            round
+            size="mini"
+            v-if="userId==item.userId && ids.length>0"
+            @click="handleAssign"
+            v-hasPermi="['cxxm:task:assign']"
+          >指派<span class="assign-user-count" v-model="ids">{{ ids.length }}</span>
+          </el-button>
+        </div>
+        <div>
+          <el-tag type="info" class="assign-user-count-tag">人员{{ userOptions.length }}位</el-tag>
+          <el-tag type="info" class="assign-user-count-tag">人均{{
+              Math.round(assignedTaskCount / userOptions.length)
+            }}条
+          </el-tag>
+          <el-tag type="info">已指派{{ assignedTaskCount }}条</el-tag>
+        </div>
+      </el-col>
+    </el-row>
+
+
+    <!-- 添加或修改任务对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="readOnly">
+        <el-collapse v-model="activeNames">
+          <el-collapse-item title="图斑信息" name="1">
+            <el-descriptions column="2" v-if="form.tbxx!=null" border>
+              <el-descriptions-item label="图斑编号">{{ form.tbxx.tbbh }}</el-descriptions-item>
+              <el-descriptions-item label="矿山名称">{{ form.tbxx.ksmc }}</el-descriptions-item>
+              <el-descriptions-item label="许可证编号">{{ form.tbxx.xkzbh }}</el-descriptions-item>
+              <el-descriptions-item label="矿权级别">{{ form.tbxx.kqjb }}</el-descriptions-item>
+              <el-descriptions-item label="省">{{ form.tbxx.sheng }}</el-descriptions-item>
+              <el-descriptions-item label="市">{{ form.tbxx.shi }}</el-descriptions-item>
+              <el-descriptions-item label="县">{{ form.tbxx.xian }}</el-descriptions-item>
+              <el-descriptions-item label="详细地址">{{ form.tbxx.xxdz }}</el-descriptions-item>
+              <el-descriptions-item label="县代码">{{ form.tbxx.xdm }}</el-descriptions-item>
+              <el-descriptions-item label="经济类型">{{ form.tbxx.jjlx }}</el-descriptions-item>
+              <el-descriptions-item label="矿种类型">{{ form.tbxx.kzlx }}</el-descriptions-item>
+              <el-descriptions-item label="开采其他矿种">{{ form.tbxx.kcqtkz }}</el-descriptions-item>
+              <el-descriptions-item label="开采方式">{{ form.tbxx.kcfs }}</el-descriptions-item>
+              <el-descriptions-item label="占地面积">{{ form.tbxx.zdmj }}</el-descriptions-item>
+              <el-descriptions-item label="违法面积">{{ form.tbxx.wfmj }}</el-descriptions-item>
+              <el-descriptions-item label="中心点经度">{{ form.tbxx.x }}</el-descriptions-item>
+              <el-descriptions-item label="中心点纬度">{{ form.tbxx.y }}</el-descriptions-item>
+              <el-descriptions-item label="对应的上期图斑编号">{{ form.tbxx.sqtbbh }}</el-descriptions-item>
+              <el-descriptions-item label="对应的部下发图斑编号">{{ form.tbxx.bxftbbh }}</el-descriptions-item>
+              <el-descriptions-item label="本期数据获取时间">{{ form.tbxx.bqsjsj }}</el-descriptions-item>
+              <el-descriptions-item label="上期数据获取时间">{{ form.tbxx.sqsjsj }}</el-descriptions-item>
+              <el-descriptions-item label="绿色矿山">{{ form.tbxx.lsks }}</el-descriptions-item>
+              <el-descriptions-item label="所在重点矿区名称">{{ form.tbxx.zdkqmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在自然保护区名称">{{ form.tbxx.zrbhqmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在重点矿区名称">{{ form.tbxx.zdkqmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在高原湖泊名称">{{ form.tbxx.gyhpmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在高原湖泊10km范围内">{{ form.tbxx.gyhp10 }}</el-descriptions-item>
+              <el-descriptions-item label="所在高原湖泊3km范围内">{{ form.tbxx.gyhp03 }}</el-descriptions-item>
+              <el-descriptions-item label="所在长江干支流10km范围内">{{ form.tbxx.cjgzl10 }}</el-descriptions-item>
+              <el-descriptions-item label="所在长江干支流范围名称">{{ form.tbxx.cjgzmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在长江干支流3km范围内">{{ form.tbxx.cjgz03 }}</el-descriptions-item>
+              <el-descriptions-item label="所在风景名胜区名称">{{ form.tbxx.fjmsmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在国家公园名称">{{ form.tbxx.gjgymc }}</el-descriptions-item>
+              <el-descriptions-item label="所在重点矿区名称">{{ form.tbxx.zdkqmc }}</el-descriptions-item>
+              <el-descriptions-item label="备注">{{ form.tbxx.bz }}</el-descriptions-item>
+              <el-descriptions-item label="线索来源">{{ form.tbxx.xsly }}</el-descriptions-item>
+            </el-descriptions>
+          </el-collapse-item>
+          <el-collapse-item title="任务信息" name="2">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="图斑编号" prop="tbbh">
+                  <el-input v-model="form.tbbh" placeholder="请输入图斑编号"/>
+                </el-form-item>
+                <el-form-item label="图斑所在县" prop="tbszx">
+                  <el-input v-model="form.tbszx" placeholder="请输入图斑所在县"/>
+                </el-form-item>
+                <el-form-item label="下发情况" prop="xfqk">
+                  <el-radio-group v-model="form.xfqk">
+                    <el-radio
+                      v-for="dict in dict.type.zf_xfqk"
+                      :key="dict.value"
+                      :label="dict.value"
+                    >{{ dict.label }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item label="下发时间" prop="xfsj">
+                  <el-date-picker clearable
+                                  v-model="form.xfsj"
+                                  type="date"
+                                  value-format="yyyy-MM-dd"
+                                  placeholder="请选择下发时间">
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item label="指派情况" prop="zpqk">
+                  <el-radio-group v-model="form.zpqk">
+                    <el-radio
+                      v-for="dict in dict.type.zf_zpqk"
+                      :key="dict.value"
+                      :label="dict.value"
+                    >{{ dict.label }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item label="指派时间" prop="xfsj">
+                  <el-date-picker clearable
+                                  v-model="form.xfsj"
+                                  type="date"
+                                  value-format="yyyy-MM-dd"
+                                  placeholder="请选择指派时间">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="巡查人" prop="xcryInfo">
+                  <el-input v-model="form.xcryInfo.userName" placeholder="请输入巡查人" v-if="form.xcryInfo!=null"/>
+                  <el-input v-model="form.xcryId" placeholder="请输入巡查人id" v-if="form.xcryInfo==null"/>
+                </el-form-item>
+                <el-form-item label="巡查情况" prop="xcqk">
+                  <el-radio-group v-model="form.xcqk">
+                    <el-radio
+                      v-for="dict in dict.type.zf_xcqk"
+                      :key="dict.value"
+                      :label="dict.value"
+                    >{{ dict.label }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+                </el-form-item>
+                <el-form-item label="部门id" prop="deptId" v-show="false">
+                  <el-input v-model="form.deptId" placeholder="请输入部门id"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-collapse-item>
+          <el-collapse-item title="任务周期" name="3">
+            <el-form-item label="已巡查次数" prop="yxccs">
+              <el-input-number v-model="form.yxccs" placeholder="请输入已巡查次数" :min="0"/>
+              <el-tag type="info" style="margin-left: 10px">次</el-tag>
+            </el-form-item>
+            <el-form-item label="需巡查次数" prop="xxccs">
+              <el-input-number v-model="form.xxccs" placeholder="请输入需巡查次数" :min="1"/>
+              <el-tag type="info" style="margin-left: 10px">次</el-tag>
+            </el-form-item>
+            <el-form-item label="巡查周期选项" prop="xczqxx" v-if="form.xxccs>1">
+              <el-radio-group v-model="xczqxx">
+                <el-radio
+                  v-for="dict in dict.type.zf_xczqxx"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="巡查周期" prop="xczq" v-if="form.xxccs>1 && form.xczqxx==3">
+              <el-input-number v-model="form.xczq" placeholder="请输入巡查周期" :min="1"/>
+              <el-tag type="info" style="margin-left: 10px">天/次</el-tag>
+            </el-form-item>
+          </el-collapse-item>
+        </el-collapse>
+      </el-form>
+      <div slot="footer" class="dialog-footer" v-if="readOnly==false">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listTask,
+  getTask,
+  delTask,
+  addTask,
+  updateTask,
+  distributeTask,
+  listAssignTask,
+  assignTask,
+  disAssignTask,
+  getTaskingCount
+} from "@/api/cxxm/task";
+import {
+  listXcry,
+} from "@/api/system/user";
+
+export default {
+  name: "TaskAssign",
+  dicts: ['zf_xfqk', 'zf_zpqk', 'zf_xcqk', 'zf_xczqxx'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 任务表格数据
+      taskList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 折叠面板
+      activeNames: ['1', '2', '3'],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        tbbh: null,
+        xfqk: null,
+        xfsj: null,
+        zpqk: null,
+        deptId: null,
+        drsjQuery: []
+      },
+      // 表单参数
+      form: {
+        xcryInfo: {}
+      },
+      // 表单校验
+      rules: {},
+      userId: null,
+      assignedTaskCount: 0,
+      userOptions: [],
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 巡查周期选项
+      xczqxx: "2",
+      // 日期区间选择
+      pickerOptions: {
+        shortcuts: [{
+          text: '本月',
+          onClick(picker) {
+            picker.$emit('pick', [new Date(), new Date()]);
+          }
+        }, {
+          text: '今年至今',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date(new Date().getFullYear(), 0);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近六个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setMonth(start.getMonth() - 6);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getUserOption();
+  },
+  computed: {
+    readOnly() {
+      if (this.title.includes("查看")) {
+        // 查看页面设为只读状态
+        return true;
+      }
+      return false;
+    },
+  },
+  watch: {
+    xczqxx(newValue, oldValue) {
+      if (newValue == "1") {
+        this.form.xczqxx = "1"
+        this.form.xczq = 7
+      }
+      if (newValue == "2") {
+        this.form.xczqxx = "2"
+        this.form.xczq = 30
+      }
+      if (newValue == "3") {
+        this.form.xczqxx = "3"
+        this.form.xczq = 30
+      }
+    }
+  },
+  methods: {
+    /**
+     * 查询用户列表
+     */
+    getUserOption() {
+      listXcry({}).then(response => {
+        this.userOptions = response.rows;
+        this.userId = null;
+        this.assignedTaskCount = 0;
+        for (const item of this.userOptions) {
+          this.assignedTaskCount += item.taskCount;
+        }
+      });
+    },
+    /** 查询任务列表 */
+    getList() {
+      this.loading = true;
+      listAssignTask(this.queryParams).then(response => {
+        this.taskList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        tbbh: null,
+        xfqk: null,
+        xfsj: null,
+        zpqk: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+        deptId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加任务";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getTask(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改任务";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateTask(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTask(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除任务编号为"' + ids + '"的数据项？').then(function () {
+        return delTask(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 指派按钮操作 */
+    handleAssign(row) {
+      const ids = row.id || this.ids;
+      const userId = this.userId
+      this.$modal.confirm('是否确认指派任务编号为"' + ids + '"的数据项？').then(function () {
+        return assignTask(ids, {"userId": userId});
+      }).then(() => {
+        this.getList();
+        this.getUserOption();
+        this.$modal.msgSuccess("指派成功");
+      }).catch(() => {
+      });
+    },
+    /** 指派按钮操作 */
+    handleDisAssign(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认撤回任务编号为"' + ids + '"的数据项？').then(function () {
+        return disAssignTask(ids);
+      }).then(() => {
+        this.getList();
+        this.getUserOption();
+        this.$modal.msgSuccess("撤回成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('cxxm/task/export', {
+        ...this.queryParams
+      }, `task_${new Date().getTime()}.xlsx`)
+    },
+    /** 自定义编号 */
+    indexMethod(index) {
+      let pageNum = this.queryParams.pageNum - 1;
+      if ((pageNum !== -1 && pageNum !== 0)) {
+        return (index + 1) + (pageNum * this.queryParams.pageSize);
+      } else {
+        return (index + 1)
+      }
+    },
+    /** 查看按钮操作 */
+    handleView(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getTask(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.xczqxx = this.form.xczqxx
+        this.title = "查看任务";
+      });
+    },
+    //判断是否可勾选
+    selectable(row, index) {
+      if (row.zpqk == 1) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  }
+};
+</script>
+<style>
+.assign-user {
+  height: 50px;
+  color: dodgerblue;
+}
+
+.assign-user-list {
+  height: 40px;
+}
+
+.assign-user-name {
+  width: 80px;
+}
+
+
+.assign-user-count {
+  border-radius: 5px;
+  padding-left: 10px;
+  padding-right: 10px;
+  margin-left: 10px;
+  background: orangered;
+}
+
+.assign-user-count-tag {
+  margin-right: 10px;
+}
+
+.el-collapse .el-collapse-item__header {
+  font-size: 16px;
+  font-weight: bold;
+  color: #1890ff;
+}
+</style>
diff --git a/ruoyi-ui/src/views/cxxm/task/check/detail.vue b/ruoyi-ui/src/views/cxxm/task/check/detail.vue
new file mode 100644
index 00000000..186de2aa
--- /dev/null
+++ b/ruoyi-ui/src/views/cxxm/task/check/detail.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--地图保留-->
+      <el-col :span="12" :xs="24">
+        <el-descriptions title="地图界面">
+        </el-descriptions>
+        <TianDiTuMap style="width: 48%" v-bind:tbxx="[form.tbxx]" v-bind:record="recordForm"></TianDiTuMap>
+      </el-col>
+      <!--巡查数据-->
+      <el-col :span="12" :xs="24">
+        <el-card>
+          <el-descriptions title="任务信息" column="2">
+            <el-descriptions-item label="图斑编号">{{ form.tbbh }}</el-descriptions-item>
+            <el-descriptions-item label="图斑位置">
+              {{ form.tbxx.sheng + form.tbxx.shi + form.tbxx.xian + form.tbxx.xxdz }}
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+        <el-card>
+          <el-descriptions title="巡查记录">
+          </el-descriptions>
+          <el-table
+            :data="form.taskCheckLogs"
+            max-height="500"
+            border
+            style="width: 100%">
+            <el-table-column
+              prop="zgqk"
+              label="整改情况"
+              align="center">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.zf_sfzg" :value="scope.row.zgqk"/>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="remark"
+              label="备注"
+              align="center">
+            </el-table-column>
+            <el-table-column
+              prop="createBy"
+              label="巡查人员"
+              align="center">
+            </el-table-column>
+            <el-table-column
+              prop="xcsj"
+              label="时间"
+              align="center" width="180">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.xcsj, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+              <template slot-scope="scope">
+                <!--                :to="{path: '/cxxm/task/check/detail', query: {'id':scope.row.taskId}}" target="_blank"-->
+                <el-button
+                  size="mini"
+                  type="text"
+                  @click="getInfo(scope.row)"
+                  icon="el-icon-view"
+                  v-hasPermi="['cxxm:task:query']"
+                >查看
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+        <el-card>
+          <el-descriptions title="巡查情况" column="2">
+            <el-descriptions-item label="整改情况">{{ this.selectDictLabel(this.dict.type.zf_sfzg, recordForm.zgqk) }}
+            </el-descriptions-item>
+            <el-descriptions-item label="备注">{{ recordForm.remark }}</el-descriptions-item>
+            <el-descriptions-item label="巡查人员">{{ recordForm.createBy }}</el-descriptions-item>
+            <el-descriptions-item label="巡查时间">{{
+                parseTime(recordForm.xcsj, '{y}-{m}-{d} {h}:{i}:{s}')
+              }}
+            </el-descriptions-item>
+          </el-descriptions>
+          <el-descriptions title="现场图片">
+
+          </el-descriptions>
+          <div v-for="(item,index) in recordForm.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-tag>图片:{{ index + 1 }}</el-tag>
+          </div>
+          <div v-if="recordForm.taskCheckImages.length==0">无</div>
+          <el-descriptions title="视频文件">
+          </el-descriptions>
+          <div v-for="(item,index) in recordForm.taskCheckVideos"
+               class="video-div">
+            <video controls width="200" height="200" :src="baseUrl+ item.cclj"></video>
+            <el-tag>视频:{{ index + 1 }}</el-tag>
+          </div>
+          <div v-if="recordForm.taskCheckVideos.length==0">无</div>
+        </el-card>
+      </el-col>
+    </el-row>
+
+  </div>
+</template>
+
+<script>
+import TianDiTuMap from "@/components/TianDiTuMap/index.vue";
+import {getTaskCheck} from "@/api/cxxm/taskCheck";
+import {number} from "echarts/lib/export";
+
+
+export default {
+  name: "TaskCheckDetail",
+  components: {TianDiTuMap},
+  dicts: ['zf_sfzg'],
+  data() {
+    return {
+      tableData: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 任务表格数据
+      taskList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {},
+      // 表单参数
+      form: {
+        tbxx: {
+          sheng: '',
+          shi: '',
+          xian: ''
+        }
+      },
+      recordForm: {},
+      // 表单校验
+      rules: {},
+      baseUrl: process.env.VUE_APP_BASE_API
+    };
+  },
+  created() {
+    this.getTaskCheckDetail();
+  },
+  methods: {
+    // 查询任务填报信息详情
+    getTaskCheckDetail() {
+      const id = this.$route.query.id
+      getTaskCheck(id).then(response => {
+        this.form = response.data;
+        this.recordForm = response.data.taskCheckLogs[0]
+      });
+    },
+    // 查询任务填报信息详情
+    getInfo(item) {
+      this.recordForm = item
+    },
+  }
+};
+</script>
+<style>
+.image_list {
+  margin-right: 10px;
+}
+
+.video-div {
+  display: inline-block;
+  width: 200px;
+  height: 200px;
+  margin: 0px 5px 50px 5px;
+  //margin-left: 10px;
+  //margin-bottom: 50px
+}
+
+</style>
diff --git a/ruoyi-ui/src/views/cxxm/task/check/index.vue b/ruoyi-ui/src/views/cxxm/task/check/index.vue
new file mode 100644
index 00000000..b6b325db
--- /dev/null
+++ b/ruoyi-ui/src/views/cxxm/task/check/index.vue
@@ -0,0 +1,355 @@
+<template>
+  <div class="app-container">
+
+    <el-row :gutter="20">
+      <el-col :span="24" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px">
+          <el-form-item label="图斑编号" prop="tbbh">
+            <el-input style="width:150px"
+                      v-model="queryParams.tbbh"
+                      placeholder="请输入图斑编号"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="巡查情况" prop="xcqk">
+            <el-select style="width:150px" v-model="queryParams.xcqk" placeholder="请选择巡查情况" clearable>
+              <el-option label="未巡查" value="1"/>
+              <el-option label="已巡查" value="2"/>
+            </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-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"/>
+          <el-table-column label="序号" align="center" type="index" :index="indexMethod" fixed="left"/>
+          <el-table-column label="图斑编号" align="center" prop="tbbh" min-width="180" :show-overflow-tooltip="true"/>
+          <el-table-column label="图斑所在县" align="center" prop="tbszx"/>
+          <el-table-column label="下发时间" align="center" prop="xfsj" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.xfsj, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="巡查情况" align="center" prop="xcqk">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.zf_xcqk" :value="scope.row.xcqk" v-if="scope.row.xcqk==1"
+                        style="color: red"/>
+              <dict-tag :options="dict.type.zf_xcqk" :value="scope.row.xcqk" v-if="scope.row.xcqk==2"
+                        style="color: grey"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="巡查说明" align="center" prop="remark"/>
+          <el-table-column label="巡查人" align="center" prop="xcryInfo">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcryInfo.userName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="巡查时间" align="center" prop="xcsj" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.xcsj, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+            <template slot-scope="scope">
+              <router-link :key="$route.fullPath" :to="{path: '/cxxm/task/check/detail', query: {'id':scope.row.id}}">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-view"
+                  v-if="scope.row.xcqk==2"
+                  v-hasPermi="['cxxm:taskCheck:query']"
+                >查看
+                </el-button>
+              </router-link>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-download"
+                @click="handleExportWord(scope.row)"
+                v-if="scope.row.xcqk==2"
+                v-hasPermi="['cxxm:taskCheck:query']"
+              >导出
+              </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-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="图斑编号" prop="tbbh">
+          <el-input v-model="form.tbbh" placeholder="请输入图斑编号"/>
+        </el-form-item>
+        <el-form-item label="图斑所在县" prop="tbszx">
+          <el-input v-model="form.tbszx" placeholder="请输入图斑所在县"/>
+        </el-form-item>
+        <el-form-item label="下发情况" prop="xfqk">
+          <el-input v-model="form.xfqk" placeholder="请输入下发情况"/>
+        </el-form-item>
+        <el-form-item label="下发时间" prop="xfsj">
+          <el-date-picker clearable
+                          v-model="form.xfsj"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择下发时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+        </el-form-item>
+        <el-form-item label="部门id" prop="deptId">
+          <el-input v-model="form.deptId" placeholder="请输入部门id"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {listTask, getTask, delTask, addTask, updateTask, distributeTask, listAssignedTask} from "@/api/cxxm/task";
+import {deptTreeSelect, getUser} from "@/api/system/user";
+
+export default {
+  name: "TaskCheck",
+  dicts: ['zf_xcqk'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 任务表格数据
+      taskList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        tbbh: null,
+        xfqk: null,
+        xfsj: null,
+        deptId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      // 部门树选项
+      deptOptions: undefined,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 日期区间选择
+      pickerOptions: {
+        shortcuts: [{
+          text: '本月',
+          onClick(picker) {
+            picker.$emit('pick', [new Date(), new Date()]);
+          }
+        }, {
+          text: '今年至今',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date(new Date().getFullYear(), 0);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近六个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setMonth(start.getMonth() - 6);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询任务列表 */
+    getList() {
+      this.loading = true;
+      listAssignedTask(this.queryParams).then(response => {
+        this.taskList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        tbbh: null,
+        xfqk: null,
+        xfsj: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+        deptId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加任务";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getTask(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改任务";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateTask(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTask(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除任务编号为"' + ids + '"的数据项？').then(function () {
+        return delTask(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 下发按钮操作 */
+    handleDistribute(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认下发任务编号为"' + ids + '"的数据项？').then(function () {
+        return distributeTask(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("下发成功");
+      }).catch(() => {
+      });
+    },
+    /** 自定义编号 */
+    indexMethod(index) {
+      let pageNum = this.queryParams.pageNum - 1;
+      if ((pageNum !== -1 && pageNum !== 0)) {
+        return (index + 1) + (pageNum * this.queryParams.pageSize);
+      } else {
+        return (index + 1)
+      }
+    },
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 导出word
+    handleExportWord(row) {
+      this.download('cxxm/taskCheck/exportWord/' + row.id, {
+        ...this.queryParams
+      }, `taskCheck_${new Date().getTime()}.doc`)
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id;
+      this.handleQuery();
+    },
+    //判断是否可勾选
+    selectable(row, index) {
+      if (row.xfqk == 3) {
+        return true;
+      } else {
+        return false;
+      }
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/cxxm/task/distribute/index.vue b/ruoyi-ui/src/views/cxxm/task/distribute/index.vue
new file mode 100644
index 00000000..9b8f82e4
--- /dev/null
+++ b/ruoyi-ui/src/views/cxxm/task/distribute/index.vue
@@ -0,0 +1,527 @@
+<template>
+  <div class="app-container">
+
+    <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="4" :xs="24">
+        <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="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px">
+          <el-form-item label="图斑编号" prop="tbbh">
+            <el-input style="width:150px"
+                      v-model="queryParams.tbbh"
+                      placeholder="请输入图斑编号"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="下发情况" prop="xfqk">
+            <el-select style="width:150px" v-model="queryParams.xfqk" placeholder="请选择下发情况" clearable>
+              <el-option label="未下发" value="1"/>
+              <el-option label="已下发" value="2"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="导入时间" prop="drsjeQuery">
+            <el-date-picker style="width:200px"
+                            v-model="queryParams.drsjQuery"
+                            type="monthrange"
+                            align="right"
+                            unlink-panels
+                            range-separator="至"
+                            start-placeholder="开始月份"
+                            end-placeholder="结束月份"
+                            value-format="yyyy-MM"
+                            :picker-options="pickerOptions">
+            </el-date-picker>
+          </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="handleDistribute"
+              v-hasPermi="['cxxm:task:distribute']"
+            >下发
+            </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"/>
+          <el-table-column label="序号" align="center" type="index" :index="indexMethod" fixed="left"/>
+          <el-table-column label="图斑编号" align="center" prop="tbbh" min-width="180" :show-overflow-tooltip="true"/>
+          <el-table-column label="图斑所在县" align="center" prop="tbszx"/>
+          <el-table-column label="下发情况" align="center" prop="xfqk">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.zf_xfqk" :value="scope.row.xfqk" v-if="scope.row.xfqk==1"
+                        style="color: red"/>
+              <dict-tag :options="dict.type.zf_xfqk" :value="scope.row.xfqk" v-if="scope.row.xfqk==2"
+                        style="color: gray"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="导入时间" align="center" prop="drsj" width="180">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.drsj, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-view"
+                @click="handleView(scope.row)"
+                v-hasPermi="['cxxm:task:query']"
+              >查看
+              </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-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="readOnly">
+        <el-collapse v-model="activeNames">
+          <el-collapse-item title="图斑信息" name="1">
+            <el-descriptions column="2" v-if="form.tbxx!=null" border>
+              <el-descriptions-item label="图斑编号">{{ form.tbxx.tbbh }}</el-descriptions-item>
+              <el-descriptions-item label="矿山名称">{{ form.tbxx.ksmc }}</el-descriptions-item>
+              <el-descriptions-item label="许可证编号">{{ form.tbxx.xkzbh }}</el-descriptions-item>
+              <el-descriptions-item label="矿权级别">{{ form.tbxx.kqjb }}</el-descriptions-item>
+              <el-descriptions-item label="省">{{ form.tbxx.sheng }}</el-descriptions-item>
+              <el-descriptions-item label="市">{{ form.tbxx.shi }}</el-descriptions-item>
+              <el-descriptions-item label="县">{{ form.tbxx.xian }}</el-descriptions-item>
+              <el-descriptions-item label="详细地址">{{ form.tbxx.xxdz }}</el-descriptions-item>
+              <el-descriptions-item label="县代码">{{ form.tbxx.xdm }}</el-descriptions-item>
+              <el-descriptions-item label="经济类型">{{ form.tbxx.jjlx }}</el-descriptions-item>
+              <el-descriptions-item label="矿种类型">{{ form.tbxx.kzlx }}</el-descriptions-item>
+              <el-descriptions-item label="开采其他矿种">{{ form.tbxx.kcqtkz }}</el-descriptions-item>
+              <el-descriptions-item label="开采方式">{{ form.tbxx.kcfs }}</el-descriptions-item>
+              <el-descriptions-item label="占地面积">{{ form.tbxx.zdmj }}</el-descriptions-item>
+              <el-descriptions-item label="违法面积">{{ form.tbxx.wfmj }}</el-descriptions-item>
+              <el-descriptions-item label="中心点经度">{{ form.tbxx.x }}</el-descriptions-item>
+              <el-descriptions-item label="中心点纬度">{{ form.tbxx.y }}</el-descriptions-item>
+              <el-descriptions-item label="对应的上期图斑编号">{{ form.tbxx.sqtbbh }}</el-descriptions-item>
+              <el-descriptions-item label="对应的部下发图斑编号">{{ form.tbxx.bxftbbh }}</el-descriptions-item>
+              <el-descriptions-item label="本期数据获取时间">{{ form.tbxx.bqsjsj }}</el-descriptions-item>
+              <el-descriptions-item label="上期数据获取时间">{{ form.tbxx.sqsjsj }}</el-descriptions-item>
+              <el-descriptions-item label="绿色矿山">{{ form.tbxx.lsks }}</el-descriptions-item>
+              <el-descriptions-item label="所在重点矿区名称">{{ form.tbxx.zdkqmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在自然保护区名称">{{ form.tbxx.zrbhqmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在重点矿区名称">{{ form.tbxx.zdkqmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在高原湖泊名称">{{ form.tbxx.gyhpmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在高原湖泊10km范围内">{{ form.tbxx.gyhp10 }}</el-descriptions-item>
+              <el-descriptions-item label="所在高原湖泊3km范围内">{{ form.tbxx.gyhp03 }}</el-descriptions-item>
+              <el-descriptions-item label="所在长江干支流10km范围内">{{ form.tbxx.cjgzl10 }}</el-descriptions-item>
+              <el-descriptions-item label="所在长江干支流范围名称">{{ form.tbxx.cjgzmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在长江干支流3km范围内">{{ form.tbxx.cjgz03 }}</el-descriptions-item>
+              <el-descriptions-item label="所在风景名胜区名称">{{ form.tbxx.fjmsmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在国家公园名称">{{ form.tbxx.gjgymc }}</el-descriptions-item>
+              <el-descriptions-item label="所在重点矿区名称">{{ form.tbxx.zdkqmc }}</el-descriptions-item>
+              <el-descriptions-item label="备注">{{ form.tbxx.bz }}</el-descriptions-item>
+              <el-descriptions-item label="线索来源">{{ form.tbxx.xsly }}</el-descriptions-item>
+            </el-descriptions>
+          </el-collapse-item>
+          <el-collapse-item title="任务信息" name="2">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="图斑编号" prop="tbbh">
+                  <el-input v-model="form.tbbh" placeholder="请输入图斑编号"/>
+                </el-form-item>
+                <el-form-item label="图斑所在县" prop="tbszx">
+                  <el-input v-model="form.tbszx" placeholder="请输入图斑所在县"/>
+                </el-form-item>
+                <el-form-item label="下发情况" prop="xfqk">
+                  <el-radio-group v-model="form.xfqk">
+                    <el-radio
+                      v-for="dict in dict.type.zf_xfqk"
+                      :key="dict.value"
+                      :label="dict.value"
+                    >{{ dict.label }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item label="下发时间" prop="xfsj">
+                  <el-date-picker clearable
+                                  v-model="form.xfsj"
+                                  type="date"
+                                  value-format="yyyy-MM-dd"
+                                  placeholder="请选择下发时间">
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item label="指派情况" prop="zpqk">
+                  <el-radio-group v-model="form.zpqk">
+                    <el-radio
+                      v-for="dict in dict.type.zf_zpqk"
+                      :key="dict.value"
+                      :label="dict.value"
+                    >{{ dict.label }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item label="指派时间" prop="xfsj">
+                  <el-date-picker clearable
+                                  v-model="form.xfsj"
+                                  type="date"
+                                  value-format="yyyy-MM-dd"
+                                  placeholder="请选择指派时间">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="巡查人" prop="xcryInfo">
+                  <el-input v-model="form.xcryInfo.userName" placeholder="请输入巡查人" v-if="form.xcryInfo!=null"/>
+                  <el-input v-model="form.xcryId" placeholder="请输入巡查人id" v-if="form.xcryInfo==null"/>
+                </el-form-item>
+                <el-form-item label="巡查情况" prop="xcqk">
+                  <el-radio-group v-model="form.xcqk">
+                    <el-radio
+                      v-for="dict in dict.type.zf_xcqk"
+                      :key="dict.value"
+                      :label="dict.value"
+                    >{{ dict.label }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+                </el-form-item>
+                <el-form-item label="部门id" prop="deptId" v-show="false">
+                  <el-input v-model="form.deptId" placeholder="请输入部门id"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-collapse-item>
+          <el-collapse-item title="任务周期" name="3">
+            <el-form-item label="已巡查次数" prop="yxccs">
+              <el-input-number v-model="form.yxccs" placeholder="请输入已巡查次数" :min="0"/>
+              <el-tag type="info" style="margin-left: 10px">次</el-tag>
+            </el-form-item>
+            <el-form-item label="需巡查次数" prop="xxccs">
+              <el-input-number v-model="form.xxccs" placeholder="请输入需巡查次数" :min="1"/>
+              <el-tag type="info" style="margin-left: 10px">次</el-tag>
+            </el-form-item>
+            <el-form-item label="巡查周期选项" prop="xczqxx" v-if="form.xxccs>1">
+              <el-radio-group v-model="xczqxx">
+                <el-radio
+                  v-for="dict in dict.type.zf_xczqxx"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="巡查周期" prop="xczq" v-if="form.xxccs>1 && form.xczqxx==3">
+              <el-input-number v-model="form.xczq" placeholder="请输入巡查周期" :min="1"/>
+              <el-tag type="info" style="margin-left: 10px">天/次</el-tag>
+            </el-form-item>
+          </el-collapse-item>
+        </el-collapse>
+      </el-form>
+      <div slot="footer" class="dialog-footer" v-if="readOnly==false">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {listTask, getTask, delTask, addTask, updateTask, distributeTask} from "@/api/cxxm/task";
+import {deptTreeSelect} from "@/api/system/user";
+
+export default {
+  name: "TaskDistribute",
+  dicts: ['zf_xfqk', 'zf_zpqk', 'zf_xcqk', 'zf_xczqxx'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 任务表格数据
+      taskList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 折叠面板
+      activeNames: ['1', '2', '3'],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        tbbh: null,
+        xfqk: null,
+        xfsj: null,
+        deptId: null,
+        drsjQuery: []
+      },
+      // 表单参数
+      form: {
+        xcryInfo: {}
+      },
+      // 表单校验
+      rules: {},
+      // 部门树选项
+      deptOptions: null,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 巡查周期选项
+      xczqxx: "2",
+      // 日期区间选择
+      pickerOptions: {
+        shortcuts: [{
+          text: '本月',
+          onClick(picker) {
+            picker.$emit('pick', [new Date(), new Date()]);
+          }
+        }, {
+          text: '今年至今',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date(new Date().getFullYear(), 0);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近六个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setMonth(start.getMonth() - 6);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getDeptTree();
+  },
+  computed: {
+    readOnly() {
+      if (this.title.includes("查看")) {
+        // 查看页面设为只读状态
+        return true;
+      }
+      return false;
+    },
+  },
+  watch: {
+    xczqxx(newValue, oldValue) {
+      if (newValue == "1") {
+        this.form.xczqxx = "1"
+        this.form.xczq = 7
+      }
+      if (newValue == "2") {
+        this.form.xczqxx = "2"
+        this.form.xczq = 30
+      }
+      if (newValue == "3") {
+        this.form.xczqxx = "3"
+        this.form.xczq = 30
+      }
+    }
+  },
+  methods: {
+    /** 查询任务列表 */
+    getList() {
+      this.loading = true;
+      listTask(this.queryParams).then(response => {
+        this.taskList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        tbbh: null,
+        xfqk: null,
+        xfsj: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+        deptId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加任务";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getTask(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改任务";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateTask(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTask(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除任务编号为"' + ids + '"的数据项？').then(function () {
+        return delTask(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 下发按钮操作 */
+    handleDistribute(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认下发任务编号为"' + ids + '"的数据项？').then(function () {
+        return distributeTask(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("下发成功");
+      }).catch(() => {
+      });
+    },
+    /** 自定义编号 */
+    indexMethod(index) {
+      let pageNum = this.queryParams.pageNum - 1;
+      if ((pageNum !== -1 && pageNum !== 0)) {
+        return (index + 1) + (pageNum * this.queryParams.pageSize);
+      } else {
+        return (index + 1)
+      }
+    },
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+          this.deptOptions = response.data[0].children;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.deptId = data.id;
+      this.handleQuery();
+    },
+    //判断是否可勾选
+    selectable(row, index) {
+      if (row.xfqk == 1) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+    /** 查看按钮操作 */
+    handleView(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getTask(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.xczqxx = this.form.xczqxx
+        this.title = "查看任务";
+      });
+    },
+  }
+};
+</script>
+<style>
+.el-collapse .el-collapse-item__header {
+  font-size: 16px;
+  font-weight: bold;
+  color: #1890ff;
+}
+</style>
diff --git a/ruoyi-ui/src/views/cxxm/task/import/index.vue b/ruoyi-ui/src/views/cxxm/task/import/index.vue
new file mode 100644
index 00000000..c5dd735c
--- /dev/null
+++ b/ruoyi-ui/src/views/cxxm/task/import/index.vue
@@ -0,0 +1,591 @@
+<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="tbbh">
+        <el-input style="width:150px"
+                  v-model="queryParams.tbbh"
+                  placeholder="请输入图斑编号"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="下发情况" prop="xfqk">
+        <el-select style="width:150px" v-model="queryParams.xfqk" placeholder="请选择下发情况" clearable>
+          <el-option
+            v-for="dict in dict.type.zf_xfqk"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="导入时间" prop="drsjeQuery">
+        <el-date-picker style="width:200px"
+                        v-model="queryParams.drsjQuery"
+                        type="monthrange"
+                        align="right"
+                        unlink-panels
+                        range-separator="至"
+                        start-placeholder="开始月份"
+                        end-placeholder="结束月份"
+                        value-format="yyyy-MM"
+                        :picker-options="pickerOptions">
+        </el-date-picker>
+      </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="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['cxxm:task:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-button
+        type="info"
+        plain
+        icon="el-icon-upload2"
+        size="mini"
+        @click="handleImport"
+        v-hasPermi="['system:user:import']"
+      >导入
+      </el-button>
+      <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"/>
+      <el-table-column label="序号" align="center" type="index" :index="indexMethod" fixed="left"/>
+      <el-table-column label="图斑编号" align="center" prop="tbbh" min-width="180" :show-overflow-tooltip="true"/>
+      <el-table-column label="图斑所在县" align="center" prop="tbszx"/>
+      <el-table-column label="下发情况" align="center" prop="xfqk">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.zf_xfqk" :value="scope.row.xfqk" v-if="scope.row.xfqk==1" style="color: red"/>
+          <dict-tag :options="dict.type.zf_xfqk" :value="scope.row.xfqk" v-if="scope.row.xfqk==2"
+                    style="color: gray"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="导入时间" align="center" prop="drsj" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.drsj, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <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-edit"
+            v-if="scope.row.xfqk==1"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['cxxm:task:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+            v-hasPermi="['cxxm:task:query']"
+          >查看
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            style="color: red"
+            icon="el-icon-delete"
+            v-if="scope.row.xfqk==1"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['cxxm:task:remove']"
+          >删除
+          </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="80%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="readOnly">
+        <el-collapse v-model="activeNames">
+          <el-collapse-item title="图斑信息" name="1">
+            <el-descriptions column="2" v-if="form.tbxx!=null" border>
+              <el-descriptions-item label="图斑编号">{{ form.tbxx.tbbh }}</el-descriptions-item>
+              <el-descriptions-item label="矿山名称">{{ form.tbxx.ksmc }}</el-descriptions-item>
+              <el-descriptions-item label="许可证编号">{{ form.tbxx.xkzbh }}</el-descriptions-item>
+              <el-descriptions-item label="矿权级别">{{ form.tbxx.kqjb }}</el-descriptions-item>
+              <el-descriptions-item label="省">{{ form.tbxx.sheng }}</el-descriptions-item>
+              <el-descriptions-item label="市">{{ form.tbxx.shi }}</el-descriptions-item>
+              <el-descriptions-item label="县">{{ form.tbxx.xian }}</el-descriptions-item>
+              <el-descriptions-item label="详细地址">{{ form.tbxx.xxdz }}</el-descriptions-item>
+              <el-descriptions-item label="县代码">{{ form.tbxx.xdm }}</el-descriptions-item>
+              <el-descriptions-item label="经济类型">{{ form.tbxx.jjlx }}</el-descriptions-item>
+              <el-descriptions-item label="矿种类型">{{ form.tbxx.kzlx }}</el-descriptions-item>
+              <el-descriptions-item label="开采其他矿种">{{ form.tbxx.kcqtkz }}</el-descriptions-item>
+              <el-descriptions-item label="开采方式">{{ form.tbxx.kcfs }}</el-descriptions-item>
+              <el-descriptions-item label="占地面积">{{ form.tbxx.zdmj }}</el-descriptions-item>
+              <el-descriptions-item label="违法面积">{{ form.tbxx.wfmj }}</el-descriptions-item>
+              <el-descriptions-item label="中心点经度">{{ form.tbxx.x }}</el-descriptions-item>
+              <el-descriptions-item label="中心点纬度">{{ form.tbxx.y }}</el-descriptions-item>
+              <el-descriptions-item label="对应的上期图斑编号">{{ form.tbxx.sqtbbh }}</el-descriptions-item>
+              <el-descriptions-item label="对应的部下发图斑编号">{{ form.tbxx.bxftbbh }}</el-descriptions-item>
+              <el-descriptions-item label="本期数据获取时间">{{ form.tbxx.bqsjsj }}</el-descriptions-item>
+              <el-descriptions-item label="上期数据获取时间">{{ form.tbxx.sqsjsj }}</el-descriptions-item>
+              <el-descriptions-item label="绿色矿山">{{ form.tbxx.lsks }}</el-descriptions-item>
+              <el-descriptions-item label="所在重点矿区名称">{{ form.tbxx.zdkqmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在自然保护区名称">{{ form.tbxx.zrbhqmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在重点矿区名称">{{ form.tbxx.zdkqmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在高原湖泊名称">{{ form.tbxx.gyhpmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在高原湖泊10km范围内">{{ form.tbxx.gyhp10 }}</el-descriptions-item>
+              <el-descriptions-item label="所在高原湖泊3km范围内">{{ form.tbxx.gyhp03 }}</el-descriptions-item>
+              <el-descriptions-item label="所在长江干支流10km范围内">{{ form.tbxx.cjgzl10 }}</el-descriptions-item>
+              <el-descriptions-item label="所在长江干支流范围名称">{{ form.tbxx.cjgzmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在长江干支流3km范围内">{{ form.tbxx.cjgz03 }}</el-descriptions-item>
+              <el-descriptions-item label="所在风景名胜区名称">{{ form.tbxx.fjmsmc }}</el-descriptions-item>
+              <el-descriptions-item label="所在国家公园名称">{{ form.tbxx.gjgymc }}</el-descriptions-item>
+              <el-descriptions-item label="所在重点矿区名称">{{ form.tbxx.zdkqmc }}</el-descriptions-item>
+              <el-descriptions-item label="备注">{{ form.tbxx.bz }}</el-descriptions-item>
+              <el-descriptions-item label="线索来源">{{ form.tbxx.xsly }}</el-descriptions-item>
+            </el-descriptions>
+          </el-collapse-item>
+          <el-collapse-item title="任务信息" name="2">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="图斑编号" prop="tbbh">
+                  <el-input v-model="form.tbbh" placeholder="请输入图斑编号"/>
+                </el-form-item>
+                <el-form-item label="图斑所在县" prop="tbszx">
+                  <el-input v-model="form.tbszx" placeholder="请输入图斑所在县"/>
+                </el-form-item>
+                <el-form-item label="下发情况" prop="xfqk">
+                  <el-radio-group v-model="form.xfqk">
+                    <el-radio
+                      v-for="dict in dict.type.zf_xfqk"
+                      :key="dict.value"
+                      :label="dict.value"
+                    >{{ dict.label }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item label="下发时间" prop="xfsj">
+                  <el-date-picker clearable
+                                  v-model="form.xfsj"
+                                  type="date"
+                                  value-format="yyyy-MM-dd"
+                                  placeholder="请选择下发时间">
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item label="指派情况" prop="zpqk">
+                  <el-radio-group v-model="form.zpqk">
+                    <el-radio
+                      v-for="dict in dict.type.zf_zpqk"
+                      :key="dict.value"
+                      :label="dict.value"
+                    >{{ dict.label }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item label="指派时间" prop="xfsj">
+                  <el-date-picker clearable
+                                  v-model="form.xfsj"
+                                  type="date"
+                                  value-format="yyyy-MM-dd"
+                                  placeholder="请选择指派时间">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="巡查人" prop="xcryInfo">
+                  <el-input v-model="form.xcryInfo.userName" placeholder="请输入巡查人" v-if="form.xcryInfo!=null"/>
+                  <el-input v-model="form.xcryId" placeholder="请输入巡查人id" v-if="form.xcryInfo==null"/>
+                </el-form-item>
+                <el-form-item label="巡查情况" prop="xcqk">
+                  <el-radio-group v-model="form.xcqk">
+                    <el-radio
+                      v-for="dict in dict.type.zf_xcqk"
+                      :key="dict.value"
+                      :label="dict.value"
+                    >{{ dict.label }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                  <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+                </el-form-item>
+                <el-form-item label="部门id" prop="deptId" v-show="false">
+                  <el-input v-model="form.deptId" placeholder="请输入部门id"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-collapse-item>
+          <el-collapse-item title="任务周期" name="3">
+            <el-form-item label="已巡查次数" prop="yxccs">
+              <el-input-number v-model="form.yxccs" placeholder="请输入已巡查次数" :min="0" :readonly="true"/>
+              <el-tag type="info" style="margin-left: 10px">次</el-tag>
+            </el-form-item>
+            <el-form-item label="需巡查次数" prop="xxccs">
+              <el-input-number v-model="form.xxccs" placeholder="请输入需巡查次数" :min="1"/>
+              <el-tag type="info" style="margin-left: 10px">次</el-tag>
+            </el-form-item>
+            <el-form-item label="巡查周期选项" prop="xczqxx" v-if="form.xxccs>1">
+              <el-radio-group v-model="xczqxx">
+                <el-radio
+                  v-for="dict in dict.type.zf_xczqxx"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{ dict.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="巡查周期" prop="xczq" v-if="form.xxccs>1 && form.xczqxx==3">
+              <el-input-number v-model="form.xczq" placeholder="请输入巡查周期" :min="1"/>
+              <el-tag type="info" style="margin-left: 10px">天/次</el-tag>
+            </el-form-item>
+          </el-collapse-item>
+        </el-collapse>
+      </el-form>
+      <div slot="footer" class="dialog-footer" v-if="readOnly==false">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".json"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <!--          <div class="el-upload__tip" slot="tip">-->
+          <!--            <el-checkbox v-model="upload.updateSupport"/>-->
+          <!--            是否更新已经存在的任务数据-->
+          <!--          </div>-->
+          <span>仅允许导入json格式文件。</span>
+          <el-link type="primary" style="font-size:12px;vertical-align: baseline;"
+                   :href='importTemplate'>下载模板
+          </el-link>
+        </div>
+      </el-upload>
+      <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>
+  </div>
+</template>
+
+<script>
+import {listTask, getTask, delTask, addTask, updateTask} from "@/api/cxxm/task";
+import {getToken} from "@/utils/auth";
+import request from "@/utils/request";
+
+export default {
+  name: "TaskImport",
+  dicts: ['zf_xfqk', 'zf_zpqk', 'zf_xcqk', 'zf_xczqxx'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 任务表格数据
+      taskList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        tbbh: null,
+        xfqk: null,
+        xfsj: null,
+        deptId: null,
+        drsjQuery: []
+      },
+      // 表单参数
+      form: {
+        xcryInfo: {},
+      },
+      // 表单校验
+      rules: {},
+      // 折叠面板
+      activeNames: ['1', '2', '3'],
+      // 日期区间选择
+      pickerOptions: {
+        shortcuts: [{
+          text: '本月',
+          onClick(picker) {
+            picker.$emit('pick', [new Date(), new Date()]);
+          }
+        }, {
+          text: '今年至今',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date(new Date().getFullYear(), 0);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近六个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setMonth(start.getMonth() - 6);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
+      // 用户导入参数
+      importTemplate: process.env.VUE_APP_BASE_API + "/profile/common/task_import_template.doc",
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/cxxm/task/importData"
+      },
+      // 巡查周期选项
+      xczqxx: "2"
+    };
+  },
+  created() {
+    this.getList();
+  },
+  computed: {
+    readOnly() {
+      if (this.title.includes("查看")) {
+        // 查看页面设为只读状态
+        return true;
+      }
+      return false;
+    },
+  },
+  watch: {
+    xczqxx(newValue, oldValue) {
+      if (newValue == "1") {
+        this.form.xczqxx = "1"
+        this.form.xczq = 7
+      }
+      if (newValue == "2") {
+        this.form.xczqxx = "2"
+        this.form.xczq = 30
+      }
+      if (newValue == "3") {
+        this.form.xczqxx = "3"
+        this.form.xczq = 30
+      }
+    }
+  },
+  methods: {
+    /** 查询任务列表 */
+    getList() {
+      this.loading = true;
+      listTask(this.queryParams).then(response => {
+        this.taskList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        tbbh: null,
+        tbszx: null,
+        xfqk: null,
+        xfsj: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+        deptId: null,
+        xxccs: 1,
+        yxccs: 0,
+        xczq: 0,
+        xczqxx: '2',
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加任务";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getTask(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改任务";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateTask(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTask(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除任务编号为"' + ids + '"的数据项？').then(function () {
+        return delTask(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('cxxm/task/export', {
+        ...this.queryParams
+      }, `task_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "任务导入";
+      this.upload.open = true;
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      var msg = '';
+      var total = "<div>" + "数据总数：" + response.data.total + "</div>"
+      var successCount = "<div>" + "导入成功：" + response.data.successCount + "</div>"
+      var failCount = "<div>" + "导入失败：" + response.data.failCount + "</div>"
+      msg = total + successCount + failCount;
+      this.$alert(msg, "导入结果", {dangerouslyUseHTMLString: true});
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    /** 自定义编号 */
+    indexMethod(index) {
+      let pageNum = this.queryParams.pageNum - 1;
+      if ((pageNum !== -1 && pageNum !== 0)) {
+        return (index + 1) + (pageNum * this.queryParams.pageSize);
+      } else {
+        return (index + 1)
+      }
+    },
+    /** 查看按钮操作 */
+    handleView(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getTask(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.xczqxx = this.form.xczqxx
+        this.title = "查看任务";
+      });
+    },
+    //判断是否可勾选
+    selectable(row, index) {
+      if (row.xfqk == 1) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+  }
+};
+</script>
+<style>
+.el-collapse .el-collapse-item__header {
+  font-size: 16px;
+  font-weight: bold;
+  color: #1890ff;
+}
+</style>
diff --git a/ruoyi-ui/src/views/cxxm/task/statistics/index.vue b/ruoyi-ui/src/views/cxxm/task/statistics/index.vue
new file mode 100644
index 00000000..2ed1153c
--- /dev/null
+++ b/ruoyi-ui/src/views/cxxm/task/statistics/index.vue
@@ -0,0 +1,102 @@
+<template>
+  <div class="app-container">
+
+    <el-row :gutter="20">
+      <el-col :span="8" :xs="24">
+        <el-card>
+          <el-descriptions class="margin-top" title="下发情况" :column="3" direction="vertical">
+            <el-descriptions-item label="图斑数量">{{ statisticsData.total }}条</el-descriptions-item>
+            <el-descriptions-item label="已下发">{{ statisticsData.yxf }}条</el-descriptions-item>
+            <el-descriptions-item label="未下发" style="color: red">{{ statisticsData.wxf }}条</el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+      </el-col>
+      <el-col :span="8" :xs="24">
+        <el-card>
+          <el-descriptions class="margin-top" title="巡查事项" :column="3" direction="vertical">
+            <el-descriptions-item label="图斑数量">{{ statisticsData.total }}条</el-descriptions-item>
+            <el-descriptions-item label="已巡查">{{ statisticsData.yxc }}条</el-descriptions-item>
+            <el-descriptions-item label="未巡查">{{ statisticsData.wxc }}条</el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+      </el-col>
+      <el-col :span="8" :xs="24">
+        <el-card>
+          <el-descriptions class="margin-top" title="整改事项" :column="3" direction="vertical">
+            <el-descriptions-item label="图斑数量">{{ statisticsData.total }}条</el-descriptions-item>
+            <el-descriptions-item label="已整改">{{ statisticsData.yzg }}条</el-descriptions-item>
+            <el-descriptions-item label="未整改">{{ statisticsData.wzg }}条</el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="24" :xs="24">
+        <el-card>
+          <el-descriptions class="margin-top" title="巡查统计" :column="3" direction="vertical">
+          </el-descriptions>
+          <ve-histogram :data="histogramData" :settings="chartSettings"></ve-histogram>
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-row :gutter="20">
+      <el-col :span="24" :xs="24">
+        <el-card>
+          <el-descriptions class="margin-top" title="日常巡查" :column="3" direction="vertical">
+          </el-descriptions>
+          <ve-line :data="lineData" :settings="chartSettings"></ve-line>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import {getStatistics} from "@/api/cxxm/task";
+
+export default {
+  name: "Statistics",
+  data() {
+    return {
+      statisticsData: null,
+      chartSettings: {
+        yAxisType: ['KMB'],
+        yAxisName: ['数值'],
+        labelMap: {
+          'deptName': '部门名称',
+          'yxf': '已下发',
+          'wxf': '未下发',
+          'yxc': '已巡查',
+          'wxc': '未巡查',
+          'yzg': '已整改',
+          'wzg': '未整改',
+        },
+      },
+      histogramData: {
+        columns: ['deptName', 'yxf', 'wxf', 'yxc', 'wxc', 'yzg', 'wzg'],
+        rows: [
+          // {'deptName': '楚雄市', 'yxf': 13, 'wfx': 10, 'yxc': 32, 'wxc': 13, 'yzg': 10, 'wzg': 32},
+        ]
+      },
+      lineData: {
+        columns: ['日期', "楚雄市", "禄丰市", "大姚县", "姚安县", "武定县", "双柏县", "牟定县", "南华县", "永仁县", "元谋县"],
+        rows: [
+          // {'日期': '2024-3-1', '楚雄市': 2, '禄丰市': 10, '大姚县': 3, '姚安县': 13, '已巡查': 10, '武定县': 32},
+        ]
+      },
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    getData() {
+      getStatistics().then(response => {
+        this.statisticsData = response.data
+        this.histogramData.rows = response.data.histogramData
+        this.lineData.rows = response.data.lineData
+      })
+    },
+  }
+};
+</script>
diff --git a/sql/task_v2.sql b/sql/task_v2.sql
index fec9fa8b..71b2d7fb 100644
--- a/sql/task_v2.sql
+++ b/sql/task_v2.sql
@@ -56,6 +56,7 @@ create table task
 (
     id          int(11) not null auto_increment comment 'id',
     tbbh        varchar(255) default null comment '图斑编号',
+    rwlx        varchar(255) default '1' comment '任务类型',
     tbszx       varchar(255) default null comment '图斑所在县',
     drry_id     int(11)      default null comment '导入人员id',
     drsj        datetime     default null comment '导入时间',
@@ -98,9 +99,7 @@ create table task_check
     update_time datetime     default null comment '更新时间',
     remark      varchar(500) default null comment '备注',
     dept_id     int(11)      default null comment '部门id',
-    primary key (id),
-    -- 添加外键约束
-    foreign key (task_id) references task (id) on delete cascade on update cascade
+    primary key (id)
 ) engine = innodb
   auto_increment = 1 comment = '任务巡查记录表';
 
@@ -122,9 +121,7 @@ create table task_check_image
     update_time datetime     default null comment '更新时间',
     remark      varchar(500) default null comment '备注',
     dept_id     int(11)      default null comment '部门id',
-    primary key (id),
-    -- 添加外键约束
-    foreign key (tc_id) references task_check (id) on delete cascade on update cascade
+    primary key (id)
 ) engine = innodb
   auto_increment = 1 comment = '任务巡查图片表';
 
@@ -143,9 +140,7 @@ create table task_check_video
     update_time datetime     default null comment '更新时间',
     remark      varchar(500) default null comment '备注',
     dept_id     int(11)      default null comment '部门id',
-    primary key (id),
-    -- 添加外键约束
-    foreign key (tc_id) references task_check (id) on delete cascade on update cascade
+    primary key (id)
 ) engine = innodb
   auto_increment = 1 comment = '任务巡查视频表';
 
@@ -165,8 +160,6 @@ create table task_check_audit
     update_time datetime     default null comment '更新时间',
     remark      varchar(500) default null comment '备注',
     dept_id     int(11)      default null comment '部门id',
-    primary key (id),
-    -- 添加外键约束
-    foreign key (tc_id) references task_check (id) on delete cascade on update cascade
+    primary key (id)
 ) engine = innodb
   auto_increment = 1 comment = '任务巡查审核表';
\ No newline at end of file