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

Compare commits

base: xiaomeng:5c950d7fdb502a0cd933ee60624fa05587bfb014
Branches Tags
xiaomeng:portal
xiaomeng:pc-master
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1
...
compare: xiaomeng:b9c63e356bd3b14d394a95e3f93f1e9e830beb3b
Branches Tags
xiaomeng:portal
xiaomeng:pc-master
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1

6 Commits
5c950d7fdb ... b9c63e356b

Author SHA1 Message Date
xiaomeng b9c63e356b Merge pull request 'pc-master' (#153) from pc-master into portal 
Reviewed-on: #153
 2024-06-22 12:58:12 +00:00
home孙 ddc77297d8 文字修改 2024-06-22 18:23:40 +08:00
home孙 de60aca2b2 1 2024-06-22 18:10:39 +08:00
home孙 ead496565a 1 2024-06-22 17:45:55 +08:00
home孙 1a890a5763 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2024-06-22 09:20:35 +08:00
home孙 3cafa3318f 1 2024-06-22 09:20:28 +08:00
4 changed files with 8 additions and 8 deletions
Show Stats Expand all files Collapse all files

4
src/views/page/LED.vue
View File

@ -67,7 +67,7 @@
</div> </div>
</div> </div>
<div class="input-main-80"> <div class="input-main-80">
<span>使用1#日标温度</span> <span>使用1#目标温度</span>
</div> </div>
<div class="input-btn"> <div class="input-btn">
<div class="btn btn-w80" @click="changeIndexOpen2(1)" :class="actList3[1] == '1' ? 'blue' : 'off'"> <div class="btn btn-w80" @click="changeIndexOpen2(1)" :class="actList3[1] == '1' ? 'blue' : 'off'">
@ -75,7 +75,7 @@
</div> </div>
</div> </div>
<div class="input-main-80"> <div class="input-main-80">
<span>使用2#日标温度</span> <span>使用2#目标温度</span>
</div> </div>
</div> </div>
<div class="flex-view padding-none border-none shrink-none"> <div class="flex-view padding-none border-none shrink-none">

8
src/views/page/alarmSettings.vue
View File

@ -5,7 +5,7 @@
</div> </div>
<div class="flex-view shrink-none border-none"> <div class="flex-view shrink-none border-none">
<div class="input-sel input-sel-w180"> <div class="input-sel input-sel-w180">
<span>目标温度1的实时温度选择</span> <span>报警温度1的实时温度选择</span>
<el-dropdown @command="handleCommand1($event, 20080)"> <el-dropdown @command="handleCommand1($event, 20080)">
<div class="el-dropdown-link"> <div class="el-dropdown-link">
<input v-model="inputDataNew[20080]" type="text" class="input-input" placeholder="无"> <input v-model="inputDataNew[20080]" type="text" class="input-input" placeholder="无">
@ -72,7 +72,7 @@
</div> </div>
<div class="flex-view shrink-none border-none"> <div class="flex-view shrink-none border-none">
<div class="input-sel input-sel-w180"> <div class="input-sel input-sel-w180">
<span>目标温度2的实时温度选择</span> <span>报警温度2的实时温度选择</span>
<el-dropdown @command="handleCommand1($event, 20086)"> <el-dropdown @command="handleCommand1($event, 20086)">
<div class="el-dropdown-link"> <div class="el-dropdown-link">
<input v-model="inputDataNew[20086]" type="text" class="input-input" placeholder="无"> <input v-model="inputDataNew[20086]" type="text" class="input-input" placeholder="无">
@ -139,7 +139,7 @@
</div> </div>
<div class="flex-view shrink-none border-none"> <div class="flex-view shrink-none border-none">
<div class="input-sel input-sel-w180"> <div class="input-sel input-sel-w180">
<span>目标湿度1的实时湿度选择</span> <span>报警湿度1的实时湿度选择</span>
<el-dropdown @command="handleCommand2($event, 20092)"> <el-dropdown @command="handleCommand2($event, 20092)">
<div class="el-dropdown-link"> <div class="el-dropdown-link">
<input v-model="inputDataNew[20092]" type="text" class="input-input" placeholder="无"> <input v-model="inputDataNew[20092]" type="text" class="input-input" placeholder="无">
@ -207,7 +207,7 @@
</div> </div>
<div class="flex-view shrink-none border-none"> <div class="flex-view shrink-none border-none">
<div class="input-sel input-sel-w180"> <div class="input-sel input-sel-w180">
<span>目标湿度2的实时湿度选择</span> <span>报警湿度2的实时湿度选择</span>
<el-dropdown @command="handleCommand2($event, 20098)"> <el-dropdown @command="handleCommand2($event, 20098)">
<div class="el-dropdown-link"> <div class="el-dropdown-link">
<input v-model="inputDataNew[20098]" type="text" class="input-input" placeholder="无"> <input v-model="inputDataNew[20098]" type="text" class="input-input" placeholder="无">

2
src/views/page/facadeInsulation.vue
View File

@ -62,7 +62,7 @@
<span>提前</span> <span>提前</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> </div>

2
src/views/page/wetFan.vue
View File

@ -7,7 +7,7 @@
<template v-if="indexs==1"> <template v-if="indexs==1">
<div class="title-tips">工作方式选择 <div class="title-tips">工作方式选择
<div class="input-btn"> <div class="input-btn">
<div class="btn btn-tips" @click="changeOpen(0)" :class="inputData[21950] == 0 ? 'blue' : 'green'"> <div class="btn btn-tips" @click="changeOpen(0,21950)" :class="inputData[21950] == 0 ? 'blue' : 'green'">
{{ inputData[21950] == 0 ? '无效' : '有效' }} {{ inputData[21950] == 0 ? '无效' : '有效' }}
</div> </div>
</div> </div>