数据接口完成

This commit is contained in:
hh 2024-03-02 22:16:39 +08:00
parent 32fe568e3f
commit 4d35967cb6
49 changed files with 232 additions and 211 deletions

View File

@ -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');
})
})

View File

@ -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
}
})

View File

@ -2,11 +2,11 @@
<div>
<el-form label-width="100px" label-position="left">
<el-form-item label="数据接口">
<!-- 请输入数据接口URL不需要添加地址 -->
<!-- 请输入数据接口URL -->
<el-input
size="mini"
v-model="dataSetValue"
placeholder="不需要添加地址前缀"
placeholder="请输入数据接口URL"
/>
</el-form-item>
<el-button

View File

@ -777,10 +777,10 @@ export const widgetBarCompare = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -865,10 +865,10 @@ export const widgetBarDoubleYaxis = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -752,10 +752,10 @@ export const widgetBarStack = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -792,10 +792,10 @@ export const widgetBarchart = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -937,10 +937,10 @@ export const widgetBarLineStack = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -919,10 +919,10 @@ export const widgetBarlinechart = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -923,10 +923,10 @@ export const widgetMoreBarLine = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -77,10 +77,10 @@ export const widgetSelect = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -334,10 +334,10 @@ export const widgetFunnel = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -570,10 +570,10 @@ export const widgetHeatmap = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -775,10 +775,10 @@ export const widgetLineCompare = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -707,10 +707,10 @@ export const widgetLineStack = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -714,10 +714,10 @@ export const widgetLinechart = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -327,10 +327,10 @@ export const widgetAirbubbleMap = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -386,10 +386,10 @@ export const widgetBarMap = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -383,10 +383,10 @@ export const widgetLineMap = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -350,10 +350,10 @@ export const widgetGauge = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -179,10 +179,10 @@ export const widgetPiePercentage = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -366,10 +366,10 @@ export const widgetPieNightingale = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -366,10 +366,10 @@ export const widgetPiechart = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -499,10 +499,10 @@ export const widgetRadar = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -429,10 +429,10 @@ export const widgetScaleHorizontal = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -429,10 +429,10 @@ export const widgetScaleVertical = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -100,10 +100,10 @@ export const widgetMarquee = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -222,10 +222,10 @@ export const widgetTable = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -231,10 +231,10 @@ export const widgetWordCloud = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -571,10 +571,10 @@ export const widgetBarCompare = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -576,10 +576,10 @@ export const widgetBarStack = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -514,10 +514,10 @@ export const widgetBarchart = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -701,10 +701,10 @@ export const widgetBarlinechart = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -674,10 +674,10 @@ export const widgetMoreBarLine = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -308,10 +308,10 @@ export const widgetFunnel = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -511,10 +511,10 @@ export const widgetHeatmap = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -696,10 +696,10 @@ export const widgetLineCompare = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -596,10 +596,10 @@ export const widgetLineStack = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -526,10 +526,10 @@ export const widgetLinechart = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -272,10 +272,10 @@ export const widgetAirbubbleMap = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -357,10 +357,10 @@ export const widgetLineMap = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -302,10 +302,10 @@ export const widgetGauge = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -179,10 +179,10 @@ export const widgetPiePercentage = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -327,10 +327,10 @@ export const widgetPieNightingale = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -327,10 +327,10 @@ export const widgetPiechart = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -100,10 +100,10 @@ export const widgetMarquee = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -221,10 +221,10 @@ export const widgetTable = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -105,10 +105,10 @@ export const widgetText = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},

View File

@ -205,10 +205,10 @@ export const widgetWordCloud = {
code: 'staticData',
name: '静态数据',
},
// {
// code: 'dynamicData',
// name: '动态数据',
// },
{
code: 'dynamicData',
name: '动态数据',
},
],
value: 'staticData',
},