修复merge

.gitignore

@@ -0,0 +1,28 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+.DS_Store
+dist
+dist-ssr
+coverage
+*.local
+
+/cypress/videos/
+/cypress/screenshots/
+
+# Editor directories and files
+.vscode
+!.vscode/extensions.json
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

src/components/Tag.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="tag-style">
-    <el-tag v-if="tagConfig.isType" :type="tagConfig.listClass" :effect="tagConfig.theme || 'plain'">
+    <el-tag v-if="tagConfig?.isType" :type="tagConfig?.listClass" :effect="tagConfig?.theme || 'plain'">
       {{ filterDict(cacheStore.getDict(dictType), value) }}
     </el-tag>
-    <el-tag v-else :color="tagConfig.listClass" :effect="tagConfig.theme || 'plain'"
+    <el-tag v-else :color="tagConfig?.listClass" :effect="tagConfig?.theme || 'plain'"
             :class="{'null-tag':filterDict(cacheStore.getDict(dictType), value)===undefined}">
       {{ filterDict(cacheStore.getDict(dictType), value) }}
     </el-tag>
@@ -45,7 +45,7 @@ const filterDict = (data, value) => {
       tagConfig.value = data.find(item => item.value == value)
     }
   }
-  return tagConfig.value.label
+  return tagConfig.value?.label || '未知'
 }
 </script>
 

src/views/home/index.vue

@@ -6,7 +6,7 @@
     </div>
     <div class="call-history"><h3 >历史通话记录</h3>
       <fvTable ref="tableIns" :tableConfig="tableConfig" :data="mockData" @headBtnClick="headBtnClick"></fvTable>
-      <Voice ref="voiceRef" />
+      <voice ref="voiceRef" />
       <infoLiveCall ref="infoLiveCallRef"/>
     </div>
   </div>