Merge branch 'master' of http://git.mes123.com/zhouyx/mes-ui

i18n/locale/zh-CN.js

@@ -1051,6 +1051,14 @@ export default {
         routing_header_id: '',
         comb_param: '',
         rule_qty: '',
+        taskSeq: '工序号',
+        efficiencyValue: '效率系数',
+        calId: '连班策略',
+        overTime: '六日加班',
+        isDiscrete: '是否离散',
+        multipleEquip: "是否多台安排设备",// 否  是
+        multipleEquipIds: "设备id", //用英文逗号分隔
+        discrete: '离散值',
     },
     routing_detail: {
         id: '',

pages/aps/aps/index.vue

@@ -346,9 +346,10 @@ export default {
             Api.apsdatachecked().then(res1=>{
               if(res1.success)
               {
-                if(res1.result)
+                if(res1.result.res)
                 {
                   this.$Message.success("数据校验成功");
+                  
                 }
                 else
                 {