From d901172c23ab2775c0bea983bb12bdad7a180fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Wed, 27 Aug 2025 22:49:45 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/main.css | 2 +- src/assets/css/main.scss | 2 +- src/i18n/lang/en.js | 6 ++--- src/i18n/lang/zh.js | 6 ++--- src/views/page/circulationCan.vue | 1 + src/views/page/sunroofControl.vue | 44 +++++++++++++++---------------- 6 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 0cd62384..3a3548f3 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -802,7 +802,7 @@ textarea { height: 100%; display: flex; align-items: center; - margin: 0 15px 0 0 !important; + margin: 0 0 0 0 !important; color: #fff; } diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 6e661c21..0e769e36 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -860,7 +860,7 @@ textarea { height: 100%; display: flex; align-items: center; - margin: 0 15px 0 0 !important; + margin: 0 0 0 0 !important; color: #fff; diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js index de02e8e4..253803b8 100644 --- a/src/i18n/lang/en.js +++ b/src/i18n/lang/en.js @@ -634,7 +634,7 @@ module.exports = { "startFan": "Start circulation fan", "controlPrecision": "Control precision", "co2Supplement": "Run circulation fan during CO2 supplementation", - "humidifying": "Run circulation fan during humidification", + "humidifying": "High Pressure Mist run circulation fan during humidification", "fanOperation": "Disable circulation fan when main fan is running", "start": "On for", "onDuration": "mins, off for", @@ -1006,7 +1006,7 @@ module.exports = { windSpeedHigh: "When wind speed is greater than", windProtection: ", retract shade net. Wind protection release time", indoorTempHigh: "When indoor temperature is higher than target temperature by", - degree: "degrees, expand outer shade.", + degree: "℃, expand outer shade.", }, parameterSet: { @@ -1204,7 +1204,7 @@ module.exports = { "ventilationStages": "Vent Stages", "fanOperationAngle": "Open Angle When Fan Running", "outdoorTempLimit": "Disable when outdoor temp < ", - "outdoorTempLimit1": "°C", + "outdoorTempLimit1": "℃", "windSpeedLimit": "Close when wind > ", "windSpeedLimit1": "m/s. Wind Protection Reset Time", diff --git a/src/i18n/lang/zh.js b/src/i18n/lang/zh.js index 343cbcb6..b957fcce 100644 --- a/src/i18n/lang/zh.js +++ b/src/i18n/lang/zh.js @@ -646,7 +646,7 @@ module.exports = { "startFan": "启动环流风扇", "controlPrecision": "控制精度", "co2Supplement": "CO2补气时，同时运行环流风扇。", - "humidifying": "加湿时，同时运行环流风扇。", + "humidifying": "高压微雾加湿时，同时运行环流风扇。", "fanOperation": "风机运行时，禁止开环流风扇。", "start": "开启", "onDuration": "分，关闭", @@ -1018,7 +1018,7 @@ module.exports = { windSpeedHigh: "风速大于", windProtection: "时收拢遮阳网，大风保护解除时间", indoorTempHigh: "室内温度高于目标温度", - degree: "度，展开外遮阳。", + degree: "℃，展开外遮阳。", }, parameterSet: { @@ -1221,7 +1221,7 @@ module.exports = { "ventilationStages": "通风窗分阶段全部打开次数", "fanOperationAngle": "风机运行时，通风窗打开角度", "outdoorTempLimit": "室外温度低于", - "outdoorTempLimit1": "度时，禁止开启通风窗。", + "outdoorTempLimit1": "℃时，禁止开启通风窗。", "windSpeedLimit": "风速大于", "windSpeedLimit1": "m/s时，关闭通风窗。大风保护解除时间", "dehumidificationFunction": "开启通风窗除湿功能", diff --git a/src/views/page/circulationCan.vue b/src/views/page/circulationCan.vue index 5ec73509..1b629845 100644 --- a/src/views/page/circulationCan.vue +++ b/src/views/page/circulationCan.vue @@ -109,6 +109,7 @@ + %
diff --git a/src/views/page/sunroofControl.vue b/src/views/page/sunroofControl.vue index 3800f103..63315d0f 100644 --- a/src/views/page/sunroofControl.vue +++ b/src/views/page/sunroofControl.vue @@ -26,62 +26,62 @@
-
-
+
+
1
-
-
{{$t('sunroofControl.tempControlPrecision')}}
+
+ {{$t('sunroofControl.tempControlPrecision')}} ℃
-
-
{{$t('sunroofControl.calculationCycle')}}
+
+ {{$t('sunroofControl.calculationCycle')}} {{$t('text.minutes')}}
-
-
+
+
2
-
-
{{$t('sunroofControl.proportionalCoefficient')}}
+
+ {{$t('sunroofControl.proportionalCoefficient')}}
-
-
{{$t('sunroofControl.integralCoefficient')}}
+
+ {{$t('sunroofControl.integralCoefficient')}}
-
-
{{$t('sunroofControl.pidResult')}}
+
+ {{$t('sunroofControl.pidResult')}}
-
-
+
+
3
-
-
{{$t('sunroofControl.ventilationStages')}}
+
+ {{$t('sunroofControl.ventilationStages')}}
-
-
+
+
4
-
-
{{$t('sunroofControl.fanOperationAngle')}}
+
+ {{$t('sunroofControl.fanOperationAngle')}}
From e9dca374f49887dec38b6bd7dc3ced331b5dd39f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Thu, 28 Aug 2025 10:52:28 +0800 Subject: [PATCH 2/7] =?UTF-8?q?08/28=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/main.css | 10 ++++++++ src/assets/css/main.scss | 16 ++++++++++--- src/i18n/lang/en.js | 16 +++++++------ src/i18n/lang/zh.js | 14 +++++++----- src/views/page/LED.vue | 22 +++++++++++------- src/views/page/air-conditioning.vue | 2 +- src/views/page/circulationCan.vue | 14 +++++++++++- src/views/page/electromagneticControl.vue | 14 +++++++----- src/views/page/facadeInsulation.vue | 5 ++-- src/views/page/insizeSunshade.vue | 6 ++--- src/views/page/internalInsulation.vue | 6 ++--- src/views/page/outsizeSunshade.vue | 13 +++++------ src/views/page/sunroofControl.vue | 28 ++++++++++++----------- src/views/page/wetFan.vue | 17 +++++++------- 14 files changed, 114 insertions(+), 69 deletions(-) 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')}}。
From 301a8a259d956e8a84a93837f6bc52796d0a78a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Thu, 28 Aug 2025 10:56:09 +0800 Subject: [PATCH 3/7] =?UTF-8?q?08/28=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/page/sunroofControl.vue | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/views/page/sunroofControl.vue b/src/views/page/sunroofControl.vue index 8a755320..e2dc8c3c 100644 --- a/src/views/page/sunroofControl.vue +++ b/src/views/page/sunroofControl.vue @@ -34,10 +34,8 @@ {{$t('sunroofControl.tempControlPrecision')}} - ℃， - -
- {{$t('sunroofControl.calculationCycle')}} + ℃，{{$t('sunroofControl.calculationCycle')}} + {{$t('text.minutes')}}。 @@ -51,10 +49,7 @@ {{$t('sunroofControl.proportionalCoefficient')}} - ， -
-
- {{$t('sunroofControl.integralCoefficient')}} + ，{{$t('sunroofControl.integralCoefficient')}} ， From 46b0eecdf6049267499c215b77d6ad56d0065bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Thu, 28 Aug 2025 10:57:03 +0800 Subject: [PATCH 4/7] =?UTF-8?q?08/28=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/page/sunroofControl.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/page/sunroofControl.vue b/src/views/page/sunroofControl.vue index e2dc8c3c..b7c4668e 100644 --- a/src/views/page/sunroofControl.vue +++ b/src/views/page/sunroofControl.vue @@ -35,7 +35,6 @@ ℃，{{$t('sunroofControl.calculationCycle')}} - {{$t('text.minutes')}}。 From fddcdc0b63e64af7a7b8bccdcfb42901db9550b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Thu, 28 Aug 2025 11:42:31 +0800 Subject: [PATCH 5/7] =?UTF-8?q?08/28=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/main.css | 12 +++ src/assets/css/main.scss | 13 ++- src/i18n/lang/en.js | 2 +- src/i18n/lang/zh.js | 11 +-- src/views/page/CO2.vue | 2 +- src/views/page/air-conditioning.vue | 104 ++++++++++++++++------ src/views/page/electromagneticControl.vue | 2 +- src/views/page/facadeInsulation.vue | 4 +- src/views/page/heatFan.vue | 16 ++-- src/views/page/insizeSunshade.vue | 4 +- src/views/page/internalInsulation.vue | 2 +- src/views/page/outsizeSunshade.vue | 7 +- src/views/page/targetCo2.vue | 8 +- src/views/page/targetTemperature.vue | 16 ++-- src/views/page/wetFan.vue | 4 +- 15 files changed, 137 insertions(+), 70 deletions(-) diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 03b08943..0a94bd91 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -693,6 +693,10 @@ textarea { width: 140px; } +.input-sel.input-sel-w120 .el-dropdown-link { + width: 120px; +} + .input-sel .el-dropdown-link { width: 300px; height: 44px; @@ -954,6 +958,14 @@ textarea { width: 180px; } +.el-dropdown-menu.input-menu-120 { + width: 140px; +} + +.el-dropdown-menu.input-menu-140 { + width: 140px; +} + .el-dropdown-menu .popper__arrow::after { border-bottom-color: rgba(0, 186, 255, 0.25) !important; } diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index f0bfe132..68a1bb03 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -735,7 +735,11 @@ textarea { width: 140px; } } - + &.input-sel-w120 { + .el-dropdown-link { + width: 120px; + } + } .el-dropdown-link { width: 300px; height: 44px; @@ -1019,7 +1023,12 @@ textarea { &.input-menu-180 { width: 180px; } - + &.input-menu-120 { + width: 140px; + } + &.input-menu-140 { + width: 140px; + } .popper__arrow::after { border-bottom-color: rgba(0, 186, 255, 0.25) !important; } diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js index 44320e74..8f38e31e 100644 --- a/src/i18n/lang/en.js +++ b/src/i18n/lang/en.js @@ -644,7 +644,7 @@ module.exports = { lightSource: 'Light source selection', lightConfirmTime: 'Light confirmation time', minutes: 'minutes', - workLimit: 'Supplement work limit', + workLimit: 'Supplement work period', lightGreaterThan: 'Light greater than', allowSupplement: 'allow supplement', indoorTempGreaterThan: 'Indoor temperature greater than', diff --git a/src/i18n/lang/zh.js b/src/i18n/lang/zh.js index 2e73abbf..245d9bfd 100644 --- a/src/i18n/lang/zh.js +++ b/src/i18n/lang/zh.js @@ -656,7 +656,7 @@ module.exports = { lightSource: '光照来源选择', lightConfirmTime: '光照确定时间', minutes: '分钟。', - workLimit: '补气工作限制', + workLimit: '补气工作时段', lightGreaterThan: '光照大于', allowSupplement: '允许补气。', indoorTempGreaterThan: '室内温度大于', @@ -802,10 +802,11 @@ module.exports = { }, gear0: '0', gear1: '{index}级', + gear2: '{index}档', }, insizeSunshade: { - daytimeShadingPeriod: '白天遮阳时段限制', + daytimeShadingPeriod: '白天遮阳时段', outdoorLightGreaterThan: '室外光照大于', lightConfirmationTime: '光照确认时间', lightHysteresisBand: '室外光照滞回带', @@ -1008,13 +1009,13 @@ module.exports = { }, outsizeSunshade: { - workingHours: "工作时段:", + workingHours: "工作时段", rainPosition: "降雨时，遮阳网处于的位置", rainConfirmTime: "降雨确认时间", outdoorLightHigh1: "室外光照大于", outdoorLightHigh2: "(KLux)时，展开外遮阳", outdoorLightFull: "(KLux)时，外遮阳展开 100%", - lightConfirmTime: "。光照确认时间", + lightConfirmTime: "光照确认时间", lightHysteresis: "室外光照滞回带", windSpeedHigh: "风速大于", windProtection: "时收拢遮阳网，大风保护解除时间", @@ -1380,7 +1381,7 @@ module.exports = { "window2": "湿帘外翻窗2模式", "tempTrigger": { "prefix": "室温大于", - "middle": "时开启湿帘外翻窗降温。滞回带", + "middle": "时,开启湿帘外翻窗降温。滞回带", }, "closeDelay": { "prefix": "风机结束时，", diff --git a/src/views/page/CO2.vue b/src/views/page/CO2.vue index 7c6d3ec7..143a69c5 100644 --- a/src/views/page/CO2.vue +++ b/src/views/page/CO2.vue @@ -93,7 +93,7 @@
- {{$t('CO2.workLimit')}} + {{$t('CO2.workLimit')}} :
- - {{$t('air.workingHours')}} + + +
+
+
+
+ {{$t('air.workingHours')}} :
- - {{$t('air.workingHours')}} +
+
+
+
+ {{$t('air.workingHours')}} :
- +
+
+
+
{{$t('air.pidSampling')}} - {{$t('text.min')}} + {{$t('text.min')}}。
- +
+
+
+
{{$t('air.proportional')}} + />。 {{$t('air.tips.pidFormula')}} @@ -331,7 +345,10 @@
- +
+
+
+
{{$t('air.integral')}} + />。 {{$t('air.tips.pidFormula2')}}
- +
+
+
+
{{$t('air.derivative')}} + />。 {{$t('air.tips.pidFormula3')}}
- +
+
+
+
{{$t('air.tips.pidSummary')}}
- +
+
+
+
{{$t('air.tempDiff')}} - ℃ + ℃。
- +
+
+
+
{{$t('air.tips.heatingStop')}}
- +
+
+
+
{{$t('air.tips.coolingStop')}}
- +
+
+
+
{{$t('air.humidityDiff')}}
- +
+
+
+
{{$t('air.tips.dehumidifyStop')}}
- +
+
+
+
{{$t('air.coolHeatMode')}}:
- +
+
+
+
{{$t('air.modeSwitch')}}
- +
+
+
+
{{$t('air.tempTolerance')}} {{$t('air.priority')}}
-
+
- +
+
+
+
{{$t('air.tips.capacityWarning')}} -
-
-
-
- {{$t('air.fallback')}}
+
diff --git a/src/views/page/electromagneticControl.vue b/src/views/page/electromagneticControl.vue index f0a04794..928d1ca4 100644 --- a/src/views/page/electromagneticControl.vue +++ b/src/views/page/electromagneticControl.vue @@ -127,7 +127,7 @@
- {{$t('electromagnetic.validDetectionTime')}} + {{$t('electromagnetic.validDetectionTime')}} : : diff --git a/src/views/page/facadeInsulation.vue b/src/views/page/facadeInsulation.vue index eea11f89..6ed6953d 100644 --- a/src/views/page/facadeInsulation.vue +++ b/src/views/page/facadeInsulation.vue @@ -28,7 +28,7 @@
- {{$t('facadeInsulation.insulationStartTime')}}： + {{$t('facadeInsulation.insulationStartTime')}} : : @@ -38,7 +38,7 @@
- {{$t('facadeInsulation.insulationEndTime')}}： + {{$t('facadeInsulation.insulationEndTime')}} : : diff --git a/src/views/page/heatFan.vue b/src/views/page/heatFan.vue index 5cae15f1..03090915 100644 --- a/src/views/page/heatFan.vue +++ b/src/views/page/heatFan.vue @@ -52,7 +52,7 @@
- {{$t('heatFan.workingPeriod')}} + {{$t('heatFan.workingPeriod')}} : : @@ -85,7 +85,7 @@
-
+
{{$t('heatFan.maxFanGear')}}
@@ -94,7 +94,7 @@
- + {{ item.label }} @@ -201,11 +201,11 @@ export default { inputData: [], 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 }, - { label:this.$t('heatFan.gear1',{index:4}), value: 4 }, - { label:this.$t('heatFan.gear1',{index:5}), value: 5 }, + { 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 }, + { label:this.$t('heatFan.gear2',{index:4}), value: 4 }, + { label:this.$t('heatFan.gear2',{index:5}), value: 5 }, ], typeList2: [ { label: this.$t('realTime.heatingMode'), value: 1 }, diff --git a/src/views/page/insizeSunshade.vue b/src/views/page/insizeSunshade.vue index 3f6cdd8e..4cf4fc7e 100644 --- a/src/views/page/insizeSunshade.vue +++ b/src/views/page/insizeSunshade.vue @@ -33,7 +33,7 @@
- {{$t('insizeSunshade.daytimeShadingPeriod')}}： + {{$t('insizeSunshade.daytimeShadingPeriod')}} : : @@ -88,7 +88,7 @@
- {{$t('insizeSunshade.nightInsulationPeriod')}}： + {{$t('insizeSunshade.nightInsulationPeriod')}} : : diff --git a/src/views/page/internalInsulation.vue b/src/views/page/internalInsulation.vue index c3fe4c2b..ca605dd2 100644 --- a/src/views/page/internalInsulation.vue +++ b/src/views/page/internalInsulation.vue @@ -28,7 +28,7 @@
- {{$t('internalInsulation.nightInsulationPeriod')}}： + {{$t('internalInsulation.nightInsulationPeriod')}} : : diff --git a/src/views/page/outsizeSunshade.vue b/src/views/page/outsizeSunshade.vue index 637fb83f..deb06bbc 100644 --- a/src/views/page/outsizeSunshade.vue +++ b/src/views/page/outsizeSunshade.vue @@ -33,7 +33,7 @@
- {{$t('outsizeSunshade.workingHours')}} + {{$t('outsizeSunshade.workingHours')}} : : @@ -57,8 +57,7 @@ {{$t('outsizeSunshade.rainPosition')}} - % - {{$t('outsizeSunshade.rainConfirmTime')}} + %，{{$t('outsizeSunshade.rainConfirmTime')}} {{$t('text.minutes')}}。 @@ -77,7 +76,7 @@ {{$t('outsizeSunshade.outdoorLightHigh2')}} - % {{$t('outsizeSunshade.lightConfirmTime')}} + %，{{$t('outsizeSunshade.lightConfirmTime')}} {{$t('text.minutes')}}。 diff --git a/src/views/page/targetCo2.vue b/src/views/page/targetCo2.vue index 1fa08ddc..5356b93f 100644 --- a/src/views/page/targetCo2.vue +++ b/src/views/page/targetCo2.vue @@ -5,7 +5,7 @@
- 1{{$t('target.timePeriodStart')}}： + 1{{$t('target.timePeriodStart')}}
- 2{{$t('target.timePeriodStart')}}： + 2{{$t('target.timePeriodStart')}}
- 3{{$t('target.timePeriodStart')}}： + 3{{$t('target.timePeriodStart')}}
- 4{{$t('target.timePeriodStart')}}： + 4{{$t('target.timePeriodStart')}}
- 1{{$t('target.timePeriodStart')}}： + 1{{$t('target.timePeriodStart')}} : @@ -31,7 +31,7 @@
- 2{{$t('target.timePeriodStart')}}： + 2{{$t('target.timePeriodStart')}} : @@ -54,7 +54,7 @@
- 3{{$t('target.timePeriodStart')}}： + 3{{$t('target.timePeriodStart')}} : @@ -77,7 +77,7 @@
- 4{{$t('target.timePeriodStart')}}： + 4{{$t('target.timePeriodStart')}} : @@ -104,7 +104,7 @@
- 1{{$t('target.timePeriodStart')}}： + 1{{$t('target.timePeriodStart')}} : @@ -127,7 +127,7 @@
- 2{{$t('target.timePeriodStart')}}： + 2{{$t('target.timePeriodStart')}} : @@ -150,7 +150,7 @@
- 3{{$t('target.timePeriodStart')}}： + 3{{$t('target.timePeriodStart')}} : @@ -173,7 +173,7 @@
- 4{{$t('target.timePeriodStart')}}： + 4{{$t('target.timePeriodStart')}} : diff --git a/src/views/page/wetFan.vue b/src/views/page/wetFan.vue index 202b2fdc..c278bf70 100644 --- a/src/views/page/wetFan.vue +++ b/src/views/page/wetFan.vue @@ -81,7 +81,7 @@
-
+
{{$t('wetFan.mode1')}}：{{$t('wetFan.maxLevel')}}
@@ -90,7 +90,7 @@
- + {{ item.label }} From a75adddcf50d2e75e0e51a375fcc02a7cda93238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Thu, 28 Aug 2025 11:44:14 +0800 Subject: [PATCH 6/7] =?UTF-8?q?08/28=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/zh.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/lang/zh.js b/src/i18n/lang/zh.js index 245d9bfd..48538ecb 100644 --- a/src/i18n/lang/zh.js +++ b/src/i18n/lang/zh.js @@ -1381,7 +1381,7 @@ module.exports = { "window2": "湿帘外翻窗2模式", "tempTrigger": { "prefix": "室温大于", - "middle": "时,开启湿帘外翻窗降温。滞回带", + "middle": "时，开启湿帘外翻窗降温。滞回带", }, "closeDelay": { "prefix": "风机结束时，", From 51980d02a7dc56b1a0a28890ec2d1899eb00219f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Thu, 28 Aug 2025 14:25:31 +0800 Subject: [PATCH 7/7] =?UTF-8?q?08/28=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/zh.js | 6 +++--- src/views/page/air-conditioning.vue | 4 ++-- src/views/page/heatFan.vue | 7 +++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/i18n/lang/zh.js b/src/i18n/lang/zh.js index 48538ecb..fff2612e 100644 --- a/src/i18n/lang/zh.js +++ b/src/i18n/lang/zh.js @@ -786,11 +786,11 @@ module.exports = { fanMode: '冷暖风机模式', maxFanGear: '冷暖风机最高档位', max4: '（最大为4档）', - heatingMode: '加热模式:', - coolingMode: '制冷模式:', + heatingMode: '加热模式', + coolingMode: '制冷模式', tempBelowTarget: '温度低于目标值', tempAboveTarget: '温度高于目标值', - cannotReachTarget: '达不到目标值,', + cannotReachTarget: '达不到目标值，', startHeating: '℃时，启动1档加热。', startCooling: '℃时，启动1档制冷。', decreaseGear: '℃时，减档。', diff --git a/src/views/page/air-conditioning.vue b/src/views/page/air-conditioning.vue index f9959fc4..b1f4e64f 100644 --- a/src/views/page/air-conditioning.vue +++ b/src/views/page/air-conditioning.vue @@ -514,7 +514,7 @@
- {{$t('air.tips.capacityWarning')}} + {{$t('air.tips.capacityWarning')}}， - {{$t('air.fallback')}} + {{$t('air.fallback')}}。
diff --git a/src/views/page/heatFan.vue b/src/views/page/heatFan.vue index 03090915..db577b02 100644 --- a/src/views/page/heatFan.vue +++ b/src/views/page/heatFan.vue @@ -102,7 +102,7 @@ 。{{$t('heatFan.max4')}}
-
{{$t('heatFan.heatingMode')}}
+
{{$t('heatFan.heatingMode')}} :
 {{$t('heatFan.tempBelowTarget')}} @@ -113,7 +113,7 @@
-  {{$t('heatFan.coolingMode')}} +  {{$t('heatFan.coolingMode')}} : {{$t('heatFan.decreaseGear')}} @@ -137,7 +137,7 @@ 制冷时，开启风机，湿帘。
--> -
{{$t('heatFan.coolingMode')}}
+
{{$t('heatFan.coolingMode')}} :
 {{$t('heatFan.tempAboveTarget')}} @@ -205,7 +205,6 @@ export default { { label:this.$t('heatFan.gear2',{index:2}), value: 2 }, { label:this.$t('heatFan.gear2',{index:3}), value: 3 }, { label:this.$t('heatFan.gear2',{index:4}), value: 4 }, - { label:this.$t('heatFan.gear2',{index:5}), value: 5 }, ], typeList2: [ { label: this.$t('realTime.heatingMode'), value: 1 },