diff --git a/pages.json b/pages.json
index 413d923..92ec95c 100644
--- a/pages.json
+++ b/pages.json
@@ -128,37 +128,37 @@
       }
     },
 	{
-	  "path": "pages/mypage/compents/wtcl/index",//问题处理
+	  "path": "pages/mypage/compents/wtcl/index",
 	  "style": {
 	    "navigationBarTitleText": ""
 	  }
 	},
 	{
-	  "path": "pages/mypage/compents/wxyh/index",//问题处理
+	  "path": "pages/mypage/compents/wxyh/index",
 	  "style": {
 	    "navigationBarTitleText": ""
 	  }
 	},
 	{
-	  "path": "pages/mypage/compents/wxyh/formZdy/index",//问题处理
+	  "path": "pages/mypage/compents/wxyh/formZdy/index",
 	  "style": {
 	    "navigationBarTitleText": ""
 	  }
 	},
 	{
-	  "path": "pages/mypage/compents/xcrw/index",//问题处理
+	  "path": "pages/mypage/compents/xcrw/index",
 	  "style": {
 	    "navigationBarTitleText": ""
 	  }
 	},
 	{
-	  "path": "pages/mypage/compents/wtcl/detail/index",//问题处理
+	  "path": "pages/mypage/compents/wtcl/detail/index",
 	  "style": {
 	    "navigationBarTitleText": ""
 	  }
 	},
 	{
-	  "path": "pages/mypage/compents/xcrw/detail/index",//巡查任务
+	  "path": "pages/mypage/compents/xcrw/detail/index",
 	  "style": {
 	    "navigationBarTitleText": ""
 	  }
diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue
index 8e1be6a..603746b 100644
--- a/pages/homeIndex/index.vue
+++ b/pages/homeIndex/index.vue
@@ -29,8 +29,8 @@
 					<div class="navIcon">
 						<image style="width: 100%; height: 100%" :src="item.icon" mode="aspectFit"></image>
 						<div class="readStatus" v-show="
-                (readStatus && item.key == 3) || (dispatchStatus && item.key ==5 && limit == 0) ||
-                (limit == 1 && readYjStatus && item.key == 5)
+                (xcStatus && item.key == 1) || (handleStatus && item.key ==3) ||
+                (warnStatus && item.key == 4)
               "></div>
 					</div>
 					<div class="navTxt">{{ item.value }}</div>
@@ -54,6 +54,10 @@
 
 <script>
 	import moment from 'moment'
+	const stm = moment().startOf('year').format("YYYY-MM-DD HH:mm:ss");
+	const etm = moment().format("YYYY-MM-DD HH:mm:ss");
+	const warnStm = moment().subtract(1,"days").format("YYYY-MM-DD HH:mm:ss")
+	const warnetm = moment().format("YYYY-MM-DD HH:mm:ss")
 	import SkInfo from '../skInfo/index.vue'
 	import YlzList from '../ylzList/index.vue'
 	export default {
@@ -64,17 +68,20 @@
 		data() {
 			return {
 				Ylzlist: [],
-				userList: uni.getStorageSync('value').data,
-				limit: 1,
-				readStatus: false, //工灾情状态
-				readYjStatus: false, //预警状态
-				dispatchStatus: false, //调令状态
+				userList: uni.getStorageSync('value'),
 				default_src: uni.getStorageSync('avatar'),
 				messagelist: [],
 				ylzList: [],
+				xcStatus: false, //巡查任务状态
+				handleStatus: false, //问题处理
+				warnStatus: false, //预警
 			}
 		},
 		onPullDownRefresh() {
+			this.getXcrwData();
+			this.getHandleData();
+			this.getYjData();
+			uni.$showMsg("刷新成功");
 			setTimeout(function () {
 				uni.stopPullDownRefresh();
 			}, 1000);
@@ -160,7 +167,7 @@
 					}
 					const {
 						data
-					} = await uni.$http.post('/gunshiApp/xfflood/visitMenuLog/insert', params)
+					} = await uni.$http.post('/gunshiApp/xyt/visitMenuLog/insert', params)
 				} catch (error) {}
 			},
 			myNavigateTo(url, menu2) {
@@ -168,17 +175,83 @@
 					url: url // 跳转到对应路径的页面
 				})
 				this.setInsert(menu2)
-			}
+			},
+
+			// 巡查任务
+			async getXcrwData() {
+				const userId = uni.getStorageSync('value').userId
+				const params = {
+					dateRangeSo: {
+						start: stm,
+						end: etm,
+					},
+					inspectUserId: userId,
+					statusList: [0, 1]
+				}
+				try {
+					const res = await uni.$http.post("/gunshiApp/xyt/inspect/task/list", params)
+					if (res.data.data.length > 0) {
+						this.xcStatus = true
+					}
+				} catch (error) {
+					uni.$showMsg();
+				}
+			},
+
+			// 问题处理
+			async getHandleData() {
+				let params = {
+					"pageSo": {
+						"pageSize": 10,
+						"pageNumber": 1
+					},
+					"dateTimeRangeSo": {
+						start:stm,
+						end:etm
+					},
+					"isHandle": 0,
+					"inspectUserId": uni.getStorageSync('value').userId
+				}
+				try {
+					const res = await uni.$http.post("/gunshiApp/xyt/inspect/detail/page", params)
+					if (res.data.data.records.length > 0) {
+						this.handleStatus = true
+					}
+				} catch (error) {
+					uni.$showMsg();
+				}
+			},
+			// 预警
+			async getYjData() {
+				const params = {
+					start: warnStm,
+					end:warnetm
+				}
+				try {
+					const res = await uni.$http.post("/gunshiApp/xyt/stQxWarnR/home/warn", params)
+					const {flowWarn,pressWarn,qxWarn,shiftWarn} = res.data.data
+					const arr = [...flowWarn,...pressWarn,...qxWarn,...shiftWarn]
+					if (arr.length > 0) {
+						this.warnStatus = true
+					}
+				} catch (error) {
+					uni.$showMsg();
+				}
+			},
 		},
+
 		onLoad() {
-			this.getList()
-			this.getYlzList()
-			this.userList = uni.getStorageSync('value')
+			console.log("走了几遍");
+			this.getList();
+			this.getYlzList();
 		},
 
 		onShow() {
 			this.setInsert()
-		}
+			this.getXcrwData();
+			this.getHandleData();
+			this.getYjData();
+		},
 
 	}
 </script>
@@ -262,11 +335,13 @@
 		text-align: left;
 		margin-bottom: 12rpx;
 	}
+
 	.info_24 {
-		padding: 15px;
+		// padding: 15px;
 		background-color: #fff;
-		margin-bottom: 12rpx;
+		// margin-bottom: 12rpx;
 	}
+
 	.title .line {
 		border: 2px solid #3380ff;
 		border-radius: 3rpx;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 33d6cef..944ade7 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -4,9 +4,9 @@
       <image style="width: 100%; height: 100%" src="../../static/images/bg_img.png" mode="scaleToFill"></image>
     </div>
     <view class="user-title">
-			<text class="sub" >用户登录</text>
+      <text class="sub">用户登录</text>
       <text class="line"></text>
-		</view>
+    </view>
     <uni-forms :modelValue="formData" class="form">
       <uni-forms-item>
         <uni-easyinput type="text" v-model="formData.username" placeholder="请输入用户名" />
@@ -26,7 +26,6 @@
 
 <script>
   import CryptoJS from 'crypto-js'
-const imgUrl = uni.getStorageSync("imgUrl");
   export default {
     data() {
       return {
@@ -48,22 +47,8 @@ const imgUrl = uni.getStorageSync("imgUrl");
     },
     methods: {
       handleChange(formData) {
-        checked = !checked
         formData.checked = !formData.checked
       },
-      // async getImgFlow(avatar){
-      //   if(!avatar) {
-      //     uni.setStorageSync("avatar",'../../static/tabs/touxiang.png')
-      //     return
-      //   }
-			// 	try {
-			// 		const {data} = await uni.$http.get(`/gunshiApp/xyt/common/download/resource?resource=${avatar}`)
-			// 		const url = fileChange(data)
-			// 		uni.setStorageSync("avatar",url)
-			// 	} catch (error) {
-					
-			// 	}
-			// },
       login(formData) {
         //loading
         uni.showLoading({
@@ -110,7 +95,7 @@ const imgUrl = uni.getStorageSync("imgUrl");
             if (res.data.token) {
               uni.setStorageSync('Gs-Token', res.data.token)
               uni.$http.get('/gunshiApp/xyt/getInfo').then(res => {
-                // this.getImgFlow(res.data.user.avatar)
+                this.getImgFlow(res.data.user.avatar)
                 uni.setStorageSync('value', res.data.user)
                 setTimeout(function () {
                   uni.hideLoading()
@@ -132,7 +117,25 @@ const imgUrl = uni.getStorageSync("imgUrl");
             clearTimeout()
           }
         })
-      }
+      },
+      getImgFlow(imgUrl) {
+        if (imgUrl) {
+          uni.request({
+            url: 'http://local.gunshiiot.com:18083' +
+              `/gunshiApp/xyt/common/download/resource?resource=${imgUrl}`,
+            responseType: 'arraybuffer',
+            success: (res) => {
+              // 将arraybuffer转换为Base64编码
+              let base64 = uni.arrayBufferToBase64(res.data);
+              const p = 'data:image/png;base64,' + base64;
+              uni.setStorageSync("avatar", p)
+            }
+          })
+        } else {
+          uni.setStorageSync('avatar', "../../static/tabs/touxiang.png")
+        }
+
+      },
     }
   }
 </script>
@@ -149,10 +152,10 @@ const imgUrl = uni.getStorageSync("imgUrl");
   }
 
   .img {
- 
-     width: 100vw;
+
+    width: 100vw;
     height: 40vh;
-    margin-top: 0vh; 
+    margin-top: 0vh;
     /* background-color: red; */
   }
 
@@ -166,27 +169,24 @@ const imgUrl = uni.getStorageSync("imgUrl");
 
   .user-title {
     position: relative;
-		padding: 4px;
-		text-align: center;
-		display: flex;
-		flex-direction: column;
-    	 .sub{
-			font-size: 28px;
-			color: #000;
-		}
-    .line{
+    padding: 4px;
+    text-align: center;
+    display: flex;
+    flex-direction: column;
+
+    .sub {
+      font-size: 28px;
+      color: #000;
+    }
+
+    .line {
       position: absolute;
       width: 80px;
       height: 5px;
-      left:20px;
+      left: 20px;
       bottom: -10px;
       background-color: #00a8ff;
       border-radius: 15%;
     }
-    }
-
-	
-
-	
-	
+  }
 </style>
\ No newline at end of file
diff --git a/pages/mypage/compents/xcrw/detail/index.vue b/pages/mypage/compents/xcrw/detail/index.vue
index a1f96c6..175e26f 100644
--- a/pages/mypage/compents/xcrw/detail/index.vue
+++ b/pages/mypage/compents/xcrw/detail/index.vue
@@ -5,8 +5,9 @@
 				fontSize:'18px'
 			}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
 		</u-navbar>
-		<view class="" style="margin-top: 44px;;background-color: #f0f0f0;border-top: 1px solid #f0f0f0; height:calc(100vh - 44px)">
-			<view  style="margin: 10px;background-color: #fff;padding: 10px;">
+		<view class=""
+			style="margin-top: 44px;;background-color: #f0f0f0;border-top: 1px solid #f0f0f0; height:calc(100vh - 44px)">
+			<view style="margin: 10px;background-color: #fff;padding: 10px;">
 				<view class="item">
 					<view class="blueTiao"></view>
 					<view class="title">
@@ -14,7 +15,7 @@
 					</view>
 				</view>
 				<view class="contentItem">
-			        <view class="itemC">
+					<view class="itemC">
 						<text>任务标题1</text>
 						<text>{{taskTitle}}</text>
 					</view>
@@ -35,13 +36,13 @@
 						<text>{{endDate}}</text>
 					</view>
 				</view>
-				
+
 			</view>
 			<!-- 	<view v-show="status == 0 && btnStatus == 0" style="display:flex;justify-content: center;margin-top: 20%;">
                 <view class="circle-btn" @click="startXc">开始巡查</view> 
 				</view> -->
-				<view  style="margin: 10px;background-color: #fff;padding: 10px;">
-					<view class="item">
+			<view style="margin: 10px;background-color: #fff;padding: 10px;">
+				<view class="item">
 					<view class="blueTiao"></view>
 					<view class="title">
 						巡检项
@@ -50,7 +51,7 @@
 				<view class="contentItem">
 					<db-form :xjItem="xjItem"></db-form>
 				</view>
-				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -59,22 +60,22 @@
 	import moment from 'moment'
 	import DbForm from './dbForm.vue'
 	export default {
-		components:{
+		components: {
 			DbForm
 		},
 		data() {
 			return {
-				taskTitle:'',
-				taskType:'',
-				taskContent:'',
-				startDate:'',
-				endDate:'',
-				status:'',
-				id:'',
+				taskTitle: '',
+				taskType: '',
+				taskContent: '',
+				startDate: '',
+				endDate: '',
+				status: '',
+				id: '',
 				btnStatus: 0,
-				xjItem:[],
-				list:["正常","异常"],
-				current:3
+				xjItem: [],
+				list: ["正常", "异常"],
+				current: 3
 			};
 		},
 		mounted() {
@@ -82,7 +83,7 @@
 		},
 		methods: {
 			// 开始巡查
-		   async startXc(){
+			async startXc() {
 				try {
 					this.btnStatus = 1;
 					this.getXjItem(this.id)
@@ -90,25 +91,27 @@
 					uni.$showMsg();
 				}
 			},
-				// 获取巡查项
-		   async getXjItem(id){
+			// 获取巡查项
+			async getXjItem(id) {
 				try {
-					const {data} = await uni.$http.get(`/gunshiApp/xyt/inspect/detail/info?taskId=${this.id}`)
-					if(data.code == 200){
+					const {
+						data
+					} = await uni.$http.get(`/gunshiApp/xyt/inspect/detail/info?taskId=${this.id}`)
+					if (data.code == 200) {
 						this.xjItem = data.data
 					}
 				} catch (error) {
 					uni.$showMsg();
 				}
 			},
-			change(e){
-                this.current = e;
+			change(e) {
+				this.current = e;
 			}
 		},
-		onLoad(option){
+		onLoad(option) {
 			this.taskTitle = option.taskTitle
 			this.taskType = option.taskType
-			this.taskContent = option.taskContent
+			this.taskContent = option.taskContent == "null" ? null : option.taskContent
 			this.startDate = (option.startDate)
 			this.endDate = option.endDate == "null" ? "" : option.endDate
 			this.status = option.status
@@ -133,17 +136,19 @@
 	}
 
 	.item {
-		
+
 		padding-bottom: 10px;
 		display: flex;
 		align-items: center;
+
 		// justify-content: space-between;
-		.blueTiao{
+		.blueTiao {
 			background-color: #007aff;
 			width: 5px;
 			height: 16px;
 			margin-right: 10px;
 		}
+
 		.title {
 			border-width: 0px;
 			font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑', sans-serif;
@@ -155,6 +160,7 @@
 
 		.titleRight {
 			display: flex;
+
 			.border {
 				border-width: 0px;
 				background-color: rgba(236, 245, 255, 1);
@@ -172,8 +178,9 @@
 		}
 
 	}
-	.contentItem{
-		.itemC{
+
+	.contentItem {
+		.itemC {
 			display: flex;
 			justify-content: space-between;
 			display: flex;
@@ -181,21 +188,24 @@
 			padding: 10px;
 			border-bottom: 1px solid #f0f0f0;
 		}
-		.itemNo{
+
+		.itemNo {
 			color: #666666;
 			padding: 10px;
 		}
 	}
-	.circle-btn{
+
+	.circle-btn {
 		width: 120px;
 		height: 120px;
 		background-color: #007aff;
 		border-radius: 50%;
-		color:#fff;
+		color: #fff;
 		text-align: center;
 		line-height: 120px;
 	}
-	.yuandian{
+
+	.yuandian {
 		display: inline-block;
 		width: 10px;
 		height: 10px;
@@ -203,15 +213,18 @@
 		border-radius: 50%;
 		margin-right: 10px;
 	}
-	.xj-content{
+
+	.xj-content {
 		height: 300px;
 		overflow-y: auto;
 	}
-	.xj-text{
+
+	.xj-text {
 		margin-left: 10%;
 		margin-top: 2%;
 	}
-	.subsectioin{
+
+	.subsectioin {
 		display: flex;
 		column-gap: 10px;
 		align-items: center;
diff --git a/pages/mypage/mypage.vue b/pages/mypage/mypage.vue
index a9cf404..a3c1a6b 100644
--- a/pages/mypage/mypage.vue
+++ b/pages/mypage/mypage.vue
@@ -13,7 +13,7 @@
 		<view class="funcBar">
 			<div class="funcList" v-for="(item, index) in func" :key="index">
 				<div @click="navigateToSubPage(func,index)">
-					<div class="funcIcon">
+					<div class="funcIcon" style="width:30px:;height:30px">
 						<image class="icon-left" style="width: 100%; height: 100%" :src="item.img" mode="aspectFit">
 						</image>
 					</div>
@@ -25,7 +25,7 @@
 			<view class="" style="padding: 5px 0 0 5px;">
 				历史记录
 			</view>
-			<view class="" style="display: flex;">
+			<view class="" style="display: flex;width: 100%;justify-content: space-around;">
 			
 			<div class="funcList" v-for="(item, index) in xjxList" :key="index" >
 				<div @click="navigateToSubPage(xjxList,index)">
diff --git a/pages/xcrw/detail/dbForm.vue b/pages/xcrw/detail/dbForm.vue
index d0237cc..49e1b95 100644
--- a/pages/xcrw/detail/dbForm.vue
+++ b/pages/xcrw/detail/dbForm.vue
@@ -60,7 +60,7 @@
 									</view>
 									<view class="" v-if="o.isHandle == 0">
 										<u-form-item label="责任人" prop="handleUserId" borderBottom	 required>
-											<uni-data-picker :localdata="treeList" popup-title="请选择班级" v-model="o.handleUserId" 
+											<uni-data-picker :localdata="treeList" popup-title="请选择责任人" v-model="o.handleUserId" 
 											:border="false"
 											:map="{'text':'title','value':'value'}"
 											v-slot:default="{data, error, options}"
@@ -270,6 +270,11 @@
 				}
 			},
 			submit(status) {
+				const timer = getStorageSync('timer');
+				if(timer) {
+					clearInterval(timer);
+					uni.removeStorageSync('timer')
+				}
 				let tigger = true
 				//判断是否符合提交条件
 				this.listData.forEach(item => {
diff --git a/pages/xcrw/detail/index.vue b/pages/xcrw/detail/index.vue
index f40e1a1..2aa6f52 100644
--- a/pages/xcrw/detail/index.vue
+++ b/pages/xcrw/detail/index.vue
@@ -90,17 +90,17 @@
 			// 开始巡查
 		   async startXc(){
 				try {
-					if(status == 0){
+					if(this.status == 0){
 						const {data} = await uni.$http.get(`/gunshiApp/xyt/inspect/task/startInspect/${this.id}`)
 						if(data.code == 200){
 							this.btnStatus = 1;
 							this.getXjItem(this.id)
 						}
-					}else if(status == 1){
+					}else if(this.status == 1){
 						this.btnStatus = 1;
 						this.getXjItem(this.id)
 					}
-					
+					this.getLocationWithInterval();
 					
 				} catch (error) {
 					uni.$showMsg();
@@ -117,15 +117,52 @@
 					uni.$showMsg();
 				}
 			},
+
+			getLocationWithInterval() {
+				this.getLocation(); // 首次获取经纬度信息
+				// 设置定时器，每隔5秒获取一次经纬度信息
+			let timer= setInterval(() => {
+					this.getLocation();
+				}, 300000); // 五分钟
+				uni.setStorageSync("timer", timer);
+			},
+			// 获取经纬度
+			getLocation() {
+				uni.getLocation({
+					type: 'gcj02',
+					success: (res) => {
+						this.latitude = res.latitude;
+						this.longitude = res.longitude;
+						this.sendLocation(res.latitude,res.longitude)
+					},
+					fail: (err) => {
+						console.log('Failed to get location:', err);
+					}
+				});
+			},
+			// 将经纬度传给服务器
+			async sendLocation(latitude, longitude) {
+                try {
+                    const { data } = await uni.$http.post(`/gunshiApp/xyt/inspectTaskTrack/insert`, {
+                        taskId: this.id,
+                        lttd: latitude,
+                        lgtd: longitude
+                    })
+                    if (data.code == 200) {
+                        console.log('Location sent successfully')
+                    }
+                } catch (error) {
+                    uni.$showMsg();
+                }
+            }
 			
 		},
 		onLoad(option){
 			this.taskTitle = option.taskTitle
 			this.taskType = option.taskType
-			this.taskContent = option.taskContent
+			this.taskContent = option.taskContent== "null" ? null:option.taskContent
 			this.startDate = (option.startDate)
 			this.endDate = option.endDate == "null" ? "" : option.endDate
-			
 			this.status = option.status
 			this.id = option.id
 		}
diff --git a/pages/xcrw/index.vue b/pages/xcrw/index.vue
index a071958..12e76f7 100644
--- a/pages/xcrw/index.vue
+++ b/pages/xcrw/index.vue
@@ -129,6 +129,13 @@
 					url:`/pages/xcrw/detail/index?taskTitle=${record.taskTitle}&taskType=${record.taskType}&taskContent=${record.taskContent}&startDate=${record.startDate}&endDate=${record.endDate}&status=${record.status}&id=${record.id}`
 				})
 			}
+		},
+		onShow(){
+			const timer =uni.getStorageSync('timer');
+			if(timer){
+				clearInterval(timer);
+				uni.removeStorageSync('timer');
+			}
 		}
 	}
 </script>
diff --git a/pages/ylzList/index.vue b/pages/ylzList/index.vue
index f2fc9a8..3088436 100644
--- a/pages/ylzList/index.vue
+++ b/pages/ylzList/index.vue
@@ -39,7 +39,6 @@
 					h12:22,
 					h24:35,
 				},
-				ylzList:[]
 			}
 		},
 			methods:{
@@ -60,27 +59,14 @@
 					// #eb20f5 100-250
 					// #761e50 >=250
 				},
-			  // 获取雨量站
-        async getYlzData(){
-            try {
-                 const {data} = await uni.$http.post(
-                  "/gunshiApp/xyt/stPptnRReal/list")
-                  if(data.code == 200){
-                    this.ylzList = [...data.data];
-                  }
-            } catch (error) {
-                 uni.$showMsg();
-            }
-        },	
+	
 			toDetail(){
 				uni.navigateTo({
 					url:`/pages/ylzList/detail/index?stnm=${this.item.stnm}`
 				})
 			},
 	},
-	mounted() {
-		this.getYlzData();
-	},
+
 	}
 </script>
 
diff --git a/static/images/info.png b/static/images/info.png
index 40c7fda..69e2537 100644
Binary files a/static/images/info.png and b/static/images/info.png differ
diff --git a/static/images/password.png b/static/images/password.png
index 1d5261d..a6a4eac 100644
Binary files a/static/images/password.png and b/static/images/password.png differ