diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index 2b21263..0000000
Binary files a/dist.zip and /dev/null differ
diff --git a/src/api/carPage/index.ts b/src/api/carPage/index.ts
index f18e4f8..e694372 100644
--- a/src/api/carPage/index.ts
+++ b/src/api/carPage/index.ts
@@ -29,5 +29,14 @@ export function running_api(data: any) {
 }
 
 
+// 车网的能量调节指令接口
+export function ajustInfo_api(data: any) {
+  return request({
+    url: "/api_car/wwpm/ev-data/v1/ctrl/command",
+    method: "POST",
+    data,
+  });
+}
+
 
 
diff --git a/src/views/commonPage/carTree.vue b/src/views/commonPage/carTree.vue
index a18c778..f12ddef 100644
--- a/src/views/commonPage/carTree.vue
+++ b/src/views/commonPage/carTree.vue
@@ -8,16 +8,27 @@
       </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"></el-tree>
+        <el-tree
+          ref="targetTreeRef"
+          :data="treeData"
+          node-key="id"
+          :expand-on-click-node="false"
+          empty-text="数据读取中..."
+          :props="targetProps"
+          :default-expanded-keys="['tongxiang']"
+          lazy
+          :load="loadNode"
+          @node-click="handleTargetInfo"
+        ></el-tree>
       </div>
     </div>
   </div>
 </template>
 <script setup lang="ts">
-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 { 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";
 
 // defineProps<{
 //   elec_list: EList[]
@@ -29,55 +40,55 @@ import { treeT, treeSecond, carTree_api } from '@/api/ajust/tree'
 
 // idflag样式
 // let idFlag = ref<number>(1)
-const label_falg = ref<number>(1)
+const label_falg = ref<number>(1);
 //通过判断(源网荷储的小标题)的labelFlag值调不同的树数据
 const labelFlag = (id: number) => {
-  label_falg.value = id
+  label_falg.value = id;
   if (id == 1) {
   } else if (id == 2) {
   } else if (id == 3) {
   } else {
   }
-}
+};
 // el-tree相关配置
 // 默认展开节点id
 // let defaultExpanded = ref<string[]>(['tongxiang'])
 // 默认展开指定数据
 // label childern等数据的配置
 const targetProps = {
-  children: 'children',
-  label: 'name',
-  isLeaf: 'leaf'
-}
+  children: "children",
+  label: "name",
+  isLeaf: "leaf",
+};
 // tree数据处理
 interface Tree {
-  baseVoltageMrid?: string
-  name?: string
-  leaf?: boolean
-  children?: Tree[]
+  baseVoltageMrid?: string;
+  name?: string;
+  leaf?: boolean;
+  children?: Tree[];
 }
 
 // json数据
 interface TreeData {
-  name: string
-  key?: string
-  leaf?: boolean
-  children?: TreeData[]
-  [otherProps: string]: any
+  name: string;
+  key?: string;
+  leaf?: boolean;
+  children?: TreeData[];
+  [otherProps: string]: any;
 }
 let treeDate = ref<Tree[]>([
   {
-    baseVoltageMrid: '',
-    name: '',
-    children: []
-  }
-])
+    baseVoltageMrid: "",
+    name: "",
+    children: [],
+  },
+]);
 
 // 判断是否有该节点
 onMounted(() => {
   // initTreeAPI();
-})
-let treeData = ref<any>([])
+});
+let treeData = ref<any>([]);
 // let initTreeDate: any = [];
 // // 初始化设备树的层级
 // const initTreeAPI = async () => {
@@ -91,15 +102,15 @@ let treeData = ref<any>([])
 const loadNode = async (node: any, resolve: any) => {
   //默认加载的节点
   if (node.level === 0) {
-    let treeData = []
+    let treeData = [];
     let result = await carTree_api({
-      orgID: '8af8470a47aad8e20147aad92e400335'
-    })
-    treeData = result.data
-    resolve(treeData)
+      orgID: "8af8470a47aad8e20147aad92e400335",
+    });
+    treeData = result.data;
+    resolve(treeData);
   } else if (node.level > 0 && node.level < 4) {
     //默认展开的层级,需要默认几层就判断一下.
-    resolve(node.data.children)
+    resolve(node.data.children);
   } else if (node.level === 4) {
     // 利用设备中的信息调用接口
     // ---------
@@ -107,58 +118,58 @@ const loadNode = async (node: any, resolve: any) => {
     // ---------
     //懒加载
     let res = await treeSecond({
-      orgID: '8af8470a47aad8e20147aad92e400335',
-      transformId: node.key
-    })
+      orgID: "8af8470a47aad8e20147aad92e400335",
+      transformId: node.key,
+    });
     if (res.data.energySupplyStation.length || res.data.dwellerPile.length) {
-      let datanames = []
+      let datanames = [];
 
       if (res.data.energySupplyStation.length) {
         datanames.push({
           name: `充电站(${res.data.energySupplyStation.length})`,
-          id: 'chongdianzhan'
-        })
+          id: "chongdianzhan",
+        });
       }
 
       if (res.data.dwellerPile.length) {
         datanames.push({
           name: `居民充电桩(${res.data.dwellerPile.length})`,
-          id: 'chongdianzhuang'
-        })
+          id: "chongdianzhuang",
+        });
       }
-      resolve(datanames)
+      resolve(datanames);
     } else {
-      resolve([{ name: '暂无数据', leaf: true }])
-      console.log(res) //需要将上一级的加号去掉
+      resolve([{ name: "暂无数据", leaf: true }]);
+      console.log(res); //需要将上一级的加号去掉
     }
   } else if (node.level === 5) {
     //懒加载
     let res = await treeSecond({
-      orgID: '8af8470a47aad8e20147aad92e400335',
-      transformId: node.parent.key
+      orgID: "8af8470a47aad8e20147aad92e400335",
+      transformId: node.parent.key,
       // transformId: "ed7d892d4f8af8514b6dc01fde016ded55e58",
-    })
+    });
 
-    if (node.key === 'chongdianzhan') {
+    if (node.key === "chongdianzhan") {
       if (res.data.energySupplyStation.length) {
         resolve(
-          res.data.energySupplyStation.map(item => ({
+          res.data.energySupplyStation.map((item) => ({
             id: item.mrid,
             name: item.name,
-            type: item.type
+            type: item.type,
           }))
-        )
+        );
       }
     }
-    if (node.key === 'chongdianzhuang') {
+    if (node.key === "chongdianzhuang") {
       if (res.data.dwellerPile.length) {
         resolve(
-          res.data.dwellerPile.map(item => ({
+          res.data.dwellerPile.map((item) => ({
             id: item.mrid,
             name: item.name,
-            type: item.type
+            type: item.type,
           }))
-        )
+        );
       }
     }
 
@@ -170,26 +181,26 @@ const loadNode = async (node: any, resolve: any) => {
     //   },
     // ]);
   } else {
-    resolve([{ name: '暂无数据', leaf: true }])
+    resolve([{ name: "暂无数据", leaf: true }]);
   }
-}
+};
 
-const emits = defineEmits(['update-node-key']) ////接收父组件的事件，子组件中触发父组件使用
+const emits = defineEmits(["update-node-key"]); ////接收父组件的事件，子组件中触发父组件使用
 
 // 点击树节点
 // 处理选中target数据，最终得到由高层到底层的数组
 const handleTargetInfo = (data: TreeData, node: any) => {
-  console.log(node, 'node')
+  console.log(node, "node");
 
-  emits('update-node-key', node)
-}
+  emits("update-node-key", node);
+};
 const handleTarget = (node: any) => {
   // 递归得到target结果数组
-  if (!node.parent) return
+  if (!node.parent) return;
 
   // targetInfo.resultArr.unshift(node.data);
   // handleTarget(node.parent);
-}
+};
 </script>
 <style scoped lang="scss">
 @function changeWidth($width) {
@@ -313,9 +324,9 @@ const handleTarget = (node: any) => {
 // el-input中图标设置大小
 /* //有子节点 且未展开 */
 :deep(.el-tree .el-tree-node.is-focusable .el-tree-node__expand-icon:before) {
-  background: url('@/assets/images/tree/icon_off.png') no-repeat 0 3px;
+  background: url("@/assets/images/tree/icon_off.png") no-repeat 0 3px;
   // background: url("@/assets/images/tree/icon_off.png") no-repeat 0 changeHeight(15);
-  content: '';
+  content: "";
   display: block;
   // width: 80px;
   // height: 80px;
@@ -337,8 +348,8 @@ const handleTarget = (node: any) => {
 
 /* //有子节点 且已展开 */
 :deep(.el-tree .is-expanded .el-tree-node__expand-icon.expanded:before) {
-  background: url('@/assets/images/tree/icon_on.png') no-repeat 0 3px;
-  content: '';
+  background: url("@/assets/images/tree/icon_on.png") no-repeat 0 3px;
+  content: "";
   display: block;
 
   // padding-right: 18px;
@@ -387,10 +398,18 @@ const handleTarget = (node: any) => {
 :deep(.el-tree-node__content:hover) {
   // background-color: transparent;
 
-  background: linear-gradient(90deg, rgba(82, 127, 243, 0.2) 0%, rgba(48, 74, 141, 0) 100%);
+  background: linear-gradient(
+    90deg,
+    rgba(82, 127, 243, 0.2) 0%,
+    rgba(48, 74, 141, 0) 100%
+  );
 }
 
-:deep(.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content) {
+:deep(
+    .el-tree--highlight-current
+      .el-tree-node.is-current
+      > .el-tree-node__content
+  ) {
   background-color: transparent;
 }
 
diff --git a/src/views/pages/CapacityAdjustmentPage/index.vue b/src/views/pages/CapacityAdjustmentPage/index.vue
index 26aafcb..ee03cde 100644
--- a/src/views/pages/CapacityAdjustmentPage/index.vue
+++ b/src/views/pages/CapacityAdjustmentPage/index.vue
@@ -93,7 +93,6 @@
                   </div>
                 </div>
               </div>
-
               <div class="source_list">
                 <div class="table_box">
                   <el-table
@@ -151,10 +150,7 @@
                 </div>
               </div>
             </div>
-
             <div class="info3">
-              <!-- <rateLine_will :rateDate="rateDate_will"></rateLine_will> -->
-              <!--  -->
             </div>
           </div>
           <div class="capAjust_box content_bg" v-else>
@@ -169,21 +165,6 @@
                   </div>
                 </div>
               </div>
-              <!-- <div class="info11">
-                <div>
-                  <div class="yuan"></div>
-                  可调节裕度 &nbsp;(<span class="colorf">-30</span>~<span
-                    class="colorf"
-                    >50</span
-                  >) kW
-                </div>
-                <div>
-                  （<span class="colorf">2024-06-08 12:00</span>~<span
-                    class="colorf"
-                    >2024-06-08 12:00</span
-                  >）
-                </div>
-              </div> -->
               <div class="source_list">
                 <div class="table_box">
                   <el-table
@@ -204,6 +185,13 @@
                         }}</span>
                       </template>
                     </el-table-column>
+                    <el-table-column label="装机容量/额定功率" align="center">
+                      <template #default="scope">
+                        <span style="margin-left: 10px">{{
+                          scope.row.rated_s
+                        }}</span>
+                      </template>
+                    </el-table-column>
                   </el-table>
                 </div>
               </div>
@@ -216,21 +204,10 @@
                 v-if="rateDate_curFlag"
                 :key="refreshkey"
               ></rateLine>
-              <!-- <rateLine
-                :rateDate="rateDate_cur"
-           
-                v-if="keyechart"
-                
-              ></rateLine> -->
             </div>
             <div class="infotitle_box">
               <div class="infotitle_short">
                 <div class="bg"></div>
-                <!-- <img
-                  src="@/assets/images/common/title_yuanicon.png"
-                  alt=""
-                  class="yuan"
-                /> -->
                 <span>负载率预测</span>
                 <div class="btns">
                   <div class="btnbg fs35" @click="handleClickPC">策略配置</div>
@@ -252,16 +229,7 @@
                 </div>
               </div>
             </div>
-            <!-- <div class="infotitle_box">
-              <div class="infotitle_short">
-                <div class="yuan"></div>
-                <div class="line"></div>
-              </div>
-              <span>负载率预测</span>
-              
-            </div> -->
             <div class="info3">
-           
               <rateLine_will
                 v-if="rateDate_willFlag"
                 :rateDate="rateDate_will"
@@ -961,7 +929,7 @@ const handleSaveDate = () => {
   });
   console.log(adjustTableData, "adjustTableData");
   refreshkey.value += 1;
-  rateDate_will=[]
+  rateDate_will = [];
   //保存后要进行负载率预测
   forceRateApi({
     orgID: "8af8470a47aad8e20147aad92e400335",
@@ -970,7 +938,7 @@ const handleSaveDate = () => {
   }).then((res) => {
     console.log(res, "1------------res");
     rateDate_will = res.data.result;
-    if(res.data.result.length>0){
+    if (res.data.result.length > 0) {
       rateDate_willFlag.value = true;
     }
   });
diff --git a/src/views/pages/CapacityAdjustmentPage/rateLine.vue b/src/views/pages/CapacityAdjustmentPage/rateLine.vue
index 0083298..abd664e 100644
--- a/src/views/pages/CapacityAdjustmentPage/rateLine.vue
+++ b/src/views/pages/CapacityAdjustmentPage/rateLine.vue
@@ -71,7 +71,7 @@ const drawOneLine = (rateArr: RateDateInfo[]) => {
               item.seriesName
             }：</div><div>${
               item.value === undefined ? "0" : item.value
-            }kW</div></div>`;
+            }%</div></div>`;
           });
           return newStr;
         }
diff --git a/src/views/pages/OpticalStoragePage/index.vue b/src/views/pages/OpticalStoragePage/index.vue
index 56d0d13..660b1d1 100644
--- a/src/views/pages/OpticalStoragePage/index.vue
+++ b/src/views/pages/OpticalStoragePage/index.vue
@@ -3,23 +3,38 @@
 <template>
   <div class="OpticalStoragePage_container" :style="styleVar">
     <div class="content_left">
-      <div :class="`animated ${hideLeft ? 'fadeInLeftBig' : 'fadeOutLeftBig'}`" :style="{ opacity: hideLeft ? '1' : '0' }">
+      <div
+        :class="`animated ${hideLeft ? 'fadeInLeftBig' : 'fadeOutLeftBig'}`"
+        :style="{ opacity: hideLeft ? '1' : '0' }"
+      >
         <!-- 左展开箭头 -->
         <div class="showPanel">
-          <div class="icon_panel_left_off" @click="ospageContentFlag = true" v-if="!ospageContentFlag"></div>
+          <div
+            class="icon_panel_left_off"
+            @click="ospageContentFlag = true"
+            v-if="!ospageContentFlag"
+          ></div>
         </div>
         <!-- 左展开箭头 -->
         <div class="ospageleft" v-if="ospageContentFlag">
           <!-- 左收缩箭头 -->
-          <div class="icon_panel_left_on" @click="ospageContentFlag = false" v-if="ospageContentFlag"></div>
+          <div
+            class="icon_panel_left_on"
+            @click="ospageContentFlag = false"
+            v-if="ospageContentFlag"
+          ></div>
           <!-- 左收缩箭头 -->
           <div class="title_bg title">
             <div class="title_box">
-              <img src="@/assets/images/osPage/os_logo.png" alt="" />光储充柔专题
+              <img
+                src="@/assets/images/osPage/os_logo.png"
+                alt=""
+              />光储充柔专题
             </div>
           </div>
           <div class="ospage_left_box content_bg">
-            <div class="infotitle"><span>中压西小站雪花网线路架构图 </span>
+            <div class="infotitle">
+              <span>中压西小站雪花网线路架构图 </span>
               <p class="tipText">(点击图片放大)</p>
             </div>
             <!-- <div class="infotitle_box">
@@ -78,7 +93,6 @@
             </div>
             <div class="infotitle_box">
               <div class="infotitle_short">
-
                 <div class="bg"></div>
                 <!-- <img
                   src="@/assets/images/common/title_yuanicon.png"
@@ -134,40 +148,70 @@
       </div>
     </div>
     <div class="content_right">
-      <div :class="` animated ${hideRight ? 'fadeInRightBig' : 'fadeOutRightBig'}`" :style="{ opacity: hideRight ? '1' : '0' }">
+      <div
+        :class="` animated ${hideRight ? 'fadeInRightBig' : 'fadeOutRightBig'}`"
+        :style="{ opacity: hideRight ? '1' : '0' }"
+      >
         <!-- 右展开箭头 -->
         <div class="showPanel">
-          <div class="icon_panel_right_off" @click="ospagerightFlag = true" v-if="!ospagerightFlag"></div>
+          <div
+            class="icon_panel_right_off"
+            @click="ospagerightFlag = true"
+            v-if="!ospagerightFlag"
+          ></div>
         </div>
         <!-- 右展开箭头 -->
         <div class="ospageright" v-if="ospagerightFlag">
           <!-- 右收缩箭头 -->
-          <div class="icon_panel_right_on" @click="ospagerightFlag = false" v-if="ospagerightFlag"></div>
+          <div
+            class="icon_panel_right_on"
+            @click="ospagerightFlag = false"
+            v-if="ospagerightFlag"
+          ></div>
           <!-- 右收缩箭头 -->
           <div class="title_bg title">
             <div class="title_box">
-              <img src="@/assets/images/osPage/os2_logo.png" alt="" />光储充柔专题
+              <img
+                src="@/assets/images/osPage/os2_logo.png"
+                alt=""
+              />光储充柔专题
             </div>
           </div>
           <div class="ospage_right_box content_bg">
             <div class="infotitle">
               <span>光伏总功率曲线</span> &nbsp;
-              <div class="address_icon" v-if="addressIconFlag" @click="send3d_guangfu(1)"></div>
+              <div
+                class="address_icon"
+                v-if="addressIconFlag"
+                @click="send3d_guangfu(1)"
+              ></div>
 
-              <div class="address_icon1" v-else @click="send3d_guangfu(2)"></div>
+              <div
+                class="address_icon1"
+                v-else
+                @click="send3d_guangfu(2)"
+              ></div>
             </div>
             <div class="os2info1">
               <pvLine :echartArr="pvArr" v-if="pvArrFlag"></pvLine>
             </div>
             <div class="infotitle">
-              <span>储能总功率曲线</span> &nbsp;<img src="@/assets/images/homePage/address.png" alt="" @click="send3d_chuneng" />
+              <span>储能总功率曲线</span> &nbsp;<img
+                src="@/assets/images/homePage/address.png"
+                alt=""
+                @click="send3d_chuneng"
+              />
             </div>
             <div class="os2info2">
               <storeLine :echartArr="battyArr" v-if="battyArrFlag"> </storeLine>
             </div>
 
             <div class="infotitle">
-              <span>充电桩总功率曲线</span> &nbsp;<img src="@/assets/images/homePage/address.png" alt="" @click="send3d_cdz" />
+              <span>充电桩总功率曲线</span> &nbsp;<img
+                src="@/assets/images/homePage/address.png"
+                alt=""
+                @click="send3d_cdz"
+              />
             </div>
             <div class="os2info3">
               <cdzLine :echartArr="userzArr" v-if="userzFlag"></cdzLine>
@@ -188,12 +232,15 @@
         </div>
         <div class="content">
           <div class="table_box">
-            <el-table :data="
+            <el-table
+              :data="
                 tableData.slice(
                   (currentPage - 1) * pageSize,
                   currentPage * pageSize
                 )
-              " style="width: 100%; height: 100%">
+              "
+              style="width: 100%; height: 100%"
+            >
               <el-table-column label="ID" align="center">
                 <template #default="scope">
                   <span style="margin-left: 10px">{{ scope.row.id }}</span>
@@ -224,7 +271,16 @@
           </div>
         </div>
         <div class="bottom">
-          <el-pagination small background layout="prev,pager,next" v-model:current-page="currentPage" v-model:page-size="pageSize" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange"></el-pagination>
+          <el-pagination
+            small
+            background
+            layout="prev,pager,next"
+            v-model:current-page="currentPage"
+            v-model:page-size="pageSize"
+            :total="total"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          ></el-pagination>
         </div>
       </div>
       <div class="area_load" v-if="areaLoadFlag">
@@ -282,7 +338,14 @@
     </div>
     <!-- 单线图 -->
     <div class="lineSvgFlag">
-      <el-dialog v-model="dialogVisible" width="30%" :show-close="false" :close-on-press-escape="false" :close-on-click-modal="false" custom-class="my-custom-dialog">
+      <el-dialog
+        v-model="dialogVisible"
+        width="30%"
+        :show-close="false"
+        :close-on-press-escape="false"
+        :close-on-click-modal="false"
+        custom-class="my-custom-dialog"
+      >
         <!-- custom-class="customDialog_line panel" -->
         <div class="panel-footer"></div>
         <div class="closeBtn" @click="handleClose"></div>
@@ -305,70 +368,101 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch, onMounted, reactive, onUnmounted, nextTick, getCurrentInstance, inject } from 'vue'
-import { ElMessage, ElPagination, ElTable, ElDialog } from 'element-plus'
-import { getColorFun } from '@/hooks/getColorFun/index'
-import { app_load, api_send, api_register } from '@/ue4Player/app'
-import pvLine from './pvLine.vue'
-import storeLine from './storeLine.vue'
-import cdzLine from './cdzLine.vue'
-import beforeLine from './beforeLine.vue'
-import afterLine from './afterLine.vue'
-import battyJSON from '@/assets/json/osp/batty.json'
-import lineSVG from '@/views/commonPage/lineSVG.vue'
-import svgHtml from '@/assets/json/svg1.js'
-import svgHtml2 from '@/assets/json/svg.js'
-import svgHtml31 from '@/assets/json/svgying31.js'
-import svgHtml41 from '@/assets/json/svgying41.js'
-import svgHtml15 from '@/assets/json/svgzhan15.js'
-import svgHtml26 from '@/assets/json/svgzhan26.js'
-import svgHtml23 from '@/assets/json/svgye23.js'
-import svgHtml311 from '@/assets/json/svgye31.js'
-import testSvg from '@/assets/json/线路二.js'
-import testSvg1 from '@/assets/json/线路556.js'
+import {
+  ref,
+  computed,
+  watch,
+  onMounted,
+  reactive,
+  onUnmounted,
+  nextTick,
+  getCurrentInstance,
+  inject,
+} from "vue";
+import { ElMessage, ElPagination, ElTable, ElDialog } from "element-plus";
+import { getColorFun } from "@/hooks/getColorFun/index";
+import { app_load, api_send, api_register } from "@/ue4Player/app";
+import pvLine from "./pvLine.vue";
+import storeLine from "./storeLine.vue";
+import cdzLine from "./cdzLine.vue";
+import beforeLine from "./beforeLine.vue";
+import afterLine from "./afterLine.vue";
+import battyJSON from "@/assets/json/osp/batty.json";
+import lineSVG from "@/views/commonPage/lineSVG.vue";
+import svgHtml from "@/assets/json/svg1.js";
+import svgHtml2 from "@/assets/json/svg.js";
+import svgHtml31 from "@/assets/json/svgying31.js";
+import svgHtml41 from "@/assets/json/svgying41.js";
+import svgHtml15 from "@/assets/json/svgzhan15.js";
+import svgHtml26 from "@/assets/json/svgzhan26.js";
+import svgHtml23 from "@/assets/json/svgye23.js";
+import svgHtml311 from "@/assets/json/svgye31.js";
+import testSvg from "@/assets/json/线路二.js";
+import testSvg1 from "@/assets/json/线路556.js";
 
 // import svgJSON from "@/assets/json/result1.json";
-import svgJSON2 from '@/assets/json/nw-result1.json'
-import svgJSON from '@/assets/json/result2_copy.json' //555
-import svgJSONye23 from '@/assets/json/ye23.json' //555
-import svgJSONye31 from '@/assets/json/ye31.json' //555
-import svgJSONying31 from '@/assets/json/ying31.json' //555
-import svgJSONying41 from '@/assets/json/ying41.json' //555
-import svgJSONzhan15 from '@/assets/json/zhan16.json' //555
-import svgJSONzhan26 from '@/assets/json/zhan26.json' //555
+import svgJSON2 from "@/assets/json/nw-result1.json";
+import svgJSON from "@/assets/json/result2_copy.json"; //555
+import svgJSONye23 from "@/assets/json/ye23.json"; //555
+import svgJSONye31 from "@/assets/json/ye31.json"; //555
+import svgJSONying31 from "@/assets/json/ying31.json"; //555
+import svgJSONying41 from "@/assets/json/ying41.json"; //555
+import svgJSONzhan15 from "@/assets/json/zhan16.json"; //555
+import svgJSONzhan26 from "@/assets/json/zhan26.json"; //555
 
 // 入口的svg图
-import OpticalStorageSVG from '@/assets/json/OpticalStorageSVG.js'
+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, pv_55606Api, usrz_55606Api, batty_unit_55606Api, getSvgData_api } from '@/api/Osp/svgApi'
-import { SVG, extend as SVGextend, Element as SVGElement, Box, Matrix } from '@svgdotjs/svg.js'
-import { handleEchartsData, handleEchartsData_timeStamp_p } from '@/hooks/handleFun'
-import { log } from 'console'
+import "@svgdotjs/svg.panzoom.js";
+import "echarts/lib/component/dataZoom";
+import loadingPage from "@/views/commonPage/loading.vue";
+import {
+  buttyApi,
+  svgdApi,
+  pvApi,
+  usrzApi,
+  pv_55606Api,
+  usrz_55606Api,
+  batty_unit_55606Api,
+  getSvgData_api,
+} from "@/api/Osp/svgApi";
+import {
+  SVG,
+  extend as SVGextend,
+  Element as SVGElement,
+  Box,
+  Matrix,
+} from "@svgdotjs/svg.js";
+import {
+  handleEchartsData,
+  handleEchartsData_timeStamp_p_u_i,
+  handleEchartsData_timeStamp_p,
+} from "@/hooks/handleFun";
+import { log } from "console";
 
 onMounted(() => {
-  send3D() //发送三维
-  getbatrry() //储能功率曲线
-  getuser() //充电桩用户侧功率曲线
-  getpv() //光伏功率曲线
-})
+  send3D(); //发送三维
+  getbatrry(); //储能功率曲线
+  getuser(); //充电桩用户侧功率曲线
+  getpv(); //光伏功率曲线
+});
 const send3D = () => {
   // 发送西小站三维移动位置
 
   const list = {
-    location: '(X=-115266.854,Y=77915.687,Z=-10571.952)',
-    rotation: 'Pitch=-2.087,Yaw=-43.474,Roll=0.0'
-  }
+    // location: "(X=-115266.854,Y=77915.687,Z=-10571.952)",
+    // rotation: "Pitch=-2.087,Yaw=-43.474,Roll=0.0",
+    location: "(X=-104747.612,Y=105710.842,Z=-279.286)",
+    rotation: "Pitch=-2.087,Yaw=-43.474,Roll=0.0",
+  };
 
-  api_send('CameraMove', list, () => {
-    console.log('CameraMove西小站')
-  })
-}
+  api_send("CameraMove", list, () => {
+    console.log("CameraMove西小站");
+  });
+};
 
 const send3d_guangfu = (val: number) => {
-  addressIconFlag.value = !addressIconFlag.value
+  addressIconFlag.value = !addressIconFlag.value;
 
   if (val === 1) {
     //第一个位置
@@ -376,183 +470,185 @@ const send3d_guangfu = (val: number) => {
     // 发送西小站三维光伏
 
     const list = {
-      location: '(X=-117420.001,Y=77173.45,Z=-10698.85)',
+      location: "(X=-117420.001,Y=77173.45,Z=-10698.85)",
 
-      rotation: 'Pitch=-10.118,Yaw=128.278,Roll=0.0'
-    }
+      rotation: "Pitch=-10.118,Yaw=128.278,Roll=0.0",
+    };
 
-    api_send('CameraMove', list, () => {
-      console.log('CameraMove西小站——光伏')
-    })
+    api_send("CameraMove", list, () => {
+      console.log("CameraMove西小站——光伏");
+    });
   } else if (val === 2) {
     //第二个位置
 
     // 发送西小站三维光伏
 
     const list = {
-      location: '(X=-111835.921,Y=79412.053,Z=-10254.546)',
+      location: "(X=-111835.921,Y=79412.053,Z=-10254.546)",
 
-      rotation: 'Pitch=-16.368,Yaw=40.176,Roll=0.0'
-    }
+      rotation: "Pitch=-16.368,Yaw=40.176,Roll=0.0",
+    };
 
-    api_send('CameraMove', list, () => {
-      console.log('CameraMove西小站——光伏')
-    })
+    api_send("CameraMove", list, () => {
+      console.log("CameraMove西小站——光伏");
+    });
   }
