diff --git a/package.json b/package.json
index 0d9163f..7e23b1b 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
     "linq": "^4.0.3",
+    "lodash": "^4.17.21",
     "md5.js": "^1.3.5",
     "nprogress": "0.2.0",
     "quill": "2.0.2",
diff --git a/src/api/administration.js b/src/api/administration.js
index d50dc3b..4338bef 100644
--- a/src/api/administration.js
+++ b/src/api/administration.js
@@ -26,16 +26,17 @@ export function getPatroltypeList(query) {
   return request({
     url: `/basedata/patrolpointmnt/patroltype/list`,
     method: 'get',
+    params: query,
   })
 }
 
-export function getAreaList(query,type=0) {
-  if(type==0){
+export function getAreaList(query, type = 0) {
+  if (type == 0) {
     return request({
       url: `/basedata/area/list`,
       method: 'get',
     })
-  }else{
+  } else {
     return request({
       url: `/basedata/area/list?areaIdS=${query}`,
       method: 'get',
diff --git a/src/api/area/area.js b/src/api/area/area.js
index d8b9e7e..28e9234 100644
--- a/src/api/area/area.js
+++ b/src/api/area/area.js
@@ -57,5 +57,666 @@ export function postRemove(query) {
     })
 }
 
+// 点位管理
+//联动点详情
+export function pointDel (linkageStrategyId) {
+  return request({
+    url: '/patrol/strategy/' + linkageStrategyId,
+    method: 'get',
+  })
+}
+//修改联动点位
+export function editPoint (data) {
+  return request({
+    url: '/patrol/strategy/edit',
+    method: 'post',
+    data: data
+  })
+}
+//  删除检修区域（批量)
+export function delPoint (linkagestrategyIds) {
+  return request({
+    url: '/patrol/strategy/remove/' + linkagestrategyIds,
+    method: 'post',
+  })
+}
+//删除检修区域（批量)
+export function delmaintenanceArea (lineIds) {
+  return request({
+    url: '/patrol/maintarea/remove/' + lineIds,
+    method: 'post',
+  })
+}
+//添加联动点位
+export function addPoint (data) {
+  return request({
+    url: '/patrol/strategy',
+    method: 'post',
+    data: data
+  })
+}
+//联动新增-查询巡检点
+export function getaddPoint (query) {
+  return request({
+    url: '/patrol/linkage/patrolpoint',
+    method: 'get',
+    params: query
+  })
+}
+//获取联动点位列表
+export function getPoints (query) {
+  return request({
+    url: '/patrol/strategy/list',
+    method: 'get',
+    params: query
+  })
+}
+//添加检修区域
+export function addTarea (data) {
+  return request({
+    url: '/patrol/maintarea',
+    method: 'post',
+    data: data
+  })
+}
+//修改巡检任务
+export function editSave (data) {
+  return request({
+    url: '/patrol/task/save',
+    method: 'post',
+    data: data
+  })
+}
+//主设备下巡检点和巡检点巡检设备树（巡视任务回显）
+export function editList (query) {
+  return request({
+    url: '/basedata/prodevmnt/device/treeProMainDevicePatrolEquSelectByEqookCode',
+    method: 'get',
+    params: query
+  })
+}
+// 巡视任务编辑回显
+export function editTask (taskId) {
+  return request({
+    url: '/patrol/task/' + taskId,
+    method: 'get',
+  })
+}
+// 复制巡检任务
+export function copyTask (query) {
+  return request({
+    url: '/patrol/task/copyTask',
+    method: 'get',
+    params: query
+  })
+}
+// 删除巡检任务（批量）
+export function delTask (taskIds) {
+  return request({
+    url: 'patrol/task/remove/' + taskIds,
+    method: 'post'
+  })
+}
+
+
+
+// 下发巡检任务
+export function issue (query) {
+  return request({
+    url: '/patrol/task/issue',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
+// 立即执行任务
+export function controlChange (id) {
+  return request({
+    url: '/patrol/taskstatus/controlChange?taskId=' + id,
+    method: 'get',
+  })
+}
+//巡视任务列表修改任务状态（列表开关）
+export function changeStatus (query) {
+  return request({
+    url: '/patrol/task/changeStatus',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新建/修改巡检任务
+export function addPatrol (data) {
+  return request({
+    url: '/patrol/task/add',
+    method: 'post',
+    data: data
+  })
+}
+// 巡视任务管理列表
+export function taskPatrol (query) {
+  return request({
+    url: 'patrol/task/list',
+    method: 'get',
+    params: query
+  })
+}
+// 主设备下巡检点和巡检点巡检设备树
+export function equSelect (query) {
+  return request({
+    url: '/basedata/prodevmnt/device/treeProMainDevicePatrolEquSelect',
+    method: 'get',
+    params: query
+  })
+}
+// 生产设备树
+export function equipmentree (query = {}) {
+  return request({
+    url: '/basedata/prodevmnt/device/getProDeviceTreeSelect',
+    method: 'get',
+    params: query
+  })
+}
+// 添加设备类型
+export function addDevicetype (data) {
+  return request({
+    url: '/basedata/devicetype/add',
+    method: 'post',
+    data: data
+  })
+}
+// 标准点位列表
+export function standardPoint (query) {
+  return request({
+    url: '/basedata/patrolpointmnt/stdpatrolpoint/list',
+    method: 'get',
+    params: query
+  })
+}
+// 联动点位管理列表
+export function linkageAdmin (query) {
+  return request({
+    url: '/patrol/linkage/list',
+    method: 'get',
+    params: query
+  })
+}
+// 联动点位管理设备类型列表
+export function linkageStyle () {
+  return request({
+    url: '/basedata/devicetype/list',
+    method: 'get'
+  })
+}
+// 获取生产设备树(包含区域、类型、部件模板)
+export function productionEquipment () {
+  return request({
+    url: '/basedata/prodevmnt/device/treeAreaDeviceSelect',
+    method: 'get'
+  })
+}
+// 删除联动点位（批量）
+export function dellinkPoint (linkagePosIds) {
+  return request({
+    url: '/patrol/linkage/' + linkagePosIds,
+    method: 'delete'
+  })
+}
+// 设备类型管理修改
+export function modifyEquipment (data) {
+  return request({
+    url: '/basedata/devicetype/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 生产区域管理导出
+export function exportarea (query) {
+  return request({
+    url: '/api/area/exportarea',
+    method: 'get',
+    params: query
+  })
+}
+// 查询部门列表
+export function listArea (query) {
+  return request({
+    url: '/basedata/area/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询部门列表（排除节点）
+export function listAreaExcludeChild (areaId) {
+  return request({
+    url: '/basedata/area/list/exclude/' + areaId,
+    method: 'get'
+  })
+}
+
+// 查询部门详细
+export function getArea (areaId) {
+  return request({
+    url: '/basedata/area/' + areaId,
+    method: 'get'
+  })
+}
+
+// 查询部门下拉树结构
+export function treeselect (query) {
+  return request({
+    url: '/basedata/area/treeselect',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据角色ID查询部门树结构
+export function roleAreaTreeselect (roleId) {
+  return request({
+    url: '/basedata/area/roleAreaTreeselect/' + roleId,
+    method: 'get'
+  })
+}
+
+// 新增部门
+export function addArea (data) {
+  return request({
+    url: '/basedata/area',
+    method: 'post',
+    data: data
+  })
+}
+// 生产新增部门
+export function addArea1 (data) {
+  return request({
+    url: '/basedata/area/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改部门
+export function updateArea (data) {
+  return request({
+    url: '/basedata/area',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改生产部门
+export function updateArea1 (data) {
+  return request({
+    url: '/basedata/area/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除部门
+export function delArea (areaId) {
+  return request({
+    url: '/basedata/area/remove/' + areaId,
+    method: 'post'
+  })
+}
+// 联动点位参数列表
+export function linkage (query) {
+  return request({
+    url: '/system/config/list',
+    params: query
+  })
+}
+// 保存联动参数
+export function saveLinkage (data) {
+  return request({
+    url: '/patrol/linkage/action',
+    method: 'post',
+    data: data
+  })
+}
+// 添加联动点位
+export function addLinkage (data) {
+  return request({
+    url: '/patrol/linkage',
+    method: 'post',
+    data: data
+  })
+}
+// 获取所属专业
+export function professionType () {
+  return request({
+    url: '/system/dict/data/type/profession_type',
+    method: 'get'
+  })
+}
+// 获取检修区域列表
+export function maintenanceArea (query) {
+  return request({
+    url: '/patrol/maintarea/list',
+    method: 'get',
+    params: query
+  })
+}
+// 添加设备类型
+export function addDevice (data) {
+  return request({
+    url: '/basedata/devicetype/add',
+    method: 'post',
+    data: data
+  })
+}
+// 删除设备类型
+export function deleteDevice (params) {
+  return request({
+    url: '/basedata/devicetype/delete/' + params,
+    method: 'post'
+  })
+}
+// 修改设备类型
+export function editDevice (data) {
+  return request({
+    url: '/basedata/devicetype/update',
+    method: 'post',
+    data: data
+  })
+}
+// 设备类型列表树
+export function deviceTrees (data) {
+  return request({
+    url: '/basedata/devicetype/getProDeviceTypeTreeSelect',
+    method: 'get'
+  })
+}
+// 查询点位列表
+export function dotList () {
+  return request({
+    url: '/basedata/patrolpointmnt/stdpatrolpoint/list',
+    method: 'get'
+  })
+}
+// 生产点位管理左侧列表树
+export function proDotManTrees () {
+  return request({
+    url: '/basedata/prodevmnt/device/getProDeviceTreeSelect',
+    method: 'get'
+  })
+}
+// 生产点位管理中间列表
+export function proDotManTable (params) {
+  return request({
+    url: '/basedata/patrolpointmnt/patrolpoint/list/monitor',
+    method: 'get',
+    params: params
+  })
+}
+// 生产点位管理单条、多条数据删除
+export function proDotTableDeleteSin (deleteid) {
+  return request({
+    url: '/basedata/patrolpointmnt/patrolpoint/remove/' + deleteid,
+    method: 'post'
+  })
+}
+// 生产点位管理单条数据新增
+export function proDotTableAddSin (data) {
+  return request({
+    url: '/basedata/patrolpointmnt/patrolpoint',
+    method: 'post',
+    data: data
+  })
+}
+// 生产点位管理单条数据修改
+export function proDotTableEditSin (data) {
+  return request({
+    url: '/basedata/patrolpointmnt/patrolpoint/edit',
+    method: 'post',
+    data: data
+  })
+}
+// 查询监控列表(预置点)
+export function bindingMonitorDotList (channelType) {
+  return request({
+    url: '/patrol/preset/camera/' + channelType,
+    method: 'get'
+  })
+}
+// 预置点下发
+export function presetDotDistribute (params) {
+  return request({
+    url: '/patrol/preset/issue',
+    method: 'get',
+    params: params
+  })
+}
+// 转到预置点
+export function convertPresetDot (params) {
+  return request({
+    url: '/patrol/preset/goto',
+    method: 'get',
+    params: params
+  })
+}
+// 拍照
+export function photograph (params) {
+  return request({
+    url: '/patrol/videotape/snap',
+    method: 'get',
+    params: params
+  })
+}
+// 云台控制
+export function cloudControl (params) {
+  return request({
+    url: '/patrol/videotape/ptz',
+    method: 'get',
+    params: params
+  })
+}
+// 实时直播
+export function realLive (params) {
+  return request({
+    url: '/patrol/video/realtime',
+    method: 'get',
+    params: params
+  })
+}
+// 录像列表
+export function recordList (params) {
+  return request({
+    url: '/patrol/videotape/record/list',
+    method: 'get',
+    params: params
+  })
+}
+// 录像
+export function record (params) {
+  return request({
+    url: '/patrol/videotape/record',
+    method: 'get',
+    params: params
+  })
+}
+// 回放开始
+export function reviewStart (params) {
+  return request({
+    url: '/patrol/videotape/review/start',
+    method: 'get',
+    params: params
+  })
+}
+// 回放结束
+export function reviewStop (params) {
+  return request({
+    url: '/patrol/videotape/review/stop',
+    method: 'get',
+    params: params
+  })
+}
+// 回放控制
+export function reviewControl (params) {
+  return request({
+    url: '/patrol/videotape/review/control',
+    method: 'get',
+    params: params
+  })
+}
+// 焦距光圈
+export function focalAperture (params) {
+  return request({
+    url: '/patrol/videotape/ptz/fi',
+    method: 'get',
+    params: params
+  })
+}
+// 绑定预置点
+export function bindingPreset (data) {
+  return request({
+    url: '/patrol/preset',
+    method: 'post',
+    data: data
+  })
+}
+
+// 设置预置位点
+export function issueUpdate (params) {
+  console.log('0000000',params)
+  return request({
+    url: '/patrol/preset/issueUpdate',
+    method: 'get',
+    params: params
+  })
+}
+
+// 修改生产设备
+export function editProEquip (data) {
+  return request({
+    url: '/basedata/prodevmnt/device/update',
+    method: 'post',
+    data: data
+  })
+}
+// 获取生产设备树(包含区域、设备、部件)
+export function getProEquipTree () {
+  return request({
+    url: '/basedata/prodevmnt/device/getProDeviceTreeSelect',
+    method: 'get'
+  })
+}
+// 获取生产设备详情
+export function getProEquipShow (deviceId) {
+  return request({
+    url: '/basedata/prodevmnt/device/' + deviceId,
+    method: 'get'
+  })
+}
+// 查询点位列表
+export function searchDotsList (params) {
+  return request({
+    url: '/basedata/patrolpointmnt/stdpatrolpoint/list',
+    method: 'get',
+    params
+  })
+}
+// 获取主设备类型下的部件类型
+export function getMainEquipPartType (params) {
+  return request({
+    url: '/basedata/devicetype/getCommpTypeTreeSelectByMainDevicetypeId',
+    method: 'get',
+    params: params
+  })
+}
+// 获取算法列表
+export function getAlgList () {
+  return request({
+    url: '/basedata/alg/list',
+    method: 'get'
+  })
+}
+// 获取算法子类型
+export function getAlgPartType () {
+  return request({
+    url: '/basedata/subtype/list',
+    method: 'get'
+  })
+}
+// 保存标准巡检点位
+export function saveStaDot (data) {
+  return request({
+    url: '/basedata/patrolpointmnt/stdpatrolpoint/addBatchList',
+    method: 'post',
+    data: data
+  })
+}
+// 获取主设备类型
+export function getMainEquipType (params) {
+  return request({
+    url: '/basedata/devicetype/list',
+    method: 'get',
+    params: { 'powerMainEquFlag': 'Yes' }
+  })
+}
+
+
+// 添加生产设备
+export function insertMainDeviceAndCommByDeviceType (data) {
+  return request({
+    url: '/basedata/prodevmnt/device/insertMainDeviceAndCommByDeviceType',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取生产设备详情
+export function getEquInfo (id) {
+  return request({
+    url: '/basedata/prodevmnt/device/' + id,
+    method: 'get',
+    params: { id }
+  })
+}
+
+export function getStationNameList (params) {
+  return request({
+    url: '/basedata/station/getStationNameList',
+    method: 'get',
+    params
+  })
+}
+
+// 获取检修区域树
+export function getRepairAreaTree (params = {}) {
+  return request({
+    url: '/basedata/prodevmnt/device/treeAreaDeviceSelectAgain',
+    method: 'get',
+    params
+  })
+}
+
+// 获取检修区域树
+export function updateRepairAreaStatus (id, enable) {
+  return request({
+    url: '/patrol/maintarea/update',
+    method: 'get',
+    params: {
+      lineId: id,
+      enable
+    }
+  })
+}
+// 批量下发检修区域
+export function downAreas (ids) {
+  return request({
+    url: '/patrol/maintarea/issue',
+    method: 'get',
+    params: {
+      ids
+    }
+  })
+}
 
 
diff --git a/src/api/basedata/area/area.js b/src/api/basedata/area/area.js
new file mode 100644
index 0000000..1d050a3
--- /dev/null
+++ b/src/api/basedata/area/area.js
@@ -0,0 +1,661 @@
+import request from '@/utils/request'
+//联动点详情
+export function pointDel (linkageStrategyId) {
+  return request({
+    url: '/patrol/strategy/' + linkageStrategyId,
+    method: 'get',
+  })
+}
+//修改联动点位
+export function editPoint (data) {
+  return request({
+    url: '/patrol/strategy/edit',
+    method: 'post',
+    data: data
+  })
+}
+//  删除检修区域（批量)
+export function delPoint (linkagestrategyIds) {
+  return request({
+    url: '/patrol/strategy/remove/' + linkagestrategyIds,
+    method: 'post',
+  })
+}
+//删除检修区域（批量)
+export function delmaintenanceArea (lineIds) {
+  return request({
+    url: '/patrol/maintarea/remove/' + lineIds,
+    method: 'post',
+  })
+}
+//添加联动点位
+export function addPoint (data) {
+  return request({
+    url: '/patrol/strategy',
+    method: 'post',
+    data: data
+  })
+}
+//联动新增-查询巡检点
+export function getaddPoint (query) {
+  return request({
+    url: '/patrol/linkage/patrolpoint',
+    method: 'get',
+    params: query
+  })
+}
+//获取联动点位列表
+export function getPoints (query) {
+  return request({
+    url: '/patrol/strategy/list',
+    method: 'get',
+    params: query
+  })
+}
+//添加检修区域
+export function addTarea (data) {
+  return request({
+    url: '/patrol/maintarea',
+    method: 'post',
+    data: data
+  })
+}
+//修改巡检任务
+export function editSave (data) {
+  return request({
+    url: '/patrol/task/save',
+    method: 'post',
+    data: data
+  })
+}
+//主设备下巡检点和巡检点巡检设备树（巡视任务回显）
+export function editList (query) {
+  return request({
+    url: '/basedata/prodevmnt/device/treeProMainDevicePatrolEquSelectByEqookCode',
+    method: 'get',
+    params: query
+  })
+}
+// 巡视任务编辑回显
+export function editTask (taskId) {
+  return request({
+    url: '/patrol/task/' + taskId,
+    method: 'get',
+  })
+}
+// 复制巡检任务
+export function copyTask (query) {
+  return request({
+    url: '/patrol/task/copyTask',
+    method: 'get',
+    params: query
+  })
+}
+// 删除巡检任务（批量）
+export function delTask (taskIds) {
+  return request({
+    url: 'patrol/task/remove/' + taskIds,
+    method: 'post'
+  })
+}
+
+
+
+// 下发巡检任务
+export function issue (query) {
+  return request({
+    url: '/patrol/task/issue',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
+// 立即执行任务
+export function controlChange (id) {
+  return request({
+    url: '/patrol/taskstatus/controlChange?taskId=' + id,
+    method: 'get',
+  })
+}
+//巡视任务列表修改任务状态（列表开关）
+export function changeStatus (query) {
+  return request({
+    url: '/patrol/task/changeStatus',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新建/修改巡检任务
+export function addPatrol (data) {
+  return request({
+    url: '/patrol/task/add',
+    method: 'post',
+    data: data
+  })
+}
+// 巡视任务管理列表
+export function taskPatrol (query) {
+  return request({
+    url: 'patrol/task/list',
+    method: 'get',
+    params: query
+  })
+}
+// 主设备下巡检点和巡检点巡检设备树
+export function equSelect (query) {
+  return request({
+    url: '/basedata/prodevmnt/device/treeProMainDevicePatrolEquSelect',
+    method: 'get',
+    params: query
+  })
+}
+// 生产设备树
+export function equipmentree (query = {}) {
+  return request({
+    url: '/basedata/prodevmnt/device/getProDeviceTreeSelect',
+    method: 'get',
+    params: query
+  })
+}
+// 添加设备类型
+export function addDevicetype (data) {
+  return request({
+    url: '/basedata/devicetype/add',
+    method: 'post',
+    data: data
+  })
+}
+// 标准点位列表
+export function standardPoint (query) {
+  return request({
+    url: '/basedata/patrolpointmnt/stdpatrolpoint/list',
+    method: 'get',
+    params: query
+  })
+}
+// 联动点位管理列表
+export function linkageAdmin (query) {
+  return request({
+    url: '/patrol/linkage/list',
+    method: 'get',
+    params: query
+  })
+}
+// 联动点位管理设备类型列表
+export function linkageStyle () {
+  return request({
+    url: '/basedata/devicetype/list',
+    method: 'get'
+  })
+}
+// 获取生产设备树(包含区域、类型、部件模板)
+export function productionEquipment () {
+  return request({
+    url: '/basedata/prodevmnt/device/treeAreaDeviceSelect',
+    method: 'get'
+  })
+}
+// 删除联动点位（批量）
+export function dellinkPoint (linkagePosIds) {
+  return request({
+    url: '/patrol/linkage/' + linkagePosIds,
+    method: 'delete'
+  })
+}
+// 设备类型管理修改
+export function modifyEquipment (data) {
+  return request({
+    url: '/basedata/devicetype/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 生产区域管理导出
+export function exportarea (query) {
+  return request({
+    url: '/api/area/exportarea',
+    method: 'get',
+    params: query
+  })
+}
+// 查询部门列表
+export function listArea (query) {
+  return request({
+    url: '/basedata/area/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询部门列表（排除节点）
+export function listAreaExcludeChild (areaId) {
+  return request({
+    url: '/basedata/area/list/exclude/' + areaId,
+    method: 'get'
+  })
+}
+
+// 查询部门详细
+export function getArea (areaId) {
+  return request({
+    url: '/basedata/area/' + areaId,
+    method: 'get'
+  })
+}
+
+// 查询部门下拉树结构
+export function treeselect (query) {
+  return request({
+    url: '/basedata/area/treeselect',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据角色ID查询部门树结构
+export function roleAreaTreeselect (roleId) {
+  return request({
+    url: '/basedata/area/roleAreaTreeselect/' + roleId,
+    method: 'get'
+  })
+}
+
+// 新增部门
+export function addArea (data) {
+  return request({
+    url: '/basedata/area',
+    method: 'post',
+    data: data
+  })
+}
+// 生产新增部门
+export function addArea1 (data) {
+  return request({
+    url: '/basedata/area/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改部门
+export function updateArea (data) {
+  return request({
+    url: '/basedata/area',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改生产部门
+export function updateArea1 (data) {
+  return request({
+    url: '/basedata/area/update',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除部门
+export function delArea (areaId) {
+  return request({
+    url: '/basedata/area/remove/' + areaId,
+    method: 'post'
+  })
+}
+// 联动点位参数列表
+export function linkage (query) {
+  return request({
+    url: '/system/config/list',
+    params: query
+  })
+}
+// 保存联动参数
+export function saveLinkage (data) {
+  return request({
+    url: '/patrol/linkage/action',
+    method: 'post',
+    data: data
+  })
+}
+// 添加联动点位
+export function addLinkage (data) {
+  return request({
+    url: '/patrol/linkage',
+    method: 'post',
+    data: data
+  })
+}
+// 获取所属专业
+export function professionType () {
+  return request({
+    url: '/system/dict/data/type/profession_type',
+    method: 'get'
+  })
+}
+// 获取检修区域列表
+export function maintenanceArea (query) {
+  return request({
+    url: '/patrol/maintarea/list',
+    method: 'get',
+    params: query
+  })
+}
+// 添加设备类型
+export function addDevice (data) {
+  return request({
+    url: '/basedata/devicetype/add',
+    method: 'post',
+    data: data
+  })
+}
+// 删除设备类型
+export function deleteDevice (params) {
+  return request({
+    url: '/basedata/devicetype/delete/' + params,
+    method: 'post'
+  })
+}
+// 修改设备类型
+export function editDevice (data) {
+  return request({
+    url: '/basedata/devicetype/update',
+    method: 'post',
+    data: data
+  })
+}
+// 设备类型列表树
+export function deviceTrees (data) {
+  return request({
+    url: '/basedata/devicetype/getProDeviceTypeTreeSelect',
+    method: 'get'
+  })
+}
+// 查询点位列表
+export function dotList () {
+  return request({
+    url: '/basedata/patrolpointmnt/stdpatrolpoint/list',
+    method: 'get'
+  })
+}
+// 生产点位管理左侧列表树
+export function proDotManTrees () {
+  return request({
+    url: '/basedata/prodevmnt/device/getProDeviceTreeSelect',
+    method: 'get'
+  })
+}
+// 生产点位管理中间列表
+export function proDotManTable (params) {
+  return request({
+    url: '/basedata/patrolpointmnt/patrolpoint/list/monitor',
+    method: 'get',
+    params: params
+  })
+}
+// 生产点位管理单条、多条数据删除
+export function proDotTableDeleteSin (deleteid) {
+  return request({
+    url: '/basedata/patrolpointmnt/patrolpoint/remove/' + deleteid,
+    method: 'post'
+  })
+}
+// 生产点位管理单条数据新增
+export function proDotTableAddSin (data) {
+  return request({
+    url: '/basedata/patrolpointmnt/patrolpoint',
+    method: 'post',
+    data: data
+  })
+}
+// 生产点位管理单条数据修改
+export function proDotTableEditSin (data) {
+  return request({
+    url: '/basedata/patrolpointmnt/patrolpoint/edit',
+    method: 'post',
+    data: data
+  })
+}
+// 查询监控列表(预置点)
+export function bindingMonitorDotList (channelType) {
+  return request({
+    url: '/patrol/preset/camera/' + channelType,
+    method: 'get'
+  })
+}
+// 预置点下发
+export function presetDotDistribute (params) {
+  return request({
+    url: '/patrol/preset/issue',
+    method: 'get',
+    params: params
+  })
+}
+// 转到预置点
+export function convertPresetDot (params) {
+  return request({
+    url: '/patrol/preset/goto',
+    method: 'get',
+    params: params
+  })
+}
+// 拍照
+export function photograph (params) {
+  return request({
+    url: '/patrol/videotape/snap',
+    method: 'get',
+    params: params
+  })
+}
+// 云台控制
+export function cloudControl (params) {
+  return request({
+    url: '/patrol/videotape/ptz',
+    method: 'get',
+    params: params
+  })
+}
+// 实时直播
+export function realLive (params) {
+  return request({
+    url: '/patrol/video/realtime',
+    method: 'get',
+    params: params
+  })
+}
+// 录像列表
+export function recordList (params) {
+  return request({
+    url: '/patrol/videotape/record/list',
+    method: 'get',
+    params: params
+  })
+}
+// 录像
+export function record (params) {
+  return request({
+    url: '/patrol/videotape/record',
+    method: 'get',
+    params: params
+  })
+}
+// 回放开始
+export function reviewStart (params) {
+  return request({
+    url: '/patrol/videotape/review/start',
+    method: 'get',
+    params: params
+  })
+}
+// 回放结束
+export function reviewStop (params) {
+  return request({
+    url: '/patrol/videotape/review/stop',
+    method: 'get',
+    params: params
+  })
+}
+// 回放控制
+export function reviewControl (params) {
+  return request({
+    url: '/patrol/videotape/review/control',
+    method: 'get',
+    params: params
+  })
+}
+// 焦距光圈
+export function focalAperture (params) {
+  return request({
+    url: '/patrol/videotape/ptz/fi',
+    method: 'get',
+    params: params
+  })
+}
+// 绑定预置点
+export function bindingPreset (data) {
+  return request({
+    url: '/patrol/preset',
+    method: 'post',
+    data: data
+  })
+}
+
+// 设置预置位点
+export function issueUpdate (params) {
+  console.log('0000000',params)
+  return request({
+    url: '/patrol/preset/issueUpdate',
+    method: 'get',
+    params: params
+  })
+}
+
+// 修改生产设备
+export function editProEquip (data) {
+  return request({
+    url: '/basedata/prodevmnt/device/update',
+    method: 'post',
+    data: data
+  })
+}
+// 获取生产设备树(包含区域、设备、部件)
+export function getProEquipTree () {
+  return request({
+    url: '/basedata/prodevmnt/device/getProDeviceTreeSelect',
+    method: 'get'
+  })
+}
+// 获取生产设备详情
+export function getProEquipShow (deviceId) {
+  return request({
+    url: '/basedata/prodevmnt/device/' + deviceId,
+    method: 'get'
+  })
+}
+// 查询点位列表
+export function searchDotsList (params) {
+  return request({
+    url: '/basedata/patrolpointmnt/stdpatrolpoint/list',
+    method: 'get',
+    params
+  })
+}
+// 获取主设备类型下的部件类型
+export function getMainEquipPartType (params) {
+  return request({
+    url: '/basedata/devicetype/getCommpTypeTreeSelectByMainDevicetypeId',
+    method: 'get',
+    params: params
+  })
+}
+// 获取算法列表
+export function getAlgList () {
+  return request({
+    url: '/basedata/alg/list',
+    method: 'get'
+  })
+}
+// 获取算法子类型
+export function getAlgPartType () {
+  return request({
+    url: '/basedata/subtype/list',
+    method: 'get'
+  })
+}
+// 保存标准巡检点位
+export function saveStaDot (data) {
+  return request({
+    url: '/basedata/patrolpointmnt/stdpatrolpoint/addBatchList',
+    method: 'post',
+    data: data
+  })
+}
+// 获取主设备类型
+export function getMainEquipType (params) {
+  return request({
+    url: '/basedata/devicetype/list',
+    method: 'get',
+    params: { 'powerMainEquFlag': 'Yes' }
+  })
+}
+
+
+// 添加生产设备
+export function insertMainDeviceAndCommByDeviceType (data) {
+  return request({
+    url: '/basedata/prodevmnt/device/insertMainDeviceAndCommByDeviceType',
+    method: 'post',
+    data: data
+  })
+}
+
+// 获取生产设备详情
+export function getEquInfo (id) {
+  return request({
+    url: '/basedata/prodevmnt/device/' + id,
+    method: 'get',
+    params: { id }
+  })
+}
+
+export function getStationNameList (params) {
+  return request({
+    url: '/basedata/station/getStationNameList',
+    method: 'get',
+    params
+  })
+}
+
+// 获取检修区域树
+export function getRepairAreaTree (params = {}) {
+  return request({
+    url: '/basedata/prodevmnt/device/treeAreaDeviceSelectAgain',
+    method: 'get',
+    params
+  })
+}
+
+// 获取检修区域树
+export function updateRepairAreaStatus (id, enable) {
+  return request({
+    url: '/patrol/maintarea/update',
+    method: 'get',
+    params: {
+      lineId: id,
+      enable
+    }
+  })
+}
+// 批量下发检修区域
+export function downAreas (ids) {
+  return request({
+    url: '/patrol/maintarea/issue',
+    method: 'get',
+    params: {
+      ids
+    }
+  })
+}
diff --git a/src/api/basedata/patrolpointmnt/patroltype.js b/src/api/basedata/patrolpointmnt/patroltype.js
index 351401c..c6d12e4 100644
--- a/src/api/basedata/patrolpointmnt/patroltype.js
+++ b/src/api/basedata/patrolpointmnt/patroltype.js
@@ -38,4 +38,12 @@ export function postRemove(query) {
     method: 'post',
     // params: query
   })
+}
+// 查询巡视类型列表
+export function listPatroltype(query) {
+  return request({
+    url: "/basedata/patrolpointmnt/patroltype/list",
+    method: "get",
+    params: query,
+  });
 }
\ No newline at end of file
diff --git a/src/api/equipment/equipment.js b/src/api/equipment/equipment.js
index 6e82dec..97f89de 100644
--- a/src/api/equipment/equipment.js
+++ b/src/api/equipment/equipment.js
@@ -75,4 +75,12 @@ export function mainsystemList(query) {
     method: 'get',
     params: { pageNum: 1, pageSize: 10000 }
   })
+}
+// 导出
+export function download(query) {
+  return request({
+    url: '/basedata/eqpbook/export',
+    method: 'post',
+     data: query
+  })
 }
\ No newline at end of file
diff --git a/src/assets/card_full_bg.png b/src/assets/card_full_bg.png
new file mode 100644
index 0000000..05b8c2e
Binary files /dev/null and b/src/assets/card_full_bg.png differ
diff --git a/src/assets/collect.png b/src/assets/collect.png
new file mode 100644
index 0000000..f8a3823
Binary files /dev/null and b/src/assets/collect.png differ
diff --git a/src/assets/images/image-btn-left-disable.png b/src/assets/images/image-btn-left-disable.png
new file mode 100644
index 0000000..93e11e1
Binary files /dev/null and b/src/assets/images/image-btn-left-disable.png differ
diff --git a/src/assets/images/image-btn-left-hover.png b/src/assets/images/image-btn-left-hover.png
new file mode 100644
index 0000000..0e7de0c
Binary files /dev/null and b/src/assets/images/image-btn-left-hover.png differ
diff --git a/src/assets/images/image-btn-left-normal.png b/src/assets/images/image-btn-left-normal.png
new file mode 100644
index 0000000..dd798ac
Binary files /dev/null and b/src/assets/images/image-btn-left-normal.png differ
diff --git a/src/assets/images/image-btn-left-press.png b/src/assets/images/image-btn-left-press.png
new file mode 100644
index 0000000..fd371cf
Binary files /dev/null and b/src/assets/images/image-btn-left-press.png differ
diff --git a/src/assets/images/image-btn-right-disable.png b/src/assets/images/image-btn-right-disable.png
new file mode 100644
index 0000000..6658bf9
Binary files /dev/null and b/src/assets/images/image-btn-right-disable.png differ
diff --git a/src/assets/images/image-btn-right-hover.png b/src/assets/images/image-btn-right-hover.png
new file mode 100644
index 0000000..9477a94
Binary files /dev/null and b/src/assets/images/image-btn-right-hover.png differ
diff --git a/src/assets/images/image-btn-right-normal.png b/src/assets/images/image-btn-right-normal.png
new file mode 100644
index 0000000..cb1a915
Binary files /dev/null and b/src/assets/images/image-btn-right-normal.png differ
diff --git a/src/assets/images/image-btn-right-press.png b/src/assets/images/image-btn-right-press.png
new file mode 100644
index 0000000..5d340aa
Binary files /dev/null and b/src/assets/images/image-btn-right-press.png differ
diff --git a/src/views/administration/administration copy.vue b/src/views/administration/administration copy.vue
new file mode 100644
index 0000000..475cd07
--- /dev/null
+++ b/src/views/administration/administration copy.vue	
@@ -0,0 +1,1182 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+      <!-- 计划名称 -->
+      <el-form-item :label="$t('administration.ProjectName')">
+        <el-input
+          v-model="queryParams.taskName"
+          :placeholder="
+            $t('share.PleaseEnter') + ' ' + $t('administration.ProjectName')
+          "
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- 区域名称 -->
+      <el-form-item :label="$t('administration.RegionName')">
+        <el-input
+          v-model="queryParams.areaName"
+          :placeholder="
+            $t('share.PleaseEnter') + ' ' + $t('administration.RegionName')
+          "
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- 状态 -->
+      <el-form-item :label="$t('share.status')" prop="status">
+        <el-select
+          v-model="queryParams.isenable"
+          :placeholder="$t('share.status')"
+          clearable
+          style="width: 240px"
+        >
+          <el-option :label="$t('share.On')" value="0"></el-option>
+          <el-option :label="$t('share.Off')" value="1"></el-option>
+        </el-select>
+      </el-form-item>
+      <!-- 计划有效期 -->
+      <el-form-item :label="$t('administration.PlanValidityPeriod')">
+        <el-date-picker
+          v-model="queryParams.cycleStartTime"
+          type="date"
+          :placeholder="$t('share.StartTime')"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        >
+        </el-date-picker>
+        -
+        <el-date-picker
+          v-model="queryParams.cycleEndTime"
+          type="date"
+          :placeholder="$t('share.EndTime')"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <!-- 创建时间 -->
+      <el-form-item :label="$t('share.CreationTime')">
+        <el-date-picker
+          v-model="queryParams.beginTime"
+          type="date"
+          :placeholder="$t('share.StartTime')"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        >
+        </el-date-picker>
+        -
+        <el-date-picker
+          v-model="queryParams.endTime"
+          type="date"
+          :placeholder="$t('share.EndTime')"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <!-- 按钮 -->
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >{{ $t("share.search") }}</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{
+          $t("share.reset")
+        }}</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <!-- 新增 -->
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >{{ $t("share.new") }}</el-button
+        >
+      </el-col>
+      <!-- 删除 -->
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          @click="handleDeleteAll"
+          >{{ $t("share.delete") }}</el-button
+        >
+      </el-col>
+    </el-row>
+    <el-table
+      v-loading="loading"
+      :data="dataList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- 计划名称 -->
+      <el-table-column
+        :label="$t('administration.ProjectName')"
+        prop="taskName"
+      />
+      <!-- 计划有效期开始时间 -->
+      <el-table-column
+        :label="$t('administration.PlanValidityPeriod') + $t('share.StartTime')"
+        prop="cycleStartTime"
+        :show-overflow-tooltip="true"
+        min-width="100px"
+      />
+      <!-- 计划有效期结束时间 -->
+      <el-table-column
+        :label="$t('administration.PlanValidityPeriod') + $t('share.EndTime')"
+        prop="cycleEndTime"
+        :show-overflow-tooltip="true"
+        min-width="100px"
+      />
+      <!-- 创建时间 -->
+      <el-table-column :label="$t('share.CreationTime')" prop="createTime" />
+      <!-- 区域时间 -->
+      <el-table-column
+        :label="$t('administration.RegionName')"
+        prop="areaName"
+      />
+      <!-- 任务策略 -->
+      <el-table-column
+        :label="$t('administration.TaskStrategy')"
+        prop="executionStatus"
+        :formatter="stateFormat"
+      />
+      <!-- 执行任务周期 -->
+      <el-table-column
+        :label="$t('administration.ExecutionTaskCycle')"
+        prop="taskCycle"
+         :formatter="stateTask"
+      />
+      <!-- 状态 -->
+      <el-table-column :label="$t('share.status')" align="center">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.isenable"
+            active-value="0"
+            inactive-value="1"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <!-- 操作 -->
+      <el-table-column
+        :label="$t('share.operate')"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="200"
+      >
+        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+          <!-- 立即执行 -->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleImmediateExecution(scope.row.taskId)"
+            >{{ $t("administration.ImmediateExecution") }}</el-button
+          >
+          <!-- 下发 -->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleIssue(scope.row.taskId)"
+            >{{ $t("administration.issue") }}</el-button
+          >
+          <!-- 复制任务 -->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleCopy(scope.row)"
+            >{{ $t("administration.ReplicationTask") }}</el-button
+          >
+          <!-- 编辑 -->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            >{{ $t("share.edit") }}</el-button
+          >
+          <!-- 删除 -->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row.taskId)"
+            >{{ $t("share.delete") }}</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+       @pagination="init"
+    />
+    <el-dialog :title="title" :visible.sync="dialogTableVisible">
+      <el-steps :active="active" style="margin-bottom: 20px">
+        <el-step :title="$t('administration.SetPlanObject')"></el-step>
+        <el-step :title="$t('administration.SelectInspectionObject')"></el-step>
+        <el-step :title="$t('administration.PointSetting')"></el-step>
+      </el-steps>
+
+      <el-form
+        ref="ruleForm"
+        :model="dialogForm"
+        label-width="110px"
+        :rules="rules"
+      >
+        <div v-if="dialogTableVisibleStep == 0">
+          <!-- 名称 -->
+          <el-form-item :label="$t('administration.name')" prop="taskName">
+            <el-input
+              v-model="dialogForm.taskName"
+              :placeholder="$t('share.PleaseEnter') + $t('administration.name')"
+            ></el-input>
+          </el-form-item>
+          <!-- 优先级 -->
+          <el-form-item :label="$t('administration.priority')" prop="priority">
+            <el-select
+              v-model="dialogForm.priority"
+              :placeholder="$t('administration.priority')"
+            >
+              <el-option
+                :label="$t('administration.priority') + 1"
+                value="1"
+              ></el-option>
+              <el-option
+                :label="$t('administration.priority') + 2"
+                value="2"
+              ></el-option>
+              <el-option
+                :label="$t('administration.priority') + 3"
+                value="3"
+              ></el-option>
+              <el-option
+                :label="$t('administration.priority') + 4"
+                value="4"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 任务类型 -->
+          <el-form-item :label="$t('administration.TaskType')" prop="type">
+            <el-select
+              v-model="dialogForm.type"
+              :placeholder="$t('administration.TaskType')"
+            >
+              <el-option
+                :label="item.patrolTypeName"
+                :value="item.patrolTypeId"
+                v-for="item in patroltype"
+                :key="item.patrolTypeId"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 任务执行方式 -->
+          <!-- <el-form-item
+            :label="$t('administration.TaskExecutionMethod')"
+            prop="executionMode"
+          >
+            <el-checkbox-group v-model="dialogForm.executionMode">
+              <el-checkbox label="0" name="type">{{
+                $t("administration.WalkThrough")
+              }}</el-checkbox>
+          
+            </el-checkbox-group>
+          </el-form-item> -->
+          <!-- 巡检区域 -->
+          <el-form-item
+            :label="$t('administration.InspectionArea')"
+            prop="areaIdS"
+          >
+            <!-- :default-checked-keys="dialogForm.areaIdS" -->
+            <el-tree
+              :data="treeData"
+              show-checkbox
+              node-key="areaId"
+              ref="tree"
+              highlight-current
+              :props="defaultProps"
+              @check="setUpHandleCheckChange"
+            >
+            </el-tree>
+          </el-form-item>
+          <!-- 执行周期 -->
+          <el-form-item :label="$t('administration.executeCycle')">
+            <el-radio-group v-model="dialogForm.executionStatus">
+              <el-radio :label="1" :value="1">{{
+                $t("administration.RegularExecution")
+              }}</el-radio>
+              <el-radio :label="2" :value="2">{{
+                $t("administration.PeriodicExecution")
+              }}</el-radio>
+              <el-radio :label="4" :value="4">{{
+                $t("administration.IntervalExecution")
+              }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <!-- 执行日期 -->
+          <el-form-item
+            :label="$t('administration.ExecutionDate')"
+            v-if="dialogForm.executionStatus == 1"
+            prop="fixedStartTime"
+          >
+            <el-date-picker
+              v-model="dialogForm.fixedStartTime"
+              type="datetime"
+              :placeholder="$t('administration.ExecutionDate')"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <div
+            v-if="dialogForm.executionStatus == 2"
+            style="margin-bottom: 20px"
+          >
+            <div class="cycle2">{{ $t("administration.timeSetting") }}</div>
+            <!-- 计划有效期 -->
+            <el-form-item
+              :label="$t('administration.PlanValidityPeriod')"
+              prop="PlanValidityPeriod"
+            >
+              <el-date-picker
+                v-model="dialogForm.value1"
+                type="datetimerange"
+                range-separator="-"
+                :start-placeholder="$t('share.StartTime')"
+                :end-placeholder="$t('share.EndTime')"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <!-- 执行任务周期 -->
+            <el-form-item
+              :label="$t('administration.ExecutionTaskCycle')"
+              prop="ExecutionTaskCycle"
+            >
+              <el-select
+                v-model="dialogForm.region"
+                :placeholder="
+                  $t('share.PleaseChoose') +
+                  $t('administration.ExecutionTaskCycle')
+                "
+              >
+                <el-option
+                  :label="$t('administration.SelectByWeek')"
+                  value="shanghai"
+                ></el-option>
+                <el-option
+                  :label="$t('administration.MonthlySelection')"
+                  value="beijing"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <!-- 执行日期添加 -->
+            <el-form-item
+              :label="$t('administration.ExecutionDate')"
+              prop="ExecutionDate"
+            >
+              <el-button type="primary" @click="executionTimeBtn"
+                >{{ $t("share.addTo") }}{{ executionTimeButton }}/7</el-button
+              >
+            </el-form-item>
+            <el-table
+              :data="executionTimeData"
+              style="width: 80%; margin-left: 10%"
+            >
+              <!-- 日期 -->
+              <el-table-column
+                :label="$t('administration.date')"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <el-select
+                    v-model="scope.row.day"
+                    :placeholder="
+                      $t('share.PleaseChoose') + $t('administration.date')
+                    "
+                  >
+                    <el-option
+                      :label="item.name"
+                      :value="item.name"
+                      v-for="(item, index) in weekData"
+                      :key="item.id"
+                      >{{ item.name }}</el-option
+                    >
+                  </el-select>
+                </template>
+              </el-table-column>
+              <!-- 时间 -->
+              <el-table-column
+                prop="name"
+                :label="$t('administration.time')"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <el-time-picker
+                    v-model="scope.row.time"
+                    :placeholder="
+                      $t('share.PleaseChoose') + $t('administration.time')
+                    "
+                  >
+                  </el-time-picker>
+                </template>
+              </el-table-column>
+              <!-- 操作 -->
+              <el-table-column
+                prop="address"
+                :label="$t('share.delete')"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="executionTimeDelet(scope.row)"
+                  />
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div
+            v-if="dialogForm.executionStatus == 4"
+            style="margin-bottom: 20px"
+          >
+            <!-- <div class="cycle2">时间设置</div> -->
+            <!-- 间隔 -->
+            <el-form-item
+              :label="$t('administration.interval')"
+              prop="interval"
+            >
+              <el-date-picker
+                v-model="dialogForm.value1"
+                type="datetimerange"
+                range-separator="-"
+                :start-placeholder="$t('share.StartTime')"
+                :end-placeholder="$t('share.EndTime')"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <!-- 执行时间 -->
+            <el-form-item
+              :label="$t('administration.executionTime')"
+              prop="executionTime"
+            >
+              <el-time-picker
+                v-model="dialogForm.value1"
+                :placeholder="
+                  $t('share.PleaseChoose') + $t('administration.executionTime')
+                "
+              >
+              </el-time-picker>
+            </el-form-item>
+            <!-- 间隔类型 -->
+            <el-form-item
+              :label="$t('administration.intervalType')"
+              prop="intervalType"
+            >
+              <el-select
+                v-model="dialogForm.region"
+                :placeholder="
+                  $t('share.PleaseChoose') + $t('administration.intervalType')
+                "
+              >
+                <el-option :label="$t('share.hour')" value="小时"></el-option>
+              </el-select>
+            </el-form-item>
+            <!-- 数量 -->
+            <el-form-item
+              :label="$t('administration.quantity')"
+              prop="quantity"
+            >
+              <el-input-number
+                v-model="dialogForm.num"
+                :min="1"
+              ></el-input-number>
+            </el-form-item>
+          </div>
+          <el-form-item>
+            <el-button @click="resetForm('ruleForm')">{{
+              $t("share.cancel")
+            }}</el-button>
+            <el-button type="primary" @click="submitForm(0)">{{
+              $t("administration.nextStep")
+            }}</el-button>
+          </el-form-item>
+        </div>
+        <!-- 选择巡检对象 -->
+        <div v-if="dialogTableVisibleStep == 1">
+          <div class="dialogTableVisibleStep1">
+            <div class="dialogTableVisibleStep1-content">
+              <div class="leftTotle">{{ $t("administration.region") }}</div>
+              <div
+                class="dialogTableVisibleStepQurey"
+                style="margin-bottom: 10px"
+              >
+                <el-input
+                  :placeholder="$t('share.content')"
+                  v-model="treeWatchInput"
+                >
+                </el-input>
+                <!-- <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  type="primary"
+                ></el-button> -->
+              </div>
+              <el-tree
+                :data="selectTreeData"
+                show-checkbox
+                node-key="areaId"
+                ref="selectTree"
+                highlight-current
+                :props="defaultProps"
+                @check="selectTreeHandleCheckChange"
+                :check-strictly="true"
+                :filter-node-method="selectTreeDataWacth"
+              >
+              </el-tree>
+            </div>
+            <div>
+              <el-transfer
+                v-model="transferValue"
+                :data="transferData"
+                :props="{ key: 'deviceId', label: 'deviceName' }"
+                :titles="[
+                  $t('administration.ToBeAdded'),
+                  $t('administration.Added'),
+                ]"
+              ></el-transfer>
+            </div>
+          </div>
+          <div
+            style="
+              margin-left: 80%;
+              margin-top: 20px;
+              display: flex;
+              justify-content: flex-end;
+            "
+          >
+            <el-button @click="returnCancel(0)">{{
+              $t("administration.PreviousStep")
+            }}</el-button>
+            <el-button type="primary" @click="submitForm(1)">{{
+              $t("administration.nextStep")
+            }}</el-button>
+          </div>
+        </div>
+        <!-- 点位设置 -->
+        <div v-if="dialogTableVisibleStep == 2">
+          <el-tree
+            :data="pointSettingsTreeData"
+            show-checkbox
+            node-key="areaId"
+            ref="pointSettingsTree"
+            highlight-current
+            :props="pointSettingsDefaultProps"
+            @check="pointSettingsTreeDataHandleCheckChange"
+          >
+          </el-tree>
+          <el-form-item
+            :label="$t('administration.IsItEnabled')"
+            prop="isenable"
+          >
+            <el-radio-group v-model="dialogForm.isenable">
+              <el-radio :label="0">{{ $t("share.Yes") }}</el-radio>
+              <el-radio :label="1">{{ $t("share.No") }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item>
+            <el-button @click="returnCancel(1)">{{
+              $t("administration.PreviousStep")
+            }}</el-button>
+            <el-button type="primary" @click="submitForm(2)">{{
+              $t("share.confirm")
+            }}</el-button>
+          </el-form-item>
+        </div>
+        <!-- <span slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">下一步</el-button>
+      </span> -->
+      </el-form>
+    </el-dialog>
+
+    <!-- 复制弹框 -->
+    <el-dialog
+      :title="$t('administration.CopyTask')"
+      :visible.sync="copyDialogVisible"
+      width="30%"
+      :before-close="handleClose"
+    >
+      <el-time-picker
+        v-model="copyTask.time"
+        format="HH:mm:ss"
+        value-format="HH:mm:ss"
+        :placeholder="$t('share.PleaseChoose') + $t('administration.time')"
+      >
+      </el-time-picker>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="copyOk()">{{
+          $t("administration.Copy")
+        }}</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getList,
+  getChangeStatus,
+  postRemove,
+  getPatroltypeList,
+  getAreaList,
+  getProDeviceTreeSelect,
+  getTreeProMainDevicePatrolEquSelect,
+  getCopyTask,
+  getControlChange,
+  getTaskIsSue,
+} from "@/api/administration";
+import TreeSelect from "@riophae/vue-treeselect";
+export default {
+  data() {
+    return {
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        taskName: "",
+        cycleStartTime: "",
+        cycleEndTime: "",
+        areaName: "",
+        isenable: "",
+        beginTime: "",
+        endTime: "",
+      },
+      total: 0,
+      loading: true,
+      dataList: [],
+      // 选中数组
+      ids: [],
+      title: "新增",
+      dialogTableVisible: false,
+      active: 0,
+      patroltype: [],
+      dialogForm: {
+        areaIdS: [],
+        executionMode: [],
+        executionStatus: 1,
+      },
+      areaIdS: [],
+      treeData: [],
+      setUpAreaIds: [],
+      selectTreeData: [],
+      selectTreeIds: [],
+      pointSettingsTreeData: [],
+      pointSettingsDefaultProps: {
+        children: "children",
+        label: "label",
+      },
+      defaultProps: {
+        children: "children",
+        label: "areaName",
+      },
+      rules: {},
+      executionTimeButton: 1,
+      executionTimeData: [{ day: "", time: "", id: Date.now() }],
+      weekData: [
+        { name: "周一", id: "0" },
+        { name: "周二", id: "1" },
+        { name: "周三", id: "2" },
+        { name: "周四", id: "3" },
+        { name: "周五", id: "4" },
+        { name: "周六", id: "5" },
+        { name: "周日", id: "6" },
+      ],
+      dialogTableVisibleStep: 0,
+      transferData: [],
+      transferValue: [],
+      copyDialogVisible: false,
+      rules: {
+        taskName: [
+          {
+            required: true,
+            message:
+              this.$t("share.PleaseEnter") + this.$t("administration.name"),
+            trigger: "blur",
+          },
+        ],
+        priority: [
+          {
+            required: true,
+            message:
+              this.$t("share.PleaseChoose") +
+              this.$t("administration.priority"),
+            trigger: "blur",
+          },
+        ],
+        type: [
+          {
+            required: true,
+            message:
+              this.$t("share.PleaseChoose") +
+              this.$t("administration.TaskType"),
+            trigger: "blur",
+          },
+        ],
+        executionMode: [
+          {
+            type: "array",
+            required: true,
+            message:
+              this.$t("share.PleaseChoose") +
+              this.$t("administration.TaskExecutionMethod"),
+            trigger: "change",
+          },
+        ],
+        areaIdS: [
+          {
+            type: "array",
+            required: true,
+            message:
+              this.$t("share.PleaseChoose") +
+              this.$t("administration.InspectionArea"),
+            trigger: "change",
+          },
+        ],
+        fixedStartTime: [
+          {
+            required: true,
+            message:
+              this.$t("share.PleaseChoose") +
+              this.$t("administration.ExecutionDate"),
+            trigger: "change",
+          },
+        ],
+        proDeviceTreeSelect: [],
+        isenable: [
+          {
+            required: true,
+            message: this.$t("share.PleaseChoose") + this.$t("share.status"),
+            trigger: "change",
+          },
+        ],
+        PlanValidityPeriod: [
+          {
+            required: true,
+            message:
+              this.$t("share.PleaseChoose") +
+              this.$t("administration.PlanValidityPeriod"),
+            trigger: "change",
+          },
+        ],
+        ExecutionTaskCycle: [
+          {
+            required: true,
+            message:
+              this.$t("share.PleaseChoose") +
+              this.$t("administration.ExecutionTaskCycle"),
+            trigger: "change",
+          },
+        ],
+        ExecutionDate: [
+          {
+            required: true,
+            message:
+              this.$t("share.PleaseChoose") +
+              this.$t("administration.ExecutionDate"),
+            trigger: "change",
+          },
+        ],
+        interval: [
+          {
+            required: true,
+            message:
+              this.$t("share.PleaseChoose") +
+              this.$t("administration.interval"),
+            trigger: "change",
+          },
+        ],
+        executionTime: [
+          {
+            required: true,
+            message:
+              this.$t("share.PleaseChoose") +
+              this.$t("administration.executionTime"),
+            trigger: "change",
+          },
+        ],
+        intervalType: [
+          {
+            required: true,
+            message:
+              this.$t("share.PleaseChoose") +
+              this.$t("administration.intervalType"),
+            trigger: "change",
+          },
+        ],
+        quantity: [
+          {
+            required: true,
+            message:
+              this.$t("share.PleaseChoose") +
+              this.$t("administration.quantity"),
+            trigger: "change",
+          },
+        ],
+      },
+      copyTask: {
+        taskId: null,
+        time: null,
+      },
+      treeWatchInput: "",
+    };
+  },
+  watch: {
+    treeWatchInput(val) {
+      this.$refs.selectTree.filter(val);
+    },
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    init() {
+      getList(this.queryParams).then((res) => {
+        console.log(res);
+        if (res.code == 200) {
+          this.loading = false;
+          this.dataList = res.rows;
+          this.total = res.total;
+          this.$message({
+            message: this.$t("prompt.success.queryWasSuccessful"),
+            type: "success",
+          });
+        }
+      });
+    },
+    // 查询
+    handleQuery() {
+      this.init();
+    },
+    // 重置
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      };
+      this.init();
+    },
+     stateFormat(row, column) {
+      if (row.executionStatus == 0) {
+        return "立即执行";
+      } else if (row.executionStatus == 1) {
+        return "周期执行";
+      } else if (row.executionStatus == 2) {
+        return "定时执行";
+      } else if (row.executionStatus == 3) {
+        return "已执行";
+      } else if (row.executionStatus == 4) {
+        return "间隔执行";
+      }
+    },
+    stateTask(row, column) {
+      if (row.executionStatus == 1) {
+        if (row.taskCycle == 0) {
+          return "按月";
+        } else if (row.taskCycle == 1) {
+          return "按周";
+        }
+        return "";
+      }
+    },
+    handleStatusChange(row) {
+      let data = {
+        taskId: row.taskId,
+        isenable: row.isenable,
+      };
+      getChangeStatus(data).then((res) => {
+        if (res.code == 200) {
+          this.init();
+        }
+      });
+    },
+    // 新增
+    handleAdd() {
+      this.dialogTableVisible = true;
+      getPatroltypeList().then((res) => {
+        if (res.code == 200) {
+          this.patroltype = res.rows;
+        }
+      });
+      getAreaList().then((res) => {
+        if (res.code == 200) {
+          let tree = this.dialogTree(res.data);
+          this.treeData = tree;
+        }
+      });
+    },
+    // 弹框tree扁平转树结构
+    dialogTree(list) {
+      var map = {},
+        node,
+        tree = [];
+      for (let i = 0; i < list.length; i++) {
+        map[list[i].areaId] = list[i];
+        list[i].children = [];
+      }
+      for (let i = 0; i < list.length; i += 1) {
+        list[i];
+        if (list[i].parentId !== 0) {
+          // 不是根节点
+          map[list[i].parentId].children.push(list[i]); // 放到父节点的children里
+        } else {
+          // 是根节点
+          tree.push(list[i]); // 根节点计入结果数组
+        }
+      }
+      return tree;
+    },
+    // 多选删除
+    handleDeleteAll() {
+      if (this.ids.length <= 0) {
+        this.$message({
+          message: this.$t("prompt.error.delete_Data"),
+          type: "warning",
+        });
+        return;
+      } else {
+        console.log(this.ids.toString());
+        postRemove(this.ids.toString()).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              message: this.$t("prompt.success.queryWasSuccessful"),
+              type: "success",
+            });
+            this.init();
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "warning",
+            });
+          }
+        });
+      }
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.taskId);
+    },
+    handleDelete(taskId) {
+      postRemove(taskId).then((res) => {
+        if (res.code == 200) {
+          this.init();
+        }
+      });
+    },
+    cancel() {
+      this.dialogTableVisible = false;
+      this.dialogForm = {};
+    },
+
+    // 弹框tree树选择
+    handleCheckChange(data) {
+      let idArr = [];
+      if (idArr.indexOf(data.areaId) > -1) {
+        idArr.splice(idArr.indexOf(data.areaId), 1);
+      } else {
+        idArr.push(data.areaId);
+      }
+      return idArr;
+    },
+    // 设置计划对象弹框选择
+    setUpHandleCheckChange(data) {
+      var parentIds = this.$refs.tree.getHalfCheckedKeys();
+      var childsIds = this.$refs.tree.getCheckedKeys();
+      let treeIds = parentIds.concat(childsIds);
+      this.dialogForm.areaIdS = treeIds;
+
+      return;
+      this.dialogForm.areaIdS = this.handleCheckChange(treeIds);
+      console.log(this.dialogForm.areaIdS);
+    },
+    // 弹框选择巡检对象 tree树选择
+    selectTreeHandleCheckChange(data) {
+      // this.selectTreeIds = this.handleCheckChange(data);
+      let res = this.$refs.selectTree.getCheckedNodes();
+      let arrDeptId = [];
+      res.forEach((item) => {
+        arrDeptId.push(item.areaId);
+      });
+      this.transferData = this.proDeviceTreeSelect.filter((item) =>
+        arrDeptId.some((ele) => ele === item.areaId)
+      );
+    },
+    // 点位设置数
+    pointSettingsTreeDataHandleCheckChange() {
+      let res = this.$refs.pointSettingsTree.getCheckedNodes();
+      console.log(res);
+    },
+    // 弹框下一步
+    submitForm(type) {
+      this.$refs["ruleForm"].validate((valid) => {
+        if (valid) {
+          console.log(this.dialogForm);
+          // this.dialogForm.executionMode = 0;
+          if (type == 0) {
+            this.active = 1;
+            this.dialogTableVisibleStep = 1;
+            let areaIdS = JSON.parse(JSON.stringify(this.dialogForm.areaIdS));
+            // areaIdS.push(1);
+            getAreaList(areaIdS.join(","), 1).then((res) => {
+              if (res.code == 200) {
+                let tree = this.dialogTree(res.data);
+                this.selectTreeData = tree;
+              }
+            });
+            getProDeviceTreeSelect(areaIdS.join(",")).then((res) => {
+              if (res.code == 200) {
+                this.proDeviceTreeSelect = res.data;
+              }
+            });
+          }
+          if (type == 1 && this.transferValue) {
+            this.active = 2;
+            this.dialogTableVisibleStep = 2;
+            getTreeProMainDevicePatrolEquSelect(
+              this.transferValue.join(",")
+            ).then((res) => {
+              console.log(res, 11111);
+              this.pointSettingsTreeData = res.data;
+            });
+          }
+          if (type == 2) {
+            console.log(this.dialogForm);
+          }
+        }
+      });
+    },
+    // 弹框上一步
+    returnCancel(type) {
+      this.active = type;
+      this.dialogTableVisibleStep = type;
+    },
+    resetForm(formName) {
+      this.dialogForm = {};
+      this.$refs[formName].resetFields();
+      this.dialogTableVisible = false;
+    },
+    // 添加任务执行时间输入框
+    executionTimeBtn() {
+      if (this.executionTimeData.length <= 6) {
+        this.executionTimeData.push({ day: "", time: "", id: Date.now() });
+      }
+    },
+    executionTimeDelet(row) {
+      if (this.executionTimeData.length > 1) {
+        this.executionTimeData = this.executionTimeData.filter(
+          (item) => item.id != row.id
+        );
+        console.log(this.executionTimeData);
+      }
+    },
+    // 复制任务
+    handleCopy(row) {
+      this.copyTask.taskId = row.taskId;
+      this.copyDialogVisible = true;
+    },
+    // 编辑任务
+    handleUpdate(row) {
+      this.dialogTableVisible = true;
+    },
+    handleClose() {
+      this.copyDialogVisible = false;
+    },
+    // 复制任务确定
+    copyOk() {
+      console.log(this.copyTask.time);
+      if (this.copyTask.time) {
+        getCopyTask(this.copyTask).then((res) => {
+          if (res.code == 200) {
+            this.$message({
+              message: this.$t("prompt.success.taskCopySuccess"),
+              type: "success",
+            });
+            this.init();
+            this.copyDialogVisible = false;
+          }
+        });
+      } else {
+        this.$message.error(this.$t("prompt.error.PleaseSelectATime"));
+      }
+    },
+    // 立即执行
+    handleImmediateExecution(taskId) {
+      getControlChange({ taskId }).then((res) => {
+        console.log(res, 111111111);
+        if (res.code == 200) {
+          this.$message({
+            message: this.$t("prompt.success.OperationSuccessful"),
+            type: "success",
+          });
+        }
+      });
+    },
+    // 任务下发
+    handleIssue(taskId) {
+      getTaskIsSue({ taskId }).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            message: this.$t("prompt.success.OperationSuccessful"),
+            type: "success",
+          });
+        }
+      });
+    },
+    // 第二部Tree过滤
+    selectTreeDataWacth(value, data) {
+      console.log(value, data, 11111111);
+      if (!value) return true;
+      return data.areaName.indexOf(value) !== -1;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.cycle2 {
+  padding: 10px;
+  font-size: 20px;
+  font-weight: bold;
+  margin-bottom: 20px;
+}
+.dialogTableVisibleStep1 {
+  display: flex;
+  justify-content: space-around;
+}
+.dialogTableVisibleStep1-content {
+  width: 30%;
+  // height: 200px;
+  .leftTotle {
+    font-size: 20px;
+    margin-bottom: 10px;
+  }
+  .el-input {
+    width: 75%;
+  }
+}
+</style>
diff --git a/src/views/administration/administration.vue b/src/views/administration/administration.vue
index 4e9e0e9..e7a763b 100644
--- a/src/views/administration/administration.vue
+++ b/src/views/administration/administration.vue
@@ -141,7 +141,7 @@
         min-width="100px"
       />
       <!-- 创建时间 -->
-      <el-table-column :label="$t('share.CreationTime')" prop="beginTime" />
+      <el-table-column :label="$t('share.CreationTime')" prop="createTime" />
       <!-- 区域时间 -->
       <el-table-column
         :label="$t('administration.RegionName')"
@@ -150,12 +150,14 @@
       <!-- 任务策略 -->
       <el-table-column
         :label="$t('administration.TaskStrategy')"
-        prop="stateFormat"
+        prop="executionStatus"
+        :formatter="stateFormat"
       />
       <!-- 执行任务周期 -->
       <el-table-column
         :label="$t('administration.ExecutionTaskCycle')"
-        prop="roleSort"
+        prop="taskCycle"
+        :formatter="stateTask"
       />
       <!-- 状态 -->
       <el-table-column :label="$t('share.status')" align="center">
@@ -205,7 +207,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            @click="editClick(scope.row)"
             >{{ $t("share.edit") }}</el-button
           >
           <!-- 删除 -->
@@ -224,7 +226,7 @@
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
-       @pagination="init"
+      @pagination="init"
     />
     <el-dialog :title="title" :visible.sync="dialogTableVisible">
       <el-steps :active="active" style="margin-bottom: 20px">
@@ -634,6 +636,42 @@
         }}</el-button>
       </span>
     </el-dialog>
+
+    <!-- 新增弹框 -->
+    <el-dialog
+      title="新建方案"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :destroy-on-close="true"
+      :visible.sync="addShow"
+      width="1200px"
+      custom-class="card-dialog card-page"
+    >
+      <newTask
+        @hideDialog="addShow = false"
+        v-if="addShow"
+        @addSuccess="addSuccess"
+      >
+      </newTask>
+    </el-dialog>
+    <!-- 编辑任务 -->
+    <el-dialog
+      title="编辑任务"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :destroy-on-close="true"
+      :visible.sync="editShow"
+      width="1200px"
+      custom-class="card-dialog card-page"
+    >
+      <editTask
+        @hideDialog="editShow = false"
+        :editid="editid"
+        @editSuccess="editSuccess"
+        v-if="editShow"
+      >
+      </editTask>
+    </el-dialog>
   </div>
 </template>
 
@@ -651,7 +689,10 @@ import {
   getTaskIsSue,
 } from "@/api/administration";
 import TreeSelect from "@riophae/vue-treeselect";
+import newTask from "./new_task";
+import editTask from "./edit_task";
 export default {
+  components: { newTask,editTask },
   data() {
     return {
       queryParams: {
@@ -842,6 +883,9 @@ export default {
         time: null,
       },
       treeWatchInput: "",
+      addShow: false,
+      editShow: false,
+      editid: "",
     };
   },
   watch: {
@@ -879,6 +923,38 @@ export default {
       };
       this.init();
     },
+    addSuccess() {
+      this.addShow = false;
+      this.$modal.msgSuccess("添加成功");
+      this.init();
+    },
+    editSuccess() {
+      this.editShow = false;
+      this.init();
+    },
+    stateFormat(row, column) {
+      if (row.executionStatus == 0) {
+        return "立即执行";
+      } else if (row.executionStatus == 1) {
+        return "周期执行";
+      } else if (row.executionStatus == 2) {
+        return "定时执行";
+      } else if (row.executionStatus == 3) {
+        return "已执行";
+      } else if (row.executionStatus == 4) {
+        return "间隔执行";
+      }
+    },
+    stateTask(row, column) {
+      if (row.executionStatus == 1) {
+        if (row.taskCycle == 0) {
+          return "按月";
+        } else if (row.taskCycle == 1) {
+          return "按周";
+        }
+        return "";
+      }
+    },
     handleStatusChange(row) {
       let data = {
         taskId: row.taskId,
@@ -891,19 +967,22 @@ export default {
       });
     },
     // 新增
+    // handleAdd() {
+    //   this.dialogTableVisible = true;
+    //   getPatroltypeList().then((res) => {
+    //     if (res.code == 200) {
+    //       this.patroltype = res.rows;
+    //     }
+    //   });
+    //   getAreaList().then((res) => {
+    //     if (res.code == 200) {
+    //       let tree = this.dialogTree(res.data);
+    //       this.treeData = tree;
+    //     }
+    //   });
+    // },
     handleAdd() {
-      this.dialogTableVisible = true;
-      getPatroltypeList().then((res) => {
-        if (res.code == 200) {
-          this.patroltype = res.rows;
-        }
-      });
-      getAreaList().then((res) => {
-        if (res.code == 200) {
-          let tree = this.dialogTree(res.data);
-          this.treeData = tree;
-        }
-      });
+      this.addShow = true;
     },
     // 弹框tree扁平转树结构
     dialogTree(list) {
@@ -1075,8 +1154,10 @@ export default {
       this.copyDialogVisible = true;
     },
     // 编辑任务
-    handleUpdate(row) {
-      this.dialogTableVisible = true;
+    editClick(row) {
+      this.editid = row.taskId;
+       sessionStorage.setItem("reportLineId", JSON.stringify(this.editid));
+       this.editShow = true;
     },
     handleClose() {
       this.copyDialogVisible = false;
diff --git a/src/views/administration/edit_task.vue b/src/views/administration/edit_task.vue
new file mode 100644
index 0000000..017fc7a
--- /dev/null
+++ b/src/views/administration/edit_task.vue
@@ -0,0 +1,1820 @@
+<template>
+  <div class="task">
+    <el-steps :active="active">
+      <el-step title="设置计划对象"></el-step>
+      <el-step title="选择巡检对象"></el-step>
+      <el-step title="点位设置"></el-step>
+    </el-steps>
+    <div style="flex: 1; height: 0; overflow-y: auto">
+      <div class="ac-on1" v-show="active == 1">
+        <div class="ac-on1-box">
+          <div class="a2">名称 <span>*</span></div>
+          <el-input class="a3" v-model="input3" placeholder="请输入"></el-input>
+          <div class="a2">优先级 <span>*</span></div>
+          <el-select class="a3" v-model="priority" placeholder="请选择">
+            <el-option label="优先级1" value="1"> </el-option>
+            <el-option label="优先级2" value="2"> </el-option>
+            <el-option label="优先级3" value="3"> </el-option>
+            <el-option label="优先级4" value="4"> </el-option>
+          </el-select>
+          <div class="a2">任务类型 <span>*</span></div>
+          <template>
+            <TreeSelect
+              :defaultExpandLevel="2"
+              :limit="0"
+              :limitText="(count) => `+${count}`"
+              v-model="type"
+              :options="listPatroltype"
+              :show-count="true"
+              placeholder="请选择巡检类型"
+            />
+            <!-- <el-select
+              class="a3"
+              v-model="type"
+              placeholder="请选择"
+              @change="typeClick"
+            >
+              <el-option
+                v-for="item in typeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select> -->
+          </template>
+          <div class="a2">任务执行方式 <span>*</span></div>
+          <el-checkbox class="a3" v-model="checked">现场巡检</el-checkbox>
+          <div class="a2">巡检区域 <span>*</span></div>
+          <template>
+            <el-input placeholder="输入关键字进行过滤" v-model="filterText">
+            </el-input>
+            <el-checkbox
+              style="margin-top: 10px"
+              v-model="checkAll"
+              @change="handleCheckAllChange"
+              >全选</el-checkbox
+            >
+            <!-- :default-checked-keys="selectAreaIdList" -->
+            <el-tree
+              :filter-node-method="filterNode"
+              :props="defaultProps2"
+              ref="treeForm"
+              :data="areaList"
+              default-expand-all
+              show-checkbox
+              node-key="areaId"
+              :default-checked-keys="selectAreaIdList"
+            >
+            </el-tree>
+          </template>
+        </div>
+        <div class="ac-on1-box ac-one1-right">
+          <div class="choose">
+            <el-radio-group v-model="radio">
+              <el-radio class="radio" v-model="radio" label="1"
+                >定时执行</el-radio
+              >
+              <el-radio class="radio" v-model="radio" label="2"
+                >周期执行</el-radio
+              >
+              <el-radio class="radio" v-model="radio" label="3"
+                >间隔执行</el-radio
+              >
+            </el-radio-group>
+          </div>
+          <div v-if="radio == 1" class="mb">
+            <el-date-picker
+              v-model="value11"
+              type="datetime"
+              placeholder="选择日期时间"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              :picker-options="pickerOptions0"
+            >
+            </el-date-picker>
+          </div>
+          <div v-if="radio == 2">
+            <div class="a1">时间设置</div>
+            <div class="a2">计划有效期 <span>*</span></div>
+            <div class="block">
+              <el-date-picker
+                v-model="value1"
+                type="datetime"
+                @change="handleChangeStartTime"
+                placeholder="选择开始日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :picker-options="pickerOptions0"
+              >
+              </el-date-picker>
+              -
+              <el-date-picker
+                v-model="value2"
+                type="datetime"
+                @change="handleChangeEndTime"
+                placeholder="选择结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :picker-options="pickerOptions1"
+              >
+              </el-date-picker>
+            </div>
+
+            <div class="a2">任务执行周期 <span>*</span></div>
+            <template>
+              <el-select
+                class="a3"
+                v-model="weekormonth"
+                @change="onChangeWeekOrMonth"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in options1"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </template>
+            <div class="a2">
+              任务执行时间 <span>*</span>
+              <el-button
+                type="primary"
+                @click="add1"
+                v-if="weekormonth == 'month'"
+                >添加({{ timelist1.length }})
+              </el-button>
+              <el-button
+                type="primary"
+                @click="add1"
+                v-if="weekormonth == 'week'"
+                >添加({{ timelist2.length }})
+              </el-button>
+            </div>
+            <el-row :gutter="20">
+              <el-col :span="6">
+                <div class="grid-content bg-purple">日期</div>
+              </el-col>
+              <el-col :span="6">
+                <div class="grid-content bg-purple">时间</div>
+              </el-col>
+              <el-col :span="6">
+                <div class="grid-content bg-purple">操作</div>
+              </el-col>
+            </el-row>
+            <div v-if="weekormonth == 'month'">
+              <el-row
+                :gutter="20"
+                class="line mb"
+                v-for="(item, index) in timelist1"
+                :key="index"
+                :index="index"
+              >
+                <el-col :span="6">
+                  <el-select
+                    v-model="item.zhixing"
+                    @change="handleChangeTaskRunDayWithMonth(item)"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in dayList"
+                      :key="item"
+                      :label="item"
+                      :value="item"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-col>
+                <el-col :span="6">
+                  <div class="grid-content bg-purple">
+                    <el-time-picker
+                      v-model="item.time"
+                      @change="
+                        (t) => {
+                          handleChangeTaskRunTimeWithMonth(t, item);
+                        }
+                      "
+                      :picker-options="{ selectableRange: '' }"
+                      placeholder="选择时间"
+                      value-format="HH:mm:ss"
+                    >
+                    </el-time-picker>
+                  </div>
+                </el-col>
+                <el-col :span="6">
+                  <div class="grid-content bg-purple">
+                    <i
+                      class="el-icon-delete fs"
+                      title="删除"
+                      @click="delete1(index)"
+                    ></i>
+                  </div>
+                </el-col>
+              </el-row>
+            </div>
+            <div v-if="weekormonth == 'week'">
+              <el-row
+                :gutter="20"
+                class="line mb"
+                v-for="(item, index) in timelist2"
+                :key="index"
+                :index="index"
+              >
+                <el-col :span="6">
+                  <el-select
+                    v-model="item.zhixing"
+                    @change="handleChangeTaskRunDay(item)"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in weekendList"
+                      :key="item"
+                      :label="item"
+                      :value="item"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-col>
+                <el-col :span="6">
+                  <div class="grid-content bg-purple">
+                    <el-time-picker
+                      v-model="item.time"
+                      @change="
+                        (t) => {
+                          handleChangeTaskRunTime(t, item);
+                        }
+                      "
+                      value-format="HH:mm:ss"
+                      :picker-options="{ selectableRange: '' }"
+                      placeholder="选择时间"
+                    >
+                    </el-time-picker>
+                  </div>
+                </el-col>
+                <el-col :span="6">
+                  <div class="grid-content bg-purple">
+                    <i
+                      class="el-icon-delete fs"
+                      title="删除"
+                      @click="delete1(index)"
+                    ></i>
+                  </div>
+                </el-col>
+              </el-row>
+            </div>
+          </div>
+          <div v-if="radio == 3">
+            <div class="a2">间隔<span>*</span></div>
+            <div class="block">
+              <el-date-picker
+                v-model="intervalStartTime"
+                @change="handleChangeIntervalStartTime"
+                type="datetime"
+                placeholder="选择开始日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :picker-options="pickerOptions0"
+              >
+              </el-date-picker>
+              -
+              <el-date-picker
+                v-model="intervalEndTime"
+                @change="handleChangeIntervalEndTime"
+                type="datetime"
+                placeholder="选择结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :picker-options="pickerOptions1"
+              >
+              </el-date-picker>
+            </div>
+
+            <div class="a2">执行时间 <span>*</span></div>
+            <div class="block">
+              <el-time-picker
+                v-model="intervalExecuteTime"
+                placeholder="间隔内开始时间"
+                value-format="HH:mm:ss"
+              >
+              </el-time-picker>
+
+              <!-- <el-date-picker
+                v-model="value1"
+                type="date"
+                placeholder="间隔执行时间"
+                value-format="yyyy-MM-dd"
+                :picker-options="intervalExecuteTime"
+              >
+              </el-date-picker> -->
+            </div>
+            <div class="a2">间隔类型 <span>*</span></div>
+            <template>
+              <el-select class="a3" v-model="intervalType" placeholder="请选择">
+                <el-option label="小时" value="1"></el-option>
+                <!-- <el-option label="天" value="2"></el-option> -->
+              </el-select>
+            </template>
+            <div class="a2">间隔执行次数 <span>*</span></div>
+            <el-input-number
+              style="margin-bottom: 20px"
+              v-if="intervalType == 1"
+              v-model="intervalNumber"
+              :min="1"
+              :max="maxintervalNumber"
+              :precision="0"
+            ></el-input-number>
+          </div>
+          <el-button @click="linkUrl">取消</el-button>
+          <el-button type="primary" @click="next1">下一步</el-button>
+        </div>
+      </div>
+      <div class="ac-on2" v-show="active == 2">
+        <div class="ac-on2-box">
+          <div class="ac2-d1">
+            <div class="ac2-d1-e1">巡检对象筛选</div>
+            <div class="search">
+              <el-input
+                placeholder="搜索区域名称"
+                icon="el-icon-search"
+                v-model="searchName"
+              ></el-input>
+              <el-button
+                class="button"
+                type="primary"
+                icon="el-icon-search"
+                @click="searchClick"
+              ></el-button>
+            </div>
+            <el-tree
+              :data="areaList1"
+              :props="defaultProps1"
+              show-checkbox
+              @check-change="handleObjectTreeChecked"
+              :default-expand-all="true"
+            ></el-tree>
+          </div>
+          <div class="ac2-d2">
+            <div style="text-align: center">
+              <el-transfer
+                style="text-align: left; display: inline-block"
+                v-model="value5"
+                filterable
+                :filter-method="transferFilterMethod"
+                :props="{ key: 'deviceId', label: 'deviceName' }"
+                :titles="['待添加', '已添加']"
+                :format="{
+                  noChecked: '${total}',
+                  hasChecked: '${checked}/${total}',
+                }"
+                @change="handleChange"
+                :data="treeList"
+              >
+                <template slot-scope="{ option }">
+                  <el-tooltip
+                    placement="top"
+                    effect="light"
+                    :content="option.deviceName"
+                  >
+                    <span> {{ option.deviceName }}</span>
+                  </el-tooltip>
+                </template>
+              </el-transfer>
+              <div class="ac-on2-btn">
+                <el-button @click="prev">上一步</el-button>
+                <el-button type="primary" @click="next">下一步</el-button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="ac-on3" v-show="active == 3">
+        <!-- @check-change="treeClick" -->
+         <el-input placeholder="输入关键字进行过滤" v-model="filterText2">
+        </el-input>
+        <div class="ac-on3-box">
+          <el-checkbox
+            style="margin-top: 10px"
+            v-model="checkPointAll"
+            @change="handleCheckPointAllChange"
+            >全选
+          </el-checkbox>
+          <el-tree
+          :filter-node-method="filterNode2"
+            style="height: 400px; overflow-y: auto"
+            :data="setList"
+            ref="tree"
+            show-checkbox
+            node-key="dataId"
+            default-expand-all
+            :default-checked-keys="setCheck"
+            :props="defaultProps"
+          >
+          </el-tree>
+        </div>
+        <div class="a2">是否开启 <span>*</span></div>
+        <template>
+          <el-radio v-model="beginradio" label="0" @change="changeBegine"
+            >是</el-radio
+          >
+          <el-radio v-model="beginradio" label="1" @change="changeBegine"
+            >否</el-radio
+          >
+        </template>
+        <div class="ac-on2-btn">
+          <el-button type="primary" @click="prev">上一步</el-button>
+          <el-button @click="saveClick">完成</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  listArea,
+  equipmentree,
+  equSelect,
+  addPatrol,
+  editTask,
+  editList,
+  editSave,
+  changeStatus,
+} from "@/api/basedata/area/area";
+import TreeSelect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import linq from "linq";
+import { listPatroltype } from "@/api/basedata/patrolpointmnt/patroltype";
+import { getWeekdaysInRange, getDaysInRange } from "@/utils/index.js";
+export default {
+  name: "edit_task",
+  components: { TreeSelect },
+  data() {
+    return {
+      checkAll: false,
+      checkPointAll: false,
+      listPatroltype: [],
+      intervalStartTime: "",
+      intervalEndTime: "",
+      intervalExecuteTime: "",
+      intervalType: "1",
+      intervalNumber: 0,
+      editid: "",
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      pickerOptions0: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;
+        },
+      },
+      pickerOptions1: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;
+        },
+      },
+      dateShow: true,
+      beginradio: "0",
+      input3: "",
+      active: 1,
+      radio: "1",
+      checked: true,
+      zhixing: "选择",
+      weekendList: [],
+      zhixing2: "选择",
+      dayList: [],
+      value: "第一间隔单元",
+      value1: "",
+      value2: "",
+      value11: "",
+      options1: [
+        {
+          value: "week",
+          label: "按周选择",
+        },
+        {
+          value: "month",
+          label: "按月选择",
+        },
+      ],
+      typeOptions: [
+        {
+          value: "1",
+          label: "例行巡视",
+        },
+        {
+          value: "2",
+          label: "特殊巡视",
+        },
+        {
+          value: "3",
+          label: "专项巡视",
+        },
+        {
+          value: "4",
+          label: "自定义巡视",
+        },
+        {
+          value: "5",
+          label: "联动巡视",
+        },
+        {
+          value: "6",
+          label: "静默类型",
+        },
+      ],
+      weekormonth: "week",
+      time: "",
+      week1: "",
+      value5: [],
+      renderFunc(h, option) {
+        return (
+          <span>
+            {option.key} - {option.label}
+          </span>
+        );
+      },
+      setList: [],
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+      timelist1: [{ zhixing: "", zhixing2: "", time: "" }],
+      timelist2: [{ zhixing: "", zhixing2: "", time: "" }],
+      defaultProps1: {
+        children: "children",
+        label: "areaName",
+      },
+      defaultProps2: {
+        children: "children",
+        label: "areaName",
+      },
+      areaList: [],
+      queryParams: {
+        areaName: undefined,
+        areaId: undefined,
+        deviceIdAll: {},
+      },
+      // 设置计划对象选择Id数组
+      selectAreaIdList: [],
+
+      // 选择巡检对象选择Id数组
+      selectObjectAreaIdList: [],
+      checkedId: "",
+      treeList: [],
+      areaList1: [],
+      time3: "",
+      taskCycle: "",
+      executionStatus: 0,
+      searchName: "",
+      addList: [],
+      cycleWeek: "",
+      cycleMonth: "",
+      deviceList: "",
+      devNo: "",
+      setCheck: [],
+      type: null,
+      priority: "1",
+      filterText: "",
+      filterText2: "",
+      transferFilterMethod: (query, item) => {
+        if (
+          this.selectObjectAreaIdList &&
+          this.selectObjectAreaIdList.length > 0
+        ) {
+          // 如果areaid不在选择范围内，则返回false
+          if (this.selectObjectAreaIdList.indexOf(item.areaId) < 0) {
+            return false;
+          }
+        }
+
+        if (query) {
+          return (
+            item.deviceName.toLowerCase().indexOf(query.toLowerCase()) > -1
+          );
+        }
+        return true;
+      },
+    };
+  },
+  watch: {
+    filterText(val) {
+      this.$refs.treeForm.filter(val);
+    },
+    filterText2(val) {
+      this.$refs.tree.filter(val);
+    },
+  },
+  created() {
+    listPatroltype().then((res) => {
+      const list = [];
+      let childs = [];
+      let ptype = {};
+      linq
+        .from(res.rows)
+        .where((x) => x.parentId === 0)
+        .toArray()
+        .forEach((node) => {
+          childs = linq
+            .from(res.rows)
+            .where((c) => c.parentId === node.patrolTypeId)
+            .select((q) => {
+              return {
+                id: q.patrolTypeCode,
+                label: q.patrolTypeName,
+              };
+            })
+            .toArray();
+          ptype = {
+            id: node.patrolTypeCode,
+            isOpen: true,
+            label: node.patrolTypeName,
+            // isDisabled: false,
+          };
+          if (childs.length > 0) {
+            ptype.children = childs;
+            // ptype.isDisabled = true;
+          }
+          list.push(ptype);
+        });
+
+      this.listPatroltype = list;
+      this.type = this.listPatroltype[0].id;
+    });
+    this.editid = JSON.parse(sessionStorage.getItem("reportLineId"));
+    console.log("11111111111122", sessionStorage.getItem("reportLineId"));
+    this.getList();
+    this.getInfo();
+    if (this.weekormonth == "week") {
+      this.taskCycle = 1;
+    } else if (this.weekormonth == "month") {
+      this.taskCycle = 0;
+    }
+  },
+  computed: {
+    maxintervalNumber() {
+      try {
+        var date = 24 - new Date(this.intervalExecuteTime).getHours();
+        return date;
+      } catch (error) {
+        return 0;
+      }
+    },
+  },
+  methods: {
+    onChangeWeekOrMonth() {
+      this.changeDateList();
+    },
+    changeDateList() {
+      if (!this.value1 || !this.value2) {
+        return;
+      }
+      if (this.weekormonth == "month") {
+        this.dayList = getDaysInRange(this.value1, this.value2);
+      } else if (this.weekormonth == "week") {
+        this.weekendList = getWeekdaysInRange(this.value1, this.value2);
+      }
+    },
+    handleChangeTaskRunTimeWithMonth(t, item) {
+      const sameArray = linq
+        .from(this.timelist1)
+        .where((x) => {
+          return (
+            x != item &&
+            x.zhixing == item.zhixing &&
+            new Date("2020-01-01 " + x.time).valueOf() ==
+              new Date("2020-01-01 " + item.time).valueOf()
+          );
+        })
+        .toArray();
+      if (sameArray.length > 0) {
+        this.$message({
+          type: "warning",
+          message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`,
+        });
+        item.time = null;
+      }
+    },
+    handleChangeTaskRunDayWithMonth(item) {
+      const sameArray = linq
+        .from(this.timelist1)
+        .where((x) => {
+          return (
+            x != item &&
+            x.zhixing == item.zhixing &&
+            new Date("2020-01-01 " + x.time).valueOf() ==
+              new Date("2020-01-01 " + item.time).valueOf()
+          );
+        })
+        .toArray();
+      if (sameArray.length > 0) {
+        this.$message({
+          type: "warning",
+          message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`,
+        });
+        item.zhixing = "";
+      }
+    },
+    handleChangeTaskRunTime(t, item) {
+      const sameArray = linq
+        .from(this.timelist2)
+        .where((x) => {
+          return (
+            x != item &&
+            x.zhixing == item.zhixing &&
+            new Date("2020-01-01 " + x.time).valueOf() ==
+              new Date("2020-01-01 " + item.time).valueOf()
+          );
+        })
+        .toArray();
+      if (sameArray.length > 0) {
+        this.$message({
+          type: "warning",
+          message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`,
+        });
+        item.time = null;
+      }
+    },
+
+    handleChangeTaskRunDay(item) {
+      const sameArray = linq
+        .from(this.timelist2)
+        .where((x) => {
+          return (
+            x != item &&
+            x.zhixing == item.zhixing &&
+            new Date("2020-01-01 " + x.time).valueOf() ==
+              new Date("2020-01-01 " + item.time).valueOf()
+          );
+        })
+        .toArray();
+      if (sameArray.length > 0) {
+        this.$message({
+          type: "warning",
+          message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`,
+        });
+        item.zhixing = "";
+      }
+    },
+
+    handleChangeIntervalStartTime(t) {
+      if (t == null || t == "") {
+        return;
+      }
+      if (this.intervalEndTime != "" && this.intervalEndTime != null) {
+        if (new Date(t).valueOf() >= new Date(this.intervalEndTime).valueOf()) {
+          this.$nextTick(() => {
+            this.intervalStartTime = "";
+            this.$message({
+              type: "warning",
+              message: "起始时间要小于截止时间",
+            });
+          });
+        }
+      }
+    },
+    handleChangeIntervalEndTime(t) {
+      if (t == null || t == "") {
+        return;
+      }
+      if (this.intervalStartTime != "" && this.intervalStartTime != null) {
+        if (
+          new Date(t).valueOf() <= new Date(this.intervalStartTime).valueOf()
+        ) {
+          this.$nextTick(() => {
+            this.intervalEndTime = "";
+            this.$message({
+              type: "warning",
+              message: "截止时间要大于起始时间",
+            });
+          });
+        }
+      }
+    },
+    handleChangeStartTime(t) {
+      if (t == null || t == "") {
+        return;
+      }
+      if (this.value2 != "" && this.value2 != null) {
+        if (new Date(t).valueOf() >= new Date(this.value2).valueOf()) {
+          this.$nextTick(() => {
+            this.value1 = "";
+            this.$message({
+              type: "warning",
+              message: "起始时间要小于截止时间",
+            });
+          });
+        }
+      }
+
+      this.changeDateList();
+      // 日期改变，需要重新选择
+      if (this.weekormonth == "month") {
+        this.timelist1 = [{ zhixing: "", zhixing2: "", time: "" }];
+      } else if (this.weekormonth == "week") {
+        this.timelist2 = [{ zhixing: "", zhixing2: "", time: "" }];
+      }
+    },
+    handleChangeEndTime(t) {
+      if (t == null || t == "") {
+        return;
+      }
+      if (this.value1 != "" && this.value1 != null) {
+        if (new Date(t).valueOf() <= new Date(this.value1).valueOf()) {
+          this.$nextTick(() => {
+            this.value2 = "";
+            this.$message({
+              type: "warning",
+              message: "截止时间要大于起始时间",
+            });
+          });
+        }
+      }
+
+      this.changeDateList();
+      // 日期改变，需要重新选择
+      if (this.weekormonth == "month") {
+        this.timelist1 = [{ zhixing: "", zhixing2: "", time: "" }];
+      } else if (this.weekormonth == "week") {
+        this.timelist2 = [{ zhixing: "", zhixing2: "", time: "" }];
+      }
+    },
+
+    handleCheckAllChange(val) {
+      if (this.checkAll) {
+        this.$refs.treeForm.setCheckedNodes(this.areaList);
+      } else {
+        this.$refs.treeForm.setCheckedNodes([]);
+      }
+    },
+    handleCheckPointAllChange(val) {
+      if (this.checkPointAll) {
+        this.$refs.tree.setCheckedNodes(this.setList);
+      } else {
+        this.$refs.tree.setCheckedNodes([]);
+      }
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.areaName.indexOf(value) !== -1;
+    },
+    filterNode2(value, data, node) {
+      if (!value) return true;
+      let one = data.label.indexOf(value) !== -1;
+      let two =
+        node.parent &&
+        node.parent.data &&
+        node.parent.data.label &&
+        node.parent.data.label.indexOf(value) !== -1;
+      let three =
+        node.parent &&
+        node.parent.parent &&
+        node.parent.parent.data &&
+        node.parent.parent.data.label &&
+        node.parent.parent.data.label.indexOf(value) !== -1;
+      let four =
+        node.parent &&
+        node.parent.parent &&
+        node.parent.parent.parent &&
+        node.parent.parent.parent.data &&
+        node.parent.parent.parent.data.label &&
+        node.parent.parent.parent.data.label.indexOf(value) !== -1;
+
+      let result_one = false;
+      let result_two = false;
+      let result_three = false;
+      let result_four = false;
+      if (node.level === 1) {
+        result_one = one;
+      } else if (node.level === 2) {
+        result_two = one || two;
+      } else if (node.level === 3) {
+        result_three = one || two || three;
+      } else if (node.level === 4) {
+        result_four = one || two || three || four;
+      }
+      return result_one || result_two || result_three || result_four;
+    },
+    getInfo: function () {
+      console.log("111111111", this.editid);
+      if (this.editid != -1) {
+        editTask(this.editid).then((response) => {
+          if (response.data.executionMode == "0") {
+            this.checked = true;
+          }
+          if (response.data.executionStatus == "4") {
+            this.radio = "3";
+          } else if (response.data.executionStatus == "1") {
+            this.radio = "2";
+          } else if (response.data.executionStatus == "2") {
+            this.radio = "1";
+          }
+          let setArr = [];
+          response.data.prevPoints.forEach((item) => {
+            setArr.push(item.parentId);
+          });
+          if (response.data.taskCycle == "1") {
+            this.weekormonth = "week";
+            this.taskCycle = 1;
+            this.intervalStartTime = response.data.intervalStartTime;
+            this.intervalEndTime = response.data.intervalEndTime;
+            this.intervalExecuteTime = response.data.intervalExecuteTime;
+            this.intervalType = response.data.intervalType;
+            this.intervalNumber = response.data.intervalNumber;
+          } else if (response.data.taskCycle == "0") {
+            this.weekormonth = "month";
+            this.taskCycle = 0;
+          }
+          this.priority = response.data.priority;
+          this.setCheck = setArr;
+          this.input3 = response.data.taskName;
+          this.value11 = response.data.fixedStartTime;
+          this.queryParams.areaId = response.data.areaId;
+          if (response.data.areaIdS) {
+            this.selectAreaIdList = response.data.areaIdS.split(",");
+          }
+          this.queryParams.areaName = response.data.areaName;
+          this.deviceList = response.data.deviceList;
+          this.devNo = response.data.devNo;
+          this.addList = response.data.prevPoints;
+
+          if (response.data.type) {
+            this.type = response.data.type;
+          }
+          var deviceLists = response.data.deviceList.split(",");
+          deviceLists.forEach((item) => {
+            this.value5.push(Number(item));
+          });
+
+          //1,2,3种执行状态
+          this.executionStatus = response.data.executionStatus;
+          //选第二个
+          this.value2 = response.data.cycleEndTime; //周期结束时间
+          this.value1 = response.data.cycleStartTime; //周期结束
+          this.time3 = response.data.cycleExecuteTime; //周期执行时间
+          //是否开启
+          this.beginradio = response.data.isenable;
+          // let str = response.data.cycleWeek;
+          if (response.data.cycleWeek) {
+            let strResult = response.data.cycleWeek.split(",");
+            let timeTmpList = response.data.cycleExecuteTime.split(",");
+            this.timelist2 = [];
+            for (let index = 0; index < strResult.length; index++) {
+              this.timelist2.push({
+                zhixing: strResult[index],
+                time: timeTmpList[index],
+              });
+            }
+          }
+          if (response.data.cycleMonth) {
+            let strmouth = response.data.cycleMonth;
+            let strmouthResult = strmouth.split(",");
+            let timeTmpList = response.data.cycleExecuteTime.split(",");
+            // let basic1 = strmouthResult.substr(0, strmouthResult.length - 1);
+            // let timeli1 = strmouthResult.pop();
+            // console.log(strmouthResult.pop())
+            this.timelist1 = [];
+            for (let index = 0; index < strmouthResult.length - 1; index++) {
+              this.timelist1.push({
+                zhixing: strmouthResult[index],
+                time: timeTmpList[index],
+              });
+            }
+          }
+          this.changeDateList();
+          this.tree();
+        });
+      } else {
+        this.type = null;
+      }
+    },
+    changeBegine: function () {
+      console.log(this.beginradio);
+      if (this.editid != -1) {
+        const data = {
+          taskId: this.editid,
+          isenable: this.beginradio,
+        };
+        changeStatus(data).then((response) => {
+          // if (response.code == 200) {
+          //   this.$modal.msgSuccess("修改成功");
+          //   this.$emit("editSuccess");
+          // }
+        });
+      }
+    },
+
+    typeClick() {
+      console.log(322, this.type);
+    },
+    linkUrl: function () {
+      this.$emit("hideDialog");
+    },
+    treeClick() {
+      let res = this.$refs.tree.getCheckedNodes();
+      let arr = [];
+      res.forEach((item) => {
+        if (item.eqpbookId != null) {
+          if (!arr.find((e) => e.eqpbookId == item.eqpbookId)) {
+            arr.push(item);
+          }
+        }
+      });
+      // res.forEach((item) => {
+      //   if (item.children) {
+      //     item.children.forEach((items) => {
+      //       arr.push(items);
+      //     });
+      //   }
+      // });
+      this.addList = arr;
+    },
+    saveClick: function () {
+      let data = {};
+      let res = this.$refs.tree.getCheckedNodes(true);
+      this.addList = res;
+      console.log(this.addList);
+      if (this.addList.length == 0) {
+        this.$modal.msgError("请选择巡视设备");
+      } else {
+        // let li = []
+        // this.addList.map(d=>{
+        //   if(d.eqpbookId != null){
+        //     li.push(d)
+        //   }
+        // })
+        var bool = this.addList.every((child) => {
+          return child.eqpbookId;
+        });
+        if (!bool) {
+          this.$modal.msgError("请选择巡视设备");
+          return;
+        }
+        if (this.radio == 1) {
+          this.executionStatus = 2;
+        } else if (this.radio == 2) {
+          this.executionStatus = 1;
+        } else if (this.radio == 3) {
+          // this.executionStatus = 0;
+          this.executionStatus = 4;
+        }
+
+        if (this.editid != -1) {
+          data = {
+            executionType: this.radio,
+            priority: this.priority,
+            deviceList: this.value5.join(","),
+            taskId: this.editid,
+            taskName: this.input3,
+            executionMode: 0,
+            cycleEndTime: this.value2,
+            cycleStartTime: this.value1,
+            cycleExecuteTime: this.time3,
+            fixedStartTime: this.value11,
+            taskCycle: this.taskCycle,
+            executionStatus: this.executionStatus,
+            prevPoints: this.addList,
+            areaIdS: this.selectAreaIdList.join(","),
+            areaId: this.queryParams.areaId,
+            areaName: this.queryParams.areaName,
+            cycleWeek: this.cycleWeek,
+            cycleMonth: this.cycleMonth,
+            isenable: this.beginradio,
+            type: this.type,
+            intervalStartTime: this.intervalStartTime,
+            intervalEndTime: this.intervalEndTime,
+            intervalExecuteTime: this.intervalExecuteTime,
+            intervalType: this.intervalType,
+            intervalNumber: this.intervalNumber,
+          };
+          editSave(data)
+            .then((res) => {
+              this.$modal.msgSuccess("修改成功");
+              this.$emit("editSuccess");
+              var data_close = {
+                id: "alarmManage2",
+                sourceId: "",
+                targetId: "main_frame_global_modal", // 基座系统弹窗ID
+                event: {
+                  type: "SWITCH_GLOBAL_MODAL",
+                  data: {
+                    cardId: "", // 弹窗卡片ID
+                    closeModal: true, // 布尔值, true为关闭
+                  },
+                },
+                tm: new Date().getTime(), // 时间戳
+              };
+              window.top.postMessage(JSON.stringify(data_close), "*");
+              var data_shua = {
+                id: "editTask",
+                sourceId: "",
+                targetId: "main_frame_global_modal", // 基座系统弹窗ID
+                event: {
+                  type: "PING",
+                  data: {},
+                },
+                tm: new Date().getTime(), // 时间戳
+              };
+              window.top.postMessage(JSON.stringify(data_shua), "*");
+            })
+            .catch((res) => {});
+        } else {
+          data = {
+            executionType: this.radio,
+            priority: this.priority,
+            deviceList: this.value5.join(","),
+            taskName: this.input3,
+            executionMode: 0,
+            cycleEndTime: this.value2,
+            cycleStartTime: this.value1,
+            cycleExecuteTime: this.time3,
+            fixedStartTime: this.value11,
+            taskCycle: this.taskCycle,
+            executionStatus: this.executionStatus,
+            prevPoints: this.addList,
+            areaId: this.queryParams.areaId,
+            areaIdS: this.selectAreaIdList.join(","),
+            areaName: this.queryParams.areaName,
+            cycleWeek: this.cycleWeek,
+            cycleMonth: this.cycleMonth,
+            isenable: this.beginradio,
+            type: this.type,
+            intervalStartTime: this.intervalStartTime,
+            intervalEndTime: this.intervalEndTime,
+            intervalExecuteTime: this.intervalExecuteTime,
+            intervalType: this.intervalType,
+            intervalNumber: this.intervalNumber,
+          };
+          addPatrol(data)
+            .then((res) => {
+              this.$modal.msgSuccess("添加成功");
+              this.$emit("addSuccess");
+              let ShuaXing = "ShuaXingList";
+              var data_close = {
+                id: "alarmManage2",
+                sourceId: "",
+                targetId: "main_frame_global_modal", // 基座系统弹窗ID
+                event: {
+                  type: "SWITCH_GLOBAL_MODAL",
+                  data: {
+                    cardId: "", // 弹窗卡片ID
+                    closeModal: true, // 布尔值, true为关闭
+                  },
+                },
+                tm: new Date().getTime(), // 时间戳
+              };
+              window.top.postMessage(JSON.stringify(data_close), "*");
+              var data_shua = {
+                id: "editTask",
+                sourceId: "",
+                targetId: "main_frame_global_modal", // 基座系统弹窗ID
+                event: {
+                  type: "PING",
+                  data: {},
+                },
+                tm: new Date().getTime(), // 时间戳
+              };
+              window.top.postMessage(JSON.stringify(data_shua), "*");
+            })
+            .catch((res) => {});
+        }
+      }
+    },
+    getList: function () {
+      listArea(this.queryParams).then((response) => {
+        this.areaList = this.handleTree(response.data, "areaId");
+      });
+    },
+    getList1: function () {
+      // listArea(this.queryParams).then((response) => {
+      //   this.areaList1 = this.handleTree(response.data, "areaId");
+      // });
+
+      const areaIdS = this.selectAreaIdList.join(",");
+      listArea({ areaIdS }).then((response) => {
+        this.areaList1 = this.handleTree(response.data, "areaId");
+        if (this.areaList1.length > 0) {
+          // this.$refs.areatree.setCurrentKey(this.areaList1[0].areaId);
+          // this.handleNodeClick1(this.areaList1[0]);
+          this.tree();
+        }
+      });
+    },
+    tree(areaId = "") {
+      let areaIdS = areaId;
+      if (!areaIdS) {
+        areaIdS = this.selectAreaIdList.join(",");
+      }
+      equipmentree({ areaIdS }).then((response) => {
+        this.treeList = response.data;
+      });
+    },
+    searchClick: function () {
+      // this.queryParams.areaName = this.searchName;
+      const areaIdS = this.selectAreaIdList.join(",");
+      var obj = { ...this.queryParams, areaIdS };
+      obj.areaName = this.searchName;
+      this.selectObjectAreaIdList = [];
+      listArea(obj).then((response) => {
+        this.areaList1 = this.handleTree(response.data, "areaId");
+      });
+    },
+
+    handleObjectTreeChecked(data, checked, node) {
+      // this.queryParams.areaId = data.areaId;
+      // this.queryParams.areaName = data.areaName;
+      // this.tree();
+
+      const idx = this.selectObjectAreaIdList.indexOf(data.areaId);
+      if (idx >= 0) {
+        this.selectObjectAreaIdList.splice(idx, 1);
+      } else {
+        this.selectObjectAreaIdList.push(data.areaId);
+      }
+    },
+    next1() {
+      let arr = [];
+      let timeArr = [];
+      let arr1 = [];
+
+      if (this.weekormonth == "week") {
+        this.taskCycle = 1;
+        this.timelist2.forEach((item) => {
+          if (item.zhixing) {
+            arr.push(item.zhixing);
+            timeArr.push(item.time);
+          }
+        });
+      } else if (this.weekormonth == "month") {
+        this.taskCycle = 0;
+        this.timelist1.forEach((item) => {
+          if (item.zhixing) {
+            arr1.push(item.zhixing);
+            timeArr.push(item.time);
+          }
+        });
+      }
+
+      this.cycleMonth = arr1.toString();
+      this.cycleWeek = arr.toString();
+      this.time3 = timeArr.join(",");
+      if (this.input3 == "") {
+        this.$modal.msgError("请填写名称");
+        return false;
+      }
+      if (!this.type) {
+        this.$modal.msgError("请选择任务类型");
+        return false;
+      }
+      if (this.checked == false) {
+        this.$modal.msgError("请选择任务执行方式");
+        return false;
+      }
+      this.selectAreaIdList = [
+        ...this.$refs.treeForm.getCheckedKeys(),
+        // ...this.$refs.treeForm.getHalfCheckedKeys(),
+      ];
+      if (this.selectAreaIdList.length <= 0) {
+        this.$modal.msgError("请选择巡检区域");
+        return false;
+      }
+      if (this.radio == 1) {
+        if (!this.value11) {
+          this.$modal.msgError("请选择执行时间");
+          return false;
+        }
+      }
+      if (this.radio == 2) {
+        if (this.value1 == "" || this.value2 == "") {
+          this.$modal.msgError("请选择计划有效期");
+          return false;
+        }
+        if (new Date(this.value1) >= new Date(this.value2)) {
+          this.$modal.msgError("计划有效期开始时间不能大于等于结束时间");
+          return false;
+        }
+
+        if (this.weekormonth == "week") {
+          for (let index = 0; index < this.timelist2.length; index++) {
+            const element = this.timelist2[index];
+            if (!element.zhixing) {
+              this.$modal.msgError("请选择日期");
+              return;
+            }
+            if (!element.time) {
+              this.$modal.msgError("请选择时间");
+              return;
+            }
+          }
+        }
+        if (this.weekormonth == "month") {
+          for (let index = 0; index < this.timelist1.length; index++) {
+            const element = this.timelist1[index];
+            if (!element.zhixing) {
+              this.$modal.msgError("请选择日期");
+              return;
+            }
+            if (!element.time) {
+              this.$modal.msgError("请选择时间");
+              return;
+            }
+          }
+        }
+
+        if (!this.time3) {
+          this.$modal.msgError("请选择时间");
+          return;
+        }
+      }
+      if (this.radio == 3) {
+        if (this.intervalStartTime == "" || this.intervalEndTime == "") {
+          this.$modal.msgError("请选择间隔");
+          return false;
+        }
+
+        // if (new Date(this.value1) > new Date(this.value2)) {
+        //   this.$modal.msgError("计划有效期开始时间不能大于结束时间");
+        //   return false;
+        // }
+        if (
+          new Date(this.intervalStartTime) >= new Date(this.intervalEndTime)
+        ) {
+          this.$modal.msgError("间隔开始时间不能大于结束时间");
+          return false;
+        }
+
+        if (new Date(this.intervalStartTime) < new Date(this.value1)) {
+          this.$modal.msgError("计划开始时间不能小于间隔开始时间");
+          return false;
+        }
+
+        // if (new Date(this.intervalEndTime) > new Date(this.value2)) {
+        //   this.$modal.msgError("间隔结束时间不能大于计划结束时间");
+        //   return false;
+        // }
+
+        if (!this.intervalExecuteTime) {
+          this.$modal.msgError("请选择执行时间");
+          return false;
+        }
+
+        // 提取时间
+        const startTime = this.intervalStartTime.split(" ")[1];
+        if (startTime > this.intervalExecuteTime) {
+          this.$modal.msgError("执行时间需大于间隔开始时间");
+          return false;
+        }
+
+        if (
+          24 - new Date(this.intervalExecuteTime).getHours() <
+          this.intervalNumber
+        ) {
+          this.$modal.msgError("间隔数量过大");
+          return false;
+        }
+      }
+      if (this.active++ > 2) this.active = 0;
+      this.getList1();
+    },
+    next() {
+      if (this.value5.length == 0) {
+        this.$modal.msgError("请选择巡检对象");
+        return;
+      }
+      if (this.type == "6") {
+        if (this.value5.length > 1) {
+          this.$modal.msgError("为静默状态只允许添加一条");
+          return false;
+        }
+      }
+      if (this.active++ > 2) this.active = 0;
+      if (this.active == 3) {
+        equSelect({
+          deviceIdAll: this.value5.join(","),
+          eqbookCode: this.devNo,
+        }).then((response) => {
+          this.setList = response.data;
+          this.checkPointAll = false;
+        });
+      }
+    },
+    prev() {
+      this.active--;
+    },
+    handleChange(value, direction, movedKeys) {
+      let rightArr = [];
+      for (let i = 0; i < this.value5.length; i++) {
+        rightArr.push(this.value5[i]);
+      }
+      rightArr.splice(0, 1);
+      this.queryParams.deviceIdAll = rightArr.toString();
+    },
+    add1() {
+      if (this.weekormonth == "month") {
+        // if (this.timelist1.length < 31) {
+          this.timelist1.push({ zhixing: "", time: "" });
+        // }
+      }
+       else if (this.weekormonth == "week") {
+        // if (this.timelist2.length < 7) {
+          this.timelist2.push({ zhixing: "", time: "" });
+        // }
+      }
+    },
+    delete1(idx) {
+      if (this.weekormonth == "month") {
+        if (this.timelist1.length > 1) {
+          this.timelist1.splice(idx, 1);
+        }
+      } else if (this.weekormonth == "week") {
+        if (this.timelist2.length > 1) {
+          this.timelist2.splice(idx, 1);
+        }
+      }
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+::-webkit-scrollbar {
+  display: none;
+}
+// 树的高度
+.el-tree {
+  height: 250px;
+  overflow: scroll;
+  // border: 1px solid red;
+}
+::v-deep {
+  .el-checkbox__label {
+    font-size: 16px;
+  }
+
+  .el-tree-node__label {
+    font-size: 16px;
+  }
+
+  .el-tree-node__content {
+    margin: 10px 0;
+  }
+
+  .el-radio__label {
+    font-size: 16px;
+  }
+
+  .el-step__title.is-process {
+    // color: #ffffff;
+  }
+
+  .vue-treeselect__control {
+    // background-color: #070a38;
+
+    &:hover {
+      // background-color: #070a38;
+    }
+  }
+
+  .vue-treeselect__single-value {
+    // color: #ffffff;
+  }
+
+  .vue-treeselect__menu {
+    // color: #ffffff;
+    background-color: #202f3e;
+    border: 1px solid #40486a;
+  }
+
+  .vue-treeselect__menu div {
+    // color: #ffffff;
+    background-color: #202f3e;
+
+    &:hover {
+      // color: #ffffff;
+      background-color: RGBA(23, 37, 51, 1);
+    }
+  }
+
+  .el-transfer-panel {
+    // background-color: #070a38;
+    // border-color: #0e66f1;
+  }
+
+  .el-transfer-panel .el-transfer-panel__header {
+    // background-color: #001946;
+    // border-color: #0e66f1;
+    // color: #ffffff;
+  }
+
+  .el-checkbox__label {
+    // color: #ffffff !important;
+  }
+}
+
+.task {
+  width: 90%;
+  margin: 0 auto;
+  height: 896px;
+  display: flex;
+  flex-direction: column;
+
+  .ac-on1 {
+    width: 100%;
+    margin: 20px auto 0;
+    padding-top: 20px;
+    padding-bottom: 50px;
+    .ac-one1-right {
+      float: right !important;
+    }
+    .ac-on1-box {
+      width: 45%;
+      float: left;
+      // margin: 0 auto;
+
+      .choose {
+        margin-bottom: 20px;
+        margin-top: 20px;
+      }
+
+      .mb {
+        margin-bottom: 20px;
+      }
+
+      .a1 {
+        // color: #1a1a1a;
+        font-size: 20px;
+        margin-bottom: 20px;
+        text-align: left;
+        font-weight: bold;
+      }
+
+      .a2 {
+        text-align: left;
+        margin-bottom: 20px;
+        display: block;
+        font-size: 14px;
+        // color: #fff;
+        line-height: 40px;
+        box-sizing: border-box;
+
+        span {
+          color: #fa3239;
+        }
+
+        button {
+          margin-left: 20px;
+        }
+      }
+
+      .a3 {
+        width: 100%;
+        display: block;
+        margin-bottom: 30px;
+      }
+
+      .block {
+        width: 100%;
+        margin-bottom: 20px;
+
+        .el-date-editor {
+          width: 40%;
+        }
+      }
+
+      .grid-content {
+        font-size: 16px;
+      }
+
+      .line {
+        margin-top: 20px;
+
+        .el-date-editor.el-input {
+          width: 100%;
+        }
+
+        .fs {
+          font-size: 18px;
+          margin-top: 8px;
+          margin-left: 20px;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
+  .ac-on2 {
+    width: 100%;
+    padding: 30px;
+    margin-top: 30px;
+    min-height: 500px;
+    border: 1px solid #40486a;
+
+    .ac-on2-box {
+      display: flex;
+      justify-content: space-between;
+      width: 100%;
+
+      .ac2-d1 {
+        width: 320px;
+
+        .ac2-d1-e1 {
+          font-size: 16px;
+          margin-bottom: 10px;
+        }
+
+        .search {
+          width: 100%;
+          position: relative;
+          margin-bottom: 20px;
+
+          input {
+            width: 78%;
+          }
+
+          .button {
+            position: absolute;
+            bottom: 0;
+            right: 0;
+          }
+        }
+      }
+
+      .ac2-d2 {
+        flex: 1;
+      }
+    }
+
+    .ac-on2-btn {
+      display: flex;
+      justify-content: flex-end;
+      margin-top: 60px;
+    }
+  }
+
+  .ac-on3 {
+    width: 100%;
+    padding: 50px 100px;
+    margin-top: 30px;
+    min-height: 500px;
+    border: 1px solid #40486a;
+
+    .ac-on2-btn {
+      margin-top: 50px;
+    }
+
+    .a2 {
+      text-align: left;
+      margin-bottom: 20px;
+      display: block;
+      font-size: 14px;
+      // color: #fff;
+      line-height: 40px;
+      box-sizing: border-box;
+
+      span {
+        color: #fa3239;
+      }
+    }
+  }
+}
+
+.treeitem >>> .el-tree-node__label {
+  font-size: 16px;
+}
+</style>
+
+<style scoped>
+.vue-treeselect__control {
+  background-color: rgb(0, 1, 1, 0) !important;
+  border: 1px solid #40486a !important;
+}
+
+.el-tree-node__content:hover {
+  background: RGBA(23, 37, 51, 1) !important;
+}
+
+.el-tree-node:focus > .el-tree-node__content {
+  background-color: RGBA(23, 37, 51, 1) !important;
+}
+
+.el-picker-panel {
+  background: #202f3e !important;
+  border: 1px solid #40486a !important;
+}
+
+.el-picker-panel__footer {
+  background: #202f3e !important;
+}
+
+.el-date-picker__time-header {
+  border-bottom: 1px solid #40486a !important;
+}
+
+.el-date-table th {
+  border-bottom: 1px solid #40486a !important;
+}
+
+.el-picker-panel__footer {
+  border-top: 1px solid #40486a !important;
+}
+
+.el-popper[x-placement^="top"] .popper__arrow::after {
+  border-top-color: #40486a !important;
+}
+
+.el-time-panel__footer {
+  border-top: 1px solid #40486a !important;
+}
+
+.el-button--medium,
+.el-button.is-plain {
+  /* background-color: #247382 !important; */
+  border: 1px solid #247382 !important;
+}
+
+.el-time-panel {
+  background-color: #202f3e !important;
+  border: 1px solid #40486a !important;
+}
+
+.el-date-table td.disabled div {
+  background: RGBA(23, 37, 51, 1) !important;
+}
+
+.el-popper[x-placement^="bottom"] .popper__arrow::after {
+  border-bottom-color: #40486a !important;
+}
+
+.el-input-number--medium .el-input-number__increase {
+  background-color: rgb(1, 1, 1, 0) !important;
+}
+
+.el-transfer-panel {
+  /* background-color: #202f3e !important; */
+  border-color: #40486a !important;
+  /* border: 1px solid red; */
+  width: 230px !important;
+}
+
+.el-transfer-panel__header {
+  background-color: #202f3e !important;
+  border-color: #40486a !important;
+}
+
+.el-step__head.is-finish {
+  color: #37cbd6 !important;
+  border-color: #37cbd6 !important;
+}
+
+.el-message-box {
+  background-color: #202f3e !important;
+  border: 1px solid #40486a !important;
+}
+
+.el-button--small {
+  background-color: #247382 !important;
+  border: none !important;
+}
+
+.el-step__title.is-finish {
+  color: #37cbd6 !important;
+}
+
+.el-input__inner {
+  border-color: #40486a !important;
+}
+
+.el-select-dropdown {
+  background-color: #202f3e !important;
+  border: 1px solid #40486a !important;
+}
+
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  background-color: RGBA(23, 37, 51, 1) !important;
+}
+</style>
diff --git a/src/views/administration/new_task.vue b/src/views/administration/new_task.vue
new file mode 100644
index 0000000..1aa887f
--- /dev/null
+++ b/src/views/administration/new_task.vue
@@ -0,0 +1,1624 @@
+<template>
+  <div class="task">
+    <el-steps :active="active">
+      <el-step title="设置计划对象"></el-step>
+      <el-step title="选择巡检对象"></el-step>
+      <el-step title="预置位设置"></el-step>
+    </el-steps>
+    <div style="flex: 1; height: 0; overflow-y: auto">
+      <div class="ac-on1" v-show="active == 1">
+        <div class="ac-on1-box">
+          <div class="a2">名称 <span>*</span></div>
+          <el-input class="a3" v-model="input3" placeholder="请输入"></el-input>
+          <!-- <div class="a2">优先级 <span>*</span></div>
+          <el-select class="a3" v-model="priority" placeholder="请选择">
+            <el-option label="优先级1" value="1"> </el-option>
+            <el-option label="优先级2" value="2"> </el-option>
+            <el-option label="优先级3" value="3"> </el-option>
+            <el-option label="优先级4" value="4"> </el-option>
+          </el-select> -->
+          <div class="a2">任务类型 <span>*</span></div>
+          <template>
+            <TreeSelect
+              :defaultExpandLevel="2"
+              :limit="0"
+              :limitText="(count) => `+${count}`"
+              v-model="type"
+              :options="listPatroltype"
+              :show-count="true"
+              placeholder="请选择巡检类型"
+            />
+            <!-- <el-select
+              class="a3"
+              v-model="type"
+              placeholder="请选择"
+              @change="typeClick"
+            >
+              <el-option
+                v-for="item in typeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select> -->
+          </template>
+          <!-- <div class="a2">任务执行方式 <span>*</span></div>
+          <el-checkbox class="a3" v-model="checked">现场巡检</el-checkbox> -->
+          <div class="a2">巡检区域 <span>*</span></div>
+          <template>
+            <el-input placeholder="输入关键字进行过滤" v-model="filterText">
+            </el-input>
+            <el-checkbox
+              style="margin-top: 10px"
+              v-model="checkAll"
+              @change="handleCheckAllChange"
+              >全选</el-checkbox
+            >
+            <!-- :default-checked-keys="selectAreaIdList" -->
+            <el-tree
+              :filter-node-method="filterNode"
+              :props="defaultProps2"
+              ref="treeForm"
+              :data="areaList"
+              default-expand-all
+              show-checkbox
+              node-key="areaId"
+              :default-checked-keys="selectAreaIdList"
+              @check-change="handleCheckChange"
+            >
+            </el-tree>
+          </template>
+        </div>
+        <div class="ac-on1-box ac-one1-right">
+          <div class="choose">
+            <el-radio-group v-model="radio">
+              <el-radio class="radio" v-model="radio" label="1"
+                >定时执行</el-radio
+              >
+              <el-radio class="radio" v-model="radio" label="2"
+                >周期执行</el-radio
+              >
+              <el-radio class="radio" v-model="radio" label="3"
+                >间隔执行</el-radio
+              >
+            </el-radio-group>
+          </div>
+          <div v-if="radio == 1" class="mb">
+            <el-date-picker
+              v-model="value11"
+              type="datetime"
+              placeholder="选择日期时间"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              :picker-options="pickerOptions0"
+            >
+            </el-date-picker>
+          </div>
+          <div v-if="radio == 2">
+            <div class="a1">时间设置</div>
+            <div class="a2">计划有效期 <span>*</span></div>
+            <div class="block">
+              <el-date-picker
+                v-model="value1"
+                type="datetime"
+                @change="handleChangeStartTime"
+                placeholder="选择开始日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :picker-options="pickerOptions0"
+              >
+              </el-date-picker>
+              -
+              <el-date-picker
+                v-model="value2"
+                type="datetime"
+                @change="handleChangeEndTime"
+                placeholder="选择结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :picker-options="pickerOptions1"
+              >
+              </el-date-picker>
+            </div>
+
+            <div class="a2">任务执行周期 <span>*</span></div>
+            <template>
+              <el-select
+                class="a3"
+                v-model="weekormonth"
+                @change="onChangeWeekOrMonth"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in options1"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </template>
+            <div class="a2">
+              任务执行时间 <span>*</span>
+              <el-button
+                type="primary"
+                @click="add1"
+                v-if="weekormonth == 'month'"
+                >添加({{ timelist1.length }})
+              </el-button>
+              <el-button
+                type="primary"
+                @click="add1"
+                v-if="weekormonth == 'week'"
+                >添加({{ timelist2.length }})
+              </el-button>
+            </div>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <div class="grid-content bg-purple">日期</div>
+              </el-col>
+              <el-col :span="8">
+                <div class="grid-content bg-purple">时间</div>
+              </el-col>
+              <el-col :span="8">
+                <div class="grid-content bg-purple">操作</div>
+              </el-col>
+            </el-row>
+            <div v-if="weekormonth == 'month'">
+              <el-row
+                :gutter="20"
+                class="line mb"
+                v-for="(item, index) in timelist1"
+                :key="index"
+                :index="index"
+              >
+                <el-col :span="6">
+                  <el-select
+                    v-model="item.zhixing"
+                    @change="handleChangeTaskRunDayWithMonth(item)"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in dayList"
+                      :key="item"
+                      :label="item"
+                      :value="item"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-col>
+                <el-col :span="6">
+                  <div class="grid-content bg-purple">
+                    <el-time-picker
+                      v-model="item.time"
+                      @change="
+                        (t) => {
+                          handleChangeTaskRunTimeWithMonth(t, item);
+                        }
+                      "
+                      :picker-options="{ selectableRange: '' }"
+                      placeholder="选择时间"
+                      value-format="HH:mm:ss"
+                    >
+                    </el-time-picker>
+                  </div>
+                </el-col>
+                <el-col :span="6">
+                  <div class="grid-content bg-purple">
+                    <i
+                      class="el-icon-delete fs"
+                      title="删除"
+                      @click="delete1(index)"
+                    ></i>
+                  </div>
+                </el-col>
+              </el-row>
+            </div>
+            <div v-if="weekormonth == 'week'">
+              <el-row
+                :gutter="20"
+                class="line mb"
+                v-for="(item, index) in timelist2"
+                :key="index"
+                :index="index"
+              >
+                <el-col :span="6">
+                  <el-select
+                    v-model="item.zhixing"
+                    @change="handleChangeTaskRunDay(item)"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in weekendList"
+                      :key="item"
+                      :label="item"
+                      :value="item"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-col>
+                <el-col :span="6">
+                  <div class="grid-content bg-purple">
+                    <el-time-picker
+                      v-model="item.time"
+                      @change="
+                        (t) => {
+                          handleChangeTaskRunTime(t, item);
+                        }
+                      "
+                      value-format="HH:mm:ss"
+                      :picker-options="{ selectableRange: '' }"
+                      placeholder="选择时间"
+                    >
+                    </el-time-picker>
+                  </div>
+                </el-col>
+                <el-col :span="6">
+                  <div class="grid-content bg-purple">
+                    <i
+                      class="el-icon-delete fs"
+                      title="删除"
+                      @click="delete1(index)"
+                    ></i>
+                  </div>
+                </el-col>
+              </el-row>
+            </div>
+          </div>
+          <div v-if="radio == 3">
+            <div class="a2">间隔<span>*</span></div>
+            <div class="block">
+              <el-date-picker
+                v-model="intervalStartTime"
+                @change="handleChangeIntervalStartTime"
+                type="datetime"
+                placeholder="选择开始日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :picker-options="pickerOptions0"
+              >
+              </el-date-picker>
+              -
+              <el-date-picker
+                v-model="intervalEndTime"
+                @change="handleChangeIntervalEndTime"
+                type="datetime"
+                placeholder="选择结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :picker-options="pickerOptions1"
+              >
+              </el-date-picker>
+            </div>
+
+            <div class="a2">执行时间 <span>*</span></div>
+            <div class="block">
+              <el-time-picker
+                v-model="intervalExecuteTime"
+                placeholder="间隔内开始时间"
+                value-format="HH:mm:ss"
+              >
+              </el-time-picker>
+
+              <!-- <el-date-picker
+                v-model="value1"
+                type="date"
+                placeholder="间隔执行时间"
+                value-format="yyyy-MM-dd"
+                :picker-options="intervalExecuteTime"
+              >
+              </el-date-picker> -->
+            </div>
+            <div class="a2">间隔类型 <span>*</span></div>
+            <template>
+              <el-select class="a3" v-model="intervalType" placeholder="请选择">
+                <el-option label="小时" value="1"></el-option>
+                <!-- <el-option label="天" value="2"></el-option> -->
+              </el-select>
+            </template>
+            <div class="a2">间隔执行次数 <span>*</span></div>
+            <el-input-number
+              style="margin-bottom: 20px"
+              v-if="intervalType == 1"
+              v-model="intervalNumber"
+              :min="1"
+              :max="maxintervalNumber"
+              :precision="0"
+            ></el-input-number>
+          </div>
+          <el-button @click="linkUrl">取消</el-button>
+          <el-button type="primary" @click="next1">下一步</el-button>
+        </div>
+      </div>
+      <div class="ac-on2" v-show="active == 2">
+        <div class="ac-on2-box">
+          <div class="ac2-d1">
+            <div class="ac2-d1-e1">巡检对象筛选</div>
+            <div class="search">
+              <el-input
+                placeholder="搜索区域名称"
+                icon="el-icon-search"
+                v-model="searchName"
+              ></el-input>
+              <el-button
+                class="button"
+                type="primary"
+                icon="el-icon-search"
+                @click="searchClick"
+              ></el-button>
+            </div>
+            <el-tree
+              :data="areaList1"
+              :props="defaultProps1"
+              show-checkbox
+              @check-change="handleObjectTreeChecked"
+              :default-expand-all="true"
+            ></el-tree>
+          </div>
+          <div class="ac2-d2">
+            <div style="text-align: center">
+              <el-transfer
+                style="text-align: left; display: inline-block"
+                v-model="value5"
+                filterable
+                :filter-method="transferFilterMethod"
+                :props="{ key: 'deviceId', label: 'deviceName' }"
+                :titles="['待添加', '已添加']"
+                :format="{
+                  noChecked: '${total}',
+                  hasChecked: '${checked}/${total}',
+                }"
+                @change="handleChange"
+                :data="treeList"
+              >
+                <template slot-scope="{ option }">
+                  <el-tooltip
+                    placement="top"
+                    effect="light"
+                    :content="option.deviceName"
+                  >
+                    <span> {{ option.deviceName }}</span>
+                  </el-tooltip>
+                </template>
+              </el-transfer>
+              <div class="ac-on2-btn">
+                <el-button @click="prev">上一步</el-button>
+                <el-button type="primary" @click="next">下一步</el-button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="ac-on3" v-show="active == 3">
+        <!-- @check-change="treeClick" -->
+        <el-input placeholder="输入关键字进行过滤" v-model="filterText2">
+        </el-input>
+        <div class="ac-on3-box">
+          <el-checkbox
+            style="margin-top: 10px"
+            v-model="checkPointAll"
+            @change="handleCheckPointAllChange"
+            >全选
+          </el-checkbox>
+          <el-tree
+            :filter-node-method="filterNode2"
+            style="height: 400px; overflow-y: auto"
+            :data="setList"
+            ref="tree"
+            show-checkbox
+            node-key="dataId"
+            default-expand-all
+            :default-checked-keys="setCheck"
+            :props="defaultProps"
+          >
+          </el-tree>
+        </div>
+        <div class="a2">是否开启 <span>*</span></div>
+        <template>
+          <el-radio v-model="beginradio" label="0">是</el-radio>
+          <el-radio v-model="beginradio" label="1">否</el-radio>
+        </template>
+        <div class="ac-on2-btn">
+          <el-button type="primary" @click="prev">上一步</el-button>
+          <el-button @click="saveClick">完成</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  listArea,
+  equipmentree,
+  equSelect,
+  addPatrol,
+  changeStatus,
+} from "@/api/basedata/area/area";
+import TreeSelect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import linq from "linq";
+import { listPatroltype } from "@/api/basedata/patrolpointmnt/patroltype";
+import { getWeekdaysInRange, getDaysInRange } from "@/utils/index.js";
+export default {
+  name: "new_task",
+  components: { TreeSelect },
+  data() {
+    return {
+      checkAll: false,
+      checkPointAll: false,
+      listPatroltype: [],
+      intervalStartTime: "",
+      intervalEndTime: "",
+      intervalExecuteTime: "",
+      intervalType: "1",
+      intervalNumber: 0,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      pickerOptions0: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;
+        },
+      },
+      pickerOptions1: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;
+        },
+      },
+      dateShow: true,
+      beginradio: "0",
+      input3: "",
+      active: 1,
+      radio: "1",
+      checked: true,
+      zhixing: "选择",
+      weekendList: [],
+      zhixing2: "选择",
+      dayList: [],
+      value: "第一间隔单元",
+      value1: "",
+      value2: "",
+      value11: "",
+      options1: [
+        {
+          value: "week",
+          label: "按周选择",
+        },
+        {
+          value: "month",
+          label: "按月选择",
+        },
+      ],
+      typeOptions: [
+        {
+          value: "1",
+          label: "例行巡视",
+        },
+        {
+          value: "2",
+          label: "特殊巡视",
+        },
+        {
+          value: "3",
+          label: "专项巡视",
+        },
+        {
+          value: "4",
+          label: "自定义巡视",
+        },
+        {
+          value: "5",
+          label: "联动巡视",
+        },
+        {
+          value: "6",
+          label: "静默类型",
+        },
+      ],
+      weekormonth: "week",
+      time: "",
+      week1: "",
+      value5: [],
+      renderFunc(h, option) {
+        return (
+          <span>
+            {option.key} - {option.label}
+          </span>
+        );
+      },
+      setList: [],
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+      timelist1: [{ zhixing: "", zhixing2: "", time: "" }],
+      timelist2: [{ zhixing: "", zhixing2: "", time: "" }],
+      defaultProps1: {
+        children: "children",
+        label: "areaName",
+      },
+      defaultProps2: {
+        children: "children",
+        label: "areaName",
+      },
+      areaList: [],
+      queryParams: {
+        areaName: undefined,
+        areaId: undefined,
+        deviceIdAll: {},
+      },
+      // 设置计划对象选择Id数组
+      selectAreaIdList: [],
+
+      // 选择巡检对象选择Id数组
+      selectObjectAreaIdList: [],
+      checkedId: "",
+      treeList: [],
+      areaList1: [],
+      time3: "",
+      taskCycle: "",
+      executionStatus: 0,
+      searchName: "",
+      addList: [],
+      cycleWeek: "",
+      cycleMonth: "",
+      deviceList: "",
+      devNo: "",
+      setCheck: [],
+      type: null,
+      priority: "1",
+      filterText: "",
+      filterText2: "",
+      transferFilterMethod: (query, item) => {
+        if (
+          this.selectObjectAreaIdList &&
+          this.selectObjectAreaIdList.length > 0
+        ) {
+          // 如果areaid不在选择范围内，则返回false
+          if (this.selectObjectAreaIdList.indexOf(item.areaId) < 0) {
+            return false;
+          }
+        }
+
+        if (query) {
+          return (
+            item.deviceName.toLowerCase().indexOf(query.toLowerCase()) > -1
+          );
+        }
+        return true;
+      },
+    };
+  },
+  watch: {
+    filterText(val) {
+      this.$refs.treeForm.filter(val);
+    },
+    filterText2(val) {
+      this.$refs.tree.filter(val);
+    },
+  },
+  created() {
+    listPatroltype().then((res) => {
+      const list = [];
+      let childs = [];
+      let ptype = {};
+      linq
+        .from(res.rows)
+        .where((x) => x.parentId === 0)
+        .toArray()
+        .forEach((node) => {
+          childs = linq
+            .from(res.rows)
+            .where((c) => c.parentId === node.patrolTypeId)
+            .select((q) => {
+              return {
+                id: q.patrolTypeCode,
+                label: q.patrolTypeName,
+              };
+            })
+            .toArray();
+          ptype = {
+            id: node.patrolTypeCode,
+            isOpen: true,
+            label: node.patrolTypeName,
+            // isDisabled: false,
+          };
+          if (childs.length > 0) {
+            ptype.children = childs;
+            // ptype.isDisabled = true;
+          }
+          list.push(ptype);
+        });
+
+      this.listPatroltype = list;
+      this.type = this.listPatroltype[0].id;
+    });
+    this.getList();
+    // this.getInfo();
+    if (this.weekormonth == "week") {
+      this.taskCycle = 1;
+    } else if (this.weekormonth == "month") {
+      this.taskCycle = 0;
+    }
+  },
+  computed: {
+    maxintervalNumber() {
+      try {
+        var date = 24 - new Date(this.intervalExecuteTime).getHours();
+        return date;
+      } catch (error) {
+        return 0;
+      }
+    },
+  },
+  methods: {
+    onChangeWeekOrMonth() {
+      this.changeDateList();
+    },
+    changeDateList() {
+      if (!this.value1 || !this.value2) {
+        return;
+      }
+      if (this.weekormonth == "month") {
+        this.dayList = getDaysInRange(this.value1, this.value2);
+      } else if (this.weekormonth == "week") {
+        this.weekendList = getWeekdaysInRange(this.value1, this.value2);
+      }
+    },
+    handleChangeTaskRunTimeWithMonth(t, item) {
+      const sameArray = linq
+        .from(this.timelist1)
+        .where((x) => {
+          return (
+            x != item &&
+            x.zhixing == item.zhixing &&
+            new Date("2020-01-01 " + x.time).valueOf() ==
+              new Date("2020-01-01 " + item.time).valueOf()
+          );
+        })
+        .toArray();
+      if (sameArray.length > 0) {
+        this.$message({
+          type: "warning",
+          message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`,
+        });
+        item.time = null;
+      }
+    },
+    handleChangeTaskRunDayWithMonth(item) {
+      const sameArray = linq
+        .from(this.timelist1)
+        .where((x) => {
+          return (
+            x != item &&
+            x.zhixing == item.zhixing &&
+            new Date("2020-01-01 " + x.time).valueOf() ==
+              new Date("2020-01-01 " + item.time).valueOf()
+          );
+        })
+        .toArray();
+      if (sameArray.length > 0) {
+        this.$message({
+          type: "warning",
+          message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`,
+        });
+        item.zhixing = "";
+      }
+    },
+    handleChangeTaskRunTime(t, item) {
+      const sameArray = linq
+        .from(this.timelist2)
+        .where((x) => {
+          return (
+            x != item &&
+            x.zhixing == item.zhixing &&
+            new Date("2020-01-01 " + x.time).valueOf() ==
+              new Date("2020-01-01 " + item.time).valueOf()
+          );
+        })
+        .toArray();
+      if (sameArray.length > 0) {
+        this.$message({
+          type: "warning",
+          message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`,
+        });
+        item.time = null;
+      }
+    },
+
+    handleChangeTaskRunDay(item) {
+      const sameArray = linq
+        .from(this.timelist2)
+        .where((x) => {
+          return (
+            x != item &&
+            x.zhixing == item.zhixing &&
+            new Date("2020-01-01 " + x.time).valueOf() ==
+              new Date("2020-01-01 " + item.time).valueOf()
+          );
+        })
+        .toArray();
+      if (sameArray.length > 0) {
+        this.$message({
+          type: "warning",
+          message: `${item.zhixing} ${item.time} 时间重复，已帮您重置。`,
+        });
+        item.zhixing = "";
+      }
+    },
+
+    handleChangeIntervalStartTime(t) {
+      if (t == null || t == "") {
+        return;
+      }
+      if (this.intervalEndTime != "" && this.intervalEndTime != null) {
+        if (new Date(t).valueOf() >= new Date(this.intervalEndTime).valueOf()) {
+          this.$nextTick(() => {
+            this.intervalStartTime = "";
+            this.$message({
+              type: "warning",
+              message: "起始时间要小于截止时间",
+            });
+          });
+        }
+      }
+    },
+    handleChangeIntervalEndTime(t) {
+      if (t == null || t == "") {
+        return;
+      }
+      if (this.intervalStartTime != "" && this.intervalStartTime != null) {
+        if (
+          new Date(t).valueOf() <= new Date(this.intervalStartTime).valueOf()
+        ) {
+          this.$nextTick(() => {
+            this.intervalEndTime = "";
+            this.$message({
+              type: "warning",
+              message: "截止时间要大于起始时间",
+            });
+          });
+        }
+      }
+    },
+    handleChangeStartTime(t) {
+      if (t == null || t == "") {
+        return;
+      }
+      if (this.value2 != "" && this.value2 != null) {
+        if (new Date(t).valueOf() >= new Date(this.value2).valueOf()) {
+          this.$nextTick(() => {
+            this.value1 = "";
+            this.$message({
+              type: "warning",
+              message: "起始时间要小于截止时间",
+            });
+          });
+        }
+      }
+
+      this.changeDateList();
+      // 日期改变，需要重新选择
+      if (this.weekormonth == "month") {
+        this.timelist1 = [{ zhixing: "", zhixing2: "", time: "" }];
+      } else if (this.weekormonth == "week") {
+        this.timelist2 = [{ zhixing: "", zhixing2: "", time: "" }];
+      }
+    },
+    handleChangeEndTime(t) {
+      if (t == null || t == "") {
+        return;
+      }
+      if (this.value1 != "" && this.value1 != null) {
+        if (new Date(t).valueOf() <= new Date(this.value1).valueOf()) {
+          this.$nextTick(() => {
+            this.value2 = "";
+            this.$message({
+              type: "warning",
+              message: "截止时间要大于起始时间",
+            });
+          });
+        }
+      }
+
+      this.changeDateList();
+      // 日期改变，需要重新选择
+      if (this.weekormonth == "month") {
+        this.timelist1 = [{ zhixing: "", zhixing2: "", time: "" }];
+      } else if (this.weekormonth == "week") {
+        this.timelist2 = [{ zhixing: "", zhixing2: "", time: "" }];
+      }
+    },
+
+    handleCheckAllChange(val) {
+      if (this.checkAll) {
+        this.$refs.treeForm.setCheckedNodes(this.areaList);
+      } else {
+        this.$refs.treeForm.setCheckedNodes([]);
+      }
+    },
+    handleCheckPointAllChange(val) {
+      if (this.checkPointAll) {
+        this.$refs.tree.setCheckedNodes(this.setList);
+      } else {
+        this.$refs.tree.setCheckedNodes([]);
+      }
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.areaName.indexOf(value) !== -1;
+    },
+    filterNode2(value, data, node) {
+      if (!value) return true;
+      let one = data.label.indexOf(value) !== -1;
+      let two =
+        node.parent &&
+        node.parent.data &&
+        node.parent.data.label &&
+        node.parent.data.label.indexOf(value) !== -1;
+      let three =
+        node.parent &&
+        node.parent.parent &&
+        node.parent.parent.data &&
+        node.parent.parent.data.label &&
+        node.parent.parent.data.label.indexOf(value) !== -1;
+      let four =
+        node.parent &&
+        node.parent.parent &&
+        node.parent.parent.parent &&
+        node.parent.parent.parent.data &&
+        node.parent.parent.parent.data.label &&
+        node.parent.parent.parent.data.label.indexOf(value) !== -1;
+
+      let result_one = false;
+      let result_two = false;
+      let result_three = false;
+      let result_four = false;
+      if (node.level === 1) {
+        result_one = one;
+      } else if (node.level === 2) {
+        result_two = one || two;
+      } else if (node.level === 3) {
+        result_three = one || two || three;
+      } else if (node.level === 4) {
+        result_four = one || two || three || four;
+      }
+      return result_one || result_two || result_three || result_four;
+    },
+    typeClick() {
+      console.log(322, this.type);
+    },
+    linkUrl: function () {
+      this.$emit("hideDialog");
+    },
+    treeClick() {
+      let res = this.$refs.tree.getCheckedNodes();
+      let arr = [];
+      res.forEach((item) => {
+        if (item.eqpbookId != null) {
+          if (!arr.find((e) => e.eqpbookId == item.eqpbookId)) {
+            arr.push(item);
+          }
+        }
+      });
+
+      // res.forEach((item) => {
+      //   if (item.children) {
+      //     item.children.forEach((items) => {
+      //       arr.push(items);
+      //     });
+      //   }
+      // });
+      this.addList = arr;
+    },
+    saveClick: function () {
+      let data = {};
+      let res = this.$refs.tree.getCheckedNodes(true);
+      this.addList = res;
+      if (this.addList.length == 0) {
+        this.$modal.msgError("请选择巡视设备");
+      } else {
+        var bool = this.addList.every((child) => {
+          return child.eqpbookId;
+        });
+        if (!bool) {
+          this.$modal.msgError("请选择巡视设备");
+          return;
+        }
+        // let li = [];
+        // this.addList.map((d) => {
+        //   if (d.eqpbookId != null) {
+        //     li.push(d);
+        //   }
+        // });
+        if (this.radio == 1) {
+          this.executionStatus = 2;
+        } else if (this.radio == 2) {
+          this.executionStatus = 1;
+        } else if (this.radio == 3) {
+          // this.executionStatus = 0;
+          this.executionStatus = 4;
+        }
+        data = {
+          priority: this.priority,
+          deviceList: this.value5.join(","),
+          taskName: this.input3,
+          executionMode: 0,
+          cycleEndTime: this.value2,
+          cycleStartTime: this.value1,
+          cycleExecuteTime: this.time3,
+          fixedStartTime: this.value11,
+          taskCycle: this.taskCycle,
+          executionStatus: this.executionStatus,
+          prevPoints: this.addList,
+          areaId: this.queryParams.areaId,
+          areaIdS: this.selectAreaIdList.join(","),
+          areaName: this.queryParams.areaName,
+          cycleWeek: this.cycleWeek,
+          cycleMonth: this.cycleMonth,
+          isenable: this.beginradio,
+          type: this.type,
+          intervalStartTime: this.intervalStartTime,
+          intervalEndTime: this.intervalEndTime,
+          intervalExecuteTime: this.intervalExecuteTime,
+          intervalType: this.intervalType,
+          intervalNumber: this.intervalNumber,
+        };
+
+        addPatrol(data)
+          .then((res) => {
+            this.$modal.msgSuccess("添加成功");
+            this.$emit("addSuccess");
+          })
+          .catch((res) => {});
+      }
+    },
+    getList: function () {
+      listArea(this.queryParams).then((response) => {
+        this.areaList = this.handleTree(response.data, "areaId");
+      });
+    },
+    getList1: function () {
+      // listArea(this.queryParams).then((response) => {
+      //   this.areaList1 = this.handleTree(response.data, "areaId");
+      // });
+
+      const areaIdS = this.selectAreaIdList.join(",");
+      listArea({ areaIdS }).then((response) => {
+        this.areaList1 = this.handleTree(response.data, "areaId");
+        if (this.areaList1.length > 0) {
+          // this.$refs.areatree.setCurrentKey(this.areaList1[0].areaId);
+          // this.handleNodeClick1(this.areaList1[0]);
+          this.tree();
+        }
+      });
+    },
+    tree(areaId = "") {
+      let areaIdS = areaId;
+      if (!areaIdS) {
+        areaIdS = this.selectAreaIdList.join(",");
+      }
+      equipmentree({ areaIdS }).then((response) => {
+        this.treeList = response.data;
+      });
+    },
+    searchClick: function () {
+      // this.queryParams.areaName = this.searchName;
+      const areaIdS = this.selectAreaIdList.join(",");
+      var obj = { ...this.queryParams, areaIdS };
+      obj.areaName = this.searchName;
+      this.selectObjectAreaIdList = [];
+      listArea(obj).then((response) => {
+        this.areaList1 = this.handleTree(response.data, "areaId");
+      });
+    },
+
+    handleObjectTreeChecked(data, checked, node) {
+      // this.queryParams.areaId = data.areaId;
+      // this.queryParams.areaName = data.areaName;
+      // this.tree();
+
+      const idx = this.selectObjectAreaIdList.indexOf(data.areaId);
+      if (idx >= 0) {
+        this.selectObjectAreaIdList.splice(idx, 1);
+      } else {
+        this.selectObjectAreaIdList.push(data.areaId);
+      }
+    },
+    next1() {
+      let arr = [];
+      let timeArr = [];
+      let arr1 = [];
+
+      if (this.weekormonth == "week") {
+        this.taskCycle = 1;
+        this.timelist2.forEach((item) => {
+          if (item.zhixing) {
+            arr.push(item.zhixing);
+            timeArr.push(item.time);
+          }
+        });
+      } else if (this.weekormonth == "month") {
+        this.taskCycle = 0;
+        this.timelist1.forEach((item) => {
+          if (item.zhixing) {
+            arr1.push(item.zhixing);
+            timeArr.push(item.time);
+          }
+        });
+      }
+
+      this.cycleMonth = arr1.toString();
+      this.cycleWeek = arr.toString();
+      this.time3 = timeArr.join(",");
+      if (this.input3 == "") {
+        this.$modal.msgError("请填写名称");
+        return false;
+      }
+      if (!this.type) {
+        this.$modal.msgError("请选择任务类型");
+        return false;
+      }
+      if (this.checked == false) {
+        this.$modal.msgError("请选择任务执行方式");
+        return false;
+      }
+      this.selectAreaIdList = [
+        ...this.$refs.treeForm.getCheckedKeys(),
+        // ...this.$refs.treeForm.getHalfCheckedKeys(),
+      ];
+      if (this.selectAreaIdList.length <= 0) {
+        this.$modal.msgError("请选择巡检区域");
+        return false;
+      }
+      if (this.radio == 1) {
+        if (!this.value11) {
+          this.$modal.msgError("请选择执行时间");
+          return false;
+        }
+      }
+      if (this.radio == 2) {
+        if (this.value1 == "" || this.value2 == "") {
+          this.$modal.msgError("请选择计划有效期");
+          return false;
+        }
+        if (new Date(this.value1) >= new Date(this.value2)) {
+          this.$modal.msgError("计划有效期开始时间不能大于等于结束时间");
+          return false;
+        }
+
+        if (this.weekormonth == "week") {
+          for (let index = 0; index < this.timelist2.length; index++) {
+            const element = this.timelist2[index];
+            if (!element.zhixing) {
+              this.$modal.msgError("请选择日期");
+              return;
+            }
+            if (!element.time) {
+              this.$modal.msgError("请选择时间");
+              return;
+            }
+          }
+        }
+        if (this.weekormonth == "month") {
+          for (let index = 0; index < this.timelist1.length; index++) {
+            const element = this.timelist1[index];
+            if (!element.zhixing) {
+              this.$modal.msgError("请选择日期");
+              return;
+            }
+            if (!element.time) {
+              this.$modal.msgError("请选择时间");
+              return;
+            }
+          }
+        }
+
+        if (!this.time3) {
+          this.$modal.msgError("请选择时间");
+          return;
+        }
+      }
+      if (this.radio == 3) {
+        if (this.intervalStartTime == "" || this.intervalEndTime == "") {
+          this.$modal.msgError("请选择间隔");
+          return false;
+        }
+
+        // if (new Date(this.value1) > new Date(this.value2)) {
+        //   this.$modal.msgError("计划有效期开始时间不能大于结束时间");
+        //   return false;
+        // }
+        if (
+          new Date(this.intervalStartTime) >= new Date(this.intervalEndTime)
+        ) {
+          this.$modal.msgError("间隔开始时间不能大于结束时间");
+          return false;
+        }
+
+        if (new Date(this.intervalStartTime) < new Date(this.value1)) {
+          this.$modal.msgError("计划开始时间不能小于间隔开始时间");
+          return false;
+        }
+
+        // if (new Date(this.intervalEndTime) > new Date(this.value2)) {
+        //   this.$modal.msgError("间隔结束时间不能大于计划结束时间");
+        //   return false;
+        // }
+
+        if (!this.intervalExecuteTime) {
+          this.$modal.msgError("请选择执行时间");
+          return false;
+        }
+
+        // 提取时间
+        const startTime = this.intervalStartTime.split(" ")[1];
+        if (startTime > this.intervalExecuteTime) {
+          this.$modal.msgError("执行时间需大于间隔开始时间");
+          return false;
+        }
+
+        if (
+          24 - new Date(this.intervalExecuteTime).getHours() <
+          this.intervalNumber
+        ) {
+          this.$modal.msgError("间隔数量过大");
+          return false;
+        }
+      }
+      if (this.active++ > 2) this.active = 0;
+      this.getList1();
+    },
+    next() {
+      if (this.value5.length == 0) {
+        this.$modal.msgError("请选择巡检对象");
+        return;
+      }
+      if (this.type == "6") {
+        if (this.value5.length > 1) {
+          this.$modal.msgError("为静默状态只允许添加一条");
+          return false;
+        }
+      }
+      if (this.active++ > 2) this.active = 0;
+      if (this.active == 3) {
+        equSelect({
+          deviceIdAll: this.value5.join(","),
+          eqbookCode: this.devNo,
+        }).then((response) => {
+          this.setList = response.data;
+          this.checkPointAll = false;
+        });
+      }
+    },
+    prev() {
+      this.active--;
+    },
+    handleChange(value, direction, movedKeys) {
+      let rightArr = [];
+      for (let i = 0; i < this.value5.length; i++) {
+        rightArr.push(this.value5[i]);
+      }
+      rightArr.splice(0, 1);
+      this.queryParams.deviceIdAll = rightArr.toString();
+    },
+    add1() {
+      if (this.weekormonth == "month") {
+        // if (this.timelist1.length < 31) {
+          this.timelist1.push({ zhixing: "", time: "" });
+        // }
+      } 
+      // else if (this.weekormonth == "week") {
+      //   if (this.timelist2.length < 7) {
+          this.timelist2.push({ zhixing: "", time: "" });
+      //   }
+      // }
+    },
+    delete1(idx) {
+      if (this.weekormonth == "month") {
+        if (this.timelist1.length > 1) {
+          this.timelist1.splice(idx, 1);
+        }
+      } else if (this.weekormonth == "week") {
+        if (this.timelist2.length > 1) {
+          this.timelist2.splice(idx, 1);
+        }
+      }
+    },
+    handleCheckChange(data, checked, node) {
+      // console.log('handleCheckChange', data);
+      // const idx = this.selectAreaIdList.indexOf(data.areaId)
+      // if (idx >= 0) {
+      //   this.selectAreaIdList.splice(idx, 1)
+      // }
+      // else {
+      //   this.selectAreaIdList.push(data.areaId)
+      // }
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+::-webkit-scrollbar {
+  display: none;
+}
+// 树的高度
+.el-tree {
+  height: 300px;
+  overflow: scroll;
+  // border: 1px solid red;
+}
+::v-deep {
+  .el-checkbox__label {
+    font-size: 16px;
+  }
+
+  .el-tree-node__label {
+    font-size: 16px;
+  }
+
+  .el-tree-node__content {
+    margin: 10px 0;
+  }
+
+  .el-radio__label {
+    font-size: 16px;
+  }
+
+  .el-step__title.is-process {
+    // color: #ffffff; 
+  }
+
+  .vue-treeselect__control {
+    // background-color: #070a38;
+
+    &:hover {
+      // background-color: #070a38;
+    }
+  }
+
+  .vue-treeselect__single-value {
+    // color: #ffffff;
+  }
+
+  .vue-treeselect__menu {
+    color: #ffffff;
+    background-color: #202f3e;
+    border: 1px solid #40486a;
+  }
+
+  .vue-treeselect__menu div {
+    color: #ffffff;
+    background-color: #202f3e;
+
+    &:hover {
+      color: #ffffff;
+      background-color: RGBA(23, 37, 51, 1);
+    }
+  }
+
+  .el-transfer-panel {
+    // background-color: #070a38;
+    // border-color: #0e66f1;
+  }
+
+  .el-transfer-panel .el-transfer-panel__header {
+    // background-color: #001946;
+    // border-color: #0e66f1;
+    // color: #ffffff;
+  }
+
+  .el-checkbox__label {
+    // color: #ffffff !important;
+  }
+}
+
+.task {
+  width: 90%;
+  margin: 0 auto;
+  height: 896px;
+  display: flex;
+  flex-direction: column;
+
+  .ac-on1 {
+    width: 100%;
+    margin: 20px auto 0;
+    padding-top: 20px;
+    padding-bottom: 50px;
+    .ac-one1-right {
+      float: right !important;
+    }
+    .ac-on1-box {
+      width: 45%;
+      float: left;
+      // margin: 0 auto;
+
+      .choose {
+        margin-bottom: 20px;
+        margin-top: 20px;
+      }
+
+      .mb {
+        margin-bottom: 20px;
+      }
+
+      .a1 {
+        // color: #1a1a1a;
+        font-size: 20px;
+        margin-bottom: 20px;
+        text-align: left;
+        font-weight: bold;
+      }
+
+      .a2 {
+        text-align: left;
+        margin-bottom: 20px;
+        display: block;
+        font-size: 14px;
+        // color: #fff;
+        line-height: 40px;
+        box-sizing: border-box;
+
+        span {
+          color: #fa3239;
+        }
+
+        button {
+          margin-left: 20px;
+        }
+      }
+
+      .a3 {
+        width: 100%;
+        display: block;
+        margin-bottom: 30px;
+      }
+
+      .block {
+        width: 100%;
+        margin-bottom: 20px;
+
+        .el-date-editor {
+          width: 40%;
+        }
+      }
+
+      .grid-content {
+        font-size: 16px;
+      }
+
+      .line {
+        margin-top: 20px;
+
+        .el-date-editor.el-input {
+          width: 100%;
+        }
+
+        .fs {
+          font-size: 18px;
+          margin-top: 8px;
+          margin-left: 20px;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
+  .ac-on2 {
+    width: 100%;
+    padding: 30px;
+    margin-top: 30px;
+    min-height: 500px;
+    border: 1px solid #40486a;
+
+    .ac-on2-box {
+      display: flex;
+      justify-content: space-between;
+      width: 100%;
+
+      .ac2-d1 {
+        width: 320px;
+
+        .ac2-d1-e1 {
+          font-size: 16px;
+          margin-bottom: 10px;
+        }
+
+        .search {
+          width: 100%;
+          position: relative;
+          margin-bottom: 20px;
+
+          input {
+            width: 78%;
+          }
+
+          .button {
+            position: absolute;
+            bottom: 0;
+            right: 0;
+          }
+        }
+      }
+
+      .ac2-d2 {
+        flex: 1;
+      }
+    }
+
+    .ac-on2-btn {
+      display: flex;
+      justify-content: flex-end;
+      margin-top: 60px;
+    }
+  }
+
+  .ac-on3 {
+    width: 100%;
+    padding: 50px 100px;
+    margin-top: 30px;
+    min-height: 500px;
+    border: 1px solid #40486a;
+
+    .ac-on2-btn {
+      margin-top: 50px;
+    }
+
+    .a2 {
+      text-align: left;
+      margin-bottom: 20px;
+      display: block;
+      font-size: 14px;
+      // color: #fff;
+      line-height: 40px;
+      box-sizing: border-box;
+
+      span {
+        color: #fa3239;
+      }
+    }
+  }
+}
+
+.treeitem >>> .el-tree-node__label {
+  font-size: 16px;
+}
+</style>
+
+<style scoped>
+.vue-treeselect__control {
+  background-color: rgb(0, 1, 1, 0) !important;
+  border: 1px solid #40486a !important;
+}
+
+.el-tree-node__content:hover {
+  background: RGBA(23, 37, 51, 1) !important;
+}
+
+.el-tree-node:focus > .el-tree-node__content {
+  background-color: RGBA(23, 37, 51, 1) !important;
+}
+
+.el-picker-panel {
+  background: #202f3e !important;
+  border: 1px solid #40486a !important;
+}
+
+.el-picker-panel__footer {
+  background: #202f3e !important;
+}
+
+.el-date-picker__time-header {
+  border-bottom: 1px solid #40486a !important;
+}
+
+.el-date-table th {
+  border-bottom: 1px solid #40486a !important;
+}
+
+.el-picker-panel__footer {
+  border-top: 1px solid #40486a !important;
+}
+
+.el-popper[x-placement^="top"] .popper__arrow::after {
+  border-top-color: #40486a !important;
+}
+
+.el-time-panel__footer {
+  border-top: 1px solid #40486a !important;
+}
+
+.el-button--medium,
+.el-button.is-plain {
+  /* background-color: #247382 !important; */
+  border: 1px solid #247382 !important;
+}
+
+.el-time-panel {
+  background-color: #202f3e !important;
+  border: 1px solid #40486a !important;
+}
+
+.el-date-table td.disabled div {
+  background: RGBA(23, 37, 51, 1) !important;
+}
+
+.el-popper[x-placement^="bottom"] .popper__arrow::after {
+  border-bottom-color: #40486a !important;
+}
+
+.el-input-number--medium .el-input-number__increase {
+  background-color: rgb(1, 1, 1, 0) !important;
+}
+
+.el-transfer-panel {
+  /* background-color: #202f3e !important; */
+  border-color: #40486a !important;
+  /* border: 1px solid red; */
+  width: 230px !important;
+}
+
+.el-transfer-panel__header {
+  background-color: #202f3e !important;
+  border-color: #40486a !important;
+}
+
+.el-step__head.is-finish {
+  color: #37cbd6 !important;
+  border-color: #37cbd6 !important;
+}
+
+.el-message-box {
+  background-color: #202f3e !important;
+  border: 1px solid #40486a !important;
+}
+
+.el-button--small {
+  /* background-color: #247382 !important; */
+  border: none !important;
+}
+
+.el-step__title.is-finish {
+  color: #37cbd6 !important;
+}
+
+.el-input__inner {
+  border-color: #40486a !important;
+}
+
+.el-select-dropdown {
+  background-color: #202f3e !important;
+  border: 1px solid #40486a !important;
+}
+
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  background-color: RGBA(23, 37, 51, 1) !important;
+}
+</style>
diff --git a/src/views/area/area.vue b/src/views/area/area.vue
index 8e9868a..06ea2b6 100644
--- a/src/views/area/area.vue
+++ b/src/views/area/area.vue
@@ -51,9 +51,13 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button icon="el-icon-sort" plain size="mini" @click="toggleExpandAll(isExpandAll)">{{
-          $t("area.UnfoldAndFold")
-        }}</el-button>
+        <el-button
+          icon="el-icon-sort"
+          plain
+          size="mini"
+          @click="toggleExpandAll(isExpandAll)"
+          >{{ $t("area.UnfoldAndFold") }}</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button type="primary" size="mini" @click="handleExport">{{
@@ -210,8 +214,9 @@ export default {
   components: { treeSelect },
   data() {
     return {
+      treeKey: 0,
       queryParams: {},
-      tableData: [{}],
+      tableData: [],
       dialogVisible: false,
       title: this.$t("area.AddArea"),
       dialogForm: {},
@@ -245,7 +250,7 @@ export default {
       menuOptions: [],
       type: 0,
       editData: {},
-      isExpandAll:true
+      isExpandAll: true,
     };
   },
   mounted() {
@@ -277,24 +282,30 @@ export default {
       });
     },
     //表格扁平转树结构
-    tableListFn(list) {
-      var map = {},
-        node,
-        tree = [];
-      for (let i = 0; i < list.length; i++) {
-        map[list[i].areaId] = list[i];
-        list[i].children = [];
+    tableListFn(list = []) {
+      var map = {};
+      var tree = [];
+
+      // 只克隆一次
+      const clonedList = list.map((item) => ({
+        ...item,
+        children: item.children ? [...item.children] : [],
+      }));
+
+      // 构建 map
+      for (const item of clonedList) {
+        map[item.areaId] = item;
       }
-      for (let i = 0; i < list.length; i += 1) {
-        list[i];
-        if (list[i].parentId !== 0) {
-          // 不是根节点
-          map[list[i].parentId].children.push(list[i]); // 放到父节点的children里
+
+      // 构建父子关系
+      for (const item of clonedList) {
+        if (item.parentId !== 0 && map[item.parentId]) {
+          map[item.parentId].children.push(item);
         } else {
-          // 是根节点
-          tree.push(list[i]); // 根节点计入结果数组
+          tree.push(item);
         }
       }
+
       return tree;
     },
     areaTypeFn(type) {
@@ -341,7 +352,7 @@ export default {
     },
     handleAdd(areaId) {
       this.dialogForm = {};
-      this.dialogForm.parentId=areaId;
+      this.dialogForm.parentId = areaId;
       let data = {
         parentId: areaId,
       };
@@ -406,16 +417,21 @@ export default {
           });
         });
     },
-    toggleExpandAll(isExpandAll){
-      this.treeKey = +new Date()
+    toggleExpandAll(isExpandAll) {
+      this.treeKey = +new Date();
       this.isExpandAll = !isExpandAll;
     },
-     /** 导出按钮操作 */
-     handleExport() {
-      this.download('/basedata/area/export', {
-        ...this.queryParams
-      }, `area_${new Date().getTime()}.xlsx`)
-    }
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/basedata/area/export",
+        {
+          ...this.queryParams,
+        },
+        `area_${new Date().getTime()}.xlsx`
+      );
+    },
+    handleClose() {},
   },
 };
 </script>
diff --git a/src/views/equipment/equipment.vue b/src/views/equipment/equipment.vue
index 6a2512e..b38818f 100644
--- a/src/views/equipment/equipment.vue
+++ b/src/views/equipment/equipment.vue
@@ -104,6 +104,7 @@
           icon="el-icon-upload"
           size="mini"
           :disabled="uploadBtn"
+          @click="handleModel"
           >{{ $t("equipment.ModelSynchronization") }}</el-button
         >
       </el-col>
@@ -694,7 +695,8 @@ import {
   video_mode,
   eqpbook,
   edit,
-  mainsystemList
+  mainsystemList,
+  download
 } from "@/api/equipment/equipment";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -727,6 +729,7 @@ export default {
       videoModeData: [],
       type: 0,
       mainSystemData: [],
+      modelData:[],
     };
   },
   mounted() {
@@ -849,6 +852,15 @@ export default {
     },
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.eqpbookId);
+      this.modelData=selection;  
+      //  this.modelData=selection.map(item => {
+      //   return {
+      //     Code: item.areaId,
+      //     Command: item.Command,
+      //     Type: item.Type,
+      //     deviceCode: item.deviceCode,
+      //   }
+      //  });
       if (this.ids.length >= 0) {
         this.multiple = false;
       }
@@ -909,12 +921,24 @@ export default {
       }
     },
     // 导出
-    handleExport() {},
+    handleExport() {
+      let data={
+        pageNum:this.queryParams.pageNum,
+        pageSize:this.queryParams.pageSize,
+      }
+      download(data).then(res=>{
+        console.log(res)
+      })
+    },
     goToAboutPage(id) {
       this.$router.push("/basedata/eqpbook/channel");
     },
     // 图片上传弹框
     uploadImg() {},
+    // 模型同步
+    handleModel(){
+      console.log(this.modelData)
+    }
   },
 };
 </script>