init

src/api/system/artCatApi.js

@@ -27,6 +27,18 @@ export function getArtCatByList(data) {
 }
 
 /**
+ * 基于父ID获取所有子分类
+ * @param artCatId
+ * @returns
+ */
+export function getArtCatListByTopId(artCatId) {
+  return request({
+    url: `/art/cat/top/${artCatId}`,
+    method: 'GET'
+  })
+}
+
+/**
  * 根据Id获取Art Category
  * @param artCatId
  * @returns

src/api/system/checklistApi.js

@@ -28,12 +28,24 @@ export function getChecklistByList(data) {
 
 /**
  * 根据Id获取Checklist
- * @param data
+ * @param checklistId
  * @returns
  */
-export function getChecklistById(id) {
+export function getChecklistById(checklistId) {
   return request({
-    url: `/checklist/${id}`,
+    url: `/checklist/${checklistId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 根据OcId获取Checklist列表
+ * @param ocId
+ * @returns
+ */
+export function getOcChecklist(ocId) {
+  return request({
+    url: `/oc/checklist/${ocId}`,
     method: 'GET'
   })
 }
@@ -66,19 +78,19 @@ export function updateChecklist(data) {
 
 /**
  * 删除Checklist
- * @param data
+ * @param checklistId
  * @returns
  */
-export function deleteChecklistById(id) {
+export function deleteChecklistById(checklistId) {
   return request({
-    url: `/checklist/${id}`,
+    url: `/checklist/${checklistId}`,
     method: 'DELETE'
   })
 }
 
 /**
  * 根据Id获取Checklist Data
- * @param data
+ * @param checklistId
  * @returns
  */
 export function getChecklistViewById(checklistId) {

src/api/system/checklistPointRecordApi.js

@@ -1,11 +1,24 @@
 import request from '@/utils/request'
 
 /**
+ * 根据Id获取Checklist Score Record Data
+ * @param recordId
+ * @param checklistId
+ * @returns
+ */
+export function getChecklistPointRecordViewById(recordId, checklistId) {
+  return request({
+    url: `/checklist/point/record/view/${recordId}/${checklistId}`,
+    method: 'GET'
+  })
+}
+
+/**
  * 获取Checklist列表
  * @param data
  * @returns
  */
-export function getChecklistRecordByList(data) {
+export function getChecklistPointRecordByList(data) {
   return request({
     url: '/checklist/point/record',
     method: 'GET',
@@ -16,13 +29,14 @@ export function getChecklistRecordByList(data) {
 /**
  * 根据Id获取Checklist Point Record
  * @param recordId
+ * @param checklistId
  * @param itemId
  * @param pointId
  * @returns
  */
-export function getChecklistPointRecordById(recordId, itemId, pointId) {
+export function getChecklistPointRecordById(recordId, checklistId, itemId, pointId) {
   return request({
-    url: `/checklist/point/record/${recordId}/${itemId}/${pointId}`,
+    url: `/checklist/point/record/${recordId}/${checklistId}/${itemId}/${pointId}`,
     method: 'GET'
   })
 }
@@ -40,3 +54,67 @@ export function deleteChecklistPointRecordById(recordId, itemId, pointId) {
     method: 'DELETE'
   })
 }
+
+/**
+ * 初始化
+ * @returns
+ * @param data
+ */
+export function initChecklistPointRecord(data) {
+  return request({
+    url: `/checklist/point/record/init`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 根据Id获取Checklist Score Record Data
+ * @param recordId
+ * @param checklistId
+ * @returns
+ */
+export function completeChecklistDoing(recordId, checklistId) {
+  return request({
+    url: `/checklist/point/record/complete/${recordId}/${checklistId}`,
+    method: 'PUT'
+  })
+}
+
+/**
+ * 根据Id获取Checklist Score Record Data
+ * @param recordId
+ * @returns
+ */
+export function cancelChecklistDoing(recordId) {
+  return request({
+    url: `/checklist/point/record/complete/${recordId}`,
+    method: 'PUT'
+  })
+}
+
+/**
+ * 更新
+ * @returns
+ * @param data
+ */
+export function updateChecklistPointRecordDoing(data) {
+  return request({
+    url: `/checklist/point/record/doing/update`,
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * 更新
+ * @returns
+ * @param recordId
+ * @param checkResult
+ */
+export function batchUpdateChecklistPointRecordDoing(recordId, checkResult) {
+  return request({
+    url: `/checklist/point/record/doing/batchUpdate/${recordId}/${checkResult}`,
+    method: 'PUT'
+  })
+}

src/api/system/checklistRecordApi.js

@@ -27,6 +27,18 @@ export function getChecklistRecordByList(data) {
 }
 
 /**
+ * 基于recordId获取Checklist记录
+ * @param recordId
+ * @returns
+ */
+export function getChecklistRecordById(recordId) {
+  return request({
+    url: `/checklist/record/${recordId}`,
+    method: 'GET'
+  })
+}
+
+/**
  * 获取Checklist记录
  * @param data
  * @returns
@@ -50,15 +62,3 @@ export function deleteChecklistRecordById(recordId) {
     method: 'DELETE'
   })
 }
-
-/**
- * 根据Id获取Checklist Record Data
- * @param recordId
- * @returns
- */
-export function getChecklistRecordViewById(recordId) {
-  return request({
-    url: `/checklist/record/view/${recordId}`,
-    method: 'GET'
-  })
-}

src/api/system/checklistRecordStatisApi.js

@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+
+/**
+ * counterByStatus
+ * @returns
+ */
+export function counterByStatus(data) {
+  return request({
+    url: `/checklist/record/statis/counterByStatus`,
+    method: 'GET',
+    params: data
+  })
+}

src/api/system/checklistScoreRecordApi.js

@@ -0,0 +1,93 @@
+import request from '@/utils/request'
+
+/**
+ * 根据Id获取Checklist Score Record Data
+ * @param recordId
+ * @returns
+ */
+export function getChecklistScoreRecordViewById(recordId, checklistId) {
+  return request({
+    url: `/checklist/score/record/view/${recordId}/${checklistId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 获取Checklist列表
+ * @param data
+ * @returns
+ */
+export function getChecklistScoreRecordByList(data) {
+  return request({
+    url: '/checklist/score/record',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 根据Id获取Checklist Point Record
+ * @param recordId
+ * @param itemId
+ * @param pointId
+ * @returns
+ */
+export function getChecklistScoreRecordById(recordId, itemId, pointId) {
+  return request({
+    url: `/checklist/score/record/${recordId}/${itemId}/${pointId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 添加
+ * @param data
+ * @returns
+ */
+export function createChecklistScoreRecord(data) {
+  return request({
+    url: `/checklist/score/record/add`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 批量添加
+ * @param data
+ * @returns
+ */
+export function batchAdd(data) {
+  return request({
+    url: `/checklist/score/record/batch`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 更新
+ * @param data
+ * @returns
+ */
+export function updateChecklistScoreRecord(data) {
+  return request({
+    url: `/checklist/score/record/update`,
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * 基于Id删除Checklist Point Record
+ * @param recordId
+ * @param itemId
+ * @param pointId
+ * @returns
+ */
+export function deleteChecklistScoreRecordById(recordId, itemId, pointId) {
+  return request({
+    url: `/checklist/score/record/${recordId}/${itemId}/${pointId}`,
+    method: 'DELETE'
+  })
+}

src/api/system/gridApi.js

@@ -7,7 +7,7 @@ import request from '@/utils/request'
  */
 export function getGridByPage(data) {
   return request({
-    url: '/ent/grid/page',
+    url: '/grid/page',
     method: 'GET',
     params: data
   })
@@ -20,7 +20,7 @@ export function getGridByPage(data) {
  */
 export function getGridByList(data) {
   return request({
-    url: '/ent/grid',
+    url: '/grid',
     method: 'GET',
     params: data
   })
@@ -33,7 +33,7 @@ export function getGridByList(data) {
  */
 export function getGridById(gridId) {
   return request({
-    url: `/ent/grid/${gridId}`,
+    url: `/grid/${gridId}`,
     method: 'GET'
   })
 }
@@ -45,7 +45,7 @@ export function getGridById(gridId) {
  */
 export function createGrid(data) {
   return request({
-    url: `/ent/grid/add`,
+    url: `/grid/add`,
     method: 'POST',
     data
   })
@@ -58,7 +58,7 @@ export function createGrid(data) {
  */
 export function updateGrid(data) {
   return request({
-    url: `/ent/grid/update`,
+    url: `/grid/update`,
     method: 'PUT',
     data
   })
@@ -71,7 +71,7 @@ export function updateGrid(data) {
  */
 export function deleteGridById(gridId) {
   return request({
-    url: `/ent/grid/${gridId}`,
+    url: `/grid/${gridId}`,
     method: 'DELETE'
   })
 }

src/api/system/gridCatApi.js

@@ -0,0 +1,77 @@
+import request from '@/utils/request'
+
+/**
+ * 设备分类列表
+ * @param data
+ * @returns
+ */
+export function getGridCatByList(data) {
+  return request({
+    url: '/grid/cat',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 设备分类列表
+ * @param data
+ * @returns
+ */
+export function getGridCatByPage(data) {
+  return request({
+    url: '/grid/cat/page',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 获取设备分类详情
+ * @param gridCatId
+ * @returns
+ */
+export function getGridCatById(gridCatId) {
+  return request({
+    url: `grid/cat/${gridCatId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 添加 设备分类分组名称
+ * @param data
+ * @returns
+ */
+export function createGridCat(data) {
+  return request({
+    url: '/grid/cat/add',
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 更新 设备分类分组名称
+ * @param data
+ * @returns
+ */
+export function updateGridCat(data) {
+  return request({
+    url: '/grid/cat/update',
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * 删除设备分类
+ * @param gridCatId
+ * @returns
+ */
+export function deleteGridCatById(gridCatId) {
+  return request({
+    url: `/grid/cat/${gridCatId}`,
+    method: 'DELETE'
+  })
+}

src/api/system/mapLayerApi.js

@@ -15,9 +15,9 @@ export function getMapLayerByList(data) {
 
 /**
  * 基于ID查询
+ * @returns
  * @param mapId
  * @param layerId
- * @returns
  */
 export function getMapLayerById(mapId, layerId) {
   return request({
@@ -27,29 +27,31 @@ export function getMapLayerById(mapId, layerId) {
 }
 
 /**
- * 更新
+ * 新增
  * @param data
  * @returns
  */
-export function updateMapLayer(data) {
+export function createMapLayer(data) {
   return request({
-    url: `/map/layer/update`,
+    url: `/map/layer/add`,
     method: 'PUT',
     data
   })
 }
+
 /**
- * 新增
+ * 更新
  * @param data
  * @returns
  */
-export function createMapLayer(data) {
+export function updateMapLayer(data) {
   return request({
-    url: `/map/layer/add`,
-    method: 'POST',
+    url: `/map/layer/update`,
+    method: 'PUT',
     data
   })
 }
+
 /**
  * 基于ID删除
  * @param mapId

src/api/system/miniProgramApi.js

@@ -0,0 +1,80 @@
+import request from '@/utils/request'
+
+/**
+ * 获取Mini分页
+ * @param data
+ * @returns
+ */
+export function getMiniByPage(data) {
+  return request({
+    url: '/mini/page',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 获取Mini列表
+ * @param data
+ * @returns
+ */
+export function getMiniByList(data) {
+  return request({
+    url: '/mini',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 根据Id获取Mini
+ * @returns
+ * @param ocId
+ * @param miniId
+ */
+export function getMiniById(ocId, miniId) {
+  return request({
+    url: `/mini/${ocId}/${miniId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 添加Mini
+ * @param data
+ * @returns
+ */
+export function createMini(data) {
+  return request({
+    url: `/mini/add`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 更新Mini
+ * @param data
+ * @returns
+ */
+export function updateMini(data) {
+  return request({
+    url: `/mini/update`,
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * 删除Mini
+ * @returns
+ * @param ocId
+ * @param miniId
+ */
+export function deleteMiniById(ocId, miniId) {
+  return request({
+    url: `/mini/${ocId}/${miniId}`,
+    method: 'DELETE'
+  })
+}
+

src/api/system/miniProgramCatApi.js

@@ -0,0 +1,80 @@
+import request from '@/utils/request'
+
+/**
+ * 获取Mini Category分页
+ * @param data
+ * @returns
+ */
+export function getMiniCatByPage(data) {
+  return request({
+    url: '/mini/cat/page',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 获取Mini Category列表
+ * @param data
+ * @returns
+ */
+export function getMiniCatByList(data) {
+  return request({
+    url: '/mini/cat',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 根据Id获取Mini Category
+ * @returns
+ * @param ocId
+ * @param miniCatId
+ */
+export function getMiniCatById(ocId, miniCatId) {
+  return request({
+    url: `/mini/cat/${ocId}/${miniCatId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 添加Mini Category
+ * @param data
+ * @returns
+ */
+export function createMiniCat(data) {
+  return request({
+    url: `/mini/cat/add`,
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 更新Mini Category
+ * @param data
+ * @returns
+ */
+export function updateMiniCat(data) {
+  return request({
+    url: `/mini/cat/update`,
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * 删除App Category
+ * @returns
+ * @param ocId
+ * @param miniCatId
+ */
+export function deleteMiniCatById(ocId, miniCatId) {
+  return request({
+    url: `/mini/cat/${ocId}/${miniCatId}`,
+    method: 'DELETE'
+  })
+}
+

src/api/system/miniProgramPositionPermitApi.js

@@ -0,0 +1,38 @@
+import request from '@/utils/request'
+
+/**
+ * 获取Mini Position Permit列表
+ * @returns
+ */
+export function getMiniPositionPermitView() {
+  return request({
+    url: '/mini/position/permit/view',
+    method: 'GET'
+  })
+}
+
+/**
+ * 添加Mini Position Permit
+ * @param data
+ * @returns
+ */
+export function createMiniPositionPermit(data) {
+  return request({
+    url: `/mini/position/permit/add`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 删除Mini Position Permit
+ * @returns
+ * @param miniId
+ * @param positionId
+ */
+export function deleteMiniPositionPermitById(miniId, positionId) {
+  return request({
+    url: `/mini/position/permit/${miniId}/${positionId}`,
+    method: 'DELETE'
+  })
+}

src/api/system/miniProgramTargetApi.js

@@ -0,0 +1,50 @@
+import request from '@/utils/request'
+
+/**
+ * 获取列表
+ * @param data
+ */
+export function getMiniTargetByList(data) {
+  return request({
+    url: '/mini/target',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 获取列表
+ * @param data
+ */
+export function getMiniSelectByList(data) {
+  return request({
+    url: '/mini/target/select',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 添加
+ * @param data
+ */
+export function createMiniTarget(data) {
+  return request({
+    url: `/mini/target/add`,
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 删除
+ * @param miniId
+ * @param riskPointId
+ */
+export function deleteMiniTargetById(miniId, riskPointId) {
+  return request({
+    url: `/mini/target/${miniId}/${riskPointId}`,
+    method: 'DELETE'
+  })
+}
+

src/api/system/taskApi.js

@@ -27,6 +27,19 @@ export function getTaskByList(data) {
 }
 
 /**
+ * 列表查询未执行Task
+ * @param data
+ * @returns
+ */
+export function getWaitingTaskByList(data) {
+  return request({
+    url: '/task/waiting',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
  * 列表查询Task: 50笔
  * @param data
  * @returns

src/api/system/uploadApi.js

@@ -6,7 +6,7 @@ import request from '@/utils/request'
  */
 export function uploadFile(data) {
   return request({
-    url: '/admin/uploadFile',
+    url: '/upload/file',
     method: 'POST',
     data
   })
@@ -17,7 +17,7 @@ export function uploadFile(data) {
  */
 export function uploadFiles(data) {
   return request({
-    url: '/admin/uploadFiles',
+    url: '/upload/files',
     method: 'POST',
     data
   })

src/api/system/wfApi.js

@@ -19,41 +19,44 @@ export function getWorkflowById(wfInsId) {
   })
 }
 
-/**
- * 处理
- * @param data
- * @returns
- */
-export function handleWorkflow(data) {
+export function getWorkflowById2(wfInsId, activityInsId) {
   return request({
-    url: `/wf/handle`,
-    method: 'POST',
-    data
+    url: `/wf/getIns/${wfInsId}/${activityInsId}`,
+    method: 'GET'
   })
 }
 
-/**
- * 移交
- * @param data
- * @returns
- */
-export function transferWorkflow(data) {
+export function getWorkflowById3(wfInsId, activityInsId, actionInsId) {
   return request({
-    url: `/wf/transfer`,
-    method: 'POST',
-    data
+    url: `/wf/getIns/${wfInsId}/${activityInsId}/${actionInsId}`,
+    method: 'GET'
+  })
+}
+
+export function getWorkflowDetailsById(wfInsId) {
+  return request({
+    url: `/wf/details/${wfInsId}`,
+    method: 'GET'
+  })
+}
+
+export function getWorkflowRecordById(wfInsId) {
+  return request({
+    url: `/wf/record/${wfInsId}`,
+    method: 'GET'
   })
 }
 
 /**
- * 完成
- * @param wfInsId
+ * 处理
+ * @param data
  * @returns
  */
-export function completeWorkflow(wfInsId) {
+export function handleWorkflow(data) {
   return request({
-    url: `/wf/complete/${wfInsId}`,
-    method: 'GET'
+    url: `/wf/handle`,
+    method: 'POST',
+    data
   })
 }
 

src/api/system/wxUserApi.js

@@ -0,0 +1,78 @@
+import request from '@/utils/request'
+
+/**
+ * 分页查询
+ * @param data
+ * @returns
+ */
+export function getWxUserByPage(data) {
+  return request({
+    url: '/wx/user/page',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 列表查询
+ * @param data
+ * @returns
+ */
+export function getWxUserByList(data) {
+  return request({
+    url: '/wx/user',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 查询
+ * @param wxId 微信用户ID
+ * @returns
+ */
+export function getWxUserById(wxId) {
+  return request({
+    url: `/wx/user/${wxId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 添加微信用户
+ * @param data
+ * @returns
+ */
+export function createWxUser(data) {
+  return request({
+    url: `/wx/user/add`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 更新微信用户
+ * @param data
+ * @returns
+ */
+export function updateWxUser(data) {
+  return request({
+    url: `/wx/user/update`,
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * 删除微信用户
+ * @param wxId 微信用户ID
+ * @returns
+ */
+export function deleteWxUserById(wxId) {
+  return request({
+    url: `/wx/user/${wxId}`,
+    method: 'DELETE'
+  })
+}
+

src/components/AppSelector/index.vue

@@ -14,7 +14,7 @@
 import { getAppByList } from '@/api/system/appApi'
 
 export default {
-  name: 'ClientSelector',
+  name: 'AppSelector',
   components: { },
   props: {
     value: {

src/components/ChecklistCatSelector/index.vue

@@ -2,7 +2,7 @@
   <el-select v-model="checklistCatId" value-key="checklistCatId" style="width: 100%" filterable placeholder="请选择清单分类">
     <el-option-group>
       <el-option
-        v-for="item in checklistCatList"
+        v-for="item in dataList"
         :key="item.checklistCatId"
         :label="item.checklistCatTitle"
         :value="item.checklistCatId"
@@ -25,7 +25,7 @@ export default {
   data() {
     return {
       checklistCatId: undefined,
-      checklistCatList: []
+      dataList: []
     }
   },
   watch: {
@@ -37,15 +37,15 @@ export default {
     }
   },
   created() {
-    this.initChecklistCatData()
+    this.getData()
   },
   mounted() {},
   methods: {
     // 检查表清单
-    initChecklistCatData() {
+    getData() {
       getChecklistCatByList().then((resp) => {
         const { data } = resp
-        this.checklistCatList = data
+        this.dataList = data
       }).catch((error) => {
         console.log(error)
       })

src/components/ChecklistSelector/index.vue

@@ -25,7 +25,10 @@ export default {
   data() {
     return {
       checklistId: undefined,
-      checklistList: []
+      checklistList: [],
+      conditions: {
+        status: 1
+      }
     }
   },
   watch: {
@@ -43,7 +46,7 @@ export default {
   methods: {
     // 检查表清单
     initChecklistData() {
-      getChecklistByList().then((resp) => {
+      getChecklistByList(this.conditions).then((resp) => {
         const { data } = resp
         this.checklistList = data
       }).catch((error) => {

src/components/EquipmentCatSelector/index.vue

@@ -2,7 +2,7 @@
   <el-select v-model="equipCatId" value-key="EquipmentCatId" style="width: 100%" filterable placeholder="请选择设备类别">
     <el-option-group>
       <el-option
-        v-for="item in EquipCatList"
+        v-for="item in dataList"
         :key="item.equipCatId"
         :label="item.equipCatTitle"
         :value="item.equipCatId"
@@ -25,7 +25,7 @@ export default {
   data() {
     return {
       equipCatId: undefined,
-      equipCatList: []
+      dataList: []
     }
   },
   watch: {
@@ -45,7 +45,7 @@ export default {
     initEquipCatData() {
       getEquipmentCatByList().then((resp) => {
         const { data } = resp
-        this.equipCatList = data
+        this.dataList = data
       }).catch((error) => {
         console.log(error)
       })

src/components/EquipmentSelector/index.vue

@@ -0,0 +1,58 @@
+<template>
+  <el-select v-model="equipId" value-key="equipId" style="width: 100%" filterable placeholder="请选择网格">
+    <el-option-group>
+      <el-option
+        v-for="item in dataList"
+        :key="item.equipId"
+        :label="item.equipTitle"
+        :value="item.equipId"
+      />
+    </el-option-group>
+  </el-select>
+</template>
+<script>
+import { getEquipmentByList } from '@/api/aqpt/equipmentApi'
+
+export default {
+  name: 'GridSelector',
+  components: {},
+  props: {
+    value: {
+      type: [Number, Array],
+      default: undefined
+    }
+  },
+  data() {
+    return {
+      equipId: undefined,
+      dataList: []
+    }
+  },
+  watch: {
+    value(val) {
+      this.equipId = val
+    },
+    equipId(val) {
+      const item = this.dataList.filter(item => item.equipId === val)[0]
+      this.$emit('input', val)
+      this.$emit('change', item)
+    }
+  },
+  created() {
+    this.initData()
+  },
+  mounted() {
+  },
+  methods: {
+
+    initData() {
+      getEquipmentByList({}).then((resp) => {
+        const { data } = resp
+        this.dataList = data
+      }).catch((error) => {
+        console.log(error)
+      })
+    }
+  }
+}
+</script>

src/components/GridCatSelector/index.vue

@@ -0,0 +1,55 @@
+<template>
+  <el-select v-model="gridCatId" value-key="gridCatId" style="width: 100%" filterable placeholder="请选择区域分类">
+    <el-option-group>
+      <el-option
+        v-for="item in dataList"
+        :key="item.gridCatId"
+        :label="item.gridCatTitle"
+        :value="item.gridCatId"
+      />
+    </el-option-group>
+  </el-select>
+</template>
+<script>
+import { getGridCatByList } from '@/api/system/gridCatApi'
+
+export default {
+  name: 'GridCatSelector',
+  components: { },
+  props: {
+    value: {
+      type: Number,
+      default: undefined
+    }
+  },
+  data() {
+    return {
+      gridCatId: undefined,
+      dataList: []
+    }
+  },
+  watch: {
+    value(val) {
+      this.gridCatId = val
+    },
+    gridCatId(val) {
+      this.$emit('input', val)
+    }
+  },
+  created() {
+    this.getData()
+  },
+  mounted() {},
+  methods: {
+    // 检查表清单
+    getData() {
+      getGridCatByList().then((resp) => {
+        const { data } = resp
+        this.dataList = data
+      }).catch((error) => {
+        console.log(error)
+      })
+    }
+  }
+}
+</script>

src/components/GridSelector/index.vue

@@ -10,7 +10,7 @@
   >
     <el-option-group>
       <el-option
-        v-for="item in gridList"
+        v-for="item in dataList"
         :key="item.gridId"
         :label="item.gridTitle"
         :value="item.gridId"
@@ -20,7 +20,7 @@
   <el-select v-else v-model="gridId" value-key="gridId" style="width: 100%" filterable placeholder="请选择网格">
     <el-option-group>
       <el-option
-        v-for="item in gridList"
+        v-for="item in dataList"
         :key="item.gridId"
         :label="item.gridTitle"
         :value="item.gridId"
@@ -47,7 +47,7 @@ export default {
   data() {
     return {
       gridId: undefined,
-      gridList: []
+      dataList: []
     }
   },
   watch: {
@@ -55,7 +55,9 @@ export default {
       this.gridId = val
     },
     gridId(val) {
+      const item = this.dataList.filter(item => item.gridId === val)[0]
       this.$emit('input', val)
+      this.$emit('change', item)
     }
   },
   created() {
@@ -68,7 +70,7 @@ export default {
     initGridData() {
       getGridByList({}).then((resp) => {
         const { data } = resp
-        this.gridList = data
+        this.dataList = data
       }).catch((error) => {
         console.log(error)
       })

src/components/GroupCatSelector/index.vue

@@ -37,12 +37,12 @@ export default {
     }
   },
   created() {
-    this.initGroupCatData()
+    this.initData()
   },
   mounted() {},
   methods: {
     // 检查表清单
-    initGroupCatData() {
+    initData() {
       getGroupCatByList().then((resp) => {
         const { data } = resp
         this.groupCatList = data

src/components/GroupSelector/index.vue

@@ -10,6 +10,7 @@
       :close-on-select="true"
       :searchable="false"
       :clearable="false"
+      size="mini"
       placeholder="请选择部门"
     />
   </div>

src/components/MiniProgramCatSelector/index.vue

@@ -0,0 +1,55 @@
+<template>
+  <el-select v-model="miniCatId" value-key="miniCatId" style="width: 100%" filterable placeholder="请选择小程序分类">
+    <el-option-group>
+      <el-option
+        v-for="item in dataList"
+        :key="item.miniCatId"
+        :label="item.miniCatTitle"
+        :value="item.miniCatId"
+      />
+    </el-option-group>
+  </el-select>
+</template>
+<script>
+import { getMiniCatByList } from '@/api/system/miniProgramCatApi'
+
+export default {
+  name: 'MiniCatSelector',
+  components: { },
+  props: {
+    value: {
+      type: Number,
+      default: undefined
+    }
+  },
+  data() {
+    return {
+      miniCatId: 0,
+      dataList: []
+    }
+  },
+  watch: {
+    value(val) {
+      this.miniCatId = val
+    },
+    miniCatId(val) {
+      this.$emit('input', val)
+    }
+  },
+  created() {
+    this.initData()
+  },
+  mounted() {},
+  methods: {
+    // 检查表清单
+    initData() {
+      getMiniCatByList().then((resp) => {
+        const { data } = resp
+        this.dataList = data
+      }).catch((error) => {
+        console.log(error)
+      })
+    }
+  }
+}
+</script>

src/components/AppTargetConfig/AppSelected.vue → src/components/MiniProgramTargetConfig/components/MiniSelected.vue

@@ -14,9 +14,9 @@
         <el-table v-loading="listLoading" class="page-table" border :data="dataList" height="calc(100vh - 220px)">
           <el-table-column type="index" label="序号" header-align="center" align="center" width="80" />
 
-          <el-table-column prop="checklistTitle" label="名称" header-align="center" align="center">
+          <el-table-column prop="miniTitle" label="名称" header-align="center" align="center">
             <template v-slot="{row}">
-              <span><i class="el-icon-notebook-2" /> {{ row.appTitle }}</span>
+              <span><i class="el-icon-notebook-2" /> {{ row.miniTitle }}</span>
             </template>
           </el-table-column>
 
@@ -31,11 +31,11 @@
   </div>
 </template>
 <script>
-import { getAppTargetByList, deleteAppTargetById } from '@/api/system/appTargetApi'
+import { getMiniTargetByList, deleteMiniTargetById } from '@/api/system/miniProgramTargetApi'
 import VueScroll from 'vuescroll'
 
 export default {
-  name: 'AppSelected',
+  name: 'MiniSelected',
   components: { VueScroll },
   data() {
     return {
@@ -63,7 +63,7 @@ export default {
       this.conditions.targetId = targetId
       this.dialogVisible = true
       this.listLoading = true
-      getAppTargetByList(this.conditions).then((resp) => {
+      getMiniTargetByList(this.conditions).then((resp) => {
         const { data } = resp
         this.listLoading = false
         this.dataList = data
@@ -82,9 +82,9 @@ export default {
 
     // Delete Handling
     handleDelete(data) {
-      const { appId } = data
+      const { miniId } = data
       const targetId = this.conditions.targetId
-      deleteAppTargetById(appId, targetId).then((resp) => {
+      deleteMiniTargetById(miniId, targetId).then((resp) => {
         this.loadData()
         this.$emit('actionUpdate')
       }).catch((error) => {

src/components/AppTargetConfig/AppUnselected.vue → src/components/MiniProgramTargetConfig/components/MiniUnselected.vue

@@ -14,9 +14,9 @@
         <el-table v-loading="listLoading" class="page-table" border :data="dataList" height="calc(100vh - 220px)">
           <el-table-column type="index" label="序号" header-align="center" align="center" width="60" />
 
-          <el-table-column prop="appTitle" label="名称" header-align="center" align="center">
+          <el-table-column prop="miniTitle" label="名称" header-align="center" align="center">
             <template v-slot="{row}">
-              <span><i class="el-icon-notebook-2" /> {{ row.appTitle }}</span>
+              <span><i class="el-icon-notebook-2" /> {{ row.miniTitle }}</span>
             </template>
           </el-table-column>
 
@@ -31,11 +31,11 @@
   </div>
 </template>
 <script>
-import { getAppSelectByList, createAppTarget } from '@/api/system/appTargetApi'
+import { getMiniSelectByList, createMiniTarget } from '@/api/system/miniProgramTargetApi'
 import VueScroll from 'vuescroll'
 
 export default {
-  name: 'AppUnSelected',
+  name: 'MiniUnSelected',
   components: { VueScroll },
   filters: { },
   props: {
@@ -62,7 +62,7 @@ export default {
       listLoading: false,
       dataList: [],
       formData: {
-        appId: undefined,
+        miniId: undefined,
         targetId: this.targetId,
         targetType: this.targetType
       },
@@ -82,7 +82,7 @@ export default {
       this.conditions.targetId = targetId
       this.dialogVisible = true
       this.listLoading = true
-      getAppSelectByList(this.conditions).then((resp) => {
+      getMiniSelectByList(this.conditions).then((resp) => {
         const { data } = resp
         this.listLoading = false
         this.dataList = data
@@ -102,9 +102,9 @@ export default {
 
     // Add Handling
     handleAdd(data) {
-      const { appId } = data
-      this.formData.appId = appId
-      createAppTarget(this.formData).then((resp) => {
+      const { miniId } = data
+      this.formData.miniId = miniId
+      createMiniTarget(this.formData).then((resp) => {
         this.loadData()
         this.$emit('actionUpdate')
       }).catch((error) => {

src/components/AppTargetConfig/index.vue → src/components/MiniProgramTargetConfig/index.vue

@@ -9,22 +9,22 @@
   >
     <el-row class="content-container">
       <el-col :span="12" class="left-counter-wrap">
-        <AppSelected ref="SelectedList" :target-type="targetType" @actionUpdate="updateUnselectedList" />
+        <MiniSelected ref="SelectedList" :target-type="targetType" @actionUpdate="updateUnselectedList" />
       </el-col>
 
       <el-col :span="12" class="right-counter-wrap">
-        <AppUnselected ref="UnselectedList" :target-type="targetType" @actionUpdate="updateSelectedList" />
+        <MiniUnselected ref="UnselectedList" :target-type="targetType" @actionUpdate="updateSelectedList" />
       </el-col>
     </el-row>
   </el-drawer>
 </template>
 <script>
-import AppSelected from './AppSelected'
-import AppUnselected from './AppUnselected'
+import MiniSelected from './components/MiniSelected.vue'
+import MiniUnselected from './components/MiniUnselected.vue'
 
 export default {
-  name: 'AppTargetConfig',
-  components: { AppSelected, AppUnselected },
+  name: 'MiniProgramTargetConfig',
+  components: { MiniSelected, MiniUnselected },
   props: {
     targetType: {
       type: [Number],

src/components/OcChecklistSelector/index.vue

@@ -0,0 +1,62 @@
+<template>
+  <el-select v-model="checklistId" value-key="checklistId" style="width: 100%" filterable placeholder="请选择检查表">
+    <el-option-group>
+      <el-option
+        v-for="item in dataList"
+        :key="item.checklistId"
+        :label="item.checklistTitle"
+        :value="item.checklistId"
+      />
+    </el-option-group>
+  </el-select>
+</template>
+<script>
+import { getOcChecklist } from '@/api/system/checklistApi'
+
+export default {
+  name: 'OcChecklistSelector',
+  components: { },
+  props: {
+    ocId: {
+      type: Number,
+      default: undefined
+    },
+    value: {
+      type: Number,
+      default: undefined
+    }
+  },
+  data() {
+    return {
+      checklistId: undefined,
+      dataList: [],
+      conditions: {
+        status: 1
+      }
+    }
+  },
+  watch: {
+    value(val) {
+      this.checklistId = val
+    },
+    checklistId(val) {
+      this.$emit('input', val)
+    }
+  },
+  created() {
+    this.initData()
+  },
+  mounted() {},
+  methods: {
+    // 检查表清单
+    initData() {
+      getOcChecklist(this.ocId).then((resp) => {
+        const { data } = resp
+        this.dataList = data
+      }).catch((error) => {
+        console.log(error)
+      })
+    }
+  }
+}
+</script>

src/components/WorkFlow/ActivityHandleRecord.vue → src/components/WorkFlow/WorkflowRecord.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="el-row">
-    <el-table :data="flowData.activityInsRecordList">
+    <el-table :data="dataList">
       <el-table-column type="index" align="center" label="序号" width="50" />
 
       <el-table-column prop="actionTime" align="center" label="处理时间" width="170">
@@ -47,7 +47,7 @@
   </div>
 </template>
 <script>
-import { getWorkflowById } from '@/api/system/wfApi'
+import { getWorkflowRecordById } from '@/api/system/wfApi'
 import AttachList from '@/components/AttachList'
 export default {
   name: 'ActivityHandleRecord',
@@ -70,14 +70,7 @@ export default {
         }
       },
       listLoading: false,
-      flowData: {
-        wfDefId: 1,
-        wfInsId: undefined,
-        wfInsTitle: '',
-        wfInsStatus: undefined,
-        activityIns: undefined,
-        activityInsRecordList: []
-      },
+      dataList: [],
       rules: {}
     }
   },
@@ -85,10 +78,10 @@ export default {
     getData(wfInsId) {
       if (!wfInsId) return
       this.listLoading = true
-      getWorkflowById(wfInsId).then((resp) => {
+      getWorkflowRecordById(wfInsId).then((resp) => {
         this.listLoading = false
         const { data } = resp
-        this.flowData = data
+        this.dataList = data
       })
     }
   }

src/components/WorkFlow/index.vue

@@ -1,14 +1,13 @@
 <template>
   <div>
     <el-form ref="flowForm" :model="formData" :rules="rules" label-width="130px">
-
-      <el-form-item v-if="actionVisible" label="处理动作" prop="actionId">
-        <el-radio-group v-if="flowData.curActivityIns" v-model="actionId">
-          <el-radio v-for="(item, index) in flowData.curActivityIns.actionList" :key="index" :label="item.actionId">{{ item.actionTitle }}</el-radio>
+      <el-form-item v-if="actionVisible" label="处理动作" prop="actionDefId">
+        <el-radio-group v-if="flowData.actionDefList" v-model="actionDefId">
+          <el-radio v-for="(item, index) in flowData.actionDefList" :key="index" :label="item.actionDefId" @change="changeAction(item)">{{ item.actionTitle }}</el-radio>
         </el-radio-group>
       </el-form-item>
 
-      <el-form-item v-if="remarkVisible" label="处理说明" prop="actionRemark">
+      <el-form-item v-if="remarkVisible" label="处理意见" prop="actionRemark">
         <el-input v-model="formData.actionRemark" type="textarea" :rows="5" placeholder="说明" />
       </el-form-item>
 
@@ -23,7 +22,7 @@
   </div>
 </template>
 <script>
-import { startWorkflow, getWorkflowById, handleWorkflow } from '@/api/system/wfApi'
+import { startWorkflow, getWorkflowById, getWorkflowById2, getWorkflowById3, handleWorkflow } from '@/api/system/wfApi'
 import UserSelector from '../UserSelector/index'
 import FileUpload from '@/components/FileUpload/multiUpload'
 import { getUserData } from '@/utils/auth'
@@ -47,7 +46,7 @@ export default {
       title: '',
       listLoading: false,
       conditions: {},
-      actionId: 0,
+      actionDefId: 0,
       actionVisible: false,
       remarkVisible: true,
       handlerVisible: true,
@@ -58,7 +57,8 @@ export default {
         activityDefId: undefined,
         activityInsId: undefined,
         activityCode: '',
-        actionId: 0,
+        actionDefId: 0,
+        actionInsId: undefined,
         actionCode: '',
         actionRemark: '', // 说明
         groupIdTo: undefined,
@@ -77,19 +77,22 @@ export default {
           { required: true, message: '请选择执行人', trigger: 'change' }
         ]
       },
+
       flowData: {
         wfDefId: this.wfDefId,
         wfInsId: this.wfInsId,
         wfInsTitle: '',
-        wfStatus: undefined,
-        curActivityIns: {
-          actionList: [],
-          activityInsId: undefined,
-          activityInsTitle: '',
-          activityDefId: undefined,
-          activityCode: ''
-        },
-        activityInsRecordList: []
+
+        activityInsId: undefined,
+        activityDefId: undefined,
+        activityCode: undefined,
+        activityInsTitle: '',
+        formCode: '',
+        actionInsId: undefined,
+        actionDefInd: undefined,
+        actionTitle: undefined,
+        actionCode: undefined,
+        actionDefList: []
       }
     }
   },
@@ -99,7 +102,7 @@ export default {
     ])
   },
   watch: {
-    actionId(val) {
+    actionDefId(val) {
       if (val > 0) {
         this.getActionCode(val)
       }
@@ -114,30 +117,32 @@ export default {
       this.flowData = data
       this.formData.wfDefId = data.wfDefId
       this.formData.wfInsId = data.wfInsId
-      this.formData.activityDefId = data.curActivityIns.activityDefId
-      this.formData.activityInsId = data.curActivityIns.activityInsId
-      this.formData.activityCode = data.curActivityIns.activityCode
+      this.formData.activityDefId = data.activityDefId
+      this.formData.activityInsId = data.activityInsId
+      this.formData.activityCode = data.activityCode
+      this.formData.actionInsId = data.actionInsId
       this.renderAction()
       return data.wfInsId
     },
 
     // 渲染功能操作按钮
     renderAction() {
-      if (this.flowData && this.flowData.curActivityIns && this.flowData.curActivityIns.actionList) {
-        const arr = this.flowData.curActivityIns.actionList
+      if (this.flowData.actionDefList) {
+        const arr = this.flowData.actionDefList
         if (arr.length > 1) {
           this.actionVisible = true
           const item = arr[0]
-          this.formData.actionId = item.actionId
+          this.formData.actionDefId = item.actionDefId
           this.formData.actionCode = item.actionCode
-          this.actionId = item.actionId
+          this.formData.actionDefId = item.actionDefId
         } else if (arr.length === 1) {
           const item = arr[0]
-          this.formData.actionId = item.actionId
+          this.actionVisible = false
+          this.formData.actionDefId = item.actionDefId
           this.formData.actionCode = item.actionCode
-          this.actionId = item.actionId
+          this.formData.actionDefId = item.actionDefId
         } else {
-          this.$message.error('数据配置有误！请联系管理员')
+          this.$message.error('数据配置有误！请联系管理员!')
         }
       }
     },
@@ -145,28 +150,83 @@ export default {
     // 获取流程
     get(wfInsId) {
       this.resetFormData()
-      getWorkflowById(wfInsId).then((resp) => {
+      return new Promise((resolve, reject) => {
+        getWorkflowById(wfInsId).then((resp) => {
+          const { data } = resp
+          this.flowData = data
+          this.formData.wfDefId = data.wfDefId
+          this.formData.wfInsId = data.wfInsId
+          this.formData.activityDefId = data.activityDefId
+          this.formData.activityInsId = data.activityInsId
+          this.formData.activityCode = data.activityCode
+          this.formData.actionInsId = data.actionInsId
+          this.renderAction()
+          resolve(this.formData.activityCode)
+          return this.formData.activityCode
+        }).catch((error) => {
+          reject(error)
+          console.log(error)
+        })
+      })
+    },
+
+    // 获取流程
+    get2(wfInsId, activityInsId) {
+      this.resetFormData()
+      getWorkflowById2(wfInsId, activityInsId).then((resp) => {
         const { data } = resp
         this.flowData = data
         this.formData.wfDefId = data.wfDefId
         this.formData.wfInsId = data.wfInsId
-        this.formData.activityDefId = data.curActivityIns.activityDefId
-        this.formData.activityInsId = data.curActivityIns.activityInsId
-        this.formData.activityCode = data.curActivityIns.activityCode
+        this.formData.activityDefId = data.activityDefId
+        this.formData.activityInsId = data.activityInsId
+        this.formData.activityCode = data.activityCode
+        this.formData.actionInsId = data.actionInsId
         this.renderAction()
       }).catch((error) => {
         console.log(error)
       })
     },
 
-    getActionCode(actionId) {
+    // 获取流程
+    get3(wfInsId, activityInsId, actionInsId) {
+      this.resetFormData()
+      getWorkflowById3(wfInsId, activityInsId, actionInsId).then((resp) => {
+        const { data } = resp
+        this.flowData = data
+        this.formData.wfDefId = data.wfDefId
+        this.formData.wfInsId = data.wfInsId
+        this.formData.activityDefId = data.activityDefId
+        this.formData.activityInsId = data.activityInsId
+        this.formData.activityCode = data.activityCode
+        this.formData.actionInsId = data.actionInsId
+        this.renderAction()
+      }).catch((error) => {
+        console.log(error)
+      })
+    },
+
+    changeAction(data) {
+      this.formData.actionDefId = data.actionDefId
+      this.formData.actionCode = data.actionCode
+      this.formData.actionTitle = data.actionTitle
+      this.getActionCode(data.actionDefId)
+    },
+
+    getActionCode(actionDefId) {
+      console.log(actionDefId)
+
       let remarkVisible = true
       let handlerVisible = true
       let attachVisible = true
-      const actionList = this.flowData.curActivityIns.actionList
-      const pass = actionList && Array.isArray(actionList) && this.flowData && this.flowData.curActivityIns
+      const actionDefList = this.flowData.actionDefList
+      console.log(actionDefList)
+      const pass = actionDefList && Array.isArray(actionDefList) && this.flowData
       if (!pass) return
-      const actionCode = actionList.filter(item => item.actionId === actionId)[0].actionCode
+      const actionCode = actionDefList.filter(item => item.actionDefId === actionDefId)[0].actionCode
+      console.log(actionCode)
+      console.log('-----')
+
       if (actionCode === 'complete') {
         remarkVisible = true
         handlerVisible = false
@@ -183,13 +243,11 @@ export default {
       this.remarkVisible = remarkVisible
       this.handlerVisible = handlerVisible
       this.attachVisible = attachVisible
-      this.formData.actionId = actionId
-      this.formData.actionCode = actionCode
     },
 
     // handleIns  自定义校验灵活度高
     verify() {
-      let bRet = false
+      let bRet = true
       // 需要校验备注
       if (this.remarkVisible) {
         bRet = this.isNotNull(this.formData.actionRemark)
@@ -215,18 +273,18 @@ export default {
 
     // 处理流程
     async handle(param2) {
-      await this.verifyForm()
       const param1 = JSON.parse(JSON.stringify(this.formData))
       const params = { ...param1, ...param2 }
       const { data } = await handleWorkflow(params)
-      const flowData = {
-        activityCode: this.formData.activityCode,
-        actionId: this.formData.actionId,
+      console.log('.........................')
+      console.log(data)
+      console.log('.........................')
+      const formData = {
         actionCode: this.formData.actionCode,
         actionRemark: this.formData.actionRemark,
         attachList: JSON.parse(JSON.stringify(this.formData.attachList))
       }
-      return { ...data, data: flowData }
+      return { ...data, data: formData }
     },
 
     // 用户选择

src/components/index.js

@@ -2,7 +2,7 @@
  * 暴露组件
  */
 export { default as WorkFlow } from './WorkFlow/index' // 单位选择
-export { default as ActivityHandleRecord } from './WorkFlow/ActivityHandleRecord'
+export { default as ActivityHandleRecord } from './WorkFlow/WorkflowRecord.vue'
 export { default as OcSelector } from './OcSelector/index' // 单位选择
 export { default as GroupSelector } from './GroupSelector/index' // 单位选择
 export { default as GroupCatSelector } from './GroupCatSelector/index' // 单位选择
@@ -39,5 +39,11 @@ export { default as IndexScoreImagePanel } from './IndexScoreImagePanel/index' /
 export { default as IndexScoreDetail } from './IndexScoreImagePanel/IndexScoreDetail' // 指标详情
 export { default as IndexScoreTablePanel } from './IndexScoreTablePanel/index' // 指标评分表格面板
 export { default as QrCode } from './QrCode/index'
+
+export { default as GridCatSelector } from './GridCatSelector/index' // 网格区域分类选择
+
 export { default as MapLayerConfig } from './MapLayerConfig/index' // 地图图层设定
+export { default as MiniProgramTargetConfig } from '@/components/MiniProgramTargetConfig/index' // 单位选择
+export { default as MiniCatSelector } from './MiniProgramCatSelector/index' // 单位选择
+export { default as OcChecklistSelector } from '@/components/OcChecklistSelector/index' // 单位类型选择
 

src/layout/index.vue

@@ -56,11 +56,13 @@ export default {
     handleClickOutside() {
       this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
     },
+
     initMessage() {
       this.$nextTick(() => {
         this.$refs['main-container'].showMessage()
       })
     },
+
     getMenuLen() {
       const routes = this.permission_routes.filter(item => !item.hidden)
       if (routes.length > 1) {

src/settings.js

@@ -40,8 +40,8 @@ module.exports = {
   // serverUrl: 'http://1.15.92.205:8080/', // 正式环境
   serverUrl: 'http://114.116.19.14:8080/', // 正式环境
   // devServerUrl: 'http://1.15.92.205:8080/', // 开发环境
-  devServerUrl: 'http://192.168.3.253:8001/', // 开发环境
-  // devServerUrl: 'http://127.0.0.1:8001/', // 开发环境
+  // devServerUrl: 'http://192.168.3.253:8001/', // 开发环境
+  devServerUrl: 'http://127.0.0.1:8001/', // 开发环境
   /**
   * websocket 地址
   * dev 开发环境

src/views/hos/doctor/index.vue

@@ -67,8 +67,8 @@
         <el-table-column label="小程序" align="center" header-align="center" width="120">
           <template v-slot="{row}">
             <el-link>
-              <span v-if="row.appNum> 0" @click="handleApp(row)"><i class="el-icon-apple" /></span>
-              <span v-else @click="handleApp(row)">绑定</span>
+              <span v-if="row.miniNum> 0" @click="handleMini(row)"><i class="el-icon-apple" /></span>
+              <span v-else @click="handleMini(row)">绑定</span>
             </el-link>
           </template>
         </el-table-column>
@@ -89,7 +89,7 @@
     <Doctor ref="EditDoctor" title="编辑" @formSuccess="getData" />
     <qrcode ref="qrcode" />
     <div id="qrcode" ref="qrcodeModal" style="position:fixed;top:-9999px;" />
-    <AppTargetConfig ref="AppTargetConfig" :target-type="targetType" />
+    <MiniProgramTargetConfig ref="MiniTargetConfig" :target-type="targetType" @formSuccess="getData" />
   </div>
 </template>
 
@@ -102,8 +102,9 @@ import saveAs from 'file-saver'
 import Doctor from './components/Doctor'
 import Pagination from '@/components/Pagination'
 import qrcodeComponents from '@/views/hos/components/qrcode.vue'
+import MiniProgramTargetConfig from '@/components/MiniProgramTargetConfig/index.vue'
 import { getDoctorByPage, deleteDoctorById } from '@/api/hos/doctorApi'
-import AppTargetConfig from '@/components/AppTargetConfig'
+
 import { getSettingById } from '@/api/system/settingApi'
 import { getUserData } from '@/utils/auth'
 
@@ -113,7 +114,7 @@ export default {
   components: {
     Pagination,
     Doctor,
-    AppTargetConfig,
+    MiniProgramTargetConfig,
     qrcode: qrcodeComponents
   },
   filters: {
@@ -288,10 +289,10 @@ export default {
       })
     },
 
-    // 显示清单绑定配置
-    handleApp(data) {
-      const { doctorId } = data
-      this.$refs['AppTargetConfig'].showModel(doctorId)
+    // 显示App绑定配置
+    handleMini(data) {
+      const { gridId } = data
+      this.$refs['MiniTargetConfig'].showModel(gridId)
     }
   }
 }

src/views/system/grid/index.vue

@@ -55,8 +55,8 @@
         <el-table-column label="小程序" align="center" header-align="center" width="70">
           <template v-slot="{row}">
             <el-link>
-              <span v-if="row.appNum> 0" @click="handleApp(row)"> <i class="el-icon-apple" /> </span>
-              <span v-else @click="handleApp(row)">绑定 </span>
+              <span v-if="row.miniNum> 0" @click="handleMini(row)"> <i class="el-icon-apple" /> </span>
+              <span v-else @click="handleMini(row)">绑定 </span>
             </el-link>
           </template>
         </el-table-column>
@@ -83,7 +83,7 @@
     <grid ref="EditGrid" title="编辑" @formSuccess="getData" />
     <QrCode ref="qrcode" />
     <div id="qrcode" ref="qrcodeModal" style="position:fixed;top:-9999px;" />
-    <AppTargetConfig ref="AppTargetConfig" :target-type="targetType" @formSuccess="getData" />
+    <MiniProgramTargetConfig ref="MiniTargetConfig" :target-type="targetType" @formSuccess="getData" />
     <MapLayer ref="MapLayer" />
   </div>
 </template>
@@ -95,10 +95,9 @@ import JSZip from 'jszip'
 import saveAs from 'file-saver'
 
 import Grid from './components/Grid'
-import { QrCode } from '@/components'
+import { MiniProgramTargetConfig, QrCode } from '@/components'
 import MapLayer from './components/MapLayer'
 import Pagination from '@/components/Pagination'
-import AppTargetConfig from '@/components/AppTargetConfig'
 import { getGridByPage, deleteGridById } from '@/api/system/gridApi'
 import { getSettingById } from '@/api/system/settingApi'
 import { getUserData } from '@/utils/auth'
@@ -108,7 +107,7 @@ export default {
   name: 'GridIndex',
   components: {
     Pagination,
-    AppTargetConfig,
+    MiniProgramTargetConfig,
     Grid,
     MapLayer,
     QrCode
@@ -126,7 +125,7 @@ export default {
       total: 0,
       targetType: 1,
       conditions: {
-        page: 1,
+        page: 2,
         limit: 10,
         keywords: ''
       },
@@ -266,10 +265,10 @@ export default {
       })
     },
 
-    // 显示清单绑定配置
-    handleApp(data) {
+    // 显示小程序绑定配置
+    handleMini(data) {
       const { gridId } = data
-      this.$refs['AppTargetConfig'].showModel(gridId)
+      this.$refs['MiniTargetConfig'].showModel(gridId)
     },
 
     // 设定地图位置

src/views/system/task/components/TaskList.vue

@@ -69,7 +69,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" header-align="center" align="center" width="200">
+        <el-table-column label="操作" header-align="center" align="center" width="220">
           <template v-slot="{row}">
             <el-button type="primary" size="mini" @click="handleDetail(row)">详情</el-button>
 

src/views/system/todo/components/Details.vue

@@ -97,7 +97,7 @@
 import Vuescroll from 'vuescroll'
 import { getTodoTaskById } from '@/api/system/todoApi'
 import { taskPriority } from '@/utils'
-import ActivityHandleRecord from '@/components/WorkFlow/ActivityHandleRecord'
+import ActivityHandleRecord from '@/components/WorkFlow/WorkflowRecord.vue'
 export default {
   name: 'ToDoDetails',
   components: { Vuescroll, ActivityHandleRecord },