diff --git a/README.md b/README.md
index 0bfecb0..81554c0 100644
--- a/README.md
+++ b/README.md
@@ -6,4 +6,19 @@ This template should help get you started developing with Vue 3 and TypeScript i
 
 - [VS Code](https://code.visualstudio.com/) + [Vue - Official](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (previously Volar) and disable Vetur
 
-- Use [vue-tsc](https://github.com/vuejs/language-tools/tree/master/packages/tsc) for performing the same type checking from the command line, or for generating d.ts files for SFCs.
+- Use [vue-tsc](https://github.com/vuejs/language-tools/tree/master/packages/tsc) for performing the same type checking 
+from the command line, or for generating d.ts files for SFCs.
+
+
+##分辨率
+3840*2160 天津城南分辨率
+1920*1080 普通电脑分辨率
+3840*1080 上海院的分辨率
+/* 针对3840x1080分辨率的样式 */
+@media screen and (min-width: 3840px) and (max-height: 2150px) {
+  .main {
+  /* margin-top: 7.8125rem; */
+  flex: 1;
+  margin-top: 3%;
+}
+}
diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index 8176b10..0000000
Binary files a/dist.zip and /dev/null differ
diff --git a/src/api/ajust/tree.ts b/src/api/ajust/tree.ts
index ec076e4..f1042a2 100644
--- a/src/api/ajust/tree.ts
+++ b/src/api/ajust/tree.ts
@@ -3,13 +3,13 @@ import request from "@/utils/http/request";
 
 interface idInfo {
     orgID?: string,
-
+    mrid?:string,
 }
 
 // 设备树  0 一级服务
 export function treeT(data: idInfo) {
     return request({
-        url: '/api/wwpm/biz/v1/device_0',
+        url: '/api/wwpm/biz/v1/er_tree',
         method: 'POST',
         data
     })
@@ -21,9 +21,9 @@ interface treeInfo {
     transformId: string;
 }
 // 设备树  1 二级服务
-export function treeSecond(data: treeInfo) {
+export function treeSecond(data: idInfo) {
     return request({
-        url: '/api/wwpm/biz/v1/device_1',
+        url: '/api/wwpm/biz/v1/er_tree/node',
         method: 'POST',
         data
     })
@@ -32,12 +32,22 @@ export function treeSecond(data: treeInfo) {
 // 设备树  充电站
 export function carTree_api(data: idInfo) {
     return request({
-        url: '/api/wwpm/biz/v1/car_tree',
+        url: '/api/wwpm/biz/v1/cn_tree',
         method: 'POST',
         data
     })
 }
-// 设备树  充电站
+
+export function carTree_api2(data: idInfo) {
+    return request({
+        url: '/api/wwpm/biz/v1/cn_tree/node',
+        method: 'POST',
+        data
+    })
+}
+
+
+// 设备树  光伏
 export function pvTree_api(data: idInfo) {
     return request({
         url: '/api/wwpm/biz/v1/pv_tree',
diff --git a/src/api/pvPage/pvApi.ts b/src/api/pvPage/pvApi.ts
index fd17ec4..261d3b3 100644
--- a/src/api/pvPage/pvApi.ts
+++ b/src/api/pvPage/pvApi.ts
@@ -10,4 +10,13 @@ interface idInfo {
       method: "POST",
       data,
     });
-  }
\ No newline at end of file
+  }
+  // 光伏实时信息
+  export function pvCurInfo_api(data: idInfo) {
+    return request({
+      url: "/api/wwpm/biz/v1/photo_voltaic/real_time/info",
+      method: "POST",
+      data,
+    });
+  }
+  
\ No newline at end of file
diff --git a/src/enums/CitySourceID.ts b/src/enums/CitySourceID.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/hooks/transFormSize.ts b/src/hooks/transFormSize.ts
index f3d7f8c..a47dc8d 100644
--- a/src/hooks/transFormSize.ts
+++ b/src/hooks/transFormSize.ts
@@ -4,21 +4,27 @@ const transformFontSize = (fontsize: number) => {
 
   const width = window.screen.width;
   const height = window.screen.height;
-  let ratio: any = 0
-  if (width > 3000) {
-    ratio = width / 4240;
-  } else if(width>2100){
-    ratio = width / 2220;
-    // 宁波分辨率
-    // ratio = width / 3220;
-  }else if(width>1900){
-    ratio = width / 4240;
-
-  }else{
-    ratio = width / 2620;
+  let ratio: any = 0;
+  //高度大于1080
+  if (height > 1080) {
+    // 3840*2160 天津城南分辨率
+    if (width > 3000) {
+      ratio = width / 4240;
+    }
+  } else {
+      //高度小于1080
+    if (width > 3000) {
+      // 3840*1080 上海院的分辨率
+      ratio = width / 11940;
+    } else if (width > 1900) {
+      // 1920*1080 普通电脑分辨率
+      ratio = width / 5960;
+    } else {
+      ratio = width / 3620;
+    }
   }
 
   // 取下整
   return parseInt(fontsize * ratio);
 };
-export default transformFontSize
\ No newline at end of file
+export default transformFontSize;
diff --git a/src/views/LoadManagementPage/loadlayout.vue b/src/views/LoadManagementPage/loadlayout.vue
index 8d4e414..a8f9d3f 100644
--- a/src/views/LoadManagementPage/loadlayout.vue
+++ b/src/views/LoadManagementPage/loadlayout.vue
@@ -165,6 +165,7 @@
   }
   
   .header_layout {
+    height: changeHeight(166);
     /* height: 186px; */
     width: 100%;
     position: absolute;
@@ -215,10 +216,6 @@
     flex: 1;
     margin-top: 3%;
   }
-  // @media screen and (max-width:1920px) {
-  //     .main {
-  //       margin-top: 6%;
-  //     }
-  // }
+
   </style>
   
\ No newline at end of file
diff --git a/src/views/commonPage/carTree.vue b/src/views/commonPage/carTree.vue
index f12ddef..311dac7 100644
--- a/src/views/commonPage/carTree.vue
+++ b/src/views/commonPage/carTree.vue
@@ -15,11 +15,15 @@
           :expand-on-click-node="false"
           empty-text="数据读取中..."
           :props="targetProps"
-          :default-expanded-keys="['tongxiang']"
           lazy
           :load="loadNode"
           @node-click="handleTargetInfo"
-        ></el-tree>
+        >
+        <template v-slot:default="{ node }">
+          <div style=" text-overflow: ellipsis;text-align: left; white-space: nowrap;width: 82%; overflow: hidden;"
+            :title="node.label">{{ node.label }}</div>
+        </template>
+      </el-tree>
       </div>
     </div>
   </div>
@@ -28,7 +32,7 @@
 import { onMounted, ref, watch } from "vue";
 import { ElTree } from "element-plus";
 import treeDatas from "@/assets/json/tree-right2.json";
-import { treeT, treeSecond, carTree_api } from "@/api/ajust/tree";
+import { carTree_api, carTree_api2 } from "@/api/ajust/tree";
 
 // defineProps<{
 //   elec_list: EList[]
@@ -108,80 +112,82 @@ const loadNode = async (node: any, resolve: any) => {
     });
     treeData = result.data;
     resolve(treeData);
-  } else if (node.level > 0 && node.level < 4) {
+  } else if (node.level > 0 && node.level < 3) {
     //默认展开的层级,需要默认几层就判断一下.
     resolve(node.data.children);
-  } else if (node.level === 4) {
-    // 利用设备中的信息调用接口
-    // ---------
+  }
+  // else if (node.level === 4) {
+  // 利用设备中的信息调用接口
+  // ---------
 
-    // ---------
-    //懒加载
-    let res = await treeSecond({
+  // ---------
+  //懒加载
+  // let res = await treeSecond({
+  //   orgID: "8af8470a47aad8e20147aad92e400335",
+  //   transformId: node.key,
+  // });
+  // if (res.data.energySupplyStation.length || res.data.dwellerPile.length) {
+  //   let datanames = [];
+
+  //   if (res.data.energySupplyStation.length) {
+  //     datanames.push({
+  //       name: `充电站(${res.data.energySupplyStation.length})`,
+  //       id: "chongdianzhan",
+  //     });
+  //   }
+
+  //   if (res.data.dwellerPile.length) {
+  //     datanames.push({
+  //       name: `居民充电桩(${res.data.dwellerPile.length})`,
+  //       id: "chongdianzhuang",
+  //     });
+  //   }
+  //   resolve(datanames);
+  // } else {
+  //   resolve([{ name: "暂无数据", leaf: true }]);
+  //   console.log(res); //需要将上一级的加号去掉
+  // }
+  // }
+  // else if (node.level === 5) {
+  // if (node.key === "chongdianzhan") {
+  //   if (res.data.energySupplyStation.length) {
+  //     resolve(
+  //       res.data.energySupplyStation.map((item) => ({
+  //         id: item.mrid,
+  //         name: item.name,
+  //         type: item.type,
+  //       }))
+  //     );
+  //   }
+  // }
+  // if (node.key === "chongdianzhuang") {
+  //   if (res.data.dwellerPile.length) {
+  //     resolve(
+  //       res.data.dwellerPile.map((item) => ({
+  //         id: item.mrid,
+  //         name: item.name,
+  //         type: item.type,
+  //       }))
+  //     );
+  //   }
+  // }
+
+  // resolve();
+  // resolve([
+  //   {
+  //     name: `懒加载第${node.level + 1}级` + +new Date(),
+  //     id: `${+new Date()}`,
+  //   },
+  // ]);
+  // }
+  else if (node.level === 3) {
+    let result = await carTree_api2({
       orgID: "8af8470a47aad8e20147aad92e400335",
-      transformId: node.key,
+      mrid: node.key,
     });
-    if (res.data.energySupplyStation.length || res.data.dwellerPile.length) {
-      let datanames = [];
-
-      if (res.data.energySupplyStation.length) {
-        datanames.push({
-          name: `充电站(${res.data.energySupplyStation.length})`,
-          id: "chongdianzhan",
-        });
-      }
-
-      if (res.data.dwellerPile.length) {
-        datanames.push({
-          name: `居民充电桩(${res.data.dwellerPile.length})`,
-          id: "chongdianzhuang",
-        });
-      }
-      resolve(datanames);
-    } else {
-      resolve([{ name: "暂无数据", leaf: true }]);
-      console.log(res); //需要将上一级的加号去掉
-    }
-  } else if (node.level === 5) {
-    //懒加载
-    let res = await treeSecond({
-      orgID: "8af8470a47aad8e20147aad92e400335",
-      transformId: node.parent.key,
-      // transformId: "ed7d892d4f8af8514b6dc01fde016ded55e58",
-    });
-
-    if (node.key === "chongdianzhan") {
-      if (res.data.energySupplyStation.length) {
-        resolve(
-          res.data.energySupplyStation.map((item) => ({
-            id: item.mrid,
-            name: item.name,
-            type: item.type,
-          }))
-        );
-      }
-    }
-    if (node.key === "chongdianzhuang") {
-      if (res.data.dwellerPile.length) {
-        resolve(
-          res.data.dwellerPile.map((item) => ({
-            id: item.mrid,
-            name: item.name,
-            type: item.type,
-          }))
-        );
-      }
-    }
-
-    // resolve();
-    // resolve([
-    //   {
-    //     name: `懒加载第${node.level + 1}级` + +new Date(),
-    //     id: `${+new Date()}`,
-    //   },
-    // ]);
-  } else {
-    resolve([{ name: "暂无数据", leaf: true }]);
+    resolve(result.data);
+  } else if (node.level > 3) {
+    resolve(node.data.children);
   }
 };
 
@@ -255,8 +261,8 @@ const handleTarget = (node: any) => {
 
 .tree {
   // height: 1300px;
-  height: changeHeight(980);
-  width: changeWidth(901.19);
+  // height: changeHeight(980);
+  // width: changeWidth(901.19);
   margin-left: changeHeight(56);
 }
 
@@ -392,7 +398,12 @@ const handleTarget = (node: any) => {
 
 // 修改鼠标点击时的颜色以及节点失去焦点时的背景色
 :deep(.el-tree-node:focus > .el-tree-node__content) {
-  background-color: transparent !important;
+  // background-color: transparent !important;
+  background: linear-gradient(
+    90deg,
+    rgba(82, 127, 243, 0.8) 0%,
+    rgba(59, 38, 148, 0) 100%
+  );
 }
 
 :deep(.el-tree-node__content:hover) {
@@ -610,4 +621,5 @@ const handleTarget = (node: any) => {
 //     }
 //   }
 // }
+
 </style>
diff --git a/src/views/commonPage/pvTree.vue b/src/views/commonPage/pvTree.vue
index 10f564b..a0ba894 100644
--- a/src/views/commonPage/pvTree.vue
+++ b/src/views/commonPage/pvTree.vue
@@ -13,13 +13,19 @@
           :data="treeData"
           node-key="id"
           :props="targetProps"
-          :default-expanded-keys="['tongxiang']"
           lazy
           :load="loadNode"
           @node-click="handleTargetInfo"
           :expand-on-click-node="false"
           empty-text="数据读取中..."
-        ></el-tree>
+          :highlight-current="true"
+          :current-node-key="'id'"
+        >
+        <template v-slot:default="{ node }">
+          <div style=" text-overflow: ellipsis;text-align: left; white-space: nowrap;width: 82%; overflow: hidden;"
+            :title="node.label">{{ node.label }}</div>
+        </template>
+      </el-tree>
       </div>
     </div>
   </div>
@@ -28,7 +34,7 @@
 import { onMounted, ref, watch } from "vue";
 import { ElTree } from "element-plus";
 import treeDatas from "@/assets/json/tree-right2.json";
-import { treeT, treeSecond,pvTree_api } from "@/api/ajust/tree";
+import { treeT, treeSecond, pvTree_api } from "@/api/ajust/tree";
 
 // defineProps<{
 //   elec_list: EList[]
@@ -110,65 +116,65 @@ const loadNode = async (node: any, resolve: any) => {
     }).then((res) => {
       resolve(res.data); //默认加载第1层
     });
-  } else if (node.level > 0 && node.level < 4) {
+  // } else if (node.level > 0 && node.level < 4) {
+  } else if (node.level > 0) {
+
     //默认展开的层级,需要默认几层就判断一下.
     resolve(node.data.children);
-  } else if (node.level === 4) {
-    console.log(node, node.level, "4------");
+  } 
+  //设备树中插入 光伏类型
+  // else if (node.level === 4) {
+  //   console.log(node, node.level, "4------");
 
-    //懒加载
-    let res = await treeSecond({
-      orgID: "8af8470a47aad8e20147aad92e400335",
-      transformId: node.key,
-    });
-    if (
-      res.data.photoVoltaicUnit.length ||
-      res.data.energySupplyStation.length ||
-      res.data.batteryUnit.length
-    ) {
-      let datanames = [];
+  //   //懒加载
+  //   let res = await treeSecond({
+  //     orgID: "8af8470a47aad8e20147aad92e400335",
+  //     transformId: node.key,
+  //   });
+  //   if (
+  //     res.data.photoVoltaicUnit.length ||
+  //     res.data.energySupplyStation.length ||
+  //     res.data.batteryUnit.length
+  //   ) {
+  //     let datanames = [];
 
-      if (res.data.photoVoltaicUnit.length) {
-        datanames.push({
-          name: `光伏(${res.data.photoVoltaicUnit.length})`,
-          id: "guangfu",
-        });
-      }
+  //     if (res.data.photoVoltaicUnit.length) {
+  //       datanames.push({
+  //         name: `光伏(${res.data.photoVoltaicUnit.length})`,
+  //         id: "guangfu",
+  //       });
+  //     }
 
-      resolve(datanames);
-    } else {
-      resolve([{ name: "加载数据", leaf: true }]);
-      console.log(res); //需要将上一级的加号去掉
-    }
-  } else if (node.level === 5) {
-    console.log(node.parent, node.level);
-    //懒加载
-    let res = await treeSecond({
-      orgID: "8af8470a47aad8e20147aad92e400335",
-      transformId: node.parent.key,
-      // transformId: "ed7d892d4f8af8514b6dc01fde016ded55e58",
-    });
-    // 二级服务只挂光伏
+  //     resolve(datanames);
+  //   } else {
+  //     resolve([{ name: "加载数据", leaf: true }]);
+  //     console.log(res); //需要将上一级的加号去掉
+  //   }
+  // }
+  //  else if (node.level === 5) {
+  //  else if (node.level === 4||node.level===5) {
+  //   console.log(node.parent, node.level);
+  //   //懒加载
+  //   let res = await treeSecond({
+  //     orgID: "8af8470a47aad8e20147aad92e400335",
+  //     transformId: node.parent.key,
+  //     // transformId: "ed7d892d4f8af8514b6dc01fde016ded55e58",
+    
+  //   });
+  //   // 二级服务只挂光伏
 
-    if (res.data.photoVoltaicUnit.length) {
-      resolve(
-        res.data.photoVoltaicUnit.map((item) => ({
-          id: item.mrid,
-          name: item.name,
-        }))
-      );
-    }
-
-    // resolve();
-    // resolve([
-    //   {
-    //     name: `懒加载第${node.level + 1}级` + +new Date(),
-    //     id: `${+new Date()}`,
-    //   },
-    // ]);
-  } else {
-    resolve([{ name: "加载数据", leaf: true }]);
-  }
+  //   if (res.data.photoVoltaicUnit.length) {
+  //     resolve(    
+  //       res.data.photoVoltaicUnit.map((item) => ({
+  //         id: item.mrid,
+  //         name: item.name,
+  //         type:item.type,  
+  //       }))
+  //     );
+  //   }
+  // } else {
+  //   // resolve([{ name: "加载数据", leaf: true }]);
+  // }
 };
 
 const emits = defineEmits(["update-node-key"]); ////接收父组件的事件，子组件中触发父组件使用
@@ -177,18 +183,13 @@ const emits = defineEmits(["update-node-key"]); ////接收父组件的事件，
 // 处理选中target数据，最终得到由高层到底层的数组
 const handleTargetInfo = (data: TreeData, node: any) => {
   // console.log(1111111,node);
-  
+
   // targetInfo.resultArr = [];
   // handleTarget(e);
   // 利用设备中的信息调用接口
   // ---------
-  // emits("update-node-key", node); //获取id,用于二级接口服务返回接口给可调资源列表
-
-  if (node.level === 6) {
-    //点中第4层 为单个光伏时 去返回id到父组件 并让父组件获取可调资源的相关信息和表格
-    emits("update-node-key", node); //获取id,用于二级接口服务返回接口给可调资源列表
-  }
-
+  //点中每一层设备树  去返回id到父组件 并让父组件获取可调资源的相关信息和表格
+   emits("update-node-key", node); //获取id,用于二级接口服务返回接口给可调资源列表
   // ---------
 };
 const handleTarget = (node: any) => {
@@ -252,8 +253,8 @@ const handleTarget = (node: any) => {
 
 .tree {
   // height: 1300px;
-  height: changeHeight(980);
-  width: changeWidth(901.19);
+  // height: changeHeight(980);
+  // width: changeWidth(901.19);
   margin-left: changeHeight(56);
 }
 
@@ -389,7 +390,12 @@ const handleTarget = (node: any) => {
 
 // 修改鼠标点击时的颜色以及节点失去焦点时的背景色
 :deep(.el-tree-node:focus > .el-tree-node__content) {
-  background-color: transparent !important;
+  // background-color: transparent !important;
+  background: linear-gradient(
+    90deg,
+    rgba(82, 127, 243, 0.8) 0%,
+    rgba(59, 38, 148, 0) 100%
+  );
 }
 
 :deep(.el-tree-node__content:hover) {
@@ -607,4 +613,5 @@ const handleTarget = (node: any) => {
 //     }
 //   }
 // }
+
 </style>
diff --git a/src/views/commonPage/tree.vue b/src/views/commonPage/tree.vue
index fae5da3..452502e 100644
--- a/src/views/commonPage/tree.vue
+++ b/src/views/commonPage/tree.vue
@@ -1,26 +1,33 @@
 <template>
-  <div class="soureTree">
-    <!-- <div class="source_label">
-          <div class="elec_box_list" v-for="(item, index) in elec_list" :key="index" @click="labelFlag(item.id)"
-              :class="[item.id === label_falg ? 'active' : '']">
-              {{ item.label }}
-          </div>
-      </div> -->
-    <div class="source_tree">
-      <div class="tree">
-        <el-tree
-          ref="targetTreeRef"
-          :data="treeData"
-          node-key="id"
-          :props="targetProps"
-          :default-expanded-keys="['tongxiang']"
-          lazy
-          :load="loadNode"
-          @node-click="handleTargetInfo"
-          :expand-on-click-node="false"
-          empty-text="数据读取中..." 
-        ></el-tree>
-        <!-- <el-tree ref="targetTreeRef" :data="treeData" :highlight-keywords="keyword" :props="props" :load="loadNode" lazy
+  <div class="tree">
+    <el-tree
+      ref="targetTreeRef"
+      :data="treeData"
+      node-key="id"
+      :props="targetProps"
+      :default-expanded-keys="['tongxiang']"
+      lazy
+      :load="loadNode"
+      @node-click="handleTargetInfo"
+      :expand-on-click-node="false"
+      empty-text="数据读取中..."
+    >
+      <template v-slot:default="{ node }">
+        <div
+          style="
+            text-overflow: ellipsis;
+            text-align: left;
+            white-space: nowrap;
+            width: 82%;
+            overflow: hidden;
+          "
+          :title="node.label"
+        >
+          {{ node.label }}
+        </div>
+      </template>
+    </el-tree>
+    <!-- <el-tree ref="targetTreeRef" :data="treeData" :highlight-keywords="keyword" :props="props" :load="loadNode" lazy
         node-key="ID" @node-click="handleNodeClick" :expand-on-click-node="false" empty-text="数据读取中..." v-else>
         <template v-slot:default="{ node }">
           <div :class="`${renderContentColor(node)} cusIcon`"></div>
@@ -28,8 +35,6 @@
             :title="node.label">{{ node.label }}</div>
         </template>
       </el-tree> -->
-      </div>
-    </div>
   </div>
 </template>
 <script setup lang="ts">
@@ -113,139 +118,153 @@ const loadNode = async (node: any, resolve: any) => {
     //   let res= await treeT({
     //   orgID: "8af8470a47aad8e20147aad92e400335",
     // });
-    treeT({
+    let treeData = [];
+    let result = await treeT({
       orgID: "8af8470a47aad8e20147aad92e400335",
-    }).then((res) => {
-      resolve(res.data); //默认加载第1层
     });
-    
-  } else if (node.level > 0 && node.level < 4) {
+    treeData = result.data;
+    resolve(treeData);
+    // treeT({
+    //   orgID: "8af8470a47aad8e20147aad92e400335",
+    // }).then((res) => {
+    //   resolve(res.data); //默认加载第1层
+    // });
+  } else if (node.level > 0 && node.level < 3) {
     //默认展开的层级,需要默认几层就判断一下.
     resolve(node.data.children);
-  } else if (node.level === 4) {
-
-
-    //懒加载
-    let res = await treeSecond({
+  } else if (node.level === 3) {
+    let result = await treeSecond({
       orgID: "8af8470a47aad8e20147aad92e400335",
-      transformId: node.key,
+      mrid: node.key,
     });
-    if (
-      res.data.photoVoltaicUnit.length ||
-      res.data.energySupplyStation.length ||
-      res.data.batteryUnit.length ||
-      res.data.dwellerPile.length
-    ) {
-      let datanames = [];
-      if (res.data.photoVoltaicUnit.length) {
-        datanames.push({
-          name: `光伏(${res.data.photoVoltaicUnit.length})`,
-          id: "guanafu",
-        });
-      }
-      if (res.data.energySupplyStation.length) {
-        datanames.push({
-          name: `充电站(${res.data.energySupplyStation.length})`,
-          id: "chongdianzhan",
-        });
-      }
-      if (res.data.batteryUnit.length) {
-        datanames.push({
-          name: `储能(${res.data.batteryUnit.length})`,
-          id: "chuneng",
-        });
-      }
-      if (res.data.dwellerPile.length) {
-        datanames.push({
-          name: `居民充电桩(${res.data.dwellerPile.length})`,
-          id: "chongdianzhuang",
-        });
-      }
-      resolve(datanames);
-    } else {
-      resolve([{ name: "加载数据", leaf: true }]);
-    }
-  } else if (node.level === 5) {
-    console.log(node.parent, node.level);
-    //懒加载
-    let res = await treeSecond({
-      orgID: "8af8470a47aad8e20147aad92e400335",
-      transformId: node.parent.key,
-      // transformId: "ed7d892d4f8af8514b6dc01fde016ded55e58",
-    });
-    console.log(node, node.parent, "父节点");
-    // 如果父节点为光伏 则返回数据
-    if (node.key === "guanafu") {
-      if (res.data.photoVoltaicUnit.length) {
-        // map转化数组
-        resolve(
-          res.data.photoVoltaicUnit.map((item) => ({
-            id: item.mrid,
-            name: item.name,
-          }))
-        );
-      }
-    }
-    if (node.key === "chongdianzhan") {
-      if (res.data.energySupplyStation.length) {
-        resolve(
-          res.data.energySupplyStation.map((item) => ({
-            id: item.mrid,
-            name: item.name,
-          }))
-        );
-      }
-    }
-    if (node.key === "chongdianzhuang") {
-      if (res.data.dwellerPile.length) {
-        resolve(
-          res.data.dwellerPile.map((item) => ({
-            id: item.mrid,
-            name: item.name,
-          }))
-        );
-      }
-    }
-    if (node.key === "chuneng") {
-      if (res.data.batteryUnit.length) {
-        resolve(
-          res.data.batteryUnit.map((item) => ({
-            id: item.mrid,
-            name: item.name,
-          }))
-        );
-      }
-    }
-
-    // resolve();
-    // resolve([
-    //   {
-    //     name: `懒加载第${node.level + 1}级` + +new Date(),
-    //     id: `${+new Date()}`,
-    //   },
-    // ]);
-  } else {
-    resolve([{ name: "加载数据", leaf: true }]);
+    resolve(result.data);
+  } else if (node.level > 3) {
+    resolve(node.data.children);
   }
+  // else if (node.level > 0 && node.level < 4) {
+  //   //默认展开的层级,需要默认几层就判断一下.
+  //   resolve(node.data.children);
+  // } else if (node.level === 4) {
+  //   //懒加载
+  //   let res = await treeSecond({
+  //     orgID: "8af8470a47aad8e20147aad92e400335",
+  //     transformId: node.key,
+  //   });
+  //   if (
+  //     res.data.photoVoltaicUnit.length ||
+  //     res.data.energySupplyStation.length ||
+  //     res.data.batteryUnit.length ||
+  //     res.data.dwellerPile.length
+  //   ) {
+  //     let datanames = [];
+  //     if (res.data.photoVoltaicUnit.length) {
+  //       datanames.push({
+  //         name: `光伏(${res.data.photoVoltaicUnit.length})`,
+  //         id: "guanafu",
+  //       });
+  //     }
+  //     if (res.data.energySupplyStation.length) {
+  //       datanames.push({
+  //         name: `充电站(${res.data.energySupplyStation.length})`,
+  //         id: "chongdianzhan",
+  //       });
+  //     }
+  //     if (res.data.batteryUnit.length) {
+  //       datanames.push({
+  //         name: `储能(${res.data.batteryUnit.length})`,
+  //         id: "chuneng",
+  //       });
+  //     }
+  //     if (res.data.dwellerPile.length) {
+  //       datanames.push({
+  //         name: `居民充电桩(${res.data.dwellerPile.length})`,
+  //         id: "chongdianzhuang",
+  //       });
+  //     }
+  //     resolve(datanames);
+  //   } else {
+  //     resolve([{ name: "加载数据", leaf: true }]);
+  //   }
+  // } else if (node.level === 5) {
+  //   console.log(node.parent, node.level);
+  //   //懒加载
+  //   let res = await treeSecond({
+  //     orgID: "8af8470a47aad8e20147aad92e400335",
+  //     transformId: node.parent.key,
+  //     // transformId: "ed7d892d4f8af8514b6dc01fde016ded55e58",
+  //   });
+  //   console.log(node, node.parent, "父节点");
+  //   // 如果父节点为光伏 则返回数据
+  //   if (node.key === "guanafu") {
+  //     if (res.data.photoVoltaicUnit.length) {
+  //       // map转化数组
+  //       resolve(
+  //         res.data.photoVoltaicUnit.map((item) => ({
+  //           id: item.mrid,
+  //           name: item.name,
+  //         }))
+  //       );
+  //     }
+  //   }
+  //   if (node.key === "chongdianzhan") {
+  //     if (res.data.energySupplyStation.length) {
+  //       resolve(
+  //         res.data.energySupplyStation.map((item) => ({
+  //           id: item.mrid,
+  //           name: item.name,
+  //         }))
+  //       );
+  //     }
+  //   }
+  //   if (node.key === "chongdianzhuang") {
+  //     if (res.data.dwellerPile.length) {
+  //       resolve(
+  //         res.data.dwellerPile.map((item) => ({
+  //           id: item.mrid,
+  //           name: item.name,
+  //         }))
+  //       );
+  //     }
+  //   }
+  //   if (node.key === "chuneng") {
+  //     if (res.data.batteryUnit.length) {
+  //       resolve(
+  //         res.data.batteryUnit.map((item) => ({
+  //           id: item.mrid,
+  //           name: item.name,
+  //         }))
+  //       );
+  //     }
+  //   }
+
+  //   // resolve();
+  //   // resolve([
+  //   //   {
+  //   //     name: `懒加载第${node.level + 1}级` + +new Date(),
+  //   //     id: `${+new Date()}`,
+  //   //   },
+  //   // ]);
+  // } else {
+  //   resolve([{ name: "加载数据", leaf: true }]);
+  // }
 };
 
 const emits = defineEmits(["update-node-key"]); ////接收父组件的事件，子组件中触发父组件使用
 
 // 点击树节点
 // 处理选中target数据，最终得到由高层到底层的数组
-const handleTargetInfo = (data: TreeData,  node: any) => {
+const handleTargetInfo = (data: TreeData, node: any) => {
   // targetInfo.resultArr = [];
 
-  console.log("点击的节点",node);
+  console.log("点击的节点", node);
+
+  if (node.level === 4 || node.level === 3) {
+    console.log(node.level, "0000", node.key);
 
-  if (node.level === 4||node.level===3) {
-    console.log(node.level,'0000',node.key);
-    
     console.log("zheshishaya");
     //点中第4层 为台区时 去返回id到父组件 并让父组件获取可调资源的相关信息和表格
     // emits("update-node-key", node.key); //获取id,用于二级接口服务返回接口给可调资源列表
     emits("update-node-key", node); //获取id,用于二级接口服务返回接口给可调资源列表
-
   }
 };
 const handleTarget = (node: any) => {
@@ -309,8 +328,8 @@ const handleTarget = (node: any) => {
 
 .tree {
   // height: 1300px;
-  height: changeHeight(980);
-  width: changeWidth(901.19);
+  // height: changeHeight(980);
+  // width: changeWidth(901.19);
   margin-left: changeHeight(56);
 }
 
diff --git a/src/views/layout/header.vue b/src/views/layout/header.vue
index c700382..1a05156 100644
--- a/src/views/layout/header.vue
+++ b/src/views/layout/header.vue
@@ -202,6 +202,7 @@ const styleVar = computed(() => {
 @function changeHeight($height) {
   @return calc(var(--box-height) * ($height / 2160));
 }
+// 上海院分辨率 3840*1080
 
 p {
   margin-bottom: 0;
@@ -445,4 +446,20 @@ p {
 .nav_content .nav_list .nav_right .activeNav {
   color: #ffe560;
 }
+/* 针对3840x1080分辨率的样式 */
+@media screen and (min-width: 3840px) and (max-height: 2150px) {
+  .header {
+    height: changeHeight(246);
+  }
+  .pdding_box {
+    height: changeHeight(186);
+  }
+  .header-logo{
+    .img1 {
+    width: changeWidth(400.84);
+    // height: changeHeight(64.32);
+    margin-left: changeWidth(72);
+  }
+  }
+}
 </style>
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 60f582a..fa6a5fa 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -181,6 +181,7 @@ const styleVar = computed(() => {
   @return calc(var(--box-height) * ($height / 1440));
 }
 
+
 .bigscreen {
   width: 100%;
   height: 100vh;
@@ -207,6 +208,7 @@ const styleVar = computed(() => {
 
 .header_layout {
   /* height: 186px; */
+  height: changeHeight(186);
   width: 100%;
   position: absolute;
   top: 0;
@@ -256,9 +258,13 @@ const styleVar = computed(() => {
   flex: 1;
   margin-top: 4.5%;
 }
-// @media screen and (max-width:1920px) {
-//     .main {
-//       margin-top: 6%;
-//     }
-// }
+/* 针对3840x1080分辨率的样式 */
+@media screen and (min-width: 3840px) and (max-height: 2150px) {
+  .main {
+  /* margin-top: 7.8125rem; */
+  flex: 1;
+  margin-top: 3%;
+}
+}
+
 </style>
diff --git a/src/views/pages/carPage/index.vue b/src/views/pages/carPage/index.vue
index 6957881..d11281c 100644
--- a/src/views/pages/carPage/index.vue
+++ b/src/views/pages/carPage/index.vue
@@ -79,10 +79,7 @@
 
                 <div class="info2_m">
                   <div class="top1_box">
-                    <img
-                      src="@/assets/images/v2-1/store_taiqu.png"
-                      alt=""
-                    />
+                    <img src="@/assets/images/v2-1/store_taiqu.png" alt="" />
                     <div class="left1_box">
                       <div class="name">
                         <div class="cen">
@@ -442,7 +439,7 @@
                 >下发指令</el-button
               >
               <div class="send_box" v-else>
-                <span class="fs45">发送中</span> 
+                <span class="fs45">发送中</span>
                 <div class="loading-dots">
                   <span>.</span>
                   <span>.</span>
@@ -792,11 +789,11 @@ const submitForm = () => {
     startTime: datat_start,
     endTime: datat_end,
   };
-  const randomDelay=getRandomInt(2000,5000)//取2000-5000ms之间的随机数
+  const randomDelay = getRandomInt(2000, 5000); //取2000-5000ms之间的随机数
   setTimeout(() => {
-    send_Status.value=false
-   
-    ajustCarPageFlag.value=false
+    send_Status.value = false;
+
+    ajustCarPageFlag.value = false;
 
     ElMessage({
       showClose: true,
@@ -804,9 +801,9 @@ const submitForm = () => {
       type: "success",
     });
   }, randomDelay);
-  
+
   // setTimeout(() => {
-    
+
   // }, 3000);
   // send_Status.value=false
   ajustInfo_api(datainput).then((res: any) => {
@@ -1132,8 +1129,9 @@ const styleVar = computed(() => {
       .car_left_box {
         margin-top: changeHeight(30);
         width: 100%;
+       // width: changeHeight(961.19);
         height: changeHeight(1679.23); //内容高度
-        display: flex;
+        // display: flex;
         // align-items: center;
         // flex-direction: column;
       }
diff --git a/src/views/pages/homePage/index.vue b/src/views/pages/homePage/index.vue
index 2104658..b563211 100644
--- a/src/views/pages/homePage/index.vue
+++ b/src/views/pages/homePage/index.vue
@@ -175,10 +175,7 @@
                       </div>
                     </div>
                     <div class="posimg">
-                      <img
-                        src="@/assets/images/v2-1/load_cdz.png"
-                        alt=""
-                      />
+                      <img src="@/assets/images/v2-1/load_cdz.png" alt="" />
                     </div>
                     <div class="list_info">
                       <div class="rowlist">
@@ -298,10 +295,7 @@
                       </div>
                     </div>
                     <div class="name_box">
-                      <img
-                        src="@/assets/images/v2-1/net_peiwang.png"
-                        alt=""
-                      />
+                      <img src="@/assets/images/v2-1/net_peiwang.png" alt="" />
                       <div class="photovoltaic">
                         <div class="rowbox">
                           <div class="photovoltaic_key1">
@@ -365,10 +359,7 @@
                       </div>
                     </div>
                     <div class="name_box">
-                      <img
-                        src="@/assets/images/v2-1/store_taiqu.png"
-                        alt=""
-                      />
+                      <img src="@/assets/images/v2-1/store_taiqu.png" alt="" />
                       <div class="photovoltaic">
                         <div class="rowbox">
                           <div class="photovoltaic_key1">
@@ -546,10 +537,7 @@
                 <div class="title_info margin2">资源概况</div>
                 <div class="content_info">
                   <div class="rowlist">
-                    <img
-                      src="@/assets/images/v2-1/store_user.png"
-                      alt=""
-                    />
+                    <img src="@/assets/images/v2-1/store_user.png" alt="" />
                     <div class="rbox">
                       <div class="key bshadow">
                         <div class="namebg">西小站</div>
@@ -666,26 +654,27 @@
       </div>
     </div>
     <!-- 通知消息 -->
-      <div class="content_center_alert1" v-if="true">
-        <div class="run_detail" v-if="alert_tongzhiFlag">
-          <div class="tip">
-            <img src="@/assets/images/mainPage/icon_alert_pv.png" alt="" />
-            <span class="jianbian">通知</span>
-            <div class="closebtn" @click="alert_tongzhiFlag = false"></div>
-          </div>
-          <div class="content">
-            <div class="box">
-              <img src="@/assets/images/homePage/tongzhi.png" alt="" />
-              <div class="gaobottom">
-                <div class="gao">
-                  <!-- 接到10kV线路556调节需求30kW，时间17:00-18:00，待处理 -->
-                  [编号：48776100419]台区55608（10kV 556线路）于2024-07-12 14:36:54发生功率倒送，反向负载率1.52%。
-                </div>
+    <div class="content_center_alert1" v-if="true">
+      <div class="run_detail" v-if="alert_tongzhiFlag">
+        <div class="tip">
+          <img src="@/assets/images/mainPage/icon_alert_pv.png" alt="" />
+          <span class="jianbian">通知</span>
+          <div class="closebtn" @click="alert_tongzhiFlag = false"></div>
+        </div>
+        <div class="content">
+          <div class="box">
+            <img src="@/assets/images/homePage/tongzhi.png" alt="" />
+            <div class="gaobottom">
+              <div class="gao">
+                <!-- 接到10kV线路556调节需求30kW，时间17:00-18:00，待处理 -->
+                [编号：48776100419]台区55608（10kV 556线路）于2024-07-12
+                14:36:54发生功率倒送，反向负载率1.52%。
               </div>
             </div>
           </div>
         </div>
       </div>
+    </div>
     <div class="black_box" v-if="alert_pvFlag"></div>
   </div>
 </template>
@@ -1123,7 +1112,6 @@ let leftData = reactive<leftDataInfo>({
         itemStyle: {
           // color: "#F1BA50",
           color: "#00B4F4",
-
         },
       },
       {
@@ -1288,10 +1276,10 @@ let storageEchart = reactive([
 const handlestorageTabDate = (val: any) => {
   storagetabDateFlag.value = val.id;
 };
-let alert_tongzhiFlag=ref(false)
-const alert_tongzhi=()=>{
-  alert_tongzhiFlag.value=true
-}
+let alert_tongzhiFlag = ref(false);
+const alert_tongzhi = () => {
+  alert_tongzhiFlag.value = true;
+};
 // 充放点量时间选择器
 let selectDateObj = ref(null);
 // 向线型图传参数
@@ -1598,9 +1586,7 @@ const styleVar = computed(() => {
       display: flex;
       align-items: center;
       margin-left: changeWidth(51);
-      width: changeHeight(744.74);
-      height: changeHeight(26);
-      width: changeWidth(1069.5);
+      width: changeHeight(1069.5);
       height: changeHeight(50.11);
       font-size: changeHeight(40);
       padding-left: changeWidth(77);
@@ -1710,7 +1696,7 @@ const styleVar = computed(() => {
         z-index: 4;
         cursor: pointer;
       }
-      
+
       .content_info {
         display: flex;
         flex-direction: column;
@@ -1753,15 +1739,15 @@ const styleVar = computed(() => {
         .name_box {
           display: flex;
           height: changeHeight(300);
-          // align-items: center;
+          align-items: center;
 
           img {
-            margin-top: 5%;
             width: changeWidth(228.25);
             height: changeHeight(201.6);
           }
           .photovoltaic,
           .new_energy {
+            height: 100%;
             margin-left: changeWidth(49);
             display: flex;
             flex-direction: column;
@@ -1771,7 +1757,8 @@ const styleVar = computed(() => {
               display: flex;
               height: changeHeight(60);
               .photovoltaic_key1 {
-                width: changeWidth(309.89);
+                // width: changeWidth(309.89);
+                flex: 1;
                 justify-content: space-between;
                 display: flex;
                 align-items: center;
@@ -1797,13 +1784,14 @@ const styleVar = computed(() => {
               }
 
               .photovoltaic_value1 {
-                margin-left: changeWidth(83.5);
+                // margin-left: changeWidth(83.5);
                 display: flex;
-                flex: 1;
-                justify-content: space-between;
-                line-height: changeHeight(80);
+                flex: 2;
+                justify-content: space-around;
+
                 .kw,
                 .hu {
+                  flex: 2;
                   font-size: changeHeight(35);
                   font-weight: 600;
                   span {
@@ -1818,6 +1806,7 @@ const styleVar = computed(() => {
                 // }
               }
               .short {
+                flex: 2;
                 margin-left: 2%;
               }
             }
@@ -1842,15 +1831,12 @@ const styleVar = computed(() => {
           display: flex;
           flex-direction: column;
           justify-content: center;
-          padding-left: changeWidth(90);
           .area_kw {
             font-size: changeHeight(50);
-
             font-weight: 600;
-
             color: #ffffff;
             display: flex;
-
+            justify-content: center;
             height: changeHeight(75);
             text-shadow: 0px 0px 10px rgba(65, 171, 168, 0.6);
             .r {
@@ -1864,25 +1850,19 @@ const styleVar = computed(() => {
             display: flex;
             font-size: changeHeight(30);
             /* 文字 */
-
+            justify-content: center;
             font-weight: 400;
-
             color: #cccccc;
-
             opacity: 0.8;
           }
         }
         .total_load_3dEchart {
           box-sizing: border-box;
-          // width: changeHeight(236.97);
-          // height: changeHeight(135.41);
-
           width: changeWidth(506.97);
           height: changeHeight(325.41);
           display: flex;
           margin-bottom: changeHeight(80);
           padding-left: changeWidth(120);
-          //
           position: relative;
           .title_load {
             position: absolute;
@@ -1893,21 +1873,15 @@ const styleVar = computed(() => {
           }
           .echarts {
             position: absolute;
-            left: changeHeight(-100);
-            top: changeHeight(-20);
-            width: changeWidth(506.97);
-            height: changeHeight(325.41);
             left: changeHeight(-200);
             top: changeHeight(-120);
-            width: changeWidth(506.97);
-            height: changeHeight(325.41);
             width: changeWidth(1006.97);
             height: changeHeight(625.41);
           }
         }
       }
-      .source_t{
-        img{
+      .source_t {
+        img {
           width: changeHeight(70.21);
           height: changeHeight(83);
         }
@@ -1964,7 +1938,7 @@ const styleVar = computed(() => {
           top: 50%;
           left: 38%;
           img {
-            width: changeWidth(227.77);
+            width: changeHeight(227.77);
             height: changeHeight(193.42);
           }
         }
@@ -1983,7 +1957,6 @@ const styleVar = computed(() => {
             display: flex;
             flex-direction: column;
             justify-content: center;
-            padding-left: changeWidth(90);
             .area_kw {
               font-size: changeHeight(50);
 
@@ -1991,6 +1964,7 @@ const styleVar = computed(() => {
 
               color: #ffffff;
               display: flex;
+              justify-content: center;
 
               height: changeHeight(75);
               text-shadow: 0px 0px 10px rgba(65, 171, 168, 0.6);
@@ -2007,7 +1981,7 @@ const styleVar = computed(() => {
               /* 文字 */
 
               font-weight: 400;
-
+              justify-content: center;
               color: #cccccc;
 
               opacity: 0.8;
@@ -2036,8 +2010,6 @@ const styleVar = computed(() => {
               position: absolute;
               left: changeHeight(-220);
               top: changeHeight(-120);
-              width: changeWidth(506.97);
-              height: changeHeight(325.41);
               width: changeWidth(1006.97);
               height: changeHeight(625.41);
             }
@@ -2080,8 +2052,8 @@ const styleVar = computed(() => {
                   background: url("@/assets/images/btnType/fontbg.png")
                     no-repeat;
                   background-size: 100% 100%;
-                  padding-left: changeWidth(82);
-                  padding-right: changeWidth(82);
+                  // padding-left: changeWidth(82);
+                  // padding-right: changeWidth(82);
                   align-items: flex-end;
                   padding-bottom: changeHeight(42);
                   line-height: changeHeight(38);
@@ -2091,10 +2063,10 @@ const styleVar = computed(() => {
           }
         }
       }
-      .load_t{
-        img{
+      .load_t {
+        img {
           width: changeHeight(78);
-          height:changeHeight(76);
+          height: changeHeight(76);
         }
       }
     }
@@ -2223,12 +2195,12 @@ const styleVar = computed(() => {
               justify-content: space-evenly;
               .rowbox {
                 display: flex;
-
+                flex: 1;
                 height: changeHeight(60);
                 line-height: changeHeight(60);
                 .photovoltaic_key1 {
-                  width: changeWidth(409.23);
-
+                  // width: changeWidth(409.23);
+                  flex: 2;
                   justify-content: space-between;
                   display: flex;
                   align-items: center;
@@ -2251,16 +2223,10 @@ const styleVar = computed(() => {
                   }
                 }
                 .photovoltaic_value1 {
-                  // background-color: red;
-                  // margin-left: changeHeight(43.5);
-                  // border: 1px solid red;
-
-                  margin-left: changeWidth(125.5);
-
                   display: flex;
-                  flex: 1;
-                  justify-content: space-between;
-                  line-height: changeHeight(60);
+                  flex: 2;
+                  align-items: center;
+                  justify-content: center;
                   font-size: changeHeight(35);
                   span {
                     font-size: changeHeight(30);
@@ -2268,13 +2234,11 @@ const styleVar = computed(() => {
                     color: #6ffbf7;
                   }
                   .kw {
-                    // background-color: #00f0ff;
-                    flex: 3;
+                    flex: 2;
                     text-align: left;
                   }
                   .hu {
-                    flex: 2;
-                    text-align: left;
+                    flex: 1;
                   }
                 }
               }
@@ -2343,11 +2307,9 @@ const styleVar = computed(() => {
 
           align-items: center;
           img {
-            width: changeWidth(227.77);
-            height: changeHeight(130.17);
-            width: changeWidth(227.77);
+
+            width: changeHeight(227.77);
             height: changeHeight(193.42);
-            ////----
 
             margin-top: 15%;
           }
@@ -2931,420 +2893,420 @@ const styleVar = computed(() => {
     }
   }
   .content_center_alert1 {
-  z-index: 1001;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
+    z-index: 1001;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
 
-  .run_detail {
-    box-sizing: border-box;
-    width: changeHeight(938);
-    height: changeHeight(476.7);
-    // width:changeHeight(1338.06);
-    // height: changeHeight(1218.37);
-    background: url("@/assets/images/homePage/jinggaobg.png") no-repeat;
-    background-size: 100% 100%;
-    padding-top: 1%;
-    padding-left: changeHeight(27);
+    .run_detail {
+      box-sizing: border-box;
+      width: changeHeight(938);
+      height: changeHeight(476.7);
+      // width:changeHeight(1338.06);
+      // height: changeHeight(1218.37);
+      background: url("@/assets/images/homePage/jinggaobg.png") no-repeat;
+      background-size: 100% 100%;
+      padding-top: 1%;
+      padding-left: changeHeight(27);
 
-    .box {
-      display: flex;
-      align-items: center;
-      height: 100%;
-      img {
-        width: changeHeight(185);
-        height: changeHeight(185);
-      }
-      .gaobottom {
-        padding-left: 2%;
-        display: flex;
-        flex-direction: column;
-        font-size: changeHeight(43);
-
-        span,
-        .gao {
-          display: flex;
-          text-align: left;
-          flex-direction: flex-start;
-        }
-      }
-    }
-    .tip {
-      height: 14%;
-      // height: 7%;
-
-      display: flex;
-      align-items: center;
-
-      img {
-        height: changeHeight(49);
-        margin-right: changeHeight(14);
-      }
-
-      /* 精品可视化素材店 */
-
-      font-weight: 600;
-      font-size: changeHeight(45);
-    }
-
-    .title {
-      height: changeHeight(152);
-      display: flex;
-      align-items: center;
-
-      .titlebg {
-        width: 100%;
-        height: changeHeight(82.15);
-        background: url("@/assets/images/osPage/run_detail_titlebg.png")
-          no-repeat;
-        background-size: 100% 100%;
+      .box {
         display: flex;
         align-items: center;
-
-        span {
-          margin-left: changeHeight(35);
-          font-weight: 400;
-          font-size: changeHeight(35);
-        }
-      }
-    }
-
-    .content {
-      height: 68%;
-      margin-top: 1%;
-
-      :deep(.table_box) {
-        width: 100%;
         height: 100%;
-        font-size: changeHeight(40) !important;
-
-        // 表格样式
-        .el-table,
-        tr,
-        th,
-        td {
-          background-color: transparent !important;
+        img {
+          width: changeHeight(185);
+          height: changeHeight(185);
         }
+        .gaobottom {
+          padding-left: 2%;
+          display: flex;
+          flex-direction: column;
+          font-size: changeHeight(43);
 
-        .el-table__body-wrapper {
-          color: #ffffff;
-        }
-
-        // 设置header的字体和高度
-        .el-table__header-wrapper {
-          .cell {
+          span,
+          .gao {
             display: flex;
-            align-items: center;
-            justify-content: center;
-            font-size: changeHeight(40);
-            font-weight: 400;
-            height: changeHeight(93);
-            line-height: changeHeight(93);
-          }
-        }
-
-        // 设置行的字体和高度
-        .el-table__body-wrapper {
-          td {
-            // border-top: 1px solid rgba(255, 255, 255, 0.5);
-            // border-bottom: none;
-          }
-
-          //  控制每行的高度
-          .cell {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            height: changeHeight(100);
-            line-height: changeHeight(40);
-            font-size: changeHeight(38);
-            // font-weight: 400;
-          }
-        }
-
-        // el-table出现小白线 伪类
-        .el-table__inner-wrapper:before {
-          height: 0;
-        }
-
-        // 设置第一列单独样式
-        .el-table td:nth-child(1) {
-          color: #6ffbf7;
-          font-size: changeHeight(45) !important;
-        }
-
-        // 设置第一列单独样式
-        .el-table td:nth-child(2) {
-          font-size: changeHeight(50) !important;
-        }
-
-        // 设置第一列单独样式
-        .el-table td:nth-child(3) {
-          font-size: changeHeight(35) !important;
-        }
-
-        // 设置第一列单独样式
-        .el-table td:nth-child(4) {
-          color: #43fb55;
-          font-size: changeHeight(45) !important;
-        }
-
-        // 去除表格得所有边框
-        .el-table thead tr > th {
-          width: 90% !important;
-          background-color: rgba(0, 100, 156, 0.8) !important;
-          border: 0px 0px 10px #50ffff !important;
-          color: #fff;
-        }
-
-        // 更改表格每行背景颜色
-        .el-table tbody tr > td {
-          // background-color: rgb(26,28,119);
-          color: #fff;
-          border: transparent !important;
-        }
-
-        // 鼠标滑过每行的颜色
-        .el-table--enable-row-hover .el-table__body tr:hover > td {
-          background-color: rgba(145, 245, 255, 0.1) !important;
-        }
-
-        // 去除表格上边框
-        .el-table th.el-table__cell.is-leaf {
-          border: transparent !important;
-        }
-
-        //  去除表格下边框
-        .el-table::before,
-        .el-table--group::after,
-        .el-table--border::after {
-          background-color: unset !important;
-          border: transparent !important;
-        }
-
-        .el-table {
-          border: transparent !important;
-
-          background: linear-gradient(
-            180deg,
-            #01233c 0%,
-            rgba(8, 150, 255, 0.42) 100%
-          );
-        }
-      }
-    }
-
-    // 分页样式
-    :deep(.bottom) {
-      //
-      margin-right: changeHeight(27);
-      height: 8%;
-      display: flex;
-      justify-content: center;
-
-      // align-items: flex-start;
-      // 分页
-      .el-pagination {
-        .el-pagination__total {
-          border: 1px solid #fff;
-          border-radius: changeHeight(4);
-          padding: changeHeight(5) changeHeight(10);
-          color: rgba(255, 255, 255, 0.6);
-        }
-
-        .btn-prev,
-        .btn-next,
-        .el-pager li {
-          background-color: transparent;
-          color: rgba(87, 223, 242, 0.6);
-          border: 1px solid #57dff2;
-          border-radius: changeHeight(4);
-          margin: 0 changeHeight(5);
-          font-size: changeHeight(30);
-          padding: changeHeight(25) changeHeight(23); //图标大小
-        }
-
-        .el-icon {
-          font-size: changeHeight(25); //》 《箭头大小
-        }
-
-        .el-pager {
-          .is-active {
-            color: #6ffbf7;
-          }
-        }
-
-        .el-pagination__sizes {
-          margin-left: changeHeight(15);
-
-          .el-input {
-            width: changeHeight(100);
-            border: 1px solid #fff;
-            border-radius: changeHeight(4);
-
-            .el-input__wrapper {
-              background-color: transparent;
-              box-shadow: none !important;
-
-              .el-input__inner {
-                color: rgba(255, 255, 255, 0.6);
-              }
-            }
-          }
-        }
-
-        .el-pagination__jump {
-          .el-input {
-            border: 1px solid #fff;
-            border-radius: changeHeight(4);
-
-            .el-input__wrapper {
-              box-shadow: none;
-              background-color: transparent;
-
-              .el-input__inner {
-                color: rgba(255, 255, 255, 0.6);
-              }
-            }
-          }
-
-          span {
-            color: rgba(255, 255, 255, 0.6);
+            text-align: left;
+            flex-direction: flex-start;
           }
         }
       }
-    }
-  }
-  .area_load {
-    width: changeHeight(1156.86);
-    height: changeHeight(620.62);
-    box-sizing: border-box;
-    background: url("@/assets/images/osPage/area_load_bg.png") no-repeat;
-    background-size: 100% 100%;
-    padding-top: 1%;
-    padding-left: changeHeight(27);
-    .tip {
-      height: 7%;
-      display: flex;
-      align-items: center;
+      .tip {
+        height: 14%;
+        // height: 7%;
 
-      img {
-        height: changeHeight(32.46);
-        margin-right: changeHeight(14);
-      }
-
-      /* 精品可视化素材店 */
-
-      font-weight: 600;
-      font-size: changeHeight(35);
-    }
-    .title {
-      height: changeHeight(105.88);
-      display: flex;
-      align-items: center;
-      .titlebg {
-        width: changeHeight(842.04);
-        height: changeHeight(57.23);
-        background: url("@/assets/images/osPage/run_detail_titlebg.png")
-          no-repeat;
-        background-size: 100% 100%;
         display: flex;
         align-items: center;
-        position: relative;
-        span {
-          margin-left: changeHeight(24);
-          font-weight: 400;
-        }
-        // 下拉菜单
-        :deep(.selectbox) {
-          position: absolute;
-          .example-showcase .el-dropdown-link {
-            cursor: pointer;
-            color: red !important;
-            display: flex;
-            align-items: center;
-          }
-        }
-      }
-    }
-    .content {
-      height: 75%;
-      display: flex;
 
-      .left,
-      .right {
-        flex: 1;
-        .number {
-          height: changeHeight(50);
-          display: flex;
-          justify-content: center;
+        img {
+          height: changeHeight(49);
+          margin-right: changeHeight(14);
         }
-        .rate {
+
+        /* 精品可视化素材店 */
+
+        font-weight: 600;
+        font-size: changeHeight(45);
+      }
+
+      .title {
+        height: changeHeight(152);
+        display: flex;
+        align-items: center;
+
+        .titlebg {
+          width: 100%;
+          height: changeHeight(82.15);
+          background: url("@/assets/images/osPage/run_detail_titlebg.png")
+            no-repeat;
+          background-size: 100% 100%;
           display: flex;
           align-items: center;
 
-          .box {
-            display: flex;
-            align-items: center;
-
-            .yuan {
-              background: #50ffff;
-              width: changeHeight(8);
-              height: changeHeight(8);
-              border-radius: changeHeight(8);
-            }
-            .key {
-              font-size: changeHeight(18);
-            }
-          }
-          .val {
-            display: flex;
-            align-items: center;
-
-            .ratekw {
-              /* 9999 */
-              font-weight: 600;
-              font-size: changeHeight(25);
-
-              // color: #12e7e3;
-            }
-            span {
-              margin-top: changeHeight(5);
-              font-size: changeHeight(18);
-              // background-color: #00f0ff;
-              margin-left: changeHeight(5);
-            }
-          }
-        }
-        .numberBefore {
-          position: relative;
-          .Btn1 {
-            position: absolute;
-            height: changeHeight(39.59);
-            line-height: changeHeight(39.59);
-
-            width: changeHeight(100.8);
-          }
-          .bg1 {
-            background: url("@/assets/images/btnType/btnblue.png") no-repeat;
-            background-size: 100% 100%;
-          }
-          .bg2 {
-            background: url("@/assets/images/btnType/btngreen.png") no-repeat;
-            background-size: 100% 100%;
-          }
-          .beforeEchart {
-            height: changeHeight(400);
-            width: changeHeight(550);
+          span {
+            margin-left: changeHeight(35);
+            font-weight: 400;
+            font-size: changeHeight(35);
           }
         }
       }
-      .right {
+
+      .content {
+        height: 68%;
+        margin-top: 1%;
+
+        :deep(.table_box) {
+          width: 100%;
+          height: 100%;
+          font-size: changeHeight(40) !important;
+
+          // 表格样式
+          .el-table,
+          tr,
+          th,
+          td {
+            background-color: transparent !important;
+          }
+
+          .el-table__body-wrapper {
+            color: #ffffff;
+          }
+
+          // 设置header的字体和高度
+          .el-table__header-wrapper {
+            .cell {
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              font-size: changeHeight(40);
+              font-weight: 400;
+              height: changeHeight(93);
+              line-height: changeHeight(93);
+            }
+          }
+
+          // 设置行的字体和高度
+          .el-table__body-wrapper {
+            td {
+              // border-top: 1px solid rgba(255, 255, 255, 0.5);
+              // border-bottom: none;
+            }
+
+            //  控制每行的高度
+            .cell {
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              height: changeHeight(100);
+              line-height: changeHeight(40);
+              font-size: changeHeight(38);
+              // font-weight: 400;
+            }
+          }
+
+          // el-table出现小白线 伪类
+          .el-table__inner-wrapper:before {
+            height: 0;
+          }
+
+          // 设置第一列单独样式
+          .el-table td:nth-child(1) {
+            color: #6ffbf7;
+            font-size: changeHeight(45) !important;
+          }
+
+          // 设置第一列单独样式
+          .el-table td:nth-child(2) {
+            font-size: changeHeight(50) !important;
+          }
+
+          // 设置第一列单独样式
+          .el-table td:nth-child(3) {
+            font-size: changeHeight(35) !important;
+          }
+
+          // 设置第一列单独样式
+          .el-table td:nth-child(4) {
+            color: #43fb55;
+            font-size: changeHeight(45) !important;
+          }
+
+          // 去除表格得所有边框
+          .el-table thead tr > th {
+            width: 90% !important;
+            background-color: rgba(0, 100, 156, 0.8) !important;
+            border: 0px 0px 10px #50ffff !important;
+            color: #fff;
+          }
+
+          // 更改表格每行背景颜色
+          .el-table tbody tr > td {
+            // background-color: rgb(26,28,119);
+            color: #fff;
+            border: transparent !important;
+          }
+
+          // 鼠标滑过每行的颜色
+          .el-table--enable-row-hover .el-table__body tr:hover > td {
+            background-color: rgba(145, 245, 255, 0.1) !important;
+          }
+
+          // 去除表格上边框
+          .el-table th.el-table__cell.is-leaf {
+            border: transparent !important;
+          }
+
+          //  去除表格下边框
+          .el-table::before,
+          .el-table--group::after,
+          .el-table--border::after {
+            background-color: unset !important;
+            border: transparent !important;
+          }
+
+          .el-table {
+            border: transparent !important;
+
+            background: linear-gradient(
+              180deg,
+              #01233c 0%,
+              rgba(8, 150, 255, 0.42) 100%
+            );
+          }
+        }
+      }
+
+      // 分页样式
+      :deep(.bottom) {
+        //
+        margin-right: changeHeight(27);
+        height: 8%;
+        display: flex;
+        justify-content: center;
+
+        // align-items: flex-start;
+        // 分页
+        .el-pagination {
+          .el-pagination__total {
+            border: 1px solid #fff;
+            border-radius: changeHeight(4);
+            padding: changeHeight(5) changeHeight(10);
+            color: rgba(255, 255, 255, 0.6);
+          }
+
+          .btn-prev,
+          .btn-next,
+          .el-pager li {
+            background-color: transparent;
+            color: rgba(87, 223, 242, 0.6);
+            border: 1px solid #57dff2;
+            border-radius: changeHeight(4);
+            margin: 0 changeHeight(5);
+            font-size: changeHeight(30);
+            padding: changeHeight(25) changeHeight(23); //图标大小
+          }
+
+          .el-icon {
+            font-size: changeHeight(25); //》 《箭头大小
+          }
+
+          .el-pager {
+            .is-active {
+              color: #6ffbf7;
+            }
+          }
+
+          .el-pagination__sizes {
+            margin-left: changeHeight(15);
+
+            .el-input {
+              width: changeHeight(100);
+              border: 1px solid #fff;
+              border-radius: changeHeight(4);
+
+              .el-input__wrapper {
+                background-color: transparent;
+                box-shadow: none !important;
+
+                .el-input__inner {
+                  color: rgba(255, 255, 255, 0.6);
+                }
+              }
+            }
+          }
+
+          .el-pagination__jump {
+            .el-input {
+              border: 1px solid #fff;
+              border-radius: changeHeight(4);
+
+              .el-input__wrapper {
+                box-shadow: none;
+                background-color: transparent;
+
+                .el-input__inner {
+                  color: rgba(255, 255, 255, 0.6);
+                }
+              }
+            }
+
+            span {
+              color: rgba(255, 255, 255, 0.6);
+            }
+          }
+        }
+      }
+    }
+    .area_load {
+      width: changeHeight(1156.86);
+      height: changeHeight(620.62);
+      box-sizing: border-box;
+      background: url("@/assets/images/osPage/area_load_bg.png") no-repeat;
+      background-size: 100% 100%;
+      padding-top: 1%;
+      padding-left: changeHeight(27);
+      .tip {
+        height: 7%;
+        display: flex;
+        align-items: center;
+
+        img {
+          height: changeHeight(32.46);
+          margin-right: changeHeight(14);
+        }
+
+        /* 精品可视化素材店 */
+
+        font-weight: 600;
+        font-size: changeHeight(35);
+      }
+      .title {
+        height: changeHeight(105.88);
+        display: flex;
+        align-items: center;
+        .titlebg {
+          width: changeHeight(842.04);
+          height: changeHeight(57.23);
+          background: url("@/assets/images/osPage/run_detail_titlebg.png")
+            no-repeat;
+          background-size: 100% 100%;
+          display: flex;
+          align-items: center;
+          position: relative;
+          span {
+            margin-left: changeHeight(24);
+            font-weight: 400;
+          }
+          // 下拉菜单
+          :deep(.selectbox) {
+            position: absolute;
+            .example-showcase .el-dropdown-link {
+              cursor: pointer;
+              color: red !important;
+              display: flex;
+              align-items: center;
+            }
+          }
+        }
+      }
+      .content {
+        height: 75%;
+        display: flex;
+
+        .left,
+        .right {
+          flex: 1;
+          .number {
+            height: changeHeight(50);
+            display: flex;
+            justify-content: center;
+          }
+          .rate {
+            display: flex;
+            align-items: center;
+
+            .box {
+              display: flex;
+              align-items: center;
+
+              .yuan {
+                background: #50ffff;
+                width: changeHeight(8);
+                height: changeHeight(8);
+                border-radius: changeHeight(8);
+              }
+              .key {
+                font-size: changeHeight(18);
+              }
+            }
+            .val {
+              display: flex;
+              align-items: center;
+
+              .ratekw {
+                /* 9999 */
+                font-weight: 600;
+                font-size: changeHeight(25);
+
+                // color: #12e7e3;
+              }
+              span {
+                margin-top: changeHeight(5);
+                font-size: changeHeight(18);
+                // background-color: #00f0ff;
+                margin-left: changeHeight(5);
+              }
+            }
+          }
+          .numberBefore {
+            position: relative;
+            .Btn1 {
+              position: absolute;
+              height: changeHeight(39.59);
+              line-height: changeHeight(39.59);
+
+              width: changeHeight(100.8);
+            }
+            .bg1 {
+              background: url("@/assets/images/btnType/btnblue.png") no-repeat;
+              background-size: 100% 100%;
+            }
+            .bg2 {
+              background: url("@/assets/images/btnType/btngreen.png") no-repeat;
+              background-size: 100% 100%;
+            }
+            .beforeEchart {
+              height: changeHeight(400);
+              width: changeHeight(550);
+            }
+          }
+        }
+        .right {
+        }
       }
     }
   }
-}
   .black_box {
     position: absolute;
     top: -20%;
@@ -3358,4 +3320,40 @@ const styleVar = computed(() => {
     height: changeHeight(933);
   }
 }
+@media screen and (min-width: 3840px) and (max-height: 2150px) {
+  .content_left {
+    width: changeWidth(646) !important;
+    .source {
+      .echarts {
+        left: changeHeight(-220);
+        top: changeHeight(-120);
+        width: changeWidth(556.97) !important;
+        height: changeHeight(625.41) !important;
+      }
+    }
+    .load {
+      .echarts {
+        width: changeWidth(556.97) !important;
+        height: changeHeight(625.41) !important;
+      }
+    }
+  }
+  .content_right {
+    width: changeWidth(646) !important;
+  }
+  .content_info {
+    .name_box {
+      img {
+        width: changeWidth(120) !important;
+        height: changeWidth(120) !important;
+      }
+      .photovoltaic_key1 {
+        img {
+          width: changeHeight(40) !important;
+          height: changeHeight(40) !important;
+        }
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/pages/pvPage/index.vue b/src/views/pages/pvPage/index.vue
index 846253f..9ee373d 100644
--- a/src/views/pages/pvPage/index.vue
+++ b/src/views/pages/pvPage/index.vue
@@ -1,6 +1,6 @@
-<!-- 光伏页面 -->
 
 <template>
+  <!-- 光伏页面 -->
   <div class="pvPage_container" :style="styleVar">
     <div class="content_left">
       <div
@@ -29,7 +29,7 @@
           <div class="tree_box content_bg">
             <tree
               @update:nodeValue="updatePvechart"
-              v-mode="tree_node"
+              v-model="tree_node"
               @update-node-key="getTreeNode"
             ></tree>
           </div>
@@ -142,23 +142,38 @@
                 </div>
               </div>
             </div>
-            <div class="infotitle"><span>实时发电量曲线</span></div>
+            <div class="infotitle">
+              <span>实时发电量曲线</span>
+              <div class="timeBox">
+                <el-date-picker
+                  class="customPicker"
+                  popper-class="customDatePicker"
+                  type="date"
+                  v-model="selectDataCurves"
+                  @change="selectDateCurvesChange"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
+                />
+              </div>
+            </div>
             <div class="info2">
               <powerLine
                 :cur_pvArr="cur_pvArr"
                 v-if="cur_pvArrFlag"
-                :key="refreshkey"
+                :key="refreshkey_Curves"
               ></powerLine>
             </div>
             <div class="infotitle">
               <span>实时功率曲线</span>
               <div class="timeBox">
                 <el-date-picker
-                
-                  v-model="value1"
+                  class="customPicker"
+                  popper-class="customDatePicker"
                   type="date"
-                  placeholder="Pick a date"
-                  :default-value="new Date(2010, 9, 1)"
+                  v-model="selectDataPv"
+                  @change="selectDatePvChange"
+                  format="YYYY-MM-DD"
+                  value-format="YYYY-MM-DD"
                 />
               </div>
             </div>
@@ -175,7 +190,7 @@
               </div> -->
               <rateLine
                 :pvArr="pvArr"
-                v-if="pvArrFlag"
+                v-if="refreshkey_pv"
                 :key="refreshkey"
               ></rateLine>
             </div>
@@ -231,6 +246,7 @@ import {
   getCurrentInstance,
   inject,
 } from "vue";
+
 import { ElMessage } from "element-plus";
 import { getColorFun } from "@/hooks/getColorFun/index";
 import { app_load, api_send, api_register } from "@/ue4Player/app";
@@ -238,84 +254,120 @@ import tree from "@/views/commonPage/pvTree.vue";
 import powerLine from "./powerLine.vue";
 import rateLine from "./rateLine.vue";
 import timePvLine from "./timePvLine.vue";
+import { getNowDate } from "@/hooks/getDate";
 import { useNow, useDateFormat } from "@vueuse/core";
 import { id } from "element-plus/es/locale/index.mjs";
-import { curpower_api } from "@/api/pvPage/pvApi";
+import { curpower_api, pvCurInfo_api } from "@/api/pvPage/pvApi";
 import { pvApi } from "@/api/Osp/svgApi";
-
+import { log } from "echarts/types/src/util/log.js";
+let citySourceId = "8af8470a47aad8e20147aad92e400335";
 onMounted(() => {
-  let Objinput = { orgID: "8af8470a47aad8e20147aad92e400335" }; //全部 获取光伏实时发电量
-  getCurves(Objinput); //获取城南的接口{orgID}
-  let inputdata = { mrid: "03DKX-24289" };
-  getpv(inputdata); //光伏功率曲线
+  getpvCurInfo({ orgID: citySourceId }) //获取光伏信息 有城南id可得
+  getCurves({ orgID: citySourceId }); //获取光伏的接口发电量 有城南id可得
+  getpv({ orgID: citySourceId }); //光伏功率曲线 有城南id可得
 });
 
-const getTreeNode = (treeNode: any) => {
-  let Objinput = {
-    orgID: "8af8470a47aad8e20147aad92e400335",
-    mrid: treeNode.key,
-  }; //全部 获取光伏实时发电量
 
-  getCurves(Objinput); //获取光伏的接口发电量
-  let inputdata = { mrid: treeNode.key };
-  getpv(inputdata);
+let treeNodeId:any=ref(null) //节点id
+//设备树节点操作模块
+const getTreeNode = (treeNode: any) => {
+  // console.log('设备树的节点',treeNode)
+  treeNodeId.value=treeNode.data //将设备树节点保存起来
+  
 };
-// 当日累计发电量
+watch(() => treeNodeId.value,()=>{
+  refreshkey_pv.value+=1
+  refreshkey_Curves.value += 1;
+  console.log('设备树节点修改后监听事件',treeNodeId.value);
+  //通过设备树节点id获取数据 
+  let apipv={ orgID: citySourceId,type:treeNodeId.value.type,mrid:treeNodeId.value.id }
+  getpvCurInfo(apipv) //获取光伏信息  入参orgID、type和id
+  getCurves(apipv); //获取光伏的接口发电量 
+  getpv(apipv);//光伏功率曲线
+})
+
+// 模块1 光伏实时信息
+const getpvCurInfo = (datares: any) => {
+  console.log(datares,'pv');
+  
+  pvCurInfo_api(datares)
+    .then((res) => {
+      //实时量测信息
+      if (res.data) {
+        if (res.data.total) {
+          total_cur.value = Number(res.data.total).toFixed(2);
+        }
+        if (res.data["380V"]) {
+          power380V.value = Number(res.data["380V"]).toFixed(2);
+        }
+        if (res.data["35kV"]) {
+          power35kv.value = Number(res.data["35kV"]).toFixed(2);
+        }
+        if (res.data["10kV"]) {
+          power10kv.value = Number(res.data["10kV"]).toFixed(2);
+        }
+      }
+    })
+    .catch();
+};
+
+//模块2 当日累计发电量
 let total_cur = ref("0");
 let power35kv = ref("0");
 let power10kv = ref("0");
 let power380V = ref("0");
 let cur_pvArrFlag = ref(false);
 let cur_pvArr = reactive([]);
+let selectDataCurves = ref(getNowDate()); //发电量曲线日期框绑定值
+let  refreshkey_Curves=ref(0)
 // 获取光伏实时发电量
 const getCurves = (datares: any) => {
   curpower_api(datares)
     .then((res) => {
-      console.log("res", res);
-      //实时量测信息
-      if (res.data) {
-        if (res.data.total) {
-          total_cur.value = res.data.total;
-        }
-        if (res.data["380V"]) {
-          power380V.value = res.data["380V"];
-        }
-        if (res.data["35kV"]) {
-          power35kv.value = res.data["35kV"];
-        }
-        if (res.data["10kV"]) {
-          power10kv.value = res.data["10kV"];
-        }
-      }
+      refreshkey_Curves.value += 1;
       // 发电量曲线
-      if (res.data.data) {
+      if (res.data) {
         cur_pvArrFlag.value = true;
-        cur_pvArr = res.data.data;
+        cur_pvArr = res.data;
       }
     })
     .catch((error) => {
       console.log(error);
     });
 };
+//发电量按日期历史查询功能
+const selectDateCurvesChange = (val: any) => {
+  // selectDataCurves.value = val;
+  getCurves({ orgID: citySourceId,date:val }); //获取光伏的接口发电量
+};
+
 let pvArr = reactive([]); //光伏
 let pvArrFlag = ref<boolean>(false);
-// 获取光伏功率曲线
-// let refreshkey=ref(1)
+let selectDataPv = ref(getNowDate()); //功率曲线日期框绑定值
+
+//模块3 获取光伏功率曲线
+let refreshkey_pv=ref(1)
 const getpv = (inputdata: any) => {
   pvApi(inputdata).then((res) => {
-    console.log(res, "respv");
     pvArr = res.data;
-    console.log(pvArr, "pvArr");
     refreshkey.value += 1;
     if (pvArr.length > 0) {
       pvArrFlag.value = true;
     }
   });
 };
+//光伏按日期历史查询功能
+const selectDatePvChange = (val: any) => {
+  console.log(val, "日期框修改值");
+  refreshkey_pv.value+=1
+  getpv({ orgID: citySourceId,data: val })
+};
 
 const HMS = useDateFormat(useNow(), "HH:mm:ss"); //当前时间
 const YMD = useDateFormat(useNow(), "YYYY-MM-DD"); //当前日期
 
+
+
 // 左侧------------------------------------------------
 
 // 设备树标识
@@ -706,7 +758,7 @@ const styleVar = computed(() => {
         box-sizing: border-box;
         .infotitle {
           position: relative;
-       
+
           width: 90%;
           height: changeHeight(50);
           line-height: changeHeight(50);
@@ -719,11 +771,10 @@ const styleVar = computed(() => {
           span {
             margin-left: 7%;
           }
-          .timeBox{
+          .timeBox {
             position: absolute;
-            right: 2%;
+            right: 3%;
           }
-
         }
         .info1 {
           height: changeHeight(359);
@@ -828,6 +879,7 @@ const styleVar = computed(() => {
         .info3 {
           width: 90%;
           height: changeHeight(600);
+         
           position: relative;
           .btnList {
             z-index: 6;
@@ -988,5 +1040,9 @@ const styleVar = computed(() => {
       }
     }
   }
+  :deep(.el-input__wrapper) {
+    background-color: transparent !important;
+    border-radius: 0 0 0 0 !important;
+  }
 }
 </style>
diff --git a/src/views/pages/pvPage/powerLine.vue b/src/views/pages/pvPage/powerLine.vue
index 27ec060..f6137a7 100644
--- a/src/views/pages/pvPage/powerLine.vue
+++ b/src/views/pages/pvPage/powerLine.vue
@@ -13,6 +13,7 @@ import {
 } from "vue";
 import transformFontSize from "@/hooks/transFormSize.ts";
 import "echarts/lib/component/dataZoom";
+import { pa } from "element-plus/es/locales.mjs";
 onMounted(() => {
   drawOneLine(props.cur_pvArr);
 });
@@ -46,7 +47,7 @@ const drawOneLine = (arr: any) => {
         let str = `
           <div style="width:100%:height:100%">
             <div style="display:flex;justify-content:space-between;"> ${
-              param[0].name.split(" ")[0]
+              param[0].name
             }</div>
             ${getDom(param)}
           </div>`;
@@ -80,7 +81,7 @@ const drawOneLine = (arr: any) => {
       },
     },
     grid: {
-      top: "25%",
+      top: "15%",
       left: "8%",
       right: "8%",
       bottom: "13%",
@@ -96,9 +97,10 @@ const drawOneLine = (arr: any) => {
         color: "#fff",
         fontSize: transformFontSize(35),
         padding: [0, 0, 0, 30],
-        // formatter: function (param: any) {
-        //   return param.split(' ')[1].split(':')[0] + ':' + param.split(' ')[1].split(':')[1]
-        // },
+        formatter: function (param: any) {
+           let paramspit=param.split(' ')
+            return paramspit[0] + "\n" + paramspit[1]; // 双行显示，\n 换行
+          },
       },
       // data: ["03:00", "06:00", "09:00", "12:00", "15:00", "18:00", "24:00"],
       data: arr.map((rtime) => rtime?.timeStamp),
diff --git a/src/views/pages/pvPage/rateLine.vue b/src/views/pages/pvPage/rateLine.vue
index ffcb824..f87c247 100644
--- a/src/views/pages/pvPage/rateLine.vue
+++ b/src/views/pages/pvPage/rateLine.vue
@@ -65,7 +65,7 @@ const drawOneLine = (arr:any) => {
       },
     },
     legend: {
-      top: "0%",
+      top: "5%",
       right: "5%",
       orient: "vertical",
       // data: ["实时功率", "短期预测功率", "超短期预测功率"],
@@ -80,7 +80,7 @@ const drawOneLine = (arr:any) => {
       },
     },
     grid: {
-      top: "25%",
+      top: "15%",
       left: "8%",
       right: "8%",
       bottom: "13%",
diff --git a/vite.config.ts b/vite.config.ts
index e653d62..9b0e524 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -90,8 +90,9 @@ export default defineConfig({
       "/api": {
         // target: "http://192.168.43.48:8080",
         // 测试地址 gu
-        target: "http://192.168.18.109:8080",
-
+        // target: "http://192.168.18.105:8080",
+        // target: "http://127.0.0.1:5173",
+        target: "http://localhost:18082",
         // 天津地址
         // target:"http://192.168.5.102:18801",
         changeOrigin: true,
@@ -101,9 +102,10 @@ export default defineConfig({
         secure: false,
       },
       "/api-svg": {
-        // target: "http://127.0.0.1:19081",
+        // target: "http://127.0.0.1:5173",
+        target: "http://localhost:18082",
         // 测试地址 gu
-        target: "http://192.168.18.109:8080",
+        // target: "http://192.168.18.105:8080",
         // 天津地址
         // target:"http://192.168.5.102:18801",
         changeOrigin: true,
@@ -113,9 +115,10 @@ export default defineConfig({
         secure: false,
       },
       "/api_car": {
-        // target: "http://127.0.0.1:16091",
+        // target: "http://127.0.0.1:5173",
+        target: "http://localhost:18082",
         // 测试地址 gu
-        target: "http://192.168.18.109:8080",
+        // target: "http://192.168.18.105:8080",
         // 天津地址
         // target:"http://192.168.5.102:18801",
         changeOrigin: true,
@@ -125,7 +128,7 @@ export default defineConfig({
         secure: false,
       },
       // "/ba-api": {
-      //   // target: "http://localhost:8080",
+       // target: "http://localhost:8080",
       //    // 桐乡地址
       //   // target:"http://localhost:8999",
       //   // 局域网工作站地址