fix
This commit is contained in:
@@ -80,7 +80,8 @@ export default defineComponent({
|
|||||||
components:{MoodTemplate},
|
components:{MoodTemplate},
|
||||||
setup() {
|
setup() {
|
||||||
let sketch:any = ref([[],[],[]])
|
let sketch:any = ref([[],[],[]])
|
||||||
let sketchList = ref([])
|
let sketchList:any = computed(()=>{
|
||||||
|
return store.state.UploadFilesModule.showSketchboard})
|
||||||
const store = useStore();
|
const store = useStore();
|
||||||
let allBoardData:any = computed(()=>{return store.state.UploadFilesModule.allBoardData})
|
let allBoardData:any = computed(()=>{return store.state.UploadFilesModule.allBoardData})
|
||||||
let likeDesignCollectionList : any = computed(()=>{return store.state.HomeStoreModule.likeDesignCollectionList})
|
let likeDesignCollectionList : any = computed(()=>{return store.state.HomeStoreModule.likeDesignCollectionList})
|
||||||
@@ -96,9 +97,9 @@ export default defineComponent({
|
|||||||
watch: {
|
watch: {
|
||||||
allBoardData:{
|
allBoardData:{
|
||||||
handler(newVal:any,oldVal:any){
|
handler(newVal:any,oldVal:any){
|
||||||
this.sketchList = []
|
// this.sketchList = []
|
||||||
// this.sketch = [[],[],[]]
|
// this.sketch = [[],[],[]]
|
||||||
this.sketchList = this.allBoardData.sketchboardFiles
|
// this.sketchList = this.allBoardData.sketchboardFiles
|
||||||
this.setSketch()
|
this.setSketch()
|
||||||
},
|
},
|
||||||
immediate: true
|
immediate: true
|
||||||
|
|||||||
@@ -178,7 +178,6 @@ export default defineComponent({
|
|||||||
let sketchList = this.store.state.UploadFilesModule.sketchboard
|
let sketchList = this.store.state.UploadFilesModule.sketchboard
|
||||||
let arr:any = []
|
let arr:any = []
|
||||||
sketchList.forEach((item:any) => {
|
sketchList.forEach((item:any) => {
|
||||||
console.log(item);
|
|
||||||
let obj = {
|
let obj = {
|
||||||
designType:item.resData.designType,
|
designType:item.resData.designType,
|
||||||
isPin:item.pin ? 1 : 0,
|
isPin:item.pin ? 1 : 0,
|
||||||
@@ -193,8 +192,6 @@ export default defineComponent({
|
|||||||
.then((rv: any) => {
|
.then((rv: any) => {
|
||||||
this.isShowMark = false
|
this.isShowMark = false
|
||||||
this.store.commit('clearAllId')
|
this.store.commit('clearAllId')
|
||||||
console.log(rv,data);
|
|
||||||
|
|
||||||
this.store.commit('setShowSketchboard',rv)
|
this.store.commit('setShowSketchboard',rv)
|
||||||
GO.id = 0
|
GO.id = 0
|
||||||
this.showCollectionModal =false
|
this.showCollectionModal =false
|
||||||
|
|||||||
@@ -162,10 +162,11 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
|
|||||||
state.sketchboard = [...state.sketchboardFiles,...state.sketchGenerateFiles,...state.sketchMaterialFiles]
|
state.sketchboard = [...state.sketchboardFiles,...state.sketchGenerateFiles,...state.sketchMaterialFiles]
|
||||||
},
|
},
|
||||||
setShowSketchboard(state,files){
|
setShowSketchboard(state,files){
|
||||||
console.log(files);
|
|
||||||
|
|
||||||
state.showSketchboard = files
|
state.showSketchboard = files
|
||||||
},
|
},
|
||||||
|
clearShowSketchboard(state,files){
|
||||||
|
state.showSketchboard = []
|
||||||
|
},
|
||||||
setPrintboardFile(state,files){
|
setPrintboardFile(state,files){
|
||||||
state.printboardFiles = files
|
state.printboardFiles = files
|
||||||
state.printboard = [...state.printboardFiles,...state.printGenerateFiles,...state.printMaterialFiles]
|
state.printboard = [...state.printboardFiles,...state.printGenerateFiles,...state.printMaterialFiles]
|
||||||
|
|||||||
@@ -140,12 +140,12 @@ function removeDiv(element){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
const openGuide = () =>{
|
const openGuide = () =>{
|
||||||
driverObj__.drive();
|
// driverObj__.drive();
|
||||||
store = useStore()
|
store = useStore()
|
||||||
// driverObj__.moveTo(18);
|
// driverObj__.moveTo(18);
|
||||||
let data = {
|
let data = {
|
||||||
index:driverIndex__,
|
index:driverIndex__,
|
||||||
driver:true,
|
// driver:true,
|
||||||
}
|
}
|
||||||
store?.commit("setGuide", data);
|
store?.commit("setGuide", data);
|
||||||
// driverObj__.moveNext();
|
// driverObj__.moveNext();
|
||||||
|
|||||||
@@ -824,6 +824,7 @@ export default defineComponent({
|
|||||||
}]:[]
|
}]:[]
|
||||||
};
|
};
|
||||||
this.store.commit("setAllBoardDataChoose", collectionData);
|
this.store.commit("setAllBoardDataChoose", collectionData);
|
||||||
|
this.store.commit("setShowSketchboard", collectionData.sketchboardFiles);
|
||||||
this.store.commit(
|
this.store.commit(
|
||||||
"setDesignCollectionId",
|
"setDesignCollectionId",
|
||||||
data.collection.collectionId
|
data.collection.collectionId
|
||||||
|
|||||||
Reference in New Issue
Block a user