diff --git a/img/dataAnalysisOctober/electricityStatistics.png b/img/dataAnalysisOctober/electricityStatistics.png
new file mode 100644
index 0000000..916f859
Binary files /dev/null and b/img/dataAnalysisOctober/electricityStatistics.png differ
diff --git a/img/dataAnalysisOctober/electricityTrend.png b/img/dataAnalysisOctober/electricityTrend.png
new file mode 100644
index 0000000..3fe40d4
Binary files /dev/null and b/img/dataAnalysisOctober/electricityTrend.png differ
diff --git a/img/dataAnalysisOctober/energyConsumption.png b/img/dataAnalysisOctober/energyConsumption.png
new file mode 100644
index 0000000..771568f
Binary files /dev/null and b/img/dataAnalysisOctober/energyConsumption.png differ
diff --git a/img/dataAnalysisOctober/waterStatistics.png b/img/dataAnalysisOctober/waterStatistics.png
new file mode 100644
index 0000000..efe0594
Binary files /dev/null and b/img/dataAnalysisOctober/waterStatistics.png differ
diff --git a/img/dataAnalysisOctober/waterTrend.png b/img/dataAnalysisOctober/waterTrend.png
new file mode 100644
index 0000000..f8d62a1
Binary files /dev/null and b/img/dataAnalysisOctober/waterTrend.png differ
diff --git a/js/pages/dataAnalysisOctober/energySavingAnalysis.js b/js/pages/dataAnalysisOctober/energySavingAnalysis.js
new file mode 100644
index 0000000..723bac6
--- /dev/null
+++ b/js/pages/dataAnalysisOctober/energySavingAnalysis.js
@@ -0,0 +1,504 @@
+let table, layer, form;
+let fontSize = '14', fontFamily = 'Alibaba PuHuiTi R', fontColor = '#fff';
+
+const bidCode = parent.$('#bidPro').val();
+layui.use(["layer", "table", "form"], function () {
+ layer = layui.layer;
+ table = layui.table;
+ form = layui.form;
+
+ getElectricityStatistics();
+ getWaterStatistics()
+
+ getWaterTrend();
+
+ getElectricityTrend();
+});
+
+function getElectricityStatistics() {
+ initElectricityStatisticsChart()
+}
+
+function getWaterStatistics() {
+ initWaterStatisticsChart()
+}
+
+function initElectricityStatisticsChart() {
+ const electricityStatistics = echarts.init(document.getElementById("electricityStatistics"));
+ const option = {
+ tooltip: {
+ trigger: "item",
+ formatter: "{b}: {c}kWh ({d}%)",
+ backgroundColor: "rgba(0, 0, 0, 0.8)",
+ borderColor: "#08DCE0",
+ borderWidth: 1,
+ textStyle: {
+ color: "#fff",
+ },
+ },
+ legend: {
+ orient: "vertical",
+ right: "20%",
+ top: "25%",
+ itemGap: 30,
+ itemWidth: 20,
+ itemHeight: 8,
+ textStyle: {
+ color: "#fff",
+ fontSize: 14,
+ rich: {
+ name: {
+ width: 30,
+ color: "#fff",
+ },
+ value: {
+ width: 60,
+ align: "right",
+ color: "#79FFFF",
+ fontSize: 16,
+ fontWeight: "bold",
+ },
+ },
+ },
+ formatter: (name) => {
+ const data = option.series[0].data
+ const item = data.find((d) => d.name === name)
+ const percent = item ? item.value : 0
+ return `{name|${name}} {value|${percent}%}`
+ },
+ },
+ series: [
+ {
+ name: "用电统计",
+ type: "pie",
+ radius: [0, '60%'],
+ center: ["30%", "55%"],
+ avoidLabelOverlap: false,
+ itemStyle: {
+ borderRadius: 5,
+ borderColor: "rgba(0, 0, 0, 0.3)",
+ borderWidth: 2,
+ shadowBlur: 10,
+ shadowColor: "rgba(0, 0, 0, 0.5)",
+ },
+ label: {
+ show: false,
+ },
+ emphasis: {
+ label: {
+ show: false,
+ },
+ itemStyle: {
+ shadowBlur: 20,
+ shadowOffsetX: 0,
+ shadowColor: "rgba(8, 220, 224, 0.8)",
+ },
+ },
+ labelLine: {
+ show: false,
+ },
+ data: [
+ {
+ value: 60,
+ name: "A区",
+ itemStyle: {
+ color: '#75F7EC',
+ },
+ },
+ {
+ value: 60,
+ name: "B区",
+ itemStyle: {
+ color: '#75F791',
+ },
+ },
+ {
+ value: 26,
+ name: "C区",
+ itemStyle: {
+ color: '#00C3F2',
+ },
+ },
+ {
+ value: 14,
+ name: "D区",
+ itemStyle: {
+ color: '#EB846A',
+ },
+ },
+ ],
+ },
+ ],
+ }
+
+ electricityStatistics.setOption(option)
+}
+
+function initWaterStatisticsChart() {
+ const waterStatistics = echarts.init(document.getElementById("waterStatistics"));
+ const option = {
+ tooltip: {
+ trigger: "item",
+ formatter: "{b}: {c}kWh ({d}%)",
+ backgroundColor: "rgba(0, 0, 0, 0.8)",
+ borderColor: "#08DCE0",
+ borderWidth: 1,
+ textStyle: {
+ color: "#fff",
+ },
+ },
+ legend: {
+ orient: "vertical",
+ right: "20%",
+ top: "25%",
+ itemGap: 30,
+ itemWidth: 20,
+ itemHeight: 8,
+ textStyle: {
+ color: "#fff",
+ fontSize: 14,
+ rich: {
+ name: {
+ width: 30,
+ color: "#fff",
+ },
+ value: {
+ width: 60,
+ align: "right",
+ color: "#79FFFF",
+ fontSize: 16,
+ fontWeight: "bold",
+ },
+ },
+ },
+ formatter: (name) => {
+ const data = option.series[0].data
+ const item = data.find((d) => d.name === name)
+ const percent = item ? item.value : 0
+ return `{name|${name}} {value|${percent}%}`
+ },
+ },
+ series: [
+ {
+ name: "用电统计",
+ type: "pie",
+ radius: [0, '60%'],
+ center: ["30%", "55%"],
+ avoidLabelOverlap: false,
+ itemStyle: {
+ borderRadius: 5,
+ borderColor: "rgba(0, 0, 0, 0.3)",
+ borderWidth: 2,
+ shadowBlur: 10,
+ shadowColor: "rgba(0, 0, 0, 0.5)",
+ },
+ label: {
+ show: false,
+ },
+ emphasis: {
+ label: {
+ show: false,
+ },
+ itemStyle: {
+ shadowBlur: 20,
+ shadowOffsetX: 0,
+ shadowColor: "rgba(8, 220, 224, 0.8)",
+ },
+ },
+ labelLine: {
+ show: false,
+ },
+ data: [
+ {
+ value: 60,
+ name: "A区",
+ itemStyle: {
+ color: '#75F7EC',
+ },
+ },
+ {
+ value: 60,
+ name: "B区",
+ itemStyle: {
+ color: '#75F791',
+ },
+ },
+ {
+ value: 26,
+ name: "C区",
+ itemStyle: {
+ color: '#00C3F2',
+ },
+ },
+ {
+ value: 14,
+ name: "D区",
+ itemStyle: {
+ color: '#EB846A',
+ },
+ },
+ ],
+ },
+ ],
+ }
+
+ waterStatistics.setOption(option)
+}
+
+function getWaterTrend() {
+ const dates = [
+ "xxxx-xx-01",
+ "xxxx-xx-02",
+ "xxxx-xx-03",
+ "xxxx-xx-04",
+ "xxxx-xx-05",
+ "xxxx-xx-06",
+ "xxxx-xx-07",
+ "xxxx-xx-08",
+ ]
+
+ const waterData = [4.2, 3.3, 3.1, 2.8, 3.0, 3.2, 3.3, 2.1]
+ initWaterTrend(dates, waterData);
+}
+
+function initWaterTrend(dates, waterData) {
+ const waterTrend = echarts.init(document.getElementById("waterTrend"));
+ const option = {
+ grid: {
+ left: "5%",
+ right: "8%",
+ top: "25%",
+ bottom: "10%",
+ containLabel: true,
+ },
+ xAxis: {
+ type: "category",
+ data: dates,
+ boundaryGap: false,
+ axisLine: {
+ lineStyle: {
+ color: "rgba(8, 220, 224, 0.3)",
+ },
+ },
+ axisLabel: {
+ color: "rgba(255, 255, 255, 0.6)",
+ fontSize: 11,
+ rotate: 0,
+ },
+ axisTick: {
+ show: false,
+ },
+ splitLine: {
+ show: false,
+ },
+ },
+ yAxis: {
+ type: "value",
+ min: 0,
+ max: 5,
+ interval: 1,
+ axisLine: {
+ show: false,
+ },
+ axisLabel: {
+ color: "rgba(255, 255, 255, 0.6)",
+ fontSize: 12,
+ },
+ axisTick: {
+ show: false,
+ },
+ splitLine: {
+ lineStyle: {
+ color: "rgba(8, 220, 224, 0.15)",
+ type: "dashed",
+ },
+ },
+ },
+ series: [
+ {
+ name: "用水量",
+ type: "line",
+ smooth: true,
+ symbol: "circle",
+ symbolSize: 6,
+ data: waterData,
+ lineStyle: {
+ color: "#08DCE0",
+ width: 2,
+ },
+ itemStyle: {
+ color: "#08DCE0",
+ borderColor: "#08DCE0",
+ borderWidth: 2,
+ },
+ areaStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: "rgba(8, 220, 224, 0.3)",
+ },
+ {
+ offset: 1,
+ color: "rgba(8, 220, 224, 0.05)",
+ },
+ ]),
+ },
+ emphasis: {
+ itemStyle: {
+ color: "#08DCE0",
+ borderColor: "#fff",
+ borderWidth: 2,
+ shadowBlur: 10,
+ shadowColor: "rgba(8, 220, 224, 0.8)",
+ },
+ },
+ },
+ ],
+ tooltip: {
+ trigger: "axis",
+ backgroundColor: "rgba(0, 20, 40, 0.9)",
+ borderColor: "#08DCE0",
+ borderWidth: 1,
+ textStyle: {
+ color: "#fff",
+ },
+ axisPointer: {
+ type: "line",
+ lineStyle: {
+ color: "rgba(8, 220, 224, 0.5)",
+ type: "dashed",
+ },
+ },
+ },
+ }
+ waterTrend.setOption(option)
+}
+
+function getElectricityTrend() {
+ const dates = [
+ "xxxx-xx-01",
+ "xxxx-xx-02",
+ "xxxx-xx-03",
+ "xxxx-xx-04",
+ "xxxx-xx-05",
+ "xxxx-xx-06",
+ "xxxx-xx-07",
+ "xxxx-xx-08",
+ ]
+
+ const electricityData = [4.2, 3.3, 3.1, 2.8, 3.0, 3.2, 3.3, 2.1]
+ initElectricityTrend(dates, electricityData);
+}
+
+function initElectricityTrend(dates, electricityData) {
+ const waterTrend = echarts.init(document.getElementById("electricityTrend"));
+ const option = {
+ grid: {
+ left: "5%",
+ right: "8%",
+ top: "25%",
+ bottom: "10%",
+ containLabel: true,
+ },
+ xAxis: {
+ type: "category",
+ data: dates,
+ boundaryGap: false,
+ axisLine: {
+ lineStyle: {
+ color: "rgba(8, 220, 224, 0.3)",
+ },
+ },
+ axisLabel: {
+ color: "rgba(255, 255, 255, 0.6)",
+ fontSize: 11,
+ rotate: 0,
+ },
+ axisTick: {
+ show: false,
+ },
+ splitLine: {
+ show: false,
+ },
+ },
+ yAxis: {
+ type: "value",
+ min: 0,
+ max: 5,
+ interval: 1,
+ axisLine: {
+ show: false,
+ },
+ axisLabel: {
+ color: "rgba(255, 255, 255, 0.6)",
+ fontSize: 12,
+ },
+ axisTick: {
+ show: false,
+ },
+ splitLine: {
+ lineStyle: {
+ color: "rgba(8, 220, 224, 0.15)",
+ type: "dashed",
+ },
+ },
+ },
+ series: [
+ {
+ name: "用水量",
+ type: "line",
+ smooth: true,
+ symbol: "circle",
+ symbolSize: 6,
+ data: electricityData,
+ lineStyle: {
+ color: "#08DCE0",
+ width: 2,
+ },
+ itemStyle: {
+ color: "#08DCE0",
+ borderColor: "#08DCE0",
+ borderWidth: 2,
+ },
+ areaStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ {
+ offset: 0,
+ color: "rgba(8, 220, 224, 0.3)",
+ },
+ {
+ offset: 1,
+ color: "rgba(8, 220, 224, 0.05)",
+ },
+ ]),
+ },
+ emphasis: {
+ itemStyle: {
+ color: "#08DCE0",
+ borderColor: "#fff",
+ borderWidth: 2,
+ shadowBlur: 10,
+ shadowColor: "rgba(8, 220, 224, 0.8)",
+ },
+ },
+ },
+ ],
+ tooltip: {
+ trigger: "axis",
+ backgroundColor: "rgba(0, 20, 40, 0.9)",
+ borderColor: "#08DCE0",
+ borderWidth: 1,
+ textStyle: {
+ color: "#fff",
+ },
+ axisPointer: {
+ type: "line",
+ lineStyle: {
+ color: "rgba(8, 220, 224, 0.5)",
+ type: "dashed",
+ },
+ },
+ },
+ }
+ waterTrend.setOption(option)
+}
diff --git a/pages/dataAnalysisOctober/energySavingAnalysis.html b/pages/dataAnalysisOctober/energySavingAnalysis.html
new file mode 100644
index 0000000..44e8c14
--- /dev/null
+++ b/pages/dataAnalysisOctober/energySavingAnalysis.html
@@ -0,0 +1,171 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 办公区用电同比昨日增加30%，建议关闭无人房间的空调，节约用电。
+
+
+
+
+
+
+ 办公区用水同比昨日增加30%，建议检查是否有阀门忘记关闭，节约用水。
+
+
+
+
+
+
+ 办公区用水同比昨日增加30%，建议检查是否有阀门忘记关闭，节约用水。
+
+
+
+
+
+
+
diff --git a/pages/dataAnalysisOctober/resourceRateAnalysis.html b/pages/dataAnalysisOctober/resourceRateAnalysis.html
index db2a6bf..4ed8f52 100644
--- a/pages/dataAnalysisOctober/resourceRateAnalysis.html
+++ b/pages/dataAnalysisOctober/resourceRateAnalysis.html
@@ -20,9 +20,6 @@
资源利用率分析
-