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 = ''