From b079a2b464ffeaea2ec9733e6ef84c6ee854e12b Mon Sep 17 00:00:00 2001 From: fks-xuxinyue <2822784518@qq.com> Date: Wed, 7 Aug 2024 10:28:29 +0800 Subject: [PATCH] taskId:282,remark:'commit' --- .../src/api/carbonEmissionFactorLibrary.ts | 6 +- hx-ai-intelligent/src/icon/carbonPlanningDown.svg | 6 + hx-ai-intelligent/src/icon/carbonPlanningUp.svg | 6 + .../carbonEmissionManage/carbonAssets/index.vue | 2 +- .../carbonEmissionFactorLibrary/config.ts | 2 +- .../carbonEmissionFactorLibrary/index.vue | 4 +- .../carbonEmissionStatistics/index.vue | 1 - .../carbonInventoryCheck/fillInPage/index.vue | 18 +- .../carbonPlanning/all/index.vue | 35 ++- .../carbonPlanning/category/categoryDeatil.vue | 236 +++++++++++++++------ .../carbonPlanning/category/index.vue | 95 +++++++-- .../carbonEmissionManage/carbonPlanning/index.vue | 63 ++++-- .../src/view/equipmentManage/group/index.vue | 1 + 13 files changed, 353 insertions(+), 122 deletions(-) create mode 100644 hx-ai-intelligent/src/icon/carbonPlanningDown.svg create mode 100644 hx-ai-intelligent/src/icon/carbonPlanningUp.svg diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts index fe5380d..c9b0f97 100644 --- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts +++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts @@ -52,7 +52,7 @@ export enum carbonInventoryCheck { update = '/carbon-smart/api/carbon/inventory/update', del = '/carbon-smart/api/carbon/inventory/del', // 获取排放源表格数据 - findUnitById = '/carbon-smartapi/carbon/inventory/findById', + findUnitById = '/carbon-smart/api/carbon/inventory/findById', getDetailsList = '/carbon-smart/api/carbon/inventory/details/getDetailsList', updateTable = '/carbon-smart/api/carbon/inventory/details/update', // 排放统计接口 @@ -86,4 +86,8 @@ export enum carbonPlanning { yearAndMonthAchievement = '/carbon-smart/api/carbon/planning/yearAndMonthAchievement', annualElectricityConsumption = '/carbon-smart/api/carbon/planning/annualElectricityConsumption', electricityUsageBackThen = '/carbon-smart/api/carbon/planning/electricityUsageBackThen', + detailedStatisticalDataTable = '/carbon-smart/api/carbon/planning/detailedStatisticalDataTable', + detailedStatisticalDataChart = '/carbon-smart/api/carbon/planning/detailedStatisticalDataChart', + batchOrUpdate = '/carbon-smart/api/carbon/planning/batchOrUpdate', + addNodes = '/carbon-smart/api/carbon/planning/addNodes', } diff --git a/hx-ai-intelligent/src/icon/carbonPlanningDown.svg b/hx-ai-intelligent/src/icon/carbonPlanningDown.svg new file mode 100644 index 0000000..cbf6941 --- /dev/null +++ b/hx-ai-intelligent/src/icon/carbonPlanningDown.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/hx-ai-intelligent/src/icon/carbonPlanningUp.svg b/hx-ai-intelligent/src/icon/carbonPlanningUp.svg new file mode 100644 index 0000000..cbf6941 --- /dev/null +++ b/hx-ai-intelligent/src/icon/carbonPlanningUp.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue index 748eb5c..25d7b2a 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue @@ -148,7 +148,7 @@
-
全国碳账户估值（CNY）
+
碳资产总估值（CNY）
{{ whole.whole }}
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts index 7eaf1ae..5044eff 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts @@ -191,7 +191,7 @@ export const formConfig = (disabled) => { }, { label: '参考文献', - field: 'reference', + field: 'bibliography', component: 'NsTextarea', componentProps: { placeholder: '请输入参考文献', diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue index feec1a2..ba32d72 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue @@ -686,7 +686,7 @@ }, { title: '参考文献', - dataIndex: 'reference', + dataIndex: 'bibliography', }, { title: '引用数量', @@ -824,7 +824,7 @@ }, }, { - field: 'reference', + field: 'bibliography', label: '文献关键字', component: 'NsInput', componentProps: { diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue index 94da7c9..76f48a0 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue @@ -37,7 +37,6 @@ energyConsumptionRef.value.mainRef.nsTableRef.reload(); } } else if (key === '2') { - debugger if (carbonEmissionsRef.value) { carbonEmissionsRef.value.getTableList(); // 调用子组件的方法 } diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue index b5eede6..151d401 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue @@ -1163,6 +1163,8 @@ let chartInstance: echarts.ECharts | null = null; const drawEcharts = () => { chartInstance = echarts.init(tplxChart.value); + let listData = datalist.value; + let linkDatas = linksData.value; let Color = [ '#61FEFF', '#937FE6', @@ -1180,6 +1182,8 @@ '#bbc951', '#FFC14B', '#b785a6', + '#c23531', + '#2f4554', ]; let Color1 = [ '#04E0F3', @@ -1198,6 +1202,8 @@ '#bbc951', '#FFC14B', '#b785a6', + '#c23531', + '#2f4554', ]; let sourceLabel = [ 'right', @@ -1219,16 +1225,16 @@ ]; let itemStyleColor = []; let labelSource = []; - for (let i = 0; i < datalist.value.length; i++) { - datalist.value[i].label = { + for (let i = 0; i < listData.length; i++) { + listData[i].label = { normal: { position: sourceLabel[i], }, }; labelSource.push(sourceLabel[i]); } - for (let d = 0; d < datalist.value.length; d++) { - datalist.value[d].itemStyle = { + for (let d = 0; d < listData.length; d++) { + listData[d].itemStyle = { normal: { color: { type: 'linear', @@ -1250,7 +1256,7 @@ }, }, }; - itemStyleColor.push(datalist.value[d]); + itemStyleColor.push(listData[d]); } const option = { backgroundColor: 'transparent', @@ -1270,7 +1276,7 @@ nodeWidth: 25, focusNodeAdjacency: 'allEdges', data: itemStyleColor, - links: linksData.value, + links: linkDatas, label: { normal: { color: '#fff', diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue index 14f7fd2..0285bb9 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue @@ -7,13 +7,15 @@ v-if="selectedTime" style="margin-left: 5%" valueFormat="YYYY" - :value="selectYear" + v-model:value="selectYear" + @change="changeYear" picker="year" />
@@ -30,7 +32,13 @@
- + +
@@ -52,26 +60,35 @@ return http.post(api, params); }; const selectYear = ref(dayjs(new Date().getFullYear().toString())); - const selectMonth = ref(); + const selectMonth = ref(dayjs().startOf('year').month(0)); // 年/月切换 const monthStyles = ref('background: #f2f2f2'); const yearStyles = ref('background: #2778ff'); const selectedTime = ref(true); + const changeMonth = () => { + queryParams.value.yearMonth = selectMonth.value; + getTableData(); + }; const changeToMonth = () => { monthStyles.value = 'background: #2778ff'; yearStyles.value = 'background: #f2f2f2'; queryParams.value.yearAndMonth = 'month'; - queryParams.value.year = selectMonth.value; + queryParams.value.yearMonth = selectMonth.value.format('YYYY-DD'); columns.value[2].title = '月份'; - columns.value[2].dataIndex = 'month'; + columns.value[2].dataIndex = 'yearMonth'; selectedTime.value = false; getTableData(); }; + const changeYear = () => { + queryParams.value.year = selectYear.value; + getTableData(); + }; const changeToYear = () => { monthStyles.value = 'background: #f2f2f2'; yearStyles.value = 'background: #2778ff'; queryParams.value.yearAndMonth = 'year'; - queryParams.value.year = selectYear.value; + delete queryParams.value.yearMonth; + // queryParams.value.year = selectYear.value; columns.value[2].title = '年份'; columns.value[2].dataIndex = 'year'; selectedTime.value = true; @@ -85,7 +102,7 @@ const chart = echarts.init(document.getElementById(`ydlChart_${index}`)!); const handred = 100; - let point = parseInt(item.budgetAchievement.replace("%", "")); + let point = parseInt(item.budgetAchievement.replace('%', '')); const option = { backgroundColor: 'transparent', title: [ @@ -197,7 +214,7 @@ }, { title: '计量单位', - dataIndex: 'name', + dataIndex: 'unitMeasurement', }, { title: '总实际用量', diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue index 0ecc940..234403e 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue @@ -13,23 +13,49 @@
-
12,500.00kwh
-
2023年实际用量
+
+ {{ lastYearActualUsage }} + kwh +
+
{{ Number(props.year) - 1 }}年实际用量
-
12,500.00kwh
-
2024年实际用量
+
+ {{ actualUsage }} + kwh +
+
{{ props.year }}年实际用量
-
12,500.00kwh
-
2024年预算
+
+ {{ budget }} + kwh +
+
{{ props.year }}年预算
-
12,500.00kwh
+
+ {{ referenceValue }} + kwh +
基准值
-
12,500.00kwh
+
+ + {{ Math.abs(count) }}% + + {{ count }}% + {{ count }}% +
实际|预算
@@ -64,6 +90,7 @@ selectedRowKeys: selectedRowKeys, onChange: onSelectionChange, }" + :scroll="{ x: 1300, y: 400 }" :pagination="false">