diff --git a/src/assets/icons/task_count.svg b/src/assets/icons/task_count.svg index 2e6997c..9a1d683 100644 --- a/src/assets/icons/task_count.svg +++ b/src/assets/icons/task_count.svg @@ -1,43 +1,43 @@ - + 任务总数 - + - + - + - + - - + + - - - - - + + + + + - + - + - - + + @@ -47,14 +47,14 @@ - + - + - + diff --git a/src/assets/icons/task_over.svg b/src/assets/icons/task_over.svg index 56565fe..03da445 100644 --- a/src/assets/icons/task_over.svg +++ b/src/assets/icons/task_over.svg @@ -1,65 +1,63 @@ - + 已审批 - + - + - - + + - + - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/assets/icons/task_wait.svg b/src/assets/icons/task_wait.svg index d95218e..f953201 100644 --- a/src/assets/icons/task_wait.svg +++ b/src/assets/icons/task_wait.svg @@ -1,61 +1,59 @@ - + 待审批 - + - + - + - + - + - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue index 3ae3b8e..faea7ef 100644 --- a/src/components/Search/Search.vue +++ b/src/components/Search/Search.vue @@ -168,7 +168,7 @@ onMounted(() => { class="list_item" @click="goPath(item, sitem.id)" > - + @@ -181,7 +181,7 @@ onMounted(() => { // width: 60%; width: 808px; position: absolute; - top: 118px; + top: 190px; left:0; right: 0; box-shadow: none !important; @@ -211,8 +211,6 @@ onMounted(() => { .list_box { - //border: 1px dashed #f4f4f4; - border: 1px dashed #f4f4f4; border-radius: 8px; box-shadow: 0px 12px 12px 0px rgba(80,122,253,0.15); margin-top: 15px; @@ -226,12 +224,12 @@ onMounted(() => { .list_classfiy_item { margin-bottom: -2px; .list_title { - font-size: 12px; + font-size: 16px; font-family: PingFang SC, PingFang SC-Regular; font-weight: Regular; color: #999999; line-height: 17px; - margin: 6px 0 12px 0; + margin: 8px 0 10px 0; font-weight: 500; } @@ -239,7 +237,7 @@ onMounted(() => { display: flex; flex-flow: row nowrap; align-items: center; - margin: 16px 0; + margin: 0 0 12px 0 } } } @@ -268,7 +266,7 @@ onMounted(() => { flex: 1; overflow-y: hidden; overflow-x: auto; - margin: 9px 0 9px 0px; + margin: -1px 0 9px 0px; .tag { font-weight: 500; @@ -277,7 +275,7 @@ onMounted(() => { border: 1px solid #e4e7ed; border-radius: 12px; margin-right: 12px; - font-size: 13px; + font-size: 16px; font-family: PingFang SC, PingFang SC-Regular; font-weight: Regular; text-align: left; diff --git a/src/config/final.ts b/src/config/final.ts index ee9dfba..69ccdc7 100644 --- a/src/config/final.ts +++ b/src/config/final.ts @@ -195,6 +195,14 @@ export const asideTaskMap: Recordable = { // component: IzProjectVue, component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/IzProject.vue")), }, + izplan: { + label: '所属计划', + defaultValue: null, + isDefaultFilter: true, + key: 'izplan', + // component: PlanVue, + component: defineAsyncComponent(() => import("@/views/home/aside/comp/items/Plan.vue")), + }, izvisitpro: { label: '拜访省份/直辖市', defaultValue: null, diff --git a/src/views/final/aside/Aside.vue b/src/views/final/aside/Aside.vue index acad8c2..74c1cdf 100644 --- a/src/views/final/aside/Aside.vue +++ b/src/views/final/aside/Aside.vue @@ -367,6 +367,7 @@ useKeydown('s', () => setShowSearch(true)) v-show="!showSearch" ref="AdvanceFilterRef" :type="1" + :toolipvalue="'请输入任务id、任务名称、提报人'" @select="filterHandler" @update:search="setShowSearch(true)" @show-custom="showModal(customModalRef)" diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue index d11db1e..ec31cb3 100644 --- a/src/views/home/aside/Aside.vue +++ b/src/views/home/aside/Aside.vue @@ -320,6 +320,7 @@ useKeydown('s', () => setShowSearch(true)) v-show="!showSearch" ref="AdvanceFilterRef" :type="0" + :toolipvalue="'请输入提报人搜索'" @select="filterHandler" @update:search="setShowSearch(true)" @show-custom="showModal(customModalRef)" diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue index ff90a69..178c8d2 100644 --- a/src/views/home/aside/comp/AdvanceFilter.vue +++ b/src/views/home/aside/comp/AdvanceFilter.vue @@ -16,6 +16,11 @@ const props = defineProps({ default: 0, required: true, }, + toolipvalue:{ + type: String, + default: "", + required: true, + } }) const emit = defineEmits<{ (e: 'show-filter'): void @@ -406,12 +411,17 @@ defineExpose({
+ + + {{toolipvalue}} + { height: `${deviceHeight.value}px`, } }) -async function init() { +async function inittask() { let result = await getLastCheckNox() console.log(result.data) if(result.data){ let res=await getCheckDuplicateStatusx({checkDuplicateNo:result.data}) if(res.data.status==1){ const checkingTaskModal = checkingTaskModalRef.value as any - checkingTaskModal.showModal() + checkingTaskModal.showModal() + loadref.value=false } } } @@ -169,14 +170,7 @@ onBeforeMount(async () => { cols.value = 5 }) -onUpdated(() => { - init() - // nextTick(() => { - // setTimeout(() => { - // layout() - // }, 50) - // }) -}) + const timeRange = ref('') const timeLabel = computed(() => { @@ -406,6 +400,7 @@ const gridMinHeight = computed(() => { }) async function oneCheck() { + loadref.value=false const asideVal = cloneDeep(configStore.getAsideValue) asideVal.upUserName = searchValue.value @@ -434,9 +429,11 @@ async function oneCheck() { configStore.setTimeNum(calNum.value) if (checkTaskStatus.value === 2 || checkTaskStatus.value === 3) { if (checkTaskStatus.value === 2) - message.success('任务执行完毕，正在刷新数据...') - else message.error('查询异常') - + { message.success('任务执行完毕，正在刷新数据...') + loadref.value=true + }else{ message.error('查询异常') + loadref.value=true + } tasksLoadingModal.closeOnlyModal() configStore.setTimeNum(100) if (timer.value) @@ -529,6 +526,7 @@ async function commitHandler(settingParam) { } onMounted(() => { + inittask() emitter.on('filter', refreshHandler) // emitter.on("filter", (searchId)=>{ // console.log("emitter on filter" + searchId) @@ -676,10 +674,13 @@ function refresh(val?: any) { checkingTaskModal.closeModal() isRefresh.value = false if (checkTaskStatus.value === 2) - message.success('任务执行完毕，正在刷新数据...') - else message.error('查询异常') - - if (timer.value) + { + message.success('任务执行完毕，正在刷新数据...') + loadref.value=true + } + else{ message.error('查询异常') + loadref.value=true + }if (timer.value) clearInterval(timer.value) reset() loadMore() @@ -702,6 +703,7 @@ function cancel() { checkDuplicateNo.value = '' checkTaskStatus.value = null message.success('查重任务取消成功') + loadref.value=true } }) } @@ -776,11 +778,18 @@ defineExpose({
+
-
+
diff --git a/src/views/home/content/modal/CheckingTaskModal.vue b/src/views/home/content/modal/CheckingTaskModal.vue index 4dcdb72..040a0a3 100644 --- a/src/views/home/content/modal/CheckingTaskModal.vue +++ b/src/views/home/content/modal/CheckingTaskModal.vue @@ -56,15 +56,9 @@ defineExpose({
- +
{{ toolsData?.total || 0 }}
任务总数
- +
{{ toolsData?.treat || 0 }}
待审批
- +
{{ toolsData?.approvedCount || 0 }}
已审批
- -
{{ toolsData?.repeat }}
+ +
{{ toolsData?.repeat }}
重复图片
diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 8371ddb..8843a67 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -35,8 +35,7 @@ useKeydown('enter', closeLoginModal) flex-direction: row; box-sizing: border-box; width: 100%; + margin-bottom: 16px } -::v-deep .aside{ - height: 854px !important; -} + diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue index 18eda38..f30bd5e 100644 --- a/src/views/task/aside/Aside.vue +++ b/src/views/task/aside/Aside.vue @@ -277,6 +277,7 @@ function handleOk(item: any) { v-show="!showSearch" ref="AdvanceFilterRef" :type="2" + :toolipvalue="'请输入任务id、任务名称、提报人'" @select="filterHandler" @update:search="setShowSearch(true)" @show-custom="showModal(CustomFieldModalRef)" diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index 393a953..e5bbde6 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -1342,7 +1342,7 @@ function cancel() { - +
diff --git a/src/views/task/modal/MapModal.vue b/src/views/task/modal/MapModal.vue index 7bec8e8..421d643 100644 --- a/src/views/task/modal/MapModal.vue +++ b/src/views/task/modal/MapModal.vue @@ -79,9 +79,8 @@ defineExpose({ .topline{ background: #E8E8E8; height: 0.5px; - width: 800px; - margin-left: -22px; - //position: absolute; + width: 805px; + margin-left: -37px; top: 85px; } .close{ diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue index 6c20260..2a643a7 100644 --- a/src/views/worksheet/aside/Aside.vue +++ b/src/views/worksheet/aside/Aside.vue @@ -207,12 +207,17 @@ if (searchContent) { 所有任务包
+ + + 请输入任务包名称 +
- {{ packageName }} + #{{ packageName }}
@@ -996,7 +996,7 @@ defineExpose({ />
- + - +
diff --git a/src/views/worksheet/index.vue b/src/views/worksheet/index.vue index 6b34b15..36e641e 100644 --- a/src/views/worksheet/index.vue +++ b/src/views/worksheet/index.vue @@ -48,5 +48,6 @@ function ApprovalOver(packageId) { } :deep(.ip_box){ z-index: 10; + bottom: 220px; } diff --git a/src/views/worksheet/modal/ApprovalModal.vue b/src/views/worksheet/modal/ApprovalModal.vue index f2ff33c..b63ff61 100644 --- a/src/views/worksheet/modal/ApprovalModal.vue +++ b/src/views/worksheet/modal/ApprovalModal.vue @@ -158,11 +158,13 @@ defineExpose({
- 智能提示：{{ detail?.similarComplete || 0 }} 张图片相似度为100%重复图片，{{ +
智能提示：
+
{{ detail?.similarComplete || 0 }} 张图片相似度为100%重复图片，{{ detail?.passCount || 0 }}张审批状态为通过，剩余{{ detail?.pendingApprovaCount || 0 }}张图片建议审批为不通过！ +
立即审批 @@ -199,14 +201,16 @@ defineExpose({ } .wrapper { position: absolute; - left: calc(50% - 350px); + left: 0; + right: 0; + .closed { position: relative; top: 0px; left: 90%; } .wrapper-hearder { - margin-top: 20px; + margin-top: 10px; .wrapper-title { text-align: center; font-size: 16px; @@ -229,7 +233,7 @@ defineExpose({ .wrapper-content { flex: 1; border-radius: 8px; - margin: 24px 50px 16px 48px; + margin: 35px 50px 16px 48px; .item { display: flex; flex-flow: row nowrap; @@ -271,8 +275,11 @@ defineExpose({ margin-right: 10px; } .error { - background: rgba(255, 78, 79, 0.1); - color: #ff4e4f; + height: 20px; + width: 117px; + background: rgba(255, 78, 79, 0.1); + color: #ff4e4f; + padding: 1.5px 9px; } } .time_box { @@ -293,6 +300,7 @@ defineExpose({ color: #666666; line-height: 16px; margin-top: 16px; + display: flex; } .footer { cursor: pointer;