This commit is contained in:
X1627315083
2025-09-03 16:36:06 +08:00
parent 8d73d6861b
commit dd3093656b
14 changed files with 139 additions and 77 deletions

View File

@@ -9,7 +9,7 @@
<div class="generalModel_state" style="width: 20rem;" v-show="systemUser">
<div class="generalModel_state_item" style="margin: 0; width: 100%;">
<a-select
v-model:value="selectObject.style"
v-model:value="selectObjectStyle"
:options="mannequinStyleList"
@change="setWorkspaceStyle"
style="width:100%"
@@ -92,6 +92,7 @@ export default defineComponent({
modelList:[],
systemUser:true,
selectObject:computed(()=>store.state.Workspace.probjects),//选择的项目
selectObjectStyle:'',
mannequinStyleList:[] as any,
mannequinStyle:computed(()=>store.state.UserHabit.mannequinStyle),//女性衣服位置
})
@@ -108,6 +109,9 @@ export default defineComponent({
watch(()=>data.selectObject.sex,(newVal)=>{
getModel()
})
watch(()=>data.selectObject.style,(newVal)=>{
data.selectObjectStyle = JSON.parse(JSON.stringify(newVal))
},{immediate:true})
const dataDom = reactive({
habitSetStyle:null as any,
edit:null as any,
@@ -115,7 +119,7 @@ export default defineComponent({
const getModel = ()=>{
let value = {
sex:data.selectObject.sex,
style:data.selectObject?.style?data.selectObject?.style:'',
style:data.selectObjectStyle,
ageGroup:data.selectObject.ageGroup,
}
Https.axiosGet(Https.httpUrls.getMannequins,{params:value}).then((rv: any) => {
@@ -186,9 +190,9 @@ export default defineComponent({
dataDom.habitSetStyle.init(data.selectObject);
}
const setWorkspaceStyle = (item:any,value:any)=>{
data.selectObject.styleName = value.name
data.selectObject.style = value.value
data.selectObject.styleId = value.id
// data.selectObject.styleName = value.name
// data.selectObject.style = value.value
// data.selectObject.styleId = value.id
getModel()
}
const openSetData = ()=>{
@@ -246,7 +250,8 @@ export default defineComponent({
const confirmDeletePic = (item:any,index:any,nData:any)=>{
let newData = {
libraryIds:[item.id],
deleteModelConfirm:item.deleteModelConfirm?item.deleteModelConfirm : 0,
deleteModelConfirm:1,
// deleteModelConfirm:item.deleteModelConfirm?item.deleteModelConfirm : 0,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
}
if(nData)newData = nData

View File

@@ -223,6 +223,7 @@ export default defineComponent({
"id":data.selectObject.id,
"moduleList":moduleList,
}
data.isShowMark = true
Https.axiosPost(Https.httpUrls.getModuleContent,value).then(async (rv)=>{
if(rv.uploadElement){//toproduct、relight、poseTransfer
let uploadElementData = {

View File

@@ -201,13 +201,14 @@ export default defineComponent({
message.info(t('PrintboardUpload.jsContent7'))
return
}
console.log(data.selectObject)
let value = {
name:data.selectObject.name,
process:props.httpWorkflowType,
styleId:data.show.style?data.selectObject.styleId:null,
id:data.selectObject.id == -1?'':data.selectObject.id,
workspace:{
id:data.workspaceId?.id == -1?'':data.workspaceId?.id,
id:data.selectObject?.workspaceId == -1?'':data.selectObject?.workspaceId,
sex:data.selectObject.sex,
// sex:data.show.gender?data.selectObject.sex:null,
systemDesignerPercentage:data.show.systemDesigner?data.selectObject.systemDesignerPercentage:null,