diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 3a3548f3..03b08943 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -681,6 +681,10 @@ textarea { margin-bottom: 11px; } +.input-sel.input-sel-w220 .el-dropdown-link { + width: 220px; +} + .input-sel.input-sel-w180 .el-dropdown-link { width: 180px; } @@ -840,6 +844,12 @@ textarea { color: #FF9191; } +.input-main-60.input-disabled input { + background: transparent; + border: 2px solid transparent; + padding-left: 0; +} + .input-main-60 span { padding: 0 10px; } diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 0e769e36..f0bfe132 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -719,7 +719,11 @@ textarea { >.title { margin-bottom: 11px; } - + &.input-sel-w220 { + .el-dropdown-link { + width: 220px; + } + } &.input-sel-w180 { .el-dropdown-link { width: 180px; @@ -828,7 +832,7 @@ textarea { width: 120px; } } - + &.input-disabled { input { background: transparent; @@ -898,7 +902,13 @@ textarea { color: #FF9191; } } - + &.input-disabled { + input { + background: transparent; + border: 2px solid transparent; + padding-left: 0; + } + } span { padding: 0 10px; diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js index 253803b8..44320e74 100644 --- a/src/i18n/lang/en.js +++ b/src/i18n/lang/en.js @@ -683,7 +683,8 @@ module.exports = { timeSegment: 'Time segment activation: each irrigation duration', minutes: 'minutes', timeRange: 'time range', - startTimes: 'start times in this time range', + startTimes: 'Started', + startTimes1: 'times within the time period', soilSensor: 'Soil sensor', validDetectionTime: 'Valid detection time range', minSoilMoisture: 'Minimum soil moisture', @@ -778,10 +779,10 @@ module.exports = { tempBelowTarget: 'Temperature below target value', tempAboveTarget: 'Temperature above target value', cannotReachTarget: 'Cannot reach target value,', - startHeating: '°C, start 1st gear heating', - startCooling: '°C, start 1st gear cooling', - decreaseGear: '°C, decrease gear', - increaseGear: 'seconds, increase gear', + startHeating: '°C, start 1st gear heating.', + startCooling: '°C, start 1st gear cooling.', + decreaseGear: '°C, decrease gear.', + increaseGear: 'seconds, increase gea.r', operationRules: { closeSkylight: 'Close skylight when heater/cooler fan is running', closeFanPad: 'Close fan and pad when heater/cooler fan is running', @@ -996,7 +997,7 @@ module.exports = { outsizeSunshade: { workingHours: "Working hours:", - rainPosition: "Shade net position during rain", + rainPosition: "Position of the sunshade net during rainfall", rainConfirmTime: "Rain confirmation time", outdoorLightHigh1: "When outdoor light intensity is greater than", outdoorLightHigh2: "(KLux), expand the outer shade", @@ -1201,7 +1202,8 @@ module.exports = { "proportionalCoefficient": "P Coefficient", "integralCoefficient": "I Coefficient", "pidResult": "PID Result", - "ventilationStages": "Vent Stages", + "ventilationStages": "Ventilation windows open fully in", + "ventilationStages1": "stages", "fanOperationAngle": "Open Angle When Fan Running", "outdoorTempLimit": "Disable when outdoor temp < ", "outdoorTempLimit1": "℃", diff --git a/src/i18n/lang/zh.js b/src/i18n/lang/zh.js index b957fcce..2e73abbf 100644 --- a/src/i18n/lang/zh.js +++ b/src/i18n/lang/zh.js @@ -695,7 +695,8 @@ module.exports = { timeSegment: '时间段启动：每次灌溉时长', timeRange: '时间段', minutes: '分', - startTimes: '时间段里启动次数', + startTimes: '时间段内启动', + startTimes1: '次', soilSensor: '土壤传感器', validDetectionTime: '有效检测时间段', minSoilMoisture: '最低土壤湿度', @@ -792,7 +793,7 @@ module.exports = { cannotReachTarget: '达不到目标值,', startHeating: '℃时，启动1档加热。', startCooling: '℃时，启动1档制冷。', - decreaseGear: '℃时，减档', + decreaseGear: '℃时，减档。', increaseGear: '秒加档。', operationRules: { closeSkylight: '冷暖风机运行时，关闭天窗。', @@ -800,7 +801,7 @@ module.exports = { openCirculationFan: '冷暖风机运行时，开启环流风扇。' }, gear0: '0', - gear1: '{index}档', + gear1: '{index}级', }, insizeSunshade: { @@ -1008,7 +1009,7 @@ module.exports = { outsizeSunshade: { workingHours: "工作时段:", - rainPosition: "降雨时遮阳网处于的位置", + rainPosition: "降雨时，遮阳网处于的位置", rainConfirmTime: "降雨确认时间", outdoorLightHigh1: "室外光照大于", outdoorLightHigh2: "(KLux)时，展开外遮阳", @@ -1218,7 +1219,8 @@ module.exports = { "proportionalCoefficient": "比例系数", "integralCoefficient": "积分系数", "pidResult": "PID计算结果", - "ventilationStages": "通风窗分阶段全部打开次数", + "ventilationStages": "通风窗分阶段", + "ventilationStages1": "次全部打开", "fanOperationAngle": "风机运行时，通风窗打开角度", "outdoorTempLimit": "室外温度低于", "outdoorTempLimit1": "℃时，禁止开启通风窗。", @@ -1378,7 +1380,7 @@ module.exports = { "window2": "湿帘外翻窗2模式", "tempTrigger": { "prefix": "室温大于", - "middle": "开启湿帘外翻窗降温。滞回带", + "middle": "时开启湿帘外翻窗降温。滞回带", }, "closeDelay": { "prefix": "风机结束时，", diff --git a/src/views/page/LED.vue b/src/views/page/LED.vue index 686d53bb..31e0524a 100644 --- a/src/views/page/LED.vue +++ b/src/views/page/LED.vue @@ -59,7 +59,7 @@
- {{$t('LED.highTempAlert')}} + {{$t('LED.highTempAlert')}}。
@@ -67,7 +67,7 @@
- {{$t('LED.useTargetTemp1')}} + {{$t('LED.useTargetTemp1')}}，
@@ -75,7 +75,7 @@
- {{$t('LED.useTargetTemp2')}} + {{$t('LED.useTargetTemp2')}}。
@@ -102,8 +102,11 @@
+
+
+
+
- {{$t('LED.lightIntensityLow')}} @@ -117,8 +120,11 @@
+
+
+
+
- {{$t('LED.lightSourceSelect')}}
@@ -132,13 +138,13 @@ item.label }} + ，
- {{$t('LED.lightConfirmTime')}} - {{$t('text.minutes')}} + {{$t('text.minutes')}}。
@@ -146,7 +152,7 @@ {{$t('LED.groupStartInterval')}} - {{$t('LED.preventOverload')}} + {{$t('LED.preventOverload')}}。
{{$t('LED.timePeriod', {index:1})}} diff --git a/src/views/page/air-conditioning.vue b/src/views/page/air-conditioning.vue index fedeafe8..aabd05e1 100644 --- a/src/views/page/air-conditioning.vue +++ b/src/views/page/air-conditioning.vue @@ -52,7 +52,7 @@ type="text" placeholder="0" /> - ℃ + ℃。
diff --git a/src/views/page/circulationCan.vue b/src/views/page/circulationCan.vue index 1b629845..01d0723d 100644 --- a/src/views/page/circulationCan.vue +++ b/src/views/page/circulationCan.vue @@ -46,6 +46,10 @@
+
+
+
+
{{$t('circulation.period2')}}：
+
+
+
+
{{$t('circulation.period3')}}：
+
+
+
+
{{$t('circulation.period4')}}： - % + %。
diff --git a/src/views/page/electromagneticControl.vue b/src/views/page/electromagneticControl.vue index 1ef36e5b..f0a04794 100644 --- a/src/views/page/electromagneticControl.vue +++ b/src/views/page/electromagneticControl.vue @@ -28,11 +28,11 @@ {{$t('electromagnetic.manualValveTime')}} - {{$t('text.minutes')}} + {{$t('text.minutes')}}。
-
+
{{$t('electromagnetic.operationMode')}}
@@ -75,7 +75,7 @@ {{$t('electromagnetic.timeSegment')}} - {{$t('electromagnetic.minutes')}} + {{$t('electromagnetic.minutes')}}。
@@ -97,6 +97,7 @@ {{$t('electromagnetic.startTimes')}} + {{$t('electromagnetic.startTimes1')}}
@@ -118,6 +119,7 @@ {{$t('electromagnetic.startTimes')}} + {{$t('electromagnetic.startTimes1')}}
@@ -144,7 +146,7 @@ {{$t('electromagnetic.minSoilMoisture')}} - % + %。
@@ -152,7 +154,7 @@ {{$t('electromagnetic.maxSoilMoisture')}} - % + %。
@@ -160,7 +162,7 @@ {{$t('electromagnetic.irrigationDurationLimit')}} - {{$t('text.minutes')}} + {{$t('text.minutes')}}。
diff --git a/src/views/page/facadeInsulation.vue b/src/views/page/facadeInsulation.vue index da3ec76b..eea11f89 100644 --- a/src/views/page/facadeInsulation.vue +++ b/src/views/page/facadeInsulation.vue @@ -58,11 +58,10 @@ {{$t('facadeInsulation.whenLightGreaterThan')}} - Klux - {{$t('facadeInsulation.advance')}} + Klux，{{$t('facadeInsulation.advance')}} - {{$t('facadeInsulation.minutesCollapseFacade')}} + {{$t('facadeInsulation.minutesCollapseFacade')}}。 diff --git a/src/views/page/insizeSunshade.vue b/src/views/page/insizeSunshade.vue index f993a869..3f6cdd8e 100644 --- a/src/views/page/insizeSunshade.vue +++ b/src/views/page/insizeSunshade.vue @@ -63,7 +63,7 @@ {{$t('text.minutes')}}。{{$t('insizeSunshade.lightHysteresisBand')}} - Klux + Klux。 @@ -113,7 +113,7 @@ {{$t('insizeSunshade.dehumidifyAngle')}} - % + %。 @@ -152,7 +152,7 @@ {{$t('insizeSunshade.stepsToCollapse')}} - {{$t('text.minutes')}} + {{$t('text.minutes')}}。 diff --git a/src/views/page/internalInsulation.vue b/src/views/page/internalInsulation.vue index 335e97f2..c3fe4c2b 100644 --- a/src/views/page/internalInsulation.vue +++ b/src/views/page/internalInsulation.vue @@ -50,7 +50,7 @@ {{$t('internalInsulation.stepsToCollapse')}} - {{$t('text.minutes')}} + {{$t('text.minutes')}}。 @@ -65,7 +65,7 @@ {{$t('internalInsulation.indoorTempHigherThan')}} - ℃，{{$t('internalInsulation.expandInnerInsulation')}}。 + ℃{{$t('internalInsulation.when')}}，{{$t('internalInsulation.expandInnerInsulation')}}。
@@ -78,7 +78,7 @@ {{$t('internalInsulation.dehumidifyAngle')}} - % + %。
diff --git a/src/views/page/outsizeSunshade.vue b/src/views/page/outsizeSunshade.vue index 24da3dc8..637fb83f 100644 --- a/src/views/page/outsizeSunshade.vue +++ b/src/views/page/outsizeSunshade.vue @@ -33,7 +33,7 @@
- {{$t('outsizeSunshade.workingHours')}}： + {{$t('outsizeSunshade.workingHours')}} : @@ -61,7 +61,7 @@ {{$t('outsizeSunshade.rainConfirmTime')}} - {{$t('text.minutes')}} + {{$t('text.minutes')}}。
@@ -80,7 +80,7 @@ % {{$t('outsizeSunshade.lightConfirmTime')}} - {{$t('text.minutes')}} + {{$t('text.minutes')}}。
@@ -88,11 +88,10 @@ {{$t('outsizeSunshade.outdoorLightHigh1')}} - {{$t('outsizeSunshade.outdoorLightFull')}} - {{$t('outsizeSunshade.lightHysteresis')}} + {{$t('outsizeSunshade.outdoorLightFull')}}，{{$t('outsizeSunshade.lightHysteresis')}} - Klux + Klux。
@@ -109,7 +108,7 @@ m/s{{$t('outsizeSunshade.windProtection')}} - {{$t('text.minutes')}} + {{$t('text.minutes')}}。 diff --git a/src/views/page/sunroofControl.vue b/src/views/page/sunroofControl.vue index 63315d0f..8a755320 100644 --- a/src/views/page/sunroofControl.vue +++ b/src/views/page/sunroofControl.vue @@ -34,13 +34,13 @@ {{$t('sunroofControl.tempControlPrecision')}} - ℃ + ℃，
{{$t('sunroofControl.calculationCycle')}} - {{$t('text.minutes')}} + {{$t('text.minutes')}}。
@@ -51,19 +51,19 @@ {{$t('sunroofControl.proportionalCoefficient')}} - + ，
{{$t('sunroofControl.integralCoefficient')}} - + ，
-
+
{{$t('sunroofControl.pidResult')}} - - + + {{statusData[1114+Number(indexs)]}}。
@@ -74,6 +74,7 @@ {{$t('sunroofControl.ventilationStages')}} + {{$t('sunroofControl.ventilationStages1')}}。
@@ -84,6 +85,7 @@ {{$t('sunroofControl.fanOperationAngle')}} + %。
@@ -114,7 +116,7 @@
- {{$t('text.minutes')}} + {{$t('text.minutes')}}。
@@ -155,7 +157,7 @@ %）,{{$t('sunroofControl.humidity.action')}} - % + %。
@@ -170,7 +172,7 @@ {{$t('sunroofControl.tempDehumidification.actionClose')}} - {{$t('text.minutes')}} + {{$t('text.minutes')}}。
@@ -183,7 +185,7 @@ {{$t('sunroofControl.tempLimit.condition')}} - {{$t('sunroofControl.tempLimit.action')}} + {{$t('sunroofControl.tempLimit.action')}}。
@@ -191,7 +193,7 @@ {{$t('sunroofControl.rainDetectionTime')}} - {{$t('text.minutes')}} + {{$t('text.minutes')}}。
diff --git a/src/views/page/wetFan.vue b/src/views/page/wetFan.vue index 9587e1c5..202b2fdc 100644 --- a/src/views/page/wetFan.vue +++ b/src/views/page/wetFan.vue @@ -95,12 +95,13 @@ item.label }} + ，
{{$t('wetFan.adjustTime')}} - {{$t('text.minutes')}} + {{$t('text.minutes')}}。
@@ -137,7 +138,7 @@
- {{$t('wetFan.conditions.maxCooling')}} + {{$t('wetFan.conditions.maxCooling')}}。
@@ -150,7 +151,7 @@ {{$t('wetFan.conditions.dryDelay')}} - {{$t('text.minutes')}} + {{$t('text.minutes')}}。
@@ -159,7 +160,7 @@ {{$t('wetFan.mode2')}}：{{$t('wetFan.conditions.tempPrecision')}} - ℃ + ℃。 @@ -321,7 +322,7 @@ ℃{{$t('wetFan.window.tempTrigger.middle')}} - ℃ + ℃。
@@ -334,7 +335,7 @@ {{$t('wetFan.window.closeDelay.prefix')}} - {{$t('wetFan.window.closeDelay.suffix')}} + {{$t('wetFan.window.closeDelay.suffix')}}。
@@ -372,7 +373,7 @@ ℃{{$t('wetFan.window.tempTrigger.middle')}} - ℃ + ℃。
@@ -385,7 +386,7 @@ {{$t('wetFan.window.closeDelay.prefix')}} - {{$t('wetFan.window.closeDelay.suffix')}} + {{$t('wetFan.window.closeDelay.suffix')}}。