From 64b86525ffb84cf6538369fd6d6b8df09f0acc7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Mon, 24 Oct 2022 17:59:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=B1=E5=9F=BA=E5=9D=91=E6=B5=8B=E7=82=B9?=
 =?UTF-8?q?=E5=88=86=E5=B8=83=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9=E3=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deepFoundationPitManage/monitorData.vue   | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/views/projectFront/deepFoundationPitManage/monitorData.vue b/src/views/projectFront/deepFoundationPitManage/monitorData.vue
index 2e4235be..22ca6caa 100644
--- a/src/views/projectFront/deepFoundationPitManage/monitorData.vue
+++ b/src/views/projectFront/deepFoundationPitManage/monitorData.vue
@@ -150,21 +150,31 @@
                     >
                       <div class="point-title">
                         <p>测点编号：{{item.measurePointName }}</p>
-                        <p>测点名称：{{ item.monitorTypeName}}</p>
+                        <p>测点名称：<span style="color:#77e8b0;display:inline-block;width:150px;height:25px">{{ item.monitorTypeName}}</span></p>
+                        <p>测点状态:
+                            <span style="display:inline-block;width:150px;height:30px" :class="{'alarm_status1': item.alarmState == 1,
+                            'alarm_status2': item.alarmState == 2,
+                            'alarm_status3': item.alarmState == 3,
+                            'alarm_status4': item.alarmState == 4}">
+                              {{item.alarmState == 1 ? '正常': item.alarmState == 2
+                          ? '超控制' : item.alarmState == 3
+                          ? '累计值报警': item.alarmState == 4
+                          ? '变化速率报警':""}}</span></p>
                       </div>
                       <vue-scroll style="height: 200px">
                         <div class="point-content">
                           <div v-for="(item2,index2) in item.sensorlist" :key="index2">
                             <p>传感器编号：{{item2.sensorSn}}</p>
                             <p>传感器类型：{{item2.sensorTypeName == null ? '无' : item2.sensorTypeName }}</p>
-                            <p>采集时间：{{item2.receiveTime == null ? '无' : item2.receiveTime}}</p>
-                            <p>当前值：{{item2.data == null ? '无' : item2.receiveTime}}</p>
-                            <p>变化速率：{{item2.dataRate == null ? '无' : item2.dataRate}}</p>
                             <p>当前状态：
-                            {{item2.status == 1 ? '正常': item2.status == 2
-                          ? '累计值报警' : item2.status == 3
-                          ? '超控制': item2.status == 4
-                          ? '变化速率报警':""}}</p>
+                                {{item2.status == 1 ? '正常': item2.status == 2
+                                  ? '超控制' : item2.status == 3
+                                 ? '累计值报警': item2.status == 4
+                                 ? '变化速率报警':""}}</p>
+                            <p>当前值：{{item2.data == null ? '无' : item2.data}}</p>
+                            <p>变化速率：{{item2.dataRate == null ? '无' : item2.dataRate}}</p>
+                            <p>累计值：{{item2.dataTotal == null ? '无' : item2.dataTotal}}</p>
+                            <p>采集时间：{{item2.receiveTime == null ? '无' : item2.receiveTime}}</p> 
                           </div>
                           <!-- 检测类型 -->
                           <!-- <p>{{$t('message.deepFoundConfig.detectionType')}}：{{item.monitorTypeName}}</p>