diff --git a/src/utils/request.js b/src/utils/request.js
index cbdb9a8d..0965402e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -24,11 +24,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://localhost:8005/submit/MESCommonBase.ashx`,
-=======
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
->>>>>>> 86989987e2fefa8d0084dce8a0f3b020afa872e7
+  baseURL: `http://192.168.0.110:8005/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
index 50e85d8d..65959ec3 100644
--- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
+++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
@@ -426,7 +426,6 @@ export default {
     // 工作状态 0 黄色 1 绿色
     getwork_state() {
       this.getOP_state()
-
       // function opclickshowPanel() {
       //   console.log(this.opname)
       //   if (this.opname != undefined) {
@@ -434,7 +433,6 @@ export default {
       //     window.open(aaa)
       //   }
       // }
-
       getwork_state().then(response => {
         console.log(response.data)
         // 通过jQuery添加类选择器和移除类选择器
@@ -490,17 +488,19 @@ export default {
     },
     // 鼠标移入加入class
     changeActive($event) {
-      searchtooltip($event.path[2].id).then(response => {
-        console.log(response.data)
-        if (response.data.length > 0) {
-          if (response.data[0].工艺计划流水号 === 0) {
-            response.data[0].零件图号_零件工艺计划 = '-'
+      console.log($event.path[2].id)
+      if ($event.path[2].id) {
+        searchtooltip($event.path[2].id).then(response => {
+          if (response.data.length > 0) {
+            if (response.data[0].工艺计划流水号 === 0) {
+              response.data[0].零件图号_零件工艺计划 = '-'
+            }
+            this.tooltip = '当前正在加工:' + response.data[0].零件图号_零件工艺计划
+          } else {
+            this.tooltip = '没有零件加工'
           }
-          this.tooltip = '当前正在加工:' + response.data[0].零件图号_零件工艺计划
-        } else {
-          this.tooltip = '没有零件加工'
-        }
-      })
+        })
+      }
       // $event.currentTarget.className="active";
     },
     removeActive($event) {