From 8585aa790730892be434d997a6149dbcb94a3712 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Mon, 18 Dec 2023 13:05:51 +0800
Subject: [PATCH] fix

---
 src/assets/style/style.css                   |  2 +-
 src/assets/style/style.less                  |  9 ++-
 src/component/HomePage/Generate.vue          | 11 ++-
 src/component/HomePage/SketchboardUpload.vue |  2 +
 src/component/HomePage/layoutMobile.vue      | 75 +++++++++++++++++---
 src/component/LibraryPage/setLabel.vue       | 10 +--
 src/lang/en.ts                               |  6 +-
 src/views/LibraryPage.vue                    |  8 +--
 src/views/trialApproval.vue                  |  5 +-
 9 files changed, 98 insertions(+), 30 deletions(-)

diff --git a/src/assets/style/style.css b/src/assets/style/style.css
index 40806d2a..4cf771d5 100644
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -672,7 +672,7 @@ li {
 i {
   font-size: 1.4rem;
 }
-.ant-modal-close-x {
+.models_placement_component .ant-modal-close-x {
   width: 100%;
   height: 100%;
 }
diff --git a/src/assets/style/style.less b/src/assets/style/style.less
index e831e6e6..7ede22d7 100644
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -764,10 +764,13 @@ ul,li{
 i{
 	font-size: 1.4rem;
 }
-.ant-modal-close-x{
-	width: 100%;
-	height: 100%;
+.models_placement_component{
+	.ant-modal-close-x{
+		width: 100%;
+		height: 100%;
+	}
 }
+
 //设计input和上传按钮样式
 .collection_modal_body,.design_detail_modal_component,.library_page{
 	.input_box{
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index 08dab46d..02c045b8 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -301,6 +301,8 @@ export default defineComponent({
                 type1: "generate",
                 type2: prop.msg,
             },
+			workspaceCom:{}
+
         };
     },
     mounted() {
@@ -314,6 +316,9 @@ export default defineComponent({
 		let isTest:any = getCookie('isTest')
         this.isTest =JSON.parse(isTest)|| ''
         this.uploadUrl = getUploadUrl();
+		this.workspaceCom = computed(()=>{
+			return  this.store?.state?.Workspace?.workspace
+		})
 		this.workspace = this.store.state.Workspace.workspace
 		this.$emit('generateCheckbox',this.checkbox[0].type)
     },
@@ -330,7 +335,11 @@ export default defineComponent({
 				}
 				
 			}
-		}
+		},
+		workspaceCom(newVal,oldVal){
+			this.workspace = newVal
+			this.upload.gender = newVal.sexEnum.name
+		},
 	},
     computed: {
         getSketchLabel(value: any) {
diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue
index 9677eae5..190677b5 100644
--- a/src/component/HomePage/SketchboardUpload.vue
+++ b/src/component/HomePage/SketchboardUpload.vue
@@ -681,6 +681,8 @@ export default defineComponent({
 				version:1,//为1就是Print
 				gender:this.workspace.sex,
 			}
+			console.log(data);
+			
 			if(generateType == 'image'){
 				if(generage?.collectionElementid){
 					data.text = ''
diff --git a/src/component/HomePage/layoutMobile.vue b/src/component/HomePage/layoutMobile.vue
index 7ccd1e81..496ccec1 100644
--- a/src/component/HomePage/layoutMobile.vue
+++ b/src/component/HomePage/layoutMobile.vue
@@ -18,17 +18,17 @@
 						<div class="layout_title">{{ $t('layout.MoodBoardDesign') }}</div>
 					</div>
 				</div>
-				<div class="collection_closeIcon" @click.stop="cancelDsign()">
+				<div class="collection_closeIcon" @touchstart.stop="cancelDsign()">
 					<i class="fi fi-rr-cross-small"></i>
 				</div>
 				<div class="layout_nav">
-					<div v-for="item,index in layoutList" :key="item" :class="{active:item.setPitch}" @click="setpitch(item,index)">
+					<div v-for="item,index in layoutList" :key="item" :class="{active:item.setPitch}" @touchstart.stop="setpitch(item,index)">
 						<img :src="item.imgUrl">
 					</div>
 				</div>
 				<div class="layout_centent" :class="{active:flex_direction}" id="layoutCentent">
-					<div v-for="item,index in layoutList" :key="item" :class="moodbClassName[index]" class="modal_imgItem" v-layout="index" @click="setpitch(item,index)" ref="content" >
-						<img crossOrigin="anonymous" :src="item.imgUrl" draggable="false" v-modelImg> 
+					<div v-for="item,index in layoutList" :key="item" :class="moodbClassName[index]" class="modal_imgItem" v-layout="index" @touchstart="setpitch(item,index)" ref="content" >
+						<img crossOrigin="anonymous" :src="item.imgUrl" :style="{'zoom':item.zoom}" draggable="false" v-modelImg> 
 						<ul v-show="item.setPitch" class="layout_btn" >
 							<li class="layout_btn_top" v-compile.stop="'top'"></li>
 							<li class="layout_btn_bottom" v-compile.stop="'bottom'"></li>
@@ -68,12 +68,16 @@
 						</div>
 					</div>
 				</div>
-				<!-- <div class="layout_right">
+				<div class="layout_right">
 					<div class="layout_right_text">
 						{{ $t('DesignPrintOperation.Scale') }}
 					</div>
-					<input type="text">
-				</div> -->
+					<a-slider
+						v-model:value="moodItemScale"
+						@change="setMoodItemScale"
+					>
+					</a-slider>
+				</div>
 				<!-- <div class="layout_right">
 					<div v-for="item,index in moodbList" class="layout_left_items" @click="setmoodb(item)">
 						<div v-for="clasitem,clasindex in item" :class="clasitem" class="layout_left_item">
@@ -132,6 +136,7 @@ export default defineComponent({
 		let layoutList:any = ref([])
 		const content = ref<HTMLElement | null>(null);
 		let loadingShow = ref(false)
+		let moodItemScale = ref(0)
         return {
             layout,
             templateFileList,
@@ -139,7 +144,8 @@ export default defineComponent({
 			drag,
 			layoutList,
 			content,
-			loadingShow
+			loadingShow,
+			moodItemScale
         };
     },
     data() {
@@ -158,6 +164,7 @@ export default defineComponent({
 			setabsolute:false,
 			token: "",
             uploadUrl: "",
+			moodIndex:0,
 			upload: {
                 isPin: 0,
 				gender:'',
@@ -600,13 +607,33 @@ export default defineComponent({
 			this.layout = false
 		},
 		setpitch(item:any,index:any){
+			// console.log(item);
+			// let dom:any = document.getElementsByClassName('modal_imgItem')[index]
+			// console.log(dom);
+			// let img = new Image()
+			// img.src = item.imgUrl
+			// img.onload = ()=>{
+			// 	console.log(dom.offsetWidth/img.width);
+			// 	console.log(img.width/dom.offsetWidth);
+			// }
+			if(!item.zoom){
+				item.zoom = 1
+			}
+			this.moodIndex = index
+			this.moodItemScale = (item.zoom?item.zoom:1)*100
 			this.layoutList.forEach((v:any)=>{
 				v.setPitch = false
 			})
 			item.setPitch = true
 			if(this.content){
 				(this.content as any)[index].style.zIndex = GO.zIndex++
-				
+			}
+			// item.style = 
+			
+		},
+		setMoodItemScale(value:any){
+			if(value > 2){
+				this.layoutList[this.moodIndex].zoom = value/100
 			}
 		},
 		setmoodb(item:any){
@@ -902,7 +929,7 @@ export default defineComponent({
 					position: absolute;
 					top: 50%;
 					left: 50%;
-					transform: translate(-50%,-50%) scale(1);
+					transform: translate(-50%,-50%);
 				}
 				::selection {
 						// background: rgba(0,0,0,0);
@@ -972,7 +999,6 @@ export default defineComponent({
 			top: 50%;
 			transform: translateY(-50%);
 			right: 5rem;
-			overflow-x: hidden;
 			// background-color: #000;
 			width: 8%;
 			height: 50%;
@@ -999,6 +1025,33 @@ export default defineComponent({
 					border: 1px solid #000;
 				}
 			}
+			.ant-slider{
+				margin: 0;
+				margin-top: 2rem;
+				padding: 0 1rem;
+				.ant-slider-track,
+				.ant-slider-rail {
+					height: .6rem;
+					background-color: #e1e1e1;
+					border-radius: 0.5rem;
+				}
+				.ant-slider .ant-slider-handle:not(.ant-tooltip-open),
+				.ant-slider-handle {
+					background-color: #2d2e76 !important;
+					border: none !important;
+				}
+				.ant-slider-handle:hover {
+					box-shadow: 0 0 0 5px rgba(45, 46, 118, 0.2);
+				}
+			
+				.habit_System_Designer_text_max {
+					display: flex;
+					justify-content: space-between;
+					.habit_System_Designer_text {
+					}
+				}
+			}
+			
 		}
         .submit_button {
             margin: 2rem auto 0;
diff --git a/src/component/LibraryPage/setLabel.vue b/src/component/LibraryPage/setLabel.vue
index c80e0772..faf63f9a 100644
--- a/src/component/LibraryPage/setLabel.vue
+++ b/src/component/LibraryPage/setLabel.vue
@@ -15,7 +15,7 @@
 					<div class="setLabel_text" :class="{active:optionsItem.checkAll}">
 						<a-checkbox v-model:checked="optionsItem.checkAll" @change="onCheckAllChange(optionsItem)"></a-checkbox>
 						<span v-show="!optionsItem.openType" :title="optionsItem.classificationName">{{ optionsItem.classificationName }}</span>
-						<input v-show="optionsItem.openType" type="text" v-model="itemName">
+						<input v-show="optionsItem.openType" type="text" v-model="itemName" @keydown.enter="putName(optionsIndex,'affirm',optionsItem)">
 						<i v-show="optionsItem.openType" @click.stop="putName(optionsIndex,'affirm',optionsItem)" class="fi fi-br-check"></i>
 						<i v-show="!optionsItem.openType" @click.stop="putName(optionsIndex,'put',optionsItem)" class="fi fi-rr-edit"></i>
 					</div>
@@ -24,12 +24,12 @@
 						<li class="childrenItem_title setLabel_text" v-for="childrenItem,childrenIndex in optionsItem.childList" :class="{active:childrenItem.checkAll}" :key="childrenItem.id">
 							<a-checkbox v-model:checked="childrenItem.checkAll" @change="onCheckAllchildrenItem(optionsItem)"></a-checkbox>
 							<span v-show="!childrenItem.openType" :title="childrenItem.classificationName">{{ childrenItem.classificationName }}</span>
-							<input v-show="childrenItem.openType" type="text" v-model="itemName">
+							<input v-show="childrenItem.openType" type="text" v-model="itemName" @keydown.enter="putName(childrenIndex,'affirm',childrenItem)">
 							<i v-show="childrenItem.openType" @click.stop="putName(childrenIndex,'affirm',childrenItem)" class="fi fi-br-check"></i>
 							<i v-show="!childrenItem.openType" @click.stop="putName(childrenIndex,'put',childrenItem)" class="fi fi-rr-edit"></i>
 						</li>
 						<li class="newLabel setLabel_text">
-							<input v-show="optionsItem.addOpenType" type="text" v-model="itemName">
+							<input v-show="optionsItem.addOpenType" type="text" v-model="itemName" @keydown.enter="putName(-1,'affirm',optionsItem)">
 							<i @click.stop="putName(-1,'affirm',optionsItem)" v-show="optionsItem.addOpenType" class="fi fi-br-check"></i>
 							<div class="addLabel" v-show="!optionsItem.addOpenType" @click="newLabel(optionsItem,optionsItem.id)">+</div>
 						</li>
@@ -37,7 +37,7 @@
 				</li>
 				<li class="newLabel setLabel_text optionsItem_title">
 					<div>
-						<input v-show="openType" type="text" v-model="itemName">
+						<input v-show="openType" type="text" v-model="itemName"  @keydown.enter="putName(-1,'affirm','')">
 						<i @click.stop="putName(-1,'affirm','')" v-show="openType" class="fi fi-br-check"></i>
 						<div class="addLabel" v-show="!openType" @click="newLabel('','')">+</div>
 					</div>
@@ -171,6 +171,8 @@ export default defineComponent({
 		this.openType = false
 	  },
 	  putName(index:number,v:string,item:any){
+			let e:any = window.event
+			e.target.parentNode.
 			let data:any 
 			if(v == 'put'){
 				this.clearOpenType()
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 2cc8e607..00e78e79 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -70,11 +70,11 @@ export default {
 		ImageOnly:'Image Only',
 		TextOnly:'Text Only',
 		TextImage:'Text-Image',
-		inputContent2:'Prompt input',
+		inputContent2:'Input name',
 		maximumLength:'The entered content exceeds the maximum length.',
 		Model1:'Model1',
 		Model2:'Model2',
-		inputContent3:'Prompt input',
+		inputContent3:'Input name',
 		Cancel:'Cancel',
 		Sure:'Sure',
 		Moodboard:'Moodboard',
@@ -331,7 +331,7 @@ export default {
 		image:'Because you are a trial user, you can only upload 10 images'
 	},
 	setLabel:{
-		EditTag:'Edit tag',
+		EditTag:'Edit Tag',
 		jsContent1:'Please enter a tag name',
 	}
 }
diff --git a/src/views/LibraryPage.vue b/src/views/LibraryPage.vue
index 41b1066c..ab68d985 100644
--- a/src/views/LibraryPage.vue
+++ b/src/views/LibraryPage.vue
@@ -729,13 +729,13 @@ export default defineComponent({
 			let labelArr:any = []
 			this.value.editLabelValue.forEach((item:any)=>{
 				// if(item.length > 1){
-				// 	labelArr.push(item[item.length-1])
 				// }else{
-					
+				// labelArr.push(item[0])
 				// }
-				labelArr.push(item[item.length-1])
-
+				labelArr.push(item[item.length-1]?item[item.length-1]:item)
 			})
+			console.log(this.value);
+			
 			let data2 = {
 				"classificationIdList": labelArr,
 				"classificationName": "",
diff --git a/src/views/trialApproval.vue b/src/views/trialApproval.vue
index 3565740d..d78fe423 100644
--- a/src/views/trialApproval.vue
+++ b/src/views/trialApproval.vue
@@ -423,13 +423,12 @@ export default defineComponent({
 						padding: 0 2rem;
 						margin: 0 2rem;
 						margin-left: 0;
-						border: 0.1rem solid #f1f1f1;
+						// border: 0.1rem solid #f1f1f1;
 						span{
-							font-size: 1.8rem;
 						}
 						>button{
 							transform: scale(.8);
-							
+
 						}
 					}
                     .content_search_block {