diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index b1d8cc9..a779dfb 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -21,10 +21,13 @@
 const close = () => {
   infoWindow.value.close()
 }
+const expand = computed(() => {
+  return trendRef.value?.expand
+})
 </script>
 
 <template>
-  <div class="container">
+  <div class="container" :style="`height: ${expand ? '200px' : '510px'}`">
     <div class="title">
       <div class="text">
         {{ info?.nodeName }}

diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index b1d8cc9..a779dfb 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -21,10 +21,13 @@
 const close = () => {
   infoWindow.value.close()
 }
+const expand = computed(() => {
+  return trendRef.value?.expand
+})
 </script>
 
 <template>
-  <div class="container">
+  <div class="container" :style="`height: ${expand ? '200px' : '510px'}`">
     <div class="title">
       <div class="text">
         {{ info?.nodeName }}
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index b5779c8..e15c477 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -21,10 +21,13 @@
 const close = () => {
   infoWindow.value.close()
 }
+const expand = computed(() => {
+  return trendRef.value?.expand
+})
 </script>
 
 <template>
-  <div class="container">
+  <div class="container" :style="`height: ${expand ? '180px' : '400px'}`">
     <div class="title">
       <div class="text">
         {{ info?.stationName }}

diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index b1d8cc9..a779dfb 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -21,10 +21,13 @@
 const close = () => {
   infoWindow.value.close()
 }
+const expand = computed(() => {
+  return trendRef.value?.expand
+})
 </script>
 
 <template>
-  <div class="container">
+  <div class="container" :style="`height: ${expand ? '200px' : '510px'}`">
     <div class="title">
       <div class="text">
         {{ info?.nodeName }}
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index b5779c8..e15c477 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -21,10 +21,13 @@
 const close = () => {
   infoWindow.value.close()
 }
+const expand = computed(() => {
+  return trendRef.value?.expand
+})
 </script>
 
 <template>
-  <div class="container">
+  <div class="container" :style="`height: ${expand ? '180px' : '400px'}`">
     <div class="title">
       <div class="text">
         {{ info?.stationName }}
diff --git a/src/components/map/infoWindowHot.vue b/src/components/map/infoWindowHot.vue
index 5566d54..82e0970 100644
--- a/src/components/map/infoWindowHot.vue
+++ b/src/components/map/infoWindowHot.vue
@@ -14,17 +14,23 @@
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  trendRef.value.range = 'day'
+  trendRef.value.range = ''
+  setTimeout(() => {
+    trendRef.value.range = 'day'
+  })
 }
 defineExpose({ initialize })
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+const expand = computed(() => {
+  return trendRef.value?.expand
+})
 </script>
 
 <template>
-  <div class="container">
+  <div class="container" :style="`height: ${expand ? '230px' : '445px'}`">
     <div class="title">
       <div class="text">
         {{ info?.deviceName }}
@@ -43,7 +49,7 @@
       <span>监测值 : {{ info?.monitorVal }}</span>  <span>监测单位 : {{ info?.monitorUnit }}</span>
     </div>
     <div class="item">
-      <span>碳势 : {{ info?.en }}</span>  <span>采集时间 : {{ info?.uploadTime }}</span>
+      <span>碳势 : {{ info?.en }} gCO2/KJ</span>  <span>采集时间 : {{ info?.uploadTime }}</span>
     </div>
     <div class="item">
       <span>安装位置 : {{ info?.installLocaltion }}</span>  <span>安装时间 : {{ info?.installTime }}</span>

diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index b1d8cc9..a779dfb 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -21,10 +21,13 @@
 const close = () => {
   infoWindow.value.close()
 }
+const expand = computed(() => {
+  return trendRef.value?.expand
+})
 </script>
 
 <template>
-  <div class="container">
+  <div class="container" :style="`height: ${expand ? '200px' : '510px'}`">
     <div class="title">
       <div class="text">
         {{ info?.nodeName }}
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index b5779c8..e15c477 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -21,10 +21,13 @@
 const close = () => {
   infoWindow.value.close()
 }
+const expand = computed(() => {
+  return trendRef.value?.expand
+})
 </script>
 
 <template>
-  <div class="container">
+  <div class="container" :style="`height: ${expand ? '180px' : '400px'}`">
     <div class="title">
       <div class="text">
         {{ info?.stationName }}
diff --git a/src/components/map/infoWindowHot.vue b/src/components/map/infoWindowHot.vue
index 5566d54..82e0970 100644
--- a/src/components/map/infoWindowHot.vue
+++ b/src/components/map/infoWindowHot.vue
@@ -14,17 +14,23 @@
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  trendRef.value.range = 'day'
+  trendRef.value.range = ''
+  setTimeout(() => {
+    trendRef.value.range = 'day'
+  })
 }
 defineExpose({ initialize })
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+const expand = computed(() => {
+  return trendRef.value?.expand
+})
 </script>
 
 <template>
