diff --git a/vue/gold-system/package.json b/vue/gold-system/package.json index 46c17b6..a2a34b0 100644 --- a/vue/gold-system/package.json +++ b/vue/gold-system/package.json @@ -4,7 +4,7 @@ "version": "0.0.0", "type": "module", "scripts": { - "dev": "vite", + "dev": "vite --host 0.0.0.0", "build": "vue-tsc -b && vite build", "preview": "vite preview", "serve": "vite - service serve --host 0.0.0.0 --port 8080" diff --git a/vue/gold-system/src/views/usergold/index.vue b/vue/gold-system/src/views/usergold/index.vue index 33e7b16..17505e5 100644 --- a/vue/gold-system/src/views/usergold/index.vue +++ b/vue/gold-system/src/views/usergold/index.vue @@ -175,6 +175,35 @@ const get7Days = function () { get(); }; + +// 验证跳转输入框的数字是否合法 +const checkNumber = function () { + if (typeof parseInt(getObj.value.pageNum) === "number") { + console.log( + "总共有多少页" + Math.ceil(total.value / getObj.value.pageSize) + ); + if ( + getObj.value.pageNum > 0 && + getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize) + ) { + console.log("输入的数字合法"); + get(); + } else { + //提示 + ElMessage({ + type: "error", + message: "请检查输入内容", + }); + } + } else { + //提示 + ElMessage({ + type: "error", + message: "请检查输入内容", + }); + } +}; + // 挂载 onMounted(async function () { await get(); @@ -188,38 +217,18 @@ onMounted(async function () {
精网号: - +
更新类型: - - + +
更新时间: - +
重置 @@ -263,42 +272,17 @@ onMounted(async function () { @@ -311,6 +295,7 @@ onMounted(async function () { .pagination { display: flex; } + .status { display: flex; } diff --git a/vue/gold-system/src/views/workspace/index.vue b/vue/gold-system/src/views/workspace/index.vue index 3c5dc92..14a93af 100644 --- a/vue/gold-system/src/views/workspace/index.vue +++ b/vue/gold-system/src/views/workspace/index.vue @@ -6,6 +6,8 @@ import { Bs1CircleFill, Bs2CircleFill, Bs3CircleFill, Bs4Circle, Bs5Circle, Bs6C import axios, { all } from 'axios'; // 变量 +// 加载对象 +const loading = ref(true) // 总览对象 const getSumCoin = ref({}); const statistics = ref({}); @@ -136,13 +138,13 @@ const get = async function () { payMonthRecharge.value = getMediuPayCoin.value.map(item => Math.abs(item.rechargeSumCoin)).reverse(); payMonthFree.value = getMediuPayCoin.value.map(item => Math.abs(item.freeSumCoin)).reverse(); payMonthTask.value = getMediuPayCoin.value.map(item => Math.abs(item.taskSumCoin)).reverse(); - payMonthRecharge.value.forEach((number)=>{ + payMonthRecharge.value.forEach((number) => { payTotalRecharge.value += number }) - payMonthFree.value.forEach((number)=>{ + payMonthFree.value.forEach((number) => { payTotalFree.value += number }) - payMonthTask.value.forEach((number)=>{ + payMonthTask.value.forEach((number) => { payTotalTask.value += number }) console.log('payMonthCategory', payMonthCategory.value); @@ -157,13 +159,13 @@ const get = async function () { consumeMonthRecharge.value = getMediuConsumeCoin.value.map(item => Math.abs(item.rechargeSumCoin)).reverse(); consumeMonthFree.value = getMediuConsumeCoin.value.map(item => Math.abs(item.freeSumCoin)).reverse(); consumeMonthTask.value = getMediuConsumeCoin.value.map(item => Math.abs(item.taskSumCoin)).reverse(); - consumeMonthRecharge.value.forEach((number)=>{ + consumeMonthRecharge.value.forEach((number) => { consumeTotalRecharge.value += number }) - consumeMonthFree.value.forEach((number)=>{ + consumeMonthFree.value.forEach((number) => { consumeTotalFree.value += number }) - consumeMonthTask.value.forEach((number)=>{ + consumeMonthTask.value.forEach((number) => { consumeTotalTask.value += number }) console.log('consumeMonthCategory', consumeMonthCategory.value); @@ -293,6 +295,9 @@ const get = async function () { { value: (Number(ERPData.value[2].value) + Number(HCData.value[2].value) + Number(LinkData.value[2].value) + Number(goldData.value[2].value)), name: '第3学科' }, { value: (Number(ERPData.value[3].value) + Number(HCData.value[3].value) + Number(LinkData.value[3].value) + Number(goldData.value[3].value)), name: '第4学科' }, ] + + loading.value = false; + console.log('allData', allData.value); } catch (error) { console.log('请求失败', error); @@ -608,7 +613,7 @@ onMounted(async function () { { name: '全年累计金币数(个)\n' + statistics.value.totalSumCoin, type: 'pie', - radius: ['80%', '60%'], + radius: ['60%', '80%'], avoidLabelOverlap: false, label: { show: true, @@ -646,7 +651,7 @@ onMounted(async function () { { name: '全年累计消耗金币数(个)\n' + getYearConsumeCoin.value.yearsumCoin, type: 'pie', - radius: ['80%', '60%'], + radius: ['60%', '80%'], avoidLabelOverlap: false, label: { show: true, @@ -684,7 +689,7 @@ onMounted(async function () { { name: '当前金币余量(个)\n' + getSumCoin.value.todayTotalCoin, type: 'pie', - radius: ['80%', '60%'], + radius: ['60%', '80%'], avoidLabelOverlap: false, label: { show: true, @@ -728,337 +733,349 @@ onMounted(async function () {