meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a

Browse Source
This commit is contained in:
zhangdingyu
2019-10-09 09:20:20 +08:00
parent d95f77a948
commit ad0e8d488f
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/request.js
View File

@@ -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 MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
<<<<<<< HEAD baseURL: `http://192.168.0.110:8005/submit/MESCommonBase.ashx`,
baseURL: `http://localhost:8005/submit/MESCommonBase.ashx`,
=======
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
>>>>>>> 86989987e2fefa8d0084dce8a0f3b020afa872e7
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

24
src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
View File

@@ -426,7 +426,6 @@ export default {
// 工作状态 0 黄色 1 绿色 // 工作状态 0 黄色 1 绿色
getwork_state() { getwork_state() {
this.getOP_state() this.getOP_state()
// function opclickshowPanel() { // function opclickshowPanel() {
// console.log(this.opname) // console.log(this.opname)
// if (this.opname != undefined) { // if (this.opname != undefined) {
@@ -434,7 +433,6 @@ export default {
// window.open(aaa) // window.open(aaa)
// } // }
// } // }
getwork_state().then(response => { getwork_state().then(response => {
console.log(response.data) console.log(response.data)
// 通过jQuery添加类选择器和移除类选择器 // 通过jQuery添加类选择器和移除类选择器
@@ -490,17 +488,19 @@ export default {
}, },
// 鼠标移入加入class // 鼠标移入加入class
changeActive($event) { changeActive($event) {
searchtooltip($event.path[2].id).then(response => { console.log($event.path[2].id)
console.log(response.data) if ($event.path[2].id) {
if (response.data.length > 0) { searchtooltip($event.path[2].id).then(response => {
if (response.data[0].工艺计划流水号 === 0) { if (response.data.length > 0) {
response.data[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"; // $event.currentTarget.className="active";
}, },
removeActive($event) { removeActive($event) {