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

pc-master #121

Merged
xiaomeng merged 2 commits from pc-master into portal 2024-03-04 09:38:54 +00:00
Conversation 0 Commits 2 Files Changed 5 +37 -9
5 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fdfa64d7ca - Show all commits

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

@ -546,6 +546,10 @@
width: 180px;
}
.input-sel.input-sel-w140 .el-dropdown-link {
width: 140px;
}
.input-sel .el-dropdown-link {
width: 300px;
height: 44px;

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

File diff suppressed because one or more lines are too long

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

@ -582,7 +582,11 @@
width: 180px;
}
}
&.input-sel-w140 {
.el-dropdown-link {
width: 140px;
}
}
.el-dropdown-link {
width: 300px;
height: 44px;

28
src/views/page/intrinsicParameter.vue
View File

@ -273,7 +273,7 @@
<input @blur="blurChange(20670, $event)" v-model="inputData[20670]" @input="change(20670, $event)"
type="text" placeholder="0">
</div>
<div class="input-sel input-sel-w180">
<div class="input-sel input-sel-w140">
<span>通风窗朝向</span>
<el-dropdown @command="handleCommand2($event,20668)">
<div class="el-dropdown-link">
@ -286,6 +286,11 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="input-main-80">
<span>开度基础值：</span>
<input @blur="blurChange(20892, $event)" v-model="inputData[20892]" @input="change(20892, $event)"
type="text" placeholder="0">
</div>
</div>
<div class="flex-view border-none shrink-none padding-none">
<div class="input-main-80">
@ -299,7 +304,7 @@
<input @blur="blurChange(20674, $event)" v-model="inputData[20674]" @input="change(20674, $event)"
type="text" placeholder="0">
</div>
<div class="input-sel input-sel-w180">
<div class="input-sel input-sel-w140">
<span>通风窗朝向</span>
<el-dropdown @command="handleCommand2($event,20672)">
<div class="el-dropdown-link">
@ -312,6 +317,11 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="input-main-80">
<span>开度基础值：</span>
<input @blur="blurChange(20893, $event)" v-model="inputData[20893]" @input="change(20893, $event)"
type="text" placeholder="0">
</div>
</div>
<div class="flex-view border-none shrink-none padding-none">
<div class="input-main-80">
@ -325,7 +335,7 @@
<input @blur="blurChange(20678, $event)" v-model="inputData[20678]" @input="change(20678, $event)"
type="text" placeholder="0">
</div>
<div class="input-sel input-sel-w180">
<div class="input-sel input-sel-w140">
<span>通风窗朝向</span>
<el-dropdown @command="handleCommand2($event,20676)">
<div class="el-dropdown-link">
@ -338,6 +348,11 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="input-main-80">
<span>开度基础值：</span>
<input @blur="blurChange(20894, $event)" v-model="inputData[20894]" @input="change(20894, $event)"
type="text" placeholder="0">
</div>
</div>
<div class="flex-view shrink-none padding-none">
<div class="input-main-80">
@ -351,7 +366,7 @@
<input @blur="blurChange(20682, $event)" v-model="inputData[20682]" @input="change(20682, $event)"
type="text" placeholder="0">
</div>
<div class="input-sel input-sel-w180">
<div class="input-sel input-sel-w140">
<span>通风窗朝向</span>
<el-dropdown @command="handleCommand2($event,20680)">
<div class="el-dropdown-link">
@ -364,6 +379,11 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="input-main-80">
<span>开度基础值：</span>
<input @blur="blurChange(20895, $event)" v-model="inputData[20895]" @input="change(20895, $event)"
type="text" placeholder="0">
</div>
</div>
<div class="flex-view shrink-none padding-none">
<div class="input-main-80">

6
src/views/page/realTime.vue
View File

@ -1376,15 +1376,15 @@ export default {
statusList.push(statusData)
} else if (el.id == 20 || el.id == 21) {
//湿帘外翻窗
var statusData = { name: el.name, type: 12, id: el.id, open: res.data.data[(1084 + ((el.id - 20) * 2))], progress: res.data.data[(1086 + ((el.id - 20) * 2))], index: res.data.data[(1085 + ((el.id - 20) * 2))],count:0 }
var statusData = { name: el.name, type: 12, id: el.id, open: res.data.data[(1084 + ((el.id - 20) * 3))], progress: res.data.data[(1086 + ((el.id - 20) * 3))], index: res.data.data[(1085 + ((el.id - 20) * 3))],count:0 }
statusList.push(statusData)
} else if (el.id == 22 || el.id == 23) {
//内遮阳
var statusData = { name: el.name, type: 13, id: el.id, open: res.data.data[(1090 + ((el.id - 22) * 2))], progress: res.data.data[(1092 + ((el.id - 22) * 2))], index: res.data.data[(1091 + ((el.id - 22) * 2))],count:0 }
var statusData = { name: el.name, type: 13, id: el.id, open: res.data.data[(1090 + ((el.id - 22) * 3))], progress: res.data.data[(1092 + ((el.id - 22) * 3))], index: res.data.data[(1091 + ((el.id - 22) * 3))],count:0 }
statusList.push(statusData)
} else if (el.id == 24 || el.id == 25) {
//外遮阳
var statusData = { name: el.name, type: 14, id: el.id, open: res.data.data[(1096 + ((el.id - 24) * 2))], progress: res.data.data[(1098 + ((el.id - 24) * 2))], index: res.data.data[(1097 + ((el.id - 24) * 2))],count:0 }
var statusData = { name: el.name, type: 14, id: el.id, open: res.data.data[(1096 + ((el.id - 24) * 3))], progress: res.data.data[(1098 + ((el.id - 24) * 3))], index: res.data.data[(1097 + ((el.id - 24) * 3))],count:0 }
statusList.push(statusData)
} else if (el.id == 26 || el.id == 27 || el.id == 28 || el.id == 29) {
//通风窗