Compare commits

..

No commits in common. "40fe0619ed01797c05563f6ff314a9d11159d9a1" and "4ac228400ac38b73b1a10071055096e063cf334d" have entirely different histories.

2 changed files with 21 additions and 23 deletions

View File

@ -50,11 +50,7 @@ export default {
this.gerRouter(); this.gerRouter();
}, },
"$store.state.equipmentIndex"(newName, oldName) { "$store.state.equipmentIndex"(newName, oldName) {
var store = this.$store.state; this.dataInit();
var item = store.equipmentList[store.equipmentIndex - 1]
if(item.deviceName == 10 || item.deviceName == 30){
this.dataInit();
}
}, },
}, },
mounted() { mounted() {
@ -182,21 +178,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({
@ -223,11 +219,11 @@ export default {
isRouter: true, isRouter: true,
}); });
} else if (el.id == 2) { } else if (el.id == 2) {
this.routerList.push({ id: el.id, sort: el.sort, name: el.nickName, list: [], router: "forceOutput", isRouter: true }); this.routerList.push({ id: el.id, sort: el.sort, name: el.nickName, list: [], router: "forceOutput", isRouter: true });
} else if (el.id == 4) { } else if (el.id == 4) {
this.routerList.push({ id: el.id, sort: el.sort, name: el.nickName, list: [], router: "intrinsicParameter", isRouter: true }); this.routerList.push({ id: el.id, sort: el.sort, name: el.nickName, list: [], router: "intrinsicParameter", isRouter: true });
} else if (el.id == 22) { } else if (el.id == 22) {
this.routerList.push({ name: el.nickName, list: [], router: "parameterSet", isRouter: true }); this.routerList.push({ name: el.nickName, list: [], router: "parameterSet", isRouter: true });
} else if (el.id == 8) { } else if (el.id == 8) {
this.routerList.push( this.routerList.push(
{ id: el.id, sort: el.sort, name: "加热水泵", list: [], router: "waterPump", isRouter: true }, { id: el.id, sort: el.sort, name: "加热水泵", list: [], router: "waterPump", isRouter: true },
@ -317,14 +313,16 @@ 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);
var router = this.$route.query setTimeout(() => {
if (router.token && router.userid) { var router = this.$route.query
return if (router.token && router.userid) {
} return
this.$router.push({ path: `/${this.routerList[0].router}` }); }
this.$router.push({ path: `/${this.routerList[0].router}` });
}, 0);
}); });

View File

@ -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{ } else if (item.router == 'formula') {
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) {