From 2d40e8d26dc8b2191a10024633a4278eb84aeb65 Mon Sep 17 00:00:00 2001 From: chenpingsen Date: Tue, 20 Aug 2024 14:13:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?add:=E7=85=A7=E6=98=8E=E7=B3=BB=E7=BB=9F/?= =?UTF-8?q?=E9=80=9A=E9=A3=8E=E7=B3=BB=E7=BB=9F=20=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hx-ai-intelligent/src/api/IlluminationInfo.ts | 2 +- .../src/api/airConditionControlSystem.ts | 2 +- hx-ai-intelligent/src/api/planManage.ts | 4 +- hx-ai-intelligent/src/api/ventilatingSystem.ts | 2 +- .../airConditionControlSystem/tabs2.vue | 47 +++++-- .../airConditionControlSystem/tabs3.vue | 17 +-- .../equipmentControl/lightingManage/indexs.vue | 28 +++- .../view/equipmentControl/lightingManage/light.vue | 12 +- .../view/equipmentControl/lightingManage/tabs1.vue | 97 ++++++++++--- .../view/equipmentControl/lightingManage/tabs2.vue | 56 ++++++-- .../view/equipmentControl/lightingManage/tabs3.vue | 34 +++-- .../src/view/equipmentControl/style/color.less | 1 + .../view/equipmentControl/style/dialogStyle.less | 1 + .../ventilationSystem/components/fanControl.vue | 119 +++++++++++++--- .../ventilationSystem/components/fanLog.vue | 33 +++-- .../ventilationSystem/components/fanPlant.vue | 48 +++++-- .../equipmentControl/ventilationSystem/index.vue | 150 ++++++++------------- 17 files changed, 446 insertions(+), 207 deletions(-) diff --git a/hx-ai-intelligent/src/api/IlluminationInfo.ts b/hx-ai-intelligent/src/api/IlluminationInfo.ts index c26c137..cb32e76 100644 --- a/hx-ai-intelligent/src/api/IlluminationInfo.ts +++ b/hx-ai-intelligent/src/api/IlluminationInfo.ts @@ -1,4 +1,4 @@ -const prefix = '/carbon-smart'; +const prefix = '/carbon-smart/api'; // 照明系统及相关接口 export enum lightingManage { // 主页 ======================================================== diff --git a/hx-ai-intelligent/src/api/airConditionControlSystem.ts b/hx-ai-intelligent/src/api/airConditionControlSystem.ts index b175523..d2088a6 100644 --- a/hx-ai-intelligent/src/api/airConditionControlSystem.ts +++ b/hx-ai-intelligent/src/api/airConditionControlSystem.ts @@ -1,4 +1,4 @@ -const prefix = '/carbon-smart'; +const prefix = '/carbon-smart/api'; // 空调系统及相关接口 export enum airConditionControl { // 主页 ====================================================== diff --git a/hx-ai-intelligent/src/api/planManage.ts b/hx-ai-intelligent/src/api/planManage.ts index 678c291..beb8075 100644 --- a/hx-ai-intelligent/src/api/planManage.ts +++ b/hx-ai-intelligent/src/api/planManage.ts @@ -1,4 +1,4 @@ -const prefix = '/carbon-smart'; +const prefix = '/carbon-smart/api'; // 照明系统及相关接口 export enum planManage { /** @@ -10,4 +10,6 @@ export enum planManage { getTableData = prefix + '/deviceCtrlPlan/getActivatedPlanList', // 提交计划状态修改 submitTransData = prefix + '/deviceCtrlPlan/activePlanByIdList', + // 用于确认当前是否有计划正在运行 + getRunningPlan = prefix + '/deviceCtrlPlan/getRunningPlan', } diff --git a/hx-ai-intelligent/src/api/ventilatingSystem.ts b/hx-ai-intelligent/src/api/ventilatingSystem.ts index a72a291..a99c07e 100644 --- a/hx-ai-intelligent/src/api/ventilatingSystem.ts +++ b/hx-ai-intelligent/src/api/ventilatingSystem.ts @@ -1,5 +1,5 @@ // 前缀 -const prefix = '/carbon-smart'; +const prefix = '/carbon-smart/api'; // 通风系统相关接口 export enum ventilating { // 排风扇相关 ============================================= diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue index cc0b7c5..b3c3c02 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/tabs2.vue @@ -1,7 +1,12 @@ -
+
@@ -96,7 +95,7 @@
- + +
+
{{ text }}
+
单位管理
- 新增分组 - 新增单位 + 新增分组 + 新增单位
@@ -147,7 +149,7 @@ ref="select" :value="unitTreeParams.id" allowClear - style="width: 96%" + style="width: 90%" placeholder="选择分组" @change="handleChange"> @@ -185,11 +187,12 @@ - + + @@ -197,11 +200,12 @@ - + + @@ -265,6 +269,7 @@ const disabled = ref(false); const treeNodeAdd = ref(false); const operationTree = ref('新增'); + const text = ref('新增数据'); // const showOperation = ref(false); const opMap: any = ref({ @@ -473,7 +478,11 @@ cancelText: '取消', onOk() { http - .post(carbonEmissionFactorLibrary.delTreeNode, { orgId: orgId.value, id: data.id }) + .post(carbonEmissionFactorLibrary.delTreeNode, { + orgId: orgId.value, + id: data.id, + emissionName: data.emissionName, + }) .then(() => { getOrgTree(); NsMessage.success('操作成功'); @@ -637,6 +646,7 @@ }); }; show.value = false; + text.value = '新增数据'; visible.value = true; }, }, @@ -812,6 +822,7 @@ }); }; show.value = true; + text.value = '编辑数据'; visible.value = true; }, }, @@ -1122,6 +1133,10 @@ padding-bottom: 10px; border-bottom: 1px solid #e9e9e9; } + .ns-form-title-add { + font-weight: bold; + user-select: text; + } .titleUnit { font-weight: bold; user-select: text; @@ -1176,6 +1191,7 @@ margin-left: 10%; flex-direction: column; border-radius: 12px; + overflow: auto; } .actionMore { display: none; @@ -1198,5 +1214,27 @@ text-align: right; width: 27%; } + .titleStyleGroup::before { + content: ''; + position: absolute; + left: 16px; + top: 13%; + transform: translateY(-50%); + height: 16px; + width: 3px; + border-radius: 1px; + background-color: #2778ff; + } + .titleStyle::before { + content: ''; + position: absolute; + left: 16px; + top: 10.5%; + transform: translateY(-50%); + height: 16px; + width: 3px; + border-radius: 1px; + background-color: #2778ff; + }   diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue index 7e797b7..c113322 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue @@ -3,15 +3,15 @@ { + selectYear.value = dayjs(new Date().getFullYear().toString()); + queryParams.value.year = selectYear.value.format('YYYY'); + getTableList(); + }; // 表头 const column: TableColumnsType[] = [ { title: '排放类型', dataIndex: 'cnValue', + width: 130, customCell: (record, rowIndex) => { if (rowIndex == undefined) { return { @@ -84,66 +90,82 @@ { title: '能源种类', dataIndex: 'energyType', + width: 80, }, { title: '计量单位', dataIndex: 'unitName', + width: 80, }, { title: '加权平均', dataIndex: 'averageFactorValue', + width: 80, }, { title: '全年', dataIndex: 'carbonYearly', + width: 80, }, { title: '1月', dataIndex: 'jan', + width: 80, }, { title: '2月', dataIndex: 'feb', + width: 80, }, { title: '3月', dataIndex: 'mar', + width: 80, }, { title: '4月', dataIndex: 'apr', + width: 80, }, { title: '5月', dataIndex: 'may', + width: 80, }, { title: '6月', dataIndex: 'jun', + width: 80, }, { title: '7月', dataIndex: 'jul', + width: 80, }, { title: '8月', dataIndex: 'aug', + width: 80, }, { title: '9月', dataIndex: 'sep', + width: 80, }, { title: '10月', dataIndex: 'oct', + width: 80, }, { title: '11月', dataIndex: 'nov', + width: 80, }, { title: '12月', dataIndex: 'dec', + width: 80, }, ]; // 合并单元格 @@ -189,9 +211,12 @@ :deep(.ant-table-container) { padding: 0px 16px; } - :deep(.ant-table-cell) { - border: 1px solid #f0f0f0; - } + // :deep(.ant-table-cell) { + // border: 1px solid #f0f0f0; + // } + // :deep(.ant-table-cell::before) { + // display: none; + // } diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue index ee8df02..a3a5e09 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue @@ -1,51 +1,79 @@