-}
+};
 
 const send3d_chuneng = () => {
   // 发送西小站三维移动位置
 
   const list = {
-    location: '(X=-111065.878,Y=79255.886,Z=-11010.192)',
+    location: "(X=-111065.878,Y=79255.886,Z=-11010.192)",
 
-    rotation: 'Pitch=-8.794,Yaw=-135.045,Roll=0.0'
-  }
+    rotation: "Pitch=-8.794,Yaw=-135.045,Roll=0.0",
+  };
 
-  api_send('CameraMove', list, () => {
-    console.log('CameraMove西小站——储能')
-  })
-}
+  api_send("CameraMove", list, () => {
+    console.log("CameraMove西小站——储能");
+  });
+};
 
 const send3d_cdz = () => {
   // 发送西小站 _cdz三维移动位置
 
   const list = {
-    location: '(X=-113424.9,Y=78194.314,Z=-11112.118)',
+    location: "(X=-113424.9,Y=78194.314,Z=-11112.118)",
 
-    rotation: 'Pitch=-1.117,Yaw=72.116,Roll=0.0'
-  }
+    rotation: "Pitch=-1.117,Yaw=72.116,Roll=0.0",
+  };
 
-  api_send('CameraMove', list, () => {
-    console.log('CameraMove西小站_充电桩')
-  })
-}
+  api_send("CameraMove", list, () => {
+    console.log("CameraMove西小站_充电桩");
+  });
+};
 
-let addressIconFlag = ref(true)
+let addressIconFlag = ref(true);
 
 // 左
 // 左侧页面标识
-let ospageContentFlag = ref(true)
+let ospageContentFlag = ref(true);
 //左1
 // 点击执行明细按钮
-let runDetailFlage = ref(false)
+let runDetailFlage = ref(false);
 
 //左2
 // 图标获取echarts图时间
-let timeSelect = ref()
+let timeSelect = ref();
 // 点击台区负载情况
-let areaLoadFlag = ref(false)
+let areaLoadFlag = ref(false);
 const handleRunDetail = () => {
-  areaLoadFlag.value = false
-  runDetailFlage.value = true
-}
+  areaLoadFlag.value = false;
+  runDetailFlage.value = true;
+};
 const handleAreaLoad = () => {
-  runDetailFlage.value = false
-  areaLoadFlag.value = true
-}
+  runDetailFlage.value = false;
+  areaLoadFlag.value = true;
+};
 
 // 右侧  储能
-let battyArr = reactive([]) //储能
+let battyArr = reactive([]); //储能
 
-let pvArr = reactive([]) //光伏
-let userzArr = reactive([]) //用户侧充电桩
+let pvArr = reactive([]); //光伏
+let userzArr = reactive([]); //用户侧充电桩
 
-let battyArrFlag = ref<boolean>(false)
-let pvArrFlag = ref<boolean>(false)
-let userzFlag = ref<boolean>(false)
+let battyArrFlag = ref<boolean>(false);
+let pvArrFlag = ref<boolean>(false);
+let userzFlag = ref<boolean>(false);
 const getpv = () => {
-  pv_55606Api({}).then(res => {
-    console.log(res, 'respv')
-    console.log('1----------', res)
+  pv_55606Api({}).then((res) => {
+    console.log(res, "respv");
+    console.log("1----------", res);
 
-    pvArr = handleEchartsData_timeStamp_p(res.data, 60)
+    pvArr = handleEchartsData_timeStamp_p(res.data, 15);
 
     // pvArr = res.data;
 
     if (pvArr.length > 0) {
-      pvArrFlag.value = true
+      pvArrFlag.value = true;
     }
-  })
-}
+  });
+};
 const getuser = () => {
-  usrz_55606Api({}).then(res => {
+  usrz_55606Api({}).then((res) => {
     // userzArr = res.data;
-    userzArr = handleEchartsData_timeStamp_p(res.data, 60)
+    userzArr = handleEchartsData_timeStamp_p(res.data, 15);
 
     if (userzArr.length > 0) {
-      userzFlag.value = true
+      userzFlag.value = true;
     }
-  })
-}
+  });
+};
 const getbatrry = () => {
-  batty_unit_55606Api({}).then(res => {
-    console.log(res, 'ssss')
+  batty_unit_55606Api({}).then((res) => {
+    console.log(res, "ssss");
     // battyArr = res.data;
-    battyArr = handleEchartsData_timeStamp_p(res.data, 60)
+    battyArr = handleEchartsData_timeStamp_p_u_i(res.data, 15);
 
     if (battyArr.length > 0) {
-      battyArrFlag.value = true
+      battyArrFlag.value = true;
     }
-  })
-}
+  });
+};
 
 // 单线图------------------
-let lineSvgFlag = ref(false)
+let lineSvgFlag = ref(false);
 // 单线图弹框
-let dialogVisible = ref<boolean>(false)
-let draw: any = null //  svg图
-let SVGContainer = ref() //  svg图DOM
-let tabValue = ref<string>('有功')
-let loadingFlag = ref<boolean>(false)
-let timer = ref<any>('')
+let dialogVisible = ref<boolean>(false);
+let draw: any = null; //  svg图
+let SVGContainer = ref(); //  svg图DOM
+let tabValue = ref<string>("有功");
+let loadingFlag = ref<boolean>(false);
+let timer = ref<any>("");
 // 点击弹窗关闭-------单线图
 let handleClose = () => {
   if (svgLevel.value === 2) {
-    handleEnter()
-    svgLevel.value = 1
+    handleEnter();
+    svgLevel.value = 1;
   } else {
-    clearInterval(timer.value)
-    draw?.clear()
-    SVGContainer.value.innerHTML = ''
+    clearInterval(timer.value);
+    draw?.clear();
+    SVGContainer.value.innerHTML = "";
     // alert(1)
-    dialogVisible.value = false
+    dialogVisible.value = false;
   }
-}
-let svgImage = new URL('@/assets/images/svgImage/active.jpg', import.meta.url).href
+};
+let svgImage = new URL("@/assets/images/svgImage/active.jpg", import.meta.url)
+  .href;
 
 // SVG层级
