From 9b360854f9ac9aece14203cb371d9b9950be3dd3 Mon Sep 17 00:00:00 2001
From: limingtao <@ming_tao_li>
Date: Fri, 2 Aug 2024 17:28:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/tabbar.vue         |  7 ++--
 pages/index/index.vue         | 16 +++++----
 pages/investigation/index.vue | 67 ++++++++++++++++++++++++++++++-----
 3 files changed, 71 insertions(+), 19 deletions(-)

diff --git a/components/tabbar.vue b/components/tabbar.vue
index 124ef44..c72845a 100644
--- a/components/tabbar.vue
+++ b/components/tabbar.vue
@@ -77,6 +77,7 @@
 		methods: {
 			to(item, index) {
 				this.value = index
+				this.$.setData('pageType', 1)
 				uni.switchTab({
 					url: item.pagePath
 				})
@@ -116,12 +117,12 @@
 				}
 				for (let i in this.list) {
 					if ('/pages/' + this.path + '/index' == this.list[i].pagePath) {
-				// console.log('/pages/' + this.path + '/index' == this.list[i].pagePath,this.list.length,i)
-				// 		this.value = Number(i)
+						// console.log('/pages/' + this.path + '/index' == this.list[i].pagePath,this.list.length,i)
+						// 		this.value = Number(i)
 					}
 				}
 				// 	console.log('/pages/'+this.path+'/index')
-					// console.log('/pages/' + this.path + '/index')
+				// console.log('/pages/' + this.path + '/index')
 			}
 		}
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ece0606..a3fa113 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -27,13 +27,13 @@
 						</view>
 					</view>
 					<view class="right">
-						<view class="current_mouth Flex Flex_C_S-B blur">
+						<view class="current_mouth Flex Flex_C_S-B blur" @click="jump(2,'2')">
 							<image style="width: 80rpx" mode="widthFix" :src="$.imgSrc + '/mouth.png'" class="video">
 							</image>
-							<text class="name">本月上报</text>
+							<text class="name">个人上报</text>
 							<text class="number">{{ totalData.MonthReport }}</text>
 						</view>
-						<view class="finish Flex Flex_C_S-B blur" @click="jump(2)">
+						<view class="finish Flex Flex_C_S-B blur" @click="jump(2,'1')">
 							<image style="width: 80rpx" mode="widthFix" :src="$.imgSrc + '/finish.png'" class="video">
 							</image>
 							<text class="name">已完成</text>
@@ -180,13 +180,13 @@
 			},
 			handleClick(row) {
 				if (row.pcType == 2) {
-					this.$.open("/pages/investigation/task" + "?id=" + row.businessId+ '&sectionId=' + row.sectionCode +
+					this.$.open("/pages/investigation/task" + "?id=" + row.businessId + '&sectionId=' + row.sectionCode +
 						'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
-						'&pcType' + row.pcType+'&sectionName='+row.sectionName+'&sectionCode='+row.sectionCode);
+						'&pcType' + row.pcType + '&sectionName=' + row.sectionName + '&sectionCode=' + row.sectionCode);
 				} else {
 					this.$.open('/pages/map/index?businessId=' + row.businessId + '&sectionId=' + row.sectionCode +
 						'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
-						'&pcType' + row.pcType+'&sectionName='+row.sectionName+'&sectionCode='+row.sectionCode)
+						'&pcType' + row.pcType + '&sectionName=' + row.sectionName + '&sectionCode=' + row.sectionCode)
 				}
 			},
 			konw() {
@@ -196,12 +196,14 @@
 			skipPage(even) {
 				// this.$.open(even)
 			},
-			jump(v) {
+			jump(v, type) {
 				if (v == 1) {
 					this.$.setData('pageStatus', 1)
+					this.$.setData('pageType', 1)
 				}
 				if (v == 2) {
 					this.$.setData('pageStatus', 3)
+					this.$.setData('pageType', type)
 				}
 
 				this.$.openTab('/pages/investigation/index')
diff --git a/pages/investigation/index.vue b/pages/investigation/index.vue
index 9d93bda..3fc9733 100644
--- a/pages/investigation/index.vue
+++ b/pages/investigation/index.vue
@@ -11,7 +11,7 @@
 					</template> -->
 				</top-title>
 			</view>
-			<view class="query-form">
+			<view class="query-form" :class="tab==3?'query-form2':''">
 				<view class="search-box">
 					<u-search placeholder="请输入名称" v-model="search" actionText="" :showAction="false"
 						@search="searchData" @clear="searchData"></u-search>
@@ -31,6 +31,20 @@
 						<text class="number">{{ totalData.InGovernance }}</text>
 					</view>
 				</view>
+				<view class="type-box" v-show="tab==3">
+					<view class="type-item" :class="queryType == 1 ? 'type-active' : ''" @click="queryType=1">
+						全部
+
+					</view>
+					<view class="type-item" :class="queryType == 2 ? 'type-active' : ''" @click="queryType=2">
+						人工上报
+					
+					</view>
+					<view class="type-item" :class="queryType == 3 ? 'type-active' : ''" @click="queryType=3">
+						系统下发
+					
+					</view>
+				</view>
 
 
 			</view>
@@ -95,7 +109,9 @@
 				},
 				status: '10',
 				search: '',
-				tabbarShow: true
+				tabbarShow: true,
+				queryType: '1',
+				pageStatus: ''
 
 			}
 		},
