mes/mes-lqqt-ui
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

192.168.2.104

Browse Source
This commit is contained in:
打豆豆 2024-05-21 10:45:16 +08:00
parent 685da3e783
commit e8209988e6
6 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/layout/components/Sidebar/Logo.vue
View File

@ -3,15 +3,15 @@
<transition name="sidebarLogoFade">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
<!-- 制造大师 -->
<img src="../../../assets/images/logo-b.png" class="sidebar-logo-small">
<!-- <img src="../../../assets/images/logo-b.png" class="sidebar-logo-small"> -->
<!-- 蚂蚁工业 -->
<!-- <img src="../../../assets/images/logo-b1.png" class="sidebar-logo-small"> -->
<img src="../../../assets/images/logo-b1.png" class="sidebar-logo-small">
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
<!-- 制造大师 -->
<img src="../../../assets/images/logo-small.png" class="sidebar-logo">
<!-- <img src="../../../assets/images/logo-small.png" class="sidebar-logo"> -->
<!-- 蚂蚁工业 -->
<!-- <img src="../../../assets/images/logo-small1.png" class="sidebar-logo"> -->
<img src="../../../assets/images/logo-small1.png" class="sidebar-logo">
</router-link>
</transition>
</div>

3
src/layout/components/Sidebar/index.vue
View File

@ -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({

9
src/views/deviceConsole/machine/index.vue
View File

@ -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,

6
src/views/deviceConsole/robotic/index.vue
View File

@ -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,
},

8
src/views/mes/pro/schedule/index.vue
View File

@ -126,12 +126,13 @@
<el-table
v-loading="loading"
:data="workorderList"
row-key="workorderId"
:row-key="getRowKeys"
default-expand-all
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
@selection-change="handleSelectionChange"
>
<el-table-column
:reserve-selection="true"
type="selection"
width="55"
align="center"
@ -658,10 +659,15 @@ export default {
this.resetForm("queryForm");
this.handleQuery();
},
getRowKeys(row) {
return row.workorderId;
//将id return出去
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.workorderId);
},
// 执行生产
handleproductione(row) {
const routeId = row.workorderId || this.ids;

8
vue.config.js
View File

@ -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: {