From b22c7af4b3c34d72e138131c9dd64882798e74b7 Mon Sep 17 00:00:00 2001 From: lihui_ocr Date: Mon, 22 Apr 2024 22:59:34 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat:=E5=BF=AB=E6=8D=B7=E9=94=AE=20c?= =?UTF-8?q?=E9=80=80=E5=87=BA=E5=85=A8=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Header/ShortcutModal.vue | 4 ++-- src/views/task/content/Content.vue | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/layout/components/Header/ShortcutModal.vue b/src/layout/components/Header/ShortcutModal.vue index a726f9f..aa81cb2 100644 --- a/src/layout/components/Header/ShortcutModal.vue +++ b/src/layout/components/Header/ShortcutModal.vue @@ -142,7 +142,7 @@ defineExpose({ - @@ -159,7 +159,7 @@ defineExpose({
+
通过
- diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index 9578709..71df98c 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -126,6 +126,10 @@ function changeimgbigshow() { // 键盘左右箭头快捷切换 useKeydown('right', forwardHandler) useKeydown('left', backHandler) +useKeydown('c', ()=>{ + isFullScreen.value = false + imgbigshow.value=false +}) useKeydown('p p', () => { const item = taskDetailInfo.value if (item?.userapprove?.statshis === 2 || item?.userapprove?.statshis == 3) { @@ -706,7 +710,7 @@ function nodrage() { - 返回 + 返回1 Date: Wed, 24 Apr 2024 17:27:55 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=E8=BF=94=E5=9B=9E=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/reset.png | Bin 0 -> 1675 bytes src/views/final/aside/Aside.vue | 2 +- src/views/final/comp/FilterModal.vue | 2 +- src/views/home/aside/Aside.vue | 3 ++- .../home/aside/comp/modals/FilterModal.vue | 1 + src/views/home/content/Content.vue | 19 +++++++++++++++++- src/views/task/aside/Aside.vue | 2 +- 7 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 src/assets/images/reset.png diff --git a/src/assets/images/reset.png b/src/assets/images/reset.png new file mode 100644 index 0000000000000000000000000000000000000000..e07f69bef21f8c40c6da8d4c3528668259f0bc76 GIT binary patch literal 1675 zcmV;626Xv}P)Px*MM*?KR9HvVm~CiQWf;eQ_ukx`y3MWmnm89J=3AvmX8J)ZLY;1sNf8tn6bMm} zN!FZcik0*wLWm%c2r6e57*v)mE5({NopVz+oiE#TYr5&?w&yt~?sMPgdG2$ba~?;1 z@_{qX&biMy*Z;cy*Z;b%TVVX`rmb@suwDmi0k)NoZ2>me^04&bp4))$nzPow&V7fx z9&q3PjQ^eTnS^WVUAAo@paZNbEVhd!2M@b&gnMG2-S#53^&z&EiWOjt#{g}l^Fae> z3{(&p(?Iw65J$wo`0jhYmtaE_?6qRap`8+w1I%uEZ!Xb+-yBemar%WphTry@`TQUv zsurpiRRZeNT1X3{wbjUUNd;*<(xgyfRx)q$eE~NwWFNg)M9nQTD zQSxVj2KJ83MDItWhl2pRf|4~6vPOf*fE43M&4#pL@uPkR+&u4n_wajRdO6f=gznQm zQ8Mx~+ONgSFH*kTHfSsbC8gvqp@5y<5(gIZl9^`#B9S`_Moa_waq0P#A&~zNT>chr zwZcHRI{MmR;HKBWY2`3tiYds!=T)m=pws8zAU1fJBbHa2z)U5R(Q>I1z~|iAkTcUP z6p)e$!-}E10jxf!O6Wh(eh9Aqs`6~YQ!uUs8b5^_=kyvke+`B0xdi>~U`0a2%qvok z^lR1`z&0CHG=X@yt0*Ha&b%A4#_BxMMrGu}=qKRPUWjxlOzwIK;Kmskw+tq%g1$~j z&xZc%aqzC2Qqmz~BpfJ(NKYaagVfXcP8_IMepE-SVY8H;kOCZ1YYHBL!bjs#6DcaM zBHbF0zICAzuKc8&kX;0sqZAE?O@fPiz0Q%|$QlPlPsf4zj80mLv?C2*Z`-l@HCS0L zTm*Tuq48s7TxKB@zXS~*KwrDMHu)83{Q)lTGdyoY@fygxAFdtO=$-JYC}-rr$Oqx) z6%g$S7nURnE>;|KBep4+iV5wEA=whxm=YhAq!u~JrGEm>eFiPx#SN5>D}DiTXF$i1 zc+2KKCuvwXUjd8wL?_lbB$Ip#vEpwHtbUWG;vicXSq2IhL*5){+^LL~6uW0F)V~jX zS5?HOyap}bL(4v|=W}O5!CV-<7}^f#a-bdJIMasauOK?0X&utKB^GCAy#cHuPQ_T` zYvf!IJqs4VsK<=pq(WLYL~g`IL*Bix8`}1J>sZcInDQ#5kASWQo%n`|%F|=z(BJ8e z^dOsYQCj0hY-1u7ljfQYxevreLOMfIXnYwoe;!vm*Zb|igB4Z4C%+82(_x?stO01Q zgx(efE+Zd`pI1fu=mxO*gPZK2DZ;oWN{?$`rz9|69W%T3gz-c`(HbN1QFTmq6kT$T9^s-k%9By>~<<}8<){B+T3jeI2SK^jw6_8YTOZmO1x9-V7KzR;_J22#veE!V@+F8m*uxbAi>p#*46#BcZ_#iNK&o7SB}QC(3FwRTEtIra{Gk&N-~hcg4Y+*Z%K3mN2p; znZ1H_;e=Rua=HP`h)Cc(6(BB-=fn3T5{ApbJ&}NBJ82=l&Atk(7iG2EHLwldI_B9P z7{quVRvN-KgF^Q%23v^rI{#!1)kKER7pwm0RlrWZ5u%F8CTbIK(BS9hsZ8Ifw^#H@ zwP&9ttn4J&0n;PP9wPP{v8wi;*k;bzuUCJ0>3s7_sbZ@oC3>82pLLc*eecrioHhPu%zN&0{_olyq@`AgrPXytld5*9Dk?}BTEizc zJSPNA>vl8ATy!U%$MzM!c#_m6i(SHI*1Afj-icrmBIaJGs32`<4eQrcvgJ+(_Ag5< V)P+_HZ1Dg9002ovPDHLkV1gRNESvxU literal 0 HcmV?d00001 diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue index 035df9f..e0d6965 100644 --- a/src/views/final/aside/Aside.vue +++ b/src/views/final/aside/Aside.vue @@ -67,7 +67,7 @@ function newFilterOk() { filterModalRef.value.pagination.page, filterModalRef.value.pagination.pageSize, ) - filterModalRef.value.showModal() + filterModalRef.value.closeModal() } const mousetrap = inject('mousetrap') as any diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue index 0c771b7..907b752 100644 --- a/src/views/final/comp/FilterModal.vue +++ b/src/views/final/comp/FilterModal.vue @@ -310,7 +310,7 @@ function closeModal() { } defineExpose({ - showModal, + showModal,closeModal, query, pagination, }) diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue index e498ba0..de73535 100644 --- a/src/views/home/aside/Aside.vue +++ b/src/views/home/aside/Aside.vue @@ -224,7 +224,8 @@ function newFilterOk() { filterModalRef.value.pagination.page, filterModalRef.value.pagination.pageSize, ) - filterModalRef.value.showModal() + filterModalRef.value.closeModal() + } // 滚动容器，让key对应模块处于可视区域 diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue index 3ff92ab..78773ed 100644 --- a/src/views/home/aside/comp/modals/FilterModal.vue +++ b/src/views/home/aside/comp/modals/FilterModal.vue @@ -358,6 +358,7 @@ function closeModal() { defineExpose({ showModal, + closeModal, query, pagination, }) diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index 68b60b3..fdc561a 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -263,6 +263,7 @@ async function featchList(userSearchId?: string) { imgName: item.imgname, states: item.states, loadOver: false, + isRepeatHis: item.isRepeatHis, } }) @@ -283,7 +284,10 @@ async function loadMore() { // listData.value = [] // isInitSeaerch.value = false // } + + console.log(more) listData.value.push(...more) + console.log(listData.value) } const gridHeight = computed(() => { @@ -751,11 +755,24 @@ defineExpose({ src="@/assets/images/task/tag-pass.png" alt="" > - + +
+
开启沉浸模式