diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 0cd62384..0a94bd91 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; } @@ -689,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; @@ -802,7 +810,7 @@ textarea { height: 100%; display: flex; align-items: center; - margin: 0 15px 0 0 !important; + margin: 0 0 0 0 !important; color: #fff; } @@ -840,6 +848,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; } @@ -944,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 6e661c21..68a1bb03 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; @@ -731,7 +735,11 @@ textarea { width: 140px; } } - + &.input-sel-w120 { + .el-dropdown-link { + width: 120px; + } + } .el-dropdown-link { width: 300px; height: 44px; @@ -828,7 +836,7 @@ textarea { width: 120px; } } - + &.input-disabled { input { background: transparent; @@ -860,7 +868,7 @@ textarea { height: 100%; display: flex; align-items: center; - margin: 0 15px 0 0 !important; + margin: 0 0 0 0 !important; color: #fff; @@ -898,7 +906,13 @@ textarea { color: #FF9191; } } - + &.input-disabled { + input { + background: transparent; + border: 2px solid transparent; + padding-left: 0; + } + } span { padding: 0 10px; @@ -1009,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 de02e8e4..8f38e31e 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", @@ -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', @@ -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", @@ -1006,7 +1007,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: { @@ -1201,10 +1202,11 @@ 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": "°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..fff2612e 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": "分,关闭", @@ -656,7 +656,7 @@ module.exports = { lightSource: '光照来源选择', lightConfirmTime: '光照确定时间', minutes: '分钟。', - workLimit: '补气工作限制', + workLimit: '补气工作时段', lightGreaterThan: '光照大于', allowSupplement: '允许补气。', indoorTempGreaterThan: '室内温度大于', @@ -695,7 +695,8 @@ module.exports = { timeSegment: '时间段启动:每次灌溉时长', timeRange: '时间段', minutes: '分', - startTimes: '时间段里启动次数', + startTimes: '时间段内启动', + startTimes1: '次', soilSensor: '土壤传感器', validDetectionTime: '有效检测时间段', minSoilMoisture: '最低土壤湿度', @@ -785,14 +786,14 @@ module.exports = { fanMode: '冷暖风机模式', maxFanGear: '冷暖风机最高档位', max4: '(最大为4档)', - heatingMode: '加热模式:', - coolingMode: '制冷模式:', + heatingMode: '加热模式', + coolingMode: '制冷模式', tempBelowTarget: '温度低于目标值', tempAboveTarget: '温度高于目标值', - cannotReachTarget: '达不到目标值,', + cannotReachTarget: '达不到目标值,', startHeating: '℃时,启动1档加热。', startCooling: '℃时,启动1档制冷。', - decreaseGear: '℃时,减档', + decreaseGear: '℃时,减档。', increaseGear: '秒加档。', operationRules: { closeSkylight: '冷暖风机运行时,关闭天窗。', @@ -800,11 +801,12 @@ module.exports = { openCirculationFan: '冷暖风机运行时,开启环流风扇。' }, gear0: '0', - gear1: '{index}档', + gear1: '{index}级', + gear2: '{index}档', }, insizeSunshade: { - daytimeShadingPeriod: '白天遮阳时段限制', + daytimeShadingPeriod: '白天遮阳时段', outdoorLightGreaterThan: '室外光照大于', lightConfirmationTime: '光照确认时间', lightHysteresisBand: '室外光照滞回带', @@ -1007,18 +1009,18 @@ module.exports = { }, outsizeSunshade: { - workingHours: "工作时段:", - rainPosition: "降雨时遮阳网处于的位置", + workingHours: "工作时段", + rainPosition: "降雨时,遮阳网处于的位置", rainConfirmTime: "降雨确认时间", outdoorLightHigh1: "室外光照大于", outdoorLightHigh2: "(KLux)时,展开外遮阳", outdoorLightFull: "(KLux)时,外遮阳展开 100%", - lightConfirmTime: "。光照确认时间", + lightConfirmTime: "光照确认时间", lightHysteresis: "室外光照滞回带", windSpeedHigh: "风速大于", windProtection: "时收拢遮阳网,大风保护解除时间", indoorTempHigh: "室内温度高于目标温度", - degree: "度,展开外遮阳。", + degree: "℃,展开外遮阳。", }, parameterSet: { @@ -1218,10 +1220,11 @@ module.exports = { "proportionalCoefficient": "比例系数", "integralCoefficient": "积分系数", "pidResult": "PID计算结果", - "ventilationStages": "通风窗分阶段全部打开次数", + "ventilationStages": "通风窗分阶段", + "ventilationStages1": "次全部打开", "fanOperationAngle": "风机运行时,通风窗打开角度", "outdoorTempLimit": "室外温度低于", - "outdoorTempLimit1": "度时,禁止开启通风窗。", + "outdoorTempLimit1": "℃时,禁止开启通风窗。", "windSpeedLimit": "风速大于", "windSpeedLimit1": "m/s时,关闭通风窗。大风保护解除时间", "dehumidificationFunction": "开启通风窗除湿功能", @@ -1378,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 @@