Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-ui/.env.development

@@ -14,10 +14,10 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 VUE_APP_BASE_API1 = 'http://192.168.110.83:8066/'
 
 #数据引擎模块IP
-VUE_APP_BASE_API2 = 'http://192.168.110.83:8099/'
+#VUE_APP_BASE_API2 = 'http://192.168.110.83:8099/'
 
 #表单引擎模块IP
-VUE_APP_BASE_API3 = 'http://192.168.110.83:8088/'
+#VUE_APP_BASE_API3 = 'http://192.168.110.83:8088/'
 
 #流程引擎模块IP
-VUE_APP_BASE_API4 = 'http://192.168.110.83:8055/'
+#VUE_APP_BASE_API4 = 'http://192.168.110.83:8055/'

zkqy-ui/src/api/bpmprocess/process.js

@@ -6,7 +6,7 @@ export function listProcess(query) {
     url: '/system/process/list',
     method: 'get',
     params: query,
-    baseURL: process.env.VUE_APP_BASE_API4
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -15,7 +15,7 @@ export function getProcess(processId) {
   return request({
     url: '/system/process/' + processId,
     method: 'get',
-    baseURL: process.env.VUE_APP_BASE_API4
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -25,7 +25,7 @@ export function addProcess(data) {
     url: '/system/process',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API4,
+    baseURL: process.env.VUE_APP_BASE_API1,
   })
 }
 
@@ -35,7 +35,7 @@ export function updateProcess(data) {
     url: '/system/process',
     method: 'put',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API4
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -44,7 +44,7 @@ export function delProcess(processId) {
   return request({
     url: '/system/process/' + processId,
     method: 'delete',
-    baseURL: process.env.VUE_APP_BASE_API4
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -54,7 +54,7 @@ export function bpmBackups(data) {
     url: 'system/process/bpmBackups',
     method: 'put',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API4
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -65,7 +65,7 @@ export function exportFileProcess(processIds) {
     url: '/system/process/exportProcessFile/' + processIds,
     method: 'get',
     responseType: 'blob',
-    baseURL: process.env.VUE_APP_BASE_API4,
+    baseURL: process.env.VUE_APP_BASE_API1,
   })
 }
 
@@ -76,7 +76,7 @@ export function enableProcess(data) {
     url: '/system/process/enableProcess',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API4,
+    baseURL: process.env.VUE_APP_BASE_API1,
   })
 }
 
@@ -87,7 +87,7 @@ export function addConfiguration(data) {
     url: '/system/configuration/addProcessNodeConfiguration',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API4,
+    baseURL: process.env.VUE_APP_BASE_API1,
     // baseURL: 'http://192.168.110.59:8055',
   })
 }
@@ -98,7 +98,7 @@ export function updateConfiguration(data) {
     url: '/system/configuration/updateProcessNodeConfiguration',
     method: 'put',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API4,
+    baseURL: process.env.VUE_APP_BASE_API1,
   })
 }
 
@@ -107,11 +107,10 @@ export function getNodeData(processKey) {
   return request({
     url: '/system/configuration/selectByProcessByKey/' + processKey,
     method: 'get',
-    baseURL: process.env.VUE_APP_BASE_API4,
+    baseURL: process.env.VUE_APP_BASE_API1,
   })
 }
 
-
 // 查询流程节点脚本列表
 export function listScript(query) {
   return request({
@@ -138,14 +137,14 @@ export function addScript(data) {
   })
 }
 
-//触发异常节点 
+//触发异常节点
 export function triggerExceptionNode(data) {
   return request({
     // url: '/system/execute/node/triggerExceptionNode',
     url: '/system/runbpm/process/triggerExceptionNode',//触发异常节点  1214版
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API4,
+    baseURL: process.env.VUE_APP_BASE_API1,
   })
 }
 

zkqy-ui/src/api/bpmprocess/run/executeProcess.js

@@ -49,7 +49,7 @@ export function processList(query) {
     url: '/system/execute/process/list',
     method: 'get',
     params: query,
-    baseURL: process.env.VUE_APP_BASE_API4,
+    baseURL: process.env.VUE_APP_BASE_API1,
   })
 }
 
@@ -59,7 +59,7 @@ export function runProcessNodeExecution(data) {
     url: '/system/runbpm/process/processNodeExecution',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API4
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -69,7 +69,7 @@ export function getProcessNodeFormTemplate(query) {
     url: '/system/runbpm/process/ProcessNodeFormTemplate',
     method: 'get',
     params: query,
-    baseURL: process.env.VUE_APP_BASE_API4,
+    baseURL: process.env.VUE_APP_BASE_API1,
   })
 }
 // 运行节点   新 请求节点的表单数据
@@ -78,6 +78,6 @@ export function getProcessNodeFormInfoData(query) {
     url: '/system/runbpm/process/processNodeFormInfoData',
     method: 'get',
     params: query,
-    baseURL: process.env.VUE_APP_BASE_API4,
+    baseURL: process.env.VUE_APP_BASE_API1,
   })
 }

zkqy-ui/src/api/bpmprocess/runDialogApi/index.js

@@ -8,6 +8,16 @@ export function submitNodeForm(data) {
     url: '/system/runbpm/process/submitNodeForm',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API4
+    baseURL: process.env.VUE_APP_BASE_API1
   })
-}
+}
+
+// 修改节点状态
+export function changeNodeState(data) {
+  return request({
+    url: '/system/execute/node',
+    method: 'put',
+    data: data,
+    baseURL: process.env.VUE_APP_BASE_API1
+  })
+}

zkqy-ui/src/api/dataEngine/index.js

