From 4aa108052675b4c7ad8e7a9bee28014d84e7fb51 Mon Sep 17 00:00:00 2001
From: WangXiaoDong <1627315083@qq.com>
Date: Sun, 21 Jan 2024 14:47:41 +0800
Subject: [PATCH] fix

---
 src/assets/style/style.css          | 20 ++++++++++++++++++++
 src/assets/style/style.less         | 21 +++++++++++++++++++++
 src/component/HomePage/Generate.vue | 15 +++++++++++----
 src/tool/https.js                   |  4 ++++
 4 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/src/assets/style/style.css b/src/assets/style/style.css
index decd4e67..ff737d60 100644
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -954,4 +954,24 @@ i {
   display: flex;
   align-items: center;
   justify-content: center;
+  flex-direction: column;
+}
+.mark_loading .mark_loading_text {
+  text-align: center;
+  font-size: 1.6rem;
+}
+.mark_loading .mark_loading_text div {
+  margin-top: 10px;
+}
+.mark_loading .mark_loading_text div span {
+  font-size: 1.8rem;
+  margin: 0 5px;
+  color: red;
+}
+.mark_loading .mark_loading_text .mark_loading_btn {
+  border: 2px solid;
+  display: inline-block;
+  padding: 0 20px;
+  border-radius: 10px;
+  cursor: pointer;
 }
diff --git a/src/assets/style/style.less b/src/assets/style/style.less
index 398b1cc0..142ad6cb 100644
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -1042,4 +1042,25 @@ i{
     display: flex;
     align-items: center;
     justify-content: center;
+	flex-direction: column;
+	.mark_loading_text{
+		text-align: center;
+		font-size: 1.6rem;
+		div{
+			margin-top: 10px;
+			span{
+				font-size: 1.8rem;
+				margin: 0 5px;
+				color: red;
+				
+			}
+		}
+		.mark_loading_btn{
+			border: 2px solid;
+			display: inline-block;
+			padding: 0 20px;
+			border-radius: 10px;
+			cursor: pointer;
+		}
+	}
 }
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index 5bcbaa74..37f83db5 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -173,11 +173,16 @@
 				</div>
 
             </div>
+			<div class="mark_loading" v-show="!loadingShow">
+			<a-spin size="large" />
+			<div class="mark_loading_text">
+				<div>您现在排队人数为<span>0</span>人</div>
+				<div class="mark_loading_btn">取消</div>
+			</div>
+		</div>
         </div>
 		<scaleImage ref="scaleImage"></scaleImage>
-		<div class="mark_loading" v-show="loadingShow">
-			<a-spin size="large" />
-		</div>
+		
     </div>
 </template>
 <script lang="ts">
@@ -524,13 +529,15 @@ export default defineComponent({
 				level1Type:this.upload.level1Type,
 				level2Type:'',
 				text:this.searchPictureName,
+				userId:83,
 				timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
 				version:1,//为1就是Print
 				gender:'',
 			}
 			this.loadingShow = true
-			Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
+			Https.axiosPost(Https.httpUrls.generatePrepare, data).then(
                 (rv) => {
+					console.log(rv)
 					if(rv){
 						this.fileList = []
 						let arr
diff --git a/src/tool/https.js b/src/tool/https.js
index 72714883..94689480 100644
--- a/src/tool/https.js
+++ b/src/tool/https.js
@@ -173,6 +173,10 @@ export const Https = {
 		
 		workspaceList:`${httpIp}/api/workspace/list`,
         sketchAndPrintGenerate:'/api/generate/sketchAndPrint',//sketchGenerate生成图片
+
+        generatePrepare:'/api/generate/prepare',//开始生成generate图片
+        generateStopWaiting:'/api/generate/stopWaiting',//取消生成
+        generateResult:'/api/generate/result',//获取生成结果
 		generateLike:'/api/generate/like',//喜欢ganerate图片
 		generateDislike:'/api/generate/dislike',//喜欢ganerate图片
         elementUpload:`/api/element/upload`,//上传图片