pc-master #110

Merged
xiaomeng merged 2 commits from pc-master into portal 2024-02-20 00:20:59 +00:00
7 changed files with 77 additions and 56 deletions

View File

@ -627,6 +627,12 @@
width: 120px; width: 120px;
} }
.input-main.input-disabled input {
background: transparent;
border: 2px solid transparent;
padding-left: 0;
}
.input-main.input-main-w260 input { .input-main.input-main-w260 input {
width: 260px; width: 260px;
} }

File diff suppressed because one or more lines are too long

View File

@ -661,6 +661,13 @@
width: 120px; width: 120px;
} }
} }
&.input-disabled{
input{
background: transparent;
border: 2px solid transparent;
padding-left: 0;
}
}
&.input-main-w260{ &.input-main-w260{
input{ input{
width: 260px; width: 260px;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -371,6 +371,7 @@ export function realTimeLine(id, data,pageId) {
} }
export function statusCharts(id, data) { export function statusCharts(id, data) {
var chartDom = document.getElementById(id); var chartDom = document.getElementById(id);
var myChart = echarts.init(chartDom); var myChart = echarts.init(chartDom);
var option; var option;

View File

@ -148,6 +148,7 @@
alt=""> alt="">
<img v-else src="../../assets/img/fan-off.png" alt=""> <span>5#风机</span> <img v-else src="../../assets/img/fan-off.png" alt=""> <span>5#风机</span>
</div> </div>
<div style="display: none;"></div>
</div> </div>
</div> </div>
<div v-else class="status-noTrue"> <div v-else class="status-noTrue">
@ -219,6 +220,7 @@
<img v-else src="../../assets/img/fan-off.png" alt=""> <img v-else src="../../assets/img/fan-off.png" alt="">
<span>8#补光灯</span> <span>8#补光灯</span>
</div> </div>
<div style="display: none;"></div>
</div> </div>
</div> </div>
<div v-else class="status-noTrue"> <div v-else class="status-noTrue">
@ -258,8 +260,7 @@
</div> </div>
<div class="status-fan status-btn" v-else> <div class="status-fan status-btn" v-else>
<div class="btn" :class="item.index == 1 ? 'blue' : 'off'"> <div class="btn" :class="item.index == 1 ? 'blue' : 'off'">
<img class="light-img" :src="getIcon(item)" <img class="light-img" :src="getIcon(item)" alt="">
alt="">
<!-- <img v-else src="../../assets/img/fan-off.png" alt=""> --> <!-- <img v-else src="../../assets/img/fan-off.png" alt=""> -->
<span>{{ item.index == 1 ? '开启' : '关闭' }}</span> <span>{{ item.index == 1 ? '开启' : '关闭' }}</span>
</div> </div>
@ -1346,12 +1347,18 @@ export default {
} }
}) })
this.statusList = statusList this.statusList = statusList
this.$forceUpdate(); this.$forceUpdate();
setTimeout(() => { setTimeout(() => {
this.statusList.forEach((el, index) => { this.statusList.forEach((el, index) => {
if (el.open != 0 && (el.type == 6 || el.type == 5 || el.type == 2 || el.type == 15 || el.type == 14 || el.type == 13 || el.type == 12)) { if (el.open != 0 && (el.type == 6 || el.type == 5 || el.type == 2 || el.type == 15 || el.type == 14 || el.type == 13 || el.type == 12)) {
setTimeout(() => {
statusCharts(`statusCharts${index}`, el.progress) statusCharts(`statusCharts${index}`, el.progress)
}, 0);
} }
}) })
}, 10); }, 10);

View File

@ -59,7 +59,7 @@
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 input-main-w120 input-disabled">
<div>PID计算结果</div> <div>PID计算结果</div>
<input disabled v-model="statusData[1114+Number(indexs)]" <input disabled v-model="statusData[1114+Number(indexs)]"
type="text" placeholder="0"> type="text" placeholder="0">