From 74953a250019269a95efd87677dc1353cfd1167a Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Sat, 2 Mar 2024 22:45:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  4 +-
 src/api/modules/securityManagement.ts         |  4 ++
 .../safeRisk/riskManage/middle.vue            | 54 +++++++++++--------
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/.env.development b/.env.development
index 6e1c916..c92c5a5 100644
--- a/.env.development
+++ b/.env.development
@@ -3,7 +3,7 @@ NODE_ENV = 'development'
 
 # 本地环境接口地址(/api/index.ts文件中使用)
 # VITE_API_URL = 'http://192.168.34.221:9111'
-# VITE_API_URL = 'http://192.168.34.221:28888'
+VITE_API_URL = 'http://192.168.34.221:28889'
 # VITE_API_URL = 'http://121.196.214.246/api'
 # VITE_API_URL = 'http://jxj.zhgdyun.com:100'
 # VITE_API_URL = 'http://192.168.34.221:12360'
@@ -12,7 +12,7 @@ NODE_ENV = 'development'
 # 演示平台
 # VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
 # 百色七参数线上地址
-VITE_API_URL = 'http://101.43.164.214:11113'
+# VITE_API_URL = 'http://101.43.164.214:11113'
 
 # 上传
 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='
diff --git a/src/api/modules/securityManagement.ts b/src/api/modules/securityManagement.ts
index 9902660..16abf31 100644
--- a/src/api/modules/securityManagement.ts
+++ b/src/api/modules/securityManagement.ts
@@ -33,6 +33,10 @@ export const getCountHiddenDangerInspectRegion = (params: {}) => {
 export const getAlarmList = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/aiAnalyseHardWareAlarmRecord/selectAiAnalyseHardWareAlarmList`, params);
 };
+// 1.查询设备报警记录列表--分页
+export const getAlarmPage = (params: {}) => {
+	return http.post(BASEURL + `/xmgl/aiAnalyseHardWareAlarmRecord/selectPageList`, params);
+};
 // 2.查询当前实时数据
 export const getRealTimeTotal = (params: {}) => {
 	return http.post(BASEURL + `/xmgl/aiAnalyseHardWareAlarmRecord/countAiAnalyseHardWareAlarmTotal`, params);
diff --git a/src/views/sevenLargeScreen/safeRisk/riskManage/middle.vue b/src/views/sevenLargeScreen/safeRisk/riskManage/middle.vue
index 813e391..af77eb0 100644
--- a/src/views/sevenLargeScreen/safeRisk/riskManage/middle.vue
+++ b/src/views/sevenLargeScreen/safeRisk/riskManage/middle.vue
@@ -44,7 +44,7 @@
 								<!-- <div>{{ item.alarmType ? getWarnName(item.alarmType) : "" }}</div> -->
 								<div style="width: 18%">{{ item.alarmTypeName }}</div>
 								<div style="width: 30%">{{ item.createTime }}</div>
-								<div style="width: 10%" @click="openPeopleCountDialog({type: 1,data: item})">去处置</div>
+								<div style="width: 10%" @click="openPeopleCountDialog({type: 1,data: item})" v-if="!item.handleResult">去处置</div>
 							</div>
 							<div class="not-data" v-if="alarmList.length == 0">
 								<img src="@/assets/images/noData.png" />
@@ -74,7 +74,7 @@
 <script lang="ts" setup>
 import Card from "@/components/card.vue";
 import { ref, onMounted, computed } from "vue";
-import { getRealTimeTotal, getAlarmList } from "@/api/modules/securityManagement";
+import { getRealTimeTotal, getAlarmPage } from "@/api/modules/securityManagement";
 import { GlobalStore } from "@/stores";
 import dataDialog from "./data-dialog.vue";
 import dataListDialog from "./data-list-dialog.vue";
@@ -116,12 +116,22 @@ const getMemberCareList = async () => {
 //获取今日报警记录列表
 let alarmList = ref([] as any);
 let detailData = ref({} as any);
-const getAlarmListInfo = async () => {
-	const res: any = await getAlarmList({ projectSn: store.sn });
-	if (res.result.length > 0) {
-		alarmList.value = res.result;
+const getAlarmListInfo = async (tip:any) => {
+	let data:any = {
+		projectSn: store.sn,
+		pageNo: tip == 'search'?1:pageNo.value,
+		pageSize: 20
+	};
+	const res: any = await getAlarmPage(data);
+	if (tip == "more") {
+		alarmList.value = alarmList.value.concat(res.result.records);
 	} else {
-		alarmList.value = [];
+		alarmList.value = res.result.records;
+	}
+	if (res.result.pages == pageNo.value) {
+		moreScroll.value = false;
+	} else {
+		pageNo.value = pageNo.value + 1;
 	}
 	dealVal.value = dealVal.value + 1;
 	emits("updateListData",dealVal.value)
@@ -141,21 +151,21 @@ function closeDialog() {
 
 onMounted(async () => {
 	await getMemberCareList();
-	await getAlarmListInfo();
-	// refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
-	// 	// console.log("滚动容器", e);
-	// 	const scrollTop = e.target.scrollTop;
-	// 	const scrollHeight = e.target.scrollHeight;
-	// 	const clientHeight = e.target.clientHeight;
-	// 	// console.log("滚动容器", scrollTop, scrollHeight, clientHeight);
-	// 	// 向上加载更多
-	// 	if (scrollTop >= scrollHeight - clientHeight - 1) {
-	// 		// console.log("加载更多");
-	// 		if (moreScroll.value) {
-	// 			getMemberCountList("more");
-	// 		}
-	// 	}
-	// });
+	await getAlarmListInfo('search');
+	refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
+		// console.log("滚动容器", e);
+		const scrollTop = e.target.scrollTop;
+		const scrollHeight = e.target.scrollHeight;
+		const clientHeight = e.target.clientHeight;
+		// console.log("滚动容器", scrollTop, scrollHeight, clientHeight);
+		// 向上加载更多
+		if (scrollTop >= scrollHeight - clientHeight - 1) {
+			// console.log("加载更多");
+			if (moreScroll.value) {
+				getAlarmListInfo("more");
+			}
+		}
+	});
 });
 </script>
 <style lang="scss" scoped>