-  <div class="container">
+  <div class="container" :style="`height: ${expand ? '230px' : '445px'}`">
     <div class="title">
       <div class="text">
         {{ info?.deviceName }}
@@ -43,7 +49,7 @@
       <span>监测值 : {{ info?.monitorVal }}</span>  <span>监测单位 : {{ info?.monitorUnit }}</span>
     </div>
     <div class="item">
-      <span>碳势 : {{ info?.en }}</span>  <span>采集时间 : {{ info?.uploadTime }}</span>
+      <span>碳势 : {{ info?.en }} gCO2/KJ</span>  <span>采集时间 : {{ info?.uploadTime }}</span>
     </div>
     <div class="item">
       <span>安装位置 : {{ info?.installLocaltion }}</span>  <span>安装时间 : {{ info?.installTime }}</span>
diff --git a/src/components/map/trendChart.vue b/src/components/map/trendChart.vue
index fc65322..332b462 100644
--- a/src/components/map/trendChart.vue
+++ b/src/components/map/trendChart.vue
@@ -25,12 +25,14 @@
 })
 const loading = ref(true)
 const range = ref('')
-defineExpose({ range })
+// defineExpose({ range })
 const yAxisData = ref([])
 const xAxisData = ref([])
 // 获取设备监测分析
 const fetchDeviceAnalysis = () => {
   loading.value = true
+  xAxisData.value = []
+  yAxisData.value = []
   getDeviceDetailAnalysis({
     deviceId: props?.deviceId,
     type: range.value,
@@ -42,11 +44,11 @@
       xAxisData.value = data.monitorTrends?.rp?.map((item: any) => item.time)
       yAxisData.value = [
         {
-          name: '有功功率',
+          name: '有功功率(MW)',
           data: data.monitorTrends?.rp?.map((item: any) => Number(item.value)),
         },
         {
-          name: '无功功率',
+          name: '无功功率(MVAr)',
           data: data.monitorTrends?.ap?.map((item: any) => Number(item.value)),
         },
       ]
@@ -72,39 +74,70 @@
 }
 // 监听 监测趋势时间段 变化 重新获取数据
 watch(() => range.value, (newVal) => {
-  fetchDeviceAnalysis()
+  if (newVal) {
+    fetchDeviceAnalysis()
+  }
 },
 {
   deep: true,
   // immediate: true,
 })
+const expand = ref(true)
+const expandChart = () => {
+  expand.value = !expand.value
+  if (!expand.value) {
+    range.value = 'year'
+    setTimeout(() => {
+      range.value = 'day'
+    })
+  }
+}
+defineExpose({ range, expand })
 </script>
 
 <template>
   <div style="padding: 10px;">
-    <div class="chart-title">
+    <div class="chart-title" @click="expandChart">
       节点监测趋势
+      <div class="btn">
+        <el-icon v-if="expand">
+          <arrow-right-bold />
+        </el-icon>
+        <el-icon v-else>
+          <arrow-down-bold />
+        </el-icon>
+      </div>
     </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 v-if="!expand">
+      <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>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .chart-title {
   background-color: #ccc;
+  position: relative;
+
+  .btn {
+    position: absolute;
+    right: 5px;
+    top: 50%;
+    transform: translateY(-50%);
+  }
 }
 </style>

diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index b1d8cc9..a779dfb 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -21,10 +21,13 @@
 const close = () => {
   infoWindow.value.close()
 }
+const expand = computed(() => {
+  return trendRef.value?.expand
+})
 </script>
 
 <template>
-  <div class="container">
+  <div class="container" :style="`height: ${expand ? '200px' : '510px'}`">
     <div class="title">
       <div class="text">
         {{ info?.nodeName }}
diff --git a/src/components/map/infoWindow2.vue b/src/components/map/infoWindow2.vue
index b5779c8..e15c477 100644
--- a/src/components/map/infoWindow2.vue
+++ b/src/components/map/infoWindow2.vue
@@ -21,10 +21,13 @@
 const close = () => {
   infoWindow.value.close()
 }
+const expand = computed(() => {
+  return trendRef.value?.expand
+})
 </script>
 
 <template>
-  <div class="container">
+  <div class="container" :style="`height: ${expand ? '180px' : '400px'}`">
     <div class="title">
       <div class="text">
         {{ info?.stationName }}
diff --git a/src/components/map/infoWindowHot.vue b/src/components/map/infoWindowHot.vue
index 5566d54..82e0970 100644
--- a/src/components/map/infoWindowHot.vue
+++ b/src/components/map/infoWindowHot.vue
@@ -14,17 +14,23 @@
   overlay.value = e.overlay
   infoWindow.value = e.infoWindow
   info.value = e.info
-  trendRef.value.range = 'day'
+  trendRef.value.range = ''
+  setTimeout(() => {
+    trendRef.value.range = 'day'
+  })
 }
 defineExpose({ initialize })
 // 关闭
 const close = () => {
   infoWindow.value.close()
 }
+const expand = computed(() => {
+  return trendRef.value?.expand
+})
 </script>
 
 <template>
-  <div class="container">
+  <div class="container" :style="`height: ${expand ? '230px' : '445px'}`">
     <div class="title">
       <div class="text">
         {{ info?.deviceName }}
@@ -43,7 +49,7 @@
       <span>监测值 : {{ info?.monitorVal }}</span>  <span>监测单位 : {{ info?.monitorUnit }}</span>
     </div>
     <div class="item">
-      <span>碳势 : {{ info?.en }}</span>  <span>采集时间 : {{ info?.uploadTime }}</span>
+      <span>碳势 : {{ info?.en }} gCO2/KJ</span>  <span>采集时间 : {{ info?.uploadTime }}</span>
     </div>
     <div class="item">
       <span>安装位置 : {{ info?.installLocaltion }}</span>  <span>安装时间 : {{ info?.installTime }}</span>
diff --git a/src/components/map/trendChart.vue b/src/components/map/trendChart.vue
index fc65322..332b462 100644
--- a/src/components/map/trendChart.vue
+++ b/src/components/map/trendChart.vue
@@ -25,12 +25,14 @@
 })
 const loading = ref(true)
 const range = ref('')
