From dab66f78eee7848b0a1fe03311297212081398d6 Mon Sep 17 00:00:00 2001 From: liushilong <2224574157@qq.com> Date: Tue, 2 Apr 2024 13:42:29 +0800 Subject: [PATCH 01/22] =?UTF-8?q?fix:=20=E5=BA=9F=E5=BC=83=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/dictonary.ts | 4 ++-- src/views/final/content/Content.vue | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/store/modules/dictonary.ts b/src/store/modules/dictonary.ts index c43121e..e912b35 100644 --- a/src/store/modules/dictonary.ts +++ b/src/store/modules/dictonary.ts @@ -108,12 +108,12 @@ export const useDictionaryStore = defineStore({ }, actions: { initData(){ - this.fetchRegionList(); + // this.fetchRegionList(); //废弃 this.fetchPictureTypeList(); this.fetchPersionList(); this.fetchPlanList(); this.fetchTFList(); - this.fetchIzShowList(); + // this.fetchIzShowList(); //废弃 this.fetchIzProjectList(); this.fetchIztaskrromList(); this.fetchIztaskstatusList(); diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index 75e3945..2678b90 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -184,8 +184,6 @@ async function getColumns() { const useList = res.data const userFieldFixed = useList.userFieldFixed?.split(',') const userFieldUnFixed = useList.userFieldUnFixed?.split(',') - console.log(userFieldFixed, userFieldUnFixed, 'userFieldUnFixed') - console.log(allList, 'allList') allList?.map((v) => { if (!userFieldFixed?.length && !userFieldUnFixed?.length) { if (v.isrequired == 2) { From b0a67b9ac3ee5426ffee3b66e7909702983bc20d Mon Sep 17 00:00:00 2001 From: liushilong <2224574157@qq.com> Date: Tue, 2 Apr 2024 14:55:12 +0800 Subject: [PATCH 02/22] =?UTF-8?q?feat:=20=E9=AB=98=E7=BA=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E9=98=88=E5=80=BC=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/aside/Aside.vue | 11 +++-------- src/views/home/aside/comp/modals/NewFilterModal.vue | 11 +++++------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue index ad6e08a..0928ad9 100644 --- a/src/views/home/aside/Aside.vue +++ b/src/views/home/aside/Aside.vue @@ -92,14 +92,6 @@ onBeforeMount(async () => { configStore.$subscribe(() => { const config = configStore.getConfig const customConfig = configStore.getCustomConfig - console.log("config", config); - console.log("customConfig", customConfig); - console.log("customObjRef.value", customObjRef.value); - console.log("customTempObjRef.value", customTempObjRef.value, ); - console.log("getFilterConfig", configStore.getFilterConfig,); - console.log("isEqual(asideValue, configStore.getAsideValue)", isEqual(asideValue, configStore.getAsideValue), ); - console.log("configStore的getAsideValue", configStore.getAsideValue, ); - console.log( "getAsideValue", asideValue); if((configFilterRef.value.length > 0 && isEqual(configFilterRef.value, configStore.getFilterConfig)) && customObjRef.value && isEqual(customObjRef.value, customTempObjRef.value)) { return } @@ -157,6 +149,7 @@ configStore.$subscribe(() => { console.log("asideValue直接处理后的结果", asideValue); console.log("customTempObjRef.value", customTempObjRef.value); let tempobj = cloneDeep(asideValue); + console.log("tempObj", tempobj); configStore.setAsideValue(tempobj); } // console.log("showKeys", showKeys); @@ -235,7 +228,9 @@ function updateComponent(key, e) { console.log("tempAsideValue跟新值", configStore.getAsideValue, asideValue); // let tempAsideValue = configStore.getAsideValue || asideValue; let tempobj = cloneDeep(asideValue); + console.log(tempobj,'tempobj') tempobj[key] = e; + console.log(tempobj, 'tempobj After') customObjRef.value = tempobj; // asideValue = Object.assign({}, asideValue, tempobj); console.log("asideValue跟新值", tempobj); diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue index d1369bc..554bf71 100644 --- a/src/views/home/aside/comp/modals/NewFilterModal.vue +++ b/src/views/home/aside/comp/modals/NewFilterModal.vue @@ -152,7 +152,7 @@ function unformatValue(searchfield: string, searchvalue: any) { } // 80,90 - if (searchfield === "izsimilarity") return searchvalue.split(","); + // if (searchfield === "izsimilarity") return searchvalue.split(","); return searchvalue; } @@ -191,15 +191,15 @@ const logicOptions = ref([]); const similarityOptions = [ { label: "80%-90%", - value: [80, 90], + value: '80,90', }, { label: "95%-100%", - value: [95, 100], + value: '95,100', }, { label: "100%-100%", - value: [100, 100], + value: '100,100', }, ]; @@ -255,7 +255,6 @@ watch( function getOptions(key: string) { if (key === "izsimilarity") return similarityOptions; - const getterName = `get${key}`; const options = unref(dicStore[getterName]); return options || []; @@ -277,7 +276,7 @@ function leaveHandler() { function edit(editFilter: any) { currentStatus.value = "edit"; - + console.log(editFilter,'editFilter') const { searchname, ocrUsersearchchildList, id } = editFilter; currentEditId = id; formValue.name = searchname; From 43b3ebd07869f2e58f8348ff2e6445e855a4ec9c Mon Sep 17 00:00:00 2001 From: Dragon <> Date: Tue, 2 Apr 2024 15:35:17 +0800 Subject: [PATCH 03/22] =?UTF-8?q?1=E3=80=81=E7=BB=88=E5=AE=A1=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=202=E3=80=81=E7=9B=B8=E4=BC=BC=E5=9B=BE=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=203=E3=80=81=E7=BB=88=E5=AE=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=204=E3=80=81=E5=AE=A1=E6=A0=B8=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E7=8A=B6=E6=80=81=E6=94=B9=E5=8F=98bug=205=E3=80=81?= =?UTF-8?q?=E7=9B=B8=E4=BC=BC=E5=9B=BE=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98?= =?UTF-8?q?=206=E3=80=81=E7=BC=A9=E7=95=A5=E5=9B=BE=E9=97=AE=E9=A2=98=207?= =?UTF-8?q?=E3=80=81=E5=B0=8F=E7=BB=93=E6=9F=A5=E9=87=8D=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=97=AE=E9=A2=98=208=E3=80=81=E7=A7=BB?= =?UTF-8?q?=E5=85=A5=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/final/comp/ListAction.vue | 16 ++- src/views/final/comp/RepeatTaskTableModal.vue | 55 ++++++--- src/views/final/content/Content.vue | 7 +- src/views/task/aside/Aside.vue | 2 - src/views/task/content/Content.vue | 13 +- src/views/task/modal/BatchModal.vue | 112 ++++++++++++++---- 6 files changed, 155 insertions(+), 50 deletions(-) diff --git a/src/views/final/comp/ListAction.vue b/src/views/final/comp/ListAction.vue index f1ef5e2..72da761 100644 --- a/src/views/final/comp/ListAction.vue +++ b/src/views/final/comp/ListAction.vue @@ -28,19 +28,25 @@ const actions = computed(() => { diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue index 8ed0c10..cb18e8b 100644 --- a/src/views/task/aside/Aside.vue +++ b/src/views/task/aside/Aside.vue @@ -70,10 +70,8 @@ const showSearch = ref(false) function setShowSearch(value: boolean) { if (!value) { - console.log('setShowSearch', value) search.value = '' taskListRef.value.search('') - return } showSearch.value = value } diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index 5c7b2c4..8b271ef 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -240,7 +240,9 @@ async function handleDragEnd(event, item) { const res = await dubiousfileyd({ pictureid: item.pictureId }) if (res.code === 'OK') { message.success('加入成功') + setBatch(false) getTableData() + getImgList() } else { message.error(res.message) @@ -355,6 +357,11 @@ async function getDetail() { getImgList() } +function notPassSuccess(param) { + batchModalRef.value.reload() + reloadList(param, '不通过') +} + function reloadList(param, text) { // 修改左侧状态 const id = currentTaskId() @@ -643,10 +650,8 @@ function switchBatch() { { let canloadMore = true -useInfiniteScroll( - el as any, - () => { - loadMore() - }, - { distance: 10, canLoadMore: () => canloadMore }, -) +// useInfiniteScroll( +// el as any, +// () => { +// console.log(123456) +// loadMore() +// }, +// { distance: 10, canLoadMore: () => canloadMore }, +// ) async function loadMore() { + console.log('loadMore') if (loading.value || el.value == null) return @@ -285,8 +287,12 @@ const showActions = computed(() => { function setBatch(value: boolean) { batch.value = value - if (value === false) - selectIds.value.length = 0 + if (value === false) { + selectIds.value = [] + listData.value.forEach((item) => { + item.checked = false + }) + } } function reject() { @@ -321,13 +327,15 @@ async function refreshHandler() { taskDetailInfo.value = await getTaskDetailInfo(taskId.value, '') nextTick(() => { - useInfiniteScroll( - el as any, - () => { - loadMore() - }, - { distance: 10, canLoadMore: () => canloadMore }, - ) + setTimeout(() => { + useInfiniteScroll( + el as any, + () => { + loadMore() + }, + { distance: 10, canLoadMore: () => canloadMore }, + ) + }, 300) }) } @@ -343,8 +351,31 @@ function switchBatch() { function reload() { selectIds.value = [] + setBatch(false) refreshHandler() } + +function sortHandler(orderby: 'similarityScore' | 'createdate') { + sortBy.orderName = orderby + sortBy.orderType = sortBy.orderType === 'asc' ? 'desc' : 'asc' + + refreshHandler() +} + +// const gridHeight = computed(() => { +// let height = '' +// if (viewMode.value === 'masonry') +// height = '' +// else if (viewMode.value === 'horizontalVersion') +// height = '145px' +// else if (viewMode.value === 'verticalVersion') +// height = '300px' +// else if (viewMode.value === '3:4') +// height = '240px' + +// return height +// }) + defineExpose({ showModal, reload, @@ -364,10 +395,10 @@ defineExpose({
- 任务审批 + 任务审批
- 任务ID:{{ taskDetailInfo.fromtaskname }} + 任务ID:{{ taskDetailInfo.fromtaskname }}
@@ -422,7 +453,7 @@ defineExpose({
- + + +
+ + 视图 + +
+
+ 时间排序 + +
+
+ 相似度排序 + +
@@ -466,10 +512,15 @@ defineExpose({ class="grid-item" >
- + > --> +
@@ -659,7 +710,7 @@ defineExpose({ margin-bottom: 10px; th { - color: #d7d7d7; + color: #999999; text-align: left; } @@ -733,6 +784,23 @@ defineExpose({ } } + .img { + border-radius: 7px; + display: block; + height: calc(100% - 25px); + } + + .img-full { + width: 100%; + overflow: hidden; + + ::v-deep(img) { + width: 100%; + height: 100%; + object-fit: cover; + } + } + .grid-item { width: 214px; padding: 16px; From a8b02071df961212021e93d9ce43ae8a93a497ae Mon Sep 17 00:00:00 2001 From: Dragon <> Date: Tue, 2 Apr 2024 15:35:25 +0800 Subject: [PATCH 04/22] =?UTF-8?q?1=E3=80=81=E7=BB=88=E5=AE=A1=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=202=E3=80=81=E7=9B=B8=E4=BC=BC=E5=9B=BE=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=203=E3=80=81=E7=BB=88=E5=AE=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=204=E3=80=81=E5=AE=A1=E6=A0=B8=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E7=8A=B6=E6=80=81=E6=94=B9=E5=8F=98bug=205=E3=80=81?= =?UTF-8?q?=E7=9B=B8=E4=BC=BC=E5=9B=BE=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98?= =?UTF-8?q?=206=E3=80=81=E7=BC=A9=E7=95=A5=E5=9B=BE=E9=97=AE=E9=A2=98=207?= =?UTF-8?q?=E3=80=81=E5=B0=8F=E7=BB=93=E6=9F=A5=E9=87=8D=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=97=AE=E9=A2=98=208=E3=80=81=E7=A7=BB?= =?UTF-8?q?=E5=85=A5=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/final/content/Content.vue | 3 +++ src/views/task/modal/BatchModal.vue | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/final/content/Content.vue b/src/views/final/content/Content.vue index da7d3f2..bbb289f 100644 --- a/src/views/final/content/Content.vue +++ b/src/views/final/content/Content.vue @@ -1079,4 +1079,7 @@ defineExpose({ :deep(.n-data-table-th__title) { color: #333; } +:deep(.n-data-table .n-data-table-td) { + color: #666; +} diff --git a/src/views/task/modal/BatchModal.vue b/src/views/task/modal/BatchModal.vue index bf4ed6c..b2d1393 100644 --- a/src/views/task/modal/BatchModal.vue +++ b/src/views/task/modal/BatchModal.vue @@ -236,6 +236,7 @@ async function afterEnter() { } function afterLeave() { + reload() removeListeners() } @@ -519,7 +520,7 @@ defineExpose({
From fad5db402228f1024be0878426cef38f8d5cdb1f Mon Sep 17 00:00:00 2001 From: liushilong <2224574157@qq.com> Date: Tue, 2 Apr 2024 16:39:44 +0800 Subject: [PATCH 05/22] =?UTF-8?q?feat:=20=E9=AB=98=E7=BA=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=96=B0=E5=A2=9E=E7=82=B9=E5=87=BB=E9=81=AE=E7=BD=A9?= =?UTF-8?q?=E6=97=A0=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/final/comp/FilterModal.vue | 1 + src/views/final/comp/NewFilterModal.vue | 4 ++-- src/views/home/aside/comp/modals/FilterModal.vue | 1 + src/views/home/aside/comp/modals/NewFilterModal.vue | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue index d8bc149..ad249c2 100644 --- a/src/views/final/comp/FilterModal.vue +++ b/src/views/final/comp/FilterModal.vue @@ -299,6 +299,7 @@ const showSearch = computed(() => { transform-origin="center" display-directive="if" @after-leave="afterLeave" + :mask-closable="false" >