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/workspace/index.vue b/vue/gold-system/src/views/workspace/index.vue index 3c5dc92..f97ffd1 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); @@ -728,337 +733,349 @@ onMounted(async function () {