From 665cab2fb7e9d421211c92856edc7fe57579c41c Mon Sep 17 00:00:00 2001
From: lihui_ocr <lihui1@qq.com>
Date: Wed, 15 May 2024 16:02:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/index.vue        | 23 +++++++++-----
 src/views/final/comp/FilterModal.vue          | 14 ++++++++-
 src/views/final/content/ListContent.vue       |  3 +-
 src/views/home/aside/comp/AdvanceFilter.vue   | 31 +++++++++----------
 .../home/aside/comp/modals/FilterModal.vue    | 25 ++++++++-------
 5 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index ceab5a8..f775454 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -105,13 +105,22 @@ export default defineComponent({
 
     // 退出登录
     const doLogout = () => {
-      dialog.info({
-        title: '提示',
+      dialog.warning({
+        title: '确认提示',
         content: '您确定要退出登录吗',
-        positiveText: '确定',
-        negativeText: '取消',
+       positiveText: '取消',
+    negativeText: '确定',
+    negativeButtonProps: {
+      type: 'info',
+      ghost: false,
+    },
+    positiveButtonProps: {
+      type: 'default',
+    },
         onPositiveClick: () => {
-          userStore.logout().then(() => {
+       
+        },
+        onNegativeClick: () => {   userStore.logout().then(() => {
             message.success('成功退出登录')
             router
               .replace({
@@ -121,9 +130,7 @@ export default defineComponent({
                 },
               })
               .finally(() => location.reload())
-          })
-        },
-        onNegativeClick: () => {},
+          })},
       })
     }
 
diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index fabca01..9a9e6f1 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -96,10 +96,22 @@ const columns: DataTableColumns<RowData> = [
     title: '更新者',
     key: 'updateby',
   },
-  {
+     {
     title: '更新时间',
     key: 'updatetime',
+    width:180,
+    renderSorterIcon: ({ order }) => {
+      if (order === false)
+        return h(SvgIcon, { name: 'sort-2' })
+      if (order === 'ascend')
+        return h(SvgIcon, { name: 'sort-1' })
+      if (order === 'descend')
+        return h(SvgIcon, { name: 'sort-3' })
+    },
+    sorter: (row1, row2) =>
+      new Date(row1?.updatetime).getTime() - new Date(row2?.updatetime).getTime(),
   },
+  
 ]
 
 const loading = ref(true)
diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue
index 2f8481a..74e3963 100644
--- a/src/views/final/content/ListContent.vue
+++ b/src/views/final/content/ListContent.vue
@@ -521,6 +521,7 @@ watch(
       for (let i=0; i<item.length;i++){
           console.log(item[i])
      item[i].showcheck=true
+     selectionIds.value.push(item[i])
     ooo.push(item[i])
         }
        // console.log(item)
@@ -541,7 +542,7 @@ watch(
         item=ooo
       newlist.push(item)
       })
-    
+      selectionIds.value=[]
     tableData.value=newlist
     }
    
diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue
index bc01ab2..27c0b31 100644
--- a/src/views/home/aside/comp/AdvanceFilter.vue
+++ b/src/views/home/aside/comp/AdvanceFilter.vue
@@ -280,13 +280,7 @@ defineExpose({
   <div class="wrapper" >
     <div class="wrapper-left">
       <svg-icon v-if="icontype==0" name="shield" size="32" />
-       <SvgIcon
-       v-if="icontype==1"
-              :style="{ marginLeft: '5px' }"
-              name="xiala"
-              size="16"
-              color="#999999"
-            />
+      
       <n-popover
         ref="popover"
         :style="{ padding: '0px' }"
@@ -297,6 +291,13 @@ defineExpose({
       >
         <template #trigger>
           <div class="wrapper-left-dropdown" @click="showClick">
+            <SvgIcon
+       v-if="icontype==1"
+              :style="{ marginLeft: '-10px',marginRight:'10px' }"
+              name="xiala"
+              size="16"
+              color="#999999"
+            />
             <n-tooltip trigger="hover">
               <template #trigger>
                 <span
@@ -311,12 +312,7 @@ defineExpose({
               {{ currentlySelectedAdvanced }}
             </n-tooltip>
 
-            <SvgIcon
-              :style="{ marginLeft: '5px' }"
-              name="down"
-              size="14"
-              color="#999999"
-            />
+        
           </div>
         </template>
         <n-spin :show="loading">
@@ -349,12 +345,13 @@ defineExpose({
               </n-form-item>
             </n-form>
 
+
             <ul ref="el" class="wrapper-left-list" @scroll="handleScroll">
                  <VueDraggable
-            v-model="data"
+             v-model="data"
                 class="draggable-ul"
                 :animation="150"
-                group="shared"
+                group="sleceted"
                   @end="moveoneEnd"
               >
               <li
@@ -429,7 +426,9 @@ defineExpose({
                     v-html="item.name"
                   />
                 </li>
-              </VueDraggable>
+              </VueDraggable><div>
+                
+              </div>
             </ul>
           </div>
         </n-spin>
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 1ec207a..2bbf9a8 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -113,7 +113,17 @@ const columns: DataTableColumns<RowData> = [
     title: '创建时间',
     key: 'createtime',
     width: 180,
-    renderSorterIcon: ({ order }) => {
+  
+  },
+  {
+    title: '更新者',
+    key: 'updateby',
+  },
+  {
+    title: '更新时间',
+    key: 'updatetime',
+    width: 180,
+     renderSorterIcon: ({ order }) => {
       if (order === false)
         return h(SvgIcon, { name: 'sort-2' })
       if (order === 'ascend')
@@ -121,22 +131,13 @@ const columns: DataTableColumns<RowData> = [
       if (order === 'descend')
         return h(SvgIcon, { name: 'sort-3' })
     },
-    sorter: (row1, row2) => {
+     sorter: (row1, row2) => {
       // tableData.value.sort(
       //   (a, b) => new Date(a?.createtime).getTime() - new Date(b?.createtime).getTime()
       // )
-      return new Date(row1?.createtime).getTime() - new Date(row2?.createtime).getTime()
+      return new Date(row1?.updatetime).getTime() - new Date(row2?.updatetime).getTime()
     },
   },
-  {
-    title: '更新者',
-    key: 'updateby',
-  },
-  {
-    title: '更新时间',
-    key: 'updatetime',
-    width: 180,
-  },
 ]
 const total = ref(0)
 const loading = ref(true)
-- 
2.39.3