第四周更新

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({});

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 () {

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 +
           "<br/>" +
           params.name +
-          (params.value == getSumCoin.value.todayFree
+          (params.value == oneData.value.freegold
             ? "</br>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 () {
           </div>
         </el-card>
       </el-col>
-      <el-col :span="8">
+      <!-- <el-col :span="8">
         <el-card>
           <template #header>
             <div class="card-header" style="display: flex">
@@ -1616,7 +1616,7 @@ onMounted(async function () {
             <div id="gold" style="width: 500px; height: 400px"></div>
           </span>
         </el-card>
-      </el-col>
+      </el-col> -->
     </el-row>
   </div>
 </template>