修复tools里面的路由跳转会出现两个tools页面
This commit is contained in:
@@ -6,17 +6,23 @@
|
|||||||
class="toProduct"
|
class="toProduct"
|
||||||
:isState="openType =='toProduct'"
|
:isState="openType =='toProduct'"
|
||||||
v-if="openType == 'toProduct' || currentProjectPath.includes('toProduct')"
|
v-if="openType == 'toProduct' || currentProjectPath.includes('toProduct')"
|
||||||
|
v-show="openType == 'toProduct'"
|
||||||
></toProduct>
|
></toProduct>
|
||||||
<toProduct ref="relight"
|
<toProduct ref="relight"
|
||||||
:productimgMenu="{value:'Relight',label:$t('ProductImg.Relight')}"
|
:productimgMenu="{value:'Relight',label:$t('ProductImg.Relight')}"
|
||||||
class="relight"
|
class="relight"
|
||||||
:isState="openType =='relight'"
|
:isState="openType =='relight'"
|
||||||
v-if="openType == 'relight' || currentProjectPath.includes('relight')"
|
v-if="openType == 'relight' || currentProjectPath.includes('relight')"
|
||||||
|
v-show="openType == 'relight'"
|
||||||
></toProduct>
|
></toProduct>
|
||||||
<poseTransfer v-if="openType == 'poseTransfer' || currentProjectPath.includes('poseTransfer')" ref="poseTransfer"></poseTransfer>
|
<poseTransfer v-if="openType == 'poseTransfer' || currentProjectPath.includes('poseTransfer')"
|
||||||
<deReconstruction v-if="openType == 'deReconstruction' || currentProjectPath.includes('deReconstruction')" ref="deReconstruction"></deReconstruction>
|
v-show="openType == 'poseTransfer'" ref="poseTransfer"></poseTransfer>
|
||||||
<patternMaking3D v-if="openType == 'patternMaking3D' || currentProjectPath.includes('patternMaking3D')" ref="patternMaking3D"></patternMaking3D>
|
<deReconstruction v-if="openType == 'deReconstruction' || currentProjectPath.includes('deReconstruction')"
|
||||||
<canvasUpload v-if="openType == 'canvasUpload' || currentProjectPath.includes('canvasUpload')" ref="canvasUpload" @canvasChangeGetJSON="canvasChangeGetJSON" :isSubmitCanvasJSON="true"></canvasUpload>
|
v-show="openType == 'deReconstruction'" ref="deReconstruction"></deReconstruction>
|
||||||
|
<patternMaking3D v-if="openType == 'patternMaking3D' || currentProjectPath.includes('patternMaking3D')"
|
||||||
|
v-show="openType == 'patternMaking3D'" ref="patternMaking3D"></patternMaking3D>
|
||||||
|
<canvasUpload v-if="openType == 'canvasUpload' || currentProjectPath.includes('canvasUpload')"
|
||||||
|
v-show="openType == 'canvasUpload'" ref="canvasUpload" @canvasChangeGetJSON="canvasChangeGetJSON" :isSubmitCanvasJSON="true"></canvasUpload>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -779,9 +779,13 @@ export default defineComponent({
|
|||||||
}).observe(imgParent)
|
}).observe(imgParent)
|
||||||
}
|
}
|
||||||
const setRouter = (item, childItem) => {
|
const setRouter = (item, childItem) => {
|
||||||
let itemRouter = item.router
|
if(store.state.Workspace.projectPath.includes(childItem.value)){
|
||||||
if (childItem.router) itemRouter = itemRouter + '?' + childItem.router
|
router.push(store.state.Workspace.projectPath)
|
||||||
router.push(itemRouter)
|
}else{
|
||||||
|
let itemRouter = item.router
|
||||||
|
if (childItem.router) itemRouter = itemRouter + '?' + childItem.router
|
||||||
|
router.push(itemRouter)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
const setHistory = (item, childItem) => {
|
const setHistory = (item, childItem) => {
|
||||||
// router.push(`/home/tools?tools=toProduct&id=${childItem.id}`)
|
// router.push(`/home/tools?tools=toProduct&id=${childItem.id}`)
|
||||||
|
|||||||
Reference in New Issue
Block a user