diff --git a/src/api/library.js b/src/api/library.js index e24d867..2dfc318 100644 --- a/src/api/library.js +++ b/src/api/library.js @@ -163,6 +163,24 @@ export function FetchInitIntoNum(params) { }) } +// 获取本年四个季度的数据 +export function FetchQuarterJH(params) { + return request({ + url: '/qyzt/getQuarterJH' + '?' + qs.stringify(params, { indices: false }), + method: 'get', + urlType: 'local' + }) +} + +// 今年每个月的 +export function FetchMonthJH(params) { + return request({ + url: '/qyzt/getMonthJH' + '?' + qs.stringify(params, { indices: false }), + method: 'get', + urlType: 'local' + }) +} + export default { FetchInitToken, FetchLibBookTotal, @@ -181,5 +199,7 @@ export default { FetchTotalResource, FetchTodayJH, FetchWeekJH, - FetchInitIntoNum + FetchInitIntoNum, + FetchQuarterJH, + FetchMonthJH } diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 8b36524..de74ac5 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -1024,9 +1024,12 @@ padding-left: .35rem; margin-top: 0; line-height: 0; - background: url('~@/assets/images/title-middle.png') no-repeat left top; + background: url('~@/assets/images/title-middle.png') no-repeat left bottom; background-size: cover; font-weight: bold; + &.big-title{ + padding-bottom: .45rem; + } } } } diff --git a/src/components/echart/lineChart.vue b/src/components/echart/lineChart.vue index 08dd8c9..0e725db 100644 --- a/src/components/echart/lineChart.vue +++ b/src/components/echart/lineChart.vue @@ -34,7 +34,7 @@ export default { watch: { chartDayData: { deep: true, - mmediate: true, + immediate: true, handler(val) { setTimeout(() => { this.initChart() diff --git a/src/components/echart/lineChartMonth.vue b/src/components/echart/lineChartMonth.vue new file mode 100644 index 0000000..b2831d4 --- /dev/null +++ b/src/components/echart/lineChartMonth.vue @@ -0,0 +1,221 @@ + + + + + diff --git a/src/components/echart/lineChartQuarter.vue b/src/components/echart/lineChartQuarter.vue new file mode 100644 index 0000000..7ec9386 --- /dev/null +++ b/src/components/echart/lineChartQuarter.vue @@ -0,0 +1,267 @@ + + + + + diff --git a/src/views/map/index.vue b/src/views/map/index.vue index 0e7fa9d..40f4fca 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -3,7 +3,7 @@