From 4095dc9ced52bd0fbef12563078b1a30a6034ce3 Mon Sep 17 00:00:00 2001
From: VVT789 <67089238+VVT789@users.noreply.github.com>
Date: 星期三, 26 三月 2025 23:55:07 +0800
Subject: [PATCH] Merge pull request #38 from Andy-Yin/develop1.0
---
zhitan-vue/src/views/buildingConsumption/branch-build/index.vue | 306 +++++++++++++++++++++
zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java | 2
zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java | 4
zhitan-system/src/main/java/com/zhitan/carbonemission/service/impl/CarbonEmissionServiceImpl.java | 66 +++-
zhitan-vue/src/layout/components/Settings/index.vue | 105 ++++---
zhitan-vue/src/api/buildingConsumption/api.js | 19 +
zhitan-vue/src/views/buildingConsumption/item-build/index.vue | 326 +++++++++++++++++++++++
zhitan-vue/src/components/Echarts/LineChart.vue | 2
zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java | 2
9 files changed, 765 insertions(+), 67 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java
index 6b8fb0d..edc291a 100644
--- a/zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java
@@ -49,7 +49,7 @@
String timeType = dto.getTimeType();
String dataTime = dto.getDataTime();
- Date beginTime = DateTimeUtil.getTypeTime(timeType, dataTime);
+ Date beginTime = DateTimeUtil.getTime(timeType, dataTime);
DateTime endTime = null;
// 鑾峰彇鑺傜偣淇℃伅
diff --git a/zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java
index 443fc99..73859cb 100644
--- a/zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java
@@ -39,7 +39,7 @@
public BranchAnalysisVO getBranchAnalysisService(BranchAnalysisDTO dto) {
String timeType = dto.getTimeType();
String dataTime = dto.getDataTime();
- Date beginTime = DateTimeUtil.getTypeTime(timeType, dataTime);
+ Date beginTime = DateTimeUtil.getTime(timeType, dataTime);
DateTime endTime = null;
List<ModelNodeIndexInfo> nodeIndexInfo = modelNodeMapper.getModelNodeIndexIdByNodeId(dto.getNodeId(), dto.getEnergyType());
@@ -68,7 +68,7 @@
default:
throw new ServiceException("鏃堕棿鏍煎紡閿欒");
}
- //鑾峰彇鏁版嵁椤瑰垪琛�
+
List<DataItem> dataItemlist = dataItemMapper.getDataItemTimeRangeInforByIndexIds(beginTime, endTime, timeType, indexlist);
BranchAnalysisVO vo = new BranchAnalysisVO();
diff --git a/zhitan-system/src/main/java/com/zhitan/carbonemission/service/impl/CarbonEmissionServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/carbonemission/service/impl/CarbonEmissionServiceImpl.java
index c9bb77d..8cd2c33 100644
--- a/zhitan-system/src/main/java/com/zhitan/carbonemission/service/impl/CarbonEmissionServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/carbonemission/service/impl/CarbonEmissionServiceImpl.java
@@ -88,8 +88,8 @@
// 璁＄畻姣忕鑳芥簮鐨勫綋鍓嶅�煎拰鍘诲勾鐨勫��
for (String s : energyType) {
- final double value = getValues(energyMap, upCarbonEmission,energyType);
- final double lastYearValueNum = getValues(energyMap, upLastCarbonEmission,energyType);
+ final double value = getValues(energyMap, upCarbonEmission, s);
+ final double lastYearValueNum = getValues(energyMap, upLastCarbonEmission, s);
allValue += value;
allLastValue += lastYearValueNum;
final CarbonEmissionRankVO carbonEmissionRankVO = new CarbonEmissionRankVO();
@@ -105,7 +105,7 @@
upData.add(carbonEmissionRankVOAll);
// 璁＄畻涓嬫柟鐨勭⒊鎺掓斁骞舵帓搴�
- List<CarbonEmissionRankVO> carbonEmissionRankVOS = calculateDownCarbonEmission(beginTime, endTime, carbonEmissionDTO, energyMap,sysEnergies);
+ List<CarbonEmissionRankVO> carbonEmissionRankVOS = calculateDownCarbonEmission(beginTime, endTime, carbonEmissionDTO, energyMap, sysEnergies);
carbonEmissionRankVOS.sort(Comparator.comparing(CarbonEmissionRankVO::getAllValue).reversed());
stringObjectMap.put("down", carbonEmissionRankVOS);
stringObjectMap.put("upData", upData);
@@ -115,7 +115,7 @@
// 璁＄畻鍚屾瘮澧為暱鐜�
private double calculateYOY(double current, double last) {
- if(last !=0.0) {
+ if (last != 0.0) {
return (current - last) / last * 100;
}
return 0;
@@ -123,7 +123,7 @@
}
// 璁＄畻涓嬫柟鐨勭⒊鎺掓斁
- private List<CarbonEmissionRankVO> calculateDownCarbonEmission(Date beginTime, Date endTime, CarbonEmissionDTO carbonEmissionDTO, Map<String, SysEnergy> energyMap,List<SysEnergy> sysEnergies) {
+ private List<CarbonEmissionRankVO> calculateDownCarbonEmission(Date beginTime, Date endTime, CarbonEmissionDTO carbonEmissionDTO, Map<String, SysEnergy> energyMap, List<SysEnergy> sysEnergies) {
List<CarbonEmission> downCarbonEmission = dataItemMapper.getDownCarbonEmission(beginTime, endTime, carbonEmissionDTO.getTimeType(), carbonEmissionDTO.getNodeId());
List<CarbonEmissionRankVO> carbonEmissionRankVOS = new ArrayList<>();
@@ -144,8 +144,8 @@
throw new RuntimeException("鑾峰彇纰虫帓鏀捐浆鎹㈢巼鏃跺嚭閿�: 绯荤粺鑳芥簮鏁版嵁涓笉瀛樺湪" + s + "鑳芥簮绫诲瀷");
}
double value = v.stream().filter(ec -> ec.getEnergyId().equals(s))
- .mapToDouble(CarbonEmission::getValue)
- .sum();
+ .mapToDouble(CarbonEmission::getValue)
+ .sum();
double calculatedValue = Double.parseDouble(df.format(sysEnergy.getCoefficient().doubleValue() * value));
switch (s) {
@@ -225,12 +225,12 @@
// 涓婁竴鏃堕棿娈电殑纰虫帓鏀炬暟鎹�
final List<CarbonEmission> lastCarbonEmissions = lastCollect.get(XAxis[i]);
// 鎬诲��
- double totalValue = getValues(energyMap, carbonEmissions,energyType);
+ double totalValue = getValues(energyMap, carbonEmissions, energyType);
// 涓婁竴鏃堕棿娈电殑鎬诲��
- double totalLastValue = getValues(energyMap, lastCarbonEmissions,energyType);
+ double totalLastValue = getValues(energyMap, lastCarbonEmissions, energyType);
// 鍓嶄竴娆＄殑鎬诲��
- double totalFrontValue = (i == 0) ? 0.0 : getValues(energyMap, collect.get(XAxis[i - 1]),energyType);
- final carbonEmissionYQVO carbonEmissionYQVO = new carbonEmissionYQVO(XAxis[i] , String.format("%.2f", totalValue) ,String.format("%.2f", calculateYOY(totalValue, totalLastValue)) , String.format("%.2f", calculateYOY(totalValue, totalFrontValue)));
+ double totalFrontValue = (i == 0) ? 0.0 : getValues(energyMap, collect.get(XAxis[i - 1]), energyType);
+ final carbonEmissionYQVO carbonEmissionYQVO = new carbonEmissionYQVO(XAxis[i], String.format("%.2f", totalValue), String.format("%.2f", calculateYOY(totalValue, totalLastValue)), String.format("%.2f", calculateYOY(totalValue, totalFrontValue)));
carbonEmissionYQVOS.add(carbonEmissionYQVO);
}
return carbonEmissionYQVOS;
@@ -253,35 +253,61 @@
}
- public static double getValues(Map<String, SysEnergy> energyMap, List<CarbonEmission> carbonEmissions,List<String> energyType) {
+ public static double getValues(Map<String, SysEnergy> energyMap, List<CarbonEmission> carbonEmissions, List<String> energyTypeList) {
if (CollectionUtils.isEmpty(carbonEmissions)) {
return 0.0;
}
-
// 鍒濆鍖栨�诲��
double allValue = 0.0;
-
// 鎸夎兘婧怚D鍒嗙粍
final Map<String, List<CarbonEmission>> energyValueMap = carbonEmissions.stream()
.collect(Collectors.groupingBy(CarbonEmission::getEnergyId));
-// final List<String> energyType = sysEnergies.stream().map(SysEnergy::getEnersno).collect(Collectors.toList());
-// 璁＄畻姣忕鑳芥簮鐨勫綋鍓嶅��
- for (String s : energyType) {
- SysEnergy sysEnergy = energyMap.get(s);
+
+ for (String energyType : energyTypeList) {
+ // 璁＄畻姣忕鑳芥簮鐨勫綋鍓嶅��
+ SysEnergy sysEnergy = energyMap.get(energyType);
// 纭繚鑳芥簮瀛樺湪涓旂郴鏁颁笉涓虹┖
if (sysEnergy == null || sysEnergy.getCoefficient() == null) {
- throw new RuntimeException("鑾峰彇纰虫帓鏀捐浆鎹㈢巼鏃跺嚭閿�: 绯荤粺鑳芥簮鏁版嵁涓笉瀛樺湪鎴栫郴鏁颁负绌�" + s + "鑳芥簮绫诲瀷");
+ throw new RuntimeException("鑾峰彇纰虫帓鏀捐浆鎹㈢巼鏃跺嚭閿�: 绯荤粺鑳芥簮鏁版嵁涓笉瀛樺湪鎴栫郴鏁颁负绌�" + energyType + "鑳芥簮绫诲瀷");
}
// 鑾峰彇瀵瑰簲鑳芥簮鐨勫��
- double value = energyValueMap.getOrDefault(s, Collections.emptyList()).stream()
+ double value = energyValueMap.getOrDefault(energyType, Collections.emptyList()).stream()
.mapToDouble(CarbonEmission::getValue)
.sum();
// 鐩存帴璁＄畻鎬诲�硷紝閬垮厤鍐椾綑鐨勮浆鎹�
allValue += sysEnergy.getCoefficient().doubleValue() * value;
}
+ // 鏍煎紡鍖栨渶缁堢粨鏋�
+ return Double.parseDouble(new DecimalFormat("#.00").format(allValue));
+ }
+
+ public static double getValues(Map<String, SysEnergy> energyMap, List<CarbonEmission> carbonEmissions, String energyType) {
+ if (CollectionUtils.isEmpty(carbonEmissions)) {
+ return 0.0;
+ }
+ // 鍒濆鍖栨�诲��
+ double allValue = 0.0;
+ // 鎸夎兘婧怚D鍒嗙粍
+ final Map<String, List<CarbonEmission>> energyValueMap = carbonEmissions.stream()
+ .collect(Collectors.groupingBy(CarbonEmission::getEnergyId));
+ // 璁＄畻姣忕鑳芥簮鐨勫綋鍓嶅��
+ SysEnergy sysEnergy = energyMap.get(energyType);
+
+ // 纭繚鑳芥簮瀛樺湪涓旂郴鏁颁笉涓虹┖
+ if (sysEnergy == null || sysEnergy.getCoefficient() == null) {
+ throw new RuntimeException("鑾峰彇纰虫帓鏀捐浆鎹㈢巼鏃跺嚭閿�: 绯荤粺鑳芥簮鏁版嵁涓笉瀛樺湪鎴栫郴鏁颁负绌�" + energyType + "鑳芥簮绫诲瀷");
+ }
+
+ // 鑾峰彇瀵瑰簲鑳芥簮鐨勫��
+ double value = energyValueMap.getOrDefault(energyType, Collections.emptyList()).stream()
+ .mapToDouble(CarbonEmission::getValue)
+ .sum();
+
+ // 鐩存帴璁＄畻鎬诲�硷紝閬垮厤鍐椾綑鐨勮浆鎹�
+ allValue += sysEnergy.getCoefficient().doubleValue() * value;
// 鏍煎紡鍖栨渶缁堢粨鏋�
return Double.parseDouble(new DecimalFormat("#.00").format(allValue));
diff --git a/zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java
index a785a08..d6079dc 100644
--- a/zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java
@@ -378,7 +378,7 @@
if (ObjectUtils.isEmpty(parentNode)) {
return energyDataList;
}
- List<String> nodeIds = modelNodeList.stream().filter(x -> ObjectUtils.isNotEmpty(x.getParentId()))
+ List<String> nodeIds = modelNodeList.stream().filter(x -> ObjectUtils.isNotEmpty(x.getParentId()) && parentNode.getNodeId().equals(x.getParentId()))
.map(ModelNode::getNodeId).collect(Collectors.toList());
if (ObjectUtils.isEmpty(nodeIds)) {
return energyDataList;
diff --git a/zhitan-vue/src/api/buildingConsumption/api.js b/zhitan-vue/src/api/buildingConsumption/api.js
new file mode 100644
index 0000000..a56c200
--- /dev/null
+++ b/zhitan-vue/src/api/buildingConsumption/api.js
@@ -0,0 +1,19 @@
+import request from "@/utils/request"
+export default {
+ // 鍒嗛」鐢ㄨ兘鍒嗘瀽
+ itemizedEnergyAnalysis(data) {
+ return request({
+ url: "/itemizedEnergyAnalysis/list",
+ method: "GET",
+ params: data,
+ })
+ },
+ // 鏀矾鐢ㄨ兘鍒嗘瀽
+ branchanalysis(data) {
+ return request({
+ url: "/branchanalysis/list",
+ method: "GET",
+ params: data,
+ })
+ },
+}
diff --git a/zhitan-vue/src/components/Echarts/LineChart.vue b/zhitan-vue/src/components/Echarts/LineChart.vue
index ef9af8b..8a1f434 100644
--- a/zhitan-vue/src/components/Echarts/LineChart.vue
+++ b/zhitan-vue/src/components/Echarts/LineChart.vue
@@ -68,7 +68,7 @@
console.log("initChart", series)
let option = {
title: {
- // text: props.chartData.title,
+ text: props.chartData.title || "",
left: "40",
textStyle: {
color: "#2979ff",
diff --git a/zhitan-vue/src/layout/components/Settings/index.vue b/zhitan-vue/src/layout/components/Settings/index.vue
index d0a0e88..51b619d 100644
--- a/zhitan-vue/src/layout/components/Settings/index.vue
+++ b/zhitan-vue/src/layout/components/Settings/index.vue
@@ -6,20 +6,42 @@
<div class="setting-drawer-block-checbox">
<div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-dark')">
<img src="@/assets/images/dark.svg" alt="dark" />
- <div v-if="sideTheme === 'theme-dark'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
+ <div v-if="sideTheme === 'theme-dark'" class="setting-drawer-block-checbox-selectIcon" style="display: block">
<i aria-label="鍥炬爣: check" class="anticon anticon-check">
- <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true" focusable="false" class>
- <path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z" />
+ <svg
+ viewBox="64 64 896 896"
+ data-icon="check"
+ width="1em"
+ height="1em"
+ :fill="theme"
+ aria-hidden="true"
+ focusable="false"
+ class
+ >
+ <path
+ d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"
+ />
</svg>
</i>
</div>
</div>
<div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-light')">
<img src="@/assets/images/light.svg" alt="light" />
- <div v-if="sideTheme === 'theme-light'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
+ <div v-if="sideTheme === 'theme-light'" class="setting-drawer-block-checbox-selectIcon" style="display: block">
<i aria-label="鍥炬爣: check" class="anticon anticon-check">
- <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true" focusable="false" class>
- <path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z" />
+ <svg
+ viewBox="64 64 896 896"
+ data-icon="check"
+ width="1em"
+ height="1em"
+ :fill="theme"
+ aria-hidden="true"
+ focusable="false"
+ class
+ >
+ <path
+ d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"
+ />
</svg>
</i>
</div>
@@ -28,7 +50,7 @@
<div class="drawer-item">
<span>涓婚棰滆壊</span>
<span class="comp-style">
- <el-color-picker v-model="theme" :predefine="predefineColors" @change="themeChange"/>
+ <el-color-picker v-model="theme" :predefine="predefineColors" @change="themeChange" />
</span>
</div>
<el-divider />
@@ -75,66 +97,65 @@
<el-button type="primary" plain icon="DocumentAdd" @click="saveSetting">淇濆瓨閰嶇疆</el-button>
<el-button plain icon="Refresh" @click="resetSetting">閲嶇疆閰嶇疆</el-button>
</el-drawer>
-
</template>
<script setup>
-import variables from '@/assets/styles/variables.module.scss'
-import axios from 'axios'
-import { ElLoading, ElMessage } from 'element-plus'
-import { useDynamicTitle } from '@/utils/dynamicTitle'
-import useAppStore from '@/store/modules/app'
-import useSettingsStore from '@/store/modules/settings'
-import usePermissionStore from '@/store/modules/permission'
-import { handleThemeStyle } from '@/utils/theme'
+import variables from "@/assets/styles/variables.module.scss"
+import axios from "axios"
+import { ElLoading, ElMessage } from "element-plus"
+import { useDynamicTitle } from "@/utils/dynamicTitle"
+import useAppStore from "@/store/modules/app"
+import useSettingsStore from "@/store/modules/settings"
+import usePermissionStore from "@/store/modules/permission"
+import { handleThemeStyle } from "@/utils/theme"
-const { proxy } = getCurrentInstance();
+const { proxy } = getCurrentInstance()
const appStore = useAppStore()
const settingsStore = useSettingsStore()
const permissionStore = usePermissionStore()
-const showSettings = ref(false);
-const theme = ref(settingsStore.theme);
-const sideTheme = ref(settingsStore.sideTheme);
-const storeSettings = computed(() => settingsStore);
-const predefineColors = ref(["#409EFF", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585"]);
+const showSettings = ref(false)
+const theme = ref(settingsStore.theme)
+const sideTheme = ref(settingsStore.sideTheme)
+const storeSettings = computed(() => settingsStore)
+const predefineColors = ref(["#409EFF", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585"])
/** 鏄惁闇�瑕乼opnav */
function topNavChange(val) {
if (!val) {
- appStore.toggleSideBarHide(false);
- permissionStore.setSidebarRouters(permissionStore.defaultRoutes);
+ appStore.toggleSideBarHide(false)
+ permissionStore.setSidebarRouters(permissionStore.defaultRoutes)
}
}
function themeChange(val) {
- settingsStore.theme = val;
- handleThemeStyle(val);
+ settingsStore.theme = val
+ handleThemeStyle(val)
}
function handleTheme(val) {
- settingsStore.sideTheme = val;
- sideTheme.value = val;
+ settingsStore.sideTheme = val
+ sideTheme.value = val
}
function saveSetting() {
- proxy.$modal.loading("姝ｅ湪淇濆瓨鍒版湰鍦帮紝璇风◢鍊�...");
+ proxy.$modal.loading("姝ｅ湪淇濆瓨鍒版湰鍦帮紝璇风◢鍊�...")
let layoutSetting = {
- "topNav": storeSettings.value.topNav,
- "tagsView": storeSettings.value.tagsView,
- "fixedHeader": storeSettings.value.fixedHeader,
- "sidebarLogo": storeSettings.value.sidebarLogo,
- "dynamicTitle": storeSettings.value.dynamicTitle,
- "sideTheme": storeSettings.value.sideTheme,
- "theme": storeSettings.value.theme
- };
- localStorage.setItem("layout-setting", JSON.stringify(layoutSetting));
+ topNav: storeSettings.value.topNav,
+ tagsView: storeSettings.value.tagsView,
+ fixedHeader: storeSettings.value.fixedHeader,
+ sidebarLogo: storeSettings.value.sidebarLogo,
+ dynamicTitle: storeSettings.value.dynamicTitle,
+ sideTheme: storeSettings.value.sideTheme,
+ theme: storeSettings.value.theme,
+ }
+ localStorage.setItem("layout-setting", JSON.stringify(layoutSetting))
setTimeout(proxy.$modal.closeLoading(), 1000)
}
function resetSetting() {
- proxy.$modal.loading("姝ｅ湪娓呴櫎璁剧疆缂撳瓨骞跺埛鏂帮紝璇风◢鍊�...");
+ proxy.$modal.loading("姝ｅ湪娓呴櫎璁剧疆缂撳瓨骞跺埛鏂帮紝璇风◢鍊�...")
localStorage.removeItem("layout-setting")
setTimeout("window.location.reload()", 1000)
}
function openSetting() {
- showSettings.value = true;
+ showSettings.value = true
}
defineExpose({
@@ -142,7 +163,7 @@
})
</script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
.setting-drawer-title {
margin-bottom: 12px;
color: rgba(0, 0, 0, 0.85);
@@ -202,4 +223,4 @@
margin: -3px 8px 0px 0px;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/zhitan-vue/src/views/buildingConsumption/branch-build/index.vue b/zhitan-vue/src/views/buildingConsumption/branch-build/index.vue
new file mode 100644
index 0000000..f5670c0
--- /dev/null
+++ b/zhitan-vue/src/views/buildingConsumption/branch-build/index.vue
@@ -0,0 +1,306 @@
+<template>
+ <div class="page">
+ <div class="page-container">
+ <div class="page-container-left">
+ <LeftTree ref="leftTreeRef" @handleNodeClick="handleNodeClick" />
+ </div>
+ <div class="page-container-right">
+ <div class="form-card">
+ <el-form :model="queryParams" ref="queryRef" :inline="true">
+ <el-form-item label="鏈熼棿" prop="timeType">
+ <el-select
+ v-model="queryParams.timeType"
+ placeholder="鏈熼棿"
+ clearable
+ style="width: 120px"
+ @change="handleTimeType"
+ >
+ <el-option v-for="dict in period" :key="dict.value" :label="dict.label" :value="dict.value" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鏃堕棿">
+ <el-date-picker
+ v-model="queryParams.dataTime"
+ :type="queryParams.timeType == 'YEAR' ? 'year' : queryParams.timeType == 'MONTH' ? 'month' : 'date'"
+ :format="
+ queryParams.timeType == 'YEAR' ? 'YYYY' : queryParams.timeType == 'MONTH' ? 'YYYY-MM' : 'YYYY-MM-DD'
+ "
+ value-format="YYYY-MM-DD"
+ placeholder="鏃堕棿"
+ style="width: 100%"
+ />
+ </el-form-item>
+ <el-form-item label="鑳芥簮绫诲瀷" prop="energyType">
+ <el-select v-model="queryParams.energyType" placeholder="鑳芥簮绫诲瀷" style="width: 120px">
+ <el-option
+ :label="item.enername"
+ :value="item.enersno"
+ v-for="item in energyTypeList"
+ :key="item.enersno"
+ @click="handleEnergyType(item)"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="Search" @click="handleQuery"> 鎼滅储 </el-button>
+ <!-- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button> -->
+ </el-form-item>
+ <!-- <el-form-item>
+ <el-button type="warning" icon="Download" @click="handleExport"> 瀵煎嚭 </el-button>
+ </el-form-item> -->
+ </el-form>
+ </div>
+ <div
+ style="height: calc(100vh - 220px) !important; max-height: calc(100vh - 220px) !important; overflow-y: auto"
+ v-loading="loading"
+ >
+ <BaseCard :title="queryParams.nodeName + '-鏀矾鐢ㄨ兘鍒嗘瀽'">
+ <div class="">
+ <!-- <div id="Chart1" /> -->
+ <line-chart ref="LineChartRef" :chartData="lineChartData" :chartType="'bar'" />
+ </div>
+ </BaseCard>
+ <BaseCard :title="queryParams.nodeName + '-鏀矾鐢ㄨ兘璇︽儏-' + queryParams.enername">
+ <div class="table-box">
+ <!-- show-summary -->
+ <el-table :data="departmentList">
+ <el-table-column label="鑺傜偣" align="center" key="nodeName" prop="nodeName" fixed="left" />
+ <el-table-column label="鍚堣" align="center" key="total" prop="total" width="100" fixed="left" />
+ <template v-if="queryParams.timeType == 'DAY'">
+ <el-table-column
+ v-for="index in 24"
+ :key="index"
+ :label="index - 1 + '鏃�'"
+ align="center"
+ min-width="130"
+ >
+ <template #default="scope">{{ scope.row[`value${index - 1}`] }}</template>
+ </el-table-column>
+ </template>
+ <template v-if="queryParams.timeType == 'MONTH'">
+ <el-table-column
+ v-for="index in 31"
+ :key="index"
+ :label="index + '鏃�'"
+ align="center"
+ min-width="130"
+ >
+ <template #default="scope">{{ scope.row[`value${index - 1}`] }}</template>
+ </el-table-column>
+ </template>
+ <template v-if="queryParams.timeType == 'YEAR'">
+ <el-table-column
+ v-for="index in 12"
+ :key="index"
+ :label="index + '鏈�'"
+ align="center"
+ min-width="130"
+ >
+ <template #default="scope">{{ scope.row[`value${index - 1}`] }}</template>
+ </el-table-column>
+ </template>
+ </el-table>
+ </div>
+ </BaseCard>
+ <!-- </el-col>
+ </el-row> -->
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script setup name="branchanalysis">
+import buildApi from "@/api/buildingConsumption/api"
+import { listEnergyTypeList } from "@/api/modelConfiguration/energyType"
+import LineChart from "@/components/Echarts/LineChart.vue"
+const { proxy } = getCurrentInstance()
+const { period } = proxy.useDict("period")
+import { useRoute } from "vue-router"
+import useSettingsStore from "@/store/modules/settings"
+const settingsStore = useSettingsStore()
+watch(
+ () => settingsStore.sideTheme,
+ (val) => {
+ getList()
+ }
+)
+const energyTypeList = ref(undefined)
+const departmentList = ref([])
+const loading = ref(false)
+const data = reactive({
+ queryParams: {
+ nodeId: null,
+ timeType: null,
+ dataTime: null,
+ energyType: null,
+ },
+ query: {
+ modelCode: null,
+ },
+})
+const { queryParams, query } = toRefs(data)
+const itemBuildData = ref({})
+const LineChartRef = ref()
+const lineChartData = ref({})
+/** 鑺傜偣鍗曞嚮浜嬩欢 */
+function handleNodeClick(data) {
+ queryParams.value.nodeId = data.id
+ queryParams.value.nodeName = data.label
+ handleTimeType(period.value[0].value)
+ listEnergyTypeList().then((res) => {
+ energyTypeList.value = res.data
+ queryParams.value.energyType = energyTypeList.value[0].enersno
+ queryParams.value.enername = energyTypeList.value[0].enername
+ queryParams.value.muid = energyTypeList.value[0].muid
+ handleQuery()
+ })
+}
+function handleTimeType(e) {
+ queryParams.value.timeType = e
+ queryParams.value.dataTime = proxy.dayjs(new Date()).format("YYYY-MM-DD")
+ handleQuery()
+}
+function handleEnergyType(item) {
+ queryParams.value.enername = item.enername
+ queryParams.value.muid = item.muid
+ handleQuery()
+}
+function getList() {
+ loading.value = true
+ buildApi
+ .branchanalysis(
+ proxy.addDateRange({
+ ...queryParams.value,
+ ...query.value,
+ })
+ )
+ .then((res) => {
+ if (!!res.code && res.code == 200) {
+ loading.value = false
+ let yData = []
+ let xData = []
+ if (!!res.data) {
+ departmentList.value = [res.data] || []
+ }
+ let dataList = res.data || {}
+ if (queryParams.value.timeType == "DAY") {
+ for (let i = 0; i < 24; i++) {
+ xData.push(i + "鏃�")
+ yData.push(dataList[`value${i}`])
+ }
+ } else if (queryParams.value.timeType == "MONTH") {
+ for (let i = 0; i < 31; i++) {
+ xData.push(i + 1 + "鏃�")
+ yData.push(dataList[`value${i}`])
+ }
+ } else {
+ for (let i = 0; i < 12; i++) {
+ xData.push(i + 1 + "鏈�")
+ yData.push(dataList[`value${i}`])
+ }
+ }
+
+ lineChartData.value = {
+ title: queryParams.value.muid,
+ xAxis: xData,
+ series: [
+ {
+ name: queryParams.value.enername,
+ data: yData,
+ },
+ ],
+ }
+ }
+ })
+ .catch(() => {
+ loading.value = false
+ })
+}
+function numFilter(value) {
+ // 鎴彇褰撳墠鏁版嵁鍒板皬鏁扮偣鍚庣殑鍑犱綅
+ let realVal = ""
+ if (!isNaN(value) && value !== "" && value !== null) {
+ realVal = parseFloat(value).toFixed(2)
+ } else {
+ realVal = "--"
+ }
+ return realVal
+}
+// 鑳借�楀姣斿垎鏋�-绉戝鑳借�楀垎鏋�-鎼滅储
+function handleQuery() {
+ getList()
+}
+// 鑳借�楀姣斿垎鏋�-绉戝鑳借�楀垎鏋�-閲嶇疆
+function resetQuery() {
+ proxy.resetForm("queryRef")
+ handleTimeType(period.value[0].value)
+ queryParams.value.energyType = energyTypeList.value[0].enersno
+ queryParams.value.enername = energyTypeList.value[0].enername
+ queryParams.value.muid = energyTypeList.value[0].muid
+ queryParams.value.analysisType = "YOY"
+ handleQuery()
+}
+// 鑳借�楀姣斿垎鏋�-绉戝鑳借�楀垎鏋�-瀵煎嚭
+function handleExport() {
+ proxy.download(
+ "consumptionanalysis/energyExport",
+ {
+ ...queryParams.value,
+ ...query.value,
+ },
+ `${queryParams.value.nodeName}-鍘傚尯鑳借�楀垎鏋恄${new Date().getTime()}.xlsx`
+ )
+}
+</script>
+<style scoped lang="scss">
+@import "@/assets/styles/page.scss";
+.el-tabs {
+ padding: 0 12px;
+ margin-top: 12px;
+ :deep(.el-tabs__header) {
+ margin: 0;
+ }
+}
+
+.themeDark {
+ .build-sum {
+ border: 1px solid #8c8b8b;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ color: #fff;
+ .build-sum-item {
+ width: 25%;
+ text-align: center;
+ padding: 12px 0;
+ .count {
+ font-size: 24px;
+ font-weight: 600;
+ margin-top: 8px;
+ color: #409eff;
+ }
+ }
+ }
+}
+.themeLight {
+ .build-sum {
+ border: 1px solid #eaeaea;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ color: #333;
+ .build-sum-item {
+ width: 25%;
+ text-align: center;
+ padding: 12px 0;
+ .count {
+ font-size: 24px;
+ font-weight: 600;
+ margin-top: 8px;
+ color: #409eff;
+ }
+ }
+ }
+}
+</style>
diff --git a/zhitan-vue/src/views/buildingConsumption/item-build/index.vue b/zhitan-vue/src/views/buildingConsumption/item-build/index.vue
new file mode 100644
index 0000000..12c53e8
--- /dev/null
+++ b/zhitan-vue/src/views/buildingConsumption/item-build/index.vue
@@ -0,0 +1,326 @@
+<template>
+ <div class="page">
+ <div class="page-container">
+ <div class="page-container-left">
+ <LeftTree ref="leftTreeRef" @handleNodeClick="handleNodeClick" />
+ </div>
+ <div class="page-container-right">
+ <div class="form-card">
+ <el-form :model="queryParams" ref="queryRef" :inline="true">
+ <el-form-item label="鏈熼棿" prop="timeType">
+ <el-select
+ v-model="queryParams.timeType"
+ placeholder="鏈熼棿"
+ clearable
+ style="width: 120px"
+ @change="handleTimeType"
+ >
+ <el-option v-for="dict in period" :key="dict.value" :label="dict.label" :value="dict.value" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鏃堕棿">
+ <el-date-picker
+ v-model="queryParams.dataTime"
+ :type="queryParams.timeType == 'YEAR' ? 'year' : queryParams.timeType == 'MONTH' ? 'month' : 'date'"
+ :format="
+ queryParams.timeType == 'YEAR' ? 'YYYY' : queryParams.timeType == 'MONTH' ? 'YYYY-MM' : 'YYYY-MM-DD'
+ "
+ value-format="YYYY-MM-DD"
+ placeholder="鏃堕棿"
+ style="width: 100%"
+ />
+ </el-form-item>
+ <el-form-item label="鑳芥簮绫诲瀷" prop="energyType">
+ <el-select v-model="queryParams.energyType" placeholder="鑳芥簮绫诲瀷" style="width: 120px">
+ <el-option
+ :label="item.enername"
+ :value="item.enersno"
+ v-for="item in energyTypeList"
+ :key="item.enersno"
+ @click="handleEnergyType(item)"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="Search" @click="handleQuery"> 鎼滅储 </el-button>
+ <!-- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button> -->
+ </el-form-item>
+ <!-- <el-form-item>
+ <el-button type="warning" icon="Download" @click="handleExport"> 瀵煎嚭 </el-button>
+ </el-form-item> -->
+ </el-form>
+ </div>
+ <div
+ style="height: calc(100vh - 220px) !important; max-height: calc(100vh - 220px) !important; overflow-y: auto"
+ v-loading="loading"
+ >
+ <BaseCard :title="queryParams.nodeName + '-鍒嗛」鐢ㄨ兘鍒嗘瀽'">
+ <div class="build-sum">
+ <div class="build-sum-item">
+ <div>鎬荤敤閲�/{{ queryParams.muid }}</div>
+ <div class="count">{{ itemBuildData.total || 0 }}</div>
+ </div>
+ <div class="build-sum-item">
+ <div>鏈�澶х敤閲�/{{ queryParams.muid }}</div>
+ <div class="count">{{ itemBuildData.max || 0 }}</div>
+ </div>
+ <div class="build-sum-item">
+ <div>鏈�灏忕敤閲�/{{ queryParams.muid }}</div>
+ <div class="count">{{ itemBuildData.min || 0 }}</div>
+ </div>
+ <div class="build-sum-item">
+ <div>骞冲潎鐢ㄩ噺/{{ queryParams.muid }}</div>
+ <div class="count">{{ itemBuildData.avg || 0 }}</div>
+ </div>
+ </div>
+ <div class="">
+ <!-- <div id="Chart1" /> -->
+ <line-chart ref="LineChartRef" :chartData="lineChartData" />
+ </div>
+ </BaseCard>
+ <BaseCard :title="queryParams.nodeName + '-鍒嗛」鐢ㄨ兘璇︽儏-' + queryParams.enername">
+ <div class="table-box">
+ <!-- show-summary -->
+ <el-table :data="departmentList">
+ <el-table-column label="鑺傜偣" align="center" key="nodeName" prop="nodeName" fixed="left" />
+ <el-table-column label="鍚堣" align="center" key="total" prop="total" width="100" fixed="left" />
+ <template v-if="queryParams.timeType == 'DAY'">
+ <el-table-column
+ v-for="index in 24"
+ :key="index"
+ :label="index - 1 + '鏃�'"
+ align="center"
+ min-width="130"
+ >
+ <template #default="scope">{{ scope.row[`value${index - 1}`] }}</template>
+ </el-table-column>
+ </template>
+ <template v-if="queryParams.timeType == 'MONTH'">
+ <el-table-column
+ v-for="index in 31"
+ :key="index"
+ :label="index + '鏃�'"
+ align="center"
+ min-width="130"
+ >
+ <template #default="scope">{{ scope.row[`value${index - 1}`] }}</template>
+ </el-table-column>
+ </template>
+ <template v-if="queryParams.timeType == 'YEAR'">
+ <el-table-column
+ v-for="index in 12"
+ :key="index"
+ :label="index + '鏈�'"
+ align="center"
+ min-width="130"
+ >
+ <template #default="scope">{{ scope.row[`value${index - 1}`] }}</template>
+ </el-table-column>
+ </template>
+ </el-table>
+ </div>
+ </BaseCard>
+ <!-- </el-col>
+ </el-row> -->
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script setup name="itemBuild">
+import buildApi from "@/api/buildingConsumption/api"
+import { listEnergyTypeList } from "@/api/modelConfiguration/energyType"
+import LineChart from "@/components/Echarts/LineChart.vue"
+const { proxy } = getCurrentInstance()
+const { period } = proxy.useDict("period")
+import { useRoute } from "vue-router"
+import useSettingsStore from "@/store/modules/settings"
+const settingsStore = useSettingsStore()
+watch(
+ () => settingsStore.sideTheme,
+ (val) => {
+ getList()
+ }
+)
+const energyTypeList = ref(undefined)
+const departmentList = ref([])
+const loading = ref(false)
+const data = reactive({
+ queryParams: {
+ nodeId: null,
+ timeType: null,
+ dataTime: null,
+ energyType: null,
+ },
+ query: {
+ modelCode: null,
+ },
+})
+const { queryParams, query } = toRefs(data)
+const itemBuildData = ref({})
+const LineChartRef = ref()
+const lineChartData = ref({})
+/** 鑺傜偣鍗曞嚮浜嬩欢 */
+function handleNodeClick(data) {
+ queryParams.value.nodeId = data.id
+ queryParams.value.nodeName = data.label
+ handleTimeType(period.value[0].value)
+ listEnergyTypeList().then((res) => {
+ energyTypeList.value = res.data
+ queryParams.value.energyType = energyTypeList.value[0].enersno
+ queryParams.value.enername = energyTypeList.value[0].enername
+ queryParams.value.muid = energyTypeList.value[0].muid
+ handleQuery()
+ })
+}
+function handleTimeType(e) {
+ queryParams.value.timeType = e
+ queryParams.value.dataTime = proxy.dayjs(new Date()).format("YYYY-MM-DD")
+ handleQuery()
+}
+function handleEnergyType(item) {
+ queryParams.value.enername = item.enername
+ queryParams.value.muid = item.muid
+ handleQuery()
+}
+function getList() {
+ loading.value = true
+ buildApi
+ .itemizedEnergyAnalysis(
+ proxy.addDateRange({
+ ...queryParams.value,
+ ...query.value,
+ })
+ )
+ .then((res) => {
+ if (!!res.code && res.code == 200) {
+ loading.value = false
+ itemBuildData.value = res.data
+ let yData = []
+ let xData = []
+ let title = []
+ if (!!res.data.dataList) {
+ departmentList.value = res.data.dataList || []
+ }
+ let dataList = res.data.dataList || []
+ if (queryParams.value.timeType == "DAY") {
+ for (let i = 0; i < 24; i++) {
+ xData.push(i + "鏃�")
+ yData.push(dataList[0][`value${i}`])
+ }
+ } else if (queryParams.value.timeType == "MONTH") {
+ for (let i = 0; i < 31; i++) {
+ xData.push(i + 1 + "鏃�")
+ yData.push(dataList[0][`value${i}`])
+ }
+ } else {
+ for (let i = 0; i < 12; i++) {
+ xData.push(i + 1 + "鏈�")
+ yData.push(dataList[0][`value${i}`])
+ }
+ }
+
+ lineChartData.value = {
+ title: queryParams.value.muid,
+ xAxis: xData,
+ series: [
+ {
+ name: queryParams.value.enername,
+ data: yData,
+ },
+ ],
+ }
+ }
+ })
+ .catch(() => {
+ loading.value = false
+ })
+}
+function numFilter(value) {
+ // 鎴彇褰撳墠鏁版嵁鍒板皬鏁扮偣鍚庣殑鍑犱綅
+ let realVal = ""
+ if (!isNaN(value) && value !== "" && value !== null) {
+ realVal = parseFloat(value).toFixed(2)
+ } else {
+ realVal = "--"
+ }
+ return realVal
+}
+// 鑳借�楀姣斿垎鏋�-绉戝鑳借�楀垎鏋�-鎼滅储
+function handleQuery() {
+ getList()
+}
+// 鑳借�楀姣斿垎鏋�-绉戝鑳借�楀垎鏋�-閲嶇疆
+function resetQuery() {
+ proxy.resetForm("queryRef")
+ handleTimeType(period.value[0].value)
+ queryParams.value.energyType = energyTypeList.value[0].enersno
+ queryParams.value.enername = energyTypeList.value[0].enername
+ queryParams.value.muid = energyTypeList.value[0].muid
+ queryParams.value.analysisType = "YOY"
+ handleQuery()
+}
+// 鑳借�楀姣斿垎鏋�-绉戝鑳借�楀垎鏋�-瀵煎嚭
+function handleExport() {
+ proxy.download(
+ "consumptionanalysis/energyExport",
+ {
+ ...queryParams.value,
+ ...query.value,
+ },
+ `${queryParams.value.nodeName}-鍘傚尯鑳借�楀垎鏋恄${new Date().getTime()}.xlsx`
+ )
+}
+</script>
+<style scoped lang="scss">
+@import "@/assets/styles/page.scss";
+.el-tabs {
+ padding: 0 12px;
+ margin-top: 12px;
+ :deep(.el-tabs__header) {
+ margin: 0;
+ }
+}
+
+.themeDark {
+ .build-sum {
+ border: 1px solid #8c8b8b;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ color: #fff;
+ .build-sum-item {
+ width: 25%;
+ text-align: center;
+ padding: 12px 0;
+ .count {
+ font-size: 24px;
+ font-weight: 600;
+ margin-top: 8px;
+ color: #409eff;
+ }
+ }
+ }
+}
+.themeLight {
+ .build-sum {
+ border: 1px solid #eaeaea;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ color: #333;
+ .build-sum-item {
+ width: 25%;
+ text-align: center;
+ padding: 12px 0;
+ .count {
+ font-size: 24px;
+ font-weight: 600;
+ margin-top: 8px;
+ color: #409eff;
+ }
+ }
+ }
+}
+</style>
--
Gitblit v1.9.3