Quellcode durchsuchen

修改输入输出控制快和网络结构图弹窗的搜索

“yueshang” vor 1 Jahr
Ursprung
Commit
03db6ba415

+ 12 - 3
src/pages/netStructPicture/components/dialogIndex.vue

@@ -11,7 +11,7 @@
     <div class="main">
       <div class="main-left">
         <el-input v-model="searchInput" class="w-50 m-2" size="large" placeholder="快捷搜索" :suffix-icon="Search"
-          @change="searchClick" style="width: 90%; margin-left: 5%; margin-top: 10px" />
+          @change="searchClick" style="width: 90%; margin-left: 5%; margin-top: 10px" clearable @clear="clearInput"/>
         <el-scrollbar height="72vh">
           <p v-for="(item, index) in iedRelation" :key="index" class="scrollbar-demo-item" @click="clickLeft(item, index)"
             :class="{ 'left-item-active': activeLeft == index }">
@@ -137,6 +137,7 @@ const result = (newData) => {
   checkData.value = newData;
 };
 const searchInput = ref("");
+
 //搜索ied编码或名称
 const searchIedList = ref([]);
 const searchClick = (value) => {
@@ -146,8 +147,8 @@ const searchClick = (value) => {
       const iedNameLower = item.ied_name ? item.ied_name.toLowerCase() : null;
       const descLower = item.desc ? item.desc.toLowerCase() : null;
       return (
-        (iedNameLower !== null && iedNameLower.includes(value)) ||
-        (descLower !== null && descLower.includes(value))
+        (iedNameLower !== null && iedNameLower.includes(lowercaseValue)) ||
+        (descLower !== null && descLower.includes(lowercaseValue))
       );
     });
   } else if (!value) {
@@ -211,6 +212,14 @@ onMounted(() => {
   // const height = ref(0);
   // height.value = document.documentElement.clientHeight - 400 + "px;";
 });
+const clearInput = () =>{
+  iedRelation.value = props.iedRelationData;
+}
+watch(()=>searchInput.value,(newValue)=>{
+  if(!newValue){
+    iedRelation.value = props.iedRelationData;
+  }
+})
 //点击头部
 const inoutItemNavIndex = ref("");
 const isPhoto = ref("photo");

+ 16 - 7
src/pages/netStructPicture/components/inoutControl.vue

@@ -388,7 +388,8 @@ const moveNumerCircePositon=()=>{
   
 }
 //圆圈未知的设置
-const circelSet = (line,numnerValue,mark) => {
+// numnerValue
+const circelSet = (endDom, numnerValue, posit, keys, startDom, keyMiddle, mark) => {
   let elmButton = document.getElementById('wrapper').appendChild(document.createElement("div"));
   // 阻止点击事件冒泡
   elmButton.addEventListener("click", async (event) => {
@@ -482,7 +483,7 @@ const setLeaderline2 = () => {
           endSocket: "left",
         }
       );
-      circelSet(line, options );
+      circelSet(endDom, options, "left", key);
     } else {
       line = new LeaderLine(
         endDom,
@@ -499,7 +500,7 @@ const setLeaderline2 = () => {
           // }),
         }
       );
-      circelSet(line, options );
+      circelSet(endDom, options, "left", key);
     }
     leaderLines2.value.push(line);
   }
@@ -525,7 +526,7 @@ const setLeaderline2 = () => {
           // middleLabel: LeaderLine.captionLabel(options),
         }
       );
-      circelSet(line, options );
+      circelSet(endDom, options, "right", key);
     } else {
       line = new LeaderLine(
         LeaderLine.pointAnchor(startDom, { x: "100%", y: rectEnd.top - 232 }),
@@ -541,7 +542,7 @@ const setLeaderline2 = () => {
           // middleLabel: LeaderLine.captionLabel(options),
         }
       );
-      circelSet(line, options );
+      circelSet(endDom, options, "right", key);
     }
     leaderLines2.value.push(line);
   }
@@ -573,8 +574,12 @@ const setLeaderline2 = () => {
               LeaderLine.positionByWindowResize = false;
               line = new LeaderLine(endDom, startDom, lineStyle);
               circelSet(
-                line,
+                endDom,
                 options2,
+                "leftMiddle",
+                key2,
+                startDom,
+                key,
                 "middle"
               );
               leaderLines2.value.push(line);
@@ -608,8 +613,12 @@ const setLeaderline2 = () => {
               LeaderLine.positionByWindowResize = false;
               line2 = new LeaderLine(startDom, endDom, lineStyle2);
               circelSet(
-                line2,
+                endDom,
                 options3,
+                "rightMiddle",
+                key2,
+                startDom,
+                key,
                 "middle"
               );
               leaderLines2.value.push(line2);