Merge pull request 'projects/mesxc-zhp' (#315) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #315
This commit is contained in:
		@@ -131,7 +131,7 @@ export default {
 | 
			
		||||
					// width: 350,
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
          type: this.$auth.hasPermi('	base: quality - isra - statistics: query') ? 'button' : '',
 | 
			
		||||
          type: this.$auth.hasPermi('base:quality-isra-statistics:query') ? 'button' : '',
 | 
			
		||||
					btnName: '查询',
 | 
			
		||||
					name: 'search',
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
@@ -207,15 +207,16 @@ export default {
 | 
			
		||||
      }).then((res) => {
 | 
			
		||||
        let mapArr= []
 | 
			
		||||
        let mapLegendData = []
 | 
			
		||||
        let obj = {
 | 
			
		||||
          name: '',
 | 
			
		||||
          type: 'line',
 | 
			
		||||
          // stack: 'Total',
 | 
			
		||||
          data: [],
 | 
			
		||||
          mapXAxisData: [],
 | 
			
		||||
        }
 | 
			
		||||
        // let mapXAxisData = []
 | 
			
		||||
        for (let i in res.data) {
 | 
			
		||||
          let obj = {
 | 
			
		||||
            name: '',
 | 
			
		||||
            type: 'line',
 | 
			
		||||
            // stack: 'Total',
 | 
			
		||||
            data: [],
 | 
			
		||||
            mapXAxisData:[],
 | 
			
		||||
          }
 | 
			
		||||
 | 
			
		||||
          // console.log(i)
 | 
			
		||||
          let dataArr = []
 | 
			
		||||
          res.data[i].forEach(ele => {
 | 
			
		||||
@@ -225,8 +226,9 @@ export default {
 | 
			
		||||
          obj.name = i
 | 
			
		||||
          obj.data = dataArr
 | 
			
		||||
          mapLegendData.push(i)
 | 
			
		||||
          mapArr.push(obj)
 | 
			
		||||
        }
 | 
			
		||||
        mapArr.push(obj)
 | 
			
		||||
        console.log(mapArr);
 | 
			
		||||
        // console.log(res.data[res]);
 | 
			
		||||
        var chartDom = this.activeName === 'day' ? document.getElementById('mapDayMain') : this.activeName === 'week' ? document.getElementById('mapWeekMain') : document.getElementById('mapMonthMain')
 | 
			
		||||
        var myChart = echarts.init(chartDom);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user