diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/controller/app/AppTaskController.java b/cxxm/src/main/java/com/ruoyi/cxxm/controller/app/AppTaskController.java
index 701bbdf7..087a5353 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/controller/app/AppTaskController.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/controller/app/AppTaskController.java
@@ -43,13 +43,13 @@ public class AppTaskController extends BaseController {
     private DeptMapper deptMapper;
 
     /**
-     * 查询任务巡查情况列表
+     * 查询本市所有任务列表
      *
      * @param task       包含任务基本信息的查询参数
      * @param pageDomain 分页参数
      * @return TableDataInfo 包含分页查询结果的数据信息
      */
-    @ApiOperation("获取任务列表")
+    @ApiOperation("获取本市任务列表")
     @PreAuthorize("@ss.hasPermi('cxxm:task:list')")
     @GetMapping("/distributed/list")
     public TableDataInfo distributedList(TaskQuery task, PageDomain pageDomain) {
@@ -101,4 +101,130 @@ public class AppTaskController extends BaseController {
         // 返回处理后的分页数据
         return getDataTableByPageNewList(taskPage, appTaskList);
     }
+
+    /**
+     * 查询乡镇任务列表
+     *
+     * @param task       包含任务基本信息的查询参数
+     * @param pageDomain 分页参数
+     * @return TableDataInfo 包含分页查询结果的数据信息
+     */
+    @ApiOperation("获取乡镇任务列表")
+    @PreAuthorize("@ss.hasPermi('cxxm:task:list')")
+    @GetMapping("/distributed2/list")
+    public TableDataInfo distributed2List(TaskQuery task, PageDomain pageDomain) {
+        // 初始化分页信息
+        Page<Task> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
+        // 构建查询条件
+        LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<>();
+        // 根据任务编号进行模糊查询
+        queryWrapper.like(Objects.nonNull(task.getTbbh()), Task::getTbbh, task.getTbbh());
+        // 查询已巡检的任务
+        queryWrapper.eq(Task::getXfqk, XFQK.YXF.getValue());
+        // 根据任务类型进行查询
+        queryWrapper.eq(Objects.nonNull(task.getRwlx()), Task::getRwlx, task.getRwlx());
+        // 乡镇
+        String groupName = getLoginUser().getUser().getGroupName();
+        queryWrapper.eq(Task::getGroupName, groupName);
+        // 处理是否完成的查询条件
+        if (task.getSfgd() == null) {
+            queryWrapper.eq(Task::getSfgd, SFGD.FALSE.getValue());
+        } else {
+            queryWrapper.eq(Task::getSfgd, task.getSfgd());
+        }
+        // 查询条件中加入部门ID，包括所有父级部门
+        queryWrapper.in(Objects.nonNull(task.getDeptId()), Task::getDeptId, deptMapper.getAllAncestorsByDeptId(task.getDeptId()));
+        // 根据日期范围进行查询
+        List<String> drsjQuery = task.getDrsjQuery();
+        if (drsjQuery != null && drsjQuery.size() == 2) {
+            queryWrapper.apply(StringUtils.format("DATE_FORMAT(drsj, '%Y-%m') between '{}' and '{}'", drsjQuery.get(0), drsjQuery.get(1)));
+        }
+        // 排序设置
+        queryWrapper.orderByAsc(Task::getXfqk);
+        queryWrapper.orderByDesc(Task::getXfsj);
+        queryWrapper.orderByDesc(Task::getDrsj);
+        // 执行查询
+        Page<Task> taskPage = taskService.page(page, queryWrapper);
+        // 处理查询结果，转换为前端需要的格式
+        ArrayList<AppTaskListItem> appTaskList = new ArrayList<>();
+        for (Task item : page.getRecords()) {
+            AppTaskListItem appTaskListItem = new AppTaskListItem();
+            BeanUtils.copyProperties(item, appTaskListItem);
+            // 获取任务详细信息，并处理
+            Tbxx tbxx = tbxxService.selectTbxxByTbbh(item.getTbbh());
+            Map tbxxMap = JSONObject.parseObject(tbxx.getInfo(), Map.class);
+            appTaskListItem.setXxdz(tbxxMap.get("KMDZ") != null ? tbxxMap.remove("KMDZ").toString() : "");
+            appTaskListItem.setX(tbxxMap.get("KMX") != null ? tbxxMap.remove("KMX").toString() : "");
+            appTaskListItem.setY(tbxxMap.get("KMY") != null ? tbxxMap.remove("KMY").toString() : "");
+            // 更新处理后的详细信息
+            tbxx.setInfo(JSON.toJSONString(tbxxMap));
+            appTaskListItem.setTbxx(tbxx);
+            appTaskList.add(appTaskListItem);
+        }
+        // 返回处理后的分页数据
+        return getDataTableByPageNewList(taskPage, appTaskList);
+    }
+
+    /**
+     * 查询本人任务列表
+     *
+     * @param task       包含任务基本信息的查询参数
+     * @param pageDomain 分页参数
+     * @return TableDataInfo 包含分页查询结果的数据信息
+     */
+    @ApiOperation("获取本人任务列表")
+    @PreAuthorize("@ss.hasPermi('cxxm:task:list')")
+    @GetMapping("/assigned/list")
+    public TableDataInfo assignedList(TaskQuery task, PageDomain pageDomain) {
+        // 初始化分页信息
+        Page<Task> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
+        // 构建查询条件
+        LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<>();
+        // 根据任务编号进行模糊查询
+        queryWrapper.like(Objects.nonNull(task.getTbbh()), Task::getTbbh, task.getTbbh());
+        // 查询已巡检的任务
+        queryWrapper.eq(Task::getXfqk, XFQK.YXF.getValue());
+        // 根据任务类型进行查询
+        queryWrapper.eq(Objects.nonNull(task.getRwlx()), Task::getRwlx, task.getRwlx());
+        // 指派用户
+        Long userId = getLoginUser().getUser().getUserId();
+        queryWrapper.eq(Task::getToId, userId);
+        // 处理是否完成的查询条件
+        if (task.getSfgd() == null) {
+            queryWrapper.eq(Task::getSfgd, SFGD.FALSE.getValue());
+        } else {
+            queryWrapper.eq(Task::getSfgd, task.getSfgd());
+        }
+        // 查询条件中加入部门ID，包括所有父级部门
+        queryWrapper.in(Objects.nonNull(task.getDeptId()), Task::getDeptId, deptMapper.getAllAncestorsByDeptId(task.getDeptId()));
+        // 根据日期范围进行查询
+        List<String> drsjQuery = task.getDrsjQuery();
+        if (drsjQuery != null && drsjQuery.size() == 2) {
+            queryWrapper.apply(StringUtils.format("DATE_FORMAT(drsj, '%Y-%m') between '{}' and '{}'", drsjQuery.get(0), drsjQuery.get(1)));
+        }
+        // 排序设置
+        queryWrapper.orderByAsc(Task::getXfqk);
+        queryWrapper.orderByDesc(Task::getXfsj);
+        queryWrapper.orderByDesc(Task::getDrsj);
+        // 执行查询
+        Page<Task> taskPage = taskService.page(page, queryWrapper);
+        // 处理查询结果，转换为前端需要的格式
+        ArrayList<AppTaskListItem> appTaskList = new ArrayList<>();
+        for (Task item : page.getRecords()) {
+            AppTaskListItem appTaskListItem = new AppTaskListItem();
+            BeanUtils.copyProperties(item, appTaskListItem);
+            // 获取任务详细信息，并处理
+            Tbxx tbxx = tbxxService.selectTbxxByTbbh(item.getTbbh());
+            Map tbxxMap = JSONObject.parseObject(tbxx.getInfo(), Map.class);
+            appTaskListItem.setXxdz(tbxxMap.get("KMDZ") != null ? tbxxMap.remove("KMDZ").toString() : "");
+            appTaskListItem.setX(tbxxMap.get("KMX") != null ? tbxxMap.remove("KMX").toString() : "");
+            appTaskListItem.setY(tbxxMap.get("KMY") != null ? tbxxMap.remove("KMY").toString() : "");
+            // 更新处理后的详细信息
+            tbxx.setInfo(JSON.toJSONString(tbxxMap));
+            appTaskListItem.setTbxx(tbxx);
+            appTaskList.add(appTaskListItem);
+        }
+        // 返回处理后的分页数据
+        return getDataTableByPageNewList(taskPage, appTaskList);
+    }
 }
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/CxxmUserController.java b/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/CxxmUserController.java
index 1ab01dab..619a939a 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/CxxmUserController.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/CxxmUserController.java
@@ -2,13 +2,14 @@ package com.ruoyi.cxxm.controller.web;
 
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 
-import com.ruoyi.cxxm.domain.dto.CxxmUser;
+import com.ruoyi.cxxm.domain.dto.CxxmUserZJ;
 import com.ruoyi.cxxm.domain.dto.CxxmUserXJ;
+import com.ruoyi.cxxm.domain.vo.UserGroup;
 import com.ruoyi.cxxm.service.ICxxmUserService;
-import com.ruoyi.system.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -43,8 +44,8 @@ public class CxxmUserController {
     @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
     public AjaxResult importData(@ApiParam(value = "用户数据文件") @RequestPart MultipartFile file,@ApiParam(value = "是否更新已经存在的用户数据") @RequestParam(required = false) boolean updateSupport) throws Exception {
-        ExcelUtil<CxxmUser> util = new ExcelUtil<CxxmUser>(CxxmUser.class);
-        List<CxxmUser> userList = util.importExcel(file.getInputStream());
+        ExcelUtil<CxxmUserZJ> util = new ExcelUtil<CxxmUserZJ>(CxxmUserZJ.class);
+        List<CxxmUserZJ> userList = util.importExcel(file.getInputStream());
         String operName = getUsername();
         String message = userService.importCxxmUser(userList, updateSupport, operName);
         return success(message);
@@ -57,7 +58,7 @@ public class CxxmUserController {
     @ApiOperation("获取导入用户模板-州级")
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response) {
-        ExcelUtil<CxxmUser> util = new ExcelUtil<CxxmUser>(CxxmUser.class);
+        ExcelUtil<CxxmUserZJ> util = new ExcelUtil<CxxmUserZJ>(CxxmUserZJ.class);
         util.importTemplateExcel(response, "用户数据");
     }
 
@@ -71,4 +72,18 @@ public class CxxmUserController {
         ExcelUtil<CxxmUserXJ> util = new ExcelUtil<CxxmUserXJ>(CxxmUserXJ.class);
         util.importTemplateExcel(response, "用户数据");
     }
+
+    @ApiOperation("获取用户组名称")
+    @GetMapping("/groupNames/{deptId}")
+    public AjaxResult getGroupNames(@PathVariable Long deptId) {
+        List<UserGroup> groupNameList = userService.getGroupNameByDeptId(deptId);
+        return success(groupNameList);
+    }
+
+    @ApiOperation("获取用户组下所有用户")
+    @GetMapping("/list")
+    public AjaxResult getUserList(@RequestParam String groupName,@RequestParam Long deptId) {
+        List<SysUser> userList = userService.getUserListByGroupName(groupName,deptId);
+        return success(userList);
+    }
 }
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/TaskController.java b/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/TaskController.java
index 932dac08..2a8bf0c4 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/TaskController.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/controller/web/TaskController.java
@@ -28,16 +28,10 @@ import com.ruoyi.cxxm.service.IStatisticsService;
 import com.ruoyi.cxxm.service.ITbxxService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 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 org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -55,7 +49,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author ruoyi
  * @date 2024-03-28
  */
-@Api(tags ="任务相关接口")
+@Api(tags = "任务相关接口")
 @RestController
 @RequestMapping("/cxxm/task")
 public class TaskController extends BaseController {
@@ -213,7 +207,6 @@ public class TaskController extends BaseController {
             while ((line = reader.readLine()) != null) {
                 content.append(line);
             }
-
             // 解析文件内容
             Map map = JSONObject.parseObject(content.toString(), Map.class);
             Object features = map.get("features");
@@ -232,6 +225,14 @@ public class TaskController extends BaseController {
                 // 提取并设置图斑信息
                 Object properties = item.get("properties");
                 Map tbxxMap = JSONObject.parseObject(properties.toString(), Map.class);
+                // 校验必填字段是否存在
+                String[] requiredFields = new String[]{"KCTBBH","KMDZ","KMMC","KMX","KMY","SHENG","SHI","XIAN","XDM","KMWFMJ"};
+                for (String field : requiredFields) {
+                    if(tbxxMap.get(field) == null){
+                        throw new Exception(StringUtils.format("缺少必须字段:{}",field));
+                    }
+                }
+
                 tbxx.setTbbh(tbxxMap.get("KCTBBH") != null ? tbxxMap.get("KCTBBH").toString() : "");
                 tbxx.setInfo(properties.toString());
 
@@ -262,14 +263,14 @@ public class TaskController extends BaseController {
     }
 
     /**
-     * 下发任务
+     * 州级下发任务
      *
      * @param ids 任务ID数组，表示需要下发的任务
      * @return 返回操作结果，成功返回AjaxResult的SUCCESS，失败返回相应的错误信息
      */
-    @ApiOperation("下发任务")
+    @ApiOperation("州级下发任务")
     @PreAuthorize("@ss.hasPermi('cxxm:task:distribute')")
-    @Log(title = "下发任务", businessType = BusinessType.UPDATE)
+    @Log(title = "州级下发任务", businessType = BusinessType.UPDATE)
     @PutMapping("/distribute/{ids}")
     public AjaxResult distribute(@PathVariable Long[] ids) {
         List<Task> taskList = new ArrayList<>();
@@ -432,6 +433,46 @@ public class TaskController extends BaseController {
         return toAjax(taskService.updateBatchById(taskList));
     }
 
+    /**
+     * 市级下发任务
+     *
+     * @param ids 任务ID数组，表示需要下发的任务
+     * @return 返回操作结果，成功返回AjaxResult的SUCCESS，失败返回相应的错误信息
+     */
+    @ApiOperation("市级下发任务")
+    @PreAuthorize("@ss.hasPermi('cxxm:task:distribute')")
+    @Log(title = "市级下发任务", businessType = BusinessType.UPDATE)
+    @PutMapping("/distribute2/{ids}")
+    public AjaxResult distribute2(@PathVariable Long[] ids, @RequestParam String groupName) {
+        List<Task> taskList = new ArrayList<>();
+        // 遍历任务ID数组，为每个任务设置下发状态和时间
+        for (Long id : ids) {
+            Task task = new Task();
+            task.setId(id);
+            task.setXfqk(XFQK.YXF2.getValue());
+            task.setXfsj2(DateUtils.getNowDate());
+            task.setGroupName(groupName);
+            taskList.add(task);
+        }
+        // 更新任务状态，并返回操作结果
+        return toAjax(taskService.updateBatchById(taskList));
+    }
+
+
+    @ApiOperation("指派任务")
+    @PreAuthorize("@ss.hasPermi('cxxm:task:distribute')")
+    @Log(title = "指派任务", businessType = BusinessType.UPDATE)
+    @PutMapping("/assign/{id}")
+    public AjaxResult assign(@PathVariable Long id, @RequestParam Long userId) {
+        Task task = new Task();
+        task.setId(id);
+        task.setXfqk(XFQK.YZP.getValue());
+        task.setZpsj(DateUtils.getNowDate());
+        task.setToId(userId);
+        // 更新任务状态，并返回操作结果
+        return toAjax(taskService.updateById(task));
+    }
+
     /**
      * 获取统计数据
      *
@@ -453,7 +494,7 @@ public class TaskController extends BaseController {
         statisticsVo.setLineData(lineData);
 
         // 返回成功响应，携带统计数据Vo
-        return AjaxResult.success(statisticsVo);
+        return success(statisticsVo);
     }
 
 }
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUserXJ.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUserXJ.java
index 47e8bcac..48ee913c 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUserXJ.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUserXJ.java
@@ -38,13 +38,13 @@ public class CxxmUserXJ extends BaseEntity {
     /**
      * 部门名称
      */
-    @Excel(name = "角色类型", type = Excel.Type.IMPORT, combo = {"县级管理员", "县级调查员"})
+    @Excel(name = "角色类型", type = Excel.Type.IMPORT, combo = {"县级管理员", "乡镇管理员", "乡镇调查员"})
     private String roleName;
 
     /**
      * 用户账号
      */
-    @Excel(name = "用户账号")
+    @Excel(name = "登录账号")
     private String userName;
 
 
@@ -55,7 +55,7 @@ public class CxxmUserXJ extends BaseEntity {
     /**
      * 用户昵称
      */
-    @Excel(name = "昵称(选填)")
+    @Excel(name = "用户姓名")
     private String nickName;
 
     /**
@@ -73,7 +73,7 @@ public class CxxmUserXJ extends BaseEntity {
     /**
      * 用户性别
      */
-    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知",type = Excel.Type.EXPORT)
+    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知", type = Excel.Type.EXPORT)
     private String sex;
 
     /**
@@ -89,7 +89,7 @@ public class CxxmUserXJ extends BaseEntity {
     /**
      * 帐号状态（0正常 1停用）
      */
-    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用",type = Excel.Type.EXPORT)
+    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用", type = Excel.Type.EXPORT)
     private String status;
 
     /**
@@ -188,8 +188,8 @@ public class CxxmUserXJ extends BaseEntity {
         this.roleName = roleName;
     }
 
-    @Xss(message = "用户昵称不能包含脚本字符")
-    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
+    @Xss(message = "用户姓名不能包含脚本字符")
+    @Size(min = 0, max = 30, message = "用户姓名长度不能超过30个字符")
     public String getNickName() {
         return nickName;
     }
@@ -198,9 +198,9 @@ public class CxxmUserXJ extends BaseEntity {
         this.nickName = nickName;
     }
 
-    @Xss(message = "用户账号不能包含脚本字符")
-    @NotBlank(message = "用户账号不能为空")
-    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
+    @Xss(message = "登录账号不能包含脚本字符")
+    @NotBlank(message = "登录账号不能为空")
+    @Size(min = 0, max = 30, message = "登录账号长度不能超过30个字符")
     public String getUserName() {
         return userName;
     }
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUser.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUserZJ.java
similarity index 91%
rename from cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUser.java
rename to cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUserZJ.java
index a289c04f..46398c05 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUser.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/dto/CxxmUserZJ.java
@@ -16,7 +16,7 @@ import java.util.Date;
 import java.util.List;
 
 
-public class CxxmUser extends BaseEntity {
+public class CxxmUserZJ extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -32,19 +32,19 @@ public class CxxmUser extends BaseEntity {
     /**
      * 部门名称
      */
-    @Excel(name = "部门名称", type = Excel.Type.IMPORT, combo = {"楚雄市", "禄丰市", "大姚县", "姚安县", "武定县", "双柏县", "牟定县", "南华县", "永仁县", "元谋县"})
+    @Excel(name = "归属市县", type = Excel.Type.IMPORT, combo = {"楚雄市", "禄丰市", "大姚县", "姚安县", "武定县", "双柏县", "牟定县", "南华县", "永仁县", "元谋县"})
     private String deptName;
 
     /**
      * 部门名称
      */
-    @Excel(name = "角色类型", type = Excel.Type.IMPORT, combo = {"县级管理员", "县级调查员"})
+    @Excel(name = "角色类型", type = Excel.Type.IMPORT, combo = {"州级管理员", "县级管理员", "乡镇管理员", "乡镇调查员"})
     private String roleName;
 
     /**
      * 用户账号
      */
-    @Excel(name = "用户账号")
+    @Excel(name = "登录账号")
     private String userName;
 
 
@@ -55,7 +55,7 @@ public class CxxmUser extends BaseEntity {
     /**
      * 用户昵称
      */
-    @Excel(name = "昵称(选填)")
+    @Excel(name = "用户姓名")
     private String nickName;
 
     /**
@@ -73,7 +73,7 @@ public class CxxmUser extends BaseEntity {
     /**
      * 用户性别
      */
-    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知",type = Excel.Type.EXPORT)
+    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知", type = Excel.Type.EXPORT)
     private String sex;
 
     /**
@@ -89,7 +89,7 @@ public class CxxmUser extends BaseEntity {
     /**
      * 帐号状态（0正常 1停用）
      */
-    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用",type = Excel.Type.EXPORT)
+    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用", type = Excel.Type.EXPORT)
     private String status;
 
     /**
@@ -138,11 +138,11 @@ public class CxxmUser extends BaseEntity {
      */
     private Long roleId;
 
-    public CxxmUser() {
+    public CxxmUserZJ() {
 
     }
 
-    public CxxmUser(Long userId) {
+    public CxxmUserZJ(Long userId) {
         this.userId = userId;
     }
 
@@ -187,8 +187,8 @@ public class CxxmUser extends BaseEntity {
         this.roleName = roleName;
     }
 
-    @Xss(message = "用户昵称不能包含脚本字符")
-    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
+    @Xss(message = "用户姓名不能包含脚本字符")
+    @Size(min = 0, max = 30, message = "用户姓名长度不能超过30个字符")
     public String getNickName() {
         return nickName;
     }
@@ -197,9 +197,9 @@ public class CxxmUser extends BaseEntity {
         this.nickName = nickName;
     }
 
-    @Xss(message = "用户账号不能包含脚本字符")
-    @NotBlank(message = "用户账号不能为空")
-    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
+    @Xss(message = "登录账号不能包含脚本字符")
+    @NotBlank(message = "登录账号不能为空")
+    @Size(min = 0, max = 30, message = "登录账号长度不能超过30个字符")
     public String getUserName() {
         return userName;
     }
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/Task.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/Task.java
index 4dddfe6e..894d96b6 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/Task.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/entity/Task.java
@@ -55,6 +55,13 @@ public class Task extends BaseEntity {
     @Excel(name = "图斑所在县")
     private String tbszx;
 
+    /**
+     * 图斑详细地址
+     */
+    @ApiModelProperty(value = "详细地址")
+    @Excel(name = "详细地址")
+    private String xxdz;
+
 
     /**
      * 导入人员id
@@ -89,6 +96,22 @@ public class Task extends BaseEntity {
     @Excel(name = "下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date xfsj;
 
+    /**
+     * 市级下发时间
+     */
+    @ApiModelProperty(value = "市级下发时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "市级下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date xfsj2;
+
+    /**
+     * 指派时间
+     */
+    @ApiModelProperty(value = "指派时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "指派时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date zpsj;
+
 
     /**
      * 巡查周期选项 1每周 2每月 3自定义
@@ -186,5 +209,19 @@ public class Task extends BaseEntity {
     @ApiModelProperty(value = "是否归档")
     @Excel(name = "是否归档")
     private String sfgd;
+
+    /**
+     * 指派巡查人员id
+     */
+    @ApiModelProperty(value = "指派巡查人员id")
+    @Excel(name = "指派巡查人员id")
+    private Long toId;
+
+    /**
+     * 用户组(乡镇)
+     */
+    @ApiModelProperty(value = "用户组(乡镇)")
+    @Excel(name = "用户组(乡镇)")
+    private String groupName;
 }
 
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/enums/XFQK.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/enums/XFQK.java
index f0043baf..07122477 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/domain/enums/XFQK.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/enums/XFQK.java
@@ -8,7 +8,11 @@ public enum XFQK {
     // 未下发
     WXF("0"),
     // 已下发
-    YXF("1");
+    YXF("1"),
+    // 市级已下发
+    YXF2("2"),
+    // 已指派
+    YZP("3");
 
     private final String value;
 
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/domain/vo/UserGroup.java b/cxxm/src/main/java/com/ruoyi/cxxm/domain/vo/UserGroup.java
new file mode 100644
index 00000000..6f847d02
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/domain/vo/UserGroup.java
@@ -0,0 +1,13 @@
+package com.ruoyi.cxxm.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class UserGroup {
+
+    private String groupName;
+
+    private Integer userCount;
+
+    private Integer taskCount;
+}
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/mapper/CxxmUserMapper.java b/cxxm/src/main/java/com/ruoyi/cxxm/mapper/CxxmUserMapper.java
new file mode 100644
index 00000000..95375cb0
--- /dev/null
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/mapper/CxxmUserMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.cxxm.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.cxxm.domain.vo.UserGroup;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+
+public interface CxxmUserMapper extends BaseMapper<SysUser> {
+    @Select("select distinct group_name as groupName,count(user_id) as userCount from sys_user where dept_id=#{deptId} and del_flag=0 group by group_name")
+    List<UserGroup> getGroupNameByDeptId(Long deptId);
+
+}
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/ICxxmUserService.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/ICxxmUserService.java
index d2d5a1b0..20d98bfa 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/service/ICxxmUserService.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/ICxxmUserService.java
@@ -1,7 +1,8 @@
 package com.ruoyi.cxxm.service;
 
-import com.ruoyi.cxxm.domain.dto.CxxmUser;
-import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.cxxm.domain.dto.CxxmUserZJ;
+import com.ruoyi.cxxm.domain.vo.UserGroup;
 
 import java.util.List;
 
@@ -14,5 +15,19 @@ public interface ICxxmUserService{
      * @param operName
      * @return
      */
-    String importCxxmUser(List<CxxmUser> userList, Boolean isUpdateSupport, String operName);
+    String importCxxmUser(List<CxxmUserZJ> userList, Boolean isUpdateSupport, String operName);
+
+    /**
+     * 根据部门id查询用户分组名称列表
+     * @param deptId
+     * @return
+     */
+    List<UserGroup> getGroupNameByDeptId(Long deptId);
+
+    /**
+     * 根据分组名称查询用户列表
+     * @param groupName
+     * @return
+     */
+    List<SysUser> getUserListByGroupName(String groupName,Long deptId);
 }
diff --git a/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/CxxmUserServiceImpl.java b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/CxxmUserServiceImpl.java
index 0e9f69ea..62fd9347 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/CxxmUserServiceImpl.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/CxxmUserServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.cxxm.service.impl;
 
+
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -8,8 +9,12 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.common.utils.bean.BeanValidators;
-import com.ruoyi.cxxm.domain.dto.CxxmUser;
+import com.ruoyi.cxxm.domain.dto.CxxmUserZJ;
+import com.ruoyi.cxxm.domain.vo.UserGroup;
+import com.ruoyi.cxxm.domain.entity.Task;
+import com.ruoyi.cxxm.mapper.CxxmUserMapper;
 import com.ruoyi.cxxm.service.ICxxmUserService;
+import com.ruoyi.cxxm.service.ITaskService;
 import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
@@ -46,6 +51,12 @@ public class CxxmUserServiceImpl implements ICxxmUserService {
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private CxxmUserMapper cxxmUserMapper;
+
+    @Autowired
+    private ITaskService taskService;
+
     /**
      * 导入用户数据
      *
@@ -56,7 +67,7 @@ public class CxxmUserServiceImpl implements ICxxmUserService {
      */
     @Override
     @Transactional
-    public String importCxxmUser(List<CxxmUser> userList, Boolean isUpdateSupport, String operName) {
+    public String importCxxmUser(List<CxxmUserZJ> userList, Boolean isUpdateSupport, String operName) {
         if (StringUtils.isNull(userList) || userList.size() == 0) {
             throw new ServiceException("导入用户数据不能为空！");
         }
@@ -65,14 +76,18 @@ public class CxxmUserServiceImpl implements ICxxmUserService {
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
         String password = configService.selectConfigByKey("sys.user.initPassword");
-        for (CxxmUser user : userList) {
+        for (CxxmUserZJ user : userList) {
             try {
+                // 设置默认值
                 if (user.getNickName() == null || Objects.equals(user.getNickName(), "")) {
                     user.setNickName(user.getUserName());
                 }
                 if (user.getDeptName() == null || Objects.equals(user.getDeptName(), "")) {
                     user.setDeptName(SecurityUtils.getLoginUser().getUser().getDept().getDeptName());
                 }
+                if (user.getGroupName() == null || Objects.equals(user.getGroupName(), "")) {
+                    user.setGroupName("未指定");
+                }
                 // 验证是否存在这个用户
                 SysUser u = userMapper.selectUserByUserName(user.getUserName());
                 if (StringUtils.isNull(u)) {
@@ -113,7 +128,41 @@ public class CxxmUserServiceImpl implements ICxxmUserService {
         return successMsg.toString();
     }
 
-    private SysUser createNewSysUserByCxxmUser(CxxmUser user) {
+    /**
+     * 根据部门id获取部门下所有用户组
+     * @param deptId
+     * @return
+     */
+    @Override
+    public List<UserGroup> getGroupNameByDeptId(Long deptId) {
+        List<UserGroup> userGroups = cxxmUserMapper.getGroupNameByDeptId(deptId);
+        for (UserGroup userGroup : userGroups) {
+            Long count = taskService.lambdaQuery()
+                    .eq(Task::getGroupName, userGroup.getGroupName())
+                    .count();
+            userGroup.setTaskCount(count.intValue());
+        }
+        return userGroups;
+    }
+
+    /**
+     * 根据用户组名获取用户组下的所有用户
+     * @param groupName
+     * @return
+     */
+    public List<SysUser> getUserListByGroupName(String groupName,Long deptId){
+        SysUser user = new SysUser();
+        user.setGroupName(groupName);
+        user.setDeptId(deptId);
+        List<SysUser> sysUsers = userMapper.selectUserList(user);
+        for (SysUser sysUser : sysUsers) {
+            Long count = taskService.lambdaQuery().eq(Task::getToId, sysUser.getUserId()).count();
+            sysUser.setTaskCount(count.intValue());
+        }
+        return sysUsers;
+    }
+
+    private SysUser createNewSysUserByCxxmUser(CxxmUserZJ user) {
         // 获取用户部门id
         String deptName = user.getDeptName();
         SysDept userDept = deptMapper.selectDeptByDeptName(deptName);
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
index aa12365a..128dc1a6 100644
--- a/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskServiceImpl.java
+++ b/cxxm/src/main/java/com/ruoyi/cxxm/service/impl/TaskServiceImpl.java
@@ -55,6 +55,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
         Map tbxxMap = JSONObject.parseObject(tbxxInfo, Map.class);
         String xian = tbxxMap.get("XIAN").toString();
         task.setTbszx(xian);
+        String xxdz = tbxxMap.get("KMDZ").toString();
+        task.setXxdz(xxdz);
         task.setDrryId(SecurityUtils.getUserId());
         task.setDrsj(DateUtils.getNowDate());
         // 获取图斑所在县的部门id
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 337a99f1..7c4b0823 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -32,11 +32,11 @@ public class SysUser extends BaseEntity
     private Long deptId;
 
     /** 用户账号 */
-    @Excel(name = "登录名称")
+    @Excel(name = "登录账号")
     private String userName;
 
     /** 用户昵称 */
-    @Excel(name = "用户名称")
+    @Excel(name = "用户姓名")
     private String nickName;
 
     /** 用户邮箱 */
@@ -94,6 +94,8 @@ public class SysUser extends BaseEntity
     /** 角色ID */
     private Long roleId;
 
+    private Integer taskCount;
+
     public SysUser()
     {
 
@@ -134,8 +136,8 @@ public class SysUser extends BaseEntity
         this.deptId = deptId;
     }
 
-    @Xss(message = "用户昵称不能包含脚本字符")
-    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
+    @Xss(message = "用户姓名不能包含脚本字符")
+    @Size(min = 0, max = 30, message = "用户姓名长度不能超过30个字符")
     public String getNickName()
     {
         return nickName;
@@ -146,9 +148,9 @@ public class SysUser extends BaseEntity
         this.nickName = nickName;
     }
 
-    @Xss(message = "用户账号不能包含脚本字符")
-    @NotBlank(message = "用户账号不能为空")
-    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
+    @Xss(message = "登录账号不能包含脚本字符")
+    @NotBlank(message = "登录账号不能为空")
+    @Size(min = 0, max = 30, message = "登录账号长度不能超过30个字符")
     public String getUserName()
     {
         return userName;
@@ -310,6 +312,14 @@ public class SysUser extends BaseEntity
         this.groupName = groupName;
     }
 
+    public Integer getTaskCount() {
+        return taskCount;
+    }
+
+    public void setTaskCount(Integer taskCount) {
+        this.taskCount = taskCount;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/AutoFillMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/AutoFillMetaObjectHandler.java
index 867ea961..1d6c7369 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/AutoFillMetaObjectHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/AutoFillMetaObjectHandler.java
@@ -30,9 +30,15 @@ public class AutoFillMetaObjectHandler implements MetaObjectHandler {
     public void updateFill(MetaObject metaObject) {
         log.info("start update fill ....");
         // 获取当前登录用户
-        String userName = SecurityUtils.getUsername();
-        fillValue("updateBy", userName, metaObject);
-        fillValue("updateTime", DateUtils.getNowDate(), metaObject);
+        String userName = null;
+        try{
+            userName = SecurityUtils.getUsername();
+        }catch (Exception e){
+
+        }finally{
+            fillValue("updateBy", userName, metaObject);
+            fillValue("updateTime", DateUtils.getNowDate(), metaObject);
+        }
     }
 
     private void fillValue(String fieldName, Object data, MetaObject metaObject) {
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index a2a18baa..327fb00c 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -60,7 +60,7 @@
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
-    "vuex": "3.6.0"
+    "vuex": "^3.6.2"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",
diff --git a/ruoyi-ui/src/api/cxxm/task.js b/ruoyi-ui/src/api/cxxm/task.js
index 55da48af..b07c42e8 100644
--- a/ruoyi-ui/src/api/cxxm/task.js
+++ b/ruoyi-ui/src/api/cxxm/task.js
@@ -76,6 +76,32 @@ export function restartTask(ids) {
   })
 }
 
+// 市级下发任务
+export function distribute2Task(ids, data) {
+  return request({
+    url: '/cxxm/task/distribute2/' + ids,
+    method: 'put',
+    params: data
+  })
+}
+
+// 指派任务
+export function assignTask(id, data) {
+  return request({
+    url: '/cxxm/task/assign/' + id,
+    method: 'put',
+    params: data
+  })
+}
+
+// 撤回指派任务
+export function disAssignTask(ids) {
+  return request({
+    url: '/cxxm/task/disAssign/' + ids,
+    method: 'put',
+  })
+}
+
 // 获取统计数据
 export function getStatistics(query) {
   return request({
diff --git a/ruoyi-ui/src/api/cxxm/user.js b/ruoyi-ui/src/api/cxxm/user.js
new file mode 100644
index 00000000..38b03cd6
--- /dev/null
+++ b/ruoyi-ui/src/api/cxxm/user.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+// 获取用户列表
+export function getUsers(query) {
+  return request({
+    url: '/cxxm/user/list',
+    method: 'get',
+    params: query
+  })
+}
+// 获取用户组名称
+export function getGroupNames(deptId) {
+  return request({
+    url: '/cxxm/user/groupNames/' + deptId,
+    method: 'get',
+  })
+}
diff --git a/ruoyi-ui/src/api/login.js b/ruoyi-ui/src/api/login.js
index 9f333cb3..7b7388fd 100644
--- a/ruoyi-ui/src/api/login.js
+++ b/ruoyi-ui/src/api/login.js
@@ -1,60 +1,60 @@
-import request from '@/utils/request'
-
-// 登录方法
-export function login(username, password, code, uuid) {
-  const data = {
-    username,
-    password,
-    code,
-    uuid
-  }
-  return request({
-    url: '/login',
-    headers: {
-      isToken: false,
-      repeatSubmit: false
-    },
-    method: 'post',
-    data: data
-  })
-}
-
-// 注册方法
-export function register(data) {
-  return request({
-    url: '/register',
-    headers: {
-      isToken: false
-    },
-    method: 'post',
-    data: data
-  })
-}
-
-// 获取用户详细信息
-export function getInfo() {
-  return request({
-    url: '/getInfo',
-    method: 'get'
-  })
-}
-
-// 退出方法
-export function logout() {
-  return request({
-    url: '/logout',
-    method: 'post'
-  })
-}
-
-// 获取验证码
-export function getCodeImg() {
-  return request({
-    url: '/captchaImage',
-    headers: {
-      isToken: false
-    },
-    method: 'get',
-    timeout: 20000
-  })
+import request from '@/utils/request'
+
+// 登录方法
+export function login(username, password, code, uuid) {
+  const data = {
+    username,
+    password,
+    code,
+    uuid
+  }
+  return request({
+    url: '/login',
+    headers: {
+      isToken: false,
+      repeatSubmit: false
+    },
+    method: 'post',
+    data: data
+  })
+}
+
+// 注册方法
+export function register(data) {
+  return request({
+    url: '/register',
+    headers: {
+      isToken: false
+    },
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取用户详细信息
+export function getInfo() {
+  return request({
+    url: '/getInfo',
+    method: 'get'
+  })
+}
+
+// 退出方法
+export function logout() {
+  return request({
+    url: '/logout',
+    method: 'post'
+  })
+}
+
+// 获取验证码
+export function getCodeImg() {
+  return request({
+    url: '/captchaImage',
+    headers: {
+      isToken: false
+    },
+    method: 'get',
+    timeout: 20000
+  })
 }
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/menu.js b/ruoyi-ui/src/api/menu.js
index 6e52e6e8..faef101c 100644
--- a/ruoyi-ui/src/api/menu.js
+++ b/ruoyi-ui/src/api/menu.js
@@ -1,9 +1,9 @@
-import request from '@/utils/request'
-
-// 获取路由
-export const getRouters = () => {
-  return request({
-    url: '/getRouters',
-    method: 'get'
-  })
+import request from '@/utils/request'
+
+// 获取路由
+export const getRouters = () => {
+  return request({
+    url: '/getRouters',
+    method: 'get'
+  })
 }
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/monitor/cache.js b/ruoyi-ui/src/api/monitor/cache.js
index e1f2c878..72c5f6a3 100644
--- a/ruoyi-ui/src/api/monitor/cache.js
+++ b/ruoyi-ui/src/api/monitor/cache.js
@@ -1,57 +1,57 @@
-import request from '@/utils/request'
-
-// 查询缓存详细
-export function getCache() {
-  return request({
-    url: '/monitor/cache',
-    method: 'get'
-  })
-}
-
-// 查询缓存名称列表
-export function listCacheName() {
-  return request({
-    url: '/monitor/cache/getNames',
-    method: 'get'
-  })
-}
-
-// 查询缓存键名列表
-export function listCacheKey(cacheName) {
-  return request({
-    url: '/monitor/cache/getKeys/' + cacheName,
-    method: 'get'
-  })
-}
-
-// 查询缓存内容
-export function getCacheValue(cacheName, cacheKey) {
-  return request({
-    url: '/monitor/cache/getValue/' + cacheName + '/' + cacheKey,
-    method: 'get'
-  })
-}
-
-// 清理指定名称缓存
-export function clearCacheName(cacheName) {
-  return request({
-    url: '/monitor/cache/clearCacheName/' + cacheName,
-    method: 'delete'
-  })
-}
-
-// 清理指定键名缓存
-export function clearCacheKey(cacheKey) {
-  return request({
-    url: '/monitor/cache/clearCacheKey/' + cacheKey,
-    method: 'delete'
-  })
-}
-
-// 清理全部缓存
-export function clearCacheAll() {
-  return request({
-    url: '/monitor/cache/clearCacheAll',
-    method: 'delete'
-  })
-}
+import request from '@/utils/request'
+
+// 查询缓存详细
+export function getCache() {
+  return request({
+    url: '/monitor/cache',
+    method: 'get'
+  })
+}
+
+// 查询缓存名称列表
+export function listCacheName() {
+  return request({
+    url: '/monitor/cache/getNames',
+    method: 'get'
+  })
+}
+
+// 查询缓存键名列表
+export function listCacheKey(cacheName) {
+  return request({
+    url: '/monitor/cache/getKeys/' + cacheName,
+    method: 'get'
+  })
+}
+
+// 查询缓存内容
+export function getCacheValue(cacheName, cacheKey) {
+  return request({
+    url: '/monitor/cache/getValue/' + cacheName + '/' + cacheKey,
+    method: 'get'
+  })
+}
+
+// 清理指定名称缓存
+export function clearCacheName(cacheName) {
+  return request({
+    url: '/monitor/cache/clearCacheName/' + cacheName,
+    method: 'delete'
+  })
+}
+
+// 清理指定键名缓存
+export function clearCacheKey(cacheKey) {
+  return request({
+    url: '/monitor/cache/clearCacheKey/' + cacheKey,
+    method: 'delete'
+  })
+}
+
+// 清理全部缓存
+export function clearCacheAll() {
+  return request({
+    url: '/monitor/cache/clearCacheAll',
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/api/monitor/logininfor.js b/ruoyi-ui/src/api/monitor/logininfor.js
index c49a40e1..4d112b78 100644
--- a/ruoyi-ui/src/api/monitor/logininfor.js
+++ b/ruoyi-ui/src/api/monitor/logininfor.js
@@ -1,34 +1,34 @@
-import request from '@/utils/request'
-
-// 查询登录日志列表
-export function list(query) {
-  return request({
-    url: '/monitor/logininfor/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 删除登录日志
-export function delLogininfor(infoId) {
-  return request({
-    url: '/monitor/logininfor/' + infoId,
-    method: 'delete'
-  })
-}
-
-// 解锁用户登录状态
-export function unlockLogininfor(userName) {
-  return request({
-    url: '/monitor/logininfor/unlock/' + userName,
-    method: 'get'
-  })
-}
-
-// 清空登录日志
-export function cleanLogininfor() {
-  return request({
-    url: '/monitor/logininfor/clean',
-    method: 'delete'
-  })
-}
+import request from '@/utils/request'
+
+// 查询登录日志列表
+export function list(query) {
+  return request({
+    url: '/monitor/logininfor/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除登录日志
+export function delLogininfor(infoId) {
+  return request({
+    url: '/monitor/logininfor/' + infoId,
+    method: 'delete'
+  })
+}
+
+// 解锁用户登录状态
+export function unlockLogininfor(userName) {
+  return request({
+    url: '/monitor/logininfor/unlock/' + userName,
+    method: 'get'
+  })
+}
+
+// 清空登录日志
+export function cleanLogininfor() {
+  return request({
+    url: '/monitor/logininfor/clean',
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/api/monitor/online.js b/ruoyi-ui/src/api/monitor/online.js
index 288ebe02..bd221378 100644
--- a/ruoyi-ui/src/api/monitor/online.js
+++ b/ruoyi-ui/src/api/monitor/online.js
@@ -1,18 +1,18 @@
-import request from '@/utils/request'
-
-// 查询在线用户列表
-export function list(query) {
-  return request({
-    url: '/monitor/online/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 强退用户
-export function forceLogout(tokenId) {
-  return request({
-    url: '/monitor/online/' + tokenId,
-    method: 'delete'
-  })
-}
+import request from '@/utils/request'
+
+// 查询在线用户列表
+export function list(query) {
+  return request({
+    url: '/monitor/online/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 强退用户
+export function forceLogout(tokenId) {
+  return request({
+    url: '/monitor/online/' + tokenId,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/api/monitor/operlog.js b/ruoyi-ui/src/api/monitor/operlog.js
index 6e881dfe..a04bca84 100644
--- a/ruoyi-ui/src/api/monitor/operlog.js
+++ b/ruoyi-ui/src/api/monitor/operlog.js
@@ -1,26 +1,26 @@
-import request from '@/utils/request'
-
-// 查询操作日志列表
-export function list(query) {
-  return request({
-    url: '/monitor/operlog/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 删除操作日志
-export function delOperlog(operId) {
-  return request({
-    url: '/monitor/operlog/' + operId,
-    method: 'delete'
-  })
-}
-
-// 清空操作日志
-export function cleanOperlog() {
-  return request({
-    url: '/monitor/operlog/clean',
-    method: 'delete'
-  })
-}
+import request from '@/utils/request'
+
+// 查询操作日志列表
+export function list(query) {
+  return request({
+    url: '/monitor/operlog/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除操作日志
+export function delOperlog(operId) {
+  return request({
+    url: '/monitor/operlog/' + operId,
+    method: 'delete'
+  })
+}
+
+// 清空操作日志
+export function cleanOperlog() {
+  return request({
+    url: '/monitor/operlog/clean',
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/api/monitor/server.js b/ruoyi-ui/src/api/monitor/server.js
index cac77916..e1f9ca21 100644
--- a/ruoyi-ui/src/api/monitor/server.js
+++ b/ruoyi-ui/src/api/monitor/server.js
@@ -1,9 +1,9 @@
-import request from '@/utils/request'
-
-// 获取服务信息
-export function getServer() {
-  return request({
-    url: '/monitor/server',
-    method: 'get'
-  })
+import request from '@/utils/request'
+
+// 获取服务信息
+export function getServer() {
+  return request({
+    url: '/monitor/server',
+    method: 'get'
+  })
 }
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/config.js b/ruoyi-ui/src/api/system/config.js
index 7858c692..a404d825 100644
--- a/ruoyi-ui/src/api/system/config.js
+++ b/ruoyi-ui/src/api/system/config.js
@@ -1,60 +1,60 @@
-import request from '@/utils/request'
-
-// 查询参数列表
-export function listConfig(query) {
-  return request({
-    url: '/system/config/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询参数详细
-export function getConfig(configId) {
-  return request({
-    url: '/system/config/' + configId,
-    method: 'get'
-  })
-}
-
-// 根据参数键名查询参数值
-export function getConfigKey(configKey) {
-  return request({
-    url: '/system/config/configKey/' + configKey,
-    method: 'get'
-  })
-}
-
-// 新增参数配置
-export function addConfig(data) {
-  return request({
-    url: '/system/config',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改参数配置
-export function updateConfig(data) {
-  return request({
-    url: '/system/config',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除参数配置
-export function delConfig(configId) {
-  return request({
-    url: '/system/config/' + configId,
-    method: 'delete'
-  })
-}
-
-// 刷新参数缓存
-export function refreshCache() {
-  return request({
-    url: '/system/config/refreshCache',
-    method: 'delete'
-  })
-}
+import request from '@/utils/request'
+
+// 查询参数列表
+export function listConfig(query) {
+  return request({
+    url: '/system/config/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询参数详细
+export function getConfig(configId) {
+  return request({
+    url: '/system/config/' + configId,
+    method: 'get'
+  })
+}
+
+// 根据参数键名查询参数值
+export function getConfigKey(configKey) {
+  return request({
+    url: '/system/config/configKey/' + configKey,
+    method: 'get'
+  })
+}
+
+// 新增参数配置
+export function addConfig(data) {
+  return request({
+    url: '/system/config',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改参数配置
+export function updateConfig(data) {
+  return request({
+    url: '/system/config',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除参数配置
+export function delConfig(configId) {
+  return request({
+    url: '/system/config/' + configId,
+    method: 'delete'
+  })
+}
+
+// 刷新参数缓存
+export function refreshCache() {
+  return request({
+    url: '/system/config/refreshCache',
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/api/system/dept.js b/ruoyi-ui/src/api/system/dept.js
index 9ca69663..fc943cd4 100644
--- a/ruoyi-ui/src/api/system/dept.js
+++ b/ruoyi-ui/src/api/system/dept.js
@@ -1,52 +1,52 @@
-import request from '@/utils/request'
-
-// 查询部门列表
-export function listDept(query) {
-  return request({
-    url: '/system/dept/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询部门列表（排除节点）
-export function listDeptExcludeChild(deptId) {
-  return request({
-    url: '/system/dept/list/exclude/' + deptId,
-    method: 'get'
-  })
-}
-
-// 查询部门详细
-export function getDept(deptId) {
-  return request({
-    url: '/system/dept/' + deptId,
-    method: 'get'
-  })
-}
-
-// 新增部门
-export function addDept(data) {
-  return request({
-    url: '/system/dept',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改部门
-export function updateDept(data) {
-  return request({
-    url: '/system/dept',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除部门
-export function delDept(deptId) {
-  return request({
-    url: '/system/dept/' + deptId,
-    method: 'delete'
-  })
+import request from '@/utils/request'
+
+// 查询部门列表
+export function listDept(query) {
+  return request({
+    url: '/system/dept/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询部门列表（排除节点）
+export function listDeptExcludeChild(deptId) {
+  return request({
+    url: '/system/dept/list/exclude/' + deptId,
+    method: 'get'
+  })
+}
+
+// 查询部门详细
+export function getDept(deptId) {
+  return request({
+    url: '/system/dept/' + deptId,
+    method: 'get'
+  })
+}
+
+// 新增部门
+export function addDept(data) {
+  return request({
+    url: '/system/dept',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改部门
+export function updateDept(data) {
+  return request({
+    url: '/system/dept',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除部门
+export function delDept(deptId) {
+  return request({
+    url: '/system/dept/' + deptId,
+    method: 'delete'
+  })
 }
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/dict/data.js b/ruoyi-ui/src/api/system/dict/data.js
index 2a6e4811..6c9eb79b 100644
--- a/ruoyi-ui/src/api/system/dict/data.js
+++ b/ruoyi-ui/src/api/system/dict/data.js
@@ -1,52 +1,52 @@
-import request from '@/utils/request'
-
-// 查询字典数据列表
-export function listData(query) {
-  return request({
-    url: '/system/dict/data/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询字典数据详细
-export function getData(dictCode) {
-  return request({
-    url: '/system/dict/data/' + dictCode,
-    method: 'get'
-  })
-}
-
-// 根据字典类型查询字典数据信息
-export function getDicts(dictType) {
-  return request({
-    url: '/system/dict/data/type/' + dictType,
-    method: 'get'
-  })
-}
-
-// 新增字典数据
-export function addData(data) {
-  return request({
-    url: '/system/dict/data',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改字典数据
-export function updateData(data) {
-  return request({
-    url: '/system/dict/data',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除字典数据
-export function delData(dictCode) {
-  return request({
-    url: '/system/dict/data/' + dictCode,
-    method: 'delete'
-  })
-}
+import request from '@/utils/request'
+
+// 查询字典数据列表
+export function listData(query) {
+  return request({
+    url: '/system/dict/data/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典数据详细
+export function getData(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'get'
+  })
+}
+
+// 根据字典类型查询字典数据信息
+export function getDicts(dictType) {
+  return request({
+    url: '/system/dict/data/type/' + dictType,
+    method: 'get'
+  })
+}
+
+// 新增字典数据
+export function addData(data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典数据
+export function updateData(data) {
+  return request({
+    url: '/system/dict/data',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除字典数据
+export function delData(dictCode) {
+  return request({
+    url: '/system/dict/data/' + dictCode,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/api/system/dict/type.js b/ruoyi-ui/src/api/system/dict/type.js
index 526977d3..a7a6e01f 100644
--- a/ruoyi-ui/src/api/system/dict/type.js
+++ b/ruoyi-ui/src/api/system/dict/type.js
@@ -1,60 +1,60 @@
-import request from '@/utils/request'
-
-// 查询字典类型列表
-export function listType(query) {
-  return request({
-    url: '/system/dict/type/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询字典类型详细
-export function getType(dictId) {
-  return request({
-    url: '/system/dict/type/' + dictId,
-    method: 'get'
-  })
-}
-
-// 新增字典类型
-export function addType(data) {
-  return request({
-    url: '/system/dict/type',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改字典类型
-export function updateType(data) {
-  return request({
-    url: '/system/dict/type',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除字典类型
-export function delType(dictId) {
-  return request({
-    url: '/system/dict/type/' + dictId,
-    method: 'delete'
-  })
-}
-
-// 刷新字典缓存
-export function refreshCache() {
-  return request({
-    url: '/system/dict/type/refreshCache',
-    method: 'delete'
-  })
-}
-
-// 获取字典选择框列表
-export function optionselect() {
-  return request({
-    url: '/system/dict/type/optionselect',
-    method: 'get'
-  })
+import request from '@/utils/request'
+
+// 查询字典类型列表
+export function listType(query) {
+  return request({
+    url: '/system/dict/type/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询字典类型详细
+export function getType(dictId) {
+  return request({
+    url: '/system/dict/type/' + dictId,
+    method: 'get'
+  })
+}
+
+// 新增字典类型
+export function addType(data) {
+  return request({
+    url: '/system/dict/type',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改字典类型
+export function updateType(data) {
+  return request({
+    url: '/system/dict/type',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除字典类型
+export function delType(dictId) {
+  return request({
+    url: '/system/dict/type/' + dictId,
+    method: 'delete'
+  })
+}
+
+// 刷新字典缓存
+export function refreshCache() {
+  return request({
+    url: '/system/dict/type/refreshCache',
+    method: 'delete'
+  })
+}
+
+// 获取字典选择框列表
+export function optionselect() {
+  return request({
+    url: '/system/dict/type/optionselect',
+    method: 'get'
+  })
 }
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/menu.js b/ruoyi-ui/src/api/system/menu.js
index 97258ee6..f6415c65 100644
--- a/ruoyi-ui/src/api/system/menu.js
+++ b/ruoyi-ui/src/api/system/menu.js
@@ -1,60 +1,60 @@
-import request from '@/utils/request'
-
-// 查询菜单列表
-export function listMenu(query) {
-  return request({
-    url: '/system/menu/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询菜单详细
-export function getMenu(menuId) {
-  return request({
-    url: '/system/menu/' + menuId,
-    method: 'get'
-  })
-}
-
-// 查询菜单下拉树结构
-export function treeselect() {
-  return request({
-    url: '/system/menu/treeselect',
-    method: 'get'
-  })
-}
-
-// 根据角色ID查询菜单下拉树结构
-export function roleMenuTreeselect(roleId) {
-  return request({
-    url: '/system/menu/roleMenuTreeselect/' + roleId,
-    method: 'get'
-  })
-}
-
-// 新增菜单
-export function addMenu(data) {
-  return request({
-    url: '/system/menu',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改菜单
-export function updateMenu(data) {
-  return request({
-    url: '/system/menu',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除菜单
-export function delMenu(menuId) {
-  return request({
-    url: '/system/menu/' + menuId,
-    method: 'delete'
-  })
+import request from '@/utils/request'
+
+// 查询菜单列表
+export function listMenu(query) {
+  return request({
+    url: '/system/menu/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询菜单详细
+export function getMenu(menuId) {
+  return request({
+    url: '/system/menu/' + menuId,
+    method: 'get'
+  })
+}
+
+// 查询菜单下拉树结构
+export function treeselect() {
+  return request({
+    url: '/system/menu/treeselect',
+    method: 'get'
+  })
+}
+
+// 根据角色ID查询菜单下拉树结构
+export function roleMenuTreeselect(roleId) {
+  return request({
+    url: '/system/menu/roleMenuTreeselect/' + roleId,
+    method: 'get'
+  })
+}
+
+// 新增菜单
+export function addMenu(data) {
+  return request({
+    url: '/system/menu',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改菜单
+export function updateMenu(data) {
+  return request({
+    url: '/system/menu',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除菜单
+export function delMenu(menuId) {
+  return request({
+    url: '/system/menu/' + menuId,
+    method: 'delete'
+  })
 }
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/notice.js b/ruoyi-ui/src/api/system/notice.js
index 737fc169..c274ea5b 100644
--- a/ruoyi-ui/src/api/system/notice.js
+++ b/ruoyi-ui/src/api/system/notice.js
@@ -1,44 +1,44 @@
-import request from '@/utils/request'
-
-// 查询公告列表
-export function listNotice(query) {
-  return request({
-    url: '/system/notice/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询公告详细
-export function getNotice(noticeId) {
-  return request({
-    url: '/system/notice/' + noticeId,
-    method: 'get'
-  })
-}
-
-// 新增公告
-export function addNotice(data) {
-  return request({
-    url: '/system/notice',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改公告
-export function updateNotice(data) {
-  return request({
-    url: '/system/notice',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除公告
-export function delNotice(noticeId) {
-  return request({
-    url: '/system/notice/' + noticeId,
-    method: 'delete'
-  })
+import request from '@/utils/request'
+
+// 查询公告列表
+export function listNotice(query) {
+  return request({
+    url: '/system/notice/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询公告详细
+export function getNotice(noticeId) {
+  return request({
+    url: '/system/notice/' + noticeId,
+    method: 'get'
+  })
+}
+
+// 新增公告
+export function addNotice(data) {
+  return request({
+    url: '/system/notice',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改公告
+export function updateNotice(data) {
+  return request({
+    url: '/system/notice',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除公告
+export function delNotice(noticeId) {
+  return request({
+    url: '/system/notice/' + noticeId,
+    method: 'delete'
+  })
 }
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/post.js b/ruoyi-ui/src/api/system/post.js
index 8faa2669..1a8e9ca0 100644
--- a/ruoyi-ui/src/api/system/post.js
+++ b/ruoyi-ui/src/api/system/post.js
@@ -1,44 +1,44 @@
-import request from '@/utils/request'
-
-// 查询岗位列表
-export function listPost(query) {
-  return request({
-    url: '/system/post/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询岗位详细
-export function getPost(postId) {
-  return request({
-    url: '/system/post/' + postId,
-    method: 'get'
-  })
-}
-
-// 新增岗位
-export function addPost(data) {
-  return request({
-    url: '/system/post',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改岗位
-export function updatePost(data) {
-  return request({
-    url: '/system/post',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除岗位
-export function delPost(postId) {
-  return request({
-    url: '/system/post/' + postId,
-    method: 'delete'
-  })
-}
+import request from '@/utils/request'
+
+// 查询岗位列表
+export function listPost(query) {
+  return request({
+    url: '/system/post/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询岗位详细
+export function getPost(postId) {
+  return request({
+    url: '/system/post/' + postId,
+    method: 'get'
+  })
+}
+
+// 新增岗位
+export function addPost(data) {
+  return request({
+    url: '/system/post',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改岗位
+export function updatePost(data) {
+  return request({
+    url: '/system/post',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除岗位
+export function delPost(postId) {
+  return request({
+    url: '/system/post/' + postId,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/api/system/role.js b/ruoyi-ui/src/api/system/role.js
index 528cd186..f13e6f40 100644
--- a/ruoyi-ui/src/api/system/role.js
+++ b/ruoyi-ui/src/api/system/role.js
@@ -1,119 +1,119 @@
-import request from '@/utils/request'
-
-// 查询角色列表
-export function listRole(query) {
-  return request({
-    url: '/system/role/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询角色详细
-export function getRole(roleId) {
-  return request({
-    url: '/system/role/' + roleId,
-    method: 'get'
-  })
-}
-
-// 新增角色
-export function addRole(data) {
-  return request({
-    url: '/system/role',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改角色
-export function updateRole(data) {
-  return request({
-    url: '/system/role',
-    method: 'put',
-    data: data
-  })
-}
-
-// 角色数据权限
-export function dataScope(data) {
-  return request({
-    url: '/system/role/dataScope',
-    method: 'put',
-    data: data
-  })
-}
-
-// 角色状态修改
-export function changeRoleStatus(roleId, status) {
-  const data = {
-    roleId,
-    status
-  }
-  return request({
-    url: '/system/role/changeStatus',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除角色
-export function delRole(roleId) {
-  return request({
-    url: '/system/role/' + roleId,
-    method: 'delete'
-  })
-}
-
-// 查询角色已授权用户列表
-export function allocatedUserList(query) {
-  return request({
-    url: '/system/role/authUser/allocatedList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询角色未授权用户列表
-export function unallocatedUserList(query) {
-  return request({
-    url: '/system/role/authUser/unallocatedList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 取消用户授权角色
-export function authUserCancel(data) {
-  return request({
-    url: '/system/role/authUser/cancel',
-    method: 'put',
-    data: data
-  })
-}
-
-// 批量取消用户授权角色
-export function authUserCancelAll(data) {
-  return request({
-    url: '/system/role/authUser/cancelAll',
-    method: 'put',
-    params: data
-  })
-}
-
-// 授权用户选择
-export function authUserSelectAll(data) {
-  return request({
-    url: '/system/role/authUser/selectAll',
-    method: 'put',
-    params: data
-  })
-}
-
-// 根据角色ID查询部门树结构
-export function deptTreeSelect(roleId) {
-  return request({
-    url: '/system/role/deptTree/' + roleId,
-    method: 'get'
-  })
-}
+import request from '@/utils/request'
+
+// 查询角色列表
+export function listRole(query) {
+  return request({
+    url: '/system/role/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询角色详细
+export function getRole(roleId) {
+  return request({
+    url: '/system/role/' + roleId,
+    method: 'get'
+  })
+}
+
+// 新增角色
+export function addRole(data) {
+  return request({
+    url: '/system/role',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改角色
+export function updateRole(data) {
+  return request({
+    url: '/system/role',
+    method: 'put',
+    data: data
+  })
+}
+
+// 角色数据权限
+export function dataScope(data) {
+  return request({
+    url: '/system/role/dataScope',
+    method: 'put',
+    data: data
+  })
+}
+
+// 角色状态修改
+export function changeRoleStatus(roleId, status) {
+  const data = {
+    roleId,
+    status
+  }
+  return request({
+    url: '/system/role/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除角色
+export function delRole(roleId) {
+  return request({
+    url: '/system/role/' + roleId,
+    method: 'delete'
+  })
+}
+
+// 查询角色已授权用户列表
+export function allocatedUserList(query) {
+  return request({
+    url: '/system/role/authUser/allocatedList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询角色未授权用户列表
+export function unallocatedUserList(query) {
+  return request({
+    url: '/system/role/authUser/unallocatedList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 取消用户授权角色
+export function authUserCancel(data) {
+  return request({
+    url: '/system/role/authUser/cancel',
+    method: 'put',
+    data: data
+  })
+}
+
+// 批量取消用户授权角色
+export function authUserCancelAll(data) {
+  return request({
+    url: '/system/role/authUser/cancelAll',
+    method: 'put',
+    params: data
+  })
+}
+
+// 授权用户选择
+export function authUserSelectAll(data) {
+  return request({
+    url: '/system/role/authUser/selectAll',
+    method: 'put',
+    params: data
+  })
+}
+
+// 根据角色ID查询部门树结构
+export function deptTreeSelect(roleId) {
+  return request({
+    url: '/system/role/deptTree/' + roleId,
+    method: 'get'
+  })
+}
diff --git a/ruoyi-ui/src/api/system/user.js b/ruoyi-ui/src/api/system/user.js
index 9b949e91..f2f76ef9 100644
--- a/ruoyi-ui/src/api/system/user.js
+++ b/ruoyi-ui/src/api/system/user.js
@@ -1,135 +1,135 @@
-import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/ruoyi";
-
-// 查询用户列表
-export function listUser(query) {
-  return request({
-    url: '/system/user/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询用户详细
-export function getUser(userId) {
-  return request({
-    url: '/system/user/' + parseStrEmpty(userId),
-    method: 'get'
-  })
-}
-
-// 新增用户
-export function addUser(data) {
-  return request({
-    url: '/system/user',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改用户
-export function updateUser(data) {
-  return request({
-    url: '/system/user',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除用户
-export function delUser(userId) {
-  return request({
-    url: '/system/user/' + userId,
-    method: 'delete'
-  })
-}
-
-// 用户密码重置
-export function resetUserPwd(userId, password) {
-  const data = {
-    userId,
-    password
-  }
-  return request({
-    url: '/system/user/resetPwd',
-    method: 'put',
-    data: data
-  })
-}
-
-// 用户状态修改
-export function changeUserStatus(userId, status) {
-  const data = {
-    userId,
-    status
-  }
-  return request({
-    url: '/system/user/changeStatus',
-    method: 'put',
-    data: data
-  })
-}
-
-// 查询用户个人信息
-export function getUserProfile() {
-  return request({
-    url: '/system/user/profile',
-    method: 'get'
-  })
-}
-
-// 修改用户个人信息
-export function updateUserProfile(data) {
-  return request({
-    url: '/system/user/profile',
-    method: 'put',
-    data: data
-  })
-}
-
-// 用户密码重置
-export function updateUserPwd(oldPassword, newPassword) {
-  const data = {
-    oldPassword,
-    newPassword
-  }
-  return request({
-    url: '/system/user/profile/updatePwd',
-    method: 'put',
-    params: data
-  })
-}
-
-// 用户头像上传
-export function uploadAvatar(data) {
-  return request({
-    url: '/system/user/profile/avatar',
-    method: 'post',
-    data: data
-  })
-}
-
-// 查询授权角色
-export function getAuthRole(userId) {
-  return request({
-    url: '/system/user/authRole/' + userId,
-    method: 'get'
-  })
-}
-
-// 保存授权角色
-export function updateAuthRole(data) {
-  return request({
-    url: '/system/user/authRole',
-    method: 'put',
-    params: data
-  })
-}
-
-// 查询部门下拉树结构
-export function deptTreeSelect() {
-  return request({
-    url: '/system/user/deptTree',
-    method: 'get'
-  })
-}
+import request from '@/utils/request'
+import { parseStrEmpty } from "@/utils/ruoyi";
+
+// 查询用户列表
+export function listUser(query) {
+  return request({
+    url: '/system/user/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户详细
+export function getUser(userId) {
+  return request({
+    url: '/system/user/' + parseStrEmpty(userId),
+    method: 'get'
+  })
+}
+
+// 新增用户
+export function addUser(data) {
+  return request({
+    url: '/system/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用户
+export function updateUser(data) {
+  return request({
+    url: '/system/user',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用户
+export function delUser(userId) {
+  return request({
+    url: '/system/user/' + userId,
+    method: 'delete'
+  })
+}
+
+// 用户密码重置
+export function resetUserPwd(userId, password) {
+  const data = {
+    userId,
+    password
+  }
+  return request({
+    url: '/system/user/resetPwd',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户状态修改
+export function changeUserStatus(userId, status) {
+  const data = {
+    userId,
+    status
+  }
+  return request({
+    url: '/system/user/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询用户个人信息
+export function getUserProfile() {
+  return request({
+    url: '/system/user/profile',
+    method: 'get'
+  })
+}
+
+// 修改用户个人信息
+export function updateUserProfile(data) {
+  return request({
+    url: '/system/user/profile',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户密码重置
+export function updateUserPwd(oldPassword, newPassword) {
+  const data = {
+    oldPassword,
+    newPassword
+  }
+  return request({
+    url: '/system/user/profile/updatePwd',
+    method: 'put',
+    params: data
+  })
+}
+
+// 用户头像上传
+export function uploadAvatar(data) {
+  return request({
+    url: '/system/user/profile/avatar',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询授权角色
+export function getAuthRole(userId) {
+  return request({
+    url: '/system/user/authRole/' + userId,
+    method: 'get'
+  })
+}
+
+// 保存授权角色
+export function updateAuthRole(data) {
+  return request({
+    url: '/system/user/authRole',
+    method: 'put',
+    params: data
+  })
+}
+
+// 查询部门下拉树结构
+export function deptTreeSelect() {
+  return request({
+    url: '/system/user/deptTree',
+    method: 'get'
+  })
+}
diff --git a/ruoyi-ui/src/api/tool/gen.js b/ruoyi-ui/src/api/tool/gen.js
index 5728980c..20756772 100644
--- a/ruoyi-ui/src/api/tool/gen.js
+++ b/ruoyi-ui/src/api/tool/gen.js
@@ -1,85 +1,85 @@
-import request from '@/utils/request'
-
-// 查询生成表数据
-export function listTable(query) {
-  return request({
-    url: '/tool/gen/list',
-    method: 'get',
-    params: query
-  })
-}
-// 查询db数据库列表
-export function listDbTable(query) {
-  return request({
-    url: '/tool/gen/db/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询表详细信息
-export function getGenTable(tableId) {
-  return request({
-    url: '/tool/gen/' + tableId,
-    method: 'get'
-  })
-}
-
-// 修改代码生成信息
-export function updateGenTable(data) {
-  return request({
-    url: '/tool/gen',
-    method: 'put',
-    data: data
-  })
-}
-
-// 导入表
-export function importTable(data) {
-  return request({
-    url: '/tool/gen/importTable',
-    method: 'post',
-    params: data
-  })
-}
-
-// 创建表
-export function createTable(data) {
-  return request({
-    url: '/tool/gen/createTable',
-    method: 'post',
-    params: data
-  })
-}
-
-// 预览生成代码
-export function previewTable(tableId) {
-  return request({
-    url: '/tool/gen/preview/' + tableId,
-    method: 'get'
-  })
-}
-
-// 删除表数据
-export function delTable(tableId) {
-  return request({
-    url: '/tool/gen/' + tableId,
-    method: 'delete'
-  })
-}
-
-// 生成代码（自定义路径）
-export function genCode(tableName) {
-  return request({
-    url: '/tool/gen/genCode/' + tableName,
-    method: 'get'
-  })
-}
-
-// 同步数据库
-export function synchDb(tableName) {
-  return request({
-    url: '/tool/gen/synchDb/' + tableName,
-    method: 'get'
-  })
-}
+import request from '@/utils/request'
+
+// 查询生成表数据
+export function listTable(query) {
+  return request({
+    url: '/tool/gen/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询db数据库列表
+export function listDbTable(query) {
+  return request({
+    url: '/tool/gen/db/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询表详细信息
+export function getGenTable(tableId) {
+  return request({
+    url: '/tool/gen/' + tableId,
+    method: 'get'
+  })
+}
+
+// 修改代码生成信息
+export function updateGenTable(data) {
+  return request({
+    url: '/tool/gen',
+    method: 'put',
+    data: data
+  })
+}
+
+// 导入表
+export function importTable(data) {
+  return request({
+    url: '/tool/gen/importTable',
+    method: 'post',
+    params: data
+  })
+}
+
+// 创建表
+export function createTable(data) {
+  return request({
+    url: '/tool/gen/createTable',
+    method: 'post',
+    params: data
+  })
+}
+
+// 预览生成代码
+export function previewTable(tableId) {
+  return request({
+    url: '/tool/gen/preview/' + tableId,
+    method: 'get'
+  })
+}
+
+// 删除表数据
+export function delTable(tableId) {
+  return request({
+    url: '/tool/gen/' + tableId,
+    method: 'delete'
+  })
+}
+
+// 生成代码（自定义路径）
+export function genCode(tableName) {
+  return request({
+    url: '/tool/gen/genCode/' + tableName,
+    method: 'get'
+  })
+}
+
+// 同步数据库
+export function synchDb(tableName) {
+  return request({
+    url: '/tool/gen/synchDb/' + tableName,
+    method: 'get'
+  })
+}
diff --git a/ruoyi-ui/src/components/TianDiTuMap/index2.vue b/ruoyi-ui/src/components/TianDiTuMap/index2.vue
index 058be4c8..756538d0 100644
--- a/ruoyi-ui/src/components/TianDiTuMap/index2.vue
+++ b/ruoyi-ui/src/components/TianDiTuMap/index2.vue
@@ -63,7 +63,7 @@ export default {
       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}`);
+      script.setAttribute('src', `https://api.tianditu.gov.cn/api?v=4.0&tk=${this.tianDiTuApiKey}`);
       document.getElementsByTagName('head')[0].appendChild(script);
       // 等待天地图T对象加载完成
       await new Promise(resolve => {
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..eff316ad
--- /dev/null
+++ b/ruoyi-ui/src/views/cxxm/task/assign/index.vue
@@ -0,0 +1,640 @@
+<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="rwlx">
+        <el-select style="width:150px" v-model="queryParams.rwlx" placeholder="请选择任务类型" clearable>
+          <el-option
+            v-for="dict in dict.type.task_lx"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </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.task_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="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :disabled="multiple"
+          @click="openDistributePage"
+        >下发
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
+      <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="rwlx">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.task_lx" :value="scope.row.rwlx"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="图斑所在县" align="center" prop="tbszx" min-width="100"/>
+      <el-table-column label="下发情况" align="center" prop="xfqk" min-width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xfqk" v-if="scope.row.xfqk==0"
+                    style="color: red"/>
+          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xfqk" v-if="scope.row.xfqk==1"
+                    style="color: gray"/>
+          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xfqk" v-if="scope.row.xfqk==2"
+                    style="color: green"/>
+          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xfqk" v-if="scope.row.xfqk==3"
+                    style="color: olive"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="乡镇" align="center" prop="groupName" min-width="100">
+      </el-table-column>
+      <el-table-column label="指派人员" align="center" prop="toId" min-width="100">
+      </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" class-name="small-padding fixed-width" fixed="right" width="120">
+        <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>
+          <el-button
+            size="mini"
+            type="text"
+            style="color: red"
+            icon="el-icon-delete"
+            v-if="scope.row.xfqk==0"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['cxxm:task:remove']"
+          >删除
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="openAssignPage(scope.row)"
+          >去指派
+          </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 :contentStyle="content_style"
+                             :labelStyle="label_style">
+              <el-descriptions-item label="图斑编号">{{ form.tbxx.tbbh }}</el-descriptions-item>
+              <el-descriptions-item label="矿产名称">{{ tbxxInfo.KCMC }}</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="省">{{ tbxxInfo.SHENG }}</el-descriptions-item>
+              <el-descriptions-item label="市">{{ tbxxInfo.SHI }}</el-descriptions-item>
+              <el-descriptions-item label="县">{{ tbxxInfo.XIAN }}</el-descriptions-item>
+              <el-descriptions-item label="详细地址">{{ form.xxdz }}</el-descriptions-item>
+              <!--              <el-descriptions-item label="县代码">{{ tbxxInfo.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="占地面积">{{ tbxxInfo.ZDMJ }}</el-descriptions-item>
+              <el-descriptions-item label="违法面积">{{ tbxxInfo.KMWFMJ }}</el-descriptions-item>
+              <el-descriptions-item label="中心点经度">{{ form.x }}</el-descriptions-item>
+              <el-descriptions-item label="中心点纬度">{{ form.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>
+            <div style="height:500px;margin-top: 20px">
+              <TianDiTuMap2 style="width: 96%;height:500px" v-bind:mapInfo="this.mapInfo"></TianDiTuMap2>
+            </div>
+          </el-collapse-item>
+          <el-collapse-item title="更多图斑信息" name="2">
+            <el-descriptions column="2" v-if="form.tbxx!=null" border :contentStyle="content_style"
+                             :labelStyle="label_style">
+              <el-descriptions-item v-for="(value,key) in tbxxInfo" :label="key">{{ value }}</el-descriptions-item>
+            </el-descriptions>
+          </el-collapse-item>
+          <el-collapse-item title="任务信息" name="3">
+            <el-descriptions column="2" border :contentStyle="content_style" :labelStyle="label_style">
+              <el-descriptions-item label="导入人员">{{ form.createBy }}</el-descriptions-item>
+              <el-descriptions-item label="导入时间">{{
+                  parseTime(form.drsj, '{y}-{m}-{d} {h}:{i}:{s}')
+                }}
+              </el-descriptions-item>
+              <el-descriptions-item label="下发情况">{{ this.selectDictLabel(this.dict.type.task_xfqk, form.xfqk) }}
+              </el-descriptions-item>
+              <el-descriptions-item label="下发时间">{{ form.xfsj2 }}</el-descriptions-item>
+              <el-descriptions-item label="已巡查次数">{{ form.yxccs }}</el-descriptions-item>
+              <el-descriptions-item label="任务状态">
+                <el-tag type="success" v-if="form.sfgd=='0'">启用</el-tag>
+                <el-tag type="warning" v-if="form.sfgd=='1'">结束</el-tag>
+              </el-descriptions-item>
+            </el-descriptions>
+          </el-collapse-item>
+          <el-collapse-item title="任务周期" name="4">
+            <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" style="display: none">
+              <el-radio-group v-model="form.xczqxx">
+                <el-radio
+                  v-for="dict in dict.type.task_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" style="display: none">
+              <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-drawer
+      title="任务下发"
+      size="35%"
+      :visible.sync="drawer"
+      direction="rtl">
+      <el-table v-loading="loading" :data="groupNames" style="align-items: center; justify-content: center;">
+        <el-table-column label="乡镇名称" align="center" prop="groupName"/>
+        <el-table-column label="任务总数" align="center" prop="taskCount"/>
+        <el-table-column label="人员总数" align="center" prop="userCount"/>
+        <el-table-column label="人均任务数" align="center">
+          <template slot-scope="scope">
+            {{ Math.round(scope.row.taskCount / scope.row.userCount) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="handleDistribute(scope.row)"
+            >下发
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!--      <pagination-->
+      <!--        v-show="total>0"-->
+      <!--        :total="total"-->
+      <!--        :page.sync="queryParams.pageNum"-->
+      <!--        :limit.sync="queryParams.pageSize"-->
+      <!--        @pagination="getList"-->
+      <!--      />-->
+    </el-drawer>
+
+    <el-drawer
+      title="任务指派"
+      size="35%"
+      :visible.sync="drawer2"
+      direction="rtl">
+      <el-select v-model="groupName" placeholder="请选择乡镇" @change="getUsers">
+        <el-option
+          v-for="item in groupNames"
+          :key="item.groupName"
+          :label="item.groupName"
+          :value="item.groupName">
+        </el-option>
+      </el-select>
+      <el-table v-loading="loading" :data="users" style="align-items: center; justify-content: center;">
+        <el-table-column label="用户账号" align="center" prop="userName"/>
+        <el-table-column label="用户昵称" align="center" prop="nickName"/>
+        <el-table-column label="任务总数" align="center" prop="taskCount"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="handleAssign(scope.row)"
+            >指派
+            </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-drawer>
+  </div>
+</template>
+
+<script>
+import TianDiTuMap2 from "@/components/TianDiTuMap/index2.vue";
+import {listTask, getTask, delTask, distribute2Task, assignTask} from "@/api/cxxm/task";
+import {getUsers, getGroupNames} from "@/api/cxxm/user";
+import { getUserProfile } from "@/api/system/user";
+
+export default {
+  name: "TaskAssign",
+  components: {TianDiTuMap2},
+  dicts: ['task_lx', 'task_xfqk', 'task_xczqxx', 'sf'],
+  data() {
+    return {
+      content_style: {
+        'text-align': 'center',
+        'width': '25%',
+        'word-break': 'break-all'
+      },
+      label_style: {
+        'text-align': 'center',
+        'width': '25%',
+        'word-break': 'keep-all'
+      },
+      mapInfo: { // 传入的地图信息
+        gis: null,
+        centerPoint: null,
+        images: null
+      },
+      // 抽屉
+      drawer: false,
+      drawer2: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      assignTaskId: null,
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 任务表格数据
+      taskList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 折叠面板
+      activeNames: ['1', '2', '3', '4'],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        tbbh: null,
+        xfqk: null,
+        xfsj: null,
+        deptId: null,
+        drsjQuery: []
+      },
+      // 表单参数
+      form: {},
+      tbxxInfo: null,
+      // 表单校验
+      rules: {},
+      groupName: null,
+      groupNames: [],
+      users: [],
+      // 部门树选项
+      deptId: null,
+      deptOptions: null,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 巡查周期选项
+      xczqxx: "0",
+      // 日期区间选择
+      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.getDeptId();
+    // this.getDeptTree();
+  },
+  computed: {
+    readOnly() {
+      if (this.title.includes("查看")) {
+        // 查看页面设为只读状态
+        return true;
+      }
+      return false;
+    },
+  },
+  methods: {
+    /** 查询任务列表 */
+    getList() {
+      this.loading = true;
+      listTask(this.queryParams).then(response => {
+        this.taskList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getGroupNames(deptId) {
+      getGroupNames(deptId).then(response => {
+        this.groupNames = response.data;
+      });
+    },
+    getUsers() {
+      getUsers({"deptId": this.deptId, "groupName": this.groupName}).then(response => {
+        this.users = response.data;
+      });
+    },
+    // 取消按钮
+    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.queryParams.drsjQuery = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 下发按钮操作 */
+    openDistributePage() {
+      this.getGroupNames(this.deptId);
+      this.drawer = true;
+    },
+    handleDistribute(row) {
+      const ids = row.id || this.ids;
+      const groupName = row.groupName;
+      this.$modal.confirm('是否确认下发任务？').then(function () {
+        return distribute2Task(ids, {"groupName": groupName});
+      }).then(() => {
+        this.drawer = false;
+        this.getList();
+        this.$modal.msgSuccess("下发成功");
+      }).catch(() => {
+      });
+    },
+    openAssignPage(row) {
+      this.getGroupNames(row.deptId);
+      this.drawer2 = true;
+      this.assignTaskId = row.id;
+
+    },
+    handleAssign(row) {
+      const ids = this.assignTaskId;
+      const userId = row.userId;
+      this.$modal.confirm('是否确认指派任务？').then(function () {
+        return assignTask(ids, {"userId": userId});
+      }).then(() => {
+        this.drawer2 = false;
+        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;
+      });
+    },
+    getDeptId() {
+      getUserProfile().then(response => {
+        this.deptId = response.data.deptId;
+      });
+    },
+    // 筛选节点
+    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.tbxxInfo = JSON.parse(response.data.tbxx.info);
+
+
+        this.mapInfo.centerPoint = {x: response.data.x, y: response.data.y}
+        this.mapInfo.gis = response.data.tbxx.gis
+
+        this.open = true;
+        this.xczqxx = this.form.xczqxx
+        this.title = "查看任务";
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除任务？').then(function () {
+        return delTask(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+  }
+};
+</script>
+<style>
+.el-collapse .el-collapse-item__header {
+  font-size: 16px;
+  font-weight: bold;
+  color: #1890ff;
+}
+
+.assign-user {
+  margin-left: 10px;
+  height: 50px;
+  color: dodgerblue;
+}
+
+.assign-user-list {
+  margin-left: 10px;
+  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/detail/index.vue b/ruoyi-ui/src/views/cxxm/task/detail/index.vue
new file mode 100644
index 00000000..d391bfa9
--- /dev/null
+++ b/ruoyi-ui/src/views/cxxm/task/detail/index.vue
@@ -0,0 +1,61 @@
+<template>
+  <div class="app-container">
+    <el-row style="width: 100%">
+      <el-col :span="13">
+        <div class="grid-content bg-purple">
+          <TianDiTuMap2 style="width: 50%;height:600px" v-bind:mapInfo="this.mapInfo"></TianDiTuMap2>
+        </div>
+      </el-col>
+      <el-col :span="11">
+        <div class="grid-content bg-purple-light">
+          <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="基本信息" name="1">基本信息</el-tab-pane>
+            <el-tab-pane label="详细详细" name="2">详细详细</el-tab-pane>
+          </el-tabs>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import TianDiTuMap2 from "@/components/TianDiTuMap/index2.vue";
+
+export default {
+  name: "TaskDetail",
+  components: {TianDiTuMap2},
+  dicts: [],
+  data() {
+    return {
+      activeName: '1'
+    }
+  },
+  created() {
+
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event);
+    }
+  }
+};
+</script>
+<style>
+.app-container {
+  display: flex; /* 启用Flexbox布局 */
+  flex-wrap: nowrap; /* 不换行 */
+}
+
+.bg-purple {
+
+}
+
+.bg-purple-light {
+
+}
+
+.grid-content {
+  border-radius: 4px;
+  min-height: 36px;
+}
+</style>
diff --git a/ruoyi-ui/src/views/cxxm/task/distribute/index.vue b/ruoyi-ui/src/views/cxxm/task/distribute/index.vue
index 04dbcbb8..3e25c01f 100644
--- a/ruoyi-ui/src/views/cxxm/task/distribute/index.vue
+++ b/ruoyi-ui/src/views/cxxm/task/distribute/index.vue
@@ -101,15 +101,18 @@
               <dict-tag :options="dict.type.task_lx" :value="scope.row.rwlx"/>
             </template>
           </el-table-column>
-          <el-table-column label="图斑所在县" align="center" prop="tbszx"/>
-          <el-table-column label="下发情况" align="center" prop="xfqk">
+          <el-table-column label="图斑所在县" align="center" prop="tbszx" min-width="100"/>
+          <el-table-column label="下发情况" align="center" prop="xfqk" min-width="100">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xfqk" v-if="scope.row.xfqk==0"
-                        style="color: red"/>
+              <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xfqk" v-if="scope.row.xfqk==0" style="color: red"/>
               <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xfqk" v-if="scope.row.xfqk==1"
                         style="color: gray"/>
+              <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xfqk" v-if="scope.row.xfqk==2"
+                        style="color: green"/>
             </template>
           </el-table-column>
+          <el-table-column label="乡镇" align="center" prop="groupName" min-width="100">
+          </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>
@@ -258,7 +261,7 @@
 
 <script>
 import TianDiTuMap2 from "@/components/TianDiTuMap/index2.vue";
-import {listTask, getTask, delTask, addTask, updateTask, distributeTask} from "@/api/cxxm/task";
+import {listTask, getTask, delTask, distributeTask} from "@/api/cxxm/task";
 import {deptTreeSelect} from "@/api/system/user";
 
 export default {
diff --git a/ruoyi-ui/src/views/cxxm/task/import/index.vue b/ruoyi-ui/src/views/cxxm/task/import/index.vue
index 9ef1432c..60a4a71c 100644
--- a/ruoyi-ui/src/views/cxxm/task/import/index.vue
+++ b/ruoyi-ui/src/views/cxxm/task/import/index.vue
@@ -83,11 +83,14 @@
         </template>
       </el-table-column>
       <el-table-column label="图斑所在县" align="center" prop="tbszx"/>
+      <el-table-column label="详细地址" align="center" prop="xxdz"/>
       <el-table-column label="下发情况" align="center" prop="xfqk">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xfqk" v-if="scope.row.xfqk==0" style="color: red"/>
           <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xfqk" v-if="scope.row.xfqk==1"
                     style="color: gray"/>
+          <dict-tag :options="dict.type.task_xfqk" :value="scope.row.xfqk" v-if="scope.row.xfqk==2"
+                    style="color: green"/>
         </template>
       </el-table-column>
 
diff --git a/ruoyi-ui/src/views/system/user/authRole.vue b/ruoyi-ui/src/views/system/user/authRole.vue
index aeb42225..8d88a78d 100644
--- a/ruoyi-ui/src/views/system/user/authRole.vue
+++ b/ruoyi-ui/src/views/system/user/authRole.vue
@@ -4,7 +4,7 @@
     <el-form ref="form" :model="form" label-width="80px">
       <el-row>
         <el-col :span="8" :offset="2">
-          <el-form-item label="用户昵称" prop="nickName">
+          <el-form-item label="用户姓名" prop="nickName">
             <el-input v-model="form.nickName" disabled />
           </el-form-item>
         </el-col>
@@ -114,4 +114,4 @@ export default {
     },
   },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 9af6ee55..68d0ee75 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -6,7 +6,7 @@
         <div class="head-container">
           <el-input
             v-model="deptName"
-            placeholder="请输入部门名称"
+            placeholder="请输入归属市县"
             clearable
             size="small"
             prefix-icon="el-icon-search"
@@ -31,10 +31,28 @@
       <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="userName">
+          <el-form-item label="登录账号" prop="userName">
             <el-input
               v-model="queryParams.userName"
-              placeholder="请输入用户名称"
+              placeholder="请输入登录账号"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="用户姓名" prop="nickName">
+            <el-input
+              v-model="queryParams.nickName"
+              placeholder="请输入用户姓名"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="归属乡镇" prop="groupName">
+            <el-input
+              v-model="queryParams.groupName"
+              placeholder="请输入归属乡镇"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
@@ -145,17 +163,17 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center"/>
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible"/>
-          <el-table-column label="用户账号" align="center" key="userName" prop="userName" v-if="columns[1].visible"
+          <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible"
                            :show-overflow-tooltip="true"/>
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
+          <el-table-column label="用户姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
                            :show-overflow-tooltip="true"/>
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+          <el-table-column label="归属市县" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
                            :show-overflow-tooltip="true"/>
-          <el-table-column label="乡镇" align="center" key="groupName" prop="groupName" v-if="columns[3].visible"
+          <el-table-column label="归属乡镇" align="center" key="groupName" prop="groupName" v-if="columns[4].visible"
                            :show-overflow-tooltip="true"/>
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber"
-                           v-if="columns[4].visible" width="120"/>
-          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+                           v-if="columns[5].visible" width="120"/>
+          <el-table-column label="状态" align="center" key="status" v-if="columns[6].visible">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -165,7 +183,7 @@
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[7].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
@@ -224,8 +242,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户账号" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户账号" maxlength="30"/>
+            <el-form-item v-if="form.userId == undefined" label="登录账号" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入登录账号" maxlength="30"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -237,13 +255,13 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30"/>
+            <el-form-item label="用户姓名" prop="nickName">
+              <el-input v-model="form.nickName" placeholder="请输入用户姓名" maxlength="30"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门"/>
+            <el-form-item label="归属市县" prop="deptId">
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属市县"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -349,10 +367,10 @@
         <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>
+<!--          <div class="el-upload__tip" slot="tip">-->
+<!--            <el-checkbox v-model="upload.updateSupport"/>-->
+<!--            是否更新已经存在的用户数据-->
+<!--          </div>-->
           <span>仅允许导入xls、xlsx格式文件。</span>
           <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
                    @click="importTemplate" v-hasRole="['zjgly']">下载模板
@@ -447,6 +465,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         userName: undefined,
+        nickName: undefined,
         groupName: undefined,
         phonenumber: undefined,
         status: undefined,
@@ -455,18 +474,19 @@ export default {
       // 列信息
       columns: [
         {key: 0, label: `用户编号`, visible: true},
-        {key: 1, label: `用户账号`, visible: true},
-        {key: 2, label: `用户昵称`, visible: true},
-        {key: 3, label: `部门`, visible: true},
-        {key: 4, label: `手机号码`, visible: true},
-        {key: 5, label: `状态`, visible: true},
-        {key: 6, label: `创建时间`, visible: true}
+        {key: 1, label: `登录账号`, visible: true},
+        {key: 2, label: `用户姓名`, visible: true},
+        {key: 3, label: `归属市县`, visible: true},
+        {key: 4, label: `归属乡镇`, visible: true},
+        {key: 5, label: `手机号码`, visible: true},
+        {key: 6, label: `状态`, visible: true},
+        {key: 7, label: `创建时间`, visible: true}
       ],
       // 表单校验
       rules: {
         userName: [
-          {required: true, message: "用户账号不能为空", trigger: "blur"},
-          {min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur'}
+          {required: true, message: "登录账号不能为空", trigger: "blur"},
+          {min: 2, max: 20, message: '登录账号长度必须介于 2 和 20 之间', trigger: 'blur'}
         ],
         nickName: [
           // { required: true, message: "用户昵称不能为空", trigger: "blur" }
@@ -653,11 +673,14 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function () {
-      if (!this.form.nickName) {
-        this.form.nickName = this.form.userName;
-      }
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if (this.form.groupName == undefined || this.form.groupName == '') {
+            this.form.groupName = "未指定"
+          }
+          if (this.form.nickName == undefined || this.form.nickName == '') {
+            this.form.nickName = this.form.userName;
+          }
           if (this.form.userId != undefined) {
             updateUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/ruoyi-ui/src/views/system/user/profile/index.vue
index d22b8903..dbd980bc 100644
--- a/ruoyi-ui/src/views/system/user/profile/index.vue
+++ b/ruoyi-ui/src/views/system/user/profile/index.vue
@@ -12,7 +12,7 @@
             </div>
             <ul class="list-group list-group-striped">
               <li class="list-group-item">
-                <svg-icon icon-class="user" />用户名称
+                <svg-icon icon-class="user" />登录账号
                 <div class="pull-right">{{ user.userName }}</div>
               </li>
               <li class="list-group-item">
@@ -24,8 +24,12 @@
                 <div class="pull-right">{{ user.email }}</div>
               </li>
               <li class="list-group-item">
-                <svg-icon icon-class="tree" />所属部门
-                <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
+                <svg-icon icon-class="tree" />所属市县
+                <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }}</div>
+              </li>
+              <li class="list-group-item">
+                <svg-icon icon-class="tree" />所属乡镇
+                <div class="pull-right" v-if="user.dept">{{ user.groupName }}</div>
               </li>
               <li class="list-group-item">
                 <svg-icon icon-class="peoples" />所属角色
diff --git a/ruoyi-ui/src/views/system/user/profile/userInfo.vue b/ruoyi-ui/src/views/system/user/profile/userInfo.vue
index df334599..9459d531 100644
--- a/ruoyi-ui/src/views/system/user/profile/userInfo.vue
+++ b/ruoyi-ui/src/views/system/user/profile/userInfo.vue
@@ -1,8 +1,8 @@
 <template>
   <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-    <el-form-item label="用户昵称" prop="nickName">
+    <el-form-item label="用户姓名" prop="nickName">
       <el-input v-model="form.nickName" maxlength="30" />
-    </el-form-item> 
+    </el-form-item>
     <el-form-item label="手机号码" prop="phonenumber">
       <el-input v-model="form.phonenumber" maxlength="11" />
     </el-form-item>
@@ -37,7 +37,7 @@ export default {
       // 表单校验
       rules: {
         nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+          { required: true, message: "用户姓名不能为空", trigger: "blur" }
         ],
         email: [
           { required: true, message: "邮箱地址不能为空", trigger: "blur" },
diff --git a/ruoyi-ui/src/views/tool/build/DraggableItem.vue b/ruoyi-ui/src/views/tool/build/DraggableItem.vue
index f669ac0e..e881778f 100644
--- a/ruoyi-ui/src/views/tool/build/DraggableItem.vue
+++ b/ruoyi-ui/src/views/tool/build/DraggableItem.vue
@@ -1,100 +1,100 @@
-<script>
-import draggable from 'vuedraggable'
-import render from '@/utils/generator/render'
-
-const components = {
-  itemBtns(h, element, index, parent) {
-    const { copyItem, deleteItem } = this.$listeners
-    return [
-      <span class="drawing-item-copy" title="复制" onClick={event => {
-        copyItem(element, parent); event.stopPropagation()
-      }}>
-        <i class="el-icon-copy-document" />
-      </span>,
-      <span class="drawing-item-delete" title="删除" onClick={event => {
-        deleteItem(index, parent); event.stopPropagation()
-      }}>
-        <i class="el-icon-delete" />
-      </span>
-    ]
-  }
-}
-const layouts = {
-  colFormItem(h, element, index, parent) {
-    const { activeItem } = this.$listeners
-    let className = this.activeId === element.formId ? 'drawing-item active-from-item' : 'drawing-item'
-    if (this.formConf.unFocusedComponentBorder) className += ' unfocus-bordered'
-    return (
-      <el-col span={element.span} class={className}
-        nativeOnClick={event => { activeItem(element); event.stopPropagation() }}>
-        <el-form-item label-width={element.labelWidth ? `${element.labelWidth}px` : null}
-          label={element.label} required={element.required}>
-          <render key={element.renderKey} conf={element} onInput={ event => {
-            this.$set(element, 'defaultValue', event)
-          }} />
-        </el-form-item>
-        {components.itemBtns.apply(this, arguments)}
-      </el-col>
-    )
-  },
-  rowFormItem(h, element, index, parent) {
-    const { activeItem } = this.$listeners
-    const className = this.activeId === element.formId ? 'drawing-row-item active-from-item' : 'drawing-row-item'
-    let child = renderChildren.apply(this, arguments)
-    if (element.type === 'flex') {
-      child = <el-row type={element.type} justify={element.justify} align={element.align}>
-              {child}
-            </el-row>
-    }
-    return (
-      <el-col span={element.span}>
-        <el-row gutter={element.gutter} class={className}
-          nativeOnClick={event => { activeItem(element); event.stopPropagation() }}>
-          <span class="component-name">{element.componentName}</span>
-          <draggable list={element.children} animation={340} group="componentsGroup" class="drag-wrapper">
-            {child}
-          </draggable>
-          {components.itemBtns.apply(this, arguments)}
-        </el-row>
-      </el-col>
-    )
-  }
-}
-
-function renderChildren(h, element, index, parent) {
-  if (!Array.isArray(element.children)) return null
-  return element.children.map((el, i) => {
-    const layout = layouts[el.layout]
-    if (layout) {
-      return layout.call(this, h, el, i, element.children)
-    }
-    return layoutIsNotFound()
-  })
-}
-
-function layoutIsNotFound() {
-  throw new Error(`没有与${this.element.layout}匹配的layout`)
-}
-
-export default {
-  components: {
-    render,
-    draggable
-  },
-  props: [
-    'element',
-    'index',
-    'drawingList',
-    'activeId',
-    'formConf'
-  ],
-  render(h) {
-    const layout = layouts[this.element.layout]
-
-    if (layout) {
-      return layout.call(this, h, this.element, this.index, this.drawingList)
-    }
-    return layoutIsNotFound()
-  }
-}
-</script>
+<script>
+import draggable from 'vuedraggable'
+import render from '@/utils/generator/render'
+
+const components = {
+  itemBtns(h, element, index, parent) {
+    const { copyItem, deleteItem } = this.$listeners
+    return [
+      <span class="drawing-item-copy" title="复制" onClick={event => {
+        copyItem(element, parent); event.stopPropagation()
+      }}>
+        <i class="el-icon-copy-document" />
+      </span>,
+      <span class="drawing-item-delete" title="删除" onClick={event => {
+        deleteItem(index, parent); event.stopPropagation()
+      }}>
+        <i class="el-icon-delete" />
+      </span>
+    ]
+  }
+}
+const layouts = {
+  colFormItem(h, element, index, parent) {
+    const { activeItem } = this.$listeners
+    let className = this.activeId === element.formId ? 'drawing-item active-from-item' : 'drawing-item'
+    if (this.formConf.unFocusedComponentBorder) className += ' unfocus-bordered'
+    return (
+      <el-col span={element.span} class={className}
+        nativeOnClick={event => { activeItem(element); event.stopPropagation() }}>
+        <el-form-item label-width={element.labelWidth ? `${element.labelWidth}px` : null}
+          label={element.label} required={element.required}>
+          <render key={element.renderKey} conf={element} onInput={ event => {
+            this.$set(element, 'defaultValue', event)
+          }} />
+        </el-form-item>
+        {components.itemBtns.apply(this, arguments)}
+      </el-col>
+    )
+  },
+  rowFormItem(h, element, index, parent) {
+    const { activeItem } = this.$listeners
+    const className = this.activeId === element.formId ? 'drawing-row-item active-from-item' : 'drawing-row-item'
+    let child = renderChildren.apply(this, arguments)
+    if (element.type === 'flex') {
+      child = <el-row type={element.type} justify={element.justify} align={element.align}>
+              {child}
+            </el-row>
+    }
+    return (
+      <el-col span={element.span}>
+        <el-row gutter={element.gutter} class={className}
+          nativeOnClick={event => { activeItem(element); event.stopPropagation() }}>
+          <span class="component-name">{element.componentName}</span>
+          <draggable list={element.children} animation={340} group="componentsGroup" class="drag-wrapper">
+            {child}
+          </draggable>
+          {components.itemBtns.apply(this, arguments)}
+        </el-row>
+      </el-col>
+    )
+  }
+}
+
+function renderChildren(h, element, index, parent) {
+  if (!Array.isArray(element.children)) return null
+  return element.children.map((el, i) => {
+    const layout = layouts[el.layout]
+    if (layout) {
+      return layout.call(this, h, el, i, element.children)
+    }
+    return layoutIsNotFound()
+  })
+}
+
+function layoutIsNotFound() {
+  throw new Error(`没有与${this.element.layout}匹配的layout`)
+}
+
+export default {
+  components: {
+    render,
+    draggable
+  },
+  props: [
+    'element',
+    'index',
+    'drawingList',
+    'activeId',
+    'formConf'
+  ],
+  render(h) {
+    const layout = layouts[this.element.layout]
+
+    if (layout) {
+      return layout.call(this, h, this.element, this.index, this.drawingList)
+    }
+    return layoutIsNotFound()
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/views/tool/build/IconsDialog.vue b/ruoyi-ui/src/views/tool/build/IconsDialog.vue
index 0d127783..958be50c 100644
--- a/ruoyi-ui/src/views/tool/build/IconsDialog.vue
+++ b/ruoyi-ui/src/views/tool/build/IconsDialog.vue
@@ -1,123 +1,123 @@
-<template>
-  <div class="icon-dialog">
-    <el-dialog
-      v-bind="$attrs"
-      width="980px"
-      :modal-append-to-body="false"
-      v-on="$listeners"
-      @open="onOpen"
-      @close="onClose"
-    >
-      <div slot="title">
-        选择图标
-        <el-input
-          v-model="key"
-          size="mini"
-          :style="{width: '260px'}"
-          placeholder="请输入图标名称"
-          prefix-icon="el-icon-search"
-          clearable
-        />
-      </div>
-      <ul class="icon-ul">
-        <li
-          v-for="icon in iconList"
-          :key="icon"
-          :class="active===icon?'active-item':''"
-          @click="onSelect(icon)"
-        >
-          <i :class="icon" />
-          <div>{{ icon }}</div>
-        </li>
-      </ul>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import iconList from '@/utils/generator/icon.json'
-
-const originList = iconList.map(name => `el-icon-${name}`)
-
-export default {
-  inheritAttrs: false,
-  props: ['current'],
-  data() {
-    return {
-      iconList: originList,
-      active: null,
-      key: ''
-    }
-  },
-  watch: {
-    key(val) {
-      if (val) {
-        this.iconList = originList.filter(name => name.indexOf(val) > -1)
-      } else {
-        this.iconList = originList
-      }
-    }
-  },
-  methods: {
-    onOpen() {
-      this.active = this.current
-      this.key = ''
-    },
-    onClose() {},
-    onSelect(icon) {
-      this.active = icon
-      this.$emit('select', icon)
-      this.$emit('update:visible', false)
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.icon-ul {
-  margin: 0;
-  padding: 0;
-  font-size: 0;
-  li {
-    list-style-type: none;
-    text-align: center;
-    font-size: 14px;
-    display: inline-block;
-    width: 16.66%;
-    box-sizing: border-box;
-    height: 108px;
-    padding: 15px 6px 6px 6px;
-    cursor: pointer;
-    overflow: hidden;
-    &:hover {
-      background: #f2f2f2;
-    }
-    &.active-item{
-      background: #e1f3fb;
-      color: #7a6df0
-    }
-    > i {
-      font-size: 30px;
-      line-height: 50px;
-    }
-  }
-}
-.icon-dialog {
-  ::v-deep .el-dialog {
-    border-radius: 8px;
-    margin-bottom: 0;
-    margin-top: 4vh !important;
-    display: flex;
-    flex-direction: column;
-    max-height: 92vh;
-    overflow: hidden;
-    box-sizing: border-box;
-    .el-dialog__header {
-      padding-top: 14px;
-    }
-    .el-dialog__body {
-      margin: 0 20px 20px 20px;
-      padding: 0;
-      overflow: auto;
-    }
-  }
-}
-</style>
+<template>
+  <div class="icon-dialog">
+    <el-dialog
+      v-bind="$attrs"
+      width="980px"
+      :modal-append-to-body="false"
+      v-on="$listeners"
+      @open="onOpen"
+      @close="onClose"
+    >
+      <div slot="title">
+        选择图标
+        <el-input
+          v-model="key"
+          size="mini"
+          :style="{width: '260px'}"
+          placeholder="请输入图标名称"
+          prefix-icon="el-icon-search"
+          clearable
+        />
+      </div>
+      <ul class="icon-ul">
+        <li
+          v-for="icon in iconList"
+          :key="icon"
+          :class="active===icon?'active-item':''"
+          @click="onSelect(icon)"
+        >
+          <i :class="icon" />
+          <div>{{ icon }}</div>
+        </li>
+      </ul>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import iconList from '@/utils/generator/icon.json'
+
+const originList = iconList.map(name => `el-icon-${name}`)
+
+export default {
+  inheritAttrs: false,
+  props: ['current'],
+  data() {
+    return {
+      iconList: originList,
+      active: null,
+      key: ''
+    }
+  },
+  watch: {
+    key(val) {
+      if (val) {
+        this.iconList = originList.filter(name => name.indexOf(val) > -1)
+      } else {
+        this.iconList = originList
+      }
+    }
+  },
+  methods: {
+    onOpen() {
+      this.active = this.current
+      this.key = ''
+    },
+    onClose() {},
+    onSelect(icon) {
+      this.active = icon
+      this.$emit('select', icon)
+      this.$emit('update:visible', false)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.icon-ul {
+  margin: 0;
+  padding: 0;
+  font-size: 0;
+  li {
+    list-style-type: none;
+    text-align: center;
+    font-size: 14px;
+    display: inline-block;
+    width: 16.66%;
+    box-sizing: border-box;
+    height: 108px;
+    padding: 15px 6px 6px 6px;
+    cursor: pointer;
+    overflow: hidden;
+    &:hover {
+      background: #f2f2f2;
+    }
+    &.active-item{
+      background: #e1f3fb;
+      color: #7a6df0
+    }
+    > i {
+      font-size: 30px;
+      line-height: 50px;
+    }
+  }
+}
+.icon-dialog {
+  ::v-deep .el-dialog {
+    border-radius: 8px;
+    margin-bottom: 0;
+    margin-top: 4vh !important;
+    display: flex;
+    flex-direction: column;
+    max-height: 92vh;
+    overflow: hidden;
+    box-sizing: border-box;
+    .el-dialog__header {
+      padding-top: 14px;
+    }
+    .el-dialog__body {
+      margin: 0 20px 20px 20px;
+      padding: 0;
+      overflow: auto;
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/tool/build/RightPanel.vue b/ruoyi-ui/src/views/tool/build/RightPanel.vue
index 863d74c0..c2760eb5 100644
--- a/ruoyi-ui/src/views/tool/build/RightPanel.vue
+++ b/ruoyi-ui/src/views/tool/build/RightPanel.vue
@@ -1,946 +1,946 @@
-<template>
-  <div class="right-board">
-    <el-tabs v-model="currentTab" class="center-tabs">
-      <el-tab-pane label="组件属性" name="field" />
-      <el-tab-pane label="表单属性" name="form" />
-    </el-tabs>
-    <div class="field-box">
-      <a class="document-link" target="_blank" :href="documentLink" title="查看组件文档">
-        <i class="el-icon-link" />
-      </a>
-      <el-scrollbar class="right-scrollbar">
-        <!-- 组件属性 -->
-        <el-form v-show="currentTab==='field' && showField" size="small" label-width="90px">
-          <el-form-item v-if="activeData.changeTag" label="组件类型">
-            <el-select
-              v-model="activeData.tagIcon"
-              placeholder="请选择组件类型"
-              :style="{width: '100%'}"
-              @change="tagChange"
-            >
-              <el-option-group v-for="group in tagList" :key="group.label" :label="group.label">
-                <el-option
-                  v-for="item in group.options"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.tagIcon"
-                >
-                  <svg-icon class="node-icon" :icon-class="item.tagIcon" />
-                  <span> {{ item.label }}</span>
-                </el-option>
-              </el-option-group>
-            </el-select>
-          </el-form-item>
-          <el-form-item v-if="activeData.vModel!==undefined" label="字段名">
-            <el-input v-model="activeData.vModel" placeholder="请输入字段名（v-model）" />
-          </el-form-item>
-          <el-form-item v-if="activeData.componentName!==undefined" label="组件名">
-            {{ activeData.componentName }}
-          </el-form-item>
-          <el-form-item v-if="activeData.label!==undefined" label="标题">
-            <el-input v-model="activeData.label" placeholder="请输入标题" />
-          </el-form-item>
-          <el-form-item v-if="activeData.placeholder!==undefined" label="占位提示">
-            <el-input v-model="activeData.placeholder" placeholder="请输入占位提示" />
-          </el-form-item>
-          <el-form-item v-if="activeData['start-placeholder']!==undefined" label="开始占位">
-            <el-input v-model="activeData['start-placeholder']" placeholder="请输入占位提示" />
-          </el-form-item>
-          <el-form-item v-if="activeData['end-placeholder']!==undefined" label="结束占位">
-            <el-input v-model="activeData['end-placeholder']" placeholder="请输入占位提示" />
-          </el-form-item>
-          <el-form-item v-if="activeData.span!==undefined" label="表单栅格">
-            <el-slider v-model="activeData.span" :max="24" :min="1" :marks="{12:''}" @change="spanChange" />
-          </el-form-item>
-          <el-form-item v-if="activeData.layout==='rowFormItem'" label="栅格间隔">
-            <el-input-number v-model="activeData.gutter" :min="0" placeholder="栅格间隔" />
-          </el-form-item>
-          <el-form-item v-if="activeData.layout==='rowFormItem'" label="布局模式">
-            <el-radio-group v-model="activeData.type">
-              <el-radio-button label="default" />
-              <el-radio-button label="flex" />
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="activeData.justify!==undefined&&activeData.type==='flex'" label="水平排列">
-            <el-select v-model="activeData.justify" placeholder="请选择水平排列" :style="{width: '100%'}">
-              <el-option
-                v-for="(item, index) in justifyOptions"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-if="activeData.align!==undefined&&activeData.type==='flex'" label="垂直排列">
-            <el-radio-group v-model="activeData.align">
-              <el-radio-button label="top" />
-              <el-radio-button label="middle" />
-              <el-radio-button label="bottom" />
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="activeData.labelWidth!==undefined" label="标签宽度">
-            <el-input v-model.number="activeData.labelWidth" type="number" placeholder="请输入标签宽度" />
-          </el-form-item>
-          <el-form-item v-if="activeData.style&&activeData.style.width!==undefined" label="组件宽度">
-            <el-input v-model="activeData.style.width" placeholder="请输入组件宽度" clearable />
-          </el-form-item>
-          <el-form-item v-if="activeData.vModel!==undefined" label="默认值">
-            <el-input
-              :value="setDefaultValue(activeData.defaultValue)"
-              placeholder="请输入默认值"
-              @input="onDefaultValueInput"
-            />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag==='el-checkbox-group'" label="至少应选">
-            <el-input-number
-              :value="activeData.min"
-              :min="0"
-              placeholder="至少应选"
-              @input="$set(activeData, 'min', $event?$event:undefined)"
-            />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag==='el-checkbox-group'" label="最多可选">
-            <el-input-number
-              :value="activeData.max"
-              :min="0"
-              placeholder="最多可选"
-              @input="$set(activeData, 'max', $event?$event:undefined)"
-            />
-          </el-form-item>
-          <el-form-item v-if="activeData.prepend!==undefined" label="前缀">
-            <el-input v-model="activeData.prepend" placeholder="请输入前缀" />
-          </el-form-item>
-          <el-form-item v-if="activeData.append!==undefined" label="后缀">
-            <el-input v-model="activeData.append" placeholder="请输入后缀" />
-          </el-form-item>
-          <el-form-item v-if="activeData['prefix-icon']!==undefined" label="前图标">
-            <el-input v-model="activeData['prefix-icon']" placeholder="请输入前图标名称">
-              <el-button slot="append" icon="el-icon-thumb" @click="openIconsDialog('prefix-icon')">
-                选择
-              </el-button>
-            </el-input>
-          </el-form-item>
-          <el-form-item v-if="activeData['suffix-icon'] !== undefined" label="后图标">
-            <el-input v-model="activeData['suffix-icon']" placeholder="请输入后图标名称">
-              <el-button slot="append" icon="el-icon-thumb" @click="openIconsDialog('suffix-icon')">
-                选择
-              </el-button>
-            </el-input>
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-cascader'" label="选项分隔符">
-            <el-input v-model="activeData.separator" placeholder="请输入选项分隔符" />
-          </el-form-item>
-          <el-form-item v-if="activeData.autosize !== undefined" label="最小行数">
-            <el-input-number v-model="activeData.autosize.minRows" :min="1" placeholder="最小行数" />
-          </el-form-item>
-          <el-form-item v-if="activeData.autosize !== undefined" label="最大行数">
-            <el-input-number v-model="activeData.autosize.maxRows" :min="1" placeholder="最大行数" />
-          </el-form-item>
-          <el-form-item v-if="activeData.min !== undefined" label="最小值">
-            <el-input-number v-model="activeData.min" placeholder="最小值" />
-          </el-form-item>
-          <el-form-item v-if="activeData.max !== undefined" label="最大值">
-            <el-input-number v-model="activeData.max" placeholder="最大值" />
-          </el-form-item>
-          <el-form-item v-if="activeData.step !== undefined" label="步长">
-            <el-input-number v-model="activeData.step" placeholder="步数" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-input-number'" label="精度">
-            <el-input-number v-model="activeData.precision" :min="0" placeholder="精度" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-input-number'" label="按钮位置">
-            <el-radio-group v-model="activeData['controls-position']">
-              <el-radio-button label="">
-                默认
-              </el-radio-button>
-              <el-radio-button label="right">
-                右侧
-              </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="activeData.maxlength !== undefined" label="最多输入">
-            <el-input v-model="activeData.maxlength" placeholder="请输入字符长度">
-              <template slot="append">
-                个字符
-              </template>
-            </el-input>
-          </el-form-item>
-          <el-form-item v-if="activeData['active-text'] !== undefined" label="开启提示">
-            <el-input v-model="activeData['active-text']" placeholder="请输入开启提示" />
-          </el-form-item>
-          <el-form-item v-if="activeData['inactive-text'] !== undefined" label="关闭提示">
-            <el-input v-model="activeData['inactive-text']" placeholder="请输入关闭提示" />
-          </el-form-item>
-          <el-form-item v-if="activeData['active-value'] !== undefined" label="开启值">
-            <el-input
-              :value="setDefaultValue(activeData['active-value'])"
-              placeholder="请输入开启值"
-              @input="onSwitchValueInput($event, 'active-value')"
-            />
-          </el-form-item>
-          <el-form-item v-if="activeData['inactive-value'] !== undefined" label="关闭值">
-            <el-input
-              :value="setDefaultValue(activeData['inactive-value'])"
-              placeholder="请输入关闭值"
-              @input="onSwitchValueInput($event, 'inactive-value')"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.type !== undefined && 'el-date-picker' === activeData.tag"
-            label="时间类型"
-          >
-            <el-select
-              v-model="activeData.type"
-              placeholder="请选择时间类型"
-              :style="{ width: '100%' }"
-              @change="dateTypeChange"
-            >
-              <el-option
-                v-for="(item, index) in dateOptions"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-if="activeData.name !== undefined" label="文件字段名">
-            <el-input v-model="activeData.name" placeholder="请输入上传文件字段名" />
-          </el-form-item>
-          <el-form-item v-if="activeData.accept !== undefined" label="文件类型">
-            <el-select
-              v-model="activeData.accept"
-              placeholder="请选择文件类型"
-              :style="{ width: '100%' }"
-              clearable
-            >
-              <el-option label="图片" value="image/*" />
-              <el-option label="视频" value="video/*" />
-              <el-option label="音频" value="audio/*" />
-              <el-option label="excel" value=".xls,.xlsx" />
-              <el-option label="word" value=".doc,.docx" />
-              <el-option label="pdf" value=".pdf" />
-              <el-option label="txt" value=".txt" />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-if="activeData.fileSize !== undefined" label="文件大小">
-            <el-input v-model.number="activeData.fileSize" placeholder="请输入文件大小">
-              <el-select slot="append" v-model="activeData.sizeUnit" :style="{ width: '66px' }">
-                <el-option label="KB" value="KB" />
-                <el-option label="MB" value="MB" />
-                <el-option label="GB" value="GB" />
-              </el-select>
-            </el-input>
-          </el-form-item>
-          <el-form-item v-if="activeData.action !== undefined" label="上传地址">
-            <el-input v-model="activeData.action" placeholder="请输入上传地址" clearable />
-          </el-form-item>
-          <el-form-item v-if="activeData['list-type'] !== undefined" label="列表类型">
-            <el-radio-group v-model="activeData['list-type']" size="small">
-              <el-radio-button label="text">
-                text
-              </el-radio-button>
-              <el-radio-button label="picture">
-                picture
-              </el-radio-button>
-              <el-radio-button label="picture-card">
-                picture-card
-              </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.buttonText !== undefined"
-            v-show="'picture-card' !== activeData['list-type']"
-            label="按钮文字"
-          >
-            <el-input v-model="activeData.buttonText" placeholder="请输入按钮文字" />
-          </el-form-item>
-          <el-form-item v-if="activeData['range-separator'] !== undefined" label="分隔符">
-            <el-input v-model="activeData['range-separator']" placeholder="请输入分隔符" />
-          </el-form-item>
-          <el-form-item v-if="activeData['picker-options'] !== undefined" label="时间段">
-            <el-input
-              v-model="activeData['picker-options'].selectableRange"
-              placeholder="请输入时间段"
-            />
-          </el-form-item>
-          <el-form-item v-if="activeData.format !== undefined" label="时间格式">
-            <el-input
-              :value="activeData.format"
-              placeholder="请输入时间格式"
-              @input="setTimeValue($event)"
-            />
-          </el-form-item>
-          <template v-if="['el-checkbox-group', 'el-radio-group', 'el-select'].indexOf(activeData.tag) > -1">
-            <el-divider>选项</el-divider>
-            <draggable
-              :list="activeData.options"
-              :animation="340"
-              group="selectItem"
-              handle=".option-drag"
-            >
-              <div v-for="(item, index) in activeData.options" :key="index" class="select-item">
-                <div class="select-line-icon option-drag">
-                  <i class="el-icon-s-operation" />
-                </div>
-                <el-input v-model="item.label" placeholder="选项名" size="small" />
-                <el-input
-                  placeholder="选项值"
-                  size="small"
-                  :value="item.value"
-                  @input="setOptionValue(item, $event)"
-                />
-                <div class="close-btn select-line-icon" @click="activeData.options.splice(index, 1)">
-                  <i class="el-icon-remove-outline" />
-                </div>
-              </div>
-            </draggable>
-            <div style="margin-left: 20px;">
-              <el-button
-                style="padding-bottom: 0"
-                icon="el-icon-circle-plus-outline"
-                type="text"
-                @click="addSelectItem"
-              >
-                添加选项
-              </el-button>
-            </div>
-            <el-divider />
-          </template>
-
-          <template v-if="['el-cascader'].indexOf(activeData.tag) > -1">
-            <el-divider>选项</el-divider>
-            <el-form-item label="数据类型">
-              <el-radio-group v-model="activeData.dataType" size="small">
-                <el-radio-button label="dynamic">
-                  动态数据
-                </el-radio-button>
-                <el-radio-button label="static">
-                  静态数据
-                </el-radio-button>
-              </el-radio-group>
-            </el-form-item>
-
-            <template v-if="activeData.dataType === 'dynamic'">
-              <el-form-item label="标签键名">
-                <el-input v-model="activeData.labelKey" placeholder="请输入标签键名" />
-              </el-form-item>
-              <el-form-item label="值键名">
-                <el-input v-model="activeData.valueKey" placeholder="请输入值键名" />
-              </el-form-item>
-              <el-form-item label="子级键名">
-                <el-input v-model="activeData.childrenKey" placeholder="请输入子级键名" />
-              </el-form-item>
-            </template>
-
-            <el-tree
-              v-if="activeData.dataType === 'static'"
-              draggable
-              :data="activeData.options"
-              node-key="id"
-              :expand-on-click-node="false"
-              :render-content="renderContent"
-            />
-            <div v-if="activeData.dataType === 'static'" style="margin-left: 20px">
-              <el-button
-                style="padding-bottom: 0"
-                icon="el-icon-circle-plus-outline"
-                type="text"
-                @click="addTreeItem"
-              >
-                添加父级
-              </el-button>
-            </div>
-            <el-divider />
-          </template>
-
-          <el-form-item v-if="activeData.optionType !== undefined" label="选项样式">
-            <el-radio-group v-model="activeData.optionType">
-              <el-radio-button label="default">
-                默认
-              </el-radio-button>
-              <el-radio-button label="button">
-                按钮
-              </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="activeData['active-color'] !== undefined" label="开启颜色">
-            <el-color-picker v-model="activeData['active-color']" />
-          </el-form-item>
-          <el-form-item v-if="activeData['inactive-color'] !== undefined" label="关闭颜色">
-            <el-color-picker v-model="activeData['inactive-color']" />
-          </el-form-item>
-
-          <el-form-item v-if="activeData['allow-half'] !== undefined" label="允许半选">
-            <el-switch v-model="activeData['allow-half']" />
-          </el-form-item>
-          <el-form-item v-if="activeData['show-text'] !== undefined" label="辅助文字">
-            <el-switch v-model="activeData['show-text']" @change="rateTextChange" />
-          </el-form-item>
-          <el-form-item v-if="activeData['show-score'] !== undefined" label="显示分数">
-            <el-switch v-model="activeData['show-score']" @change="rateScoreChange" />
-          </el-form-item>
-          <el-form-item v-if="activeData['show-stops'] !== undefined" label="显示间断点">
-            <el-switch v-model="activeData['show-stops']" />
-          </el-form-item>
-          <el-form-item v-if="activeData.range !== undefined" label="范围选择">
-            <el-switch v-model="activeData.range" @change="rangeChange" />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.border !== undefined && activeData.optionType === 'default'"
-            label="是否带边框"
-          >
-            <el-switch v-model="activeData.border" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-color-picker'" label="颜色格式">
-            <el-select
-              v-model="activeData['color-format']"
-              placeholder="请选择颜色格式"
-              :style="{ width: '100%' }"
-              @change="colorFormatChange"
-            >
-              <el-option
-                v-for="(item, index) in colorFormatOptions"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.size !== undefined &&
-              (activeData.optionType === 'button' ||
-                activeData.border ||
-                activeData.tag === 'el-color-picker')"
-            label="选项尺寸"
-          >
-            <el-radio-group v-model="activeData.size">
-              <el-radio-button label="medium">
-                中等
-              </el-radio-button>
-              <el-radio-button label="small">
-                较小
-              </el-radio-button>
-              <el-radio-button label="mini">
-                迷你
-              </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item v-if="activeData['show-word-limit'] !== undefined" label="输入统计">
-            <el-switch v-model="activeData['show-word-limit']" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-input-number'" label="严格步数">
-            <el-switch v-model="activeData['step-strictly']" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-cascader'" label="是否多选">
-            <el-switch v-model="activeData.props.props.multiple" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-cascader'" label="展示全路径">
-            <el-switch v-model="activeData['show-all-levels']" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-cascader'" label="可否筛选">
-            <el-switch v-model="activeData.filterable" />
-          </el-form-item>
-          <el-form-item v-if="activeData.clearable !== undefined" label="能否清空">
-            <el-switch v-model="activeData.clearable" />
-          </el-form-item>
-          <el-form-item v-if="activeData.showTip !== undefined" label="显示提示">
-            <el-switch v-model="activeData.showTip" />
-          </el-form-item>
-          <el-form-item v-if="activeData.multiple !== undefined" label="多选文件">
-            <el-switch v-model="activeData.multiple" />
-          </el-form-item>
-          <el-form-item v-if="activeData['auto-upload'] !== undefined" label="自动上传">
-            <el-switch v-model="activeData['auto-upload']" />
-          </el-form-item>
-          <el-form-item v-if="activeData.readonly !== undefined" label="是否只读">
-            <el-switch v-model="activeData.readonly" />
-          </el-form-item>
-          <el-form-item v-if="activeData.disabled !== undefined" label="是否禁用">
-            <el-switch v-model="activeData.disabled" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-select'" label="是否可搜索">
-            <el-switch v-model="activeData.filterable" />
-          </el-form-item>
-          <el-form-item v-if="activeData.tag === 'el-select'" label="是否多选">
-            <el-switch v-model="activeData.multiple" @change="multipleChange" />
-          </el-form-item>
-          <el-form-item v-if="activeData.required !== undefined" label="是否必填">
-            <el-switch v-model="activeData.required" />
-          </el-form-item>
-
-          <template v-if="activeData.layoutTree">
-            <el-divider>布局结构树</el-divider>
-            <el-tree
-              :data="[activeData]"
-              :props="layoutTreeProps"
-              node-key="renderKey"
-              default-expand-all
-              draggable
-            >
-              <span slot-scope="{ node, data }">
-                <span class="node-label">
-                  <svg-icon class="node-icon" :icon-class="data.tagIcon" />
-                  {{ node.label }}
-                </span>
-              </span>
-            </el-tree>
-          </template>
-
-          <template v-if="activeData.layout === 'colFormItem' && activeData.tag !== 'el-button'">
-            <el-divider>正则校验</el-divider>
-            <div
-              v-for="(item, index) in activeData.regList"
-              :key="index"
-              class="reg-item"
-            >
-              <span class="close-btn" @click="activeData.regList.splice(index, 1)">
-                <i class="el-icon-close" />
-              </span>
-              <el-form-item label="表达式">
-                <el-input v-model="item.pattern" placeholder="请输入正则" />
-              </el-form-item>
-              <el-form-item label="错误提示" style="margin-bottom:0">
-                <el-input v-model="item.message" placeholder="请输入错误提示" />
-              </el-form-item>
-            </div>
-            <div style="margin-left: 20px">
-              <el-button icon="el-icon-circle-plus-outline" type="text" @click="addReg">
-                添加规则
-              </el-button>
-            </div>
-          </template>
-        </el-form>
-        <!-- 表单属性 -->
-        <el-form v-show="currentTab === 'form'" size="small" label-width="90px">
-          <el-form-item label="表单名">
-            <el-input v-model="formConf.formRef" placeholder="请输入表单名（ref）" />
-          </el-form-item>
-          <el-form-item label="表单模型">
-            <el-input v-model="formConf.formModel" placeholder="请输入数据模型" />
-          </el-form-item>
-          <el-form-item label="校验模型">
-            <el-input v-model="formConf.formRules" placeholder="请输入校验模型" />
-          </el-form-item>
-          <el-form-item label="表单尺寸">
-            <el-radio-group v-model="formConf.size">
-              <el-radio-button label="medium">
-                中等
-              </el-radio-button>
-              <el-radio-button label="small">
-                较小
-              </el-radio-button>
-              <el-radio-button label="mini">
-                迷你
-              </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="标签对齐">
-            <el-radio-group v-model="formConf.labelPosition">
-              <el-radio-button label="left">
-                左对齐
-              </el-radio-button>
-              <el-radio-button label="right">
-                右对齐
-              </el-radio-button>
-              <el-radio-button label="top">
-                顶部对齐
-              </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="标签宽度">
-            <el-input-number v-model="formConf.labelWidth" placeholder="标签宽度" />
-          </el-form-item>
-          <el-form-item label="栅格间隔">
-            <el-input-number v-model="formConf.gutter" :min="0" placeholder="栅格间隔" />
-          </el-form-item>
-          <el-form-item label="禁用表单">
-            <el-switch v-model="formConf.disabled" />
-          </el-form-item>
-          <el-form-item label="表单按钮">
-            <el-switch v-model="formConf.formBtns" />
-          </el-form-item>
-          <el-form-item label="显示未选中组件边框">
-            <el-switch v-model="formConf.unFocusedComponentBorder" />
-          </el-form-item>
-        </el-form>
-      </el-scrollbar>
-    </div>
-
-    <treeNode-dialog :visible.sync="dialogVisible" title="添加选项" @commit="addNode" />
-    <icons-dialog :visible.sync="iconsVisible" :current="activeData[currentIconModel]" @select="setIcon" />
-  </div>
-</template>
-
-<script>
-import { isArray } from 'util'
-import draggable from 'vuedraggable'
-import TreeNodeDialog from './TreeNodeDialog'
-import { isNumberStr } from '@/utils/index'
-import IconsDialog from './IconsDialog'
-import {
-  inputComponents,
-  selectComponents,
-  layoutComponents
-} from '@/utils/generator/config'
-
-const dateTimeFormat = {
-  date: 'yyyy-MM-dd',
-  week: 'yyyy 第 WW 周',
-  month: 'yyyy-MM',
-  year: 'yyyy',
-  datetime: 'yyyy-MM-dd HH:mm:ss',
-  daterange: 'yyyy-MM-dd',
-  monthrange: 'yyyy-MM',
-  datetimerange: 'yyyy-MM-dd HH:mm:ss'
-}
-
-export default {
-  components: {
-    draggable,
-    TreeNodeDialog,
-    IconsDialog
-  },
-  props: ['showField', 'activeData', 'formConf'],
-  data() {
-    return {
-      currentTab: 'field',
-      currentNode: null,
-      dialogVisible: false,
-      iconsVisible: false,
-      currentIconModel: null,
-      dateTypeOptions: [
-        {
-          label: '日(date)',
-          value: 'date'
-        },
-        {
-          label: '周(week)',
-          value: 'week'
-        },
-        {
-          label: '月(month)',
-          value: 'month'
-        },
-        {
-          label: '年(year)',
-          value: 'year'
-        },
-        {
-          label: '日期时间(datetime)',
-          value: 'datetime'
-        }
-      ],
-      dateRangeTypeOptions: [
-        {
-          label: '日期范围(daterange)',
-          value: 'daterange'
-        },
-        {
-          label: '月范围(monthrange)',
-          value: 'monthrange'
-        },
-        {
-          label: '日期时间范围(datetimerange)',
-          value: 'datetimerange'
-        }
-      ],
-      colorFormatOptions: [
-        {
-          label: 'hex',
-          value: 'hex'
-        },
-        {
-          label: 'rgb',
-          value: 'rgb'
-        },
-        {
-          label: 'rgba',
-          value: 'rgba'
-        },
-        {
-          label: 'hsv',
-          value: 'hsv'
-        },
-        {
-          label: 'hsl',
-          value: 'hsl'
-        }
-      ],
-      justifyOptions: [
-        {
-          label: 'start',
-          value: 'start'
-        },
-        {
-          label: 'end',
-          value: 'end'
-        },
-        {
-          label: 'center',
-          value: 'center'
-        },
-        {
-          label: 'space-around',
-          value: 'space-around'
-        },
-        {
-          label: 'space-between',
-          value: 'space-between'
-        }
-      ],
-      layoutTreeProps: {
-        label(data, node) {
-          return data.componentName || `${data.label}: ${data.vModel}`
-        }
-      }
-    }
-  },
-  computed: {
-    documentLink() {
-      return (
-        this.activeData.document
-        || 'https://element.eleme.cn/#/zh-CN/component/installation'
-      )
-    },
-    dateOptions() {
-      if (
-        this.activeData.type !== undefined
-        && this.activeData.tag === 'el-date-picker'
-      ) {
-        if (this.activeData['start-placeholder'] === undefined) {
-          return this.dateTypeOptions
-        }
-        return this.dateRangeTypeOptions
-      }
-      return []
-    },
-    tagList() {
-      return [
-        {
-          label: '输入型组件',
-          options: inputComponents
-        },
-        {
-          label: '选择型组件',
-          options: selectComponents
-        }
-      ]
-    }
-  },
-  methods: {
-    addReg() {
-      this.activeData.regList.push({
-        pattern: '',
-        message: ''
-      })
-    },
-    addSelectItem() {
-      this.activeData.options.push({
-        label: '',
-        value: ''
-      })
-    },
-    addTreeItem() {
-      ++this.idGlobal
-      this.dialogVisible = true
-      this.currentNode = this.activeData.options
-    },
-    renderContent(h, { node, data, store }) {
-      return (
-        <div class="custom-tree-node">
-          <span>{node.label}</span>
-          <span class="node-operation">
-            <i on-click={() => this.append(data)}
-              class="el-icon-plus"
-              title="添加"
-            ></i>
-            <i on-click={() => this.remove(node, data)}
-              class="el-icon-delete"
-              title="删除"
-            ></i>
-          </span>
-        </div>
-      )
-    },
-    append(data) {
-      if (!data.children) {
-        this.$set(data, 'children', [])
-      }
-      this.dialogVisible = true
-      this.currentNode = data.children
-    },
-    remove(node, data) {
-      const { parent } = node
-      const children = parent.data.children || parent.data
-      const index = children.findIndex(d => d.id === data.id)
-      children.splice(index, 1)
-    },
-    addNode(data) {
-      this.currentNode.push(data)
-    },
-    setOptionValue(item, val) {
-      item.value = isNumberStr(val) ? +val : val
-    },
-    setDefaultValue(val) {
-      if (Array.isArray(val)) {
-        return val.join(',')
-      }
-      if (['string', 'number'].indexOf(val) > -1) {
-        return val
-      }
-      if (typeof val === 'boolean') {
-        return `${val}`
-      }
-      return val
-    },
-    onDefaultValueInput(str) {
-      if (isArray(this.activeData.defaultValue)) {
-        // 数组
-        this.$set(
-          this.activeData,
-          'defaultValue',
-          str.split(',').map(val => (isNumberStr(val) ? +val : val))
-        )
-      } else if (['true', 'false'].indexOf(str) > -1) {
-        // 布尔
-        this.$set(this.activeData, 'defaultValue', JSON.parse(str))
-      } else {
-        // 字符串和数字
-        this.$set(
-          this.activeData,
-          'defaultValue',
-          isNumberStr(str) ? +str : str
-        )
-      }
-    },
-    onSwitchValueInput(val, name) {
-      if (['true', 'false'].indexOf(val) > -1) {
-        this.$set(this.activeData, name, JSON.parse(val))
-      } else {
-        this.$set(this.activeData, name, isNumberStr(val) ? +val : val)
-      }
-    },
-    setTimeValue(val, type) {
-      const valueFormat = type === 'week' ? dateTimeFormat.date : val
-      this.$set(this.activeData, 'defaultValue', null)
-      this.$set(this.activeData, 'value-format', valueFormat)
-      this.$set(this.activeData, 'format', val)
-    },
-    spanChange(val) {
-      this.formConf.span = val
-    },
-    multipleChange(val) {
-      this.$set(this.activeData, 'defaultValue', val ? [] : '')
-    },
-    dateTypeChange(val) {
-      this.setTimeValue(dateTimeFormat[val], val)
-    },
-    rangeChange(val) {
-      this.$set(
-        this.activeData,
-        'defaultValue',
-        val ? [this.activeData.min, this.activeData.max] : this.activeData.min
-      )
-    },
-    rateTextChange(val) {
-      if (val) this.activeData['show-score'] = false
-    },
-    rateScoreChange(val) {
-      if (val) this.activeData['show-text'] = false
-    },
-    colorFormatChange(val) {
-      this.activeData.defaultValue = null
-      this.activeData['show-alpha'] = val.indexOf('a') > -1
-      this.activeData.renderKey = +new Date() // 更新renderKey,重新渲染该组件
-    },
-    openIconsDialog(model) {
-      this.iconsVisible = true
-      this.currentIconModel = model
-    },
-    setIcon(val) {
-      this.activeData[this.currentIconModel] = val
-    },
-    tagChange(tagIcon) {
-      let target = inputComponents.find(item => item.tagIcon === tagIcon)
-      if (!target) target = selectComponents.find(item => item.tagIcon === tagIcon)
-      this.$emit('tag-change', target)
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.right-board {
-  width: 350px;
-  position: absolute;
-  right: 0;
-  top: 0;
-  padding-top: 3px;
-  .field-box {
-    position: relative;
-    height: calc(100vh - 42px);
-    box-sizing: border-box;
-    overflow: hidden;
-  }
-  .el-scrollbar {
-    height: 100%;
-  }
-}
-.select-item {
-  display: flex;
-  border: 1px dashed #fff;
-  box-sizing: border-box;
-  & .close-btn {
-    cursor: pointer;
-    color: #f56c6c;
-  }
-  & .el-input + .el-input {
-    margin-left: 4px;
-  }
-}
-.select-item + .select-item {
-  margin-top: 4px;
-}
-.select-item.sortable-chosen {
-  border: 1px dashed #409eff;
-}
-.select-line-icon {
-  line-height: 32px;
-  font-size: 22px;
-  padding: 0 4px;
-  color: #777;
-}
-.option-drag {
-  cursor: move;
-}
-.time-range {
-  .el-date-editor {
-    width: 227px;
-  }
-  ::v-deep .el-icon-time {
-    display: none;
-  }
-}
-.document-link {
-  position: absolute;
-  display: block;
-  width: 26px;
-  height: 26px;
-  top: 0;
-  left: 0;
-  cursor: pointer;
-  background: #409eff;
-  z-index: 1;
-  border-radius: 0 0 6px 0;
-  text-align: center;
-  line-height: 26px;
-  color: #fff;
-  font-size: 18px;
-}
-.node-label{
-  font-size: 14px;
-}
-.node-icon{
-  color: #bebfc3;
-}
-</style>
+<template>
+  <div class="right-board">
+    <el-tabs v-model="currentTab" class="center-tabs">
+      <el-tab-pane label="组件属性" name="field" />
+      <el-tab-pane label="表单属性" name="form" />
+    </el-tabs>
+    <div class="field-box">
+      <a class="document-link" target="_blank" :href="documentLink" title="查看组件文档">
+        <i class="el-icon-link" />
+      </a>
+      <el-scrollbar class="right-scrollbar">
+        <!-- 组件属性 -->
+        <el-form v-show="currentTab==='field' && showField" size="small" label-width="90px">
+          <el-form-item v-if="activeData.changeTag" label="组件类型">
+            <el-select
+              v-model="activeData.tagIcon"
+              placeholder="请选择组件类型"
+              :style="{width: '100%'}"
+              @change="tagChange"
+            >
+              <el-option-group v-for="group in tagList" :key="group.label" :label="group.label">
+                <el-option
+                  v-for="item in group.options"
+                  :key="item.label"
+                  :label="item.label"
+                  :value="item.tagIcon"
+                >
+                  <svg-icon class="node-icon" :icon-class="item.tagIcon" />
+                  <span> {{ item.label }}</span>
+                </el-option>
+              </el-option-group>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="activeData.vModel!==undefined" label="字段名">
+            <el-input v-model="activeData.vModel" placeholder="请输入字段名（v-model）" />
+          </el-form-item>
+          <el-form-item v-if="activeData.componentName!==undefined" label="组件名">
+            {{ activeData.componentName }}
+          </el-form-item>
+          <el-form-item v-if="activeData.label!==undefined" label="标题">
+            <el-input v-model="activeData.label" placeholder="请输入标题" />
+          </el-form-item>
+          <el-form-item v-if="activeData.placeholder!==undefined" label="占位提示">
+            <el-input v-model="activeData.placeholder" placeholder="请输入占位提示" />
+          </el-form-item>
+          <el-form-item v-if="activeData['start-placeholder']!==undefined" label="开始占位">
+            <el-input v-model="activeData['start-placeholder']" placeholder="请输入占位提示" />
+          </el-form-item>
+          <el-form-item v-if="activeData['end-placeholder']!==undefined" label="结束占位">
+            <el-input v-model="activeData['end-placeholder']" placeholder="请输入占位提示" />
+          </el-form-item>
+          <el-form-item v-if="activeData.span!==undefined" label="表单栅格">
+            <el-slider v-model="activeData.span" :max="24" :min="1" :marks="{12:''}" @change="spanChange" />
+          </el-form-item>
+          <el-form-item v-if="activeData.layout==='rowFormItem'" label="栅格间隔">
+            <el-input-number v-model="activeData.gutter" :min="0" placeholder="栅格间隔" />
+          </el-form-item>
+          <el-form-item v-if="activeData.layout==='rowFormItem'" label="布局模式">
+            <el-radio-group v-model="activeData.type">
+              <el-radio-button label="default" />
+              <el-radio-button label="flex" />
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="activeData.justify!==undefined&&activeData.type==='flex'" label="水平排列">
+            <el-select v-model="activeData.justify" placeholder="请选择水平排列" :style="{width: '100%'}">
+              <el-option
+                v-for="(item, index) in justifyOptions"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="activeData.align!==undefined&&activeData.type==='flex'" label="垂直排列">
+            <el-radio-group v-model="activeData.align">
+              <el-radio-button label="top" />
+              <el-radio-button label="middle" />
+              <el-radio-button label="bottom" />
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="activeData.labelWidth!==undefined" label="标签宽度">
+            <el-input v-model.number="activeData.labelWidth" type="number" placeholder="请输入标签宽度" />
+          </el-form-item>
+          <el-form-item v-if="activeData.style&&activeData.style.width!==undefined" label="组件宽度">
+            <el-input v-model="activeData.style.width" placeholder="请输入组件宽度" clearable />
+          </el-form-item>
+          <el-form-item v-if="activeData.vModel!==undefined" label="默认值">
+            <el-input
+              :value="setDefaultValue(activeData.defaultValue)"
+              placeholder="请输入默认值"
+              @input="onDefaultValueInput"
+            />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag==='el-checkbox-group'" label="至少应选">
+            <el-input-number
+              :value="activeData.min"
+              :min="0"
+              placeholder="至少应选"
+              @input="$set(activeData, 'min', $event?$event:undefined)"
+            />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag==='el-checkbox-group'" label="最多可选">
+            <el-input-number
+              :value="activeData.max"
+              :min="0"
+              placeholder="最多可选"
+              @input="$set(activeData, 'max', $event?$event:undefined)"
+            />
+          </el-form-item>
+          <el-form-item v-if="activeData.prepend!==undefined" label="前缀">
+            <el-input v-model="activeData.prepend" placeholder="请输入前缀" />
+          </el-form-item>
+          <el-form-item v-if="activeData.append!==undefined" label="后缀">
+            <el-input v-model="activeData.append" placeholder="请输入后缀" />
+          </el-form-item>
+          <el-form-item v-if="activeData['prefix-icon']!==undefined" label="前图标">
+            <el-input v-model="activeData['prefix-icon']" placeholder="请输入前图标名称">
+              <el-button slot="append" icon="el-icon-thumb" @click="openIconsDialog('prefix-icon')">
+                选择
+              </el-button>
+            </el-input>
+          </el-form-item>
+          <el-form-item v-if="activeData['suffix-icon'] !== undefined" label="后图标">
+            <el-input v-model="activeData['suffix-icon']" placeholder="请输入后图标名称">
+              <el-button slot="append" icon="el-icon-thumb" @click="openIconsDialog('suffix-icon')">
+                选择
+              </el-button>
+            </el-input>
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-cascader'" label="选项分隔符">
+            <el-input v-model="activeData.separator" placeholder="请输入选项分隔符" />
+          </el-form-item>
+          <el-form-item v-if="activeData.autosize !== undefined" label="最小行数">
+            <el-input-number v-model="activeData.autosize.minRows" :min="1" placeholder="最小行数" />
+          </el-form-item>
+          <el-form-item v-if="activeData.autosize !== undefined" label="最大行数">
+            <el-input-number v-model="activeData.autosize.maxRows" :min="1" placeholder="最大行数" />
+          </el-form-item>
+          <el-form-item v-if="activeData.min !== undefined" label="最小值">
+            <el-input-number v-model="activeData.min" placeholder="最小值" />
+          </el-form-item>
+          <el-form-item v-if="activeData.max !== undefined" label="最大值">
+            <el-input-number v-model="activeData.max" placeholder="最大值" />
+          </el-form-item>
+          <el-form-item v-if="activeData.step !== undefined" label="步长">
+            <el-input-number v-model="activeData.step" placeholder="步数" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-input-number'" label="精度">
+            <el-input-number v-model="activeData.precision" :min="0" placeholder="精度" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-input-number'" label="按钮位置">
+            <el-radio-group v-model="activeData['controls-position']">
+              <el-radio-button label="">
+                默认
+              </el-radio-button>
+              <el-radio-button label="right">
+                右侧
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="activeData.maxlength !== undefined" label="最多输入">
+            <el-input v-model="activeData.maxlength" placeholder="请输入字符长度">
+              <template slot="append">
+                个字符
+              </template>
+            </el-input>
+          </el-form-item>
+          <el-form-item v-if="activeData['active-text'] !== undefined" label="开启提示">
+            <el-input v-model="activeData['active-text']" placeholder="请输入开启提示" />
+          </el-form-item>
+          <el-form-item v-if="activeData['inactive-text'] !== undefined" label="关闭提示">
+            <el-input v-model="activeData['inactive-text']" placeholder="请输入关闭提示" />
+          </el-form-item>
+          <el-form-item v-if="activeData['active-value'] !== undefined" label="开启值">
+            <el-input
+              :value="setDefaultValue(activeData['active-value'])"
+              placeholder="请输入开启值"
+              @input="onSwitchValueInput($event, 'active-value')"
+            />
+          </el-form-item>
+          <el-form-item v-if="activeData['inactive-value'] !== undefined" label="关闭值">
+            <el-input
+              :value="setDefaultValue(activeData['inactive-value'])"
+              placeholder="请输入关闭值"
+              @input="onSwitchValueInput($event, 'inactive-value')"
+            />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.type !== undefined && 'el-date-picker' === activeData.tag"
+            label="时间类型"
+          >
+            <el-select
+              v-model="activeData.type"
+              placeholder="请选择时间类型"
+              :style="{ width: '100%' }"
+              @change="dateTypeChange"
+            >
+              <el-option
+                v-for="(item, index) in dateOptions"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="activeData.name !== undefined" label="文件字段名">
+            <el-input v-model="activeData.name" placeholder="请输入上传文件字段名" />
+          </el-form-item>
+          <el-form-item v-if="activeData.accept !== undefined" label="文件类型">
+            <el-select
+              v-model="activeData.accept"
+              placeholder="请选择文件类型"
+              :style="{ width: '100%' }"
+              clearable
+            >
+              <el-option label="图片" value="image/*" />
+              <el-option label="视频" value="video/*" />
+              <el-option label="音频" value="audio/*" />
+              <el-option label="excel" value=".xls,.xlsx" />
+              <el-option label="word" value=".doc,.docx" />
+              <el-option label="pdf" value=".pdf" />
+              <el-option label="txt" value=".txt" />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="activeData.fileSize !== undefined" label="文件大小">
+            <el-input v-model.number="activeData.fileSize" placeholder="请输入文件大小">
+              <el-select slot="append" v-model="activeData.sizeUnit" :style="{ width: '66px' }">
+                <el-option label="KB" value="KB" />
+                <el-option label="MB" value="MB" />
+                <el-option label="GB" value="GB" />
+              </el-select>
+            </el-input>
+          </el-form-item>
+          <el-form-item v-if="activeData.action !== undefined" label="上传地址">
+            <el-input v-model="activeData.action" placeholder="请输入上传地址" clearable />
+          </el-form-item>
+          <el-form-item v-if="activeData['list-type'] !== undefined" label="列表类型">
+            <el-radio-group v-model="activeData['list-type']" size="small">
+              <el-radio-button label="text">
+                text
+              </el-radio-button>
+              <el-radio-button label="picture">
+                picture
+              </el-radio-button>
+              <el-radio-button label="picture-card">
+                picture-card
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.buttonText !== undefined"
+            v-show="'picture-card' !== activeData['list-type']"
+            label="按钮文字"
+          >
+            <el-input v-model="activeData.buttonText" placeholder="请输入按钮文字" />
+          </el-form-item>
+          <el-form-item v-if="activeData['range-separator'] !== undefined" label="分隔符">
+            <el-input v-model="activeData['range-separator']" placeholder="请输入分隔符" />
+          </el-form-item>
+          <el-form-item v-if="activeData['picker-options'] !== undefined" label="时间段">
+            <el-input
+              v-model="activeData['picker-options'].selectableRange"
+              placeholder="请输入时间段"
+            />
+          </el-form-item>
+          <el-form-item v-if="activeData.format !== undefined" label="时间格式">
+            <el-input
+              :value="activeData.format"
+              placeholder="请输入时间格式"
+              @input="setTimeValue($event)"
+            />
+          </el-form-item>
+          <template v-if="['el-checkbox-group', 'el-radio-group', 'el-select'].indexOf(activeData.tag) > -1">
+            <el-divider>选项</el-divider>
+            <draggable
+              :list="activeData.options"
+              :animation="340"
+              group="selectItem"
+              handle=".option-drag"
+            >
+              <div v-for="(item, index) in activeData.options" :key="index" class="select-item">
+                <div class="select-line-icon option-drag">
+                  <i class="el-icon-s-operation" />
+                </div>
+                <el-input v-model="item.label" placeholder="选项名" size="small" />
+                <el-input
+                  placeholder="选项值"
+                  size="small"
+                  :value="item.value"
+                  @input="setOptionValue(item, $event)"
+                />
+                <div class="close-btn select-line-icon" @click="activeData.options.splice(index, 1)">
+                  <i class="el-icon-remove-outline" />
+                </div>
+              </div>
+            </draggable>
+            <div style="margin-left: 20px;">
+              <el-button
+                style="padding-bottom: 0"
+                icon="el-icon-circle-plus-outline"
+                type="text"
+                @click="addSelectItem"
+              >
+                添加选项
+              </el-button>
+            </div>
+            <el-divider />
+          </template>
+
+          <template v-if="['el-cascader'].indexOf(activeData.tag) > -1">
+            <el-divider>选项</el-divider>
+            <el-form-item label="数据类型">
+              <el-radio-group v-model="activeData.dataType" size="small">
+                <el-radio-button label="dynamic">
+                  动态数据
+                </el-radio-button>
+                <el-radio-button label="static">
+                  静态数据
+                </el-radio-button>
+              </el-radio-group>
+            </el-form-item>
+
+            <template v-if="activeData.dataType === 'dynamic'">
+              <el-form-item label="标签键名">
+                <el-input v-model="activeData.labelKey" placeholder="请输入标签键名" />
+              </el-form-item>
+              <el-form-item label="值键名">
+                <el-input v-model="activeData.valueKey" placeholder="请输入值键名" />
+              </el-form-item>
+              <el-form-item label="子级键名">
+                <el-input v-model="activeData.childrenKey" placeholder="请输入子级键名" />
+              </el-form-item>
+            </template>
+
+            <el-tree
+              v-if="activeData.dataType === 'static'"
+              draggable
+              :data="activeData.options"
+              node-key="id"
+              :expand-on-click-node="false"
+              :render-content="renderContent"
+            />
+            <div v-if="activeData.dataType === 'static'" style="margin-left: 20px">
+              <el-button
+                style="padding-bottom: 0"
+                icon="el-icon-circle-plus-outline"
+                type="text"
+                @click="addTreeItem"
+              >
+                添加父级
+              </el-button>
+            </div>
+            <el-divider />
+          </template>
+
+          <el-form-item v-if="activeData.optionType !== undefined" label="选项样式">
+            <el-radio-group v-model="activeData.optionType">
+              <el-radio-button label="default">
+                默认
+              </el-radio-button>
+              <el-radio-button label="button">
+                按钮
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="activeData['active-color'] !== undefined" label="开启颜色">
+            <el-color-picker v-model="activeData['active-color']" />
+          </el-form-item>
+          <el-form-item v-if="activeData['inactive-color'] !== undefined" label="关闭颜色">
+            <el-color-picker v-model="activeData['inactive-color']" />
+          </el-form-item>
+
+          <el-form-item v-if="activeData['allow-half'] !== undefined" label="允许半选">
+            <el-switch v-model="activeData['allow-half']" />
+          </el-form-item>
+          <el-form-item v-if="activeData['show-text'] !== undefined" label="辅助文字">
+            <el-switch v-model="activeData['show-text']" @change="rateTextChange" />
+          </el-form-item>
+          <el-form-item v-if="activeData['show-score'] !== undefined" label="显示分数">
+            <el-switch v-model="activeData['show-score']" @change="rateScoreChange" />
+          </el-form-item>
+          <el-form-item v-if="activeData['show-stops'] !== undefined" label="显示间断点">
+            <el-switch v-model="activeData['show-stops']" />
+          </el-form-item>
+          <el-form-item v-if="activeData.range !== undefined" label="范围选择">
+            <el-switch v-model="activeData.range" @change="rangeChange" />
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.border !== undefined && activeData.optionType === 'default'"
+            label="是否带边框"
+          >
+            <el-switch v-model="activeData.border" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-color-picker'" label="颜色格式">
+            <el-select
+              v-model="activeData['color-format']"
+              placeholder="请选择颜色格式"
+              :style="{ width: '100%' }"
+              @change="colorFormatChange"
+            >
+              <el-option
+                v-for="(item, index) in colorFormatOptions"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="activeData.size !== undefined &&
+              (activeData.optionType === 'button' ||
+                activeData.border ||
+                activeData.tag === 'el-color-picker')"
+            label="选项尺寸"
+          >
+            <el-radio-group v-model="activeData.size">
+              <el-radio-button label="medium">
+                中等
+              </el-radio-button>
+              <el-radio-button label="small">
+                较小
+              </el-radio-button>
+              <el-radio-button label="mini">
+                迷你
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="activeData['show-word-limit'] !== undefined" label="输入统计">
+            <el-switch v-model="activeData['show-word-limit']" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-input-number'" label="严格步数">
+            <el-switch v-model="activeData['step-strictly']" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-cascader'" label="是否多选">
+            <el-switch v-model="activeData.props.props.multiple" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-cascader'" label="展示全路径">
+            <el-switch v-model="activeData['show-all-levels']" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-cascader'" label="可否筛选">
+            <el-switch v-model="activeData.filterable" />
+          </el-form-item>
+          <el-form-item v-if="activeData.clearable !== undefined" label="能否清空">
+            <el-switch v-model="activeData.clearable" />
+          </el-form-item>
+          <el-form-item v-if="activeData.showTip !== undefined" label="显示提示">
+            <el-switch v-model="activeData.showTip" />
+          </el-form-item>
+          <el-form-item v-if="activeData.multiple !== undefined" label="多选文件">
+            <el-switch v-model="activeData.multiple" />
+          </el-form-item>
+          <el-form-item v-if="activeData['auto-upload'] !== undefined" label="自动上传">
+            <el-switch v-model="activeData['auto-upload']" />
+          </el-form-item>
+          <el-form-item v-if="activeData.readonly !== undefined" label="是否只读">
+            <el-switch v-model="activeData.readonly" />
+          </el-form-item>
+          <el-form-item v-if="activeData.disabled !== undefined" label="是否禁用">
+            <el-switch v-model="activeData.disabled" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-select'" label="是否可搜索">
+            <el-switch v-model="activeData.filterable" />
+          </el-form-item>
+          <el-form-item v-if="activeData.tag === 'el-select'" label="是否多选">
+            <el-switch v-model="activeData.multiple" @change="multipleChange" />
+          </el-form-item>
+          <el-form-item v-if="activeData.required !== undefined" label="是否必填">
+            <el-switch v-model="activeData.required" />
+          </el-form-item>
+
+          <template v-if="activeData.layoutTree">
+            <el-divider>布局结构树</el-divider>
+            <el-tree
+              :data="[activeData]"
+              :props="layoutTreeProps"
+              node-key="renderKey"
+              default-expand-all
+              draggable
+            >
+              <span slot-scope="{ node, data }">
+                <span class="node-label">
+                  <svg-icon class="node-icon" :icon-class="data.tagIcon" />
+                  {{ node.label }}
+                </span>
+              </span>
+            </el-tree>
+          </template>
+
+          <template v-if="activeData.layout === 'colFormItem' && activeData.tag !== 'el-button'">
+            <el-divider>正则校验</el-divider>
+            <div
+              v-for="(item, index) in activeData.regList"
+              :key="index"
+              class="reg-item"
+            >
+              <span class="close-btn" @click="activeData.regList.splice(index, 1)">
+                <i class="el-icon-close" />
+              </span>
+              <el-form-item label="表达式">
+                <el-input v-model="item.pattern" placeholder="请输入正则" />
+              </el-form-item>
+              <el-form-item label="错误提示" style="margin-bottom:0">
+                <el-input v-model="item.message" placeholder="请输入错误提示" />
+              </el-form-item>
+            </div>
+            <div style="margin-left: 20px">
+              <el-button icon="el-icon-circle-plus-outline" type="text" @click="addReg">
+                添加规则
+              </el-button>
+            </div>
+          </template>
+        </el-form>
+        <!-- 表单属性 -->
+        <el-form v-show="currentTab === 'form'" size="small" label-width="90px">
+          <el-form-item label="表单名">
+            <el-input v-model="formConf.formRef" placeholder="请输入表单名（ref）" />
+          </el-form-item>
+          <el-form-item label="表单模型">
+            <el-input v-model="formConf.formModel" placeholder="请输入数据模型" />
+          </el-form-item>
+          <el-form-item label="校验模型">
+            <el-input v-model="formConf.formRules" placeholder="请输入校验模型" />
+          </el-form-item>
+          <el-form-item label="表单尺寸">
+            <el-radio-group v-model="formConf.size">
+              <el-radio-button label="medium">
+                中等
+              </el-radio-button>
+              <el-radio-button label="small">
+                较小
+              </el-radio-button>
+              <el-radio-button label="mini">
+                迷你
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="标签对齐">
+            <el-radio-group v-model="formConf.labelPosition">
+              <el-radio-button label="left">
+                左对齐
+              </el-radio-button>
+              <el-radio-button label="right">
+                右对齐
+              </el-radio-button>
+              <el-radio-button label="top">
+                顶部对齐
+              </el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="标签宽度">
+            <el-input-number v-model="formConf.labelWidth" placeholder="标签宽度" />
+          </el-form-item>
+          <el-form-item label="栅格间隔">
+            <el-input-number v-model="formConf.gutter" :min="0" placeholder="栅格间隔" />
+          </el-form-item>
+          <el-form-item label="禁用表单">
+            <el-switch v-model="formConf.disabled" />
+          </el-form-item>
+          <el-form-item label="表单按钮">
+            <el-switch v-model="formConf.formBtns" />
+          </el-form-item>
+          <el-form-item label="显示未选中组件边框">
+            <el-switch v-model="formConf.unFocusedComponentBorder" />
+          </el-form-item>
+        </el-form>
+      </el-scrollbar>
+    </div>
+
+    <treeNode-dialog :visible.sync="dialogVisible" title="添加选项" @commit="addNode" />
+    <icons-dialog :visible.sync="iconsVisible" :current="activeData[currentIconModel]" @select="setIcon" />
+  </div>
+</template>
+
+<script>
+import { isArray } from 'util'
+import draggable from 'vuedraggable'
+import TreeNodeDialog from './TreeNodeDialog'
+import { isNumberStr } from '@/utils/index'
+import IconsDialog from './IconsDialog'
+import {
+  inputComponents,
+  selectComponents,
+  layoutComponents
+} from '@/utils/generator/config'
+
+const dateTimeFormat = {
+  date: 'yyyy-MM-dd',
+  week: 'yyyy 第 WW 周',
+  month: 'yyyy-MM',
+  year: 'yyyy',
+  datetime: 'yyyy-MM-dd HH:mm:ss',
+  daterange: 'yyyy-MM-dd',
+  monthrange: 'yyyy-MM',
+  datetimerange: 'yyyy-MM-dd HH:mm:ss'
+}
+
+export default {
+  components: {
+    draggable,
+    TreeNodeDialog,
+    IconsDialog
+  },
+  props: ['showField', 'activeData', 'formConf'],
+  data() {
+    return {
+      currentTab: 'field',
+      currentNode: null,
+      dialogVisible: false,
+      iconsVisible: false,
+      currentIconModel: null,
+      dateTypeOptions: [
+        {
+          label: '日(date)',
+          value: 'date'
+        },
+        {
+          label: '周(week)',
+          value: 'week'
+        },
+        {
+          label: '月(month)',
+          value: 'month'
+        },
+        {
+          label: '年(year)',
+          value: 'year'
+        },
+        {
+          label: '日期时间(datetime)',
+          value: 'datetime'
+        }
+      ],
+      dateRangeTypeOptions: [
+        {
+          label: '日期范围(daterange)',
+          value: 'daterange'
+        },
+        {
+          label: '月范围(monthrange)',
+          value: 'monthrange'
+        },
+        {
+          label: '日期时间范围(datetimerange)',
+          value: 'datetimerange'
+        }
+      ],
+      colorFormatOptions: [
+        {
+          label: 'hex',
+          value: 'hex'
+        },
+        {
+          label: 'rgb',
+          value: 'rgb'
+        },
+        {
+          label: 'rgba',
+          value: 'rgba'
+        },
+        {
+          label: 'hsv',
+          value: 'hsv'
+        },
+        {
+          label: 'hsl',
+          value: 'hsl'
+        }
+      ],
+      justifyOptions: [
+        {
+          label: 'start',
+          value: 'start'
+        },
+        {
+          label: 'end',
+          value: 'end'
+        },
+        {
+          label: 'center',
+          value: 'center'
+        },
+        {
+          label: 'space-around',
+          value: 'space-around'
+        },
+        {
+          label: 'space-between',
+          value: 'space-between'
+        }
+      ],
+      layoutTreeProps: {
+        label(data, node) {
+          return data.componentName || `${data.label}: ${data.vModel}`
+        }
+      }
+    }
+  },
+  computed: {
+    documentLink() {
+      return (
+        this.activeData.document
+        || 'https://element.eleme.cn/#/zh-CN/component/installation'
+      )
+    },
+    dateOptions() {
+      if (
+        this.activeData.type !== undefined
+        && this.activeData.tag === 'el-date-picker'
+      ) {
+        if (this.activeData['start-placeholder'] === undefined) {
+          return this.dateTypeOptions
+        }
+        return this.dateRangeTypeOptions
+      }
+      return []
+    },
+    tagList() {
+      return [
+        {
+          label: '输入型组件',
+          options: inputComponents
+        },
+        {
+          label: '选择型组件',
+          options: selectComponents
+        }
+      ]
+    }
+  },
+  methods: {
+    addReg() {
+      this.activeData.regList.push({
+        pattern: '',
+        message: ''
+      })
+    },
+    addSelectItem() {
+      this.activeData.options.push({
+        label: '',
+        value: ''
+      })
+    },
+    addTreeItem() {
+      ++this.idGlobal
+      this.dialogVisible = true
+      this.currentNode = this.activeData.options
+    },
+    renderContent(h, { node, data, store }) {
+      return (
+        <div class="custom-tree-node">
+          <span>{node.label}</span>
+          <span class="node-operation">
+            <i on-click={() => this.append(data)}
+              class="el-icon-plus"
+              title="添加"
+            ></i>
+            <i on-click={() => this.remove(node, data)}
+              class="el-icon-delete"
+              title="删除"
+            ></i>
+          </span>
+        </div>
+      )
+    },
+    append(data) {
+      if (!data.children) {
+        this.$set(data, 'children', [])
+      }
+      this.dialogVisible = true
+      this.currentNode = data.children
+    },
+    remove(node, data) {
+      const { parent } = node
+      const children = parent.data.children || parent.data
+      const index = children.findIndex(d => d.id === data.id)
+      children.splice(index, 1)
+    },
+    addNode(data) {
+      this.currentNode.push(data)
+    },
+    setOptionValue(item, val) {
+      item.value = isNumberStr(val) ? +val : val
+    },
+    setDefaultValue(val) {
+      if (Array.isArray(val)) {
+        return val.join(',')
+      }
+      if (['string', 'number'].indexOf(val) > -1) {
+        return val
+      }
+      if (typeof val === 'boolean') {
+        return `${val}`
+      }
+      return val
+    },
+    onDefaultValueInput(str) {
+      if (isArray(this.activeData.defaultValue)) {
+        // 数组
+        this.$set(
+          this.activeData,
+          'defaultValue',
+          str.split(',').map(val => (isNumberStr(val) ? +val : val))
+        )
+      } else if (['true', 'false'].indexOf(str) > -1) {
+        // 布尔
+        this.$set(this.activeData, 'defaultValue', JSON.parse(str))
+      } else {
+        // 字符串和数字
+        this.$set(
+          this.activeData,
+          'defaultValue',
+          isNumberStr(str) ? +str : str
+        )
+      }
+    },
+    onSwitchValueInput(val, name) {
+      if (['true', 'false'].indexOf(val) > -1) {
+        this.$set(this.activeData, name, JSON.parse(val))
+      } else {
+        this.$set(this.activeData, name, isNumberStr(val) ? +val : val)
+      }
+    },
+    setTimeValue(val, type) {
+      const valueFormat = type === 'week' ? dateTimeFormat.date : val
+      this.$set(this.activeData, 'defaultValue', null)
+      this.$set(this.activeData, 'value-format', valueFormat)
+      this.$set(this.activeData, 'format', val)
+    },
+    spanChange(val) {
+      this.formConf.span = val
+    },
+    multipleChange(val) {
+      this.$set(this.activeData, 'defaultValue', val ? [] : '')
+    },
+    dateTypeChange(val) {
+      this.setTimeValue(dateTimeFormat[val], val)
+    },
+    rangeChange(val) {
+      this.$set(
+        this.activeData,
+        'defaultValue',
+        val ? [this.activeData.min, this.activeData.max] : this.activeData.min
+      )
+    },
+    rateTextChange(val) {
+      if (val) this.activeData['show-score'] = false
+    },
+    rateScoreChange(val) {
+      if (val) this.activeData['show-text'] = false
+    },
+    colorFormatChange(val) {
+      this.activeData.defaultValue = null
+      this.activeData['show-alpha'] = val.indexOf('a') > -1
+      this.activeData.renderKey = +new Date() // 更新renderKey,重新渲染该组件
+    },
+    openIconsDialog(model) {
+      this.iconsVisible = true
+      this.currentIconModel = model
+    },
+    setIcon(val) {
+      this.activeData[this.currentIconModel] = val
+    },
+    tagChange(tagIcon) {
+      let target = inputComponents.find(item => item.tagIcon === tagIcon)
+      if (!target) target = selectComponents.find(item => item.tagIcon === tagIcon)
+      this.$emit('tag-change', target)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.right-board {
+  width: 350px;
+  position: absolute;
+  right: 0;
+  top: 0;
+  padding-top: 3px;
+  .field-box {
+    position: relative;
+    height: calc(100vh - 42px);
+    box-sizing: border-box;
+    overflow: hidden;
+  }
+  .el-scrollbar {
+    height: 100%;
+  }
+}
+.select-item {
+  display: flex;
+  border: 1px dashed #fff;
+  box-sizing: border-box;
+  & .close-btn {
+    cursor: pointer;
+    color: #f56c6c;
+  }
+  & .el-input + .el-input {
+    margin-left: 4px;
+  }
+}
+.select-item + .select-item {
+  margin-top: 4px;
+}
+.select-item.sortable-chosen {
+  border: 1px dashed #409eff;
+}
+.select-line-icon {
+  line-height: 32px;
+  font-size: 22px;
+  padding: 0 4px;
+  color: #777;
+}
+.option-drag {
+  cursor: move;
+}
+.time-range {
+  .el-date-editor {
+    width: 227px;
+  }
+  ::v-deep .el-icon-time {
+    display: none;
+  }
+}
+.document-link {
+  position: absolute;
+  display: block;
+  width: 26px;
+  height: 26px;
+  top: 0;
+  left: 0;
+  cursor: pointer;
+  background: #409eff;
+  z-index: 1;
+  border-radius: 0 0 6px 0;
+  text-align: center;
+  line-height: 26px;
+  color: #fff;
+  font-size: 18px;
+}
+.node-label{
+  font-size: 14px;
+}
+.node-icon{
+  color: #bebfc3;
+}
+</style>
diff --git a/sql/task_v3.sql b/sql/task_v3.sql
index cbc08244..a8d33184 100644
--- a/sql/task_v3.sql
+++ b/sql/task_v3.sql
@@ -16,27 +16,6 @@ create table tbxx
 ) engine = innodb
   auto_increment = 1 comment = '图斑信息表';
 
-# drop table if exists task_lx;
-# create table task_lx
-# (
-#     id          int(11) not null auto_increment comment 'id',
-#     name        varchar(255) default null comment '类型名称',
-#     icon        varchar(255) default null comment '图标地址',
-#     color       varchar(255) default null comment '颜色',
-#     sort        int(11)      default null comment ' 排序 ',
-#     is_show     varchar(255) default ' 0 ' comment ' 是否显示 0 显示 1 不显示 ',
-#     value       varchar(255) default null comment ' 值 ',
-#
-#     --  公共字段
-#     create_by   varchar(64)  default null comment ' 创建者 ',
-#     create_time datetime     default null comment ' 创建时间 ',
-#     update_by   varchar(64)  default null comment ' 更新者 ',
-#     update_time datetime     default null comment ' 更新时间 ',
-#     remark      varchar(500) default null comment ' 备注 ',
-#     dept_id     int(11)      default null comment ' 部门id '
-# ) engine = innodb
-#   auto_increment = 1 comment = ' 任务表 ';
-
 drop table if exists task;
 create table task
 (
@@ -59,6 +38,8 @@ create table task
     tc_id       int(11)      default null comment ' 最后巡查记录id ',
     xcsj        datetime     default null comment ' 最后巡查时间 ',
     xcry_id     int(11)      default null comment ' 最后巡查人员id ',
+    group_name  varchar(255) default null comment '用户组(乡镇)',
+    to_id       int(11)      default null comment '巡查人员id',
     sfgd        varchar(255) default ' 0 ' comment ' 是否归档 ',
 --  公共字段
     create_by   varchar(64)  default null comment ' 创建者 ',
diff --git a/sql/task_v4.sql b/sql/task_v4.sql
new file mode 100644
index 00000000..6582fcca
--- /dev/null
+++ b/sql/task_v4.sql
@@ -0,0 +1,156 @@
+drop table if exists task;
+create table task
+(
+    id          int(11) not null auto_increment comment ' id ',
+    tbbh        varchar(255) default null comment ' 图斑编号 ',
+    tbmc        varchar(255) default null comment ' 图斑名称 ',
+    shi         varchar(255) default null comment ' 所在市 ',
+    xian        varchar(255) default null comment ' 所在县 ',
+    xxdz        varchar(255) default null comment ' 详细地址 ',
+    x           varchar(255) default null comment ' 经度 ',
+    y           varchar(255) default null comment ' 纬度 ',
+    info        text         default null comment '详细信息',
+    gis         GEOMETRY     default null comment '空间信息',
+
+    rwlx        varchar(255) default ' 1 ' comment ' 任务类型 ',
+    drry_id     int(11)      default null comment ' 导入人员id ',
+    drsj        datetime     default null comment ' 导入时间 ',
+
+    zjxfqk      varchar(255) default ' 0 ' comment ' 州级下发情况 ',
+    zjxfsj      datetime     default null comment ' 州级下发时间 ',
+    xjxfqk      varchar(255) default ' 0 ' comment ' 县级下发情况 ',
+    xjxfsj      datetime     default null comment ' 县级下发时间 ',
+    xzxfqk      varchar(255) default ' 0 ' comment ' 乡镇下发情况 ',
+    xzxfsj      datetime     default null comment ' 乡镇下发时间 ',
+
+    group_name  varchar(255) default null comment ' 乡镇 ',
+    to_id       int(11)      default null comment ' 巡查人员id ',
+    to_name     int(11)      default null comment ' 巡查人员姓名 ',
+    kssj        datetime     default null comment ' 开始时间 ',
+    jssj        datetime     default null comment ' 结束时间 ',
+    yxccs       int(11)      default 0 comment ' 已巡查次数 ',
+    zjxccs      int(11)      default 0 comment ' 州级巡查次数 ',
+    xjxccs      int(11)      default 0 comment ' 县级巡查次数 ',
+    tc_id       int(11)      default null comment ' 最后巡查记录id ',
+    xcsj        datetime     default null comment ' 最后巡查时间 ',
+    xcry_id     int(11)      default null comment ' 最后巡查人员id ',
+    sfgd        varchar(255) default ' 0 ' comment ' 是否归档 ',
+--  公共字段
+    create_by   varchar(64)  default null comment ' 创建者 ',
+    create_time datetime     default null comment ' 创建时间 ',
+    update_by   varchar(64)  default null comment ' 更新者 ',
+    update_time datetime     default null comment ' 更新时间 ',
+    remark      varchar(500) default null comment ' 备注 ',
+    dept_id     int(11)      default null comment ' 部门id ',
+    primary key (id)
+) engine = innodb
+  auto_increment = 1 comment = ' 任务表 ';
+
+drop table if exists task_check;
+create table task_check
+(
+    id          int(11) not null auto_increment comment ' id ',
+    task_id     int(11)      default null comment ' 任务id ',
+    sfsb        varchar(255) default ' 0 ' comment ' 是否上报 ',
+    sbsj        datetime     default null comment ' 上报时间 ',
+    sfwc        varchar(255) default ' 0 ' comment ' 是否完成 ',
+    zgqk        varchar(255) default ' 0 ' comment ' 整改情况 ',
+    xcjb        varchar(255) default ' 1 ' comment ' 巡查级别 ',
+    xcry_id     int(11)      default null comment ' 巡查人员id ',
+    xcsj        datetime     default null comment ' 巡查时间 ',
+    --  公共字段
+    create_by   varchar(64)  default null comment ' 创建者 ',
+    create_time datetime     default null comment ' 创建时间 ',
+    update_by   varchar(64)  default null comment ' 更新者 ',
+    update_time datetime     default null comment ' 更新时间 ',
+    remark      varchar(500) default null comment ' 备注 ',
+    dept_id     int(11)      default null comment ' 部门id ',
+    primary key (id)
+) engine = innodb
+  auto_increment = 1 comment = ' 任务巡查记录表 ';
+
+drop table if exists task_check_image;
+create table task_check_image
+(
+    id          int(11) not null auto_increment comment ' id ',
+    tc_id       int(11)      default null comment ' 任务巡查记录id ',
+    jd          varchar(255) default null comment ' 经度 ',
+    wd          varchar(255) default null comment ' 纬度 ',
+    psfx        varchar(255) default null comment ' 拍摄方向 ',
+    cclj        varchar(255) default null comment ' 存储路径 ',
+    tjry_id     int(11)      default null comment ' 提交人员id ',
+    scsj        varchar(255) default null comment ' 上传时间 ',
+    --  公共字段
+    create_by   varchar(64)  default null comment ' 创建者 ',
+    create_time datetime     default null comment ' 创建时间 ',
+    update_by   varchar(64)  default null comment ' 更新者 ',
+    update_time datetime     default null comment ' 更新时间 ',
+    remark      varchar(500) default null comment ' 备注 ',
+    dept_id     int(11)      default null comment ' 部门id ',
+    primary key (id)
+) engine = innodb
+  auto_increment = 1 comment = ' 任务巡查图片表 ';
+
+drop table if exists task_check_video;
+create table task_check_video
+(
+    id          int(11) not null auto_increment comment ' id ',
+    tc_id       int(11)      default null comment ' 任务巡查记录id ',
+    cclj        varchar(255) default null comment ' 存储路径 ',
+    tjry_id     int(11)      default null comment ' 提交人员id ',
+    scsj        varchar(255) default null comment ' 上传时间 ',
+    --  公共字段
+    create_by   varchar(64)  default null comment ' 创建者 ',
+    create_time datetime     default null comment ' 创建时间 ',
+    update_by   varchar(64)  default null comment ' 更新者 ',
+    update_time datetime     default null comment ' 更新时间 ',
+    remark      varchar(500) default null comment ' 备注 ',
+    dept_id     int(11)      default null comment ' 部门id ',
+    primary key (id)
+) engine = innodb
+  auto_increment = 1 comment = ' 任务巡查视频表 ';
+
+drop table if exists task_check_audit;
+create table task_check_audit
+(
+    id          int(11) not null auto_increment comment ' id ',
+    tc_id       int(11)      default null comment ' 任务巡查记录id ',
+    shjg        varchar(255) default ' 0 ' comment ' 审核结果 ',
+    shsm        text         default null comment ' 审核说明 ',
+    shsj        datetime     default null comment ' 审核时间 ',
+    shry_id     int(11)      default null comment ' 审核人员id ',
+--  公共字段
+    create_by   varchar(64)  default null comment ' 创建者 ',
+    create_time datetime     default null comment ' 创建时间 ',
+    update_by   varchar(64)  default null comment ' 更新者 ',
+    update_time datetime     default null comment ' 更新时间 ',
+    remark      varchar(500) default null comment ' 备注 ',
+    dept_id     int(11)      default null comment ' 部门id ',
+    primary key (id)
+) engine = innodb
+  auto_increment = 1 comment = ' 任务巡查审核表 ';
+
+drop table if exists app_version;
+create table app_version
+(
+    id                 int(11) not null auto_increment comment ' id ',
+    new_version        varchar(255) default null comment ' 最新版本号 ',
+    min_version        varchar(255) default null comment ' 最小版本号 ',
+    apk_url            varchar(255) default null comment ' apk下载地址 ',
+    update_description text         default null comment ' 更新描述 ',
+    is_update          varchar(255) default ' 0 ' comment ' 是否更新 ',
+    force_update       varchar(255) default ' 0 ' comment ' 是否强制更新 ',
+    apk_size           varchar(255) default ' 0 ' comment ' apk大小 ',
+    md5                varchar(32)  default null comment ' apk md5值 ',
+--  公共字段
+    create_by          varchar(64)  default null comment ' 创建者 ',
+    create_time        datetime     default null comment ' 创建时间 ',
+    update_by          varchar(64)  default null comment ' 更新者 ',
+    update_time        datetime     default null comment ' 更新时间 ',
+    remark             varchar(500) default null comment ' 备注 ',
+    dept_id            int(11)      default null comment ' 部门id ',
+    primary key (id)
+) engine = innodb
+  auto_increment = 1 comment = ' app版本表 ';
+
+