Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/views/produceOrder/detail.vue

@@ -71,7 +71,7 @@
           statusList[infoData.status]
         }}</el-descriptions-item>
         <el-descriptions-item label="完成时间">{{
-          infoData.completionTime
+          infoData.completeTime
         }}</el-descriptions-item>
         <el-descriptions-item label="生产周期">{{
           infoData.productionCycle
@@ -1206,8 +1206,8 @@
         this.$refs.bomListRef.open(row);
       },
 
-      refreshData () {
-        const res = getInfoById(this.workOrderId);
+      async refreshData () {
+        const res = await getInfoById(this.workOrderId);
         this.infoData = res;
         if (typeof res.taskTypeProcessDiagrams == 'string') {
           this.tabList = [];

vue.config.js

@@ -32,7 +32,6 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://192.168.3.51:18086', // 测试
-
         target: 'http://192.168.3.35:8080', // kang杨威
         // target: 'http://192.168.3.25:8080', // 黄峥嵘
         // target: 'http://192.168.3.41:8080', // 何江鹏