From 57e761c78f47aaf0b3dfed36f29ba3d007f6d855 Mon Sep 17 00:00:00 2001 From: donghaolin <17667510818@163.com> Date: Thu, 19 Dec 2024 11:36:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/gold-system/src/views/audit/rechargeAudit.vue | 2 +- vue/gold-system/src/views/audit/refundAudit.vue | 2 +- vue/gold-system/src/views/consume/allConsume.vue | 28 +- .../src/views/managerecharge/activity.vue | 4 +- vue/gold-system/src/views/managerecharge/rate.vue | 2 +- .../src/views/recharge/adminRecharge.vue | 2 +- vue/gold-system/src/views/recharge/allRecharge.vue | 2 +- vue/gold-system/src/views/refund/allRefund.vue | 2 +- vue/gold-system/src/views/usergold/index.vue | 2 +- vue/gold-system/src/views/workspace/index.vue | 281 +++++++++++++++------ 10 files changed, 224 insertions(+), 103 deletions(-) diff --git a/vue/gold-system/src/views/audit/rechargeAudit.vue b/vue/gold-system/src/views/audit/rechargeAudit.vue index 11a348d..41eb2d0 100644 --- a/vue/gold-system/src/views/audit/rechargeAudit.vue +++ b/vue/gold-system/src/views/audit/rechargeAudit.vue @@ -22,7 +22,7 @@ const rechargeVo = ref({}); // 搜索对象 const getObj = ref({ pageNum: 1, - pageSize: 5, + pageSize: 10, }); //分页总条目 const total = ref(100); diff --git a/vue/gold-system/src/views/audit/refundAudit.vue b/vue/gold-system/src/views/audit/refundAudit.vue index ddbba6d..69fe3c4 100644 --- a/vue/gold-system/src/views/audit/refundAudit.vue +++ b/vue/gold-system/src/views/audit/refundAudit.vue @@ -22,7 +22,7 @@ const consumeDetail = ref({}); // 搜索对象 const getObj = ref({ pageNum: 1, - pageSize: 5, + pageSize: 10, }); //分页总条目 const total = ref(100); diff --git a/vue/gold-system/src/views/consume/allConsume.vue b/vue/gold-system/src/views/consume/allConsume.vue index 5b982e1..d3c20bc 100644 --- a/vue/gold-system/src/views/consume/allConsume.vue +++ b/vue/gold-system/src/views/consume/allConsume.vue @@ -354,19 +354,27 @@ getGoods(); > - - - + + + + + + + + item == "" ? (ERPData.value[index] = { - value: 0, - name: "第" + (index + 1) + "学科" + 0, - }) + value: 0, + name: "第" + (index + 1) + "学科" + 0, + }) : (ERPData.value[index] = { - value: item[0], - name: "第" + (index + 1) + "学科" + item[0], - }) + value: item[0], + name: "第" + (index + 1) + "学科" + item[0], + }) ); console.log("ERPData", ERPData.value); HCData.value = [ @@ -237,13 +237,13 @@ const get = async function () { HCData.value.forEach((item, index) => item == "" ? (HCData.value[index] = { - value: 0, - name: "第" + (index + 1) + "学科" + 0, - }) + value: 0, + name: "第" + (index + 1) + "学科" + 0, + }) : (HCData.value[index] = { - value: item[0], - name: "第" + (index + 1) + "学科" + item[0], - }) + value: item[0], + name: "第" + (index + 1) + "学科" + item[0], + }) ); console.log("HCData", HCData.value); LinkData.value = [ @@ -263,13 +263,13 @@ const get = async function () { LinkData.value.forEach((item, index) => item == "" ? (LinkData.value[index] = { - value: 0, - name: "第" + (index + 1) + "学科" + 0, - }) + value: 0, + name: "第" + (index + 1) + "学科" + 0, + }) : (LinkData.value[index] = { - value: item[0], - name: "第" + (index + 1) + "学科" + item[0], - }) + value: item[0], + name: "第" + (index + 1) + "学科" + item[0], + }) ); console.log("LinkData", LinkData.value); goldData.value = [ @@ -289,13 +289,13 @@ const get = async function () { goldData.value.forEach((item, index) => item == "" ? (goldData.value[index] = { - value: 0, - name: "第" + (index + 1) + "学科" + 0, - }) + value: 0, + name: "第" + (index + 1) + "学科" + 0, + }) : (goldData.value[index] = { - value: item[0], - name: "第" + (index + 1) + "学科" + item[0], - }) + value: item[0], + name: "第" + (index + 1) + "学科" + item[0], + }) ); console.log("goldData", goldData.value); allData.value = [ @@ -365,7 +365,7 @@ const get = async function () { // 获取中间柱状图数据 const getMiddleBar = async function () { const result = await API.post( - "http://192.168.8.93:10010/statistics/getCoinTime", + "http://192.168.8.147:10010/statistics/getCoinTime", getMiddleBarObj.value ); @@ -373,14 +373,18 @@ const getMiddleBar = async function () { console.log("getMiddleBarData", getMiddleBarData.value); // 柱状图数据处理 - middleCategory.value = getMiddleBarData.value - .map((item) => item.day == null ? item.month : item.day.substring(0, 10)); - middleRecharge.value = getMiddleBarData.value - .map((item) => Math.abs(item.rechargeSumCoin)); - middleFree.value = getMiddleBarData.value - .map((item) => Math.abs(item.freeSumCoin)); - middleTask.value = getMiddleBarData.value - .map((item) => Math.abs(item.taskSumCoin)); + middleCategory.value = getMiddleBarData.value.map((item) => + item.day == null ? item.month : item.day.substring(0, 10) + ); + middleRecharge.value = getMiddleBarData.value.map((item) => + Math.abs(item.rechargeSumCoin) + ); + middleFree.value = getMiddleBarData.value.map((item) => + Math.abs(item.freeSumCoin) + ); + middleTask.value = getMiddleBarData.value.map((item) => + Math.abs(item.taskSumCoin) + ); middleTotalRecharge.value = 0; middleTotalFree.value = 0; @@ -694,28 +698,28 @@ const allTime = function () { search(); }; // 时间选择器 -const changeTime=function(){ - console.log("changeTimeRatio",changeTimeRatio.value); - if(changeTimeRatio.value=="allDays"){ +const changeTime = function () { + console.log("changeTimeRatio", changeTimeRatio.value); + if (changeTimeRatio.value == "allDays") { allTime(); - }else if(changeTimeRatio.value=="week"){ + } else if (changeTimeRatio.value == "week") { thisWeek(); - }else if(changeTimeRatio.value=="month"){ + } else if (changeTimeRatio.value == "month") { thisMonth(); - }else if(changeTimeRatio.value=="year"){ + } else if (changeTimeRatio.value == "year") { thisYear(); - }else if(changeTimeRatio.value=="day"){ + } else if (changeTimeRatio.value == "day") { today(); } -} +}; // 根据时间搜索 const search = function () { console.log( "searchTime", moment(searchTime.value[0]).format("YYYY-MM-DD") + - "至" + - moment(searchTime.value[1]).format("YYYY-MM-DD") + "至" + + moment(searchTime.value[1]).format("YYYY-MM-DD") ); getMiddleBarObj.value.searchStartTime = moment(searchTime.value[0]).format( @@ -1085,26 +1089,37 @@ onMounted(async function () {
较前一天 {{ formatNum(getSumCoin.coinDifference) }} - +
较前一天 {{ formatNum(getSumCoin.coinDifference) }} - +
较前一天 {{ formatNum(getSumCoin.coinDifference) }} - +

- + @@ -1114,9 +1129,11 @@ onMounted(async function () { {{ formatNum(Math.abs(statistics.totalSumCoin)) }}

- 折合新币累计金额 {{ formatNum(Math.abs(statistics.rechargeSumCoin)) }} + 折合新币累计金额 + {{ formatNum(Math.abs(statistics.rechargeSumCoin)) }}

-