Commit 64e5a439d540a5d14f6fa371fe8599582ab69185
1 parent
572f20ef
1、添加表格自动换行
2添加表格列字体对其方式特殊属性 3添加折线图滑块默认100%
Showing
10 changed files
with
17 additions
and
102 deletions
src/mixins/queryform.js
| ... | ... | @@ -118,29 +118,16 @@ export default { |
| 118 | 118 | //barlineCharts 下拉框 |
| 119 | 119 | const chartType = params.chartType |
| 120 | 120 | // console.log(data,chartType,'33333'); |
| 121 | - if (chartType == "widget-linechart") { | |
| 122 | - return this.barOrLineChartFn(params.chartProperties, data); | |
| 123 | - }else if (chartType == "widget-barlinechart" ) { | |
| 124 | - return this.barLineChartFn(params.chartProperties, data); | |
| 125 | - // } else if ( chartType == "widget-barchart") { | |
| 126 | - // return this.barOrLineChartFn(params.chartProperties, data); | |
| 127 | - } else if ( | |
| 128 | - chartType == "widget-piechart" || | |
| 129 | - chartType == "widget-funnel" | |
| 130 | - ) { | |
| 131 | - return this.piechartFn(params.chartProperties, data); | |
| 132 | - } else if (chartType == "widget-text") { | |
| 121 | + if (chartType == "widget-text") { | |
| 133 | 122 | return this.widgettext(params.chartProperties, data) |
| 134 | - } else if (chartType == "widget-stackchart") { | |
| 135 | - return this.stackChartFn(params.chartProperties, data); | |
| 136 | - // return this.stackChartFn(params.chartProperties, data) | |
| 137 | - } else if (chartType == "widget-coord") { | |
| 123 | + } else if (chartType == "widget-coord") { | |
| 138 | 124 | return this.coordChartFn(params.chartProperties, data) |
| 139 | 125 | } else if (chartType == "widget-linemap") { |
| 140 | 126 | return this.linemapChartFn(params.chartProperties, data) |
| 141 | - } else if (chartType == "widget-radar") { | |
| 142 | - return this.radarChartFn(params.chartProperties, data) | |
| 143 | - } else if (chartType == "widget-select") { | |
| 127 | + // } else if (chartType == "widget-radar") { | |
| 128 | + // return this.radarChartFn(params.chartProperties, data) | |
| 129 | + } | |
| 130 | + else if (chartType == "widget-select") { | |
| 144 | 131 | return this.selectChartFn(params.chartProperties, data) |
| 145 | 132 | } else { |
| 146 | 133 | return data | ... | ... |
src/views/bigscreenDesigner/designer/widget/funnel/widgetConicalColumnChart.vue
src/views/bigscreenDesigner/designer/widget/funnel/widgetFunnel.vue
src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue
| ... | ... | @@ -670,19 +670,7 @@ export default { |
| 670 | 670 | }); |
| 671 | 671 | }, |
| 672 | 672 | renderingFn(optionsSetup, val) { |
| 673 | - const legendName = []; | |
| 674 | - this.options.xAxis[0]['data'] = val.xAxis; | |
| 675 | - this.options.xAxis[1]['data'] = val.xAxis; | |
| 676 | - if (val.series[0].type == "line") { | |
| 677 | - this.options.series[0]['name'] = val.series[0].name; | |
| 678 | - this.options.series[0]['data'] = val.series[0].data; | |
| 679 | - this.options.series[1]['name'] = val.series[1].name; | |
| 680 | - this.options.series[1]['data'] = val.series[1].data; | |
| 681 | - legendName.push(val.series[0].name); | |
| 682 | - legendName.push(val.series[1].name); | |
| 683 | - } | |
| 684 | - this.options.legend['data'] = legendName; | |
| 685 | - this.setOptionsLegendName(legendName); | |
| 673 | + this.staticDataFn(val) | |
| 686 | 674 | } |
| 687 | 675 | } |
| 688 | 676 | }; | ... | ... |
src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue
| ... | ... | @@ -450,64 +450,6 @@ export default { |
| 450 | 450 | }, |
| 451 | 451 | renderingFn(optionsSetup, val) { |
| 452 | 452 | this.staticDataFn(val); |
| 453 | - //颜色 | |
| 454 | - // const customColor = optionsSetup.customColor; | |
| 455 | - // const arrColor = []; | |
| 456 | - // for (let i = 0; i < customColor.length; i++) { | |
| 457 | - // arrColor.push(customColor[i].color); | |
| 458 | - // } | |
| 459 | - // // x轴 | |
| 460 | - // if (optionsSetup.verticalShow) { | |
| 461 | - // this.options.xAxis.data = []; | |
| 462 | - // this.options.yAxis.data = val.xAxis; | |
| 463 | - // this.options.xAxis.type = "value"; | |
| 464 | - // this.options.yAxis.type = "category"; | |
| 465 | - // } else { | |
| 466 | - // this.options.xAxis.data = val.xAxis; | |
| 467 | - // this.options.yAxis.data = []; | |
| 468 | - // this.options.xAxis.type = "category"; | |
| 469 | - // this.options.yAxis.type = "value"; | |
| 470 | - // } | |
| 471 | - // const series = []; | |
| 472 | - // const legendName = []; | |
| 473 | - // for (const i in val.series) { | |
| 474 | - // if (val.series[i].type == "line") { | |
| 475 | - // series.push({ | |
| 476 | - // name: val.series[i].name, | |
| 477 | - // type: "line", | |
| 478 | - // data: val.series[i].data, | |
| 479 | - // width: optionsSetup.lineWidth, | |
| 480 | - // symbol: optionsSetup.symbol, | |
| 481 | - // showSymbol: optionsSetup.markPoint, | |
| 482 | - // symbolSize: optionsSetup.pointSize, | |
| 483 | - // symbolColor: arrColor[i], | |
| 484 | - // smooth: optionsSetup.smoothCurve, | |
| 485 | - // // 线条 | |
| 486 | - // lineStyle: { | |
| 487 | - // color: arrColor[i], | |
| 488 | - // width: optionsSetup.lineWidth, | |
| 489 | - // }, | |
| 490 | - // //点 | |
| 491 | - // itemStyle: { | |
| 492 | - // color: arrColor[i], | |
| 493 | - // }, | |
| 494 | - // areaStyle: this.getOptionArea(), | |
| 495 | - // // 标题部分 | |
| 496 | - // label: { | |
| 497 | - // show: optionsSetup.isShow, | |
| 498 | - // position: "top", | |
| 499 | - // distance: 10, | |
| 500 | - // fontSize: optionsSetup.fontSize, | |
| 501 | - // color: optionsSetup.subTextColor, | |
| 502 | - // fontWeight: optionsSetup.fontWeight, | |
| 503 | - // }, | |
| 504 | - // }) | |
| 505 | - // } | |
| 506 | - // legendName.push(val.series[i].name); | |
| 507 | - // } | |
| 508 | - // this.options.series = series; | |
| 509 | - // this.options.legend['data'] = legendName; | |
| 510 | - // this.setOptionsLegendName(legendName); | |
| 511 | 453 | } |
| 512 | 454 | } |
| 513 | 455 | }; | ... | ... |
src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue
src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue
src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue
| ... | ... | @@ -244,11 +244,7 @@ export default { |
| 244 | 244 | }); |
| 245 | 245 | }, |
| 246 | 246 | renderingFn(val) { |
| 247 | - for (const key in this.options.series) { | |
| 248 | - if (this.options.series[key].type == "pie") { | |
| 249 | - this.options.series[key].data = val; | |
| 250 | - } | |
| 251 | - } | |
| 247 | + this.staticDataFn(val) | |
| 252 | 248 | const arrColorData = []; |
| 253 | 249 | for (let i = 0; i < val.length; i++) { |
| 254 | 250 | const res = val[i]; | ... | ... |
src/views/bigscreenDesigner/designer/widget/pie/widgetRadioPiechart.vue
| ... | ... | @@ -90,7 +90,7 @@ export default { |
| 90 | 90 | this.optionsCollapse = this.value.collapse; |
| 91 | 91 | this.optionsSetup = this.value.setup; |
| 92 | 92 | this.editorOptions(); |
| 93 | - | |
| 93 | + | |
| 94 | 94 | }, |
| 95 | 95 | methods: { |
| 96 | 96 | // 修改图标options属性 |
| ... | ... | @@ -244,7 +244,7 @@ export default { |
| 244 | 244 | getEchartData(val) { |
| 245 | 245 | const data = this.queryEchartsData(val); |
| 246 | 246 | data.then(res => { |
| 247 | - this.renderingFn(res); | |
| 247 | + this.staticDataFn(res); | |
| 248 | 248 | }); |
| 249 | 249 | }, |
| 250 | 250 | renderingFn(val) { | ... | ... |
src/views/bigscreenDesigner/designer/widget/radar/widgetRadar.vue