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

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

@@ -176,11 +176,11 @@ export default {
                         let str = "";
                         str =
                             params.row.status == 1
-                                ? "待上料"
+                                ? "待执行"
                                 : params.row.status == 2
-                                ? "生产中"
+                                ? "执行中"
                                 : params.row.status == 3
-                                ? "待下料"
+                                ? "执行完成"
                                 : "";
                         return h("div", str);
                     },