xiaomeng/wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc-master #276

Merged
xiaomeng merged 7 commits from pc-master into portal 2025-08-28 06:27:23 +00:00
Conversation 0 Commits 7 Files Changed 18 +31 -30
6 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d901172c23 - Show all commits

2
src/assets/css/main.css
View File

@ -802,7 +802,7 @@ textarea {
height: 100%; height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
margin: 0 15px 0 0 !important; margin: 0 0 0 0 !important;
color: #fff; color: #fff;
} }

2
src/assets/css/main.scss
View File

@ -860,7 +860,7 @@ textarea {
height: 100%; height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
margin: 0 15px 0 0 !important; margin: 0 0 0 0 !important;
color: #fff; color: #fff;

6
src/i18n/lang/en.js
View File

@ -634,7 +634,7 @@ module.exports = {
"startFan": "Start circulation fan", "startFan": "Start circulation fan",
"controlPrecision": "Control precision", "controlPrecision": "Control precision",
"co2Supplement": "Run circulation fan during CO2 supplementation", "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", "fanOperation": "Disable circulation fan when main fan is running",
"start": "On for", "start": "On for",
"onDuration": "mins, off for", "onDuration": "mins, off for",
@ -1006,7 +1006,7 @@ module.exports = {
windSpeedHigh: "When wind speed is greater than", windSpeedHigh: "When wind speed is greater than",
windProtection: ", retract shade net. Wind protection release time", windProtection: ", retract shade net. Wind protection release time",
indoorTempHigh: "When indoor temperature is higher than target temperature by", indoorTempHigh: "When indoor temperature is higher than target temperature by",
degree: "degrees, expand outer shade.", degree: "℃, expand outer shade.",
}, },
parameterSet: { parameterSet: {
@ -1204,7 +1204,7 @@ module.exports = {
"ventilationStages": "Vent Stages", "ventilationStages": "Vent Stages",
"fanOperationAngle": "Open Angle When Fan Running", "fanOperationAngle": "Open Angle When Fan Running",
"outdoorTempLimit": "Disable when outdoor temp < ", "outdoorTempLimit": "Disable when outdoor temp < ",
"outdoorTempLimit1": "°C", "outdoorTempLimit1": "℃",
"windSpeedLimit": "Close when wind > ", "windSpeedLimit": "Close when wind > ",
"windSpeedLimit1": "m/s. Wind Protection Reset Time", "windSpeedLimit1": "m/s. Wind Protection Reset Time",

6
src/i18n/lang/zh.js
View File

@ -646,7 +646,7 @@ module.exports = {
"startFan": "启动环流风扇", "startFan": "启动环流风扇",
"controlPrecision": "控制精度", "controlPrecision": "控制精度",
"co2Supplement": "CO2补气时，同时运行环流风扇。", "co2Supplement": "CO2补气时，同时运行环流风扇。",
"humidifying": "加湿时，同时运行环流风扇。", "humidifying": "高压微雾加湿时，同时运行环流风扇。",
"fanOperation": "风机运行时，禁止开环流风扇。", "fanOperation": "风机运行时，禁止开环流风扇。",
"start": "开启", "start": "开启",
"onDuration": "分，关闭", "onDuration": "分，关闭",
@ -1018,7 +1018,7 @@ module.exports = {
windSpeedHigh: "风速大于", windSpeedHigh: "风速大于",
windProtection: "时收拢遮阳网，大风保护解除时间", windProtection: "时收拢遮阳网，大风保护解除时间",
indoorTempHigh: "室内温度高于目标温度", indoorTempHigh: "室内温度高于目标温度",
degree: "度，展开外遮阳。", degree: "℃，展开外遮阳。",
}, },
parameterSet: { parameterSet: {
@ -1221,7 +1221,7 @@ module.exports = {
"ventilationStages": "通风窗分阶段全部打开次数", "ventilationStages": "通风窗分阶段全部打开次数",
"fanOperationAngle": "风机运行时，通风窗打开角度", "fanOperationAngle": "风机运行时，通风窗打开角度",
"outdoorTempLimit": "室外温度低于", "outdoorTempLimit": "室外温度低于",
"outdoorTempLimit1": "度时，禁止开启通风窗。", "outdoorTempLimit1": "℃时，禁止开启通风窗。",
"windSpeedLimit": "风速大于", "windSpeedLimit": "风速大于",
"windSpeedLimit1": "m/s时，关闭通风窗。大风保护解除时间", "windSpeedLimit1": "m/s时，关闭通风窗。大风保护解除时间",
"dehumidificationFunction": "开启通风窗除湿功能", "dehumidificationFunction": "开启通风窗除湿功能",

1
src/views/page/circulationCan.vue
View File

@ -109,6 +109,7 @@
<input @blur="blurChange10(startList[indexs - 1] + 19, $event)" <input @blur="blurChange10(startList[indexs - 1] + 19, $event)"
v-model="inputData[startList[indexs - 1] + 19]" v-model="inputData[startList[indexs - 1] + 19]"
@input="changeCount10(startList[indexs - 1] + 19, $event)" type="text" placeholder="0"> @input="changeCount10(startList[indexs - 1] + 19, $event)" type="text" placeholder="0">
<span>%</span>
</div> </div>
</div> </div>
<div class="flex-view border-none shrink-none padding-none"> <div class="flex-view border-none shrink-none padding-none">

44
src/views/page/sunroofControl.vue
View File

@ -26,62 +26,62 @@
</div> </div>
</div> </div>
</div> </div>
<div class="flex-view border-none padding-none"> <div class="flex-view border-none padding-none shrink-none">
<div class="number-view p-t-31"> <div class="number-view">
<div>1</div> <div>1</div>
</div> </div>
<div class="input-main input-main-w120"> <div class="input-main-60">
<div>{{$t('sunroofControl.tempControlPrecision')}}</div> <span>{{$t('sunroofControl.tempControlPrecision')}}</span>
<input @blur="blurChange10(startList[indexs-1]+3, $event)" v-model="inputData[startList[indexs-1]+3]" @input="changeCount10(startList[indexs-1]+3, $event)" <input @blur="blurChange10(startList[indexs-1]+3, $event)" v-model="inputData[startList[indexs-1]+3]" @input="changeCount10(startList[indexs-1]+3, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
<span>℃</span> <span>℃</span>
</div> </div>
<div class="input-main input-main-w120"> <div class="input-main-60">
<div>{{$t('sunroofControl.calculationCycle')}}</div> <span>{{$t('sunroofControl.calculationCycle')}}</span>
<input @blur="blurChange(startList[indexs-1]+5, $event)" v-model="inputData[startList[indexs-1]+5]" @input="change(startList[indexs-1]+5, $event)" <input @blur="blurChange(startList[indexs-1]+5, $event)" v-model="inputData[startList[indexs-1]+5]" @input="change(startList[indexs-1]+5, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
<span>{{$t('text.minutes')}}</span> <span>{{$t('text.minutes')}}</span>
</div> </div>
</div> </div>
<div class="flex-view border-none padding-none"> <div class="flex-view border-none padding-none shrink-none">
<div class="number-view p-t-31"> <div class="number-view">
<div>2</div> <div>2</div>
</div> </div>
<div class="input-main input-main-w120"> <div class="input-main-60">
<div>{{$t('sunroofControl.proportionalCoefficient')}}</div> <span>{{$t('sunroofControl.proportionalCoefficient')}}</span>
<input @blur="blurChange(startList[indexs-1]+6, $event)" v-model="inputData[startList[indexs-1]+6]" @input="change(startList[indexs-1]+6, $event)" <input @blur="blurChange(startList[indexs-1]+6, $event)" v-model="inputData[startList[indexs-1]+6]" @input="change(startList[indexs-1]+6, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
<span></span> <span></span>
</div> </div>
<div class="input-main input-main-w120"> <div class="input-main-60">
<div>{{$t('sunroofControl.integralCoefficient')}}</div> <span>{{$t('sunroofControl.integralCoefficient')}}</span>
<input @blur="blurChange(startList[indexs-1]+7, $event)" v-model="inputData[startList[indexs-1]+7]" @input="change(startList[indexs-1]+7, $event)" <input @blur="blurChange(startList[indexs-1]+7, $event)" v-model="inputData[startList[indexs-1]+7]" @input="change(startList[indexs-1]+7, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
<span></span> <span></span>
</div> </div>
<div class="input-main input-main-w120 input-disabled"> <div class="input-main-60">
<div>{{$t('sunroofControl.pidResult')}}</div> <span>{{$t('sunroofControl.pidResult')}}</span>
<input disabled v-model="statusData[1114+Number(indexs)]" <input disabled v-model="statusData[1114+Number(indexs)]"
type="text" placeholder="0"> type="text" placeholder="0">
<span></span> <span></span>
</div> </div>
</div> </div>
<div class="flex-view border-none padding-none"> <div class="flex-view border-none padding-none shrink-none">
<div class="number-view p-t-31"> <div class="number-view">
<div>3</div> <div>3</div>
</div> </div>
<div class="input-main input-main-w260"> <div class="input-main-60">
<div>{{$t('sunroofControl.ventilationStages')}}</div> <span>{{$t('sunroofControl.ventilationStages')}}</span>
<input @blur="blurChange(startList[indexs-1]+4, $event)" v-model="inputData[startList[indexs-1]+4]" @input="change(startList[indexs-1]+4, $event)" <input @blur="blurChange(startList[indexs-1]+4, $event)" v-model="inputData[startList[indexs-1]+4]" @input="change(startList[indexs-1]+4, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
</div> </div>
</div> </div>
<div class="flex-view padding-none "> <div class="flex-view padding-none shrink-none">
<div class="number-view p-t-31"> <div class="number-view">
<div>4</div> <div>4</div>
</div> </div>
<div class="input-main input-main-w260"> <div class="input-main-60">
<div>{{$t('sunroofControl.fanOperationAngle')}}</div> <span>{{$t('sunroofControl.fanOperationAngle')}}</span>
<input @blur="blurChange(startList[indexs-1]+2, $event)" v-model="inputData[startList[indexs-1]+2]" @input="change(startList[indexs-1]+2, $event)" <input @blur="blurChange(startList[indexs-1]+2, $event)" v-model="inputData[startList[indexs-1]+2]" @input="change(startList[indexs-1]+2, $event)"
type="text" placeholder="0"> type="text" placeholder="0">
</div> </div>