pull/131/head
parent
fcc36d28e7
commit
f4d9e34b05
|
@ -50,7 +50,11 @@ export default {
|
||||||
this.gerRouter();
|
this.gerRouter();
|
||||||
},
|
},
|
||||||
"$store.state.equipmentIndex"(newName, oldName) {
|
"$store.state.equipmentIndex"(newName, oldName) {
|
||||||
|
var store = this.$store.state;
|
||||||
|
var item = store.equipmentList[store.equipmentIndex - 1]
|
||||||
|
if(item.deviceName == 10 || item.deviceName == 30){
|
||||||
this.dataInit();
|
this.dataInit();
|
||||||
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
@ -178,21 +182,21 @@ export default {
|
||||||
}
|
}
|
||||||
let targetObject = this.routerList.find(item => item.router === 'electromagneticControl');
|
let targetObject = this.routerList.find(item => item.router === 'electromagneticControl');
|
||||||
if (el.id == 11) {
|
if (el.id == 11) {
|
||||||
targetObject.list.push({name: el.nickName, status: -1, router: 'electromagneticControl', index: 1 });
|
targetObject.list.push({ name: el.nickName, status: -1, router: 'electromagneticControl', index: 1 });
|
||||||
} else if (el.id == 12) {
|
} else if (el.id == 12) {
|
||||||
targetObject.list.push({name: el.nickName, status: -1, router: 'electromagneticControl', index: 2 });
|
targetObject.list.push({ name: el.nickName, status: -1, router: 'electromagneticControl', index: 2 });
|
||||||
} else if (el.id == 13) {
|
} else if (el.id == 13) {
|
||||||
targetObject.list.push({name: el.nickName, status: -1, router: 'electromagneticControl', index: 3 });
|
targetObject.list.push({ name: el.nickName, status: -1, router: 'electromagneticControl', index: 3 });
|
||||||
} else if (el.id == 14) {
|
} else if (el.id == 14) {
|
||||||
targetObject.list.push({name: el.nickName, status: -1, router: 'electromagneticControl', index: 4 });
|
targetObject.list.push({ name: el.nickName, status: -1, router: 'electromagneticControl', index: 4 });
|
||||||
} else if (el.id == 15) {
|
} else if (el.id == 15) {
|
||||||
targetObject.list.push({name: el.nickName, status: -1, router: 'electromagneticControl', index: 5 });
|
targetObject.list.push({ name: el.nickName, status: -1, router: 'electromagneticControl', index: 5 });
|
||||||
} else if (el.id == 16) {
|
} else if (el.id == 16) {
|
||||||
targetObject.list.push({name: el.nickName, status: -1, router: 'electromagneticControl', index: 6 });
|
targetObject.list.push({ name: el.nickName, status: -1, router: 'electromagneticControl', index: 6 });
|
||||||
} else if (el.id == 17) {
|
} else if (el.id == 17) {
|
||||||
targetObject.list.push({name: el.nickName, status: -1, router: 'electromagneticControl', index: 7 });
|
targetObject.list.push({ name: el.nickName, status: -1, router: 'electromagneticControl', index: 7 });
|
||||||
} else if (el.id == 18) {
|
} else if (el.id == 18) {
|
||||||
targetObject.list.push({name: el.nickName, status: -1, router: 'electromagneticControl', index: 8 });
|
targetObject.list.push({ name: el.nickName, status: -1, router: 'electromagneticControl', index: 8 });
|
||||||
}
|
}
|
||||||
} else if (el.id == 5) {
|
} else if (el.id == 5) {
|
||||||
this.routerList.push({
|
this.routerList.push({
|
||||||
|
@ -313,8 +317,7 @@ export default {
|
||||||
// this.routerList.sort((a, b) => a.sort - b.sort);
|
// this.routerList.sort((a, b) => a.sort - b.sort);
|
||||||
|
|
||||||
this.routerList.push({ name: '系统参数配置', list: [], router: 'systemSet-con', isRouter: true, },);
|
this.routerList.push({ name: '系统参数配置', list: [], router: 'systemSet-con', isRouter: true, },);
|
||||||
console.log(this.routerList);
|
|
||||||
setTimeout(() => {
|
|
||||||
var router = this.$route.query
|
var router = this.$route.query
|
||||||
if (router.token && router.userid) {
|
if (router.token && router.userid) {
|
||||||
return
|
return
|
||||||
|
@ -322,7 +325,6 @@ export default {
|
||||||
this.$router.push({ path: `/${this.routerList[0].router}` });
|
this.$router.push({ path: `/${this.routerList[0].router}` });
|
||||||
|
|
||||||
|
|
||||||
}, 0);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -358,7 +358,7 @@ export default {
|
||||||
} else if (this.routerNow == 'historyData') {
|
} else if (this.routerNow == 'historyData') {
|
||||||
this.$store.state.equipmentIndex = item.index
|
this.$store.state.equipmentIndex = item.index
|
||||||
this.$router.push({ path: `/historyData?index=${item.index ? item.index : 1}` })
|
this.$router.push({ path: `/historyData?index=${item.index ? item.index : 1}` })
|
||||||
} else if (item.router == 'formula') {
|
} else{
|
||||||
this.$store.state.equipmentIndex = item.index
|
this.$store.state.equipmentIndex = item.index
|
||||||
this.routerIndex = item.index
|
this.routerIndex = item.index
|
||||||
if (item.deviceName == 10 || item.deviceName == 30) {
|
if (item.deviceName == 10 || item.deviceName == 30) {
|
||||||
|
|
Loading…
Reference in New Issue