|
@@ -512,7 +512,7 @@ export default {
|
|
}
|
|
}
|
|
if(needGetDataArr.length)
|
|
if(needGetDataArr.length)
|
|
await Promise.all(needGetDataArr).then(()=>{
|
|
await Promise.all(needGetDataArr).then(()=>{
|
|
- console.log('promise all then chart')
|
|
|
|
|
|
+ //console.log('promise all then chart')
|
|
if(fromType==='present'){
|
|
if(fromType==='present'){
|
|
for(let i=0;i<chartElements.length;i++) {
|
|
for(let i=0;i<chartElements.length;i++) {
|
|
let temp = getChartInfo(this.optionMap[chartElements[i].chartId])
|
|
let temp = getChartInfo(this.optionMap[chartElements[i].chartId])
|
|
@@ -533,7 +533,7 @@ export default {
|
|
}
|
|
}
|
|
if(needGetDataArr.length)
|
|
if(needGetDataArr.length)
|
|
await Promise.all(needGetDataArr).then(()=>{
|
|
await Promise.all(needGetDataArr).then(()=>{
|
|
- console.log('promise all then sheet')
|
|
|
|
|
|
+ //console.log('promise all then sheet')
|
|
})
|
|
})
|
|
},
|
|
},
|
|
async getsheetData(id){
|
|
async getsheetData(id){
|
|
@@ -542,7 +542,7 @@ export default {
|
|
})
|
|
})
|
|
if(res.Ret !== 200) return 0
|
|
if(res.Ret !== 200) return 0
|
|
const {TableInfo} = res.Data
|
|
const {TableInfo} = res.Data
|
|
- console.log('get')
|
|
|
|
|
|
+ //console.log('get')
|
|
this.sheetDataMap[id] = _.cloneDeep(TableInfo.TableDataList)
|
|
this.sheetDataMap[id] = _.cloneDeep(TableInfo.TableDataList)
|
|
return 1
|
|
return 1
|
|
},
|
|
},
|
|
@@ -590,7 +590,7 @@ export default {
|
|
/* 主题样式*/
|
|
/* 主题样式*/
|
|
const chartTheme = ChartThemeStyle ? JSON.parse(ChartThemeStyle) : null;
|
|
const chartTheme = ChartThemeStyle ? JSON.parse(ChartThemeStyle) : null;
|
|
|
|
|
|
- console.log(options)
|
|
|
|
|
|
+ //console.log(options)
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
let is_linear = options.series
|
|
let is_linear = options.series
|
|
? options.series.some(_ => _.chartType === 'linear')
|
|
? options.series.some(_ => _.chartType === 'linear')
|