修改

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",

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',

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
+    }
+  })
+}
 
 

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
+    }
+  })
+}

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,
+  });
 }

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
+  })
 }

src/components/VideoPlayerPlatform/players/jessibucaPlayer.js

@@ -0,0 +1,127 @@
+/**
+ * 播放器类
+ */
+class JessibucaPlayer {
+  //初始化 可以 await
+  init () {
+    const me = this
+    return new Promise((resolve) => {
+      me.jessibuca = new window.Jessibuca(this.config);
+      me.jessibuca.on("load", function () {
+        resolve()
+      });
+      //网速信息
+      me.jessibuca.on('kBps', function (kBps) {
+        if (me.config['onkBps']) {
+          me.config['onkBps'](kBps);
+        }
+      });
+      //错误信息
+      me.jessibuca.on('error', function (error) {
+        if (me.config['onError']) {
+          me.config['onError'](error);
+        }
+      });
+      //码流信息
+      me.jessibuca.on("stats", function (stats) {
+        if (me.config['onStats']) {
+          me.config['onStats'](stats);
+        }
+      })
+      //性能 
+      /**
+       * 0: 表示卡顿
+       * 1: 表示流畅
+       * 2: 表示非常流畅
+       * 这个可以供ui来显示用
+       */
+      me.jessibuca.on("performance", function (performance) {
+        if (me.config['onPerformance']) {
+          me.config['onPerformance'](performance);
+        }
+      })
+      //超时事件
+      me.jessibuca.on("timeout", function () {
+        if (me.config['onTimeout']) {
+          me.config['onTimeout']();
+        }
+      })
+    })
+
+  }
+  // 播放
+  play (url, cb) {
+    this.jessibuca.on("play", () => {
+      cb && cb()
+    });
+    if (this.jessibuca.hasLoaded()) {
+      this.jessibuca.play(url);
+    } else {
+      this.jessibuca.on("load", () => {
+        this.jessibuca.play(url);
+      });
+    }
+  }
+  //取消静音
+  cancelMute () {
+    this.jessibuca.cancelMute()
+  }
+  //销毁
+  destroy () {
+    this.jessibuca.destroy()
+  }
+  //全屏
+  setFullscreen () {
+    this.jessibuca.setFullscreen()
+  }
+  //截图
+  screenshot () {
+    this.jessibuca.screenshot()
+  }
+  //重置画面
+  resize(){
+    this.jessibuca.resize();
+  }
+  constructor(options) {
+    this.config = Object.assign({
+      container: null,//播放容器element
+      videoBuffer: 0.2,//设置最大缓冲时长，单位毫秒，播放器会自动消除延迟。
+      vod: false,
+      isResize: true,//当为true的时候：视频画面做等比缩放后,高或宽对齐canvas区域,画面不被拉伸,但有黑边。当为false的时候：视频画面完全填充canvas区域,画面会被拉伸。
+      isFullSize: false,// 当为true的时候：视频画面做等比缩放后,完全填充canvas区域,画面不被拉伸,没有黑边,但画面显示不全。
+      isFlv: false,//当为true的时候：ws协议不检验是否以.flv为依据，进行协议解析。
+      debug: false,
+      timeout: 30,// 超时时间
+      supportDblclickFullscreen: true,//双击全屏
+      showBandwidth: false, //显示网速
+      keepScreenOn: false,//保持屏幕
+      isNotMute: false,//是否开启声音，默认是关闭声音播放的。
+      hasAudio: true,//是否包含音频
+      /**
+       * fullscreen 是否显示全屏按钮
+       * screenshot 是否显示截图按钮
+       * play 是否显示播放暂停按钮
+       * audio 是否显示声音按钮
+       */
+      operateBtns: {
+        fullscreen: false,
+        screenshot: false,
+        play: false,
+        audio: false
+      },
+      loadingText: '加载中...',//加载过程中文案。
+      background: '',//背景图片。
+      /*
+       * worker地址
+       * 直接引用 index.js 的地址即可。项目会直接引用根目录的index.js，如果修改了index.js文件名称，改为xxx.js，
+       * 请同步修改decoder参数，引用的是xxx.js文件目录
+      */
+      decoder: 'index.js',
+      rotate: 0,//设置旋转角度，只支持，0(默认) ，180，270 三个值。
+      text: '',
+      forceNoOffscreen: true,// 是否不使用离屏模式（提升渲染能力）
+      hiddenAutoPause: false//是否开启当页面的'visibilitythis.变为'hidden'的时候，自动暂停播放。
+    }, options)
+  }
+}
+export default JessibucaPlayer

