Commit 03e4086c authored by 莫坚培's avatar 莫坚培

fix: 修改柱状图取错字段的问题

parent f9eb9296
...@@ -1055,7 +1055,6 @@ function loopRenderBarchart(poolData, resData, resCode) { ...@@ -1055,7 +1055,6 @@ function loopRenderBarchart(poolData, resData, resCode) {
} }
let resValue = JSON.parse(resData[key]) let resValue = JSON.parse(resData[key])
if (!resValue) { if (!resValue) {
return return
} }
...@@ -1092,7 +1091,6 @@ function loopRenderBarchart(poolData, resData, resCode) { ...@@ -1092,7 +1091,6 @@ function loopRenderBarchart(poolData, resData, resCode) {
if(requestLoopVaribleCache[cacheKey] === undefined) { if(requestLoopVaribleCache[cacheKey] === undefined) {
requestLoopVaribleCache[cacheKey] = dataList requestLoopVaribleCache[cacheKey] = dataList
} else { } else {
console.log('柱状图缓存', requestLoopVaribleCache[cacheKey])
dataList = requestLoopVaribleCache[cacheKey] dataList = requestLoopVaribleCache[cacheKey]
} }
...@@ -1109,13 +1107,13 @@ function loopRenderBarchart(poolData, resData, resCode) { ...@@ -1109,13 +1107,13 @@ function loopRenderBarchart(poolData, resData, resCode) {
}) })
if (poolData.option.AxisChartYAxis.yAxisData) { if (poolData.option.AxisChartYAxis.yAxisData) {
chartOption.yAxis[0].data = resData.x ? resData.x : poolData.option.BarChartData.option.AxisChartYAxis.yAxisData chartOption.yAxis[0].data = resValue.x ? resValue.x : poolData.option.BarChartData.option.AxisChartYAxis.yAxisData
let list = chartOption.yAxis[0].data[0] let list = chartOption.yAxis[0].data[0]
if (left <= getTextWidth(list, 16)) { if (left <= getTextWidth(list, 16)) {
left = getTextWidth(list, 16) left = getTextWidth(list, 16)
} }
} else { } else {
chartOption.xAxis[0].data = resData.x ? resData.x : poolData.option.XData chartOption.xAxis[0].data = resValue.x ? resValue.x : poolData.option.XData
} }
chartOption.series = [] chartOption.series = []
...@@ -1193,7 +1191,6 @@ function loopRenderLinechart(poolData, resData, resCode) { ...@@ -1193,7 +1191,6 @@ function loopRenderLinechart(poolData, resData, resCode) {
if(requestLoopVaribleCache[cacheKey] === undefined) { if(requestLoopVaribleCache[cacheKey] === undefined) {
requestLoopVaribleCache[cacheKey] = dataList requestLoopVaribleCache[cacheKey] = dataList
} else { } else {
console.log('折线图缓存', requestLoopVaribleCache[cacheKey])
dataList = requestLoopVaribleCache[cacheKey] dataList = requestLoopVaribleCache[cacheKey]
} }
...@@ -1284,7 +1281,6 @@ function loopRenderDashboardchart(poolData, resData, resCode) { ...@@ -1284,7 +1281,6 @@ function loopRenderDashboardchart(poolData, resData, resCode) {
if(requestLoopVaribleCache[cacheKey] === undefined) { if(requestLoopVaribleCache[cacheKey] === undefined) {
requestLoopVaribleCache[cacheKey] = value requestLoopVaribleCache[cacheKey] = value
} else { } else {
console.log('仪表盘缓存', requestLoopVaribleCache[cacheKey])
value = requestLoopVaribleCache[cacheKey] value = requestLoopVaribleCache[cacheKey]
} }
...@@ -1352,7 +1348,6 @@ function loopRenderPiechart(poolData, resData, resCode) { ...@@ -1352,7 +1348,6 @@ function loopRenderPiechart(poolData, resData, resCode) {
if(requestLoopVaribleCache[cacheKey] === undefined) { if(requestLoopVaribleCache[cacheKey] === undefined) {
requestLoopVaribleCache[cacheKey] = value requestLoopVaribleCache[cacheKey] = value
} else { } else {
console.log('饼图缓存', requestLoopVaribleCache[cacheKey])
value = requestLoopVaribleCache[cacheKey] value = requestLoopVaribleCache[cacheKey]
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @description: 文件描述 * @description: 文件描述
* @Date: 2021-09-16 18:33:55 * @Date: 2021-09-16 18:33:55
* @LastEditors: 莫靓仔 * @LastEditors: 莫靓仔
* @LastEditTime: 2021-09-29 09:56:55 * @LastEditTime: 2021-09-30 17:26:44
*/ */
let setObj = { let setObj = {
// 厂家大佬 // 厂家大佬
...@@ -29,10 +29,16 @@ let setObj = { ...@@ -29,10 +29,16 @@ let setObj = {
devToken: 'd59bfc52-4f36-4284-b02b-9ab0a3b7f3e2', devToken: 'd59bfc52-4f36-4284-b02b-9ab0a3b7f3e2',
devAppId: 'CESHI0000001_d09i', devAppId: 'CESHI0000001_d09i',
devTenantId: 'CESHI0000001_d09i' devTenantId: 'CESHI0000001_d09i'
},
// lgz
set5: {
devToken: 'ec154c77-3edd-4224-9375-7b1b306d49d0',
devAppId: 'LGZ_f9bk',
devTenantId: 'LGZ_f9bk'
} }
} }
let defaultObj = 'set4' let defaultObj = 'set5'
window.devToken = setObj[defaultObj].devToken window.devToken = setObj[defaultObj].devToken
window.devAppId = setObj[defaultObj].devAppId window.devAppId = setObj[defaultObj].devAppId
window.devTenantId = setObj[defaultObj].devTenantId window.devTenantId = setObj[defaultObj].devTenantId
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment