diff --git a/frontend/src/routers/index.ts b/frontend/src/routers/index.ts index 9e7f20e..a1aea8f 100644 --- a/frontend/src/routers/index.ts +++ b/frontend/src/routers/index.ts @@ -30,6 +30,7 @@ const routerMode = { * @param meta.isKeepAlive ==> 当前路由是否缓存 * */ const router = createRouter({ + history: routerMode[mode](), routes: [...staticRouter], // 不区分路由大小写,非严格模式下提供了更宽松的路径匹配 @@ -68,10 +69,9 @@ router.beforeEach(async (to, from, next) => { await initDynamicRouter() return next({ ...to, replace: true }) } - //console.log(to) + // 7.存储 routerName 做按钮权限筛选 authStore.setRouteName(to.name as string) - // 8.正常访问页面 next() }) diff --git a/frontend/src/routers/modules/dynamicRouter.ts b/frontend/src/routers/modules/dynamicRouter.ts index 2aaa3c5..043e2d9 100644 --- a/frontend/src/routers/modules/dynamicRouter.ts +++ b/frontend/src/routers/modules/dynamicRouter.ts @@ -41,6 +41,7 @@ export const initDynamicRouter = async () => { if (item.component && typeof item.component == "string") { item.component = modules["/src/views" + item.component + ".vue"]; } + if (item.meta.isFull) { router.addRoute(item as unknown as RouteRecordRaw); } else { diff --git a/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue b/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue new file mode 100644 index 0000000..f60a12f --- /dev/null +++ b/frontend/src/views/machine/controlSource/components/controlSourceDetail.vue @@ -0,0 +1,473 @@ + + + + + diff --git a/frontend/src/views/machine/controlSource/components/tree.vue b/frontend/src/views/machine/controlSource/components/tree.vue new file mode 100644 index 0000000..cf1662e --- /dev/null +++ b/frontend/src/views/machine/controlSource/components/tree.vue @@ -0,0 +1,106 @@ + + + diff --git a/frontend/src/views/machine/controlSource/index.vue b/frontend/src/views/machine/controlSource/index.vue new file mode 100644 index 0000000..f973864 --- /dev/null +++ b/frontend/src/views/machine/controlSource/index.vue @@ -0,0 +1,211 @@ + + + diff --git a/frontend/src/views/machine/testScript/components/testScriptDetail.vue b/frontend/src/views/machine/testScript/components/testScriptDetail.vue index 2265221..e106767 100644 --- a/frontend/src/views/machine/testScript/components/testScriptDetail.vue +++ b/frontend/src/views/machine/testScript/components/testScriptDetail.vue @@ -258,11 +258,13 @@ const column = ref([ ]) // 获取树 const getTree = () => { + console.log('props.formContent.id', props.formContent.id) getTreeData({ scriptId: props.formContent.id }).then(res => { if (res.code === 'A0000') { treeData.value = res.data + console.log('tree',treeData.value) // 添加tab子项 props.options.forEach((k: any, i: number) => { tabData.value[i].children = [] @@ -385,7 +387,7 @@ const copyRow = async (row: any) => { } // 查看 const view = (row: Partial = {}) => { - + getCommunication() //当前点击的一级tab const parentTabName = communicationList.value.find(t => t.id === activeName.value)?.name || '未找到对应名称'; @@ -441,6 +443,7 @@ const addTab = (row: any) => { const saveTheNewsletter = () => {} onMounted(() => { getTree() + console.log('123',props.options) props.options.forEach((item: any) => { tabData.value.push({ label: item.label.replace(/准确度|检测/g, ''), @@ -453,6 +456,7 @@ onMounted(() => { valueCode.value = dictStore .getDictData('Script_Value_Type') .filter(item => item.id == props.formContent.valueType)[0].code + })