src/components/VideoPlayerPlatform/players/livePlayer.vue

@@ -0,0 +1,69 @@
+<template>
+  <LivePlayer v-show="visible" :show-custom-button="false" ref="player" @snapOutside="onSnap" aspect='fullscreen' :videoUrl="videoUrl" :live="true" :alt="' '" :hide-fluent-button="true" :hide-big-play-button="true" @pause="onpause" @ended="onended" @timeupdate="ontimeupdate" />
+</template>
+<script>
+import LivePlayer from '@liveqing/liveplayer'
+export default {
+  data () {
+    return {
+      visible: false,
+      videoUrl: ''
+    }
+  },
+  components: {
+    LivePlayer
+  },
+  methods: {
+    onpause () {
+      this.$emit('pause')
+    },
+    ontimeupdate (t) {
+      this.$emit('timeupdate', t)
+    },
+    onended () {
+      this.$emit('ended')
+    },
+    onSnap (str) {
+      this.$emit('snap', str)
+    },
+    show () {
+      this.visible = true
+    },
+    hide () {
+      this.visible = false;
+    },
+    play (url, time) {
+      if (url) {
+        this.videoUrl = url
+      }
+      this.$refs.player.play()
+      if (time) {
+        this.$refs.player.setCurrentTime(time);
+      }
+    },
+    replay () {
+      this.$refs.player.play()
+    },
+    destroy () {
+      this.videoUrl = ''
+    },
+    setFullscreen () {
+      this.$refs.player.toggleFullscreen()
+    },
+    setMuted (open) {
+      this.$refs.player.setMuted(open ? 0 : 1)
+    },
+    snap () {
+      this.$refs.player.snap()
+    },
+    pause () {
+      this.$refs.player.pause()
+    }
+  }
+}
+</script>
+<style lang="scss">
+.video-wrapper .alt {
+  display: none;
+}
+</style>

src/components/VideoPlayerPlatform/players/zlmRtcPlayer.js

