|
@@ -689,31 +689,26 @@ export default defineComponent({
|
|
|
|
|
|
// 范围为1年内 x轴显示为月/日 否则默认年/月
|
|
|
let xAxis:any = {};
|
|
|
- const bool_time:boolean = xTimeDiffer();
|
|
|
+ const isLessThanOneYear:boolean = xTimeDiffer();
|
|
|
let minTime: number=Math.min(...minTimeArr);
|
|
|
let maxTime=Math.max(...maxTimeArr);
|
|
|
|
|
|
let step = setXaxisStep(maxTime-minTime);
|
|
|
|
|
|
- xAxis = bool_time ? {
|
|
|
+ xAxis = {
|
|
|
...defaultOpts.xAxis,
|
|
|
tickInterval: screen.value === 'phone' ? step : undefined,
|
|
|
labels: {
|
|
|
formatter: function (ctx: any) {
|
|
|
- return Highcharts.dateFormat('%m/%d', ctx.value);
|
|
|
+ return isLessThanOneYear
|
|
|
+ ? Highcharts.dateFormat('%m/%d', ctx.value)
|
|
|
+ : Highcharts.dateFormat('%y/%m', ctx.value);
|
|
|
},
|
|
|
+
|
|
|
style: {
|
|
|
fontSize: '10px',
|
|
|
},
|
|
|
}
|
|
|
- } : {
|
|
|
- ...defaultOpts.xAxis,
|
|
|
- tickInterval: screen.value === 'phone' ? step : undefined,
|
|
|
- labels: {
|
|
|
- style: {
|
|
|
- fontSize: '10px',
|
|
|
- },
|
|
|
- },
|
|
|
}
|
|
|
|
|
|
state.options = {
|
|
@@ -893,31 +888,26 @@ export default defineComponent({
|
|
|
|
|
|
// 范围为1年内 x轴显示为月/日 否则默认年/月
|
|
|
let xAxis:any = {};
|
|
|
- const bool_time:boolean = xTimeDiffer();
|
|
|
+ const isLessThanOneYear:boolean = xTimeDiffer();
|
|
|
let minTime: number=Math.min(...minTimeArr);
|
|
|
let maxTime=Math.max(...maxTimeArr);
|
|
|
|
|
|
let step = setXaxisStep(maxTime-minTime);
|
|
|
|
|
|
- xAxis = bool_time ? {
|
|
|
+ xAxis = {
|
|
|
...defaultOpts.xAxis,
|
|
|
tickInterval: screen.value === 'phone' ? step : undefined,
|
|
|
labels: {
|
|
|
formatter: function (ctx: any) {
|
|
|
- return Highcharts.dateFormat('%m/%d', ctx.value);
|
|
|
+ return isLessThanOneYear
|
|
|
+ ? Highcharts.dateFormat('%m/%d', ctx.value)
|
|
|
+ : Highcharts.dateFormat('%y/%m', ctx.value);
|
|
|
},
|
|
|
+
|
|
|
style: {
|
|
|
fontSize: '10px',
|
|
|
},
|
|
|
}
|
|
|
- } : {
|
|
|
- ...defaultOpts.xAxis,
|
|
|
- tickInterval: screen.value === 'phone' ? step : undefined,
|
|
|
- labels: {
|
|
|
- style: {
|
|
|
- fontSize: '10px',
|
|
|
- },
|
|
|
- },
|
|
|
}
|
|
|
|
|
|
state.options = {
|