From 6db26177ccdd053fa3ec338c540368257cee313e Mon Sep 17 00:00:00 2001 From: jingna <1264204245@qq.com> Date: Mon, 26 May 2025 10:44:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=BC=E8=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/assets/img/nav1.png | Bin 0 -> 741 bytes core/core-frontend/src/assets/img/nav2.png | Bin 0 -> 525 bytes core/core-frontend/src/assets/img/nav3.png | Bin 0 -> 443 bytes core/core-frontend/src/assets/img/nav4.png | Bin 0 -> 470 bytes core/core-frontend/src/assets/img/navbg.png | Bin 0 -> 4129 bytes core/core-frontend/src/assets/img/navmenu.png | Bin 0 -> 373 bytes .../src/assets/img/navmenucheck.png | Bin 0 -> 370 bytes core/core-frontend/src/assets/img/navwbg.png | Bin 0 -> 1278 bytes core/core-frontend/src/assets/img/资源 9.png | Bin 0 -> 4172 bytes .../components/visualization/DvSidebar.vue | 3 + .../application/module/Leftmenu/index.vue | 6 ++ .../application/module/Navbar/index.vue | 99 ++++++++++++++++++ .../src/viewsnew/application/module/index.vue | 7 +- 13 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 core/core-frontend/src/assets/img/nav1.png create mode 100644 core/core-frontend/src/assets/img/nav2.png create mode 100644 core/core-frontend/src/assets/img/nav3.png create mode 100644 core/core-frontend/src/assets/img/nav4.png create mode 100644 core/core-frontend/src/assets/img/navbg.png create mode 100644 core/core-frontend/src/assets/img/navmenu.png create mode 100644 core/core-frontend/src/assets/img/navmenucheck.png create mode 100644 core/core-frontend/src/assets/img/navwbg.png create mode 100644 core/core-frontend/src/assets/img/资源 9.png create mode 100644 core/core-frontend/src/viewsnew/application/module/Navbar/index.vue 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 0000000000000000000000000000000000000000..ddfb89378acf5b6a9de21cf5cb4b0159e74c1e07 GIT binary patch literal 741 zcmVL8;L7kJ5m4etjERW}zJSOBz#I4i zEZCFq0PJu_d;)iFi3?ro3%D_ckbnXKA>ufE&2XVuoNDGydvA9Q8RJPRom5wy|M{p> zeLCfw{a-TbTaXycnQmL0<}7&Ct9y~>DHIN8V72F#x1 ziO6vccok>LvqrLTYAHozx8NzP8kGg9XMBz8_@O+1#G#6PugaLTJ)e{pxktejTxfaq zCBCbGr{dhWoGnStV;si1{?mOA2Nt~h6t{Zz!+vaL)&|&HCi}cj9bovVVt?cPG7 zfqgxeep3O4FYr~5t|bgJ&j;e7UsggfXPm}LC0qr3FCN1nZpR7Z5LnT^Dscpp#v zH#L7;v{HAPi8swe=5_&pC=TFGZmhm>OngRf&RWy%$$t}GukNA&$3?SoE0&+enk+5pLw@1-7#~ei}Z(2Y8AH4mc32_K@^3*F&HZmV`X9jh1OE5g**U4tp&V++Zqe7 zvqYaj3JMDo@dZR<&=MoDq0q+0m?$>>G}mG-f@E2C5iC5(Wd82V*?afgnK6h67TdrL z!^er%sZhsY9jK0g>>DAhM|I#_;APkZ1`@y$P!C~4R~-crfI!8-B+wii1wk+TDOsq$ zNgD>zKmmvXd(Dl77r+6gfHIH|mm0NSlNpEs2ih%f9qn&+nWTU?*3K2a!e}55++jUP z3#2orho3H{(btWI)q%-0bUC01Obb*1W}hG5{CsF2GOSl;0@<$gICimZ0zLnkAF@T% zn=UxOb*u9}KJfuK;ZnmRUqzCL%!mkXMH~5E^Ud}7_{!~-%soBqdhC%zWG0aG-4HG{ zY8UEUKU>c*8Y^YLhz(3;AVOONZer-f8IV!s1}DQVi~>92p)f@jt3+o|vY6I61L9R^ zC%k9ay#!L=r{o>%kyO<2f)XTjJ_6i(k@b~+hkPT5)Ve0J{nia6eLX$ms?Z2f3wq%O z&NClk>52b)Q=5)=V?x{y++PyV+W*J9aYHuT|axSM1P?`hBZ6f8DEXRI{zu0-dV?k9Zbq&1JzMia}L{4V`tU7@G zD59KE0lX-Dwha&%0YjjOD3@;41qeW4DR2yIkGcTVslPCROkg9R0<+Fw0tqk&V&DtUCa|?{ zFb9~1U`>|s3|M;NbE~t^KnJJ(E}KDrd?t|YFjlfR%+h&b%|+dPrf1+%0^iLyvkW)| z?iAJm*c8|jFu4zwSbbyLQ*Ghb@ZM#QJh2(ol+S?)@L>Hj1B@&l0~;SKXllopu^HSA zOheDPruNOO`c9>vQp?a7SnvA7Z47gup=7C5e@xxB#5p&P)W6~G3E+GD%DHi9r=ZRx ls9xB0LAeXGt#hkizW~VnEJV;`2xkBQ002ovPDHLkV1kaDym$Zr literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ad9dabefeab4d2978a2a5bfbf713e9f4dfe049ec GIT binary patch literal 470 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 b$8Ws08CH8$CYdGz!;!($)z4*}Q$iB}+%%-2 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..43b0e9c01a9afec1f9645fc4647a9952bb35a6ca GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0vp^@jxuk!3HE7MFeL8Db50q$YKTtZXpn6ymYtj4+8_E zil>WXNJit^TN}L&2Qaig{I6zSTAb^l&*XV@(cxIW{}VJHF4D-GY5B6`({7W$2gFi$m)UjgPQ5vM zKkud-){6YP;OsA1&sRt6zo~ip^JxirDY+|Z)nBL2Sf07jZtlJ{PKI2GYoe|S^>2Qz z_Ca*Ts`LjE60gj*o|C-be?|M&nUAe9@h3 zYzFrGIW)8HyzlS*?PPZ!HffUV=66^Be)IJGdoo;q>C-zuyzt(?V1P1iMDo3h3tYPRKB|Hmiq z>ilyLeltfO?Z5ius5$}wEU!#Ai$ceBWp2Dn?{;{n#5*P4DYa80bWR)d+MF9Rzv;TB zYg5)(M9sEr^^Up&001TkB>+HY5J~`m&LETk0G&Z70RTE9E|kvcRN_7W0Ei5wOIp)g zI+wT?0Kk%q3#Fb0dRt%U0>K0TNGJY#N<9s9QL6+K03emPP#S4tyqaJF03=gClvXs* z&-#X70sy2|FO*g^&=sxflGb!zw>8pmT!ml)05ldJN|Qi3rn86t(cyQ32>_5zcqmN* zX}a000TZ{qQV-1ORA3TqqGp0Du<6|L(hyHV7mDKuYny`;I^Y z03;R{N(2%BpauLnbO1nS5J~`m&LETk0G&Z70RTFKPyzsS2B8E1=#2igSFY*ui|Zem zgEzK68GgU}0e^l10I*Q~&tCpql0GyC?;d~W7eWaDuxQrb68`Y?>u2?b3P~FOD`kgA zQehm+7`1;iXH3Vk!}?XVs*YXz+K@8yoddYR|DF8=-MAKN}V^^VQa z*>TrnB`bB`tX`dSx#T?8q^|A!yz+V9?edtf2g!dQL+kjTlkR!p_3U${^8Ik_A5;6F zzWZD+a-DC_ko6%ornSO_)-3N4x2}mjZTEkAdU5yEiN}v5DJzOXlD1zvv85I5jHkr} zf$N;_!Jb#ln~u9*n9F0?xTgDsBjmog&o>X%+41mx=lgKYnaXA!%Aqf;b?*0po@1Zt zCsI{y_g+=^scKzZP}ue?&-H~=$X@%N3O(!9tlLL;099QNQ~BDs*M{^LTccj>Df@M; o?xE?PF*WM!m7=djd8YmU0qNX_4_m?55C8xG07*qoM6N<$f;C!%lmGw# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9f1a0b2f0fe1aa00e4e1416964fa657f0f7b002c GIT binary patch literal 4172 zcmeAS@N?(olHy`uVBq!ia0y~yU_8vgzrMq>1 z7#R5fdAc};RLpsM^I+FhR))5R_2(=OOUketb4GhCPMhelb84P~PsU1dff7c?+XVtC zc^X{hc`S|{VUm|rHh);cW_8AZeeTCCFT}1e?>%44djDN)4fp1oITCG&7UiG6ZC!db z`MSHe_j_K35BA@(%HO{`c<_ygrgJ zNjO>(j?9v9@y&;?Uw*oEtKyzBLqeQeyZ-X}H8md|eyrqYY$$*EWBL5KGHr=7_SWsS zwYqWtf92ONFN4+X_m^bdJIwGPHbQ2-jAiA=?yrYmetCGUSG!*DR9vQ`d`$k=N~Sf4O=8`uyCO+Iv=y7@$45ummep?A^5x!~?Mw%vzoK=)|1*Uzn$sJ)+D{2MJiy@T>gTe~DWM4f D6NPvN literal 0 HcmV?d00001 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 7097a87..6acc763 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..92b4c25 --- /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" > + From 56501aa5d0efdb02d1b6237455d06d42f27f77a8 Mon Sep 17 00:00:00 2001 From: jingna <1264204245@qq.com> Date: Mon, 26 May 2025 10:44:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/viewsnew/application/module/Navbar/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-frontend/src/viewsnew/application/module/Navbar/index.vue b/core/core-frontend/src/viewsnew/application/module/Navbar/index.vue index 92b4c25..28783a4 100644 --- a/core/core-frontend/src/viewsnew/application/module/Navbar/index.vue +++ b/core/core-frontend/src/viewsnew/application/module/Navbar/index.vue @@ -20,7 +20,7 @@ const checkindex = ref(null)
12:45:35
2022-08-16 星期二
-
+
{{ item.name }}