修改bug

src/pages/netStructPicture/components/CidTree.vue

@@ -332,6 +332,7 @@ const tagClick = (row, num) => {
   })
   tagChoose.value = num;
   clickTage.value = row;
+  emit("treeBack", row)
   // cid
   //   .findFile({
   //     scd_id: route.query.id,

src/pages/netStructPicture/components/Gsix.vue

@@ -10,7 +10,6 @@ import newly0 from "@/assets/image/CID/newly0.png";
 import LeaderLine from "../../../../public/leader-line.min.js";
 import AnimEvent from "../../../../public/anim-event.min.js";
 import { hiddenLine2, hiddenLineDialog } from "@/utils/linesPosition";
-import cid from "@/api/cid/cid";
 import jiantou from "@/assets/image/CID/jiantou.png";
 import { useRoute } from "vue-router";
 const route = useRoute();
@@ -164,7 +163,7 @@ const getData = async () => {
     comptype: "u",
     itemcode: cClickCode.value,
   });
-  if (!res.data || !res.data.length) return (loading.value = false);
+  if (!res||!res.data || !res.data.length) return (loading.value = false);
   if (res.data && cClickCode.value != "scd.ied") {
     res.data.forEach((item) => {
       let text;
@@ -222,7 +221,7 @@ const clickTypeImg = (item, event) => {
   setTimeout(() => {
     setLeaderlines("add");
     newPositionLine2(leaderLineShow.value);
-  }, 100);
+  }, 200);
   comonTypeImg(item, event);
 };
 const clickTypeImgDel = (item, event) => {
@@ -909,7 +908,7 @@ onMounted(() => {
   if (props.iedRelation) {
     tagList.value = Object.values(props.iedRelation)[0];
   }
-  if (clickRow.value && clickRow.value.id) {
+  if (clickRow.value && clickRow.value.id&&!props.isCid) {
     getData();
   }
 });
@@ -947,20 +946,19 @@ onMounted(() => {
             v-for="(item, index) in dataU"
             :key="index"
             class="left-item-cont"
-            @click="
+            :ref="(el) => setdomLeftMain(el, item.diff_object_name)"
+            :id="item.diff_object_name.replace(/[^\w\s]/g, '')"
+          >
+            <div class="item-img">
+              <img :src="codeImg" alt="" class="type-img"   @click="
               clickUpTypeImgLeft(
                 item.diff_desc,
                 $event,
                 item.diff_object_name,
                 item
               )
-            "
-            :ref="(el) => setdomLeftMain(el, item.diff_object_name)"
-            :id="item.diff_object_name.replace(/[^\w\s]/g, '')"
-          >
-            <div class="item-img">
-              <img :src="codeImg" alt="" class="type-img" />
-              <img :src="modify0" alt="" class="type-img-mini" />
+            "/>
+              <img loading="lazy" :src="modify0" alt="" class="type-img-mini" />
             </div>
             <div class="wraps">{{ item.diff_object_name }}</div>
           </div>
@@ -972,8 +970,8 @@ onMounted(() => {
             id="leftBasic"
           >
             <div class="item-img">
-              <img :src="codeImg" alt="" class="type-img" />
-              <img :src="modify0" alt="" class="type-img-mini" />
+              <img loading="lazy"  :src="codeImg" alt="" class="type-img" />
+              <img loading="lazy"  :src="modify0" alt="" class="type-img-mini" />
             </div>
             <div class="wraps">基本信息</div>
           </div>
@@ -984,12 +982,11 @@ onMounted(() => {
             v-for="(item, index) in leftI"
             :key="index"
             class="left-item-cont"
-            @click="clickTypeImg(item, $event)"
             :ref="(el) => setdomLeftMain(el, item.diff_object_name)"
           >
             <div class="item-img">
-              <img :src="codeImg" alt="" class="type-img" />
-              <img :src="newly0" alt="" class="type-img-mini" />
+              <img loading="lazy" :src="codeImg" alt="" class="type-img"  @click="clickTypeImg(item, $event)"/>
+              <img loading="lazy" :src="newly0" alt="" class="type-img-mini" />
             </div>
             <div class="wraps">{{ item.diff_object_name }}</div>
           </div>
@@ -1036,20 +1033,20 @@ onMounted(() => {
             v-for="(item, index) in dataU"
             :key="index"
             class="left-item-cont"
-            @click="
+            
+            :id="item.diff_object_name.replace(/[^\w\s]/g, '')"
+            :ref="(el) => setdomRightMain(el, item.diff_object_name)"
+          >
+            <div class="item-img">
+              <img :src="codeImg" alt="" class="type-img" @click="
               clickUpTypeImgRight(
                 item.diff_desc,
                 $event,
                 item.diff_object_name,
                 item
               )
-            "
-            :id="item.diff_object_name.replace(/[^\w\s]/g, '')"
-            :ref="(el) => setdomRightMain(el, item.diff_object_name)"
-          >
-            <div class="item-img">
-              <img :src="codeImg" alt="" class="type-img" />
-              <img :src="modify0" alt="" class="type-img-mini" />
+            "/>
+              <img loading="lazy" :src="modify0" alt="" class="type-img-mini" />
             </div>
             <div class="wraps">{{ item.diff_object_name }}</div>
           </div>
@@ -1061,8 +1058,8 @@ onMounted(() => {
             id="rightBasic"
           >
             <div class="item-img">
-              <img :src="codeImg" alt="" class="type-img" />
-              <img :src="modify0" alt="" class="type-img-mini" />
+              <img loading="lazy" :src="codeImg" alt="" class="type-img" />
+              <img loading="lazy" :src="modify0" alt="" class="type-img-mini" />
             </div>
             <div class="wraps">基本信息</div>
           </div>
@@ -1073,12 +1070,11 @@ onMounted(() => {
             v-for="(item, index) in rightD"
             :key="index"
             class="left-item-cont"
-            @click="clickTypeImgDel(item, $event)"
             :ref="(el) => setdomRightMain(el, item.diff_object_name)"
           >
             <div class="item-img">
-              <img :src="codeImg" alt="" class="type-img" />
-              <img :src="del0" alt="" class="type-img-mini" />
+              <img loading="lazy" :src="codeImg" alt="" class="type-img" @click="clickTypeImgDel(item, $event)" />
+              <img loading="lazy" :src="del0" alt="" class="type-img-mini" />
             </div>
             <div class="wraps">{{ item.diff_object_name }}</div>
           </div>

src/pages/netStructPicture/components/ScdNow.vue

@@ -79,6 +79,7 @@
     <div v-else-if="!clickRow" class="no-data">
       请选择比对记录或创建新的比对
     </div>
+    <!-- 新增和 删除 -->
     <dialog-index
       :openBig="openBig"
       @done="done"
@@ -87,6 +88,7 @@
       :scdView="scdView"
       :delScdId="delScdId"
     ></dialog-index>
+    <!-- 点击修改的弹窗  -->
     <scl-update
       :openScl="openScl"
       @doneScl="doneScl"
@@ -271,7 +273,8 @@ const lookAddOrDel = async (comData, del) => {
   if (del == "del" && clickRowData.value.target_id) {
     delScdId.value = clickRowData.value.target_id; //点击删除的scdid要用对比文件的
   } else if (del == "add") {
-    delScdId.value = route.query.id;
+    // delScdId.value = route.query.id;
+    delScdId.value = clickRowData.value.source_id;
   } else if (del == "edit") {
     recordDelIedVer.value = iedVer.value&&iedVer.value.d ? iedVer.value.d.list : null;
   }

src/pages/netStructPicture/components/basicInfo.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="treedom4" v-loading="loading" style="overflow: hidden">
+  <div id="treedom4" v-loading="loading">
     <div style="position: relative">
       <div class="nav" id="topLine">
         <div

src/pages/netStructPicture/components/inoutControl.vue

@@ -178,7 +178,7 @@ const getIedChild = async () => {
     ied_name: props.checkData.ied_name,
     forcerefresh: 0,
   });
-  if (!listData2.value.list || !childRes.data) return;
+  if (!listData2.value.list || !childRes.data) return loading.value = false;
   if (childRes.data) {
     //左右侧内部侧数据组装
     listData2.value.list.forEach((item, index) => {
@@ -224,7 +224,7 @@ const getNetworkInfo = async () => {
     scd_id: scdIdValue,
     ied_name: listData2.value.ied_name,
   });
-  if (!svResInfoCtrl.data || !svResInfo.data) return;
+  if (!svResInfoCtrl.data || !svResInfo.data) return loading.value = false;
   if (svResInfoCtrl.data && svResInfoCtrl.data.GSEControl) {
     //处理数据得到APPID
     svResInfo.data.forEach((item) => {
@@ -325,6 +325,7 @@ const processArray = (arr) => {
 const clickImg = async (dataItem) => {
   loading.value = true;
   listData2.value = await clickImgEvent(props, dataItem, scdIdValue);
+  if(!listData2.value) return loading.value = false
 };
 
 //点击后重置数据和线条

src/pages/netStructPicture/components/relationShip.vue

@@ -300,12 +300,13 @@ const middleLinePosition = () => {
         setElementMarginTop(leftElement, 92);
         setElementMarginTop(middleElement, 150);
         break;
+       
       default:
         if (!middleElement.value) return;
-        if (rightListLength <= 3 && leftListLength <= 3) {
+        if (rightListLength <= 4 && leftListLength <= 4) {
           setElementMarginTop(middleElement, 150);
         }
-        if (leftListLength > 2 || rightListLength > 2) {
+        if (leftListLength > 4 || rightListLength > 4) {
           setElementMarginTop(rightElement, 0);
           setElementMarginTop(leftElement, 0);
           middleElement.value.style.marginTop = `${(heights - 60) / 2}px`; // 设置元素的垂直位置

src/pages/netStructPicture/components/virtualnformation.vue

@@ -200,6 +200,7 @@ const processBoth = (list, svResInfo, inoutType) => {
           ied_name: item.ied_name,
           reset: 1,
         });
+        if(!item.ied_name||!iedRes.data[item.ied_name]) return;
         item.descName = iedRes.data[item.ied_name].desc;
       } else {
         const iedRes = await scdIedRelation({

src/pages/netStructPicture/index.vue

@@ -183,6 +183,7 @@ const navtopData = ref([
   { name: "虚端子关系图", code: "virtual" },
 ]);
 const activeNav = ref(null);
+const upload = ref(null);//上传按钮的ref
 const backName = ref({}); //树组件返回名称
 let mustVal = ref(false);
 let upName = ref(""); //上传的文件名称
@@ -237,6 +238,7 @@ const closeX = () => {
 };
 const allCidStart = ref([]);
 const nowUpload = (file, e) => {
+  upload.value.clearFiles();
   console.log('files====', file)
   upFile.value = file.file;
   upName.value = file.file.name;
@@ -277,7 +279,7 @@ const nowUpload = (file, e) => {
             })
             .then((res) => {
               ElNotification.closeAll();
-              if (res.code == 0) {
+              if (res&&res.code == 0) {
                 ElMessage({
                   type: "success",
                   message: "对比成功!",

src/pages/netStructPicture/newTitle/SlcCheck.vue

@@ -7,7 +7,7 @@
       <div v-else>SLC效验</div>
       <span class="closeX" @click="closeX">×</span>
     </div>
-    <div class="main">
+    <div class="main" v-loading="tableLoading">
       <div class="treeBox">
         <div class="tree-title">
           <img :src="HardDrives" alt="" />
@@ -71,7 +71,6 @@
       </div>
       <div
         class="tableBox"
-        v-loading="tableLoading"
         element-loading-text="正在查询校验信息中"
       >
         <div class="allMis">
@@ -373,9 +372,7 @@ const common = async () => {
     node_id: nodeId,
     level: levels,
   });
-  if (res.code == 0) {
-    tableLoading.value = false;
-  }
+  if(res||!res)  tableLoading.value = false;
   tableData.value = res;
 };
 //点击全部、错误等