This commit is contained in:
X1627315083
2025-04-09 14:53:13 +08:00
parent 37f1b36e54
commit 57040f3cb1
5 changed files with 32 additions and 9 deletions

View File

@@ -128,6 +128,12 @@ export default defineComponent({
value:rv.workspaceVO.positionEnum.name value:rv.workspaceVO.positionEnum.name
}, },
positionList:[], positionList:[],
publishData:{
id:'',
portfolioDes:'',
portfolioName:'',
tagsDTO:[],
},
model:{} model:{}
} }
let model:any = {} let model:any = {}

View File

@@ -23,11 +23,11 @@ import { useI18n } from 'vue-i18n'
import * as THREE from 'three'; import * as THREE from 'three';
import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js"; import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader.js' import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader.js'
import { OrbitControls } from 'three/addons/controls/OrbitControls.js'; import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js';
import { EffectComposer } from "three/addons/postprocessing/EffectComposer.js"; import { EffectComposer } from "three/examples/jsm/postprocessing/EffectComposer.js";
import { RenderPass } from "three/addons/postprocessing/RenderPass.js"; import { RenderPass } from "three/examples/jsm/postprocessing/RenderPass.js";
import { OutlinePass } from "three/addons/postprocessing/OutlinePass.js"; import { OutlinePass } from "three/examples/jsm/postprocessing/OutlinePass.js";
import gsap from 'gsap'; import gsap from 'gsap';
import { env } from 'echarts'; import { env } from 'echarts';

View File

@@ -93,6 +93,7 @@ export default defineComponent({
let publish: any = ref(false);//弹窗 let publish: any = ref(false);//弹窗
let publishMask:any = ref(false)//弹窗遮罩 let publishMask:any = ref(false)//弹窗遮罩
let publishData:any = reactive({ let publishData:any = reactive({
selectObject:computed(()=>store.state.Workspace.probjects),//选择的项目
publishName:'', publishName:'',
loadingShow:false, loadingShow:false,
publishMarginTop:0, publishMarginTop:0,
@@ -114,7 +115,7 @@ export default defineComponent({
}, },
}) })
// let portfolio:any = inject('portfolio') // let portfolio:any = inject('portfolio')
// let setPortfolio:any = inject('setPortfolio') // let setPortfolio:any = inject('setPortfolio')
let tagList = ref([ let tagList = ref([
// {id:1,tagName:'#AiDAworkshop_2024',title:'The process is simple: use AiDA to post your design work on the "Gallery ", and the one with the most likes(at least 20 likes) will be invited to the AiDA Workshop offline event in Hong Kong on November 14th, to exchange ideas with the Royal College of Art (RCA), Jae Lim, co-founder of the renowned fashion brand BESFXXK, and outstanding designers! '}, // {id:1,tagName:'#AiDAworkshop_2024',title:'The process is simple: use AiDA to post your design work on the "Gallery ", and the one with the most likes(at least 20 likes) will be invited to the AiDA Workshop offline event in Hong Kong on November 14th, to exchange ideas with the Royal College of Art (RCA), Jae Lim, co-founder of the renowned fashion brand BESFXXK, and outstanding designers! '},
@@ -138,14 +139,14 @@ export default defineComponent({
accountId : userInfo.userId, accountId : userInfo.userId,
createDate:'', createDate:'',
idDeleted:'', idDeleted:'',
id:portfolio.value.id?portfolio.value.id:'', id:publishData.selectObject.publishData.id,
portfolioDes:portfolio.value.portfolioDes?portfolio.value.portfolioDes:'', portfolioDes:publishData.selectObject.publishData.portfolioDes,
portfolioName:portfolio.value.portfolioName?portfolio.value.portfolioName:'', portfolioName:publishData.selectObject.publishData.portfolioName,
portfolioType:'History', portfolioType:'History',
status:'', status:'',
updateDate:'', updateDate:'',
collectionId:'', collectionId:'',
tagsDTO:portfolio.value.tagsDTO?portfolio.value.tagsDTO:[], tagsDTO:publishData.selectObject.publishData.tagsDTO,
// isAllowLikes:true, // isAllowLikes:true,
} }
} }

4
src/shims-vue.d.ts vendored
View File

@@ -15,3 +15,7 @@ declare module '@ans1998/vue3-color'
declare var ColorThief: any; declare var ColorThief: any;
declare var EyeDropper: any; declare var EyeDropper: any;
declare module 'three' declare module 'three'
declare module 'OrbitControls'
declare module 'EffectComposer'
declare module 'RenderPass'
declare module 'OutlinePass'

View File

@@ -28,6 +28,12 @@ const Workspace : Module<DesignDetail,RootState> = {
ageGroup:'Adult',//年龄组 ageGroup:'Adult',//年龄组
positionList:[],//衣服位置 positionList:[],//衣服位置
position:{},//衣服位置 position:{},//衣服位置
publishData:{
id:'',
portfolioDes:'',
portfolioName:'',
tagsDTO:[],
},//发布的作品数据
systemDesignerPercentage:30,//设计师分成 systemDesignerPercentage:30,//设计师分成
model:{ model:{
id:null, id:null,
@@ -77,6 +83,12 @@ const Workspace : Module<DesignDetail,RootState> = {
ageGroup:'Adult',//年龄组 ageGroup:'Adult',//年龄组
positionList:[], positionList:[],
position:{},//衣服位置 position:{},//衣服位置
publishData:{
id:'',
portfolioDes:'',
portfolioName:'',
tagsDTO:[],
},//发布的作品数据
systemDesignerPercentage:30, systemDesignerPercentage:30,
model:{ model:{
id:-1, id:-1,