溯源排查判定逻辑bug调整，溯源排除条件样式修改

src/views/yhlywsytst/yhlywsytst/index.vue

@@ -2,7 +2,7 @@
  * @Description:
  * @Author: lisu lisu@gavelinfo.com
  * @LastEditors: lisu lisu@gavelinfo.com
- * @LastEditTime: 2024-09-19 16:18:43
+ * @LastEditTime: 2024-09-20 09:40:20
  * @FilePath: /zghywpc-vue/src/views/yhlywsytst/yhlywsytst/index.vue
 -->
 <template>
@@ -287,19 +287,19 @@
         </div>
         <div class="full " style="height: calc(100% - 14px);padding-top: 12px;">
           <el-row :gutter="20" class="search-row-1" style="width: 100%;">
-            <el-col :span="8" class="search-col">
+            <el-col :span="4" class="search-col">
               <div class="search-item">
                 <span class="search-span">功能位置:</span>
                 <el-input v-model="sypcQueryParams.gnwz"></el-input>
               </div>
             </el-col>
-            <el-col :span="8" class="search-col">
+            <el-col :span="4" class="search-col">
               <div class="search-item">
                 <span class="search-span">最大管径:</span>
                 <el-input v-model="sypcQueryParams.gj"></el-input>
               </div>
             </el-col>
-            <el-col :span="8" class="search-col flex-center">
+            <el-col :span="4" class="search-col flex-center">
               <div class="search-item">
                 <span class="search-span">近期引入:</span>
                 <RelSelect placeholder='' style="width: 100%;" :optionsData="[
@@ -309,22 +309,20 @@
                 </RelSelect>
               </div>
             </el-col>
-          </el-row>
-          <el-row :gutter="20" class="search-row-1" style="width: 100%;">
-            <el-col :span="8" class="search-col">
+            <el-col :span="4" class="search-col">
               <div class="search-item">
                 <span class="search-span">规格:</span>
                 <RelSelect placeholder='' style="width: 100%;" src='sbgl/usbxx/init/gg' filterable clearable
                   :match="{value:'name',label:'name'}" v-model='sypcQueryParams.gg'></RelSelect>
               </div>
             </el-col>
-            <el-col :span="8" class="search-col">
+            <el-col :span="4" class="search-col">
               <div class="search-item">
                 <span class="search-span">材质:</span>
                 <el-input v-model="sypcQueryParams.cz"></el-input>
               </div>
             </el-col>
-            <el-col :span="8" class="search-col flex-center">
+            <el-col :span="4" class="search-col flex-center">
               <div class="search-item">
                 <span class="search-span">流动特性:</span>
                 <RelSelect placeholder='' style="width: 100%;" src='ywxxgl/uywxx/init/ldtx ' filterable clearable
@@ -332,35 +330,17 @@
               </div>
             </el-col>
           </el-row>
-          <el-row :gutter="20" class="search-row-1" style="width: 100%;">
-            <el-col :span="8" class="search-col">
-              <!--         <div class="search-item">
-                <span class="search-span">机组:</span>
-                <el-input v-model="queryParams.jzbm"></el-input>
-              </div> -->
-            </el-col>
-            <el-col :span="8" class="search-col">
-              <!--    <div class="search-item">
-                <span class="search-span">状态:</span>
-                <RelSelect placeholder='' style="width: 100%;" src='sbgl/usbxx/init/zt ' filterable clearable
-                  :match="{value:'id',label:'name'}" v-model='queryParams.kshZt'></RelSelect>
-              </div> -->
-
-              <!--   <div class="search-item">
-                <span class="search-span">异物:</span>
-                <el-input v-model="sypcQueryParams.ywName"></el-input>
-              </div> -->
+
+          <el-row :gutter="24" class="search-row-1" style="width: 100%;">
+            <el-col :span="20" class="search-col">
 
             </el-col>
