diff --git a/pages/index.vue b/pages/index.vue
index aaf5bc8..754b690 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -39,7 +39,7 @@
 									<u-icon name="clock" size="18" color="#AEBAC8" class="" class="icon"></u-icon>
 								</view>
 								<view class="smofontsiez">
-									{{item.eventTime}}
+									{{item.firstWarnTimeDate}}
 								</view>
 							</view>
 						</view>
diff --git a/views/jiashicangshenhe/jiashicangshenhe - 副本.vue b/views/jiashicangshenhe/jiashicangshenhe - 副本.vue
index f68b4c3..bf3e70c 100644
--- a/views/jiashicangshenhe/jiashicangshenhe - 副本.vue	
+++ b/views/jiashicangshenhe/jiashicangshenhe - 副本.vue	
@@ -23,7 +23,7 @@
 							预警时间:
 						</view>
 						<view class="indexcontentbttom-item-bottom-rigth">
-							{{Objitem.eventTime}}
+							{{Objitem.firstWarnTimeDate}}
 						</view>
 					</view>
 					<view class="indexcontentbttom-item-bottom">
diff --git a/views/jiashicangshenhe/jiashicangshenhe.vue b/views/jiashicangshenhe/jiashicangshenhe.vue
index 8cb9dfa..499f794 100644
--- a/views/jiashicangshenhe/jiashicangshenhe.vue
+++ b/views/jiashicangshenhe/jiashicangshenhe.vue
@@ -24,7 +24,7 @@
 							预警时间:
 						</view>
 						<view class="indexcontentbttom-item-bottom-rigth">
-							{{Objitem.eventTime}}
+							{{Objitem.firstWarnTimeDate}}
 						</view>
 					</view>
 					<view class="indexcontentbttom-item-bottom">
@@ -109,17 +109,20 @@
 			<LieBIaoList ref="LieBIaoListis"></LieBIaoList>
 		</view>
 		<view class="dibuaBtn" v-show="tabscurrentShow">
-			<view class="dibuaBtn-lanse" @click="Chongxinshangbao(1,)"
-				:class="Objitem.title!=Objitem.oldTitle || $store.state.tijiaoList.shijianList.length!=0 ?'':'jinyong'">
-				{{Objitem.title!=Objitem.oldTitle || $store.state.tijiaoList.shijianList.length!=0 ?'重新上报驾驶舱':'重新上报驾驶舱'}}
+			<view class="dibuaBtn-lanse" @click="Chongxinshangbao(1)"
+				:class="Objitem.title!=Objitem.oldTitle || $store.state.tijiaoList.shijianList.length!=0 ? '' : 'jinyong'">
+				<!-- {{Objitem.title!=Objitem.oldTitle || $store.state.tijiaoList.shijianList.length!=0 ?'重新上报驾驶舱':'重新上报驾驶舱'}} -->
+				重新上报驾驶舱
 			</view>
 			<view class="dibuaBtn-hongse" @click="Chongxinshangbao(2)"
-				:class="Objitem.title!=Objitem.oldTitle || $store.state.tijiaoList.shijianList.length!=0 ?'':'jinyong'">
-				{{Objitem.title!=Objitem.oldTitle || $store.state.tijiaoList.shijianList.length!=0 ?'退回算法重训练':'退回算法重训练'}}
+				:class="Objitem.title!=Objitem.oldTitle || $store.state.tijiaoList.shijianList.length!=0 ? '' : 'jinyong'">
+				<!-- {{Objitem.title!=Objitem.oldTitle || $store.state.tijiaoList.shijianList.length!=0 ?'退回算法重训练':'退回算法重训练'}} -->
+				退回算法重训练
 			</view>
 			<view class="dibuaBtn-lvse" @click="Chongxinshangbao(3)"
 				:class="Objitem.title!=Objitem.oldTitle || $store.state.tijiaoList.shijianList.length!=0 ?'jinyong':''">
-				{{Objitem.title!=Objitem.oldTitle || $store.state.tijiaoList.shijianList.length!=0 ?'审核通过':'审核通过'}}
+				<!-- {{Objitem.title!=Objitem.oldTitle || $store.state.tijiaoList.shijianList.length!=0 ?'审核通过':'审核通过'}} -->
+				审核通过
 			</view>
 		</view>
 		<!-- 修改标题 -->
@@ -196,7 +199,7 @@
 				if (this.tabscurrentShow) {
 					if (this.textareavalue2 != "" && this.textareavalue2 != this.Objitem.title) {
 						this.Objitem.title = this.textareavalue2
-						console.log(this.Objitem);
+						// console.log(this.Objitem);
 						// massEventsedit(this.Objitem).then(res => {
 						// 	if (res.code == 200) {
 						// 		this.getByInnerEventIdmy()
@@ -247,7 +250,9 @@
 						tabscurrent: this.tabscurrent,
 						innerEventId: this.innerEventId
 					}
-					this.$refs.LieBIaoListis.open(obj)
+					if(this.navbarValue !== '紧急事件') {
+						this.$refs.LieBIaoListis.open(obj)
+					}
 					// console.log(this.$refs.LieBIaoListis);
 				})
 
@@ -264,6 +269,7 @@
 			},
 			// 退回或者提交
 			Chongxinshangbao(isReport) {
+				// isReport 1:上报驾驶舱 2:重训练 3:审核通过
 				if (isReport == 3 && (this.Objitem.title != this.Objitem.oldTitle || this.$store.state.tijiaoList
 						.shijianList.length != 0)) {
 					uni.showToast({