diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index fefb873..869036b 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -225,7 +225,7 @@
     xAxis: [
       {
         type: props.xAxisType,
-        boundaryGap: false,
+        boundaryGap: true,
         axisLine: {
           lineStyle: {
             color: props.axisLineColor, // 轴线的颜色
@@ -235,6 +235,11 @@
           color: props.fontColor, // X轴名称颜色
           fontSize: 14,
         },
+
+        axisTick: {
+          show: true,
+          alignWithLabel: true,
+        },
         // splitLine: {
         //   show: false,
         //   lineStyle: {

diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index fefb873..869036b 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -225,7 +225,7 @@
     xAxis: [
       {
         type: props.xAxisType,
-        boundaryGap: false,
+        boundaryGap: true,
         axisLine: {
           lineStyle: {
             color: props.axisLineColor, // 轴线的颜色
@@ -235,6 +235,11 @@
           color: props.fontColor, // X轴名称颜色
           fontSize: 14,
         },
+
+        axisTick: {
+          show: true,
+          alignWithLabel: true,
+        },
         // splitLine: {
         //   show: false,
         //   lineStyle: {
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index 1df9061..f40a204 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -34,10 +34,13 @@
       节点编号 : {{ info?.busId }}
     </div>
     <div class="item">
-      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+      <span>负荷有功功率 : {{ info?.pd }} MW</span>  <span>负荷无功功率 : {{ info?.qd }} MW</span>
     </div>
     <div class="item">
-      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+      <span>节点碳势 : {{ info?.en }} gCO2/kWh</span>  <span>节点负荷碳流率 : {{ info?.flowRate }} kgCO2/h</span>
+    </div>
+    <div class="item">
+      <span>采集时间 : {{ info?.colTime }}</span>
     </div>
     <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
     // <div class="item">设备ID : {{ device.deviceId }}</div>
@@ -48,8 +51,8 @@
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 440px;
+  height: 180px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;

diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index fefb873..869036b 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -225,7 +225,7 @@
     xAxis: [
       {
         type: props.xAxisType,
-        boundaryGap: false,
+        boundaryGap: true,
         axisLine: {
           lineStyle: {
             color: props.axisLineColor, // 轴线的颜色
@@ -235,6 +235,11 @@
           color: props.fontColor, // X轴名称颜色
           fontSize: 14,
         },
+
+        axisTick: {
+          show: true,
+          alignWithLabel: true,
+        },
         // splitLine: {
         //   show: false,
         //   lineStyle: {
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index 1df9061..f40a204 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -34,10 +34,13 @@
       节点编号 : {{ info?.busId }}
     </div>
     <div class="item">
-      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+      <span>负荷有功功率 : {{ info?.pd }} MW</span>  <span>负荷无功功率 : {{ info?.qd }} MW</span>
     </div>
     <div class="item">
-      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+      <span>节点碳势 : {{ info?.en }} gCO2/kWh</span>  <span>节点负荷碳流率 : {{ info?.flowRate }} kgCO2/h</span>
+    </div>
+    <div class="item">
+      <span>采集时间 : {{ info?.colTime }}</span>
     </div>
     <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
     // <div class="item">设备ID : {{ device.deviceId }}</div>
@@ -48,8 +51,8 @@
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 440px;
+  height: 180px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/utils/fullScreenUrl.ts b/src/utils/fullScreenUrl.ts
index 1b6414d..92005e8 100644
--- a/src/utils/fullScreenUrl.ts
+++ b/src/utils/fullScreenUrl.ts
@@ -3,15 +3,15 @@
   return [
     {
       name: '碳足迹监测',
-      url: 'https://share.shanhaibi.com/6476b2cd921ee/',
+      url: 'https://share.shanhaibi.com/64812707b1f6b/',
     },
     {
       name: '碳足迹评价',
-      url: 'https://share.shanhaibi.com/6476b2cd921ee/',
+      url: 'https://share.shanhaibi.com/64812707b1f6b/',
     },
     {
       name: '碳足迹预警',
-      url: 'https://share.shanhaibi.com/6476b2cd921ee/',
+      url: 'https://share.shanhaibi.com/64812707b1f6b/',
     },
   ]
 }

diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index fefb873..869036b 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -225,7 +225,7 @@
     xAxis: [
       {
         type: props.xAxisType,
-        boundaryGap: false,
+        boundaryGap: true,
         axisLine: {
           lineStyle: {
             color: props.axisLineColor, // 轴线的颜色
@@ -235,6 +235,11 @@
           color: props.fontColor, // X轴名称颜色
           fontSize: 14,
         },
+
+        axisTick: {
+          show: true,
+          alignWithLabel: true,
+        },
         // splitLine: {
         //   show: false,
         //   lineStyle: {
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index 1df9061..f40a204 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -34,10 +34,13 @@
       节点编号 : {{ info?.busId }}
     </div>
     <div class="item">
-      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+      <span>负荷有功功率 : {{ info?.pd }} MW</span>  <span>负荷无功功率 : {{ info?.qd }} MW</span>
     </div>
     <div class="item">
-      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+      <span>节点碳势 : {{ info?.en }} gCO2/kWh</span>  <span>节点负荷碳流率 : {{ info?.flowRate }} kgCO2/h</span>
+    </div>
+    <div class="item">
+      <span>采集时间 : {{ info?.colTime }}</span>
     </div>
     <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
     // <div class="item">设备ID : {{ device.deviceId }}</div>
@@ -48,8 +51,8 @@
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 440px;
+  height: 180px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/utils/fullScreenUrl.ts b/src/utils/fullScreenUrl.ts
index 1b6414d..92005e8 100644
--- a/src/utils/fullScreenUrl.ts
+++ b/src/utils/fullScreenUrl.ts
@@ -3,15 +3,15 @@
   return [
     {
       name: '碳足迹监测',
-      url: 'https://share.shanhaibi.com/6476b2cd921ee/',
+      url: 'https://share.shanhaibi.com/64812707b1f6b/',
     },
     {
       name: '碳足迹评价',
-      url: 'https://share.shanhaibi.com/6476b2cd921ee/',
+      url: 'https://share.shanhaibi.com/64812707b1f6b/',
     },
     {
       name: '碳足迹预警',
-      url: 'https://share.shanhaibi.com/6476b2cd921ee/',
+      url: 'https://share.shanhaibi.com/64812707b1f6b/',
     },
   ]
 }
diff --git a/src/views/data/device/detail.vue b/src/views/data/device/detail.vue
index 459158d..83aa56e 100644
--- a/src/views/data/device/detail.vue
+++ b/src/views/data/device/detail.vue
@@ -9,7 +9,7 @@
 const $route = useRoute()
 const width = (document.body.clientWidth - 180 - 20 - 40 - 24) / 24
 // 监测趋势时间段
-const range = ref('year')
+const range = ref('day')
 const goBak = () => {
   $router.push({
     name: 'Ddevice',
@@ -144,8 +144,8 @@
             <el-radio label="month">
               月
             </el-radio>
-            <el-radio label="week">
-              周
+            <el-radio label="day">
+              日
             </el-radio>
           </el-radio-group>
         </el-col>

diff --git a/src/components/Echart/LineChart.vue b/src/components/Echart/LineChart.vue
index fefb873..869036b 100644
--- a/src/components/Echart/LineChart.vue
+++ b/src/components/Echart/LineChart.vue
@@ -225,7 +225,7 @@
     xAxis: [
       {
         type: props.xAxisType,
-        boundaryGap: false,
+        boundaryGap: true,
         axisLine: {
           lineStyle: {
             color: props.axisLineColor, // 轴线的颜色
@@ -235,6 +235,11 @@
           color: props.fontColor, // X轴名称颜色
           fontSize: 14,
         },
+
+        axisTick: {
+          show: true,
+          alignWithLabel: true,
+        },
         // splitLine: {
         //   show: false,
         //   lineStyle: {
diff --git a/src/components/map/infoWindow.vue b/src/components/map/infoWindow.vue
index 1df9061..f40a204 100644
--- a/src/components/map/infoWindow.vue
+++ b/src/components/map/infoWindow.vue
@@ -34,10 +34,13 @@
       节点编号 : {{ info?.busId }}
     </div>
     <div class="item">
-      <span>负荷有功功率 : {{ info?.pd }}</span>  <span>负荷无功功率 : {{ info?.qd }}</span>
+      <span>负荷有功功率 : {{ info?.pd }} MW</span>  <span>负荷无功功率 : {{ info?.qd }} MW</span>
     </div>
     <div class="item">
-      <span>节点碳势 : {{ info?.en }}</span>  <span>节点负荷碳流率 : {{ info?.flowRate }}</span>
+      <span>节点碳势 : {{ info?.en }} gCO2/kWh</span>  <span>节点负荷碳流率 : {{ info?.flowRate }} kgCO2/h</span>
+    </div>
+    <div class="item">
+      <span>采集时间 : {{ info?.colTime }}</span>
     </div>
     <!-- // <div class="item">设备信息 : {{ device.produceCode }}</div>
     // <div class="item">设备ID : {{ device.deviceId }}</div>
@@ -48,8 +51,8 @@
 
 <style lang="scss" scoped>
 .container {
-  width: 340px;
-  height: 140px;
+  width: 440px;
+  height: 180px;
   padding: 10px;
   background-color: #fff;
   border: 1px solid #6d9ece;
diff --git a/src/utils/fullScreenUrl.ts b/src/utils/fullScreenUrl.ts
index 1b6414d..92005e8 100644
--- a/src/utils/fullScreenUrl.ts
+++ b/src/utils/fullScreenUrl.ts
@@ -3,15 +3,15 @@
   return [
     {
       name: '碳足迹监测',
-      url: 'https://share.shanhaibi.com/6476b2cd921ee/',
+      url: 'https://share.shanhaibi.com/64812707b1f6b/',
     },
     {
       name: '碳足迹评价',
-      url: 'https://share.shanhaibi.com/6476b2cd921ee/',
+      url: 'https://share.shanhaibi.com/64812707b1f6b/',
     },
     {
       name: '碳足迹预警',
-      url: 'https://share.shanhaibi.com/6476b2cd921ee/',
+      url: 'https://share.shanhaibi.com/64812707b1f6b/',
     },
   ]
 }
diff --git a/src/views/data/device/detail.vue b/src/views/data/device/detail.vue
index 459158d..83aa56e 100644
--- a/src/views/data/device/detail.vue
+++ b/src/views/data/device/detail.vue
@@ -9,7 +9,7 @@
 const $route = useRoute()
 const width = (document.body.clientWidth - 180 - 20 - 40 - 24) / 24
 // 监测趋势时间段
-const range = ref('year')
+const range = ref('day')
 const goBak = () => {
   $router.push({
     name: 'Ddevice',
@@ -144,8 +144,8 @@
             <el-radio label="month">
               月
             </el-radio>
-            <el-radio label="week">
-              周
+            <el-radio label="day">
+              日
             </el-radio>
           </el-radio-group>
         </el-col>
diff --git a/src/views/data/electricity/components/networkBusbar.vue b/src/views/data/electricity/components/networkBusbar.vue
index aab02f8..1f0bac0 100644
--- a/src/views/data/electricity/components/networkBusbar.vue
+++ b/src/views/data/electricity/components/networkBusbar.vue
@@ -39,10 +39,11 @@
   { text: '母线省损耗区域', value: 'zone', align: 'center' },
   { text: '节点最大电压', value: 'vmax', align: 'center' },
   { text: '节点最小电压', value: 'vmin', align: 'center' },
-  { text: '负荷有功功率', value: 'pd', align: 'center' },
-  { text: '负荷无功功率', value: 'qd', align: 'center' },
-  { text: '节点碳势', value: 'en', align: 'center' },
-  { text: '负荷碳流率', value: 'flowRate', align: 'center' },
+  { text: '负荷有功功率(MW)', value: 'pd', align: 'center' },
+  { text: '负荷无功功率(MW)', value: 'qd', align: 'center' },
+  { text: '节点碳势(gCO2/kWh)', value: 'en', align: 'center' },
+  { text: '负荷碳流率(kgCO2/h)', value: 'flowRate', align: 'center' },
+  { text: '采集时间', value: 'colTime', align: 'center' },
 ]) // 表格
 const total = ref<number>(0)
 const list = ref<any[]>([])