提交修改

src/component/home/tools/patternMaking3D/index.vue

@@ -2,8 +2,29 @@
 	<div class="patternMaking3D">
 		<div class="selectModel">
 			<div class="heard selectList">
-				<div :class="{active:libraryOrModel == 'model'}" @click="setLibraryOrModel('model')">Clothing</div>
-				<div :class="{active:libraryOrModel == 'print'}" @click="setLibraryOrModel('print')">Print</div>
+				<div class="title" :class="{active:libraryOrModel == 'model'}" @click="setLibraryOrModel('model')">Clothing</div>
+				<div class="title" :class="{active:libraryOrModel == 'print'}" @click="setLibraryOrModel('print')">Print</div>
+				<div class="generalModel_state">
+					<div class="generalModel_state_item smail">
+						<a-select
+							ref="select"
+							v-model:value="sex"
+							:options="sexList"
+							size="large"
+							:fieldNames="{ label: 'name', value: 'value' }"
+							style="width:20rem"
+							@change="sexChange"
+						>
+							<template #suffixIcon
+								><span
+									class="icon iconfont icon-xiala"
+									style="color: #000"
+								></span
+							></template>
+						</a-select>
+					</div>
+				</div>
+				
 			</div>
 			<div class="list" v-show="libraryOrModel == 'model'" v-if="maskShow">
 				<div v-for="item in modelList" class="modelItem" :class="{active:item.id == selectModel.id}" @click="setSelectModel(item)">
@@ -86,6 +107,8 @@ export default defineComponent({
 			// }),
 			selectObject:computed(()=>store.state.Workspace.probjects),//选择的项目
 			modelList:[] as any,
+			sex:'Female',
+			sexList:computed(()=>store.state.UserHabit.sex.value),
 			printList:computed(()=>store.state.UploadFilesModule.allBoardData.printboardFiles),
 			isShowMark:false,
 			isNoData:false,
@@ -97,12 +120,12 @@ export default defineComponent({
 			maskShow:false,
 			libraryOrModel:'model'
 		})
-		watch(()=>data.selectObject.sex,(newVal)=>{
+		const sexChange = ()=>{
 			data.modelList = []
 			data.currentPage = 0,
 			data.isNoData = false
 			data.isShowMark = false
-		})
+		}
 		const setSelectModel = (item:any)=>{
 			data.isShowMark = true
 			const value = {
@@ -143,7 +166,7 @@ export default defineComponent({
             let value = {
                 page: data.currentPage,
                 size:data.pageSize,
-				sex:data.selectObject.sex,
+				sex:data.sex,
             }
             data.isShowLoading = true
             Https.axiosPost(Https.httpUrls.threeDPage,value).then(
@@ -177,7 +200,7 @@ export default defineComponent({
 			dataDom.download.openDown(data.selectModel.id)
 		}
 		const setLibraryOrModel = (str:any)=>{
-			if(str == 'print' && data.selectModel.id == -1)return
+			// if(str == 'print' && data.selectModel.id == -1)return
 			data.libraryOrModel = str
 		}
 		const setMaterial = (item:any)=>{
@@ -191,6 +214,7 @@ export default defineComponent({
 		return{
 			...toRefs(dataDom),
 			...toRefs(data),
+			sexChange,
 			setSelectModel,
 			openSetData,
 			getModelList,
@@ -246,14 +270,19 @@ export default defineComponent({
 				display: flex;
 				justify-content: space-between;
 				width: 100%;
+				align-items: center;
 				&.selectList{
 					justify-content: flex-start;
-					> div{
+					> .title{
 						position: relative;
 						margin-right: 2rem;
-						margin-bottom: 2rem;
+						cursor: pointer;
+						// margin-bottom: 2rem;
 					}
-					> div::before{
+					> .generalModel_state{
+						margin-left: auto;
+					}
+					> .title::before{
 						position: absolute;
 						content: "";
 						display: block;