xiaoy
/
water-dispatch-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复设备删除后无法显示调令问题

Browse Source
master
xy 1 year ago
parent 6752c64e34
commit cbefe62270
3 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File

8
src/views/bigScreen1/component/doing.vue
Unescape View File

@ -55,11 +55,11 @@
<svg-icon v-if="item.diaolingleixing === 3" icon-class="ship" style="font-size: 2rem;padding-right: 2px;"></svg-icon> <svg-icon v-if="item.diaolingleixing === 3" icon-class="ship" style="font-size: 2rem;padding-right: 2px;"></svg-icon>
<span>{{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}</span> <span>{{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}</span>
</p> </p>
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;" v-if="item.equipment_id_equipments_id_relation && item.equipment_id_equipments_id_relation.bengzhashuliang">
<p style="zoom:.85;">闸门</p> <p style="zoom:.85;">闸门</p>
<div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.bengzhashuliang || 0)" :style="index >= item.kaiqishuliang ? 'background: red;' : ''"></div> <div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.bengzhashuliang || 0)" :style="index >= item.kaiqishuliang ? 'background: red;' : ''"></div>
</div> </div>
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;" v-if="item.equipment_id_equipments_id_relation && item.equipment_id_equipments_id_relation.shuibengtaishu">
<p style="zoom:.85;">水泵</p> <p style="zoom:.85;">水泵</p>
<div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.shuibengtaishu || 0)" :style="index >= item.kaiqishuliang1 ? 'background: red;' : ''"></div> <div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.shuibengtaishu || 0)" :style="index >= item.kaiqishuliang1 ? 'background: red;' : ''"></div>
</div> </div>
@ -202,7 +202,7 @@ export default {
isShowNotice () { isShowNotice () {
return function (item) { return function (item) {
return item.id_feedbacks_transfer_id_relation.reduce((pre, cur) => (!!(pre || cur.status)), false) return item.id_feedbacks_transfer_id_relation?.reduce((pre, cur) => (!!(pre || cur.status)), false)
} }
}, },
@ -217,7 +217,7 @@ export default {
} }
return 3 return 3
} }
if (item.id_transfers_to_transfer_id_relation.length > 0) { if (item.id_transfers_to_transfer_id_relation?.length > 0) {
return 2 return 2
} }
if (diffMins < 0) { if (diffMins < 0) {

26
src/views/bigScreen1/component/done.vue
Unescape View File

@ -35,6 +35,20 @@
<div class="list-item__name"> <div class="list-item__name">
{{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }} {{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}
</div> </div>
<div class="list-item__name">
<p>
<svg-icon v-if="item.diaolingleixing === 3" icon-class="ship" style="font-size: 2rem;padding-right: 2px;"></svg-icon>
<span>{{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}</span>
</p>
<div style="display: flex;align-items: center;" v-if="item.equipment_id_equipments_id_relation && item.equipment_id_equipments_id_relation.bengzhashuliang">
<p style="zoom:.85;">闸门</p>
<div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.bengzhashuliang || 0)" :style="index >= item.kaiqishuliang ? 'background: red;' : ''"></div>
</div>
<div style="display: flex;align-items: center;" v-if="item.equipment_id_equipments_id_relation && item.equipment_id_equipments_id_relation.shuibengtaishu">
<p style="zoom:.85;">水泵</p>
<div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.shuibengtaishu || 0)" :style="index >= item.kaiqishuliang1 ? 'background: red;' : ''"></div>
</div>
</div>
<div class="list-item__content"> <div class="list-item__content">
<el-tooltip class="item" effect="dark" :content="item.content" placement="top-start"> <el-tooltip class="item" effect="dark" :content="item.content" placement="top-start">
<span>{{ item.content }}</span> <span>{{ item.content }}</span>
@ -315,8 +329,16 @@ $list-height: calc(#{$container-height} - 5.33rem);
font-size: 1.34rem; font-size: 1.34rem;
flex: 1; flex: 1;
} }
&__number {
width: 0.7rem;
height: 0.7rem;
border-radius: 100%;
background: $primaryColor;
margin-right: 0.3rem;
margin-top: 0.2rem;
}
&__content { &__content {
flex-basis: 14%; flex-basis: 11%;
word-break: keep-all; word-break: keep-all;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
@ -336,7 +358,7 @@ $list-height: calc(#{$container-height} - 5.33rem);
justify-content: center; justify-content: center;
.step { .step {
width: 5rem; width: 4.2rem;
&-icon { &-icon {
display: flex; display: flex;

10
src/views/bigScreen1/component/toDo.vue
Unescape View File

@ -58,11 +58,11 @@
<svg-icon v-if="item.diaolingleixing === 3" icon-class="ship" style="font-size: 2rem;padding-right: 2px;"></svg-icon> <svg-icon v-if="item.diaolingleixing === 3" icon-class="ship" style="font-size: 2rem;padding-right: 2px;"></svg-icon>
<span>{{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}</span> <span>{{ item.equipment_id_equipments_id_relation ? item.equipment_id_equipments_id_relation.name : '' }}</span>
</p> </p>
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;" v-if="item.equipment_id_equipments_id_relation && item.equipment_id_equipments_id_relation.bengzhashuliang">
<p style="zoom:.85;padding-right: 2px;">闸门</p> <p style="zoom:.85;padding-right: 2px;">闸门</p>
<div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.bengzhashuliang || 0)" :style="index >= item.kaiqishuliang ? 'background: red;' : ''"></div> <div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.bengzhashuliang || 0)" :style="index >= item.kaiqishuliang ? 'background: red;' : ''"></div>
</div> </div>
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;" v-if="item.equipment_id_equipments_id_relation && item.equipment_id_equipments_id_relation.shuibengtaishu">
<p style="zoom:.85;padding-right: 2px;">水泵</p> <p style="zoom:.85;padding-right: 2px;">水泵</p>
<div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.shuibengtaishu || 0)" :style="index >= item.kaiqishuliang1 ? 'background: red;' : ''"></div> <div class="list-item__number" v-for="(i,index) in Number(item.equipment_id_equipments_id_relation.shuibengtaishu || 0)" :style="index >= item.kaiqishuliang1 ? 'background: red;' : ''"></div>
</div> </div>
@ -206,7 +206,7 @@ export default {
isShowNotice () { isShowNotice () {
return function (item) { return function (item) {
return item.id_feedbacks_transfer_id_relation.reduce((pre, cur) => (!!(pre || cur.status)), false) return item.id_feedbacks_transfer_id_relation?.reduce((pre, cur) => (!!(pre || cur.status)), false)
} }
}, },
@ -231,7 +231,7 @@ export default {
}, },
]; ];
} else if (item.tiaozhengleixing === 1) { } else if (item.tiaozhengleixing === 1) {
if (item.equipment_id_equipments_id_relation.type === 1) { if (item.equipment_id_equipments_id_relation?.type === 1) {
return [ return [
{ {
value: 2, value: 2,
@ -285,7 +285,7 @@ export default {
} }
return 3 return 3
} }
if (item.id_transfers_to_transfer_id_relation.length > 0) { if (item.id_transfers_to_transfer_id_relation?.length > 0) {
return 2 return 2
} }
if (diffMins < 0) { if (diffMins < 0) {

Write Preview
Loading…
Cancel
Save