diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue index 026823e97..116a8597f 100644 --- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue +++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue @@ -177,18 +177,11 @@ export default { this.legends = [] this.series = chartOption.series = this.handleTimeSeries(this.chartInfo, chartOption.series[0], this.chartData) // 生成series和legends - const styleOption = this.$lodash.get(this.chartInfo, 'param.option', {}) chartOption.series.forEach(item => { - if (item.lineStyle && styleOption.lineWidth != undefined) { - item.lineStyle.width = styleOption.lineWidth - } else if (item.lineStyle) { + if (item.lineStyle) { item.lineStyle.width = this.lineOption.lineWidth } - if (styleOption.pointSize != undefined) { - item.symbolSize = styleOption.pointSize - } else { - item.symbolSize = this.lineOption.pointSize - } + item.symbolSize = this.lineOption.pointSize }) this.isGrey = this.legends.map(() => false) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue index 0909cd515..768399423 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue @@ -251,7 +251,6 @@ export default { max: undefined }, dataLink: [], - option: undefined }, elements: [{ expression: '', legend: '', type: 'expert', id: '', name: 'A', state: 1, orderNum: 0 }], panel: '', diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue index e33ea04e4..970479836 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue @@ -454,44 +454,6 @@ - -
-
- {{$t('dashboard.dashboard.chartForm.option')}} -
-
- - - - - - - - -
-
-
@@ -1352,9 +1314,6 @@ export default { minStep () { return this.nzDefaultConfig.minStep }, - lineOption () { - return this.nzDefaultConfig.option - } }, data () { return { @@ -1449,8 +1408,7 @@ export default { min: undefined, max: undefined }, - dataLink: this.chartConfig.param.dataLink, - option: this.lineOption + dataLink: this.chartConfig.param.dataLink } this.$nextTick(() => { this.chartConfig.param.thresholds.push({ value: undefined, color: randomcolor() }) diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue index c2fc909e1..58a3d48ab 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue @@ -173,9 +173,6 @@ export default { panelChart }, computed: { - lineOption () { - return this.nzDefaultConfig.option - }, chartLastPosition () { return this.$store.getters.getChartLastPosition }, @@ -412,7 +409,6 @@ export default { max: undefined }, dataLink: [], - option: this.lineOption } } } @@ -645,9 +641,6 @@ export default { max: undefined } } - if (!obj.param.option) { - obj.param.option = this.lineOption - } } this.editChart = this.$lodash.cloneDeep(obj) this.oldData = this.$lodash.cloneDeep(obj) diff --git a/nezha-fronted/src/components/page/dashboard/dashboard.vue b/nezha-fronted/src/components/page/dashboard/dashboard.vue index d16699b02..5fea308dc 100644 --- a/nezha-fronted/src/components/page/dashboard/dashboard.vue +++ b/nezha-fronted/src/components/page/dashboard/dashboard.vue @@ -266,8 +266,7 @@ export default { min: undefined, max: undefined }, - dataLink: [], - option: undefined + dataLink: [] }, elements: [{ expression: '', legend: '', type: 'expert', id: '', name: 'A', state: 1, orderNum: 0, step: undefined }], panel: '',