diff --git a/src/App.vue b/src/App.vue index 1c61672e..dc22450a 100644 --- a/src/App.vue +++ b/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(); } diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js index 3e4dd08c..de02e8e4 100644 --- a/src/i18n/lang/en.js +++ b/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', - collapseInnerShade: 'collapse inner shade', + expandInnerShade: 'expand 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)" } }, diff --git a/src/i18n/lang/zh.js b/src/i18n/lang/zh.js index fe3ab6e1..343cbcb6 100644 --- a/src/i18n/lang/zh.js +++ b/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": "风机。" } }, diff --git a/src/views/page/LED.vue b/src/views/page/LED.vue index 5bc7c0cd..686d53bb 100644 --- a/src/views/page/LED.vue +++ b/src/views/page/LED.vue @@ -107,13 +107,13 @@ {{$t('LED.lightIntensityLow')}} - {{$t('LED.turnOnLights')}} + Klux{{$t('LED.turnOnLights')}}
{{$t('LED.lightIntensityHigh')}} - {{$t('LED.turnOffLights')}} + Klux{{$t('LED.turnOffLights')}}
diff --git a/src/views/page/facadeInsulation.vue b/src/views/page/facadeInsulation.vue index 4fc791c1..da3ec76b 100644 --- a/src/views/page/facadeInsulation.vue +++ b/src/views/page/facadeInsulation.vue @@ -58,7 +58,7 @@ {{$t('facadeInsulation.whenLightGreaterThan')}} - klu + Klux {{$t('facadeInsulation.advance')}} diff --git a/src/views/page/insizeSunshade.vue b/src/views/page/insizeSunshade.vue index 288d557c..f993a869 100644 --- a/src/views/page/insizeSunshade.vue +++ b/src/views/page/insizeSunshade.vue @@ -57,7 +57,7 @@ {{$t('insizeSunshade.outdoorLightGreaterThan')}} - {{$t('insizeSunshade.KLux')}}，{{$t('insizeSunshade.expandInnerShade')}}。{{$t('insizeSunshade.lightConfirmationTime')}} + {{$t('insizeSunshade.KLux')}},{{$t('insizeSunshade.expandInnerShade')}}{{$t('insizeSunshade.lightConfirmationTime')}} {{$t('text.minutes')}}。{{$t('insizeSunshade.lightHysteresisBand')}} @@ -77,7 +77,7 @@ {{$t('insizeSunshade.indoorTempHigherThan')}} - {{$t('text.degrees')}},{{$t('insizeSunshade.expandInnerShade')}} + ℃,{{$t('insizeSunshade.expandInnerShade')}}
@@ -113,6 +113,7 @@ {{$t('insizeSunshade.dehumidifyAngle')}} + % diff --git a/src/views/page/internalInsulation.vue b/src/views/page/internalInsulation.vue index 8bb4bf07..335e97f2 100644 --- a/src/views/page/internalInsulation.vue +++ b/src/views/page/internalInsulation.vue @@ -65,7 +65,7 @@ {{$t('internalInsulation.indoorTempHigherThan')}} - {{$t('text.degrees')}}，{{$t('internalInsulation.expandInnerInsulation')}}。 + ℃，{{$t('internalInsulation.expandInnerInsulation')}}。
@@ -78,6 +78,7 @@ {{$t('internalInsulation.dehumidifyAngle')}} + %
@@ -91,7 +92,7 @@ {{$t('internalInsulation.whenLightGreaterThan')}} - {{$t('internalInsulation.when')}}，{{$t('internalInsulation.advance')}} + Klux{{$t('internalInsulation.when')}}，{{$t('internalInsulation.advance')}} {{$t('internalInsulation.advanceCollapse')}}。 diff --git a/src/views/page/outsizeSunshade.vue b/src/views/page/outsizeSunshade.vue index 0216318d..24da3dc8 100644 --- a/src/views/page/outsizeSunshade.vue +++ b/src/views/page/outsizeSunshade.vue @@ -106,7 +106,7 @@ {{$t('outsizeSunshade.windSpeedHigh')}} - {{$t('outsizeSunshade.windProtection')}} + m/s{{$t('outsizeSunshade.windProtection')}} {{$t('text.minutes')}} diff --git a/src/views/page/status.vue b/src/views/page/status.vue index 276f86ee..93c8aa42 100644 --- a/src/views/page/status.vue +++ b/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 - - // for (var i = 0; i < index; i++) { - // if (Number(number[i])) { - // typeNumber = i - // } - // } - // this.openType = this.getType29(typeNumber) + + var index = 6 + var typeNumber = -1 + for (var i = 0; i < index; i++) { + if (Number(openListNew[i+8])) { + typeNumber = i + } + } + this.openType = this.getType29(typeNumber) // var statusIndex = 8 // var list=[] diff --git a/src/views/page/sunroofControl.vue b/src/views/page/sunroofControl.vue index 95a968ca..3800f103 100644 --- a/src/views/page/sunroofControl.vue +++ b/src/views/page/sunroofControl.vue @@ -34,7 +34,7 @@
{{$t('sunroofControl.tempControlPrecision')}}
- {{$t('text.degrees')}} + ℃
{{$t('sunroofControl.calculationCycle')}}
@@ -163,6 +163,7 @@ {{$t('sunroofControl.tempDehumidification.condition')}} + ℃ {{$t('sunroofControl.tempDehumidification.actionOpen')}} diff --git a/src/views/page/wetFan.vue b/src/views/page/wetFan.vue index 1c911c39..9587e1c5 100644 --- a/src/views/page/wetFan.vue +++ b/src/views/page/wetFan.vue @@ -113,7 +113,7 @@ {{$t('wetFan.conditions.outdoorTempLimit.prefix')}} - {{$t('wetFan.conditions.outdoorTempLimit.suffix')}} + ℃{{$t('wetFan.conditions.outdoorTempLimit.suffix')}}
@@ -127,7 +127,7 @@ {{$t('wetFan.conditions.tempExceed.prefix')}} - {{$t('wetFan.conditions.tempExceed.suffix')}} + ℃{{$t('wetFan.conditions.tempExceed.suffix')}}
@@ -159,6 +159,7 @@ {{$t('wetFan.mode2')}}：{{$t('wetFan.conditions.tempPrecision')}} + ℃
@@ -317,9 +318,10 @@ {{$t('wetFan.window.tempTrigger.prefix')}} - {{$t('wetFan.window.tempTrigger.middle')}} + ℃{{$t('wetFan.window.tempTrigger.middle')}} + ℃
@@ -367,9 +369,10 @@ {{$t('wetFan.window.tempTrigger.prefix')}} - {{$t('wetFan.window.tempTrigger.middle')}} + ℃{{$t('wetFan.window.tempTrigger.middle')}} + ℃
diff --git a/src/views/vrcode.vue b/src/views/vrcode.vue index 5c391de8..094b5815 100644 --- a/src/views/vrcode.vue +++ b/src/views/vrcode.vue @@ -21,18 +21,18 @@