@@ -0,0 +1,132 @@
+
+class ZlmRtcPlayer {
+  constructor(options) {
+    this.webrtcPlayer = null;
+    this.playerEl = null;
+    this.config = Object.assign({
+      debug: false,
+      simulecast: false,
+      useCamera: false,
+      audioEnable: false,
+      videoEnable: false,
+      recvOnly: true,
+    }, options)
+  }
+  eventcallbacK (e, msg) {
+    if (this.config['on' + e]) {
+      this.config['on' + e](msg);
+    }
+  }
+  //全屏
+  setFullscreen () {
+    // this.playerEl.setFullscreen()
+    const el = this.playerEl;
+    function launchFullScreen () {
+      var element = el;
+      if (element.requestFullScreen) {
+        element.requestFullScreen();
+      } else if (element.mozRequestFullScreen) {
+        element.mozRequestFullScreen();
+      } else if (element.webkitRequestFullScreen) {
+        element.webkitRequestFullScreen();
+      }
+    }
+    launchFullScreen();
+  }
+  setMuted (open) {
+    this.playerEl.volume = open ? 1 : 0;
+  }
+  setVolume (val) {
+    this.playerEl.volume = val;
+  }
+  getVideoSize(){
+    let height = this.playerEl.videoHeight
+    let width =  this.playerEl.videoWidth
+    return {
+      width,height
+    }
+  }
+  snap (cb) {
+    let canvas = document.createElement('canvas');
+    canvas.setAttribute('width', this.playerEl.videoWidth);
+    canvas.setAttribute('height', this.playerEl.videoHeight);
+    var ctx = canvas.getContext("2d");
+    ctx.drawImage(this.playerEl, 0, 0, canvas.width, canvas.height);
+    canvas.toBlob(function (blob) {
+      canvas = null;
+      cb(blob)
+    });
+  }
+  destroy () {
+    this.webrtcPlayer.close();
+    this.playerEl.remove();
+  }
+  init () {
+    return new Promise((resolve) => {
+      resolve();
+    })
+  }
+  resize () { }
+  pause(){
+    this.playerEl.pause()
+  }
+  replay(){
+    this.playerEl.play()
+  }
+  play (url) {
+    // console.log(url,"play预置位配置url")
+    var ZLMRTCClient = window.ZLMRTCClient;
+    const player = document.createElement('video');
+    this.playerEl = player;
+    const me = this
+    // player.setAttribute('controls', 'controls');
+    player.setAttribute('autoplay', 'autoplay');
+    player.setAttribute('playsinline', 'playsinline');
+    player.setAttribute('stretch', 'stretch');
+    player.setAttribute('crossorigin', 'anonymous');
+    player.addEventListener('pause', () => {
+      me.eventcallbacK("pause", "暂停")
+    })
+    player.classList.add('video_player_zlm')
+    // player.setAttribute('id', 'v_' + this.config.container.id);
+    this.config.container.innerHtml = '';
+    this.config.container.appendChild(player);
+    this.webrtcPlayer = new ZLMRTCClient.Endpoint({
+      element: player,// video 标签
+      debug: this.config.debug,// 是否打印日志
+      zlmsdpUrl: url,//流地址
+      // zlmsdpUrl:document.location.protocol+"//"+window.location.host + "/wuhan/videoMonitor2/index/api/webrtc?app=live&stream=stream"+"&type=play",
+      simulecast: this.config.simulecast,
+      useCamera: this.config.useCamera,
+      audioEnable: this.config.audioEnable,
+      videoEnable: this.config.videoEnable,
+      recvOnly: this.config.recvOnly,
+    })
+    this.webrtcPlayer.on(ZLMRTCClient.Events.WEBRTC_ICE_CANDIDATE_ERROR, () => {// ICE 协商出错
+      // console.error('ICE 协商出错', e)
+      this.eventcallbacK("ICE ERROR", "ICE 协商出错")
+    });
+
+    this.webrtcPlayer.on(ZLMRTCClient.Events.WEBRTC_ON_REMOTE_STREAMS, (stream) => {//获取到了远端流，可以播放
+      console.log(stream)
+      player.volume = 0;
+      this.eventcallbacK("playing", "播放成功")
+    });
+
+    this.webrtcPlayer.on(ZLMRTCClient.Events.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED, (e) => {// offer anwser 交换失败
+      // console.error('offer anwser 交换失败', e)
+      this.eventcallbacK("OFFER ANSWER ERROR", "offer anwser 交换失败")
+      if (e.code == -400 && e.msg == "流不存在") {
+        this.timer = setTimeout(() => {
+          this.webrtcPlayer.close();
+          this.play(url);
+        }, 100)
+      }
+    });
+
+    this.webrtcPlayer.on(ZLMRTCClient.Events.WEBRTC_ON_LOCAL_STREAM, () => {// 获取到了本地流
+      this.eventcallbacK("LOCAL STREAM", "获取到了本地流")
+    });
+  }
+}
+export default ZlmRtcPlayer

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;

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>

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>

src/views/point/site_management.vue

@@ -26,7 +26,7 @@
       </el-col>
       <el-col :span="14">
         <el-alert
-          :title="$t('share.prompt')"
+          title="提示"
           type="info"
           :description="$t('site_management.promptMsg') + ';'"
           show-icon
@@ -123,14 +123,14 @@
             :render-header="addRedStar"
           >
             <template slot-scope="scope">
+              {{ patrolTypeNameFn(scope.row.patrolTypeIds) }}
               <el-select
                 multiple
-                v-model="scope.row.patrolTypeId"
+                v-model="scope.row.patrolTypeIds"
                 :placeholder="
                   $t('share.PleaseChoose') +
                   $t('site_management.InspectionType')
                 "
-                disabled
               >
                 <el-option
                   v-for="item in InspectionTypeData"
@@ -379,10 +379,9 @@
           prop="patrolTypeId"
         >
           <el-select
-            v-model="monitorPointForm.patrolTypeId"
+            v-model="monitorPointForm.patrolTypeIds"
             multiple
             filterable
-            allow-create
             default-first-option
             :placeholder="
               $t('share.PleaseChoose') + $t('site_management.InspectionType')
