diff --git a/src/components/ChartItemSetting/GlobalSetting.vue b/src/components/ChartItemSetting/GlobalSetting.vue index a1aca2d3..2a8d6307 100644 --- a/src/components/ChartItemSetting/GlobalSetting.vue +++ b/src/components/ChartItemSetting/GlobalSetting.vue @@ -257,7 +257,6 @@ const props = defineProps({ } }) -console.log(props.data) const { title, xAxis, yAxis, legend } = toRefs(props.data) diff --git a/src/components/ChartItemSetting/SettingItemBox.vue b/src/components/ChartItemSetting/SettingItemBox.vue index 78e37672..88edc3d3 100644 --- a/src/components/ChartItemSetting/SettingItemBox.vue +++ b/src/components/ChartItemSetting/SettingItemBox.vue @@ -25,6 +25,7 @@ $leftWidth: 60px; .item-left { width: $leftWidth; text-align: left; + margin-top: 4px; margin-left: 10px; font-size: 12px; } diff --git a/src/views/chart/ContentDetails/components/CanvasPage/components/ChartDataSetting/index.vue b/src/views/chart/ContentDetails/components/CanvasPage/components/ChartDataSetting/index.vue new file mode 100644 index 00000000..b0a11877 --- /dev/null +++ b/src/views/chart/ContentDetails/components/CanvasPage/components/ChartDataSetting/index.vue @@ -0,0 +1,7 @@ + + + \ No newline at end of file diff --git a/src/views/chart/ContentDetails/components/CanvasPage/components/ChartThemSetting/index.vue b/src/views/chart/ContentDetails/components/CanvasPage/components/ChartThemSetting/index.vue deleted file mode 100644 index 720876a4..00000000 --- a/src/views/chart/ContentDetails/components/CanvasPage/components/ChartThemSetting/index.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/chart/ContentDetails/components/CanvasPage/index.vue b/src/views/chart/ContentDetails/components/CanvasPage/index.vue index 40077fe0..32355265 100644 --- a/src/views/chart/ContentDetails/components/CanvasPage/index.vue +++ b/src/views/chart/ContentDetails/components/CanvasPage/index.vue @@ -128,8 +128,8 @@ const switchSelectColorLoading = ref(false) const ChartThemeColor = loadAsyncComponent(() => import('./components/ChartThemeColor/index.vue') ) -const ChartThemSetting = loadAsyncComponent(() => - import('./components/ChartThemSetting/index.vue') +const ChartDataSetting = loadAsyncComponent(() => + import('./components/ChartDataSetting/index.vue') ) // 页面设置 @@ -153,9 +153,9 @@ const globalTabList = [ }, { key: 'ChartSysSetting', - title: '全局图表', + title: '数据配置', icon: ZAxisIcon, - render: ChartThemSetting + render: ChartDataSetting } ] diff --git a/src/views/chart/ContentDetails/components/ChartSetting/index.vue b/src/views/chart/ContentDetails/components/ChartSetting/index.vue index 3a3b9f06..48ea3add 100644 --- a/src/views/chart/ContentDetails/components/ChartSetting/index.vue +++ b/src/views/chart/ContentDetails/components/ChartSetting/index.vue @@ -1,26 +1,35 @@