feat: 调整taskId为taskchildpictureid #83

Merged
lizijie merged 2 commits from jie into test 1 year ago

@ -13,7 +13,7 @@ import emitter from '@/utils/mitt';
import { useInfiniteScroll } from "@vueuse/core"; import { useInfiniteScroll } from "@vueuse/core";
import { format } from 'date-fns'; import { format } from 'date-fns';
import imagesloaded from "imagesloaded"; import imagesloaded from "imagesloaded";
import { clone, debounce, pickBy } from "lodash-es"; import { clone, cloneDeep, debounce, pickBy } from "lodash-es";
import { useDialog, useMessage } from "naive-ui"; import { useDialog, useMessage } from "naive-ui";
import { computed, onUnmounted, onUpdated, reactive, ref, unref, watch } from "vue"; import { computed, onUnmounted, onUpdated, reactive, ref, unref, watch } from "vue";
import PictureInfo from "../components/PictureInfo.vue"; import PictureInfo from "../components/PictureInfo.vue";
@ -296,8 +296,11 @@ function rejectHandler() {
} }
function detailRejectHandler() { function detailRejectHandler() {
const modal = unref(notPassModalRef)! as any const modal = unref(notPassModalRef)! as any
modal.showModal([taskDetailInfo.value]) const params = cloneDeep(taskDetailInfo.value)
params.id = params.taskchildpictureid
modal.showModal([params])
} }
function singleRejectHandler(item) { function singleRejectHandler(item) {
const modal = unref(notPassModalRef)! as any const modal = unref(notPassModalRef)! as any
modal.showModal([item]) modal.showModal([item])
@ -324,6 +327,7 @@ function approvalHandler(items?: any) {
} }
else if (overTask.value) { else if (overTask.value) {
cloneItem = clone(overTask.value) cloneItem = clone(overTask.value)
cloneItem.id = cloneItem.taskchildpictureid
processItems = [cloneItem] processItems = [cloneItem]
} }
// => => / // => => /
@ -533,10 +537,9 @@ function reloadList() {
<n-checkbox v-show="batch && item.historyStates !== 2 && item.historyStates !== 3" v-model:checked="item.checked" @click.stop <n-checkbox v-show="batch && item.historyStates !== 2 && item.historyStates !== 3" v-model:checked="item.checked" @click.stop
@update:checked="onCheckChange($event, item)" /> @update:checked="onCheckChange($event, item)" />
</div> </div>
<div class="percent"> <div class="percent" :class="{ 'percent-red': item?.maxSimilarity >= 100 }">
<SvgIcon size="42" name="tag" />
<div class="val"> <div class="val">
{{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) }}% {{ item?.maxSimilarity && Number(item?.maxSimilarity).toFixed(0) }}<span class="percent-unit">%</span>
</div> </div>
</div> </div>
@ -967,29 +970,26 @@ function reloadList() {
.percent { .percent {
position: absolute; position: absolute;
text-align: center; display: flex;
z-index: 3; align-items: center;
right: 17px; justify-content: center;
top: 2px; width: 35px;
height: 18px;
opacity: 0.9;
background: #6f92fd;
border-radius: 6px 0px 6px 0px;
z-index: 5;
right: 12px;
top: 15px;
color: #fff; color: #fff;
font-size: 14px;
.val { }
position: absolute; .percent-unit {
left: 0; font-size: 8px;
top: 0; margin-top: 4px;
display: block; }
width: 100%; .percent-red{
height: 100%; background: #ff4e4f;
display: flex;
align-items: center;
justify-content: center;
font-size: 12px;
font-family: PingFang SC, PingFang SC-Semibold;
font-weight: Semibold;
text-align: left;
color: #ffffff;
line-height: 24px;
}
} }
.pass-status { .pass-status {

Loading…
Cancel
Save