-let svgLevel = ref<number>(1)
+let svgLevel = ref<number>(1);
 // svg入口事件 打开一个svg图
 let handleEnter = () => {
-  dialogVisible.value = true
-  loadingFlag.value = true
-
+  dialogVisible.value = true;
+  loadingFlag.value = true;
+  send3d_xuehua();
   nextTick(() => {
-    SVGContainer.value.innerHTML = OpticalStorageSVG as any
-    draw = SVG(SVGContainer.value.getElementsByTagName('svg')[0])
-    let s = draw.panZoom({ zoomMin: 0.1, zoomMax: 30, zoomFactor: 0.5 })
-    draw.size('100%', '100%')
-    draw.zoom(0.5)
+    SVGContainer.value.innerHTML = OpticalStorageSVG as any;
+    draw = SVG(SVGContainer.value.getElementsByTagName("svg")[0]);
+    let s = draw.panZoom({ zoomMin: 0.1, zoomMax: 30, zoomFactor: 0.5 });
+    draw.size("100%", "100%");
+    draw.zoom(0.5);
 
     let data = [
       {
-        id: '555_1',
-        flag: '-1',
-        Pi: '190.4101',
-        Qi: '5.9663',
-        V_b: '10.4993',
-        I: '10.4709'
+        id: "555_1",
+        flag: "-1",
+        Pi: "190.4101",
+        Qi: "5.9663",
+        V_b: "10.4993",
+        I: "10.4709",
       },
       {
-        id: '555_2',
-        flag: '1',
-        Pi: '1',
-        Qi: '2',
-        V_b: '3',
-        I: '1'
+        id: "555_2",
+        flag: "1",
+        Pi: "1",
+        Qi: "2",
+        V_b: "3",
+        I: "1",
       },
       {
+<<<<<<< HEAD
         id: '555_3',
         flag: '1',
         Pi: '1',
@@ -567,16 +663,25 @@ let handleEnter = () => {
         Qi: '32.3110',
         V_b: '10.4989',
         I: '13.7123'
+=======
+        id: "556_1",
+        flag: "-1",
+        Pi: "249.3605",
+        Qi: "32.3110",
+        V_b: "10.4989",
+        I: "13.7123",
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
       },
       {
-        id: '556_2',
-        flag: '1',
-        Pi: '1',
-        Qi: '2',
-        V_b: '3',
-        I: '1'
+        id: "556_2",
+        flag: "1",
+        Pi: "1",
+        Qi: "2",
+        V_b: "3",
+        I: "1",
       },
       {
+<<<<<<< HEAD
         id: '556_3',
         flag: '1',
         Pi: '1',
@@ -591,16 +696,25 @@ let handleEnter = () => {
         Qi: '14.3602',
         V_b: '10.4990',
         I: '17.8706'
+=======
+        id: "ying_31_1",
+        flag: "-1",
+        Pi: "324.9620",
+        Qi: "14.3602",
+        V_b: "10.4990",
+        I: "17.8706",
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
       },
       {
-        id: 'ying_31_2',
-        flag: '1',
-        Pi: '1',
-        Qi: '2',
-        V_b: '3',
-        I: '1'
+        id: "ying_31_2",
+        flag: "1",
+        Pi: "1",
+        Qi: "2",
+        V_b: "3",
+        I: "1",
       },
       {
+<<<<<<< HEAD
         id: 'ying_31_3',
         flag: '1',
         Pi: '1',
@@ -631,24 +745,41 @@ let handleEnter = () => {
         Qi: '2',
         V_b: '3',
         I: '1'
+=======
+        id: "ying_41_1",
+        flag: "-1",
+        Pi: "110.7202",
+        Qi: "6.6579",
+        V_b: "10.4997",
+        I: "6.0088",
       },
       {
-        id: 'zhan_26_1',
-        flag: '-1',
-        Pi: '1',
-        Qi: '2',
-        V_b: '3',
-        I: '1'
+        id: "ying_41_2",
+        flag: "1",
+        Pi: "1",
+        Qi: "2",
+        V_b: "3",
+        I: "1",
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
       },
       {
-        id: 'zhan_26_2',
-        flag: '1',
-        Pi: '152.8102',
-        Qi: '6.6579',
-        V_b: '10.4998',
-        I: '8.4072'
+        id: "zhan_26_1",
+        flag: "-1",
+        Pi: "1",
+        Qi: "2",
+        V_b: "3",
+        I: "1",
       },
       {
+        id: "zhan_26_2",
+        flag: "1",
+        Pi: "152.8102",
+        Qi: "6.6579",
+        V_b: "10.4998",
+        I: "8.4072",
+      },
+      {
+<<<<<<< HEAD
         id: 'zhan_26_3',
         flag: '1',
         Pi: '152.8102',
@@ -663,16 +794,25 @@ let handleEnter = () => {
         Qi: '1.2095',
         V_b: '10.4993',
         I: '5.3655'
+=======
+        id: "zhan_16_1",
+        flag: "-1",
+        Pi: "97.5900",
+        Qi: "1.2095",
+        V_b: "10.4993",
+        I: "5.3655",
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
       },
       {
-        id: 'zhan_16_2',
-        flag: '1',
-        Pi: '1',
-        Qi: '2',
-        V_b: '3',
-        I: '1'
+        id: "zhan_16_2",
+        flag: "1",
+        Pi: "1",
+        Qi: "2",
+        V_b: "3",
+        I: "1",
       },
       {
+<<<<<<< HEAD
         id: 'zhan_16_3',
         flag: '1',
         Pi: '1',
@@ -737,6 +877,40 @@ let handleEnter = () => {
         I: '1'
       }
     ]
+=======
+        id: "ye_31_1",
+        flag: "-1",
+        Pi: "263.1002",
+        Qi: "8.6865",
+        V_b: "10.4995",
+        I: "14.1577",
+      },
+      {
+        id: "ye_31_2",
+        flag: "1",
+        Pi: "1",
+        Qi: "2",
+        V_b: "3",
+        I: "1",
+      },
+      {
+        id: "ye_23_1",
+        flag: "-1",
+        Pi: "429.7437",
+        Qi: "10.6202",
+        V_b: "10.4991",
+        I: "23.7348",
+      },
+      {
+        id: "ye_23_2",
+        flag: "1",
+        Pi: "1",
+        Qi: "2",
+        V_b: "3",
+        I: "1",
+      },
+    ];
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
 
     // 增加一个数字4
     // 文本
@@ -750,6 +924,7 @@ let handleEnter = () => {
       .fill('#FFF')
 
     // 流向
+<<<<<<< HEAD
     const dom = draw.find('g')
     const polyline = draw.find('polyline')
 
@@ -767,109 +942,132 @@ let handleEnter = () => {
           } else {
             // 流向
             handlePolyineAnimate2(polyineArray, pathDate, item)
+=======
+    const dom = draw.find("g");
+    const polyline = draw.find("polyline");
+    dom.forEach((item) => {
+      polyline.forEach((lineIte) => {
+        if (item.node.id === lineIte.node.id) {
+          let newData = data.find((ite) => lineIte.node.id === ite.id);
+          console.log(newData);
+          const polyineArray = lineIte.array();
+          let pathDate = "M" + polyineArray.join(" L");
+          if (newData.flag === "1") {
+            // 流向
+            handlePolyineAnimate2(polyineArray, pathDate, item);
+          } else {
+            // 流向
+            handlePolyineAnimate(polyineArray, pathDate, item);
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
           }
 
           // 文字
-          handleLineText2(polyineArray, newData, item)
+          handleLineText2(polyineArray, newData, item);
         }
-      })
-    })
+      });
+    });
     // 正向流动
     function handlePolyineAnimate(pointArray, pointsValue, lineDom) {
       // 拿到长度
-      let length = 0
+      let length = 0;
       for (let i = 0; i < pointArray.length; i++) {
         if (pointArray[i] && pointArray[i + 1]) {
-          length += pointDistance(pointArray[i][0], pointArray[i][1], pointArray[i + 1][0], pointArray[i + 1][1])
+          length += pointDistance(
+            pointArray[i][0],
+            pointArray[i][1],
+            pointArray[i + 1][0],
+            pointArray[i + 1][1]
+          );
         }
       }
-      let num = 20
-      let num1 = 0.5
-      let spacingDuration = 10
+      let num = 20;
+      let num1 = 0.5;
+      let spacingDuration = 10;
       // console.log(length, 'length');
 
       if (length >= 0 && length <= 100) {
-        length = 50
-        num = 20
-        num1 = 0.5
-        spacingDuration = 2
+        length = 50;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 2;
       } else if (length >= 100 && length <= 200) {
-        length = 150
-        num = 20
-        num1 = 0.5
-        spacingDuration = 4
+        length = 150;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 4;
       } else if (length >= 200 && length <= 500) {
-        length = 350
-        num = 20
-        num1 = 0.5
-        spacingDuration = 8
+        length = 350;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 8;
       } else if (length >= 500 && length <= 700) {
-        length = 650
-        num = 20
-        num1 = 0.5
-        spacingDuration = 10
+        length = 650;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 10;
       } else if (length >= 700 && length <= 1000) {
-        length = 850
-        num = 20
-        num1 = 0.5
-        spacingDuration = 12
+        length = 850;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 12;
       } else if (length >= 1000 && length <= 1200) {
-        length = 1150
-        num = 20
-        num1 = 0.5
-        spacingDuration = 16
+        length = 1150;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 16;
       } else if (length >= 1200 && length <= 1500) {
-        length = 1350
-        num = 20
-        num1 = 0.5
-        spacingDuration = 20
+        length = 1350;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 20;
       } else if (length >= 1500 && length <= 1700) {
-        length = 1600
-        num = 20
-        num1 = 0.5
-        spacingDuration = 24
+        length = 1600;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 24;
       } else if (length >= 1700 && length <= 2000) {
-        length = 1850
-        num = 20
-        num1 = 0.5
-        spacingDuration = 28
+        length = 1850;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 28;
       } else if (length >= 2000 && length <= 2200) {
-        length = 2100
-        num = 20
-        num1 = 0.5
-        spacingDuration = 32
+        length = 2100;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 32;
       } else if (length >= 2200 && length <= 2500) {
-        length = 2350
-        num = 20
-        num1 = 0.5
-        spacingDuration = 34
+        length = 2350;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 34;
       } else if (length >= 2500 && length <= 2700) {
-        length = 2600
-        num = 20
-        num1 = 0.5
-        spacingDuration = 38
+        length = 2600;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 38;
       } else if (length >= 2700 && length <= 3000) {
-        length = 2800
-        num = 20
-        num1 = 0.5
-        spacingDuration = 40
+        length = 2800;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 40;
       } else if (length >= 3000 && length <= 3200) {
-        length = 3100
-        num = 20
-        num1 = 0.5
-        spacingDuration = 44
+        length = 3100;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 44;
       } else if (length >= 3200 && length <= 3500) {
-        length = 3350
-        num = 20
-        num1 = 0.5
-        spacingDuration = 48
+        length = 3350;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 48;
       }
 
-      let numTriangles = Math.ceil(length / num)
-      let duration = numTriangles / num1
-      let middleDuration = duration / num1
+      let numTriangles = Math.ceil(length / num);
+      let duration = numTriangles / num1;
+      let middleDuration = duration / num1;
 
       for (let i = 0; i < numTriangles; i++) {
+<<<<<<< HEAD
         let triangle = draw.polygon('0,-9 20,0 0,9').fill('lightgreen').stroke({ color: 'lightgreen', width: 0.2 })
 
         let triangleanimate = document.createElementNS('http://www.w3.org/2000/svg', 'animateMotion')
@@ -886,101 +1084,132 @@ let handleEnter = () => {
       }
       let rect = draw.rect(30, 30).fill('#000').move(-15, -10)
       lineDom.add(rect)
+=======
+        let triangle = draw
+          .polygon("0,-7 20,0 0,7")
+          .fill("lightgreen")
+          .stroke({ color: "lightgreen", width: 0.2 });
+
+        let triangleanimate = document.createElementNS(
+          "http://www.w3.org/2000/svg",
+          "animateMotion"
+        );
+        triangleanimate.setAttribute("path", pointsValue);
+        triangleanimate.setAttribute("dur", `${spacingDuration}s`);
+        let startTime =
+          middleDuration - (duration / numTriangles) * i - i * spacingDuration;
+        triangleanimate.setAttribute("begin", `${startTime}s`);
+        triangleanimate.setAttribute("fill", "remove");
+        triangleanimate.setAttribute("rotate", "auto");
+        triangleanimate.setAttribute("repeatCount", "indefinite");
+        triangle.node.appendChild(triangleanimate);
+
+        lineDom.add(triangle);
+      }
+      let rect = draw.rect(30, 30).fill("#000").move(-5, -10);
+      lineDom.add(rect);
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
     }
     // 反向流动
     function handlePolyineAnimate2(pointArray, pointsValue, lineDom) {
       // 拿到长度
-      let length = 0
+      let length = 0;
       for (let i = 0; i < pointArray.length; i++) {
         if (pointArray[i] && pointArray[i + 1]) {
-          length += pointDistance(pointArray[i][0], pointArray[i][1], pointArray[i + 1][0], pointArray[i + 1][1])
+          length += pointDistance(
+            pointArray[i][0],
+            pointArray[i][1],
+            pointArray[i + 1][0],
+            pointArray[i + 1][1]
+          );
         }
       }
-      let num = 20
-      let num1 = 0.5
-      let spacingDuration = 10
+      let num = 20;
+      let num1 = 0.5;
+      let spacingDuration = 10;
 
       if (length >= 0 && length <= 100) {
-        length = 50
-        num = 20
-        num1 = 0.5
-        spacingDuration = 2
+        length = 50;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 2;
       } else if (length >= 100 && length <= 200) {
-        length = 150
-        num = 20
-        num1 = 0.5
-        spacingDuration = 4
+        length = 150;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 4;
       } else if (length >= 200 && length <= 500) {
-        length = 350
-        num = 20
-        num1 = 0.5
-        spacingDuration = 8
+        length = 350;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 8;
       } else if (length >= 500 && length <= 700) {
-        length = 650
-        num = 20
-        num1 = 0.5
-        spacingDuration = 10
+        length = 650;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 10;
       } else if (length >= 700 && length <= 1000) {
-        length = 850
-        num = 20
-        num1 = 0.5
-        spacingDuration = 12
+        length = 850;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 12;
       } else if (length >= 1000 && length <= 1200) {
-        length = 1150
-        num = 20
-        num1 = 0.5
-        spacingDuration = 16
+        length = 1150;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 16;
       } else if (length >= 1200 && length <= 1500) {
-        length = 1350
-        num = 20
-        num1 = 0.5
-        spacingDuration = 20
+        length = 1350;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 20;
       } else if (length >= 1500 && length <= 1700) {
-        length = 1600
-        num = 20
-        num1 = 0.5
-        spacingDuration = 24
+        length = 1600;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 24;
       } else if (length >= 1700 && length <= 2000) {
-        length = 1850
-        num = 20
-        num1 = 0.5
-        spacingDuration = 28
+        length = 1850;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 28;
       } else if (length >= 2000 && length <= 2200) {
-        length = 2100
-        num = 20
-        num1 = 0.5
-        spacingDuration = 32
+        length = 2100;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 32;
       } else if (length >= 2200 && length <= 2500) {
-        length = 2350
-        num = 20
-        num1 = 0.5
-        spacingDuration = 34
+        length = 2350;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 34;
       } else if (length >= 2500 && length <= 2700) {
-        length = 2600
-        num = 20
-        num1 = 0.5
-        spacingDuration = 38
+        length = 2600;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 38;
       } else if (length >= 2700 && length <= 3000) {
-        length = 2800
-        num = 20
-        num1 = 0.5
-        spacingDuration = 40
+        length = 2800;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 40;
       } else if (length >= 3000 && length <= 3200) {
-        length = 3100
-        num = 20
-        num1 = 0.5
-        spacingDuration = 44
+        length = 3100;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 44;
       } else if (length >= 3200 && length <= 3500) {
-        length = 3350
-        num = 20
-        num1 = 0.5
-        spacingDuration = 48
+        length = 3350;
+        num = 20;
+        num1 = 0.5;
+        spacingDuration = 48;
       }
 
-      let numTriangles = Math.ceil(length / num)
-      let duration = numTriangles / num1
-      let middleDuration = duration / num1
+      let numTriangles = Math.ceil(length / num);
+      let duration = numTriangles / num1;
+      let middleDuration = duration / num1;
       for (let i = 0; i < numTriangles; i++) {
+<<<<<<< HEAD
         let triangle = draw.polygon('0,-9 -20,0 0,9').fill('lightgreen').stroke({ color: 'lightgreen', width: 0.2 })
 
         let triangleanimate = document.createElementNS('http://www.w3.org/2000/svg', 'animateMotion')
@@ -997,15 +1226,41 @@ let handleEnter = () => {
         triangle.node.appendChild(triangleanimate)
 
         lineDom.add(triangle)
+=======
+        let triangle = draw
+          .polygon("0,-7 -20,0 0,7")
+          .fill("lightgreen")
+          .stroke({ color: "lightgreen", width: 0.2 });
+
+        let triangleanimate = document.createElementNS(
+          "http://www.w3.org/2000/svg",
+          "animateMotion"
+        );
+        triangleanimate.setAttribute("path", pointsValue);
+        triangleanimate.setAttribute("dur", `${spacingDuration}s`);
+        let startTime =
+          middleDuration - (duration / numTriangles) * i - i * spacingDuration;
+        triangleanimate.setAttribute("begin", `${startTime}s`);
+        triangleanimate.setAttribute("fill", "remove");
+        triangleanimate.setAttribute("rotate", "auto");
+        triangleanimate.setAttribute("repeatCount", "indefinite");
+        triangleanimate.setAttribute("keyPoints", "1;0");
+        triangleanimate.setAttribute("keyTimes", "0;1");
+        triangleanimate.setAttribute("calcMode", "linear");
+        triangle.node.appendChild(triangleanimate);
+
+        lineDom.add(triangle);
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
       }
-      let rect = draw.rect(30, 30).fill('#000').move(-5, -10)
-      lineDom.add(rect)
+      let rect = draw.rect(30, 30).fill("#000").move(-5, -10);
+      lineDom.add(rect);
     }
     function pointDistance(x1, y1, x2, y2) {
-      const distance = Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2))
-      return distance
+      const distance = Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2));
+      return distance;
     }
     function handleLineText2(polyineArray, Lineitem, lineDom) {
+<<<<<<< HEAD
       console.log(polyineArray, Lineitem, lineDom, 'polyineArray, Lineitem, lineDom')
       let arrData = ['555_2', '555_3', '556_2', '556_3', 'ying_31_3', 'ying_31_2', 'ying_41_1', 'ying_41_3', 'zhan_26_1', 'zhan_26_3', 'zhan_16_2', 'zhan_16_3', 'ye_13_2', 'ye_13_1', 'ye_13_3', 'ye_23_2', 'ye_23_3']
       if (arrData.includes(Lineitem.id)) return
@@ -1076,39 +1331,96 @@ let handleEnter = () => {
         endY = y + 80
         endTextX = x
         endTextY = y + 50
+=======
+      console.log(
+        polyineArray,
+        Lineitem,
+        lineDom,
+        "polyineArray, Lineitem, lineDom"
+      );
+      let arrData = [
+        "555_2",
+        "556_2",
+        "ying_31_2",
+        "ying_41_2",
+        "zhan_26_1",
+        "zhan_16_2",
+        "ye_31_2",
+        "ye_23_2",
+      ];
+      if (arrData.includes(Lineitem.id)) return;
+
+      let data = Lineitem;
+      let x = polyineArray[polyineArray.length - 1][0];
+      let y = polyineArray[polyineArray.length - 1][1];
+      let line = "";
+      let text = "";
+      let endX = x;
+      let endY = y + 40;
+      let endTextX = x - 30;
+      let endTextY = y + 50;
+
+      if (data.id === "556_1") {
+        endX = x + 20;
+        endTextX = x;
+      } else if (data.id === "zhan_16_1") {
+        endX = x - 20;
+        endY = y + 70;
+        endTextX = x - 70;
+        endTextY = y + 80;
+      } else if (data.id === "ying_31_1") {
+        endX = x - 30;
+        endTextX = x - 70;
+      } else if (data.id === "ying_41_1") {
+        endX = x + 30;
+        endTextX = x + 30;
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
       }
 
       //只要线路上有sec_id 就显示线路上的文字 p  q v i 参数
-      if (data['id']) {
+      if (data["id"]) {
         // 引出线
         line = draw.line(x, y, endX, endY).attr({
-          'stroke-width': 2,
-          id: 'left_line_' + data.psrId,
-          stroke: 'green',
-          'stroke-dasharray': '3,3'
-        })
+          "stroke-width": 2,
+          id: "left_line_" + data.psrId,
+          stroke: "green",
+          "stroke-dasharray": "3,3",
+        });
         // 文本
         text = draw
-          .text(`P: ${parseFloat(data['Pi']).toFixed(4)} kW \nQ: ${parseFloat(data['Qi']).toFixed(4)} kVar \nV: ${parseFloat(data['V_b']).toFixed(4)}  kV \nI: ${parseFloat(data['I'])}  A`)
+          .text(
+            `P: ${parseFloat(data["Pi"]).toFixed(4)} kW \nQ: ${parseFloat(
+              data["Qi"]
+            ).toFixed(4)} kVar \nV: ${parseFloat(data["V_b"]).toFixed(
+              4
+            )}  kV \nI: ${parseFloat(data["I"])}  A`
+          )
           .attr({
             x: endTextX,
             y: endTextY,
+<<<<<<< HEAD
             id: 'load_text' + data.psrId,
             'font-size': '15',
             leading: '0.9'
+=======
+            id: "load_text" + data.psrId,
+            "font-size": "9",
+            leading: "0.9",
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
           })
-          .fill('green')
+          .fill("green");
       }
-      lineDom.add(line)
-      lineDom.add(text)
+      lineDom.add(line);
+      lineDom.add(text);
     }
     // 点击框
-    let backgroundRectArr: any = []
-    let clickDom = draw.find('path')
+    let backgroundRectArr: any = [];
+    let clickDom = draw.find("path");
     clickDom.forEach((item: any) => {
       if (item.node.id) {
-        console.log(item, 'item')
+        console.log(item, "item");
         // 增加透明选择框
+<<<<<<< HEAD
         var backgroundRectYing31 = draw.rect(120, 60).attr({ x: 750, y: 245, id: 'ying31' }).fill('transparent').css('cursor', 'pointer')
         backgroundRectArr.push(backgroundRectYing31)
         var backgroundRectYing41 = draw.rect(120, 60).attr({ x: 1040, y: 250, id: 'ying41' }).fill('transparent').css('cursor', 'pointer')
@@ -1126,121 +1438,191 @@ let handleEnter = () => {
         var backgroundRect556 = draw.rect(120, 60).attr({ x: 210, y: 740, id: '556' }).fill('transparent').css('cursor', 'pointer')
         backgroundRectArr.push(backgroundRect556)
 
+=======
+        var backgroundRectYing31 = draw
+          .rect(120, 60)
+          .attr({ x: 570, y: 225, id: "ying31" })
+          .fill("transparent")
+          .css("cursor", "pointer");
+        backgroundRectArr.push(backgroundRectYing31);
+        var backgroundRectYing41 = draw
+          .rect(120, 60)
+          .attr({ x: 905, y: 200, id: "ying41" })
+          .fill("transparent")
+          .css("cursor", "pointer");
+        backgroundRectArr.push(backgroundRectYing41);
+        var backgroundRectZhan26 = draw
+          .rect(120, 60)
+          .attr({ x: 1300, y: 650, id: "zhan26" })
+          .fill("transparent")
+          .css("cursor", "pointer");
+        backgroundRectArr.push(backgroundRectZhan26);
+        var backgroundRectZhan16 = draw
+          .rect(120, 60)
+          .attr({ x: 1300, y: 975, id: "zhan16" })
+          .fill("transparent")
+          .css("cursor", "pointer");
+        backgroundRectArr.push(backgroundRectZhan16);
+        var backgroundRectYe23 = draw
+          .rect(120, 60)
+          .attr({ x: 600, y: 1350, id: "ye23" })
+          .fill("transparent")
+          .css("cursor", "pointer");
+        backgroundRectArr.push(backgroundRectYe23);
+        var backgroundRectYe31 = draw
+          .rect(120, 60)
+          .attr({ x: 910, y: 1380, id: "ye31" })
+          .fill("transparent")
+          .css("cursor", "pointer");
+        backgroundRectArr.push(backgroundRectYe31);
+        var backgroundRect555 = draw
+          .rect(120, 60)
+          .attr({ x: 160, y: 945, id: "555" })
+          .fill("transparent")
+          .css("cursor", "pointer");
+        backgroundRectArr.push(backgroundRect555);
+        var backgroundRect556 = draw
+          .rect(120, 60)
+          .attr({ x: 160, y: 690, id: "556" })
+          .fill("transparent")
+          .css("cursor", "pointer");
+        backgroundRectArr.push(backgroundRect556);
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
         // 遍历点击事件
         backgroundRectArr.forEach((item: any) => {
-          item.on('click', function (e) {
-            svgLevel.value = 2
-            draw?.clear()
-            let id = e.target.id
-            if (id === '556') {
-              handleCustomLine(testSvg1, svgJSON2.result)
+          item.on("click", function (e) {
+            svgLevel.value = 2;
+            draw?.clear();
+            let id = e.target.id;
+            if (id === "556") {
+              handleCustomLine(testSvg1, svgJSON2.result);
             } else {
-              handleShowSvg(id)
+              handleShowSvg(id);
             }
-          })
-        })
+          });
+        });
       }
-    })
-  })
-}
+    });
+  });
+};
+// svg入口事件 发送雪花网三维移动位置
+const send3d_xuehua = () => {
+  // 发送雪花网三维移动位置
+  const list = {
+    location: "(X=-113918.378,Y=86363.557,Z=-4864.535)",
+    rotation: "Pitch=-2.087,Yaw=-43.474,Roll=0.0",
+  };
+  api_send("CameraMove", list, () => {
+    console.log("CameraMove雪花网");
+  });
+};
+
 // svg入口事件 打开一个svg图
 let handleEnter2 = () => {
-  dialogVisible.value = true
-  loadingFlag.value = true
+  dialogVisible.value = true;
+  loadingFlag.value = true;
 
   getSvgData_api({})
-    .then(res => {
+    .then((res) => {
       nextTick(() => {
-        SVGContainer.value.innerHTML = testSvg as any
-        draw = SVG(SVGContainer.value.getElementsByTagName('svg')[0])
-        let s = draw.panZoom({ zoomMin: 0.1, zoomMax: 30, zoomFactor: 0.5 })
-        draw.size('100%', '100%')
-        draw.zoom(0.7)
+        SVGContainer.value.innerHTML = testSvg as any;
+        draw = SVG(SVGContainer.value.getElementsByTagName("svg")[0]);
+        let s = draw.panZoom({ zoomMin: 0.1, zoomMax: 30, zoomFactor: 0.5 });
+        draw.size("100%", "100%");
+        draw.zoom(0.7);
 
         let data = [
           {
-            name: '55607',
-            id: 'ed6eb345698af8514b6dc01fde016ded6e383e5dbb',
+            name: "55607",
+            id: "ed6eb345698af8514b6dc01fde016ded6e383e5dbb",
             x: 153,
             y: 127,
             endX: 100,
             endY: 150,
             textX: 30,
-            textY: 160
+            textY: 160,
           },
           {
-            name: '55603',
-            id: 'eda7801f768af8514b6dc01fde016deda70283627a',
+            name: "55603",
+            id: "eda7801f768af8514b6dc01fde016deda70283627a",
             x: 402,
             y: 127,
             endX: 350,
             endY: 150,
             textX: 280,
-            textY: 160
+            textY: 160,
           },
           {
-            name: '55518',
-            id: 'ed7d892d4f8af8514b6dc01fde016ded7d0dc55e58',
+            name: "55518",
+            id: "ed7d892d4f8af8514b6dc01fde016ded7d0dc55e58",
             x: 651,
             y: 127,
             endX: 600,
             endY: 150,
             textX: 530,
-            textY: 160
+            textY: 160,
           },
           {
-            name: '55517',
-            id: 'f10e98af158af8514b6dc01fde016df10e18b3663c',
+            name: "55517",
+            id: "f10e98af158af8514b6dc01fde016df10e18b3663c",
             x: 900,
             y: 127,
             endX: 850,
             endY: 150,
             textX: 780,
-            textY: 160
-          }
-        ]
-        data.forEach(item => {
-          res?.data.forEach(ite => {
+            textY: 160,
+          },
+        ];
+        data.forEach((item) => {
+          res?.data.forEach((ite) => {
             if (item.id === ite.transformerId) {
-              item.TotW = ite.TotW
-              item.TotVar = ite.TotVar
-              item.A_phsA = ite.A_phsA
-              item.A_phsB = ite.A_phsB
-              item.A_phsC = ite.A_phsC
+              item.TotW = ite.TotW;
+              item.TotVar = ite.TotVar;
+              item.A_phsA = ite.A_phsA;
+              item.A_phsB = ite.A_phsB;
+              item.A_phsC = ite.A_phsC;
             }
-          })
-        })
-        console.log(data, 'datadata')
+          });
+        });
+        console.log(data, "datadata");
 
-        data.forEach(item => {
+        data.forEach((item) => {
           // 引出线
           let line = draw.line(item.x, item.y, item.endX, item.endY).attr({
-            'stroke-width': 2,
-            stroke: 'green',
-            'stroke-dasharray': '3,3'
-          })
+            "stroke-width": 2,
+            stroke: "green",
+            "stroke-dasharray": "3,3",
+          });
           // 文本
           let text = draw
-            .text(`P: ${parseFloat(item['TotW']).toFixed(4)} kW \nQ: ${parseFloat(item['TotVar']).toFixed(4)} kVar \nIa: ${parseFloat(item['A_phsA']).toFixed(4)}  A \nIb: ${parseFloat(item['A_phsB']).toFixed(4)}  A \nIc: ${parseFloat(item['A_phsC']).toFixed(4)}  A`)
+            .text(
+              `P: ${parseFloat(item["TotW"]).toFixed(4)} kW \nQ: ${parseFloat(
+                item["TotVar"]
+              ).toFixed(4)} kVar \nIa: ${parseFloat(item["A_phsA"]).toFixed(
+                4
+              )}  A \nIb: ${parseFloat(item["A_phsB"]).toFixed(
+                4
+              )}  A \nIc: ${parseFloat(item["A_phsC"]).toFixed(4)}  A`
+            )
             .attr({
               x: item.textX,
               y: item.textY,
-              'font-size': '9',
-              leading: '0.9'
+              "font-size": "9",
+              leading: "0.9",
             })
-            .fill('green')
-          draw.add(line)
-          draw.add(text)
-        })
-      })
-    })
-    .catch(err => {
-      SVGContainer.value.innerHTML = testSvg as any
-      draw = SVG(SVGContainer.value.getElementsByTagName('svg')[0])
-      let s = draw.panZoom({ zoomMin: 0.1, zoomMax: 30, zoomFactor: 0.5 })
-      draw.size('100%', '100%')
-      draw.zoom(0.7)
+            .fill("green");
+          draw.add(line);
+          draw.add(text);
+        });
+      });
     })
