diff --git a/core/core-frontend/src/assets/img/nav1.png b/core/core-frontend/src/assets/img/nav1.png new file mode 100644 index 0000000..ddfb893 Binary files /dev/null and b/core/core-frontend/src/assets/img/nav1.png differ diff --git a/core/core-frontend/src/assets/img/nav2.png b/core/core-frontend/src/assets/img/nav2.png new file mode 100644 index 0000000..3ea33f2 Binary files /dev/null and b/core/core-frontend/src/assets/img/nav2.png differ diff --git a/core/core-frontend/src/assets/img/nav3.png b/core/core-frontend/src/assets/img/nav3.png new file mode 100644 index 0000000..2d16302 Binary files /dev/null and b/core/core-frontend/src/assets/img/nav3.png differ diff --git a/core/core-frontend/src/assets/img/nav4.png b/core/core-frontend/src/assets/img/nav4.png new file mode 100644 index 0000000..ad9dabe Binary files /dev/null and b/core/core-frontend/src/assets/img/nav4.png differ diff --git a/core/core-frontend/src/assets/img/navbg.png b/core/core-frontend/src/assets/img/navbg.png new file mode 100644 index 0000000..5fd47ac Binary files /dev/null and b/core/core-frontend/src/assets/img/navbg.png differ diff --git a/core/core-frontend/src/assets/img/navmenu.png b/core/core-frontend/src/assets/img/navmenu.png new file mode 100644 index 0000000..d1a6e6d Binary files /dev/null and b/core/core-frontend/src/assets/img/navmenu.png differ diff --git a/core/core-frontend/src/assets/img/navmenucheck.png b/core/core-frontend/src/assets/img/navmenucheck.png new file mode 100644 index 0000000..43b0e9c Binary files /dev/null and b/core/core-frontend/src/assets/img/navmenucheck.png differ diff --git a/core/core-frontend/src/assets/img/navwbg.png b/core/core-frontend/src/assets/img/navwbg.png new file mode 100644 index 0000000..2f5073c Binary files /dev/null and b/core/core-frontend/src/assets/img/navwbg.png differ diff --git a/core/core-frontend/src/assets/img/资源 9.png b/core/core-frontend/src/assets/img/资源 9.png new file mode 100644 index 0000000..9f1a0b2 Binary files /dev/null and b/core/core-frontend/src/assets/img/资源 9.png differ diff --git a/core/core-frontend/src/components/visualization/DvSidebar.vue b/core/core-frontend/src/components/visualization/DvSidebar.vue index 7cd4842..7853d79 100644 --- a/core/core-frontend/src/components/visualization/DvSidebar.vue +++ b/core/core-frontend/src/components/visualization/DvSidebar.vue @@ -587,4 +587,7 @@ color: #ffffff !important; .ed-input-number__decrease:hover, .ed-input-number__increase:hover { color: #0089ff; } +.ed-select .ed-input.is-disabled:not(.ed-input--dark) .ed-input__wrapper:hover{ + box-shadow: none!important;; +} diff --git a/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue b/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue index c8d39f0..f0d6355 100644 --- a/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue +++ b/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue @@ -544,4 +544,10 @@ function delTreeClic(){ // 删除 box-shadow: none; border: 1px solid #5f5f5f; } +.ed-select .ed-input.is-disabled:not(.ed-input--dark) .ed-input__wrapper:hover{ + box-shadow: none !important; +} +.ed-input.is-disabled .ed-input__wrapper{ + box-shadow: none !important; +} diff --git a/core/core-frontend/src/viewsnew/application/module/Navbar/index.vue b/core/core-frontend/src/viewsnew/application/module/Navbar/index.vue new file mode 100644 index 0000000..28783a4 --- /dev/null +++ b/core/core-frontend/src/viewsnew/application/module/Navbar/index.vue @@ -0,0 +1,99 @@ + + + + \ No newline at end of file diff --git a/core/core-frontend/src/viewsnew/application/module/index.vue b/core/core-frontend/src/viewsnew/application/module/index.vue index ed9b8e6..5cf301e 100644 --- a/core/core-frontend/src/viewsnew/application/module/index.vue +++ b/core/core-frontend/src/viewsnew/application/module/index.vue @@ -7,7 +7,7 @@ import { findApplicationById } from "@/api/application/application"; import { useRouter, useRoute } from 'vue-router' import DvPreview from '@/viewsnew/data-visualization/DvPreview.vue' import FormCreate from '@/viewsnew/common/FormCreate.vue' - +import Navbar from '@/viewsnew/application/module/Navbar/index.vue' import DePreview from '@/components/data-visualization/canvas/DePreview.vue' import { initCanvasData, initCanvasDataPrepare, onInitReady } from '@/utils/canvasUtils' @@ -27,6 +27,7 @@ const dataInitState = ref(true) const downloadStatus = ref(false) const dvPreviewRef = ref(null) const showPosition = ref("preview") +const isNavbar = ref(false) // const noClose = ref(false) // const props = defineProps({ // showPosition: { @@ -110,6 +111,7 @@ const loadCanvasData = (dvId, weight?, ext?) => { function handleNodeClick(e){ isFormCreate.value = false dataInitState.value = false + isNavbar.value = false if(e.type == '0301'){ busiFlag.value = 'dashboard' loadCanvasData(e.id,9,0) @@ -119,6 +121,8 @@ function handleNodeClick(e){ }else if(e.type == '09'){ moduleInfo.value = e isFormCreate.value = true + } else if(e.type == '02'){ + isNavbar.value = true } } onBeforeMount(() => { @@ -143,6 +147,7 @@ onBeforeMount(() => { :download-status="downloadStatus" > +