diff --git a/components/layout/AiDvSummary/AiDvSummary.vue b/components/layout/AiDvSummary/AiDvSummary.vue index 63de4002..1b0a15a4 100644 --- a/components/layout/AiDvSummary/AiDvSummary.vue +++ b/components/layout/AiDvSummary/AiDvSummary.vue @@ -1,7 +1,6 @@ @@ -26,11 +25,13 @@ import Summary16 from './components/Summary16' import Summary17 from './components/Summary17' import Summary18 from './components/Summary18' import Summary19 from "./components/Summary19"; +import Summary20 from "./components/Summary20"; export default { name: 'AiDvSummary', components: { + Summary20, Summary19, Summary0, Summary1, diff --git a/components/layout/AiDvSummary/components/Summary20.vue b/components/layout/AiDvSummary/components/Summary20.vue new file mode 100644 index 00000000..27e0452c --- /dev/null +++ b/components/layout/AiDvSummary/components/Summary20.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/packages/bigscreen/designer/components/componentConfig.vue b/packages/bigscreen/designer/components/componentConfig.vue index 35644bbb..e9655a62 100644 --- a/packages/bigscreen/designer/components/componentConfig.vue +++ b/packages/bigscreen/designer/components/componentConfig.vue @@ -202,19 +202,16 @@ -
- -
- - - - -
-
+ + + + + +
@@ -237,10 +234,11 @@ import ConfigItem from "./configItem.vue"; import AiDialogBtn from "dui/packages/layout/AiDialogBtn.vue"; import {monitorTypes} from "../config"; +import AiDvSummary from "../../../../components/layout/AiDvSummary/AiDvSummary.vue"; export default { name: 'componentConfig', - components: {AiDialogBtn, ConfigItem}, + components: {AiDvSummary, AiDialogBtn, ConfigItem}, props: { config: {default: () => ({})}, instance: Function, @@ -250,9 +248,6 @@ export default { return { borderList: ['border0', 'border1', 'border2', 'border3', 'border4', 'border5', 'border6', 'border7', 'border8', 'border9', 'border10', 'border11', 'border12', 'border13', 'border14', 'border15'],//边框待选项 - summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary6', 'summary5', - 'summary7', 'summary8', 'summary9', 'summary10', 'summary11', 'summary12', 'summary13', 'summary14', - 'summary15', 'summary16', 'summary17', 'summary18', 'summary19'],//汇总待选项 //是否显示排名 tableStatus: [ {label: '是', value: '1'}, @@ -262,6 +257,9 @@ export default { monitorTypes } }, + computed: { + summaryList: () => Object.keys(AiDvSummary.components) + } }