@@ -784,11 +783,14 @@ import {
   // listByEqIdAndChannelId
 } from "@/api/point/site_management";
 import siteVideoDialog from "./components/site_VideoDialog.vue";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "SiteManagement",
   components: {
     videoPlayer,
     siteVideoDialog,
+    Treeselect,
   },
   data() {
     return {
@@ -919,6 +921,7 @@ export default {
     }),
       getPatroltypeList().then((res) => {
         if (res.code == 200) {
+          console.log(res.rows, 1111111111);
           this.InspectionTypeData = res.rows;
         }
       });
@@ -954,6 +957,12 @@ export default {
         if (res.code == 200) {
           this.tableData = res.rows;
           this.tableData.forEach((item) => {
+            // item.patrolTypeIds = item.patrolTypeId.split(",");
+            // item.patrolTypeIds = item.patrolTypeId.split(",").map(Number)||[];
+            item.patrolTypeIds = (item.patrolTypeId || "")
+              .split(",")
+              .map(Number)
+              .filter(Boolean);
             let id = item.algSubtypeIds.split(",");
             item.patrolTypeId = id.map(Number);
           });
@@ -991,6 +1000,7 @@ export default {
     },
     tabsClick() {},
     add() {
+      this.monitorPointForm={}
       this.type = 0;
       this.monitorPointDialogVisible = true;
       this.monitorPointTitle = this.$t("site_management.AddMonitoringPoints");
@@ -999,20 +1009,16 @@ export default {
       this.monitorPointDialogVisible = false;
     },
     monitorPointEdit(data) {
+      this.monitorPointForm={}
       this.type = 1;
       this.monitorPointDialogVisible = true;
       this.monitorPointTitle = this.$t(
         "site_management.ModifyMonitoringPoints"
       );
-      this.monitorPointForm = data;
-      // this.tableData.forEach((item) => {
-      //   if (item.patrolpointId == data.patrolpointId) {
-      //     // console.log(item, 11111111111111);
-      //     editItem(item.patrolpointId).then((res) => {
-      //       console.log(res, 111111111);
-      //     });
-      //   }
-      // });
+      this.monitorPointForm = {
+        ...data,
+        patrolTypeIds: data.patrolTypeIds || [],
+      };
     },
     // 关闭绑定可见光监测点弹窗
     bindingMonitorPointClose() {
@@ -1052,9 +1058,9 @@ export default {
     InspectionBtn() {
       this.InspectionDialogVisible = true;
       eqpbookList(this.eqpbookListQuery).then((res) => {
-        console.log(res,1111)
-        if(res.code==200){
-          this.InspectionTableData=res.rows
+        console.log(res, 1111);
+        if (res.code == 200) {
+          this.InspectionTableData = res.rows;
         }
       });
     },
@@ -1094,7 +1100,7 @@ export default {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
           this.monitorPointForm.patrolTypeId =
-            this.monitorPointForm.patrolTypeId.toString();
+            this.monitorPointForm.patrolTypeIds.toString();
           if (this.type == 0) {
             postAdd(this.monitorPointForm).then((res) => {
               if (res.code == 200) {
@@ -1190,6 +1196,27 @@ export default {
     dialogChannelImgHandleClose() {
       this.dialogChannelImg = false;
     },
+    patrolTypeNameFn(arr) {
+      // console.log(str, 1111111111);
+      if (Array.isArray(arr) && arr.length > 0) {
+        // return this.InspectionTypeData.filter(item => item.id == str)[0].name;
+        console.log(this.InspectionTypeData, "存在", arr);
+      }
+    },
+    // handleSelectPointCode(node, row) {
+    //   row.patrolTypeId.push(node.id);
+    //   console.log( row.patrolTypeId,2222222)
+    //   return
+    //   this.handleChangePointCode(row);
+    // },
+    // handleDeSelectPointCode(node, row) {
+    //   if (row.patrolTypeId.indexOf(node.id) != -1) {
+    //     row.patrolTypeId.splice(row.patrolTypeId.indexOf(node.id), 1);
+    //     console.log( row.patrolTypeId,2222222)
+    //     return
+    //     this.handleChangePointCode(row);
+    //   }
+    // },
   },
 };
 </script>