192.168.2.104

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

View File

@ -3,15 +3,15 @@
<transition name="sidebarLogoFade"> <transition name="sidebarLogoFade">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/"> <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>
<router-link v-else key="expand" class="sidebar-logo-link" to="/"> <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> </router-link>
</transition> </transition>
</div> </div>

View File

@ -101,7 +101,8 @@ export default {
) )
.then(() => { .then(() => {
axios 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) => { .then((res) => {
if (res.code === 200) { if (res.code === 200) {
this.$message({ this.$message({

View File

@ -533,7 +533,8 @@ export default {
setInterval() { setInterval() {
axios 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: { params: {
id: this.id, id: this.id,
}, },
@ -546,7 +547,8 @@ export default {
off() { off() {
if (this.id != "") { if (this.id != "") {
axios 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: { params: {
id: this.id, id: this.id,
type: 2, type: 2,
@ -566,7 +568,8 @@ export default {
on() { on() {
if (this.id != "") { if (this.id != "") {
axios 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: { params: {
id: this.id, id: this.id,
type: 1, type: 1,

View File

@ -372,7 +372,8 @@ export default {
upbutton() { upbutton() {
if (this.id != "") { if (this.id != "") {
axios 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: { params: {
id: this.id, id: this.id,
}, },
@ -397,7 +398,8 @@ export default {
downbutton() { downbutton() {
if (this.id != "") { if (this.id != "") {
axios 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: { params: {
id: this.id, id: this.id,
}, },

View File

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

View File

@ -36,20 +36,20 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
"/prod-api": { "/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://192.168.50.191:8063`,
// 线上 // 线上
target: `http://mes.jshengzheng.com:7072`, // target: `http://mes.jshengzheng.com:7072`,
changeOrigin: true, changeOrigin: true,
// pathRewrite: { // pathRewrite: {
// ['^' + process.env.VUE_APP_BASE_API]: '' // ['^' + process.env.VUE_APP_BASE_API]: ''
// } // }
}, },
"/ureport": { "/ureport": {
// target: `http://192.168.2.104:8063`, target: `http://192.168.2.104:8063`,
// target: `http://192.168.50.191:8063`, // target: `http://192.168.50.191:8063`,
target: `http://mes.jshengzheng.com:7072`, // target: `http://mes.jshengzheng.com:7072`,
ws: false, ws: false,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {