diff --git a/pages/forewarning/hd.vue b/pages/forewarning/hd.vue
index 9cfb2ee..81c2c12 100644
--- a/pages/forewarning/hd.vue
+++ b/pages/forewarning/hd.vue
@@ -145,10 +145,11 @@ const sttp = {
 					},1000)
 				}
 			},
-			toSh(record) {
-				// uni.navigateTo({
-				//   url: '/pages/forewarning/shInformation/shInformation?obj='+JSON.stringify(record) // 跳转到对应路径的页面
-				// });
+			toSh(params) {
+				console.log(`/pages/hdDetail/hdDetail?stcd=${params.stcd}&stnm=${params.stnm}&source=${params.source}&wrz=${params.wrz}&grz=${params.grz}`)
+				uni.navigateTo({
+				  url:`/pages/hdDetail/hdDetail?stcd=${params.stcd}&stnm=${params.stnm}&source=${params.source}&wrz=${params.wrz}&grz=${params.grz}`
+				})
 			},
 		},
 		created() {
diff --git a/pages/forewarning/sk.vue b/pages/forewarning/sk.vue
index 9469f60..ba019d1 100644
--- a/pages/forewarning/sk.vue
+++ b/pages/forewarning/sk.vue
@@ -147,10 +147,11 @@ const sttp = {
 					},1000)
 				}
 			},
-			toSh(record) {
-				// uni.navigateTo({
-				//   url: '/pages/forewarning/shInformation/shInformation?obj='+JSON.stringify(record) // 跳转到对应路径的页面
-				// });
+			toSh(params) {
+				console.log(`/pages/skDetail/skDetail?stcd=${params.stcd}&stnm=${params.stnm}&source=${params.source}&afsltdz=${params.afsltdz}&flLowLimLev=${params.flLowLimLev}&desFloodLev=${params.desFloodLev}&calFloodLev=${params.calFloodLev}&resCode=${params.resCode}`)
+				uni.navigateTo({
+				  url:`/pages/skDetail/skDetail?stcd=${params.stcd}&stnm=${params.stnm}&source=${params.source}&afsltdz=${params.afsltdz}&flLowLimLev=${params.flLowLimLev}&desFloodLev=${params.desFloodLev}&calFloodLev=${params.calFloodLev}&resCode=${params.resCode}`
+				})
 			},
 		},
 		created() {
diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue
index e00be51..36934cd 100644
--- a/pages/homeIndex/index.vue
+++ b/pages/homeIndex/index.vue
@@ -24,7 +24,7 @@
     </view>
     <!-- nav -->
     <view class="navBar">
-      <div class="navList" v-for="(item, index) in navList" :key="index">
+      <div class="navList" v-for="(item, index) in getNavList" :key="index">
 		  <div @click="myNavigateTo(item.url)">
 			<div class="navIcon">
 			  <image
@@ -214,45 +214,6 @@ const dataType = {
   Sunday: '星期天'
 }
 
-const navList = [
-  {
-    value: '雨情',
-    key: 1,
-    icon: '../../static/tabs/形状 1@2x.png',
-	url:"/pages/rain/rain"
-  },
-  {
-    value: '水情',
-    key: 2,
-    icon: '../../static/tabs/water (1) 拷贝@2x.png',
-	url:"/pages/water/water"
-  },
-  {
-    value: '工情灾情',
-    key: 3,
-    icon: '../../static/tabs/工情——icon@2x.png',
-	url:''
-  },
-  {
-    value: '信息上报',
-    key: 4,
-    icon: '../../static/tabs/xinxi_icon@2x.png',
-	url:''
-  },
-  {
-    value: '预警',
-    key: 5,
-    icon: '../../static/tabs/yujing_icon@2x.png',
-	url:'/pages/forewarning/forewarning'
-  },
-  {
-    value: '调令反馈',
-    key: 5,
-    icon: '../../static/tabs/yujing_icon@2x.png',
-  	url:'/pages/orderFeedback/orderFeedback'
-  }
-]
-
 import moment from 'moment'
 
 export default {
@@ -261,7 +222,6 @@ export default {
       monthDay: '',
       dayOfWeek: '',
       dataType,
-      navList,
       userList: {},
       changeBool: false,
       tableData: [],
@@ -273,6 +233,81 @@ export default {
       tableData: {},
       tm: ''
     }
+  },
+  computed: {
+	getNavList() {
+		const adcd = uni.getStorageSync('value').adcd
+		let lever = 0
+		if (adcd.endsWith('000000000')) {
+		  //县
+		  return [
+			  {
+			    value: '雨情',
+			    key: 1,
+			    icon: '../../static/tabs/形状 1@2x.png',
+			  	url:"/pages/rain/rain"
+			  },
+			  {
+			    value: '水情',
+			    key: 2,
+			    icon: '../../static/tabs/water (1) 拷贝@2x.png',
+			  	url:"/pages/water/water"
+			  },
+			  {
+			    value: '工情灾情',
+			    key: 3,
+			    icon: '../../static/tabs/工情——icon@2x.png',
+			  	url:''
+			  },
+			  {
+			    value: '信息上报',
+			    key: 4,
+			    icon: '../../static/tabs/xinxi_icon@2x.png',
+			  	url:''
+			  },
+			  {
+			    value: '预警',
+			    key: 5,
+			    icon: '../../static/tabs/yujing_icon@2x.png',
+			  	url:'/pages/forewarning/forewarning'
+			  }
+		  ]
+		} else {
+		  //乡镇
+		  return [
+			  {
+			    value: '雨情',
+			    key: 1,
+			    icon: '../../static/tabs/形状 1@2x.png',
+			  	url:"/pages/rain/rain"
+			  },
+			  {
+			    value: '水情',
+			    key: 2,
+			    icon: '../../static/tabs/water (1) 拷贝@2x.png',
+			  	url:"/pages/water/water"
+			  },
+			  {
+			    value: '工情灾情',
+			    key: 3,
+			    icon: '../../static/tabs/工情——icon@2x.png',
+			  	url:''
+			  },
+			  {
+			    value: '调令反馈',
+			    key: 5,
+			    icon: '../../static/tabs/yujing_icon@2x.png',
+			  	url:'/pages/orderFeedback/orderFeedback'
+			  },
+			  {
+			    value: '信息上报',
+			    key: 4,
+			    icon: '../../static/tabs/xinxi_icon@2x.png',
+			  	url:''
+			  }
+		  ]
+		}
+	}
   },
   methods: {
     tabChange (val) {
diff --git a/pages/orderFeedback/fk.vue b/pages/orderFeedback/fk.vue
index f5b8599..4c408d1 100644
--- a/pages/orderFeedback/fk.vue
+++ b/pages/orderFeedback/fk.vue
@@ -1,11 +1,11 @@
 <template>
 	<view :style="{height:'99%',position:'relative'}">
-		<div class="row">
+		<u-toast ref="uToast"></u-toast>
+		<div class="row" v-if="!record.isDisabled">
 			<text class="lf">指令内容:</text>
 			<div class="rf">
 				<u--textarea 
 					v-model="value" 
-					:disabled='record.isDisabled'
 					height=100
 				></u--textarea>
 			</div>
@@ -13,19 +13,21 @@
 		<div :style="{margin:'0 10px'}"><u-divider></u-divider></div>
 		<div class="mybody">
 			<div class="row2" v-for="(item,index) in list">
-				<text>2024-01-13 09:38:20执行反馈</text>
+				<text>{{item.tm+' '+item.content}}</text>
 			</div>
 		</div>
-		<div :style="{width:'100%',position:'absolute',bottom:'40px'}">
+		<div :style="{width:'100%',position:'absolute',bottom:'40px'}" v-if="!record.isDisabled">
 			<u-button
 				type="primary"
 				text="反馈"
 				customStyle="margin-top: 20px"
+				@click="submit1"
 			></u-button>
 			<u-button
 				type="primary"
 				text="反馈并结束"
 				customStyle="margin-top: 10px"
+				@click="submit2"
 			></u-button>
 		</div>
 	</view>
@@ -37,19 +39,74 @@
 	export default {
 		props:{
 			record:{
-			  type: String,
+			  type: Object,
 			  required: true,
 			},
 		},
 		data() {
 			return {
 				value:'',
-				list:[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]
+				list:[]
 			};
 		},
+		created() {
+			this.getData()
+		},
 		methods: {
 			tabsChange(item) {
 			},
+			async getData() {
+				try{
+					const res = await uni.$http.get('/gunshiApp/xfflood/xfEmerDispatchR/getFeedbackById/'+this.record.id)
+					console.log('res',res)
+					this.list = res.data.data					
+				}catch(e){
+					uni.$showMsg()
+				}
+			},
+			async submit1() {
+				try{
+					if(!this.value){
+						this.$refs.uToast.show({
+							type: 'error',
+							title: '失败主题',
+							message: "请输入指令内容",
+						})
+						return
+					}
+					const params = {
+						dispatchId:this.record.id,
+						content:this.value,
+					}
+					console.log('params',params)
+					const res = await uni.$http.post('/gunshiApp/xfflood/xfEmerDispatchR/feedback',params)
+					console.log('res',res)
+					this.value = ''
+					this.getData()
+				}catch(e){
+					uni.$showMsg()
+				}
+			},
+			async submit2() {
+				try{
+					if(!this.value){
+						this.$refs.uToast.show({
+							type: 'error',
+							title: '失败主题',
+							message: "请输入指令内容",
+						})
+						return
+					}
+					const params = {
+						dispatchId:this.record.id,
+						content:this.value,
+					}
+					const res = await uni.$http.post('/gunshiApp/xfflood/xfEmerDispatchR/feedbackAndEnd',params)
+					uni.navigateBack()
+				}catch(e){
+					uni.$showMsg()
+				}
+			}
 		},
 	}
 </script>
diff --git a/pages/orderFeedback/orderFeedback.vue b/pages/orderFeedback/orderFeedback.vue
index 5b0aa21..032f637 100644
--- a/pages/orderFeedback/orderFeedback.vue
+++ b/pages/orderFeedback/orderFeedback.vue
@@ -150,24 +150,25 @@
 				showEtmPicker:false,
 				stm:Number(moment(new Date()).add(-7,'days')),
 				etm:Number(new Date()),
-				list:[{
-					serial:'10',//调度指令编号
-					year:'2023',//调度令年度
-					executeOrgCode:'执行单位编码',//执行单位编码
-					executeOrgName:'执行单位名称',//执行单位名称
-					dispatchType:'水库调洪',//调度类型
-					forwardOrgName:'抄送单位',//抄送单位
-					startTm:'计划执行时间',//计划执行时间
-					endTm:'计划结束时间',//计划结束时间
-					content:'指令内容',//指令内容
-					createTm:'指令日期',//指令日期
-					createUserId:'指令发起人id',//指令发起人id
-					createUserName:'张三',//指令发起人
-					status:'1',//调令状态，0=待下发，1=执行中，2=完成
-					createTm:'2023-10-10 12:12:10',
-					dispatchId: '14'
+				list:[],
+				// {
+				// 	serial:'10',//调度指令编号
+				// 	year:'2023',//调度令年度
+				// 	executeOrgCode:'执行单位编码',//执行单位编码
+				// 	executeOrgName:'执行单位名称',//执行单位名称
+				// 	dispatchType:'水库调洪',//调度类型
+				// 	forwardOrgName:'抄送单位',//抄送单位
+				// 	startTm:'计划执行时间',//计划执行时间
+				// 	endTm:'计划结束时间',//计划结束时间
+				// 	content:'指令内容',//指令内容
+				// 	createTm:'指令日期',//指令日期
+				// 	createUserId:'指令发起人id',//指令发起人id
+				// 	createUserName:'张三',//指令发起人
+				// 	status:'1',//调令状态，0=待下发，1=执行中，2=完成
+				// 	createTm:'2023-10-10 12:12:10',
+				// 	dispatchId: '14'
 					
-				}]
+				// }
 			};
 		},
 		computed: {
@@ -228,8 +229,12 @@
 			}
 		},
 		created() {
-			// this.submit()
+			this.submit()
+		},
+		onShow() {
+			this.submit()
 		}
+		
 	}
 </script>
 
diff --git a/pages/orderFeedback/zl.vue b/pages/orderFeedback/zl.vue
index 20ea3a4..a5ee543 100644
--- a/pages/orderFeedback/zl.vue
+++ b/pages/orderFeedback/zl.vue
@@ -110,7 +110,7 @@
 	export default {
 		props:{
 			record:{
-			  type: String,
+			  type: Object,
 			  required: true,
 			},
 		},