xiaomeng/wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xiaomeng:40fe0619ed01797c05563f6ff314a9d11159d9a1
Branches Tags
xiaomeng:main
xiaomeng:pc-master
xiaomeng:portal
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:0.0.1
..
compare: xiaomeng:4ac228400ac38b73b1a10071055096e063cf334d
Branches Tags
xiaomeng:pc-master
xiaomeng:portal
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1

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

2 changed files with 21 additions and 23 deletions
Show Stats Expand all files Collapse all files

8
src/components/setParamsControl.vue
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;
var item = store.equipmentList[store.equipmentIndex - 1]
if(item.deviceName == 10 || item.deviceName == 30){
this.dataInit(); this.dataInit();
}
}, },
}, },
mounted() { mounted() {
@ -317,7 +313,8 @@ 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
@ -325,6 +322,7 @@ export default {
this.$router.push({ path: `/${this.routerList[0].router}` }); this.$router.push({ path: `/${this.routerList[0].router}` });
}, 0);
}); });

2
src/views/index.vue
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) {