s

src/api/Osp/svgApi.ts

@@ -44,5 +44,39 @@ export function usrzApi(data: any) {
     data,
   });
 }
+// 西小站充电桩
+export function usrz_55606Api(data: any) { 
+  return request({
+    // url: "http://10.120.75.248:19081/algoService/feederPowerFlowResult",
+    // url: "http://127.0.0.1:19081/algoService/feederPowerFlowResult",
+    url: "/api/wwpm/biz/v1/gccr/gross_power_curve/charge_pipe",
+    method: "POST",
+    data,
+  });
+}
+// 西小站光伏
+export function pv_55606Api(data: any) { 
+  return request({
+    // url: "http://10.120.75.248:19081/algoService/feederPowerFlowResult",
+    // url: "http://127.0.0.1:19081/algoService/feederPowerFlowResult",
+    url: "/api/wwpm/biz/v1/gccr/gross_power_curve/photovoltaics",
+    method: "POST",
+    data,
+  });
+}
+// 西小站储能
+export function batty_unit_55606Api(data: any) { 
+  return request({
+    // url: "http://10.120.75.248:19081/algoService/feederPowerFlowResult",
+    // url: "http://127.0.0.1:19081/algoService/feederPowerFlowResult",
+    url: "/api/wwpm/biz/v1/gccr/gross_power_curve/battery_unit",
+    method: "POST",
+    data,
+  });
+}
+
+
+
+
 
 

src/views/pages/OpticalStoragePage/index.vue

@@ -412,7 +412,15 @@ import OpticalStorageSVG from "@/assets/json/OpticalStorageSVG.js";
 import "@svgdotjs/svg.panzoom.js";
 import "echarts/lib/component/dataZoom";
 import loadingPage from "@/views/commonPage/loading.vue";
-import { buttyApi, svgdApi, pvApi, usrzApi } from "@/api/Osp/svgApi";
+import {
+  buttyApi,
+  svgdApi,
+  pvApi,
+  usrzApi,
+  pv_55606Api,
+  usrz_55606Api,
+  batty_unit_55606Api,
+} from "@/api/Osp/svgApi";
 import {
   SVG,
   extend as SVGextend,
@@ -532,6 +540,7 @@ const handleAreaLoad = () => {
 
 // 右侧  储能
 let battyArr = reactive([]); //储能
+
 let pvArr = reactive([]); //光伏
 let userzArr = reactive([]); //用户侧充电桩
 
@@ -539,7 +548,7 @@ let battyArrFlag = ref<boolean>(false);
 let pvArrFlag = ref<boolean>(false);
 let userzFlag = ref<boolean>(false);
 const getpv = () => {
-  pvApi({ orgID: "8af8470a47aad8e20147aad92e400335" }).then((res) => {
+  pv_55606Api({}).then((res) => {
     console.log(res, "respv");
     console.log("1----------", res);
 
@@ -553,7 +562,7 @@ const getpv = () => {
   });
 };
 const getuser = () => {
-  usrzApi({ mrid: "03DKX-24289" }).then((res) => {
+  usrz_55606Api({}).then((res) => {
     // userzArr = res.data;
     userzArr = handleEchartsData_timeStamp_p(res.data, 60);
 
@@ -563,7 +572,7 @@ const getuser = () => {
   });
 };
 const getbatrry = () => {
-  buttyApi({}).then((res) => {
+  batty_unit_55606Api({}).then((res) => {
     console.log(res, "ssss");
     // battyArr = res.data;
     battyArr = handleEchartsData_timeStamp_p(res.data, 60);
@@ -838,7 +847,7 @@ let handleShowSvg = async (svgIndex: string) => {
     nextTick(() => {
       handleAnimate(result);
     });
-  }, 300);
+  }, 3000);
   // ---------离线的svg 返回结果
 
   function fun(svgHtml: any) {

src/views/pages/OpticalStoragePage/storeLine.vue

@@ -14,10 +14,12 @@ import {
 import transformFontSize from "@/hooks/transFormSize.ts";
 import "echarts/lib/component/dataZoom";
 onMounted(() => {
-  drawOneLine(props.echartArr);
+  drawOneLine(props.echartArr,props.echartArr_u,props.echartArr_i);
 });
 const props = defineProps<{
   echartArr: any[];
+  echartArr_u:any[];
+  echartArr_i:any[];
 }>();
 
 // 获取echart挂载的DOM节点
@@ -26,7 +28,7 @@ const OneLine: any = ref();
 // 获取当前组件实例
 const { proxy }: any = getCurrentInstance();
 
-const drawOneLine = (arr: any) => {
+const drawOneLine = (arr: any,arr_u:any,arr_i:any) => {
   console.log(arr, "储能的曲线222");
 
   let myChart = proxy.$echarts.init(OneLine.value);
@@ -70,7 +72,7 @@ const drawOneLine = (arr: any) => {
       top: "0%",
       right: "5%",
       orient: "vertical",
-      data: ["总功率"],
+      data: ["总功率","电压","电流"],
       itemWidth: transformFontSize(40),
       itemHeight: transformFontSize(18),
       itemGap: transformFontSize(8),
@@ -136,6 +138,34 @@ const drawOneLine = (arr: any) => {
         barWidth: 2, // 柱子宽度核心代码
         smooth: true,
         showSymbol: false,
+        itemStyle: {
+          color: "rgba(0, 252, 255,1)",
+        },
+        areaStyle: {
+          normal: {
+            color: new proxy.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: "rgba(0, 252, 255, 0.4)",
+              },
+
+              {
+                offset: 1,
+
+                color: "rgba(0, 252, 255,0.01)",
+              },
+            ]),
+          },
+        },
+        // data: [20, 42, 41, 24, 40, 30, 10],
+        data: arr.map((yitem) => yitem.p),
+      },
+      {
+        name: "电压",
+        type: "line",
+        barWidth: 2, // 柱子宽度核心代码
+        smooth: true,
+        showSymbol: false,
         itemStyle: {
           color: "rgba(248, 153, 21,1)",
         },
@@ -156,7 +186,35 @@ const drawOneLine = (arr: any) => {
           },
         },
         // data: [20, 42, 41, 24, 40, 30, 10],
-        data: arr.map((yitem) => yitem.p),
+        data: arr.map((yitem) => yitem.u),
+      },
+      {
+        name: "电流",
+        type: "line",
+        barWidth: 2, // 柱子宽度核心代码
+        smooth: true,
+        showSymbol: false,
+        itemStyle: {
+          color: "rgba(107, 255, 210,1)",
+        },
+        areaStyle: {
+          normal: {
+            color: new proxy.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              {
+                offset: 0,
+                color: "rgba(107, 255, 210, 0.4)",
+              },
+
+              {
+                offset: 1,
+
+                color: "rgba(107, 255, 210, 0.01)",
+              },
+            ]),
+          },
+        },
+        // data: [20, 42, 41, 24, 40, 30, 10],
+        data: arr.map((yitem) => yitem.i),
       },
     ],
   };

src/views/pages/homePage/index.vue

@@ -49,7 +49,8 @@
                     <div class="total_load_3dEchart">
                       <div class="title_load fs40">负荷户数比例</div>
                       <div class="echarts">
-                        <threeEchart2></threeEchart2>
+                        <!-- <Treepie ></Treepie> -->
+                        <Treepie v-if="show" :threeDPieData="leftData.threeDPieData"></Treepie>
                       </div>
 
                       <!-- <threeDPie :threeDPieData="leftData.threeDPieData"></threeDPie> -->