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

zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDictDataController.java

@@ -42,7 +42,7 @@ public class SysDictDataController extends BaseController
     @Autowired
     private ISysDictTypeService dictTypeService;
 
-    @PreAuthorize("@ss.hasPermi('system:dict:list')")
+//    @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysDictData dictData)
     {

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/mes/ExceptionAmmunitionLoading.java

@@ -0,0 +1,50 @@
+package com.zkqy.execution.produce.dispersed.service.impl.runbpm.mes;
+
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
+import com.zkqy.execution.produce.dispersed.service.IRunBPMService;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PreDestroy;
+
+/**
+ * 加弹-异常节点
+ */
+@Service("726e8197-dde4-405b-a5ac-c66b94c9a9d0")
+@Scope("prototype")
+public class ExceptionAmmunitionLoading implements IRunBPMService {
+
+    @Override
+    public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
+        return null;
+    }
+
+    @Override
+    public AjaxResult preValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult afterValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public boolean isVerificationMethod() {
+        return true;
+    }
+
+    @Override
+    @PreDestroy
+    public boolean preDestroy() {
+        return true;
+    }
+}

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/mes/ExceptionMixing.java

@@ -0,0 +1,50 @@
+package com.zkqy.execution.produce.dispersed.service.impl.runbpm.mes;
+
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
+import com.zkqy.execution.produce.dispersed.service.IRunBPMService;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PreDestroy;
+
+/**
+ * 调丝-异常节点
+ */
+@Service("d421ef26-02ae-4553-a995-f514e0bb84e3")
+@Scope("prototype")
+public class ExceptionMixing implements IRunBPMService {
+
+    @Override
+    public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
+        return null;
+    }
+
+    @Override
+    public AjaxResult preValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult afterValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public boolean isVerificationMethod() {
+        return true;
+    }
+
+    @Override
+    @PreDestroy
+    public boolean preDestroy() {
+        return true;
+    }
+}

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

@@ -67,7 +67,7 @@
       </div>
       <div class="show-body">
         <!--    流程任务列表    -->
-        <el-table :data="tableData" border stripe>
+        <el-table :data="tableData" v-loading="loading" border stripe>
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column type="index" width="50" align="center" />
           <el-table-column
@@ -350,6 +350,7 @@ export default {
       // 弹窗表单渲染数据
       formData: {},
       backExceptionTaskList: ["GY06"], //特殊回退表单组件列表
+      loading: true,
     };
   },
   computed: {
@@ -394,6 +395,7 @@ export default {
   methods: {
     // 获取列表数据
     getList() {
+      this.loading = true;
       processList({ ...this.queryParams, taskName: this.queryString }).then(
         (res) => {
           if (res.code == 200) {
@@ -403,6 +405,7 @@ export default {
           } else {
             this.$message.error("网络异常,请稍后再试");
           }
+          this.loading = false;
         }
       );
     },

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

@@ -46,9 +46,10 @@
           </div>
         </div>
       </div>
-      <div class="show-body">
+      <div class="show-body" v-loading="loading">
         <template v-if="tableData.length > 0">
           <TaskList
+            
             v-for="(item, index) of tableData"
             :key="index + 1"
             :num="index + 1"
@@ -89,12 +90,14 @@ export default {
         taskProcessState: "0",
       },
       tableData: [], //列表数据
+      loading: true,
     };
   },
   computed: {},
   methods: {
     // 获取列表数据
     getList() {
+      this.loading = true;
       getListLog({ ...this.queryParams, taskName: this.queryString }).then(
         (res) => {
           if (res.code == 200) {
@@ -105,6 +108,8 @@ export default {
           } else {
             this.$message.error("网络异常,请稍后再试");
           }
+          this.loading=false;
+
 
           return;
           if (res.code == 200) {