@@ -108,6 +124,8 @@
 			// tabFun.tabbar()
 			this.getData()
 			let pageStatus = this.$.getData('pageStatus')
+			this.pageStatus = pageStatus
+			this.queryType = this.$.getData('pageType')
 			if (pageStatus == 1) {
 				this.handleTabClick(1)
 				this.$.setData('pageStatus', '0')
@@ -205,24 +223,28 @@
 				console.log(row)
 				if (this.tab === 1) {
 					if (row.pcType == 2) {
-						this.$.open("/pages/investigation/task" + "?id=" + row.businessId+ '&sectionId=' + row.sectionCode +
-						'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
-						'&pcType' + row.pcType+'&sectionName='+row.sectionName+'&sectionCode='+row.sectionCode);
+						this.$.open("/pages/investigation/task" + "?id=" + row.businessId + '&sectionId=' + row
+							.sectionCode +
+							'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
+							'&pcType' + row.pcType + '&sectionName=' + row.sectionName + '&sectionCode=' + row
+							.sectionCode);
 					} else {
 						this.$.open('/pages/map/index?businessId=' + row.businessId +
 							'&operator=' + row.operator +
 							'&deptId=' + row.handleDept +
 							'&pcType=' + row.pcType +
-							'&type=' + (this.tab == 1 ? 'edit' : 'view')+'&sectionName='+row.sectionName+'&sectionCode='+row.sectionCode)
+							'&type=' + (this.tab == 1 ? 'edit' : 'view') + '&sectionName=' + row.sectionName +
+							'&sectionCode=' + row.sectionCode)
 						// this.$.open('/pages/map/index?businessId=' + row.businessId)
 					}
 
 				} else {
 					// this.$.open('/pages/investigation/complete?id=' + row.businessId + '&type=' + (this.tab == 1 ? 'edit' :
 					// 	'view'))
-					this.$.open("/pages/investigation/complete" + "?id=" + row.businessId+ '&sectionId=' + row.sectionCode +
-					'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
-					'&pcType' + row.pcType+'&sectionName='+row.sectionName+'&sectionCode='+row.sectionCode);
+					this.$.open("/pages/investigation/complete" + "?id=" + row.businessId + '&sectionId=' + row
+						.sectionCode +
+						'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
+						'&pcType' + row.pcType + '&sectionName=' + row.sectionName + '&sectionCode=' + row.sectionCode);
 				}
 
 			},
@@ -362,6 +384,33 @@
 		}
 	}
 
+	.query-form2 {
+		height: 146px;
+
+		.type-box {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			width: calc(100% - 100rpx);
+			padding: 0 50rpx;
+			height: 108rpx;
+			.type-item{
+				width: 28%;
+				border-radius: 200rpx;
+				height: 50rpx;
+				text-align: center;
+				line-height: 50rpx;
+				font-size: 26rpx;
+				border: #999999 solid 1rpx;
+				margin-top: 15rpx;
+			}
+			.type-active{
+				border: #3c6dc3 solid 1rpx;
+				color:#3c6dc3;
+			}
+		}
+	}
+
 	.Box {
 		padding-top: var(--status-bar-height);