diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts index 5961d52..3583af0 100644 --- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts +++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts @@ -70,3 +70,8 @@ export enum carbonAssets { delete = '/carbon-smart/api/carbon/trade/details/delete', quotaStatistics = '/carbon-smart/api/carbon/trade/details/quotaStatistics', } +// 上传图片接口 +export enum uploadPic { + uploadfiles = '/carbon-smart/api/common/file/uploadfiles', + select = '/carbon-smart/api/common/file/select', +} diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue index fe1f4ed..26938d9 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue @@ -55,12 +55,19 @@ 新增 导入 导出 - 批量删除 + 批量删除 - - + + - + @@ -164,10 +172,16 @@ + diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue index aeda327..748eb5c 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue @@ -6,7 +6,9 @@ >
全国碳账户估值(CNY)
-
{{nationwide.valuation}}
+
{{ + nationwide.valuation + }}
-
{{nationwide.opening}}
+
{{ nationwide.opening }}
期初余额(tCO2)
-
{{nationwide.income}}
+
{{ nationwide.income }}
增加(tCO2) @@ -34,7 +36,7 @@
-
{{nationwide.expenditure}}
+
{{ nationwide.expenditure }}
减少(tCO2) @@ -42,7 +44,7 @@
-
{{nationwide.period}}
+
{{ nationwide.period }}
期末余额(tCO2)
@@ -53,7 +55,7 @@ >
地方碳账户估值(CNY)
-
{{place.valuation}}
+
{{ place.valuation }}
-
{{place.opening}}
+
{{ place.opening }}
期初余额(tCO2)
-
{{place.income}}
+
{{ place.income }}
增加(tCO2) @@ -81,7 +83,7 @@
-
{{place.expenditure}}
+
{{ place.expenditure }}
减少(tCO2) @@ -89,7 +91,7 @@
-
{{place.period}}
+
{{ place.period }}
期末余额(tCO2)
@@ -100,7 +102,7 @@ >
CCER资产估值(CNY)
-
{{ccer.valuation}}
+
{{ ccer.valuation }}
-
{{ccer.opening}}
+
{{ ccer.opening }}
期初余额(tCO2)
-
{{ccer.income}}
+
{{ ccer.income }}
增加(tCO2) @@ -128,7 +130,7 @@
-
{{ccer.expenditure}}
+
{{ ccer.expenditure }}
减少(tCO2) @@ -136,7 +138,7 @@
-
{{ccer.period}}
+
{{ ccer.period }}
期末余额(tCO2)
@@ -147,7 +149,7 @@ >
全国碳账户估值(CNY)
-
{{whole.whole}}
+
{{ whole.whole }}
-
{{whole.nationwide}}
+
{{ whole.nationwide }}
全国碳账户资产估值
-
{{whole.place}}
+
{{ whole.place }}
地方碳账户资产估值
-
{{whole.ccer}}
+
{{ whole.ccer }}
CCER碳资产估值
@@ -204,23 +206,24 @@ orgId: orgId.value, year: new Date().getFullYear(), }); - const nationwide = ref() - const place = ref() - const ccer = ref() - const whole = ref() + const nationwide = ref(); + const place = ref(); + const ccer = ref(); + const whole = ref(); const getData = () => { fetch(carbonAssets.carbonAssets, queryParams.value).then((res) => { console.log(res); - nationwide.value = res.data.nationwide - place.value = res.data.place - ccer.value = res.data.ccer - whole.value = res.data.whole + nationwide.value = res.data.nationwide; + place.value = res.data.place; + ccer.value = res.data.ccer; + whole.value = res.data.whole; }); }; getData(); // 填报页点击返回 const updateData = (type) => { homePage.value = type; + getData(); }; 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 406d4e3..b5eede6 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue @@ -283,7 +283,7 @@ - + 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 5f20ffd..f1afc2b 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/categoryDeatil.vue @@ -5,25 +5,262 @@ 统计数据
- 返回 + 返回
-
-
-
-
+ +
+
+
+
12,500.00kwh
+
2023年实际用量
+
+
+
+
+
+
+
+ +
+ 批量设置 + 基准值设置 +
+ + + +
\ No newline at end of file + :deep(.ant-card-body) { + padding: unset; + height: 100%; + width: 100%; + } + diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue index cdb76b7..c1714e2 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/category/index.vue @@ -14,7 +14,7 @@
-
+
@@ -31,7 +31,7 @@
- +
@@ -50,6 +50,7 @@ import type { Dayjs } from 'dayjs'; import * as echarts from 'echarts'; import categoryDeatil from './categoryDeatil.vue'; + import 'echarts-liquidfill'; defineOptions({ energyType: 'all', // 与页面路由name一致缓存才可生效 }); @@ -190,8 +191,25 @@ chartInstance = echarts.init(pillarChartRef.value); chartInstance.setOption(option); }; + const ballChartRef = ref(null); + let ballChartInstance: echarts.ECharts | null = null; + const drawSQ = () => { + ballChartInstance = echarts.init(ballChartRef.value); + const option = { + series: [ + { + type: 'liquidFill', + data: [0.6, 0.5, 0.4, 0.3], + radius: '80%', + }, + ], + }; + ballChartInstance = echarts.init(ballChartRef.value); + ballChartInstance.setOption(option); + }; setTimeout(() => { drawPillarChart(); + drawSQ(); }, 500); // 新增节点 const visible = ref(false);