fix

2024-06-28 17:34:28 +08:00
parent ade36d899a
commit 8e694ce2c4
15 changed files with 210 additions and 66 deletions
--- a/src/component/HomePage/ColorboardUpload.vue
+++ b/src/component/HomePage/ColorboardUpload.vue
@@ -130,7 +130,10 @@
 								<img src="#" :title="pantongNameList[index]">
 							</div>
 						</div>
-						<div class="started_btn upload_color_btn" v-show="selectColorList.length>0" @click="()=>isSelectSuccessively = !isSelectSuccessively">{{isSelectSuccessively?$t('ColorboardUpload.SelectSuccessively'):$t('ColorboardUpload.SelectSeparately')}}</div>
+						<div class="upload_color_btn" v-show="selectColorList.length>0">
+							<span>{{$t('ColorboardUpload.SelectSuccessively')}}</span>
+							<a-switch :checked="isSelectSuccessively" @click="()=>isSelectSuccessively = !isSelectSuccessively" checked-children="ON" un-checked-children="OFF"/>
+						</div>
 					</div>
                </div>
 				<div class="right_content_line">
@@ -1025,6 +1028,14 @@ export default defineComponent({
 					transform: translateX(-50%);
 					bottom: 0;
 					white-space: nowrap;
+					display: flex;
+					align-items: center;
+					height: 4rem;
+					font-weight: 600;
+					font-size: 1.8rem;
+					>span{
+						margin-right: 1rem;
+					}
 				}
 				.color_setting_block{
 					margin: auto;
--- a/src/component/HomePage/Material.vue
+++ b/src/component/HomePage/Material.vue
@@ -38,12 +38,12 @@
            <div class="my_material_content">
             
                <div class="material_content_body scroll_style">
-					<div v-for="item,index in imgList" :key="item" class="content_img_item" :class="[ item?.checked ? 'active':''  , selectCode == 'Moodboard' ? 'moodb':''  ]" >
+					<div v-for="item,index in imgList" :key="item" class="content_img_item" :class="[ item?.libraryChecked ? 'active':''  , selectCode == 'Moodboard' ? 'moodb':''  ]" >
 						<img :src="item?.imgUrl" @click.stop="selectImgItem(item)">
 						<sketchCategory v-if="selectCode == 'Sketchboard'" :disignTypeList="disignTypeList" :generateList="imgList" :item="item" :isSetSketchCategory="true" @upTypeSucced='upTypeSucced'></sketchCategory>
 						<!-- <printCategory v-if="selectCode == 'Printboard'" :disignTypeList="disignTypeList" :generateList="imgList" :item="item" :isSetSketchCategory="true"></printCategory> -->
 						<!-- <div v-if="selectCode == 'Sketchboard' || selectCode == 'Printboard'" class="pin_block">
-							<a-checkbox v-model:checked="item.pin">{{ $t('Material.PIN') }}</a-checkbox>
+							<a-checkbox v-model:libraryChecked="item.pin">{{ $t('Material.PIN') }}</a-checkbox>
 						</div> -->
 					</div>
 					<div v-show="total > imgList?.length && total != 0" class="material_content_list_loding" v-observe>
@@ -205,7 +205,7 @@ export default defineComponent({
 					if(newVal.findIndex((newValItem:any) =>newValItem.id == item.id) == -1){
 						this.imgList.forEach((i:any)=>{
 							if(i.id == item.id){
-								i.checked = false
+								i.libraryChecked = false
 							}
 						})
 					}
@@ -219,7 +219,7 @@ export default defineComponent({
 					if(newVal.findIndex((newValItem:any) =>newValItem.id == item.id) == -1){
 						this.imgList.forEach((i:any)=>{
 							if(i.id == item.id){
-								i.checked = false
+								i.libraryChecked = false
 							}
 						})
 					}
@@ -234,7 +234,7 @@ export default defineComponent({
 					if(newVal.findIndex((newValItem:any) =>newValItem.id == item.id) == -1){
 						this.imgList.forEach((i:any)=>{
 							if(i.id == item.id){
-								i.checked = false
+								i.libraryChecked = false
 							}
 						})
 					}
@@ -261,14 +261,14 @@ export default defineComponent({
 		setUseGenerate(arr:any){
 			let parent:any = this.$parent
 			this.imgList.forEach((item:any) => {
-				item.checked = false
+				item.libraryChecked = false
 			});
 			if(parent.isUseGenerate){
 			}else{
 				arr.forEach((item:any) => {
 					this.imgList.forEach((imgListItem:any) => {
 						if(item.id == imgListItem.id){
-							imgListItem.checked = true
+							imgListItem.libraryChecked = true
 						}
 					});
 				});
@@ -281,9 +281,10 @@ export default defineComponent({
 				imgData.categoryValue = imgData.level2TypeEnum.name
 				imgData.category = imgData.level2TypeEnum.value
 			}
+			imgData.libraryChecked = true
+			imgData.like = true
 			if(parent.isUseGenerate){
 				this.setUseGenerate([])
-				imgData.checked = true
 				let obj = {
 					imgId : imgData.id,
 					imgUr: imgData.imgUrl,
@@ -370,7 +371,7 @@ export default defineComponent({
 							arr.forEach((v:any)=>{
 								if(item.id == v.id){
 									item.id_ = v.id_?v.id_:GO.id++
-									item.checked = true
+									item.libraryChecked = true
 									item.pin = v.pin
 								}
 							})
--- a/src/component/HomePage/PrintboardUpload.vue
+++ b/src/component/HomePage/PrintboardUpload.vue
@@ -123,13 +123,13 @@
 						<img v-lazy="item.imgUrl">
 						<sketchCategory :disignTypeList="printCatecoryList" :generateList="printboardList" :isSpread="true" :item="item" ></sketchCategory>

-						<!-- <div
+						<div
 							class="delete_like_file_block left1"
 							:class="[driver__.driver?'hideEvents':'']"
 						>
-							<i v-if="!item.like" class="fi fi-rr-heart" @click.stop="likeFile(item,'like')"></i>
+							<i v-if="!item.like || item.libraryChecked" class="fi fi-rr-heart" @click.stop="likeFile(item,'like')"></i>
 							<i v-else class="fi fi-sr-heart" :adminLike="!!item.like" @click.stop="likeFile(item,'noLike')"></i>
-						</div> -->
+						</div>
 						<div class="delete_like_file_block left"  :class="[driver__.driver?'hideEvents':'']">
 							<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(index)"></i>
 						</div>
--- a/src/component/HomePage/SketchboardUpload.vue
+++ b/src/component/HomePage/SketchboardUpload.vue
@@ -140,13 +140,13 @@
 						<img v-lazy="item.imgUrl">
 						<sketchCategory :disignTypeList="sketchCatecoryList" :generateList="sketchboardList" :isSpread="true" :item="item" :driver__="driver__.driver"></sketchCategory>

-						<!-- <div
+						<div
 							class="delete_like_file_block left1"
 							:class="[driver__.driver?'hideEvents':'']"
 						>
 							<i v-if="!item.like" class="fi fi-rr-heart" @click.stop="likeFile(item,'like')"></i>
 							<i v-else class="fi fi-sr-heart" :adminLike="!!item.like" @click.stop="likeFile(item,'noLike')"></i>
-						</div> -->
+						</div>
 						<div class="delete_like_file_block left"  :class="[driver__.driver?'hideEvents':'']">
 							<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(index)"></i>
 						</div>
@@ -462,6 +462,35 @@ export default defineComponent({
 				this.store.commit("setSketchboardFile", this.fileList);
 			}
        },
+		likeFile(item:any,str:string){
+			if(str == 'like'){
+				let data = {
+					generateDetailId:item.id,
+					level1Type:"Sketchboard",
+					level2Type: item.categoryValue?item.categoryValue:item.level2Type,
+					gender:this.workspace.sexEnum.value,
+					timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
+				}
+				Https.axiosPost(Https.httpUrls.generateLike, data).then(
+					(rv) => {
+						item.like = true
+					}
+				).catch(res=>{
+				});
+			}else{
+				let data = {
+					generateDetailId:item.id,
+					timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
+				}
+				Https.axiosGet(Https.httpUrls.generateDislike, {params:data}).then(
+					(rv) => {
+						item.like = false
+					}
+				).catch(res=>{
+				});
+			}
+
+		},
        recollection() {
 			this.useGenerate = {
 				imgId : '',
--- a/src/component/HomePage/productImg.vue
+++ b/src/component/HomePage/productImg.vue
@@ -48,6 +48,19 @@
 							
 						</div>
 					</div>
+					<div class="productImg_content_item_title productImg_content_item_title_similarity">
+						<span>{{$t('ProductImg.Similarity')}}</span>
+					</div>
+					<div>
+						<input type="text" v-model="similarity">
+						<a-slider id="system_silder"
+							v-model:value="similarity"
+							@afterChange="setSimilarity"
+							:tooltipVisible="false"
+							:step=".05"
+						>
+						</a-slider>
+					</div>
 					<div class="productImg_content_item_title">{{$t('ProductImg.SelectCollection')}}</div>
 					<div class="productImg_content_item_imgBox generalScroll" v-mousewheel>
 						<div class="content_item_imgBox_itemImg" v-for="item in selectList[productimgMenu.value]" :key="item.id" >
@@ -112,27 +125,34 @@
 								{{$t('Generate.Close')}}
 							</div>
 						</div>
-						<!-- <div class="input_clear started_btn" @click="clearPrductimg">{{$t('ProductImg.Clear')}}</div> -->
 					</div>
 				</div>
 				<div class="productImg_right">
 					<div class="productImg_content_item_title">{{$t('ProductImg.GenerateProduct')}}</div>
 					<div class="productImg_right_item_box generalScroll" v-mousewheel>
 						<div class="productImg_right_item" v-for="item,index in generateList[productimgMenu.value]" :key="item">
-							<img :src="item.url" alt="">
-							<div class="productImg_right_item_like">
-								<i class="fi fi-rr-heart" @click.stop="likeFile(item,'like',index)"></i>
+							<div class="productImg_right_item_imgBox" v-if="item.status != 'Success'">
+								<img class="loadingImg" src="@/assets/images/homePage/loading.gif" alt="">
 							</div>
-							<div class="productImg_right_item_scale iconLeft">
-								<i class="fi fi-bs-expand-arrows-alt" @click.stop="setScaleImage(generateList[productimgMenu.value],index)"></i>
-							</div>
-							<div class="productImg_right_item_menu iconLeft">
-								<i class="fi fi-rr-circle-ellipsis" @click.stop="setMenuShow(item)"></i>
-								<ul v-show="item.menuShow">
-									<li v-for="menuItem,index in productimgMenuList" v-show="index != 0" @click.stop="setMenu(menuItem,item)" :key="menuItem.value">{{ menuItem.label }}</li>
-								</ul>
+							<div class="productImg_right_item_imgBox" v-else>
+								<img :src="item.url" alt="">
+								<div class="productImg_right_item_like">
+									<i class="fi fi-rr-heart" @click.stop="likeFile(item,'like',index)"></i>
+								</div>
+								<div class="productImg_right_item_scale iconLeft">
+									<i class="fi fi-bs-expand-arrows-alt" @click.stop="setScaleImage(generateList[productimgMenu.value],index)"></i>
+								</div>
+								<div class="productImg_right_item_menu iconLeft">
+									<i class="fi fi-rr-circle-ellipsis" @click.stop="setMenuShow(item)"></i>
+									<ul v-show="item.menuShow">
+										<li v-for="menuItem,index in productimgMenuList" v-show="index != 0" @click.stop="setMenu(menuItem,item)" :key="menuItem.value">{{ menuItem.label }}</li>
+									</ul>
+								</div>
 							</div>
 						</div>
+						<div class="mark_loading" v-show="isShowMark">
+							<a-spin size="large" />
+						</div>
 					</div>
 					<div class="productImg_content_item_title productImg_right_titleBtn">
 						{{$t('ProductImg.SelectedProduct')}}
@@ -158,9 +178,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="mark_loading" v-show="isShowMark">
-			<a-spin size="large" />
-		</div>
+		
 		<ExportModel ref="ExportModel" @setTask="setTask"></ExportModel>
 		<scaleImage ref="scaleImage"></scaleImage>
 	</a-modal>
@@ -206,6 +224,7 @@ export default defineComponent({
 			selectProductimgList:[],
 			generateList:{},
 			likeList:[],
+			similarity:0,
 		})
 		let productimgMenuList = ref([
 			{
@@ -265,7 +284,6 @@ export default defineComponent({
 		}
 		let cleardata = ()=>{
 		    productImg.value = false
-			productImgData.isShowMark = false
 			productImgData.likeList = []
 			productImgData.generateList = {}
 			productimgMenu.value = productimgMenuList.value[0]
@@ -369,7 +387,8 @@ export default defineComponent({
 				"isLike": 0,
 				"taskId": "",
 				"toProductImageRecordId": 0,
-				"url": ""
+				"url": "",
+				imageStrength:.3
 			}
 			if(productImgData.fileList[productimgMenu.value.value]){
 				productImgData.fileList[productimgMenu.value.value].forEach((item:any)=>{
@@ -411,15 +430,23 @@ export default defineComponent({
 			if(productimgMenu.value.value == 'Relight'){
 				url = Https.httpUrls.relight
 			}
+			productImgData.isShowMark = true
 			Https.axiosPost(url, data).then(
                (rv) => {
+					productImgData.isShowMark = false
 					let arr:any = []
+					if(!productImgData.generateList[productimgMenu.value.value]){
+						productImgData.generateList[productimgMenu.value.value] = []
+					}
 					rv.forEach((item:any)=>{
 					  arr.push(item.taskId)  
 					})
+					
+					productImgData.generateList[productimgMenu.value.value].push(...rv)
 					setPrductimg(arr)
                }
            ).catch(res=>{
+				productImgData.isShowMark = false
 				productImgData.isProductimg = false
 				clearInterval(remPrductimgTime)
 				productImgData.remProductimg= false
@@ -427,7 +454,6 @@ export default defineComponent({
 		}
 		let generateProceedList:any = []
 		let setPrductimg = (dataList:any)=>{
-			
 			let data = dataList
 			let dataNum = dataList.length
 			let state = true
@@ -447,10 +473,15 @@ export default defineComponent({
 							rv.forEach((element:any) => {
 								if(element.status == 'Success'){
 									element.imgUrl = element.url
-									if(!productImgData.generateList[productimgMenu.value.value]){
-										productImgData.generateList[productimgMenu.value.value] = []										
-									}
-									productImgData.generateList[productimgMenu.value.value].unshift(element)
+									// if(!productImgData.generateList[productimgMenu.value.value]){
+									// 	productImgData.generateList[productimgMenu.value.value] = []										
+									// }
+									let index = productImgData.generateList[productimgMenu.value.value].findIndex((obj:any) => obj.taskId === element.taskId);
+									productImgData.generateList[productimgMenu.value.value][index] = element
+									// productImgData.generateList[productimgMenu.value.value].unshift(element)
+								}else if(element.status == 'Fail'){
+									let index = productImgData.generateList[productimgMenu.value.value].findIndex((obj:any) => obj.taskId === element.taskId);
+									productImgData.generateList[productimgMenu.value.value].splice(index,1)
 								}
 								data = data.filter((item:any) => item !== element.taskId);
 							});
@@ -522,9 +553,10 @@ export default defineComponent({
 			generalIsMenuShow = {}
 			document.removeEventListener('click',removeMenuShow)
 		}
-		let clearPrductimg = ()=>{
+		let setSimilarity = ()=>{

 		}
+		
 		//超分
 		let setTask = (data:any)=>{
 			emit('setTask',data)
@@ -555,7 +587,7 @@ export default defineComponent({
 			setScaleImage,
 			setMenu,
 			setMenuShow,
-			clearPrductimg,
+			setSimilarity,
 			setTask,
        };
    },
@@ -655,6 +687,9 @@ export default defineComponent({
 					font-weight: 500;
 				}
 			}
+			&.productImg_content_item_title_similarity{
+				// margin-bottom: 8rem;
+			}
 		}
 		.productImg_content_item_intro{
 			font-size: 1.4rem;
@@ -765,12 +800,23 @@ export default defineComponent({
 				border-radius: 2rem;
 				margin-bottom: 2%;
 				padding: 1rem 1.5rem;
+				position: relative;
+				.mark_loading{
+					position: absolute
+				}
 				.productImg_right_item{
 					height: 100%;
 					padding: 1rem 0;
 					margin-right: 1rem;
 					position: relative;
 					background: #fff;
+					.productImg_right_item_imgBox{
+						height: 100%;
+						.loadingImg{
+							width: 14rem;
+							object-fit: contain;
+						}
+					}
 					img{
 						height: 100%;
 					}