From 58c27ac9d6ad635f6631ad3ef7c5afa524307aef Mon Sep 17 00:00:00 2001 From: Dragon <> Date: Wed, 27 Mar 2024 23:27:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/camera-time.svg | 1 + src/assets/icons/submit-time.svg | 1 + src/assets/images/task/tag-not-pass.png | Bin 0 -> 1752 bytes src/assets/images/task/tag-pass.png | Bin 0 -> 2166 bytes src/views/task/content/Content.vue | 123 ++++++++++++++++++++---- src/views/task/content/History.vue | 115 +++++++++++++--------- 6 files changed, 176 insertions(+), 64 deletions(-) create mode 100644 src/assets/icons/camera-time.svg create mode 100644 src/assets/icons/submit-time.svg create mode 100644 src/assets/images/task/tag-not-pass.png create mode 100644 src/assets/images/task/tag-pass.png diff --git a/src/assets/icons/camera-time.svg b/src/assets/icons/camera-time.svg new file mode 100644 index 0000000..b276693 --- /dev/null +++ b/src/assets/icons/camera-time.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/submit-time.svg b/src/assets/icons/submit-time.svg new file mode 100644 index 0000000..148f5aa --- /dev/null +++ b/src/assets/icons/submit-time.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/task/tag-not-pass.png b/src/assets/images/task/tag-not-pass.png new file mode 100644 index 0000000000000000000000000000000000000000..25a606f57302bbbbcdc1a2ecc237185f0d9dd90c GIT binary patch literal 1752 zcmXXGeLNF*f5@StPN^Md7rmwvdYWO z`=hflFWWtgIb1#%Ih}=Q{ce5kzMt>=`{(<|HxrGtkw2_{7y^OF+u7d0h-I9ZOl76S z{5mwT4+4=;M?2iK7MlQx0w@&l@Bla*aB&5M0O0NYB`^s1_yB)@zPb5736n6`KPXQA z5*i8;6G3wF*Fq#p?Ek8h$pDT1>Pbra8cj+D2?+p+oHRBTb0CJ05I`h~n*#y?V6h-9 z95^`vUq28<`gb}W55#k$?*JDU;Oq?U#(;aVATAChBm$ujynYP|3xP-k*lh6jS3sqL z)m2bd23Vt@yaMFqfrSN-ojoC5W@iU%Y=HWDFf#-8_rcs8*xCY99FUp{nwr4U5*Qc& z#l@hv7qqm1=g&dL1JKn4YHC0-8N7Q3Xf!Z1WYMk}BEHUd(HNvNL?{x9K}RHn$-jF` zAL&g$SZQx>uFF89ZG}Q6Ga)n+?)VV`k+!$HVR;ifFjTy9m-pjwgxnfqmzsGtZxwoI zFxR2CfNbR>b$1?^7`<%r=bp((oBQ?^yN}4e1nc7cXOXx*bTIr8*Me(tJ#T$BmC{(M zb4~F+-12*eDb9mX(=zr7$u{eU!v8Ku&1e;<{v5M;t-Fv&64^l+b1V*?#fNuS-~LP3 zY21_GW>cd++ON+tGFG-XQL(4DNf&vvjOrSZE-GO*;Rzij*z|da$w<%S0hTPA#jWDy z=P0Dj&u4eUj?&ok<7%kD+u@JB2)DyM1O449+GeOW1#Wfoj5*7|G0$e3X80QxhQ)1AAP@nSxgISWLQ;8$DrT4Pkh(@^rGkLhGjm7 zz?)T|Rs@_p#`AiSjq|LbW{&scL*vcxRs!EZhl|^q-GCQ`gZC88=Kjr->2}`Ja$E*Ix7nFSnUTUD5MVQBXJ3+d{A*i162P zTQFCB8$B~$PYCaaNK{P3q2JU-v7;%7b!QEP{nNG@IBTMX=P2>SJG-ZDqM>%Chsu$| z>hd{Pr^4KMb}IKU(+eCTA~g_=3Sj zpCpo{zg3z*0ikP#%F#Iv#T*Np^?*z>JX+bD&-92ajC$|joKNJ3I2n{LU75W7tmc2H z^hlgm9ctBj0_O409oW^+n> zpBdF^^)*R+C=!}y~_ceyi*$#}j zUp}N)(s+cv6O`Qn!??rmX#9Rjin0{1;bBsR8|Pz*P7y_)3Qlo%+s8OE>P}`huS-cy z{5{Uwpa@cH>Tv3x$_noDuLO^ zGh!iL9o7;uQpJ{RytFOYKrq4FS8v3l(I zY1mS+2_``C|8hbZEzw%@O#hT6ZPrBSs#{GofY6X9tJ<)7rHr4Is&f_exv_&zY>D(1 z32e_sRtajt?oGkSG96x8!G-u9XoAJ)(g{b`mgc&(wP1(fAO!7Z2wdN)DN)sr$y5E@ z9(m5hE6*7dwnaK!t3WtKsH=!aex6cnCQ3P$Cw+6lJ|PfmSnJ3+?Y7`eE5s29g4pVb zzdX*bJFZaknH+Z9D}Iz=!$Qvq0`7GiUuq4H)S$G-+LL#FGbV3lZ+U8 q^zUH*3N4@}{?FjGFU8ZBdL*dPiHGs58bB_-=+u8i3-t| z2+D*A%7p+-F9*ql|Ns9B)tU;_m+~rukhUa{{4LC$7JBRJK3fU+N1aV`_}jE z&h_Z4?%9In#1hbx9?p=o@!o6SwkO!4Al98F(wFi4`RDrdrtQ|8?9!0v%3t8NO5U(u z+^`JVq7BZD?)&%T`t!W<;Cti0W8=M1+Nw9$q!`hZ5zmmK>d{i)vt-?}QQWRU+p9y@ zqc+u^6V#a;)0o`%?#J}yYUI9gN}B)x21`jqK~z}7y_k1b8c`6%N$xj_mMg@r^3i*N3+P^KIb!6xLWFNzlKvlyQ!Ni!LYKRs~ z5lm2G%<%<@F~D43d9-Eg@>uupi!W_VSd3y?4YN|QM54BqXoO;0jxizyfwCQA0C}~_ zr5%GWF{V+(GR6X6i7}lnjv~uN5lixAlc_@7G9Af%NjRej63eBXF&P7ijfpKrAzv3k za*G4`ifda;E7X3c4hdCIh>*7s!9p1V#;l7RLGgYtcfCA%?m- zEP+YBbRlwaP<1R0Tg$LL_xr$d6GlNa2@@ExVzmi3hz`n}Fl~zywm5AQ!*+`^VVR;A zUkIW&lNd_TTkK3&jDi?OzT|`zYa_$@`Uu6ws$op>#TtHkHgGmD|CDu0ON_l)AeI;- z)Xk2Lhf?%^fvpl4SjLz*V_JiH(F0$@$}6fw>#G_V<;DR~!t6GsuGnc4!(uUveVO8* zgvointWnJN1-j5Ei1az2o1xJ>GR zlP-EQ$t=*igO$Uo^H|22+$%9U&DWGiH|R8*>rxtU`U46ijTn}ONf6Jm1m*TABI!Difv)(fF$AX(0WG0rmi`xl}%I#L*g?S4RC^HB!49*^))z=|s@PwQ>E%7d3Hb%D=m6@#!#wc^b^vrQv!Z_I2 z*ogi#gJ10eiwg`idoD}aDjOzI6qbtuEKy6&B853~P8eV|!9qj5m4uN{#RCptXGKBM&qu97zUmPG5f5Nxk+NhGu_z9rK7y;rXu s@GX_LZ@zlSw^Rac>0qFp_WgJL0meI{pMu9)!2kdN07*qoM6N<$g2bLIX#fBK literal 0 HcmV?d00001 diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index 5901360..590d17e 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -290,6 +290,7 @@ watch( const taskId = taskStore.getActiveId console.log(packageid) console.log(taskId) + setBatch(false) if (isEmpty(taskId)) return @@ -364,10 +365,6 @@ onUnmounted(() => { window.removeEventListener('keydown', handleKeydown) }) -const mark = computed(() => { - return taskDetailInfo.value.iztrueorfalse === null ? '未标记' : '已标记' -}) - function immersionHandler() { taskStore.updateImmersion() } @@ -523,6 +520,7 @@ function getPercent(pictureid: string) { name="zhen" /> +
@@ -548,8 +546,14 @@ function getPercent(pictureid: string) {
- - {{ formatToDateHMS(taskDetailInfo.createdate || 0) }} +
+ + {{ formatToDateHMS(taskDetailInfo.createdate || 0) }} +
+
+ + {{ formatToDateHMS(taskDetailInfo.createdate || 0) }} +
+
-
- {{ item.similarityscore }} + + + +
+
+ + {{ formatToDateHMS(Number(item.photoDateTimestamp) || 0) }} +
+
+ + {{ formatToDateHMS(Number(item.submitDateTimestamp) || 0) }} +
+
+
+ {{ item.similarityScore }}%
@@ -607,7 +625,7 @@ function getPercent(pictureid: string) { - + @@ -630,6 +648,8 @@ function getPercent(pictureid: string) { } ::v-deep(.n-tabs-tab--active .n-tabs-tab__label) { color: #507AFD; + font-size: 16px; + font-weight: 500; } .wrapper-header-action { @@ -773,6 +793,16 @@ function getPercent(pictureid: string) { border-radius: 8px; position: relative; + .big-mark{ + width: 100%; + height: 151px; + background: linear-gradient(180deg,rgba(0,0,0,0.00) 0%, rgba(0,0,0,0.00) 29%, rgba(3,0,0,0.73)); + position: absolute; + left: 0; + bottom: 0; + z-index: 0; + } + .mark { position: absolute; z-index: 1; @@ -804,8 +834,8 @@ function getPercent(pictureid: string) { .info { position: absolute; z-index: 3; - right: 2%; - bottom: 2%; + right: 16px; + bottom: 16px; width: 136px; height: 119px; background: rgba(216, 216, 216, 0.4); @@ -817,14 +847,22 @@ function getPercent(pictureid: string) { .time { position: absolute; z-index: 3; - left: 2%; - bottom: 2%; - display: flex; - align-items: center; - font-size: 14px; - font-family: PingFang SC, PingFang SC-Medium; - font-weight: 500; - color: #ffffff; + left: 16px; + bottom: 16px; + + .time-item{ + display: flex; + align-items: center; + font-size: 14px; + font-family: PingFang SC, PingFang SC-Medium; + font-weight: 500; + color: #ffffff; + margin-bottom: 4px; + } + + .time-item2{ + margin-bottom: 0; + } .svg-time{ margin-right: 5px @@ -895,6 +933,50 @@ function getPercent(pictureid: string) { overflow: hidden; margin: 0px 16px 27px 0px; + .small-mark{ + width: 100%; + height: 36px; + background: linear-gradient(180deg,rgba(0,0,0,0.01), rgba(0,0,0,0.44) 88%); + border-radius: 0px 8px 8px 0px; + position: absolute; + left: 0; + bottom: 0; + z-index: 0; + } + + .tag-status{ + width: 46px; + height: 18px; + position: absolute; + left: 0; + top: 0; + } + + .time { + position: absolute; + z-index: 3; + left: 3px; + bottom: 3px; + .time-item{ + display: flex; + align-items: center; + font-size: 10px; + font-family: PingFang SC, PingFang SC-Medium; + font-weight: 500; + color: #ffffff; + margin-bottom: 2px; + line-height: 12px; + } + + .time-item2{ + margin-bottom: 0; + } + + .svg-time{ + margin-right: 5px + } + } + .img-wrapper { width: 122px; height: 70px; @@ -932,7 +1014,8 @@ function getPercent(pictureid: string) { } .percent-unit{ - font-size: 8dvb; + font-size: 8px; + margin-top: 4px } .percent-red{ diff --git a/src/views/task/content/History.vue b/src/views/task/content/History.vue index c84f668..9461c27 100644 --- a/src/views/task/content/History.vue +++ b/src/views/task/content/History.vue @@ -1,5 +1,5 @@