zjs_project 1 year ago
parent
commit
b01313b5d2

+ 10 - 4
src/components/newBottomCom/viewMask/viewMask.vue

@@ -23,7 +23,7 @@
 				inputBase64Url: "",
 				taskId: "", // 图生图任务ID
 				img2imgTimer: null,
-				imageWidth: 320,
+				imageWidth: 750,
 				imageHeight: 448,
 				showAIFlag:false,//继续生成状态切换标志
 				checked:false,
@@ -568,7 +568,10 @@
 				
 				const prompt = this.styleList[this.curStyleIndex].prompt;
 				const noPromot = this.styleList[this.curStyleIndex].negativePrompt;
-				
+				let unit = 768 / window.screen.width;
+				this.imageWidth = window.screen.width * unit;
+				this.imageHeight = this.$parent.canvasHeight * unit;
+				// this.$parent.canvasHeight = window.screen.height - (208 * unit);
 				var parmas = {
 					negativePrompt: noPromot,
 					prompt: prompt,
@@ -593,7 +596,8 @@
 				let that = this;
 				if (res.success && res.single) {
 					if(typeof(res.single)=="object"){
-						this.showToast(`${res.single.queueCount | 0}人排队中,预计等待${Math.round(Math.random() * 20)}秒`)
+						let cot = res.single.queueCount || 1;
+						this.showToast("正有"+cot+"人排队,预计等待"+cot*25+"秒");
 						this.aiImage = "";
 						this.aiFlag = false;
 						this.clearInterval();
@@ -671,6 +675,7 @@
 								this.$store.dispatch('setAiData', cpAiData)
 							}
 							this.clearInterval();
+							this.$refs.carousel.next();
 						} else {
 							if (!res.success) {
 								this.showToast("渲染失败,请重试")
@@ -690,7 +695,8 @@
 							}
 						}
 					} else {
-						this.showToast(`${res.single.queueCount | 0}人排队中,预计等待${Math.round(Math.random() * 20)}秒`)
+						let cot = res.single.queueCount || 1;
+						this.showToast("正有"+cot+"人排队,预计等待"+cot*25+"秒");
 						this.aiImage = "";
 						this.aiFlag = false;
 						this.clearInterval();

+ 5 - 1
src/pages/webgl_rxdz/webgl_rxdz.vue

@@ -376,15 +376,19 @@
 						z:-spaceObj.centerY/100,
 					}
 					oldUp = camera.up;//俯视状态
-					newUp = camera.up
+					newUp = new THREE.Vector3(0,0,-1);
 					// that.cameraLastPosition = cameraNewPosition;//记录下上一次摄像头位置
 					// that.controlLastPosition = targetNewPosition;//记录下上一次观察点位置
+					if(cameraNewPosition.x<0){
+						cameraNewPosition.x = 0;
+					}
 				}
 				console.warn("**moveMeshCenter***",isUserContorl,spaceObj,JSON.stringify(camera.position),JSON.stringify(controls.target)
 				,cameraNewPosition,targetNewPosition,JSON.stringify(camera.up))
 				tweenCamera(camera.position,controls.target,cameraNewPosition,targetNewPosition,oldUp,newUp,1000);
 				setTimeout(()=>{
 					that.showLables = true;
+					camera.up = new THREE.Vector3(0,1,0);
 					// updateLables();
 				},1001);//动画结束后回复原始状态
 			}