Merge pull request '1' (#131) from pc-master into portal

Reviewed-on: #131

src/components/setParamsControl.vue

@@ -50,7 +50,11 @@ export default {
       this.gerRouter();
     },
     "$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();
+      }
     },
   },
   mounted() {
@@ -313,8 +317,7 @@ export default {
         // this.routerList.sort((a, b) => a.sort - b.sort);
 
         this.routerList.push({ name: '系统参数配置', list: [], router: 'systemSet-con', isRouter: true, },);
-        console.log(this.routerList);
-        setTimeout(() => {
+
         var router = this.$route.query
         if (router.token && router.userid) {
           return
@@ -322,7 +325,6 @@ export default {
         this.$router.push({ path: `/${this.routerList[0].router}` });
 
 
-        }, 0);
       });
 
 

src/views/index.vue

@@ -358,7 +358,7 @@ export default {
                     } else if (this.routerNow == 'historyData') {
                         this.$store.state.equipmentIndex = item.index
                         this.$router.push({ path: `/historyData?index=${item.index ? item.index : 1}` })
-                    } else if (item.router == 'formula') {
+                    } else{
                         this.$store.state.equipmentIndex = item.index
                         this.routerIndex = item.index
                         if (item.deviceName == 10 || item.deviceName == 30) {