From 2d667ac03802eecc82ed9e815668bd66570bf4c2 Mon Sep 17 00:00:00 2001 From: YOU <15501379989@163.com> Date: Thu, 15 May 2025 13:56:19 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=9C=8B=E6=9D=BF=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E8=B0=83=E6=95=B4=E5=8F=8A=E4=BC=98=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/common/model.ts | 25 +++++++++--- src/views/dashboard/comp/pop.vue | 6 +++ src/views/dashboard/main.vue | 61 ++++++++++++++++++----------- 3 files changed, 65 insertions(+), 27 deletions(-) diff --git a/src/views/dashboard/common/model.ts b/src/views/dashboard/common/model.ts index a148508..e562434 100644 --- a/src/views/dashboard/common/model.ts +++ b/src/views/dashboard/common/model.ts @@ -30,7 +30,9 @@ export const monthEnergyUsageTrend = (data = [], unit?: string): IObject => { let str = `
${axisValue}日
`; for (const item of params) { const { data } = item; - str += `
${item.marker} ${data} ${unit}
`; + str += `
${ + item.marker + } ${data ?? '--'} ${unit}
`; } return str + '
'; } @@ -193,7 +195,16 @@ export const costStatistic = (data = []): IObject => { tooltip: { formatter: (params) => { if (params.name !== '') { - return params.name + ' : ' + params.value + '\n' + '(' + params.percent + '%)'; + return ( + params.marker + + params.name + + ' : ' + + (params.value ?? '--') + + ' tce \n' + + '(' + + params.percent + + '%)' + ); } }, }, @@ -294,7 +305,9 @@ export const usageRanking = (data = [], unit?: string): IObject => { let str = `
${axisValue}
`; for (const item of params) { const { data } = item; - str += `
${item.marker} ${data} ${unit}
`; + str += `
${ + item.marker + } ${data ?? '--'} ${unit}
`; } return str + '
'; } @@ -375,7 +388,9 @@ export const elecPayload = (data = []): IObject => { let str = `
${moment().format('YYYY-MM-DD')} ${axisValue}时
`; for (const item of params) { const { seriesName, data } = item; - str += `
${item.marker}电力负荷： ${data} kWh
`; + str += `
${ + item.marker + }电力负荷： ${data ?? '--'} kWh
`; } return str + '
'; } @@ -492,7 +507,7 @@ export const energyUsageDistribution = (data = []): IObject => { const { seriesName, data } = item; str += `
${ item.marker - }${seriesName}： ${data} ${ + }${seriesName}： ${data ?? '--'} ${ utilService.getTargetItemByKey(energyMap, seriesName, 'name')?.unit || '' }
`; } diff --git a/src/views/dashboard/comp/pop.vue b/src/views/dashboard/comp/pop.vue index 501871c..6fc660d 100644 --- a/src/views/dashboard/comp/pop.vue +++ b/src/views/dashboard/comp/pop.vue @@ -98,5 +98,11 @@ export default defineComponent({ } } } + + &:first-child { + b { + font-size: 20px !important; + } + } } diff --git a/src/views/dashboard/main.vue b/src/views/dashboard/main.vue index e038cb4..5ede6b3 100644 --- a/src/views/dashboard/main.vue +++ b/src/views/dashboard/main.vue @@ -30,11 +30,11 @@ -
+
@@ -116,7 +116,7 @@ export default defineComponent({ icon: 'elec', label: '电用量', value: '', - unit: '万kWh', + unit: 'kWh', }, { key: 'waterDayValue', @@ -157,7 +157,7 @@ export default defineComponent({ icon: 'elec', label: '电用量', value: '', - unit: '万kWh', + unit: 'kWh', }, { key: 'waterDayValue', @@ -190,11 +190,10 @@ export default defineComponent({ ], }, { - title: '当月用能趋势', comp: 'chart', - option: monthEnergyUsageTrend(), + title: '当日电力负荷', + option: elecPayload(), unit: 'kWh', - select: true, }, ], right: [ @@ -212,10 +211,11 @@ export default defineComponent({ select: true, }, { + title: '当月用能趋势', comp: 'chart', - title: '当日电力负荷', - option: elecPayload(), + option: monthEnergyUsageTrend(), unit: 'kWh', + select: true, }, ], bottom: { @@ -242,7 +242,7 @@ export default defineComponent({ const d = res.currentMonthData; const c = state.dataForm.code; const u = state.dataForm.codeMap[c]; - state.left[2].option = monthEnergyUsageTrend(d, u); + state.right[2].option = monthEnergyUsageTrend(d, u); } }, }); @@ -315,24 +315,24 @@ export default defineComponent({ cb: (res: any) => { if (utilService.isValidObject(res) && utilService.isValidArray(res.currentMonthData)) { const d = res.currentMonthData; - state.right[2].option = elecPayload(d); + state.left[2].option = elecPayload(d); } }, }); }; //24小时用能分布情况 - useFetch('/board/dayEnergy/trend', { - data: { - //day: '2025-04-01', - day: moment().subtract(1, 'days').format('YYYY-MM-DD'), - }, - cb: (res: any) => { - if (utilService.isValidObject(res)) { - state.bottom.option = energyUsageDistribution(res); - } - }, - }); + // useFetch('/board/dayEnergy/trend', { + // data: { + // //day: '2025-04-01', + // day: moment().subtract(1, 'days').format('YYYY-MM-DD'), + // }, + // cb: (res: any) => { + // if (utilService.isValidObject(res)) { + // state.bottom.option = energyUsageDistribution(res); + // } + // }, + // }); changeType(state.dataForm.code); fn(); @@ -472,6 +472,23 @@ export default defineComponent({ cursor: move; //background: url("@/assets/images/njhl/bg.png"); //transform: translate(-50%, -50%); + /* 初始阴影设置（透明） */ + &::before { + content: ''; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border-radius: inherit; + //opacity: 0; + //transition: opacity 0.4s; + box-shadow: inset 0 0 80px 30px #000b31; + } + + &:hover::before { + // opacity: 1; + } } .icon {