From b10a31396df8eb87510d35c19e7e9fb34e681e69 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期四, 04 四月 2024 14:32:45 +0800
Subject: [PATCH] fix: 修改报警记录

---
 monitor/singlePoint/index.wxml |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/monitor/singlePoint/index.wxml b/monitor/singlePoint/index.wxml
index 564354d..00b63de 100644
--- a/monitor/singlePoint/index.wxml
+++ b/monitor/singlePoint/index.wxml
@@ -205,7 +205,7 @@
       <view class="flexItem rowStyle  personInfo" style="margin-top:20rpx;">
         <view class="flexItem rowStyle marginLeft12" style="display: flex;flex-direction: column;">
           <text class="color54 fontSize12">鎶ヨ鏃堕棿: {{info.AlarmTime}}</text>
-          <text class="color54 fontSize12">鎭㈠鏃堕棿: {{info.RecoveryTime}}</text>
+          <!-- <text class="color54 fontSize12">鎭㈠鏃堕棿: {{info.RecoveryTime}}</text> -->
         </view>
       </view>
       <view class="flexItem columnStyle tableViewCell">
@@ -220,16 +220,14 @@
           </view>
         </view>
         <view class="flexItem rowStyle marginBottom10 cellStyle" style="width:100%;">
-          <label class="color54 fontSize12" style="width:50%;color:#8799a3">鎶ヨ鍐呭:{{info.AlarmContent}}</label>
+          <!-- <label class="color54 fontSize12" style="width:50%;color:#8799a3">鎶ヨ鍐呭:{{info.AlarmContent}}</label> -->
           <label class="color54 fontSize12" style="width:50%;color:#8799a3">鎶ヨ绛夌骇:{{info.AlarmLevelName}}</label>
+          <label class="color54 fontSize12" style="width:50%;color:#8799a3">鎶ヨ绫诲瀷:{{info.AlarmName}}</label>
         </view>
-        <view class="flexItem rowStyle marginBottom10 cellStyle" style="width:100%;">
-          <label class="color54 fontSize12" style="width:50%;color:#8799a3">鎶ヨ绫诲瀷:{{info.AlarmType}}</label>
+        <view class="flexItem rowStyle marginBottom10 cellStyle" style="width:100%;">    
           <label class="color54 fontSize12" style="width:50%;color:#8799a3">鎶ヨ闃�鍊�:{{info.ThresholdValue}}</label>
-        </view>
-        <view class="flexItem rowStyle marginBottom10 cellStyle" style="width:100%;">
-          <label class="color54 fontSize12" style="width:50%;color:#8799a3">鐩戞帶鍊�:{{info.DataValue}}</label>
-          <label class="color54 fontSize12" style="width:50%;color:#8799a3">澶勭悊鐘舵��:{{info.HandleStatus}}</label>
+          <label class="color54 fontSize12" style="color:#8799a3">鐩戞帶鍊�:</label>
+            <label class="fontSize12" style="color:{{info.AlarmLevelColor}}"> {{info.DataValue}}</label>
         </view>
       </view>
     </block>

--
Gitblit v1.9.3