From 402dd65efacf8b811e94d10589337ceccaf43dec Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Tue, 28 May 2024 22:14:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=BC=96=E8=BE=91=E5=90=8E=E7=9A=84?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/aside/comp/modals/FilterModal.vue    | 4 +++-
 src/views/home/aside/comp/modals/NewFilterModal.vue | 6 +++++-
 src/views/task/content/Content.vue                  | 8 ++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 2bbf9a8..551c645 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -250,6 +250,8 @@ function editSelection(id) {
     return item.id === selectedId
   })
 
+console.log(selectedFilter)
+//alert(1)
   emit('editFilter', selectedFilter)
   closeModal()
 }
@@ -485,7 +487,7 @@ function handleOk() {
             <n-button style="background-color: #507afd" type="info" @click="handleOk">
               确定
             </n-button>
-            <n-button secondary style="margin-left: 15px" @click="closeModal">
+            <n-button secondary style="margin-left: 15px" @click="handleOk">
               取消
             </n-button>
           </div>
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index 8369c40..aadec67 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -11,8 +11,9 @@ import SvgIcon from '@/components/Icon/SvgIcon.vue'
 
 type Status = 'edit' | 'new'
 
-const emit = defineEmits(['onOk'])
+const emit = defineEmits(['onOk','handleOk'])
 const show = ref(false)
+const editValue=ref({})
 const configStore = useConfig()
 const dicStore = useDictionary()
 const currentStatus = ref<Status>('new')
@@ -124,6 +125,8 @@ function handleSumbit(e: MouseEvent) {
     if (currentStatus.value === 'new')
       addCondition(param)
     else updateCondition({ id: currentEditId!, ...param })
+    console.log(editValue.value)
+   emit('handleOk', editValue.value)
     closeModal()
   })
 }
@@ -283,6 +286,7 @@ function leaveHandler() {
 function edit(editFilter: any) {
   currentStatus.value = 'edit'
   console.log(editFilter, 'editFilter')
+   editValue.value=editFilter
   const { searchname, ocrUsersearchchildList, id } = editFilter
   currentEditId = id
   formValue.name = searchname
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue
index 99b4584..dbc1f28 100644
--- a/src/views/task/content/Content.vue
+++ b/src/views/task/content/Content.vue
@@ -131,8 +131,8 @@ const fullscreenStyles = computed<any>(() => ({
   top: isFullScreen.value ? '0' : '',
   left: isFullScreen.value ? '0' : '',
   zIndex: isFullScreen.value ? '100' : '',
-   marginLeft: isFullScreen.value ? '0px' : '',
-    marginRight: isFullScreen.value ? '0px' : '',
+   marginLeft: isFullScreen.value ? '0px !important' : '',
+    marginRight: isFullScreen.value ? '0px !important' : '',
 }))
 const fullscreenStylestwo = computed<any>(() => ({
   width: isFullScreen.value ? '100vw' : '',
@@ -141,8 +141,8 @@ const fullscreenStylestwo = computed<any>(() => ({
   top: isFullScreen.value ? '0' : '',
   left: isFullScreen.value ? '0' : '',
   zIndex: isFullScreen.value ? '160' : '',
-  marginLeft: isFullScreen.value ? '0px' : '',
-   marginRight: isFullScreen.value ? '0px' : '',
+  marginLeft: isFullScreen.value ? '0px !important' : '',
+   marginRight: isFullScreen.value ? '0px !important' : '',
 }))
 
 function renderIcon(icon: Component) {