+    .catch((err) => {
+      SVGContainer.value.innerHTML = testSvg as any;
+      draw = SVG(SVGContainer.value.getElementsByTagName("svg")[0]);
+      let s = draw.panZoom({ zoomMin: 0.1, zoomMax: 30, zoomFactor: 0.5 });
+      draw.size("100%", "100%");
+      draw.zoom(0.7);
+    });
 
   // let res = {
   //   msg: '操作成功',
@@ -1284,7 +1666,7 @@ let handleEnter2 = () => {
   //     }
   //   ]
   // }
-}
+};
 let handleShowSvg = async (svgIndex: string) => {
   // let setData = { id: svgIndex }
   // svgdApi(setData)
@@ -1343,329 +1725,379 @@ let handleShowSvg = async (svgIndex: string) => {
 
   // ---------离线的svg 返回结果
   // 更换result接口
-  let svgJSONIndex = {}
-  if (svgIndex === '556') {
-    svgJSONIndex = svgJSON2.result
-  } else if (svgIndex === '555') {
-    svgJSONIndex = svgJSON.result
-  } else if (svgIndex === 'ying31') {
-    svgJSONIndex = svgJSONying31.result
-  } else if (svgIndex === 'ying41') {
-    svgJSONIndex = svgJSONying41.result
-  } else if (svgIndex === 'zhan16') {
-    svgJSONIndex = svgJSONzhan15.result
-  } else if (svgIndex === 'zhan26') {
-    svgJSONIndex = svgJSONzhan26.result
-  } else if (svgIndex === 'ye23') {
-    svgJSONIndex = svgJSONye23.result
-  } else if (svgIndex === 'ye31') {
-    svgJSONIndex = svgJSONye31.result
+  let svgJSONIndex = {};
+  if (svgIndex === "556") {
+    svgJSONIndex = svgJSON2.result;
+  } else if (svgIndex === "555") {
+    svgJSONIndex = svgJSON.result;
+  } else if (svgIndex === "ying31") {
+    svgJSONIndex = svgJSONying31.result;
+  } else if (svgIndex === "ying41") {
+    svgJSONIndex = svgJSONying41.result;
+  } else if (svgIndex === "zhan16") {
+    svgJSONIndex = svgJSONzhan15.result;
+  } else if (svgIndex === "zhan26") {
+    svgJSONIndex = svgJSONzhan26.result;
+  } else if (svgIndex === "ye23") {
+    svgJSONIndex = svgJSONye23.result;
+  } else if (svgIndex === "ye31") {
+    svgJSONIndex = svgJSONye31.result;
   }
-  let result = svgJSONIndex
+  let result = svgJSONIndex;
   nextTick(() => {
     // 更换svg图
-    let svgHtmlIndex = ''
-    if (svgIndex === '556') {
+    let svgHtmlIndex = "";
+    if (svgIndex === "556") {
       // svgHtmlIndex = svgHtml2
-      svgHtmlIndex = testSvg1
-      handleCustomLine(svgHtmlIndex, result)
-      return
-    } else if (svgIndex === '555') {
-      svgHtmlIndex = svgHtml
-    } else if (svgIndex === 'ying31') {
-      svgHtmlIndex = svgHtml31
-    } else if (svgIndex === 'ying41') {
-      svgHtmlIndex = svgHtml41
-    } else if (svgIndex === 'zhan16') {
-      svgHtmlIndex = svgHtml15
-    } else if (svgIndex === 'zhan26') {
-      svgHtmlIndex = svgHtml26
-    } else if (svgIndex === 'ye23') {
-      svgHtmlIndex = svgHtml23
-    } else if (svgIndex === 'ye31') {
-      svgHtmlIndex = svgHtml311
+      svgHtmlIndex = testSvg1;
+      handleCustomLine(svgHtmlIndex, result);
+      return;
+    } else if (svgIndex === "555") {
+      svgHtmlIndex = svgHtml;
+    } else if (svgIndex === "ying31") {
+      svgHtmlIndex = svgHtml31;
+    } else if (svgIndex === "ying41") {
+      svgHtmlIndex = svgHtml41;
+    } else if (svgIndex === "zhan16") {
+      svgHtmlIndex = svgHtml15;
+    } else if (svgIndex === "zhan26") {
+      svgHtmlIndex = svgHtml26;
+    } else if (svgIndex === "ye23") {
+      svgHtmlIndex = svgHtml23;
+    } else if (svgIndex === "ye31") {
+      svgHtmlIndex = svgHtml311;
     }
-    fun(svgHtmlIndex)
-  })
+    fun(svgHtmlIndex);
+  });
   // 潮流计算
   setTimeout(() => {
     nextTick(() => {
-      handleAnimate(result)
-    })
-  }, 3000)
+      handleAnimate(result);
+    });
+  }, 3000);
   // ---------离线的svg 返回结果
 
   function fun(svgHtml: any) {
-    console.log('svg图渲染函数开始')
+    console.log("svg图渲染函数开始");
 
-    SVGContainer.value.innerHTML = svgHtml as any
-    draw = SVG(SVGContainer.value.getElementsByTagName('svg')[0])
-    let s = draw.panZoom({ zoomMin: 0.1, zoomMax: 30, zoomFactor: 0.5 })
-    draw.size('100%', '100%')
-    draw.zoom(1)
+    SVGContainer.value.innerHTML = svgHtml as any;
+    draw = SVG(SVGContainer.value.getElementsByTagName("svg")[0]);
+    let s = draw.panZoom({ zoomMin: 0.1, zoomMax: 30, zoomFactor: 0.5 });
+    draw.size("100%", "100%");
+    draw.zoom(1);
 
     // 设置文字为白色
-    draw.find('text').each(function () {
-      if (this.fill() === 'blank' || this.fill() === '#000000') {
-        this.fill('#FFFFFF')
+    draw.find("text").each(function () {
+      if (this.fill() === "blank" || this.fill() === "#000000") {
+        this.fill("#FFFFFF");
       }
-    })
+    });
 
-    draw.find('g').each(function () {
+    draw.find("g").each(function () {
       if (this.node.children[1]) {
-        if (this.node.children[1].tagName === 'metadata') {
+        if (this.node.children[1].tagName === "metadata") {
           if (this.node.children[1].children[0].attributes.globeid) {
-            this.node.attributes[0].nodeValue = 'ZQ_' + this.node.children[1].children[0].attributes.globeid.nodeValue
+            this.node.attributes[0].nodeValue =
+              "ZQ_" +
+              this.node.children[1].children[0].attributes.globeid.nodeValue;
           }
         }
       }
-    })
+    });
   }
-  console.log('svg图渲染函数结束')
-}
+  console.log("svg图渲染函数结束");
+};
 // 处理自定义的图
 let handleCustomLine = (svgHtml, result) => {
   nextTick(() => {
-    SVGContainer.value.innerHTML = svgHtml as any
-    draw = SVG(SVGContainer.value.getElementsByTagName('svg')[0])
-    let s = draw.panZoom({ zoomMin: 0.1, zoomMax: 30, zoomFactor: 0.5 })
-    draw.size('100%', '100%')
-    draw.zoom(0.5)
+    SVGContainer.value.innerHTML = svgHtml as any;
+    draw = SVG(SVGContainer.value.getElementsByTagName("svg")[0]);
+    let s = draw.panZoom({ zoomMin: 0.1, zoomMax: 30, zoomFactor: 0.5 });
+    draw.size("100%", "100%");
+    draw.zoom(0.5);
 
     setTimeout(() => {
-      console.log(result, 'result')
-      let polyline = draw.find('polyline')
-      const dom = draw.find('g')
+      console.log(result, "result");
+      let polyline = draw.find("polyline");
+      const dom = draw.find("g");
 
-      result.line.forEach(item => {
-        polyline.forEach(lineIte => {
+      result.line.forEach((item) => {
+        polyline.forEach((lineIte) => {
           if (item.sec_id === lineIte.node.id) {
-            dom.forEach(lineG => {
-              const polyineArray = lineIte.array()
-              console.log(polyineArray, 'polyineArray')
+            dom.forEach((lineG) => {
+              const polyineArray = lineIte.array();
+              console.log(polyineArray, "polyineArray");
 
-              let pathDate = 'M' + polyineArray.join(' L')
+              let pathDate = "M" + polyineArray.join(" L");
               // 流向
-              handlePolyineAnimate(polyineArray, pathDate, lineG)
+              handlePolyineAnimate(polyineArray, pathDate, lineG);
               // 文字
-              handleLineText2(polyineArray, item, lineG)
-            })
+              handleLineText2(polyineArray, item, lineG);
+            });
           }
-        })
-      })
+        });
+      });
 
       // 正向流动
       function handlePolyineAnimate(pointArray, pointsValue, lineDom) {
         // 拿到长度
-        let length = 0
+        let length = 0;
         for (let i = 0; i < pointArray.length; i++) {
           if (pointArray[i] && pointArray[i + 1]) {
-            length += pointDistance(pointArray[i][0], pointArray[i][1], pointArray[i + 1][0], pointArray[i + 1][1])
+            length += pointDistance(
+              pointArray[i][0],
+              pointArray[i][1],
+              pointArray[i + 1][0],
+              pointArray[i + 1][1]
+            );
           }
         }
-        let num = 20
-        let num1 = 0.5
-        let spacingDuration = 10
+        let num = 20;
+        let num1 = 0.5;
+        let spacingDuration = 10;
         // console.log(length, 'length');
 
         if (length >= 0 && length <= 100) {
-          length = 50
-          num = 20
-          num1 = 0.5
-          spacingDuration = 2
+          length = 50;
+          num = 20;
+          num1 = 0.5;
+          spacingDuration = 2;
         } else if (length >= 100 && length <= 200) {
-          length = 150
-          num = 20
-          num1 = 0.5
-          spacingDuration = 4
+          length = 150;
+          num = 20;
+          num1 = 0.5;
+          spacingDuration = 4;
         } else if (length >= 200 && length <= 500) {
-          length = 350
-          num = 20
-          num1 = 0.5
-          spacingDuration = 8
+          length = 350;
+          num = 20;
+          num1 = 0.5;
+          spacingDuration = 8;
         } else if (length >= 500 && length <= 700) {
-          length = 650
-          num = 20
-          num1 = 0.5
-          spacingDuration = 10
+          length = 650;
+          num = 20;
+          num1 = 0.5;
+          spacingDuration = 10;
         } else if (length >= 700 && length <= 1000) {
-          length = 850
-          num = 20
-          num1 = 0.5
-          spacingDuration = 12
+          length = 850;
+          num = 20;
+          num1 = 0.5;
+          spacingDuration = 12;
         } else if (length >= 1000 && length <= 1200) {
-          length = 1150
-          num = 20
-          num1 = 0.5
-          spacingDuration = 16
+          length = 1150;
+          num = 20;
+          num1 = 0.5;
+          spacingDuration = 16;
         } else if (length >= 1200 && length <= 1500) {
-          length = 1350
-          num = 20
-          num1 = 0.5
-          spacingDuration = 20
+          length = 1350;
+          num = 20;
+          num1 = 0.5;
+          spacingDuration = 20;
         } else if (length >= 1500 && length <= 1700) {
-          length = 1600
-          num = 20
-          num1 = 0.5
-          spacingDuration = 24
+          length = 1600;
+          num = 20;
+          num1 = 0.5;
+          spacingDuration = 24;
         } else if (length >= 1700 && length <= 2000) {
-          length = 1850
-          num = 20
-          num1 = 0.5
-          spacingDuration = 28
+          length = 1850;
+          num = 20;
+          num1 = 0.5;
+          spacingDuration = 28;
         } else if (length >= 2000 && length <= 2200) {
-          length = 2100
-          num = 20
-          num1 = 0.5
-          spacingDuration = 32
+          length = 2100;
+          num = 20;
+          num1 = 0.5;
+          spacingDuration = 32;
         } else if (length >= 2200 && length <= 2500) {
-          length = 2350
-          num = 20
-          num1 = 0.5
-          spacingDuration = 34
+          length = 2350;
+          num = 20;
+          num1 = 0.5;
+          spacingDuration = 34;
         } else if (length >= 2500 && length <= 2700) {
-          length = 2600
-          num = 20
-          num1 = 0.5
-          spacingDuration = 38
+          length = 2600;
+          num = 20;
+          num1 = 0.5;
+          spacingDuration = 38;
         } else if (length >= 2700 && length <= 3000) {
-          length = 2800
-          num = 20
-          num1 = 0.5
-          spacingDuration = 40
+          length = 2800;
+          num = 20;
+          num1 = 0.5;
+          spacingDuration = 40;
         } else if (length >= 3000 && length <= 3200) {
-          length = 3100
-          num = 20
-          num1 = 0.5
-          spacingDuration = 44
+          length = 3100;
+          num = 20;
+          num1 = 0.5;
+          spacingDuration = 44;
         } else if (length >= 3200 && length <= 3500) {
-          length = 3350
-          num = 20
-          num1 = 0.5
-          spacingDuration = 48
+          length = 3350;
+          num = 20;
+          num1 = 0.5;
+          spacingDuration = 48;
         }
 
-        let numTriangles = Math.ceil(length / num)
-        let duration = numTriangles / num1
-        let middleDuration = duration / num1
+        let numTriangles = Math.ceil(length / num);
+        let duration = numTriangles / num1;
+        let middleDuration = duration / num1;
 
         for (let i = 0; i < numTriangles; i++) {
-          let triangle = draw.polygon('0,-5 20,0 0,5').fill('lightgreen').stroke({ color: 'lightgreen', width: 0.2 })
+          let triangle = draw
+            .polygon("0,-5 20,0 0,5")
+            .fill("lightgreen")
+            .stroke({ color: "lightgreen", width: 0.2 });
 
-          let triangleanimate = document.createElementNS('http://www.w3.org/2000/svg', 'animateMotion')
-          triangleanimate.setAttribute('path', pointsValue)
-          triangleanimate.setAttribute('dur', `${spacingDuration}s`)
-          let startTime = middleDuration - (duration / numTriangles) * i - i * spacingDuration
-          triangleanimate.setAttribute('begin', `${startTime}s`)
-          triangleanimate.setAttribute('fill', 'remove')
-          triangleanimate.setAttribute('rotate', 'auto')
-          triangleanimate.setAttribute('repeatCount', 'indefinite')
-          triangle.node.appendChild(triangleanimate)
+          let triangleanimate = document.createElementNS(
+            "http://www.w3.org/2000/svg",
+            "animateMotion"
+          );
+          triangleanimate.setAttribute("path", pointsValue);
+          triangleanimate.setAttribute("dur", `${spacingDuration}s`);
+          let startTime =
+            middleDuration -
+            (duration / numTriangles) * i -
+            i * spacingDuration;
+          triangleanimate.setAttribute("begin", `${startTime}s`);
+          triangleanimate.setAttribute("fill", "remove");
+          triangleanimate.setAttribute("rotate", "auto");
+          triangleanimate.setAttribute("repeatCount", "indefinite");
+          triangle.node.appendChild(triangleanimate);
 
-          lineDom.add(triangle)
+          lineDom.add(triangle);
         }
-        let rect = draw.rect(30, 30).fill('#000').move(-5, -10)
-        lineDom.add(rect)
+        let rect = draw.rect(30, 30).fill("#000").move(-5, -10);
+        lineDom.add(rect);
       }
       function pointDistance(x1, y1, x2, y2) {
-        const distance = Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2))
-        return distance
+        const distance = Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2));
+        return distance;
       }
       function handleLineText2(polyineArray, Lineitem, lineDom) {
-        let textArr = ['0ce8fe26-ce4a-4d21-9dfa-b8084e9296091', '0ce8fe26-ce4a-4d21-9dfa-b8084e9296092', '0ce8fe26-ce4a-4d21-9dfa-b8084e9296093', '26']
-        if (textArr.includes(Lineitem.sec_id)) return
+        let textArr = [
+          "0ce8fe26-ce4a-4d21-9dfa-b8084e9296091",
+          "0ce8fe26-ce4a-4d21-9dfa-b8084e9296092",
+          "0ce8fe26-ce4a-4d21-9dfa-b8084e9296093",
+          "26",
+        ];
+        if (textArr.includes(Lineitem.sec_id)) return;
         // console.log(item, "lineitem");
-        let idArr = ['896EE332-AFB3-5C1C-E044-001A4B099F30-00001', '0ce8fe26-ce4a-4d21-9dfa-b8084e929609', 'C9425152-181A-481C-A0E7-E6227E425596-14781', '02ACC5B5-6200-4775-BFEB-726A237EB6C1-410133', '896EE332-AFB5-5C1C-E044-001A4B099F30-00001', 'SBID0000008FDCEBEC3EEE4304902CF0EFD3A8B0A5']
+        let idArr = [
+          "896EE332-AFB3-5C1C-E044-001A4B099F30-00001",
+          "0ce8fe26-ce4a-4d21-9dfa-b8084e929609",
+          "C9425152-181A-481C-A0E7-E6227E425596-14781",
+          "02ACC5B5-6200-4775-BFEB-726A237EB6C1-410133",
+          "896EE332-AFB5-5C1C-E044-001A4B099F30-00001",
+          "SBID0000008FDCEBEC3EEE4304902CF0EFD3A8B0A5",
+        ];
         // 判断line的  "Flow_Direction_Flag": "0" 满足条件显示箭头和文字
-        if (Lineitem['Flow_Direction_Flag'] === '0') return
+        if (Lineitem["Flow_Direction_Flag"] === "0") return;
 
-        let data = Lineitem
-        let x = (Number(polyineArray[polyineArray.length - 1][0]) + Number(polyineArray[0][0])) / 2
-        let y = (Number(polyineArray[polyineArray.length - 1][1]) + Number(polyineArray[0][1])) / 2
-        let line = ''
-        let text = ''
-        let endX = 0
-        let endY = 0
-        let endTextX = 0
-        let endTextY = 0
+        let data = Lineitem;
+        let x =
+          (Number(polyineArray[polyineArray.length - 1][0]) +
+            Number(polyineArray[0][0])) /
+          2;
+        let y =
+          (Number(polyineArray[polyineArray.length - 1][1]) +
+            Number(polyineArray[0][1])) /
+          2;
+        let line = "";
+        let text = "";
+        let endX = 0;
+        let endY = 0;
+        let endTextX = 0;
+        let endTextY = 0;
         if (idArr.includes(Lineitem.sec_id)) {
-          endX = x - 30
-          endY = y + 40
-          endTextX = x - 80
-          endTextY = y + 50
+          endX = x - 30;
+          endY = y + 40;
+          endTextX = x - 80;
+          endTextY = y + 50;
         } else {
           // 起点y 终点y相等
-          endX = x
-          endY = y + 30
-          endTextX = x - 30
-          endTextY = y + 40
+          endX = x;
+          endY = y + 30;
+          endTextX = x - 30;
+          endTextY = y + 40;
         }
         //只要线路上有sec_id 就显示线路上的文字 p  q v i 参数
-        if (data['sec_id']) {
+        if (data["sec_id"]) {
           // 引出线
           line = draw.line(x, y, endX, endY).attr({
-            'stroke-width': 2,
-            id: 'left_line_' + data.psrId,
-            stroke: 'green',
-            'stroke-dasharray': '3,3'
-          })
+            "stroke-width": 2,
+            id: "left_line_" + data.psrId,
+            stroke: "green",
+            "stroke-dasharray": "3,3",
+          });
           // 文本
           text = draw
-            .text(`P: ${(parseFloat(data['Pi']) * 100).toFixed(4)} kW \nQ: ${(parseFloat(data['Qi']) * 10).toFixed(4)} kVar \nV: ${parseFloat(data['V_b']).toFixed(4)}  kV \nI: ${((parseFloat(data['Pi']) * 100) / (parseFloat(data['V_b']) * 1.732)).toFixed(4)}  A`)
+            .text(
+              `P: ${(parseFloat(data["Pi"]) * 100).toFixed(4)} kW \nQ: ${(
+                parseFloat(data["Qi"]) * 10
+              ).toFixed(4)} kVar \nV: ${parseFloat(data["V_b"]).toFixed(
+                4
+              )}  kV \nI: ${(
+                (parseFloat(data["Pi"]) * 100) /
+                (parseFloat(data["V_b"]) * 1.732)
+              ).toFixed(4)}  A`
+            )
             .attr({
               x: endTextX,
               y: endTextY,
-              id: 'load_text' + data.psrId,
-              'font-size': '8',
-              leading: '0.9'
+              id: "load_text" + data.psrId,
+              "font-size": "8",
+              leading: "0.9",
             })
-            .fill('green')
+            .fill("green");
         }
 
-        lineDom.add(line)
-        lineDom.add(text)
+        lineDom.add(line);
+        lineDom.add(text);
       }
