up

src/api/system/accountPermitApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 获取帐号权限视图
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getAccountPermitViewByList(data) {
   return request({
@@ -17,7 +17,7 @@ export function getAccountPermitViewByList(data) {
  * 添加帐号权限
  * @param accountId
  * @param permitId
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createAccountPermit(accountId, permitId) {
   return request({
@@ -30,7 +30,7 @@ export function createAccountPermit(accountId, permitId) {
  * 删除帐号权限
  * @param accountId
  * @param permitId
- * @returns {AxiosPromise}
+ * @returns
  */
 export function deleteAccountPermitById(accountId, permitId) {
   return request({

src/api/system/appApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 获取App分页
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getAppByPage(data) {
   return request({
@@ -16,7 +16,7 @@ export function getAppByPage(data) {
 /**
  * 获取App列表
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getAppByList(data) {
   return request({
@@ -28,8 +28,8 @@ export function getAppByList(data) {
 
 /**
  * 根据Id获取App
- * @param data
- * @returns {AxiosPromise}
+ * @param appId
+ * @returns
  */
 export function getAppById(appId) {
   return request({
@@ -41,7 +41,7 @@ export function getAppById(appId) {
 /**
  * 添加App
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createApp(data) {
   return request({
@@ -57,7 +57,7 @@ export function createApp(data) {
 /**
  * 更新App
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateApp(data) {
   return request({
@@ -72,8 +72,9 @@ export function updateApp(data) {
 
 /**
  * 更新App
- * @param data
- * @returns {AxiosPromise}
+ * @param appId
+ * @param status
+ * @returns
  */
 export function updateAppStatus(appId, status) {
   return request({
@@ -83,9 +84,22 @@ export function updateAppStatus(appId, status) {
 }
 
 /**
+ * 更新App应用中心发布状态
+ * @param appId
+ * @param ifStore
+ * @returns
+ */
+export function updateAppStoreStatus(appId, ifStore) {
+  return request({
+    url: `/app/updateStoreStatus/${appId}/${ifStore}`,
+    method: 'PUT'
+  })
+}
+
+/**
  * 删除App
- * @param data
- * @returns {AxiosPromise}
+ * @param appId
+ * @returns
  */
 export function deleteAppById(appId) {
   return request({

src/api/system/appCatApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 获取App Catogery分页
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getAppCatByPage(data) {
   return request({
@@ -16,7 +16,7 @@ export function getAppCatByPage(data) {
 /**
  * 获取App Catogery列表
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getAppCatByList(data) {
   return request({
@@ -28,12 +28,12 @@ export function getAppCatByList(data) {
 
 /**
  * 根据Id获取App Catogery
- * @param data
- * @returns {AxiosPromise}
+ * @param appCatId
+ * @returns
  */
-export function getAppCatById(id) {
+export function getAppCatById(appCatId) {
   return request({
-    url: `/app/cat/${id}`,
+    url: `/app/cat/${appCatId}`,
     method: 'GET'
   })
 }
@@ -41,7 +41,7 @@ export function getAppCatById(id) {
 /**
  * 添加App Catogery
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createAppCat(data) {
   return request({
@@ -54,7 +54,7 @@ export function createAppCat(data) {
 /**
  * 更新App Catogery
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateAppCat(data) {
   return request({
@@ -66,12 +66,12 @@ export function updateAppCat(data) {
 
 /**
  * 删除App Category
- * @param data
- * @returns {AxiosPromise}
+ * @param appCatId
+ * @returns
  */
-export function deleteAppCatById(id) {
+export function deleteAppCatById(appCatId) {
   return request({
-    url: `/app/cat/${id}`,
+    url: `/app/cat/${appCatId}`,
     method: 'DELETE'
   })
 }

src/api/system/appRolePermitApi.js

@@ -0,0 +1,69 @@
+import request from '@/utils/request'
+
+/**
+ * 获取角色菜单
+ * @returns
+ * @param appId
+ * @param roleId
+ */
+export function getAppRolePermitByList(appId, roleId) {
+  return request({
+    url: '/app/role/permit/' + `${appId}/${roleId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 获取角色菜单
+ * @returns
+ * @param appId
+ * @param roleId
+ * @param permitId
+ */
+export function getAppRolePermitById(appId, roleId, permitId) {
+  return request({
+    url: '/app/role/permit/' + `${appId}/${roleId}/${permitId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 添加角色权限
+ * @param data
+ * @returns
+ */
+export function createAppRolePermit(data) {
+  return request({
+    url: '/app/role/permit/' + `add`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 更新角色权限
+ * @param data
+ * @returns
+ */
+export function updateAppRolePermit(data) {
+  return request({
+    url: '/app/role/permit/update',
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * 删除角色权限
+ * @returns
+ * @param appId
+ * @param roleId
+ * @param permitId
+ */
+export function deleteAppRolePermitById(appId, roleId, permitId) {
+  return request({
+    url: '/app/role/permit/' + `${appId}/${roleId}/${permitId}`,
+    method: 'DELETE'
+  })
+}
+

src/api/system/appTargetApi.js

@@ -0,0 +1,50 @@
+import request from '@/utils/request'
+
+/**
+ * 获取列表
+ * @param data
+ */
+export function getAppTargetByList(data) {
+  return request({
+    url: '/app/target',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 获取列表
+ * @param data
+ */
+export function getAppSelectByList(data) {
+  return request({
+    url: '/app/target/select',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 添加
+ * @param data
+ */
+export function createAppTarget(data) {
+  return request({
+    url: `/app/target/add`,
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 删除
+ * @param targetId
+ * @param appId
+ */
+export function deleteAppTargetById(appId, targetId) {
+  return request({
+    url: `/app/target/${appId}/${targetId}`,
+    method: 'DELETE'
+  })
+}
+

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/checklistCatApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 获取分页
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getChecklistCatByPage(data) {
   return request({
@@ -16,7 +16,7 @@ export function getChecklistCatByPage(data) {
 /**
  * 获取列表
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getChecklistCatByList(data) {
   return request({
@@ -28,12 +28,12 @@ export function getChecklistCatByList(data) {
 
 /**
  * 根据Id获取
- * @param data
- * @returns {AxiosPromise}
+ * @param checklistCatId
+ * @returns
  */
-export function getChecklistCatById(id) {
+export function getChecklistCatById(checklistCatId) {
   return request({
-    url: `/checklist/cat/${id}`,
+    url: `/checklist/cat/${checklistCatId}`,
     method: 'GET'
   })
 }
@@ -41,7 +41,7 @@ export function getChecklistCatById(id) {
 /**
  * 添加
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createChecklistCat(data) {
   return request({
@@ -54,7 +54,7 @@ export function createChecklistCat(data) {
 /**
  * 更新
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateChecklistCat(data) {
   return request({
@@ -66,12 +66,12 @@ export function updateChecklistCat(data) {
 
 /**
  * 删除
- * @param data
- * @returns {AxiosPromise}
+ * @param checklistCatId
+ * @returns
  */
-export function deleteChecklistCatById(id) {
+export function deleteChecklistCatById(checklistCatId) {
   return request({
-    url: `/checklist/cat/${id}`,
+    url: `/checklist/cat/${checklistCatId}`,
     method: 'DELETE'
   })
 }

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/clientApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 获取Client分页
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getClientByPage(data) {
   return request({
@@ -16,7 +16,7 @@ export function getClientByPage(data) {
 /**
  * 获取Client列表
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getClientByList(data) {
   return request({
@@ -29,7 +29,7 @@ export function getClientByList(data) {
 /**
  * 根据Id获取Client
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getClientById(id) {
   return request({
@@ -41,7 +41,7 @@ export function getClientById(id) {
 /**
  * 添加Client
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createClient(data) {
   return request({
@@ -54,7 +54,7 @@ export function createClient(data) {
 /**
  * 更新Client
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateClient(data) {
   return request({
@@ -67,7 +67,7 @@ export function updateClient(data) {
 /**
  * 更新Client状态
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateClientStatus(clientId, status) {
   return request({
@@ -79,7 +79,7 @@ export function updateClientStatus(clientId, status) {
 /**
  * 删除Client
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function deleteClientById(id) {
   return request({

src/api/system/companyApi.js

@@ -2,8 +2,7 @@ import request from '@/utils/request'
 
 /**
  * 获取公司信息
- * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getCompanyProfile() {
   return request({
@@ -15,7 +14,7 @@ export function getCompanyProfile() {
 /**
  * 更新公司信息
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateCompanyProfile(data) {
   return request({

src/api/system/docApi.js

@@ -3,19 +3,20 @@ import request from '@/utils/request'
 /**
  * 文件分类列表
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
-export function getDirByList() {
+export function getDirByList(data) {
   return request({
-    url: '/doc/dir/',
-    method: 'GET'
+    url: '/doc/dir',
+    method: 'GET',
+    params: data
   })
 }
 
 /**
  * 文件分类详情
- * @param data
- * @returns {AxiosPromise}
+ * @param dirId
+ * @returns
  */
 export function getDir(dirId) {
   return request({
@@ -27,7 +28,7 @@ export function getDir(dirId) {
 /**
  * 文件分类详情
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createDir(data) {
   return request({
@@ -40,7 +41,7 @@ export function createDir(data) {
 /**
  * 文件分类详情
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateDir(data) {
   return request({
@@ -52,8 +53,8 @@ export function updateDir(data) {
 
 /**
  * 文件分类详情
- * @param data
- * @returns {AxiosPromise}
+ * @param dirId
+ * @returns
  */
 export function deleteDir(dirId) {
   return request({
@@ -64,8 +65,9 @@ export function deleteDir(dirId) {
 
 /**
  * 移动分类
- * @param data
- * @returns {AxiosPromise}
+ * @param dirId
+ * @param type
+ * @returns
  */
 export function moveDir(dirId, type) {
   return request({
@@ -78,7 +80,7 @@ export function moveDir(dirId, type) {
 /**
  * 文件列表
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getFileByPage(data) {
   return request({
@@ -90,8 +92,8 @@ export function getFileByPage(data) {
 
 /**
  * 文件详情
- * @param data
- * @returns {AxiosPromise}
+ * @param fileId
+ * @returns
  */
 export function getFile(fileId) {
   return request({
@@ -103,7 +105,7 @@ export function getFile(fileId) {
 /**
  * 文件详情
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createFile(data) {
   return request({
@@ -116,7 +118,7 @@ export function createFile(data) {
 /**
  * 文件详情
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateFile(data) {
   return request({
@@ -128,8 +130,8 @@ export function updateFile(data) {
 
 /**
  * 文件详情
- * @param data
- * @returns {AxiosPromise}
+ * @param fileId
+ * @returns
  */
 export function deleteFile(fileId) {
   return request({

src/api/system/entApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 获取列表
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getEntByPage(data) {
   return request({
@@ -14,59 +14,9 @@ export function getEntByPage(data) {
 }
 
 /**
- * 获取管理员
- * @param ocId
- * @returns {AxiosPromise}
- */
-export function getEntAdmin(ocId) {
-  return request({
-    url: `/ent/getAdmin/${ocId}`,
-    method: 'GET'
-  })
-}
-
-/**
- * 新增管理员
- * @param data
- * @returns {AxiosPromise}
- */
-export function createEntAdmin(data) {
-  return request({
-    url: '/ent/addAdmin',
-    method: 'POST',
-    data
-  })
-}
-
-/**
- * 更新管理员
- * @param data
- * @returns {AxiosPromise}
- */
-export function updateEntAdmin(data) {
-  return request({
-    url: '/ent/updateAdmin',
-    method: 'PUT',
-    data
-  })
-}
-
-/**
- * 重置管理员密码
- * @param data
- * @returns {AxiosPromise}
- */
-export function resetAdminPwd(ocId, adminId) {
-  return request({
-    url: `/ent/resetAdminPwd/${ocId}/${adminId}`,
-    method: 'PUT'
-  })
-}
-
-/**
  * 根据ID获取企业信息
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param ocId
  */
 export function getEntById(ocId) {
   return request({
@@ -78,7 +28,7 @@ export function getEntById(ocId) {
 /**
  * 添加企业
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createEnt(data) {
   return request({
@@ -91,7 +41,7 @@ export function createEnt(data) {
 /**
  * 更新企业
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateEnt(data) {
   return request({
@@ -103,8 +53,8 @@ export function updateEnt(data) {
 
 /**
  * 删除企业
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param ocId
  */
 export function deleteEntById(ocId) {
   return request({
@@ -112,15 +62,3 @@ export function deleteEntById(ocId) {
     method: 'DELETE'
   })
 }
-
-/**
- * 更新企业状态
- * @param data
- * @returns {AxiosPromise}
- */
-export function updateEntStatus(ocId, status) {
-  return request({
-    url: `/ent/updateStatus/${ocId}/${status}`,
-    method: 'PUT'
-  })
-}

src/api/system/entCatApi.js

@@ -1,78 +0,0 @@
-import request from '@/utils/request'
-
-/**
- * 获取Ent Catogery分页
- * @param data
- * @returns {AxiosPromise}
- */
-export function getEntCatByPage(data) {
-  return request({
-    url: '/ent/cat/page',
-    method: 'GET',
-    params: data
-  })
-}
-
-/**
- * 获取Ent Catogery列表
- * @param data
- * @returns {AxiosPromise}
- */
-export function getEntCatByList(data) {
-  return request({
-    url: '/ent/cat',
-    method: 'GET',
-    params: data
-  })
-}
-
-/**
- * 根据Id获取Ent Catogery
- * @param data
- * @returns {AxiosPromise}
- */
-export function getEntCatById(id) {
-  return request({
-    url: `/ent/cat/${id}`,
-    method: 'GET'
-  })
-}
-
-/**
- * 添加Ent Catogery
- * @param data
- * @returns {AxiosPromise}
- */
-export function createEntCat(data) {
-  return request({
-    url: `/ent/cat/add`,
-    method: 'post',
-    data
-  })
-}
-
-/**
- * 更新Ent Catogery
- * @param data
- * @returns {AxiosPromise}
- */
-export function updateEntCat(data) {
-  return request({
-    url: `/ent/cat/update`,
-    method: 'PUT',
-    data
-  })
-}
-
-/**
- * 删除Ent Type
- * @param data
- * @returns {AxiosPromise}
- */
-export function deleteEntCat(id) {
-  return request({
-    url: `/ent/cat/${id}`,
-    method: 'DELETE'
-  })
-}
-

src/api/system/grantGroupApi.js

@@ -2,8 +2,8 @@ import request from '@/utils/request'
 
 /**
  * 根据ID获取
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param gmpgId
  */
 export function getGrantGroupById(gmpgId) {
   return request({
@@ -15,7 +15,7 @@ export function getGrantGroupById(gmpgId) {
 /**
  * 添加部门类别
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createGrantGroup(data) {
   return request({
@@ -28,7 +28,7 @@ export function createGrantGroup(data) {
 /**
  * 添加部门类别
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateGrantGroup(data) {
   return request({
@@ -40,8 +40,8 @@ export function updateGrantGroup(data) {
 
 /**
  * 删除部门类别
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param gmpgId
  */
 export function deleteGrantGroup(gmpgId) {
   return request({

src/api/system/gridApi.js

@@ -3,11 +3,11 @@ import request from '@/utils/request'
 /**
  * 分页查询
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getGridByPage(data) {
   return request({
-    url: '/ent/grid/page',
+    url: '/grid/page',
     method: 'GET',
     params: data
   })
@@ -16,11 +16,11 @@ export function getGridByPage(data) {
 /**
  * 列表查询
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getGridByList(data) {
   return request({
-    url: '/ent/grid',
+    url: '/grid',
     method: 'GET',
     params: data
   })
@@ -28,12 +28,12 @@ export function getGridByList(data) {
 
 /**
  * 基于ID查询
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param gridId
  */
-export function getGridById(id) {
+export function getGridById(gridId) {
   return request({
-    url: `/ent/grid/${id}`,
+    url: `/grid/${gridId}`,
     method: 'GET'
   })
 }
@@ -41,11 +41,11 @@ export function getGridById(id) {
 /**
  * 新增
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createGrid(data) {
   return request({
-    url: `/ent/grid/add`,
+    url: `/grid/add`,
     method: 'POST',
     data
   })
@@ -54,11 +54,11 @@ export function createGrid(data) {
 /**
  * 更新
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateGrid(data) {
   return request({
-    url: `/ent/grid/update`,
+    url: `/grid/update`,
     method: 'PUT',
     data
   })
@@ -66,12 +66,12 @@ export function updateGrid(data) {
 
 /**
  * 删除
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param gridId
  */
-export function deleteGridById(id) {
+export function deleteGridById(gridId) {
   return request({
-    url: `/ent/grid/${id}`,
+    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/groupApi.js

@@ -2,8 +2,7 @@ import request from '@/utils/request'
 
 /**
  * 获取部门列表
- * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getGroupByList() {
   return request({
@@ -14,8 +13,8 @@ export function getGroupByList() {
 
 /**
  * 根据ID获取
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param groupId
  */
 export function getGroupById(groupId) {
   return request({
@@ -27,7 +26,7 @@ export function getGroupById(groupId) {
 /**
  * 添加部门
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createGroup(data) {
   return request({
@@ -40,7 +39,7 @@ export function createGroup(data) {
 /**
  * 更新部门
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateGroup(data) {
   return request({
@@ -52,8 +51,8 @@ export function updateGroup(data) {
 
 /**
  * 删除部门
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param groupId
  */
 export function deleteGroupById(groupId) {
   return request({
@@ -64,8 +63,7 @@ export function deleteGroupById(groupId) {
 
 /**
  * 获取部门列表
- * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getGroupView() {
   return request({

src/api/system/groupCatApi.js

@@ -3,19 +3,20 @@ import request from '@/utils/request'
 /**
  * 列表查询
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
-export function getGroupCatByList() {
+export function getGroupCatByList(data) {
   return request({
     url: '/group/cat',
-    method: 'GET'
+    method: 'GET',
+    params: data
   })
 }
 
 /**
  * 分页查询
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getGroupCatByPage(data) {
   return request({
@@ -27,8 +28,8 @@ export function getGroupCatByPage(data) {
 
 /**
  * 基于ID查询
- * @param data
- * @returns {AxiosPromise}
+ * @param id
+ * @returns
  */
 export function getGroupCatById(id) {
   return request({
@@ -40,7 +41,7 @@ export function getGroupCatById(id) {
 /**
  * 添加
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createGroupCat(data) {
   return request({
@@ -53,7 +54,7 @@ export function createGroupCat(data) {
 /**
  * 更新
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateGroupCat(data) {
   return request({
@@ -65,8 +66,8 @@ export function updateGroupCat(data) {
 
 /**
  * 删除
- * @param data
- * @returns {AxiosPromise}
+ * @param groupCatId
+ * @returns
  */
 export function deleteGroupCatById(groupCatId) {
   return request({

src/api/system/industryApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 分页查询
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getIndustryByPage(data) {
   return request({
@@ -16,7 +16,7 @@ export function getIndustryByPage(data) {
 /**
  * 列表查询
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getIndustryByList(data) {
   return request({
@@ -28,12 +28,12 @@ export function getIndustryByList(data) {
 
 /**
  * 基于ID查询
- * @param data
- * @returns {AxiosPromise}
+ * @param industryId
+ * @returns
  */
-export function getIndustryById(id) {
+export function getIndustryById(industryId) {
   return request({
-    url: `/industry/${id}`,
+    url: `/industry/${industryId}`,
     method: 'GET'
   })
 }
@@ -41,7 +41,7 @@ export function getIndustryById(id) {
 /**
  * 新增
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createIndustry(data) {
   return request({
@@ -54,7 +54,7 @@ export function createIndustry(data) {
 /**
  * 更新
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateIndustry(data) {
   return request({
@@ -66,20 +66,19 @@ export function updateIndustry(data) {
 
 /**
  * 删除
- * @param data
- * @returns {AxiosPromise}
+ * @param industryId
+ * @returns
  */
-export function deleteIndustryById(id) {
+export function deleteIndustryById(industryId) {
   return request({
-    url: `/industry/${id}`,
+    url: `/industry/${industryId}`,
     method: 'DELETE'
   })
 }
 
 /**
  * 行业选择视图
- * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getIndustryView() {
   return request({

src/api/system/jobApi.js

@@ -3,7 +3,6 @@ import request from '@/utils/request'
 /**
  * 获取Job分页
  * @param data
- * @returns {AxiosPromise}
  */
 export function getJobByPage(data) {
   return request({
@@ -16,7 +15,6 @@ export function getJobByPage(data) {
 /**
  * 获取Job列表
  * @param data
- * @returns {AxiosPromise}
  */
 export function getJobByList(data) {
   return request({
@@ -27,9 +25,20 @@ export function getJobByList(data) {
 }
 
 /**
- * 根据Id获取Job
+ * 获取Job列表
  * @param data
- * @returns {AxiosPromise}
+ */
+export function getActiveJobByList(data) {
+  return request({
+    url: '/job/active',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 根据Id获取Job
+ * @param jobId
  */
 export function getJobById(jobId) {
   return request({
@@ -41,7 +50,6 @@ export function getJobById(jobId) {
 /**
  * 添加Job
  * @param data
- * @returns {AxiosPromise}
  */
 export function createJob(data) {
   return request({
@@ -54,7 +62,6 @@ export function createJob(data) {
 /**
  * 更新Job
  * @param data
- * @returns {AxiosPromise}
  */
 export function updateJob(data) {
   return request({
@@ -65,21 +72,30 @@ export function updateJob(data) {
 }
 
 /**
- * 更新Job
- * @param data
- * @returns {AxiosPromise}
+ * 启动Job
+ * @param jobId
+ */
+export function startJob(jobId) {
+  return request({
+    url: `/job/start/${jobId}`,
+    method: 'PUT'
+  })
+}
+
+/**
+ * 停止Job
+ * @param jobId
  */
-export function updateJobStatus(jobId, status) {
+export function stopJob(jobId) {
   return request({
-    url: `/job/updateStatus/${jobId}/${status}`,
+    url: `/job/stop/${jobId}`,
     method: 'PUT'
   })
 }
 
 /**
  * 删除Job
- * @param data
- * @returns {AxiosPromise}
+ * @param jobId
  */
 export function deleteJobById(jobId) {
   return request({

src/api/system/jobClassApi.js

@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+/**
+ * 获取Job Class列表
+ * @param data
+ */
+export function getJobClassByList(data) {
+  return request({
+    url: '/job/class',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 根据Id获取Job Class
+ * @param jobClassId
+ */
+export function getJobClassById(jobClassId) {
+  return request({
+    url: `/job/class/${jobClassId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 添加Job Class
+ * @param data
+ */
+export function createJobClass(data) {
+  return request({
+    url: `/job/class/add`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 更新Job Class
+ * @param data
+ */
+export function updateJobClass(data) {
+  return request({
+    url: `/job/class/update`,
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * 删除Job Class
+ * @param jobClassId
+ */
+export function deleteJobClassById(jobClassId) {
+  return request({
+    url: `/job/class/${jobClassId}`,
+    method: 'DELETE'
+  })
+}
+

src/api/system/jobScheduleApi.js

@@ -1,65 +0,0 @@
-import request from '@/utils/request'
-
-/**
- * 获取Job分页
- * @param data
- * @returns {AxiosPromise}
- */
-export function getJobScheduleByPage(data) {
-  return request({
-    url: '/job/schedule/page',
-    method: 'GET',
-    params: data
-  })
-}
-
-/**
- * 根据Id获取Job Schedule
- * @param data
- * @returns {AxiosPromise}
- */
-export function getJobScheduleById(scheduleId) {
-  return request({
-    url: `/job/schedule/${scheduleId}`,
-    method: 'GET'
-  })
-}
-
-/**
- * 添加Job Schedule
- * @param data
- * @returns {AxiosPromise}
- */
-export function createJobSchedule(data) {
-  return request({
-    url: `/job/schedule/add`,
-    method: 'post',
-    data
-  })
-}
-
-/**
- * 更新Job Schedule
- * @param data
- * @returns {AxiosPromise}
- */
-export function updateJobSchedule(data) {
-  return request({
-    url: `/job/schedule/update`,
-    method: 'PUT',
-    data
-  })
-}
-
-/**
- * 删除Job Schedule
- * @param data
- * @returns {AxiosPromise}
- */
-export function deleteJobScheduleById(scheduleId) {
-  return request({
-    url: `/job/schedule/${scheduleId}`,
-    method: 'DELETE'
-  })
-}
-

src/api/system/jobTriggerApi.js

@@ -1,90 +0,0 @@
-import request from '@/utils/request'
-
-/**
- * 获取Job Trigger分页
- * @param data
- * @returns {AxiosPromise}
- */
-export function getJobTriggerByPage(data) {
-  return request({
-    url: '/job/trigger/page',
-    method: 'GET',
-    params: data
-  })
-}
-
-/**
- * 获取Job Trigger列表
- * @param data
- * @returns {AxiosPromise}
- */
-export function getJobTriggerByList(data) {
-  return request({
-    url: '/job/trigger',
-    method: 'GET',
-    params: data
-  })
-}
-
-/**
- * 根据Id获取Job
- * @param data
- * @returns {AxiosPromise}
- */
-export function getJobTriggerById(triggerId) {
-  return request({
-    url: `/job/trigger/${triggerId}`,
-    method: 'GET'
-  })
-}
-
-/**
- * 添加Job
- * @param data
- * @returns {AxiosPromise}
- */
-export function createJobTrigger(data) {
-  return request({
-    url: `/job/trigger/add`,
-    method: 'post',
-    data
-  })
-}
-
-/**
- * 更新Job Trigger
- * @param data
- * @returns {AxiosPromise}
- */
-export function updateJobTrigger(data) {
-  return request({
-    url: `/job/trigger/update`,
-    method: 'PUT',
-    data
-  })
-}
-
-/**
- * 更新Job Trigger Status
- * @param data
- * @returns {AxiosPromise}
- */
-export function updateJobTriggerStatus(triggerId, status) {
-  return request({
-    url: `/job/trigger/updateStatus/${triggerId}/${status}`,
-    method: 'PUT'
-  })
-}
-
-/**
- * 删除Job Trigger
- * @param data
- * @returns {AxiosPromise}
- */
-export function deleteJobTriggerById(triggerId) {
-  return request({
-    url: `/job/trigger/${triggerId}`,
-    method: 'DELETE'
-  })
-}
-

src/api/system/leadingGroupApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 获取LeadingGroup列表(不含下级)
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getLeadingGroupTopByList(data) {
   return request({
@@ -16,7 +16,7 @@ export function getLeadingGroupTopByList(data) {
 /**
  * 获取LeadingGroup列表（含下级）
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getLeadingGroupByList(data) {
   return request({
@@ -28,8 +28,8 @@ export function getLeadingGroupByList(data) {
 
 /**
  * 根据Id获取Leading Group
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param id
  */
 export function getLeadingGroupById(id) {
   return request({
@@ -40,8 +40,8 @@ export function getLeadingGroupById(id) {
 
 /**
  * 根据Id获取Leading Group树状视图，包含成员信息
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param id
  */
 export function getLeadingGroupDetailById(id) {
   return request({
@@ -53,7 +53,7 @@ export function getLeadingGroupDetailById(id) {
 /**
  * 添加Leading Group
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createLeadingGroup(data) {
   return request({
@@ -66,7 +66,7 @@ export function createLeadingGroup(data) {
 /**
  * 更新Leading Group
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateLeadingGroup(data) {
   return request({
@@ -77,9 +77,9 @@ export function updateLeadingGroup(data) {
 }
 
 /**
- * 删除App Category
- * @param data
- * @returns {AxiosPromise}
+ * 删除Leading Group
+ * @returns
+ * @param id
  */
 export function deleteLeadingGroupById(id) {
   return request({

src/api/system/licenseApi.js

@@ -0,0 +1,24 @@
+import request from '@/utils/request'
+
+/**
+ * 获取License列表
+ * @param data
+ */
+export function getLicenseByList() {
+  return request({
+    url: '/oc/license',
+    method: 'GET'
+  })
+}
+
+/**
+ * 更新License
+ * @param data
+ */
+export function updateLicense(data) {
+  return request({
+    url: `/oc/license/update`,
+    method: 'PUT',
+    data
+  })
+}

src/api/system/mapApi.js

@@ -7,7 +7,7 @@ import request from '@/utils/request'
  */
 export function getMapByList(data) {
   return request({
-    url: '/ent/map',
+    url: '/map',
     method: 'GET',
     params: data
   })
@@ -20,7 +20,7 @@ export function getMapByList(data) {
  */
 export function getMapByPage(data) {
   return request({
-    url: '/ent/map/page',
+    url: '/map/page',
     method: 'GET',
     params: data
   })
@@ -33,7 +33,7 @@ export function getMapByPage(data) {
  */
 export function getMapById(mapId) {
   return request({
-    url: `/ent/map/${mapId}`,
+    url: `/map/${mapId}`,
     method: 'GET'
   })
 }
@@ -45,7 +45,7 @@ export function getMapById(mapId) {
  */
 export function createMap(data) {
   return request({
-    url: `/ent/map/add`,
+    url: `/map/add`,
     method: 'POST',
     data
   })
@@ -58,7 +58,7 @@ export function createMap(data) {
  */
 export function updateMap(data) {
   return request({
-    url: `/ent/map/update`,
+    url: `/map/update`,
     method: 'PUT',
     data
   })
@@ -71,7 +71,7 @@ export function updateMap(data) {
  */
 export function deleteMapById(mapId) {
   return request({
-    url: `/ent/map/${mapId}`,
+    url: `/map/${mapId}`,
     method: 'DELETE'
   })
 }

src/api/system/mapLayerApi.js

@@ -7,7 +7,7 @@ import request from '@/utils/request'
  */
 export function getMapLayerByList(data) {
   return request({
-    url: '/ent/map/layer',
+    url: '/map/layer',
     method: 'GET',
     params: data
   })
@@ -15,41 +15,43 @@ export function getMapLayerByList(data) {
 
 /**
  * 基于ID查询
+ * @returns
  * @param mapId
  * @param layerId
- * @returns
  */
 export function getMapLayerById(mapId, layerId) {
   return request({
-    url: `/ent/map/layer/${mapId}/${layerId}`,
+    url: `/map/layer/${mapId}/${layerId}`,
     method: 'GET'
   })
 }
 
 /**
- * 更新
+ * 新增
  * @param data
  * @returns
  */
-export function updateMapLayer(data) {
+export function createMapLayer(data) {
   return request({
-    url: `/ent/map/layer/update`,
+    url: `/map/layer/add`,
     method: 'PUT',
     data
   })
 }
+
 /**
- * 新增
+ * 更新
  * @param data
  * @returns
  */
-export function createMapLayer(data) {
+export function updateMapLayer(data) {
   return request({
-    url: `/ent/map/layer/add`,
-    method: 'POST',
+    url: `/map/layer/update`,
+    method: 'PUT',
     data
   })
 }
+
 /**
  * 基于ID删除
  * @param mapId
@@ -58,7 +60,7 @@ export function createMapLayer(data) {
  */
 export function deleteMapLayerById(mapId, layerId) {
   return request({
-    url: `/ent/map/layer/${mapId}/${layerId}`,
+    url: `/map/layer/${mapId}/${layerId}`,
     method: 'DELETE'
   })
 }

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/msgCatApi.js

@@ -1,9 +1,9 @@
 import request from '@/utils/request'
 
 /**
- * 获取MsgCat Category分页
+ * 获取Msg Category分页
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getMsgCatByPage(data) {
   return request({
@@ -14,9 +14,9 @@ export function getMsgCatByPage(data) {
 }
 
 /**
- * 获取MsgCat Category列表
+ * 获取Msg Category列表
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getMsgCatByList(data) {
   return request({
@@ -27,21 +27,21 @@ export function getMsgCatByList(data) {
 }
 
 /**
- * 根据Id获取MsgCat Category
- * @param data
- * @returns {AxiosPromise}
+ * 根据Id获取Msg Category
+ * @param msgCatId
+ * @returns
  */
-export function getMsgCatById(id) {
+export function getMsgCatById(msgCatId) {
   return request({
-    url: `/msg/cat/${id}`,
+    url: `/msg/cat/${msgCatId}`,
     method: 'GET'
   })
 }
 
 /**
- * 添加MsgCat Category
+ * 添加Msg Category
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createMsgCat(data) {
   return request({
@@ -54,7 +54,7 @@ export function createMsgCat(data) {
 /**
  * 更新MsgCat Category
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateMsgCat(data) {
   return request({
@@ -65,13 +65,13 @@ export function updateMsgCat(data) {
 }
 
 /**
- * 删除MsgCat Category
- * @param data
- * @returns {AxiosPromise}
+ * 删除Msg Category
+ * @param msgCatId
+ * @returns
  */
-export function deleteMsgCatById(id) {
+export function deleteMsgCatById(msgCatId) {
   return request({
-    url: `/msg/cat/${id}`,
+    url: `/msg/cat/${msgCatId}`,
     method: 'DELETE'
   })
 }

src/api/system/ocApi.js

@@ -1,9 +1,9 @@
 import request from '@/utils/request'
 
 /**
- * 获取列表
+ * 列表查询
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getOcByList(data) {
   return request({
@@ -12,3 +12,130 @@ export function getOcByList(data) {
     params: data
   })
 }
+
+/**
+ * 分页查询
+ * @param data
+ * @returns
+ */
+export function getOcByPage(data) {
+  return request({
+    url: '/oc/page',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 基于ID查询
+ * @returns
+ * @param ocId
+ */
+export function getOcById(ocId) {
+  return request({
+    url: `/oc/${ocId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 添加
+ * @param data
+ * @returns
+ */
+export function createOc(data) {
+  return request({
+    url: `/oc/add`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 更新
+ * @param data
+ * @returns
+ */
+export function updateOc(data) {
+  return request({
+    url: `/oc/update`,
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * 删除
+ * @returns
+ * @param ocId
+ */
+export function deleteOcById(ocId) {
+  return request({
+    url: `/oc/${ocId}`,
+    method: 'DELETE'
+  })
+}
+
+/**
+ * 更新状态
+ * @returns
+ * @param ocId
+ * @param status
+ */
+export function updateOcStatus(ocId, status) {
+  return request({
+    url: `/oc/updateStatus/${ocId}/${status}`,
+    method: 'PUT'
+  })
+}
+
+/**
+ * 获取管理员
+ * @param ocId
+ * @returns
+ */
+export function getOcAdmin(ocId) {
+  return request({
+    url: `/oc/getAdmin/${ocId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 新增管理员
+ * @param data
+ * @returns
+ */
+export function createOcAdmin(data) {
+  return request({
+    url: '/oc/addAdmin',
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 更新管理员
+ * @param data
+ * @returns
+ */
+export function updateOcAdmin(data) {
+  return request({
+    url: '/oc/updateAdmin',
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * 重置管理员密码
+ * @returns
+ * @param ocId
+ * @param adminId
+ */
+export function resetAdminPwd(ocId) {
+  return request({
+    url: `/oc/resetAdminPwd/${ocId}`,
+    method: 'PUT'
+  })
+}

src/api/system/ocCatApi.js

@@ -0,0 +1,80 @@
+import request from '@/utils/request'
+
+/**
+ * 获取OC Category分页
+ * @param data
+ * @returns
+ */
+export function getOcCatByPage(data) {
+  return request({
+    url: '/oc/cat/page',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 获取OC Category列表
+ * @param data
+ * @returns
+ */
+export function getOcCatByList(data) {
+  return request({
+    url: '/oc/cat',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 根据Id获取OC Category
+ * @returns
+ * @param ocTypeId
+ * @param ocCatId
+ */
+export function getOcCatById(ocTypeId, ocCatId) {
+  return request({
+    url: `/oc/cat/${ocTypeId}/${ocCatId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 添加OC Category
+ * @param data
+ * @returns
+ */
+export function createOcCat(data) {
+  return request({
+    url: `/oc/cat/add`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 更新OC Category
+ * @param data
+ * @returns
+ */
+export function updateOcCat(data) {
+  return request({
+    url: `/oc/cat/update`,
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * 删除OC Category
+ * @returns
+ * @param ocTypeId
+ * @param ocCatId
+ */
+export function deleteOcCatById(ocTypeId, ocCatId) {
+  return request({
+    url: `/oc/cat/${ocTypeId}/${ocCatId}`,
+    method: 'DELETE'
+  })
+}
+

src/api/system/ocTypeApi.js

@@ -0,0 +1,14 @@
+import request from '@/utils/request'
+
+/**
+ * 列表查询OC Type
+ * @param data
+ * @returns
+ */
+export function getOcTypeByList(data) {
+  return request({
+    url: '/oc/type',
+    method: 'GET',
+    params: data
+  })
+}

src/api/system/orgApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 获取列表
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getOrgByList(data) {
   return request({
@@ -16,7 +16,7 @@ export function getOrgByList(data) {
 /**
  * 获取管理员
  * @param ocId
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getOrgAdmin(ocId) {
   return request({
@@ -28,7 +28,7 @@ export function getOrgAdmin(ocId) {
 /**
  * 新增管理员
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createOrgAdmin(data) {
   return request({
@@ -41,7 +41,7 @@ export function createOrgAdmin(data) {
 /**
  * 更新管理员
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateOrgAdmin(data) {
   return request({
@@ -53,8 +53,9 @@ export function updateOrgAdmin(data) {
 
 /**
  * 重置管理员密码
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param ocId
+ * @param adminId
  */
 export function resetAdminPwd(ocId, adminId) {
   return request({
@@ -65,8 +66,8 @@ export function resetAdminPwd(ocId, adminId) {
 
 /**
  * 根据ID获取Org
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param ocId
  */
 export function getOrgById(ocId) {
   return request({
@@ -78,7 +79,7 @@ export function getOrgById(ocId) {
 /**
  * 添加Org
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createOrg(data) {
   return request({
@@ -91,7 +92,7 @@ export function createOrg(data) {
 /**
  * 更新Org
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateOrg(data) {
   return request({
@@ -103,8 +104,8 @@ export function updateOrg(data) {
 
 /**
  * 删除Org
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param ocId
  */
 export function deleteOrgById(ocId) {
   return request({
@@ -115,8 +116,9 @@ export function deleteOrgById(ocId) {
 
 /**
  * 更新状态
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param ocId
+ * @param status
  */
 export function updateOrgStatus(ocId, status) {
   return request({

src/api/system/orgCatApi.js

@@ -1,78 +0,0 @@
-import request from '@/utils/request'
-
-/**
- * 获取Org Category分页
- * @param data
- * @returns {AxiosPromise}
- */
-export function getOrgCatByPage(data) {
-  return request({
-    url: '/org/cat/page',
-    method: 'GET',
-    params: data
-  })
-}
-
-/**
- * 获取Org Category列表
- * @param data
- * @returns {AxiosPromise}
- */
-export function getOrgCatByList(data) {
-  return request({
-    url: '/org/cat',
-    method: 'GET',
-    params: data
-  })
-}
-
-/**
- * 根据Id获取Org Category
- * @param data
- * @returns {AxiosPromise}
- */
-export function getOrgCatById(id) {
-  return request({
-    url: `/org/cat/${id}`,
-    method: 'GET'
-  })
-}
-
-/**
- * 添加Org Category
- * @param data
- * @returns {AxiosPromise}
- */
-export function createOrgCat(data) {
-  return request({
-    url: `/org/cat/add`,
-    method: 'POST',
-    data
-  })
-}
-
-/**
- * 更新Org Category
- * @param data
- * @returns {AxiosPromise}
- */
-export function updateOrgCat(data) {
-  return request({
-    url: `/org/cat/update`,
-    method: 'PUT',
-    data
-  })
-}
-
-/**
- * 删除Org Category
- * @param data
- * @returns {AxiosPromise}
- */
-export function deleteOrgCatById(id) {
-  return request({
-    url: `/org/cat/${id}`,
-    method: 'DELETE'
-  })
-}
-

src/api/system/partnerApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 获取列表
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getPartnerByPage(data) {
   return request({
@@ -16,7 +16,7 @@ export function getPartnerByPage(data) {
 /**
  * 获取管理员
  * @param ocId
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getPartnerAdmin(ocId) {
   return request({
@@ -28,7 +28,7 @@ export function getPartnerAdmin(ocId) {
 /**
  * 新增管理员
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createPartnerAdmin(data) {
   return request({
@@ -41,7 +41,7 @@ export function createPartnerAdmin(data) {
 /**
  * 更新管理员
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updatePartnerAdmin(data) {
   return request({
@@ -54,7 +54,7 @@ export function updatePartnerAdmin(data) {
 /**
  * 重置管理员密码
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function resetAdminPwd(ocId, adminId) {
   return request({
@@ -66,7 +66,7 @@ export function resetAdminPwd(ocId, adminId) {
 /**
  * 根据ID获取Partner
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getPartnerById(ocId) {
   return request({
@@ -78,7 +78,7 @@ export function getPartnerById(ocId) {
 /**
  * 添加Partner
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createPartner(data) {
   return request({
@@ -91,7 +91,7 @@ export function createPartner(data) {
 /**
  * 更新Partner
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updatePartner(data) {
   return request({
@@ -104,7 +104,7 @@ export function updatePartner(data) {
 /**
  * 删除Partner
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function deletePartner(ocId) {
   return request({
@@ -116,7 +116,7 @@ export function deletePartner(ocId) {
 /**
  * 更新状态
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updatePartnerStatus(ocId, status) {
   return request({

src/api/system/partnerCatApi.js

@@ -1,78 +0,0 @@
-import request from '@/utils/request'
-
-/**
- * 分页查询Partner Category
- * @param data
- * @returns {AxiosPromise}
- */
-export function getPartnerCatByPage(data) {
-  return request({
-    url: '/partner/cat/page',
-    method: 'GET',
-    params: data
-  })
-}
-
-/**
- * 列表查询Partner Category
- * @param data
- * @returns {AxiosPromise}
- */
-export function getPartnerCatByList(data) {
-  return request({
-    url: '/partner/cat',
-    method: 'GET',
-    params: data
-  })
-}
-
-/**
- * 基于ID查询Partner Category
- * @param data
- * @returns {AxiosPromise}
- */
-export function getPartnerCatById(id) {
-  return request({
-    url: `/partner/cat/${id}`,
-    method: 'GET'
-  })
-}
-
-/**
- * 新增Partner Category
- * @param data
- * @returns {AxiosPromise}
- */
-export function createPartnerCat(data) {
-  return request({
-    url: `/partner/cat/add`,
-    method: 'POST',
-    data
-  })
-}
-
-/**
- * 更新Partner Category
- * @param data
- * @returns {AxiosPromise}
- */
-export function updatePartnerCat(data) {
-  return request({
-    url: `/partner/cat/update`,
-    method: 'PUT',
-    data
-  })
-}
-
-/**
- * 删除Partner Category
- * @param data
- * @returns {AxiosPromise}
- */
-export function deletePartnerCatById(id) {
-  return request({
-    url: `/partner/cat/${id}`,
-    method: 'DELETE'
-  })
-}
-

src/api/system/positionApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 获取职位分页
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getPositionByPage(data) {
   return request({
@@ -16,7 +16,7 @@ export function getPositionByPage(data) {
 /**
  * 获取职位列表
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getPositionByList(data) {
   return request({
@@ -29,7 +29,7 @@ export function getPositionByList(data) {
 /**
  * 获取职位列表
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function selectPositionByList(data) {
   return request({
@@ -41,8 +41,8 @@ export function selectPositionByList(data) {
 
 /**
  * 根据ID获取职位
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param positionId
  */
 export function getPositionById(positionId) {
   return request({
@@ -54,7 +54,7 @@ export function getPositionById(positionId) {
 /**
  * 添加职位
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createPosition(data) {
   return request({
@@ -67,7 +67,7 @@ export function createPosition(data) {
 /**
  * 更新职位
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updatePosition(data) {
   return request({
@@ -79,8 +79,8 @@ export function updatePosition(data) {
 
 /**
  * 删除职位
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param positionId
  */
 export function deletePositionById(positionId) {
   return request({

src/api/system/positionPermitApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 获取岗位权限视图
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getPositionPermitViewByList(data) {
   return request({
@@ -15,8 +15,9 @@ export function getPositionPermitViewByList(data) {
 
 /**
  * 添加岗位权限
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param positionId
+ * @param permitId
  */
 export function createPositionPermit(positionId, permitId) {
   return request({
@@ -27,8 +28,9 @@ export function createPositionPermit(positionId, permitId) {
 
 /**
  * 删除岗位权限
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param positionId
+ * @param permitId
  */
 export function deletePositionPermitById(positionId, permitId) {
   return request({

src/api/system/profileApi.js

@@ -2,8 +2,7 @@ import request from '@/utils/request'
 
 /**
  * 获取Ent Profile
- * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getEntProfile() {
   return request({
@@ -15,7 +14,7 @@ export function getEntProfile() {
 /**
  * 更新Ent Profile
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateEntProfile(data) {
   return request({
@@ -27,8 +26,7 @@ export function updateEntProfile(data) {
 
 /**
  * 获取Partner Profile
- * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getPartnerProfile() {
   return request({
@@ -40,7 +38,7 @@ export function getPartnerProfile() {
 /**
  * 更新Partner Profile
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updatePartnerProfile(data) {
   return request({
@@ -49,28 +47,3 @@ export function updatePartnerProfile(data) {
     data
   })
 }
-
-/**
- * 获取Org Profile
- * @param data
- * @returns {AxiosPromise}
- */
-export function getOrgProfile() {
-  return request({
-    url: '/org/profile',
-    method: 'GET'
-  })
-}
-
-/**
- * 更新Partner Profile
- * @param data
- * @returns {AxiosPromise}
- */
-export function updateOrgProfile(data) {
-  return request({
-    url: `/org/profile/update`,
-    method: 'PUT',
-    data
-  })
-}

src/api/system/roleApi.js

@@ -69,7 +69,7 @@ export function updateRole(data) {
  * @param roleId 角色ID
  * @returns
  */
-export function deleteRole(roleId) {
+export function deleteRoleById(roleId) {
   return request({
     url: `/sys/role/${roleId}`,
     method: 'DELETE'

src/api/system/rolePermitApi.js

@@ -1,64 +0,0 @@
-import request from '@/utils/request'
-
-/**
- * 获取角色菜单
- * @param data
- * @returns {AxiosPromise}
- */
-export function getRolePermitByList(clientId, roleId) {
-  return request({
-    url: '/sys/role/permit/' + `${clientId}/${roleId}`,
-    method: 'GET'
-  })
-}
-
-/**
- * 获取角色菜单
- * @param data
- * @returns {AxiosPromise}
- */
-export function getRolePermitById(clientId, roleId, permitId) {
-  return request({
-    url: '/sys/role/permit/' + `${clientId}/${roleId}/${permitId}`,
-    method: 'GET'
-  })
-}
-
-/**
- * 添加角色权限
- * @param data
- * @returns {AxiosPromise}
- */
-export function createRolePermit(data) {
-  return request({
-    url: '/sys/role/permit/' + `add`,
-    method: 'POST',
-    data
-  })
-}
-
-/**
- * 更新角色权限
- * @param data
- * @returns {AxiosPromise}
- */
-export function updateRolePermit(data) {
-  return request({
-    url: '/sys/role/permit/update',
-    method: 'PUT',
-    data
-  })
-}
-
-/**
- * 删除角色权限
- * @param data
- * @returns {AxiosPromise}
- */
-export function deleteRolePermitById(clientId, roleId, permitId) {
-  return request({
-    url: '/sys/role/permit/' + `${clientId}/${roleId}/${permitId}`,
-    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/taskCatApi.js

@@ -1,9 +1,9 @@
 import request from '@/utils/request'
 
 /**
- * 获取Task Catogery分页
+ * 获取Task Category分页
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getTaskCatByPage(data) {
   return request({
@@ -14,9 +14,9 @@ export function getTaskCatByPage(data) {
 }
 
 /**
- * 获取Task Catogery列表
+ * 获取Task Category列表
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getTaskCatByList(data) {
   return request({
@@ -27,21 +27,21 @@ export function getTaskCatByList(data) {
 }
 
 /**
- * 根据Id获取Task Catogery
- * @param data
- * @returns {AxiosPromise}
+ * 根据Id获取Task Category
+ * @param taskCatId
+ * @returns
  */
-export function getTaskCatById(id) {
+export function getTaskCatById(taskCatId) {
   return request({
-    url: `/task/cat/${id}`,
+    url: `/task/cat/${taskCatId}`,
     method: 'GET'
   })
 }
 
 /**
- * 添加Task Catogery
+ * 添加Task Category
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createTaskCat(data) {
   return request({
@@ -52,9 +52,9 @@ export function createTaskCat(data) {
 }
 
 /**
- * 更新Task Catogery
+ * 更新Task Category
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateTaskCat(data) {
   return request({
@@ -66,12 +66,12 @@ export function updateTaskCat(data) {
 
 /**
  * 删除Task Category
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param taskCatId
  */
-export function deleteTaskCatById(id) {
+export function deleteTaskCatById(taskCatId) {
   return request({
-    url: `/task/cat/${id}`,
+    url: `/task/cat/${taskCatId}`,
     method: 'DELETE'
   })
 }

src/api/system/taskEventApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 获取Task Event分页
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getTaskEventByPage(data) {
   return request({
@@ -16,7 +16,7 @@ export function getTaskEventByPage(data) {
 /**
  * 获取Task Event列表
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getTaskEventByList(data) {
   return request({
@@ -29,7 +29,7 @@ export function getTaskEventByList(data) {
 /**
  * 根据Id获取Task Event
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getTaskEventByTaskId(taskId) {
   return request({
@@ -41,7 +41,7 @@ export function getTaskEventByTaskId(taskId) {
 /**
  * 添加Task Event
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createTaskEvent(data) {
   return request({
@@ -54,7 +54,7 @@ export function createTaskEvent(data) {
 /**
  * 删除Task Event
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function deleteTaskEvent(taskId) {
   return request({

src/api/system/taskStatisApi.js

@@ -2,8 +2,7 @@ import request from '@/utils/request'
 
 /**
  * counterByStatus
- * @param
- * @returns {AxiosPromise}
+ * @returns
  */
 export function counterGroupTaskByStatus() {
   return request({
@@ -14,8 +13,7 @@ export function counterGroupTaskByStatus() {
 
 /**
  * counterMyTaskByStatus
- * @param
- * @returns AxiosPromise
+ * @returns
  */
 export function counterMyTaskByStatus() {
   return request({
@@ -26,8 +24,7 @@ export function counterMyTaskByStatus() {
 
 /**
  * getTaskCounter
- * @param
- * @returns AxiosPromise}
+ * @returns}
  */
 export function getTaskCounter() {
   return request({

src/api/system/testApi.js

@@ -0,0 +1,22 @@
+import request from '@/utils/request'
+
+/**
+ * 推送消息
+ * @param data
+ * @returns
+ */
+export function pushMsg(data) {
+  return request({
+    url: `/test/push/msg`,
+    method: 'PUT',
+    data
+  })
+}
+
+export function pushNotification(data) {
+  return request({
+    url: `/test/push/notification`,
+    method: 'PUT',
+    data
+  })
+}

src/api/system/todoApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 分页查询Todo任务
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getTodoTaskByPage(data) {
   return request({
@@ -16,7 +16,7 @@ export function getTodoTaskByPage(data) {
 /**
  * 列表查询Todo任务
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getTodoTaskByList(data) {
   return request({
@@ -28,8 +28,8 @@ export function getTodoTaskByList(data) {
 
 /**
  * 基于ID查询Todo任务
- * @param data
- * @returns {AxiosPromise}
+ * @param taskId
+ * @returns
  */
 export function getTodoTaskById(taskId) {
   return request({
@@ -41,7 +41,7 @@ export function getTodoTaskById(taskId) {
 /**
  * 处理Todo任务
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function handleTotoTask(data) {
   return request({
@@ -53,8 +53,8 @@ export function handleTotoTask(data) {
 
 /**
  * 删除Todo任务
- * @param data
- * @returns {AxiosPromise}
+ * @param todoId
+ * @returns
  */
 export function deleteTodoTaskById(todoId) {
   return request({

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/wfActivityActionDefApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 分页查询流程Activity Action定义
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getWfActivityActionDefByPage(data) {
   return request({
@@ -15,8 +15,9 @@ export function getWfActivityActionDefByPage(data) {
 
 /**
  * 列表查询流程Activity Action定义
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param wfDefId
+ * @param activityDefId
  */
 export function getWfActivityActionDefByList(wfDefId, activityDefId) {
   return request({
@@ -27,8 +28,10 @@ export function getWfActivityActionDefByList(wfDefId, activityDefId) {
 
 /**
  * 基于ID查询流程Activity Action定义
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param wfDefId
+ * @param activityDefId
+ * @param actionId
  */
 export function getWfActivityActionDefById(wfDefId, activityDefId, actionId) {
   return request({
@@ -40,7 +43,7 @@ export function getWfActivityActionDefById(wfDefId, activityDefId, actionId) {
 /**
  * 添加流程Activity Action定义
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createWfActivityActionDef(data) {
   return request({
@@ -53,7 +56,7 @@ export function createWfActivityActionDef(data) {
 /**
  * 更新流程Activity Action定义
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateWfActivityActionDef(data) {
   return request({
@@ -65,8 +68,10 @@ export function updateWfActivityActionDef(data) {
 
 /**
  * 删除流程Activity Action定义
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param wfDefId
+ * @param activityDefId
+ * @param actionId
  */
 export function deleteWfActivityActionDefById(wfDefId, activityDefId, actionId) {
   return request({

src/api/system/wfActivityDefApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 分页查询流程Activity定义
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getWfActivityDefByPage(data) {
   return request({
@@ -15,8 +15,8 @@ export function getWfActivityDefByPage(data) {
 
 /**
  * 列表查询WF Activity
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param wfDefId
  */
 export function getWfActivityDefByList(wfDefId) {
   return request({
@@ -27,8 +27,9 @@ export function getWfActivityDefByList(wfDefId) {
 
 /**
  * 基于ID查询Activity定义
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param wfDefId
+ * @param wfActivityDefId
  */
 export function getWfActivityDefById(wfDefId, wfActivityDefId) {
   return request({
@@ -40,7 +41,7 @@ export function getWfActivityDefById(wfDefId, wfActivityDefId) {
 /**
  * 添加WF Activity定义
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createWfActivityDef(data) {
   return request({
@@ -53,7 +54,7 @@ export function createWfActivityDef(data) {
 /**
  * 更新WF Activity定义
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateWfActivityDef(data) {
   return request({
@@ -65,8 +66,9 @@ export function updateWfActivityDef(data) {
 
 /**
  * 删除WF Activity定义
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param wfDefId
+ * @param wfActivityDefId
  */
 export function deleteWfActivityDefById(wfDefId, wfActivityDefId) {
   return request({

src/api/system/wfActivityInsApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 分页查询流程Activity实例
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getWfActivityInsByPage(data) {
   return request({
@@ -16,7 +16,7 @@ export function getWfActivityInsByPage(data) {
 /**
  * 获取WF Activity实例列表
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getWfActivityInsByList(data) {
   return request({
@@ -28,8 +28,10 @@ export function getWfActivityInsByList(data) {
 
 /**
  * 获取WF Activity实例
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param ocId
+ * @param wfInsId
+ * @param activityInsId
  */
 export function getWfActivityInsById(ocId, wfInsId, activityInsId) {
   return request({
@@ -41,7 +43,7 @@ export function getWfActivityInsById(ocId, wfInsId, activityInsId) {
 /**
  * 添加WF Activity实例
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createWfActivityIns(data) {
   return request({
@@ -54,7 +56,7 @@ export function createWfActivityIns(data) {
 /**
  * 更新WF Activity实例
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateWfActivityIns(data) {
   return request({
@@ -66,8 +68,10 @@ export function updateWfActivityIns(data) {
 
 /**
  * 删除WF Activity实例
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param ocId
+ * @param wfInsId
+ * @param activityInsId
  */
 export function deleteWfActivityInsById(ocId, wfInsId, activityInsId) {
   return request({

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/wfDefApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 分页查询流程定义
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getWfDefByPage(data) {
   return request({
@@ -16,7 +16,7 @@ export function getWfDefByPage(data) {
 /**
  * 列查查询流程定义
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getWfDefByList(data) {
   return request({
@@ -28,8 +28,8 @@ export function getWfDefByList(data) {
 
 /**
  * 基于ID查询流程定义
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param wfDefId
  */
 export function getWfDefById(wfDefId) {
   return request({
@@ -41,7 +41,7 @@ export function getWfDefById(wfDefId) {
 /**
  * 添加流程定义
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function createWfDef(data) {
   return request({
@@ -54,7 +54,7 @@ export function createWfDef(data) {
 /**
  * 更新流程定义
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function updateWfDef(data) {
   return request({
@@ -66,8 +66,8 @@ export function updateWfDef(data) {
 
 /**
  * 删除流程定义
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param wfDefId
  */
 export function deleteWfDef(wfDefId) {
   return request({

src/api/system/wfExampleApi.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 /**
  * 分页查询
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getWfExampleByPage(data) {
   return request({
@@ -16,7 +16,7 @@ export function getWfExampleByPage(data) {
 /**
  * 列表查询
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function getWfExampleByList(data) {
   return request({
@@ -28,8 +28,8 @@ export function getWfExampleByList(data) {
 
 /**
  * 基于ID查询Wf Example
- * @param data
- * @returns {AxiosPromise}
+ * @returns
+ * @param exampleId
  */
 export function getWfExampleById(exampleId) {
   return request({
@@ -40,8 +40,7 @@ export function getWfExampleById(exampleId) {
 
 /**
  * 添加Wf Example
- * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function startWfExample() {
   return request({
@@ -53,7 +52,7 @@ export function startWfExample() {
 /**
  * 更新Wf Example
  * @param data
- * @returns {AxiosPromise}
+ * @returns
  */
 export function submitWfExample(data) {
   return request({

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

@@ -0,0 +1,55 @@
+<template>
+  <el-select v-model="appId" value-key="appId" style="width: 90%;" filterable placeholder="请选择应用">
+    <el-option-group>
+      <el-option
+        v-for="item in dataList"
+        :key="item.appId"
+        :label="item.appTitle"
+        :value="item.appId"
+      />
+    </el-option-group>
+  </el-select>
+</template>
+<script>
+import { getAppByList } from '@/api/system/appApi'
+
+export default {
+  name: 'AppSelector',
+  components: { },
+  props: {
+    value: {
+      type: Number,
+      default: -1
+    }
+  },
+  data() {
+    return {
+      appId: undefined,
+      dataList: []
+    }
+  },
+  watch: {
+    value(val) {
+      this.appId = val
+    },
+    appId(val) {
+      this.$emit('input', val)
+    }
+  },
+  created() {
+    this.appId = this.value
+    this.initData()
+  },
+  mounted() {},
+  methods: {
+    initData() {
+      getAppByList().then((resp) => {
+        const { data } = resp
+        this.dataList = data
+      }).catch((error) => {
+        console.log(error)
+      })
+    }
+  }
+}
+</script>

src/components/ArtCatSelector/index.vue

@@ -41,19 +41,16 @@ export default {
   },
   mounted() {},
   methods: {
+
     // 文章分类
     initArtCatData() {
       getArtCatByList().then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.artCatList = data
-          this.treedata = packageTreeData({
-            data,
-            id: 'artCatId'
-          })
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        this.artCatList = data
+        this.treedata = packageTreeData({
+          data,
+          id: 'artCatId'
+        })
       }).catch((error) => {
         console.log(error)
       })

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,19 +37,15 @@ export default {
     }
   },
   created() {
-    this.initChecklistCatData()
+    this.getData()
   },
   mounted() {},
   methods: {
     // 检查表清单
-    initChecklistCatData() {
+    getData() {
       getChecklistCatByList().then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.checklistCatList = data
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        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,13 +46,9 @@ export default {
   methods: {
     // 检查表清单
     initChecklistData() {
-      getChecklistByList().then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.checklistList = data
-        } else {
-          this.$message.error(msg)
-        }
+      getChecklistByList(this.conditions).then((resp) => {
+        const { data } = resp
+        this.checklistList = data
       }).catch((error) => {
         console.log(error)
       })

src/components/ChecklistTargetConfig/ChecklistSelected.vue

@@ -64,13 +64,9 @@ export default {
       this.dialogVisible = true
       this.listLoading = true
       getChecklistTargetByList(this.conditions).then((resp) => {
-        const { code, data, msg } = resp
+        const { data } = resp
         this.listLoading = false
-        if (code === 200) {
-          this.dataList = data
-        } else {
-          this.$message.error(msg)
-        }
+        this.dataList = data
       }).catch((error) => {
         console.log(error)
       })
@@ -88,13 +84,8 @@ export default {
     handleDelete(data) {
       const { targetId, checklistId } = data
       deleteChecklistTargetById(targetId, checklistId).then((resp) => {
-        const { code, msg } = resp
-        if (code === 200) {
-          this.loadData()
-          this.$emit('actionUpdate')
-        } else {
-          this.$message.error(msg)
-        }
+        this.loadData()
+        this.$emit('actionUpdate')
       }).catch((error) => {
         console.log(error)
       })

src/components/ChecklistTargetConfig/ChecklistUnselected.vue

@@ -83,13 +83,9 @@ export default {
       this.dialogVisible = true
       this.listLoading = true
       getChecklistSelectByList(this.conditions).then((resp) => {
-        const { code, data, msg } = resp
+        const { data } = resp
         this.listLoading = false
-        if (code === 200) {
-          this.dataList = data
-        } else {
-          this.$message.error(msg)
-        }
+        this.dataList = data
       }).catch((error) => {
         console.log(error)
       })
@@ -109,13 +105,8 @@ export default {
       const { checklistId } = data
       this.formData.checklistId = checklistId
       createChecklistTarget(this.formData).then((resp) => {
-        const { code, msg } = resp
-        if (code === 200) {
-          this.loadData()
-          this.$emit('actionUpdate')
-        } else {
-          this.$message.error(msg)
-        }
+        this.loadData()
+        this.$emit('actionUpdate')
       }).catch((error) => {
         console.log(error)
       })

src/components/ChecklistTargetConfig/index.vue

@@ -52,11 +52,13 @@ export default {
     // 操作更新
     updateUnselectedList() {
       this.$refs['UnselectedList'].loadData(this.targetId)
+      this.$refs['SelectedList'].loadData(this.targetId)
     },
 
     // 操作更新
     updateSelectedList() {
       this.$refs['SelectedList'].loadData(this.targetId)
+      this.$refs['UnselectedList'].loadData(this.targetId)
       this.$emit('formSuccess')
     }
   }

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: {
@@ -44,12 +44,8 @@ export default {
     // 检查表清单
     initEquipCatData() {
       getEquipmentCatByList().then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.equipCatList = data
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        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/FileUpload/avatarUpload.vue

@@ -46,12 +46,8 @@ export default {
       const formData = new FormData()
       formData.append('file', file)
       uploadFile(formData).then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.imageUrl = data.fileUrl
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        this.imageUrl = data.fileUrl
       }).catch((error) => {
         console.log(error)
       })

src/components/FileUpload/cardUpload.vue

@@ -106,20 +106,16 @@ export default {
       const formData = new FormData()
       formData.append('file', file)
       uploadFile(formData).then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          const of = {}
-          of.fileId = 0
-          of.fileTitle = data.fileTitle
-          of.fileSize = data.fileSize
-          of.fileUrl = data.fileUrl
-          of.fileExt = data.fileExt
-          of.opCode = 0 // 新上传的文件opCode都是0
-          this.oFileList.push(of)
-          this.nFileList.push({ name: of.fileTitle, url: of.fileUrl, id: of.fileId })
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        const of = {}
+        of.fileId = 0
+        of.fileTitle = data.fileTitle
+        of.fileSize = data.fileSize
+        of.fileUrl = data.fileUrl
+        of.fileExt = data.fileExt
+        of.opCode = 0 // 新上传的文件opCode都是0
+        this.oFileList.push(of)
+        this.nFileList.push({ name: of.fileTitle, url: of.fileUrl, id: of.fileId })
       }).catch((error) => {
         console.log(error)
       })

src/components/FileUpload/index.vue

@@ -85,26 +85,22 @@ export default {
         background: 'rgba(0, 0, 0, 0.7)'
       })
       uploadFile(formData).then((resp) => {
-        const { code, data, msg } = resp
+        const { data } = resp
         loading.close()
-        if (code === 200) {
-          var ofile = {}
-          ofile.fileId = 0
-          ofile.oriFileName = data.oriFileName
-          ofile.fileSize = data.size
-          ofile.path = data.path
-          ofile.fileExt = data.ext
-          ofile.thumbnailPath = data.thumbnailPath
-          ofile.opCode = 0 // 新上传的文件opCode都是0
-          if (Array.isArray(this.fileList)) {
-            this.fileList.push(ofile)
-          } else {
-            this.fileList = [ofile]
-          }
-          this.fileListChange()
+        var ofile = {}
+        ofile.fileId = 0
+        ofile.oriFileName = data.oriFileName
+        ofile.fileSize = data.size
+        ofile.path = data.path
+        ofile.fileExt = data.ext
+        ofile.thumbnailPath = data.thumbnailPath
+        ofile.opCode = 0 // 新上传的文件opCode都是0
+        if (Array.isArray(this.fileList)) {
+          this.fileList.push(ofile)
         } else {
-          this.$message.error(msg)
+          this.fileList = [ofile]
         }
+        this.fileListChange()
       }).catch((error) => {
         loading.close()
         console.log(error)

src/components/FileUpload/multiUpload.vue

@@ -110,19 +110,16 @@ export default {
       formData.append('dirId', this.dirId)
       uploadFile(formData).then((resp) => {
         loading.close()
-        const { code, data, msg } = resp
-        if (code === 200) {
-          const of = {}
-          of.fileId = data.fileId
-          of.fileTitle = data.fileTitle
-          of.fileSize = data.fileSize
-          of.fileUrl = data.fileUrl
-          of.fileExt = data.fileExt
-          this.oFileList.push(of)
-          this.nFileList.push({ name: of.fileTitle, url: of.fileUrl, id: of.fileId })
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        const of = {}
+        of.fileId = data.fileId
+        of.fileTitle = data.fileTitle
+        of.fileSize = data.fileSize
+        of.fileUrl = data.fileUrl
+        of.fileIcon = data.fileIcon
+        of.fileExt = data.fileExt
+        this.oFileList.push(of)
+        this.nFileList.push({ name: of.fileTitle, url: of.fileUrl, id: of.fileId })
       }).catch((error) => {
         loading.close()
         console.log(error)

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() {
@@ -67,12 +69,8 @@ export default {
     // 网格列表
     initGridData() {
       getGridByList({}).then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.gridList = data
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        this.dataList = data
       }).catch((error) => {
         console.log(error)
       })

src/components/GroupCatSelector/index.vue

@@ -37,19 +37,15 @@ export default {
     }
   },
   created() {
-    this.initGroupCatData()
+    this.initData()
   },
   mounted() {},
   methods: {
     // 检查表清单
-    initGroupCatData() {
+    initData() {
       getGroupCatByList().then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.groupCatList = data
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        this.groupCatList = data
       }).catch((error) => {
         console.log(error)
       })

src/components/GroupSelector/index.vue

@@ -10,6 +10,7 @@
       :close-on-select="true"
       :searchable="false"
       :clearable="false"
+      size="mini"
       placeholder="请选择部门"
     />
   </div>
@@ -57,12 +58,8 @@ export default {
     // 初始化部门数据
     initGroupData() {
       getGroupView().then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.groupData = data
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        this.groupData = data
       }).catch((error) => {
         console.log(error)
       })

src/components/JobSelector/index.vue

@@ -0,0 +1,62 @@
+<template>
+  <el-select v-model="jobId" value-key="jobId" style="width: 100%" filterable placeholder="请选择派发频次">
+    <el-option-group>
+      <el-option
+        v-for="item in jobList"
+        :key="item.jobId"
+        :label="item.cycleTitle"
+        :value="item.jobId"
+      />
+    </el-option-group>
+  </el-select>
+</template>
+<script>
+import { getActiveJobByList } from '@/api/system/jobApi'
+
+export default {
+  name: 'JobSelector',
+  components: { },
+  props: {
+    value: {
+      type: Number,
+      default: undefined
+    },
+    jobClassId: {
+      type: Number,
+      default: undefined
+    }
+  },
+  data() {
+    return {
+      jobId: undefined,
+      jobList: [],
+      conditions: {
+        jobClassId: this.jobClassId
+      }
+    }
+  },
+  watch: {
+    value(val) {
+      this.jobId = val
+    },
+    jobId(val) {
+      this.$emit('input', val)
+    }
+  },
+  created() {
+    this.initJobData()
+  },
+  mounted() {},
+  methods: {
+    // Job列表
+    initJobData() {
+      getActiveJobByList(this.conditions).then((resp) => {
+        const { data } = resp
+        this.jobList = data
+      }).catch((error) => {
+        console.log(error)
+      })
+    }
+  }
+}
+</script>

src/components/MapLayerConfig/example.vue

@@ -65,13 +65,9 @@ export default {
     // 初始化
     getData() {
       getMapLayerById(this.conditions.layerId).then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.viewData = data
-          this.setRasterLayer()
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        this.viewData = data
+        this.setRasterLayer()
       }).catch((error) => {
         console.log(error)
       })
@@ -180,13 +176,9 @@ export default {
       const obj = {}
       obj.mapId = this.mapId
       getMapLayerByList(obj).then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.mapLayerList = data
-          this.initMapLayers()
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        this.mapLayerList = data
+        this.initMapLayers()
       }).catch((error) => {
         console.log(error)
       })

src/components/MapLayerConfig/index.vue

@@ -63,13 +63,9 @@ export default {
     // 初始化
     getData() {
       getMapLayerById(this.conditions.layerId).then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.viewData = data
-          this.setRasterLayer()
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        this.viewData = data
+        this.setRasterLayer()
       }).catch((error) => {
         console.log(error)
       })
@@ -165,13 +161,9 @@ export default {
       const obj = {}
       obj.mapId = this.mapId
       getMapLayerByList(obj).then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.mapLayerList = data
-          this.initMapLayers()
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        this.mapLayerList = data
+        this.initMapLayers()
       }).catch((error) => {
         console.log(error)
       })
@@ -217,8 +209,6 @@ export default {
     font-size: 18px;
     font-weight: bold;
     color: #FFFFFF;
-
-    font-weight: bold;
   }
   .tool-bar {
     height: 60px;

src/components/MapSelector/index.vue

@@ -46,16 +46,12 @@ export default {
     // 检查表清单
     initMapData() {
       getMapByList({}).then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.mapList = data
-          if (data && data.length > 0) {
-            const node = data[0]
-            this.mapId = node.mapId
-            this.setVal(node)
-          }
-        } else {
-          this.$message.error(msg)
+        const { data } = resp
+        this.mapList = data
+        if (data && data.length > 0) {
+          const node = data[0]
+          this.mapId = node.mapId
+          this.setVal(node)
         }
       }).catch((error) => {
         console.log(error)

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/MiniProgramTargetConfig/components/MiniSelected.vue

@@ -0,0 +1,127 @@
+<template>
+
+  <div class="content-container">
+    <el-row class="tool-bar">
+      <el-col :span="24" class="left">
+        <div class="tool-bar-label">
+          <span>已绑定列表</span>
+        </div>
+      </el-col>
+    </el-row>
+
+    <el-row class="content-body">
+      <VueScroll :ops="ops" style="height: calc(100vh - 150px)">
+        <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="miniTitle" label="名称" header-align="center" align="center">
+            <template v-slot="{row}">
+              <span><i class="el-icon-notebook-2" /> {{ row.miniTitle }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" header-align="center" align="center" width="80">
+            <template v-slot="{row}">
+              <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </VueScroll>
+    </el-row>
+  </div>
+</template>
+<script>
+import { getMiniTargetByList, deleteMiniTargetById } from '@/api/system/miniProgramTargetApi'
+import VueScroll from 'vuescroll'
+
+export default {
+  name: 'MiniSelected',
+  components: { VueScroll },
+  data() {
+    return {
+      ops: {
+        bar: {
+          keepShow: false,
+          background: 'rgba(144, 147, 153, 0.4)',
+          onlyShowBarOnScroll: false
+        }
+      },
+      dialogVisible: false,
+      listLoading: false,
+      conditions: {
+        targetId: this.targetId
+      },
+      dataList: [],
+      rules: {}
+    }
+  },
+  methods: {
+
+    // 显示窗口
+    loadData(targetId) {
+      this.resetFormData()
+      this.conditions.targetId = targetId
+      this.dialogVisible = true
+      this.listLoading = true
+      getMiniTargetByList(this.conditions).then((resp) => {
+        const { data } = resp
+        this.listLoading = false
+        this.dataList = data
+      }).catch((error) => {
+        console.log(error)
+      })
+    },
+
+    // 重置
+    resetFormData() {
+      this.formData = {
+        checklistId: undefined,
+        targetId: undefined
+      }
+    },
+
+    // Delete Handling
+    handleDelete(data) {
+      const { miniId } = data
+      const targetId = this.conditions.targetId
+      deleteMiniTargetById(miniId, targetId).then((resp) => {
+        this.loadData()
+        this.$emit('actionUpdate')
+      }).catch((error) => {
+        console.log(error)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+
+</style>
+<style lang="scss" scoped>
+.content-container {
+  margin: 0 10px;
+  position: relative;
+  height: calc(100% - 120px);
+
+  .tool-bar-label {
+    font-size: 13px;
+    color: #F7F7F7;
+  }
+}
+
+.el-form-item-desc{
+  background: #3A71A8;
+  color: #fff;
+  padding:10px;
+  p{
+    margin: 0;
+    line-height: 1.8;
+  }
+}
+.assess-attachList{
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
+}
+</style>

src/components/MiniProgramTargetConfig/components/MiniUnselected.vue

@@ -0,0 +1,148 @@
+<template>
+
+  <div class="content-container">
+    <el-row class="tool-bar">
+      <el-col :span="24" class="left">
+        <div class="tool-bar-label">
+          <span> 待选择列表 </span>
+        </div>
+      </el-col>
+    </el-row>
+
+    <el-row class="content-body">
+      <VueScroll :ops="ops" style="height: calc(100vh - 400px)">
+        <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="miniTitle" label="名称" header-align="center" align="center">
+            <template v-slot="{row}">
+              <span><i class="el-icon-notebook-2" /> {{ row.miniTitle }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作" header-align="center" align="center" width="100">
+            <template v-slot="{row}">
+              <el-button size="mini" icon="el-icon-edit" type="primary" @click="handleAdd(row)">添加</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </VueScroll>
+    </el-row>
+  </div>
+</template>
+<script>
+import { getMiniSelectByList, createMiniTarget } from '@/api/system/miniProgramTargetApi'
+import VueScroll from 'vuescroll'
+
+export default {
+  name: 'MiniUnSelected',
+  components: { VueScroll },
+  filters: { },
+  props: {
+    targetId: {
+      type: [Number],
+      default: undefined
+    },
+
+    targetType: {
+      type: [Number],
+      default: undefined
+    }
+  },
+  data() {
+    return {
+      ops: {
+        bar: {
+          keepShow: false,
+          background: 'rgba(144, 147, 153, 0.4)',
+          onlyShowBarOnScroll: false
+        }
+      },
+      dialogVisible: false,
+      listLoading: false,
+      dataList: [],
+      formData: {
+        miniId: undefined,
+        targetId: this.targetId,
+        targetType: this.targetType
+      },
+      conditions: {
+        targetId: this.targetId
+      },
+      rules: {}
+    }
+  },
+  mounted() {},
+  methods: {
+
+    // 显示窗口
+    loadData(targetId) {
+      this.resetFormData()
+      this.formData.targetId = targetId
+      this.conditions.targetId = targetId
+      this.dialogVisible = true
+      this.listLoading = true
+      getMiniSelectByList(this.conditions).then((resp) => {
+        const { data } = resp
+        this.listLoading = false
+        this.dataList = data
+      }).catch((error) => {
+        console.log(error)
+      })
+    },
+
+    // 重置
+    resetFormData() {
+      this.formData = {
+        checklistId: undefined,
+        targetId: this.targetId,
+        targetType: this.targetType
+      }
+    },
+
+    // Add Handling
+    handleAdd(data) {
+      const { miniId } = data
+      this.formData.miniId = miniId
+      createMiniTarget(this.formData).then((resp) => {
+        this.loadData()
+        this.$emit('actionUpdate')
+      }).catch((error) => {
+        console.log(error)
+      })
+    }
+
+  }
+}
+</script>
+
+<style lang="scss">
+
+</style>
+<style lang="scss" scoped>
+.content-container {
+  margin: 0 10px;
+  position: relative;
+  height: calc(100% - 120px);
+
+  .tool-bar-label {
+    font-size: 13px;
+    color: #F7F7F7;
+  }
+}
+
+.el-form-item-desc{
+  background: #3A71A8;
+  color: #fff;
+  padding:10px;
+  p{
+    margin: 0;
+    line-height: 1.8;
+  }
+}
+.assess-attachList{
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
+}
+</style>

src/components/MiniProgramTargetConfig/index.vue

@@ -0,0 +1,93 @@
+<template>
+  <el-drawer
+    :title="title"
+    :modal-append-to-body="false"
+    :modal="false"
+    :wrapper-closable="false"
+    size="60%"
+    :visible.sync="dialogVisible"
+  >
+    <el-row class="content-container">
+      <el-col :span="12" class="left-counter-wrap">
+        <MiniSelected ref="SelectedList" :target-type="targetType" @actionUpdate="updateUnselectedList" />
+      </el-col>
+
+      <el-col :span="12" class="right-counter-wrap">
+        <MiniUnselected ref="UnselectedList" :target-type="targetType" @actionUpdate="updateSelectedList" />
+      </el-col>
+    </el-row>
+  </el-drawer>
+</template>
+<script>
+import MiniSelected from './components/MiniSelected.vue'
+import MiniUnselected from './components/MiniUnselected.vue'
+
+export default {
+  name: 'MiniProgramTargetConfig',
+  components: { MiniSelected, MiniUnselected },
+  props: {
+    targetType: {
+      type: [Number],
+      default: 1
+    }
+  },
+  data() {
+    return {
+      title: '小程序绑定配置',
+      dialogVisible: false,
+      targetId: undefined
+    }
+  },
+  mounted() {},
+  methods: {
+    showModel(targetId) {
+      console.log(targetId)
+      this.targetId = targetId
+      this.dialogVisible = true
+      this.$nextTick(() => {
+        this.$refs['UnselectedList'].loadData(this.targetId)
+        this.$refs['SelectedList'].loadData(this.targetId)
+      })
+    },
+
+    // 操作更新
+    updateUnselectedList() {
+      this.$refs['UnselectedList'].loadData(this.targetId)
+      this.$refs['SelectedList'].loadData(this.targetId)
+    },
+
+    // 操作更新
+    updateSelectedList() {
+      this.$refs['SelectedList'].loadData(this.targetId)
+      this.$refs['UnselectedList'].loadData(this.targetId)
+      this.$emit('formSuccess')
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+
+</style>
+<style lang="scss" scoped>
+.content-container {
+  margin: 0 0;
+  position: relative;
+  height: calc(100% - 250px);
+}
+
+.el-form-item-desc{
+  background: #3A71A8;
+  color: #fff;
+  padding:10px;
+  p{
+    margin: 0;
+    line-height: 1.8;
+  }
+}
+.assess-attachList{
+  overflow: hidden;
+  text-overflow:ellipsis;
+  white-space: nowrap;
+}
+</style>

src/components/MsgCatSelector/index.vue

@@ -44,12 +44,8 @@ export default {
     // Init Measure Type List
     initMsgCatListData() {
       getMsgCatByList().then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.msgCatList = data
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        this.msgCatList = data
       }).catch((error) => {
         console.log(error)
       })

src/components/OcCatSelector/index.vue

@@ -0,0 +1,61 @@
+<template>
+  <el-select v-model="ocCatId" value-key="ocCatId" style="width: 100%" filterable placeholder="请选择单位分类">
+    <el-option-group>
+      <el-option
+        v-for="item in dataList"
+        :key="item.ocCatId"
+        :label="item.ocCatTitle"
+        :value="item.ocCatId"
+      />
+    </el-option-group>
+  </el-select>
+</template>
+<script>
+import { getOcCatByList } from '@/api/system/ocCatApi'
+
+export default {
+  name: 'OcCatSelector',
+  components: { },
+  props: {
+    value: {
+      type: Number,
+      default: undefined
+    },
+    ocTypeId: {
+      type: Number,
+      default: undefined
+    }
+  },
+  data() {
+    return {
+      ocCatId: undefined,
+      dataList: [],
+      conditions: {
+        ocTypeId: undefined
+      }
+    }
+  },
+  watch: {
+    value(val) {
+      this.ocCatId = val
+    },
+    ocCatId(val) {
+      this.$emit('input', val)
+    }
+  },
+  created() {
+    this.initDataList()
+  },
+  mounted() {},
+  methods: {
+    initDataList() {
+      getOcCatByList(this.conditions).then((resp) => {
+        const { data } = resp
+        this.dataList = data
+      }).catch((error) => {
+        console.log(error)
+      })
+    }
+  }
+}
+</script>

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/OcSelector/index.vue

@@ -43,12 +43,8 @@ export default {
   methods: {
     initOcData() {
       getOcByList().then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.ocList = data
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        this.ocList = data
       }).catch((error) => {
         console.log(error)
       })

src/components/OrgCatSelector/index.vue

@@ -1,58 +0,0 @@
-<template>
-  <el-select v-model="orgCatId" value-key="orgCatId" style="width: 100%" filterable placeholder="请选择措施类型">
-    <el-option-group>
-      <el-option
-        v-for="item in orgCatList"
-        :key="item.orgCatId"
-        :label="item.orgCatTitle"
-        :value="item.orgCatId"
-      />
-    </el-option-group>
-  </el-select>
-</template>
-<script>
-import { getOrgCatByList } from '@/api/system/orgCatApi'
-
-export default {
-  name: 'OrgCatSelector',
-  components: { },
-  props: {
-    value: {
-      type: Number,
-      default: undefined
-    }
-  },
-  data() {
-    return {
-      orgCatId: undefined,
-      orgCatList: []
-    }
-  },
-  watch: {
-    value(val) {
-      this.orgCatId = val
-    },
-    orgCatId(val) {
-      this.$emit('input', val)
-    }
-  },
-  created() {
-    this.initOrgCatList()
-  },
-  mounted() {},
-  methods: {
-    initOrgCatList() {
-      getOrgCatByList().then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.orgCatList = data
-        } else {
-          this.$message.error(msg)
-        }
-      }).catch((error) => {
-        console.log(error)
-      })
-    }
-  }
-}
-</script>

src/components/PositionSelector/index.vue

@@ -59,12 +59,8 @@ export default {
     // 岗位列表
     initPositionData() {
       selectPositionByList(this.conditions).then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.positionList = data
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        this.positionList = data
       }).catch((error) => {
         console.log(error)
       })

src/components/QrCode/index.vue

@@ -0,0 +1,159 @@
+<template>
+  <div>
+    <el-dialog
+      :title="title"
+      :visible.sync="dialogVisible"
+      width="30%"
+      destroy-on-close
+      :close-on-click-modal="false"
+    >
+      <div id="qrcodetemplate" ref="qrcodetemplateModal" />
+      <span slot="footer" class="dialog-footer" />
+
+    </el-dialog>
+    <div id="qrcode" ref="qrcodeModal" style="position:fixed;top:-9999px;" />
+  </div>
+</template>
+<script>
+import QRCode from 'qrcodejs2'
+import { getSettingById } from '@/api/system/settingApi'
+import { mapGetters } from 'vuex'
+import html2canvas from 'html2canvas'
+import JSZip from 'jszip'
+import saveAs from 'file-saver'
+
+let zip = new JSZip()
+export default {
+  name: 'QrCode',
+  props: {
+    title: {
+      type: String,
+      default: '二维码'
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      miniUrl: undefined
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'userData'
+    ])
+  },
+  created() {
+    this.getMiniUrl()
+  },
+  methods: {
+
+    // 获取小程序地址
+    getMiniUrl() {
+      const settingId = 1
+      this.listLoading = true
+      getSettingById(settingId).then((resp) => {
+        const { data } = resp
+        this.listLoading = false
+        this.miniUrl = data.settingValue
+      }).catch((error) => {
+        console.log(error)
+      })
+    },
+
+    // 外部调用接口
+    draw(objCode) {
+      if (!objCode) {
+        this.$message.error('没有生产二维码的参数')
+        return
+      }
+      this.dialogVisible = true
+      const ocId = this.userData.ocId
+      const code = this.miniUrl + '?ocId=' + ocId + '&code=' + objCode
+      this.renderQrcode(code)
+    },
+
+    // 渲染二维码
+    renderQrcode(url) {
+      this.$nextTick(() => {
+        this.$refs.qrcodetemplateModal.innerHTML = ''
+        new QRCode('qrcodetemplate', {
+          width: 200,
+          height: 200,
+          text: url.toString()
+        })
+      })
+    },
+
+    async download(arr, fileName) {
+      const self = this
+      window.loading = this.$loading({
+        lock: true,
+        text: '制作二维码中!',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+
+      zip = new JSZip()
+      for (let i = 0; i < arr.length; i++) {
+        const item = arr[i]
+        await self.generateQrcode(item.type, item.code).catch(() => {
+          window.loading.close()
+          this.$message.error('导出失败')
+        })
+        await self.packMaterial(item.title).catch(() => {
+          window.loading.close()
+          this.$message.error('导出失败')
+        })
+      }
+      zip.generateAsync({
+        type: 'blob'
+      }).then((blob) => {
+        saveAs(blob, fileName + '二维码物料.zip')
+        window.loading.close()
+      })
+    },
+
+    generateQrcode(type, url, sleep) { // 绘制二维码
+      return new Promise((resolve, reject) => {
+        this.$nextTick(() => {
+          this.$refs.qrcodeModal.innerHTML = ''
+          new QRCode('qrcode', {
+            width: 400,
+            height: 400,
+            text: url.toString()
+          })
+          setTimeout(function() {
+            resolve()
+          }, sleep || 300)
+        })
+      })
+    },
+
+    packMaterial(name) { // 打包处理
+      if (!name) name = 'xxx'
+      return new Promise((resolve, reject) => {
+        html2canvas(document.getElementById('qrcode'), {
+          backgroundColor: null,
+          useCORS: true,
+          dpi: 500,
+          scale: 5
+        }).then((canvas) => {
+          let dataURL = canvas.toDataURL('photo/png')
+          dataURL = dataURL.replace(/^data:image\/(png|jpg);base64,/, '')
+          zip.file(name + '.jpg', dataURL, { base64: true })
+          resolve()
+        }).catch((e) => {
+          reject(e)
+        })
+      })
+    }
+  }
+}
+</script>
+<style lang="scss">
+#qrcodetemplate{
+  width: 200px;
+  height: 200px;
+  margin: 0 auto;
+}
+</style>

src/components/TaskCatSelector/index.vue

@@ -44,12 +44,8 @@ export default {
     // 任务类别
     initTaskCatListData() {
       getTaskCatByList().then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.taskCatList = data
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        this.taskCatList = data
       }).catch((error) => {
         console.log(error)
       })

src/components/TaskPanel/index.vue

@@ -99,14 +99,10 @@ export default {
     getData() {
       this.listLoading = true
       getTaskByList(this.conditions).then((resp) => {
-        const { code, data, total, msg } = resp
+        const { data, total } = resp
         this.listLoading = false
-        if (code === 200) {
-          this.total = total
-          this.dataList = data
-        } else {
-          this.$message.error(msg)
-        }
+        this.total = total
+        this.dataList = data
       }).catch((error) => {
         console.log(error)
       })

src/components/UserSelector/index.vue

@@ -76,12 +76,8 @@ export default {
     // 初始化用户列表
     initUserListData() {
       getUserList().then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.userList = data
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        this.userList = data
       }).catch((error) => {
         console.log(error)
       })

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

@@ -1,15 +1,15 @@
 <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="160">
+      <el-table-column prop="actionTime" align="center" label="处理时间" width="170">
         <template v-slot="{row}">
           <span><i class="el-icon el-icon-time" />{{ row.actionTime }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column prop="accountAvatar" align="center" label="人员" width="150">
+      <el-table-column prop="accountAvatar" align="center" label="人员" width="160">
         <template v-slot="{row}">
           <div class="flex-center">
             <el-image style="width: 20px; height: 20px;border-radius:50%" :src="row.accountAvatar" :preview-src-list="[row.accountAvatar]" />
@@ -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,30 +70,18 @@ export default {
         }
       },
       listLoading: false,
-      flowData: {
-        wfDefId: 1,
-        wfInsId: undefined,
-        wfInsTitle: '',
-        wfInsStatus: undefined,
-        activityIns: undefined,
-        activityInsRecordList: []
-      },
+      dataList: [],
       rules: {}
     }
   },
   methods: {
     getData(wfInsId) {
       if (!wfInsId) return
-
       this.listLoading = true
-      getWorkflowById(wfInsId).then((resp) => {
+      getWorkflowRecordById(wfInsId).then((resp) => {
         this.listLoading = false
-        const { code, data, msg } = resp
-        if (code === 200) {
-          this.flowData = data
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        this.dataList = data
       })
     }
   }

src/components/WorkFlow/index.vue

@@ -1,13 +1,13 @@
 <template>
   <div>
-    <el-form ref="flowForm" :model="formData" :rules="rules" label-width="100px">
-
-      <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 ref="flowForm" :model="formData" :rules="rules" label-width="130px">
+      <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>
 
@@ -22,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'
@@ -46,7 +46,7 @@ export default {
       title: '',
       listLoading: false,
       conditions: {},
-      actionId: 0,
+      actionDefId: 0,
       actionVisible: false,
       remarkVisible: true,
       handlerVisible: true,
@@ -57,12 +57,16 @@ export default {
         activityDefId: undefined,
         activityInsId: undefined,
         activityCode: '',
-        actionId: 0,
+        actionDefId: 0,
+        actionInsId: undefined,
         actionCode: '',
         actionRemark: '', // 说明
         groupIdTo: undefined,
         positionIdTo: undefined,
         accountIdTo: undefined, // 执行人
+        groupNameTo: undefined,
+        positionNameTo: undefined,
+        accountNameTo: undefined,
         attachList: []
       },
       rules: {
@@ -73,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: []
       }
     }
   },
@@ -95,7 +102,7 @@ export default {
     ])
   },
   watch: {
-    actionId(val) {
+    actionDefId(val) {
       if (val > 0) {
         this.getActionCode(val)
       }
@@ -106,39 +113,36 @@ export default {
     // 启动流程
     async start(wfDefId) {
       this.resetFormData()
-      const { code, data, msg } = await startWorkflow(wfDefId)
-      if (code === 200) {
-        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.renderAction()
-        return data.wfInsId
-      } else {
-        this.$message.error(msg)
-        return 0
-      }
+      const { data } = await startWorkflow(wfDefId)
+      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()
+      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('数据配置有误！请联系管理员!')
         }
       }
     },
@@ -146,32 +150,83 @@ export default {
     // 获取流程
     get(wfInsId) {
       this.resetFormData()
-      getWorkflowById(wfInsId).then((resp) => {
-        const { code, data, msg } = resp
-        if (code === 200) {
+      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.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()
-        } else {
-          this.$message.error(msg)
-        }
+          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.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
@@ -188,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)
@@ -205,6 +258,7 @@ export default {
       }
       return bRet
     },
+
     verifyForm() {
       return new Promise((reslove, reject) => {
         this.$refs['flowForm'].validate((valid) => {
@@ -219,23 +273,18 @@ export default {
 
     // 处理流程
     async handle(param2) {
-      await this.verifyForm()
       const param1 = JSON.parse(JSON.stringify(this.formData))
       const params = { ...param1, ...param2 }
-      const { code, msg, data } = await handleWorkflow(params)
-      if (code === 200) {
-        const flowData = {
-          activityCode: this.formData.activityCode,
-          actionId: this.formData.actionId,
-          actionCode: this.formData.actionCode,
-          actionRemark: this.formData.actionRemark,
-          attachList: this.formData.attachList
-        }
-        return { ...data, data: flowData }
-      } else {
-        this.$message.error(msg)
-        return false
+      const { data } = await handleWorkflow(params)
+      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: formData }
     },
 
     // 用户选择
@@ -243,6 +292,9 @@ export default {
       this.formData.accountIdTo = item.accountId
       this.formData.groupIdTo = item.groupId
       this.formData.positionIdTo = item.positionId
+      this.formData.accountNameTo = item.accountName
+      this.formData.groupNameTo = item.groupName
+      this.formData.positionNameTo = item.positionName
     },
 
     // 重置
@@ -267,8 +319,12 @@ export default {
         this.formData.accountIdTo = userData.userId
         this.formData.groupIdTo = userData.groupId
         this.formData.positionId = userData.positionId
+        this.formData.groupNameTo = userData.groupName
+        this.formData.positionNameTo = userData.positionName
+        this.formData.accountNameTo = userData.userName
       }
     },
+
     isNotNull(val) {
       if (val !== undefined && val !== 'undefined' && val !== null && val !== '' && val !== ' ') { return true } else {
         return false

src/components/index.js

@@ -2,15 +2,17 @@
  * 暴露组件
  */
 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' // 单位选择
-export { default as OrgCatSelector } from './OrgCatSelector/index' // 单位类型选择
+export { default as OcCatSelector } from '@/components/OcCatSelector/index' // 单位类型选择
 export { default as MsgCatSelector } from './MsgCatSelector/index' // 消息类型选择
 export { default as UserSelector } from './UserSelector/index' // 帐号选择
 export { default as PositionSelector } from './PositionSelector' // 岗位选择
 export { default as TaskCatSelector } from './TaskCatSelector' // 任务分类选择
+export { default as JobSelector } from './JobSelector' // 派发JOB选择
+export { default as ChecklistSelector } from './ChecklistSelector' // 清单选择
 
 export { default as Breadcrumb } from '@/components/Breadcrumb'
 export { default as Hamburger } from '@/components/Hamburger'
@@ -36,6 +38,12 @@ export { default as IndexScoreProgressPanel } from './IndexScoreProgressPanel/in
 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' // 单位类型选择