调整部分bug

2025-05-28 10:28:07 +08:00
parent 608a4dec89
commit 9fc2bcaedf
78 changed files with 2034 additions and 10193 deletions
--- a/src/component/DetailCopy/designDetail.vue
+++ b/src/component/DetailCopy/designDetail.vue
@@ -39,6 +39,10 @@
 							<img src="@/assets/images/icon/details_elements.png" alt="">
 							<div class="detailText">Elements</div>
 						</div>
+						<div class="nav_item" :class="{active:currentDetailType == 'models'}" @click="setCurrentDetail('models')">
+							<img src="@/assets/images/icon/details_model.svg" alt="">
+							<div class="detailText">Model</div>
+						</div>
 					</div>
 				</div>
 				<div class="item detailLeft" :class="{isEditPattern:isEditPattern.value}">
@@ -293,6 +297,7 @@ export default defineComponent({
 			let workspace = store.state.Workspace.probjects
 			if(!detailData.selectDetail.path && !detailData.selectDetail.newDetail?.sketch?.minIOPath)return
 			let clothes:any = await setClothes([detailData.selectDetail])
+			console.log(detailData.designDetail)
 			let data = {
 				designItemId:detailData.designDetail.designItemId,
 				designSingleItemDTOList:clothes,
@@ -537,12 +542,13 @@ export default defineComponent({
 					> .gallery_btn{
 						width: 6rem;
 						height: 6rem;
+						margin-top: 2rem;
 						border-radius: 50%;
 					}
 				}
 				> .nav_list{
 					margin-top: 2.7rem;
-					height: 38rem;
+					// height: 38rem;
 					width: 9rem;
 					background: #f4f4f4;
 					border-radius: 1.4rem;
--- a/src/component/DetailCopy/detailLeft/index.vue
+++ b/src/component/DetailCopy/detailLeft/index.vue
@@ -4,6 +4,7 @@
 		<print v-show="currentDetailType == 'print'"></print>
 		<color v-if="currentDetailType == 'color'"></color>
 		<element v-show="currentDetailType == 'element'"></element>
+		<models v-show="currentDetailType == 'models'"></models>
 		<addDetails ref="addDetails" @setSloganData="setSloganData"></addDetails>
    </div>
 </template>
@@ -18,11 +19,12 @@ import sketch from './sketch.vue'
 import print from './print.vue'
 import color from './colorBox/index.vue'
 import element from './element.vue'
+import models from './models.vue'
 import addDetails from '@/component/Detail/addDetails.vue'

 export default defineComponent({
    components:{
-		sketch,print,color,addDetails,element
+		sketch,print,color,addDetails,element,models
    },
    setup(props,{emit}) {
        const store = useStore();
--- a/src/component/DetailCopy/detailLeft/models.vue
+++ b/src/component/DetailCopy/detailLeft/models.vue
@@ -0,0 +1,171 @@
+<template>
+    <div class="sketch">
+		<div class="detailText">Current Model</div>
+		<div class="select_sketch">
+			<!-- <img :src="selectDetail?.sketchString?selectDetail?.sketchString:selectDetail.path" alt=""> -->
+			<img :src="frontBack.body.path || selectDetail.path" alt="">
+		</div>
+		<selectList @selectImgItem="selectImgItem" :isUpload="false" level1Type="Models" type="models" :catecoryList="sketchCatecoryList"></selectList>
+    </div>
+</template>
+<script lang="ts">
+import { defineComponent,computed,ref,provide,nextTick,createVNode,toRefs, reactive} from 'vue'
+// import setDesignItem from '@/component/Detail/setDesignItem2.vue'
+import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+import { Https } from "@/tool/https";
+import { useStore } from "vuex";
+import { useI18n } from 'vue-i18n'
+// import sketchCategory from "@/component/HomePage/sketchCategory.vue";
+import selectList from './module/selectList.vue'
+
+export default defineComponent({
+    components:{
+		selectList,
+    },
+	emit:['addDetail'],
+    setup(props,{emit}) {
+        const store = useStore();
+		const detailData = reactive({
+			selectTitle:'current',
+			frontBack:computed(()=>store.state.DesignDetailCopy.frontBack),
+			designDetail:computed(()=>store.state.DesignDetailCopy.designDetail),
+			selectDetail:computed(()=>store.state.DesignDetailCopy.selectDetail),
+			sketchCatecoryList:computed(()=>{
+				return store.state.UserHabit.sex.value
+			}),
+			currentDetailType:computed(()=>store.state.DesignDetailCopy.currentDetailType)
+		})
+		const getDetailListData = reactive({
+			total:0,
+			pageSize:10,
+			currentPage:1,
+		})
+		const getDetailListDom = reactive({
+			libraryList:null as any,
+		})
+		const openCurrent = ()=>{
+			detailData.selectTitle = 'current'
+		}
+		const openUpload = ()=>{
+			detailData.selectTitle = 'upload'
+		}
+		const openLibrary = ()=>{
+			detailData.selectTitle = 'library'
+			getDetailListDom.libraryList.init()
+		}
+		const selectImgItem = (data:any)=>{
+			data.url = data.presignedUrl
+			let value = {
+				data,
+			}
+			store.commit('DesignDetailCopy/setNewDetail',value)
+		}
+		const openAddDetail = ()=>{
+			emit('addDetail')
+		}
+        return{
+			...toRefs(detailData),
+			...toRefs(getDetailListData),
+			...toRefs(getDetailListDom),
+
+			openCurrent,
+			openUpload,
+			openLibrary,
+			selectImgItem,
+			openAddDetail,
+        }
+    },
+
+	provide() {
+		return {
+		}
+	},
+		
+})
+</script>
+<style lang="less" scoped>
+    .sketch{
+		// width: 34rem;
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		> .detailText{
+			margin-bottom: 1rem;
+		}
+		> .select_sketch{
+			width: 100%;
+			height: 23.5rem;
+			padding: 1rem 0;
+			text-align: center;
+			border-radius: .5rem;
+			// border: 1px dashed #202020;
+			border: 1px dashed transparent;
+			position: relative;
+        	background: linear-gradient(#fff, #fff) padding-box,repeating-linear-gradient(-45deg,#fff 0,#fff 0.3em,	#000 0,#000 0.6em);
+			margin-bottom: 3rem;
+			> img{
+				width: 100%;
+				height: 100%;
+				object-fit: contain;
+			}
+			> i{
+				position: absolute;
+				left: auto;
+				right: 1rem;
+				top: 2rem;
+				font-size: 2rem;
+				cursor: pointer;
+			}
+			> div{
+				height: 100%;
+				width: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				> i{
+					font-size: 10rem;
+				}
+			}
+		}
+		> .switch_type_list{
+			display: flex;
+			margin-bottom: 2.5rem;
+			> .switch_type_item:last-child{
+				margin-right: 0;
+			}
+			> .switch_type_item{
+				position: relative;
+				cursor: pointer;
+				margin-right: 6.5rem;
+			}
+			> .switch_type_item::before {
+                    position: absolute;
+                    content: "";
+                    display: block;
+                    background: #000;
+                    height: calc(.4rem*1.2);
+                    left: 50%;
+                    transform: translateX(-50%);
+                    bottom: -.5rem;
+                    width: 0px;
+                    transition: 0.3s all;
+                }
+			> .select_swtich {
+				color: #000;
+				font-weight: 600;
+			}
+			> .select_swtich::before {
+				width: 100%;
+			}
+		}
+		> .sketch_content_list{
+			flex: 1;
+			overflow: hidden;
+			> .content_item{
+				height: 100%;
+				margin-top: 1rem;
+			}
+		}
+	}
+</style>
--- a/src/component/DetailCopy/detailLeft/module/libraryList.vue
+++ b/src/component/DetailCopy/detailLeft/module/libraryList.vue
@@ -1,7 +1,7 @@
 <template>
    <div class="libraryList">
 		<div class="generalModel_state" v-if="type != 'element'">
-			<div class="generalModel_state_item" style="width: 40%;">
+			<div class="generalModel_state_item" v-if="level1Type != 'Models'" style="width: 40%;">
 				<a-select
 					v-model:value="designType"
 					:options="designTypeList"
@@ -18,7 +18,76 @@
 					></template>
 				</a-select>
 			</div>
-			<div class="generalModel_state_item" style="width: 35%;">
+			<div class="generalModel_state_item" v-if="level1Type == 'Models'" style="margin-bottom: 1rem;" :style="{'width':mannequinData.system == 'system'?'48%':'100%'}">
+				<a-select
+					v-model:value="mannequinData.system"
+					:options="systemList"
+					@change="handleChange"
+					style="width:100%"
+					size="large"
+					:fieldNames="{ label: 'name', value: 'value' }"
+				>
+					<template #suffixIcon
+						><span
+							class="icon iconfont icon-xiala"
+							style="color: #343579"
+						></span
+					></template>
+				</a-select>
+			</div>
+			<div class="generalModel_state_item" v-if="level1Type == 'Models'" v-show="mannequinData.system == 'system'" style="width: 48%; margin-bottom: 1rem;">
+				<!-- {{ mannequinStyle }} -->
+				<a-select
+					v-model:value="mannequinData.style"
+					:options="mannequinStyle"
+					@change="handleChange"
+					style="width:100%"
+					size="large"
+					:fieldNames="{ label: 'name', value: 'value' }"
+				>
+					<template #suffixIcon
+						><span
+							class="icon iconfont icon-xiala"
+							style="color: #343579"
+						></span
+					></template>
+				</a-select>
+			</div>
+			<div class="generalModel_state_item" v-if="level1Type == 'Models'" style="width: 39%;">
+				<a-select
+					v-model:value="mannequinData.ageGroup"
+					:options="ageGroupList"
+					@change="handleChange"
+					style="width:100%"
+					size="large"
+					:fieldNames="{ label: 'name', value: 'value' }"
+				>
+					<template #suffixIcon
+						><span
+							class="icon iconfont icon-xiala"
+							style="color: #343579"
+						></span
+					></template>
+				</a-select>
+			</div>
+			<div class="generalModel_state_item" v-if="level1Type == 'Models'" style="width: 39%;">
+				<a-select
+					v-model:value="mannequinData.sex"
+					:options="sexList"
+					@change="handleChange"
+					style="width:100%"
+					size="large"
+					:fieldNames="{ label: 'name', value: 'value' }"
+				>
+					<template #suffixIcon
+						><span
+							class="icon iconfont icon-xiala"
+							style="color: #343579"
+						></span
+					></template>
+				</a-select>
+			</div>
+			<div class="generalModel_state_item" style="width: 35%;" v-if="level1Type != 'Models'">
 				<input class="search_input" style="width: 100%;" :placeholder="$t('DesignDetailAlter.inputContent1')" v-model="searchPictureName"  @keydown.enter="getLibraryList()">
 			</div>
 			<div  class="generalModel_state_item" style="width: auto;">
@@ -29,8 +98,8 @@
 		<div class="libraryList_box">
 			<div class="content_img_item" v-for="(file) in libraryList" :key="file.id">
 				<div class="content_img_item_block" :class="{active:file?.checked}">
-					<img v-lazy="file.url" :key="file.url" :alt="file.name" @click.stop="selectImgItem(file)"/>
-					<sketchCategory :disignTypeList="designTypeList" :generateList="libraryList" :item="file" :isSetSketchCategory="true"></sketchCategory>
+					<img v-lazy="level1Type != 'Models'?file.url:file.presignedUrl" :key="level1Type != 'Models'?file.url:file.presignedUrl" :alt="file?.name" @click.stop="selectImgItem(file)"/>
+					<sketchCategory v-if="level1Type != 'Models'" :disignTypeList="designTypeList" :generateList="libraryList" :item="file" :isSetSketchCategory="true"></sketchCategory>
 				</div>
 			</div>
 			<div v-show="total > libraryList.length" class="material_content_list_loding" v-observe>
@@ -84,6 +153,19 @@ export default defineComponent({
 			designType:'',
 			searchPictureName:'',
 			designDetail:computed(()=>store.state.DesignDetailCopy.designDetail),
+			mannequinData:{
+				sex:'Female',
+				style:'',
+				system:'system',
+				ageGroup:'Adult',
+				systemList:[],
+				libraryList:[],
+			},
+			systemList:[{name:'System',value:'system',},{name:'Library',value:'library',}],//系统
+			mannequinStyle:computed(()=>store.state.UserHabit.mannequinStyle),//风格列表
+			sexList:computed(()=>store.state.UserHabit.sex.value),//风格列表
+			ageGroupList:computed(()=>store.state.UserHabit.ageGroup),//风格列表
+			
 		})
 		const getDetailListData = reactive({
 			total:0,
@@ -126,7 +208,44 @@ export default defineComponent({
 			// store.commit('DesignDetailCopy/setNewDetail',data)
 		}
 		const getLibraryList = ()=>{
-            detailData.isShowLoading = true
+           if(props.type == 'models'){
+				getModelList()
+		   }else{
+				getList()
+			}
+        } 
+		const getModelList = ()=>{
+			detailData.isShowLoading = true
+			let value = {
+				sex:detailData.mannequinData.sex,
+				style:detailData.mannequinData?.style,
+				ageGroup:store.state.Workspace.probjects.ageGroup,
+			}
+			Https.axiosGet(Https.httpUrls.getMannequins,{params:value}).then((rv: any) => {
+				if (rv) {
+					rv.forEach((item:any) => {
+						if(item.type == 'System'){
+							detailData.mannequinData.systemList = item.modelList
+						}else{
+							detailData.mannequinData.libraryList = item.modelList
+						}
+					});
+					setMannequinList()
+				}
+                detailData.isShowLoading = false
+			}).catch((res)=>{
+                detailData.isShowLoading = false
+            });
+		}
+		const setMannequinList = ()=>{
+			if(detailData.mannequinData.system == 'system'){
+				detailData.libraryList = detailData.mannequinData.systemList
+			}else{
+				detailData.libraryList = detailData.mannequinData.libraryList
+			}
+		}
+		const getList = ()=>{
+			detailData.isShowLoading = true
 			let level2Type = ''
 			let workspace = store.state.Workspace.probjects
 			// let type = store.state.DesignDetailCopy.currentDetailType
@@ -159,14 +278,13 @@ export default defineComponent({
            ).catch((res)=>{
                detailData.isShowLoading = false
            });
-        }
+		}
 		const handleChange = ()=>{
 			getDetailListData.currentPage = 1
 			detailData.libraryList = []
            getLibraryList()
 		}
 		onMounted(()=>{
-			// getLibraryList()
 		})
        return{
 			...toRefs(detailData),
--- a/src/component/DetailCopy/detailLeft/module/selectList.vue
+++ b/src/component/DetailCopy/detailLeft/module/selectList.vue
@@ -9,6 +9,7 @@
 				<span class="detailText">{{ $t('DesignDetailAlter.current') }}</span>
 			</div>
 			<div
+				v-if="isUpload"
 				@click.stop="openUpload()"
 				class="switch_type_item"
 				:class="[selectTitle == 'upload' ? 'select_swtich' : '',]"
@@ -85,6 +86,11 @@ export default defineComponent({
 			default:'' as any,
 			required:true
 		},
+		isUpload:{
+		    type:Boolean,
+			default:true,
+			required:false	
+		}
 	},
 	emits:['selectImgItem'],
    setup(props,{emit}) {
--- a/src/component/DetailCopy/detailRight/index.vue
+++ b/src/component/DetailCopy/detailRight/index.vue
@@ -9,6 +9,7 @@
 		<!-- <elementType v-if="currentDetailType === 'element'"></elementType> -->
 		<editPrintElement ref="editPrintElement" v-if="currentDetailType === 'print'" type="print"></editPrintElement>
 		<editPrintElement ref="editPrintElement" v-if="currentDetailType === 'element'" type="element"></editPrintElement>
+		<modelsType ref="modelsType" v-if="currentDetailType === 'models'"></modelsType>
    </div>
    
 </template>
@@ -20,9 +21,10 @@ import sketchType from './sketchType.vue'
 import printType from './printType.vue'
 import editPrintElement from './editPrintElement.vue'
 import elementType from './elementType.vue'
+import modelsType from './modelsType.vue'
 export default defineComponent({
    components:{
-		sketchType,printType,elementType,editPrintElement
+		sketchType,printType,elementType,editPrintElement,modelsType
    },
    setup(props,{emit}) {
        const store = useStore();
--- a/src/component/DetailCopy/detailRight/modelsType.vue
+++ b/src/component/DetailCopy/detailRight/modelsType.vue
@@ -0,0 +1,60 @@
+<template>
+    <div class="sketchType" v-show="selectDetail?.newDetail?.[currentDetailType]">
+		<div class="detailText">New Model</div>
+		<div class="sketchContent">
+			<img :src="selectDetail.newDetail?.[currentDetailType].url" alt="">
+		</div>
+    </div>
+</template>
+<script lang="ts">
+import { defineComponent,computed,ref,provide,nextTick,createVNode,toRefs, reactive} from 'vue'
+// import setDesignItem from '@/component/Detail/setDesignItem2.vue'
+import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+import { Https } from "@/tool/https";
+import { useStore } from "vuex";
+import { useI18n } from 'vue-i18n'
+export default defineComponent({
+    components:{
+    },
+    setup(props,{emit}) {
+        const store = useStore();
+		const detailData = reactive({
+		    selectDetail:computed(()=>store.state.DesignDetailCopy.selectDetail),
+		    currentDetailType:computed(()=>store.state.DesignDetailCopy.currentDetailType),
+		})
+		const getDetailListData = reactive({
+		
+		})
+		const getDetailListDom = reactive({
+		})
+        return{
+			...toRefs(detailData),
+			...toRefs(getDetailListData),
+			...toRefs(getDetailListDom),
+
+        }
+    },
+
+	provide() {
+		return {
+		}
+	},
+		
+})
+</script>
+<style lang="less" scoped>
+    .sketchType{
+		margin: auto 0;
+		width: 100%;
+		> .detailText{
+			margin-bottom: 1rem;
+		}
+		> .sketchContent{
+			> img{
+				width: 100%;
+				object-fit: contain;
+				max-height: 60rem;
+			}
+		}
+	}
+</style>
--- a/src/component/DetailCopy/model/index.vue
+++ b/src/component/DetailCopy/model/index.vue
@@ -164,18 +164,20 @@ export default defineComponent({
 				border-radius: 1rem;
 				padding: .7rem ;
 				flex-shrink: 0;
-				flex: 1;
 				overflow: hidden;
-				max-height: 4rem;
+				// max-height: 4rem;
 				> i{
 					font-size: 2rem;
 					cursor: pointer;
-					padding: 1.5rem;
+					// padding: 1.5rem;
 					display: flex;
 					align-items: center;
 					border-radius: .6rem;
 					overflow: hidden;
 					transition: all .3s;
+					width: 4rem;
+					height: 4rem;
+					justify-content: center;
 				}
 				> i:hover{
 					background: #000000;