diff --git a/src/assets/demo/1-1市电.png b/src/assets/demo/1-1市电.png
new file mode 100644
index 0000000..cf840f7
Binary files /dev/null and b/src/assets/demo/1-1市电.png differ
diff --git a/src/assets/demo/1-2光伏.png b/src/assets/demo/1-2光伏.png
new file mode 100644
index 0000000..8d0f308
Binary files /dev/null and b/src/assets/demo/1-2光伏.png differ
diff --git a/src/assets/demo/1-3电机.png b/src/assets/demo/1-3电机.png
new file mode 100644
index 0000000..135e1eb
Binary files /dev/null and b/src/assets/demo/1-3电机.png differ
diff --git a/src/assets/demo/1-4负荷.png b/src/assets/demo/1-4负荷.png
new file mode 100644
index 0000000..e28693c
Binary files /dev/null and b/src/assets/demo/1-4负荷.png differ
diff --git a/src/assets/demo/1储能电池.png b/src/assets/demo/1储能电池.png
new file mode 100644
index 0000000..dae465e
Binary files /dev/null and b/src/assets/demo/1储能电池.png differ
diff --git a/src/assets/demo/1充电桩.png b/src/assets/demo/1充电桩.png
new file mode 100644
index 0000000..fa8da33
Binary files /dev/null and b/src/assets/demo/1充电桩.png differ
diff --git a/src/assets/demo/1光伏发电.png b/src/assets/demo/1光伏发电.png
new file mode 100644
index 0000000..fdbd5ee
Binary files /dev/null and b/src/assets/demo/1光伏发电.png differ
diff --git a/src/assets/demo/1市电.png b/src/assets/demo/1市电.png
new file mode 100644
index 0000000..a29eda5
Binary files /dev/null and b/src/assets/demo/1市电.png differ
diff --git a/src/assets/demo/1柴发.png b/src/assets/demo/1柴发.png
new file mode 100644
index 0000000..e1aba53
Binary files /dev/null and b/src/assets/demo/1柴发.png differ
diff --git a/src/assets/demo/1负荷.png b/src/assets/demo/1负荷.png
new file mode 100644
index 0000000..5083a08
Binary files /dev/null and b/src/assets/demo/1负荷.png differ
diff --git a/src/assets/demo/1风力发电.png b/src/assets/demo/1风力发电.png
new file mode 100644
index 0000000..ad06fad
Binary files /dev/null and b/src/assets/demo/1风力发电.png differ
diff --git a/src/assets/demo/2充电.png b/src/assets/demo/2充电.png
new file mode 100644
index 0000000..23fe97a
Binary files /dev/null and b/src/assets/demo/2充电.png differ
diff --git a/src/assets/demo/2光伏.png b/src/assets/demo/2光伏.png
new file mode 100644
index 0000000..a4429ee
Binary files /dev/null and b/src/assets/demo/2光伏.png differ
diff --git a/src/assets/demo/2光照.png b/src/assets/demo/2光照.png
new file mode 100644
index 0000000..529956b
Binary files /dev/null and b/src/assets/demo/2光照.png differ
diff --git a/src/assets/demo/2功率.png b/src/assets/demo/2功率.png
new file mode 100644
index 0000000..0bc1bde
Binary files /dev/null and b/src/assets/demo/2功率.png differ
diff --git a/src/assets/demo/2年.png b/src/assets/demo/2年.png
new file mode 100644
index 0000000..2e12305
Binary files /dev/null and b/src/assets/demo/2年.png differ
diff --git a/src/assets/demo/2收益.png b/src/assets/demo/2收益.png
new file mode 100644
index 0000000..a683f8a
Binary files /dev/null and b/src/assets/demo/2收益.png differ
diff --git a/src/assets/demo/2收益背景.png b/src/assets/demo/2收益背景.png
new file mode 100644
index 0000000..ae5f0b6
Binary files /dev/null and b/src/assets/demo/2收益背景.png differ
diff --git a/src/assets/demo/2放电.png b/src/assets/demo/2放电.png
new file mode 100644
index 0000000..b202e25
Binary files /dev/null and b/src/assets/demo/2放电.png differ
diff --git a/src/assets/demo/2日.png b/src/assets/demo/2日.png
new file mode 100644
index 0000000..b95b0e2
Binary files /dev/null and b/src/assets/demo/2日.png differ
diff --git a/src/assets/demo/2月.png b/src/assets/demo/2月.png
new file mode 100644
index 0000000..75e6fbd
Binary files /dev/null and b/src/assets/demo/2月.png differ
diff --git a/src/assets/demo/2温度.png b/src/assets/demo/2温度.png
new file mode 100644
index 0000000..bf94148
Binary files /dev/null and b/src/assets/demo/2温度.png differ
diff --git a/src/assets/demo/2湿度.png b/src/assets/demo/2湿度.png
new file mode 100644
index 0000000..937bfbf
Binary files /dev/null and b/src/assets/demo/2湿度.png differ
diff --git a/src/assets/demo/2电压.png b/src/assets/demo/2电压.png
new file mode 100644
index 0000000..06c23bd
Binary files /dev/null and b/src/assets/demo/2电压.png differ
diff --git a/src/assets/demo/2电机.png b/src/assets/demo/2电机.png
new file mode 100644
index 0000000..658f968
Binary files /dev/null and b/src/assets/demo/2电机.png differ
diff --git a/src/assets/demo/2设备.png b/src/assets/demo/2设备.png
new file mode 100644
index 0000000..5928aac
Binary files /dev/null and b/src/assets/demo/2设备.png differ
diff --git a/src/assets/demo/2风机.png b/src/assets/demo/2风机.png
new file mode 100644
index 0000000..d38d57c
Binary files /dev/null and b/src/assets/demo/2风机.png differ
diff --git a/src/assets/demo/subheadClick.png b/src/assets/demo/subheadClick.png
new file mode 100644
index 0000000..939f44a
Binary files /dev/null and b/src/assets/demo/subheadClick.png differ
diff --git a/src/assets/demo/top.jpg b/src/assets/demo/top.jpg
new file mode 100644
index 0000000..08a8106
Binary files /dev/null and b/src/assets/demo/top.jpg differ
diff --git a/src/assets/demo/二氧化碳.png b/src/assets/demo/二氧化碳.png
new file mode 100644
index 0000000..6320f69
Binary files /dev/null and b/src/assets/demo/二氧化碳.png differ
diff --git a/src/assets/demo/光照.png b/src/assets/demo/光照.png
new file mode 100644
index 0000000..aae5e16
Binary files /dev/null and b/src/assets/demo/光照.png differ
diff --git a/src/assets/demo/标准煤排放.png b/src/assets/demo/标准煤排放.png
new file mode 100644
index 0000000..80444bd
Binary files /dev/null and b/src/assets/demo/标准煤排放.png differ
diff --git a/src/assets/demo/消费.png b/src/assets/demo/消费.png
new file mode 100644
index 0000000..629d808
Binary files /dev/null and b/src/assets/demo/消费.png differ
diff --git a/src/assets/demo/温度.png b/src/assets/demo/温度.png
new file mode 100644
index 0000000..994ddba
Binary files /dev/null and b/src/assets/demo/温度.png differ
diff --git a/src/assets/demo/湿度.png b/src/assets/demo/湿度.png
new file mode 100644
index 0000000..a670794
Binary files /dev/null and b/src/assets/demo/湿度.png differ
diff --git a/src/assets/demo/能源管理系统.jpg b/src/assets/demo/能源管理系统.jpg
new file mode 100644
index 0000000..96017f9
Binary files /dev/null and b/src/assets/demo/能源管理系统.jpg differ
diff --git a/src/assets/demo/装机容量.png b/src/assets/demo/装机容量.png
new file mode 100644
index 0000000..967a061
Binary files /dev/null and b/src/assets/demo/装机容量.png differ
diff --git a/src/assets/demo/钱袋.png b/src/assets/demo/钱袋.png
new file mode 100644
index 0000000..4ab1a9a
Binary files /dev/null and b/src/assets/demo/钱袋.png differ
diff --git a/src/assets/demo/风速.png b/src/assets/demo/风速.png
new file mode 100644
index 0000000..964cb81
Binary files /dev/null and b/src/assets/demo/风速.png differ
diff --git a/src/components/chart.vue b/src/components/chart.vue
index 67c6730..b822223 100644
--- a/src/components/chart.vue
+++ b/src/components/chart.vue
@@ -22,9 +22,6 @@ onMounted(async () => {
   if (defaultOption.value) {
     setData(defaultOption.value);
   }
-  debugger
-  console.log(chartRef.value);
-  debugger
   nextTick(() => {
     const resizeObserver = new ResizeObserver(entries => {
       for (let entry of entries) {
@@ -49,7 +46,7 @@ const initChart = (option) => {
 const resize = () => {
   if (resizeTime.value) {
     resizeTime.value = false;
-    if (option.value  && chartRef.value) {
+    if (option.value && chartRef.value) {
       chartRef.value.resize();
     }
     setTimeout(() => {
diff --git a/src/permission.ts b/src/permission.ts
index 125438b..f12d1cb 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -10,7 +10,7 @@ import useSettingsStore from '@/store/modules/settings';
 import usePermissionStore from '@/store/modules/permission';
 
 NProgress.configure({ showSpinner: false });
-const whiteList = ['/login', '/register', '/social-callback'];
+const whiteList = ['/board1','/board2','/login', '/register', '/social-callback'];
 
 router.beforeEach(async (to, from, next) => {
   NProgress.start();
diff --git a/src/views/board/index.vue b/src/views/board/index.vue
index bdfda90..65324a3 100644
--- a/src/views/board/index.vue
+++ b/src/views/board/index.vue
@@ -1,5 +1,31 @@
 <template>
   <div class="board">
+    <div class="topNav"></div>
+
+
+    <div class="rightImg">
+    </div>
+    <div class="right">
+                <span>
+                    光伏系统
+                </span>
+    </div>
+    <div class="rightImg" style="left:38%;">
+    </div>
+    <div class="right" style="left:38%;">
+                <span>
+                    风力风电
+                </span>
+    </div>
+    <div class="rightImg" style="left:45%;">
+    </div>
+    <div class="right" style="left:45%;">
+                <span>
+                   储能系统
+                </span>
+    </div>
+
+
     <div class="title">
       微电网能源管理系统
     </div>
@@ -10,8 +36,10 @@
       <span>累计告警:</span>
       <span style="color: #4F98B8">3392</span>
     </div>
-    <div class="card" style="left: 0.3%;background-color: #DD8F78">
-      <div class="cardTitle">上网电量</div>
+    <div class="card" style="left: 0.3%;background: linear-gradient(to right, #E47C65, #EA6596);">
+      <div class=" cardTitle
+    ">上网电量
+      </div>
       <div class="cardInfo">
         <div class="cardItem" style="width: 50%;padding-left: 0.5vw;">
           日上网电量
@@ -35,14 +63,14 @@
         </div>
       </div>
     </div>
-    <div class="card" style="left: 16.9%;background-color: #DD8F78">
-      <div class="cardTitle">上网电量</div>
+    <div class="card" style="left: 16.9%;background: linear-gradient(to right, #2E74C3, #385CCB);">
+      <div class="cardTitle">下网电量</div>
       <div class="cardInfo">
         <div class="cardItem" style="width: 50%;padding-left: 0.5vw;">
-          日上网电量
+          日用电量
         </div>
         <div class="cardItem" style="width: 20%;font-size: 1.2vw">
-          103.2
+          24.2
         </div>
         <div class="cardItem" style="width: 30%;text-align: right;padding-right: 0.5vw;">
           kwh
@@ -50,24 +78,24 @@
       </div>
       <div class="cardInfo">
         <div class="cardItem" style="width: 50%;padding-left: 0.5vw;">
-          累计上网电量
+          累计用电量
         </div>
         <div class="cardItem" style="width: 20%;font-size: 1.2vw">
-          36371
+          7394
         </div>
         <div class="cardItem" style="width: 30%;text-align: right;padding-right: 0.5vw;">
           kwh
         </div>
       </div>
     </div>
-    <div class="card" style="left: 33.5%;background-color: #DD8F78">
-      <div class="cardTitle">上网电量</div>
+    <div class="card" style="left: 33.5%;background: linear-gradient(to right, #3F40A6, #4234B1)">
+      <div class="cardTitle">光伏发电</div>
       <div class="cardInfo">
         <div class="cardItem" style="width: 50%;padding-left: 0.5vw;">
-          日上网电量
+          日发电量
         </div>
         <div class="cardItem" style="width: 20%;font-size: 1.2vw">
-          103.2
+          43.5
         </div>
         <div class="cardItem" style="width: 30%;text-align: right;padding-right: 0.5vw;">
           kwh
@@ -75,24 +103,24 @@
       </div>
       <div class="cardInfo">
         <div class="cardItem" style="width: 50%;padding-left: 0.5vw;">
-          累计上网电量
+          累计发电量
         </div>
         <div class="cardItem" style="width: 20%;font-size: 1.2vw">
-          36371
+          64924
         </div>
         <div class="cardItem" style="width: 30%;text-align: right;padding-right: 0.5vw;">
           kwh
         </div>
       </div>
     </div>
-    <div class="card" style="left: 50.1%;background-color: #DD8F78">
-      <div class="cardTitle">上网电量</div>
+    <div class="card" style="left: 50.1%;background: linear-gradient(to right, #E47C65, #EA6596);">
+      <div class="cardTitle">储能放电</div>
       <div class="cardInfo">
         <div class="cardItem" style="width: 50%;padding-left: 0.5vw;">
-          日上网电量
+          日放电量
         </div>
         <div class="cardItem" style="width: 20%;font-size: 1.2vw">
-          103.2
+          0
         </div>
         <div class="cardItem" style="width: 30%;text-align: right;padding-right: 0.5vw;">
           kwh
@@ -100,24 +128,24 @@
       </div>
       <div class="cardInfo">
         <div class="cardItem" style="width: 50%;padding-left: 0.5vw;">
-          累计上网电量
+          累计放电量
         </div>
         <div class="cardItem" style="width: 20%;font-size: 1.2vw">
-          36371
+          64913
         </div>
         <div class="cardItem" style="width: 30%;text-align: right;padding-right: 0.5vw;">
           kwh
         </div>
       </div>
     </div>
-    <div class="card" style="left: 66.7%;background-color: #DD8F78">
+    <div class="card" style="left: 66.7%;background: linear-gradient(to right, #2E74C3, #385CCB)">
       <div class="cardTitle">上网电量</div>
       <div class="cardInfo">
         <div class="cardItem" style="width: 50%;padding-left: 0.5vw;">
-          日上网电量
+          储能充电
         </div>
         <div class="cardItem" style="width: 20%;font-size: 1.2vw">
-          103.2
+          0
         </div>
         <div class="cardItem" style="width: 30%;text-align: right;padding-right: 0.5vw;">
           kwh
@@ -125,24 +153,24 @@
       </div>
       <div class="cardInfo">
         <div class="cardItem" style="width: 50%;padding-left: 0.5vw;">
-          累计上网电量
+          累计充电量
         </div>
         <div class="cardItem" style="width: 20%;font-size: 1.2vw">
-          36371
+          9841
         </div>
         <div class="cardItem" style="width: 30%;text-align: right;padding-right: 0.5vw;">
           kwh
         </div>
       </div>
     </div>
-    <div class="card" style="left: 83.3%;background-color: #DD8F78">
-      <div class="cardTitle">上网电量</div>
+    <div class="card" style="left: 83.3%;background: linear-gradient(to right, #3F40A6, #4234B1)">
+      <div class="cardTitle">风力发电</div>
       <div class="cardInfo">
         <div class="cardItem" style="width: 50%;padding-left: 0.5vw;">
-          日上网电量
+          日发电量
         </div>
         <div class="cardItem" style="width: 20%;font-size: 1.2vw">
-          103.2
+          0
         </div>
         <div class="cardItem" style="width: 30%;text-align: right;padding-right: 0.5vw;">
           kwh
@@ -150,10 +178,10 @@
       </div>
       <div class="cardInfo">
         <div class="cardItem" style="width: 50%;padding-left: 0.5vw;">
-          累计上网电量
+          累计发电量
         </div>
         <div class="cardItem" style="width: 20%;font-size: 1.2vw">
-          36371
+          1741
         </div>
         <div class="cardItem" style="width: 30%;text-align: right;padding-right: 0.5vw;">
           kwh
@@ -163,31 +191,45 @@
     <div class="bottomLeftTop">
       <div class="card1" style="margin-top: 1%;margin-bottom: 2%">
         <div class="title1">系统收益</div>
-        <div class="icon1"></div>
+        <div class="icon1">
+          <img src="@/assets/demo/钱袋.png" alt="" width="60%">
+        </div>
         <div class="num1">1.11</div>
         <div class="span1">万元</div>
       </div>
       <div class="card1" style="margin-top: 1%;margin-bottom: 2%">
-        <div class="title1">系统收益</div>
-        <div class="icon1"></div>
-        <div class="num1">1.11</div>
+        <div class="title1">用电消费</div>
+        <div class="icon1">
+          <img src="@/assets/demo/消费.png" alt="" width="60%">
+        </div>
+        <div class="num1">0.32</div>
         <div class="span1">万元</div>
       </div>
       <div class="card1">
-        <div class="title1">系统收益</div>
-        <div class="icon1"></div>
-        <div class="num1">1.11</div>
-        <div class="span1">万元</div>
+        <div class="title1">节约标准煤</div>
+        <div class="icon1">
+          <img src="@/assets/demo/标准煤排放.png" alt="" width="60%">
+        </div>
+        <div class="num1">74194</div>
+        <div class="span1">kg</div>
       </div>
       <div class="card1">
-        <div class="title1">系统收益</div>
-        <div class="icon1"></div>
-        <div class="num1">1.11</div>
-        <div class="span1">万元</div>
+        <div class="title1">减排二氧化碳</div>
+        <div class="icon1">
+          <img src="@/assets/demo/二氧化碳.png" alt="" width="60%">
+        </div>
+        <div class="num1">7481904</div>
+        <div class="span1">kg</div>
       </div>
     </div>
     <div class="bottomLeftMid">
       <div class="title2">光伏/市电日电量占比</div>
+      <div class="bigIcon">
+        <img src="@/assets/demo/1光伏发电.png" alt="" width="100%">
+      </div>
+      <div class="bigIcon" style="left: 50%">
+        <img src="@/assets/demo/1市电.png" alt="" width="100%">
+      </div>
       <div class="num2">100</div>
       <div class="span2">%</div>
       <div class="num3">100</div>
@@ -196,7 +238,9 @@
     <div class="bottomLeftBottom">
       <div class="title3">气象信息</div>
       <div class="card2">
-        <div class="icon2"></div>
+        <div class="icon2">
+          <img src="@/assets/demo/2光照.png" alt="" width="100%">
+        </div>
         <div class="card2Title">光照</div>
         <div class="card2Span">
           <span>
@@ -207,36 +251,42 @@
           </span></div>
       </div>
       <div class="card2">
-        <div class="icon2"></div>
-        <div class="card2Title">光照</div>
+        <div class="icon2">
+          <img src="@/assets/demo/2风机.png" alt="" width="100%">
+        </div>
+        <div class="card2Title">风速</div>
         <div class="card2Span">
           <span>
             0.00
           </span>
           <span style="position:absolute;right: 0">
-            lx
+            m/s
           </span></div>
       </div>
       <div class="card2">
-        <div class="icon2"></div>
-        <div class="card2Title">光照</div>
+        <div class="icon2">
+          <img src="@/assets/demo/2湿度.png" alt="" width="100%">
+        </div>
+        <div class="card2Title">湿度</div>
         <div class="card2Span">
           <span>
             0.00
           </span>
           <span style="position:absolute;right: 0">
-            lx
+            %
           </span></div>
       </div>
       <div class="card2">
-        <div class="icon2"></div>
-        <div class="card2Title">光照</div>
+        <div class="icon2">
+          <img src="@/assets/demo/2温度.png" alt="" width="100%">
+        </div>
+        <div class="card2Title">温度</div>
         <div class="card2Span">
           <span>
             0.00
           </span>
           <span style="position:absolute;right: 0">
-            lx
+            °C
           </span></div>
       </div>
     </div>
@@ -244,42 +294,441 @@
     </div>
     <div class="bottomRightTop">
       <div class="card1" style="margin-top: 1%;margin-bottom: 2%">
-        <div class="title1">系统收益</div>
-        <div class="icon1"></div>
-        <div class="num1">1.11</div>
-        <div class="span1">万元</div>
+        <div class="title1">风机装机容量</div>
+        <div class="icon1">
+          <img src="@/assets/demo/装机容量.png" alt="" width="60%">
+        </div>
+        <div class="num1">10</div>
+        <div class="span1">kw</div>
       </div>
       <div class="card1" style="margin-top: 1%;margin-bottom: 2%">
-        <div class="title1">系统收益</div>
-        <div class="icon1"></div>
-        <div class="num1">1.11</div>
-        <div class="span1">万元</div>
+        <div class="title1">光伏装机容量</div>
+        <div class="icon1">
+          <img src="@/assets/demo/装机容量.png" alt="" width="60%">
+        </div>
+        <div class="num1">123</div>
+        <div class="span1">kw</div>
       </div>
       <div class="card1">
-        <div class="title1">系统收益</div>
-        <div class="icon1"></div>
-        <div class="num1">1.11</div>
-        <div class="span1">万元</div>
+        <div class="title1">储能装机容量</div>
+        <div class="icon1">
+          <img src="@/assets/demo/装机容量.png" alt="" width="60%">
+        </div>
+        <div class="num1">111</div>
+        <div class="span1">kwh</div>
       </div>
       <div class="card1">
-        <div class="title1">系统收益</div>
-        <div class="icon1"></div>
-        <div class="num1">1.11</div>
-        <div class="span1">万元</div>
+        <div class="title1">负荷容量</div>
+        <div class="icon1">
+          <img src="@/assets/demo/装机容量.png" alt="" width="60%">
+        </div>
+        <div class="num1">54</div>
+        <div class="span1">kw</div>
       </div>
 
     </div>
     <div class="bottomRightMid">
-
+      <Chart ref="chartRef" />
     </div>
     <div class="bottomRightBottom">
-
+      <Chart ref="chartRef1" />
     </div>
   </div>
 </template>
 <script lang="ts" setup>
+import Chart from '@/components/chart.vue';
+import * as echarts from 'echarts';
+
+const chartRef = ref();
+const chartRef1 = ref();
+onMounted(() => {
+  const colorList = ['#9E87FF', '#73DDFF', '#fe9a8b', '#F56948', '#9E87FF'];
+  let option = {
+    title: {
+      text: '系统功率曲线',
+      textStyle: {
+        fontSize: 12,
+        fontWeight: 400,
+        color: '#fff'
+      },
+      left: '0',
+      top: '5%'
+    },
+    legend: {
+      icon: 'circle',
+      top: '5%',
+      right: '5%',
+      itemWidth: 6,
+      itemGap: 20,
+      textStyle: {
+        color: '#fff'
+      }
+    },
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        label: {
+          show: true,
+          backgroundColor: '#fff',
+          color: '#fff',
+          borderColor: 'rgba(0,0,0,0)',
+          shadowColor: 'rgba(0,0,0,0)',
+          shadowOffsetY: 0
+        },
+        lineStyle: {
+          width: 0
+        }
+      },
+      backgroundColor: '#fff',
+      textStyle: {
+        color: '#fff'
+      },
+      padding: [10, 10],
+      extraCssText: 'box-shadow: 1px 0 2px 0 rgba(163,163,163,0.5)'
+    },
+    grid: {
+      top: '30%',
+      bottom: '10%'
+    },
+    xAxis: [
+      {
+        type: 'category',
+        data: [' ', ' ', ' ', ' ', ' ', ' ', ' '],
+        axisLine: {
+          lineStyle: {
+            color: '#DCE2E8'
+          }
+        },
+        axisTick: {
+          show: false
+        },
+        axisLabel: {
+          interval: 0,
+          textStyle: {
+            color: '#fff'
+          },
+          // 默认x轴字体大小
+          fontSize: 0,
+          // margin:文字到x轴的距离
+          margin: -10
+        },
+        axisPointer: {
+          label: {
+            padding: [0, 0, 0, 0],
+            /*
+      除了padding[0]建议必须是0之外，其他三项可随意设置
+
+      和CSSpadding相同，[上，右，下，左]
+
+      如果需要下边线超出文字，设左右padding即可，注：左右padding最好相同
+
+      padding[2]的10:
+
+      10 = 文字距下边线的距离 + 下边线的宽度
+
+      如：UI图中文字距下边线距离为7 下边线宽度为2
+
+      则padding: [0, 0, 9, 0]
+
+                  */
+            // 这里的margin和axisLabel的margin要一致!
+            margin: 0,
+            // 移入时的字体大小
+            fontSize: 12
+          }
+        },
+        boundaryGap: false
+      }
+    ],
+    yAxis: [
+      {
+        type: 'value',
+        axisTick: {
+          show: false
+        },
+        axisLine: {
+          show: true,
+          lineStyle: {
+            color: '#fff'
+          }
+        },
+        axisLabel: {
+          textStyle: {
+            color: '#fff'
+          }
+        },
+        splitLine: {
+          show: false
+        }
+      }
+    ],
+    series: [
+      {
+        name: '充电桩+负载回路',
+        type: 'line',
+        data: [0, 0, 0, 0, 0, 0, 0],
+        symbolSize: 1,
+        symbol: 'circle',
+        smooth: true,
+        yAxisIndex: 0,
+        showSymbol: false,
+        lineStyle: {
+          width: 1,
+          color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+            {
+              offset: 0,
+              color: '#9effff'
+            },
+            {
+              offset: 1,
+              color: '#9E87FF'
+            }
+          ]),
+          shadowColor: 'rgba(158,135,255, 0.3)',
+          shadowBlur: 10,
+          shadowOffsetY: 20
+        },
+        itemStyle: {
+          normal: {
+            color: colorList[0],
+            borderColor: colorList[0]
+          }
+        }
+      },
+      {
+        name: '光伏+风电',
+        type: 'line',
+        data: [0, 5, 18, 22, 29, 31, 35],
+        symbolSize: 1,
+        symbol: 'circle',
+        smooth: true,
+        yAxisIndex: 0,
+        showSymbol: false,
+        lineStyle: {
+          width: 1,
+          color: new echarts.graphic.LinearGradient(1, 1, 0, 0, [
+            {
+              offset: 0,
+              color: '#73DD39'
+            },
+            {
+              offset: 1,
+              color: '#73DDFF'
+            }
+          ]),
+          shadowColor: 'rgba(115,221,255, 0.3)',
+          shadowBlur: 10,
+          shadowOffsetY: 20
+        },
+        itemStyle: {
+          normal: {
+            color: colorList[1],
+            borderColor: colorList[1]
+          }
+        }
+      },
+      {
+        name: '储能',
+        type: 'line',
+        data: [0, 0, 0, 0, 0, 0, 0],
+        symbolSize: 1,
+        symbol: 'circle',
+        smooth: true,
+        showSymbol: false,
+        lineStyle: {
+          width: 1,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: '#fe9a'
+            },
+            {
+              offset: 1,
+              color: '#fe9a8b'
+            }
+          ]),
+          shadowColor: 'rgba(254,154,139, 0.3)',
+          shadowBlur: 10,
+          shadowOffsetY: 20
+        },
+        itemStyle: {
+          normal: {
+            color: colorList[2],
+            borderColor: colorList[2]
+          }
+        }
+      }
+    ]
+  };
+  let option1 = {
+    title: {
+      text: '并网功率曲线',
+      textStyle: {
+        fontSize: 12,
+        fontWeight: 400,
+        color: '#fff'
+      },
+      left: '0',
+      top: '5%'
+    },
+    legend: {
+      icon: 'circle',
+      top: '5%',
+      right: '5%',
+      itemWidth: 6,
+      itemGap: 20,
+      textStyle: {
+        color: '#fff'
+      }
+    },
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        label: {
+          show: true,
+          backgroundColor: '#fff',
+          color: '#fff',
+          borderColor: 'rgba(0,0,0,0)',
+          shadowColor: 'rgba(0,0,0,0)',
+          shadowOffsetY: 0
+        },
+        lineStyle: {
+          width: 0
+        }
+      },
+      backgroundColor: '#fff',
+      textStyle: {
+        color: '#fff'
+      },
+      padding: [10, 10],
+      extraCssText: 'box-shadow: 1px 0 2px 0 rgba(163,163,163,0.5)'
+    },
+    grid: {
+      top: '30%',
+      bottom: '10%'
+    },
+    xAxis: [
+      {
+        type: 'category',
+        data: [' ', ' ', ' ', ' ', ' ', ' ', ' '],
+        axisLine: {
+          lineStyle: {
+            color: '#DCE2E8'
+          }
+        },
+        axisTick: {
+          show: false
+        },
+        axisLabel: {
+          interval: 0,
+          textStyle: {
+            color: '#fff'
+          },
+          // 默认x轴字体大小
+          fontSize: 0,
+          // margin:文字到x轴的距离
+          margin: -10
+        },
+        axisPointer: {
+          label: {
+            padding: [0, 0, 0, 0],
+            /*
+      除了padding[0]建议必须是0之外，其他三项可随意设置
+
+      和CSSpadding相同，[上，右，下，左]
+
+      如果需要下边线超出文字，设左右padding即可，注：左右padding最好相同
+
+      padding[2]的10:
+
+      10 = 文字距下边线的距离 + 下边线的宽度
+
+      如：UI图中文字距下边线距离为7 下边线宽度为2
+
+      则padding: [0, 0, 9, 0]
+
+                  */
+            // 这里的margin和axisLabel的margin要一致!
+            margin: 0,
+            // 移入时的字体大小
+            fontSize: 12
+          }
+        },
+        boundaryGap: false
+      }
+    ],
+    yAxis: [
+      {
+        type: 'value',
+        axisTick: {
+          show: false
+        },
+        axisLine: {
+          show: true,
+          lineStyle: {
+            color: '#fff'
+          }
+        },
+        axisLabel: {
+          textStyle: {
+            color: '#fff'
+          }
+        },
+        splitLine: {
+          show: false
+        }
+      }
+    ],
+    series: [
+      {
+        name: '并网功率',
+        type: 'line',
+        data: [2.31, -3.21, -5.24, -6.12, -7.41, -9.12, -10],
+        symbolSize: 1,
+        symbol: 'circle',
+        smooth: true,
+        showSymbol: false,
+        lineStyle: {
+          width: 1,
+          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            {
+              offset: 0,
+              color: '#fe9a'
+            },
+            {
+              offset: 1,
+              color: '#fe9a8b'
+            }
+          ]),
+          shadowColor: 'rgba(254,154,139, 0.3)',
+          shadowBlur: 10,
+          shadowOffsetY: 20
+        },
+        itemStyle: {
+          normal: {
+            color: colorList[2],
+            borderColor: colorList[2]
+          }
+        }
+      }
+    ]
+  };
+  chartRef.value.setData(option);
+  chartRef1.value.setData(option1);
+});
 </script>
 <style scoped lang="less">
+.topNav {
+  background-image: url("@/assets/demo/top.jpg");
+  position: absolute;
+  width: 100%;
+  height: 7%;
+  top: 0;
+  left: 0;
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+}
+
 .board {
   background-color: #020A3A;
   position: absolute;
@@ -291,7 +740,7 @@
 
 .title {
   position: absolute;
-  top: 2%;
+  top: 3.5%;
   left: 2%;
   font-size: 1vw;
   color: white;
@@ -300,7 +749,7 @@
 .rightTop {
   position: absolute;
   top: 2%;
-  right: 2%;
+  right: 3%;
   font-size: 0.8vw;
   color: white;
 }
@@ -370,6 +819,15 @@
   background-color: #141B4C;
 }
 
+.bigIcon {
+  position: absolute;
+  top: 65%;
+  left: 10%;
+  transform: translateY(-50%);
+  width: 5vw;
+  height: 5vw;
+}
+
 .bottomRightMid {
   position: absolute;
   top: 50.6%;
@@ -407,16 +865,29 @@
 }
 
 .icon1 {
+  background-color: #3C3D8C;
+  border-radius: 50%;
+  text-align: center;
+  line-height: 2vw;
   position: absolute;
-  width: 10%;
+  width: 2vw;
+  height: 2vw;
   top: 10%;
   right: 10%;
+
+  img {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
 }
 
 .num1 {
   position: absolute;
   bottom: 10%;
   left: 10%;
+  font-size: 1.2vw;
 }
 
 .span1 {
@@ -484,7 +955,6 @@
 }
 
 .icon2 {
-  background-color: #00afff;
   position: absolute;
   transform: translateY(-50%);
   top: 50%;
@@ -516,6 +986,30 @@
   color: white;
   font-size: 0.8vw;
 }
+
+.rightImg {
+  transform: rotateX(180deg);
+  background-image: url('@/assets/demo/subheadClick.png');
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  position: absolute;
+  width: 8vw;
+  height: 1.66vw;
+  top: 3.8%;
+  left: 31%;
+}
+
+.right {
+  position: absolute;
+  width: 8vw;
+  height: 1.66vw;
+  top: 3.8%;
+  left: 31%;
+  line-height: 1.66vw;
+  font-size: 0.8vw;
+  color: #fff;
+  text-align: center;
+}
 </style>
 
 
diff --git a/src/views/board/index2.vue b/src/views/board/index2.vue
index 923d335..10e3b60 100644
--- a/src/views/board/index2.vue
+++ b/src/views/board/index2.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="board">
+    <div class="topNav"></div>
     <div class="title">
       微电网能源管理系统
     </div>
@@ -11,32 +12,22 @@
       <span style="color: #4F98B8">3392</span>
     </div>
     <div class="bottomLeftTop">
-      <div class="card1" style="margin-top: 1%;margin-bottom: 2%">
-        <div class="title1">系统收益</div>
-        <div class="icon1"></div>
-        <div class="num1">1.11</div>
-        <div class="span1">万元</div>
-      </div>
-      <div class="card1" style="margin-top: 1%;margin-bottom: 2%">
-        <div class="title1">系统收益</div>
-        <div class="icon1"></div>
-        <div class="num1">1.11</div>
-        <div class="span1">万元</div>
-      </div>
+      <div class="title3">收益</div>
       <div class="card1">
-        <div class="title1">系统收益</div>
-        <div class="icon1"></div>
-        <div class="num1">1.11</div>
-        <div class="span1">万元</div>
-      </div>
-      <div class="card1">
-        <div class="title1">系统收益</div>
-        <div class="icon1"></div>
-        <div class="num1">1.11</div>
-        <div class="span1">万元</div>
+        <div class="a1">
+          当日收益
+        </div>
+        <div class="a2" style="white-space: nowrap;text-align: center">
+          <span style="padding: 0 1vw;font-size: 1vw">1111</span>
+          <span>元</span>
+        </div>
+        <div class="a3">
+          <img src="@/assets/demo/2收益.png" alt="" width="100%">
+        </div>
       </div>
     </div>
     <div class="bottomLeftMid">
+      <div class="title3">发电量</div>
       <div class="title2">光伏/市电日电量占比</div>
       <div class="num2">100</div>
       <div class="span2">%</div>
@@ -46,7 +37,9 @@
     <div class="bottomLeftBottom">
       <div class="title3">气象信息</div>
       <div class="card2">
-        <div class="icon2"></div>
+        <div class="icon2">
+          <img src="@/assets/demo/光照.png" alt="" width="100%">
+        </div>
         <div class="card2Title">光照</div>
         <div class="card2Span">
           <span>
@@ -57,36 +50,42 @@
           </span></div>
       </div>
       <div class="card2">
-        <div class="icon2"></div>
-        <div class="card2Title">光照</div>
+        <div class="icon2">
+          <img src="@/assets/demo/风速.png" alt="" width="100%">
+        </div>
+        <div class="card2Title">风速</div>
         <div class="card2Span">
           <span>
             0.00
           </span>
           <span style="position:absolute;right: 0">
-            lx
+            m/s
           </span></div>
       </div>
       <div class="card2">
-        <div class="icon2"></div>
-        <div class="card2Title">光照</div>
+        <div class="icon2">
+          <img src="@/assets/demo/湿度.png" alt="" width="100%">
+        </div>
+        <div class="card2Title">湿度</div>
         <div class="card2Span">
           <span>
             0.00
           </span>
           <span style="position:absolute;right: 0">
-            lx
+            %
           </span></div>
       </div>
       <div class="card2">
-        <div class="icon2"></div>
-        <div class="card2Title">光照</div>
+        <div class="icon2">
+          <img src="@/assets/demo/温度.png" alt="" width="100%">
+        </div>
+        <div class="card2Title">温度</div>
         <div class="card2Span">
           <span>
             0.00
           </span>
           <span style="position:absolute;right: 0">
-            lx
+            °C
           </span></div>
       </div>
     </div>
@@ -200,6 +199,17 @@
 <script lang="ts" setup>
 </script>
 <style scoped lang="less">
+.topNav {
+  background-image: url("@/assets/demo/top.jpg");
+  position: absolute;
+  width: 90%;
+  height: 7%;
+  top: 0;
+  left: 0;
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+}
+
 .board {
   background-color: #020A3A;
   position: absolute;
@@ -289,15 +299,42 @@
 }
 
 .card1 {
-  width: 48%;
-  height: 45%;
-  display: inline-block;
-  margin: 0 1%;
-  vertical-align: top;
-  border: 0.5px solid #fff2;
-  color: #fff;
-  position: relative;
-  font-size: 0.8vw;
+  width: 40%;
+  height: 80%;
+  top: 10%;
+  left: 10%;
+  position: absolute;
+
+  .a1 {
+    position: absolute;
+    color: white;
+    text-align: center;
+    //background-color: #C28E4766;
+    top: 10%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 60%;
+    height: 1vw;
+  }
+
+  .a2 {
+    position: absolute;
+    color: white;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 100%;
+    height: 20%;
+  }
+
+  .a3 {
+    position: absolute;
+    top: 70%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: 70%;
+    height: 20%;
+  }
 }
 
 .title1 {
@@ -384,7 +421,6 @@
 }
 
 .icon2 {
-  background-color: #00afff;
   position: absolute;
   transform: translateY(-50%);
   top: 50%;
diff --git a/vite.config.ts b/vite.config.ts
index 885708f..421db19 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -3,6 +3,7 @@ import { UserConfig, ConfigEnv, loadEnv, defineConfig } from 'vite';
 import createPlugins from './vite/plugins';
 
 import path from 'path';
+
 export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
   const env = loadEnv(mode, process.cwd());
   return {
@@ -25,12 +26,19 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
       open: true,
       proxy: {
         [env.VITE_APP_BASE_API]: {
-          target: 'http://localhost:6080',
+          // target: 'http://localhost:6080',
+          target: 'http://192.168.100.100:6080',
           // target: 'http://192.168.137.1:6080',
           // target: 'http://175.27.215.92:6080/prod-api',
           changeOrigin: true,
           ws: true,
           rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')
+        },
+        '/deva-api': {
+          target: `http://175.27.215.92/prod-api`,
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path) => path.replace(new RegExp('^' + '/deva-api'), '')
         }
       }
     },