From 4f7e1228c916b73c101ddedc8b5045fbf76134f8 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 27 Mar 2024 17:03:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/HomePage/TaskPage.vue | 43 +++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/component/HomePage/TaskPage.vue b/src/component/HomePage/TaskPage.vue
index d215f122..765855fe 100644
--- a/src/component/HomePage/TaskPage.vue
+++ b/src/component/HomePage/TaskPage.vue
@@ -8,9 +8,9 @@
 		@after-visible-change="afterVisibleChange"
 	>
 		<div class="task_content">
-			<div class="task_content_select">
+			<!-- <div class="task_content_select">
 				<a-select @visibleChange="visibleChange()" v-model:value="currentState.value" size="large" optionFilterProp="label" :options="state" placeholder="Please select" :getPopupContainer="getPopupContainer" allowClear show-search></a-select>
-			</div>
+			</div> -->
 			<!-- <div class="task_content_item" v-for="item in taskList">
 				<img v-if="item.status !== 'success'" src="@/assets/images/homePage/loading.gif" alt="">
 				<img v-else :src="item.inputParam.images" alt="">
@@ -29,22 +29,28 @@
 			</div> -->
 			
 			<div class="task_content_item" v-for="item in taskListMore">
-				<img v-if="item.status == 'Waiting' || item.status == 'Executing'" src="@/assets/images/homePage/loading.gif" alt="">
-				<img v-else :src="item.inputImage" alt="">
+				<!-- <img v-if="item.status == 'Waiting' || item.status == 'Executing'" src="@/assets/images/homePage/loading.gif" alt=""> -->
+				<img :src="item?.inputImage" alt="">
 				<div class="task_content_item_text">
 					<div class="task_content_item_text_left modal_title_text">
-						<div class="task_content_item_text_left_titile">{{ item.imageName }}</div>
-						<div class="task_content_item_text_left_into modal_title_text_intro">{{ item.createDate }}</div>
+						<div class="task_content_item_text_left_titile">{{ item?.imageName }}</div>
+						<div class="task_content_item_text_left_into modal_title_text_intro">{{ item?.createDate }}</div>
 					</div>
-					<div class="task_content_item_text_right modal_title_text">
+					<img v-if="item?.status == 'Executing'" src="@/assets/images/homePage/loading.gif" alt="">
+					<div v-else class="task_content_item_text_right modal_title_text">
 						<div class="task_content_item_text_left_titile">{{ item.status }}</div>
 						<div v-show="item.status === 'success'" @click="setDownloadIamge(item)" class="task_content_item_text_left_into modal_title_text_intro ">{{ $t('taskPage.download') }}</div>
 					</div>
 				</div>
+
 			</div>
 			<div v-show="total > taskListMore?.length && total != 0 && taskListMore.length > 0" class="task_content_more" v-observe>
 				<img src="@/assets/images/homePage/loading.gif" alt="">
 			</div>
+			
+		</div>
+		<div class="mark_loading" v-show="isShowMark">
+			<a-spin size="large" />
 		</div>
 		<!-- <TaskDetailPage ref="TaskDetailPage"></TaskDetailPage> -->
 	</a-drawer>
@@ -89,6 +95,7 @@ export default defineComponent({
 			value:'SR',
 		})
 		let getTaskTime:any = null
+		let isShowMark:any = false
         return {
 			...toRefs(filter),
 			store,
@@ -99,6 +106,7 @@ export default defineComponent({
 			currentState,
 			getTaskTime,
 			t,
+			isShowMark,
         };
     },
     data() {
@@ -144,11 +152,12 @@ export default defineComponent({
         init(data:any){
 			this.visible = true
 			// this.getTaskList()
-			this.currentPage = 1
-			// setTimeout(() => {
+			this.isShowMark = true
+			setTimeout(() => {
+				this.currentPage = 1
 				this.getTaskMoreList()
-			// }, 1000);
-			this.getTaskTime = null
+				this.getTaskTime = null
+			}, 1000);
 		},
 		sort(arr:any){
 			arr.sort((a:any, b:any) => {
@@ -238,9 +247,12 @@ export default defineComponent({
 					if(!this.getTaskTime){
 						this.getTaskList()
 					}
+					this.isShowMark = false
 					// if(this.taskListMore.indexOf('success'))
 				}
-			})
+			}).catch((rv) => {
+				this.isShowMark = false;
+			});
 		},
 		setDownloadIamge(item:any){
 			console.log(item);
@@ -252,10 +264,14 @@ export default defineComponent({
 </script>
 <style lang="less">
 .task_page {
+	.mark_loading{
+		position: absolute;
+	}
 	.ant-drawer-body{
 		background: #f6f5fa;
 	}
 	.task_content{
+		position: relative;
 		.task_content_item{
 			background: #fff;
 			margin: 2rem 0;
@@ -284,6 +300,9 @@ export default defineComponent({
 				align-items: center;
 				overflow: hidden;
 				position: relative;
+				img{
+					margin-right: 0;
+				}
 				.task_content_item_text_left,.task_content_item_text_right{
 					margin-bottom: 0;
 				}