From 4adfa4774e09f3b388335bb8dee5dea518856e5b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期日, 30 五月 2021 19:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/table/components/tabHandover.vue | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index 43896f1..c3e087a 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -19,8 +19,7 @@
import EnvironmentalRisk from '@components/table/components/EnvironmentalRisk'
import Pipeline from '@components/table/components/Pipeline'
import CorporateEmergency from '@components/table/components/CorporateEmergency'
-
-import { TopicList } from '../../../conf/Topic'
+import { topicList } from '../../../conf/Topic'
export default {
name: 'tabHandover',
components: {
@@ -37,8 +36,8 @@
return {
titleProp: '',
activeName: '姹℃煋婧�',
- topicList: TopicList, // tab椤�
- gcComp: PollutionSource // 榛樿鏄剧ず姹℃煋婧愬唴瀹�
+ topicList: topicList, // tab椤�
+ gcComp: PollutionSource
}
},
methods: {
--
Gitblit v1.8.0