diff --git a/project/oms/apps/develop/AppDeployCustom/add.vue b/project/oms/apps/develop/AppDeployCustom/add.vue
index c9a90f43..ed91b34e 100644
--- a/project/oms/apps/develop/AppDeployCustom/add.vue
+++ b/project/oms/apps/develop/AppDeployCustom/add.vue
@@ -332,7 +332,7 @@ export default {
           } else if (type == 'web') {
             const {desc} = sysInfo
             sysInfo.desc = JSON.parse(desc || null)
-            sysInfo.ssl = sysInfo.ssl.replace(/"/g, "'")
+            sysInfo.ssl = sysInfo.ssl?.replace(/"/g, "'")
             this.form.extra = {isSingleService, homePage, hmt, dv, downloadCenter, showTool, helpDoc, customerService, sysInfo, appQRCode, base}
           } else if (type == 'wxwork') {
             this.form.extra = {isSingleService, homePage, hmt, customLogin, base}
diff --git a/project/qujing/app/AppConflictMediation/components/Detail.vue b/project/qujing/app/AppConflictMediation/components/Detail.vue
index f4eeddae..b9b89cb2 100644
--- a/project/qujing/app/AppConflictMediation/components/Detail.vue
+++ b/project/qujing/app/AppConflictMediation/components/Detail.vue
@@ -9,7 +9,7 @@
           <template #content>
             <ai-wrapper>
               <ai-info-item label="上报人员" :value="detail.name"/>
-              <ai-info-item label="当前状态" :value="dict.getLabel('clapEventStatus', detail.eventStatus)"></ai-info-item>
+              <ai-info-item label="当前状态" :value="dict.getLabel('conflictEventStatus', detail.eventStatus)"></ai-info-item>
               <ai-info-item label="上报时间">{{ detail.createTime }}</ai-info-item>
               <ai-info-item label="事件类型">{{ detail.groupName }}</ai-info-item>
               <ai-info-item label="事件描述" isLine>{{ detail.content }}</ai-info-item>
@@ -71,7 +71,7 @@ export default {
   },
 
   created() {
-    this.dict.load('clapEventStatus').then(() => {
+    this.dict.load('conflictEventStatus').then(() => {
       this.getDetail()
     })
   },
diff --git a/project/qujing/app/AppConflictMediation/components/List.vue b/project/qujing/app/AppConflictMediation/components/List.vue
index a6d1ac36..8563fd06 100644
--- a/project/qujing/app/AppConflictMediation/components/List.vue
+++ b/project/qujing/app/AppConflictMediation/components/List.vue
@@ -10,7 +10,7 @@
               v-model="search.eventStatus"
               clearable
               placeholder="处理状态"
-              :selectList="dict.getDict('clapEventStatus')"
+              :selectList="dict.getDict('conflictEventStatus')"
               @change="search.current = 1, getList()">
           </ai-select>
         </template>
@@ -74,7 +74,7 @@ export default {
         {prop: 'content', label: '内容描述', width: '300px'},
         {prop: 'groupName', label: '事件类型', align: 'center'},
         {prop: 'girdName', label: '所属网格', align: 'center'},
-        {prop: 'eventStatus', label: '事件状态', align: 'center', dict:"clapEventStatus"},
+        {prop: 'eventStatus', label: '事件状态', align: 'center', dict:"conflictEventStatus"},
         {prop: 'userName', label: '上报人', align: 'center'},
         {slot: 'options'}
       ]
@@ -82,7 +82,7 @@ export default {
   },
 
   created() {
-    this.dict.load('clapEventStatus').then(() => {
+    this.dict.load('conflictEventStatus').then(() => {
       this.getList()
     })