From e3848c892b0e4538f6ed998a43d45197bed0ad0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= Date: Mon, 26 Feb 2024 10:39:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=AE=A1=E8=BE=96=E8=B7=AF=E6=AE=B5,?= =?UTF-8?q?=E8=B7=AF=E6=AE=B5=E9=87=8C=E7=A8=8B=E5=8A=A0km=E5=8D=95?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/JiHeExpressway/components/Card1/index.vue | 2 +- .../views/jurisdictionalManagement/index.vue | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue index dc21c63a..fe136d79 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue @@ -6,7 +6,7 @@ {{ item.label }}: - {{ getValue(item.key) }} + {{ getValue(item.key) }}{{ item.suffix }}

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/index.vue index d5e86e10..ccf5c1e6 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/index.vue @@ -101,7 +101,8 @@ export default { }, { key: "mileage", - label: "路段里程" + label: "路段里程", + suffix: "km" } ], // data: Array.from({ length: 20 }).map(() => ({ @@ -213,11 +214,11 @@ export default { line-height: 16px; span:first-child { - color: rgba(0, 179, 204, 1)#000; + color: #FFDB82; } span:last-child { - color: rgba(217, 0, 27, 1) + color: #00EBC1; } } } From bd98f65045e0ab7ed9358485bc5e60f84021044c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= Date: Mon, 26 Feb 2024 10:40:53 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=9C=BA=E6=9E=84=E6=8A=A5=E9=94=99=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../businessDataManagement/views/emergencyAgencies/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/index.vue index d3352520..ac0da082 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/index.vue @@ -121,7 +121,7 @@ export default { await confirm({ message: "是否要删除该机构?" }); request({ - url: `/business/shifts/${data.id}`, + url: `/business/organization/${data.dcOrganizations.id}`, method: "DELETE", data: {} }) @@ -168,7 +168,7 @@ export default { } }).then(result => { if (result.code != 200) return; - + this.data = result.rows; this.setTotal(result.total) }).finally(() => { From f0d5b90aa6a16e7b59403a7555a4047689ec834e Mon Sep 17 00:00:00 2001 From: hui <770260999@qq.com> Date: Mon, 26 Feb 2024 13:51:25 +0800 Subject: [PATCH 3/6] =?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/assets/styles/JiHeExpressway.scss | 44 ++++++++++++------- ruoyi-ui/src/router/routerCreater.js | 31 ++++++++++++- .../components/HeaderMenu/CustomMenu.vue | 6 +-- .../components/HeaderMenu/index.vue | 6 ++- .../components/infoBoard/BoardInfoEditor.vue | 2 +- .../components/infoBoard/BoardPreview.vue | 34 +++++++++----- .../components/infoBoard/BoardTplPreview.vue | 18 +++++--- .../statisticalAnalysis/index.vue | 3 +- .../pages/service/sensitive/index.vue | 2 +- 9 files changed, 103 insertions(+), 43 deletions(-) diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss index f12ce990..6d8b2f91 100644 --- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss +++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss @@ -141,6 +141,7 @@ // 导航菜单 .el-menu--popup { + border-radius: 0; background: linear-gradient(180deg, rgba(6, 66, 88, 0.5) 0%, #064258 93%); border: 1px solid; @@ -150,6 +151,25 @@ rgba(55, 231, 255, 0) ) 10 10; + + + @mixin activeBtn { + color: #fff; + background: linear-gradient(90deg, + rgba(164, 255, 250, 0) 0%, + rgba(164, 255, 250, 0.42) 50%, + rgba(164, 255, 250, 0) 100%); + border: 1px solid; + border-image: linear-gradient(90deg, + rgba(190, 255, 246, 0.03) 0%, + rgba(190, 255, 246, 1) 50%, + rgba(190, 255, 246, 0.03) 100%) 1 1; + + p { + color: #fff; + } + } + .el-submenu__title { } @@ -170,27 +190,17 @@ color: #00d1ff; } - &:hover { - color: #fff; - background: linear-gradient( - 90deg, - rgba(164, 255, 250, 0) 0%, - rgba(164, 255, 250, 0.42) 50%, - rgba(164, 255, 250, 0) 100% - ); - border: 1px solid; - border-image: linear-gradient( - 90deg, - rgba(190, 255, 246, 0.03) 0%, - rgba(190, 255, 246, 1) 50%, - rgba(190, 255, 246, 0.03) 100% - ) - 1 1; + &:hover{ + @include activeBtn; } p { - color: #fff; + color: #00d1ff; } } + .el-menu-item.menuActive, .menuActive .el-submenu__title{ + @include activeBtn; + } + .el-menu-item.is-active, .el-submenu__title.is-active { color: #fff; diff --git a/ruoyi-ui/src/router/routerCreater.js b/ruoyi-ui/src/router/routerCreater.js index 33d2266e..75122681 100644 --- a/ruoyi-ui/src/router/routerCreater.js +++ b/ruoyi-ui/src/router/routerCreater.js @@ -10,14 +10,33 @@ import menuData from "@/common/menuData"; // 公共路由 import {constantRoutes} from "./index.js"; + +let ids = []; //层级id列表，每级菜单记录一个id，供菜单回显使用 +let prev = ""; //前缀，用来区分左右侧菜单 +let level = 0; //当前正在处理的菜单层级 +let deltaLvl = 1; //已递归进入的菜单层级，用于编辑完当前菜单后返回时使用 +let counter = {} //记录左右侧菜单的下一个可用索引 function processNode(node) { + let arr = []; - node.forEach((item) => { + node.forEach((item, index) => { + + if(level == 0 ){ //处理顶级菜单，加前缀、按照前缀分别计算下一个可用索引记录到counter中 + prev = item.position.substring(0, 1); //取到前缀 + counter[prev] == undefined ? counter[prev] = 0 : ""; + ids = [counter[prev]]; + counter[prev] ++; + }else{ + ids[level] = index; //如果不是顶级菜单，直接将“下一个可用索引”存到ids列表里 + } + let temp = { path: item.path || "", title: item.title, name: item.name, + meta: { menuId : prev + "_" + ids.join("-") } }; + if (item.redirect) { temp.redirect = { name: item.redirect, @@ -31,7 +50,15 @@ function processNode(node) { } if (item.children && item.children.length > 0) { + level ++; + if (index == (node.length - 1)){ //处理最后一项菜单还有children、无法返回上一层的情况 + deltaLvl ++; //记录的是“最后一项有children”的层级的累计数量 + } temp.children = processNode(item.children); + } else if (index == (node.length - 1)) { //当前层级已处理到最后一项、且最后一项无children时返回 + level -= deltaLvl; + ids.splice(deltaLvl*-1, deltaLvl); //返回后，摘出ids里对应数量的层级数 + deltaLvl = 1 } arr.push(temp); }); @@ -52,7 +79,7 @@ let routes = [ }, { path: "/", - name: "index", + name: "root", redirect:{ path:"/home" } diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue index 8e268f2f..cd711a52 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue @@ -6,20 +6,20 @@ diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue index 0c811091..0282c440 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/index.vue @@ -40,6 +40,7 @@ export default { }, emit: ["change"], created() { + this.activeIndex = this.$route.meta.menuId; this.menuLeft = []; this.menuRight = []; menuData.forEach(item => { @@ -51,10 +52,13 @@ export default { }); // this.changeMenu(this.menuLeft[0]); }, + mounted(){ + // this.activeIndex = "l_2-0-3"; + // console.log(this.activeIndex); + }, methods: { onChange(item, activeIndex) { this.activeIndex = activeIndex; - console.log(this.activeIndex); // this.$router.push(item.name); this.$emit("onChange", item) } diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue index 1b7d0802..a51dfa4b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue @@ -9,7 +9,7 @@
- + diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue index ddc37af2..005fa7d5 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue @@ -1,6 +1,6 @@