From 4d35967cb6c487cacf760c96a7fb5312c04aa52f Mon Sep 17 00:00:00 2001 From: hh <2397241381@qq.com> Date: Sat, 2 Mar 2024 22:16:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/bigscreen.js | 33 +++++++++------- src/mixins/queryform.js | 38 +++++++++++++------ .../designer/components/dynamicComponents.vue | 4 +- .../configure/barCharts/widget-bar-compare.js | 8 ++-- .../widget-bar-double-yaxis-chart.js | 8 ++-- .../configure/barCharts/widget-bar-stack.js | 8 ++-- .../configure/barCharts/widget-barchart.js | 8 ++-- .../barlineCharts/widget-bar-line-stack.js | 8 ++-- .../barlineCharts/widget-barlinechart.js | 8 ++-- .../barlineCharts/widget-more-bar-line.js | 8 ++-- .../tools/configure/form/widget-select.js | 8 ++-- .../configure/funnelCharts/widget-funnel.js | 8 ++-- .../tools/configure/heatmap/widget-heatmap.js | 8 ++-- .../lineCharts/widget-line-compare.js | 8 ++-- .../configure/lineCharts/widget-line-stack.js | 8 ++-- .../configure/lineCharts/widget-linechart.js | 8 ++-- .../mapCharts/widget-airbubble-map.js | 8 ++-- .../configure/mapCharts/widget-bar-map.js | 8 ++-- .../configure/mapCharts/widget-line-map.js | 8 ++-- .../configure/percentCharts/widget-gauge.js | 8 ++-- .../percentCharts/widget-pie-percentage.js | 8 ++-- .../pieCharts/widget-pie-nightingale.js | 8 ++-- .../configure/pieCharts/widget-piechart.js | 8 ++-- .../configure/radarCharts/widget-radar.js | 8 ++-- .../scaleCharts/widget-scale-horizontal.js | 8 ++-- .../scaleCharts/widget-scale-vertical.js | 8 ++-- .../tools/configure/texts/widget-marquee.js | 8 ++-- .../tools/configure/texts/widget-table.js | 8 ++-- .../wordcloudCharts/widget-word-cloud.js | 8 ++-- .../config/barCharts/widget-bar-compare.js | 8 ++-- .../config/barCharts/widget-bar-stack.js | 8 ++-- .../config/barCharts/widget-barchart.js | 8 ++-- .../barlineCharts/widget-barlinechart.js | 8 ++-- .../barlineCharts/widget-more-bar-line.js | 8 ++-- .../config/funnelCharts/widget-funnel.js | 8 ++-- .../config/heatmap/widget-heatmap.js | 8 ++-- .../config/lineCharts/widget-line-compare.js | 8 ++-- .../config/lineCharts/widget-line-stack.js | 8 ++-- .../config/lineCharts/widget-linechart.js | 8 ++-- .../config/mapCharts/widget-airbubble-map.js | 8 ++-- .../config/mapCharts/widget-line-map.js | 8 ++-- .../config/percentCharts/widget-gauge.js | 8 ++-- .../percentCharts/widget-pie-percentage.js | 8 ++-- .../pieCharts/widget-pie-nightingale.js | 8 ++-- .../config/pieCharts/widget-piechart.js | 8 ++-- .../config/texts/widget-marquee.js | 8 ++-- .../config/texts/widget-table.js | 8 ++-- .../config/texts/widget-text.js | 8 ++-- .../wordcloudCharts/widget-word-cloud.js | 8 ++-- 49 files changed, 232 insertions(+), 211 deletions(-) diff --git a/src/api/bigscreen.js b/src/api/bigscreen.js index 78b8987..d702726 100644 --- a/src/api/bigscreen.js +++ b/src/api/bigscreen.js @@ -36,30 +36,35 @@ export function detailBysetId(data) { method: 'get', }) } - +// SBHY // 获取动态数据 export function getData(data) { - // return request({ - // url: 'reportDashboard/getData', - // method: 'post', - // headers: { 'Share-Token': getShareToken(), 'Authorization': getToken() }, - // data, - // }) - return null; + return new Promise((resolve) => { + let url = data.setCode + axios({ + method: 'get', + url: url, + }).then(res => { + resolve(res.data); + }).catch(err => { + resolve(null); + }) + }) + } // 导出大屏 export function exportDashboard(data) { - return new Promise((resolve) =>{ + return new Promise((resolve) => { axios({ - method:'get', + method: 'get', url: process.env.BASE_API + '/reportDashboard/export', headers: { 'Authorization': getToken() }, - params:data, - responseType:'blob' - }).then(res =>{ + params: data, + responseType: 'blob' + }).then(res => { resolve(res.data); - }).catch(err =>{ + }).catch(err => { resolve('error'); }) }) diff --git a/src/mixins/queryform.js b/src/mixins/queryform.js index ceb33d5..1eb66ab 100644 --- a/src/mixins/queryform.js +++ b/src/mixins/queryform.js @@ -1,5 +1,5 @@ import miment from 'miment' -import {getData} from '@/api/bigscreen' +import { getData } from '@/api/bigscreen' export default { data() { @@ -94,17 +94,33 @@ export default { handlerInputchange(val) { this.parseParamsBySelectInput(this.selectInput.keyname, val) }, - // 查询echarts 数据 + // 查询echarts 数据 () + // 前端统一数据类型为 + // { + // "chartType": "对应的图表类型", + // "data": { + // 对应的数据 + // } + // } queryEchartsData(params) { - const queryParams = this.toEchartsDataQueryParams(params) - console.log('---------------------------------------------------------------', queryParams) return new Promise(async (resolve) => { - const { code, data } = await getData(queryParams); - if (code != 200) return - const analysisData = this.analysisChartsData(params, data); - resolve(analysisData) + console.log('查询参数为', params) + const data = await getData(params); + console.log('数据为', data) + //判断data的chartType和params的chartType是否一致 + if (!data) { + this.$message.error("查询数据异常"); + return + } + if (data.chartType !== params.chartType) { + this.$message.error("查询数据类型不匹配"); + return + } else { + resolve(data.data) + } }) }, + /** * 将url参数解析到图表参数中 * 1. tenantCode=aaa @@ -117,11 +133,11 @@ export default { toEchartsDataQueryParams(params) { const queryParams = this.deepClone(params) const query = this.$route.query - if(!this.isIncludePoints(query)) { + if (!this.isIncludePoints(query)) { queryParams.contextData = { ...queryParams.contextData, ...query } } else { Object.keys(query).forEach(item => { - if(item.indexOf('.') > -1) { + if (item.indexOf('.') > -1) { const obj = {} const key1 = item.split('.')[0] const key2 = item.split('.')[1] @@ -140,7 +156,7 @@ export default { isIncludePoints(query) { let isPoints = false Object.keys(query).forEach(item => { - if(item.indexOf('.') > -1) { + if (item.indexOf('.') > -1) { isPoints = true } }) diff --git a/src/views/bigscreenDesigner/designer/components/dynamicComponents.vue b/src/views/bigscreenDesigner/designer/components/dynamicComponents.vue index 562ab17..030614f 100644 --- a/src/views/bigscreenDesigner/designer/components/dynamicComponents.vue +++ b/src/views/bigscreenDesigner/designer/components/dynamicComponents.vue @@ -2,11 +2,11 @@