From 84674c63fd9462e2ebe511020146e3de700b4f1e Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 22 Mar 2024 12:01:11 +0800
Subject: [PATCH] fix

---
 src/assets/style/style.css                    |  24 ++
 src/assets/style/style.less                   |  27 +-
 src/component/Administrator/trialApproval.vue |  10 +-
 src/component/HomePage/ExportModel.vue        | 125 ++++++---
 src/component/HomePage/TaskDetailPage.vue     | 259 +++++++++++++-----
 src/component/HomePage/TaskPage.vue           | 103 ++++---
 src/component/Pay/allOrder.vue                | 187 ++-----------
 src/component/Pay/creditsDetail.vue           | 171 +-----------
 src/component/Pay/payOrder.vue                |  31 +--
 src/tool/canvasDrawing.js                     |  54 ++--
 src/tool/cookie.js                            |   4 +-
 src/tool/https.js                             |   7 +-
 src/views/HomeMain.vue                        |  85 +-----
 src/views/HomeView/HomeView.vue               |  11 +-
 14 files changed, 475 insertions(+), 623 deletions(-)

diff --git a/src/assets/style/style.css b/src/assets/style/style.css
index 44d1b654..2a0a1258 100644
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -768,6 +768,7 @@ li {
   color: rgba(0, 0, 0, 0.45);
 }
 .collection_modal .ant-modal-body,
+.generalModel_modal .ant-modal-body,
 .payOrder_modal .ant-modal-body,
 .design_detail_modal_component .ant-modal-body,
 .designOpenrtion_modal .ant-modal-body,
@@ -776,6 +777,7 @@ li {
   overflow-y: hidden;
 }
 .collection_modal .ant-upload.ant-upload-select-picture-card,
+.generalModel_modal .ant-upload.ant-upload-select-picture-card,
 .payOrder_modal .ant-upload.ant-upload-select-picture-card,
 .design_detail_modal_component .ant-upload.ant-upload-select-picture-card,
 .designOpenrtion_modal .ant-upload.ant-upload-select-picture-card,
@@ -789,6 +791,7 @@ li {
   margin: 0;
 }
 .collection_modal .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao,
+.generalModel_modal .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao,
 .payOrder_modal .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao,
 .design_detail_modal_component .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao,
 .designOpenrtion_modal .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao,
@@ -798,6 +801,7 @@ li {
   color: #B7B7B7;
 }
 .collection_modal .ant-upload.ant-upload-select-picture-card .ant-upload-text,
+.generalModel_modal .ant-upload.ant-upload-select-picture-card .ant-upload-text,
 .payOrder_modal .ant-upload.ant-upload-select-picture-card .ant-upload-text,
 .design_detail_modal_component .ant-upload.ant-upload-select-picture-card .ant-upload-text,
 .designOpenrtion_modal .ant-upload.ant-upload-select-picture-card .ant-upload-text,
@@ -807,6 +811,7 @@ li {
   color: #B7B7B7;
 }
 .collection_modal .ant-upload-list-picture-card-container,
+.generalModel_modal .ant-upload-list-picture-card-container,
 .payOrder_modal .ant-upload-list-picture-card-container,
 .design_detail_modal_component .ant-upload-list-picture-card-container,
 .designOpenrtion_modal .ant-upload-list-picture-card-container,
@@ -815,6 +820,7 @@ li {
   display: none !important;
 }
 .collection_modal .ant-upload-picture-card-wrapper,
+.generalModel_modal .ant-upload-picture-card-wrapper,
 .payOrder_modal .ant-upload-picture-card-wrapper,
 .design_detail_modal_component .ant-upload-picture-card-wrapper,
 .designOpenrtion_modal .ant-upload-picture-card-wrapper,
