diff --git a/src/api/ManufacturingCenter/EquipmentMonitoring.js b/src/api/ManufacturingCenter/EquipmentMonitoring.js index 867714f8..f38dab0e 100644 --- a/src/api/ManufacturingCenter/EquipmentMonitoring.js +++ b/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 } }) diff --git a/src/assets/img/img26.jpg b/src/assets/img/img26.jpg new file mode 100644 index 00000000..cde40701 Binary files /dev/null and b/src/assets/img/img26.jpg differ diff --git a/src/utils/request.js b/src/utils/request.js index 25262f70..0965402e 100644 --- a/src/utils/request.js +++ b/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 diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue index 50e85d8d..71659433 100644 --- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue +++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue @@ -1,356 +1,522 @@ @@ -602,7 +847,7 @@ export default { width: 1690px; height: 830px; /*border: 1px solid red;*/ - background: url('../../../assets/img/img25.png') repeat; + background: url('../../../assets/img/img26.jpg') repeat; background-repeat:no-repeat; background-size:100% 100%;-moz-background-size:100% 100%; }