Merge branch 'feature_修改keyword' of elab-damai-h5/h5-webgl-program into develop

src/components/newBottomCom/viewMask/viewMask.vue

@@ -664,7 +664,7 @@
 					"denoising":0.9,
 					image:this.shottingImg,
 					styleImage:imgUrl,
-					keyword: "replicate",
+					keyword: "elabSd",
 					model: this.modelType==1? "lucataco/ssd-1b" : 'catio-apps/controlnet-interior-design',
 				};
 				if(this.modelType==2){//精准设计
@@ -957,7 +957,10 @@
 						this.loadingMsg = '启动中';
 					}
 					this.count = this.count + 1;
-					this.getOutPicture();
+					// this.getOutPicture();
+                    setTimeout(()=>{
+                        this.getOutPicture();
+                    },1000)
 				}else if(single.status=='processing'){
 					let random = single.progress || 0;
 					if(random >= 100){
@@ -965,7 +968,10 @@
 					}
 					this.myloading = true;
 					this.loadingMsg = '生成中…' + parseInt(random) + '%';
-					this.getOutPicture();
+					// this.getOutPicture();
+                    setTimeout(()=>{
+                        this.getOutPicture();
+                    },1000)
 				}else if(single.status=='succeeded'){
 					this.myloading = true;
 					this.loadingMsg = '生成中…100%';

src/components/newBottomCom/viewStyle/viewStyle.vue

@@ -312,7 +312,7 @@
 					height: this.imageHeight,
 					width: this.imageWidth,
 					"moduleType": "simple_and_quiet",
-					"keyword":"img_2_img",
+					"keyword":"elabSd",
 					"steps":50,
 					"sampler":"DDIM",
 					"controlNetSessionHash":session_hash,

src/components/newQCCom/viewMask/viewMask.vue

@@ -713,7 +713,7 @@
 					"denoising":0.9,
 					image:this.shottingImg,
 					styleImage:imgUrl,
-					keyword: "replicate",
+					keyword: "elabSd",
 					model: this.modelType==1? "lucataco/ssd-1b" : 'catio-apps/controlnet-interior-design',
 				};
 				if(this.modelType==2){//精准设计
@@ -1006,7 +1006,10 @@
 						this.loadingMsg = '启动中';
 					}
 					this.count = this.count + 1;
-					this.getOutPicture();
+					// this.getOutPicture();
+                    setTimeout(()=>{
+                        this.getOutPicture();
+                    },1000)
 				}else if(single.status=='processing'){
 					let random = single.progress || 0;
 					if(random >= 100){
@@ -1014,7 +1017,10 @@
 					}
 					this.myloading = true;
 					this.loadingMsg = '生成中…' + parseInt(random) + '%';
-					this.getOutPicture();
+					// this.getOutPicture();
+                    setTimeout(()=>{
+                        this.getOutPicture();
+                    },1000)
 				}else if(single.status=='succeeded'){
 					this.myloading = true;
 					this.loadingMsg = '生成中…100%';

src/components/newQCCom/viewStyle/viewStyle.vue

@@ -312,7 +312,7 @@
 					height: this.imageHeight,
 					width: this.imageWidth,
 					"moduleType": "simple_and_quiet",
-					"keyword":"img_2_img",
+					"keyword":"elabSd",
 					"steps":50,
 					"sampler":"DDIM",
 					"controlNetSessionHash":session_hash,

src/mixins/createImgHandle.js

@@ -134,7 +134,7 @@ export default {
 				// styleImage:imgUrl,
 				// keyword: "zhiqite",
                 // model: 'controlnet',
-                keyword: "replicate",
+                keyword: "elabSd",
 				model: 'lucataco/ssd-1b',
 			};
 			let result = await this.prevHandle(parmas);