diff --git a/public/images/nav/nav1.png b/public/images/nav/nav1.png new file mode 100644 index 0000000..69f93ea Binary files /dev/null and b/public/images/nav/nav1.png differ diff --git a/public/images/nav/nav2.png b/public/images/nav/nav2.png new file mode 100644 index 0000000..d293f29 Binary files /dev/null and b/public/images/nav/nav2.png differ diff --git a/public/images/nav/nav3.png b/public/images/nav/nav3.png new file mode 100644 index 0000000..f85f1cf Binary files /dev/null and b/public/images/nav/nav3.png differ diff --git a/public/images/nav/nav4.png b/public/images/nav/nav4.png new file mode 100644 index 0000000..e40d5f9 Binary files /dev/null and b/public/images/nav/nav4.png differ diff --git a/public/images/nav/nav5.png b/public/images/nav/nav5.png new file mode 100644 index 0000000..a22a969 Binary files /dev/null and b/public/images/nav/nav5.png differ diff --git a/src/api/menu/index.ts b/src/api/menu/index.ts index 3855860..4415c9c 100644 --- a/src/api/menu/index.ts +++ b/src/api/menu/index.ts @@ -11,20 +11,20 @@ class MenuAPI { { path: "/split", component: "Layout", - redirect: "/split/index", + redirect: "/split/split1", name: "/split", meta: { title: "算法分割", - icon: "project", + icon: "split", hidden: false, roles: ["GUEST", "ADMIN", "ADMIN6"], alwaysShow: false, }, children: [ { - path: "user", - component: "system/user/index", - name: "User", + path: "split1", + component: "split/split1/index", + name: "split1", meta: { title: "算法分割1", icon: "user", @@ -35,9 +35,9 @@ class MenuAPI { }, }, { - path: "role", - component: "system/role/index", - name: "Role", + path: "/split2", + component: "split/split1/index", + name: "/split2", meta: { title: "算法分割2", icon: "role", @@ -56,7 +56,7 @@ class MenuAPI { name: "/internetProtocol", meta: { title: "互联协议", - icon: "api", + icon: "web", hidden: false, roles: ["GUEST", "ADMIN", "ADMIN6"], alwaysShow: false, @@ -97,7 +97,7 @@ class MenuAPI { name: "/simulationEvaluation", meta: { title: "仿真评估", - icon: "client", + icon: "simu", hidden: false, roles: ["GUEST", "ADMIN", "ADMIN6"], alwaysShow: false, @@ -138,16 +138,16 @@ class MenuAPI { name: "/operatorLibrary", meta: { title: "算子库管理", - icon: "dict", + icon: "oper", hidden: false, roles: ["GUEST", "ADMIN", "ADMIN6"], alwaysShow: false, }, children: [ { - path: "user", - component: "system/user/index", - name: "User", + path: "operatorLibrary", + component: "/operatorLibrary/index", + name: "operatorLibrary", meta: { title: "算子库管理1", icon: "user", @@ -158,9 +158,9 @@ class MenuAPI { }, }, { - path: "role", - component: "system/role/index", - name: "Role", + path: "operatorLibrary2", + component: "/operatorLibrary/index2", + name: "operatorLibrary2", meta: { title: "算子库管理2", icon: "role", @@ -179,7 +179,7 @@ class MenuAPI { name: "/dataMgr", meta: { title: "数据管理", - icon: "edit", + icon: "db", hidden: false, roles: ["GUEST", "ADMIN", "ADMIN6"], alwaysShow: false, @@ -220,7 +220,7 @@ class MenuAPI { name: "/tester", meta: { title: "算法测试仪管理", - icon: "link", + icon: "test", hidden: false, roles: ["GUEST", "ADMIN", "ADMIN6"], alwaysShow: false, @@ -261,7 +261,7 @@ class MenuAPI { name: "/system", meta: { title: "系统管理", - icon: "menu", + icon: "system", hidden: false, roles: ["GUEST", "ADMIN", "ADMIN6"], alwaysShow: false, diff --git a/src/assets/icons/build.svg b/src/assets/icons/build.svg new file mode 100644 index 0000000..f4db470 --- /dev/null +++ b/src/assets/icons/build.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/db.svg b/src/assets/icons/db.svg new file mode 100644 index 0000000..d74f28b --- /dev/null +++ b/src/assets/icons/db.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/oper.svg b/src/assets/icons/oper.svg new file mode 100644 index 0000000..04c192f --- /dev/null +++ b/src/assets/icons/oper.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/simu.svg b/src/assets/icons/simu.svg new file mode 100644 index 0000000..d7fd711 --- /dev/null +++ b/src/assets/icons/simu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/split.svg b/src/assets/icons/split.svg new file mode 100644 index 0000000..a027db9 --- /dev/null +++ b/src/assets/icons/split.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/test.svg b/src/assets/icons/test.svg new file mode 100644 index 0000000..09c3bae --- /dev/null +++ b/src/assets/icons/test.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/web.svg b/src/assets/icons/web.svg new file mode 100644 index 0000000..f1946b2 --- /dev/null +++ b/src/assets/icons/web.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/logo.svg b/src/assets/logo.svg new file mode 100644 index 0000000..ef805e2 --- /dev/null +++ b/src/assets/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/layout/components/AppMain/index.vue b/src/layout/components/AppMain/index.vue index c8017b2..00594f8 100644 --- a/src/layout/components/AppMain/index.vue +++ b/src/layout/components/AppMain/index.vue @@ -1,5 +1,6 @@ @@ -25,9 +27,8 @@ const cachedViews = computed(() => useTagsViewStore().cachedViews); // 缓存页 .app-main { position: relative; width: 100%; - min-height: calc(100vh - $navbar-height); - overflow: hidden; - background-color: var(--el-bg-color-page); + min-height: calc(100vh - 100px); + overflow: hidden; } .hasTagsView .app-main { diff --git a/src/layout/components/NavBar/components/NavbarLeft.vue b/src/layout/components/NavBar/components/NavbarLeft.vue deleted file mode 100644 index 937391f..0000000 --- a/src/layout/components/NavBar/components/NavbarLeft.vue +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue index 8661cec..1392c86 100644 --- a/src/layout/components/NavBar/components/NavbarRight.vue +++ b/src/layout/components/NavBar/components/NavbarRight.vue @@ -1,25 +1,18 @@ - - diff --git a/src/layout/components/Settings/components/ThemeColorPicker.vue b/src/layout/components/Settings/components/ThemeColorPicker.vue deleted file mode 100644 index 5a0d59c..0000000 --- a/src/layout/components/Settings/components/ThemeColorPicker.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - - - diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue deleted file mode 100644 index d7f670a..0000000 --- a/src/layout/components/Settings/index.vue +++ /dev/null @@ -1,144 +0,0 @@ - - - - - diff --git a/src/layout/components/Sidebar/components/SidebarLogo.vue b/src/layout/components/Sidebar/components/SidebarLogo.vue deleted file mode 100644 index d72e746..0000000 --- a/src/layout/components/Sidebar/components/SidebarLogo.vue +++ /dev/null @@ -1,64 +0,0 @@ - - - - - diff --git a/src/layout/components/Sidebar/components/SidebarMenu.vue b/src/layout/components/Sidebar/components/SidebarMenu.vue index 444fa0d..3a3bb75 100644 --- a/src/layout/components/Sidebar/components/SidebarMenu.vue +++ b/src/layout/components/Sidebar/components/SidebarMenu.vue @@ -1,22 +1,9 @@ diff --git a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue index 383aa74..8dbc291 100644 --- a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue +++ b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue @@ -3,10 +3,7 @@ -
- -
- - - -
- - diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index 4255fa6..65ea81c 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -1,35 +1,16 @@