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

Reviewed-on: #275

src/App.vue

@@ -30,6 +30,10 @@
  
     },
     mounted(){
+         var router = this.$route.query;
+      if(router.token){
+      localStorage.setItem("token", router.token);
+      }
  let inputList = document.querySelectorAll('input');
    for (let index = 0; index < inputList.length; index++) {
      inputList[index].onfocus = this.selectValue();//input放入焦点，全选文本
@@ -37,7 +41,7 @@
     
     },
     methods:{
-      //全选文本
+      //全选文本 
 selectValue(e) {
 	e.currentTarget.select();
 }

src/i18n/lang/en.js

@@ -662,7 +662,7 @@ module.exports = {
   coercionMist: {
 
     indoorTempHigher: 'Indoor temperature higher than target temperature',
-    openHighPressureMist: 'degrees, turn on high pressure mist cooling',
+    openHighPressureMist: '℃, turn on high pressure mist cooling',
     intervalWork: 'for interval work',
     indoorHumidityLower: 'Indoor humidity lower than target value, turn on high pressure mist humidification',
     indoorHumidityHigher: 'Indoor humidity higher than (target humidity + hysteresis band)',
@@ -804,8 +804,8 @@ module.exports = {
     nightInsulationEnd: 'At the end of night insulation',
     stepsToCollapse: 'steps to collapse the shade net, interval time',
     degrees: 'degrees',
-    expandInnerShade: 'expand inner shade',
+    expandInnerShade: 'expand inner shade.',
-    collapseInnerShade: 'collapse inner shade',
+    collapseInnerShade: 'collapse inner shade.',
     shadingNet: 'shade net'
   },
   internalInsulation: {
@@ -1346,7 +1346,7 @@ module.exports = {
       },
       "fanStartCondition": {
         "prefix": "Start fan ",
-        "middle": " when temp > (",
+        "middle": "℃ when temp > (",
         "suffix": " + hysteresis)"
       }
     },

src/i18n/lang/zh.js

@@ -673,7 +673,7 @@ module.exports = {
   },
   coercionMist: {
     indoorTempHigher: '室内温度高于目标温度',
-    openHighPressureMist: '度，开启高压微雾降温。',
+    openHighPressureMist: '℃，开启高压微雾降温。',
     intervalWork: '进行间隔工作。',
     indoorHumidityLower: '室内湿度小于目标值，开启高压微雾加湿。',
     indoorHumidityHigher: '室内湿度大于（目标湿度+滞回带',
@@ -1238,7 +1238,7 @@ module.exports = {
     },
     "tempLimit": {
       "condition": "室内温度低于",
-      "action": "度，禁止开窗除湿"
+      "action": "℃，禁止开窗除湿"
     },
     "rainDetectionTime": "下雨检测时间"
   },
@@ -1362,7 +1362,7 @@ module.exports = {
       },
       "fanStartCondition": {
         "prefix": "温度大于(",
-        "middle": "+控温精度滞回带)时，启动",
+        "middle": "℃+控温精度滞回带)时，启动",
         "suffix": "风机。"
       }
     },

src/views/page/LED.vue

@@ -107,13 +107,13 @@
                 <span>{{$t('LED.lightIntensityLow')}}</span>
                 <input @blur="blurChange10(21425, $event)" v-model="inputData[21425]"
                     @input="changeCount10(21425, $event)" type="text" placeholder="0">
-                <span>{{$t('LED.turnOnLights')}}</span>
+                <span>Klux{{$t('LED.turnOnLights')}}</span>
             </div>
             <div class="input-main-60">
                 <span>{{$t('LED.lightIntensityHigh')}}</span>
                 <input @blur="blurChange10(21426, $event)" v-model="inputData[21426]"
                     @input="changeCount10(21426, $event)" type="text" placeholder="0">
-                <span>{{$t('LED.turnOffLights')}}</span>
+                <span>Klux{{$t('LED.turnOffLights')}}</span>
             </div>
         </div>
         <div class="flex-view padding-none shrink-none">

src/views/page/facadeInsulation.vue

@@ -58,7 +58,7 @@
                 <span>{{$t('facadeInsulation.whenLightGreaterThan')}}</span>
                 <input @blur="blurChange10(startList[indexs - 1] + 6, $event)" v-model="inputData[startList[indexs - 1] + 6]"
                     @input="changeCount10(startList[indexs - 1] + 6, $event)" type="text" placeholder="0">
-                <span>klu </span>
+                <span>Klux </span>
                 <span>{{$t('facadeInsulation.advance')}}</span>
                   <input @blur="blurChange(startList[indexs-1]+7, $event)" v-model="inputData[startList[indexs-1]+7]" @input="change(startList[indexs-1]+7, $event)"
                  type="text" placeholder="0">

src/views/page/insizeSunshade.vue

@@ -57,7 +57,7 @@
                 <span>{{$t('insizeSunshade.outdoorLightGreaterThan')}}</span>
                 <input @blur="blurChange10(startList[indexs-1]+6, $event)" v-model="inputData[startList[indexs-1]+6]" @input="changeCount10(startList[indexs-1]+6, $event)"
                  type="text" placeholder="0">
-                <span>{{$t('insizeSunshade.KLux')}}，{{$t('insizeSunshade.expandInnerShade')}}。{{$t('insizeSunshade.lightConfirmationTime')}}</span>
+                <span>{{$t('insizeSunshade.KLux')}},{{$t('insizeSunshade.expandInnerShade')}}{{$t('insizeSunshade.lightConfirmationTime')}}</span>
                 <input @blur="blurChange(startList[indexs-1]+12, $event)" v-model="inputData[startList[indexs-1]+12]" @input="change(startList[indexs-1]+12, $event)"
                  type="text" placeholder="0">
                 <span>{{$t('text.minutes')}}。{{$t('insizeSunshade.lightHysteresisBand')}}</span>
@@ -77,7 +77,7 @@
                 <span>{{$t('insizeSunshade.indoorTempHigherThan')}}</span>
                 <input @blur="blurChange10(startList[indexs-1]+7, $event)" v-model="inputData[startList[indexs-1]+7]" @input="changeCount10(startList[indexs-1]+7, $event)"
                  type="text" placeholder="0">
-                <span>{{$t('text.degrees')}},{{$t('insizeSunshade.expandInnerShade')}}</span>
+                <span>℃,{{$t('insizeSunshade.expandInnerShade')}}</span>
             </div>
         </div>
 
@@ -113,6 +113,7 @@
                 <span>{{$t('insizeSunshade.dehumidifyAngle')}}</span>
                 <input @blur="blurChange(startList[indexs-1]+13, $event)" v-model="inputData[startList[indexs-1]+13]" @input="change(startList[indexs-1]+13, $event)"
                  type="text" placeholder="0">
+                 <span>%</span>
             </div>
         </div>
    

src/views/page/internalInsulation.vue

@@ -65,7 +65,7 @@
                  <span>{{$t('internalInsulation.indoorTempHigherThan')}}</span>
                 <input @blur="blurChange10(startList[indexs - 1] + 2, $event)" v-model="inputData[startList[indexs - 1] + 2]"
                     @input="changeCount10(startList[indexs - 1] + 2, $event)" type="text" placeholder="0">
-              <span>{{$t('text.degrees')}}，{{$t('internalInsulation.expandInnerInsulation')}}。</span>
+              <span>℃，{{$t('internalInsulation.expandInnerInsulation')}}。</span>
             </div>
         </div>
         <div class="flex-view border-none  shrink-none padding-none">
@@ -78,6 +78,7 @@
                 <span>{{$t('internalInsulation.dehumidifyAngle')}}</span>
                 <input @blur="blurChange(startList[indexs-1]+7, $event)" v-model="inputData[startList[indexs-1]+7]" @input="change(startList[indexs-1]+7, $event)"
                  type="text" placeholder="0">
+                 <span>%</span>
             </div>
         </div>
 
@@ -91,7 +92,7 @@
                <span>{{$t('internalInsulation.whenLightGreaterThan')}}</span>
                 <input @blur="blurChange10(startList[indexs - 1] + 8, $event)" v-model="inputData[startList[indexs - 1] + 8]"
                     @input="changeCount10(startList[indexs - 1] + 8, $event)" type="text" placeholder="0">
-                <span>{{$t('internalInsulation.when')}}，{{$t('internalInsulation.advance')}}</span>
+                <span>Klux{{$t('internalInsulation.when')}}，{{$t('internalInsulation.advance')}}</span>
                 <input @blur="blurChange(startList[indexs-1]+9, $event)" v-model="inputData[startList[indexs-1]+9]" @input="change(startList[indexs-1]+9, $event)"
                  type="text" placeholder="0">
                 <span>{{$t('internalInsulation.advanceCollapse')}}。</span>

src/views/page/outsizeSunshade.vue

@@ -106,7 +106,7 @@
                 <span>{{$t('outsizeSunshade.windSpeedHigh')}}</span>
                 <input @blur="blurChange10(startList[indexs-1]+12, $event)" v-model="inputData[startList[indexs-1]+12]" @input="changeCount10(startList[indexs-1]+12, $event)"
                  type="text" placeholder="0">
-                <span>{{$t('outsizeSunshade.windProtection')}}</span>
+                <span>m/s{{$t('outsizeSunshade.windProtection')}}</span>
                 <input @blur="blurChange(startList[indexs-1]+11, $event)" v-model="inputData[startList[indexs-1]+11]" @input="change(startList[indexs-1]+11, $event)"
                  type="text" placeholder="0">
                 <span>{{$t('text.minutes')}}</span>

src/views/page/status.vue

@@ -510,15 +510,15 @@ export default {
               var openListNew = []
             openListNew = number.split("")
             this.right2Index = openListNew.reverse();
-            // var index = 6
+            
-            // var typeNumber = -1
+            var index = 6
-
+            var typeNumber = -1
-            // for (var i = 0; i < index; i++) {
+            for (var i = 0; i < index; i++) {
-            //     if (Number(number[i])) {
+                if (Number(openListNew[i+8])) {
-            //         typeNumber = i
+                    typeNumber = i
-            //     }
+                }
-            // }
+            }
-            // this.openType = this.getType29(typeNumber)
+            this.openType = this.getType29(typeNumber)
 
             // var statusIndex = 8
             // var list=[]

src/views/page/sunroofControl.vue

@@ -34,7 +34,7 @@
                 <div>{{$t('sunroofControl.tempControlPrecision')}}</div>
                 <input @blur="blurChange10(startList[indexs-1]+3, $event)" v-model="inputData[startList[indexs-1]+3]" @input="changeCount10(startList[indexs-1]+3, $event)"
                  type="text" placeholder="0">
-                <span>{{$t('text.degrees')}}</span>
+                <span>℃</span>
             </div>
             <div class="input-main input-main-w120">
                 <div>{{$t('sunroofControl.calculationCycle')}}</div>
@@ -163,6 +163,7 @@
                 <span>{{$t('sunroofControl.tempDehumidification.condition')}}</span>
                 <input @blur="blurChange10(startList[indexs-1]+15, $event)" v-model="inputData[startList[indexs-1]+15]" @input="changeCount10(startList[indexs-1]+15, $event)"
                  type="text" placeholder="0">
+                 <span>℃</span>
                 <span>{{$t('sunroofControl.tempDehumidification.actionOpen')}}</span>
                 <input @blur="blurChange(startList[indexs-1]+10, $event)" v-model="inputData[startList[indexs-1]+10]" @input="change(startList[indexs-1]+10, $event)"
                  type="text" placeholder="0">

src/views/page/wetFan.vue

@@ -113,7 +113,7 @@
                 <span>{{$t('wetFan.conditions.outdoorTempLimit.prefix')}}</span>
                 <input @blur="blurChangeCount(21958, $event)" v-model="inputData[21958]" @input="changeCountData(21958, $event)"
                  type="text" placeholder="0">
-                <span>{{$t('wetFan.conditions.outdoorTempLimit.suffix')}}</span>
+                <span>℃{{$t('wetFan.conditions.outdoorTempLimit.suffix')}}</span>
             </div>
         </div>
 
@@ -127,7 +127,7 @@
                 <span>{{$t('wetFan.conditions.tempExceed.prefix')}}</span>
                 <input @blur="blurChange10(21960, $event)" v-model="inputData[21960]" @input="changeCount10(21960, $event)"
                  type="text" placeholder="0">
-                <span>{{$t('wetFan.conditions.tempExceed.suffix')}}</span>
+                <span>℃{{$t('wetFan.conditions.tempExceed.suffix')}}</span>
             </div>
         </div>
         <div class="flex-view border-none shrink-none padding-none">
@@ -159,6 +159,7 @@
                 <span>{{$t('wetFan.mode2')}}：{{$t('wetFan.conditions.tempPrecision')}}</span>
                 <input @blur="blurChange10(21964, $event)" v-model="inputData[21964]" @input="changeCount10(21964, $event)"
                 type="text" placeholder="0">
+                <span>℃</span>
             </div>
         </div>
 
@@ -317,9 +318,10 @@
                 <span>{{$t('wetFan.window.tempTrigger.prefix')}}</span>
                 <input @blur="blurChangeCount(21976, $event)" v-model="inputData[21976]" @input="changeCountData(21976, $event)"
                  type="text" placeholder="0">
-                <span>{{$t('wetFan.window.tempTrigger.middle')}}</span>
+                <span>℃{{$t('wetFan.window.tempTrigger.middle')}}</span>
                 <input @blur="blurChange10(21977, $event)" v-model="inputData[21977]" @input="changeCount10(21977, $event)"
                  type="text" placeholder="0">
+                 <span>℃</span>
             </div>
         </div>
         <div class="flex-view shrink-none padding-none">
@@ -367,9 +369,10 @@
                 <span>{{$t('wetFan.window.tempTrigger.prefix')}}</span>
                 <input @blur="blurChangeCount(21981, $event)" v-model="inputData[21981]" @input="changeCountData(21981, $event)"
                  type="text" placeholder="0">
-                <span>{{$t('wetFan.window.tempTrigger.middle')}}</span>
+                <span>℃{{$t('wetFan.window.tempTrigger.middle')}}</span>
                 <input @blur="blurChange10(21982, $event)" v-model="inputData[21982]" @input="changeCount10(21982, $event)"
                  type="text" placeholder="0">
+                    <span>℃</span>
             </div>
         </div>
         <div class="flex-view border-none shrink-none padding-none">

src/views/vrcode.vue

@@ -21,18 +21,18 @@
             <div class="left collapse scroll">
                 <el-menu :default-active="routerNow" class="el-menu-vertical-demo" @open="clickmenu" @close="clickmenu">
                     <template v-for="item, index in leftList">
-                        <el-submenu @click="toRouter1(item)" :index="item.router" v-if="item.list.length">
+                        <el-submenu @click="toRouter1(item)" :key="index" :index="item.router" v-if="item.list.length">
                             <template slot="title">
                                 <div class="img"><img :src="item.img" alt=""></div>
                                 <span>{{ item.name }}</span>
                             </template>
                             <el-menu-item-group>
                                 <el-menu-item :disabled="item1.router ? false : true" @click="toRouter1(item1)"
-                                    :index="item1.router" v-for="item1, index1 in item.list">{{ item1.name
+                                    :index="item1.router"  :key="index1" v-for="item1, index1 in item.list">{{ item1.name
                                     }}</el-menu-item>
                             </el-menu-item-group>
                         </el-submenu>
-                        <el-menu-item @click="toRouter1(item)" :index="item.router" v-else>
+                        <el-menu-item @click="toRouter1(item)"  :key="index" :index="item.router" v-else>
                             <div class="img"><img :src="item.img" alt=""></div>
                             <span>{{ item.name }}</span>
                         </el-menu-item>