diff --git a/src/mixins/queryform.js b/src/mixins/queryform.js index 8a3e882..f6a0242 100644 --- a/src/mixins/queryform.js +++ b/src/mixins/queryform.js @@ -98,7 +98,6 @@ export default { queryEchartsData(params) { return new Promise(async (resolve) => { const { code, data } = await getData(params); - // console.log(data,2222222); if (code != 200) return const analysisData = this.analysisChartsData(params, data); resolve(analysisData) diff --git a/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue b/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue index c460782..830bf05 100644 --- a/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue +++ b/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue @@ -440,8 +440,8 @@ export default { series[key].barWidth = optionsSetup.maxWidth; } } - console.log(series,'series'); - + // console.log(series,'series'); + this.options.series = series; }, // tooltip 提示语设置 @@ -559,9 +559,8 @@ export default { optionsData.dataType == "staticData" ? this.staticDataFn(optionsData.staticData, optionsSetup) : this.dynamicDataFn( - optionsData.dynamicData, - optionsData.refreshTime, - optionsSetup + optionsData.dynamicData, + optionsData.refreshTime ); }, //去重 @@ -611,36 +610,22 @@ export default { this.setOptionsLegendName(legendName); }, // 动态数据 - dynamicDataFn(val, refreshTime, optionsSetup) { + dynamicDataFn(val, refreshTime) { if (!val) return; if (this.ispreview) { - this.getEchartData(val, optionsSetup); + this.getEchartData(val); this.flagInter = setInterval(() => { - this.getEchartData(val, optionsSetup); + this.getEchartData(val); }, refreshTime); } else { - this.getEchartData(val, optionsSetup); + this.getEchartData(val); } }, - getEchartData(val, optionsSetup) { + getEchartData(val) { const data = this.queryEchartsData(val); data.then(res => { - this.renderingFn(optionsSetup, res); + this.staticDataFn(res); }); - }, - renderingFn(optionsSetup, val) { - const legendName = []; - this.options.yAxis[1]['data'] = val.xAxis; - if (val.series[0].type == "bar"){ - this.options.series[0]['name'] = val.series[0].name; - this.options.series[0]['data'] = val.series[0].data; - this.options.series[1]['name'] = val.series[1].name; - this.options.series[1]['data'] = val.series[1].data; - legendName.push(val.series[0].name); - legendName.push(val.series[1].name); - } - this.options.legend['data'] = legendName; - this.setOptionsLegendName(legendName); } } }; diff --git a/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue b/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue index 2114368..9c47e2b 100644 --- a/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue +++ b/src/views/bigscreenDesigner/designer/widget/bar/widgetBarchart.vue @@ -293,14 +293,12 @@ export default { }, // 数据解析 setOptionsData() { - const optionsSetup = this.optionsSetup; const optionsData = this.optionsData; // 数据类型 静态 or 动态 optionsData.dataType == "staticData" ? this.staticDataFn(optionsData.staticData) : this.dynamicDataFn( optionsData.dynamicData, - optionsData.refreshTime, - optionsSetup + optionsData.refreshTime ); }, // 静态数据 @@ -330,44 +328,46 @@ export default { } }, // 动态数据 - dynamicDataFn(val, refreshTime, optionsSetup) { + dynamicDataFn(val, refreshTime) { if (!val) return; if (this.ispreview) { - this.getEchartData(val, optionsSetup); + this.getEchartData(val); this.flagInter = setInterval(() => { - this.getEchartData(val, optionsSetup); + this.getEchartData(val); }, refreshTime); } else { - this.getEchartData(val, optionsSetup); + this.getEchartData(val); } }, - getEchartData(val, optionsSetup) { + getEchartData(val) { const data = this.queryEchartsData(val); + console.log("datassssssssssssssss",data) data.then(res => { - this.renderingFn(optionsSetup, res); + this.staticDataFn(res); + // renderingFn(optionsSetup, res); }); - }, - renderingFn(optionsSetup, val) { - // x轴 - if (optionsSetup.verticalShow) { - this.options.xAxis.data = []; - this.options.yAxis.data = val.xAxis; - this.options.xAxis.type = "value"; - this.options.yAxis.type = "category"; - } else { - this.options.xAxis.data = val.xAxis; - this.options.yAxis.data = []; - this.options.xAxis.type = "category"; - this.options.yAxis.type = "value"; - } - // series - const series = this.options.series; - for (const i in series) { - if (series[i].type == "bar") { - series[i].data = val.series[i].data; - } - } } + // renderingFn(optionsSetup, val) { + // // x轴 + // if (optionsSetup.verticalShow) { + // this.options.xAxis.data = []; + // this.options.yAxis.data = val.xAxis; + // this.options.xAxis.type = "value"; + // this.options.yAxis.type = "category"; + // } else { + // this.options.xAxis.data = val.xAxis; + // this.options.yAxis.data = []; + // this.options.xAxis.type = "category"; + // this.options.yAxis.type = "value"; + // } + // // series + // const series = this.options.series; + // for (const i in series) { + // if (series[i].type == "bar") { + // series[i].data = val.series[i].data; + // } + // } + // } } }; diff --git a/src/views/bigscreenDesigner/designer/widget/bar/widgetCapsuleChart.vue b/src/views/bigscreenDesigner/designer/widget/bar/widgetCapsuleChart.vue index a789688..9a00a0f 100644 --- a/src/views/bigscreenDesigner/designer/widget/bar/widgetCapsuleChart.vue +++ b/src/views/bigscreenDesigner/designer/widget/bar/widgetCapsuleChart.vue @@ -53,6 +53,13 @@ export default { deep: true } }, + // mounted() { + // this.optionsStyle = this.value.position; + // this.optionsData = this.value.data; + // this.optionsCollapse = this.value.setup; + // this.optionsSetup = this.value.setup; + // this.editorOptions(); + // }, created() { this.optionsStyle = this.value.position; this.optionsData = this.value.data; @@ -84,6 +91,7 @@ export default { }, setOptionsData() { const optionsData = this.optionsData; // 数据类型 静态 or 动态 + console.log("optionsData.dataType",optionsData.dataType); optionsData.dataType == "staticData" ? this.staticDataFn(optionsData.staticData) : this.dynamicDataFn(optionsData.dynamicData, optionsData.refreshTime); @@ -107,11 +115,10 @@ export default { getEchartData(val) { const data = this.queryEchartsData(val); data.then(res => { - this.renderingFn(res); + this.options.data = res; + // console.log("WidgetCapsuleChart2222====",res); + // this.staticDataFn(res); }); - }, - renderingFn(val) { - this.options.data=val; } } }; diff --git a/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue b/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue index 780ca87..9218a6a 100644 --- a/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue +++ b/src/views/bigscreenDesigner/designer/widget/barline/widgetBarlinechart.vue @@ -127,7 +127,7 @@ export default { this.optionsCollapse = this.value.collapse; this.optionsSetup = this.value.setup; this.editorOptions(); - + }, methods: { // 修改图标options属性 @@ -484,7 +484,8 @@ export default { getEchartData(val) { const data = this.queryEchartsData(val); data.then(res => { - this.renderingFn(res); + this.staticDataFn(res); + // this.renderingFn(res); }); }, renderingFn(val) { diff --git a/src/views/bigscreenDesigner/designer/widget/percent/widgetPiePercentageChart.vue b/src/views/bigscreenDesigner/designer/widget/percent/widgetPiePercentageChart.vue index a039607..9cebe8f 100644 --- a/src/views/bigscreenDesigner/designer/widget/percent/widgetPiePercentageChart.vue +++ b/src/views/bigscreenDesigner/designer/widget/percent/widgetPiePercentageChart.vue @@ -454,10 +454,12 @@ export default { }, getEchartData(val) { const data = this.queryEchartsData(val); + // console.log("ddddddddd",data) data.then(res => { - this.options.title.text = "{nums|" + res[0].value + "}{percent|%}"; - this.options.series[6]["data"][0]["value"] = res[0].value; - this.options.series[6]["data"][1]["value"] = 100 - res[0].value; + this.staticDataFn(res); + // this.options.title.text = "{nums|" + res[0].value + "}{percent|%}"; + // this.options.series[6]["data"][0]["value"] = res[0].value; + // this.options.series[6]["data"][1]["value"] = 100 - res[0].value; }); } } diff --git a/src/views/screenDesigner/widget/barCharts/widgetBarCompareChart.vue b/src/views/screenDesigner/widget/barCharts/widgetBarCompareChart.vue index d0ce849..36276c8 100644 --- a/src/views/screenDesigner/widget/barCharts/widgetBarCompareChart.vue +++ b/src/views/screenDesigner/widget/barCharts/widgetBarCompareChart.vue @@ -611,22 +611,13 @@ export default { getEchartData(val, optionsSetup) { const data = this.queryEchartsData(val); data.then(res => { + console.log("柱状对比图",res); + // this.staticDataFn(res) this.renderingFn(optionsSetup, res); }); }, renderingFn(optionsSetup, val) { - const legendName = []; - this.options.yAxis[1]['data'] = val.xAxis; - if (val.series[0].type == "bar"){ - this.options.series[0]['name'] = val.series[0].name; - this.options.series[0]['data'] = val.series[0].data; - this.options.series[1]['name'] = val.series[1].name; - this.options.series[1]['data'] = val.series[1].data; - legendName.push(val.series[0].name); - legendName.push(val.series[1].name); - } - this.options.legend['data'] = legendName; - this.setOptionsLegendName(legendName); + this.staticDataFn(val) } } };