diff --git a/common/css/global.scss b/common/css/global.scss
index c70b8f0..fba57ce 100644
--- a/common/css/global.scss
+++ b/common/css/global.scss
@@ -62,4 +62,30 @@
     background-color: rgba(255, 255, 255, 0.2); /* 半透明背景 */
     backdrop-filter: blur(10px); /* 背景模糊 */
     -webkit-backdrop-filter: blur(10px); /* 兼容老版本 Safari */
-}
\ No newline at end of file
+}
+
+
+.font-family-SR {
+	font-family: 'SOURCEHANSANSCN-REGULAR';
+}
+
+.font-family-ASB {
+	font-family: 'Alimama_ShuHeiTi_Bold';
+}
+
+.font-family-TMB {
+	font-family: 'Tensentype-MeiHeiJ-Bold';
+}
+
+.font-family-SM {
+	font-family: 'SOURCEHANSANSCN-MEDIUM';
+}
+
+.font-family-SB {
+	font-family: 'SOURCEHANSANSCN-BOLD';
+}
+
+.font-family-MNR {
+	font-family: 'MFLiHei_Noncommercial-Regular';
+}
+
diff --git a/common/globalJs/globalJs.js b/common/globalJs/globalJs.js
index 53afbf5..7d7038c 100644
--- a/common/globalJs/globalJs.js
+++ b/common/globalJs/globalJs.js
@@ -2,8 +2,8 @@
 // #ifdef APP-PLUS || MP
 // const baseUrl = "http://116.62.210.143:9002";
 // const baseUrl = "http://118.89.79.160:8800/HiatmpPro";
-const baseUrl = "http://49.235.207.167:8800/HiatmpPro";
-// const baseUrl = "http://219.147.31.25:30001/tht-app-api/HiatmpPro";
+// const baseUrl = "http://49.235.207.167:8800/HiatmpPro";
+const baseUrl = "http://219.147.31.25:30001/tht-app-api/HiatmpPro";
 const chatUrl = "http://219.147.31.25:30001/hitap";
 // #endif
 // #ifdef H5
diff --git a/components/tabbar.vue b/components/tabbar.vue
index 5205d56..f56cf97 100644
--- a/components/tabbar.vue
+++ b/components/tabbar.vue
@@ -37,42 +37,51 @@
 					// 图片路径，icon 大小限制为40kb，建议尺寸为 81px * 81px
 					"selectedIconPath": "/static/nav/index_active.png",
 					// 选中时的图片路径
-					"text": "首页"
+					"text": "首页",
 					// tab 上按钮文字
+					role: ['领导', '排查人员', '治理人员']
 				},
 				approve: {
 					"pagePath": "/pages/approve/index",
 					"iconPath": "/static/nav/jobfind.png",
 					"selectedIconPath": "/static/nav/jobfind_active.png",
-					"text": "审批"
+					"text": "审批",
+					role: ['领导']
 				},
 				investigation: {
 					"pagePath": "/pages/investigation/index",
 					"iconPath": "/static/nav/job.png",
 					"selectedIconPath": "/static/nav/job_active.png",
-					"text": "排查"
+					"text": "排查",
+					role: ['领导', '排查人员']
 				},
 
 				governance: {
 					"pagePath": "/pages/governance/index",
 					"iconPath": "/static/nav/lean.png",
 					"selectedIconPath": "/static/nav/lean_active.png",
-					"text": "治理"
+					"text": "治理",
+					role: ['领导', '治理人员']
 				},
 				mine: {
 					"pagePath": "/pages/mine/index",
 					"iconPath": "/static/nav/mine.png",
 					"selectedIconPath": "/static/nav/mine_active.png",
-					"text": "我的"
+					"text": "我的",
+					role: ['领导', '排查人员', '治理人员']
 				},
-				"list": [
-
-				],
 				value: 0
 			}
 		},
