diff --git a/src/assets/images/carbon-result-bg-1.png b/src/assets/images/carbon-result-bg-1.png
index d1f724e..d414efe 100644
--- a/src/assets/images/carbon-result-bg-1.png
+++ b/src/assets/images/carbon-result-bg-1.png
Binary files differ

diff --git a/src/assets/images/carbon-result-bg-1.png b/src/assets/images/carbon-result-bg-1.png
index d1f724e..d414efe 100644
--- a/src/assets/images/carbon-result-bg-1.png
+++ b/src/assets/images/carbon-result-bg-1.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index ab9c1f9..d4f61cb 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -57,5 +57,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    TrendChart: typeof import('./components/map/trendChart.vue')['default']
   }
 }

diff --git a/src/assets/images/carbon-result-bg-1.png b/src/assets/images/carbon-result-bg-1.png
index d1f724e..d414efe 100644
--- a/src/assets/images/carbon-result-bg-1.png
+++ b/src/assets/images/carbon-result-bg-1.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index ab9c1f9..d4f61cb 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -57,5 +57,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    TrendChart: typeof import('./components/map/trendChart.vue')['default']
   }
 }
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 869036b..8ebf01a 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -30,7 +30,7 @@
     default: () => {
       return {
         top: 50,
-        left: 10,
+        left: 20,
         right: 20,
         bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
@@ -174,6 +174,13 @@
     type: Boolean,
     default: false,
   },
+  /**
+  * 工具
+  */
+  toolbox: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 // 图表对象
@@ -183,6 +190,7 @@
 // 监听数据变化
 watch(
   [() => props.xAxisData, props.data], ([newName, newNums], [oldName, oldNums]) => {
+    console.log(newName, newNums)
     refreshChart()
   },
   {
@@ -196,7 +204,7 @@
     grid: props.grid,
     legend: props.legend, // 图例
     toolbox: {
-      show: true,
+      show: props.toolbox,
       feature: {
         dataZoom: {
           yAxisIndex: 'none',

diff --git a/src/assets/images/carbon-result-bg-1.png b/src/assets/images/carbon-result-bg-1.png
index d1f724e..d414efe 100644
--- a/src/assets/images/carbon-result-bg-1.png
+++ b/src/assets/images/carbon-result-bg-1.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index ab9c1f9..d4f61cb 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -57,5 +57,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    TrendChart: typeof import('./components/map/trendChart.vue')['default']
   }
 }
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 869036b..8ebf01a 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -30,7 +30,7 @@
     default: () => {
       return {
         top: 50,
-        left: 10,
+        left: 20,
         right: 20,
         bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
@@ -174,6 +174,13 @@
     type: Boolean,
     default: false,
   },
+  /**
+  * 工具
+  */
+  toolbox: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 // 图表对象
@@ -183,6 +190,7 @@
 // 监听数据变化
 watch(
   [() => props.xAxisData, props.data], ([newName, newNums], [oldName, oldNums]) => {
+    console.log(newName, newNums)
     refreshChart()
   },
   {
@@ -196,7 +204,7 @@
     grid: props.grid,
     legend: props.legend, // 图例
     toolbox: {
-      show: true,
+      show: props.toolbox,
       feature: {
         dataZoom: {
           yAxisIndex: 'none',
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index fbcdc2f..62cbbd3 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -379,6 +379,7 @@
 // 切换用电检测/用热监测
 const changeFlagType = () => {
   map.value.clearMap()
+  map.value.setCenter([111.765785, 40.718114])
   if (flagType.value) {
     useHot()
   }

diff --git a/src/assets/images/carbon-result-bg-1.png b/src/assets/images/carbon-result-bg-1.png
index d1f724e..d414efe 100644
--- a/src/assets/images/carbon-result-bg-1.png
+++ b/src/assets/images/carbon-result-bg-1.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index ab9c1f9..d4f61cb 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -57,5 +57,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    TrendChart: typeof import('./components/map/trendChart.vue')['default']
   }
 }
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 869036b..8ebf01a 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -30,7 +30,7 @@
     default: () => {
       return {
         top: 50,
-        left: 10,
+        left: 20,
         right: 20,
         bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
@@ -174,6 +174,13 @@
     type: Boolean,
     default: false,
   },
+  /**
+  * 工具
+  */
+  toolbox: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 // 图表对象
@@ -183,6 +190,7 @@
 // 监听数据变化
 watch(
   [() => props.xAxisData, props.data], ([newName, newNums], [oldName, oldNums]) => {
+    console.log(newName, newNums)
     refreshChart()
   },
   {
@@ -196,7 +204,7 @@
     grid: props.grid,
     legend: props.legend, // 图例
     toolbox: {
-      show: true,
+      show: props.toolbox,
       feature: {
         dataZoom: {
           yAxisIndex: 'none',
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index fbcdc2f..62cbbd3 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -379,6 +379,7 @@
 // 切换用电检测/用热监测
 const changeFlagType = () => {
   map.value.clearMap()
+  map.value.setCenter([111.765785, 40.718114])
   if (flagType.value) {
     useHot()
   }
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index 430bd46..b1d8cc9 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -4,14 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -46,13 +49,14 @@
     // <div class="item">设备ID : {{ device.deviceId }}</div>
     // <div class="item">IP地址 : {{ device.deviceIp }}</div>
     // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+    <trend-chart ref="trendRef" :width="430" :height="280" :device-id="info?.deviceId" :device-type="info?.type" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
   width: 470px;
-  height: 180px;
+  height: 510px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;

diff --git a/src/assets/images/carbon-result-bg-1.png b/src/assets/images/carbon-result-bg-1.png
index d1f724e..d414efe 100644
--- a/src/assets/images/carbon-result-bg-1.png
+++ b/src/assets/images/carbon-result-bg-1.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index ab9c1f9..d4f61cb 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -57,5 +57,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    TrendChart: typeof import('./components/map/trendChart.vue')['default']
   }
 }
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 869036b..8ebf01a 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -30,7 +30,7 @@
     default: () => {
       return {
         top: 50,
-        left: 10,
+        left: 20,
         right: 20,
         bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
@@ -174,6 +174,13 @@
     type: Boolean,
     default: false,
   },
+  /**
+  * 工具
+  */
+  toolbox: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 // 图表对象
@@ -183,6 +190,7 @@
 // 监听数据变化
 watch(
   [() => props.xAxisData, props.data], ([newName, newNums], [oldName, oldNums]) => {
+    console.log(newName, newNums)
     refreshChart()
   },
   {
@@ -196,7 +204,7 @@
     grid: props.grid,
     legend: props.legend, // 图例
     toolbox: {
-      show: true,
+      show: props.toolbox,
       feature: {
         dataZoom: {
           yAxisIndex: 'none',
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index fbcdc2f..62cbbd3 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -379,6 +379,7 @@
 // 切换用电检测/用热监测
 const changeFlagType = () => {
   map.value.clearMap()
+  map.value.setCenter([111.765785, 40.718114])
   if (flagType.value) {
     useHot()
   }
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index 430bd46..b1d8cc9 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -4,14 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -46,13 +49,14 @@
     // <div class="item">设备ID : {{ device.deviceId }}</div>
     // <div class="item">IP地址 : {{ device.deviceIp }}</div>
     // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+    <trend-chart ref="trendRef" :width="430" :height="280" :device-id="info?.deviceId" :device-type="info?.type" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
   width: 470px;
-  height: 180px;
+  height: 510px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index 407e288..b5779c8 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -4,15 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  console.log(e, '123')
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -35,18 +37,19 @@
       光伏挂载节点 : {{ info?.nodeId }}
     </div>
     <div class="item">
-      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+      <span>发电机组有功 : {{ info?.pg }} MW</span>  <span>发电机组无功 : {{ info?.qg }} MW</span>
     </div>
     <div class="item">
-      碳排强度 : {{ info?.strength }}
+      碳排强度 : {{ info?.strength }} gCO2·/kWh
     </div>
+    <trend-chart ref="trendRef" :width="400" :height="200" :device-id="info?.deviceId" :device-type="1" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 430px;
+  height: 400px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;

diff --git a/src/assets/images/carbon-result-bg-1.png b/src/assets/images/carbon-result-bg-1.png
index d1f724e..d414efe 100644
--- a/src/assets/images/carbon-result-bg-1.png
+++ b/src/assets/images/carbon-result-bg-1.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index ab9c1f9..d4f61cb 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -57,5 +57,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    TrendChart: typeof import('./components/map/trendChart.vue')['default']
   }
 }
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 869036b..8ebf01a 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -30,7 +30,7 @@
     default: () => {
       return {
         top: 50,
-        left: 10,
+        left: 20,
         right: 20,
         bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
@@ -174,6 +174,13 @@
     type: Boolean,
     default: false,
   },
+  /**
+  * 工具
+  */
+  toolbox: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 // 图表对象
@@ -183,6 +190,7 @@
 // 监听数据变化
 watch(
   [() => props.xAxisData, props.data], ([newName, newNums], [oldName, oldNums]) => {
+    console.log(newName, newNums)
     refreshChart()
   },
   {
@@ -196,7 +204,7 @@
     grid: props.grid,
     legend: props.legend, // 图例
     toolbox: {
-      show: true,
+      show: props.toolbox,
       feature: {
         dataZoom: {
           yAxisIndex: 'none',
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index fbcdc2f..62cbbd3 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -379,6 +379,7 @@
 // 切换用电检测/用热监测
 const changeFlagType = () => {
   map.value.clearMap()
+  map.value.setCenter([111.765785, 40.718114])
   if (flagType.value) {
     useHot()
   }
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index 430bd46..b1d8cc9 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -4,14 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -46,13 +49,14 @@
     // <div class="item">设备ID : {{ device.deviceId }}</div>
     // <div class="item">IP地址 : {{ device.deviceIp }}</div>
     // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+    <trend-chart ref="trendRef" :width="430" :height="280" :device-id="info?.deviceId" :device-type="info?.type" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
   width: 470px;
-  height: 180px;
+  height: 510px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index 407e288..b5779c8 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -4,15 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  console.log(e, '123')
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -35,18 +37,19 @@
       光伏挂载节点 : {{ info?.nodeId }}
     </div>
     <div class="item">
-      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+      <span>发电机组有功 : {{ info?.pg }} MW</span>  <span>发电机组无功 : {{ info?.qg }} MW</span>
     </div>
     <div class="item">
-      碳排强度 : {{ info?.strength }}
+      碳排强度 : {{ info?.strength }} gCO2·/kWh
     </div>
+    <trend-chart ref="trendRef" :width="400" :height="200" :device-id="info?.deviceId" :device-type="1" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 430px;
+  height: 400px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/infoWindowHot.vue b/src/components/map/infoWindowHot.vue
index 30f915e..5566d54 100644
--- a/src/components/map/infoWindowHot.vue
+++ b/src/components/map/infoWindowHot.vue
@@ -4,15 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  console.log(e, '123')
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -38,15 +40,22 @@
       <span>所属分区 : {{ info?.ptnName }}</span>  <span>监测对象 : {{ info?.monitorObjName }}</span>
     </div>
     <div class="item">
+      <span>监测值 : {{ info?.monitorVal }}</span>  <span>监测单位 : {{ info?.monitorUnit }}</span>
+    </div>
+    <div class="item">
+      <span>碳势 : {{ info?.en }}</span>  <span>采集时间 : {{ info?.uploadTime }}</span>
+    </div>
+    <div class="item">
       <span>安装位置 : {{ info?.installLocaltion }}</span>  <span>安装时间 : {{ info?.installTime }}</span>
     </div>
+    <trend-chart ref="trendRef" :width="400" :height="200" :device-id="info?.id" :device-type="info?.deviceType" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 440px;
+  height: 445px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;

diff --git a/src/assets/images/carbon-result-bg-1.png b/src/assets/images/carbon-result-bg-1.png
index d1f724e..d414efe 100644
--- a/src/assets/images/carbon-result-bg-1.png
+++ b/src/assets/images/carbon-result-bg-1.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index ab9c1f9..d4f61cb 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -57,5 +57,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    TrendChart: typeof import('./components/map/trendChart.vue')['default']
   }
 }
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 869036b..8ebf01a 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -30,7 +30,7 @@
     default: () => {
       return {
         top: 50,
-        left: 10,
+        left: 20,
         right: 20,
         bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
@@ -174,6 +174,13 @@
     type: Boolean,
     default: false,
   },
+  /**
+  * 工具
+  */
+  toolbox: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 // 图表对象
@@ -183,6 +190,7 @@
 // 监听数据变化
 watch(
   [() => props.xAxisData, props.data], ([newName, newNums], [oldName, oldNums]) => {
+    console.log(newName, newNums)
     refreshChart()
   },
   {
@@ -196,7 +204,7 @@
     grid: props.grid,
     legend: props.legend, // 图例
     toolbox: {
-      show: true,
+      show: props.toolbox,
       feature: {
         dataZoom: {
           yAxisIndex: 'none',
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index fbcdc2f..62cbbd3 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -379,6 +379,7 @@
 // 切换用电检测/用热监测
 const changeFlagType = () => {
   map.value.clearMap()
+  map.value.setCenter([111.765785, 40.718114])
   if (flagType.value) {
     useHot()
   }
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index 430bd46..b1d8cc9 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -4,14 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -46,13 +49,14 @@
     // <div class="item">设备ID : {{ device.deviceId }}</div>
     // <div class="item">IP地址 : {{ device.deviceIp }}</div>
     // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+    <trend-chart ref="trendRef" :width="430" :height="280" :device-id="info?.deviceId" :device-type="info?.type" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
   width: 470px;
-  height: 180px;
+  height: 510px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index 407e288..b5779c8 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -4,15 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  console.log(e, '123')
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -35,18 +37,19 @@
       光伏挂载节点 : {{ info?.nodeId }}
     </div>
     <div class="item">
-      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+      <span>发电机组有功 : {{ info?.pg }} MW</span>  <span>发电机组无功 : {{ info?.qg }} MW</span>
     </div>
     <div class="item">
-      碳排强度 : {{ info?.strength }}
+      碳排强度 : {{ info?.strength }} gCO2·/kWh
     </div>
+    <trend-chart ref="trendRef" :width="400" :height="200" :device-id="info?.deviceId" :device-type="1" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 430px;
+  height: 400px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/infoWindowHot.vue b/src/components/map/infoWindowHot.vue
index 30f915e..5566d54 100644
--- a/src/components/map/infoWindowHot.vue
+++ b/src/components/map/infoWindowHot.vue
@@ -4,15 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  console.log(e, '123')
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -38,15 +40,22 @@
       <span>所属分区 : {{ info?.ptnName }}</span>  <span>监测对象 : {{ info?.monitorObjName }}</span>
     </div>
     <div class="item">
+      <span>监测值 : {{ info?.monitorVal }}</span>  <span>监测单位 : {{ info?.monitorUnit }}</span>
+    </div>
+    <div class="item">
+      <span>碳势 : {{ info?.en }}</span>  <span>采集时间 : {{ info?.uploadTime }}</span>
+    </div>
+    <div class="item">
       <span>安装位置 : {{ info?.installLocaltion }}</span>  <span>安装时间 : {{ info?.installTime }}</span>
     </div>
+    <trend-chart ref="trendRef" :width="400" :height="200" :device-id="info?.id" :device-type="info?.deviceType" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 440px;
+  height: 445px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/trendChart.vue b/src/components/map/trendChart.vue
new file mode 100644
index 0000000..fc65322
--- /dev/null
+++ b/src/components/map/trendChart.vue
@@ -0,0 +1,110 @@
+<!--
+  Description: 节点监测趋势echarts
+  Author: 李亚光
+  Date: 2023-06-05
+ -->
+<script lang="ts" setup name="TrendChart">
+import { getDeviceDetailAnalysis } from '@/api/api/index'
+const props = defineProps({
+  height: {
+    type: Number,
+    default: 400,
+  },
+  width: {
+    type: Number,
+    default: 400,
+  },
+  deviceId: {
+    type: Number || String,
+    require: true,
+  },
+  deviceType: {
+    type: Number || String,
+    require: true,
+  },
+})
+const loading = ref(true)
+const range = ref('')
+defineExpose({ range })
+const yAxisData = ref([])
+const xAxisData = ref([])
+// 获取设备监测分析
+const fetchDeviceAnalysis = () => {
+  loading.value = true
+  getDeviceDetailAnalysis({
+    deviceId: props?.deviceId,
+    type: range.value,
+  }).then((res) => {
+    const data = res.data
+    // 整理节点监测趋势数据-用电
+    if (data.monitorTrends?.rp.length && Number(props.deviceType) === 1) {
+      console.log('用电设备')
+      xAxisData.value = data.monitorTrends?.rp?.map((item: any) => item.time)
+      yAxisData.value = [
+        {
+          name: '有功功率',
+          data: data.monitorTrends?.rp?.map((item: any) => Number(item.value)),
+        },
+        {
+          name: '无功功率',
+          data: data.monitorTrends?.ap?.map((item: any) => Number(item.value)),
+        },
+      ]
+    }
+    // 整理节点监测趋势数据-用热/用气
+    if (data.monitorTrends?.val.length && Number(props.deviceType) !== 1) {
+      console.log('用热设备')
+      xAxisData.value = data.monitorTrends?.val?.map((item: any) => item.time)
+      yAxisData.value = [
+        {
+          name: '监测值',
+          data: data.monitorTrends?.val?.map((item: any) => Number(item.value)),
+        },
+      ]
+    }
+    loading.value = false
+    console.log(yAxisData.value, 'yAxisData.value')
+  }).catch(() => {
+    console.log('请求失败')
+    xAxisData.value = []
+    loading.value = false
+  })
+}
+// 监听 监测趋势时间段 变化 重新获取数据
+watch(() => range.value, (newVal) => {
+  fetchDeviceAnalysis()
+},
+{
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div style="padding: 10px;">
+    <div class="chart-title">
+      节点监测趋势
+    </div>
+    <el-radio-group v-model="range">
+      <el-radio label="day">
+        日
+      </el-radio>
+      <el-radio label="month">
+        月
+      </el-radio>
+      <el-radio label="year">
+        年
+      </el-radio>
+    </el-radio-group>
+    <line-chart
+      v-loading="loading" :height="`${props.height}px`" :width="`${props.width}px`" :data="yAxisData"
+      :x-axis-data="xAxisData"
+    />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.chart-title {
+  background-color: #ccc;
+}
+</style>

diff --git a/src/assets/images/carbon-result-bg-1.png b/src/assets/images/carbon-result-bg-1.png
index d1f724e..d414efe 100644
--- a/src/assets/images/carbon-result-bg-1.png
+++ b/src/assets/images/carbon-result-bg-1.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index ab9c1f9..d4f61cb 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -57,5 +57,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    TrendChart: typeof import('./components/map/trendChart.vue')['default']
   }
 }
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 869036b..8ebf01a 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -30,7 +30,7 @@
     default: () => {
       return {
         top: 50,
-        left: 10,
+        left: 20,
         right: 20,
         bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
@@ -174,6 +174,13 @@
     type: Boolean,
     default: false,
   },
+  /**
+  * 工具
+  */
+  toolbox: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 // 图表对象
@@ -183,6 +190,7 @@
 // 监听数据变化
 watch(
   [() => props.xAxisData, props.data], ([newName, newNums], [oldName, oldNums]) => {
+    console.log(newName, newNums)
     refreshChart()
   },
   {
@@ -196,7 +204,7 @@
     grid: props.grid,
     legend: props.legend, // 图例
     toolbox: {
-      show: true,
+      show: props.toolbox,
       feature: {
         dataZoom: {
           yAxisIndex: 'none',
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index fbcdc2f..62cbbd3 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -379,6 +379,7 @@
 // 切换用电检测/用热监测
 const changeFlagType = () => {
   map.value.clearMap()
+  map.value.setCenter([111.765785, 40.718114])
   if (flagType.value) {
     useHot()
   }
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index 430bd46..b1d8cc9 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -4,14 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -46,13 +49,14 @@
     // <div class="item">设备ID : {{ device.deviceId }}</div>
     // <div class="item">IP地址 : {{ device.deviceIp }}</div>
     // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+    <trend-chart ref="trendRef" :width="430" :height="280" :device-id="info?.deviceId" :device-type="info?.type" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
   width: 470px;
-  height: 180px;
+  height: 510px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index 407e288..b5779c8 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -4,15 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  console.log(e, '123')
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -35,18 +37,19 @@
       光伏挂载节点 : {{ info?.nodeId }}
     </div>
     <div class="item">
-      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+      <span>发电机组有功 : {{ info?.pg }} MW</span>  <span>发电机组无功 : {{ info?.qg }} MW</span>
     </div>
     <div class="item">
-      碳排强度 : {{ info?.strength }}
+      碳排强度 : {{ info?.strength }} gCO2·/kWh
     </div>
+    <trend-chart ref="trendRef" :width="400" :height="200" :device-id="info?.deviceId" :device-type="1" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 430px;
+  height: 400px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/infoWindowHot.vue b/src/components/map/infoWindowHot.vue
index 30f915e..5566d54 100644
--- a/src/components/map/infoWindowHot.vue
+++ b/src/components/map/infoWindowHot.vue
@@ -4,15 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  console.log(e, '123')
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -38,15 +40,22 @@
       <span>所属分区 : {{ info?.ptnName }}</span>  <span>监测对象 : {{ info?.monitorObjName }}</span>
     </div>
     <div class="item">
+      <span>监测值 : {{ info?.monitorVal }}</span>  <span>监测单位 : {{ info?.monitorUnit }}</span>
+    </div>
+    <div class="item">
+      <span>碳势 : {{ info?.en }}</span>  <span>采集时间 : {{ info?.uploadTime }}</span>
+    </div>
+    <div class="item">
       <span>安装位置 : {{ info?.installLocaltion }}</span>  <span>安装时间 : {{ info?.installTime }}</span>
     </div>
+    <trend-chart ref="trendRef" :width="400" :height="200" :device-id="info?.id" :device-type="info?.deviceType" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 440px;
+  height: 445px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/trendChart.vue b/src/components/map/trendChart.vue
new file mode 100644
index 0000000..fc65322
--- /dev/null
+++ b/src/components/map/trendChart.vue
@@ -0,0 +1,110 @@
+<!--
+  Description: 节点监测趋势echarts
+  Author: 李亚光
+  Date: 2023-06-05
+ -->
+<script lang="ts" setup name="TrendChart">
+import { getDeviceDetailAnalysis } from '@/api/api/index'
+const props = defineProps({
+  height: {
+    type: Number,
+    default: 400,
+  },
+  width: {
+    type: Number,
+    default: 400,
+  },
+  deviceId: {
+    type: Number || String,
+    require: true,
+  },
+  deviceType: {
+    type: Number || String,
+    require: true,
+  },
+})
+const loading = ref(true)
+const range = ref('')
+defineExpose({ range })
+const yAxisData = ref([])
+const xAxisData = ref([])
+// 获取设备监测分析
+const fetchDeviceAnalysis = () => {
+  loading.value = true
+  getDeviceDetailAnalysis({
+    deviceId: props?.deviceId,
+    type: range.value,
+  }).then((res) => {
+    const data = res.data
+    // 整理节点监测趋势数据-用电
+    if (data.monitorTrends?.rp.length && Number(props.deviceType) === 1) {
+      console.log('用电设备')
+      xAxisData.value = data.monitorTrends?.rp?.map((item: any) => item.time)
+      yAxisData.value = [
+        {
+          name: '有功功率',
+          data: data.monitorTrends?.rp?.map((item: any) => Number(item.value)),
+        },
+        {
+          name: '无功功率',
+          data: data.monitorTrends?.ap?.map((item: any) => Number(item.value)),
+        },
+      ]
+    }
+    // 整理节点监测趋势数据-用热/用气
+    if (data.monitorTrends?.val.length && Number(props.deviceType) !== 1) {
+      console.log('用热设备')
+      xAxisData.value = data.monitorTrends?.val?.map((item: any) => item.time)
+      yAxisData.value = [
+        {
+          name: '监测值',
+          data: data.monitorTrends?.val?.map((item: any) => Number(item.value)),
+        },
+      ]
+    }
+    loading.value = false
+    console.log(yAxisData.value, 'yAxisData.value')
+  }).catch(() => {
+    console.log('请求失败')
+    xAxisData.value = []
+    loading.value = false
+  })
+}
+// 监听 监测趋势时间段 变化 重新获取数据
+watch(() => range.value, (newVal) => {
+  fetchDeviceAnalysis()
+},
+{
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div style="padding: 10px;">
+    <div class="chart-title">
+      节点监测趋势
+    </div>
+    <el-radio-group v-model="range">
+      <el-radio label="day">
+        日
+      </el-radio>
+      <el-radio label="month">
+        月
+      </el-radio>
+      <el-radio label="year">
+        年
+      </el-radio>
+    </el-radio-group>
+    <line-chart
+      v-loading="loading" :height="`${props.height}px`" :width="`${props.width}px`" :data="yAxisData"
+      :x-axis-data="xAxisData"
+    />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.chart-title {
+  background-color: #ccc;
+}
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0bb95a0..9f395ae 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -24,7 +24,7 @@
 </script>
 
 <template>
-  <div :style="{ height: `${mainHeight}px` }">
+  <div :style="{ height: `${mainHeight}px`, overflow: 'hidden' }">
     <!-- 地图 -->
     <guadmap ref="mapRef" />
     <!-- 按钮 -->

diff --git a/src/assets/images/carbon-result-bg-1.png b/src/assets/images/carbon-result-bg-1.png
index d1f724e..d414efe 100644
--- a/src/assets/images/carbon-result-bg-1.png
+++ b/src/assets/images/carbon-result-bg-1.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index ab9c1f9..d4f61cb 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -57,5 +57,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    TrendChart: typeof import('./components/map/trendChart.vue')['default']
   }
 }
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 869036b..8ebf01a 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -30,7 +30,7 @@
     default: () => {
       return {
         top: 50,
-        left: 10,
+        left: 20,
         right: 20,
         bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
@@ -174,6 +174,13 @@
     type: Boolean,
     default: false,
   },
+  /**
+  * 工具
+  */
+  toolbox: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 // 图表对象
@@ -183,6 +190,7 @@
 // 监听数据变化
 watch(
   [() => props.xAxisData, props.data], ([newName, newNums], [oldName, oldNums]) => {
+    console.log(newName, newNums)
     refreshChart()
   },
   {
@@ -196,7 +204,7 @@
     grid: props.grid,
     legend: props.legend, // 图例
     toolbox: {
-      show: true,
+      show: props.toolbox,
       feature: {
         dataZoom: {
           yAxisIndex: 'none',
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index fbcdc2f..62cbbd3 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -379,6 +379,7 @@
 // 切换用电检测/用热监测
 const changeFlagType = () => {
   map.value.clearMap()
+  map.value.setCenter([111.765785, 40.718114])
   if (flagType.value) {
     useHot()
   }
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index 430bd46..b1d8cc9 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -4,14 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -46,13 +49,14 @@
     // <div class="item">设备ID : {{ device.deviceId }}</div>
     // <div class="item">IP地址 : {{ device.deviceIp }}</div>
     // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+    <trend-chart ref="trendRef" :width="430" :height="280" :device-id="info?.deviceId" :device-type="info?.type" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
   width: 470px;
-  height: 180px;
+  height: 510px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index 407e288..b5779c8 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -4,15 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  console.log(e, '123')
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -35,18 +37,19 @@
       光伏挂载节点 : {{ info?.nodeId }}
     </div>
     <div class="item">
-      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+      <span>发电机组有功 : {{ info?.pg }} MW</span>  <span>发电机组无功 : {{ info?.qg }} MW</span>
     </div>
     <div class="item">
-      碳排强度 : {{ info?.strength }}
+      碳排强度 : {{ info?.strength }} gCO2·/kWh
     </div>
+    <trend-chart ref="trendRef" :width="400" :height="200" :device-id="info?.deviceId" :device-type="1" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 430px;
+  height: 400px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/infoWindowHot.vue b/src/components/map/infoWindowHot.vue
index 30f915e..5566d54 100644
--- a/src/components/map/infoWindowHot.vue
+++ b/src/components/map/infoWindowHot.vue
@@ -4,15 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  console.log(e, '123')
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -38,15 +40,22 @@
       <span>所属分区 : {{ info?.ptnName }}</span>  <span>监测对象 : {{ info?.monitorObjName }}</span>
     </div>
     <div class="item">
+      <span>监测值 : {{ info?.monitorVal }}</span>  <span>监测单位 : {{ info?.monitorUnit }}</span>
+    </div>
+    <div class="item">
+      <span>碳势 : {{ info?.en }}</span>  <span>采集时间 : {{ info?.uploadTime }}</span>
+    </div>
+    <div class="item">
       <span>安装位置 : {{ info?.installLocaltion }}</span>  <span>安装时间 : {{ info?.installTime }}</span>
     </div>
+    <trend-chart ref="trendRef" :width="400" :height="200" :device-id="info?.id" :device-type="info?.deviceType" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 440px;
+  height: 445px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/trendChart.vue b/src/components/map/trendChart.vue
new file mode 100644
index 0000000..fc65322
--- /dev/null
+++ b/src/components/map/trendChart.vue
@@ -0,0 +1,110 @@
+<!--
+  Description: 节点监测趋势echarts
+  Author: 李亚光
+  Date: 2023-06-05
+ -->
+<script lang="ts" setup name="TrendChart">
+import { getDeviceDetailAnalysis } from '@/api/api/index'
+const props = defineProps({
+  height: {
+    type: Number,
+    default: 400,
+  },
+  width: {
+    type: Number,
+    default: 400,
+  },
+  deviceId: {
+    type: Number || String,
+    require: true,
+  },
+  deviceType: {
+    type: Number || String,
+    require: true,
+  },
+})
+const loading = ref(true)
+const range = ref('')
+defineExpose({ range })
+const yAxisData = ref([])
+const xAxisData = ref([])
+// 获取设备监测分析
+const fetchDeviceAnalysis = () => {
+  loading.value = true
+  getDeviceDetailAnalysis({
+    deviceId: props?.deviceId,
+    type: range.value,
+  }).then((res) => {
+    const data = res.data
+    // 整理节点监测趋势数据-用电
+    if (data.monitorTrends?.rp.length && Number(props.deviceType) === 1) {
+      console.log('用电设备')
+      xAxisData.value = data.monitorTrends?.rp?.map((item: any) => item.time)
+      yAxisData.value = [
+        {
+          name: '有功功率',
+          data: data.monitorTrends?.rp?.map((item: any) => Number(item.value)),
+        },
+        {
+          name: '无功功率',
+          data: data.monitorTrends?.ap?.map((item: any) => Number(item.value)),
+        },
+      ]
+    }
+    // 整理节点监测趋势数据-用热/用气
+    if (data.monitorTrends?.val.length && Number(props.deviceType) !== 1) {
+      console.log('用热设备')
+      xAxisData.value = data.monitorTrends?.val?.map((item: any) => item.time)
+      yAxisData.value = [
+        {
+          name: '监测值',
+          data: data.monitorTrends?.val?.map((item: any) => Number(item.value)),
+        },
+      ]
+    }
+    loading.value = false
+    console.log(yAxisData.value, 'yAxisData.value')
+  }).catch(() => {
+    console.log('请求失败')
+    xAxisData.value = []
+    loading.value = false
+  })
+}
+// 监听 监测趋势时间段 变化 重新获取数据
+watch(() => range.value, (newVal) => {
+  fetchDeviceAnalysis()
+},
+{
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div style="padding: 10px;">
+    <div class="chart-title">
+      节点监测趋势
+    </div>
+    <el-radio-group v-model="range">
+      <el-radio label="day">
+        日
+      </el-radio>
+      <el-radio label="month">
+        月
+      </el-radio>
+      <el-radio label="year">
+        年
+      </el-radio>
+    </el-radio-group>
+    <line-chart
+      v-loading="loading" :height="`${props.height}px`" :width="`${props.width}px`" :data="yAxisData"
+      :x-axis-data="xAxisData"
+    />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.chart-title {
+  background-color: #ccc;
+}
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0bb95a0..9f395ae 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -24,7 +24,7 @@
 </script>
 
 <template>
-  <div :style="{ height: `${mainHeight}px` }">
+  <div :style="{ height: `${mainHeight}px`, overflow: 'hidden' }">
     <!-- 地图 -->
     <guadmap ref="mapRef" />
     <!-- 按钮 -->
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index fbaeaa9..d623a5c 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -38,7 +38,7 @@
   // { text: '配电网区域', value: 'electricityArea', align: 'center' },
   // { text: '上传人', value: 'uploaderName', align: 'center' },
   // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '基准功率', value: 'basePower', align: 'center' },
+  { text: '基准功率(MVA)', value: 'basePower', align: 'center' },
   { text: '系统节点数', value: 'nodeNum', align: 'center' },
   { text: '发电机数', value: 'genNum', align: 'center' },
   { text: '系统负荷数', value: 'loadNum', align: 'center' },

diff --git a/src/assets/images/carbon-result-bg-1.png b/src/assets/images/carbon-result-bg-1.png
index d1f724e..d414efe 100644
--- a/src/assets/images/carbon-result-bg-1.png
+++ b/src/assets/images/carbon-result-bg-1.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index ab9c1f9..d4f61cb 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -57,5 +57,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    TrendChart: typeof import('./components/map/trendChart.vue')['default']
   }
 }
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 869036b..8ebf01a 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -30,7 +30,7 @@
     default: () => {
       return {
         top: 50,
-        left: 10,
+        left: 20,
         right: 20,
         bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
@@ -174,6 +174,13 @@
     type: Boolean,
     default: false,
   },
+  /**
+  * 工具
+  */
+  toolbox: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 // 图表对象
@@ -183,6 +190,7 @@
 // 监听数据变化
 watch(
   [() => props.xAxisData, props.data], ([newName, newNums], [oldName, oldNums]) => {
+    console.log(newName, newNums)
     refreshChart()
   },
   {
@@ -196,7 +204,7 @@
     grid: props.grid,
     legend: props.legend, // 图例
     toolbox: {
-      show: true,
+      show: props.toolbox,
       feature: {
         dataZoom: {
           yAxisIndex: 'none',
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index fbcdc2f..62cbbd3 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -379,6 +379,7 @@
 // 切换用电检测/用热监测
 const changeFlagType = () => {
   map.value.clearMap()
+  map.value.setCenter([111.765785, 40.718114])
   if (flagType.value) {
     useHot()
   }
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index 430bd46..b1d8cc9 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -4,14 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -46,13 +49,14 @@
     // <div class="item">设备ID : {{ device.deviceId }}</div>
     // <div class="item">IP地址 : {{ device.deviceIp }}</div>
     // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+    <trend-chart ref="trendRef" :width="430" :height="280" :device-id="info?.deviceId" :device-type="info?.type" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
   width: 470px;
-  height: 180px;
+  height: 510px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index 407e288..b5779c8 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -4,15 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  console.log(e, '123')
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -35,18 +37,19 @@
       光伏挂载节点 : {{ info?.nodeId }}
     </div>
     <div class="item">
-      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+      <span>发电机组有功 : {{ info?.pg }} MW</span>  <span>发电机组无功 : {{ info?.qg }} MW</span>
     </div>
     <div class="item">
-      碳排强度 : {{ info?.strength }}
+      碳排强度 : {{ info?.strength }} gCO2·/kWh
     </div>
+    <trend-chart ref="trendRef" :width="400" :height="200" :device-id="info?.deviceId" :device-type="1" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 430px;
+  height: 400px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/infoWindowHot.vue b/src/components/map/infoWindowHot.vue
index 30f915e..5566d54 100644
--- a/src/components/map/infoWindowHot.vue
+++ b/src/components/map/infoWindowHot.vue
@@ -4,15 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  console.log(e, '123')
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -38,15 +40,22 @@
       <span>所属分区 : {{ info?.ptnName }}</span>  <span>监测对象 : {{ info?.monitorObjName }}</span>
     </div>
     <div class="item">
+      <span>监测值 : {{ info?.monitorVal }}</span>  <span>监测单位 : {{ info?.monitorUnit }}</span>
+    </div>
+    <div class="item">
+      <span>碳势 : {{ info?.en }}</span>  <span>采集时间 : {{ info?.uploadTime }}</span>
+    </div>
+    <div class="item">
       <span>安装位置 : {{ info?.installLocaltion }}</span>  <span>安装时间 : {{ info?.installTime }}</span>
     </div>
+    <trend-chart ref="trendRef" :width="400" :height="200" :device-id="info?.id" :device-type="info?.deviceType" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 440px;
+  height: 445px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/trendChart.vue b/src/components/map/trendChart.vue
new file mode 100644
index 0000000..fc65322
--- /dev/null
+++ b/src/components/map/trendChart.vue
@@ -0,0 +1,110 @@
+<!--
+  Description: 节点监测趋势echarts
+  Author: 李亚光
+  Date: 2023-06-05
+ -->
+<script lang="ts" setup name="TrendChart">
+import { getDeviceDetailAnalysis } from '@/api/api/index'
+const props = defineProps({
+  height: {
+    type: Number,
+    default: 400,
+  },
+  width: {
+    type: Number,
+    default: 400,
+  },
+  deviceId: {
+    type: Number || String,
+    require: true,
+  },
+  deviceType: {
+    type: Number || String,
+    require: true,
+  },
+})
+const loading = ref(true)
+const range = ref('')
+defineExpose({ range })
+const yAxisData = ref([])
+const xAxisData = ref([])
+// 获取设备监测分析
+const fetchDeviceAnalysis = () => {
+  loading.value = true
+  getDeviceDetailAnalysis({
+    deviceId: props?.deviceId,
+    type: range.value,
+  }).then((res) => {
+    const data = res.data
+    // 整理节点监测趋势数据-用电
+    if (data.monitorTrends?.rp.length && Number(props.deviceType) === 1) {
+      console.log('用电设备')
+      xAxisData.value = data.monitorTrends?.rp?.map((item: any) => item.time)
+      yAxisData.value = [
+        {
+          name: '有功功率',
+          data: data.monitorTrends?.rp?.map((item: any) => Number(item.value)),
+        },
+        {
+          name: '无功功率',
+          data: data.monitorTrends?.ap?.map((item: any) => Number(item.value)),
+        },
+      ]
+    }
+    // 整理节点监测趋势数据-用热/用气
+    if (data.monitorTrends?.val.length && Number(props.deviceType) !== 1) {
+      console.log('用热设备')
+      xAxisData.value = data.monitorTrends?.val?.map((item: any) => item.time)
+      yAxisData.value = [
+        {
+          name: '监测值',
+          data: data.monitorTrends?.val?.map((item: any) => Number(item.value)),
+        },
+      ]
+    }
+    loading.value = false
+    console.log(yAxisData.value, 'yAxisData.value')
+  }).catch(() => {
+    console.log('请求失败')
+    xAxisData.value = []
+    loading.value = false
+  })
+}
+// 监听 监测趋势时间段 变化 重新获取数据
+watch(() => range.value, (newVal) => {
+  fetchDeviceAnalysis()
+},
+{
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div style="padding: 10px;">
+    <div class="chart-title">
+      节点监测趋势
+    </div>
+    <el-radio-group v-model="range">
+      <el-radio label="day">
+        日
+      </el-radio>
+      <el-radio label="month">
+        月
+      </el-radio>
+      <el-radio label="year">
+        年
+      </el-radio>
+    </el-radio-group>
+    <line-chart
+      v-loading="loading" :height="`${props.height}px`" :width="`${props.width}px`" :data="yAxisData"
+      :x-axis-data="xAxisData"
+    />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.chart-title {
+  background-color: #ccc;
+}
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0bb95a0..9f395ae 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -24,7 +24,7 @@
 </script>
 
 <template>
-  <div :style="{ height: `${mainHeight}px` }">
+  <div :style="{ height: `${mainHeight}px`, overflow: 'hidden' }">
     <!-- 地图 -->
     <guadmap ref="mapRef" />
     <!-- 按钮 -->
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index fbaeaa9..d623a5c 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -38,7 +38,7 @@
   // { text: '配电网区域', value: 'electricityArea', align: 'center' },
   // { text: '上传人', value: 'uploaderName', align: 'center' },
   // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '基准功率', value: 'basePower', align: 'center' },
+  { text: '基准功率(MVA)', value: 'basePower', align: 'center' },
   { text: '系统节点数', value: 'nodeNum', align: 'center' },
   { text: '发电机数', value: 'genNum', align: 'center' },
   { text: '系统负荷数', value: 'loadNum', align: 'center' },
diff --git a/src/views/data/electricity/page.vue b/src/views/data/electricity/page.vue
index 93492d1..e414999 100644
--- a/src/views/data/electricity/page.vue
+++ b/src/views/data/electricity/page.vue
@@ -30,16 +30,16 @@
 const columns = ref([
   { text: '机组名称', value: 'stationName', align: 'center' },
   { text: '发电机组对应节点数', value: 'nodeId', align: 'center' },
-  { text: '发电机有功/MW', value: 'pg', align: 'center' },
-  { text: '发电机无功', value: 'qg', align: 'center' },
-  { text: '最大无功', value: 'qmax', align: 'center' },
-  { text: '最小无功', value: 'qmin', align: 'center' },
+  { text: '发电机有功(MW)', value: 'pg', align: 'center' },
+  { text: '发电机无功(MW)', value: 'qg', align: 'center' },
+  { text: '最大无功(MVAr)', value: 'qmax', align: 'center' },
+  { text: '最小无功(MVAr)', value: 'qmin', align: 'center' },
   { text: '节点电压', value: 'vg', align: 'center' },
   { text: '发电机容量', value: 'mbase', align: 'center' },
   { text: '运行状态', value: 'sttusName', align: 'center' },
-  { text: '最大有功', value: 'pmax', align: 'center' },
-  { text: '最小有功', value: 'pmin', align: 'center' },
-  { text: '碳排强度', value: 'strength', align: 'center' },
+  { text: '最大有功(MW)', value: 'pmax', align: 'center' },
+  { text: '最小有功(MW)', value: 'pmin', align: 'center' },
+  { text: '碳排强度(gCO2·/kWh)', value: 'strength', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])

diff --git a/src/assets/images/carbon-result-bg-1.png b/src/assets/images/carbon-result-bg-1.png
index d1f724e..d414efe 100644
--- a/src/assets/images/carbon-result-bg-1.png
+++ b/src/assets/images/carbon-result-bg-1.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index ab9c1f9..d4f61cb 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -57,5 +57,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    TrendChart: typeof import('./components/map/trendChart.vue')['default']
   }
 }
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 869036b..8ebf01a 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -30,7 +30,7 @@
     default: () => {
       return {
         top: 50,
-        left: 10,
+        left: 20,
         right: 20,
         bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
@@ -174,6 +174,13 @@
     type: Boolean,
     default: false,
   },
+  /**
+  * 工具
+  */
+  toolbox: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 // 图表对象
@@ -183,6 +190,7 @@
 // 监听数据变化
 watch(
   [() => props.xAxisData, props.data], ([newName, newNums], [oldName, oldNums]) => {
+    console.log(newName, newNums)
     refreshChart()
   },
   {
@@ -196,7 +204,7 @@
     grid: props.grid,
     legend: props.legend, // 图例
     toolbox: {
-      show: true,
+      show: props.toolbox,
       feature: {
         dataZoom: {
           yAxisIndex: 'none',
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index fbcdc2f..62cbbd3 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -379,6 +379,7 @@
 // 切换用电检测/用热监测
 const changeFlagType = () => {
   map.value.clearMap()
+  map.value.setCenter([111.765785, 40.718114])
   if (flagType.value) {
     useHot()
   }
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index 430bd46..b1d8cc9 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -4,14 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -46,13 +49,14 @@
     // <div class="item">设备ID : {{ device.deviceId }}</div>
     // <div class="item">IP地址 : {{ device.deviceIp }}</div>
     // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+    <trend-chart ref="trendRef" :width="430" :height="280" :device-id="info?.deviceId" :device-type="info?.type" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
   width: 470px;
-  height: 180px;
+  height: 510px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index 407e288..b5779c8 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -4,15 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  console.log(e, '123')
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -35,18 +37,19 @@
       光伏挂载节点 : {{ info?.nodeId }}
     </div>
     <div class="item">
-      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+      <span>发电机组有功 : {{ info?.pg }} MW</span>  <span>发电机组无功 : {{ info?.qg }} MW</span>
     </div>
     <div class="item">
-      碳排强度 : {{ info?.strength }}
+      碳排强度 : {{ info?.strength }} gCO2·/kWh
     </div>
+    <trend-chart ref="trendRef" :width="400" :height="200" :device-id="info?.deviceId" :device-type="1" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 430px;
+  height: 400px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/infoWindowHot.vue b/src/components/map/infoWindowHot.vue
index 30f915e..5566d54 100644
--- a/src/components/map/infoWindowHot.vue
+++ b/src/components/map/infoWindowHot.vue
@@ -4,15 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  console.log(e, '123')
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -38,15 +40,22 @@
       <span>所属分区 : {{ info?.ptnName }}</span>  <span>监测对象 : {{ info?.monitorObjName }}</span>
     </div>
     <div class="item">
+      <span>监测值 : {{ info?.monitorVal }}</span>  <span>监测单位 : {{ info?.monitorUnit }}</span>
+    </div>
+    <div class="item">
+      <span>碳势 : {{ info?.en }}</span>  <span>采集时间 : {{ info?.uploadTime }}</span>
+    </div>
+    <div class="item">
       <span>安装位置 : {{ info?.installLocaltion }}</span>  <span>安装时间 : {{ info?.installTime }}</span>
     </div>
+    <trend-chart ref="trendRef" :width="400" :height="200" :device-id="info?.id" :device-type="info?.deviceType" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 440px;
+  height: 445px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/trendChart.vue b/src/components/map/trendChart.vue
new file mode 100644
index 0000000..fc65322
--- /dev/null
+++ b/src/components/map/trendChart.vue
@@ -0,0 +1,110 @@
+<!--
+  Description: 节点监测趋势echarts
+  Author: 李亚光
+  Date: 2023-06-05
+ -->
+<script lang="ts" setup name="TrendChart">
+import { getDeviceDetailAnalysis } from '@/api/api/index'
+const props = defineProps({
+  height: {
+    type: Number,
+    default: 400,
+  },
+  width: {
+    type: Number,
+    default: 400,
+  },
+  deviceId: {
+    type: Number || String,
+    require: true,
+  },
+  deviceType: {
+    type: Number || String,
+    require: true,
+  },
+})
+const loading = ref(true)
+const range = ref('')
+defineExpose({ range })
+const yAxisData = ref([])
+const xAxisData = ref([])
+// 获取设备监测分析
+const fetchDeviceAnalysis = () => {
+  loading.value = true
+  getDeviceDetailAnalysis({
+    deviceId: props?.deviceId,
+    type: range.value,
+  }).then((res) => {
+    const data = res.data
+    // 整理节点监测趋势数据-用电
+    if (data.monitorTrends?.rp.length && Number(props.deviceType) === 1) {
+      console.log('用电设备')
+      xAxisData.value = data.monitorTrends?.rp?.map((item: any) => item.time)
+      yAxisData.value = [
+        {
+          name: '有功功率',
+          data: data.monitorTrends?.rp?.map((item: any) => Number(item.value)),
+        },
+        {
+          name: '无功功率',
+          data: data.monitorTrends?.ap?.map((item: any) => Number(item.value)),
+        },
+      ]
+    }
+    // 整理节点监测趋势数据-用热/用气
+    if (data.monitorTrends?.val.length && Number(props.deviceType) !== 1) {
+      console.log('用热设备')
+      xAxisData.value = data.monitorTrends?.val?.map((item: any) => item.time)
+      yAxisData.value = [
+        {
+          name: '监测值',
+          data: data.monitorTrends?.val?.map((item: any) => Number(item.value)),
+        },
+      ]
+    }
+    loading.value = false
+    console.log(yAxisData.value, 'yAxisData.value')
+  }).catch(() => {
+    console.log('请求失败')
+    xAxisData.value = []
+    loading.value = false
+  })
+}
+// 监听 监测趋势时间段 变化 重新获取数据
+watch(() => range.value, (newVal) => {
+  fetchDeviceAnalysis()
+},
+{
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div style="padding: 10px;">
+    <div class="chart-title">
+      节点监测趋势
+    </div>
+    <el-radio-group v-model="range">
+      <el-radio label="day">
+        日
+      </el-radio>
+      <el-radio label="month">
+        月
+      </el-radio>
+      <el-radio label="year">
+        年
+      </el-radio>
+    </el-radio-group>
+    <line-chart
+      v-loading="loading" :height="`${props.height}px`" :width="`${props.width}px`" :data="yAxisData"
+      :x-axis-data="xAxisData"
+    />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.chart-title {
+  background-color: #ccc;
+}
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0bb95a0..9f395ae 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -24,7 +24,7 @@
 </script>
 
 <template>
-  <div :style="{ height: `${mainHeight}px` }">
+  <div :style="{ height: `${mainHeight}px`, overflow: 'hidden' }">
     <!-- 地图 -->
     <guadmap ref="mapRef" />
     <!-- 按钮 -->
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index fbaeaa9..d623a5c 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -38,7 +38,7 @@
   // { text: '配电网区域', value: 'electricityArea', align: 'center' },
   // { text: '上传人', value: 'uploaderName', align: 'center' },
   // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '基准功率', value: 'basePower', align: 'center' },
+  { text: '基准功率(MVA)', value: 'basePower', align: 'center' },
   { text: '系统节点数', value: 'nodeNum', align: 'center' },
   { text: '发电机数', value: 'genNum', align: 'center' },
   { text: '系统负荷数', value: 'loadNum', align: 'center' },
diff --git a/src/views/data/electricity/page.vue b/src/views/data/electricity/page.vue
index 93492d1..e414999 100644
--- a/src/views/data/electricity/page.vue
+++ b/src/views/data/electricity/page.vue
@@ -30,16 +30,16 @@
 const columns = ref([
   { text: '机组名称', value: 'stationName', align: 'center' },
   { text: '发电机组对应节点数', value: 'nodeId', align: 'center' },
-  { text: '发电机有功/MW', value: 'pg', align: 'center' },
-  { text: '发电机无功', value: 'qg', align: 'center' },
-  { text: '最大无功', value: 'qmax', align: 'center' },
-  { text: '最小无功', value: 'qmin', align: 'center' },
+  { text: '发电机有功(MW)', value: 'pg', align: 'center' },
+  { text: '发电机无功(MW)', value: 'qg', align: 'center' },
+  { text: '最大无功(MVAr)', value: 'qmax', align: 'center' },
+  { text: '最小无功(MVAr)', value: 'qmin', align: 'center' },
   { text: '节点电压', value: 'vg', align: 'center' },
   { text: '发电机容量', value: 'mbase', align: 'center' },
   { text: '运行状态', value: 'sttusName', align: 'center' },
-  { text: '最大有功', value: 'pmax', align: 'center' },
-  { text: '最小有功', value: 'pmin', align: 'center' },
-  { text: '碳排强度', value: 'strength', align: 'center' },
+  { text: '最大有功(MW)', value: 'pmax', align: 'center' },
+  { text: '最小有功(MW)', value: 'pmin', align: 'center' },
+  { text: '碳排强度(gCO2·/kWh)', value: 'strength', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
diff --git a/src/views/data/environment/page.vue b/src/views/data/environment/page.vue
index 08abe7d..0a337c9 100644
--- a/src/views/data/environment/page.vue
+++ b/src/views/data/environment/page.vue
@@ -21,9 +21,9 @@
 }, { deep: true })
 const loadingTable = ref(true)
 const columns = ref([
-  { text: '环境温度', value: 'temperature', align: 'center' },
-  { text: '相对湿度', value: 'humidity', align: 'center' },
-  { text: '风速', value: 'windSpeed', align: 'center' },
+  { text: '环境温度(°C)', value: 'temperature', align: 'center' },
+  { text: '相对湿度(%rh)', value: 'humidity', align: 'center' },
+  { text: '风速(km/h)', value: 'windSpeed', align: 'center' },
   { text: '风向', value: 'windDirection', align: 'center' },
   { text: '大气压力', value: 'atmos', align: 'center' },
   { text: '降雨量', value: 'rainfall', align: 'center' },

diff --git a/src/assets/images/carbon-result-bg-1.png b/src/assets/images/carbon-result-bg-1.png
index d1f724e..d414efe 100644
--- a/src/assets/images/carbon-result-bg-1.png
+++ b/src/assets/images/carbon-result-bg-1.png
Binary files differ
diff --git a/src/components.d.ts b/src/components.d.ts
index ab9c1f9..d4f61cb 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -57,5 +57,6 @@
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
     Trend: typeof import('./components/Trend/index.vue')['default']
+    TrendChart: typeof import('./components/map/trendChart.vue')['default']
   }
 }
diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index 869036b..8ebf01a 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -30,7 +30,7 @@
     default: () => {
       return {
         top: 50,
-        left: 10,
+        left: 20,
         right: 20,
         bottom: 10,
         containLabel: true, // 是否包含坐标轴的刻度标签
@@ -174,6 +174,13 @@
     type: Boolean,
     default: false,
   },
+  /**
+  * 工具
+  */
+  toolbox: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 // 图表对象
@@ -183,6 +190,7 @@
 // 监听数据变化
 watch(
   [() => props.xAxisData, props.data], ([newName, newNums], [oldName, oldNums]) => {
+    console.log(newName, newNums)
     refreshChart()
   },
   {
@@ -196,7 +204,7 @@
     grid: props.grid,
     legend: props.legend, // 图例
     toolbox: {
-      show: true,
+      show: props.toolbox,
       feature: {
         dataZoom: {
           yAxisIndex: 'none',
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index fbcdc2f..62cbbd3 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -379,6 +379,7 @@
 // 切换用电检测/用热监测
 const changeFlagType = () => {
   map.value.clearMap()
+  map.value.setCenter([111.765785, 40.718114])
   if (flagType.value) {
     useHot()
   }
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index 430bd46..b1d8cc9 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -4,14 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -46,13 +49,14 @@
     // <div class="item">设备ID : {{ device.deviceId }}</div>
     // <div class="item">IP地址 : {{ device.deviceIp }}</div>
     // <div class="item">地址 : {{ device.deviceAddress }}</div> -->
+    <trend-chart ref="trendRef" :width="430" :height="280" :device-id="info?.deviceId" :device-type="info?.type" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
   width: 470px;
-  height: 180px;
+  height: 510px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index 407e288..b5779c8 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -4,15 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  console.log(e, '123')
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -35,18 +37,19 @@
       光伏挂载节点 : {{ info?.nodeId }}
     </div>
     <div class="item">
-      <span>发电机组有功 : {{ info?.pg }}</span>  <span>发电机组无功 : {{ info?.qg }}</span>
+      <span>发电机组有功 : {{ info?.pg }} MW</span>  <span>发电机组无功 : {{ info?.qg }} MW</span>
     </div>
     <div class="item">
-      碳排强度 : {{ info?.strength }}
+      碳排强度 : {{ info?.strength }} gCO2·/kWh
     </div>
+    <trend-chart ref="trendRef" :width="400" :height="200" :device-id="info?.deviceId" :device-type="1" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 430px;
+  height: 400px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/infoWindowHot.vue b/src/components/map/infoWindowHot.vue
index 30f915e..5566d54 100644
--- a/src/components/map/infoWindowHot.vue
+++ b/src/components/map/infoWindowHot.vue
@@ -4,15 +4,17 @@
   Date: 2023-05-10
  -->
 <script lang="ts" setup name="infoWindow">
+import trendChart from './trendChart.vue'
 const overlay = ref()
 const infoWindow = ref()
 const info = ref()
+const trendRef = ref()
 // 初始化
 const initialize = (e) => {
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  console.log(e, '123')
+  trendRef.value.range = 'day'
 }
 defineExpose({ initialize })
 // 关闭
@@ -38,15 +40,22 @@
       <span>所属分区 : {{ info?.ptnName }}</span>  <span>监测对象 : {{ info?.monitorObjName }}</span>
     </div>
     <div class="item">
+      <span>监测值 : {{ info?.monitorVal }}</span>  <span>监测单位 : {{ info?.monitorUnit }}</span>
+    </div>
+    <div class="item">
+      <span>碳势 : {{ info?.en }}</span>  <span>采集时间 : {{ info?.uploadTime }}</span>
+    </div>
+    <div class="item">
       <span>安装位置 : {{ info?.installLocaltion }}</span>  <span>安装时间 : {{ info?.installTime }}</span>
     </div>
+    <trend-chart ref="trendRef" :width="400" :height="200" :device-id="info?.id" :device-type="info?.deviceType" />
   </div>
 </template>
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 440px;
+  height: 445px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/components/map/trendChart.vue b/src/components/map/trendChart.vue
new file mode 100644
index 0000000..fc65322
--- /dev/null
+++ b/src/components/map/trendChart.vue
@@ -0,0 +1,110 @@
+<!--
+  Description: 节点监测趋势echarts
+  Author: 李亚光
+  Date: 2023-06-05
+ -->
+<script lang="ts" setup name="TrendChart">
+import { getDeviceDetailAnalysis } from '@/api/api/index'
+const props = defineProps({
+  height: {
+    type: Number,
+    default: 400,
+  },
+  width: {
+    type: Number,
+    default: 400,
+  },
+  deviceId: {
+    type: Number || String,
+    require: true,
+  },
+  deviceType: {
+    type: Number || String,
+    require: true,
+  },
+})
+const loading = ref(true)
+const range = ref('')
+defineExpose({ range })
+const yAxisData = ref([])
+const xAxisData = ref([])
+// 获取设备监测分析
+const fetchDeviceAnalysis = () => {
+  loading.value = true
+  getDeviceDetailAnalysis({
+    deviceId: props?.deviceId,
+    type: range.value,
+  }).then((res) => {
+    const data = res.data
+    // 整理节点监测趋势数据-用电
+    if (data.monitorTrends?.rp.length && Number(props.deviceType) === 1) {
+      console.log('用电设备')
+      xAxisData.value = data.monitorTrends?.rp?.map((item: any) => item.time)
+      yAxisData.value = [
+        {
+          name: '有功功率',
+          data: data.monitorTrends?.rp?.map((item: any) => Number(item.value)),
+        },
+        {
+          name: '无功功率',
+          data: data.monitorTrends?.ap?.map((item: any) => Number(item.value)),
+        },
+      ]
+    }
+    // 整理节点监测趋势数据-用热/用气
+    if (data.monitorTrends?.val.length && Number(props.deviceType) !== 1) {
+      console.log('用热设备')
+      xAxisData.value = data.monitorTrends?.val?.map((item: any) => item.time)
+      yAxisData.value = [
+        {
+          name: '监测值',
+          data: data.monitorTrends?.val?.map((item: any) => Number(item.value)),
+        },
+      ]
+    }
+    loading.value = false
+    console.log(yAxisData.value, 'yAxisData.value')
+  }).catch(() => {
+    console.log('请求失败')
+    xAxisData.value = []
+    loading.value = false
+  })
+}
+// 监听 监测趋势时间段 变化 重新获取数据
+watch(() => range.value, (newVal) => {
+  fetchDeviceAnalysis()
+},
+{
+  deep: true,
+  // immediate: true,
+})
+</script>
+
+<template>
+  <div style="padding: 10px;">
+    <div class="chart-title">
+      节点监测趋势
+    </div>
+    <el-radio-group v-model="range">
+      <el-radio label="day">
+        日
+      </el-radio>
+      <el-radio label="month">
+        月
+      </el-radio>
+      <el-radio label="year">
+        年
+      </el-radio>
+    </el-radio-group>
+    <line-chart
+      v-loading="loading" :height="`${props.height}px`" :width="`${props.width}px`" :data="yAxisData"
+      :x-axis-data="xAxisData"
+    />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.chart-title {
+  background-color: #ccc;
+}
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0bb95a0..9f395ae 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -24,7 +24,7 @@
 </script>
 
 <template>
-  <div :style="{ height: `${mainHeight}px` }">
+  <div :style="{ height: `${mainHeight}px`, overflow: 'hidden' }">
     <!-- 地图 -->
     <guadmap ref="mapRef" />
     <!-- 按钮 -->
diff --git a/src/views/data/electricity/network.vue b/src/views/data/electricity/network.vue
index fbaeaa9..d623a5c 100644
--- a/src/views/data/electricity/network.vue
+++ b/src/views/data/electricity/network.vue
@@ -38,7 +38,7 @@
   // { text: '配电网区域', value: 'electricityArea', align: 'center' },
   // { text: '上传人', value: 'uploaderName', align: 'center' },
   // { text: '上传时间', value: 'uploadTime', align: 'center' },
-  { text: '基准功率', value: 'basePower', align: 'center' },
+  { text: '基准功率(MVA)', value: 'basePower', align: 'center' },
   { text: '系统节点数', value: 'nodeNum', align: 'center' },
   { text: '发电机数', value: 'genNum', align: 'center' },
   { text: '系统负荷数', value: 'loadNum', align: 'center' },
diff --git a/src/views/data/electricity/page.vue b/src/views/data/electricity/page.vue
index 93492d1..e414999 100644
--- a/src/views/data/electricity/page.vue
+++ b/src/views/data/electricity/page.vue
@@ -30,16 +30,16 @@
 const columns = ref([
   { text: '机组名称', value: 'stationName', align: 'center' },
   { text: '发电机组对应节点数', value: 'nodeId', align: 'center' },
-  { text: '发电机有功/MW', value: 'pg', align: 'center' },
-  { text: '发电机无功', value: 'qg', align: 'center' },
-  { text: '最大无功', value: 'qmax', align: 'center' },
-  { text: '最小无功', value: 'qmin', align: 'center' },
+  { text: '发电机有功(MW)', value: 'pg', align: 'center' },
+  { text: '发电机无功(MW)', value: 'qg', align: 'center' },
+  { text: '最大无功(MVAr)', value: 'qmax', align: 'center' },
+  { text: '最小无功(MVAr)', value: 'qmin', align: 'center' },
   { text: '节点电压', value: 'vg', align: 'center' },
   { text: '发电机容量', value: 'mbase', align: 'center' },
   { text: '运行状态', value: 'sttusName', align: 'center' },
-  { text: '最大有功', value: 'pmax', align: 'center' },
-  { text: '最小有功', value: 'pmin', align: 'center' },
-  { text: '碳排强度', value: 'strength', align: 'center' },
+  { text: '最大有功(MW)', value: 'pmax', align: 'center' },
+  { text: '最小有功(MW)', value: 'pmin', align: 'center' },
+  { text: '碳排强度(gCO2·/kWh)', value: 'strength', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])
diff --git a/src/views/data/environment/page.vue b/src/views/data/environment/page.vue
index 08abe7d..0a337c9 100644
--- a/src/views/data/environment/page.vue
+++ b/src/views/data/environment/page.vue
@@ -21,9 +21,9 @@
 }, { deep: true })
 const loadingTable = ref(true)
 const columns = ref([
-  { text: '环境温度', value: 'temperature', align: 'center' },
-  { text: '相对湿度', value: 'humidity', align: 'center' },
-  { text: '风速', value: 'windSpeed', align: 'center' },
+  { text: '环境温度(°C)', value: 'temperature', align: 'center' },
+  { text: '相对湿度(%rh)', value: 'humidity', align: 'center' },
+  { text: '风速(km/h)', value: 'windSpeed', align: 'center' },
   { text: '风向', value: 'windDirection', align: 'center' },
   { text: '大气压力', value: 'atmos', align: 'center' },
   { text: '降雨量', value: 'rainfall', align: 'center' },
diff --git a/src/views/data/useHeat/page.vue b/src/views/data/useHeat/page.vue
index b26d0f2..2ad63d0 100644
--- a/src/views/data/useHeat/page.vue
+++ b/src/views/data/useHeat/page.vue
@@ -46,8 +46,8 @@
   { text: '设备类型', value: 'deviceTypeName', align: 'center' },
   { text: '设备编号', value: 'deviceNo', align: 'center' },
   { text: '安装位置', value: 'installLocaltion', align: 'center' },
-  { text: props.type === '0' ? '负荷有功功率' : '数值', value: props.type === '0' ? 'pd' : 'monitorVal', align: 'center' },
-  { text: props.type === '0' ? '负荷无功功率' : '单位', value: props.type === '0' ? 'qd' : 'monitorUnit', align: 'center' },
+  { text: props.type === '0' ? '负荷有功功率(MW)' : '数值', value: props.type === '0' ? 'pd' : 'monitorVal', align: 'center' },
+  { text: props.type === '0' ? '负荷无功功率(MW)' : '单位', value: props.type === '0' ? 'qd' : 'monitorUnit', align: 'center' },
   { text: '上传时间', value: 'createTime', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)