diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts index 50665a4..eecf57e 100644 --- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts +++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts @@ -1,3 +1,4 @@ +// 碳排因子库接口 export enum carbonEmissionFactorLibrary { getTableList = '/carbon-smart/api/carbon/emission/factor/queryCarbonFactorPage', creatOrUpdate = '/carbon-smart/api/carbon/emission/factor/creatOrUpdate', @@ -8,3 +9,7 @@ export enum carbonEmissionFactorLibrary { creat = '/carbon-smart/api/carbon/emission/type/creatOrUpdate', delTreeNode = '/carbon-smart/api/carbon/emission/type/del', } +// 碳排管理-碳排统计接口 +export enum energyConsumption { + pageList = '/carbon-smart/api/carbon/stats/pageList', +} \ No newline at end of file diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts index 58964de..6c3642a 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts @@ -83,24 +83,39 @@ export const formConfig = (disabled) => { }, ], }, + // { + // field: 'emissionProcess', + // label: '排放环节', + // component: 'NsSelectApi', + // componentProps: { + // api: carbonEmissionFactorLibrary.getEmissionProcess, + // params: { + // emissionType: sessionStorage.getItem('checkedTreeNode'), + // }, + // resultField: 'data', + // labelField: 'emissionProcess', + // valueField: 'emissionProcess', + // immediate: true, + // autoSelectFirst: false, + // filterOption:false, + // showSearch:true, + // autoClearSearchValue:false + // }, + // }, { - field: 'emissionProcess', label: '排放环节', - component: 'NsSelectApi', + field: 'emissionProcess', + component: 'NsInput', componentProps: { - api: carbonEmissionFactorLibrary.getEmissionProcess, - params: { - emissionType: sessionStorage.getItem('checkedTreeNode'), - }, - resultField: 'data', - labelField: 'emissionProcess', - valueField: 'emissionProcess', - immediate: true, - autoSelectFirst: false, - filterOption:false, - showSearch:true, - autoClearSearchValue:false + placeholder: '请输入排放环节', + maxLength: 20, }, + rules: [ + { + required: true, + message: '请输入排放环节', + }, + ], }, { label: '排放因子', diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue index 1d62e7e..3c651cf 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue @@ -306,6 +306,7 @@ import { log } from 'node:console'; } // 点击新增树节点 const addTreeNodeData = () => { + operationTree.value='新增' treeNodeAdd.value = true; editTreeNode.value.type = 'create' }; @@ -389,6 +390,7 @@ import { log } from 'node:console'; level:info.selectedNodes[0].level, dataNumber:info.selectedNodes[0].dataNumber, sortNumber:info.selectedNodes[0].sortNumber, + parentEmissionId:info.selectedNodes[0].parentEmissionId, } } }; diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts index db7b76a..e12f23a 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts @@ -1,111 +1,74 @@ -import { dateUtil } from '/nerv-lib/util/date-util'; -import data from './mock.json'; -export const tableConfig = { - title: '设备台账', - // api: '/carbon_emission/device/getDeviceList', - value: data.dataSource, - params: { - page: 0, - pageSize: 10, - }, - rowSelection: null, - columns: [ - { - title: '序号', - customRender: (text: any) => { - return text.index + 1; - }, +export const tableColumns = [ + { + title: '序号', + customRender: (text: any) => { + return text.index + 1; }, - { - title: '能源种类', - dataIndex: 'id', - }, - { - title: '计量单位', - dataIndex: 'deviceCode', - }, - { - title: '全年', - dataIndex: 'deviceName', - textNumber: 8, - textEllipsis: true, - }, - { - title: '设备一级区域', - dataIndex: 'position', - }, - { - title: '设备二级区域', - dataIndex: 'position', - }, - { - title: '设备详细位置', - dataIndex: 'position', - }, - { - title: '设备规格', - dataIndex: 'position', - }, - { - title: '设备厂商纳税人识别号', - dataIndex: 'position', - }, - { - title: '厂商联系人', - dataIndex: 'position', - }, - { - title: '设备描述', - dataIndex: 'position', - }, - { - title: 'IP地址', - dataIndex: 'position', - }, - { - title: '生产日期', - dataIndex: 'position', - }, - { - title: '采购日期', - dataIndex: 'position', - }, - { - title: '启用日期', - dataIndex: 'position', - }, - { - title: '设备成本(元)', - dataIndex: 'position', - }, - { - title: '使用期限', - dataIndex: 'position', - }, - { - title: '额定功率', - dataIndex: 'position', - }, - { - title: '特殊参数', - dataIndex: 'position', - }, - ], - - formConfig: { - schemas: [ - { - field: 'createTime', - label: '生产日期', - component: 'NsRangePicker', - fieldMap: ['queryStartDate', 'queryEndDate'], - componentProps: { - valueFormat: 'YYYY-MM-DD', - }, - }, - ], - params: {}, - }, - // pagination: { pageSizeOptions: false }, - rowKey: 'uuid', -}; + }, + { + title: '能源种类', + dataIndex: 'money', + }, + { + title: '计量单位', + className: 'column-money', + dataIndex: 'money', + }, + { + title: '全年', + dataIndex: 'address', + }, + { + title: '1月', + dataIndex: 'address', + }, + { + title: '2月', + dataIndex: 'address', + }, + { + title: '3月', + dataIndex: 'address', + }, + { + title: '4月', + dataIndex: 'address', + }, + { + title: '5月', + dataIndex: 'address', + }, + { + title: '6月', + dataIndex: 'address', + }, + { + title: '7月', + dataIndex: 'address', + }, + { + title: '8月', + dataIndex: 'address', + }, + { + title: '9月', + dataIndex: 'address', + }, + { + title: '10月', + dataIndex: 'address', + }, + { + title: '11月', + dataIndex: 'address', + }, + { + title: '12月', + dataIndex: 'address', + }, + { + title: '操作', + key: 'action', + width: 130 + }, +]; \ 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 new file mode 100644 index 0000000..3100688 --- /dev/null +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue @@ -0,0 +1,251 @@ + + + + \ No newline at end of file diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue index 4cb9985..9c54fa1 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue @@ -1,7 +1,7 @@