diff --git a/src/assets/icons/summary.svg b/src/assets/icons/summary.svg new file mode 100644 index 0000000..075c554 --- /dev/null +++ b/src/assets/icons/summary.svg @@ -0,0 +1,26 @@ + + + chazhongjiansuo + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Approval/NotPassed.vue b/src/components/Approval/NotPassed.vue index b2e53a5..7d3ea14 100644 --- a/src/components/Approval/NotPassed.vue +++ b/src/components/Approval/NotPassed.vue @@ -101,7 +101,7 @@ async function handleSumbit(e: MouseEvent) { audit(param).then((res) => { const { code } = res if (code === 'OK') { - message.success('审核成功') + message.success(res.message) emit('success', param) closeModal() } @@ -199,6 +199,8 @@ async function selectChange(id) { justify-content: flex-end; padding-right: 24px; padding-bottom: 10px; + border-top: 0.5px solid #d9d9d9; + padding-top: 15px; } &-info { @@ -236,6 +238,10 @@ async function selectChange(id) { margin-bottom: 0px; } +::v-deep(.n-form-item-label__text) { + color: #666666; +} + ::v-deep(.n-input__placeholder) { color: #333333!important; } diff --git a/src/views/final/comp/RepeatTaskTableModal.vue b/src/views/final/comp/RepeatTaskTableModal.vue index 00947ed..0d1c1ae 100644 --- a/src/views/final/comp/RepeatTaskTableModal.vue +++ b/src/views/final/comp/RepeatTaskTableModal.vue @@ -322,7 +322,7 @@ function doAudit(param: any) { audit(param).then((res) => { const { code } = res if (code === 'OK') { - message.success('审核成功') + message.success(res.message) reload() } else { message.error(res.message) } diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index cd56c0c..71285a0 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -717,7 +717,7 @@ function doAudit(param: any) { audit(param).then((res) => { const { code } = res if (code === 'OK') { - message.success('审核成功') + message.success(res.message) reload() } else { message.error(res.message) } @@ -762,6 +762,7 @@ async function refreshHandler(searchId?: any) {
+ 小结查重 diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index e0c9fe3..488edf8 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -2,7 +2,7 @@ import { computed, onMounted, onUnmounted, reactive, ref, unref, watch } from 'vue' import { chunk, clone } from 'lodash-es' import { useDialog, useMessage } from 'naive-ui' -import { useRoute } from 'vue-router' +import { useRoute, useRouter } from 'vue-router' import BatchModal from '../modal/BatchModal.vue' import CustomSettingModal from '../modal/CustomSettingModal.vue' import PictureTable from './PictureTable.vue' @@ -25,6 +25,9 @@ import { formatToDateHMS } from '@/utils/dateUtil' import { hideDownload } from '@/utils/image' const emit = defineEmits(['setAsideItemName']) + +const router = useRouter() + const batch = ref(false) const selectItems = ref([]) const message = useMessage() @@ -37,22 +40,12 @@ const packageId: any = ref('') // 包id const CustomSettingModalRef = ref(null) const taskTableData = ref([]) const route = useRoute() - +const isDetail = ref(false) // 是否是详情 const sortBy: any = { orderType: 'desc', orderName: 'similarityScore', } -function setBatch(value: boolean) { - if (totalCount.value === 0) - return - - batch.value = value - - if (value === false) - selectItems.value = [] -} - function onCheckChange(checked: any, item: any) { const index = selectItems.value.indexOf(item) item.checked = checked @@ -77,23 +70,23 @@ const taskDetailPictureList = ref([]) const userStore = useUser() const imageRef = ref() let processItems: any[] = [] -const isFullScreen = ref(false); +const isFullScreen = ref(false) const fullscreenStyles = computed(() => ({ - 'width': isFullScreen.value ? '100vw' : '', - 'height': isFullScreen.value ? '100vh' : '', - 'position': isFullScreen.value ? 'fixed' : '', - 'top': isFullScreen.value ? '0' : '', - 'left': isFullScreen.value ? '0' : '', - 'zIndex': isFullScreen.value ? '9999' : '', -})); - + width: isFullScreen.value ? '100vw' : '', + height: isFullScreen.value ? '100vh' : '', + position: isFullScreen.value ? 'fixed' : '', + top: isFullScreen.value ? '0' : '', + left: isFullScreen.value ? '0' : '', + zIndex: isFullScreen.value ? '9999' : '', +})) onMounted(() => { window.addEventListener('keydown', handleKeydown) if (route.query.id) { taskId.value = route.query.id packageId.value = route.query.packageid + isDetail.value = true getDetail() } }) @@ -108,6 +101,21 @@ function handleKeydown(event) { // 在这里执行右箭头的逻辑 } +function setBatch(value: boolean) { + // if (totalCount.value === 0) + // return + + batch.value = value + + if (value === false) { + taskDetailInfo.value.checked = false + selectItems.value = [] + taskDetailPictureList.value.forEach((item) => { + item.checked = false + }) + } +} + // 从store里面获取任务id function currentTaskId() { const index = taskStore.getCurrentIndex @@ -202,7 +210,7 @@ function doAudit(param: any) { audit(param).then((res) => { const { code } = res if (code === 'OK') { - message.success('审核成功') + message.success(res.message) setBatch(false) reloadList(param, '通过') } @@ -311,12 +319,12 @@ onUnmounted(() => { function immersionHandler() { // taskStore.updateImmersion() - toggleFullScreen(); + toggleFullScreen() } // 切换全屏状态 -const toggleFullScreen = () => { - isFullScreen.value = !isFullScreen.value; -}; +function toggleFullScreen() { + isFullScreen.value = !isFullScreen.value +} function previewHandler(event: MouseEvent) { event.stopImmediatePropagation() event.stopPropagation() @@ -354,6 +362,14 @@ function reloadList(param, text) { getDetail() } + +function goBack() { + router.back() +} + +function switchBatch() { + setBatch(!batch.value) +}