|
@@ -267,7 +267,7 @@ let sectionOption={
|
|
|
|
|
|
axisPointer: {
|
|
|
// 坐标轴指示器,坐标轴触发有效
|
|
|
- type: 'line', // 默认为直线,可选为:'line' | 'shadow',
|
|
|
+ type: 'line', // 默认为直线,可选为:'line' | 'shadow',
|
|
|
|
|
|
},
|
|
|
|
|
@@ -277,7 +277,7 @@ let sectionOption={
|
|
|
},
|
|
|
grid: {
|
|
|
left: '2%',
|
|
|
- right: '0%',
|
|
|
+ right: '2%',
|
|
|
bottom: '0%',
|
|
|
top: '12%',
|
|
|
containLabel: true
|
|
@@ -501,8 +501,8 @@ export default {
|
|
|
|
|
|
},
|
|
|
dateValue(newName,oldName){
|
|
|
- console.log(newName,oldName)
|
|
|
- if( newName[0].format('YYYY-MM-DD')==oldName[0].format('YYYY-MM-DD') || newName[0].format('YYYY-MM-DD')==moment().format('YYYY-MM-DD')){
|
|
|
+ // console.log(newName,oldName)
|
|
|
+ if(newName[0].format('YYYY-MM-DD')==oldName[0].format('YYYY-MM-DD') || newName[0].format('YYYY-MM-DD')==moment().format('YYYY-MM-DD')){
|
|
|
|
|
|
}else{
|
|
|
this.searchgetData();
|
|
@@ -843,7 +843,7 @@ export default {
|
|
|
if (chart) {
|
|
|
var myChart = echarts.init(document.getElementById(idName))
|
|
|
myChart.clear()
|
|
|
- myChart.setOption(optionName,true)
|
|
|
+ myChart.setOption(optionName)
|
|
|
window.addEventListener('resize', function() {
|
|
|
myChart.resize()
|
|
|
})
|
|
@@ -1002,7 +1002,7 @@ export default {
|
|
|
}).then(res => {
|
|
|
if(res.success){
|
|
|
this.loading=false;
|
|
|
- console.log(res)
|
|
|
+ // console.log(res)
|
|
|
res.result.forEach(element => {
|
|
|
if(this.timeValueString){
|
|
|
element.date=this.dateValue[0].format('YYYY.MM.DD')+'—'+this.timeValueString
|
|
@@ -1144,9 +1144,14 @@ export default {
|
|
|
},
|
|
|
mounted() {
|
|
|
this.accountHttp()
|
|
|
- this.getEchartData('sectionChart', this.sectionOption)
|
|
|
+ new Promise((resolve, reject) => {
|
|
|
+ this.getEchartData('sectionChart', this.sectionOption)
|
|
|
+ resolve()
|
|
|
+ }).then(()=>{
|
|
|
+ this.myChart.clear()
|
|
|
+ })
|
|
|
|
|
|
- postAction('/toutiao/videoReportDaily/getColumnJson', {
|
|
|
+ postAction('/toutiao/videoReportDaily/getColumnJson', {
|
|
|
columnType: 5
|
|
|
}).then(res => {
|
|
|
// console.log(res)
|