From 063f77b345e71ad140722f9787bfb3f613bbcc18 Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期四, 29 二月 2024 11:24:23 +0800
Subject: [PATCH] 5 解决冲突
---
static/js/menu.js | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/static/js/menu.js b/static/js/menu.js
index 461ce35..504cb3e 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -182,8 +182,8 @@
}, {
v: "绯荤粺鏃ュ織",
i: "el-icon-s-tools",
- u: "",
- p: ""
+ u: "system-log",
+ p: "selectSystemLogList"
}]
},
{
@@ -244,9 +244,9 @@
}, {
v: "鍦烘墍鎴栬鏂�",
i: "font icon-24gl-clipboardList",
- u: "",
+ u: "a5-laboratory-management",
g: "D鍦烘墍鎴栬鏂�",
- p: ""
+ p: "selectItemParameter"
}, {
v: "缁勭粐鐩稿叧鏂囦欢",
i: "font icon-24gl-clipboardList",
@@ -523,7 +523,7 @@
g: "6.6 澶栭儴鎻愪緵鐨勪骇鍝佸拰鏈嶅姟",
p: ""
}]
- },
+ },
{
v: "7 杩囩▼瑕佹眰",
i: "el-icon-tickets",
@@ -740,4 +740,4 @@
export default {
menu: menu
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3