diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index 46d38e4..ac9484c 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -14,6 +14,7 @@ import { useRoute, useRouter } from 'vue-router' import { useInfiniteScroll } from '@vueuse/core' import BatchModal from '../modal/BatchModal.vue' import CustomSettingModal from '../modal/CustomSettingModal.vue' +import ImgDetailModal from "../modal/ImgDetailModal.vue" import PictureTable from './PictureTable.vue' import TaskTable from './TaskTable.vue' import History from './History.vue' @@ -56,6 +57,7 @@ const route = useRoute() const isDetail = ref(false) // 是否是详情 const finalStore = useFinal() const imgbigshow = ref(true) +const imgdetailref=ref(null) const sortBy: any = { orderType: 'desc', orderName: 'similarityScore', @@ -129,6 +131,8 @@ useKeydown('left', backHandler) useKeydown('c', () => { isFullScreen.value = false imgbigshow.value = false + const modal = unref(imgdetailref)! as any + modal.closeModal() }) useKeydown('p p', () => { const item = taskDetailInfo.value @@ -201,6 +205,7 @@ function validate(items: any[]) { } function approvalHandler(items?: any) { + let cloneItem: any if (batch.value) { processItems = selectItems.value @@ -387,6 +392,7 @@ async function getTableData() { return v }) taskTableData.value = chunk(listData, 2) + console.log(taskDetailInfo) } async function getImgList() { @@ -478,6 +484,7 @@ watch( // 获取数据 async function getDetail() { + console.log(taskId.value, packageId.value, taskIndex.value) taskDetailInfo.value = await getTaskDetailInfo(taskId.value, packageId.value, taskIndex.value) setBatch(false) getTableData() @@ -633,6 +640,25 @@ function sortHandler(orderby: 'similarityScore' | 'createdate') { function nodrage() { message.error('已审批无法移入可疑文件夹中!') } +function getDetailImg(event, item){ + //console.log(item) + //alert(1) + const modal = unref(imgdetailref)! as any + + + modal.showModal(item, packageId.value, taskIndex.value) + +} +function passfun(e){ + + approvalHandler([imgdetailref.value?.taskDetailInfo]) + +} +function nopassfun(e){ + + singleRejectHandlex([imgdetailref.value?.taskDetailInfo]) + +} @@ -1539,7 +1568,7 @@ function nodrage() { background-repeat: no-repeat; border-radius: 8px; position: relative; - background-color: #f2f2f2; + background-color: #F3F6FF; .preview { position: absolute; right: 10px; diff --git a/src/views/task/index.vue b/src/views/task/index.vue index e912fb3..3d2e48e 100644 --- a/src/views/task/index.vue +++ b/src/views/task/index.vue @@ -46,5 +46,6 @@ function setAsideItemName(text) { flex-direction: row; box-sizing: border-box; width: 100%; + margin-bottom: 16px; } diff --git a/src/views/task/modal/ImgDetailModal.vue b/src/views/task/modal/ImgDetailModal.vue new file mode 100644 index 0000000..6302e78 --- /dev/null +++ b/src/views/task/modal/ImgDetailModal.vue @@ -0,0 +1,439 @@ + + + + + diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue index ec7222c..5c727f0 100644 --- a/src/views/worksheet/content/Content.vue +++ b/src/views/worksheet/content/Content.vue @@ -1087,7 +1087,7 @@ defineExpose({ background-repeat: no-repeat; border-radius: 8px; position: relative; - background-color: #f2f2f2; + background-color: #F3F6FF; // width: 632px; // height: 346px; @@ -1137,12 +1137,8 @@ defineExpose({ .footer-times { width: 100%; - height: 80px; - background: linear-gradient( - 180deg, - rgba(0, 0, 0, 0.01), - rgba(0, 0, 0, 0.71) 100% - ); + height: 210px; + background: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 29%, rgba(3, 0, 0, 0.73)); border-radius: 0px 8px 8px 8px; position: absolute; bottom: 0; @@ -1151,7 +1147,7 @@ defineExpose({ flex-direction: column; justify-content: center; font-weight: Medium; - + padding-top: 125px; .time { color: white; font-size: 15px; diff --git a/src/views/worksheet/index.vue b/src/views/worksheet/index.vue index e9dbaea..8fd6e05 100644 --- a/src/views/worksheet/index.vue +++ b/src/views/worksheet/index.vue @@ -42,7 +42,9 @@ function ApprovalOver(packageId) { flex-direction: row; box-sizing: border-box; width: 100%; - height: calc(100% - 170px); + height: 100%; + padding-bottom: 16px; + //height: calc(100% - 170px); } :deep(.ip_box){ z-index: 10;