已知新问题修改
孙萌
parent
ecc929e6d8
commit
fdf65f9ec6
|
|
@ -1783,6 +1783,10 @@
|
|||
justify-content: center;
|
||||
}
|
||||
|
||||
.realTime .page-content .realTime-list .seamless-warp .list-view .number.red {
|
||||
color: #fc7d6a;
|
||||
}
|
||||
|
||||
.realTime .page-content .flex-list {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1880,6 +1880,9 @@
|
|||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
&.red{
|
||||
color: rgba(252, 125, 106, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
|
|
@ -236,12 +236,6 @@ export default {
|
|||
list: [],
|
||||
isRouter: true
|
||||
},
|
||||
{
|
||||
name: "通道报警设置",
|
||||
router: "exitSettings",
|
||||
list: [],
|
||||
isRouter: true
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,9 @@
|
|||
<span>选项三:温度高于</span>
|
||||
<input @blur="blurChangeCount('20083', $event)" v-model="inputData['20083']"
|
||||
@input="changeCountData('20083', $event)" type="text" value="60" placeholder="60" />
|
||||
<span>℃，高温报警。</span>
|
||||
<span>℃，高温报警。报警通道</span>
|
||||
<input @blur="blurChange(20104, $event)" v-model="inputData[20104]" @input="change(20104, $event)"
|
||||
type="text" placeholder="0">
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex-view">
|
||||
|
|
@ -63,7 +65,9 @@
|
|||
<span>选项四:温度低于</span>
|
||||
<input @blur="blurChangeCount('20084', $event)" v-model="inputData['20084']"
|
||||
@input="changeCountData('20084', $event)" type="text" value="60" placeholder="60" />
|
||||
<span>℃，低温报警。</span>
|
||||
<span>℃，低温报警。报警通道</span>
|
||||
<input @blur="blurChange(20105, $event)" v-model="inputData[20105]" @input="change(20105, $event)"
|
||||
type="text" placeholder="0">
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex-view shrink-none border-none">
|
||||
|
|
@ -114,7 +118,9 @@
|
|||
<span>选项三:温度高于</span>
|
||||
<input @blur="blurChangeCount('20089', $event)" v-model="inputData['20089']"
|
||||
@input="changeCountData('20089', $event)" type="text" value="60" placeholder="60" />
|
||||
<span>℃，高温报警。</span>
|
||||
<span>℃，高温报警。报警通道</span>
|
||||
<input @blur="blurChange(20106, $event)" v-model="inputData[20106]" @input="change(20106, $event)"
|
||||
type="text" placeholder="0">
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex-view">
|
||||
|
|
@ -126,7 +132,9 @@
|
|||
<span>选项四:温度低于</span>
|
||||
<input @blur="blurChangeCount('20090', $event)" v-model="inputData['20090']"
|
||||
@input="changeCountData('20090', $event)" type="text" value="60" placeholder="60" />
|
||||
<span>℃，低温报警。</span>
|
||||
<span>℃，低温报警。报警通道</span>
|
||||
<input @blur="blurChange(20107, $event)" v-model="inputData[20107]" @input="change(20107, $event)"
|
||||
type="text" placeholder="0">
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex-view shrink-none border-none">
|
||||
|
|
@ -178,7 +186,9 @@
|
|||
<span>选项三:湿度高于</span>
|
||||
<input @blur="blurChange10('20096', $event)" v-model="inputData['20096']"
|
||||
@input="changeCount10('20096', $event)" type="text" value="60" placeholder="60" />
|
||||
<span>%RH，高湿报警。</span>
|
||||
<span>%RH，高湿报警。报警通道</span>
|
||||
<input @blur="blurChange(20108, $event)" v-model="inputData[20108]" @input="change(20108, $event)"
|
||||
type="text" placeholder="0">
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex-view">
|
||||
|
|
@ -190,7 +200,9 @@
|
|||
<span>选项四:湿度低于</span>
|
||||
<input @blur="blurChange10('20097', $event)" v-model="inputData['20097']"
|
||||
@input="changeCount10('20097', $event)" type="text" value="60" placeholder="60" />
|
||||
<span>%RH，低湿报警。</span>
|
||||
<span>%RH，低湿报警。报警通道</span>
|
||||
<input @blur="blurChange(20109, $event)" v-model="inputData[20109]" @input="change(20109, $event)"
|
||||
type="text" placeholder="0">
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex-view shrink-none border-none">
|
||||
|
|
@ -241,7 +253,9 @@
|
|||
<span>选项三:湿度高于</span>
|
||||
<input @blur="blurChange10('20102', $event)" v-model="inputData['20102']"
|
||||
@input="changeCount10('20102', $event)" type="text" value="60" placeholder="60" />
|
||||
<span>%RH，高湿报警。</span>
|
||||
<span>%RH，高湿报警。报警通道</span>
|
||||
<input @blur="blurChange(20110, $event)" v-model="inputData[20110]" @input="change(20110, $event)"
|
||||
type="text" placeholder="0">
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex-view border-none">
|
||||
|
|
@ -253,7 +267,9 @@
|
|||
<span>选项四:湿度低于</span>
|
||||
<input @blur="blurChange10('20103', $event)" v-model="inputData['20103']"
|
||||
@input="changeCount10('20103', $event)" type="text" value="60" placeholder="60" />
|
||||
<span>%RH，低湿报警。</span>
|
||||
<span>%RH，低湿报警。报警通道</span>
|
||||
<input @blur="blurChange(20111, $event)" v-model="inputData[20111]" @input="change(20111, $event)"
|
||||
type="text" placeholder="0">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -65,11 +65,11 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="flex-view border-none shrink-none padding-none">
|
||||
<div class="input-btn">
|
||||
<!-- <div class="input-btn">
|
||||
<div class="btn btn-w80" @click="changeIndexOpen(1)" :class="actList1[1] == '1' ? 'blue' : 'off'">
|
||||
{{ actList1[1] == '1' ? '有效' : '无效' }}
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<div class="input-main-80">
|
||||
<span>室外光照大于</span>
|
||||
<input @blur="blurChange10(startList[indexs-1]+7, $event)" v-model="inputData[startList[indexs-1]+7]" @input="changeCount10(startList[indexs-1]+7, $event)"
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
<img :src="item.img" alt="">
|
||||
<div>
|
||||
<div class="text">{{ item.name }}</div>
|
||||
<div class="number">{{ item.num }}</div>
|
||||
<div class="number" :class="item.num=='无效'?'red':''">{{ item.num }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</vue-seamless>
|
||||
|
|
@ -142,51 +142,51 @@
|
|||
</div>
|
||||
<div class="status-fan">
|
||||
<div class="btn" :class="item.status[0] == 1 ? 'blue' : 'off'">
|
||||
<img class="light-img" v-if="item.status[0] == 1" src="../../assets/img/light-on.png"
|
||||
<img class="light-img" v-if="item.status[0] == 1" src="../../assets/img/LED-on.png"
|
||||
alt="">
|
||||
<img v-else src="../../assets/img/light-off.png" alt="">
|
||||
<img v-else src="../../assets/img/fan-off.png" alt="">
|
||||
<span>1#补光灯</span>
|
||||
</div>
|
||||
<div class="btn" :class="item.status[1] == 1 ? 'blue' : 'off'">
|
||||
<img class="light-img" v-if="item.status[1] == 1" src="../../assets/img/light-on.png"
|
||||
<img class="light-img" v-if="item.status[1] == 1" src="../../assets/img/LED-on.png"
|
||||
alt="">
|
||||
<img v-else src="../../assets/img/light-off.png" alt="">
|
||||
<img v-else src="../../assets/img/fan-off.png" alt="">
|
||||
<span>2#补光灯</span>
|
||||
</div>
|
||||
<div class="btn" :class="item.status[2] == 1 ? 'blue' : 'off'">
|
||||
<img class="light-img" v-if="item.status[2] == 1" src="../../assets/img/light-on.png"
|
||||
<img class="light-img" v-if="item.status[2] == 1" src="../../assets/img/LED-on.png"
|
||||
alt="">
|
||||
<img v-else src="../../assets/img/light-off.png" alt="">
|
||||
<img v-else src="../../assets/img/fan-off.png" alt="">
|
||||
<span>3#补光灯</span>
|
||||
</div>
|
||||
<div class="btn" :class="item.status[3] == 1 ? 'blue' : 'off'">
|
||||
<img class="light-img" v-if="item.status[3] == 1" src="../../assets/img/light-on.png"
|
||||
<img class="light-img" v-if="item.status[3] == 1" src="../../assets/img/LED-on.png"
|
||||
alt="">
|
||||
<img v-else src="../../assets/img/light-off.png" alt="">
|
||||
<img v-else src="../../assets/img/fan-off.png" alt="">
|
||||
<span>4#补光灯</span>
|
||||
</div>
|
||||
<div class="btn" :class="item.status[4] == 1 ? 'blue' : 'off'">
|
||||
<img class="light-img" v-if="item.status[4] == 1" src="../../assets/img/light-on.png"
|
||||
<img class="light-img" v-if="item.status[4] == 1" src="../../assets/img/LED-on.png"
|
||||
alt="">
|
||||
<img v-else src="../../assets/img/light-off.png" alt="">
|
||||
<img v-else src="../../assets/img/fan-off.png" alt="">
|
||||
<span>5#补光灯</span>
|
||||
</div>
|
||||
<div class="btn" :class="item.status[5] == 1 ? 'blue' : 'off'">
|
||||
<img class="light-img" v-if="item.status[5] == 1" src="../../assets/img/light-on.png"
|
||||
<img class="light-img" v-if="item.status[5] == 1" src="../../assets/img/LED-on.png"
|
||||
alt="">
|
||||
<img v-else src="../../assets/img/light-off.png" alt="">
|
||||
<img v-else src="../../assets/img/fan-off.png" alt="">
|
||||
<span>6#补光灯</span>
|
||||
</div>
|
||||
<div class="btn" :class="item.status[6] == 1 ? 'blue' : 'off'">
|
||||
<img class="light-img" v-if="item.status[6] == 1" src="../../assets/img/light-on.png"
|
||||
<img class="light-img" v-if="item.status[6] == 1" src="../../assets/img/LED-on.png"
|
||||
alt="">
|
||||
<img v-else src="../../assets/img/light-off.png" alt="">
|
||||
<img v-else src="../../assets/img/fan-off.png" alt="">
|
||||
<span>7#补光灯</span>
|
||||
</div>
|
||||
<div class="btn" :class="item.status[7] == 1 ? 'blue' : 'off'">
|
||||
<img class="light-img" v-if="item.status[7] == 1" src="../../assets/img/light-on.png"
|
||||
<img class="light-img" v-if="item.status[7] == 1" src="../../assets/img/LED-on.png"
|
||||
alt="">
|
||||
<img v-else src="../../assets/img/light-off.png" alt="">
|
||||
<img v-else src="../../assets/img/fan-off.png" alt="">
|
||||
<span>8#补光灯</span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -211,7 +211,8 @@
|
|||
手机控制
|
||||
</div>
|
||||
</div>
|
||||
<div class="status-true-charts" v-if="item.type == 6 || item.type == 5 || item.type == 2|| item.type == 15|| item.type == 14|| item.type == 13|| item.type == 12">
|
||||
<div class="status-true-charts"
|
||||
v-if="item.type == 6 || item.type == 5 || item.type == 2 || item.type == 15 || item.type == 14 || item.type == 13 || item.type == 12">
|
||||
<img src="../../assets/img/status-true-charts-icon.png" alt="">
|
||||
<div :id="'statusCharts' + index"></div>
|
||||
</div>
|
||||
|
|
@ -221,7 +222,8 @@
|
|||
<div class="status-true-text">
|
||||
<div class="status-true-text-left">{{ getNumberStatus(item) }}</div>
|
||||
<div class="status-true-text-right"
|
||||
v-if="item.type == 6 || item.type == 5 || item.type == 2|| item.type == 15|| item.type == 14|| item.type == 13|| item.type == 12">{{
|
||||
v-if="item.type == 6 || item.type == 5 || item.type == 2 || item.type == 15 || item.type == 14 || item.type == 13 || item.type == 12">
|
||||
{{
|
||||
item.progress }}%</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -807,7 +809,11 @@ export default {
|
|||
// }else if(el1.countType==3){
|
||||
// num=this.countType3(el.environmentData)+el1.unit
|
||||
// }else{
|
||||
if(el.equipmentStart==0){
|
||||
num='无效'
|
||||
}else{
|
||||
num = el.environmentData + el1.unit
|
||||
}
|
||||
// }
|
||||
// if (el.equipmentNumber == 0) {
|
||||
// if (el.targetValue == 1) {
|
||||
|
|
@ -902,7 +908,12 @@ export default {
|
|||
// }else if(el1.countType==3){
|
||||
// num=this.countType3(el.environmentData)+el1.unit
|
||||
// }else{
|
||||
|
||||
if(el.equipmentStart==0){
|
||||
num='无效'
|
||||
}else{
|
||||
num = el.environmentData + el1.unit
|
||||
}
|
||||
// }
|
||||
if (el.equipmentNumber == 0) {
|
||||
|
||||
|
|
@ -941,7 +952,12 @@ export default {
|
|||
list.forEach((el1, index1) => {
|
||||
if (el.formula == el1.value) {
|
||||
// console.log(el1);
|
||||
var num = el.environmentData + el1.unit
|
||||
var num=0
|
||||
if(el.equipmentStart==0){
|
||||
num='无效'
|
||||
}else{
|
||||
num = el.environmentData + el1.unit
|
||||
}
|
||||
this.controlList.push({
|
||||
...el,
|
||||
num: num,
|
||||
|
|
@ -1000,7 +1016,12 @@ export default {
|
|||
list.forEach((el1, index1) => {
|
||||
if (el.formula == el1.value) {
|
||||
// console.log(el1);
|
||||
var num = el.environmentData + el1.unit
|
||||
var num=0
|
||||
if(el.equipmentStart==0){
|
||||
num='无效'
|
||||
}else{
|
||||
num = el.environmentData + el1.unit
|
||||
}
|
||||
this.list.push({
|
||||
...el,
|
||||
name: el.environmentDataId,
|
||||
|
|
|
|||
Loading…
Reference in New Issue