-defineExpose({ range })
+// defineExpose({ range })
 const yAxisData = ref([])
 const xAxisData = ref([])
 // 获取设备监测分析
 const fetchDeviceAnalysis = () => {
   loading.value = true
+  xAxisData.value = []
+  yAxisData.value = []
   getDeviceDetailAnalysis({
     deviceId: props?.deviceId,
     type: range.value,
@@ -42,11 +44,11 @@
       xAxisData.value = data.monitorTrends?.rp?.map((item: any) => item.time)
       yAxisData.value = [
         {
-          name: '有功功率',
+          name: '有功功率(MW)',
           data: data.monitorTrends?.rp?.map((item: any) => Number(item.value)),
         },
         {
-          name: '无功功率',
+          name: '无功功率(MVAr)',
           data: data.monitorTrends?.ap?.map((item: any) => Number(item.value)),
         },
       ]
@@ -72,39 +74,70 @@
 }
 // 监听 监测趋势时间段 变化 重新获取数据
 watch(() => range.value, (newVal) => {
-  fetchDeviceAnalysis()
+  if (newVal) {
+    fetchDeviceAnalysis()
+  }
 },
 {
   deep: true,
   // immediate: true,
 })
+const expand = ref(true)
+const expandChart = () => {
+  expand.value = !expand.value
+  if (!expand.value) {
+    range.value = 'year'
+    setTimeout(() => {
+      range.value = 'day'
+    })
+  }
+}
+defineExpose({ range, expand })
 </script>
 
 <template>
   <div style="padding: 10px;">
-    <div class="chart-title">
+    <div class="chart-title" @click="expandChart">
       节点监测趋势
+      <div class="btn">
+        <el-icon v-if="expand">
+          <arrow-right-bold />
+        </el-icon>
+        <el-icon v-else>
+          <arrow-down-bold />
+        </el-icon>
+      </div>
     </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 v-if="!expand">
+      <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>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .chart-title {
   background-color: #ccc;
+  position: relative;
+
+  .btn {
+    position: absolute;
+    right: 5px;
+    top: 50%;
+    transform: translateY(-50%);
+  }
 }
 </style>
diff --git a/src/views/data/device/detail.vue b/src/views/data/device/detail.vue
index 6fd05d1..dcfbff9 100644
--- a/src/views/data/device/detail.vue
+++ b/src/views/data/device/detail.vue
@@ -48,11 +48,11 @@
       xAxisData1.value = data.monitorTrends?.rp?.map((item: any) => item.time)
       data1.value = [
         {
-          name: '有功功率',
+          name: '有功功率(MW)',
           data: data.monitorTrends?.rp?.map((item: any) => item.value),
         },
         {
-          name: '无功功率',
+          name: '无功功率(MVAr)',
           data: data.monitorTrends?.ap?.map((item: any) => item.value),
         },
       ]
@@ -73,7 +73,7 @@
       xAxisData2.value = emissionsTrends.map((item: any) => item.time)
       data2.value = [
         {
-          name: '碳排趋势',
+          name: '碳排趋势(gCO2/kWh)',
           data: emissionsTrends.map((item: any) => item.value),
         },
       ]