-            <el-col :span="8" class="search-col flex-center">
-              <el-col :span="14" class="search-col flex-center">
-                <!--     <el-button v-show='mxbshow'
-                  style="background-color: rgba(7,32,96,0.0);border: 1px solid #68D8FE; color: #68D8FE;" size="mini"
-                  @click="xsqbmx()" type="primary">显示全部模型</el-button> -->
+            <el-col :span="4" class="search-col flex-center" style="padding: 0px;">
+              <el-col :span="12" class="search-col flex-center">
                 <el-button style="background-color: rgba(7,32,96,0.0);border: 1px solid #68D8FE; color: #68D8FE;"
                   size="mini" @click="czmx()" type="primary">重置模型</el-button>
               </el-col>
-              <el-col :span="10" class="search-col flex-center">
+              <el-col :span="12" class="search-col flex-center">
                 <el-button style="background-color: rgba(7,32,96,0.0);border: 1px solid #68D8FE; color: #68D8FE;"
                   size="mini" @click="sypc()" type="primary">溯源排查</el-button>
               </el-col>
@@ -400,7 +380,7 @@
       </div>
     </div> -->
     <!-- 溯源标记列表-->
-    <div v-show="sylbshow" class="sylb">
+    <!-- <div v-show="sylbshow" class="sylb">
       <div class="full  data-box1" style="position: relative;">
         <i @click="sylbshow=false"
           style="position: absolute;right: 1px;top: 2px;color: #68D8FE;cursor: pointer;z-index: 999;"
@@ -424,7 +404,7 @@
           </div>
         </div>
       </div>
-    </div>
+    </div> -->
 
     <!--   <div class="sblx">
       <div class="full  data-box1" style="position: relative;">
@@ -705,9 +685,9 @@
             } else {
               this.sylbshow = false
             }
-            if (sbxxList.length > 0 && (this.jzReMaterialQue.length != sbxxList.length)) {
-              this.$warning('存在与模型数据不匹配的数据!')
-            }
+            // if (sbxxList.length > 0 && (this.jzReMaterialQue.length != sbxxList.length)) {
+            //   this.$warning('存在与模型数据不匹配的数据!')
+            // }
             /* 绘制全部流向*/
             this.allPieData = zbInfos.filter((item) => {
               return item.children.some((child) => child.data.length >= 2);
@@ -765,7 +745,8 @@
             this.loading = true
             this.loadingText = '正在处理,请稍等。'
 
-            if (this.sypcQueryParams.isrRecentImport != '') {
+            if (this.sypcQueryParams.isrRecentImport !== '') {
+
 
               this.$post('ksh/check/workOrder',
                 this.sypcQueryParams
@@ -992,6 +973,7 @@
             }
 
           },
+          /* 弃用*/
           apiJzbm() {
             let params = _.cloneDeep(this.queryParams)
             delete params.sbxxCode
@@ -1054,9 +1036,9 @@
                 } else {
                   this.sylbshow = false
                 }
-                if (sbxxList.length > 0 && (this.jzReMaterialQue.length != sbxxList.length)) {
-                  this.$warning('存在与模型数据不匹配的数据!')
-                }
+                // if (sbxxList.length > 0 && (this.jzReMaterialQue.length != sbxxList.length)) {
+                //   this.$warning('存在与模型数据不匹配的数据!')
+                // }
 
 
 
@@ -1549,8 +1531,6 @@
                 viewer.controls.target.set(coldx + (px - coldx) * progress, coldy + (py - coldy) * progress,
                   coldz + (
                     pz - coldz) * progress)
-
-
               }
             });
           }
@@ -1732,12 +1712,12 @@
 
   .sypc {
     top: 105px;
-    left: 50%;
-    transform: translate(-50%, 0%);
+    right: 15px;
+    // transform: translate(-50%, 0%);
     /* 使元素居中 */
     position: absolute;
-    height: 185px;
-    width: 40%;
+    height: 134px;
+    width: calc(70% - 15px);
     z-index: 12;
     background-color: rgba(0, 0, 0, 0.6);
   }