diff --git a/src/App.vue b/src/App.vue
index 298f518a..7a615db8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,7 +14,7 @@ export default {
     this.initWaterMarker()
   },
   onPageNotFound() {
-    this.logout()
+    // this.logout()
   },
   computed: {
     ...mapState(['token', 'user']),
diff --git a/src/sass/AppConflictMediation/List.vue b/src/sass/AppConflictMediation/List.vue
index bdd1c990..690779f3 100644
--- a/src/sass/AppConflictMediation/List.vue
+++ b/src/sass/AppConflictMediation/List.vue
@@ -18,7 +18,7 @@
     <!-- 事件列表 -->
     <div class="title">
       <div class="title-name">事件列表</div>
-      <div class="title-type">{{ $dict.getLabel('clapEventStatusAll', groupName) }}<u-icon name="arrow-down"></u-icon></div>
+      <div class="title-type" @click="showGird = true">{{ status? status: '全部' }}<u-icon name="arrow-down"></u-icon></div>
     </div>
 
     <template>
@@ -50,7 +50,7 @@
       <AiEmpty v-if="!datas.length"></AiEmpty>
     </template>
 
-    <u-select v-model="showGird" :list="groupType" label-name="groupName" value-name="id"
+    <u-select v-model="showGird" :list="$dict.getDict('clapEventStatusAll')" label-name="dictName" value-name="dictValue"
               @confirm="changeType"/>
 
     <div class="pad-b120" v-if="datas.length"></div>
@@ -75,6 +75,7 @@ export default {
       girdNameText: '所属网格',
       showType: false,
       listType: [],
+      status: '',
       eventStatus: '',
       eventStatusText: '办件状态',
       listTypeHistory: [],
@@ -140,13 +141,10 @@ export default {
     },
     // 切换类型
     changeType(e) {
-      console.log(e)
-      this.girdId = e[0].value
-      this.groupType.map((item) => {
-        if(item.id == this.form.girdId) {
-          this.form.girdName = item.girdName
-        }
-      })
+      this.status = e[0].label
+      this.datas = []
+      this.eventStatus = e[0].value
+      this.getList()
     },
 
     // 新增事件
diff --git a/src/sass/AppConflictMediation/detail.vue b/src/sass/AppConflictMediation/detail.vue
index 172ea23d..9ab88055 100644
--- a/src/sass/AppConflictMediation/detail.vue
+++ b/src/sass/AppConflictMediation/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="Detail">
+  <div class="Detail" v-if="showPage">
     <div class="header-top">
       <div class="avatars" v-if="data.name">{{ data.name.substring(data.name.length, data.name.length - 2) }}</div>
 
@@ -131,13 +131,14 @@ export default {
       data: {},
       id: '',
       doItShow: false,
+      showPage: false,
     }
   },
   computed: {},
   watch: {},
   onLoad(o) {
-    this.id = o.id
     this.$dict.load('realityStatus', 'clapDoStatus').then(() => {
+      this.id = o.id
       this.getDetail()
     })
 
@@ -153,6 +154,7 @@ export default {
       this.$http.post(`/app/appclapeventinfo/queryDetailById?id=${this.id}`).then((res) => {
         if (res?.data) {
           this.data = res.data
+          this.showPage = true
         }
       })
     },