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')}}
- + {{ 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')}}
- + {{ item.label }}