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

pc-master #231

Merged
xiaomeng merged 5 commits from pc-master into portal 2025-04-17 08:04:51 +00:00
Conversation 0 Commits 5 Files Changed 24 +12 -14
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a3c83bddc0 - Show all commits

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

@ -1931,6 +1931,10 @@ textarea {
cursor: pointer;
}
.dataModel {
height: 650px;
}
.dataModel .view-new {
width: 100%;
display: flex;

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

@ -2032,6 +2032,7 @@ textarea{
}
.dataModel {
height: 650px;
.view-new {
width: 100%;
display: flex;

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

@ -425,7 +425,7 @@
<el-dialog title="实时数据" class="vrcode-model" :append-to-body="true" :visible.sync="dataModel" width="1030px">
<el-button class="model-return-btn" type="primary" @click="dataModel = false">返 回</el-button>
<div class="vrcode-model-title vrcode-model-title-282">实时数据</div>
<div class="dataModel">
<div class="dataModel scroll">
<div class="view-new border">
<template v-for="item, index in list">
<div class="list-view" :key="index" v-if="item.targetValue==1">
@ -448,20 +448,10 @@
</div>
</template>
</div>
<div class="view-new border">
<template v-for="item1,index1 in 13" >
<div class="view-new border" :key="index1" v-if="list.some(item => item.targetValue==0 && item.equipmentNumber==(index1+1))">
<template v-for="item, index in list">
<div class="list-view" :key="index" v-if="item.targetValue==0&&(item.equipmentNumber==1)">
<img :src="item.img" alt="">
<div>
<div class="text">{{ item.name }}</div>
<div class="number" :style="item.num=='故障'?'color:rgba(252, 125, 106, 1)':''"> {{ getControlData(item) }}</div>
</div>
</div>
</template>
</div>
<div class="view-new">
<template v-for="item, index in list">
<div class="list-view" :key="index" v-if="item.targetValue==0&&(item.equipmentNumber==2)">
<div class="list-view" :key="index" v-if="item.targetValue==0&&(item.equipmentNumber==(index1+1))">
<img :src="item.img" alt="">
<div>
<div class="text">{{ item.name }}</div>
@ -470,6 +460,9 @@
</div>
</template>
</div>
</template>
</div>
</el-dialog>