wkyy 1 år sedan
förälder
incheckning
448bc4215b

+ 9 - 2
pages/abnormal/abnormalAlarmRecord.vue

@@ -142,7 +142,11 @@
 				],
 				],
 			}
 			}
 		},
 		},
-		onLoad() {
+		onLoad(op) {
+			if(op.id) {
+				this.companyId = op.id;
+			}
+			
 			var date = new Date();
 			var date = new Date();
 			var year = date.getFullYear();
 			var year = date.getFullYear();
 			var month = date.getMonth()+1 >= 10 ? date.getMonth()+1 : '0'+(date.getMonth()+1);
 			var month = date.getMonth()+1 >= 10 ? date.getMonth()+1 : '0'+(date.getMonth()+1);
@@ -150,8 +154,8 @@
 			this.queryDate = year + '-' + month;
 			this.queryDate = year + '-' + month;
 			this.time = year + '年' + parseInt(month) + '月';
 			this.time = year + '年' + parseInt(month) + '月';
 			
 			
-			this.getAbnormalAlarmRecord();
 			this.getAlarmConfiguration();
 			this.getAlarmConfiguration();
+			this.getAbnormalAlarmRecord();
 		},
 		},
 		onReady() {
 		onReady() {
 			
 			
@@ -221,6 +225,9 @@
 					
 					
 					if(response.data.companyInfoList && response.data.companyInfoList.length != 0) {
 					if(response.data.companyInfoList && response.data.companyInfoList.length != 0) {
 						list2 = response.data.companyInfoList.map(item => {
 						list2 = response.data.companyInfoList.map(item => {
+							if(item.id == this.companyId) {
+								this.device = item.name;
+							}
 							return {
 							return {
 								label: item.name,
 								label: item.name,
 								value: item.id
 								value: item.id

+ 5 - 15
pages/equipmentDataMonitoring/electronicMonitoring.vue

@@ -135,33 +135,23 @@
 						异常告警
 						异常告警
 					</view>
 					</view>
 				</view>
 				</view>
-				<view class="more" @click="gotoUrl('/pages/abnormal/abnormalAlarmRecord?id=')">
+				<view class="more" @click="gotoUrl('/pages/abnormal/abnormalAlarmRecord?id='+companyId)">
 					查看全部
 					查看全部
 					<u-icon name="arrow-right" size="24" color="#d4d4d4"></u-icon>
 					<u-icon name="arrow-right" size="24" color="#d4d4d4"></u-icon>
 				</view>
 				</view>
 			</view>
 			</view>
 
 
 			<view class="details">
 			<view class="details">
-				<view class="item">
-					<view class="name">
-						温度异常告警
-					</view>
-					<view class="time">
-						2024-01-25 15:00:00
-					</view>
-				</view>
-
-				<view class="item">
+				<view class="item" v-for="(item, index) in abnormalRecordsList" :key="index"
+				@click="gotoUrl('/pages/abnormal/abnormalAlarmDetails?id='+item.id)">
 					<view class="name">
 					<view class="name">
-						三厢功率因数异常告警
+						{{item.configName}}
 					</view>
 					</view>
 					<view class="time">
 					<view class="time">
-						2024-01-05 20:00:00
+						{{item.createTime}}
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>
-
-
 		</view>
 		</view>
 
 
 		<!-- 能源监测 -->
 		<!-- 能源监测 -->

+ 1 - 1
pages/statistics/statistics.vue

@@ -160,7 +160,7 @@
 					<view class="text">
 					<view class="text">
 						异常告警记录
 						异常告警记录
 					</view>
 					</view>
-					<view class="check-all" @click="gotoUrl('/pages/abnormal/abnormalAlarmRecord')">
+					<view class="check-all" @click="gotoUrl('/pages/abnormal/abnormalAlarmRecord?id'+companyId)">
 						查看全部<u-icon name="arrow-right" size="24" color="#838383"></u-icon>
 						查看全部<u-icon name="arrow-right" size="24" color="#838383"></u-icon>
 					</view>
 					</view>
 				</view>
 				</view>