diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index fec1a26..5129612 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 f9b4e54..20d5b86 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -101,8 +101,8 @@ export default { ) .then(() => { axios - .get("http://192.168.2.104:8077/manage/task/emergencyStop") - // .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 fcec6fb..7a0d25e 100644 --- a/src/views/deviceConsole/machine/index.vue +++ b/src/views/deviceConsole/machine/index.vue @@ -533,8 +533,8 @@ export default { setInterval() { axios - .get("http://192.168.2.104:8077/manage/modbus/data", { - // .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, }, @@ -547,8 +547,8 @@ export default { off() { if (this.id != "") { axios - .get("http://192.168.2.104:8077/manage/modbus/operate", { - // .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, @@ -568,8 +568,8 @@ export default { on() { if (this.id != "") { axios - .get("http://192.168.2.104:8077/manage/modbus/operate", { - // .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 8ecef1c..7e246bb 100644 --- a/src/views/deviceConsole/robotic/index.vue +++ b/src/views/deviceConsole/robotic/index.vue @@ -372,8 +372,8 @@ export default { upbutton() { if (this.id != "") { axios - .get("http://192.168.2.104:8077/manage/robot/powerOn", { - // .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, }, @@ -398,8 +398,8 @@ export default { downbutton() { if (this.id != "") { axios - .get("http://192.168.2.104:8077/manage/robot/powerOff", { - // .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 6e84852..2d72b4c 100644 --- a/src/views/mes/pro/schedule/index.vue +++ b/src/views/mes/pro/schedule/index.vue @@ -673,8 +673,8 @@ export default { const routeId = row.workorderId || this.ids; if (routeId !== "") { axios - .get("http://192.168.2.104:8077/manage/task/execute?ids=" + routeId) - // .get("http://192.168.50.191:8077/manage/task/execute?ids=" + routeId) + // .get("http://192.168.2.104:8077/manage/task/execute?ids=" + routeId) + .get("http://192.168.50.191:8077/manage/task/execute?ids=" + routeId) // .get("http://127.0.0.1:8077/manage/task/execute?ids=" + routeId) .then((res) => { if (res.data.code === 200) { @@ -698,8 +698,8 @@ export default { Pendingproduction(row) { const routeId = row.workorderId || this.ids; axios - .get("http://192.168.2.104:8077/manage/task/suspension?id=" + routeId) - // .get("http://192.168.50.191:8077/manage/task/suspension?id=" + routeId) + // .get("http://192.168.2.104:8077/manage/task/suspension?id=" + routeId) + .get("http://192.168.50.191:8077/manage/task/suspension?id=" + routeId) // .get("http://127.0.0.1:8077/manage/task/suspension?id=" + routeId) .then((res) => { if (res.data.code === 200) { diff --git a/src/views/mes/wm/itemrecpt/index.vue b/src/views/mes/wm/itemrecpt/index.vue index fb70b7a..a475891 100644 --- a/src/views/mes/wm/itemrecpt/index.vue +++ b/src/views/mes/wm/itemrecpt/index.vue @@ -732,8 +732,8 @@ export default { if (this.remainingquantity != 0) { axios .post( - "http://192.168.2.104:8077/manage/matter/storageItem", - // "http://192.168.50.191:8063/manage/matter/storageItem", + // "http://192.168.2.104:8077/manage/matter/storageItem", + "http://192.168.50.191:8063/manage/matter/storageItem", this.perform ) .then(function (res) { diff --git a/vue.config.js b/vue.config.js index e7b2d78..9419505 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: {