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 +++----
monitor/singlePoint/index.js | 6 +-
monitor/station/index.wxml | 48 +++++++++++------------
monitor/station/index.js | 11 ++---
4 files changed, 37 insertions(+), 42 deletions(-)
diff --git a/monitor/singlePoint/index.js b/monitor/singlePoint/index.js
index 32f0b2e..42fac10 100644
--- a/monitor/singlePoint/index.js
+++ b/monitor/singlePoint/index.js
@@ -93,7 +93,7 @@
currentTabIndex: 0,
hasAlarmData: false,
isChecked: false, //switch閫変腑鐘舵�� ---鏄惁鏄剧ず鎶ヨ鐐�
- alarmListInfo: [],
+ alarmListInfo:[],
currentRecordParas: {},
scrollOneId: '', //瀹炴椂鐩戞帶鏁版嵁鍒楄〃瀵瑰簲鐨勫垪琛ㄥ瓙椤筰d
@@ -1804,7 +1804,7 @@
wx.showLoading({
title: '鍔犺浇涓�...',
})
-
+ const endNext=util.formatDay(util.GetNextDate(that.data.endAlarmDate, 1))
Request({
url: Constant.BASE_SERVER_URL + "Monitor/Value/Alarm/Record/Std/GetPageListBySignalID@V1.0",
method: 'GET',
@@ -1812,7 +1812,7 @@
SignalID : that.data.pointID,
StartTime: that.data.startAlarmDate,
- EndTime: that.data.endAlarmDate,
+ EndTime: endNext,
PageIndex: that.data.PageIndex,
PageSize: that.data.PageSize
},
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>
diff --git a/monitor/station/index.js b/monitor/station/index.js
index b1de29a..7e51ce5 100644
--- a/monitor/station/index.js
+++ b/monitor/station/index.js
@@ -141,7 +141,6 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad: function (options) {
- // console.log(options)
wx.setNavigationBarTitle({
title: "娉电珯鐩戞帶" + options.name
})
@@ -709,15 +708,15 @@
wx.showLoading({
title: '鍔犺浇涓�...',
})
-console.log(that.data.stationID,706)
+ const endNext=util.formatDay(util.GetNextDate(that.data.endAlarmDate, 1))
Request({
- url: Constant.BASE_SERVER_URL + "Monitor/Value/Alarm/Record/Std/GetPageListBySignalID@V1.0",
+ url: Constant.BASE_SERVER_URL + "Monitor/Value/Alarm/Record/Std/GetPageListByBelongTypeAndBelongID@V1.0",
method: 'GET',
data: {
-
- SignalID : that.data.stationID,
+ BelongType:'logic-site',
+ BelongID :that.data.stationID,
StartTime: that.data.startAlarmDate,
- EndTime: that.data.endAlarmDate,
+ EndTime: endNext,
PageIndex: that.data.PageIndex,
PageSize: that.data.PageSize
},
diff --git a/monitor/station/index.wxml b/monitor/station/index.wxml
index 9e94588..64cace0 100644
--- a/monitor/station/index.wxml
+++ b/monitor/station/index.wxml
@@ -149,33 +149,31 @@
<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">
- <view style="display:flex;align-items: center;justify-content: space-between;width:100%;">
- <view class="flexItem rowStyle marginBottom10 cellStyle" style="width:50%;">
- <label class="color54 fontSize12" style="color:#8799a3">瀵硅薄鍚嶇О:</label>
- <label class="fontSize14"> {{info.MonitorPointName}}</label>
- </view>
- <view class="flexItem rowStyle marginBottom10 cellStyle" style="width:50%;">
- <label class="color54 fontSize12" style="color:#8799a3">鐩戞祴鍚嶇О:</label>
- <label class="fontSize14">{{info.MonitorPointName}} </label>
- </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.AlarmLevelName}}</label>
- </view>
- <view class="flexItem rowStyle marginBottom10 cellStyle" style="width:100%;">
- <label class="color54 fontSize12" style="width:50%;color:#8799a3">鎶ヨ绫诲瀷:{{info.AlarmType}}</label>
- <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>
- </view>
- </view>
+ <view class="flexItem columnStyle tableViewCell">
+ <view style="display:flex;align-items: center;justify-content: space-between;width:100%;">
+ <view class="flexItem rowStyle marginBottom10 cellStyle" style="width:50%;">
+ <label class="color54 fontSize12" style="color:#8799a3">瀵硅薄鍚嶇О:</label>
+ <label class="fontSize14"> {{info.MonitorPointName}}</label>
+ </view>
+ <view class="flexItem rowStyle marginBottom10 cellStyle" style="width:50%;">
+ <label class="color54 fontSize12" style="color:#8799a3">鐩戞祴鍚嶇О:</label>
+ <label class="fontSize14">{{info.SignalName}} </label>
+ </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.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.ThresholdValue}}</label>
+ <label class="color54 fontSize12" style="color:#8799a3">鐩戞帶鍊�:</label>
+ <label class="fontSize12" style="color:{{info.AlarmLevelColor}}"> {{info.DataValue}}</label>
+ </view>
+ </view>
</block>
<view
style="width: 100%;height: 80rpx;display: flex;background-color: #eee;align-items: center;justify-content: center;"
--
Gitblit v1.9.3