Merge branch 'joke' into 'master'
杭州-大屏及税务局大屏月业务量折线图插件调整 杭州-大屏及税务局大屏月业务量折线图插件调整 See merge request !112
Showing
1 changed file
with
25 additions
and
24 deletions
| @@ -46,11 +46,11 @@ export default { | @@ -46,11 +46,11 @@ export default { | ||
| 46 | let yAxisData=[]; | 46 | let yAxisData=[]; |
| 47 | $.each(declareLineData,function (i,v){ | 47 | $.each(declareLineData,function (i,v){ |
| 48 | let index=0; | 48 | let index=0; |
| 49 | - if(i==2){ | ||
| 50 | - index=1; | ||
| 51 | - }else{ | ||
| 52 | - index=0; | ||
| 53 | - } | 49 | + // if(i==2){ |
| 50 | + // index=1; | ||
| 51 | + // }else{ | ||
| 52 | + // index=0; | ||
| 53 | + // } | ||
| 54 | ySeriesCommon.push({ | 54 | ySeriesCommon.push({ |
| 55 | name:v.name, | 55 | name:v.name, |
| 56 | type:'line', | 56 | type:'line', |
| @@ -92,10 +92,10 @@ export default { | @@ -92,10 +92,10 @@ export default { | ||
| 92 | let data1=proxy.yAxisData[0]; | 92 | let data1=proxy.yAxisData[0]; |
| 93 | let data2=proxy.yAxisData[1]; | 93 | let data2=proxy.yAxisData[1]; |
| 94 | let data3=proxy.yAxisData[2]; | 94 | let data3=proxy.yAxisData[2]; |
| 95 | - let min1=proxy.calMin([data1,data2]); | ||
| 96 | - let max1=proxy.calMax([data1,data2]); | ||
| 97 | - let min2=proxy.calMin([data3,data3]); | ||
| 98 | - let max2=proxy.calMax([data3,data3]); | 95 | + let min1=proxy.calMin([data1,data2,data3]); |
| 96 | + let max1=proxy.calMax([data1,data2,data3]); | ||
| 97 | + // let min2=proxy.calMin([data3,data3]); | ||
| 98 | + // let max2=proxy.calMax([data3,data3]); | ||
| 99 | 99 | ||
| 100 | proxy.optionData = { | 100 | proxy.optionData = { |
| 101 | title: { | 101 | title: { |
| @@ -165,22 +165,23 @@ export default { | @@ -165,22 +165,23 @@ export default { | ||
| 165 | min:min1, | 165 | min:min1, |
| 166 | max:max1, | 166 | max:max1, |
| 167 | interval:(max1-min1)/5 | 167 | interval:(max1-min1)/5 |
| 168 | - }, | ||
| 169 | - { | ||
| 170 | - type: 'value', | ||
| 171 | - splitLine:{ | ||
| 172 | - lineStyle: { | ||
| 173 | - color:'#0a1b31' | ||
| 174 | - } | ||
| 175 | - }, | ||
| 176 | - axisLabel:{ | ||
| 177 | - color:'#ffffff', | ||
| 178 | - }, | ||
| 179 | - splitNumber:5, | ||
| 180 | - min:min2, | ||
| 181 | - max:max2, | ||
| 182 | - interval:(max2-min2)/5 | ||
| 183 | } | 168 | } |
| 169 | + // , | ||
| 170 | + // { | ||
| 171 | + // type: 'value', | ||
| 172 | + // splitLine:{ | ||
| 173 | + // lineStyle: { | ||
| 174 | + // color:'#0a1b31' | ||
| 175 | + // } | ||
| 176 | + // }, | ||
| 177 | + // axisLabel:{ | ||
| 178 | + // color:'#ffffff', | ||
| 179 | + // }, | ||
| 180 | + // splitNumber:5, | ||
| 181 | + // min:min2, | ||
| 182 | + // max:max2, | ||
| 183 | + // interval:(max2-min2)/5 | ||
| 184 | + // } | ||
| 184 | ], | 185 | ], |
| 185 | series: proxy.ySeriesCommon, | 186 | series: proxy.ySeriesCommon, |
| 186 | itemStyle:{ | 187 | itemStyle:{ |
-
Please register or login to post a comment