@@ -5,42 +5,28 @@ export function tableInfoList(query) {
     url: '/tableInfo/tableInfoList',
     method: 'get',
     params: query,
-    baseURL: process.env.VUE_APP_BASE_API2
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
 
-// export function removeTable(tableName) {
-//   return request({
-//     url: '/tableInfo/removeTable/' + tableName,
-//     method: 'delete',
-//     baseURL:process.env.VUE_APP_BASE_API2
-//   })
-// }
-
 export function removeTable(data) {
   return request({
     url: '/tableInfo/removeTable',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API2
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
-// export function tableInfo(tableName) {
-//   return request({
-//     url: '/tableInfo/tableFieldInfo?tableName=' + tableName,
-//     method: 'get',
-//     baseURL:process.env.VUE_APP_BASE_API2
-//   })
-// }
+
 
 export function tableInfo(data) {
   return request({
     url: '/tableInfo/tableFieldInfo',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API2
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -49,7 +35,7 @@ export function editTable(data) {
     url: '/tableInfo/editTable',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API2
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -58,6 +44,5 @@ export function changeDatasource(data = {}) {
     url: '/dataSource/changeDatasource',
     method: 'post',
     data: data,
-    // baseURL: process.env.VUE_APP_BASE_API2
   })
 }

zkqy-ui/src/api/datasheet/index.js

@@ -5,7 +5,7 @@ export function createDatabase(data) {
       url: '/tableInfo/createTable',
       method: 'post',
       data: data,
-      baseURL:process.env.VUE_APP_BASE_API2
+      baseURL:process.env.VUE_APP_BASE_API1
     })
   }
 
@@ -14,7 +14,7 @@ export function createDatabase(data) {
       url: '/tableInfo/createSqlServerDataBase',
       method: 'post',
       data: data,
-      baseURL:process.env.VUE_APP_BASE_API2
+      baseURL:process.env.VUE_APP_BASE_API1
     })
   }
 
@@ -23,6 +23,6 @@ export function createDatabase(data) {
       url: '/tableInfo/createDmDataBase',
       method: 'post',
       data: data,
-      baseURL:process.env.VUE_APP_BASE_API2
+      baseURL:process.env.VUE_APP_BASE_API1
     })
-  }
+  }

zkqy-ui/src/api/dragform/form.js

