diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
index 7783915..aaad9c2 100644
--- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
+++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
@@ -11,6 +11,9 @@ export enum carbonEmissionFactorLibrary {
// 单位管理
dictionaryUnitManagement = '/carbon-smart/api/carbon/emission/factor/dictionaryUnitManagement',
findOutermost = '/carbon-smart/api/carbon/emission/factor/findOutermost',
+ createDictionary = '/carbon-smart/api/carbon/emission/factor/createDictionary',
+ updateDictionary = '/carbon-smart/api/carbon/emission/factor/updateDictionary',
+ delDictionary = '/carbon-smart/api/carbon/emission/factor/delDictionary',
}
// 碳排管理-碳排统计接口
export enum energyConsumption {
@@ -20,4 +23,12 @@ export enum energyConsumption {
creat = '/carbon-smart/api/carbon/stats/creat',
update = '/carbon-smart/api/carbon/stats/update',
del = '/carbon-smart/api/carbon/stats/del',
+}
+// 碳排管理-碳排速算接口
+export enum quickCalculation {
+ carbonQuickTree = '/carbon-smart/api/carbon/energy/correlation/carbonQuickTree',
+ queryCarbonEmissionPage = '/carbon-smart/api/carbon/energy/correlation/queryCarbonEmissionPage',
+ creat = '/carbon-smart/api/carbon/energy/correlation/creat',
+ update = '/carbon-smart/api/carbon/energy/correlation/update',
+ del = '/carbon-smart/api/carbon/energy/correlation/del',
}
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/config/app.config.ts b/hx-ai-intelligent/src/config/app.config.ts
index 9f2881a..11df6ca 100644
--- a/hx-ai-intelligent/src/config/app.config.ts
+++ b/hx-ai-intelligent/src/config/app.config.ts
@@ -103,7 +103,7 @@ export const appConfig = {
updatePassWordInfo: {
title: '修改密码',
subtitle: 'huaxing平台',
- api: '/carbon-smart/api/user/password',
+ api: '/carbon-smart/api/user/update/password',
},
// headerBellInfo: {
// isShow: true,
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index 94b132f..cf05dbf 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -46,18 +46,18 @@
{{ data.emissionName }}
-
-
-
-
编辑
-
新增子节点
-
上移
-
下移
-
删除
-
+
+
+
+
+ 编辑
+ 新增子节点
+ 上移
+ 下移
+ 删除
+
-
-
+
@@ -107,61 +107,89 @@
title="单位管理"
@close="closeUnitManag">
+ class="draggable-tree"
+ block-node>
{{ data.cnValue }}
-
-
-
-
编辑
-
新增子节点
-
上移
-
下移
-
删除
-
-
-
-
+
取消
- 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.cnValue }}
+
+
+
+
+
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
index 09b276d..6c8fd15 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
@@ -87,36 +87,56 @@ export const columns = [
},
{
title: '因子值',
- dataIndex: 'energyType',
+ dataIndex: 'emissionFactors',
},
{
title: '计量单位',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'carbonEmissionSuffix',
+ dataIndex: 'carbonEmissionSuffix',
},
{
title: '更新时间',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'updateTime',
+ dataIndex: 'updateTime',
},
{
title: '启用时间',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'startTime ',
+ dataIndex: 'startTime ',
},
{
title: '结束时间',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'endTime',
+ dataIndex: 'endTime',
},
{
title: '数据来源',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'dataSources',
+ dataIndex: 'dataSources',
},
{
title: '操作',
key: 'action',
width: 130
},
+];
+export const drawerColumns = [
+ {
+ title: '名称',
+ dataIndex: 'emissionSources',
+ },
+ {
+ title: '因子值',
+ dataIndex: 'emissionFactors',
+ },
+ {
+ title: '排放环节',
+ className: 'emissionProcess',
+ dataIndex: 'emissionProcess',
+ },
+ {
+ title: '数据来源',
+ className: 'dataSources',
+ dataIndex: 'dataSources',
+ },
];
\ No newline at end of file
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 0e88f8d..7026fdb 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -181,6 +181,7 @@
const queryParams = ref({
pageNum: 1,
pageSize: 10,
+ orgId: orgId.value,
})
const isRequired = ref(false);
const visible = ref(false);
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index copy.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index copy.vue
deleted file mode 100644
index 81d30db..0000000
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index copy.vue
+++ /dev/null
@@ -1,401 +0,0 @@
-
-
-
-
-
-
-
- 排放分类
-
-
-
-
-
- {{ emissionName.substring(0, emissionName.indexOf(selectTreeDataValue)) }}
- {{ selectTreeDataValue }}
- {{ emissionName.substring(emissionName.indexOf(selectTreeDataValue) + selectTreeDataValue.length) }}
-
- {{ emissionName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 确定
-
-
-
-
-
-
-
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
index f9df2af..4c6d60c 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -17,19 +17,22 @@
-
-
- {{ title.substring(0, title.indexOf(searchValue)) }}
+
+
+ {{ data.energyType.substring(0, data.energyType.indexOf(searchValue)) }}
{{ searchValue }}
- {{ title.substring(title.indexOf(searchValue) + searchValue.length) }}
+ {{ data.energyType.substring(data.energyType.indexOf(searchValue) + searchValue.length) }}
- {{ title }}
+ {{ data.energyType }}
@@ -66,7 +69,7 @@
@change="onChange" />
-
-
-
-
-
-
-
-
-
-
-
-
- 是
- 否
-
-
-
-
-
- {{ item.cnValue }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
取消
确定
@@ -118,11 +120,12 @@
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
index abd7710..be69c2c 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts
@@ -227,6 +227,7 @@ export const tableConfig = (el, elGroup, elFormula, defaultParams) => {
label: '编辑',
name: 'groupEdit',
type: 'primary',
+ dynamicDisabled: () => !defaultParams.value?.id,
handle: (a, b) => {
el.value.toggle();
},
@@ -497,7 +498,6 @@ export const tableConfigCal = (el, elGroup, elFormula, defaultParams) => {
defaultParams: defaultParams.value,
componentProps: {
placeholder: '请选择设备型号',
- mode: 'multiple',
api: (params: any) => {
return http.post(group.dropGroupInfoFilter, params).then((res: any) => {
const result = [...new Set(res.data)];
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue b/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue
index 9ce1621..455cc0f 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/edit.vue
@@ -45,6 +45,7 @@
const clearData = () => {
dataSource.value = [];
targetKeys.value = [];
+ currentId.value = '';
};
const toggle = () => {
visible.value = !visible.value;
@@ -58,7 +59,10 @@
const btnClick = () => {
// visible.value = false;
-
+ if (!currentId.value) {
+ NsMessage.warn('请先选择公司');
+ return;
+ }
http
.post(group.saveGroupList, {
...props.params,
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue
index 2f2ca8f..f60b997 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/editCal.vue
@@ -45,6 +45,7 @@
const clearData = () => {
dataSource.value = [];
targetKeys.value = [];
+ currentId.value = '';
};
const toggle = () => {
visible.value = !visible.value;
@@ -59,7 +60,10 @@
};
const btnClick = () => {
- // visible.value = false;
+ if (!currentId.value) {
+ NsMessage.warn('请先选择公司');
+ return;
+ }
http
.post(group.saveComputeList, {
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue
index 905f7fa..8ab2a97 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/editFormula.vue
@@ -2,7 +2,7 @@
@@ -140,6 +140,10 @@
];
const btnClick = () => {
+ if (!model.value?.formula) {
+ NsMessage.warn('请填写公式');
+ return;
+ }
http
.post(group.formula, {
...props.params,
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue
index 97bb5fd..6240169 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/editGroup.vue
@@ -16,8 +16,8 @@
-
-
+
+
@@ -161,6 +161,7 @@
() => [
createVNode(DeleteOutlined, {
style: { color: 'red', cursor: 'pointer' },
+ title: '删除',
// onClick: () => delGroup(record.id),
}),
],
@@ -266,6 +267,10 @@
};
const btnClick = () => {
+ if (!selectedRowKeys.value[0]) {
+ NsMessage.warn('请选择分组');
+ return;
+ }
http
.post(group.saveComputeGroupInfo, {
...props.params,
diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/index.vue b/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
index 7eb9cd3..0ee490a 100644
--- a/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentManage/group/index.vue
@@ -5,10 +5,6 @@
-
-
diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
index f6e8062..b599c83 100644
--- a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue
@@ -40,18 +40,22 @@
-
+
查询
@@ -89,15 +93,15 @@
// 能耗类型list
const options1 = ref
([]);
- // 采集频率list
+ // 日期类型list
const options2 = ref([]);
const mode = ref('1');
// 能耗类型
const selectedValue = ref();
- // 采集频率
- const frequencyValue = ref();
+ // 日期类型
+ const dateTypeValue = ref();
// 时间
- const dateRange = ref<[Dayjs, Dayjs] | undefined>();
+ const dateValue = ref<[Dayjs, Dayjs] | undefined>();
// 页面初始化参数
const getOptionsList = async () => {
@@ -115,20 +119,12 @@
}
options2.value = [
{
- value: '1',
- label: '5分钟',
- },
- {
- value: '2',
- label: '10分钟',
+ value: 'month',
+ label: '月',
},
{
- value: '3',
- label: '30分钟',
- },
- {
- value: '4',
- label: '1小时',
+ value: 'year',
+ label: '年',
},
];
};
@@ -691,9 +687,9 @@
}
};
- const onChange = (val: RangeValue) => {
- dateRange.value = val;
- };
+ // const onChange = (val: RangeValue) => {
+ // dateRange.value = val;
+ // };
const onCalendarChange = (val: RangeValue) => {
dates.value = val;
@@ -716,8 +712,8 @@
options2,
mode,
selectedValue,
- frequencyValue,
- dateRange,
+ dateTypeValue,
+ dateValue,
getOptionsList,
getSelect,
getSelect11,
@@ -725,7 +721,7 @@
disabledDate,
onCalendarChange,
onOpenChange,
- onChange,
+ // onChange,
hackValue,
treeLoading,
changeEnergyType,
diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
index 1536c37..1831fc5 100644
--- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
+++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue
@@ -1,3 +1,4 @@
+
@@ -59,7 +60,8 @@
align-items: center;
">
-
+
+
@@ -124,16 +160,30 @@