diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
index eecf57e..8f30f9a 100644
--- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
+++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
@@ -11,5 +11,10 @@ export enum carbonEmissionFactorLibrary {
}
// 碳排管理-碳排统计接口
export enum energyConsumption {
+ getDicList = '/carbon-smart/client/dict/list',
pageList = '/carbon-smart/api/carbon/stats/pageList',
+ findById = '/carbon-smart/api/carbon/stats/findById',
+ creat = '/carbon-smart/api/carbon/stats/creat',
+ update = '/carbon-smart/api/carbon/stats/update',
+ del = '/carbon-smart/api/carbon/stats/del',
}
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index 6f07629..bbc926e 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -82,7 +82,6 @@
@close="onClose">
{
return formRef.value?.validateResult && userAuthList.value?.length;
});
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue
new file mode 100644
index 0000000..c205a2d
--- /dev/null
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index copy.vue
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
new file mode 100644
index 0000000..be5bf5b
--- /dev/null
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
@@ -0,0 +1,82 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
index d3bc6e8..f5bc524 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
@@ -21,12 +21,12 @@ export const tableColumns = [
{
title: '1月',
dataIndex: 'jan',
- customRender: ({ text, record }) => ({
- children: text,
- attrs: {
- style: record.janFlag === 1 ? 'color: red' : 'color: blue'
- }
- })
+ // customRender: ({ text, record }) => ({
+ // children: text,
+ // attrs: {
+ // style: record.janFlag === 1 ? 'color: red' : 'color: blue'
+ // }
+ // })
},
{
title: '2月',
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
index a209ff2..0e88f8d 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -6,12 +6,12 @@
bordered
:pagination="false"
:scroll="{ x: 2000 }">
-
+
- 编辑
+ 编辑
- 删除
+ 删除
@@ -22,15 +22,15 @@
导入
导出
模板下载
- 上传凭证
+ 上传凭证
凭证下载
- 是
- 否
+ 是
+ 否
-
+
- 直接排放
- 间接排放
- 其他
+
+ {{ item.cnValue }}
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -130,38 +130,61 @@
确定
+
+
+
+
+
+
+
+
1.仅支持pdf格式文件或文件夹
+ 2.文件命名规则为【能源种类_年份】
+ 3.每次上传自动覆盖
+
+
+