-      let path = draw.find('path')
-      path.forEach(item => {
+      let path = draw.find("path");
+      path.forEach((item) => {
         if (item.node.id) {
-          let data = result.load.find(ite => item.node.id === ite.load_id.split('&')[0])
+          let data = result.load.find(
+            (ite) => item.node.id === ite.load_id.split("&")[0]
+          );
           if (data) {
-            let position = item.bbox()
+            let position = item.bbox();
 
-            let centerX = position.cx
-            let centerY = position.cy
-            console.log(position, centerX, centerY)
+            let centerX = position.cx;
+            let centerY = position.cy;
+            console.log(position, centerX, centerY);
             draw.line(centerX, centerY, centerX - 50, centerY + 70).attr({
-              'stroke-width': 2,
-              id: 'load_' + data.load_id,
-              stroke: 'green',
-              'stroke-dasharray': '3,3'
-            })
+              "stroke-width": 2,
+              id: "load_" + data.load_id,
+              stroke: "green",
+              "stroke-dasharray": "3,3",
+            });
             // 文本
             draw
-              .text(`P: ${(parseFloat(data['Pload/phase']) * 8).toFixed(4)} kW\nQ: ${(parseFloat(data['i']) * 8).toFixed(4)} kVar`)
+              .text(
+                `P: ${(parseFloat(data["Pload/phase"]) * 8).toFixed(
+                  4
+                )} kW\nQ: ${(parseFloat(data["i"]) * 8).toFixed(4)} kVar`
+              )
               .attr({
                 x: centerX - 100,
                 y: centerY + 80,
-                id: 'load_text' + data.load_id,
-                'font-size': '9',
-                leading: '0.9'
+                id: "load_text" + data.load_id,
+                "font-size": "9",
+                leading: "0.9",
               })
-              .fill('green')
+              .fill("green");
           }
         }
-      })
-    }, 2000)
-  })
-}
+      });
+    }, 2000);
+  });
+};
 // 处理线的动画、文字
 let handleAnimate = async (result: any) => {
-  console.log(result, 'resultresultresultresultresult')
+  console.log(result, "resultresultresultresultresult");
   // 获取所有的g
-  let aclineDOM = draw.find('g')
+  let aclineDOM = draw.find("g");
   // 线的流向
-  result.line.forEach(item => {
+  result.line.forEach((item) => {
     let showTextArr = [
+<<<<<<< HEAD
       '53865f4f-5564-42fd-94e6-697fa110dc58',
       'f9d98d48-f25a-4486-bf20-49895ec3e342',
       'a1096ad7-aae7-487b-ad05-1113a03cb4f8',
@@ -1925,50 +2357,274 @@ let handleAnimate = async (result: any) => {
     ]
 
     let dom = draw.findOne('#ZQ_' + item.sec_id)
+=======
+      "53865f4f-5564-42fd-94e6-697fa110dc58",
+      "f9d98d48-f25a-4486-bf20-49895ec3e342",
+      "a1096ad7-aae7-487b-ad05-1113a03cb4f8",
+      "6DDB3B85-A4AB-4595-8591-2168E8D81210-04953",
+      "95efda22-86a3-49b5-9de3-803738256461",
+      "c47a01b3-3d42-47fd-a263-6ae11b630a36",
+      "e0af5215-d781-4050-87bb-c21dafca0695",
+      "8bd342c8-9820-4bb8-85cf-105bcb8f1a03",
+      "4b00fe92-0efa-40b9-bce0-2d6598a6c357",
+      "1fd7d361-4ea0-487f-9a36-a7a5d222b66d",
+      "c70087bd-0468-4ac7-8208-db96853550b8",
+      "65c2f45a-4432-4a29-9b9e-a2ac60f83f38",
+      "c78a0a1d-f2b5-4a41-ba98-ba895a5701f5",
+      "e5698b2c-2dff-43b7-b0b1-6135f780a052",
+      "1bf76898-ea7c-47bd-8f31-14d624ac3f66",
+      "20604b66-0efd-44fc-a712-e4a534b61ffa",
+      "fe8cb836-ae9b-4ab2-8b65-a5ff405d3a9c",
+      "d5336b00-5afe-4393-9014-bcb2dc0029a1",
+      "AD4A0872-6474-4BD2-9646-746B0B63D24A-26520",
+      "ea04e6d3-587e-4ca0-ae6a-31997fd1fb35",
+      "7fc56aa9-3bf3-4a2b-bd03-4b6b791bc63a",
+      "c8695ee9-c277-40ac-ad1c-5c10605e4e47",
+      "9f77f5b2-c3e2-4141-be4f-df9043789813",
+      "AD4A0872-6474-4BD2-9646-746B0B63D24A-26480",
+      "22205de9-f4db-4626-aad5-437b17856f6d",
+      "177997cd-edc3-420d-b657-0b602a473929",
+      "1d2f708c-f0d6-4269-bcc7-db998503d9e6",
+      "ef7de3d0-8521-4f6d-81d2-c9f1705bfb9b",
+      "d3cebbd8-3ffd-48af-8979-874389f9c32a",
+      "01f825ec-9526-4239-b0cf-f9d0d473b086",
+      "513e7602-d1d5-4370-a39f-af41ef2a5eef",
+      "23ee05dc-1e5d-4eca-8fea-07210d06a579",
+      "487C8FA1-ABEC-4252-A14D-7727D4E31DAD-47360",
+      "AD4A0872-6474-4BD2-9646-746B0B63D24A-26525",
+      "AD4A0872-6474-4BD2-9646-746B0B63D24A-26530",
+      "SBID00000017083154D08541B8A57FB8B69B1B3201",
+      "AD4A0872-6474-4BD2-9646-746B0B63D24A-26535",
+      "013255C2-7FE7-4B28-BF7C-7EB83FC07F31-06125",
+      "AD4A0872-6474-4BD2-9646-746B0B63D24A-26465",
+      "ce4ba346-1227-416f-84ad-b8d2cde0154c",
+      "SBID0000001986642DB7C045E89813CED6BE4C13A0",
+      "87608bd7-15a2-4c9c-bd78-ccf9b58a31c0",
+      "888c9204-7897-4dc2-a247-3ab3be9a08cf",
+      "c65da884-685d-4c1b-97d8-08b50328b0ba",
+      "SBID0000001D2DEA1F390C4024B42B0C3F9E7F4EFE",
+      "90477e98-bfd8-46ab-ba4e-c58d631a1437",
+      "0746bb6a-b717-49b1-bc57-6073c4e2d2e9",
+      "5d43423c-3705-40c1-8226-db498fd35af2",
+      "aeaf5dbb-e1c9-48bb-adc6-d604fa8f1028",
+      "31e7b036-400a-4fe3-8700-30190f7f6b82",
+      "SBID000000C8642470D83E486BBB311BDA51515F35",
+      "af2d4b84-bee6-4c93-b9d4-3e1c32ad17ff",
+      "SBID0000006A6B053E31A648609F9743D97E12A49D",
+      "b78c69b4-71de-47cf-ae83-90dbd4e9e8f2",
+      "bab210a5-c289-461c-94fb-5c4afd158544",
+      "c83d5650-08e1-44d6-b8c7-822de083f36e",
+      "6374FC19-1673-43C6-AC8D-494CFFBB4C9F-85198",
+      "6374FC19-1673-43C6-AC8D-494CFFBB4C9F-85193",
+      "be9d83ac-8121-4f96-bb3a-c1c751f185d6",
+      "2ccdaa60-8958-45de-bb31-f35e7ba85a8b",
+      "a2ebae33-0efb-40ee-a097-2dacec109868",
+      "eb4fc970-2478-4bdc-aa25-bdd7ad4c5dae",
+      "644e331d-e932-4ec8-92ed-3d09e30db28f",
+      "SBID000000BE1E6FF87E7244B5BC7E1346FF0860CA",
+      "ce1df80b-9fd3-498b-9f24-a5ed6f416532",
+      "2D6FDD6A-F2D0-4EDE-8177-321A747C4D10-76308",
+      "00d1219b-a69c-4a43-b8fd-67f461b4c9f3",
+      "DCEED74F-BD86-4AF6-AE71-15C80F872877-46071",
+      "2db67071-a5bd-4c03-83bb-d4250d44b995",
+      "d63eae69-fe6c-4012-b6aa-8c5333f2dd27",
+      "b7867bdd-4203-4f03-9d25-8f5acb3caa3b",
+      "8CF95CE3-7B11-15ED-E044-001A4B099F30-00001",
+      "a12f5c38-3ad7-47be-b304-045733513143",
+      "6b046b2c-dc11-45d5-8fff-d1529fe3835a",
+      "30fe04fa-8610-4cb5-8bc8-ad1222690638",
+      "1682d60e-58f2-4716-a041-59e7ddb35ee8",
+      "a2998143-bf4a-4753-8f6a-08a519a7bd11",
+      "e95bd2eb-5c61-4993-90f9-625ada63ad04",
+      "8febc98f-8334-4de0-a163-c6c03ad0692b",
+      "93313035-093F-4346-96F4-84CEA3607C08-25598",
+      "7A414E41-2DA2-4341-91BB-250834033791-36035",
+      "SBID0000002BEFD03075CF4033878FEF9249896A21",
+      "cd4d4dd4-15a1-4154-995a-fe2431051acd",
+      "5e909114-b342-4dc1-9f32-22b268060812",
+      "629c0eb1-7af8-4893-87ab-d8feb70cdb1f",
+      "FF801E5F-FE30-4F54-B32E-28B9A46504B7-13926",
+      "DD330AD2-52B1-4581-AB75-18D80366F023-37414",
+      "7fb7a36d-2f2f-4e57-9ebb-bc43a8109e78",
+      "8f70fcb5-b59f-490a-baad-55370c5f7161",
+      "dfbf6f51-edb2-440e-b703-1325fe2695fb",
+      "0b48767a-d287-4f57-be3b-1148305b2048",
+      "629c0eb1-7af8-4893-87ab-d8feb70cdb1f",
+      "FF801E5F-FE30-4F54-B32E-28B9A46504B7-13926",
+      "DD330AD2-52B1-4581-AB75-18D80366F023-37414",
+      "7fb7a36d-2f2f-4e57-9ebb-bc43a8109e78",
+      "8f70fcb5-b59f-490a-baad-55370c5f7161",
+      "SBID000000EEED86E606694F4EACF343E96A517170",
+      "e3ad70bf-4b84-4fb3-8c95-36973433b007",
+      "dfbf6f51-edb2-440e-b703-1325fe2695fb",
+      "4e036c18-19c5-473a-a95d-481cf89c362c",
+      "4e231cf2-9f49-4a78-a534-c0b702296833",
+      "9d8e808f-5d3b-4376-97a7-58eeca042dba",
+      "SBID000000AECA5D4DF7874850A8F0AA07FCC3A705",
+      "283e025e-994f-4125-8772-4ec88fc7e321",
+      "fa4353a2-6ccb-4e12-b47a-e765b81804fa",
+      "0ffd90f0-37dd-4aa1-96a7-a29d2bd4e535",
+      "2299b109-34a7-493f-9541-c22594ba4312",
+      "cb957cab-247a-4cea-b787-cd627f9e0f7a",
+      "b7dc1c1f-5743-4905-b99e-cbc5617b660a",
+      "fbca52e8-59ef-4bc1-be38-6f60757a3579",
+      "b46aea1f-fc42-4bd4-a6b2-c5ae63c2b33b",
+      "16bb368c-104d-4ba7-934d-a44927f65444",
+      "3e43db18-8b4d-4e57-99b0-ab6521600daa",
+      "SBID0000003195CD2F53454D99BD74B97F94982AF9",
+      "8486dc26-360e-458b-976c-93ced7c82369",
+      "99da9925-a1d7-49be-89ef-adb955a06f21",
+      "3c18d284-b067-4dca-94b4-ee178410f751",
+      "9de0fd07-7169-4fcb-bb0b-789ec3644ac7",
+      "418bb7a7-f954-4505-8762-f80b1516d773",
+      "4b14e5cc-91f7-484b-b970-45297c125d8d",
+      "9df040f3-0278-4ea8-960f-0b8c9b13c759",
+      "461EC281-51EC-4913-82B0-C155B2C3EC96-38266",
+      "6ed756cb-d68c-482d-9e37-b9d55f6ba28e",
+      "1190934f-fc87-4ae0-8ffd-7ad1873342b5",
+      "64dbe8d8-13d3-434d-be7d-0a34087c9bba",
+      "8efc932e-4ee9-4898-9ce9-e074a5c3e5ae",
+      "5398db21-a148-4ec2-9e5c-27be65e83f81",
+      "eea16226-2564-41d7-b9fd-afb7fcab3086",
+      "7d0a1873-b6cf-4d91-9e3d-7cff52681768",
+      "37765eb0-b5df-4fbf-8a62-8c1af3454c9a",
+      "25d8733e-e117-4b6d-8a36-ce0bd1e6bdbb",
+      "787bf14f-e8f7-4a2c-9b35-44e1f710838d",
+      "7A414E41-2DA2-4341-91BB-250834033791-36070",
+      "f9b30774-dcf2-4e3d-a055-3b8f3951734e",
+      "791b3f34-7329-4c99-8a2f-821695a539a4",
+      "977797dc-70b8-4b5e-b8da-59d87fd54e4c",
+      "96d8e5c2-fe59-420e-b2b8-dca40760d1bb",
+      "958c21b9-c6b6-4e39-9320-6b81958d6a89",
+      "6723d52b-dd5d-4a2d-bfcd-6c86c26196ff",
+      "195947f3-4f2d-4f04-8652-62260d83896d",
+      "bd9e14ce-bdf9-4bc9-bbcc-2a33f9e1eee3",
+      "8052490e-ef04-48d8-965a-bc8e67224457",
+      "f6188f0d-93f5-44ea-a4b3-b482ab228e38",
+      "C2D0E102-F479-4163-9D19-80591BCDB1E1-49087",
+      "bcdb90ce-eefc-46f5-b62a-be92593dac23",
+      "62f47df6-646a-407c-809c-d57e0fd85829",
+      "b1a0e9eb-ed69-4761-acc4-a6cd9b345d82",
+      "9ee10651-8ee7-435e-a68e-6d4e2009cf33",
+      "3f8bf3a5-9326-4cc1-bd42-ece7b7c58acc",
+      "93c510f7-ab06-4fd5-a143-8efd373fb679",
+      "6c31a6e8-2aee-49a2-9c87-07a20168e67c",
+      "SBID000000EEE12F9BA91E41C1ABACD8C2C85A8E4D",
+      "91731803-5e37-4aee-a520-68a8590ea0b7",
+      "af2b9349-494c-4968-955c-2d5c0a5ef3b0",
+      "60773faf-fdc8-4ade-a840-1d10514056e7",
+      "2e7d953e-82b0-40e2-96ac-ed8dc53499e7",
+      "ade7eb0e-7c87-46b9-a095-9445d519042e",
+      "5a4c6345-443c-423b-88b9-af736411c7ed",
+      "6105A1DC-215A-4ADC-82F4-AA82D20B4635-15661",
+      "3e0f29af-1753-4b84-8675-5f358c9b65f4",
+      "4e00c1b4-10ec-470a-bc11-fa8a986e8df1",
+      "78cbdff3-a003-46b1-9f0c-b20ff2bebdd9",
+      "aa153f85-d7e5-42d5-81c9-a3ab942438ed",
+      "29f27fd3-ef21-4f23-8939-11d5d996bbec",
+      "D20588AB-3797-4B2C-BF86-9A2768671604-52022",
+      "5e4c71dc-119c-430a-b7f2-55898d54592b",
+      "d82f3561-9b7f-4c83-80c1-9541697c377d",
+      "e956cb7e-ad60-473e-9266-305d98d3fa79",
+      "SBID000000E22B0F1386EE4160BCC88ECC30363978",
+      "e87ee5a8-ff96-41ea-905e-fa9b311bbf58",
+      "020c37c3-faa3-4b7b-a953-5a607cf052c9",
+      "b7783c78-fd54-421a-9f40-10e94417f35c",
+      "93e2b4c4-f983-42b8-920d-bb1732ef6e3c",
+      "add38f99-955a-43bd-b906-aabc02c0ac45",
+      "b5d7c462-60dd-4e3d-959e-6f018cd13408",
+      "19159691-4689-4B1C-A59F-93B88BE04CF8-60065",
+      "d9698e64-cc16-476e-aaaa-302d84977134",
+      "0e1f3493-d65a-4cba-b0f5-4de5802f1094",
+      "aed6d852-eb97-4a36-bd6e-b6515a1fddf7",
+      "C9B5E416-235E-406E-9F10-6540B896742C-16471",
+      "316f8582-f4ef-4308-b401-0e340e913fd4",
+      "8a17350d-2a01-4fd3-8162-b49ff846dfff",
+      "43284474-a877-4c2f-ab51-c41494ce471a",
+      "d4ac29b6-d466-4260-82b4-ac9de017639d",
+      "02f3c20b-b206-4d7a-a72b-813acb818277",
+      "C9B5E416-235E-406E-9F10-6540B896742C-16441",
+      "c5877708-9737-42a2-bc7e-8c3c80ada526",
+      "7721f74c-830b-462d-9213-6a587c89ba52",
+      "SBID00000004B3ED27EB944D438AB05DE144E145B1",
+      "12ad0cff-60b7-41bc-994d-003fd1417aa6",
+      "b70aebff-33b5-404d-b010-703fc6d409f9",
+      "be8815ba-1467-4428-8deb-f6667ab74cb2",
+      "487ed7a1-fbb7-4065-93c8-fb6963a46516",
+      "eaf496e5-df1c-4c22-8e1c-0114d4e256fe",
+      "090a428c-4a90-4587-a395-cf96d492cd6f",
+      "c9c480b7-01dc-4a64-b74d-71269d9c5914",
+      "a62b1217-0381-4fa3-be3a-585ea974f5ab",
+      "efa7f59c-34b6-4f83-b998-d0979f55a290",
+      "77da5747-f38b-4aab-8506-65011a62c0f6",
+      "e380d914-65d1-48bb-813b-3b2016f399e9",
+    ];
+
+    let dom = draw.findOne("#ZQ_" + item.sec_id);
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
 
     if (dom) {
-      if (item.Flow_Direction_Flag === '0') return
-      const polyine = dom.findOne('polyline')
-      const polyineArray = polyine.array()
-      const width = polyine.attr('stroke-width')
-      let polyineArray2 = polyine.array()
-      let pathDate = 'M' + polyineArray2.join(' L')
-      if (item.Flow_Direction_Flag === '-1') {
-        handlePolyineAnimate2(polyineArray, pathDate, dom, item)
+      if (item.Flow_Direction_Flag === "0") return;
+      const polyine = dom.findOne("polyline");
+      const polyineArray = polyine.array();
+      const width = polyine.attr("stroke-width");
+      let polyineArray2 = polyine.array();
+      let pathDate = "M" + polyineArray2.join(" L");
+      if (item.Flow_Direction_Flag === "-1") {
+        handlePolyineAnimate2(polyineArray, pathDate, dom, item);
       } else {
-        handlePolyineAnimate(polyineArray, pathDate, dom, item)
+        handlePolyineAnimate(polyineArray, pathDate, dom, item);
       }
-      console.log(item.sec_id, showTextArr.includes(item.sec_id))
-      showTextArr.includes(item.sec_id) ? '' : handleLineText2(polyineArray, item, dom)
+      console.log(item.sec_id, showTextArr.includes(item.sec_id));
+      showTextArr.includes(item.sec_id)
+        ? ""
+        : handleLineText2(polyineArray, item, dom);
     }
-  })
+  });
   function handleLineText2(polyineArray, Lineitem, lineDom) {
     // 判断line的  "Flow_Direction_Flag": "0" 满足条件显示箭头和文字
-    if (Lineitem['Flow_Direction_Flag'] === '0') return
+    if (Lineitem["Flow_Direction_Flag"] === "0") return;
 
-    let data = Lineitem
-    let x = (Number(polyineArray[polyineArray.length - 1][0]) + Number(polyineArray[0][0])) / 2
-    let y = (Number(polyineArray[polyineArray.length - 1][1]) + Number(polyineArray[0][1])) / 2
-    let line
-    let text
+    let data = Lineitem;
+    let x =
+      (Number(polyineArray[polyineArray.length - 1][0]) +
+        Number(polyineArray[0][0])) /
+      2;
+    let y =
+      (Number(polyineArray[polyineArray.length - 1][1]) +
+        Number(polyineArray[0][1])) /
+      2;
+    let line;
+    let text;
     //只要线路上有sec_id 就显示线路上的文字 p  q v i 参数
-    if (data['sec_id']) {
+    if (data["sec_id"]) {
       // 引出线
       line = draw.line(x, y, x - 5, y + 5).attr({
-        'stroke-width': 0.1,
-        id: 'left_line_' + data.psrId,
-        stroke: 'green',
-        'stroke-dasharray': '1,1'
-      })
+        "stroke-width": 0.1,
+        id: "left_line_" + data.psrId,
+        stroke: "green",
+        "stroke-dasharray": "1,1",
+      });
       // 文本
       text = draw
         .text(
+<<<<<<< HEAD
           `P: ${(parseFloat(data['Pi']) * 100).toFixed(4)} kW 
               Q: ${(parseFloat(data['Qi']) * 10).toFixed(4)} kVar \nV: ${parseFloat(data['V_b']).toFixed(4)}  kV \nI: ${((parseFloat(data['Pi']) * 100) / (parseFloat(data['V_b']) * 1.732)).toFixed(4)}  A`
+=======
+          `P: ${(parseFloat(data["Pi"]) * 10).toFixed(4)} kW 
+              Q: ${(parseFloat(data["Qi"]) * 10).toFixed(
+                4
+              )} kVar \nV: ${parseFloat(data["V_b"]).toFixed(4)}  kV \nI: ${(
+            (parseFloat(data["Pi"]) * 10) /
+            (parseFloat(data["V_b"]) * 1.732)
+          ).toFixed(4)}  A`
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
         )
         .attr({
           x: x - 10,
           y: y + 5,
+<<<<<<< HEAD
           id: 'load_text' + data.psrId,
           'font-size': '1'
         })
@@ -1977,15 +2633,25 @@ let handleAnimate = async (result: any) => {
       text.node.children[1].setAttribute('dy', '1')
       text.node.children[2].setAttribute('dy', '1')
       text.node.children[3].setAttribute('dy', '1')
+=======
+          id: "load_text" + data.psrId,
+          "font-size": "1",
+        })
+        .fill("green");
+      text.node.children[0].setAttribute("dy", "1");
+      text.node.children[1].setAttribute("dy", "1");
+      text.node.children[2].setAttribute("dy", "1");
+      text.node.children[3].setAttribute("dy", "1");
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
     }
 
-    lineDom.add(line)
-    lineDom.add(text)
+    lineDom.add(line);
+    lineDom.add(text);
   }
 
   // 正向流动
   function handlePolyineAnimate(pointArray, pointsValue, lineDom, Lineitem) {
-    console.log(pointArray, pointsValue, lineDom, Lineitem)
+    console.log(pointArray, pointsValue, lineDom, Lineitem);
 
     // console.log(
     //   pointArray,
@@ -1996,131 +2662,153 @@ let handleAnimate = async (result: any) => {
     //   "潮流的流动--------"
     // );
     // 判断line的  "Flow_Direction_Flag": "0" 满足条件显示箭头和文字
-    if (Lineitem['Flow_Direction_Flag'] === '0') return
+    if (Lineitem["Flow_Direction_Flag"] === "0") return;
 
     // 拿到长度
-    let length = 0
+    let length = 0;
     for (let i = 0; i < pointArray.length; i++) {
       if (pointArray[i] && pointArray[i + 1]) {
-        length += pointDistance(pointArray[i][0], pointArray[i][1], pointArray[i + 1][0], pointArray[i + 1][1])
+        length += pointDistance(
+          pointArray[i][0],
+          pointArray[i][1],
+          pointArray[i + 1][0],
+          pointArray[i + 1][1]
+        );
       }
     }
-    let num = 20
-    let num1 = 0.5
-    let spacingDuration = 10
+    let num = 20;
+    let num1 = 0.5;
+    let spacingDuration = 10;
     // console.log(length, 'length');
 
     if (length >= 0 && length <= 100) {
-      length = 50
-      num = 20
-      num1 = 0.5
-      spacingDuration = 2
+      length = 50;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 2;
     } else if (length >= 100 && length <= 200) {
-      length = 150
-      num = 20
-      num1 = 0.5
-      spacingDuration = 4
+      length = 150;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 4;
     } else if (length >= 200 && length <= 500) {
-      length = 350
-      num = 20
-      num1 = 0.5
-      spacingDuration = 8
+      length = 350;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 8;
     } else if (length >= 500 && length <= 700) {
-      length = 650
-      num = 20
-      num1 = 0.5
-      spacingDuration = 10
+      length = 650;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 10;
     } else if (length >= 700 && length <= 1000) {
-      length = 850
-      num = 20
-      num1 = 0.5
-      spacingDuration = 12
+      length = 850;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 12;
     } else if (length >= 1000 && length <= 1200) {
-      length = 1150
-      num = 20
-      num1 = 0.5
-      spacingDuration = 16
+      length = 1150;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 16;
     } else if (length >= 1200 && length <= 1500) {
-      length = 1350
-      num = 20
-      num1 = 0.5
-      spacingDuration = 20
+      length = 1350;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 20;
     } else if (length >= 1500 && length <= 1700) {
-      length = 1600
-      num = 20
-      num1 = 0.5
-      spacingDuration = 24
+      length = 1600;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 24;
     } else if (length >= 1700 && length <= 2000) {
-      length = 1850
-      num = 20
-      num1 = 0.5
-      spacingDuration = 28
+      length = 1850;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 28;
     } else if (length >= 2000 && length <= 2200) {
-      length = 2100
-      num = 20
-      num1 = 0.5
-      spacingDuration = 32
+      length = 2100;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 32;
     } else if (length >= 2200 && length <= 2500) {
-      length = 2350
-      num = 20
-      num1 = 0.5
-      spacingDuration = 34
+      length = 2350;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 34;
     } else if (length >= 2500 && length <= 2700) {
-      length = 2600
-      num = 20
-      num1 = 0.5
-      spacingDuration = 38
+      length = 2600;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 38;
     } else if (length >= 2700 && length <= 3000) {
-      length = 2800
-      num = 20
-      num1 = 0.5
-      spacingDuration = 40
+      length = 2800;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 40;
     } else if (length >= 3000 && length <= 3200) {
-      length = 3100
-      num = 20
-      num1 = 0.5
-      spacingDuration = 44
+      length = 3100;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 44;
     } else if (length >= 3200 && length <= 3500) {
-      length = 3350
-      num = 20
-      num1 = 0.5
-      spacingDuration = 48
+      length = 3350;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 48;
     }
 
-    let numTriangles = Math.ceil(length / num)
-    let duration = numTriangles / num1
-    let middleDuration = duration / num1
+    let numTriangles = Math.ceil(length / num);
+    let duration = numTriangles / num1;
+    let middleDuration = duration / num1;
 
     for (let i = 0; i < numTriangles; i++) {
-      let triangle = draw.polygon('0,-1 4,0 0,1').fill('lightgreen').stroke({ color: 'lightgreen', width: 0.2 })
+      let triangle = draw
+        .polygon("0,-1 4,0 0,1")
+        .fill("lightgreen")
+        .stroke({ color: "lightgreen", width: 0.2 });
 
-      let triangleanimate = document.createElementNS('http://www.w3.org/2000/svg', 'animateMotion')
-      triangleanimate.setAttribute('path', pointsValue)
-      triangleanimate.setAttribute('dur', `${spacingDuration}s`)
-      let startTime = middleDuration - (duration / numTriangles) * i - i * spacingDuration
-      triangleanimate.setAttribute('begin', `${startTime}s`)
-      triangleanimate.setAttribute('fill', 'remove')
-      triangleanimate.setAttribute('rotate', 'auto')
-      triangleanimate.setAttribute('repeatCount', 'indefinite')
-      triangle.node.appendChild(triangleanimate)
+      let triangleanimate = document.createElementNS(
+        "http://www.w3.org/2000/svg",
+        "animateMotion"
+      );
+      triangleanimate.setAttribute("path", pointsValue);
+      triangleanimate.setAttribute("dur", `${spacingDuration}s`);
+      let startTime =
+        middleDuration - (duration / numTriangles) * i - i * spacingDuration;
+      triangleanimate.setAttribute("begin", `${startTime}s`);
+      triangleanimate.setAttribute("fill", "remove");
+      triangleanimate.setAttribute("rotate", "auto");
+      triangleanimate.setAttribute("repeatCount", "indefinite");
+      triangle.node.appendChild(triangleanimate);
 
-      lineDom.add(triangle)
+      lineDom.add(triangle);
     }
+<<<<<<< HEAD
     let rect = draw.rect(40, 30).fill('#000').move(-30, -10)
     lineDom.add(rect)
+=======
+    let rect = draw.rect(30, 30).fill("#000").move(-5, -10);
+    lineDom.add(rect);
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
   }
   // 反向流动
   function handlePolyineAnimate2(pointArray, pointsValue, lineDom) {
     // 拿到长度
-    let length = 0
+    let length = 0;
     for (let i = 0; i < pointArray.length; i++) {
       if (pointArray[i] && pointArray[i + 1]) {
-        length += pointDistance(pointArray[i][0], pointArray[i][1], pointArray[i + 1][0], pointArray[i + 1][1])
+        length += pointDistance(
+          pointArray[i][0],
+          pointArray[i][1],
+          pointArray[i + 1][0],
+          pointArray[i + 1][1]
+        );
       }
     }
-    let num = 20
-    let num1 = 0.5
-    let spacingDuration = 10
+    let num = 20;
+    let num1 = 0.5;
+    let spacingDuration = 10;
 
     // if (length >= 0 && length <= 100) {
     //     num = 30
@@ -2139,151 +2827,174 @@ let handleAnimate = async (result: any) => {
     //     spacingDuration = 10
     // }
     if (length >= 0 && length <= 100) {
-      length = 50
-      num = 20
-      num1 = 0.5
-      spacingDuration = 2
+      length = 50;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 2;
     } else if (length >= 100 && length <= 200) {
-      length = 150
-      num = 20
-      num1 = 0.5
-      spacingDuration = 4
+      length = 150;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 4;
     } else if (length >= 200 && length <= 500) {
-      length = 350
-      num = 20
-      num1 = 0.5
-      spacingDuration = 8
+      length = 350;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 8;
     } else if (length >= 500 && length <= 700) {
-      length = 650
-      num = 20
-      num1 = 0.5
-      spacingDuration = 10
+      length = 650;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 10;
     } else if (length >= 700 && length <= 1000) {
-      length = 850
-      num = 20
-      num1 = 0.5
-      spacingDuration = 12
+      length = 850;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 12;
     } else if (length >= 1000 && length <= 1200) {
-      length = 1150
-      num = 20
-      num1 = 0.5
-      spacingDuration = 16
+      length = 1150;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 16;
     } else if (length >= 1200 && length <= 1500) {
-      length = 1350
-      num = 20
-      num1 = 0.5
-      spacingDuration = 20
+      length = 1350;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 20;
     } else if (length >= 1500 && length <= 1700) {
-      length = 1600
-      num = 20
-      num1 = 0.5
-      spacingDuration = 24
+      length = 1600;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 24;
     } else if (length >= 1700 && length <= 2000) {
-      length = 1850
-      num = 20
-      num1 = 0.5
-      spacingDuration = 28
+      length = 1850;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 28;
     } else if (length >= 2000 && length <= 2200) {
-      length = 2100
-      num = 20
-      num1 = 0.5
-      spacingDuration = 32
+      length = 2100;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 32;
     } else if (length >= 2200 && length <= 2500) {
-      length = 2350
-      num = 20
-      num1 = 0.5
-      spacingDuration = 34
+      length = 2350;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 34;
     } else if (length >= 2500 && length <= 2700) {
-      length = 2600
-      num = 20
-      num1 = 0.5
-      spacingDuration = 38
+      length = 2600;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 38;
     } else if (length >= 2700 && length <= 3000) {
-      length = 2800
-      num = 20
-      num1 = 0.5
-      spacingDuration = 40
+      length = 2800;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 40;
     } else if (length >= 3000 && length <= 3200) {
-      length = 3100
-      num = 20
-      num1 = 0.5
-      spacingDuration = 44
+      length = 3100;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 44;
     } else if (length >= 3200 && length <= 3500) {
-      length = 3350
-      num = 20
-      num1 = 0.5
-      spacingDuration = 48
+      length = 3350;
+      num = 20;
+      num1 = 0.5;
+      spacingDuration = 48;
     }
 
-    let numTriangles = Math.ceil(length / num)
-    let duration = numTriangles / num1
-    let middleDuration = duration / num1
+    let numTriangles = Math.ceil(length / num);
+    let duration = numTriangles / num1;
+    let middleDuration = duration / num1;
     for (let i = 0; i < numTriangles; i++) {
-      let triangle = draw.polygon('0,-1 -4,0 0,1').fill('lightgreen').stroke({ color: 'lightgreen', width: 0.2 })
+      let triangle = draw
+        .polygon("0,-1 -4,0 0,1")
+        .fill("lightgreen")
+        .stroke({ color: "lightgreen", width: 0.2 });
 
-      let triangleanimate = document.createElementNS('http://www.w3.org/2000/svg', 'animateMotion')
-      triangleanimate.setAttribute('path', pointsValue)
-      triangleanimate.setAttribute('dur', `${spacingDuration}s`)
-      let startTime = middleDuration - (duration / numTriangles) * i - i * spacingDuration
-      triangleanimate.setAttribute('begin', `${startTime}s`)
-      triangleanimate.setAttribute('fill', 'remove')
-      triangleanimate.setAttribute('rotate', 'auto')
-      triangleanimate.setAttribute('repeatCount', 'indefinite')
-      triangleanimate.setAttribute('keyPoints', '1;0')
-      triangleanimate.setAttribute('keyTimes', '0;1')
-      triangleanimate.setAttribute('calcMode', 'linear')
-      triangle.node.appendChild(triangleanimate)
+      let triangleanimate = document.createElementNS(
+        "http://www.w3.org/2000/svg",
+        "animateMotion"
+      );
+      triangleanimate.setAttribute("path", pointsValue);
+      triangleanimate.setAttribute("dur", `${spacingDuration}s`);
+      let startTime =
+        middleDuration - (duration / numTriangles) * i - i * spacingDuration;
+      triangleanimate.setAttribute("begin", `${startTime}s`);
+      triangleanimate.setAttribute("fill", "remove");
+      triangleanimate.setAttribute("rotate", "auto");
+      triangleanimate.setAttribute("repeatCount", "indefinite");
+      triangleanimate.setAttribute("keyPoints", "1;0");
+      triangleanimate.setAttribute("keyTimes", "0;1");
+      triangleanimate.setAttribute("calcMode", "linear");
+      triangle.node.appendChild(triangleanimate);
 
-      lineDom.add(triangle)
+      lineDom.add(triangle);
     }
+<<<<<<< HEAD
     let rect = draw.rect(40, 30).fill('#000').move(-25, -10)
     lineDom.add(rect)
+=======
+    let rect = draw.rect(30, 30).fill("#000").move(-5, -10);
+    lineDom.add(rect);
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
   }
   function pointDistance(x1, y1, x2, y2) {
-    const distance = Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2))
-    return distance
+    const distance = Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2));
+    return distance;
   }
   // 变电站提示文字
