调整design的moodboard的位置信息和部分修改

This commit is contained in:
X1627315083
2024-09-30 15:43:37 +08:00
parent 16d6416f73
commit 8fbd0376b4
14 changed files with 67 additions and 34 deletions

View File

@@ -260,9 +260,20 @@ export default defineComponent({
}
})
}
MyWs.linkWs("wss://"+MyWs.messageUrl,'message')
MyWs.linkWs("ws://"+MyWs.messageUrl+`/${JSON.parse(getCookie("userInfo")).userId}`,'message')
let getWsMessage = (data)=>{
let userInfo = ['followeeCount','followerCount']
let obj = {}
let isObj = false
data.forEach(element => {
const keys = Object.keys(element)[0]
if(userInfo.indexOf(keys) > 0){
obj[keys] = element[keys]
isObj = true
}
});
if(isObj)store.commit('setUserInfo',obj)
store.commit('setMessageSystem',...data)
}
MyEvent.add('getMessage',getWsMessage)

View File

@@ -535,8 +535,10 @@ export default defineComponent({
// this.likeDesignCollectionList.push(team)
// },
affiche(text:any){
let affiche:any = this.$refs.affiche
affiche.init(text)
nextTick(()=>{
let affiche:any = this.$refs.affiche
affiche.init(text)
})
// affiche.afficheMask = true
},
dragstart (e:any, index:any) {
@@ -716,7 +718,7 @@ export default defineComponent({
colorBoards,
sketchboardFiles,
marketingSketchFiles,
moodTemplateId,
moodboardPosition,
} = this.store.state.UploadFilesModule.allBoardData;
this.randomNum()
let workspace = this.store.state.Workspace.workspace
@@ -726,6 +728,7 @@ export default defineComponent({
moodBoards: this.getBoardId(moodboardFiles),
printBoards: this.getPrintId(printboardFiles),
sketchBoards: this.getSkecthBoard(sketchboardFiles),
moodboardPosition: moodboardPosition,
switchCategory: !workspace.overallSingle ?"": workspace.position,
singleOverall: !workspace.overallSingle ? "overall" : "single",
systemScale: workspace.systemDesignerPercentage?workspace.systemDesignerPercentage*.01:.3,
@@ -737,6 +740,7 @@ export default defineComponent({
timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
processId:this.designRandom
};
// data.moodboardPosition = JSON.stringify(this.store.state.UploadFilesModule.moodboardPosition)
let isLoad = false
if(designCollectionId == -1){
isLoad = true
@@ -954,6 +958,8 @@ export default defineComponent({
},
//处理选择组的数据
dealHistoryChooseData(data: any, type: any) {
console.log(data.collection.moodboardPosition);
let collectionData = {
disposeMoodboard: data.collection.moodTemplateId?[{
id:data.collection.moodTemplateId,