- 所属部门：
+ 职位名称：
@@ -489,7 +489,7 @@ onMounted(async function () {
-
+
总部管理员
@@ -660,7 +660,7 @@ onMounted(async function () {
>
-
+
{
-
+
diff --git a/gold-system/src/views/recharge/allRecharge.vue b/gold-system/src/views/recharge/allRecharge.vue
index 55e2da9..d16e7cb 100644
--- a/gold-system/src/views/recharge/allRecharge.vue
+++ b/gold-system/src/views/recharge/allRecharge.vue
@@ -472,11 +472,11 @@ const handleSortChange = (column) => {
-
+
diff --git a/gold-system/src/views/refund/allRefund.vue b/gold-system/src/views/refund/allRefund.vue
index 261c874..2ff1792 100644
--- a/gold-system/src/views/refund/allRefund.vue
+++ b/gold-system/src/views/refund/allRefund.vue
@@ -533,13 +533,13 @@ const handleSortChange = (column) => {
-
+
-
+
昨日新增消耗{{
formatNum(
Math.abs(
- threeData.yesterdayCoin !== undefined &&
- threeData.yesterdayCoin !== null
- ? threeData.yesterdayCoin / 100
+ threeData.yesterdayGold + threeData.yesterdayrefund !==
+ undefined &&
+ threeData.yesterdayGold + threeData.yesterdayrefund !== null
+ ? (threeData.yesterdayGold + threeData.yesterdayrefund) /
+ 100
: 0
)
)
From 15c464c34c4435eeb4115c24dabfd9a7ac2a3f51 Mon Sep 17 00:00:00 2001
From: donghaolin <17667510818@163.com>
Date: Mon, 7 Apr 2025 10:28:44 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E7=AC=AC=E5=9B=9B=E5=91=A8=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
gold-system/src/views/audit/rechargeAudit.vue | 6 --
gold-system/src/views/consume/addConsume.vue | 5 +-
gold-system/src/views/workspace/index.vue | 92 +++++++++++++--------------
3 files changed, 50 insertions(+), 53 deletions(-)
diff --git a/gold-system/src/views/audit/rechargeAudit.vue b/gold-system/src/views/audit/rechargeAudit.vue
index a693861..1e1aeaa 100644
--- a/gold-system/src/views/audit/rechargeAudit.vue
+++ b/gold-system/src/views/audit/rechargeAudit.vue
@@ -7,12 +7,6 @@ import axios from "axios";
import moment from "moment";
import API from "../../api/index.js";
// 变量
-// 用户对象假的
-const admin = ref({
- adminId: 1,
- name: "赵刚",
- area: "中国",
-});
//这是获取用户信息的接口
const adminData = ref({});
diff --git a/gold-system/src/views/consume/addConsume.vue b/gold-system/src/views/consume/addConsume.vue
index 576d620..49f2be3 100644
--- a/gold-system/src/views/consume/addConsume.vue
+++ b/gold-system/src/views/consume/addConsume.vue
@@ -120,7 +120,10 @@ const rules = reactive({
rechargeCoin: [
{ required: true, message: "请输入免费金币", trigger: "blur" },
],
- allGold: [{ validator: checkFreeGoldRadio, trigger: "blur" }],
+ allGold: [
+ { required: true, message: "消费金币总数不能为空", trigger: "blur" },
+ { validator: checkFreeGoldRadio, trigger: "blur" },
+ ],
});
//这是重置方法
const delteConsume = function () {
diff --git a/gold-system/src/views/workspace/index.vue b/gold-system/src/views/workspace/index.vue
index 31e1dd1..e3fc275 100644
--- a/gold-system/src/views/workspace/index.vue
+++ b/gold-system/src/views/workspace/index.vue
@@ -16,8 +16,8 @@ const areaRankLoading = ref(true);
// 总览对象
const getSumCoin = ref({});
const statistics = ref({});
-const getYearConsumeCoin = ref({});
-const getDayConsumeCoin = ref({});
+// const getYearConsumeCoin = ref({});
+// const getDayConsumeCoin = ref({});
// 中间统计图搜索参数
const changeTimeRatio = ref("allDays");
@@ -95,22 +95,22 @@ const get = async function () {
getAreaRank();
getMiddleBar();
// 发送POST请求
- const result1 = await API.post(
- "http://54.251.137.151:10702/statistics/getSumCoin",
- {}
- );
+ // const result1 = await API.post(
+ // "http://54.251.137.151:10702/statistics/getSumCoin",
+ // {}
+ // );
const result2 = await API.post(
"http://54.251.137.151:10702/statistics/a",
{}
);
- 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 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",
// {}
@@ -151,71 +151,71 @@ const get = async function () {
console.log("oneData", oneData.value);
// 将响应结果存储到响应式数据中
- getSumCoin.value = result1.data;
+ // getSumCoin.value = result1.data;
statistics.value = result2.data;
- getYearConsumeCoin.value = result3.data;
- getDayConsumeCoin.value = result4.data;
+ // getYearConsumeCoin.value = result3.data;
+ // getDayConsumeCoin.value = result4.data;
platformData.value = result9.data;
- console.log("getSumCoin", getSumCoin.value);
+ // console.log("getSumCoin", getSumCoin.value);
console.log("statistics", statistics.value);
- console.log("getYearConsumeCoin", getYearConsumeCoin.value);
- console.log("getDayConsumeCoin", getDayConsumeCoin.value);
+ // console.log("getYearConsumeCoin", getYearConsumeCoin.value);
+ // console.log("getDayConsumeCoin", getDayConsumeCoin.value);
console.log("platformData", platformData.value);
option3Data.value = [
{
- value: Math.abs(statistics.value.rechargeSumCoin),
- name: "永久金币" + " | " + formatNum(statistics.value.rechargeSumCoin),
+ value: Math.abs(twoData.value.rechargegold),
+ name: "永久金币" + " | " + formatNum(twoData.value.rechargegold / 100),
},
{
- value: Math.abs(statistics.value.freeSumCoin),
- name: "免费金币" + " | " + formatNum(statistics.value.freeSumCoin),
+ value: Math.abs(twoData.value.freegold),
+ name: "免费金币" + " | " + formatNum(twoData.value.freegold / 100),
},
{
- value: Math.abs(statistics.value.taskSumCoin),
- name: "任务金币" + " | " + formatNum(statistics.value.taskSumCoin),
+ value: Math.abs(twoData.value.taskgold),
+ name: "任务金币" + " | " + formatNum(twoData.value.taskgold / 100),
},
];
option4Data.value = [
{
- value: Math.abs(getYearConsumeCoin.value.yearSumRechargeCoin),
+ value: Math.abs(threeData.value.rechargegold),
name:
"永久金币" +
" | " +
- formatNum(Math.abs(getYearConsumeCoin.value.yearSumRechargeCoin)),
+ formatNum(Math.abs(threeData.value.rechargegold / 100)),
},
{
- value: Math.abs(getYearConsumeCoin.value.yearSumFreeCoin),
+ value: Math.abs(threeData.value.freegold),
name:
"免费金币" +
" | " +
- formatNum(Math.abs(getYearConsumeCoin.value.yearSumFreeCoin)),
+ formatNum(Math.abs(threeData.value.freegold / 100)),
},
{
- value: Math.abs(getYearConsumeCoin.value.yearSumTaskCoin),
+ value: Math.abs(threeData.value.taskgold),
name:
"任务金币" +
" | " +
- formatNum(Math.abs(getYearConsumeCoin.value.yearSumTaskCoin)),
+ formatNum(Math.abs(threeData.value.taskgold / 100)),
},
];
console.log("option4Data", option4Data.value);
option5Data.value = [
{
- value: Math.abs(getSumCoin.value.todayRecharge),
- name: "永久金币" + " | " + formatNum(getSumCoin.value.todayRecharge),
+ value: Math.abs(oneData.value.rechargegold),
+ name: "永久金币" + " | " + formatNum(oneData.value.rechargegold / 100),
},
{
- value: Math.abs(getSumCoin.value.todayFree),
- name: "免费金币" + " | " + formatNum(getSumCoin.value.todayFree),
+ value: Math.abs(oneData.value.freegold),
+ name: "免费金币" + " | " + formatNum(oneData.value.freegold / 100),
},
{
- value: Math.abs(getSumCoin.value.todayTask),
- name: "任务金币" + " | " + formatNum(getSumCoin.value.todayTask),
+ value: Math.abs(oneData.value.taskgold),
+ name: "任务金币" + " | " + formatNum(oneData.value.taskgold / 100),
},
];
console.log("option5Data", option5Data.value);
@@ -1029,7 +1029,7 @@ onMounted(async function () {
{
name:
"全年累计金币数(个)\n" +
- formatNum(Math.abs(statistics.value.totalSumCoin)),
+ formatNum(Math.abs(twoData.value.totalgold / 100)),
type: "pie",
radius: ["60%", "80%"],
avoidLabelOverlap: false,
@@ -1073,7 +1073,7 @@ onMounted(async function () {
{
name:
"全年累计消耗金币数(个)\n" +
- formatNum(Math.abs(getYearConsumeCoin.value.yearsumCoin)),
+ formatNum(Math.abs(threeData.value.consumeGold / 100)),
type: "pie",
radius: ["60%", "80%"],
avoidLabelOverlap: false,
@@ -1106,11 +1106,11 @@ onMounted(async function () {
params.seriesName +
"
" +
params.name +
- (params.value == getSumCoin.value.todayFree
+ (params.value == oneData.value.freegold
? "6月到期 | " +
- statistics.value.free6SumCoin +
+ oneData.value.sfreegold / 100 +
" ; 12月到期 | " +
- statistics.value.free12SumCoin
+ oneData.value.dfreegold / 100
: "")
);
},
@@ -1127,7 +1127,7 @@ onMounted(async function () {
{
name:
"当前金币余量(个)\n" +
- formatNum(Math.abs(getSumCoin.value.todayTotalCoin)),
+ formatNum(Math.abs(oneData.value.sumgold / 100)),
type: "pie",
radius: ["60%", "80%"],
avoidLabelOverlap: false,
@@ -1579,7 +1579,7 @@ onMounted(async function () {
-
+