-  aclineDOM.forEach(item => {
-    let data = result.load.find(ite => item.node.attributes[0].nodeValue === 'ZQ_' + ite.load_id.split('&')[0])
+  aclineDOM.forEach((item) => {
+    let data = result.load.find(
+      (ite) =>
+        item.node.attributes[0].nodeValue === "ZQ_" + ite.load_id.split("&")[0]
+    );
     if (data) {
-      let position = item.bbox()
-      let centerX = position.x + position.width / 2
-      let centerY = position.y + position.height / 2
+      let position = item.bbox();
+      let centerX = position.x + position.width / 2;
+      let centerY = position.y + position.height / 2;
       // 这是变压器上的文字和线段
       // 引出线
       draw
         .line(centerX, centerY, centerX + 10, centerY - 10)
         .attr({
-          'stroke-width': 0.1,
-          id: 'load_' + data.load_id,
-          stroke: 'green',
-          'stroke-dasharray': '1,1'
+          "stroke-width": 0.1,
+          id: "load_" + data.load_id,
+          stroke: "green",
+          "stroke-dasharray": "1,1",
         })
-        .font({ size: '8' })
+        .font({ size: "8" });
       // 文本
       draw
+<<<<<<< HEAD
         .text(`P: ${(parseFloat(data['Pload/phase']) * 100).toFixed(4)} kW\nQ: ${(parseFloat(data['i']) * 10).toFixed(4)} kVar`)
+=======
+        .text(
+          `P: ${(parseFloat(data["Pload/phase"]) * 10).toFixed(4)} kW\nQ: ${(
+            parseFloat(data["i"]) * 10
+          ).toFixed(4)} kVar`
+        )
+>>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
         .attr({
           x: centerX + 10,
           y: centerY - 10,
-          id: 'load_text' + data.load_id,
-          'font-size': '2',
-          leading: '0.9'
+          id: "load_text" + data.load_id,
+          "font-size": "2",
+          leading: "0.9",
         })
-        .fill('green')
+        .fill("green");
     }
-  })
+  });
 
   // 变电站母线颜色
