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 0000000..25a606f Binary files /dev/null and b/src/assets/images/task/tag-not-pass.png differ diff --git a/src/assets/images/task/tag-pass.png b/src/assets/images/task/tag-pass.png new file mode 100644 index 0000000..dee55fd Binary files /dev/null and b/src/assets/images/task/tag-pass.png differ 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 @@