+		computed: {
+			list() {
+				const routerArr = [this.home, this.approve, this.investigation, this.governance, this.mine]
+				const myRoles = this.$.getData('userInfo').role || []
+				return routerArr.filter(item => item.role.some(role => myRoles.includes(role)))
+			}
+		},
 		created() {
-			this.initTab()
+			// this.initTab()
 		},
 		methods: {
 			to(item, index) {
@@ -107,7 +116,7 @@
 				}
 				if (role.includes('排查人员') && !role.includes('领导')) {
 					this.list.push(this.home)
-					// this.list.push(this.approve)
+					this.list.push(this.approve)
 					this.list.push(this.investigation)
 					this.list.push(this.governance)
 					this.list.push(this.mine)
@@ -115,8 +124,8 @@
 				if (!role.includes('排查人员') && !role.includes('领导')) {
 
 					this.list.push(this.home)
-					// this.list.push(this.approve)
-					// this.list.push(this.investigation)
+					this.list.push(this.approve)
+					this.list.push(this.investigation)
 					this.list.push(this.governance)
 					this.list.push(this.mine)
 				}
diff --git a/pages/create/create.vue b/pages/create/create.vue
index 0efae49..7931b11 100644
--- a/pages/create/create.vue
+++ b/pages/create/create.vue
@@ -1,6 +1,11 @@
 <template>
 	<view class="create-investigation">
-		<top-title title="排查选择" class="custom_bg"></top-title>
+		<top-title title="排查选择" class="custom_bg" :rightWidth='60'>
+			<template slot="right">
+				<image src="/static/map/daohang.png" class="right-dh" mode="" @click="handleOpenMapNav">
+				</image>
+			</template>
+		</top-title>
 
 		<view class="page-body">
 			<!-- <map :latitude="latitude" :longitude="longitude" :markers="markers" /> -->
@@ -12,7 +17,7 @@
 				<cover-image src="../../static/map/3746.png" alt="" srcset="" @click="getCurCenter" />
 			</cover-view>
 		</view>
-
+		<mapNavigation ref="mapNavigation" />
 		<view class="page-footer">
 
 
@@ -39,12 +44,14 @@
 	import {
 		wgs84LL2gcjLL2
 	} from "@/pages/map/c.js";
+	import mapNavigation from "./map-navigation.vue";
 
 	export default {
 		components: {
 			Change,
 			TopTitle,
-			Three
+			Three,
+			mapNavigation
 		},
 		data() {
 			return {
@@ -95,6 +102,16 @@
 			this.mapContext = uni.createMapContext('myMap', this).$getAppMap()
 		},
 		methods: {
+			handleOpenMapNav() {
+				if (!this.sectionCode) return this.$.toast('请选择路段或路口')
+				this.$refs.mapNavigation.open({
+					name: this.curSections.name,
+					latitude: this.curSections.position[
+						0].latitude,
+					longitude: this.curSections.position[
+						0].longitude
+				})
+			},
 			onSearch(value) {
 				this.search = value
 				this.getList()
@@ -174,7 +191,11 @@
 				this.longitude = longitude
 				this.latitude = latitude
 				// #endif
+				// #ifdef H5
 				this.getList()
+				// #endif
+				// 当前中心点变化，自动调取接口 见moveUserToMapViewCenter
+				// this.getList()
 			}
 		},
 		onLoad() {
@@ -190,6 +211,12 @@
 		display: flex;
 		flex-direction: column;
 
+		.right-dh {
+			display: inline-block;
+			width: 30px;
+			height: 30px;
+		}
+
 		.page-body {
 			width: 100%;
 			padding-top: calc(var(--status-bar-height) + 88rpx);
diff --git a/pages/create/map-navigation.vue b/pages/create/map-navigation.vue
new file mode 100644
index 0000000..91d79c7
--- /dev/null
+++ b/pages/create/map-navigation.vue
@@ -0,0 +1,91 @@
+<template>
+	<!-- <u-action-sheet :actions="sheetActions" cancelText="取消" round="8" :show="show" @select="handleSelect"
+			@close="handleClose"></u-action-sheet> -->
+</template>
+
+<script>
+	export default {
+		name: 'map-navigation',
+		data() {
+			return {
+				show: false,
+				actions: [{
+					name: '高德地图',
+					packageName: 'com.autonavi.minimap',
+					isTrue: false,
+					getAppUrl: (name, latitude, longitude) => {
+						return `androidamap://viewMap?sourceApplication=隐患排查&poiname=${name}&lat=${latitude}&lon=${longitude}&dev=0`
+					}
+				}, {
+					name: '百度地图',
+					packageName: 'com.baidu.BaiduMap',
+					isTrue: false,
+					getAppUrl: (name, latitude, longitude) => {
+						return `baidumap://map/marker?location=${latitude},${longitude}&title=${name}&content=${name}&src=andr.baidu.openAPIdemo&coord_type=gcj02`
+					}
+				}, {
+					name: '腾讯地图',
+					packageName: 'com.tencent.map',
+					isTrue: false,
+					getAppUrl: (name, latitude, longitude, referer) => {
+						return `qqmap://map/geocoder?coord=${latitude},${longitude}&title${name}&addr=${name}=&referer=${referer}`
+					}
+				}],
+			}
+		},
+		computed: {
+			sheetActions() {
+				return this.actions.filter(item => item.isTrue).map(item => item.name)
+			}
+		},
+		mounted() {
+			this.getAppList()
+		},
+		methods: {
+			open({
+				name,
+				latitude,
+				longitude
+			}) {
+				if (!this.sheetActions.length) {
+					this.$.toast('您当前未安装地图APP')
+				} else {
+					uni.showActionSheet({
+						itemList: this.sheetActions,
+						success: ({
+							tapIndex
+						}) => {
+							const appList = this.actions.filter(item => item.isTrue)
+							const url = encodeURI(appList[tapIndex].getAppUrl(name, latitude,
+								longitude))
+							plus.runtime.openURL(url, (err) => {
+								console.log(err)
+							})
+						}
+					})
+				}
+
+			},
+			handleSelect(index) {
+				console.log(index)
+			},
+			handleClose() {
+				this.show = false
+			},
+			getAppList() {
+				this.actions = this.actions.map(item => ({
+					...item,
+					isTrue: plus.runtime.isApplicationExist({
+						pname: item.packageName
+					})
+				}))
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.u-popup {
+		flex: 0 !important;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/detail.vue b/pages/index/detail.vue
index 5ab0022..6c3553f 100644
--- a/pages/index/detail.vue
+++ b/pages/index/detail.vue
@@ -59,7 +59,11 @@
 				<view class="content">
 					<view style="width: 100%; overflow: hidden;">
 						<zeroMarkdownView :markdown="item.data || ''" />
-
+						<view class="tips-content font-family-SR" v-show="item.isOver"
+							@click="clickYinDao(item.reference)">
+							{{item.reference ? item.reference.title : ''}}
+							<image class="tips-content-icon" src="/static/nav/yindao.png" mode=""></image>
+						</view>
 					</view>
 					<!-- <ua-markdown :source="mdvalue" /> -->
 					<view class="btnBox">
@@ -637,10 +641,10 @@
 									answerOptions || [];
 								this.msgList[this.msgList.length - 1].checkboxValue1 = [];
 								this.msgList[this.msgList.length - 1].radiovalue1 = "";
-								this.msgList[this.msgList.length - 1].reference = reference;
 							} else {
 								this.msgList[this.msgList.length - 1].options = answerOptions;
 							}
+							this.msgList[this.msgList.length - 1].reference = reference;
 							// this.msgList.forEach(item => {
 							// 	if (typeof item.reference === 'object' && item.reference.title && item
 							// 		.reference
@@ -665,7 +669,11 @@
 							// 	}
 							// })
 							clearInterval(timer);
-							this.msgList[this.msgList.length - 1].isOver = true
+							const lastData = this.msgList[this.msgList.length - 1]
+							if (typeof lastData.reference === 'object' && lastData.reference?.title && lastData
+								.reference?.content) {
+								this.msgList[this.msgList.length - 1].isOver = true
+							}
 						}
 					}, 50);
 				} else {
@@ -775,6 +783,19 @@
 		height: 100vh;
 		overflow: hidden;
 
+		.tips-content {
+			display: flex;
+			align-items: center;
+			padding: 0px 12px 7px 12px;
+			color: rgba(94, 111, 138, 1);
+
+			&-icon {
+				width: 16px;
+				height: 16px;
+				margin-left: 3px;
+			}
+		}
+
 		.knowledge {
 			width: 40rpx;
 			height: 40rpx;
diff --git a/pages/index/index-pers.vue b/pages/index/index-pers.vue
new file mode 100644
index 0000000..016897f
--- /dev/null
+++ b/pages/index/index-pers.vue
@@ -0,0 +1,650 @@
+<template>
+	<view class="index-pers">
+		<view class="index-pers-content">
+			<view class="index-pers-title font-family-TMB">
+				洞察隐患 智能守护
+			</view>
+			<view class="index-pers-desc font-family-SR">
+				科技之眼照亮安全之路
+			</view>
+			<view class="index-pers-pc index-pers-content" v-if="curLogin === 1">
+				<view class="left-content" @click="handleToTab('Investigated')">
+					<view class="left-content-label font-family-SM">
+						待排查
+					</view>
+					<view class="left-content-value font-family-ASB">
+						{{pageData.Investigated || 0}}
+					</view>
+					<view class="left-content-bg">
+
+					</view>
+				</view>
+				<view class="right-content">
+					<view class="right-content-item">
+						<view class="right-content-item-label font-family-SM">
+							超期
+						</view>
+						<view class="right-content-item-value cq-color font-family-ASB">
+							{{pageData.PcDelay || 0}}
+						</view>
+					</view>
+					<view class="right-content-item">
+						<view class="right-content-item-label font-family-SM">
+							临期
+						</view>
+						<view class="right-content-item-value lq-color font-family-ASB">
+							{{pageData.PcDying || 0}}
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="index-pers-zl index-pers-content" v-if="curLogin === 2">
+				<view class="left-content" @click="handleToTab('Government')">
+					<view class="left-content-label font-family-SM">
+						待治理
+					</view>
+					<view class="left-content-value font-family-ASB">
+						{{pageData.Government || 0}}
+					</view>
+					<view class="left-content-bg">
+
+					</view>
+				</view>
+				<view class="right-content">
+					<view class="right-content-item">
+						<view class="right-content-item-label font-family-SM">
+							超期
+						</view>
+						<view class="right-content-item-value cq-color font-family-ASB">
+							{{pageData.ZlDelay || 0}}
+						</view>
+					</view>
+					<view class="right-content-item">
+						<view class="right-content-item-label font-family-SM">
+							临期
+						</view>
+						<view class="right-content-item-value lq-color font-family-ASB">
+							{{pageData.ZlDying || 0}}
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="index-pers-pczl index-pers-content" v-if="curLogin === 3">
+				<view class="left-content basic-content" @click="handleToTab('Investigated')">
+					<view class="left-content-bg basic-content-bg">
+
+					</view>
+					<view class="basic-content-top">
+						<view class="basic-content-top-label font-family-SM">
+							待排查
+						</view>
+						<view class="basic-content-top-value font-family-ASB">
+							{{pageData.Investigated || 0}}
+						</view>
+					</view>
+					<view class="basic-content-bottom">
+						<view class="basic-content-bottom-item">
+							<view class="basic-content-bottom-item-label font-family-SM">
+								超期
+							</view>
+							<view class="basic-content-bottom-item-value cq-color font-family-ASB">
+								{{pageData.PcDelay || 0}}
+							</view>
+						</view>
+						<view class="basic-content-bottom-item">
+							<view class="basic-content-bottom-item-label font-family-SM">
+								临期
+							</view>
+							<view class="basic-content-bottom-item-value lq-color font-family-ASB">
+								{{pageData.PcDying || 0}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="right-content basic-content" @click="handleToTab('Government')">
+					<view class="right-content-bg basic-content-bg">
+
+					</view>
+					<view class="basic-content-top">
+						<view class="basic-content-top-label font-family-SM">
+							待治理
+						</view>
+						<view class="basic-content-top-value font-family-ASB">
+							{{pageData.Government || 0}}
+						</view>
+					</view>
+					<view class="basic-content-bottom">
+						<view class="basic-content-bottom-item">
+							<view class="basic-content-bottom-item-label font-family-SM">
+								超期
+							</view>
+							<view class="basic-content-bottom-item-value cq-color font-family-ASB">
+								{{pageData.ZlDelay || 0}}
+							</view>
+						</view>
+						<view class="basic-content-bottom-item">
+							<view class="basic-content-bottom-item-label font-family-SM">
+								临期
+							</view>
+							<view class="basic-content-bottom-item-value lq-color font-family-ASB">
+								{{pageData.ZlDying || 0}}
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="index-pers-sp index-pers-content" v-if="curLogin === 4">
+				<view class="left-content" @click="handleToTab('Approve')">
+					<view class="left-content-bg">
+
+					</view>
+					<view class="left-content-label font-family-SM">
+						待审批
+					</view>
+					<view class="left-content-value font-family-ASB">
+						{{pageData.Approve || 0}}
+					</view>
+				</view>
+				<view class="right-content">
+					<view class="right-content-item" @click="handleToTab('Investigated')">
+						<view class="right-content-item-top">
+							<view class="right-content-item-top-label font-family-SM">
+								待排查
+							</view>
+							<view class="right-content-item-top-value font-family-ASB">
+								{{pageData.Investigated || 0}}
+							</view>
+						</view>
+						<view class="right-content-item-bottom">
+							<view class="right-content-item-bottom-item">
+								<view class="right-content-item-bottom-item-label font-family-SM">
+									超期
+								</view>
+								<view class="right-content-item-bottom-item-value cq-color font-family-ASB">
+									{{pageData.PcDelay || 0}}
+								</view>
+							</view>
+							<view class="right-content-item-bottom-item">
+								<view class="right-content-item-bottom-item-label font-family-SM">
+									临期
+								</view>
+								<view class="right-content-item-bottom-item-value lq-color font-family-ASB">
+									{{pageData.PcDying || 0}}
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="right-content-item" @click="handleToTab('Government')">
+						<view class="right-content-item-top">
+							<view class="right-content-item-top-label font-family-SM">
+								待治理
+							</view>
+							<view class="right-content-item-top-value font-family-ASB">
+								{{pageData.Government || 0}}
+							</view>
+						</view>
+						<view class="right-content-item-bottom">
+							<view class="right-content-item-bottom-item">
+								<view class="right-content-item-bottom-item-label font-family-SM">
+									超期
+								</view>
+								<view class="right-content-item-bottom-item-value cq-color font-family-ASB">
+									{{pageData.ZlDelay || 0}}
+								</view>
+							</view>
+							<view class="right-content-item-bottom-item">
+								<view class="right-content-item-bottom-item-label font-family-SM">
+									临期
+								</view>
+								<view class="right-content-item-bottom-item-value lq-color font-family-ASB">
+									{{pageData.ZlDying || 0}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+
+
+			<view class="con" @click="konw">
+				<image class="bg" src="/static/know.png" />
+				<view class="con-box">
+					<text class="font-family-SM" style="color: #363F4D;font-weight: 500;">交通隐患排查知识库</text>
+					<view class="icon">
+						<uni-icons type="right" size="18" color="#fff" />
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'index-pers',
+		props: {
+
+		},
+		data() {
+			return {
+				pageData: []
+			}
+		},
+		computed: {
+			curLogin() {
+				const myRoles = this.$.getData('userInfo').role || []
+				if (myRoles.includes('领导')) {
+					return 4
+				}
+				if (myRoles.includes('排查人员') && myRoles.includes('治理人员')) {
+					return 3
+				}
+				if (myRoles.includes('治理人员')) {
+					return 2
+				}
+				if (myRoles.includes('排查人员')) {
+					return 1
+				}
+				return 0
+			}
+		},
+		created() {
+			const data = this.$.getData('token')
+			this.$request.globalRequest('/hiddenDanger/highDanger/getHighDangerStatusNum', {
+				nuserid: data
+			}, 'GET').then(res => {
+				if (res.code === 200) {
+					this.pageData = res.result.reduce((obj, item) => {
+						const {
+							status,
+							count = 0
+						} = item
+						obj[status] = count
+						return obj
+					}, {})
+				} else {
+					this.$.toast(res.message)
+				}
+			})
+		},
+		methods: {
+			konw() {
+				this.$.open('/pages/knowledge/index')
+			},
+			handleToTab(routeKey) {
+				console.log(routeKey)
+				if (routeKey === 'Investigated') {
+					uni.setStorageSync('MyPCtabIndex', 1)
+					this.$.openTab('/pages/investigation/index')
+				}
+				if (routeKey === 'Government') {
+					uni.setStorageSync('MyZLtabIndex', 1)
+					this.$.openTab('/pages/governance/index')
+				}
+				if (routeKey === 'Approve') {
+					uni.setStorageSync('MySPtabIndex', 1)
+					this.$.openTab('/pages/approve/index')
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.index-pers {
+		position: relative;
+		color: #fff;
+		padding: calc(var(--status-bar-height) + 40rpx) 20rpx 0rpx;
+
+		.cq-color {
+			color: rgba(204, 41, 54, 1);
+		}
+
+		.lq-color {
+			color: rgba(230, 138, 11, 1)
+		}
+
+		&::after {
+			content: '';
+			position: absolute;
+			height: 100%;
+			width: 100%;
+			left: 0;
+			top: 0;
+			z-index: 1;
+			background: url("../../static/home_bg.png") no-repeat;
+			background-size: 100% 100%;
+		}
+
+		&-content {
+			position: relative;
+			z-index: 2;
+		}
+
+		&-title {
+			// font-weight: bold;
+			font-size: 24px;
+			line-height: 28px;
+			letter-spacing: 2px;
+			text-shadow: 0px 4px 0px rgba(255, 255, 255, 0.16);
+			text-align: left;
+			font-style: normal;
+			text-transform: none;
+			color: #fff;
+		}
+
+		&-desc {
+			margin-top: 20rpx;
+			letter-spacing: 11rpx;
+			color: #fff;
+		}
+
+		&-content {
+			margin-top: 20px;
+			font-weight: 500;
+			color: rgba(54, 63, 77, 1);
+		}
+
+		&-pc,
+		&-zl {
+			display: flex;
+			align-items: center;
+			height: 190rpx;
+
+			.left-content {
+				position: relative;
+				height: 100%;
+				width: 53%;
+				background: linear-gradient(180deg, #80CBFF 0%, #F0F5FA 100%);
+				border-radius: 9px 9px 9px 9px;
+
+				&-bg {
+					height: 160rpx;
+					width: 160rpx;
+					background: url("/static/index/pc.png") no-repeat;
+					background-size: 100% 100%;
+					position: absolute;
+					right: 15rpx;
+					top: 15rpx;
+				}
+
+				&-label {
+					font-size: 18px;
+					padding: 18px 0 0 15px;
+				}
+
+				&-value {
+					font-size: 26px;
+					padding: 3px 0 0 15px;
+				}
+			}
+
+			.right-content {
+				flex: 1;
+				margin-left: 12px;
+				height: 100%;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+
+
+				&-item {
+					height: 46%;
+					width: calc(100% - 40px);
+					padding: 0 20px;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					background: rgba(255, 255, 255, .3);
+					border-radius: 9px 9px 9px 9px;
+					backdrop-filter: blur(4px);
+
+					&-value {
+						font-size: 20px;
+					}
+				}
+			}
+		}
+
+
+		&-zl {
+			.left-content {
+				background: linear-gradient(180deg, #F0D9B4 0%, #F6F6F6 100%);
+
+				&-bg {
+					background: url("/static/index/zl.png") no-repeat;
+					background-size: 100% 100%;
+					width: 90px;
+				}
+			}
+		}
+
+		&-pczl {
+			display: flex;
+			align-items: center;
+			height: 280rpx;
+
+			.basic-content {
+				flex: 1;
+				position: relative;
+				height: 100%;
+				color: rgba(54, 63, 77, 1);
+
+				&-bg {
+					position: absolute;
+					top: 16rpx;
+					right: 0rpx;
+					width: 90px;
+					height: 90px;
+					z-index: 1;
+				}
+
+				&-top {
+					height: 54px;
+					padding: 18px 15px;
+
+					&-label {
+						font-size: 18px;
+					}
+
+					&-value {
+						font-size: 26px;
+						color: rgba(54, 63, 77, 1);
+					}
+				}
+
+				&-bottom {
+					height: 50px;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					padding: 0 15px;
+					background: rgba(255, 255, 255, 0.1);
+					border-radius: 9px 9px 9px 9px;
+					position: relative;
+					z-index: 2;
+					backdrop-filter: blur(4px);
+
+					&-item {
+						display: flex;
+						align-items: center;
+
+						&-label {
+							margin-right: 5px;
+						}
+
+						&-value {
+							font-size: 18px;
+						}
+					}
+				}
+			}
+
+			.left-content {
+				background: linear-gradient(180deg, #80CBFF 0%, #EBF1F7 100%);
+				border-radius: 9px 9px 9px 9px;
+				margin-right: 12px;
+
+				&-bg {
+					background: url("/static/index/pc.png") no-repeat;
+					background-size: 100% 100%;
+				}
+			}
+
+			.right-content {
+				background: linear-gradient(180deg, #F0D9B4 0%, #F6F6F6 100%);
+				border-radius: 9px 9px 9px 9px;
+
+				&-bg {
+					background: url("/static/index/zl.png") no-repeat;
+					background-size: 100% 100%;
+					width: 100px;
+				}
+			}
+		}
+
+		&-sp {
+			color: rgba(54, 63, 77, 1);
+			height: 370rpx;
+			display: flex;
+			align-items: center;
+
+			.left-content {
+				position: relative;
+				height: 100%;
+				width: 42%;
+				background: linear-gradient(180deg, #F0D9B4 0%, #FFFEFC 100%);
+				border-radius: 9px 9px 9px 9px;
+
+				&-label {
+					padding: 18px 0 0 15px;
+				}
+
+				&-value {
+					padding: 0 0 0 15px;
+					font-size: 30px;
+				}
+
+				&-bg {
+					width: 160px;
+					height: 95px;
+					position: absolute;
+					right: 0;
+					bottom: 0;
+					background: url('/static/index/sp.png') no-repeat;
+					background-size: 100% 100%;
+				}
+			}
+
+			.right-content {
+				margin-left: 12px;
+				flex: 1;
+				height: 100%;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+
+				&-item {
+					height: 47%;
+					width: 100%;
+					background: rgba(255, 255, 255, .4);
+					border-radius: 9px 9px 9px 9px;
+					backdrop-filter: blur(4px);
+					display: flex;
+					flex-direction: column;
+
+					&-top {
+						height: 45px;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						padding: 0 15px;
+						width: calc(100% - 30px);
+
+						&-value {
+							font-size: 20px;
+						}
+					}
+
+					&-bottom {
+						flex: 1;
+						height: 35px;
+						background-color: rgba(255, 255, 255, 0.2);
+						backdrop-filter: blur(4px);
+						border-radius: 0px 0px 9px 9px;
+						padding: 0 15px;
+						width: calc(100% - 30px);
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+
+						&-item {
+							display: flex;
+							align-items: center;
+
+							&-label {
+								margin-right: 14rpx;
+							}
+
+							&-value {
+								font-size: 18px;
+							}
+						}
+
+					}
+				}
+			}
+		}
+
+
+		.con {
+			width: 100%;
+			height: 240rpx;
+			padding: 16rpx 0;
+			box-sizing: border-box;
+			position: relative;
+			z-index: 999;
+			background-size: 100% 100%;
+			display: flex;
+			align-items: center;
+			background: transparent;
+
+			.bg {
+				position: absolute;
+				top: 0;
+				right: 0;
+				width: 100%;
+				height: 100%;
+			}
+
+			.con-box {
+				width: 100%;
+				padding: 0 50rpx;
+				box-sizing: border-box;
+				height: 80%;
+				background: linear-gradient(to right, #8FB4F2 0%, #BCD2F2 100%);
+				z-index: -1;
+				position: relative;
+				border-radius: 8rpx;
+				display: flex;
+				align-items: center;
+
+				.icon {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					background: rgba(255, 255, 255, 0.3);
+					color: #fff;
+					border-radius: 10%;
+					width: 40rpx;
+					height: 40rpx;
+					margin-left: 20rpx;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d96bc41..a89749f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,60 +1,36 @@
 <template>
 	<view id="page">
-		<view style="
-		position: sticky;
-		top: 0;
-		z-index: 999;">
-			<view class="header Box">
-				<view class="title">洞察隐患 智能守护</view>
-				<!-- <view class="title">排查助手</view> -->
-				<view class="desc">科技之眼照亮安全之路</view>
-				<view class="total Flex Flex_C_S-B PositionR">
-					<view class="left Flex">
-						<view class="info" @click="jump(1)">
-							<view class="name">待办</view>
-							<view class="number">{{ totalData.UnderInvestigation }}</view>
-						</view>
-						<image style="width: 160rpx" mode="widthFix" :src="$.imgSrc + '/need.png'" class="need"></image>
-						<view class="bottom PositionA Flex Flex_C_S-A TextCenter blur">
-							<view class="item Flex_C_S-Center">
-								<text>超期</text>
-								<text style="margin-left: 10rpx;color: #CC2936;">{{ totalData.Delay }}</text>
-							</view>
-							<view class="item Flex_C_S-Center">
-								<text>临期</text>
-								<text style="margin-left: 10rpx;color: #E68A0B;">{{ totalData.Dying }}</text>
+		<indexPers />
+		<view class="index-pc-cur Box" v-if="!!curPcList.length">
+			<view class="index-title">
+				排查中
+			</view>
+			<view class="Content MarginAuto BorderBox" style="padding-bottom: 2px;">
+				<view class="List Width100 BorderBox">
+					<view class="Unit FontBold BorderBox Width100 MarginT_30rpx BG_FFFFFF" v-for="item in list"
+						:key='item.id' @click='handleClick(item)'>
+						<!-- <image class="imgleft" :src="item.imgurl || '/static/logo.png'" mode="widthFix"></image> -->
+						<view class="right">
+							<view class="title">{{ item.name }}</view>
+							<view class="type">
+								<text>{{ item.enumname || '--' }}</text>
+								<text>{{ item.deadlineStatus || '--' }}</text>
 							</view>
 						</view>
-					</view>
-					<view class="right">
-						<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="number">{{ totalData.MonthReport }}</text>
+						<view class="trapezoidal" v-if="item.deadlineType == 1">
+							超期
 						</view>
-						<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>
-							<text class="number">{{ totalData.InGovernance }}</text>
+						<view class="trapezoidal lin" v-if="item.deadlineType == 2">
+							临期
 						</view>
 					</view>
 				</view>
 			</view>
-			<view class="con" @click="konw">
-				<image class="bg" src="/static/know.png" />
-				<view class="con-box">
-					<text
-						style="font-family: Source Han Sans CN, Source Han Sans CN;color: #363F4D;font-weight: 500;">交通隐患排查知识库</text>
-					<view class="icon">
-						<uni-icons type="right" size="18" color="#fff" />
-					</view>
-				</view>
-			</view>
 		</view>
 		<view class="Width100 Box BorderBox">
-			<view class="list_title">待办任务</view>
+			<view class="index-title">
+				待办任务
+			</view>
 			<view class="Content MarginAuto BorderBox">
 				<no-data v-if="isEmpty" />
 				<view v-else class="List Width100 BorderBox">
@@ -68,12 +44,14 @@
 								<text>{{ item.deadlineStatus || '--' }}</text>
 							</view>
 						</view>
-						<view class="trapezoidal" v-if="item.deadlineType == 1">
-							超期
-						</view>
-						<view class="trapezoidal lin" v-if="item.deadlineType == 2">
-							临期
-						</view>
+						<template v-if="listStatus !== '60'">
+							<view class="trapezoidal" v-if="item.deadlineType == 1">
+								超期
+							</view>
+							<view class="trapezoidal lin" v-if="item.deadlineType == 2">
+								临期
+							</view>
+						</template>
 					</view>
 				</view>
 				<u-loadmore :status="loadmorestatus" v-show="!isEmpty" />
@@ -87,11 +65,13 @@
 	import tabFun from '@/libs/function/tabbar.js'
 	import NoData from "../../components/no-data.vue";
 	import Tabbar from "../../components/tabbar.vue";
+	import indexPers from './index-pers.vue';
 	export default {
 		// 组件
 		components: {
 			NoData,
-			Tabbar
+			Tabbar,
+			indexPers
 		},
 		data() {
 			return {
@@ -99,18 +79,10 @@
 				// 公用的js
 				bgUrl1: '', // 登录信息背景图
 				list: [],
+				curPcList: [],
 				isEmpty: false,
 				isMore: true,
 				page: 1,
-				tab: 1,
-				totalData: {
-					UnderInvestigation: 0,
-					InGovernance: 0,
-					Finished: 0,
-					MonthReport: 0,
-					Dying: 0,
-					Delay: 0,
-				},
 				loadmorestatus: 'loading',
 				tabbarShow: true
 			}
@@ -122,11 +94,11 @@
 		},
 		onShow(e) {
 			uni.hideTabBar() //隐藏官方的tabBar
-			this.getData()
 			this.isMore = true
 			this.list = []
 			this.page = 1
 			this.getList()
+			this.getCurPcList()
 			// tabFun.tabbar()
 			// this.tabbarShow = false
 			// this.$nextTick(() => {
@@ -134,28 +106,33 @@
 			// })
 		},
 		// 计算属性
-		computed: {},
+		computed: {
+			listStatus() {
+				const myRoles = this.$.getData('userInfo').role || []
+				if (myRoles.includes('领导')) {
+					return '60'
+				}
+				if (myRoles.includes('排查人员') && myRoles.includes('治理人员')) {
+					return "10"
+				}
+				if (myRoles.includes('治理人员')) {
+					return "20"
+				}
+				if (myRoles.includes('排查人员')) {
+					return "10"
+				}
+				return "10"
+			}
+		},
 		// 方法
 		methods: {
-			getData() {
-				const data = this.$.getData('token')
-				this.$request.globalRequest('/hiddenDanger/highDanger/getHighDangerStatusNum', {
-					nuserid: data
-				}, 'GET').then(res => {
-					if (res.code === 200) {
-						res.result.forEach(item => {
-							this.totalData[item.status] = item.count
-						})
-					} else {
-						this.$.toast(res.message)
-					}
-				})
+			getCurPcList() {
+
 			},
 			getList() {
 				let datas = {
 					nuserid: this.$.getData('token'),
-					status: '10',
-					// approve: '1'
+					status: this.listStatus
 				}
 				this.loadmorestatus = 'loading'
 				this.$request.globalRequest(
@@ -181,38 +158,35 @@
 					})
 			},
 			handleClick(row) {
-				if (row.pcType == 2) {
-					this.$.open("/pages/investigation/task" + "?id=" + row.businessId + '&sectionId=' + row.sectionCode +
+				if (this.listStatus === '60') {
+					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 + '&sectionType=' + (row.ifCross || '1'));
-				} 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 + '&enumname=' + row.enumname + '&deadlineStatus=' + row.deadlineStatus +
-						'&sectionType=' + (row.ifCross || '1'))
+						.sectionCode + '&sectionType=' + (row.ifCross || '1') + '&pageName=' + '审批' +
+						'&approveStatus=' +
+						row.status + '&isSP=1');
 				}
-			},
-			konw() {
-				this.$.open('/pages/knowledge/index')
-			},
-			// 跳转页面
-			skipPage(even) {
-				// this.$.open(even)
-			},
-			jump(v, type) {
-				if (v == 1) {
-					this.$.setData('pageStatus', 1)
-					this.$.setData('pageType', 1)
+				if (this.listStatus === '20') {
+					this.$.open(`/pages/governance/governance-form?id=${row.businessId}`)
 				}
-				if (v == 2) {
-					this.$.setData('pageStatus', 3)
-					this.$.setData('pageType', type)
+				if (this.listStatus === '10') {
+					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 + '&sectionType=' + (row.ifCross || '1'));
+					} 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 + '&enumname=' + row.enumname + '&deadlineStatus=' + row.deadlineStatus +
+							'&sectionType=' + (row.ifCross || '1') +
+							'&deadlineType=' + row.deadlineType)
+					}
 				}
-
-				this.$.openTab('/pages/investigation/index')
-			}
+			},
 		},
 		onReady() {
 			// this.$tabFun.tabbar()
@@ -223,13 +197,6 @@
 		// 页面卸载
 		onUnload() {
 
-		},
-		// 触发下拉刷新
-		onPullDownRefresh() {
-			// 延迟关闭刷新动画
-			setTimeout(() => {
-				uni.stopPullDownRefresh();
-			}, 1500);
 		},
 		// 页面上拉触底事件的处理函数
 		onReachBottom() {
@@ -245,7 +212,18 @@
 </style>
 <style lang="scss" scoped>
 	page {
-		background: #F6F8FA;
+		background: #F0F2F7;
+	}
+
+	.index-title {
+		background: linear-gradient(180deg, #FFFFFF 0%, rgba(255, 255, 255, 0) 100%);
+		border-radius: 24rpx 24rpx 0px 0px;
+		padding: 0 20px;
+		height: 44px;
+		line-height: 44px;
+		font-weight: bold;
+		font-size: 18px;
+		font-family: Source Han Sans CN, Source Han Sans CN;
 	}
 
 	.header {
@@ -400,7 +378,7 @@
 		// border-radius: 24px 24px 0px 0px;
 		padding: 20rpx 30rpx;
 		font-family: Source Han Sans CN, Source Han Sans CN;
-		position: fixed;
+		// position: fixed;
 		/* top: 418px; */
 		top: calc(var(--status-bar-height) + 792rpx);
 		z-index: 99;
@@ -412,7 +390,6 @@
 		.Content {
 			width: calc(100% - 48rpx);
 			padding-bottom: 100rpx;
-			margin-top: 100rpx;
 		}
 
 		.Unit {
@@ -459,50 +436,4 @@
 			}
 		}
 	}
-
-	.con {
-		width: 100%;
-		height: 240rpx;
-		padding: 30rpx;
-		box-sizing: border-box;
-		position: relative;
-		z-index: 999;
-		background-size: 100% 100%;
-		display: flex;
-		align-items: center;
-		background: #f8fafb;
-
-		.bg {
-			position: absolute;
-			top: 0;
-			right: 0;
-			width: 100%;
-			height: 100%;
-		}
-
-		.con-box {
-			width: 100%;
-			padding: 0 20rpx;
-			box-sizing: border-box;
-			height: 80%;
-			background: linear-gradient(to right, #8FB4F2 0%, #BCD2F2 100%);
-			z-index: -1;
-			position: relative;
-			border-radius: 8rpx;
-			display: flex;
-			align-items: center;
-
-			.icon {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				background: rgba(255, 255, 255, 0.3);
-				color: #fff;
-				border-radius: 10%;
-				width: 40rpx;
-				height: 40rpx;
-				margin-left: 20rpx;
-			}
-		}
-	}
 </style>
\ No newline at end of file
diff --git a/pages/investigation/index.vue b/pages/investigation/index.vue
index 4f0d5ed..e62d445 100644
--- a/pages/investigation/index.vue
+++ b/pages/investigation/index.vue
@@ -11,43 +11,30 @@
 					</template>
 				</top-title>
 			</view>
-			<view class="query-form" :class="tab==3?'query-form2':''">
+			<view class="query-form" :class="approve==2?'query-form2':''">
 				<view class="search-box">
-					<u-search placeholder="请输入名称" v-model="search" actionText="" :showAction="false"
-						@search="searchData" @clear="searchData"></u-search>
+					<u-search placeholder="请输入名称" v-model="searchValue" actionText="" :showAction="false"
+						@search="handleSearch" @clear="handleSearch"></u-search>
 				</view>
 				<view class="tab">
-
-					<view class="tab-item" :class="tab === 1 ? 'active' : ''" @click='handleTabClick(1)'>
-						<text>待办</text>
-						<text v-if="showNumber" class="number">{{ totalData.UnderInvestigation }}</text>
-					</view>
-					<!-- <view class="tab-item" :class="tab === 2 ? 'active' : ''" @click='handleTabClick(2)'>
-						<text>正在办理</text>
-						<text class="number">{{ totalData.InGovernance }}</text>
-					</view> -->
-					<view class="tab-item" :class="tab === 3 ? 'active' : ''" @click='handleTabClick(3,true)'>
-						<text>已完成</text>
-						<text class="number">{{ totalData.InGovernance }}</text>
+					<view v-for="tabItem in tabList" :key="tabItem.active" :class="{
+							'tab-item': true,
+							'active': tabItem.active == approve
+						}" @click="handleTabChange(tabItem.active)">
+						<text>{{tabItem.name}}</text>
+						<text class="number">{{tabItem.number}}</text>
 					</view>
 				</view>
-				<view class="type-box" v-show="tab==3">
-					<view class="type-item" :class="queryType == 1 ? 'type-active' : ''" @click="queryTypeChange('1')">
-						全部
-
-					</view>
-					<view class="type-item" :class="queryType == 2 ? 'type-active' : ''" @click="queryTypeChange('2')">
-						人工上报
-
-					</view>
-					<view class="type-item" :class="queryType == 3 ? 'type-active' : ''" @click="queryTypeChange('3')">
-						系统下发
-
+				<view class="type-box" v-show="approve==2">
+					<view v-for="item in tabTypeList" :key="item.active" :class="{
+						'type-item': true,
+						'type-active': classification == item.active
+					}" @click="queryTypeChange(item.active)">
+						{{item.name}}
 					</view>
 				</view>
-				<dateSearch :startDate.sync="startDate" :endDate.sync="endDate" @handleSearch="searchData"
-					v-if="tab == 3" />
-
+				<dateSearch :startDate.sync="startDate" :endDate.sync="endDate" @handleSearch="handleSearch"
+					v-if="approve == 2" />
 			</view>
 			<view class="Content MarginAuto BorderBox">
 				<no-data v-if="isEmpty" />
@@ -61,13 +48,13 @@
 								<!-- <text v-if="tab === 1">排查</text>
 								<text v-if="tab === 3">治理</text> -->
 								<text>{{ item.enumname || '--' }}</text>
-								<text v-show="tab!=3">{{ item.deadlineStatus || '--' }}</text>
+								<text v-show="approve!=2">{{ item.deadlineStatus || '--' }}</text>
 							</view>
 						</view>
-						<view class="trapezoidal" v-if="item.deadlineType == 1&&tab!=3">
+						<view class="trapezoidal" v-if="item.deadlineType == 1&&approve!=2">
 							超期
 						</view>
-						<view class="trapezoidal lin" v-if="item.deadlineType == 2&&tab!=3">
+						<view class="trapezoidal lin" v-if="item.deadlineType == 2&&approve!=2">
 							临期
 						</view>
 					</view>
@@ -92,210 +79,163 @@
 			NoData,
 			TopTitle,
 			Tabbar,
-			dateSearch
+			dateSearch,
 		},
 		data() {
 			return {
-				loadmorestatus: 'loading',
-				showNumber: true,
-				// 公用的js
-				bgUrl1: '', // 登录信息背景图
 				list: [],
-				list2: [],
-				startDate: '',
-				endDate: '',
 				isEmpty: false,
 				isMore: true,
-				page: 1,
-				tab: 1,
-				totalData: {
-					UnderInvestigation: 0,
-					InGovernance: 0,
-					Finished: 0,
-					Unconfirmed: 0,
-				},
-				status: '1',
-				search: '',
+				pageNum: 1,
+				pageSize: 10,
+				searchValue: '',
+				classification: '1',
+				approve: '1',
+				status: '10',
 				tabbarShow: true,
-				queryType: '1',
-				pageStatus: '',
-				totalResultList: []
+				startDate: '',
+				endDate: '',
+				tabList: [{
+						name: '待办',
+						active: '1',
+						number: 0
+					},
+					{
+						name: '已完成',
+						active: '2',
+						number: 0
+					},
+				],
+				tabTypeList: [{
+						name: '全部',
+						active: '1'
+					},
+					{
+						name: '人工上报',
+						active: '2'
+					},
+					{
+						name: '系统下发',
+						active: '3'
+					},
+				],
+				loadmorestatus: 'loading'
 			}
 		},
 		// 页面加载
 		onLoad(e) {
 			// this.getList()
+
 		},
 
 		onShow() {
-			// tabFun.tabbar()
-			this.getData()
-			let pageStatus = this.$.getData('pageStatus')
-			this.queryType = this.$.getData('pageType')
-			this.pageStatus = pageStatus
-			console.log(this.$.getData('pageType'))
-
-			if (pageStatus == 1) {
-				this.handleTabClick(1)
-				this.$.setData('pageStatus', '0')
-			} else if (pageStatus == 3) {
-				this.handleTabClick(3)
-				this.$.setData('pageStatus', '0')
-			} else {
-				this.handleTabClick(1)
+			const approve = uni.getStorageSync('MyPCtabIndex')
+			if (approve) {
+				this.approve = Number(approve)
+				uni.setStorageSync('MyPCtabIndex', '')
 			}
 			uni.hideTabBar() //隐藏官方的tabBar
-			// this.tabbarShow = false
-			// this.$nextTick(() => {
-			// 	this.tabbarShow = true
-			// })
+			this.pageNum = 1
+			this.list = [];
+			this.getList()
 		},
 		// 计算属性
 		computed: {
-			$() {
-				return $
-			}
+
 		},
 		// 方法
 		methods: {
-			queryTypeChange(e) {
-				this.queryType = e
-				this.page = 1;
-				this.$.setData('pageType', e)
-				this.list = [];
-				this.isMore = true
+			handleSearch() {
+				this.pageNum = 1
+				this.list = []
 				this.getList()
 			},
-			handleTabClick(tab, falg = false) {
-				this.tab = tab;
-				this.page = 1;
-				// this.search=''
-				this.list = [];
-				this.list2 = [];
-				this.isMore = true
-				switch (tab) {
-					case 1:
-						this.status = '1';
-						this.queryType = null
-						break;
-						// case 2:
-						// 	this.status = '20';
-						// 	break;
-					case 3:
-						if (falg) {
-							this.queryType = '1'
-						}
-
-						this.status = '2';
-						break;
+			queryTypeChange(tabKey) {
+				if (this.classification != tabKey) {
+					this.classification = tabKey
+					this.pageNum = 1
+					this.list = []
+					this.getList()
 				}
-				this.totalResultList.forEach(item => {
-					this.totalData[item.status] = item.count
-				})
-				this.getList()
 			},
-
-			getData() {
-				this.$request.globalRequest('/hiddenDanger/highDanger/getHighDangerStatusNum', {
-					nuserid: this.$.getData('token')
-				}, 'GET').then(res => {
-					if (res.code === 200) {
-						// console.log(res.result)
-						this.totalResultList = res.result
-						res.result.forEach(item => {
-							this.totalData[item.status] = item.count
-						})
-					} else {
-						this.$.toast(res.message)
-					}
-				})
-			},
-			searchData() {
-				this.page = 1;
-				this.list = []
-				this.getList()
-				this.getNum1()
-				this.getNum2()
-			},
-			getNum1() {
-				console.log('UnderInvestigation')
-				let datas = {
-					nuserid: this.$.getData('token'),
-					status: '10',
-
+			handleTabChange(tabKey) {
+				if (this.approve != tabKey) {
+					this.approve = tabKey
+					this.pageNum = 1
+					this.list = []
+					this.getList()
 				}
-				let query = 1 == 2 ?
-					`pageNum=${this.page}&pageSize=${10}&search=${this.search}&approve=${1}&classification=${this.queryType}&startTime=${this.startDate}&endTime=${this.endDate}` :
-					`pageNum=${this.page}&pageSize=${10}&search=${this.search}&approve=${1}`
-				this.$request.globalRequest(
-						`/hiddenDanger/highDanger/getHigDangerDealt?${query}`,
-						datas, 'POST')
-					.then(res => {
-						this.$set(this.totalData, 'UnderInvestigation', res.result.total)
-					}).catch((err) => {})
 			},
-			getNum2() {
-				console.log('InGovernance')
-				let datas = {
-					nuserid: this.$.getData('token'),
-					status: '10',
-
+			getQueryStr(query) {
+				let myQuery = {
+					...query
+				}
+				if (myQuery.approve == 1) {
+					delete myQuery.classification
 				}
-				let query = 2 == 2 ?
-					`pageNum=${this.page}&pageSize=${10}&search=${this.search}&approve=${2}&classification=${this.queryType?this.queryType:1}&startTime=${this.startDate}&endTime=${this.endDate}` :
-					`pageNum=${this.page}&pageSize=${10}&search=${this.search}&approve=${2}`
-				this.$request.globalRequest(
-						`/hiddenDanger/highDanger/getHigDangerDealt?${query}`,
-						datas, 'POST')
-					.then(res => {
-						this.$set(this.totalData, 'InGovernance', res.result.total)
-					}).catch((err) => {})
+				if (myQuery.approve == 2) {
+					myQuery.startTime = this.startDate
+					myQuery.endTime = this.endDate
+				}
+				return Object.entries(myQuery).reduce((str, keyValue, index, self) => {
+					const [key, value] = keyValue
+					str += `${key}=${value}${index !== self.length - 1 ? '&' : ''}`
+					return str
+				}, '')
 			},
 			getList() {
-				let datas = {
+				const data = {
 					nuserid: this.$.getData('token'),
-					status: '10',
-
+					status: this.status
 				}
+				const queryStr = this.getQueryStr({
+					pageNum: this.pageNum,
+					pageSize: this.pageSize,
+					search: this.searchValue,
+					classification: this.classification,
+					approve: this.approve,
+				})
 				this.loadmorestatus = 'loading'
-				let query = this.status == 2 ?
-					`pageNum=${this.page}&pageSize=${10}&search=${this.search}&approve=${this.status}&classification=${this.queryType}&startTime=${this.startDate}&endTime=${this.endDate}` :
-					`pageNum=${this.page}&pageSize=${10}&search=${this.search}&approve=${this.status}`
-				this.$request.globalRequest(
-						`/hiddenDanger/highDanger/getHigDangerDealt?${query}`,
-						datas, 'POST')
-					.then(res => {
-						this.loadmorestatus = 'loadmore'
-						uni.stopPullDownRefresh();
-						if (res.code === 200) {
-							if (res.result.total === 0) {
-								this.isEmpty = true;
-							} else {
-								this.isEmpty = false;
-								this.list.push(...res.result.list)
-							}
-							if (this.list.length >= res.result.total) {
-								this.loadmorestatus = 'nomore'
-								this.isMore = false
-							}
+				this.isMore = true
+				this.$request.globalRequest(`/hiddenDanger/highDanger/getHigDangerDealt?${queryStr}`, data, 'post').then((
+					res) => {
+					this.loadmorestatus = 'loadmore'
+					uni.stopPullDownRefresh();
+					this.$set(this.tabList[this.approve - 1], 'number', res.result.total)
+					if (res.code === 200) {
+						if (res.result.total === 0) {
+							this.isEmpty = true;
 						} else {
-							this.$.toast(res.message)
-						}
-						console.log(this.totalData.UnderInvestigation, this.totalData.InGovernance)
-						if (this.status == 1) {
-							this.$set(this.totalData, 'UnderInvestigation', res.result.total)
+							this.isEmpty = false;
+							this.list.push(...res.result.list)
 						}
-						if (this.status == 2) {
-							this.$set(this.totalData, 'InGovernance', res.result.total)
+						if (this.list.length >= res.result.total) {
+							this.loadmorestatus = 'nomore'
+							this.isMore = false
 						}
-					}).catch((err) => {
-						this.loadmorestatus = 'nomore'
-						uni.stopPullDownRefresh();
+						console.log(res)
+					} else {
+						this.$.toast(res.message)
+					}
+				}).catch((err) => {
+					this.loadmorestatus = 'nomore'
+					uni.stopPullDownRefresh();
+				})
+				if (this.pageNum == 1) {
+					this.$request.globalRequest(`/hiddenDanger/highDanger/getHigDangerDealt?${this.getQueryStr({
+						pageNum: this.pageNum,
+						pageSize: 1,
+						search: this.searchValue,
+						classification: this.classification,
+						approve: this.approve == 1 ? 2 : 1,
+					})}`, data, 'post').then(res => {
+						this.$set(this.tabList[this.approve == 1 ? 1 : 0], 'number', res.result.total)
 					})
+				}
+
 			},
 			handleClick(row) {
-				console.log(row)
-				if (this.tab === 1) {
+				if (this.approve == 1) {
 					if (row.pcType == 2) {
 						this.$.open("/pages/investigation/task" + "?id=" + row.businessId + '&sectionId=' + row
 							.sectionCode +
@@ -307,9 +247,10 @@
 							'&operator=' + row.operator +
 							'&deptId=' + row.handleDept +
 							'&pcType=' + row.pcType +
-							'&type=' + (this.tab == 1 ? 'edit' : 'view') + '&sectionName=' + row.sectionName +
+							'&type=' + (this.approve == 1 ? 'edit' : 'view') + '&sectionName=' + row.sectionName +
 							'&sectionCode=' + row.sectionCode + '&taskName=' + row.name + '&enumname=' + row.enumname +
-							'&deadlineStatus=' + row.deadlineStatus + '&sectionType=' + (row.ifCross || '1'))
+							'&deadlineStatus=' + row.deadlineStatus + '&sectionType=' + (row.ifCross || '1') +
+							'&deadlineType=' + row.deadlineType)
 						// this.$.open('/pages/map/index?businessId=' + row.businessId)
 					}
 
@@ -336,9 +277,8 @@
 		},
 		// 触发下拉刷新
 		onPullDownRefresh() {
-			this.page = 1;
+			this.pageNum = 1
 			this.list = [];
-			this.isMore = true
 			this.getList()
 			// 延迟关闭刷新动画
 			// setTimeout(() => {
@@ -348,7 +288,7 @@
 		// 页面上拉触底事件的处理函数
 		onReachBottom() {
 			if (this.isMore) {
-				this.page++
+				this.pageNum++
 				this.getList()
 			}
 		},
@@ -525,7 +465,7 @@
 
 				.title {
 					font-size: 16px;
-					width: 380rpx;
+					width: 100%;
 					min-height: 60rpx;
 					overflow: hidden;
 					text-overflow: ellipsis;
diff --git a/pages/logIn/logIn.vue b/pages/logIn/logIn.vue
index 93becf0..a2ed8da 100644
--- a/pages/logIn/logIn.vue
+++ b/pages/logIn/logIn.vue
@@ -29,7 +29,8 @@
 						<!--              <text class="InlineBlock FontS_34rpx Color_1A1F39 FontBold">+86</text>-->
 						<!--            </view>-->
 						<view class="img-box">
-							<image :src="$.imgSrc + '/scimg/login_user.png'" mode="aspectFit" class="input_left_icon input_icon"></image>
+							<image :src="$.imgSrc + '/scimg/login_user.png'" mode="aspectFit"
+								class="input_left_icon input_icon"></image>
 						</view>
 						<input type="text" placeholder="请输入用户名" v-model="logInData.phone"
 							class="Height100 Input1 FloatL FontS_32rpx" />
@@ -47,14 +48,16 @@
 					</view>
 					<view class="Input">
 						<view class="img-box">
-							<image :src="$.imgSrc + '/scimg/login_password.png'" mode="aspectFit" class="input_left_icon input_icon"></image>
+							<image :src="$.imgSrc + '/scimg/login_password.png'" mode="aspectFit"
+								class="input_left_icon input_icon"></image>
 						</view>
 						<input v-show="!showPassword" type="password" v-model="logInData.password" placeholder="请输入您的密码"
 							class="Height100 Input1 FloatL FontS_32rpx" />
 						<input v-show="showPassword" type="text" v-model="logInData.password" placeholder="请输入您的密码"
 							class="Height100 Input1 FloatL FontS_32rpx" />
 						<view class="img-box">
-							<image :src="$.imgSrc + (!showPassword ? '/scimg/login_no.png' : '/scimg/login_yes.png')" mode="aspectFit" class="input_left_icon input_icon" @click="clickPasswordBtn"></image>
+							<image :src="$.imgSrc + (!showPassword ? '/scimg/login_no.png' : '/scimg/login_yes.png')"
+								mode="aspectFit" class="input_left_icon input_icon" @click="clickPasswordBtn"></image>
 						</view>
 						<view class="ClearB"></view>
 					</view>
@@ -271,7 +274,7 @@
 			}
 
 			.NavBox {
-				.logo-title{
+				.logo-title {
 					font-family: 'MFLiHei_Noncommercial-Regular';
 					font-size: 70rpx;
 					display: flex;
@@ -279,6 +282,7 @@
 					justify-content: center;
 					color: white;
 				}
+
 				.Unit {
 					margin-right: 110rpx;
 
@@ -316,26 +320,31 @@
 					border-radius: 8rpx;
 					margin-bottom: 48rpx;
 					background-color: rgba(225, 225, 225, 0.8);
-					box-shadow: 0px 4px 10px 1px rgba(0,0,0,0.1);
+					box-shadow: 0px 4px 10px 1px rgba(0, 0, 0, 0.1);
 					position: relative;
 					display: flex;
-					.img-box{
+
+					.img-box {
 						height: 110rpx;
 						width: 110rpx;
 						display: flex;
 						justify-content: center;
 						align-items: center;
-						.input_icon{
+
+						.input_icon {
 							width: 54rpx;
 							height: 54rpx;
 						}
-						.input_left_icon{
+
+						.input_left_icon {
 							position: absolute;
 						}
 					}
-					.input-placeholder{
+
+					.input-placeholder {
 						color: rgba(0, 0, 0, 0.4) !important;
 					}
+
 					.CodeBox {
 						text {
 							line-height: 110rpx;
@@ -378,13 +387,14 @@
 				margin-top: 96rpx;
 				height: 108rpx;
 				background: linear-gradient(0deg, #0064FF 0%, #2D99FD 100%);
-				box-shadow: 0px 4px 10px 1px rgba(0,0,0,0.1);
+				box-shadow: 0px 4px 10px 1px rgba(0, 0, 0, 0.1);
 				border-radius: 8rpx;
 				line-height: 108rpx;
 			}
 		}
 	}
-	.pic{
+
+	.pic {
 		position: absolute;
 		bottom: 0;
 		width: 100%;
diff --git a/pages/map/index.vue b/pages/map/index.vue
index af16fdb..be91aed 100644
--- a/pages/map/index.vue
+++ b/pages/map/index.vue
@@ -9,8 +9,8 @@
 			<cover-image src="../../static/map/3746.png" alt="" srcset="" />
 		</cover-view>
 		<view class="dialog dialog-one" v-if="pageType == 1">
-			<view class="status" v-if="pageType1Result.deadlineType == 1">超期</view>
-			<view class="status" v-if="pageType1Result.deadlineType == 2">延期</view>
+			<view class="status" v-if="deadlineType == 1">超期</view>
+			<view class="status" v-if="deadlineType == 2">临期</view>
 			<!-- <view class="status" v-if="pageType1Result.deadlineType == 3">正常</view> -->
 			<view class="top">
 				<!-- <image src="/static/logo.png" mode="" style="width: 120px; height: 90px" class="mimg"></image> -->
@@ -172,6 +172,7 @@
 				pageType1Result: {
 					deadlineType: 3,
 				},
+				deadlineType: null,
 				rname: "",
 				search: "",
 				name1: "",
@@ -202,13 +203,14 @@
 			this.name = options.taskName
 			this.sectionName = options.sectionName
 			this.type = options.type;
-			this.pageHeight = uni.getSystemInfoSync().windowHeight;
 			this.enumname = options.enumname
 			this.deadlineStatus = options.deadlineStatus
 			this.sectionType = options.sectionType
 			this.pageType = 1;
+			this.deadlineType = options.deadlineType
 			this.initData();
 			this.getSystemInfo()
+			this.pageHeight = uni.getSystemInfoSync().windowHeight;
 		},
 		onShow() {
 			if (this.pcTypes == 2) {
@@ -469,8 +471,7 @@
 									"&deptId=" +
 									this.deptId +
 									"&sectionType=" +
-									this.pointType +
-									'&sectionType=' + this.sectionType
+									this.sectionType
 								);
 							} else {
 								this.$.toast(res.message);
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 7311d8a..e583bae 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -53,7 +53,7 @@
 			number: 0,
 			pagePath: '/pages/investigation/index',
 			beforeFun: () => {
-				uni.setStorageSync('pageStatus', 3)
+				uni.setStorageSync('MyPCtabIndex', 2)
 			}
 		},
 		{
@@ -109,11 +109,16 @@
 				if (role.includes('领导')) {
 					return tabList
 				}
-				if (role.includes('排查人员') && !role.includes('领导')) {
-					console.log(tabList.slice(0, 1))
+				if (role.includes('排查人员') && role.includes('治理人员')) {
 					return tabList.slice(0, 2)
 				}
-				return tabList.slice(1, 2)
+				if (role.includes('排查人员')) {
+					return tabList.slice(0, 1)
+				}
+				if (role.includes('治理人员')) {
+					return tabList.slice(1, 2)
+				}
+				return []
 			},
 			// funcList() {
 			// 	return [{
diff --git a/static/index/pc.png b/static/index/pc.png
new file mode 100644
index 0000000..c230b98
Binary files /dev/null and b/static/index/pc.png differ
diff --git a/static/index/sp.png b/static/index/sp.png
new file mode 100644
index 0000000..6e4d0cd
Binary files /dev/null and b/static/index/sp.png differ
diff --git a/static/index/zl.png b/static/index/zl.png
new file mode 100644
index 0000000..9afb8ea
Binary files /dev/null and b/static/index/zl.png differ
diff --git a/static/map/daohang.png b/static/map/daohang.png
new file mode 100644
index 0000000..1e94934
Binary files /dev/null and b/static/map/daohang.png differ