src/views/home/aside/Aside.vue

@@ -249,26 +249,10 @@ function scrollHandler(key: string) {
 
 // 选择某个过滤配置，刷新图片墙 -> 筛选搜索条件
 async function filterHandler(searchId: string) {
-
   // emitter.emit('filter', searchId)
   const res = await getFilterList({ userSearchId: searchId })
-   console.log("顾虑结果", res);
+  // console.log("顾虑结果", res);
   if (res.code == 'OK') {
-   console.log(  res.data.izsimilarity==null)
-    if(res.data.izsimilarity==null){
-      res.data.izsimilarity=[0,100]
-    }
-     if(res.data.izyear==null){
-      let arr=[0,0]
-      arr[1]=new Date().getTime()
-      let currentDate = new Date();
-// 前推30天
-let pastDate = new Date();
-pastDate.setDate(currentDate.getDate() - 30);
-      arr[0]=pastDate.getTime();
-       res.data.izyear=arr
-    }
-    
     const obj = res.data
     customObjRef.value = res.data
     const showKeys: any[] = []
@@ -393,7 +377,7 @@ useKeydown('s', () => setShowSearch(true))
         @handle-ok="handleOk"
       />
       <!-- 新增过滤 -->
-      <NewFilterModalVue ref="newFilterModalRef" @on-ok="newFilterOk"   @select="filterHandler"  @handle-ok="handleOk"/>
+      <NewFilterModalVue ref="newFilterModalRef" @on-ok="newFilterOk" />
       <!-- 筛选 -->
       <CustomFilterModalVue ref="customModalRef" />
     </n-scrollbar>

src/views/home/aside/comp/modals/NewFilterModal.vue

@@ -11,7 +11,7 @@ import SvgIcon from '@/components/Icon/SvgIcon.vue'
 
 type Status = 'edit' | 'new'
 
-const emit = defineEmits(['onOk','handleOk','select'])
+const emit = defineEmits(['onOk','handleOk'])
 const show = ref(false)
 const editValue=ref({})
 const configStore = useConfig()
@@ -126,17 +126,7 @@ function handleSumbit(e: MouseEvent) {
       addCondition(param)
     else updateCondition({ id: currentEditId!, ...param })
     console.log(editValue.value)
-    let obj=editValue.value
+   emit('handleOk', editValue.value)
-    if(currentStatus.value != 'new'){
-     obj.searchname=param.searchname
-    // obj.ocrUsersearchchildList=param.ocrUsersearchchildList
-     }
-   emit('handleOk', obj)
-
-   if(currentStatus.value != 'new'){
-         emit('select', currentEditId)
-     }
-
     closeModal()
   })
 }
@@ -163,8 +153,6 @@ function unformatValue(searchfield: string, searchvalue: any) {
     const start = formatToDate3(dataStrs[0])
     const end = formatToDate3(dataStrs[1])
     return [start, end]
-  }else if(searchfield !="izsimilarity"){
-searchvalue= searchvalue.split(",");
   }
 
   // 80,90
@@ -426,7 +414,6 @@ if(formValue.name){
                   clearable
                 />
               </n-space>
-             
               <n-select
                 v-else
                   :max-tag-count="1"
@@ -436,7 +423,7 @@ if(formValue.name){
                 style="margin-left: 8px"
                 placeholder="请选择"
                 :options="getOptions(item.type!)"
-              /> 
+              />
               <n-button
                 :style="noBorderInput"
                 icon-placement="right"