-  let busDom = draw.findOne('#BusbarSection_Layer')
-  let bus_g = busDom.find('g')
-  bus_g.forEach(item => {
-    const polyine = item.findOne('polyline')
-    polyine.attr({ stroke: '#FFFFFF' })
-  })
-  loadingFlag.value = false
-}
+  let busDom = draw.findOne("#BusbarSection_Layer");
+  let bus_g = busDom.find("g");
+  bus_g.forEach((item) => {
+    const polyine = item.findOne("polyline");
+    polyine.attr({ stroke: "#FFFFFF" });
+  });
+  loadingFlag.value = false;
+};
 
 // const handleClose = () => {
 //   lineSvgFlag.value = false;
@@ -2293,191 +3004,191 @@ let handleAnimate = async (result: any) => {
 // 执行明细
 // 表格
 interface TableDate {
-  id: number
-  run_content: string
-  run_time: string
-  run_status: number
+  id: number;
+  run_content: string;
+  run_time: string;
+  run_status: number;
 }
 let tableData = reactive<TableDate[]>([
   {
     id: 4455671,
-    run_content: '***',
-    run_time: '2023-04-30 12:30:00',
-    run_status: 1
+    run_content: "***",
+    run_time: "2023-04-30 12:30:00",
+    run_status: 1,
   },
   {
     id: 4455672,
-    run_content: '***',
-    run_time: '2023-04-30 12:30:00',
-    run_status: 1
+    run_content: "***",
+    run_time: "2023-04-30 12:30:00",
+    run_status: 1,
   },
   {
     id: 4455673,
-    run_content: '***',
-    run_time: '2023-04-30 12:30:00',
-    run_status: 0
+    run_content: "***",
+    run_time: "2023-04-30 12:30:00",
+    run_status: 0,
   },
   {
     id: 4455674,
-    run_content: '***',
-    run_time: '2023-04-30 12:30:00',
-    run_status: 1
+    run_content: "***",
+    run_time: "2023-04-30 12:30:00",
+    run_status: 1,
   },
   {
     id: 4455675,
-    run_content: '***',
-    run_time: '2023-04-30 12:30:00',
-    run_status: 1
+    run_content: "***",
+    run_time: "2023-04-30 12:30:00",
+    run_status: 1,
   },
   {
     id: 4455676,
-    run_content: '***',
-    run_time: '2023-04-30 12:30:00',
-    run_status: 1
+    run_content: "***",
+    run_time: "2023-04-30 12:30:00",
+    run_status: 1,
   },
   {
     id: 4455677,
-    run_content: '***',
-    run_time: '2023-04-30 12:30:00',
-    run_status: 1
+    run_content: "***",
+    run_time: "2023-04-30 12:30:00",
+    run_status: 1,
   },
   {
     id: 4455678,
-    run_content: '***',
-    run_time: '2023-04-30 12:30:00',
-    run_status: 1
+    run_content: "***",
+    run_time: "2023-04-30 12:30:00",
+    run_status: 1,
   },
   {
     id: 4455679,
-    run_content: '***',
-    run_time: '2023-04-30 12:30:00',
-    run_status: 1
+    run_content: "***",
+    run_time: "2023-04-30 12:30:00",
+    run_status: 1,
   },
   {
     id: 4455612,
-    run_content: '***',
-    run_time: '2023-04-30 12:30:00',
-    run_status: 1
+    run_content: "***",
+    run_time: "2023-04-30 12:30:00",
+    run_status: 1,
   },
   {
     id: 4455613,
-    run_content: '***',
-    run_time: '2023-04-30 12:30:00',
-    run_status: 0
+    run_content: "***",
+    run_time: "2023-04-30 12:30:00",
+    run_status: 0,
   },
   {
     id: 4455614,
-    run_content: '***',
-    run_time: '2023-04-30 12:30:00',
-    run_status: 1
+    run_content: "***",
+    run_time: "2023-04-30 12:30:00",
+    run_status: 1,
   },
   {
     id: 4455615,
-    run_content: '***',
-    run_time: '2023-04-30 12:30:00',
-    run_status: 1
+    run_content: "***",
+    run_time: "2023-04-30 12:30:00",
+    run_status: 1,
   },
   {
     id: 4455616,
-    run_content: '***',
-    run_time: '2023-04-30 12:30:00',
-    run_status: 1
+    run_content: "***",
+    run_time: "2023-04-30 12:30:00",
+    run_status: 1,
   },
   {
     id: 4455617,
-    run_content: '***',
-    run_time: '2023-04-30 12:30:00',
-    run_status: 1
+    run_content: "***",
+    run_time: "2023-04-30 12:30:00",
+    run_status: 1,
   },
   {
     id: 4455618,
-    run_content: '***',
-    run_time: '2023-04-30 12:30:00',
-    run_status: 1
-  }
-])
+    run_content: "***",
+    run_time: "2023-04-30 12:30:00",
+    run_status: 1,
+  },
+]);
 
 // 分页
-let currentPage = ref<number>(1)
-let pageSize = ref<number>(6) //每页显示的个数
-let total = ref<number>(40)
+let currentPage = ref<number>(1);
+let pageSize = ref<number>(6); //每页显示的个数
+let total = ref<number>(40);
 
 const handleSizeChange = (size: number) => {
   // console.log(`${size} items per page`);
-  pageSize.value = size
-}
+  pageSize.value = size;
+};
 const handleCurrentChange = (page: number) => {
-  currentPage.value = page
-}
+  currentPage.value = page;
+};
 
 // 右侧页面标识
-let ospagerightFlag = ref(true)
-const hideLeft = ref<boolean>(true) //默认页面显示
-const hideRight = ref<boolean>(true) //默认页面显示  右边
+let ospagerightFlag = ref(true);
+const hideLeft = ref<boolean>(true); //默认页面显示
+const hideRight = ref<boolean>(true); //默认页面显示  右边
 // 组件卸载调用
 onUnmounted(() => {
-  hideLeft.value = false
-  hideRight.value = false
-})
+  hideLeft.value = false;
+  hideRight.value = false;
+});
 
 // 跳转三维
-const handleThree = val => {
+const handleThree = (val) => {
   const list = {
-    location: '(X=18705617.163,Y=1826842.166,Z=4299675.505)',
-    rotation: 'Pitch=-89.9,Yaw=-90.542,Roll=0'
-  }
-  api_send('CameraMove', list, () => {
-    console.log('CameraMove')
-  })
+    location: "(X=18705617.163,Y=1826842.166,Z=4299675.505)",
+    rotation: "Pitch=-89.9,Yaw=-90.542,Roll=0",
+  };
+  api_send("CameraMove", list, () => {
+    console.log("CameraMove");
+  });
   let _list = {
     CityID: val,
-    status: '1'
-  }
-  api_send('ShowCityEdge', _list, () => {
-    console.log('ShowCityEdge')
-  })
-}
+    status: "1",
+  };
+  api_send("ShowCityEdge", _list, () => {
+    console.log("ShowCityEdge");
+  });
+};
 
 // 根据不同的屏幕宽度换算字体大小
 const transformFontSize = (fontsize: number) => {
   // 获取屏幕宽度
-  const width = window.screen.width
-  const height = window.screen.height
-  let ratio: any = 0
+  const width = window.screen.width;
+  const height = window.screen.height;
+  let ratio: any = 0;
   if (width > 3000) {
-    ratio = width / 4240
+    ratio = width / 4240;
   } else {
-    ratio = width / 2220
+    ratio = width / 2220;
   }
   // 取下整
-  return parseInt(fontsize * ratio)
-}
+  return parseInt(fontsize * ratio);
+};
 // 动态获取宽高
-let ctwh = ref()
-let ctht = ref()
+let ctwh = ref();
+let ctht = ref();
 const updateCtw = () => {
   if (window.screen.width > 1900) {
-    ctwh.value = Number(window.screen.width)
-    ctht.value = Number(window.screen.height)
+    ctwh.value = Number(window.screen.width);
+    ctht.value = Number(window.screen.height);
   } else {
-    ctwh.value = Number(1920)
-    ctht.value = Number(1080)
+    ctwh.value = Number(1920);
+    ctht.value = Number(1080);
   }
-}
+};
 // 使用watch来监听$route的变化
 watch(
   () => window.location.pathname,
-  newPath => {
-    updateCtw()
+  (newPath) => {
+    updateCtw();
   },
   { immediate: true }
-)
+);
 const styleVar = computed(() => {
   return {
-    '--box-width': ctwh.value + 'px',
-    '--box-height': ctht.value + 'px'
-  }
-})
+    "--box-width": ctwh.value + "px",
+    "--box-height": ctht.value + "px",
+  };
+});
 </script>
 
 <style lang="scss" scoped>
