From 34fe52caba63e6a6337cb9c3e6bd0d4707fd6a99 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 10:17:05 +0800
Subject: [PATCH] 解决冲突
---
admin/src/views/business/admissionStatistics.vue | 552 +++++++++++++++++++++++++++---------------------------
1 files changed, 274 insertions(+), 278 deletions(-)
diff --git a/admin/src/views/business/admissionStatistics.vue b/admin/src/views/business/admissionStatistics.vue
index 06da26a..72a9752 100644
--- a/admin/src/views/business/admissionStatistics.vue
+++ b/admin/src/views/business/admissionStatistics.vue
@@ -114,316 +114,313 @@
</template>
<script>
- import * as echarts from 'echarts'
- import { getInParkUserData, getRataList, getReportList, reportExportExcel } from '@/api/business'
- export default {
- data() {
- return {
- info: null,
- isGroupBy: 0,
- radio: 'month',
- value: '',
- dateType: 'month',
- date: '',
- date1: '',
+import * as echarts from 'echarts'
+import { getInParkUserData, getRataList, getReportList, reportExportExcel } from '@/api/business'
+export default {
+ data () {
+ return {
+ info: null,
+ isGroupBy: 0,
+ radio: 'month',
+ value: '',
+ dateType: 'month',
+ date: '',
+ date1: '',
- listZB: [],
- column: [],
- list: []
- }
- },
- mounted() {
- var now = new Date();
- var year = now.getFullYear();
- var month = now.getMonth() + 1 > 9 ? now.getMonth() + 1 : `0${now.getMonth() + 1}`;
- this.value = `${year}-${month}`
- this.date1 = `${year}-${month}`
+ listZB: [],
+ column: [],
+ list: []
+ }
+ },
+ mounted () {
+ var now = new Date()
+ var year = now.getFullYear()
+ var month = now.getMonth() + 1 > 9 ? now.getMonth() + 1 : `0${now.getMonth() + 1}`
+ this.value = `${year}-${month}`
+ this.date1 = `${year}-${month}`
this.getData()
this.getRataLists()
this.getReportLists()
+ },
+ methods: {
+ // 瀵煎嚭
+ daochu () {
+ reportExportExcel({ dateStr: this.date1, isGroupBy: this.isGroupBy, type: 1 }).then(res => {
+ this.download(res)
+ })
},
- methods: {
- // 瀵煎嚭
- daochu() {
- reportExportExcel({ dateStr: this.date1, isGroupBy: this.isGroupBy, type: 1 }).then(res => {
- this.download(res)
+ changeBB () {
+ if (this.radio === 'month') {
+ const now = new Date()
+ const year = now.getFullYear()
+ const month = now.getMonth() + 1 > 9 ? now.getMonth() + 1 : `0${now.getMonth() + 1}`
+ this.date1 = `${year}-${month}`
+ } else {
+ const now = new Date()
+ const year = now.getFullYear()
+ this.date1 = `${year}`
+ }
+ this.getReportLists()
+ },
+ // 鍏ュ洯杞﹁締缁熻琛�
+ getReportLists () {
+ getReportList({ dateStr: this.date1, isGroupBy: this.isGroupBy, type: 1 })
+ .then(res => {
+ if (!res || res.length === 0) {
+ this.column = []
+ this.list = []
+ return
+ }
+ this.column = res[0]
+ this.list = res.slice(1).map(row => {
+ const obj = {}
+ this.column.forEach((header, index) => {
+ obj[header] = row[index]
+ })
+ return obj
+ })
+ // if (res.length === 0) {
+ // this.column = []
+ // this.list = []
+ // return
+ // }
+ //
+ // this.column = res[0]
+ // this.list = res.slice(1, res.length);
})
- },
- changeBB() {
- if (this.radio === 'month') {
- let now = new Date();
- let year = now.getFullYear();
- let month = now.getMonth() + 1 > 9 ? now.getMonth() + 1 : `0${now.getMonth() + 1}`;
- this.date1 = `${year}-${month}`
- } else {
- let now = new Date();
- let year = now.getFullYear();
- this.date1 = `${year}`
- }
- this.getReportLists()
- },
- // 鍏ュ洯杞﹁締缁熻琛�
- getReportLists() {
- getReportList({ dateStr: this.date1, isGroupBy: this.isGroupBy, type: 1 })
- .then(res => {
- if (res.length === 0) {
- this.column = []
- this.list = []
- return
- }
-
- this.column = res[0]
-
- this.list = res.slice(1).map(row => {
- const obj = {};
- this.column.forEach((header, index) => {
- obj[header] = row[index];
- });
- return obj;
- });
-
- // if (res.length === 0) {
- // this.column = []
- // this.list = []
- // return
- // }
- //
- // this.column = res[0]
- // this.list = res.slice(1, res.length);
- })
- },
- changeDateType() {
- if (this.dateType === 'month') {
- let now = new Date();
- let year = now.getFullYear();
- let month = now.getMonth() + 1 > 9 ? now.getMonth() + 1 : `0${now.getMonth() + 1}`;
- this.value = `${year}-${month}`
- } else {
- let now = new Date();
- let year = now.getFullYear();
- this.value = `${year}`
- }
- this.getRataLists()
- },
- // 杞﹁締鍒嗙被缁熻
- getRataLists() {
- getRataList({ dateStr: this.value, isGroupBy: this.isGroupBy, type: 1 })
- .then(res => {
- this.listZB = res
- // this.$nextTick(() => {
- // this.initDept()
- // })
- setTimeout(() => {
- this.initDept()
- }, 1000)
- })
- },
- // 鍩虹鏁版嵁
- getData() {
- getInParkUserData({ isGroupBy: this.isGroupBy, type: 1 }).then(res => {
- this.info = res
+ },
+ changeDateType () {
+ if (this.dateType === 'month') {
+ const now = new Date()
+ const year = now.getFullYear()
+ const month = now.getMonth() + 1 > 9 ? now.getMonth() + 1 : `0${now.getMonth() + 1}`
+ this.value = `${year}-${month}`
+ } else {
+ const now = new Date()
+ const year = now.getFullYear()
+ this.value = `${year}`
+ }
+ this.getRataLists()
+ },
+ // 杞﹁締鍒嗙被缁熻
+ getRataLists () {
+ getRataList({ dateStr: this.value, isGroupBy: this.isGroupBy, type: 1 })
+ .then(res => {
+ this.listZB = res
// this.$nextTick(() => {
- // this.initType()
+ // this.initDept()
// })
setTimeout(() => {
- this.initType()
+ this.initDept()
}, 1000)
})
- },
- // 鍏ㄥ勾鍏ュ洯杞﹁締瓒嬪娍
- initType() {
- if (!this.info.cumulativeDataList) return
+ },
+ // 鍩虹鏁版嵁
+ getData () {
+ getInParkUserData({ isGroupBy: this.isGroupBy, type: 1 }).then(res => {
+ this.info = res
+ // this.$nextTick(() => {
+ // this.initType()
+ // })
+ setTimeout(() => {
+ this.initType()
+ }, 1000)
+ })
+ },
+ // 鍏ㄥ勾鍏ュ洯杞﹁締瓒嬪娍
+ initType () {
+ if (!this.info.cumulativeDataList) return
- const myChart = echarts.init(document.querySelector('.echart1'))
+ const myChart = echarts.init(document.querySelector('.echart1'))
- let names = this.info.cumulativeDataList.map(item => item.name)
- let datas = this.info.cumulativeDataList.map(item => item.total)
+ const names = this.info.cumulativeDataList.map(item => item.name)
+ const datas = this.info.cumulativeDataList.map(item => item.total)
- let option = {
- grid: {
- left: '0%',
- right: '5%',
- bottom: '10%',
- top: '10%',
- containLabel: true
+ const option = {
+ grid: {
+ left: '0%',
+ right: '5%',
+ bottom: '10%',
+ top: '10%',
+ containLabel: true
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'line'
+ }
+ },
+ xAxis: {
+ type: 'category',
+ data: names
+ },
+ yAxis: {
+ type: 'value',
+ axisLine: {
+ show: true
},
- tooltip: {
- trigger: 'axis',
- axisPointer: {
- type: 'line'
+ axisLabel: {
+ formatter: function (value) {
+ // 鍥涜垗浜斿叆鍒版渶杩戠殑鏁存暟
+ return Math.round(value)
}
- },
- xAxis: {
- type: 'category',
- data: names
- },
- yAxis: {
- type: 'value',
- axisLine: {
- show: true
- },
- axisLabel: {
- formatter: function (value) {
- // 鍥涜垗浜斿叆鍒版渶杩戠殑鏁存暟
- return Math.round(value);
+ }
+ },
+ graphic: {
+ elements: [
+ {
+ type: 'text',
+ left: 'left',
+ top: 'top',
+ style: {
+ text: '浜哄憳鏁�',
+ textAlign: 'center',
+ fill: '#333'
}
}
- },
- graphic: {
- elements: [
- {
- type: 'text',
- left: 'left',
- top: 'top',
- style: {
- text: '浜哄憳鏁�',
- textAlign: 'center',
- fill: '#333'
- }
- }
- ]
- },
- series: [
- {
- data: datas,
- type: 'line',
- areaStyle: {
- normal: {
- color: {
- x: 0,
- y: 0,
- x2: 0,
- y2: 1,
- colorStops: [{
- offset: 0,
- color: '#207FF7' // 0% 澶勭殑棰滆壊
- }, {
- offset: 1,
- color: 'rgba(255,255,255,.2)' // 100% 澶勭殑棰滆壊
- }],
- globalCoord: false // 缂虹渷涓� false
- }
- }
- },
- lineStyle: { // 绾挎潯鏍峰紡
+ ]
+ },
+ series: [
+ {
+ data: datas,
+ type: 'line',
+ areaStyle: {
+ normal: {
color: {
- type: 'linear',
x: 0,
y: 0,
x2: 0,
y2: 1,
colorStops: [{
- offset: 0, color: '#207FF7' // 0% 澶勭殑棰滆壊
+ offset: 0,
+ color: '#207FF7' // 0% 澶勭殑棰滆壊
}, {
- offset: 1, color: '#207FF7' // 100% 澶勭殑棰滆壊
- }]
- },
- width: 2 // 绾挎潯绮楃粏
+ offset: 1,
+ color: 'rgba(255,255,255,.2)' // 100% 澶勭殑棰滆壊
+ }],
+ globalCoord: false // 缂虹渷涓� false
+ }
+ }
+ },
+ lineStyle: { // 绾挎潯鏍峰紡
+ color: {
+ type: 'linear',
+ x: 0,
+ y: 0,
+ x2: 0,
+ y2: 1,
+ colorStops: [{
+ offset: 0, color: '#207FF7' // 0% 澶勭殑棰滆壊
+ }, {
+ offset: 1, color: '#207FF7' // 100% 澶勭殑棰滆壊
+ }]
},
- symbol: 'circle',
- symbolSize: 10,
- itemStyle: {
- borderWidth: 1,
- borderColor: '#fff',
- color: '#207FF7'
- },
- smooth: false
- }
- ]
- }
- myChart.setOption(option)
- window.addEventListener('resize', function () { // 鎵ц
- myChart.resize()
- })
- },
- // 杞﹁締鍒嗙被缁熻
- initDept() {
- if (!this.listZB) return
-
- const dom = document.getElementById('echart2')
- console.log(dom)
- const myChart = echarts.init(dom)
-
- let data = this.listZB.map(item => {
- return {
- value: item.total,
- name: item.name
+ width: 2 // 绾挎潯绮楃粏
+ },
+ symbol: 'circle',
+ symbolSize: 10,
+ itemStyle: {
+ borderWidth: 1,
+ borderColor: '#fff',
+ color: '#207FF7'
+ },
+ smooth: false
}
- })
+ ]
+ }
+ myChart.setOption(option)
+ window.addEventListener('resize', function () { // 鎵ц
+ myChart.resize()
+ })
+ },
+ // 杞﹁締鍒嗙被缁熻
+ initDept () {
+ if (!this.listZB) return
- let option = {
- tooltip: {
- trigger: 'item',
- },
- legend: {
- show: false,
- orient: 'vertical',
- left: 'left'
- },
- series : [
- {
- name: '璁块棶鏉ユ簮',
- type: 'pie',
- radius: ['34%', '50%'],
- labelLine: {
- normal: {
- length: 30,
- length2: 70,
+ const dom = document.getElementById('echart2')
+ console.log(dom)
+ const myChart = echarts.init(dom)
+
+ const data = this.listZB.map(item => {
+ return {
+ value: item.total,
+ name: item.name
+ }
+ })
+
+ const option = {
+ tooltip: {
+ trigger: 'item'
+ },
+ legend: {
+ show: false,
+ orient: 'vertical',
+ left: 'left'
+ },
+ series: [
+ {
+ name: '璁块棶鏉ユ簮',
+ type: 'pie',
+ radius: ['34%', '50%'],
+ labelLine: {
+ normal: {
+ length: 30,
+ length2: 70
+ }
+ },
+ label: {
+ formatter: '{a|{b}} {d}%',
+ rich: {
+ a: {
+ color: '#333333',
+ fontSize: 14,
+ fontWeight: 500
}
},
- label: {
- formatter: "{a|{b}} {d}%",
- rich: {
- a: {
- color: '#333333',
- fontSize: 14,
- fontWeight: 500
- }
- },
- padding: [0,-50,20,-100]
- },
- data: data
- }
- ]
- }
- myChart.setOption(option)
- window.addEventListener('resize', function () { // 鎵ц
- myChart.resize()
- })
- },
- initDept3() {
- const myChart = echarts.init(document.querySelector('#echart3'))
-
- let option = {
- grid: {
- left: '5%',
- right: '10%',
- bottom: '0%',
- top: '20%',
- containLabel: true
- },
- xAxis: {
- type: 'category',
- data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
- },
- yAxis: {
- type: 'value'
- },
- series: [
- {
- data: [150, 230, 224, 218, 135, 147, 260],
- type: 'line'
- }
- ]
- }
- myChart.setOption(option)
- window.addEventListener('resize', function () { // 鎵ц
- myChart.resize()
- })
+ padding: [0, -50, 20, -100]
+ },
+ data: data
+ }
+ ]
}
+ myChart.setOption(option)
+ window.addEventListener('resize', function () { // 鎵ц
+ myChart.resize()
+ })
+ },
+ initDept3 () {
+ const myChart = echarts.init(document.querySelector('#echart3'))
+
+ const option = {
+ grid: {
+ left: '5%',
+ right: '10%',
+ bottom: '0%',
+ top: '20%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [
+ {
+ data: [150, 230, 224, 218, 135, 147, 260],
+ type: 'line'
+ }
+ ]
+ }
+ myChart.setOption(option)
+ window.addEventListener('resize', function () { // 鎵ц
+ myChart.resize()
+ })
}
}
+}
</script>
<style lang="scss" scoped>
@@ -504,7 +501,7 @@
.main_table {
display: flex;
- align-items: start;
+ align-items: flex-start;
justify-content: space-between;
margin-top: 10px;
.main_table_list {
@@ -665,7 +662,6 @@
padding: 20px;
box-sizing: border-box;
/*border-right: 12px solid #f7f7f7;*/
-
.echart1 {
width: 100%;
--
Gitblit v1.9.3