diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 5129612..fec1a26 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -3,15 +3,15 @@ - + - + - + - + diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index d790ea9..f9b4e54 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -101,7 +101,8 @@ export default { ) .then(() => { axios - .get("http://192.168.50.191:8077/manage/task/emergencyStop") + .get("http://192.168.2.104:8077/manage/task/emergencyStop") + // .get("http://192.168.50.191:8077/manage/task/emergencyStop") .then((res) => { if (res.code === 200) { this.$message({ diff --git a/src/views/deviceConsole/machine/index.vue b/src/views/deviceConsole/machine/index.vue index c16814d..fcec6fb 100644 --- a/src/views/deviceConsole/machine/index.vue +++ b/src/views/deviceConsole/machine/index.vue @@ -533,7 +533,8 @@ export default { setInterval() { axios - .get("http://192.168.50.191:8077/manage/modbus/data", { + .get("http://192.168.2.104:8077/manage/modbus/data", { + // .get("http://192.168.50.191:8077/manage/modbus/data", { params: { id: this.id, }, @@ -546,7 +547,8 @@ export default { off() { if (this.id != "") { axios - .get("http://192.168.50.191:8077/manage/modbus/operate", { + .get("http://192.168.2.104:8077/manage/modbus/operate", { + // .get("http://192.168.50.191:8077/manage/modbus/operate", { params: { id: this.id, type: 2, @@ -566,7 +568,8 @@ export default { on() { if (this.id != "") { axios - .get("http://192.168.50.191:8077/manage/modbus/operate", { + .get("http://192.168.2.104:8077/manage/modbus/operate", { + // .get("http://192.168.50.191:8077/manage/modbus/operate", { params: { id: this.id, type: 1, diff --git a/src/views/deviceConsole/robotic/index.vue b/src/views/deviceConsole/robotic/index.vue index bc4a9c8..8ecef1c 100644 --- a/src/views/deviceConsole/robotic/index.vue +++ b/src/views/deviceConsole/robotic/index.vue @@ -372,7 +372,8 @@ export default { upbutton() { if (this.id != "") { axios - .get("http://192.168.50.191:8077/manage/robot/powerOn", { + .get("http://192.168.2.104:8077/manage/robot/powerOn", { + // .get("http://192.168.50.191:8077/manage/robot/powerOn", { params: { id: this.id, }, @@ -397,7 +398,8 @@ export default { downbutton() { if (this.id != "") { axios - .get("http://192.168.50.191:8077/manage/robot/powerOff", { + .get("http://192.168.2.104:8077/manage/robot/powerOff", { + // .get("http://192.168.50.191:8077/manage/robot/powerOff", { params: { id: this.id, }, diff --git a/src/views/mes/pro/schedule/index.vue b/src/views/mes/pro/schedule/index.vue index f689048..6e84852 100644 --- a/src/views/mes/pro/schedule/index.vue +++ b/src/views/mes/pro/schedule/index.vue @@ -126,12 +126,13 @@ item.workorderId); }, + // 执行生产 handleproductione(row) { const routeId = row.workorderId || this.ids; diff --git a/vue.config.js b/vue.config.js index 9419505..e7b2d78 100644 --- a/vue.config.js +++ b/vue.config.js @@ -36,20 +36,20 @@ module.exports = { // detail: https://cli.vuejs.org/config/#devserver-proxy "/prod-api": { // 蚂蚁工业 - // target: `http://192.168.2.104:8063`, + target: `http://192.168.2.104:8063`, // 内网 // target: `http://192.168.50.191:8063`, // 线上 - target: `http://mes.jshengzheng.com:7072`, + // target: `http://mes.jshengzheng.com:7072`, changeOrigin: true, // pathRewrite: { // ['^' + process.env.VUE_APP_BASE_API]: '' // } }, "/ureport": { - // target: `http://192.168.2.104:8063`, + target: `http://192.168.2.104:8063`, // target: `http://192.168.50.191:8063`, - target: `http://mes.jshengzheng.com:7072`, + // target: `http://mes.jshengzheng.com:7072`, ws: false, changeOrigin: true, pathRewrite: {