diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts index edae9fa..57e28ca 100644 --- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts +++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts @@ -42,4 +42,13 @@ export enum carbonInventoryCheck { createOrUpdate = '/carbon-smart/api/carbon/report/createOrUpdate', findById = '/carbon-smart/api/carbon/report/findById', delete = '/carbon-smart/api/carbon/report/delete', + // 填报页面接口 + // 最左侧碳盘查报告树 + getCategoryTree = '/carbon-smart/api/carbon/inventory/contact/getCategoryTree', + updateCategoryTree = '/carbon-smart/api/carbon/inventory/contact/update', + // 排放源中左侧树 + getInventoryTree = '/carbon-smart/api/carbon/inventory/getInventoryTree', + create = '/carbon-smart/api/carbon/inventory/create', + update = '/carbon-smart/api/carbon/inventory/update', + del = '/carbon-smart/api/carbon/inventory/del', } \ No newline at end of file diff --git a/hx-ai-intelligent/src/api/deviceManage.ts b/hx-ai-intelligent/src/api/deviceManage.ts index 29cfc9e..d4b2fd4 100644 --- a/hx-ai-intelligent/src/api/deviceManage.ts +++ b/hx-ai-intelligent/src/api/deviceManage.ts @@ -28,4 +28,5 @@ export enum group { queryFormula = `${BASE_URL}/deviceGroup/queryFormula`, // 公式查询 dropGroupFilter = `${BASE_URL}/deviceGroup/dropGroupFilter`, // 分组列表查询 dropGroupInfoFilter = `${BASE_URL}/deviceGroup/dropGroupInfoFilter`, // 计算列表查询 + queryDeviceToEnergy = `${BASE_URL}/deviceGroup/queryDeviceToEnergy`, // 能耗监测用查询设备（能耗监测设备树） } diff --git a/hx-ai-intelligent/src/api/monitor.ts b/hx-ai-intelligent/src/api/monitor.ts index 62f5064..35e31ee 100644 --- a/hx-ai-intelligent/src/api/monitor.ts +++ b/hx-ai-intelligent/src/api/monitor.ts @@ -1,13 +1,14 @@ +// 设备监测 export enum deviceMonitor { - // getTableList = '/carbon/emission/factor/queryCarbonFactorPage', - // addNewData = '/carbon/emission/factor/creatOrUpdate', - // editUser = '/carbon-smart/api/user/edit', - // frozen = '/carbon-smart/api/user/frozen', - // resetPwd = '/carbon-smart/api/user/resetPwd', - // del = '/carbon-smart/api/user/del', - // batchDel = '/carbon-smart/api/user/batchDel', - // getCarbonFactorTree = '/carbon/emission/type/getCarbonFactorTree', - // queryDeptTree = '/carbon-smart/api/user/queryDeptTree', - // queryUserPerList = '/carbon-smart/api/user/queryUserPerList', getDeviceGraph = '/carbon-smart/api/monitor/getDeviceGraph', + getDevicePointToMonitor = '/carbon-smart//api/monitor/getDevicePointToMonitor', } + +// 能耗监测 +export enum energyMonitor { + getDeviceOrNodeEnergyGraph = '/carbon-smart/api/monitor/getDeviceOrNodeEnergyGraph', + getDeviceOrNodeEnergyAnalyse = '/carbon-smart/api/monitor/getDeviceOrNodeEnergyAnalyse', +} + +// 环境监测 +export enum environmentMonitor {} diff --git a/hx-ai-intelligent/src/router/equipmentControl.ts b/hx-ai-intelligent/src/router/equipmentControl.ts index e682e9a..dcb244b 100644 --- a/hx-ai-intelligent/src/router/equipmentControl.ts +++ b/hx-ai-intelligent/src/router/equipmentControl.ts @@ -24,6 +24,25 @@ const equipmentControl = { }, ], }, + { + path: 'liftSystem', + name: 'liftSystem', + meta: { title: '电梯系统', hideChildren: true, icon: 'shebeiqunkong' }, + component: Base, + redirect: { name: 'liftSystem' }, + children: [ + { + path: 'index', + name: 'liftSystem', + component: () => import('/@/view/equipmentControl/liftSystem/index.vue'), + meta: { + title: '电梯系统', + keepAlive: false, + // backApi: [], + }, + }, + ], + }, ], }; export default equipmentControl; diff --git a/hx-ai-intelligent/src/router/equipmentManage.ts b/hx-ai-intelligent/src/router/equipmentManage.ts index 5cb2769..26cf030 100644 --- a/hx-ai-intelligent/src/router/equipmentManage.ts +++ b/hx-ai-intelligent/src/router/equipmentManage.ts @@ -39,7 +39,18 @@ const equipment = { meta: { title: '分组管理', keepAlive: false, - // backApi: [], + operates: [ + { title: '新增分组', code: 'GroupAdd' }, + { title: '删除分组', code: 'GroupDelete' }, + { title: '编辑分组', code: 'GroupEdit' }, + { title: '删除点位', code: 'GroupPointDelete' }, + { title: '编辑点位', code: 'GroupPointEdit' }, + { title: '导入点位', code: 'GroupPointImport' }, + { title: '导出点位', code: 'GroupPointExports' }, + { title: '模版下载', code: 'GroupTempDownload' }, + { title: '批量分组', code: 'GroupBatchGroup' }, + { title: '公式编辑', code: 'GroupFormulaEdit' }, + ], }, }, ], diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts index 6c3642a..aa2df7e 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts @@ -52,27 +52,27 @@ export const formConfig = (disabled) => { options: [ { label: 'CO2', - value: 'CO2', + value: 1, }, { label: 'CO2e', - value: 'CO2e', + value: 2, }, { label: 'SF6', - value:'SF6', + value: 3, }, { label: 'CH4', - value: 'CH4', + value: 4, }, { label: 'PFCs', - value: 'PFCs', + value: 5, }, { label: 'HFCs', - value: 'HFCs', + value: 6, }, ], }, @@ -195,7 +195,8 @@ export const formConfig = (disabled) => { component: 'NsTextarea', componentProps: { placeholder: '请输入参考文献', - maxLength: 20, + maxLength: 300, + showCount:true }, }, ], diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue index 874ac97..bd5c776 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue @@ -50,7 +50,7 @@ --> - + + + @@ -170,41 +175,24 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - + + + + + + + - Jack - Lucy + + {{ item.cnValue }} + - - - Jack - Lucy - - - - - Jack - Lucy - - - - - Jack - Lucy - + + +
+
+
+
+ +
+
+
+
开启
+
+ +
+
+
+
+ +
+
+
+
开启
+
+ +
+
+
+
+ +
+
+
+
开启
+
+ + + + + + diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue index cf3de9a..adb4b68 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue @@ -50,6 +50,7 @@ { // 获得分区与线路的结构 - http.get(lightingManage.getArea, { projectId: 'HLlmTZp8' }).then(res => { - const data = res.data - floorData.value = data - /** 只在前端使用的变量 - * @param id 用于判断样式和层级的前端属性 - * @param selected 用于表示是否选中的前端属性 - */ - data.forEach(floor => { - floor.childList.forEach((item, index) => { - if (index == 0) { - item.selected = true - } else { - item.selected = false - } - item.id = String(index + 1) - item.childList.forEach((v, i) => { - v.selected = false - v.id = (index + 1) + '-' + (i + 1) - }) - }) - }) - treeData.value = data[0].childList - }) + getAllArea() }) // 分层业务 ===================================================== +// 所有楼层的数据 +const floorData = ref([]) // 左上角分层切换 const changeFloor = (area: any) => { // 重置数据 @@ -130,8 +111,6 @@ const changeFloor = (area: any) => { // 分区业务 ===================================================== -// 所有楼层的数据 -const floorData = ref([]) // 分区结构树 const treeData = ref([]) // 当前选中的分区id @@ -203,6 +182,7 @@ const changeArea = (result: any) => { } // 由当前组件控制的分区切换 const changeThisArea = (result: any) => { + tabs1Ref.value.changeCancel() console.log(result, 'changeThisArea') // 修改前，将所有选项置空 reset() @@ -224,9 +204,9 @@ const changeThisArea = (result: any) => { } // 重置分区树所有当前选项 const reset = () => { - treeData.value.forEach(item => { + treeData.value.forEach((item: any) => { item.selected = false - item.childList.forEach(i => { + item.childList.forEach((i: any) => { i.selected = false }) }) @@ -240,6 +220,32 @@ const computedClass = (string: string) => { } } +const getAllArea = () => { + http.get(lightingManage.getArea, { projectId: 'HLlmTZp8' }).then(res => { + const data = res.data + floorData.value = data + /** 只在前端使用的变量 + * @param id 用于判断样式和层级的前端属性 + * @param selected 用于表示是否选中的前端属性 + */ + data.forEach((floor: any) => { + floor.childList.forEach((item: any, index: number) => { + if (index == 0) { + item.selected = true + } else { + item.selected = false + } + item.id = String(index + 1) + item.childList.forEach((v: any, i: number) => { + v.selected = false + v.id = (index + 1) + '-' + (i + 1) + }) + }) + }) + treeData.value = data[0].childList + }) +} + // 抽屉业务 ===================================================== // 抽屉 - 当前选择的tab @@ -250,6 +256,7 @@ let visible = ref(false); const toggleDrawer = () => { visible.value = !visible.value; }; +const tabs1Ref = ref()