diff --git a/core/core-frontend/src/assets/img/资源 9.png b/core/core-frontend/src/assets/img/menuhoverbg.png similarity index 100% rename from core/core-frontend/src/assets/img/资源 9.png rename to core/core-frontend/src/assets/img/menuhoverbg.png diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue index 5fc122b..dc62abd 100644 --- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue +++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue @@ -51,7 +51,7 @@ " @click="downloadViewDetails('view')" > - {{ t('chart.export_excel') }} @@ -68,7 +68,7 @@ state.dataFrom === 'template' " > - {{ t('chart.export_raw_details') }} diff --git a/core/core-frontend/src/router/index.ts b/core/core-frontend/src/router/index.ts index ab66a0e..6280169 100644 --- a/core/core-frontend/src/router/index.ts +++ b/core/core-frontend/src/router/index.ts @@ -219,6 +219,13 @@ export const routes: AppRouteRecordRaw[] = [ hidden: true, meta: {}, component: () => import('@/viewsnew/application/menuconfig/index.vue') + }, + { + path: '/PreviewSystem', + name: 'PreviewSystem', + hidden: true, + meta: {}, + component: () => import('@/viewsnew/application/PreviewSystem.vue') } ] diff --git a/core/core-frontend/src/viewsnew/application/PreviewSystem.vue b/core/core-frontend/src/viewsnew/application/PreviewSystem.vue new file mode 100644 index 0000000..d011b26 --- /dev/null +++ b/core/core-frontend/src/viewsnew/application/PreviewSystem.vue @@ -0,0 +1,42 @@ + + + + + + + + diff --git a/core/core-frontend/src/viewsnew/application/index.vue b/core/core-frontend/src/viewsnew/application/index.vue index 94c09b8..82674c0 100644 --- a/core/core-frontend/src/viewsnew/application/index.vue +++ b/core/core-frontend/src/viewsnew/application/index.vue @@ -68,6 +68,13 @@ function delClick(row){ }) } +function preview(row){ + const route = router.resolve({ + path: '/PreviewSystem', + query: { id: row.id,name:row.name } + }); + window.open(route.href, '_blank'); +} @@ -112,7 +119,7 @@ function delClick(row){ - 预览 + 预览 模块配置 diff --git a/core/core-frontend/src/viewsnew/application/menuconfig/assocmenu.vue b/core/core-frontend/src/viewsnew/application/menuconfig/assocmenu.vue index 9c61ce8..c2c8982 100644 --- a/core/core-frontend/src/viewsnew/application/menuconfig/assocmenu.vue +++ b/core/core-frontend/src/viewsnew/application/menuconfig/assocmenu.vue @@ -9,6 +9,7 @@ import { ElTree,FormInstance } from 'element-plus' import { publicTree } from '@/utils/validate'; import { setModuleId } from '@/api/permission/menu' import { ElMessage, ElMessageBox } from 'element-plus' +import Navbar from '@/viewsnew/application/module/Navbar/index.vue' const props = defineProps({ applicationId:String, assoccurrentid:String, @@ -43,6 +44,7 @@ const assocmenuname = ref('') const moduletreeData = ref([]) const moduletreeRef = ref>() const assoccurrentid = ref('') +const isNavbar = ref(false) const loadCanvasData = (dvId, weight?, ext?) => { const initMethod = initCanvasData dataInitState.value = false @@ -81,6 +83,7 @@ const handleNodeClick = (e: any) => { // 树节点点击 isFormCreate.value = false dataInitState.value = false + isNavbar.value = false if(e.type == '0301'){ busiFlag.value = 'dashboard' loadCanvasData(e.id,9,0) @@ -90,6 +93,8 @@ const handleNodeClick = (e: any) => { }else if(e.type == '09'){ moduleInfo.value = e isFormCreate.value = true + } else if(e.type == '02'){ + isNavbar.value = true } rightloading.value = false } @@ -198,6 +203,7 @@ function handleDatasetName() { :download-status="downloadStatus" > + diff --git a/core/core-frontend/src/viewsnew/application/menuconfig/assocmodule.vue b/core/core-frontend/src/viewsnew/application/menuconfig/assocmodule.vue index 2c043d8..7c66ab6 100644 --- a/core/core-frontend/src/viewsnew/application/menuconfig/assocmodule.vue +++ b/core/core-frontend/src/viewsnew/application/menuconfig/assocmodule.vue @@ -5,6 +5,7 @@ import FormCreate from '@/viewsnew/common/FormCreate.vue' import { initCanvasData } from '@/utils/canvasUtils' import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import { moduleList } from '@/api/application/module' +import Navbar from '@/viewsnew/application/module/Navbar/index.vue' const props = defineProps({ moduleinfo:Object, applicationId:String @@ -25,6 +26,7 @@ const busiFlag = ref('dataV') const dataInitState = ref(true) const downloadStatus = ref(false) const loading = ref(false) +const isNavbar = ref(false) const loadCanvasData = (dvId, weight?, ext?) => { const initMethod = initCanvasData dataInitState.value = false @@ -84,6 +86,7 @@ console.log(props.applicationId,props.moduleinfo) function handleNodeClick(e){ isFormCreate.value = false dataInitState.value = false + isNavbar.value = false if(e.type == '0301'){ busiFlag.value = 'dashboard' loadCanvasData(e.id,9,0) @@ -93,12 +96,14 @@ function handleNodeClick(e){ }else if(e.type == '09'){ moduleInfo.value = e isFormCreate.value = true + } else if(e.type == '02'){ + isNavbar.value = true } loading.value = false } - + + + \ No newline at end of file