diff --git a/public/sketch_bar_chart.html b/public/sketch_bar_chart.html new file mode 100644 index 00000000..91135472 --- /dev/null +++ b/public/sketch_bar_chart.html @@ -0,0 +1,427 @@ + + + + + style category + + + + + + +
+
+
+

style category

+ +
+

1. ALL

+
+ +
+
+ +
+

2. Male

+
+ +
+
+ +
+

3. Female

+
+ +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/src/component/home/index.vue b/src/component/home/index.vue index 45a0b998..fceb79e9 100644 --- a/src/component/home/index.vue +++ b/src/component/home/index.vue @@ -226,7 +226,7 @@ export default defineComponent({ storeData.positionList = position store.commit('setProbject',storeData) // setChatData() - if(route.name == 'tools'){ + if(route.name == 'toolsPage'){ getCollection('tools',null) }else{ getCollection('design',null) diff --git a/src/component/home/newProject/workspace.vue b/src/component/home/newProject/workspace.vue index 738e129d..92f0a20a 100644 --- a/src/component/home/newProject/workspace.vue +++ b/src/component/home/newProject/workspace.vue @@ -84,7 +84,7 @@
-
{{ sourceType == 'edit' ? $t('HomeView.Save') : $t('HomeView.Start')}}
+
{{ sourceType == 'edit' ? $t('HomeView.Save') : $t('HomeView.Start')}}
@@ -201,12 +201,11 @@ export default defineComponent({ const formatterBrandDNA = (value: number)=>{ return `${value}%`; } - const complete = ()=>{ + const complete = (sourceType)=>{ // if(!data.selectObject.name){ // message.info(t('PrintboardUpload.jsContent7')) // return // } - console.log(data.selectObject) let value = { name:data.selectObject.name, process:props.httpWorkflowType, @@ -227,6 +226,10 @@ export default defineComponent({ } Https.axiosPost(Https.httpUrls.projectSaveOrUpdate,value).then((rv)=>{ if(rv){ + if((sourceType == 'edit' && data.selectObject.id == rv.id) || sourceType != 'edit'){ + store.state.Workspace.cachedRoutes = []; + store.commit('setProjectPath','') + } data.selectObject.id = rv.id let storeData = { diff --git a/src/component/toolsPage/index.vue b/src/component/toolsPage/index.vue index 5997d521..086c74dd 100644 --- a/src/component/toolsPage/index.vue +++ b/src/component/toolsPage/index.vue @@ -5,18 +5,24 @@ :productimgMenu="{value:'ToProductImage',label:$t('ProductImg.ProductImage')}" class="toProduct" :isState="openType =='toProduct'" - v-if="openType == 'toProduct'" + v-if="openType == 'toProduct' || currentProjectPath.includes('toProduct')" + v-show="openType == 'toProduct'" > - - - - + + + + @@ -62,7 +68,10 @@ export default defineComponent({ width: 800, height: 600, backgroundColor: "#f8f8f8", - } + }, + currentProjectPath:computed(() => { + return store.state.Workspace.projectPath + }) }) const dataDom:any = reactive({ toProduct:null as any, @@ -79,7 +88,6 @@ export default defineComponent({ const setIsShowMark = (boolean:boolean)=>{ data.isShowMark = boolean } - let settingGetHistory:any = inject('settingGetHistory') const open = (str:any)=>{ nextTick(()=>{ @@ -92,7 +100,7 @@ export default defineComponent({ (query:any, oldQuery:any) => { if(oldQuery && query == oldQuery)return const key = Object.keys(query)?.[0] - if(route.name == 'tools' && key){ + if(route.name == 'toolsPage' && key){ data.openType = query[key] nextTick(()=>{ open(query[key]) diff --git a/src/router/index.ts b/src/router/index.ts index 1fe4d6b1..a28a7f9d 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -67,7 +67,7 @@ const routes: Array = [ children: [ { path: "tools", - name: "tools", + name: "toolsPage", meta: { enter: "all",cache:true }, component: () => import("@/views/HomeView/Tools.vue"), }, diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index 0cda79c7..5ccf1380 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -779,9 +779,13 @@ export default defineComponent({ }).observe(imgParent) } const setRouter = (item, childItem) => { - let itemRouter = item.router - if (childItem.router) itemRouter = itemRouter + '?' + childItem.router - router.push(itemRouter) + if(store.state.Workspace.projectPath.includes(childItem.value)){ + router.push(store.state.Workspace.projectPath) + }else{ + let itemRouter = item.router + if (childItem.router) itemRouter = itemRouter + '?' + childItem.router + router.push(itemRouter) + } } const setHistory = (item, childItem) => { // router.push(`/home/tools?tools=toProduct&id=${childItem.id}`)