2023-11-2 zjb需求-接口联调 实时报警 历史报警

shenmu/main.js

@@ -3,6 +3,11 @@ import store from './store'
 
 // #ifndef VUE3
 import Vue from 'vue'
+
+// const BASEURL = 'http://117.34.103.191:8086' // 生产环境url
+const BASEURL = 'http://192.168.3.23:8086' // 研发环境url
+Vue.prototype.$BASEURL = BASEURL
+
 Vue.config.productionTip = false
 Vue.prototype.$store = store
 Vue.prototype.$adpid = "1111111111"

shenmu/pages/tabBar/monitor/logAlarm.nvue

@@ -4,14 +4,14 @@
 			<uni-search-bar v-model="query.name" class="uni-mt-10 margin0" radius="5" placeholder="输入设备名查询" clearButton="auto"
 				cancelButton="none" @confirm="loadData" />
 		</view>
-		<uni-card v-for="(item,index) in dataList" :title="item.name" :key='index' :isFull="true"
-			:sub-title="'检测项：'+item.type" :extra="'检测值：'+item.value" :thumbnail="iconList[2]">
+		<uni-card v-for="(item,index) in dataList" :title="item.deviceName" :key='index' :isFull="true"
+			:sub-title="'检测项：'+item.item" :extra="'检测值：'+item.data" :thumbnail="iconList[2]">
 			<uni-row class="demo-uni-row">
 				<uni-col :span="8">
-					<view class="demo-uni-col">状态：{{item.status}}</view>
+					<view class="demo-uni-col">状态：{{item.flg}}</view>
 				</uni-col>
 				<uni-col :span="16">
-					<view class="demo-uni-col" style="font-size: 16upx;text-align: right;">解除时间：{{item.time}}</view>
+					<view class="demo-uni-col" style="font-size: 16upx;text-align: right;">解除时间：{{item.jcTime}}</view>
 				</uni-col>
 			</uni-row>
 		</uni-card>
@@ -32,11 +32,13 @@
 				query: {
 					name: ''
 				},
+				page: 0,
+				pageSize: 10,
 				devInfo: {
 					onNum: 26,
 					offNum: 13,
 				},
-				dataList: [{
+				dataList: [/* {
 					name: '气象站7号',
 					type: '温度',
 					value: '39.7℃',
@@ -72,7 +74,7 @@
 					value: '39.7℃',
 					status: '解除',
 					time: '2023-10-18 10:03:58'
-				}]
+				} */]
 			}
 		},
 		onReady() {
@@ -81,6 +83,10 @@
 		onShow() {
 			this.loadData()
 		},
+		onReachBottom() {
+			this.pageSize += 10
+			this.loadData()
+		},
 		methods: {
 			loadData() {
 				this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
@@ -88,6 +94,26 @@
 				uni.setNavigationBarTitle({
 					title: `历史报警-${this.currProInfo.text}`
 				});
+				
+				uni.request({
+					url: `${this.$BASEURL}/api/historyAlarm/loadHistoryAlarmByProId`,
+					method: "get",
+					header: {
+						'Accept':'application/json, text/plain, */*',
+						'Authorization':'Bearer '+this.userInfo.token
+					},
+					data: {
+						page: this.page,
+						pageSize: this.pageSize,
+						proId: this.currProInfo.value,
+						deviceName: this.query.name||''
+					}
+				}).then(result => {
+					let [error, res] = result
+					if (res.data && res.data.code==200) {
+						this.dataList = res.data.data.dataList
+					}
+				})
 			},
 		}
 	}

shenmu/pages/tabBar/monitor/realAlarm.nvue

@@ -4,11 +4,11 @@
 			<uni-search-bar v-model="query.name" class="uni-mt-10 margin0" radius="5" placeholder="输入设备名查询" clearButton="auto"
 				cancelButton="none" @confirm="loadData" />
 		</view>
-		<uni-card v-for="(item,index) in dataList" :title="item.name" :key='index' :isFull="true"
-			:sub-title="'检测项：'+item.type" :extra="'检测值：'+item.value" :thumbnail="iconList[2]">
+		<uni-card v-for="(item,index) in dataList" :title="item.deviceName" :key='index' :isFull="true"
+			:sub-title="'检测项：'+item.item" :extra="'检测值：'+item.data" :thumbnail="iconList[2]">
 			<uni-row class="demo-uni-row">
 				<uni-col :span="16">
-					<view class="demo-uni-col">状态：{{item.status}}</view>
+					<view class="demo-uni-col">状态：{{item.flg}}</view>
 				</uni-col>
 				<uni-col :span="8">
 					<view class="demo-uni-col">
@@ -34,7 +34,7 @@
 	export default {
 		data() {
 			return {
-				baseUrl: "http://192.168.3.23:8086",
+				baseUrl: "http://117.34.103.191:8086",
 				userInfo: {},
 				currProInfo: {},
 				iconList: [online, offline, wendu],
@@ -43,11 +43,13 @@
 				query: {
 					name: ''
 				},
+				page: 0,
+				pageSize: 10,	
 				devInfo: {
 					onNum: 26,
 					offNum: 13,
 				},
-				dataList: [{
+				dataList: [/* {
 					name: '气象站7号',
 					type: '温度',
 					value: '39.7℃',
@@ -83,7 +85,7 @@
 					value: '39.7℃',
 					status: '报警',
 					time: '2023-10-18 10:03:58'
-				}]
+				} */]
 			}
 		},
 		onReady() {
@@ -99,6 +101,26 @@
 				uni.setNavigationBarTitle({
 					title: `实时报警-${this.currProInfo.text}`
 				});
+				
+				uni.request({
+					url: `${this.$BASEURL}/api/nowAlarm/loadNowAlarmByProId`,
+					method: "get",
+					header: {
+						'Accept':'application/json, text/plain, */*',
+						'Authorization':'Bearer '+this.userInfo.token
+					},
+					data: {
+						page: this.page,
+						pageSize: this.pageSize,
+						proId: this.currProInfo.value,
+						deviceName: this.query.name||''
+					}
+				}).then(result => {
+					let [error, res] = result
+					if (res.data && res.data.code==200) {
+						this.dataList = res.data.data.dataList
+					}
+				})
 			},
 			dialogClose() {
 				this.msgType = 'error',
@@ -112,7 +134,11 @@
 			},
 			removeAlarm(item) {
 				this.$refs.alertDialog.open()
-			}
+			},
+			onReachBottom() {
+				this.pageSize += 10
+				this.loadData()
+			},
 		}
 	}
 </script>