@@ -6,7 +6,7 @@ export function listForm(query) {
     url: '/dragform/form/list',
     method: 'get',
     params: query,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -15,7 +15,7 @@ export function getForm(fId) {
   return request({
     url: '/dragform/form/' + fId,
     method: 'get',
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -25,7 +25,7 @@ export function addForm(data) {
     url: '/dragform/form',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -35,7 +35,7 @@ export function updateForm(data) {
     url: '/dragform/form',
     method: 'put',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -44,17 +44,17 @@ export function delForm(fId) {
   return request({
     url: '/dragform/form/' + fId,
     method: 'delete',
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
-// 获取当前数据源所有表 
+// 获取当前数据源所有表
 export function getFormName(data) {
   return request({
     url: '/dataSource/getAllTable',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 // 获取列名
@@ -63,7 +63,7 @@ export function getListName(data) {
     url: '/dataSource/getInfoTable',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -73,7 +73,7 @@ export function dragTablePreview(query) {
     url: '/dragform/common/dragTablePreview',
     method: 'get',
     params: query,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 

zkqy-ui/src/api/dragform/tableList.js

@@ -5,7 +5,7 @@ export function listTable(query) {
     url: '/system/table/list',
     method: 'get',
     params: query,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 // 查询拖拽表格列表
@@ -14,7 +14,7 @@ export function dragTableList(query) {
     url: '/system/table/dragTableList',
     method: 'get',
     params: query,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 // 删除表格列表
@@ -23,6 +23,6 @@ export function removeTableList(data) {
     url: '/system/table/remove',
     method: 'delete',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
-}
+}

zkqy-ui/src/api/relateTable/index.js

@@ -6,7 +6,7 @@ export function listGroup(query) {
     url: '/system/group/list',
     method: 'get',
     params: query,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
 
   })
 }
@@ -25,7 +25,7 @@ export function addGroup(data) {
     url: '/system/group',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -35,7 +35,7 @@ export function getTable(query) {
     url: '/system/group/listDetail',
     method: 'get',
     params: query,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -44,7 +44,7 @@ export function delGroup(id) {
   return request({
     url: '/system/group/' + id,
     method: 'delete',
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -54,7 +54,7 @@ export function dragGroupTableInfo(query) {
     url: '/system/group/dragGroupTableInfo',
     method: 'get',
     params: query,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -64,6 +64,6 @@ export function updataGroup(data){
     url: '/system/group',
     method: 'put',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }

zkqy-ui/src/api/system/PortalEngine.js

@@ -8,6 +8,5 @@ export function getTenant(data) {
       url: 'system/tenant/list',
       method: 'get',
       params: data,
-    //   baseURL:process.env.VUE_APP_BASE_API2
     })
   }

zkqy-ui/src/api/system/btn.js

@@ -1,13 +1,13 @@
 import request from '@/utils/request'
 
 // 查询格绑定的自定义按钮列表
-// btnParentId：0 
+// btnParentId：0
 export function listBtn(query) {
   return request({
     url: '/system/btn/list',
     method: 'get',
     params: query,
-    baseURL:process.env.VUE_APP_BASE_API3
+    baseURL:process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -16,7 +16,7 @@ export function getBtn(id) {
   return request({
     url: '/system/btn/' + id,
     method: 'get',
-    baseURL:process.env.VUE_APP_BASE_API3
+    baseURL:process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -26,7 +26,7 @@ export function addBtn(data) {
     url: '/system/btn',
     method: 'post',
     data: data,
-    baseURL:process.env.VUE_APP_BASE_API3
+    baseURL:process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -36,7 +36,7 @@ export function updateBtn(data) {
     url: '/system/btn',
     method: 'put',
     data: data,
-    baseURL:process.env.VUE_APP_BASE_API3
+    baseURL:process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -45,6 +45,6 @@ export function delBtn(id) {
   return request({
     url: '/system/btn/' + id,
     method: 'delete',
-    baseURL:process.env.VUE_APP_BASE_API3
+    baseURL:process.env.VUE_APP_BASE_API1
   })
 }

zkqy-ui/src/api/system/data.js

@@ -7,7 +7,7 @@ export function getList(query) {
     url: '/dataSource/list',
     method: 'get',
     params: query,
-    baseURL:process.env.VUE_APP_BASE_API2
+    baseURL:process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -27,7 +27,7 @@ export function getDataSourceInfo(query) {
     url: '/dataSource/querySelectDataSource',
     method: 'get',
     params: query,
-    baseURL:process.env.VUE_APP_BASE_API2
+    baseURL:process.env.VUE_APP_BASE_API1
   })
 }
 // 校验当前数据库名称得到得到当前数据源下所有库的信息
@@ -36,7 +36,7 @@ export function insertDataSource(data) {
     url: '/tableInfo/initDatabase',
     method: 'post',
     data: data,
-    baseURL:process.env.VUE_APP_BASE_API2
+    baseURL:process.env.VUE_APP_BASE_API1
   })
 }
 

zkqy-ui/src/api/system/table.js

@@ -7,7 +7,7 @@ export function getTableInfo(query) {
   return request({
     url: `/system/table/getInfo/${query}`,
     method: 'get',
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -17,6 +17,6 @@ export function editTable(data) {
     url: '/system/table/edit',
     method: 'put',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }

zkqy-ui/src/api/system/user.js

@@ -12,6 +12,7 @@ export function listUser(query) {
 
 // 查询用户详细
 export function getUser(userId) {
+  console.log(userId,"dddddd")
   return request({
     url: '/system/user/' + parseStrEmpty(userId),
     method: 'get'

zkqy-ui/src/api/tablelist/commonTable.js

@@ -7,7 +7,7 @@ export function listTableData(query) {
     url: '/dragform/common/selectList',
     method: 'get',
     params: query,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -38,7 +38,7 @@ export function addTableData(data) {
     url: '/dragform/common/batchInsert',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -48,7 +48,7 @@ export function batchEdit(data) {
     url: '/dragform/common/batchEdit',
     method: 'put',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -58,7 +58,7 @@ export function updateTableData(data) {
     url: '/dragform/common/edit',
     method: 'put',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -68,7 +68,7 @@ export function delTableData(data) {
     url: '/dragform/common/batchDelete',
     method: 'delete',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -78,7 +78,7 @@ export function listTableTem(query) {
     url: '/system/table/list',
     method: 'get',
     params: query,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -87,7 +87,7 @@ export function getTableTem(tId) {
   return request({
     url: '/system/table/' + tId,
     method: 'get',
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -97,7 +97,7 @@ export function addTableTem(data) {
     url: '/system/table',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -107,7 +107,7 @@ export function updateTableTem(data) {
     url: '/system/table',
     method: 'put',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -116,7 +116,7 @@ export function delTableTem(tId) {
   return request({
     url: '/system/table/' + tId,
     method: 'delete',
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -125,7 +125,7 @@ export function getInfoBySqlKey(sqlKey) {
   return request({
     url: '/dragform/form/getInfoBySqlKey/' + sqlKey,
     method: 'get',
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -135,7 +135,7 @@ export function addDragTable(data) {
     url: '/system/table/addDragTable',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -146,7 +146,7 @@ export function addStatistic(data) {
     url: '/system/statistic',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -156,7 +156,7 @@ export function updateStatistic(data) {
     url: '/system/statistic',
     method: 'put',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -165,7 +165,7 @@ export function getStatistic(id) {
   return request({
     url: '/system/statistic/' + id,
     method: 'get',
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -174,7 +174,7 @@ export function delStatistic(data) {
   return request({
     url: '/system/statistic/' + data,
     method: 'delete',
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -184,7 +184,7 @@ export function exportStatistic(data) {
     url: '/system/statistic/export',
     method: 'post',
     data: data,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 
@@ -194,7 +194,7 @@ export function listStatistic(query) {
     url: '/system/statistic/list',
     method: 'get',
     params: query,
-    baseURL: process.env.VUE_APP_BASE_API3
+    baseURL: process.env.VUE_APP_BASE_API1
   })
 }
 

zkqy-ui/src/layout/index.vue

@@ -5,7 +5,7 @@
       <el-row>
         <el-col :span="12">
           <span>
-            <img src="../assets/images/comlo.png" alt="" class="imgg" />
+            <img src="../assets/images/mec_logo1.png" alt="" class="imgg" />
           </span>
         </el-col>
         <el-col :span="4" :offset="8">
@@ -146,7 +146,7 @@ export default {
     },
   },
   mounted() {
-    if(user){
+    if (user) {
       var user = sessionStorage.getItem("sessionObj");
       var user = JSON.parse(user);
       this.userName = JSON.parse(user.data).username;

zkqy-ui/src/views/bpmprocess/index.vue

@@ -655,7 +655,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        process.env.VUE_APP_BASE_API4 + "system/process/export",
+        process.env.VUE_APP_BASE_API1 + "system/process/export",
         {
           ...this.queryParams,
         },

zkqy-ui/src/views/bussiness/dialogCompments/Mec/PersonalDistribution.vue

@@ -1,322 +1,323 @@
 <template>
-    <div class="app-container">
-      <div class="leftMessage">
-        <div class="list" v-for="(item, index) in baseMessage" :key="index">
-          <span class="title">
-            {{ item.title }}
-          </span>
-          <span v-if="item.prop == 'taskNo'" class="content">
-            {{ form.masterTask[item.prop] }}
-          </span>
-          <span
-            v-else-if="item.prop == 'mapNumber'"
-            class="content"
-            style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
-          >
-            {{ form.masterTask[item.prop] }}
-          </span>
-          <span
-            v-else-if="item.prop == 'mapName'"
-            class="content"
-            style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
+  <div class="app-container">
+    <div class="leftMessage">
+      <div class="list" v-for="(item, index) in baseMessage" :key="index">
+        <span class="title">
+          {{ item.title }}
+        </span>
+        <span v-if="item.prop == 'taskNo'" class="content">
+          {{ form.masterTask[item.prop] }}
+        </span>
+        <span
+          v-else-if="item.prop == 'mapNumber'"
+          class="content"
+          style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
+        >
+          {{ form.masterTask[item.prop] }}
+        </span>
+        <span
+          v-else-if="item.prop == 'mapName'"
+          class="content"
+          style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
+        >
+          {{ form.masterTask[item.prop] }}
+        </span>
+        <span
+          v-else-if="item.prop == 'modelNumber'"
+          class="content"
+          style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
+        >
+          {{ form.masterTask[item.prop] }}
+        </span>
+        <span
+          v-else-if="item.prop == 'craftRoute'"
+          class="content"
+          style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
+        >
+          {{ form.masterTask[item.prop] }}
+        </span>
+        <span
+          v-else
+          class="content"
+          style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
+        >
+          {{ form.recordQualityControlCard[item.prop] }}
+        </span>
+      </div>
+      <div></div>
+      <div class="content"></div>
+    </div>
+    <div class="rightMessage">
+      <div class="top">
+        <div class="state">
+          <div class="list">
+            <span>工序状态：</span>
+            <p id="state">
+              {{
+                form.taskNodeOtherState
+                  ? stateObj[form.taskNodeOtherState]
+                  : "初始"
+              }}
+            </p>
+          </div>
+          <div class="list">
+            <span>是否外协：</span>
+            <p>
+              <el-checkbox
+                @change="
+                  (val) => {
+                    updateHandler(form.taskNodeOtherState, val);
+                  }
+                "
+                v-model="checked"
+              ></el-checkbox>
+            </p>
+          </div>
+        </div>
+      </div>
+      <div class="button">
+        <el-button-group prop="state">
+          <el-button
+            type="primary"
+            icon="el-icon-video-play"
+            plain
+            round
+            @click="updateHandler('1', checked)"
+            >开始</el-button
           >
-            {{ form.masterTask[item.prop] }}
-          </span>
-          <span
-            v-else-if="item.prop == 'modelNumber'"
-            class="content"
-            style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
+          <el-button
+            type="danger"
+            icon="el-icon-video-pause"
+            plain
+            @click="updateHandler('2', checked)"
+            >暂停</el-button
           >
-            {{ form.masterTask[item.prop] }}
-          </span>
-          <span
-            v-else-if="item.prop == 'craftRoute'"
-            class="content"
-            style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
+          <el-button
+            type="success"
+            icon="el-icon-circle-check"
+            plain
+            @click="updateHandler('3', checked)"
+            >完成</el-button
           >
-            {{ form.masterTask[item.prop] }}
-          </span>
-          <span
-            v-else
-            class="content"
-            style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
+          <el-button
+            type="info"
+            icon="el-icon-refresh"
+            plain
+            round
+            @click="updateHandler('0', checked)"
+            >重置</el-button
           >
-            {{ form.recordQualityControlCard[item.prop] }}
-          </span>
-        </div>
-        <div></div>
-        <div class="content"></div>
+        </el-button-group>
       </div>
-      <div class="rightMessage">
-        <div class="top">
-          <div class="state">
-            <div class="list">
-              <span>工序状态：</span>
-              <p id="state">
-                {{
-                  form.taskNodeOtherState
-                    ? stateObj[form.taskNodeOtherState]
-                    : "初始"
-                }}
-              </p>
-            </div>
-            <div class="list">
-              <span>是否外协：</span>
-              <p>
-                <el-checkbox
-                  @change="
-                    (val) => {
-                      updateHandler(form.taskNodeOtherState, val);
-                    }
-                  "
-                  v-model="checked"
-                ></el-checkbox>
-              </p>
-            </div>
-          </div>
-        </div>
-        <div class="button">
-          <el-button-group prop="state">
-            <el-button
-              type="primary"
-              icon="el-icon-video-play"
-              plain
-              round
-              @click="updateHandler('1', checked)"
-              >开始</el-button
-            >
-            <el-button
-              type="danger"
-              icon="el-icon-video-pause"
-              plain
-              @click="updateHandler('2', checked)"
-              >暂停</el-button
-            >
-            <el-button
-              type="success"
-              icon="el-icon-circle-check"
-              plain
-              @click="updateHandler('3', checked)"
-              >完成</el-button
-            >
-            <el-button
-              type="info"
-              icon="el-icon-refresh"
-              plain
-              round
-              @click="updateHandler('0', checked)"
-              >重置</el-button
-            >
-          </el-button-group>
-        </div>
-        <div class="middle" v-show="!checked">
-          <el-table :data="oldTableData" border ref="addTableRowRef">
-            <el-table-column label="人员姓名">
-              <template slot-scope="scope">
-                <el-input
-                  v-if="scope.row.isEdit"
-                  v-model="editingRow.personnelName"
-                ></el-input>
-                <span v-else>{{ scope.row.personnelName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="分配工时">
-              <template slot-scope="scope">
-                <el-input-number
-                  v-if="scope.row.isEdit"
-                  v-model="editingRow.allottedTime"
-                  controls-position="right"
-                  @change="handleChange"
-                  :min="0"
-                  :step="0.25"
-                  size="small"
-                ></el-input-number>
-                <span v-else>{{ scope.row.allottedTime }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" width="120" align="center">
-              <template slot-scope="scope">
-                <el-dropdown v-if="!scope.row.isEdit">
-                  <el-button type="warning" plain size="small">
-                    处理<i class="el-icon-arrow-down el-icon--right"></i>
-                  </el-button>
-                  <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item
-                      ><el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-edit"
-                        @click="changeHandler(scope.row)"
-                        >修改</el-button
-                      ></el-dropdown-item
+      <div class="middle" v-show="!checked">
+        <el-table :data="oldTableData" border ref="addTableRowRef">
+          <el-table-column label="人员姓名">
+            <template slot-scope="scope">
+              <el-input
+                v-if="scope.row.isEdit"
+                v-model="editingRow.personnelName"
+              ></el-input>
+              <span v-else>{{ scope.row.personnelName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="分配工时">
+            <template slot-scope="scope">
+              <el-input-number
+                v-if="scope.row.isEdit"
+                v-model="editingRow.allottedTime"
+                controls-position="right"
+                @change="handleChange"
+                :min="0"
+                :step="0.25"
+                size="small"
+              ></el-input-number>
+              <span v-else>{{ scope.row.allottedTime }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="120" align="center">
+            <template slot-scope="scope">
+              <el-dropdown v-if="!scope.row.isEdit">
+                <el-button type="warning" plain size="small">
+                  处理<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item
+                    ><el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-edit"
+                      @click="changeHandler(scope.row)"
+                      >修改</el-button
+                    ></el-dropdown-item
+                  >
+                  <el-dropdown-item
+                    ><el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-delete"
+                      @click="deleteOne(scope.row)"
+                      v-hasPermi="['system:dict:remove']"
+                      >删除</el-button
                     >
-                    <el-dropdown-item
-                      ><el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-delete"
-                        @click="deleteOne(scope.row)"
-                        v-hasPermi="['system:dict:remove']"
-                        >删除</el-button
-                      >
-                    </el-dropdown-item>
-                  </el-dropdown-menu>
-                </el-dropdown>
-                <el-dropdown v-else>
-                  <el-button type="warning" plain size="small">
-                    处理<i class="el-icon-arrow-down el-icon--right"></i>
-                  </el-button>
-                  <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item
-                      ><el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-edit"
-                        @click="saveOne"
-                        >保存</el-button
-                      ></el-dropdown-item
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+              <el-dropdown v-else>
+                <el-button type="warning" plain size="small">
+                  处理<i class="el-icon-arrow-down el-icon--right"></i>
+                </el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item
+                    ><el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-edit"
+                      @click="saveOne"
+                      >保存</el-button
+                    ></el-dropdown-item
+                  >
+                  <el-dropdown-item
+                    ><el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-delete"
+                      @click="cancelHandler(scope.row)"
+                      v-hasPermi="['system:dict:remove']"
+                      >取消</el-button
                     >
-                    <el-dropdown-item
-                      ><el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-delete"
-                        @click="cancelHandler(scope.row)"
-                        v-hasPermi="['system:dict:remove']"
-                        >取消</el-button
-                      >
-                    </el-dropdown-item>
-                  </el-dropdown-menu>
-                </el-dropdown>
-                <!-- <el-button
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+              <!-- <el-button
                   icon="el-icon-delete"
                   size="mini"
                   @click="deleteTableRow(scope.$index)"
                   >删除</el-button
                 > -->
-              </template>
-            </el-table-column>
-          </el-table>
-          <div class="name">人员及工时分配</div>
-          <el-table :data="tableData" border ref="addTableRowRef">
-            <el-table-column label="人员姓名">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.personnelName"></el-input>
-              </template>
-            </el-table-column>
-            <el-table-column label="分配工时">
-              <template slot-scope="scope">
-                <el-input-number
-                  v-model="scope.row.allottedTime"
-                  controls-position="right"
-                  @change="handleChange"
-                  :min="0"
-                  :step="0.25"
-                  size="small"
-                ></el-input-number>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" width="120" align="center">
-              <template slot-scope="scope">
-                <el-button
-                  icon="el-icon-delete"
-                  size="mini"
-                  @click="deleteTableRow(scope.$index)"
-                  >删除</el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
-          <div class="block">
-            <el-pagination layout="prev, pager, next" :total="50">
-            </el-pagination>
-          </div>
-          <el-button
-            size="mini"
-            icon="el-icon-plus"
-            type="primary"
-            @click="addTableRow"
-            >新 增</el-button
-          >
-          <el-button
-            size="mini"
-            icon="el-icon-check"
-            type="success"
-            @click="saveTableRow"
-            >保 存</el-button
-          >
-          <div class="total">
-            <span>当前工序总工时： 10</span>
-            <span>当前已分配工时： 10</span>
-            <span>当前剩余工时： 10</span>
-          </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="name">人员及工时分配</div>
+        <el-table :data="tableData" border ref="addTableRowRef">
+          <el-table-column label="人员姓名">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.personnelName"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="分配工时">
+            <template slot-scope="scope">
+              <el-input-number
+                v-model="scope.row.allottedTime"
+                controls-position="right"
+                @change="handleChange"
+                :min="0"
+                :step="0.25"
+                size="small"
+              ></el-input-number>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="120" align="center">
+            <template slot-scope="scope">
+              <el-button
+                icon="el-icon-delete"
+                size="mini"
+                @click="deleteTableRow(scope.$index)"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block">
+          <el-pagination layout="prev, pager, next" :total="50">
+          </el-pagination>
+        </div>
+        <el-button
+          size="mini"
+          icon="el-icon-plus"
+          type="primary"
+          @click="addTableRow"
+          >新 增</el-button
+        >
+        <el-button
+          size="mini"
+          icon="el-icon-check"
+          type="success"
+          @click="saveTableRow"
+          >保 存</el-button
+        >
+        <div class="total">
+          <span>当前工序总工时： 10</span>
+          <span>当前已分配工时： 10</span>
+          <span>当前剩余工时： 10</span>
         </div>
       </div>
     </div>
+  </div>
 </template>
 <script>
 import {
-submitNodeForm,
-changeNodeState,
+  submitNodeForm,
+  changeNodeState,
 } from "@/api/bpmprocess/runDialogApi/index";
 import { getProcessNodeFormInfoData } from "@/api/bpmprocess/run/executeProcess";
 export default {
-name: "PersonalDistribution",
-props: ["formData", "row"],
-data() {
+  name: "PersonalDistribution",
+  props: ["formData", "row"],
+  data() {
     return {
-    checked: true,
-    isEdit: false,
-    form: {
+      checked: true,
+      isEdit: false,
+      form: {
         taskNodeOtherState: "0",
-    },
-    tableData: [],
-    editingRow: {},
-    oldTableData: [
+      },
+      tableData: [],
+      editingRow: {},
+      oldTableData: [
         {
-        id: 1,
-        personnelName: "芝麻林",
-        allottedTime: 1,
-        isEdit: false,
+          id: 1,
+          personnelName: "芝麻林",
+          allottedTime: 1,
+          isEdit: false,
         },
-    ],
-    newRow: {},
+      ],
+      newRow: {},
 
-    baseMessage: [
+      baseMessage: [
         { title: "任务", prop: "taskNo" },
         { title: "图号", prop: "mapNumber" },
         { title: "名称", prop: "mapName" },
         { title: "数量", prop: "modelNumber" },
         { title: "工艺", prop: "craftRoute" },
         { title: "质控", prop: "qualityControlCard" },
-    ],
-    stateObj: {
+      ],
+      stateObj: {
         0: "初始",
         1: "开始",
         2: "暂停",
         3: "完成",
-    },
+      },
     };
-},
-computed: {
+  },
+  computed: {
     myFormData() {
-    return this.formData;
+      return this.formData;
     },
-},
-watch: {
+  },
+  watch: {
     myFormData: {
-    handler(nval) {
+      handler(nval) {
         if (!nval) return;
         this.initData(nval);
+      },
+      deep: true,
+      immediate: true,
     },
-    deep: true,
-    immediate: true,
-    },
-},
-methods: {
+  },
+  methods: {
+    resetForm() {},
     async updateHandler(state, flag) {
-    flag = flag ? "true" : "false";
-    let payLoad = {
+      flag = flag ? "true" : "false";
+      let payLoad = {
         // conditionMap: {
         taskProcessKey: this.row.benTaskProcessKey,
         taskNodeKey: this.row.benTaskNodeKey,
@@ -325,145 +326,145 @@ methods: {
         taskNodeOtherState: state,
         task1: flag,
         // },
-    };
+      };
 
-    changeNodeState(payLoad).then((response) => {
+      changeNodeState(payLoad).then((response) => {
         if (response.code == 200) {
-        this.$modal.msgSuccess("修改成功");
-        this.form.taskNodeOtherState = state;
+          this.$modal.msgSuccess("修改成功");
+          this.form.taskNodeOtherState = state;
         } else {
-        this.$modal.error("修改失败,请稍后再试");
+          this.$modal.error("修改失败,请稍后再试");
         }
-    });
+      });
     },
     async submitHandler() {
-    console.log(this.row);
-    let res = await this.$refs.form?.validate();
-    if (res) {
+      console.log(this.row);
+      let res = await this.$refs.form?.validate();
+      if (res) {
         let payLoad = {};
         let { state } = this.form;
         console.log(this.form);
         if (this.isEdit) {
-        let { taskKey, taskNodeKey } = this.myFormData.resultMap;
-        payLoad.updateCommonEntityList = [
+          let { taskKey, taskNodeKey } = this.myFormData.resultMap;
+          payLoad.updateCommonEntityList = [
             {
-            basicMap: {
+              basicMap: {
                 tableName: "bpm_execute_node",
-            },
-            conditionMap: {
+              },
+              conditionMap: {
                 task_key: taskKey,
                 task_node_key: taskNodeKey,
-            },
-            commMap: {
+              },
+              commMap: {
                 task_node_other_state: state,
+              },
             },
-            },
-        ];
+          ];
         } else {
-        payLoad.insertCommonEntityList = [
+          payLoad.insertCommonEntityList = [
             {
-            basicMap: {
+              basicMap: {
                 tableName: "bpm_execute_node",
-            },
-            addListMap: [
+              },
+              addListMap: [
                 {
-                task_node_other_state: state,
-                taskKey: this.row.benTaskProcessKey,
-                taskNodeKey: this.row.benTaskNodeKey,
+                  task_node_other_state: state,
+                  taskKey: this.row.benTaskProcessKey,
+                  taskNodeKey: this.row.benTaskNodeKey,
                 },
-            ],
+              ],
             },
-        ];
+          ];
         }
         submitNodeForm(payLoad).then((response) => {
-        if (response.code == 200) {
+          if (response.code == 200) {
             this.$modal.msgSuccess("保存成功");
-        } else {
+          } else {
             this.$modal.error("保存失败,请稍后再试");
-        }
+          }
         });
-    }
+      }
     },
     async getFormData() {
-    return {
+      return {
         flag: true,
         data: {},
-    };
+      };
 
-    let formData = {
+      let formData = {
         flag: false,
         msg: "",
-    };
-    try {
+      };
+      try {
         let valid = await this.$refs.form.validate();
         if (valid) {
-        formData.flag = true;
-        formData.data = this.form;
-        return formData;
+          formData.flag = true;
+          formData.data = this.form;
+          return formData;
         } else {
-        formData.msg = "表单校验异常,请规范填写表单数据";
-        return formData;
+          formData.msg = "表单校验异常,请规范填写表单数据";
+          return formData;
         }
-    } catch (error) {
+      } catch (error) {
         // console.log(error);
         formData.msg = "表单校验异常,请规范填写表单数据";
         return formData;
-    }
+      }
     },
     addTableRow() {
-    const newRow = {
+      const newRow = {
         personnelName: "",
         allottedTime: 0,
-    };
-    this.tableData.push(newRow);
+      };
+      this.tableData.push(newRow);
     },
     deleteTableRow(index) {
-    if (index !== -1) {
+      if (index !== -1) {
         this.tableData.splice(index, 1);
-    }
+      }
     },
     // 批量保存表格数据回调
     async saveTableRow() {
-    console.log(this.tableData);
-    let payLoad = {};
-    payLoad.insertCommonEntityList = [
+      console.log(this.tableData);
+      let payLoad = {};
+      payLoad.insertCommonEntityList = [
         {
-        basicMap: {
+          basicMap: {
             tableName: "process_inspect_personnel",
-        },
-        addListMap: [
+          },
+          addListMap: [
             // {
             //   task_node_other_state: state,
             //   taskKey: this.row.benTaskProcessKey,
             //   taskNodeKey: this.row.benTaskNodeKey,
             // },
-        ],
+          ],
         },
-    ];
-    payLoad.insertCommonEntityList[0].addListMap = this.tableData.map(
+      ];
+      payLoad.insertCommonEntityList[0].addListMap = this.tableData.map(
         (item) => {
-        let { personnelName, allottedTime } = item;
-        return {
+          let { personnelName, allottedTime } = item;
+          return {
             personnelName,
             allottedTime,
             taskProcessKey: this.row.benTaskProcessKey,
             taskNodeKey: this.row.benTaskNodeKey,
-        };
+          };
         }
-    );
-    // this.tableData = [];
-    let res = await submitNodeForm(payLoad);
-    if (res.code == 200) {
+      );
+      // this.tableData = [];
+      let res = await submitNodeForm(payLoad);
+      if (res.code == 200) {
         this.$message.success("保存成功");
         this.tableData = [];
         this.refreshData(this.row);
-    } else {
+      } else {
         this.$message.warning("网络异常,请稍后再试");
-    }
+      }
     },
     // 刷新弹窗数据
     async refreshData(row) {
-    let {
+      let {
         benTaskNodeFormKey,
         benTaskNodeFormType,
         bepTaskPlanKey,
@@ -472,192 +473,196 @@ methods: {
         benTaskProcessKey,
         benmTaskAutomaticScriptTriggerType,
         bepTaskNodeNextKey,
-    } = row;
-    let payLoad = {
+      } = row;
+      let payLoad = {
         taskNodeKey: bepTaskNodeNextKey,
         taskProcessKey: benTaskProcessKey,
         taskAutomaticScriptTriggerType: benmTaskAutomaticScriptTriggerType,
         taskPlanKey: bepTaskPlanKey,
-    };
-    let res = await getProcessNodeFormInfoData(payLoad);
-    if (res.code == 200) {
+      };
+      let res = await getProcessNodeFormInfoData(payLoad);
+      if (res.code == 200) {
         this.updataTableData(res.data);
-    } else {
+      } else {
         this.$message.error("网络异常,请稍后再试");
-    }
+      }
     },
     // 修改某一条数据
     async saveOne() {
-    console.log(this.editingRow);
-    let payLoad = {};
-    let { taskKey, taskNodeKey } = this.myFormData.resultMap;
-    let { id, personnelName, allottedTime } = this.editingRow;
-    payLoad.updateCommonEntityList = [
+      console.log(this.editingRow);
+      let payLoad = {};
+      let { taskKey, taskNodeKey } = this.myFormData.resultMap;
+      let { id, personnelName, allottedTime } = this.editingRow;
+      payLoad.updateCommonEntityList = [
         {
-        basicMap: {
+          basicMap: {
             tableName: "process_inspect_personnel",
-        },
-        conditionMap: {
+          },
+          conditionMap: {
             taskProcessKey: this.row.benTaskProcessKey,
             taskNodeKey: this.row.benTaskNodeKey,
             id,
-        },
-        commMap: {
+          },
+          commMap: {
             personnelName,
             allottedTime,
+          },
         },
-        },
-    ];
-    let res = await submitNodeForm(payLoad);
-    if (res.code == 200) {
+      ];
+      let res = await submitNodeForm(payLoad);
+      if (res.code == 200) {
         this.$message.success("保存成功");
         this.refreshData(this.row);
-    } else {
+      } else {
         this.$message.warning("网络异常,请稍后再试");
-    }
+      }
     },
     // 删除一条数据
     async deleteOne(row) {
-    let payLoad = {};
-    let { id } = row;
-    payLoad.deleteCommonEntityList = [
+      let payLoad = {};
+      let { id } = row;
+      payLoad.deleteCommonEntityList = [
         {
-        basicMap: {
+          basicMap: {
             tableName: "process_inspect_personnel",
-        },
-        conditionMap: {
+          },
+          conditionMap: {
             // taskProcessKey: this.row.benTaskProcessKey,
             // taskNodeKey: this.row.benTaskNodeKey,
             id: [id],
+          },
         },
-        },
-    ];
-    let res = await submitNodeForm(payLoad);
-    if (res.code == 200) {
+      ];
+      let res = await submitNodeForm(payLoad);
+      if (res.code == 200) {
         this.$message.success("删除成功");
         this.refreshData(this.row);
-    } else {
+      } else {
         this.$message.warning("网络异常,请稍后再试");
-    }
+      }
     },
     // 取消修改回调
     cancelHandler(row) {
-    row.isEdit = false;
+      row.isEdit = false;
     },
     handleChange(value) {
-    console.log(value);
+      console.log(value);
     },
     changeHandler(row) {
-    console.log(row);
-    row.isEdit = true;
-    this.editingRow = JSON.parse(JSON.stringify(row));
+      console.log(row);
+      row.isEdit = true;
+      this.editingRow = JSON.parse(JSON.stringify(row));
     },
     // 初始化数据
     initData(nval) {
-    this.form = JSON.parse(JSON.stringify(nval?.resultMap));
-    this.form.personnelList.forEach((element) => {
+      // this.form = JSON.parse(JSON.stringify(nval?.resultMap));
+      Object.assign(this.form, nval?.resultMap);
+      console.log(this.form);
+      this.form.personnelList?.forEach((element) => {
         element.isEdit = false;
-    });
-    this.oldTableData = JSON.parse(JSON.stringify(this.form.personnelList));
-    this.checked = this.form.task1 == "true" ? true : false;
-    // this.$set(this.form, 'card', nval?.resultMap.qualityControlCard);
-    this.$set(this.form, "state", nval?.resultMap.taskNnodeOtherState);
+      });
+      this.oldTableData = JSON.parse(
+        JSON.stringify(this.form.personnelList || [])
+      );
+      this.checked = this.form.task1 == "true" ? true : false;
+      // this.$set(this.form, 'card', nval?.resultMap.qualityControlCard);
+      this.$set(this.form, "state", nval?.resultMap.taskNnodeOtherState);
     },
     // 更新表格数据
     updataTableData(nval) {
-    nval?.resultMap.personnelList.forEach((element) => {
+      nval?.resultMap.personnelList.forEach((element) => {
         element.isEdit = false;
-    });
-    this.oldTableData = JSON.parse(
+      });
+      this.oldTableData = JSON.parse(
         JSON.stringify(nval?.resultMap.personnelList)
-    );
+      );
     },
-},
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .app-container {
-::v-deep .el-checkbox {
+  ::v-deep .el-checkbox {
     /* font-size: 8px; */
     color: white;
-}
-display: flex;
-flex-direction: row;
-justify-content: space-between;
-.leftMessage {
+  }
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  .leftMessage {
     display: flex;
     flex-direction: column;
     width: 145px;
     .list {
-    padding: 10px 0px;
-    span {
+      padding: 10px 0px;
+      span {
         border-radius: 10px;
         padding: 5px;
         margin-right: 10px;
-    }
-    .title {
+      }
+      .title {
         background-color: rgb(52, 191, 163);
         color: white;
-    }
-    .content {
+      }
+      .content {
         background: rgb(235, 237, 242);
         color: rgb(232, 83, 152);
+      }
     }
-    }
-}
-.rightMessage {
+  }
+  .rightMessage {
     display: flex;
     width: 500px;
     flex-direction: column;
     .top {
-    background: #53b0f8;
-    color: white;
-    height: 60px;
-    .state {
+      background: #53b0f8;
+      color: white;
+      height: 60px;
+      .state {
         display: flex;
         flex-direction: row;
         padding: 10px 20px;
         .list:first-child {
-        padding-right: 180px;
+          padding-right: 180px;
         }
         /* p {
         padding-top: 5px;
         font-size: 10px;
         } */
-    }
+      }
     }
     .button {
-    width: 100%;
-    padding: 20px 0px;
-    .el-button {
+      width: 100%;
+      padding: 20px 0px;
+      .el-button {
         width: 140px;
         /* background: none; */
-    }
-    .el-button--info {
+      }
+      .el-button--info {
         width: 80px;
-    }
+      }
     }
     .middle {
-    .name {
+      .name {
         color: black;
         font-weight: bold;
         text-align: center;
         padding: 10px 0px;
-    }
-    .block {
+      }
+      .block {
         text-align: center;
-    }
-    .total {
+      }
+      .total {
         display: inline-block;
         flex-direction: row;
         margin-top: 10px;
         span {
-        font-weight: bold;
-        color: black;
+          font-weight: bold;
+          color: black;
         }
+      }
     }
-    }
-}
+  }
 }
 </style>

zkqy-ui/src/views/bussiness/processMange.vue

@@ -249,6 +249,7 @@ import Print from "./dialogCompments/Mec/Print.vue";
 import NodeShow from "./dialogCompments/Mec/NodeShow.vue";
 import RecordQuality from "./dialogCompments/Mec/RecordQuality.vue";
 import ProductionProcesses from "./dialogCompments/Mec/ProductionProcesses.vue";
+import PersonalDistribution from "./dialogCompments/Mec/PersonalDistribution.vue";
 
 export default {
   name: "processMange",
@@ -272,6 +273,7 @@ export default {
     Print,
     RecordQuality,
     ProductionProcesses,
+    PersonalDistribution,
   },
   dicts: ["bpm_type", "task_process_state"],
   data() {

zkqy-ui/src/views/dragform/index.vue

@@ -92,7 +92,7 @@
         >
       </el-form-item>
     </el-form>
-    <!--  v-hasPermi="['dragform:form:add']" 
+    <!--  v-hasPermi="['dragform:form:add']"
           v-hasPermi="['dragform:form:edit']"
           v-hasPermi="['dragform:form:remove']"
           v-hasPermi="['dragform:form:export']"
@@ -280,7 +280,7 @@
             >修改
           </el-button> -->
           <!--  v-hasPermi="['dragform:form:edit']"
-            
+
 
           -->
           <!-- <el-button
@@ -532,7 +532,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        process.env.VUE_APP_BASE_API3 + "dragform/form/export",
+        process.env.VUE_APP_BASE_API1 + "dragform/form/export",
         {
           ...this.queryParams,
         },

zkqy-ui/src/views/dragform/tableList.vue

@@ -432,11 +432,11 @@ export default {
         )
         .then(async function () {
           let res = await delMenu(menuIdList);
-          // await delStatistic(row.tableKey) 
+          // await delStatistic(row.tableKey)
 
           //  await removeTableList(data);
 
-          if (res.code == 200) { 
+          if (res.code == 200) {
             await removeTableList(data);
           } else {
             return Promise.reject();
@@ -477,7 +477,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        process.env.VUE_APP_BASE_API3 + "system/table/export",
+        process.env.VUE_APP_BASE_API1 + "system/table/export",
         {
           ...this.queryParams,
         },

zkqy-ui/src/views/index.vue

@@ -71,7 +71,7 @@ export default {
         // 设置上传的请求头部
         headers: {Authorization: "Bearer " + getToken()},
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API3 + "common/importDataInfo",
+        url: process.env.VUE_APP_BASE_API1 + "common/importDataInfo",
       },
       // 版本号
       version: "3.8.5",

zkqy-ui/src/views/login.vue

@@ -351,7 +351,7 @@ export default {
   margin-top: 57px;
   width: 194px;
   height: 64px;
-  background: url(../assets/images/comp.png);
+  background: url(../assets/images/mec_logo_login.png);
   /* box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.25); */
   opacity: 1;
 }

zkqy-ui/src/views/relateTable/components/RelateTableCard.vue

@@ -52,7 +52,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        v-for="(item, index) in columns"
+        v-for="item in columns"
         :prop="item.key"
         :key="item.key"
         :label="item.value"
@@ -240,11 +240,13 @@ export default {
           this.templateInfo.template.primaryKey;
 
         this.$nextTick(async () => {
+          console.log(this.preRow);
           if (this.newsort == 0) {
             // 第一张表请求表数据不需要条件
             await this.getDataHandler();
           } else {
-            if (this.myContion) {
+            if (this.myContion && this.preRow) {
+              console.log("111", this.myContion, this.preRow);
               await this.getDataHandler(this.myContion, this.preRow);
               console.log(this.myContion, this.preRow);
             }
@@ -274,14 +276,21 @@ export default {
       this.preRow = list;
       // console.log(list);
       // 处理请求下一张表数据的依赖条件
-      if (contion) {
+      let tableLists;
+      console.log(this.newsort);
+      if (contion && list) {
+        console.log(contion);
         let key = contion.split(".");
         this.queryParams.queryMap["#{" + contion] = "'" + list[key[1]] + "'";
-      }
-      this.queryParams.queryMap.sqlkey = this.templateInfo.template.sqlKey;
 
-      this.tableList = [];
-      let tableLists = await unionListTableData(this.queryParams);
+        this.queryParams.queryMap.sqlkey = this.templateInfo.template.sqlKey;
+
+        this.tableList = [];
+        tableLists = await unionListTableData(this.queryParams);
+      } else if (this.newsort == 0) {
+        console.log(contion);
+        tableLists = await unionListTableData(this.queryParams);
+      }
       if (tableLists.code == 200) {
         // 默认根据这张表的第一条数据请求下一张表的数据
         this.$emit("getDefaultCardData", this.index);
@@ -300,7 +309,9 @@ export default {
         });
         // console.log(this.tableList);
       }
+
       this.total = tableLists.total;
+
       this.loading = false;
     },
     // 处理列表信息
@@ -439,7 +450,9 @@ export default {
       this.queryFromWhere.forEach((item) => {
         let { conditionDefaultValue, conditionField } = item;
         res[camelCase(conditionField.split(".")[1])] =
-          this.preRow[conditionDefaultValue.split(".")[1]];
+          conditionDefaultValue.includes(".")
+            ? this.preRow[conditionDefaultValue.split(".")[1]]
+            : conditionDefaultValue;
       });
       return res;
     },

zkqy-ui/src/views/tablelist/commonTable/grouplistInfo.vue

@@ -262,7 +262,7 @@ export default {
         // 设置上传的请求头部
         headers: {Authorization: "Bearer " + getToken()},
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API3 + "common/uploadData",
+        url: process.env.VUE_APP_BASE_API1+ "common/uploadData",
       },
       // 排序方式 默认降序
       sortOrder: true,
@@ -580,7 +580,7 @@ export default {
       }
       this.queryParams.execlMap = JSON.stringify(this.queryParams.execlMap);
       this.download(
-        process.env.VUE_APP_BASE_API3 + "common/export",
+        process.env.VUE_APP_BASE_API1 + "common/export",
         {
           ...this.queryParams,
         },
@@ -595,7 +595,7 @@ export default {
     /** 下载模板操作 */
     importTemplate() {
       this.download(
-        process.env.VUE_APP_BASE_API3 +
+        process.env.VUE_APP_BASE_API1 +
         `common/exportTemplate?tableName=${this.tableName}&sqlkey=${this.sqlkey}`,
         {},
         `下载模版名称${new Date().getTime()}.xlsx`