diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts index 8f30f9a..7783915 100644 --- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts +++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts @@ -8,6 +8,9 @@ export enum carbonEmissionFactorLibrary { getCarbonFactorTree = '/carbon-smart/api/carbon/emission/type/getCarbonFactorTree', creat = '/carbon-smart/api/carbon/emission/type/creatOrUpdate', delTreeNode = '/carbon-smart/api/carbon/emission/type/del', + // 单位管理 + dictionaryUnitManagement = '/carbon-smart/api/carbon/emission/factor/dictionaryUnitManagement', + findOutermost = '/carbon-smart/api/carbon/emission/factor/findOutermost', } // 碳排管理-碳排统计接口 export enum energyConsumption { diff --git a/hx-ai-intelligent/src/api/deviceManage.ts b/hx-ai-intelligent/src/api/deviceManage.ts index 878ab00..29cfc9e 100644 --- a/hx-ai-intelligent/src/api/deviceManage.ts +++ b/hx-ai-intelligent/src/api/deviceManage.ts @@ -26,4 +26,6 @@ export enum group { computeGroupNum = `${BASE_URL}/deviceGroup/computeGroupNum`, // 分组删除 formula = `${BASE_URL}/deviceGroup/formula`, // 编辑公式 queryFormula = `${BASE_URL}/deviceGroup/queryFormula`, // 公式查询 + dropGroupFilter = `${BASE_URL}/deviceGroup/dropGroupFilter`, // 分组列表查询 + dropGroupInfoFilter = `${BASE_URL}/deviceGroup/dropGroupInfoFilter`, // 计算列表查询 } diff --git a/hx-ai-intelligent/src/config/app.config.ts b/hx-ai-intelligent/src/config/app.config.ts index a0db2b8..9f2881a 100644 --- a/hx-ai-intelligent/src/config/app.config.ts +++ b/hx-ai-intelligent/src/config/app.config.ts @@ -27,6 +27,7 @@ export const appConfig = { themeConfig: { bgImageUrl: `${import.meta.env.VITE_PUBLIC_PATH}/asset/image/login/background.png`, logoLessUrl: `${import.meta.env.VITE_PUBLIC_PATH}/asset/image/headerIcon.png`, + logoUrl: `${import.meta.env.VITE_PUBLIC_PATH}/asset/image/headerIcon.png`, }, // userCustomRouterGuard: (to, from, next, whiteNameList, authorizationStore, appConfig) => { // console.log({ to, from, next, whiteNameList, authorizationStore, appConfig }, 'routeConfig'); @@ -102,7 +103,7 @@ export const appConfig = { updatePassWordInfo: { title: '修改密码', subtitle: 'huaxing平台', - api: '/api/web/objs/User/changePassword', + api: '/carbon-smart/api/user/password', }, // headerBellInfo: { // isShow: true, diff --git a/hx-ai-intelligent/src/icon/common.svg b/hx-ai-intelligent/src/icon/common.svg new file mode 100644 index 0000000..6e5cb9e --- /dev/null +++ b/hx-ai-intelligent/src/icon/common.svg @@ -0,0 +1,4 @@ + + + + diff --git a/hx-ai-intelligent/src/router/monitor.ts b/hx-ai-intelligent/src/router/monitor.ts index 65d21c1..8a21dde 100644 --- a/hx-ai-intelligent/src/router/monitor.ts +++ b/hx-ai-intelligent/src/router/monitor.ts @@ -5,25 +5,25 @@ const equipment = { meta: { title: '监控中心', icon: 'jiankongzhongxin', index: 1 }, redirect: { name: 'EnvironmentMonitor' }, children: [ - // { - // path: 'environmentMonitor', - // name: 'EnvironmentMonitor', - // meta: { title: '环境监测', hideChildren: true, icon: 'huanjingjiance' }, - // component: Base, - // redirect: { name: 'EnvironmentMonitorIndex' }, - // children: [ - // { - // path: 'index', - // name: 'EnvironmentMonitorIndex', - // component: () => import('/@/view/monitor/environmentMonitor/index.vue'), - // meta: { - // title: '环境监测', - // keepAlive: true, - // // backApi: [], - // }, - // }, - // ], - // }, + { + path: 'environmentMonitor', + name: 'EnvironmentMonitor', + meta: { title: '环境监测', hideChildren: true, icon: 'huanjingjiance' }, + component: Base, + redirect: { name: 'EnvironmentMonitorIndex' }, + children: [ + { + path: 'index', + name: 'EnvironmentMonitorIndex', + component: () => import('/@/view/monitor/environmentMonitor/index.vue'), + meta: { + title: '环境监测', + keepAlive: true, + // backApi: [], + }, + }, + ], + }, { path: 'deviceMonitor', name: 'DeviceMonitor', diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue index 54cee22..94b132f 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue @@ -36,27 +36,31 @@ :expanded-keys="expandedKeys" :auto-expand-parent="autoExpandParent" @expand="onExpand"> - - - - + + +
+ 新增分组 + 新增单位 +
+
+
+ + + {{ 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 f5bc524..09b276d 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts @@ -77,4 +77,46 @@ export const tableColumns = [ key: 'action', width: 130 }, +]; +export const columns = [ + { + title: '序号', + customRender: (text: any) => { + return text.index + 1; + }, + }, + { + title: '因子值', + dataIndex: 'energyType', + }, + { + title: '计量单位', + className: 'unit', + dataIndex: 'unit', + }, + { + title: '更新时间', + className: 'unit', + dataIndex: 'unit', + }, + { + title: '启用时间', + className: 'unit', + dataIndex: 'unit', + }, + { + title: '结束时间', + className: 'unit', + dataIndex: 'unit', + }, + { + title: '数据来源', + className: 'unit', + dataIndex: 'unit', + }, + { + title: '操作', + key: 'action', + width: 130 + }, ]; \ No newline at end of file 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 new file mode 100644 index 0000000..81d30db --- /dev/null +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index copy.vue @@ -0,0 +1,401 @@ + + + + + + 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 2a74ad5..f9df2af 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue @@ -1,16 +1,14 @@ - -