Merge pull request 'shen' (#39) from shen into test

Reviewed-on: #39
pull/41/head^2
shenhailong 1 year ago
commit 6710622480

1
components.d.ts vendored

@ -34,6 +34,7 @@ declare module 'vue' {
NModal: typeof import('naive-ui')['NModal']
NNotificationProvider: typeof import('naive-ui')['NNotificationProvider']
NotPassed: typeof import('./src/components/NotPassed.vue')['default']
NPopconfirm: typeof import('naive-ui')['NPopconfirm']
NPopover: typeof import('naive-ui')['NPopover']
NPopselect: typeof import('naive-ui')['NPopselect']
NProgress: typeof import('naive-ui')['NProgress']

@ -68,31 +68,16 @@ export async function repetitionTask() {
* @returns
*/
export async function getRepeatList(params: FinalParam) {
const notEmptyParams = pickBy(params, notEmpty)
Object.keys(notEmptyParams).forEach((key) => {
const val = notEmptyParams[key]
if (key === 'izuptime') {
const start = formatToDate2(val[0])
const end = formatToDate2(val[1])
notEmptyParams[key] = `${start}-${end}`
}
if (Array.isArray(notEmptyParams[key]))
notEmptyParams[key] = val.join(',')
})
const res = await http.request({
url: `/flow/task/repetitionTaskList`,
method: 'get',
params: notEmptyParams,
params,
})
const { data: { list, totalPage, totalCount } } = res
const { data: { records, totalPage, totalCount } } = res
return {
pageCount: totalPage,
data: list,
data: records,
totalCount,
}
}

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>chazhongjiansuo</title>
<defs>
<rect id="path-1" x="0" y="0" width="64" height="64"></rect>
<linearGradient x1="12.4444444%" y1="0%" x2="87.5555556%" y2="100%" id="linearGradient-3">
<stop stop-color="#5B85F8" offset="0%"></stop>
<stop stop-color="#3C6CF0" offset="100%"></stop>
</linearGradient>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="PrevailCloud-Design-图标集" transform="translate(-2250.000000, -6758.000000)">
<g id="chazhongjiansuo" transform="translate(2250.000000, 6758.000000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<g id="蒙版"></g>
<g mask="url(#mask-2)" fill="url(#linearGradient-3)" fill-rule="nonzero" id="形状结合">
<g transform="translate(6.000000, 2.000000)">
<path d="M31.4511232,24.8747904 L31.7607141,24.8786253 L32.4504148,24.8786253 C39.5888163,25.0499657 45.2098765,30.9440752 45.0374513,38.0375676 C44.9632519,41.0900989 43.8225861,43.8634128 41.9782017,46.0188901 L51.6240923,56.6794025 C52.1413678,57.2619598 52.1413678,57.8102491 51.5206372,58.3585383 L50.106751,59.6264573 C49.5205054,60.1404784 48.9687449,60.1404784 48.4169844,59.523653 L38.6877524,48.7707922 C36.6723213,49.9523783 34.3085739,50.605744 31.7951992,50.5454164 L31.7951992,50.5454164 L31.1054985,50.5454164 C23.967097,50.374076 18.3460368,44.4799664 18.518462,37.3864741 C18.6908871,30.2929817 24.6223126,24.7072849 31.7607141,24.8786253 Z M23.6222467,0.61682542 C24.5188575,-0.205608473 25.8982588,-0.205608473 26.7948696,0.61682542 C29.3467619,2.94705478 35.2781874,6.95642001 46.3478825,7.77885391 C48.6928647,7.9501943 50.4516013,9.9034748 50.4176147,12.1994361 L50.4176147,12.1994361 L50.4176147,38.1061037 L48.5894096,38.1061037 C49.106685,28.682382 41.8303434,20.6293835 32.3469597,20.1153623 C22.8290909,19.6013411 14.6906235,26.7976377 14.173348,36.2556275 C13.6560725,45.7136172 20.9324142,53.8008838 30.4157979,54.314905 C31.5538039,54.3834412 32.69181,54.314905 33.795331,54.1435646 L33.795331,54.1435646 L34.5540017,55.2744112 C32.5193848,56.5423302 30.553738,57.775981 28.6915463,58.8382914 C26.5534744,60.1747465 23.8291569,60.1747465 21.6910849,58.8382914 C14.7595935,54.4177093 0,44.1715537 0,37.5235464 L0,37.5235464 L0,12.1994361 C0,9.9034748 1.75873661,8.01873046 4.06923373,7.81312199 C15.0009888,6.99068809 21.0013843,2.94705478 23.6222467,0.61682542 Z M31.7951992,30.2244456 C27.6225103,30.1216413 24.1395221,33.3771088 24.0705521,37.5235464 C23.967097,41.6699839 27.243175,45.0967918 31.4158638,45.199596 L31.4158638,45.199596 L31.8296842,45.199596 C36.002373,45.3024003 39.4508762,42.0469328 39.5543313,37.9004952 C39.6577864,33.7540577 36.3817084,30.3272498 32.2090195,30.2244456 L32.2090195,30.2244456 Z"></path>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.2 KiB

@ -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;
}

@ -40,10 +40,6 @@ onBeforeMount(() => {
dicStore.fetchizstatusListt()
})
function showModal() {
show.value = true
}
function closeModal() {
show.value = false
}
@ -53,10 +49,6 @@ async function handleSumbit(e: MouseEvent) {
closeModal()
}
defineExpose({
showModal,
})
const columns: DataTableColumns<RowData> = [
{
type: 'selection',
@ -190,7 +182,7 @@ async function query(page: number, pageSize: number) {
const result = await getRepeatList({
sortorder: 'asc',
pageSize: pagination.pageSize,
currPage: 1,
pageNo: 1,
sortname: '',
})
console.log(666666)
@ -330,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) }
@ -351,12 +343,21 @@ function rejectHandler(list) {
const modal = unref(notPassModalRef)! as any
modal.showModal(list)
}
query(pagination.page, pagination.pageSize)
// query(pagination.page, pagination.pageSize)
function showModal() {
query(pagination.page, pagination.pageSize)
show.value = true
}
function reload() {
selectionIds.value = []
checkedRowKeys.value = []
}
defineExpose({
showModal,
})
</script>
<template>

@ -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) {
<SvgIcon size="32" name="magnifying" @click="changeContent" />
</div>
<div>
<SvgIcon style="margin-right: 6px;" size="13" name="summary" @click="showModal(repeatModalRef)" />
<NButton class="xjcc" text @click="showModal(repeatModalRef)">
小结查重
</NButton>

@ -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<any[]>([])
const message = useMessage()
@ -37,22 +40,12 @@ const packageId: any = ref('') // 包id
const CustomSettingModalRef = ref(null)
const taskTableData = ref<any[]>([])
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<any[]>([])
const userStore = useUser()
const imageRef = ref<ComponentElRef | null>()
let processItems: any[] = []
const isFullScreen = ref(false);
const isFullScreen = ref(false)
const fullscreenStyles = computed<any>(() => ({
'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
})
}
}
// storeid
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)
}
</script>
<template>
@ -361,12 +377,14 @@ function reloadList(param, text) {
<div class="wrapper-header">
<div class="left">
<span class="font">任务ID{{ taskDetailInfo.fromtaskname }}</span>
<SvgIcon size="22" class="forward" name="arrow-left" @click="backHandler" />
<SvgIcon size="22" class="back" name="arrow-right" @click="forwardHandler" />
<template v-if="!isDetail">
<SvgIcon size="22" class="forward" name="arrow-left" @click="backHandler" />
<SvgIcon size="22" class="back" name="arrow-right" @click="forwardHandler" />
</template>
</div>
<div class="right">
<div v-if="!isDetail" class="right">
<div v-show="!showActions" style="display: flex; align-items: center">
<div class="btn" @click="setBatch(true)">
<div class="btn" @click="switchBatch()">
<SvgIcon style="margin-right: 6px" size="22" name="batch" />
批量审批
</div>
@ -396,12 +414,12 @@ function reloadList(param, text) {
</ul>
</n-popover> -->
<div class="icon-wrap">
<SvgIcon size="20" v-if="isFullScreen" name="power-off" @click="immersionHandler" style="cursor: pointer;"/>
<SvgIcon size="20" v-else name="immersion-model" @click="immersionHandler" style="cursor: pointer;"/>
<SvgIcon v-if="isFullScreen" size="20" name="power-off" style="cursor: pointer;" @click="immersionHandler" />
<SvgIcon v-else size="20" name="immersion-model" style="cursor: pointer;" @click="immersionHandler" />
</div>
</div>
<div v-show="showActions" class="batch">
<n-button text @click="setBatch(false)">
<n-button text @click="switchBatch()">
<template #icon>
<SvgIcon name="revoke" />
</template>
@ -422,6 +440,14 @@ function reloadList(param, text) {
>
</div>
</div>
<div v-else class="right">
<n-button text @click="goBack">
<template #icon>
<SvgIcon name="revoke" />
</template>
返回
</n-button>
</div>
</div>
<div class="wrapper-detail">
<div

Loading…
Cancel
Save