From 39b9c75525233b7bf013d40fe1edbc7de812c637 Mon Sep 17 00:00:00 2001
From: limingtao <@ming_tao_li>
Date: Thu, 18 Jul 2024 14:01:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue         |  4 +--
 pages/investigation/index.vue | 51 ++++++++++++++++++++++++++---------
 pages/map/index.vue           |  3 ++-
 3 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index f70b238..9920237 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -131,7 +131,7 @@
 			getList() {
 				let datas = {
 					nuserid: this.$.getData('token'),
-					status: '0',
+					status: '10',
 				}
 				this.loadmorestatus = 'loading'
 				this.$request.globalRequest(
@@ -367,7 +367,7 @@
 				top: 0px;
 				right: 0px;
 				color: #ffffff;
-				font-size: 14px;
+				font-size: 22rpx;
 				font-weight: normal;
 				z-index: 1;
 			}
diff --git a/pages/investigation/index.vue b/pages/investigation/index.vue
index 2dadc6d..8325e99 100644
--- a/pages/investigation/index.vue
+++ b/pages/investigation/index.vue
@@ -16,10 +16,10 @@
 					<text>待办</text>
 					<text v-if="showNumber" class="number">{{ totalData.Unconfirmed }}</text>
 				</view>
-				<view class="tab-item" :class="tab === 2 ? 'active' : ''" @click='handleTabClick(2)'>
+				<!-- <view class="tab-item" :class="tab === 2 ? 'active' : ''" @click='handleTabClick(2)'>
 					<text>正在办理</text>
 					<text class="number">{{ totalData.InGovernance }}</text>
-				</view>
+				</view> -->
 				<view class="tab-item" :class="tab === 3 ? 'active' : ''" @click='handleTabClick(3)'>
 					<text>已完成</text>
 					<text class="number">{{ totalData.Finished }}</text>
@@ -79,7 +79,7 @@
 					Finished: 0,
 					Unconfirmed: 0,
 				},
-				status: '0',
+				status: '10',
 
 			}
 		},
@@ -89,8 +89,8 @@
 		},
 
 		onShow: function() {
-			this.getData()
-
+			this.getData1()
+			this.getData2()
 		},
 		// 计算属性
 		computed: {
@@ -107,17 +107,44 @@
 				this.isMore = true
 				switch (tab) {
 					case 1:
-						this.status = '0';
-						break;
-					case 2:
-						this.status = '20';
+						this.status = '10';
 						break;
+						// case 2:
+						// 	this.status = '20';
+						// 	break;
 					case 3:
-						this.status = '40';
+						this.status = '20';
 						break;
 				}
 				this.getList()
 			},
+			getData1() {
+				let datas = {
+					nuserid: this.$.getData('token'),
+					status: '10',
+				}
+				this.loadmorestatus = 'loading'
+				this.$request.globalRequest(
+						`/hiddenDanger/highDanger/getHigDangerDealt?pageNum=${this.page}&pageSize=${10}`, datas, 'POST')
+					.then(res => {
+						console.log(res)
+						this.totalData.Unconfirmed = res.result.total
+					}).catch((err) => {})
+
+			},
+			getData2() {
+				let datas = {
+					nuserid: this.$.getData('token'),
+					status: '20',
+				}
+				this.loadmorestatus = 'loading'
+				this.$request.globalRequest(
+						`/hiddenDanger/highDanger/getHigDangerDealt?pageNum=${this.page}&pageSize=${10}`, datas, 'POST')
+					.then(res => {
+						this.totalData.Finished = res.result.total
+					}).catch((err) => {})
+
+			},
 			getData() {
 				this.$request.globalRequest('/hiddenDanger/highDanger/getHighDangerStatusNum', {
 					nuserid: this.$.getData('token')
@@ -313,9 +340,9 @@
 			.trapezoidal {
 				position: absolute;
 				top: -0px;
-				right: 4px;
+				right: 0px;
 				color: #ffffff;
-				font-size: 14px;
+				font-size: 22rpx;
 				font-weight: normal;
 				z-index: 1;
 			}
diff --git a/pages/map/index.vue b/pages/map/index.vue
index 3e1a3e1..9d62753 100644
--- a/pages/map/index.vue
+++ b/pages/map/index.vue
@@ -570,7 +570,8 @@ export default {
       right: 0;
       width: 50px;
       height: 28px;
-      line-height: 28px;
+      line-height: 28px;
+	  font-size: 22rpx;
       background: #cc2936;
       color: #fff;
       text-align: center;