chat聊天功能

src/component/HomePage/index/model/collection/MoodboardUpload.vue

@@ -577,7 +577,6 @@ export default defineComponent({
 			flex: 1;
             height: calc(30rem*1.2);
             overflow-x: hidden;
-            border-right: 1px solid #e5e5e5;
 			display: flex;
 			flex-direction: column;
             &.moodboard_body::-webkit-scrollbar {
@@ -673,11 +672,10 @@ export default defineComponent({
 				padding-block: calc(2rem*1.2);
 			}
 			.modal_img_max{
-				// flex: 1;
-				// width: 57rem;
-				// height: 35rem;
-				width: 92rem;
-				height: 56.5rem;
+				// width: calc(57rem*1.2);
+				// height: calc(35rem*1.2);
+				width: 100%;
+				aspect-ratio: 1.62 / 1;
 				position: relative;
 				.mark_loading{
 					position: absolute;

src/component/HomePage/index/model/collection/PrintboardUpload.vue

@@ -923,7 +923,6 @@ export default defineComponent({
 					position: relative;
 					cursor: pointer;
 					text-align: center;
-					overflow: hidden;
 					.moreBox{
 						position: absolute;
 						right: 1rem;

src/component/HomePage/index/model/collection/SketchboardUpload.vue

@@ -129,6 +129,7 @@
                 ref="Generate"
                 msg="Sketchboard"
 				:scene="scene"
+				:gender="workspace.sex"
 				:sketchCatecoryList="sketchCatecoryList"
             ></Generate>
         </div>
@@ -685,7 +686,6 @@ export default defineComponent({
 			padding-top: calc(2.5rem*1.2);
 			height: calc(30rem*1.2);
 			overflow-x: hidden;
-			border-right: 1px solid #e5e5e5;
 			display: flex;
 			flex-direction: column;
         &.moodboard_body::-webkit-scrollbar {
@@ -877,7 +877,6 @@ export default defineComponent({
 					position: relative;
 					cursor: pointer;
 					text-align: center;
-					overflow: hidden;
 					.moreBox{
 						position: absolute;
 						right: 1rem;

src/component/HomePage/index/model/mannequin/edit.vue

@@ -1,12 +1,14 @@
 <template>
     <div  ref="placementModal" v-if="placementShow">
-        <a-modal class="generalModel fullScreen" 
+        <a-modal class="generalModel " 
+			:class="{fullScreen:!isPop}"
             v-model:visible="placementShow" 
             :footer="null" 
-			 width="100%"
+			:width="isPop?'150rem':'100%'"
+			:height="isPop?'90rem':'100%'"
 			:get-container="() => $refs.placementModal"
-			height="100%"
             :maskClosable="false"
+			:mask="mannEditMask"
 			:keyboard="false"
             :centered="true"
 			:closable="false"
@@ -201,6 +203,16 @@ export default defineComponent({
 	components:{
         VueCropper,
     },
+	props: {
+		isPop: {
+			type: Boolean,
+			default: false,	
+		},
+		ageGroup: {
+			type: String,
+			default: '',	
+		}
+	},
 	emits:['submit'],
     setup() {
         const store = useStore()
@@ -219,6 +231,7 @@ export default defineComponent({
 			modelType:'Library',
 			slider:50,
 			editOrUpload:'edit',//edit 编辑  upload 上传
+			mannEditMask:false,
 		})
 		const dataDom = reactive({
 			placement:null as any,
@@ -430,6 +443,7 @@ export default defineComponent({
 		},
         async showPlacementModal(value:any,sex:any,type:any,editOrUpload:any){
 			// this.sex = arr[0].value
+			
 			this.editOrUpload = editOrUpload
             this.placementShow = true
 			this.isShowMark = true
@@ -848,7 +862,7 @@ export default defineComponent({
 				cropper.getCropData(async (value:any) => {
 				// 转换为File对象
 					if(this.printObject.templateId || this.printObject.id){
-						this.printObject.id = this.printObject.relationId
+						if(this.printObject.relationId)this.printObject.id = this.printObject.relationId
 						this.confrimSubmit()
 					}else{
 						let file:any = base64toFile(value,this.printObject.file.name || '-');
@@ -988,8 +1002,8 @@ export default defineComponent({
                 level2Type:'',
 				checkMd5:1,
 				sex:this.sex,
+				ageGroup:this.$props.ageGroup,
 				modelType:modelType,
-				ageGroup:this.store.state.Workspace.probjects.ageGroup,
                 timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
             }
             this.isShowMark = true
@@ -1133,19 +1147,22 @@ export default defineComponent({
 })
 </script>
 <style lang="less" scoped>
-:deep(.ant-modal-body){
-	padding: 4rem 5rem;
-	margin-bottom: 0;
-	.generalModel_btn {
-		.generalModel_closeIcon{
-			transform: translate(-100%, 100%);
-			svg{
-				color: #000;
+:deep(.ant-modal-centered){
+	// position: absolute;
+	.ant-modal-body{
+		padding: 4rem 5rem;
+		margin-bottom: 0;
+		.generalModel_btn {
+			.generalModel_closeIcon{
+				transform: translate(-100%, 100%);
+				svg{
+					color: #000;
+				}
 			}
 		}
 	}
-	
 }
+
 .close_icon{
 	width: 3.6rem;
 	height: 3.6rem;
@@ -1219,7 +1236,7 @@ export default defineComponent({
 			position: absolute;
 			left: 0;
 			top: 18rem;
-			left: 30rem;
+			left: 18rem;
 			.select_block{
 				// background: #FFFFFF;
 				margin-bottom: 3rem;

src/component/HomePage/index/model/mannequin/index.vue

@@ -57,7 +57,7 @@
 			
 		</div>
 		<habitSetStyle ref="habitSetStyle" @setWorkspaceStyle="setWorkspaceStyle"></habitSetStyle>
-		<edit ref="edit" @submit="getModel"></edit>
+		<edit ref="edit" :ageGroup="selectObject.ageGroup" @submit="getModel"></edit>
 	</div>
 </template>
 <script lang="ts">

src/component/HomePage/index/model/patternMaking3D/index.vue

@@ -279,7 +279,8 @@ export default defineComponent({
 			}
 		}
 		> .selectModel{
-			width: 70rem;
+			width: 40%;
+			// width: 70rem;
 			flex-shrink: 0;
 			height: 100%;
 			background: #f7f8fa;

src/component/HomePage/index/model/poseTransfer/index.vue

@@ -158,6 +158,7 @@ export default defineComponent({
 		const selectImgItem = (item:any,)=>{
 			data.selectImg = item
 			data.fileList.forEach((listItem:any)=>listItem.isChecked = false)
+			console.log(data.currentList)
 			data.currentList.forEach((listItem:any)=>listItem.isChecked = false)
 			item.isChecked = true
 			if(item.url || item.imgUrl)data.selectImg.minioUrl = getMinioUrl(item.url || item.imgUrl)