Merge pull request 'projects/mesxc-zhp' (#315) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #315
This commit is contained in:
commit
812b72f10d
@ -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,15 +207,16 @@ export default {
|
|||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
let mapArr= []
|
let mapArr= []
|
||||||
let mapLegendData = []
|
let mapLegendData = []
|
||||||
// let mapXAxisData = []
|
|
||||||
for (let i in res.data) {
|
|
||||||
let obj = {
|
let obj = {
|
||||||
name: '',
|
name: '',
|
||||||
type: 'line',
|
type: 'line',
|
||||||
// stack: 'Total',
|
// stack: 'Total',
|
||||||
data: [],
|
data: [],
|
||||||
mapXAxisData:[],
|
mapXAxisData: [],
|
||||||
}
|
}
|
||||||
|
// let mapXAxisData = []
|
||||||
|
for (let i in res.data) {
|
||||||
|
|
||||||
// console.log(i)
|
// console.log(i)
|
||||||
let dataArr = []
|
let dataArr = []
|
||||||
res.data[i].forEach(ele => {
|
res.data[i].forEach(ele => {
|
||||||
@ -225,8 +226,9 @@ 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);
|
||||||
|
Loading…
Reference in New Issue
Block a user