|
@@ -32,7 +32,7 @@ import { IDataProps, ILunarItem, IParams, ISeasonDataItemProps } from '@/types';
|
|
|
import Highcharts from 'highcharts';
|
|
|
import { defaultOpts, seasonOptions } from '@/utils/chartOptions';
|
|
|
import moment from 'moment';
|
|
|
-import { browser } from '@/utils/utils';
|
|
|
+import { browser,getTerminal } from '@/utils/utils';
|
|
|
|
|
|
export default defineComponent({
|
|
|
components: {
|
|
@@ -319,6 +319,7 @@ export default defineComponent({
|
|
|
// 季节图x轴显示月/日
|
|
|
const xAxis = {
|
|
|
...defaultOpts.xAxis,
|
|
|
+ // tickInterval: 24 * 3600 * 1000 * 30,
|
|
|
labels: {
|
|
|
formatter: function (ctx: any) {
|
|
|
return Highcharts.dateFormat('%m/%d', ctx.value);
|
|
@@ -371,8 +372,7 @@ export default defineComponent({
|
|
|
};
|
|
|
|
|
|
//农历图调整顶部缩进
|
|
|
- ['FF','Safari'].includes(browser())
|
|
|
- if (state.chartInfo.Calendar === '农历' && !['FF','Safari'].includes(browser())) chart = {
|
|
|
+ if (state.chartInfo.Calendar === '农历' && browser() !== 'FF' && getTerminal() !== 'ios') chart = {
|
|
|
spacing: [-26, 8, 2, 8]
|
|
|
}
|
|
|
|