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

Reviewed-on: #277

src/i18n/lang/zh.js

@@ -642,7 +642,7 @@ module.exports = {
     "period2": "时段2",
     "period3": "时段3",
     "period4": "时段4",
-    "highHumidity": "湿度高于",
+    "highHumidity": "室内湿度高于",
     "startFan": "启动环流风扇",
     "controlPrecision": "控制精度",
     "co2Supplement": "CO2补气时，同时运行环流风扇。",
@@ -724,7 +724,7 @@ module.exports = {
   facadeInsulation: {
     insulationStartTime: '保温开始时间',
     insulationEndTime: '保温结束时间',
-    whenLightGreaterThan: '当光照大于',
+    whenLightGreaterThan: '当室外光照大于',
     advance: '提前',
     minutesCollapseFacade: '分钟收拢立面保温'
   },
@@ -808,13 +808,13 @@ module.exports = {
   insizeSunshade: {
     daytimeShadingPeriod: '白天遮阳时段',
     outdoorLightGreaterThan: '室外光照大于',
-    lightConfirmationTime: '光照确认时间',
+    lightConfirmationTime: '室外光照确认时间',
     lightHysteresisBand: '室外光照滞回带',
     indoorTempHigherThan: '室内温度高于目标温度',
     nightInsulationPeriod: '夜间保温时段',
     KLux: '(KLux)时',
     dehumidifyAngle: '通风窗除湿时，内遮阳开启角度',
-    lightGreaterThan: '光照大于',
+    lightGreaterThan: '室外光照大于',
     advanceCollapse: '分钟收拢内遮阳。',
     nightInsulationEnd: '夜间保温结束时',
     stepsToCollapse: '步收拢遮阳网，间隔时间',
@@ -831,7 +831,7 @@ module.exports = {
     indoorTempHigherThan: '室内温度高于目标温度',
     expandInnerInsulation: '展开内保温',
     dehumidifyAngle: '通风窗除湿时，内保温开启角度',
-    whenLightGreaterThan: '光照大于',
+    whenLightGreaterThan: '室外光照大于',
     advanceCollapse: '分钟收拢内保温',
     when: '时',
     advance: '提前',
@@ -1215,7 +1215,7 @@ module.exports = {
     }
   },
   "sunroofControl": {
-    "tempControlPrecision": "温度控制精度",
+    "tempControlPrecision": "室内温度控制精度",
     "calculationCycle": "计算周期",
     "proportionalCoefficient": "比例系数",
     "integralCoefficient": "积分系数",
@@ -1231,11 +1231,11 @@ module.exports = {
     "rainProtection": "选择下雨保护条件有效",
     "rainGaugeDetection": "选择有雨量桶检测条件有效",
     "humidity": {
-      "condition": "实测湿度大于（目标湿度+滞回带",
+      "condition": "实测室内湿度大于（目标湿度+滞回带",
       "action": "通风窗除湿时开启角度",
     },
     "tempDehumidification": {
-      "condition": "实测温度比目标温度低",
+      "condition": "实测室内温度比目标温度低",
       "actionOpen": "将进行间断除湿开",
       "actionClose": "分钟，关",
     },
@@ -1360,7 +1360,7 @@ module.exports = {
         "suffix": "时，禁止启动风机。"
       },
       "tempExceed": {
-        "prefix": "实测温度大于目标温度",
+        "prefix": "实测室内温度大于目标温度",
         "suffix": "时，跳过通风窗直接启动风机。"
       },
       "fanStartCondition": {
@@ -1380,7 +1380,7 @@ module.exports = {
       "window1": "湿帘外翻窗1模式",
       "window2": "湿帘外翻窗2模式",
       "tempTrigger": {
-        "prefix": "室温大于",
+        "prefix": "室内温度大于",
         "middle": "时，开启湿帘外翻窗降温。滞回带",
       },
       "closeDelay": {

src/views/page/heatFan.vue

@@ -113,7 +113,7 @@
         </div>
         <div class="flex-view padding-none shrink-none border-none">
             <div class="input-main-60">
-                <span></span><span></span> <span>&nbsp;{{$t('heatFan.coolingMode')}}&nbsp;:</span>
+                <span></span><span></span> <span>&nbsp;{{$t('heatFan.tempAboveTarget')}}</span>
                 <input @blur="blurChange10(22259, $event)" v-model="inputData[22259]"
                     @input="changeCount10(22259, $event)" type="text" placeholder="0">
                 <span>{{$t('heatFan.decreaseGear')}}</span>
@@ -200,7 +200,6 @@ export default {
         return {
             inputData: [],
             typeList1: [
-            { label:this.$t('heatFan.gear0'), value: 0 },
                   { label:this.$t('heatFan.gear2',{index:1}), value: 1 },
                   { label:this.$t('heatFan.gear2',{index:2}), value: 2 },
                   { label:this.$t('heatFan.gear2',{index:3}), value: 3 },
@@ -320,7 +319,7 @@ export default {
             this.change(code, sendData)
         },
         getData1(data) {
-            var name = "";
+            var name = "0";
             this.typeList1.forEach((el, index) => {
                 if (el.value == data) {
                     name = el.label;

src/views/page/sunroofControl.vue

@@ -51,13 +51,13 @@
                 <span>，{{$t('sunroofControl.integralCoefficient')}}</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>
+                <span class="padding-none">，</span>
             </div>
                 <div class="input-main-60 input-disabled">
-                <span>{{$t('sunroofControl.pidResult')}}</span>
+                <span class="padding-none">{{$t('sunroofControl.pidResult')}}</span>
                 <!-- <input disabled v-model="statusData[1114+Number(indexs)]"
                  type="text" placeholder="0"> -->
-                <span>{{statusData[1114+Number(indexs)]}}。</span>
+                <span>{{statusData[1114+Number(indexs)]}}</span>
             </div>
         </div>
         <div class="flex-view border-none padding-none shrink-none">

src/views/page/wetFan.vue

@@ -406,7 +406,6 @@ export default {
       loading:null,
       pageName:'湿帘风机',
       typeList1: [
-         { label:this.$t('heatFan.gear0'), value: 0 },
                   { label:this.$t('heatFan.gear1',{index:1}), value: 1 },
                   { label:this.$t('heatFan.gear1',{index:2}), value: 2 },
                   { label:this.$t('heatFan.gear1',{index:3}), value: 3 },
@@ -705,7 +704,7 @@ export default {
             })
         },
         getData1(data) {
-            var name = "";
+            var name = "0";
             this.typeList1.forEach((el, index) => {
                 if (el.value == data) {
                     name = el.label;