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

Reviewed-on: #159

src/components/setParamsControl.vue

@@ -107,7 +107,7 @@ export default {
             var list = [
               { name: "目标温度", list: [], router: "targetTemperature", isRouter: true, index: 1 },
               { name: "目标湿度", list: [], router: "targetHumidity", isRouter: true, index: 2 },
-              { name: "目标CO3", list: [], router: "targetCo2", isRouter: true, index: 3 }
+              { name: "目标CO2", list: [], router: "targetCo2", isRouter: true, index: 3 }
             ]
             let newList
             if (el.child.length) {
@@ -326,7 +326,7 @@ if (el.child.length) {
           } else if (el.id == 22) {
             this.routerList.push({ name: el.nickName, list: [], router: "parameterSet", isRouter: true });
           } else if (el.id == 8) {
-            
+
             this.routerList.push(
               { id: el.id, sort: el.sort, name: "加热水泵", list: [], router: "waterPump", isRouter: true },
               {
@@ -473,7 +473,7 @@ if (el.child.length) {
             if (item.router == this.routerNow && item.index == this.$route.query.id) {
               return
             }
-            this.$router.push({ path: `/${item.router}?id=${item.index}` })
+            this.$router.push({ path: `/${item.router}`,query:{id:item.index,name:item.name} })
 
             return
           }
@@ -481,7 +481,7 @@ if (el.child.length) {
           if (item.router == this.routerNow) {
             return
           }
-          this.$router.push({ name: item.router });
+          this.$router.push({ name: item.router,query:{name:item.name} });
         }
       }
     },

src/views/page/LED.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="wetFan">
         <div class="table-title">
-            <img src="../../assets/img/LED.png" alt="">补光灯
+            <img src="../../assets/img/LED.png" alt="">{{pageName}}
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
@@ -296,12 +296,16 @@ export default {
             actList3: [],
             startList:[21408,21413,21418,21423],
       loading:null,
+      pageName:'补光灯'
         }
     },
     watch: {
         $route(newVal, oldVal) {
             const that = this;
             this.indexs = this.$route.query.id ? this.$route.query.id : 1;
+            if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
             setTimeout(() => {
             that.getActive1();
         }, 0);
@@ -322,6 +326,9 @@ export default {
         for (let index = 0; index < inputList.length; index++) {
             inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
         }
+        if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
     },
     methods: {
          //失去焦点 计算公式 x/10

src/views/page/circulationCan.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="circulationCan">
         <div class="table-title">
-            <img src="../../assets/img/circulationCan.png" alt="">环流风扇{{ indexs }}
+            <img src="../../assets/img/circulationCan.png" alt="">{{ pageName }}
 
         </div>
         <div class="title-tips">工作方式选择
@@ -144,12 +144,16 @@ export default {
             indexs: 1,
             actList1: [],
       loading:null,
+      pageName:'环流风扇'
         }
     },
     watch: {
         $route(newVal, oldVal) {
             const that = this;
             this.indexs = this.$route.query.id ? this.$route.query.id : 1;
+            if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
             setTimeout(() => {
                 that.getActive1();
             }, 0);
@@ -170,6 +174,9 @@ export default {
         for (let index = 0; index < inputList.length; index++) {
             inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
         }
+        if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
     },
     methods: {
         //失去焦点 计算公式 x/10

src/views/page/coercionMist.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="coercionMist">
         <div class="table-title">
-            <img src="../../assets/img/coercionMist.png" alt="">高压微雾{{ indexs }}
+            <img src="../../assets/img/coercionMist.png" alt="">{{ pageName }}
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
@@ -83,12 +83,16 @@ export default {
             indexs: 1,
             actList1: [],
       loading:null,
+      pageName:'高压微雾'
         }
     },
     watch: {
         $route(newVal, oldVal) {
             const that = this;
             this.indexs = this.$route.query.id ? this.$route.query.id : 1;
+            if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
             setTimeout(() => {
                 that.getActive1();
             }, 0);
@@ -109,6 +113,9 @@ export default {
         for (let index = 0; index < inputList.length; index++) {
             inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
         }
+        if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
     },
     methods: {
         //失去焦点 计算公式 x/10

src/views/page/electromagneticControl.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="electromagneticControl">
         <div class="table-title">
-            <img src="../../assets/img/electromagneticControl.png" alt="">{{ indexs }}#电磁阀
+            <img src="../../assets/img/electromagneticControl.png" alt="">{{ pageName }}
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
@@ -178,6 +178,7 @@ export default {
             inputData: [],
             typeList: [{ label: '间隔模式启动', value: 1, },
             { label: '土壤湿度传感器启动', value: 2, },],
+            pageName:'电磁阀',
             
       loading:null,
         }
@@ -186,7 +187,9 @@ export default {
         $route(newVal, oldVal) {
             const that = this;
             this.indexs = this.$route.query.id ? this.$route.query.id : 1;
-  
+            if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
             setTimeout(() => {
                 that.dataInit();
             }, 0);
@@ -207,6 +210,9 @@ export default {
         for (let index = 0; index < inputList.length; index++) {
             inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
         }
+        if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
     },
     methods: {
         //二进制转换后的补全

src/views/page/facadeInsulation.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="internalInsulation">
         <div class="table-title">
-            <img src="../../assets/img/internalInsulation.png" alt="">立面保温{{ indexs }}
+            <img src="../../assets/img/internalInsulation.png" alt="">{{ pageName }}
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
@@ -79,12 +79,16 @@ export default {
             indexs: 1,
             actList1: [],
       loading:null,
+      pageName:'立面保温'
         }
     },
     watch: {
         $route(newVal, oldVal) {
             const that = this;
             this.indexs = this.$route.query.id ? this.$route.query.id : 1;
+            if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
             setTimeout(() => {
                 that.getActive1();
             }, 0);
@@ -105,6 +109,9 @@ export default {
         for (let index = 0; index < inputList.length; index++) {
             inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
         }
+        if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
     },
     methods: {
         //失去焦点 计算公式 x/10

src/views/page/insizeSunshade.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="insizeSunshade">
         <div class="table-title">
-            <img src="../../assets/img/insizeSunshade.png" alt="">内遮阳{{ indexs }}
+            <img src="../../assets/img/insizeSunshade.png" alt="">{{ pageName }}
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
@@ -163,12 +163,16 @@ export default {
             indexs: 1,
             actList1: [],
       loading:null,
+      pageName:'内遮阳'
         }
     },
     watch: {
         $route(newVal, oldVal) {
             const that = this;
             this.indexs = this.$route.query.id ? this.$route.query.id : 1;
+            if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
             setTimeout(() => {
                 that.getActive1();
             }, 0);
@@ -189,6 +193,9 @@ export default {
         for (let index = 0; index < inputList.length; index++) {
             inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
         }
+        if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
     },
     methods: {
         //失去焦点 计算公式 x/10

src/views/page/internalInsulation.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="internalInsulation">
         <div class="table-title">
-            <img src="../../assets/img/internalInsulation.png" alt="">内保温{{ indexs }}
+            <img src="../../assets/img/internalInsulation.png" alt="">{{ pageName }}
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
@@ -110,12 +110,16 @@ export default {
             indexs: 1,
             actList1: [],
       loading:null,
+      pageName:'内保温'
         }
     },
     watch: {
         $route(newVal, oldVal) {
             const that = this;
             this.indexs = this.$route.query.id ? this.$route.query.id : 1;
+            if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
             setTimeout(() => {
                 that.getActive1();
             }, 0);
@@ -136,6 +140,9 @@ export default {
         for (let index = 0; index < inputList.length; index++) {
             inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
         }
+        if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
     },
     methods: {
         //失去焦点 计算公式 x/10

src/views/page/outsizeSunshade.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="outsizeSunshade">
         <div class="table-title">
-            <img src="../../assets/img/outsizeSunshade.png" alt="">外遮阳{{ indexs }}
+            <img src="../../assets/img/outsizeSunshade.png" alt="">{{pageName}}
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
@@ -133,12 +133,16 @@ export default {
             indexs: 1,
             actList1: [],
       loading:null,
+      pageName:'外遮阳',
         }
     },
     watch: {
         $route(newVal, oldVal) {
             const that = this;
             this.indexs = this.$route.query.id ? this.$route.query.id : 1;
+            if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
             setTimeout(() => {
             that.getActive1();
         }, 0);
@@ -159,6 +163,9 @@ export default {
         for (let index = 0; index < inputList.length; index++) {
             inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
         }
+        if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
     },
     methods: {
          //失去焦点 计算公式 x/10

src/views/page/sunroofControl.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="sunroofControl">
         <div class="table-title">
-            <img src="../../assets/img/sunroofControl.png" alt="">通风窗{{indexs}}
+            <img src="../../assets/img/sunroofControl.png" alt="">{{pageName}}
         </div>
         <div class="title-tips">工作方式选择
             <div class="input-btn">
@@ -204,19 +204,24 @@ export default {
             indexs: 1,
             actList1: [],
       loading:null,
+      pageName:'通风窗'
         }
     },
     watch: {
         $route(newVal, oldVal) {
             const that = this;
             this.indexs = this.$route.query.id ? this.$route.query.id : 1;
+            if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
             setTimeout(() => {
             that.getActive1();
         }, 0);
         },
 '$store.state.equipmentIndex'(newVal, oldVal) {
   this.dataInit();
-},
+  
+},  
     },
     mounted() {
         const that = this;
@@ -230,6 +235,9 @@ export default {
         for (let index = 0; index < inputList.length; index++) {
             inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
         }
+        if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
     },
     methods: {
         //失去焦点 计算公式 x/10

src/views/page/targetCo2.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="targetCo2">
       <div class="table-title">
-      <img src="../../assets/img/targetCo2.png" alt="">目标CO2
+      <img src="../../assets/img/targetCo2.png" alt="">{{ pageName }}
     </div>
     <div class="flex-view border-none shrink-none padding-none">
       <div class="input-main-80">
@@ -104,6 +104,7 @@
         return {
           inputData:[],
       loading:null,
+      pageName:'目标CO2'
         }
     },
   
@@ -123,6 +124,9 @@
     for (let index = 0; index < inputList.length; index++) {
       inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
     }
+    if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
   },
   methods: {
     //失去焦点 计算公式 x/10

src/views/page/targetHumidity.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="targetHumidity">
         <div class="table-title">
-      <img src="../../assets/img/targetHumidity.png" alt="">目标湿度
+      <img src="../../assets/img/targetHumidity.png" alt="">{{pageName}}
     </div>
     <div class="title-tips-bold">
       1#目标湿度参数配置
@@ -202,6 +202,7 @@
         return {
           inputData:[],
       loading:null,
+      pageName:'目标湿度'
         }
     },
  
@@ -221,6 +222,9 @@
     for (let index = 0; index < inputList.length; index++) {
       inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
     }
+    if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
   },
   methods: {
     //失去焦点 计算公式 x/10

src/views/page/targetTemperature.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="targetTemperature">
     <div class="table-title">
-      <img src="../../assets/img/targetTemperature.png" alt="">目标温度
+      <img src="../../assets/img/targetTemperature.png" alt="">{{pageName}}
     </div>
     <div class="title-tips-bold">
       1#目标温度参数配置
@@ -203,6 +203,7 @@ export default {
       timer: null,
       inputData: [],
       loading:null,
+      pageName:'目标温度'
     }
   },
   watch: {
@@ -214,7 +215,7 @@ export default {
 
   mounted() {
     const that = this;
-  
+
     setTimeout(() => {
       that.dataInit();
     }, 0);
@@ -223,6 +224,10 @@ export default {
     for (let index = 0; index < inputList.length; index++) {
       inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
     }
+    if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
+    
   },
   methods: {
     //失去焦点 计算公式 x/10

src/views/page/wetFan.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="wetFan">
         <div class="table-title">
-            <img src="../../assets/img/wetFan.png" alt="">{{getName()}}
+            <img src="../../assets/img/wetFan.png" alt="">{{pageName}}
         </div>
      
         <template v-if="indexs==1">
@@ -388,12 +388,16 @@ export default {
             actList5: [],
             indexs: 1,
       loading:null,
+      pageName:'湿帘风机',
         }
     },
     watch: {
         $route(newVal, oldVal) {
             const that = this;
             this.indexs = this.$route.query.id ? this.$route.query.id : 1;
+            if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
         },
         '$store.state.equipmentIndex'(newVal, oldVal) {
   this.dataInit();
@@ -411,6 +415,9 @@ export default {
         for (let index = 0; index < inputList.length; index++) {
             inputList[index].onfocus = this.selectValue;//input放入焦点，全选文本
         }
+        if(this.$route.query.name){
+      this.pageName=this.$route.query.name
+    }
     },
     methods: {
         getName(){