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

Html/src/locale/lang/en-US.js

@@ -6651,6 +6651,10 @@ export default {
     '300159': '设备正在使用中',
     '300160': '任务进行中',
     '300161': '产品工装未找到',
-    '300162': '未找到工装信息'
+    '300162': '未找到工装信息',
+    '300163': '设备正在空闲中',
+    '300164': '设备已经生产完成',
+    '300165': '该设备当前无工装状态',
+    '300166': '未配置字典信息',
 
 }

Html/src/locale/lang/zh-CN.js

@@ -6923,7 +6923,12 @@ export default {
     '300159': '设备正在使用中',
     '300160': '任务进行中',
     '300161': '产品工装未找到',
-    '300162': '未找到工装信息'
+    '300162': '未找到工装信息',
+    '300163': '设备正在空闲中',
+    '300164': '设备已经生产完成',
+    '300165': '该设备当前无工装状态',
+    '300166': '未配置字典信息',
+
 
 
 

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

@@ -199,7 +199,7 @@ export default {
                 {
                     title: "任务编号",
                     key: "taskno",
-                    width:300
+                    width: 300,
                 },
                 {
                     title: "产线层级",
@@ -270,9 +270,9 @@ export default {
                                 break;
                             case 4:
                                 str = "取消";
-                                break;  
+                                break;
                         }
-                        return h('div',str)
+                        return h("div", str);
                     },
                 },
                 {
@@ -298,14 +298,14 @@ export default {
             performType: 0,
             startTime: "",
             endTime: "",
-            detailobj:{}
+            detailobj: {},
         };
     },
     created() {
         this.columns1 = this.$time.initTableTitle(this.columns1);
         this.initlevel();
         this.iniproducts();
-        this.search(1,10);
+        this.search(1, 10);
     },
     methods: {
         search(page, pagesize) {
@@ -333,14 +333,15 @@ export default {
                         console.log(res.data.data);
                         this.data1 = res.data.data.data;
                     }
+                    this.total = res.data.data.total;
                 });
         },
         cancel() {
-            if (this.detailobj.status !=1) {
+            if (this.detailobj.status != 1) {
                 this.$Message.error("该任务清单状态不能取消");
                 return false;
             }
-            return
+            return;
             let data = {
                 section: this.sectionid,
             };
@@ -361,24 +362,22 @@ export default {
             //     this.$Message.error("该任务清单不能手动执行");
             //     return false;
             // }
-             if (!this.detailobj.id) {
+            if (!this.detailobj.id) {
                 this.$Message.error(this.$t(1043));
                 return false;
             }
             let data = {
                 id: this.detailobj.id,
             };
-            this.request(
-                "/acc/AutomationOperate/Send",
-                data,
-                "get"
-            ).then((res) => {
-                if (res.data.ret == 1) {
-                    this.$Message.success(this.$t(res.data.msg));
-                } else {
-                    this.$Message.error(this.$t(res.data.msg));
+            this.request("/acc/AutomationOperate/Send", data, "get").then(
+                (res) => {
+                    if (res.data.ret == 1) {
+                        this.$Message.success(this.$t(res.data.msg));
+                    } else {
+                        this.$Message.error(this.$t(res.data.msg));
+                    }
                 }
-            });
+            );
         },
         exportExcel() {
             // this.axios.request({