@@ -1079,6 +1085,24 @@ i {
 .library_page .upload_item .upload_file_item .upload_img_icon {
   width: calc(4.6rem*1.2);
 }
+.generalModel_modal .ant-modal-content {
+  border-radius: calc(1rem * 1.2);
+  overflow: hidden;
+}
+.generalModel_modal .ant-modal-content .ant-modal-header {
+  background-color: #fff;
+  border-bottom: none;
+}
+.generalModel_modal .ant-modal-content .ant-modal-body {
+  height: calc(65rem * 1.2);
+}
+.generalModel_modal .ant-modal-content .ant-progress-circle.ant-progress-status-success .ant-progress-text {
+  color: #000;
+}
+.generalModel_modal .ant-modal-content .ant-progress-circle .ant-progress-text {
+  color: rgba(0, 0, 0, 0.55);
+  font-size: calc(1.6rem * 1.2);
+}
 .hideChecked {
   user-select: none;
   -moz-user-select: none;
diff --git a/src/assets/style/style.less b/src/assets/style/style.less
index 5b63184d..dfbc7dab 100644
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -893,7 +893,7 @@ input:focus{
 	}
 }
 //collection 弹窗
-.collection_modal,.payOrder_modal,.design_detail_modal_component,.designOpenrtion_modal,.library_page,.Export{
+.collection_modal,.generalModel_modal,.payOrder_modal,.design_detail_modal_component,.designOpenrtion_modal,.library_page,.Export{
 	
     .ant-modal-body{
         overflow-y: hidden;
@@ -1148,6 +1148,31 @@ i{
 		}
 	}
 }
+.generalModel_modal{//公共弹窗 
+    // max-width: 1200px ;
+    // max-width: 1150px ;
+    .ant-modal-content {
+        border-radius: calc(1rem * 1.2);
+        overflow: hidden;
+        .ant-modal-header {
+            background-color: #fff;
+            border-bottom: none;
+        }
+        .ant-modal-body {
+            // height: calc(65vh - 6.4rem);
+            height: calc(65rem * 1.2);
+        }
+        //进度完成字体颜色
+
+        .ant-progress-circle.ant-progress-status-success .ant-progress-text {
+            color: #000;
+        }
+        .ant-progress-circle .ant-progress-text {
+            color: rgba(0, 0, 0, 0.55);
+            font-size: calc(1.6rem * 1.2);
+        }
+    }
+}
 .hideChecked{
 	user-select: none;
     -moz-user-select: none;
diff --git a/src/component/Administrator/trialApproval.vue b/src/component/Administrator/trialApproval.vue
index 32efeaeb..ff830151 100644
--- a/src/component/Administrator/trialApproval.vue
+++ b/src/component/Administrator/trialApproval.vue
@@ -41,9 +41,9 @@
 						<div
 							v-show="status == 0"
 							class="operate_item"
-							@click="setConsent(record, index)"
+							@click="setAagree(record, index)"
 						>
-							consent
+							agree
 						</div>
 						<div
 							v-show="status == 0"
@@ -111,7 +111,7 @@ export default defineComponent({
 						if(record.value == 0){
 							str ='pending'
 						}else if(record.value == 1){
-							str ='consent'
+							str ='agree'
 						}else if(record.value == 2){
 							str ='reject'
 						}
@@ -168,7 +168,7 @@ export default defineComponent({
 				value:0,
 			},
 			{
-				label:'consent',
+				label:'agree',
 				value:1,
 			},
 			{
@@ -255,7 +255,7 @@ export default defineComponent({
                 }
             );
         },
-		setConsent(record: any, index: number){
+		setAgree(record: any, index: number){
 			const formData = new FormData()
 			formData.append('ids',record.id)
 			let config:any = {headers:{'Content-Type':'multipart/form-data','Accept':'*/*'  }}
diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue
index 592b6ebf..e21472d5 100644
--- a/src/component/HomePage/ExportModel.vue
+++ b/src/component/HomePage/ExportModel.vue
@@ -21,14 +21,15 @@
         <div class="exportCanvasBox">
             <div class="exportCanvasBox_left">
                 <div class="exportCanvasBox_title">Canvas Size</div>
-                <label>
-                    <div>Width:</div>
-                    <input type="number" @input="setMaxInput('width', 500)" v-model="canvasWH.width"/>
-                </label>
-                <label>
-                    <div>Height:</div>
-                    <input type="number" @input="setMaxInput('height', 10000)" v-model="canvasWH.height"/>
-                </label>
+               
+				<label>
+					<div>Width:</div>
+					<input type="number" @input="setMaxInput('width', 500)" v-model="canvasWH.width"/>
+				</label>
+				<label>
+				<div>Height:</div>
+					<input type="number" @input="setMaxInput('height', 10000)" v-model="canvasWH.height" />
+				</label>
                 <div class="exportCanvasBox_title" @click.stop="setCloseNav('nav')">
 					Canvas Nav
 					<div
@@ -173,12 +174,8 @@
 				</div>
 				<div class="exportCanvasBox_right_definition">
 					<label>
-						<div>Width:</div>
-						<input type="number" @input="setMaxInput('width', 500)" v-model="canvasWH.width"/>
-					</label>
-					<label>
-                    <div>Height:</div>
-						<input type="number" @input="setMaxInput('height', 10000)" v-model="canvasWH.height" />
+						<div>Scale:</div>
+						<input type="number" @input="setMaxInput('scale', 500)" v-model="scaleSR"/>
 					</label>
 				</div>
 				<!-- <div class="" @click="multiselect">all</div> -->
@@ -197,9 +194,10 @@
     </a-modal>
 </template>
 <script>
-import {defineComponent, computed, h, ref, nextTick, inject, reactive, onMounted,
+import {defineComponent, computed, h, ref, nextTick, createVNode, reactive, onMounted,
 } from "vue";
 import { Https } from "@/tool/https";
+import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import scaleImage from "@/component/HomePage/scaleImage.vue";
 import ExportNewCoolection from "@/component/HomePage/ExportNewCoolection.vue";
 import { useStore } from "vuex";
@@ -215,7 +213,7 @@ export default defineComponent({
         ExportNewCoolection,
     },
     props: ["msg", "sketchCatecoryList"],
-    setup() {
+    setup(props,{emit}) {
 		let driver__ = computed(()=>{
 			return store.state.Guide.guide
 		})
@@ -286,6 +284,8 @@ export default defineComponent({
 				});
 				canvas.preserveObjectStacking = true;
 				//鼠标移动
+				setCanvasKeyDown()//document上添加按下和抬起事件
+				canvas.on("mouse:over", event =>console.log(123123123123));
 				canvas.on("mouse:move", event =>setCanvasMove(event));
 				canvas.on("mouse:out", event=>setCanvasOut(event));
 				canvas.on("mouse:down", event=>setCanvasDown(event));
@@ -424,13 +424,13 @@ export default defineComponent({
             });
 			
         };
-		let deleteObject = (eventData, transform)=> {
+		let deleteObject = ()=> {
 				// var target = [transform.target];
-				
-				let target = canvas.getActiveObjects()
-				if(!target){
+				if(!canvas.getActiveObjects()){
 					return
 				}
+				let target = canvas.getActiveObjects()
+
 				target.forEach((item)=>{
 					// var canvas = item.canvas;
 					// canvas.remove(item);
@@ -659,7 +659,9 @@ export default defineComponent({
                 canvasWH.value.width = maxNum;
             } else if (str == "height" && canvasWH.value.height >= maxNum) {
                 canvasWH.value.height = maxNum;
-            }
+            }else if(str == 'scale'){
+				scaleSR.value = scaleSR.value < 1 ? 1:scaleSR.value>4? 4:scaleSR.value
+			}
             canvas.setHeight(canvasWH.value.height);
             canvas.setWidth(canvasWH.value.width);
         };
@@ -826,11 +828,10 @@ export default defineComponent({
 
 		// let brushwork = ref('')
 		// 监听键盘的 keydown 和 keyup 事件
-		
 		let keyDown = []
-		document.addEventListener('keydown', function(event) {
+		let canvasKeyDown = (event) => {
+			console.log(123123123);
 			if(keyDown.indexOf(event.key)>-1){
-
 			}else{
 				keyDown.push(event.code)
 				if(event.key === 'Enter' && operation.value == 'fold'){
@@ -847,13 +848,20 @@ export default defineComponent({
 					paste()
 				}
 			}
-		});
-
-		document.addEventListener('keyup', function(event) {
-			keyDown = keyDown.filter(function(item) {
-				return event.code !== item;
-			});
-		});
+		}
+		let canvasKeyUp = (event) =>{
+				keyDown = keyDown.filter(function(item) {
+					return event.code !== item;
+				})
+			}
+		let setCanvasKeyDown = ()=>{
+			document.addEventListener('keydown',canvasKeyDown );
+			document.addEventListener('keyup', canvasKeyUp);
+		}
+		let clearCanvasKeyDown = ()=>{
+			document.removeEventListener('keydown',canvasKeyDown );
+			document.removeEventListener('keyup', canvasKeyUp);
+		}
 		let canvasPencilColor = ref('#000000')
 		let canvasPencilWidth = ref(20)
 		let setOperation = (str)=>{
@@ -1133,6 +1141,7 @@ export default defineComponent({
 		}
 		let setCanvasOut = (event)=>{
 			canvas.remove(brushIndicator)//鼠标移出删除绘画范围的圆形
+			clearCanvasKeyDown()//鼠标移出关闭键盘事件
 		}
 		//设置再画布上按下
 		let setCanvasDown = (event)=>{
@@ -1223,14 +1232,55 @@ export default defineComponent({
 			}
 		}
 		let setHDExport = async ()=>{//获取选中内容的位置信息
-			let imgData = await exportSele(canvas,'jpg')
-			let img = new Image
-			img.src = imgData
-			img.onload = ()=>{
-				console.log(img.width,img.height);
+			let {url,imageType} = await exportSele(canvas,'jpg')
+			if(!imageType){
+				message.info('Please select the region of SR')
+				return
+			}
+			let img = new Image
+			img.src = url
+			let imgStyle = {
+				'width': '80%',
+				'max-height': '30rem',
+				'object-fit': 'contain',
+				'position': 'relative',
+				'left': '50%',
+				'transform': 'translateX(-50%)',
+			}
+			let imgElement = createVNode('img',{src:url,style:imgStyle})
+			img.onload = ()=>{
+				Modal.confirm({
+					title: 'SR needs 300 points, whether to continue？',
+					icon: false,
+					okText: 'Yes',
+					cancelText: 'No',
+					content: imgElement,
+					mask:false,
+					centered:true,
+					onOk() {
+						if(img.width*scaleSR.value>4069 || img.height*scaleSR.value>4069){
+							message.info('Your selected area and SR magnification are more than 4096 pixels,Please re-select.')
+							return
+						}
+						let data = {
+							images: url,
+							scale: scaleSR.value,
+							uniqueId: "",
+							imageType:imageType,
+						}
+						Https.axiosPost(Https.httpUrls.prepareForSR, data).then((rv) => {
+							console.log(rv);
+							emit('setTask')
+						});
+					},
+					// onCancel(){
+					// 	_this.isShowMark = false
+					// 	resolve(false)
+					// }
+				});
 			}
-			console.log(imgData);
 		}
+		let scaleSR = ref(2);
         onMounted(() => {});
 
         return {
@@ -1264,6 +1314,7 @@ export default defineComponent({
 			textureValueChange,//切换材质信息
 			brushworkValue,//当前笔触
 			textureValue,//当前材质
+			scaleSR,
         };
     },
     data(prop) {
diff --git a/src/component/HomePage/TaskDetailPage.vue b/src/component/HomePage/TaskDetailPage.vue
index c708c1f9..f849e097 100644
--- a/src/component/HomePage/TaskDetailPage.vue
+++ b/src/component/HomePage/TaskDetailPage.vue
@@ -1,6 +1,6 @@
 <template>
     <a-modal
-        class="modal_component TaskDetail_modal payOrder_modal"
+        class="modal_component generalModel_modal"
         v-model:visible="showPayOrder"
         :footer="null"
         width="78%"
@@ -10,22 +10,43 @@
         wrapClassName="#app"
         :keyboard="false"
     >
-		<div class="payOrder_page ">
+		<div class="generalModel_page ">
 			<div class="closeIcon">
 				<i class="fi fi-rr-cross-small" @click.stop="cancelDsign()"></i>
 			</div>
-			<div class="creditsDetail_table_search allOrder_table_search">
-				<div class="creditsDetail_state allOrder_state">
-					<div class="creditsDetail_state_item allOrder_state_item">
+			<div class="creditsDetail_table_search generalModel_table_search">
+				<div class="creditsDetail_state generalModel_state">
+					<div class="generalModel_state_item">
+						<span>Time:</span>
+							<a-range-picker
+							class="range_picker"
+							v-model:value="rangePickerValue"
+							style="width:35rem"
+							:placeholder="[
+								$t('HistoryPage.StartDate'),
+								$t('HistoryPage.EndDate'),
+							]"
+							:show-time="{ format: 'HH:mm:ss' }"
+							format="YYYY-MM-DD HH:mm:ss"
+							valueFormat="YYYY-MM-DD HH:mm:ss"
+						>
+							<template #suffixIcon>
+								<span
+									class="icon iconfont range_picker_icon icon-rili"
+								></span>
+							</template>
+						</a-range-picker>
+					</div>
+					<div class="creditsDetail_state_item generalModel_state_item">
 						<span>State:</span>
 						<a-select style="width:25rem" v-model:value="currentState.value" size="large" optionFilterProp="label" :options="state" placeholder="Please select" allowClear show-search></a-select>
 					</div>
 				</div>
 
 				
-				<div class="creditsDetail_search allOrder_search">
+				<div class="creditsDetail_search generalModel_search">
 					<div
-						class="creditsDetail_search_item allOrder_search_item"
+						class="creditsDetail_search_item generalModel_search_item"
 						@click="searchcreditsDetailList()"
 					>
 						<span
@@ -34,7 +55,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="TaskDetail_page" ref="historyTable">
+			<div class="generalModel_table_content" ref="historyTable">
 				<a-table
 					:columns="columns"
 					:data-source="collectionList"
@@ -49,7 +70,21 @@
 						bordered: false,
 					}"
 				>
-					<template
+					<template #bodyCell="{ column, text, record, index }">
+						<template v-if="column.inputImage">
+							<img :src="text.inputImage" :title="column.title">
+						</template>
+						<template v-else-if="column.outputImage">
+							<img :src="text.outputImage" :title="column.title">
+						</template>
+						<template v-else-if="column.Operations">
+							<div class="operate_list">
+								<div class="operate_item" @click="openExport(text)">下载</div>
+							</div>
+							<!-- <div v-else class="operate_item">/</div> -->
+						</template>
+					</template>
+					<!-- <template
 						#bodyCell="{ column, text, record, index }"
 					>
 						<div
@@ -58,7 +93,7 @@
 						>
 							<div class="operate_item">{{ $t('HistoryPage.Delete') }}</div>
 						</div>
-					</template>
+					</template> -->
 				</a-table>
 			</div>
 		</div>
@@ -72,7 +107,7 @@
 <script lang="ts">
 import { defineComponent, ref, createVNode, computed, nextTick } from "vue";
 import { Https } from "@/tool/https";
-import { formatTime } from "@/tool/util";
+import { downloadIamge } from "@/tool/util";
 import { Modal, message } from "ant-design-vue";
 import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
 import { useI18n } from "vue-i18n";
@@ -87,65 +122,69 @@ export default defineComponent({
 		const columns: any = computed(() => {
             return [
                 {
-                    title: "Serial",
+                    title: "Input",
                     align: "center",
                     ellipsis: true,
-                    dataIndex: "orderNo",
-                    key: "orderNo",
+                    // dataIndex: "inputImage",
+                    key: "inputImage",
+					inputImage:true,
+                },
+				{
+                    title: "Output",
+                    align: "center",
+                    ellipsis: true,
+                    // dataIndex: "outputImage",
+                    key: "outputImage",
+					outputImage:true,
+
                 },
                 {
-                    title: "Title",
+                    title: "Name",
                     align: "center",
                     ellipsis: true,
-                    dataIndex: "title",
-                    key: "title",
+                    dataIndex: "imageName",
+                    key: "imageName",
+                },
+				{
+                    title: "CreateDate",
+                    align: "center",
+                    ellipsis: true,
+                    dataIndex: "createDate",
+                    key: "createDate",
                 },
                 {
-                    title: "Money",
+                    title: "Scale",
                     align: "center",
                     ellipsis: true,
-                    dataIndex: "totalFee",
-                    key: "totalFee",
-                },
-                {
-                    title: "Payment",
-                    align: "center",
-                    ellipsis: true,
-                    dataIndex: "paymentType",
-                    key: "paymentType",
-                },
-                {
-                    title: "State",
-                    align: "center",
-                    ellipsis: true,
-                    dataIndex: "orderStatus",
-                    key: "orderStatus",
+                    dataIndex: "otherInput",
+                    key: "otherInput",
                 },
 
-                // {
-                //     title: useI18n().t("HistoryPage.Operations"),
-                //     key: "operation",
-                //     align: "center",
-                //     // slots:{customRender:'action'}
-                //     Operations: true,
-                // },
+                {
+                    title: useI18n().t("HistoryPage.Operations"),
+                    key: "operation",
+                    align: "center",
+                    // slots:{customRender:'action'}
+                    Operations: true,
+                },
             ];
 		
         });
 		let currentState = ref({
-			value:'income',
+			value:'SR',
 		})
 		let state:any = ref([
 			{
-				label:'Income',
-				value:'income',
-			},
-			{
-				label:'Expend',
-				value:'expend',
+				label:'SR',
+				value:'SR',
 			},
+			// {
+			// 	label:'Expend',
+			// 	value:'expend',
+			// },
 		])
         let collectionList: any = ref([]);
+        let rangePickerValue: any = ref([]);
         return {
             presentState,
             showPayOrder,
@@ -155,6 +194,7 @@ export default defineComponent({
 			currentState,
 			state,
 			collectionList,
+			rangePickerValue,
         };
     },
     data() {
@@ -166,15 +206,18 @@ export default defineComponent({
         };
     },
     mounted() {
-		// let historyTable: any = this.$refs.historyTable;
-        // this.historyTableHeight = historyTable.clientHeight - 130;
-		// console.log(historyTable);
+		
+		
 	},
     methods: {
         init() {
             this.showPayOrder = true;
 			this.currentPage = 1
 			this.pageSize = 10
+			nextTick().then(()=>{
+				let historyTable: any = this.$refs.historyTable;
+				this.historyTableHeight = historyTable.clientHeight - 130;
+			})
 			this.getTaskDetail()
         },
 		 //改变页码
@@ -189,17 +232,18 @@ export default defineComponent({
             this.getTaskDetail();
         },
 		getTaskDetail() {
+			let startDate: any = this.rangePickerValue[0]?this.rangePickerValue[0] : "";
+            let endDate: any = this.rangePickerValue[1]?this.rangePickerValue[1] : "";
+				
 			let data = {
-				isIncome: this.currentState.value == 'income'?true:false,
-				page:this.currentPage,
-                size:this.pageSize,
+				size:this.pageSize,
+                page: this.currentPage,
+				type:this.currentState.value,
+				endTime: endDate,
+				startTime: startDate,
 			}
-			console.log(data);
-			// getCreditsDetail
-			// orderInfoList
-            Https.axiosPost(Https.httpUrls.getCreditsDetail,data).then((rv: any) => {
-                this.total = rv.length;
-                this.collectionList = rv
+
+            Https.axiosPost(Https.httpUrls.getTasksHistory,data).then((rv: any) => {
 				if(this.currentPage > 1 && rv.content.length == 0){
 					this.currentPage = 1
 					this.getTaskDetail()
@@ -210,6 +254,9 @@ export default defineComponent({
 				
             });
         },
+		openExport(exportObj:any){
+			downloadIamge(exportObj.outputImage,exportObj.imageName)
+		},
 		cancelDsign(){
 			this.showPayOrder = false
 		}
@@ -217,23 +264,20 @@ export default defineComponent({
 });
 </script>
 <style lang="less">
-.TaskDetail_modal {
-   
-}
-</style>
-<style lang="less">
-.payOrder_modal {
+// .generalModel_modal {
     .closeIcon {
         z-index: 2;
     }
-    .payOrder_page {
+    .generalModel_page {
         width: 100%;
         height: 100%;
         padding: 9rem;
         overflow: hidden;
         // min-width: 1440px;
         position: relative;
-		.allOrder_table_search {
+		display: flex;
+		flex-direction: column;
+		.generalModel_table_search {
 		display: flex;
 		margin-top: 2rem;
 		padding: 2rem 3.5rem 5rem 2.8rem;
@@ -242,9 +286,9 @@ export default defineComponent({
 		justify-content: flex-start;
 		align-items: center;
 		
-		.allOrder_search{
-			width: 20%;
-			.allOrder_search_item{
+		.generalModel_search{
+			width: auto;
+			.generalModel_search_item{
 				background: #343579;
 				border-color: #343579;
 				height: 4rem;
@@ -256,12 +300,13 @@ export default defineComponent({
 				cursor: pointer;
 			}
 		}
-		.allOrder_state {
+		.generalModel_state {
 			position: relative;
 			display: flex;
 			align-items: center;
-			width: 80%;
-			.allOrder_state_item{
+			width: auto;
+			flex-wrap: wrap;
+			.generalModel_state_item{
 				display: flex;
 				align-items: center;
 				margin-right: 5rem;
@@ -292,7 +337,7 @@ export default defineComponent({
 					}
 				}
 			}
-			.allOrder_current{
+			.generalModel_current{
 				background: #fff;
 				width: 100%;
 				display: flex;
@@ -322,6 +367,68 @@ export default defineComponent({
 			}
 		}
 	}
-	}
+	
+	// }
 }
+.generalModel_table_content {
+		width: 100%;
+		// height: 100%;
+		height: 100%;
+		flex: 1;
+		padding-bottom: 3rem;
+		background: #fff;
+		border-radius: 2rem;
+		overflow: hidden;
+		.ant-table {
+			background: transparent;
+		}
+
+		.ant-table-body {
+			overflow-y: auto !important;
+			-ms-overflow-style: none;
+			overflow: -moz-scrollbars-none;
+
+			&::-webkit-scrollbar {
+				width: 0 !important;
+			}
+		}
+		.ant-table-thead > tr > th {
+			background: #ffffff00;
+			border-bottom: none;
+			backdrop-filter: blur(1rem);
+		}
+
+		.ant-table-tbody > tr > td {
+			border: none;
+			background: transparent;
+			// color: #fff;
+			img{
+				max-width: 100%;
+				max-height: 10rem;
+				object-fit: contain;
+			}
+		}
+		.ant-table-tbody > tr {
+			&:hover > td {
+				background: #ffffff3a;
+			}
+		}
+		.ant-table-pagination-right {
+			padding-right: 3.5rem;
+		}
+		.operate_list {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 0 1rem;
+			justify-content: center;
+			.operate_item {
+				font-size: 1.4rem;
+				font-family: Roboto;
+				font-weight: 400;
+				color: #343579;
+				cursor: pointer;
+			}
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/src/component/HomePage/TaskPage.vue b/src/component/HomePage/TaskPage.vue
index 19dd1355..660a178c 100644
--- a/src/component/HomePage/TaskPage.vue
+++ b/src/component/HomePage/TaskPage.vue
@@ -12,11 +12,11 @@
 		</template>
 		<div class="task_content">
 			<div class="task_content_item" v-for="item in taskList">
-				<img v-if="item.state !== 'success'" src="@/assets/images/homePage/loading.gif" alt="">
+				<img v-if="item.status !== 'success'" src="@/assets/images/homePage/loading.gif" alt="">
 				<img v-else :src="item.inputParam.images" 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.title }}</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">
@@ -24,22 +24,22 @@
 					</div>
 				</div>
 			</div>
-			<div class="task_content_more" v-show="taskListMore.length == 0" @click="setTaskListMore">
+			<div class="task_content_more" v-show="taskListMore.length == 0" @click="getTaskMoreList">
 				点击查看更多
 			</div>
 			<div class="task_content_select" v-show="taskListMore.length > 0">
 				<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 class="task_content_item" v-for="item in taskListMore" v-show="taskListMore.length > 0">
-				<img v-if="item.state === '执行中' || item.state === '失败'" src="@/assets/images/homePage/loading.gif" alt="">
-				<img v-else :src="item.url" alt="">
+			<div class="task_content_item" v-for="item in taskListMore">
+				<img v-if="item.status !== 'success'" src="@/assets/images/homePage/loading.gif" alt="">
+				<img v-else :src="item.inputParam.images" 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.title }}</div>
-						<div class="task_content_item_text_left_into modal_title_text_intro">{{ item.time }}</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">
-						<div class="task_content_item_text_left_titile">{{ item.state }}</div>
+						<div class="task_content_item_text_left_titile">{{ item.status }}</div>
 					</div>
 				</div>
 			</div>
@@ -54,6 +54,7 @@
 import { message, Upload } from "ant-design-vue";
 import { defineComponent, computed, h, ref, nextTick, inject } from "vue";
 import { Https } from "@/tool/https";
+import { downloadIamge } from "@/tool/util";
 import { useStore } from "vuex";
 // import { forEach } from "jszip";
 import TaskDetailPage from "@/component/HomePage/TaskDetailPage.vue";
@@ -72,17 +73,19 @@ export default defineComponent({
 		let taskListMore:any = ref([])
 		let state:any = ref([
 			{
-				label:'Income',
-				value:'income',
+				label:'SR',
+				value:'SR',
 			},
-			{
-				label:'Expend',
-				value:'expend',
-			}
+			// {
+			// 	label:'SR',
+			// 	value:'SR',
+			// }
 		])
 		let currentState = ref({
-			value:'income',
+			value:'SR',
 		})
+		let getTaskTime:any = null
+		let oldTaskListMore:any = ref([])
         return {
 			store,
 			visible,
@@ -90,6 +93,8 @@ export default defineComponent({
 			taskListMore,
 			state,
 			currentState,
+			getTaskTime,
+			oldTaskListMore,
         };
     },
     data(prop) {
@@ -117,7 +122,7 @@ export default defineComponent({
 				function callback(entries:any, observer:any) {
 					entries.forEach((entry:any) => {
 						if (entry.isIntersecting) {
-							this_.getTaskList()
+							this_.getTaskMoreList()
 						} else {
 						}
 					});
@@ -126,14 +131,25 @@ export default defineComponent({
 		},
 	},
 	watch:{
-		// newWindowState:{
-		// 	handler(newVal,oldVal){
-		// 		console.log(newVal);
-		// 		if(newVal){
-		// 			this.newWindow?.close();
-		// 		}
-		// 	}
-		// },
+		taskList:{
+			handler(newVal,oldVal){
+				if(oldVal.length > 0){
+					let newSuccess = newVal.filter((item:any)=>item.status == 'success')
+					let oldSuccess = oldVal.filter((item:any)=>item.status == 'success')
+					// const exportSR = newSuccess.filter((item:any) => !oldSuccess.includes(item));
+					// console.log(JSON.parse(JSON.stringify(newSuccess)),JSON.parse(JSON.stringify(oldSuccess)));
+					// console.log(exportSR);
+					let difference = newSuccess.filter((objA:any) => !oldSuccess.some((objB:any) => objA.id === objB.id));
+					if(difference.length > 0){
+						difference.forEach((item:any)=>{
+							downloadIamge(item.outputImage,item.imageName)
+						})
+					}
+
+				}
+				
+			}
+		},
 		
 	},
     methods: {
@@ -143,16 +159,13 @@ export default defineComponent({
 		},
         init(){
 			this.visible = true
-			Https.axiosGet(Https.httpUrls.getTasksList).then((rv)=>{
-
-				this.taskList = this.sort(rv)
-			})
+			this.getTaskList()
 		},
 		sort(arr:any){
 			arr.sort((a:any, b:any) => {
 				var a_num = Date.parse(a.createDate);
-				var b_num = b.style.zIndex;
-				return a_num - b_num;
+				var b_num = Date.parse(b.createDate);
+				return b_num - a_num;
 			});
 			return arr
 		},
@@ -160,13 +173,8 @@ export default defineComponent({
 			if(!bool){
 				this.taskListMore = []
 			}
-			console.log(bool);
-		},
-		setTaskListMore(){
-			// this.taskListMore = this.taskList
-			
-			this.taskListMore.push(...this.taskList,...this.taskList)
 		},
+		
 		openTaskDetailPage(){
 			let taskDetailPage:any = this.$refs.TaskDetailPage
 			this.visible = false
@@ -178,14 +186,29 @@ export default defineComponent({
 			this.total = 0
 		},
 		getTaskList(){
+			clearTimeout(this.getTaskTime)
+			Https.axiosGet(Https.httpUrls.getTasksList).then((rv)=>{
+				this.taskList = this.sort(rv)
+				let isSuccess = rv.filter((item:any) => item.status == 'Waiting' || item.status == 'Executing')
+				if(isSuccess.length>0){
+					this.getTaskTime = setTimeout(() => {
+						this.getTaskList()
+					}, 4000);
+				}
+			})
+		},
+		getTaskMoreList(){
 			let data = {
 				size:this.pageSize,
                 page: this.currentPage,
-				aaa:this.currentState,
+				type:this.currentState.value,
+				endTime: "",
+				startTime: "",
 			}
-			console.log(123123);
 			this.currentPage += 1
-			Https.axiosGet()
+			Https.axiosPost(Https.httpUrls.getTasksHistory,data).then((rv)=>{
+				this.taskListMore = rv
+			})
 		}
     },
 });
diff --git a/src/component/Pay/allOrder.vue b/src/component/Pay/allOrder.vue
index 65b14f67..b7762d93 100644
--- a/src/component/Pay/allOrder.vue
+++ b/src/component/Pay/allOrder.vue
@@ -1,8 +1,8 @@
 <template>
-    <div class="allOrder_page">
-		<div class="allOrder_table_search">
-			<div class="allOrder_state">
-				<div class="allOrder_state_item">
+    <div class="allOrder_page generalModel_page">
+		<div class="generalModel_table_search">
+			<div class="generalModel_state">
+				<div class="generalModel_state_item">
 					<span>Time:</span>
 						<a-range-picker
 						class="range_picker"
@@ -11,7 +11,9 @@
 							$t('HistoryPage.StartDate'),
 							$t('HistoryPage.EndDate'),
 						]"
-						valueFormat="YYYY-MM-DD"
+						:show-time="{ format: 'HH:mm:ss' }"
+						format="YYYY-MM-DD HH:mm:ss"
+						valueFormat="YYYY-MM-DD HH:mm:ss"
 					>
 						<template #suffixIcon>
 							<span
@@ -21,10 +23,9 @@
 					</a-range-picker>
 				</div>
 			</div>
-
-			<div class="allOrder_search">
+			<div class="generalModel_search">
 				<div
-					class="allOrder_search_item"
+					class="generalModel_search_item"
 					@click="searchAllOrderList()"
 				>
 					<span
@@ -33,7 +34,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="allOrder_table_content" ref="historyTable">
+		<div class="generalModel_table_content" ref="historyTable">
 			<a-table
 				:columns="columns"
 				:data-source="collectionList"
@@ -186,14 +187,8 @@ export default defineComponent({
         },
 		//获取列表
         getAllOrderList() {
-			let startTime = '00:00:00'
-			let endTime = '00:00:00'
-			let startDate: any = this.rangePickerValue[0]
-                ? this.rangePickerValue[0]+' '+startTime
-                : "";
-            let endDate: any = this.rangePickerValue[1]
-                ? this.rangePickerValue[1]+' '+endTime
-                : "";
+			let startDate: any = this.rangePickerValue[0]?this.rangePickerValue[0] : "";
+            let endDate: any = this.rangePickerValue[1]?this.rangePickerValue[1] : "";
 			let data = {
 				endTime: endDate,
 				isIncome: this.currentState.value == 'income'?true:false,
@@ -201,7 +196,6 @@ export default defineComponent({
                 size:this.pageSize,
 				startTime: startDate
 			}
-			console.log(data);
 			// getCreditsDetail
 			// orderInfoList
             Https.axiosPost(Https.httpUrls.orderInfoList,data).then((rv: any) => {
@@ -221,158 +215,9 @@ export default defineComponent({
 });
 </script>
 <style lang="less">
-.allOrder_page {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    // min-width: 1440px;
-    position: relative;
-	display: flex;
-	flex-direction: column;
-	.allOrder_table_search {
-		display: flex;
-		margin-top: 2rem;
-		padding: 2rem 3.5rem 5rem 2.8rem;
-		background: #fff;
-		display: flex;
-		justify-content: flex-start;
-		align-items: center;
-		
-		.allOrder_search{
-			width: 20%;
-			.allOrder_search_item{
-				background: #343579;
-				border-color: #343579;
-				height: 4rem;
-				padding: .64rem 1.5rem;
-				font-size: 1.6rem;
-				border-radius: 2px;
-				display: inline-block;
-				color: #fff;
-				cursor: pointer;
-			}
-		}
-		.allOrder_state {
-			position: relative;
-			display: flex;
-			align-items: center;
-			width: 80%;
-			.allOrder_state_item{
-				display: flex;
-				align-items: center;
-				margin-right: 5rem;
-				>span{
-					font-size: 2rem;
-					font-weight: 400;
-					color: #030303;
-					margin-right: 15px;
-					flex-shrink: 0;
-					display: block;
-					min-width: 5rem;
-					text-align: left;
-				}
-				.ant-picker-range{
-					height: 5rem;
-				}
-				.ant-select-lg{
-					font-size: 14px;
-					.ant-select-selector{
-						height: 5rem;
-						.ant-select-selection-item{
-							line-height: 5rem;
-						}
-						input{
-							line-height: 5rem;
-							height: 5rem;
-						}
-					}
-				}
-			}
-			.allOrder_current{
-				background: #fff;
-				width: 100%;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-			}
-			.header_user_content {
-				position: absolute;
-				border: 2px solid;
-				border-radius: 1rem;
-				overflow: hidden;
-				top: 0;
-				transform: translateY(6rem);
-				z-index: 2;
-				display: none;
-				margin-left: -2rem;
-				.username{
-					padding: 0 2rem;
-					color: #000;
-				}
-				.username:hover{
-					background: #e1e1e1;
-				}
-				&.active{
-					display: block;
-				}
-			}
-		}
-	}
-
-	.allOrder_table_content {
-		width: 100%;
-		// height: 100%;
-		flex: 1;
-		padding-bottom: 3rem;
-		background: #fff;
-		border-radius: 2rem;
-		overflow: hidden;
-		.ant-table {
-			background: transparent;
-		}
-
-		.ant-table-body {
-			overflow-y: auto !important;
-			-ms-overflow-style: none;
-			overflow: -moz-scrollbars-none;
-
-			&::-webkit-scrollbar {
-				width: 0 !important;
-			}
-		}
-		.ant-table-thead > tr > th {
-			background: #ffffff00;
-			border-bottom: none;
-			backdrop-filter: blur(1rem);
-		}
-
-		.ant-table-tbody > tr > td {
-			border: none;
-			background: transparent;
-			// color: #fff;
-		}
-		.ant-table-tbody > tr {
-			&:hover > td {
-				background: #ffffff3a;
-			}
-		}
-		.ant-table-pagination-right {
-			padding-right: 3.5rem;
-		}
-		.operate_list {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 0 1rem;
-
-			.operate_item {
-				font-size: 1.4rem;
-				font-family: Roboto;
-				font-weight: 400;
-				color: #343579;
-				cursor: pointer;
-			}
-		}
-	}
+.allOrder_page{
+	padding: 0 !important;
+	flex: 1;
 }
+
 </style>
\ No newline at end of file
diff --git a/src/component/Pay/creditsDetail.vue b/src/component/Pay/creditsDetail.vue
index fed56e3d..41a82e5e 100644
--- a/src/component/Pay/creditsDetail.vue
+++ b/src/component/Pay/creditsDetail.vue
@@ -1,8 +1,8 @@
 <template>
-    <div class="creditsDetail_page">
-		<div class="creditsDetail_table_search">
-			<div class="creditsDetail_state">
-				<div class="creditsDetail_state_item">
+    <div class="creditsDetail_page generalModel_page">
+		<div class="generalModel_table_search">
+			<div class="generalModel_state">
+				<div class="generalModel_state_item">
 					<span>Time:</span>
 						<a-range-picker
 						class="range_picker"
@@ -20,16 +20,16 @@
 						</template>
 					</a-range-picker>
 				</div>
-				<div class="creditsDetail_state_item">
+				<div class="generalModel_state_item">
 					<span>State:</span>
 					<a-select v-model:value="currentState.value" style="width:25rem" size="large" optionFilterProp="label" :options="state" placeholder="Please select" allowClear show-search></a-select>
 				</div>
 			</div>
 
 			
-			<div class="creditsDetail_search">
+			<div class="generalModel_search">
 				<div
-					class="creditsDetail_search_item"
+					class="generalModel_search_item"
 					@click="searchcreditsDetailList()"
 				>
 					<span
@@ -38,7 +38,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="creditsDetail_table_content" ref="historyTable">
+		<div class="generalModel_table_content" ref="historyTable">
 			<a-table
 				:columns="columns"
 				:data-source="collectionList"
@@ -227,158 +227,7 @@ export default defineComponent({
 </script>
 <style lang="less">
 .creditsDetail_page {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    // min-width: 1440px;
-    position: relative;
-	display: flex;
-	flex-direction: column;
-	.creditsDetail_table_search {
-		display: flex;
-		margin-top: 2rem;
-		padding: 2rem 3.5rem 5rem 2.8rem;
-		background: #fff;
-		display: flex;
-		justify-content: flex-start;
-		align-items: center;
-		
-		.creditsDetail_search{
-			width: 20%;
-			.creditsDetail_search_item{
-				background: #343579;
-				border-color: #343579;
-				height: 4rem;
-				padding: .64rem 1.5rem;
-				font-size: 1.6rem;
-				border-radius: 2px;
-				display: inline-block;
-				color: #fff;
-				cursor: pointer;
-			}
-		}
-		.creditsDetail_state {
-			position: relative;
-			display: flex;
-			align-items: center;
-			cursor: pointer;
-			width: 80%;
-			.creditsDetail_state_item{
-				display: flex;
-				align-items: center;
-				margin-right: 5rem;
-				>span{
-					font-size: 2rem;
-					font-weight: 400;
-					color: #030303;
-					margin-right: 15px;
-					flex-shrink: 0;
-					display: block;
-					min-width: 5rem;
-					text-align: left;
-				}
-				.ant-picker-range{
-					height: 5rem;
-				}
-				.ant-select-lg{
-					font-size: 14px;
-					.ant-select-selector{
-						height: 5rem;
-						.ant-select-selection-item{
-							line-height: 5rem;
-						}
-						input{
-							line-height: 5rem;
-							height: 5rem;
-						}
-					}
-				}
-			}
-			.creditsDetail_current{
-				background: #fff;
-				width: 100%;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-			}
-			.header_user_content {
-				position: absolute;
-				border: 2px solid;
-				border-radius: 1rem;
-				overflow: hidden;
-				top: 0;
-				transform: translateY(6rem);
-				z-index: 2;
-				display: none;
-				margin-left: -2rem;
-				.username{
-					padding: 0 2rem;
-					color: #000;
-				}
-				.username:hover{
-					background: #e1e1e1;
-				}
-				&.active{
-					display: block;
-				}
-			}
-		}
-	}
-
-	.creditsDetail_table_content {
-		width: 100%;
-		// height: 100%;
-		flex: 1;
-		padding-bottom: 3rem;
-		background: #fff;
-		border-radius: 2rem;
-		overflow: hidden;
-		.ant-table {
-			background: transparent;
-		}
-
-		.ant-table-body {
-			overflow-y: auto !important;
-			-ms-overflow-style: none;
-			overflow: -moz-scrollbars-none;
-
-			&::-webkit-scrollbar {
-				width: 0 !important;
-			}
-		}
-		.ant-table-thead > tr > th {
-			background: #ffffff00;
-			border-bottom: none;
-			backdrop-filter: blur(1rem);
-		}
-
-		.ant-table-tbody > tr > td {
-			border: none;
-			background: transparent;
-			// color: #fff;
-		}
-		.ant-table-tbody > tr {
-			&:hover > td {
-				background: #ffffff3a;
-			}
-		}
-		.ant-table-pagination-right {
-			padding-right: 3.5rem;
-		}
-		.operate_list {
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			padding: 0 1rem;
-
-			.operate_item {
-				font-size: 1.4rem;
-				font-family: Roboto;
-				font-weight: 400;
-				color: #343579;
-				cursor: pointer;
-			}
-		}
-	}
+	padding: 0 !important;
+	flex: 1;
 }
 </style>
\ No newline at end of file
diff --git a/src/component/Pay/payOrder.vue b/src/component/Pay/payOrder.vue
index e95f4ef5..8bf233e3 100644
--- a/src/component/Pay/payOrder.vue
+++ b/src/component/Pay/payOrder.vue
@@ -1,6 +1,6 @@
 <template>
     <a-modal
-        class="modal_component payOrder_modal"
+        class="modal_component payOrder_modal generalModel_modal"
         v-model:visible="showPayOrder"
         :footer="null"
         width="78%"
@@ -83,33 +83,6 @@ export default defineComponent({
 });
 </script>
 <style lang="less">
-.payOrder_modal {
-    // max-width: 1200px ;
-    // max-width: 1150px ;
-    .ant-modal-content {
-        border-radius: calc(1rem * 1.2);
-        overflow: hidden;
-        .ant-modal-header {
-            background-color: #fff;
-            border-bottom: none;
-        }
-        .ant-modal-body {
-            // height: calc(65vh - 6.4rem);
-            height: calc(65rem * 1.2);
-        }
-        //进度完成字体颜色
-
-        .ant-progress-circle.ant-progress-status-success .ant-progress-text {
-            color: #000;
-        }
-        .ant-progress-circle .ant-progress-text {
-            color: rgba(0, 0, 0, 0.55);
-            font-size: calc(1.6rem * 1.2);
-        }
-    }
-}
-</style>
-<style lang="less">
 .payOrder_modal {
     .closeIcon {
         z-index: 2;
@@ -154,6 +127,8 @@ export default defineComponent({
 		}
 		.payOrder_table_content{
 			height: 100%;
+			display: flex;
+		flex-direction: column;
 		}
 	}
 }
diff --git a/src/tool/canvasDrawing.js b/src/tool/canvasDrawing.js
index 76a7fa44..c5b79fb8 100644
--- a/src/tool/canvasDrawing.js
+++ b/src/tool/canvasDrawing.js
@@ -110,28 +110,44 @@ function JScanvasMouseDown(str,e, width,patterning) {//创建线
 }
 async function exportSele(canvas,format){
 	var activeObjects = canvas.getActiveObject();
-	if(activeObjects.length == 0){
+	let data = {
+		url:'',
+		imageType:'u'
+	}
+	if(!activeObjects){
 		return
 	}
-	var exportCanvas = new fabric.Canvas(null, {
-		width: activeObjects.width,
-		height: activeObjects.height,
-		backgroundColor: "rgba(255, 255, 255)",
-	});
-	await new Promise((resolve, reject)=>{
-		activeObjects.clone((value)=>{
-			value.left = 0
-			value.top = 0
-			exportCanvas.add(value);
-			resolve()
+	if(activeObjects.type == 'image'){
+		data = {
+			url:activeObjects.getSrc(),
+			imageType:'u',
+		}
+	}else{
+		let scale = activeObjects.scaleX? activeObjects.scaleX: 1
+		var exportCanvas = new fabric.Canvas(null, {
+			width: activeObjects.width*scale,
+			height: activeObjects.height*scale,
+			backgroundColor: "rgba(255, 255, 255)",
+		});
+		await new Promise((resolve, reject)=>{
+			activeObjects.clone((value)=>{
+				value.left = 0
+				value.top = 0
+				exportCanvas.add(value);
+				resolve()
+			})
 		})
-	})
-	exportCanvas.renderAll();
-	var imgData = exportCanvas.toDataURL({
-		format: format
-	});
-	exportCanvas.dispose()
-	return imgData
+		exportCanvas.renderAll();
+		var imgData = exportCanvas.toDataURL({
+			format: format
+		});
+		data = {
+			url:imgData,
+			imageType:'b',
+		}
+		exportCanvas.dispose()
+	}
+	return data
 }
 function JScreateCheck(e){//创建对号
 	let downPoint = e.absolutePointer
diff --git a/src/tool/cookie.js b/src/tool/cookie.js
index d42913ad..db160604 100644
--- a/src/tool/cookie.js
+++ b/src/tool/cookie.js
@@ -18,8 +18,8 @@ function WriteCookie(name) {
     now.setMonth( now.getMonth() - 1 );
     // cookievalue = escape(document.myform.customer.value) + ";"
     
-    document.cookie = name + '=' + '';
-    document.cookie = "expires=" + now.toUTCString() + ";"
+    document.cookie = name + '=' + '' + ";Path=/";
+    document.cookie = "expires=" + now.toUTCString() + ";Path=/";
     // document.write("Setting Cookies : " + "name=" + cookievalue );
   }
 
diff --git a/src/tool/https.js b/src/tool/https.js
index d4419b38..8e4f2f37 100644
--- a/src/tool/https.js
+++ b/src/tool/https.js
@@ -43,6 +43,7 @@ axios.interceptors.request.use((config) => {
 
     // config.headers.Authorization = 'Bearer-eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIyIiwic3ViIjoie1wiaWRcIjoyLFwidXNlcm5hbWVcIjpcImxpcnNcIn0iLCJpYXQiOjE2NjU3NDEwODcsImlzcyI6IkRXSiIsImF1dGhvcml0aWVzIjoiW10iLCJleHAiOjE2NzQzODEwODd9.ShM9R_NNFD7oo1OvxrEgg7PFeWinOuAKkuInUCMQupp66s64Hhv8tN0Wwr83nIN4rHPqtn95wmd4msWcvaFYJA'; 
     config.headers.Authorization = getCookie('token'); 
+
     return config;
 },(error) =>{
     return Promise.reject(error);
@@ -210,8 +211,10 @@ export const Https = {
 		//查询某个时间内design点击次数
 		getDesignStatistic:`/api/inquiry/getDesignStatistic`,//拒绝审批
 
-		getTasksList:`/api/tasks/getList`,//获取档期那任务列表
-		getDesignStatistic:`/api/inquiry/getDesignStatistic`,//拒绝审批
+		getTasksList:`/api/tasks/getList`,//获取当前那任务列表
+		getTasksHistory:`/api/tasks/getHistory`,//获取所有任务列表
+		prepareForSR:`/api/python/prepareForSR`,//超分
+		
 
     },
 
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index 41a9db6e..99b0309a 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -84,7 +84,7 @@
         </header>
 	
 		<div class="homeMain_content_body">
-			<router-view/>
+			<router-view @setTask = "setTask"/>
 		</div>
 		<RobotAssist></RobotAssist>
     </div>
@@ -190,6 +190,9 @@ export default defineComponent({
 		this.getLang('')
     },
     methods: {
+		setTask(){
+			this.openTask()
+		},
         turnToNewPage(url) {
             window.open(url);
         },
@@ -245,60 +248,9 @@ export default defineComponent({
             document.removeEventListener("click", this.closeShowOperateContent);
         },
 
-        //打开绑定邮箱弹窗
-        showBindEmailModal() {
-            this.bindEmailVisible = true;
-        },
 
-        emailNextStepFun() {
-            if (!isEmail(this.email)) {
-                message.info(this.t('Header.jsContent1'));
-                return;
-            }
-            let data = {
-                email: this.email,
-                operationType: "BIND_MAILBOX",
-            };
-            const hide = message.loading("loading", 0);
-            Https.axiosPost(Https.httpUrls.accountSendEmail, data)
-                .then((rv) => {
-                    if (rv) {
-                        this.bindEmailStep = 2;
-                        (this.emailCode = ["", "", "", "", "", ""]),
-                            this.createTimer();
-                        hide();
-                        message.success(this.t('Header.jsContent2'));
-                    }
-                })
-                .catch((res) => {
-                    hide();
-                });
-        },
+    
 
-        //绑定邮箱的上一步
-        emailLastStepFun() {
-            this.bindEmailStep = 1;
-            this.email = "";
-            (this.emailCode = ["", "", "", "", "", ""]), this.clearTimer();
-        },
-
-        //创建定时器
-        createTimer() {
-            this.timer = setInterval(() => {
-                this.time--;
-                if (!this.time) {
-                    clearInterval(this.timer);
-                }
-            }, 1000);
-        },
-
-        //清除定时器
-        clearTimer() {
-            this.time = 60;
-            if (this.timer) {
-                clearInterval(this.timer);
-            }
-        },
 		//查看订单
 		orderForm(){
 			let payOrder = this.$refs.payOrder
@@ -315,40 +267,19 @@ export default defineComponent({
 				await Https.axiosGet(Https.httpUrls.trialUserLogout,).then((rv) => {
 					Https.axiosPost(Https.httpUrls.accountLogout, data).then((rv) => {
 						this.$router.replace("/login");
-						WriteCookie("token");
+						// WriteCookie("token");
 					});
 				})
 			}else{
 				await Https.axiosPost(Https.httpUrls.accountLogout, data).then((rv) => {
-					WriteCookie("token");
+					// WriteCookie("token");
 				});
 				this.$router.replace("/login");
 			}
+			WriteCookie("token");
 			// window.location.reload()
             
         },
-
-        //绑定邮箱
-        submitBindEmail(emailVerifyCode) {
-            let data = {
-                userEmail: this.email,
-                userId: this.userInfo.userId,
-                emailVerifyCode: emailVerifyCode,
-            };
-            Https.axiosPost(Https.httpUrls.accountBindEmail, data).then(
-                (rv) => {
-                    if (rv) {
-                        this.userInfo.email = this.email;
-                        setCookie("userInfo", JSON.stringify(this.userInfo));
-                        (this.bindEmailVisible = false),
-                            (this.bindEmailStep = 1);
-                        this.clearTimer();
-                        this.emailCode = ["", "", "", "", "", ""];
-                    }
-                }
-            );
-        },
-
         //判断是否登录
         accountIsLogin(userInfo) {
             let data = {
diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue
index 2850959f..95f733bd 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/src/views/HomeView/HomeView.vue
@@ -191,7 +191,7 @@
 		<CollectionModal ref="collectionModal" @finishCollection="finishCollection()"></CollectionModal>
 		<DesignDetail ref="designDetail" @finishRedesign="finishRedesign"></DesignDetail>
 		<ExportNewCoolection id="exportNewCoolection"></ExportNewCoolection>
-		<ExportModel ref="ExportModel"></ExportModel>
+		<ExportModel ref="ExportModel" @setTask="setTask"></ExportModel>
 		<!-- 导出缩略图的蒙层 start-->
 		<div class="mark_loading" v-show="isShowMark">
 			<a-spin size="large" />
@@ -252,7 +252,7 @@ export default defineComponent({
 		// RobotAssist,
 		draggable
 	},
-	setup() {
+	setup(props,{emit}) {
 		const store = useStore();
 		let likeDesignCollectionList: any = computed(() => {
 			return store.state.HomeStoreModule.likeDesignCollectionList;
@@ -408,7 +408,7 @@ export default defineComponent({
 							if(days < 30){
 								setTimeout(() => {
 									let text = {
-										str:`${this.t('HomeView.jsContent4',{days:1,hours:2})}<a href="https://code-create.com.hk/aida" target="_blank">${this.t('HomeView.jsContent8')}</a>`,
+										str:`${this.t('HomeView.jsContent4',{days:days,hours:hours})}<a href="https://code-create.com.hk/aida" target="_blank">${this.t('HomeView.jsContent8')}</a>`,
 										title:`${this.t('HomeView.jsContent7')}`,
 									}
 									this.affiche(text)
@@ -1009,7 +1009,6 @@ export default defineComponent({
 		exportModel(){
 			let exportModel:any = this.$refs.ExportModel
 			exportModel.init()
-			
 		},
 
 		//打开图片详情
@@ -1047,6 +1046,10 @@ export default defineComponent({
 				});
 			}
 		},
+		setTask(){
+			this.$emit('setTask')
+			// this.exportModel()
+		},
 	},
 });
 </script>