From 4d2aaed40a57c04ae98248d19e9a54c840fd95d5 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 25 Sep 2019 20:23:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          |  6 +-----
 .../ProcessingStatus/index.vue                | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 375bf45a..f61bf8ab 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,11 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-<<<<<<< HEAD
-  baseURL: `http://192.168.0.104:8005/submit/MESCommonBase.ashx`,
-=======
-  baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`,
->>>>>>> e3035b1d55444222c4f068bc3cd159ea6cd21458
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index b425a0a5..da00be87 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -451,13 +451,18 @@ export default {
               value2: response.data[i].项目名称
             })
           }
-        }).then(() => {
-          this.Machine = parseInt(Cookie.get('machineValue'))
-          this.getGroup()
-          this.Group = parseInt(Cookie.get('group'))
-          this.getTableData()
-          Cookie.remove('machineValue')
-          Cookie.remove('group')
+          if (Cookie.get('group') !== undefined) {
+            this.Machine = parseInt(Cookie.get('machineValue'))
+            this.getGroup()
+            this.Group = parseInt(Cookie.get('group'))
+            this.getTableData()
+            Cookie.remove('machineValue')
+            Cookie.remove('group')
+          } else {
+            this.getTableData()
+            Cookie.remove('machineValue')
+            Cookie.remove('group')
+          }
         })
       } else {
         this.Machine = ''