From a3c83bddc0439c659ca7226ae2fe41301863cdcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com>
Date: Wed, 16 Apr 2025 09:47:20 +0800
Subject: [PATCH] 1

---
 src/assets/css/main.css     |  4 ++++
 src/assets/css/main.scss    |  1 +
 src/views/page/realTime.vue | 21 +++++++--------------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index 9f22c6f..7375fff 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -1931,6 +1931,10 @@ textarea {
   cursor: pointer;
 }
 
+.dataModel {
+  height: 650px;
+}
+
 .dataModel .view-new {
   width: 100%;
   display: flex;
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index cc44f23..67cac27 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -2032,6 +2032,7 @@ textarea{
 }
 
 .dataModel {
+    height: 650px;
     .view-new {
         width: 100%;
         display: flex;
diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue
index cc91061..5067ef1 100644
--- a/src/views/page/realTime.vue
+++ b/src/views/page/realTime.vue
@@ -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>