From 12a4ea7b4b77a7f1c585405d5b9942af3c5e2c8a Mon Sep 17 00:00:00 2001
From: xusd <xu13181496959@163.com>
Date: Tue, 11 Jun 2024 10:19:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=92=8C=E8=B7=B3=E8=BD=AC=E6=8A=A5=E8=AD=A6=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index.vue                | 46 ++++++++++++++++++++++------------
 pages/work/alarm/listAlarm.vue | 35 ++++++++++++++++++--------
 2 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/pages/index.vue b/pages/index.vue
index 4d97705..c7a4d26 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<uni-section title="点巡检" type="line">
+<!-- 		<uni-section title="点巡检" type="line">
 			<swiper class="swiper-box">
 				<swiper-item>
 					<view class="content-card-container">
@@ -21,19 +21,19 @@
 					</view>
 				</swiper-item>
 			</swiper>
-		</uni-section>
-		<uni-section title="报警处理" type="line">
+		</uni-section> -->
+		<uni-section title="快捷入口" type="line">
 			<swiper class="swiper-box">
 				<swiper-item>
 					<view class="content-card-container">
 						<view class="content-card-wrap" @click="handleClickAllAlarm">
 							<view class="content-container">
 								<view class="content-icon-wrap">
-									<view :class="'iconfont icon-jixie'" :style="{'--color':'#0099FF'}">
+									<view :class="'iconfont icon-guzhang1'" :style="{'--color':'#FF0000'}">
 									</view>
 								</view>
 								<view class="content-title-wrap">
-									<view class="content-title">报警总数</view>
+									<view class="content-title">报警管理</view>
 									<view class="content-subTitle">
 										<text class="content-count">{{allCount}}</text>
 										次
@@ -41,7 +41,21 @@
 								</view>
 							</view>
 						</view>
-						<view class="content-card-wrap" @click="handleClickProcessedAlarm">
+						<view class="content-card-wrap" @click="handleClickPatrolCount">
+							<view class="content-container">
+								<view class="content-icon-wrap">
+									<uni-icons type="paperplane-filled" size="40" color="#0099FF"></uni-icons>
+								</view>
+								<view class="content-title-wrap">
+									<view class="content-title">巡检任务</view>
+									<view class="content-subTitle">
+										<text class="content-count">{{patrolCount}}</text>
+										次
+									</view>
+								</view>
+							</view>
+						</view>
+<!-- 						<view class="content-card-wrap" @click="handleClickProcessedAlarm">
 							<view class="content-container">
 								<view class="content-icon-wrap">
 									<view :class="'iconfont icon-zhengchang'" :style="{'--color':'#2BD52B'}">
@@ -70,7 +84,7 @@
 									</view>
 								</view>
 							</view>
-						</view>
+						</view> -->
 					</view>
 				</swiper-item>
 			</swiper>
@@ -425,16 +439,16 @@
 			},
 			//点击所有报警
 			handleClickAllAlarm() {
-				this.$tab.navigateTo("/pages/work/alarm/listAlarm?flag=0");
-			},
-			//点击已处理报警
-			handleClickProcessedAlarm() {
-				this.$tab.navigateTo("/pages/work/alarm/listAlarm?flag=1");
-			},
-			//点击未处理报警
-			handleClickUntreatedAlarm() {
-				this.$tab.navigateTo("/pages/work/alarm/listAlarm?flag=2");
+				this.$tab.navigateTo("/pages/work/alarm/listAlarm");
 			},
+			// //点击已处理报警
+			// handleClickProcessedAlarm() {
+			// 	this.$tab.navigateTo("/pages/work/alarm/listAlarm?flag=1");
+			// },
+			// //点击未处理报警
+			// handleClickUntreatedAlarm() {
+			// 	this.$tab.navigateTo("/pages/work/alarm/listAlarm?flag=2");
+			// },
 			tabListClick(item) {
 				clearInterval(this.intervalTask);
 				this.tabIndex = item.index;
diff --git a/pages/work/alarm/listAlarm.vue b/pages/work/alarm/listAlarm.vue
index 8101eb4..541a788 100644
--- a/pages/work/alarm/listAlarm.vue
+++ b/pages/work/alarm/listAlarm.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="card-group">
+		<u-tabs :list="tabList" @click="tabListClick"></u-tabs>
 		<view class="search-container">
 			<uni-data-select v-model="equipId" placeholder="请选择监测设备" :localdata="equipList"
 				@change="equipChange"></uni-data-select>
@@ -73,7 +74,14 @@
 					pageNum: 1,
 					pageSize: 10
 				},
-				equipList: []
+				equipList: [],
+				tabList: [{
+					name: '全部',
+				}, {
+					name: '未处理',
+				}, {
+					name: '已处理'
+				}]
 			}
 		},
 		onReachBottom() {
@@ -91,10 +99,23 @@
 			this.getAlarmList();
 			this.getEquipList();
 		},
-		onLoad(opts) {
-			this.flag = opts.flag;
-		},
+		// onLoad(opts) {
+		// 	this.flag = opts.flag;
+		// },
 		methods: {
+			tabListClick(item){
+				this.finished = true;
+				this.alarmList = []
+				this.tabIndex = item.index;
+				if (0 === item.index) {
+					this.queryParams.status = null;
+				} else if (1 === item.index) {
+					this.queryParams.status = 0;
+				} else if (2 === item.index) {
+					this.queryParams.status = 1;
+				}
+				this.getAlarmList();
+			},
 			equipChange() {
 				this.getAlarmList();
 			},
@@ -116,12 +137,6 @@
 			},
 			getAlarmList() {
 				this.finished = true;
-				//flag：0全部 1已处理 2未处理
-				if (this.flag === "1") {
-					this.queryParams.status = 1;
-				} else if (this.flag === "2") {
-					this.queryParams.status = 0;
-				}
 				this.queryParams.equipId = this.equipId;
 				listRecord(this.queryParams).then((res) => {
 					this.finished = false;