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

Merge pull request 'pc-master' (#108) from pc-master into portal

Browse Source 
Reviewed-on: #108
This commit is contained in:
xiaomeng 2024-01-27 00:18:23 +00:00
commit b2137d2834
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1800,6 +1800,11 @@
.realTime .page-content .realTime-bottom.videoMonitoring-monitor {
justify-content: space-between;
height: calc(100% - 90px);
}
.realTime .page-content .realTime-bottom.videoMonitoring-monitor .left-view {
width: 100%;
}
.realTime .page-content .realTime-bottom > div {

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

@ -1901,6 +1901,10 @@
margin-top: 30px;
&.videoMonitoring-monitor{
justify-content: space-between;
height: calc(100% - 90px);
.left-view{
width: 100%;
}
}
>div {
flex-shrink: 0;
@ -1962,7 +1966,7 @@
align-items: center;
justify-content: center;
padding: 10px;
// overflow: hidden;
>div {
width: 100%;
height: 100%;

16
src/views/page/targetTemperature.vue
View File

@ -26,7 +26,7 @@
<span>目标温度</span>
<input @blur="blurChangeCount(20002, $event)" v-model="inputData[20002]" @input="changeCountData(20002, $event)"
type="text" placeholder="0">
<span></span>
<span>℃</span>
</div>
</div>
<div class="flex-view border-none shrink-none padding-none">
@ -49,7 +49,7 @@
<span>目标温度</span>
<input @blur="blurChangeCount(20006, $event)" v-model="inputData[20006]" @input="changeCountData(20006, $event)"
type="text" placeholder="0">
<span></span>
<span>℃</span>
</div>
</div>
<div class="flex-view border-none shrink-none padding-none">
@ -72,7 +72,7 @@
<span>目标温度</span>
<input @blur="blurChangeCount(20010, $event)" v-model="inputData[20010]" @input="changeCountData(20010, $event)"
type="text" placeholder="0">
<span></span>
<span>℃</span>
</div>
</div>
<div class="flex-view shrink-none padding-none">
@ -95,7 +95,7 @@
<span>目标温度</span>
<input @blur="blurChangeCount(20014, $event)" v-model="inputData[20014]" @input="changeCountData(20014, $event)"
type="text" placeholder="0">
<span></span>
<span>℃</span>
</div>
</div>
@ -122,7 +122,7 @@
<span>目标温度</span>
<input @blur="blurChangeCount(20018, $event)" v-model="inputData[20018]" @input="changeCountData(20018, $event)"
type="text" placeholder="0">
<span></span>
<span>℃</span>
</div>
</div>
<div class="flex-view border-none shrink-none padding-none">
@ -145,7 +145,7 @@
<span>目标温度</span>
<input @blur="blurChangeCount(20022, $event)" v-model="inputData[20022]" @input="changeCountData(20022, $event)"
type="text" placeholder="0">
<span></span>
<span>℃</span>
</div>
</div>
<div class="flex-view border-none shrink-none padding-none">
@ -168,7 +168,7 @@
<span>目标温度</span>
<input @blur="blurChangeCount(20026, $event)" v-model="inputData[20026]" @input="changeCountData(20026, $event)"
type="text" placeholder="0">
<span></span>
<span>℃</span>
</div>
</div>
<div class="flex-view border-none shrink-none padding-none">
@ -191,7 +191,7 @@
<span>目标温度</span>
<input @blur="blurChangeCount(20030, $event)" v-model="inputData[20030]" @input="changeCountData(20030, $event)"
type="text" placeholder="0">
<span></span>
<span>℃</span>
</div>
</div>
</div>