diff --git a/.env.development b/.env.development
index ac14418..b87c5db 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
# VITE_API_BASE='http://54.251.137.151:10704/'
-VITE_API_BASE='http://192.168.8.94:8080/'
+# VITE_API_BASE='http://192.168.8.94:8080/'
# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
# VITE_API_BASE='http://54.251.137.151:10704/'
-# VITE_API_BASE='http://192.168.8.225:8080/'
+VITE_API_BASE='http://192.168.8.225:8080/'
diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue
index dc8fe17..5d84f70 100644
--- a/src/views/workspace/index.vue
+++ b/src/views/workspace/index.vue
@@ -95,37 +95,7 @@ const get = async function () {
try {
getAreaRank()
getMiddleBar()
- // 发送POST请求
- // const result1 = await API.post(
- // "http://54.251.137.151:10702/statistics/getSumCoin",
- // {}
- // );
const result2 = await API({ url: '/statistics/a', data: {} })
- // const result3 = await API.post(
- // "http://54.251.137.151:10702/statistics/getYearConsumeCoin",
- // {}
- // );
- // const result4 = await API.post(
- // "http://54.251.137.151:10702/statistics/getDayConsumeCoin",
- // {}
- // );
- // const result5 = await API.post(
- // "http://192.168.8.93:10010/statistics/getMediumAreaPay",
- // {}
- // );
- // const result6 = await API.post(
- // "http://192.168.8.93:10010/statistics/getMediumAreaConsume",
- // {}
- // );
-
- // const result7 = await API.post(
- // "http://192.168.8.93:10010/statistics/getMediuPayCoin",
- // {}
- // );
- // const result8 = await API.post(
- // "http://192.168.8.93:10010/statistics/getMediuConsumeCoin",
- // {}
- // );
const result9 = await API({ url: '/statistics/b', data: {} })
// 重构的工作台
const result10 = await API({
@@ -149,18 +119,10 @@ const get = async function () {
threeData.value = result12
console.log('oneData', oneData.value)
- // 将响应结果存储到响应式数据中
- // getSumCoin.value = result1.data;
statistics.value = result2.data
- // getYearConsumeCoin.value = result3.data;
- // getDayConsumeCoin.value = result4.data;
-
platformData.value = result9.data
- // console.log("getSumCoin", getSumCoin.value);
console.log('statistics', statistics.value)
- // console.log("getYearConsumeCoin", getYearConsumeCoin.value);
- // console.log("getDayConsumeCoin", getDayConsumeCoin.value);
console.log('platformData', platformData.value)
option3Data.value = [
@@ -218,169 +180,6 @@ const get = async function () {
}
]
console.log('option5Data', option5Data.value)
- // 平台数据处理
- ERPData.value = [
- platformData.value.erpsum
- .filter((item) => item.subject == '第一学科')
- .map((item) => Math.abs(item.totalERPSum)),
- platformData.value.erpsum
- .filter((item) => item.subject == '第二学科')
- .map((item) => Math.abs(item.totalERPSum)),
- platformData.value.erpsum
- .filter((item) => item.subject == '第三学科')
- .map((item) => Math.abs(item.totalERPSum)),
- platformData.value.erpsum
- .filter((item) => item.subject == '第四学科')
- .map((item) => Math.abs(item.totalERPSum))
- ]
- ERPData.value.forEach((item, index) =>
- item == ''
- ? (ERPData.value[index] = {
- value: 0,
- name: '第' + (index + 1) + '学科' + 0
- })
- : (ERPData.value[index] = {
- value: item[0],
- name: '第' + (index + 1) + '学科' + item[0]
- })
- )
- console.log('ERPData', ERPData.value)
- HCData.value = [
- platformData.value.homilyChartSum
- .filter((item) => item.subject == '第一学科')
- .map((item) => Math.abs(item.totalHomilyChartSum)),
- platformData.value.homilyChartSum
- .filter((item) => item.subject == '第二学科')
- .map((item) => Math.abs(item.totalHomilyChartSum)),
- platformData.value.homilyChartSum
- .filter((item) => item.subject == '第三学科')
- .map((item) => Math.abs(item.totalHomilyChartSum)),
- platformData.value.homilyChartSum
- .filter((item) => item.subject == '第四学科')
- .map((item) => Math.abs(item.totalHomilyChartSum))
- ]
- HCData.value.forEach((item, index) =>
- item == ''
- ? (HCData.value[index] = {
- value: 0,
- name: '第' + (index + 1) + '学科' + 0
- })
- : (HCData.value[index] = {
- value: item[0],
- name: '第' + (index + 1) + '学科' + item[0]
- })
- )
- console.log('HCData', HCData.value)
- LinkData.value = [
- platformData.value.homilyLinkSum
- .filter((item) => item.subject == '第一学科')
- .map((item) => Math.abs(item.totalHomilyLinkSum)),
- platformData.value.homilyLinkSum
- .filter((item) => item.subject == '第二学科')
- .map((item) => Math.abs(item.totalHomilyLinkSum)),
- platformData.value.homilyLinkSum
- .filter((item) => item.subject == '第三学科')
- .map((item) => Math.abs(item.totalHomilyLinkSum)),
- platformData.value.homilyLinkSum
- .filter((item) => item.subject == '第四学科')
- .map((item) => Math.abs(item.totalHomilyLinkSum))
- ]
- LinkData.value.forEach((item, index) =>
- item == ''
- ? (LinkData.value[index] = {
- value: 0,
- name: '第' + (index + 1) + '学科' + 0
- })
- : (LinkData.value[index] = {
- value: item[0],
- name: '第' + (index + 1) + '学科' + item[0]
- })
- )
- console.log('LinkData', LinkData.value)
- goldData.value = [
- platformData.value.coinSystemSum
- .filter((item) => item.subject == '第一学科')
- .map((item) => Math.abs(item.totalCoinSystemSum)),
- platformData.value.coinSystemSum
- .filter((item) => item.subject == '第二学科')
- .map((item) => Math.abs(item.totalCoinSystemSum)),
- platformData.value.coinSystemSum
- .filter((item) => item.subject == '第三学科')
- .map((item) => Math.abs(item.totalCoinSystemSum)),
- platformData.value.coinSystemSum
- .filter((item) => item.subject == '第四学科')
- .map((item) => Math.abs(item.totalCoinSystemSum))
- ]
- goldData.value.forEach((item, index) =>
- item == ''
- ? (goldData.value[index] = {
- value: 0,
- name: '第' + (index + 1) + '学科' + 0
- })
- : (goldData.value[index] = {
- value: item[0],
- name: '第' + (index + 1) + '学科' + item[0]
- })
- )
- console.log('goldData', goldData.value)
- allData.value = [
- {
- value:
- Number(ERPData.value[0].value) +
- Number(HCData.value[0].value) +
- Number(LinkData.value[0].value) +
- Number(goldData.value[0].value),
- name:
- '第一学科' +
- (Number(ERPData.value[0].value) +
- Number(HCData.value[0].value) +
- Number(LinkData.value[0].value) +
- Number(goldData.value[0].value))
- },
- {
- value:
- Number(ERPData.value[1].value) +
- Number(HCData.value[1].value) +
- Number(LinkData.value[1].value) +
- Number(goldData.value[1].value),
- name:
- '第二学科' +
- (Number(ERPData.value[1].value) +
- Number(HCData.value[1].value) +
- Number(LinkData.value[1].value) +
- Number(goldData.value[1].value))
- },
- {
- value:
- Number(ERPData.value[2].value) +
- Number(HCData.value[2].value) +
- Number(LinkData.value[2].value) +
- Number(goldData.value[2].value),
- name:
- '第三学科' +
- (Number(ERPData.value[2].value) +
- Number(HCData.value[2].value) +
- Number(LinkData.value[2].value) +
- Number(goldData.value[2].value))
- },
- {
- value:
- Number(ERPData.value[3].value) +
- Number(HCData.value[3].value) +
- Number(LinkData.value[3].value) +
- Number(goldData.value[3].value),
- name:
- '第四学科' +
- (Number(ERPData.value[3].value) +
- Number(HCData.value[3].value) +
- Number(LinkData.value[3].value) +
- Number(goldData.value[3].value))
- }
- ]
-
- loading.value = false
-
- console.log('allData', allData.value)
} catch (error) {
console.log('请求失败', error)
loading.value = false
@@ -1012,171 +811,6 @@ function updateChart() {
onMounted(async function () {
await get()
updateChart()
-
- // 第一个饼状图 基于准备好的dom,初始化echarts实例
- var yearRechargePie = echarts.init(document.getElementById('yearRecharge'))
- const option3 = {
- tooltip: {
- trigger: 'item',
- position: ['15%', '-3%'],
- show:false, //控制上方小卡片是否展示
- formatter: function (params) {
- return params.seriesName + '
' + params.name
- }
- },
- legend: {
- bottom: '-1%',
- left: 'center',
- orient: 'vertical',
- // 控制点击事件
- selectedMode: false,
- },
- series: [
- {
- name:
- '全年累计金币数(个)\n' +
- formatNum(Math.abs(twoData.value.totalgold / 100)),
- type: 'pie',
- radius: ['60%', '80%'],
- avoidLabelOverlap: false,
- label: {
- show: true,
- position: 'center',
- formatter: '{a}',
- fontSize: 15,
- fontWeight: 'bold'
- },
- labelLine: {
- show: false
- },
- data: option3Data.value,
- color: ['#57a5ff', '#7f29ff', '#f2d113']
- }
- ]
- }
- // 使用刚指定的配置项和数据显示图表。
- yearRechargePie.setOption(option3)
-
- // 第二个饼状图 基于准备好的dom,初始化echarts实例
- var yearConsumePie = echarts.init(document.getElementById('yearConsume'))
- const option4 = {
- tooltip: {
- show:false, //控制上方小卡片是否展示
- trigger: 'item',
- position: ['15%', '-3%'],
- formatter: function (params) {
- return params.seriesName + '
' + params.name
- }
- },
- legend: {
- bottom: '-1%',
- left: 'center',
- orient: 'vertical',
- selectedMode: false,
- },
- grid: {
- top: '0%' // 设置图表距离容器顶部的距离为10%,使饼图上移
- },
- series: [
- {
- name:
- '全年累计消耗金币数(个)\n' +
- formatNum(Math.abs(threeData.value.consumeGold / 100)),
- type: 'pie',
- radius: ['60%', '80%'],
- avoidLabelOverlap: false,
- label: {
- show: true,
- position: 'center',
- formatter: '{a}',
- fontSize: 15,
- fontWeight: 'bold'
- },
- labelLine: {
- show: false
- },
- data: option4Data.value,
- color: ['#57a5ff', '#7f29ff', '#f2d113']
- }
- ]
- }
- // 使用刚指定的配置项和数据显示图表。
- yearConsumePie.setOption(option4)
-
- // 第三个饼状图 基于准备好的dom,初始化echarts实例
- var nowGoldPie = echarts.init(document.getElementById('nowGold'))
- const option5 = {
- tooltip: {
- show: false,
- trigger: 'item',
- position: ['15%', '-3%'],
- formatter: function (params) {
- return (
- params.seriesName +
- '
' +
- params.name +
- (params.value == oneData.value.freegold
- ? '6月到期 | ' +
- oneData.value.sfreegold / 100 +
- ' ; 12月到期 | ' +
- oneData.value.dfreegold / 100
- : '')
- )
- }
- },
- legend: {
- selectedMode: false,
- bottom: '-1%',
- left: 'center',
- orient: 'vertical'
- },
- grid: {
- top: '10%' // 设置图表距离容器顶部的距离为10%,使饼图上移
- },
- series: [
- {
- name:
- '当前金币余量(个)\n' +
- formatNum(Math.abs(oneData.value.sumgold / 100)),
- type: 'pie',
- radius: ['60%', '80%'],
- avoidLabelOverlap: false,
- label: {
- show: true,
- position: 'center',
- formatter: '{a}',
- fontSize: 15,
- fontWeight: 'bold'
- },
- labelLine: {
- show: false
- },
- data: option5Data.value,
- color: ['#57a5ff', '#7f29ff', '#f2d113']
- }
- ]
- }
- // 使用刚指定的配置项和数据显示图表。
- nowGoldPie.setOption(option5)
-
- // 第4-1个饼状图 基于准备好的dom,初始化echarts实例
- var all = echarts.init(document.getElementById('all'))
- const option6 = {
- tooltip: {
- trigger: 'item'
- },
- series: [
- {
- name: '四大学科类别占比',
- type: 'pie',
- radius: ['40%', '60%'],
- avoidLabelOverlap: false,
- data: allData.value
- }
- ]
- }
- // 使用刚指定的配置项和数据显示图表。
- all.setOption(option6)
})
@@ -1554,60 +1188,6 @@ onMounted(async function () {
-
-
-
-
-
-
-
-
-
-
-