@@ -2534,7 +3245,7 @@ const styleVar = computed(() => {
   .closeBtn {
     width: changeHeight(42.12);
     height: changeHeight(42.12);
-    background: url('@/assets/images/common/closebtn.png');
+    background: url("@/assets/images/common/closebtn.png");
     background-repeat: no-repeat;
     background-size: 100% 100%;
     position: absolute;
@@ -2612,7 +3323,7 @@ const styleVar = computed(() => {
 
 .blueShadow {
   /* 精品可视化素材店 */
-  font-family: 'PingFang SC';
+  font-family: "PingFang SC";
   font-style: normal;
   font-weight: 600;
   text-shadow: 0px 0px 10px #00f0ff;
@@ -2636,7 +3347,7 @@ const styleVar = computed(() => {
   top: 3%;
   width: changeHeight(40);
   height: changeHeight(40);
-  background-image: url('@/assets/images/common/closebtn.png');
+  background-image: url("@/assets/images/common/closebtn.png");
   background-repeat: no-repeat;
   background-size: 100% 100%;
   z-index: 6;
@@ -2645,13 +3356,13 @@ const styleVar = computed(() => {
 
 // 公共标题
 .title_bg {
-  background: url('@/assets/images/carPage/car_titlebg.png') no-repeat;
+  background: url("@/assets/images/carPage/car_titlebg.png") no-repeat;
   background-size: 100% 100%;
 }
 
 // 公共背景
 .content_bg {
-  background: url('@/assets/images/common/tree_content_bg.png') no-repeat;
+  background: url("@/assets/images/common/tree_content_bg.png") no-repeat;
   background-size: 100% 100%;
 }
 
@@ -2660,7 +3371,7 @@ const styleVar = computed(() => {
   width: 90%;
   height: changeHeight(50);
   line-height: changeHeight(50);
-  background: url('@/assets/images/common/common_title.png') no-repeat;
+  background: url("@/assets/images/common/common_title.png") no-repeat;
   background-size: 100% 100%;
   font-size: changeHeight(45);
   // background-color: red;
@@ -2671,7 +3382,7 @@ const styleVar = computed(() => {
 
     height: changeHeight(55);
 
-    background: url('@/assets/images/homePage/address.png') no-repeat;
+    background: url("@/assets/images/homePage/address.png") no-repeat;
 
     background-size: 100% 100%;
   }
@@ -2681,7 +3392,7 @@ const styleVar = computed(() => {
 
     height: changeHeight(55);
 
-    background: url('@/assets/images/homePage/v2img/addres1.png') no-repeat;
+    background: url("@/assets/images/homePage/v2img/addres1.png") no-repeat;
 
     background-size: 100% 100%;
   }
@@ -2708,7 +3419,7 @@ const styleVar = computed(() => {
     width: 100%;
     height: 100%;
     position: absolute;
-    background: url('@/assets/images/common/common_title.png') no-repeat;
+    background: url("@/assets/images/common/common_title.png") no-repeat;
     background-size: 100% 100%;
   }
 
@@ -2789,7 +3500,7 @@ const styleVar = computed(() => {
   width: changeHeight(183.47);
   height: changeHeight(60);
   line-height: changeHeight(60);
-  background: url('@/assets/images/btnType/pvtipBtn.png') no-repeat;
+  background: url("@/assets/images/btnType/pvtipBtn.png") no-repeat;
   background-size: 100% 100%;
   /* 历史调节次数12次 */
 
@@ -2807,7 +3518,7 @@ const styleVar = computed(() => {
   margin-top: changeHeight(100);
   margin-top: changeHeight(17);
   // margin-top: 0.5%;
-  font-family: 'PingFang SC';
+  font-family: "PingFang SC";
   font-style: normal;
   font-weight: 400;
   color: #ffffff;
@@ -2834,7 +3545,8 @@ const styleVar = computed(() => {
 
       .icon_panel_left_off {
         position: absolute;
-        background: url('@/assets/images/btnType/icon_panel_right.png') no-repeat;
+        background: url("@/assets/images/btnType/icon_panel_right.png")
+          no-repeat;
         background-size: 100% 100%;
         width: changeHeight(42.28);
         height: changeHeight(52.02);
@@ -2853,7 +3565,7 @@ const styleVar = computed(() => {
       .icon_panel_left_on {
         position: absolute;
         background: salmon;
-        background: url('@/assets/images/btnType/icon_panel_left.png') no-repeat;
+        background: url("@/assets/images/btnType/icon_panel_left.png") no-repeat;
         background-size: 100% 100%;
         width: changeHeight(42.28);
         height: changeHeight(52.02);
@@ -2951,7 +3663,7 @@ const styleVar = computed(() => {
               // border:1px solid red;
               // background: url("@/assets/images/osPage/xixiaozhantp.png") no-repeat;
               // background: url("@/assets/images/osPage/xuetp.png") no-repeat;
-              background: url('@/assets/images/osPage/svgB.png') no-repeat;
+              background: url("@/assets/images/osPage/svgB.png") no-repeat;
               background-size: 80% 100%;
               background-position-x: 50%;
               // background-image: url(".png");
@@ -3056,7 +3768,7 @@ const styleVar = computed(() => {
               // height: changeHeight(728.6);
               width: 100%;
               height: 100%;
-              background: url('@/assets/images/osPage/rztp.png') no-repeat;
+              background: url("@/assets/images/osPage/rztp.png") no-repeat;
               background-size: 100% 100%;
               cursor: pointer;
             }
@@ -3117,7 +3829,7 @@ const styleVar = computed(() => {
             height: changeHeight(60);
             line-height: changeHeight(60);
 
-            background: url('@/assets/images/btnType/pvtipBtn.png') no-repeat;
+            background: url("@/assets/images/btnType/pvtipBtn.png") no-repeat;
             background-size: 100% 100%;
             /* 历史调节次数12次 */
 
@@ -3140,7 +3852,7 @@ const styleVar = computed(() => {
 
     .icon_panel_right_off {
       position: absolute;
-      background: url('@/assets/images/btnType/icon_panel_left.png') no-repeat;
+      background: url("@/assets/images/btnType/icon_panel_left.png") no-repeat;
       background-size: 100% 100%;
       width: changeHeight(42.28);
       height: changeHeight(52.02);
@@ -3169,7 +3881,7 @@ const styleVar = computed(() => {
 
       .icon_panel_right_off {
         position: absolute;
-        background: url('@/assets/images/btnType/icon_panel_left.png') no-repeat;
+        background: url("@/assets/images/btnType/icon_panel_left.png") no-repeat;
         background-size: 100% 100%;
         width: changeHeight(42.28);
         height: changeHeight(52.02);
@@ -3187,7 +3899,8 @@ const styleVar = computed(() => {
       // 右 箭头展开
       .icon_panel_right_on {
         position: absolute;
-        background: url('@/assets/images/btnType/icon_panel_right.png') no-repeat;
+        background: url("@/assets/images/btnType/icon_panel_right.png")
+          no-repeat;
         background-size: 100% 100%;
         width: changeHeight(42.28);
         height: changeHeight(52.02);
@@ -3275,7 +3988,7 @@ const styleVar = computed(() => {
     width: changeHeight(368.31);
     height: changeHeight(180.28);
     // padding: changeHeight(25) changeHeight(5) changeHeight(0) changeHeight(10);
-    background: url('@/assets/images/legend/legend_bg.png') no-repeat;
+    background: url("@/assets/images/legend/legend_bg.png") no-repeat;
     background-size: 100% 100%;
     display: flex;
     align-items: center;
@@ -3351,7 +4064,7 @@ const styleVar = computed(() => {
       box-sizing: border-box;
       width: changeHeight(1338.06);
       height: changeHeight(1218.37);
-      background: url('@/assets/images/osPage/run_detail_bg.png') no-repeat;
+      background: url("@/assets/images/osPage/run_detail_bg.png") no-repeat;
       background-size: 100% 100%;
       padding-top: 1%;
       padding-left: changeHeight(27);
@@ -3380,7 +4093,8 @@ const styleVar = computed(() => {
         .titlebg {
           width: 100%;
           height: changeHeight(82.15);
-          background: url('@/assets/images/osPage/run_detail_titlebg.png') no-repeat;
+          background: url("@/assets/images/osPage/run_detail_titlebg.png")
+            no-repeat;
           background-size: 100% 100%;
           display: flex;
           align-items: center;
@@ -3508,7 +4222,11 @@ const styleVar = computed(() => {
           .el-table {
             border: transparent !important;
 
-            background: linear-gradient(180deg, #01233c 0%, rgba(8, 150, 255, 0.42) 100%);
+            background: linear-gradient(
+              180deg,
+              #01233c 0%,
+              rgba(8, 150, 255, 0.42) 100%
+            );
           }
         }
       }
@@ -3599,7 +4317,7 @@ const styleVar = computed(() => {
       width: changeHeight(1747.34);
       height: changeHeight(937.4);
       box-sizing: border-box;
-      background: url('@/assets/images/osPage/area_load_bg.png') no-repeat;
+      background: url("@/assets/images/osPage/area_load_bg.png") no-repeat;
       background-size: 100% 100%;
       padding-top: 1%;
       padding-left: changeHeight(27);
@@ -3628,7 +4346,8 @@ const styleVar = computed(() => {
         .titlebg {
           width: 100%;
           height: changeHeight(82);
-          background: url('@/assets/images/osPage/run_detail_titlebg.png') no-repeat;
+          background: url("@/assets/images/osPage/run_detail_titlebg.png")
+            no-repeat;
           background-size: 100% 100%;
           display: flex;
           align-items: center;
@@ -3708,12 +4427,12 @@ const styleVar = computed(() => {
             }
 
             .bg1 {
-              background: url('@/assets/images/btnType/btnblue.png') no-repeat;
+              background: url("@/assets/images/btnType/btnblue.png") no-repeat;
               background-size: 100% 100%;
             }
 
             .bg2 {
-              background: url('@/assets/images/btnType/btngreen.png') no-repeat;
+              background: url("@/assets/images/btnType/btngreen.png") no-repeat;
               background-size: 100% 100%;
             }
 
@@ -3747,7 +4466,7 @@ const styleVar = computed(() => {
       position: absolute;
       top: -3px;
       left: -2px;
-      content: '';
+      content: "";
       width: changeHeight(20);
       height: changeHeight(20);
       border-top: changeHeight(3) solid #cffffc;
@@ -3758,7 +4477,7 @@ const styleVar = computed(() => {
       position: absolute;
       top: -3px;
       right: -1.5px;
-      content: '';
+      content: "";
       width: changeHeight(20);
       height: changeHeight(20);
       border-top: changeHeight(3) solid #cffffc;
@@ -3777,7 +4496,7 @@ const styleVar = computed(() => {
         position: absolute;
         bottom: -3px;
         left: -3px;
-        content: '';
+        content: "";
         width: changeHeight(20);
         height: changeHeight(20);
         border-bottom: changeHeight(3) solid #cffffc;
@@ -3788,7 +4507,7 @@ const styleVar = computed(() => {
         position: absolute;
         bottom: -3px;
         right: -3px;
-        content: '';
+        content: "";
         width: changeHeight(20);
         height: changeHeight(20);
         border-bottom: changeHeight(3) solid #cffffc;
@@ -3806,7 +4525,7 @@ const styleVar = computed(() => {
         top: changeHeight(20);
         width: changeHeight(40.12);
         height: changeHeight(40.12);
-        background-image: url('../../assets/images/photovaltaicPagev3/closebtn.png');
+        background-image: url("../../assets/images/photovaltaicPagev3/closebtn.png");
         background-repeat: no-repeat;
         background-size: 100% 100%;
         z-index: 6;
diff --git a/src/views/pages/carPage/index.vue b/src/views/pages/carPage/index.vue
index be1f210..7eb9a12 100644
--- a/src/views/pages/carPage/index.vue
+++ b/src/views/pages/carPage/index.vue
@@ -112,7 +112,12 @@
               <div class="load_runstatus_box">
                 <div class="infotitle">
                   <span>充电桩运行状态</span>
-                  <div class="posbtn" @click="ajustCarPage">能量调节</div>
+                  <div
+                    :class="[btndownFlag === true ? '' : 'no_click', 'posbtn']"
+                    @click="ajustCarPage"
+                  >
+                    能量调节
+                  </div>
                 </div>
                 <div class="list_box">
                   <div class="box_d">
@@ -326,11 +331,13 @@
           ></el-pagination>
         </div>
       </div>
+      <!-- <div class="ajustCar" v-if="false"> -->
+
       <div class="ajustCar" v-if="ajustCarPageFlag">
         <div class="tip">
           <img src="@/assets/images/mainPage/icon_title2.png" alt="" />
-          <span class="jianbian">能量调节</span>
-          <div class="closebtn" @click="adjustInfoFlag = false"></div>
+          <span class="jianbian fs45">能量调节</span>
+          <div class="closebtn" @click="ajustCarPageFlag = false"></div>
         </div>
         <div class="content">
           <el-form
@@ -343,8 +350,9 @@
             <!-- 添加表单项 -->
             <el-form-item label="调节类型" prop="type">
               <el-select
+                popper-class="customSelectAdjust"
                 v-model="formData.type"
-                placeholder="Select"
+                placeholder="类型"
                 size="large"
                 style="width: 240px"
               >
@@ -359,7 +367,7 @@
               <!-- <el-input v-model="form.password" type="password"></el-input> -->
               <el-radio-group v-model="formData.whether" class="ml-4">
                 <el-radio value="1" size="large">是</el-radio>
-                <el-radio value="2" size="large">否</el-radio>
+                <el-radio value="0" size="large">否</el-radio>
               </el-radio-group>
             </el-form-item>
             <el-form-item label="调节值" prop="number">
@@ -382,11 +390,20 @@
                 <span class="text-gray-500">-</span>
               </el-col>
               <el-col :span="11">
-                <el-time-picker
+                <!-- <el-time-picker
                   v-model="formData.start_time"
                   placeholder="Pick a time"
                   style="width: 100%"
                 />
+                -->
+                <el-time-select
+                  v-model="formData.start_time"
+                  style="width: 240px"
+                  start="08:30"
+                  step="00:15"
+                  end="18:30"
+                  placeholder="开始时间"
+                />
               </el-col>
             </el-form-item>
 
@@ -404,22 +421,23 @@
                 <span class="text-gray-500">-</span>
               </el-col>
               <el-col :span="11">
-                <el-time-picker
+                <el-time-select
                   v-model="formData.end_time"
-                  placeholder="Pick a time"
-                  style="width: 100%"
+                  style="width: 240px"
+                  start="08:30"
+                  step="00:15"
+                  end="18:30"
+                  placeholder="结束时间"
                 />
               </el-col>
             </el-form-item>
             <!-- 添加提交按钮 -->
             <el-form-item>
-              <el-button
-                type="primary"
-                @click="submitForm('formRef')"
-              ></el-button>
-              <el-button type="primary" @click="submitForm('formRef')"
+              <el-button type="primary"></el-button>
+              <el-button type="primary" @click="submitForm()"
                 >下发指令</el-button
               >
+              <!-- @click="submitForm('formRef')" -->
               <!-- <el-button @click="resetForm('formRef')">清空</el-button> -->
             </el-form-item>
           </el-form>
@@ -450,10 +468,12 @@ import load_c_echart from "./load_c_echart.vue";
 import load_info_echart from "./load_info_echart.vue";
 import cdz_echart from "./cdz_echart.vue";
 import carTree from "@/views/commonPage/carTree.vue";
+
 import {
   powerCurve_api,
   transformerOverloadCount_api,
   running_api,
+  ajustInfo_api,
 } from "@/api/carPage/index";
 import {
   handleEchartsData,
@@ -463,6 +483,7 @@ import { usrzApi } from "@/api/Osp/svgApi";
 import { start } from "repl";
 
 onMounted(() => {
+  send3D();
   // 获取右侧数据
   getPowerCurve_api();
   // 获取台区 重过载
@@ -470,6 +491,29 @@ onMounted(() => {
   // 获取充电桩列表
   getRunning_api();
 });
+const send3D = () => {
+  //  显示城南位置
+  const list = {
+    location: "(X=-715146.324,Y=-1188697.616,Z=4422791.944)",
+    rotation: "Pitch=-83.545,Yaw=-91.394,Roll=0",
+  };
+  api_send("CameraMove", list, () => {
+    console.log("CameraMove");
+  });
+  // 显示城南边界线
+  const datadispaly = {
+    CityID: "12010",
+    status: "1", //0隐藏1显示
+  };
+  api_send("ShowCityEdge", datadispaly, () => {
+    console.log("ShowCityEdge显示城南边界线");
+  });
+  // 显示全部的充电站
+  const datadel = { status: "1" };
+  api_send("SelectChargingstation", datadel, () => {
+    console.log("SelectChargingstation,显示全部的变电站");
+  });
+};
 
 // 设备树传的数据
 let currentData = reactive<any>({});
@@ -492,6 +536,12 @@ const getTreeKey = (treeKey: any) => {
     // 获取充电桩列表
     getRunning_api();
   }
+  // 控制调节按钮的可用不可用
+  if (currentData.type === "station") {
+    btndownFlag.value = true;
+  } else {
+    btndownFlag.value = false;
+  }
 };
 
 // 车网互动专题切换栏
@@ -570,25 +620,24 @@ const hideRight = ref<boolean>(true); //默认页面显示  右边
 
 // 组件卸载调用
 onUnmounted(() => {
+  handleThree_out(); //清楚边界线和字体
   hideLeft.value = false;
   hideRight.value = false;
 });
-
 // 跳转三维
-const handleThree = (val) => {
-  const list = {
-    location: "(X=18705617.163,Y=1826842.166,Z=4299675.505)",
-    rotation: "Pitch=-89.9,Yaw=-90.542,Roll=0",
+const handleThree_out = () => {
+  // 隐藏城南边界线
+  const datadispaly = {
+    CityID: "12010",
+    status: "0", //0隐藏1显示
   };
-  api_send("CameraMove", list, () => {
-    console.log("CameraMove");
+  api_send("ShowCityEdge", datadispaly, () => {
+    console.log("ShowCityEdge隐藏城南边界线");
   });
-  let _list = {
-    CityID: val,
-    status: "1",
-  };
-  api_send("ShowCityEdge", _list, () => {
-    console.log("ShowCityEdge");
+  // 隐藏全部的充电站
+  const datadel = { status: "0" };
+  api_send("SelectChargingstation", datadel, () => {
+    console.log("SelectChargingstation,隐藏全部的充电站");
   });
 };
 
@@ -619,6 +668,7 @@ let getPowerCurve_api = () => {
     // 空的 请求全部
   } else if (currentData.type === "station") {
     // 站
+
     setData.stationId = currentData.id;
   } else if (currentData.type === "dewellerpipe" && currentLevel.value === 6) {
     // 桩用户充电桩
@@ -636,7 +686,7 @@ let getPowerCurve_api = () => {
         item.measValue = item.p;
       });
 
-      let result = handleEchartsData(res.data, 60);
+      let result = handleEchartsData(res.data, 15);
       carRightData.echartsData = result;
     });
   } else {
@@ -646,7 +696,7 @@ let getPowerCurve_api = () => {
         item.datetime = item.dateTime;
       });
 
-      let result = handleEchartsData(res.data, 60);
+      let result = handleEchartsData(res.data, 15);
 
       carRightData.echartsData = result;
     });
@@ -697,13 +747,49 @@ let formData = ref({
   end_date: "",
   end_time: "",
 });
+// let newcarAjustDate = reactive<any>([]);
+// newcarAjustDate.push(formData);
+const handledata_time = (data_s: any, time_s: any) => {
+  const date = new Date(data_s);
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  const formattedDate = `${year}-${month}-${day}`;
+  return `${formattedDate} ${time_s}`;
+};
 const submitForm = () => {
   console.log(formData, "1--------------formData");
+  // let dataNew
+  let datat_start = handledata_time(
+    formData.value.start_date,
+    formData.value.start_time
+  );
+  let datat_end = handledata_time(
+    formData.value.end_date,
+    formData.value.end_time
+  );
+  //  console.log(datat_start,datat_end,"3---------");
+  let datainput = {
+    chargingStationID: currentData.id,
+    type: parseInt(formData.value.type),
+    isForce: parseInt(formData.value.whether),
+    targetValue: parseInt(formData.value.number),
+    startTime: datat_start,
+    endTime: datat_end,
+  };
+
+  ajustInfo_api(datainput).then((res: any) => {
+    console.log(res, "1-------car");
+  });
 };
+
 //进入调节
-let ajustCarPageFlag = ref(true);
+let ajustCarPageFlag = ref(false);
+let btndownFlag = ref(false);
 const ajustCarPage = () => {
-  ajustCarPageFlag.value = true;
+  if (currentData.type === "station") {
+    ajustCarPageFlag.value = true;
+  }
 };
 
 // 根据不同的屏幕宽度换算字体大小
@@ -847,6 +933,10 @@ const styleVar = computed(() => {
     background: url("@/assets/images/btnType/send_btn.png") no-repeat;
     background-size: 100% 100%;
   }
+  .no_click {
+    color: #ccc;
+    cursor: not-allowed;
+  }
 }
 .infotitle_short {
   width: 100%;
@@ -1886,7 +1976,7 @@ const styleVar = computed(() => {
         align-items: center;
 
         img {
-          height: changeHeight(45);
+          height: changeHeight(55);
           margin-right: changeHeight(14);
         }
 
@@ -1918,9 +2008,7 @@ const styleVar = computed(() => {
         margin-top: 3%;
         width: 95%;
         height: 100%;
-        border: 1px solid pink;
         :deep(.el-form) {
-          border: 1px solid red;
           height: 100%;
           // label标签
           .el-form-item__label {
@@ -1939,22 +2027,54 @@ const styleVar = computed(() => {
             width: changeHeight(300) !important;
             height: changeHeight(80) !important;
           }
+          .el-select__wrapper {
+            width: changeHeight(350) !important;
+            height: changeHeight(80) !important;
+            padding-top: 1%;
+            background: transparent !important;
+          }
+          // .el-select,
           .el-input__inner {
             color: #fff !important;
-          }
-       
-          .el-select__placeholder{
-
-            color: #fff !important;
-          }
-          .el-radio__label{
-            color: #fff !important;
+            height: changeHeight(50) !important;
+            line-height: changeHeight(50) !important;
 
           }
+
+          .el-select__placeholder {
+            color: #fff !important;
+            height: changeHeight(50) !important;
+            line-height: changeHeight(50) !important;
+            font-size: changeHeight(35) !important;
+
+          }
+
+          .el-radio__label {
+            color: #fff !important;
+            font-size: changeHeight(35) !important;
+          }
+          .el-select__popper {
+            width: changeHeight(500) !important;
+            height: changeHeight(200) !important;
+           line-height: changeHeight(200) !important;
+
+            font-size: changeHeight(35) !important;
+
+          }
+          .el-select-dropdown__list {
+            width: changeHeight(500) !important;
+            height: changeHeight(200) !important;
+          }
+          // .el-select__selected-item .el-select__placeholder,.el-select__selected-item .el-select__placeholder.is-transparent{
+          //   height: changeHeight(80) !important;
+
+          // }
           // 按钮
           .el-button {
             width: changeHeight(250);
             height: changeHeight(80);
+            font-size: changeHeight(35) !important;
+            background-color: transparent !important;
           }
           .el-button:nth-child(1) {
             background-color: transparent !important;
@@ -1962,12 +2082,16 @@ const styleVar = computed(() => {
           }
           .el-button:nth-child(2) {
             margin-top: 2%;
-            margin-left: changeHeight(180);
+            margin-left: 34%;
+            width: changeHeight(250);
+            height: changeHeight(80);
+            background: url("@/assets/images/btnType/send_btn.png") no-repeat;
+            background-size: 100% 100%;
           }
           // 没一行
-          .el-form-item{
+          .el-form-item {
             height: changeHeight(80) !important;
-            margin-bottom:changeHeight(50) !important;
+            margin-bottom: changeHeight(30) !important;
           }
         }
       }
diff --git a/vite.config.ts b/vite.config.ts
index 27b7985..d525c42 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -101,7 +101,7 @@ export default defineConfig({
         // only https
         secure: false,
       },
-      "/api/api-svg": {
+      "/api-svg": {
         // target: "http://192.168.18.106:8080",
         target: "http://127.0.0.1:19081",
         // 天津地址
@@ -112,6 +112,17 @@ export default defineConfig({
         // only https
         secure: false,
       },
+      "/api_car": {
+        // target: "http://192.168.18.106:8080",
+        target: "http://127.0.0.1:16091",
+        // 天津地址
+        // target:"http://192.168.5.102:18801",
+        changeOrigin: true,
+        ws: true,
+        rewrite: (path: string) => path.replace(new RegExp(`^/api-svg`), ""),
+        // only https
+        secure: false,
+      },
       // "/ba-api": {
       //   // target: "http://localhost:8080",
       //    // 桐乡地址