Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/api/ManufacturingCenter/EquipmentMonitoring.js

@@ -28,7 +28,31 @@ export function searchtooltip(num) {
     method: 'post',
     data: {
       type: '1',
-      name: 'MES_机加工MES_工位零件图号查询',
+      name: 'MES_机加工MES_工位零件图号查询_设备监控',
+      param: '工位号=' + num
+    }
+  })
+}
+// 查询工位状态
+export function getOP_state2(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'MES_机加工MES_设备数据采集_工位状态_查询_按工位号',
+      param: '工位号=' + num
+    }
+  })
+}
+// 查询待加工零件
+export function getDaijiagong(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'MES_机加工MES_待加工零件_查询_设备监控',
       param: '工位号=' + num
     }
   })

src/utils/request.js

@@ -24,7 +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({
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.110:8005/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service