diff --git a/src/project/qujing/AppConflictMediation/List.vue b/src/project/qujing/AppConflictMediation/List.vue
index 4a9639a2..19c417a6 100644
--- a/src/project/qujing/AppConflictMediation/List.vue
+++ b/src/project/qujing/AppConflictMediation/List.vue
@@ -53,7 +53,7 @@
       <AiEmpty v-if="!datas.length"></AiEmpty>
     </template>
 
-    <u-select v-model="showGird" :list="$dict.getDict('clapEventStatusAll')" label-name="dictName" value-name="dictValue" @confirm="changeType"/>
+    <u-select v-model="showGird" :list="$dict.getDict('conflictEventStatusAll')" label-name="dictName" value-name="dictValue" @confirm="changeType"/>
 
     <div class="pad-b120" v-if="datas.length"></div>
   </div>
@@ -75,12 +75,9 @@ export default {
       groupName: '',
       girdNameText: '所属网格',
       showType: false,
-      listType: [],
       status: '',
       eventStatus: '',
       eventStatusText: '办件状态',
-      listTypeHistory: [],
-      listTypeAll: [],
       groupType: [],
       showGird: false,
       staticName: [
@@ -130,11 +127,7 @@ export default {
       this.getList(),
       this.getStaticList()
     ]).finally(() => uni.hideLoading())
-    this.$dict.load('conflictEventStatus', 'clapEventStatusAll', 'clapEventStatusHistory').then(() => {
-      this.listTypeAll = this.$dict.getDict('clapEventStatusAll')
-      this.listTypeHistory = this.$dict.getDict('clapEventStatusHistory')
-      this.listType = this.listTypeAll
-    })
+    this.$dict.load('conflictEventStatus', 'conflictEventStatusAll')
   },
   methods: {
     getList() {
@@ -194,11 +187,6 @@ export default {
       this.girdNameText = '所属网格'
       this.eventStatusText = '办件状态'
       this.currentTabs = index
-      if (index == 0) {
-        this.listType = this.listTypeAll
-      } else {
-        this.listType = this.listTypeHistory
-      }
       this.getList()
     },