-
-
-
-
-
-
+
+
+
+
+
+
$emit('retrieve',value)">
@@ -39,6 +39,7 @@ export default defineComponent({
selectKey_:String,
workflowType:String,
httpWorkflowType:String,
+ workflowTitle:String,
},
emit:['projectComplete','retrieve'],
setup(props,{emit}) {
@@ -61,7 +62,7 @@ export default defineComponent({
//处理design数据
const setDesignData = (str:any)=>{
// if (str in dataDom) {
- if(str == 'workspace' || str == '')return
+ if(str == 'workspace' || str == 'yun' || str == '')return
return new Promise(async (resolve,reject)=>{
if(str == "colorBoard")await setColor()
// if(str == "sketchBoard")await setSketch()
diff --git a/src/component/HomePage/index/workflow/content/printDesign.vue b/src/component/HomePage/index/workflow/content/printDesign.vue
index e93d71df..7ad733b4 100644
--- a/src/component/HomePage/index/workflow/content/printDesign.vue
+++ b/src/component/HomePage/index/workflow/content/printDesign.vue
@@ -1,6 +1,6 @@
@@ -29,6 +29,7 @@ export default defineComponent({
},
workflowType:String,
httpWorkflowType:String,
+ workflowTitle:String,
},
emits:['projectComplete'],
setup(props,{emit}) {
diff --git a/src/component/HomePage/index/workflow/content/printingDesign3D.vue b/src/component/HomePage/index/workflow/content/printingDesign3D.vue
index fe58e9e3..649e56a6 100644
--- a/src/component/HomePage/index/workflow/content/printingDesign3D.vue
+++ b/src/component/HomePage/index/workflow/content/printingDesign3D.vue
@@ -1,6 +1,6 @@
-
+
@@ -31,6 +31,7 @@ export default defineComponent({
},
workflowType:String,
httpWorkflowType:String,
+ workflowTitle:String,
},
setup(props,{emit}) {
const store = useStore();
@@ -100,8 +101,16 @@ export default defineComponent({
),
generatePrintFiles: [],
};
+
store.commit("setAllBoardDataChoose", collectionData);
- store.commit('setPatternMaking3D',value.threeDSimpleId)
+ let patternMaking3DData = {
+ threeDsimpleId:value.patternMaking3D.threeDSimpleId,
+ collectionElementId:value.patternMaking3D.collectionElementId,
+ printMinioUrl:value.patternMaking3D.printMinioUrl,
+ x:value.patternMaking3D.x,
+ y:value.patternMaking3D.y,
+ };
+ store.commit('setPatternMaking3D',patternMaking3DData)
}
const dealViewChooseData = (data: any,str:string)=> {
if (!data) {
diff --git a/src/component/HomePage/index/workflow/content/productDrawingDesign.vue b/src/component/HomePage/index/workflow/content/productDrawingDesign.vue
index 45f39e51..5bdd0dc1 100644
--- a/src/component/HomePage/index/workflow/content/productDrawingDesign.vue
+++ b/src/component/HomePage/index/workflow/content/productDrawingDesign.vue
@@ -1,6 +1,6 @@
-
+
-
+
@@ -54,6 +54,7 @@ export default defineComponent({
},
workflowType:String,
httpWorkflowType:String,
+ workflowTitle:String,
},
emits:['projectComplete'],
setup(props,{emit}) {
diff --git a/src/component/HomePage/index/workflow/content/singleProductDesign.vue b/src/component/HomePage/index/workflow/content/singleProductDesign.vue
index bee94767..070710f4 100644
--- a/src/component/HomePage/index/workflow/content/singleProductDesign.vue
+++ b/src/component/HomePage/index/workflow/content/singleProductDesign.vue
@@ -1,6 +1,6 @@
-
+
@@ -50,6 +50,7 @@ export default defineComponent({
},
workflowType:String,
httpWorkflowType:String,
+ workflowTitle:String,
},
setup(props,{emit}) {
const store = useStore();
diff --git a/src/component/HomePage/index/workflow/content/sketchDesign.vue b/src/component/HomePage/index/workflow/content/sketchDesign.vue
index 6b391183..2a99ac03 100644
--- a/src/component/HomePage/index/workflow/content/sketchDesign.vue
+++ b/src/component/HomePage/index/workflow/content/sketchDesign.vue
@@ -1,6 +1,6 @@
-
+
@@ -33,6 +33,7 @@ export default defineComponent({
},
workflowType:String,
httpWorkflowType:String,
+ workflowTitle:String,
},
setup(props,{emit}) {
const store = useStore();
diff --git a/src/component/HomePage/index/workflow/index.vue b/src/component/HomePage/index/workflow/index.vue
index 9950b71b..c52d0411 100644
--- a/src/component/HomePage/index/workflow/index.vue
+++ b/src/component/HomePage/index/workflow/index.vue
@@ -26,7 +26,7 @@
-
+
@@ -62,7 +62,10 @@ export default defineComponent({
props:{
workflowType:{
type:String,
-
+ },
+ workflowTitle:{
+ type:String,
+ default:''
},
httpWorkflowType:{
type:String,
diff --git a/src/component/HomePage/index/workflow/nav.vue b/src/component/HomePage/index/workflow/nav.vue
index 54be7f0d..63260a06 100644
--- a/src/component/HomePage/index/workflow/nav.vue
+++ b/src/component/HomePage/index/workflow/nav.vue
@@ -21,7 +21,8 @@
{{ item.name }}
-