Compare commits

..

No commits in common. "812b72f10d4484a47294bf411da608da3ce24225" and "58457487d14b51a0f4071f3f4c34693ee99a446f" have entirely different histories.

View File

@ -131,7 +131,7 @@ export default {
// width: 350, // width: 350,
}, },
{ {
type: this.$auth.hasPermi('base:quality-isra-statistics:query') ? 'button' : '', type: this.$auth.hasPermi(' base: quality - isra - statistics: query') ? 'button' : '',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary', color: 'primary',
@ -207,16 +207,15 @@ export default {
}).then((res) => { }).then((res) => {
let mapArr= [] let mapArr= []
let mapLegendData = [] let mapLegendData = []
let obj = {
name: '',
type: 'line',
// stack: 'Total',
data: [],
mapXAxisData: [],
}
// let mapXAxisData = [] // let mapXAxisData = []
for (let i in res.data) { for (let i in res.data) {
let obj = {
name: '',
type: 'line',
// stack: 'Total',
data: [],
mapXAxisData:[],
}
// console.log(i) // console.log(i)
let dataArr = [] let dataArr = []
res.data[i].forEach(ele => { res.data[i].forEach(ele => {
@ -226,9 +225,8 @@ export default {
obj.name = i obj.name = i
obj.data = dataArr obj.data = dataArr
mapLegendData.push(i) mapLegendData.push(i)
mapArr.push(obj)
} }
mapArr.push(obj)
console.log(mapArr);
// console.log(res.data[res]); // console.log(res.data[res]);
var chartDom = this.activeName === 'day' ? document.getElementById('mapDayMain') : this.activeName === 'week' ? document.getElementById('mapWeekMain') : document.getElementById('mapMonthMain') var chartDom = this.activeName === 'day' ? document.getElementById('mapDayMain') : this.activeName === 'week' ? document.getElementById('mapWeekMain') : document.getElementById('mapMonthMain')
var myChart = echarts.init(chartDom); var myChart = echarts.init(chartDom);