Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

Html/src/view/fml/statistical_analysis/taskList.vue

@@ -357,18 +357,21 @@ export default {
             });
         },
         manual() {
-            console.log(1111);
-            if (this.detailobj.actiontype != 1) {
-                this.$Message.error("该任务清单不能手动执行");
+            // if (this.detailobj.actiontype != 1) {
+            //     this.$Message.error("该任务清单不能手动执行");
+            //     return false;
+            // }
+             if (!this.detailobj.id) {
+                this.$Message.error(this.$t(1043));
                 return false;
             }
             let data = {
                 id: this.detailobj.id,
             };
             this.request(
-                // "/acc/AutomationOperate/CompalateAssemble",
+                "/acc/AutomationOperate/Send",
                 data,
-                "post"
+                "get"
             ).then((res) => {
                 if (res.data.ret == 1) {
                     this.$Message.success(this.$t(res.data.msg));