diff --git a/src/assets/images/Mars3DIcon/Rectangle.png b/src/assets/images/Mars3DIcon/Rectangle.png new file mode 100644 index 0000000..45f42cb Binary files /dev/null and b/src/assets/images/Mars3DIcon/Rectangle.png differ diff --git a/src/assets/images/Mars3DIcon/RectangleBox.png b/src/assets/images/Mars3DIcon/RectangleBox.png new file mode 100644 index 0000000..dd9689b Binary files /dev/null and b/src/assets/images/Mars3DIcon/RectangleBox.png differ diff --git a/src/assets/images/Mars3DIcon/headBg.png b/src/assets/images/Mars3DIcon/headBg.png index f78445f..6f414c2 100644 Binary files a/src/assets/images/Mars3DIcon/headBg.png and b/src/assets/images/Mars3DIcon/headBg.png differ diff --git a/src/assets/images/Mars3DIcon/no-select.png b/src/assets/images/Mars3DIcon/no-select.png new file mode 100644 index 0000000..2dd5354 Binary files /dev/null and b/src/assets/images/Mars3DIcon/no-select.png differ diff --git a/src/assets/images/Mars3DIcon/selected.png b/src/assets/images/Mars3DIcon/selected.png new file mode 100644 index 0000000..3139e18 Binary files /dev/null and b/src/assets/images/Mars3DIcon/selected.png differ diff --git a/src/assets/images/login/login-bg.jpg b/src/assets/images/login/login-bg.jpg new file mode 100644 index 0000000..0bf4058 Binary files /dev/null and b/src/assets/images/login/login-bg.jpg differ diff --git a/src/assets/images/login/login-title-bg.png b/src/assets/images/login/login-title-bg.png index c37ae15..9aca245 100644 Binary files a/src/assets/images/login/login-title-bg.png and b/src/assets/images/login/login-title-bg.png differ diff --git a/src/assets/images/login/mailliekai.png b/src/assets/images/login/mailliekai.png deleted file mode 100644 index 8cd596e..0000000 Binary files a/src/assets/images/login/mailliekai.png and /dev/null differ diff --git a/src/assets/json/dynamicRouter.json b/src/assets/json/dynamicRouter.json index e00e207..18bc7ed 100644 --- a/src/assets/json/dynamicRouter.json +++ b/src/assets/json/dynamicRouter.json @@ -1,20 +1,6 @@ { "code": 200, "result": [ - { - "path": "/frontLargeScreen", - "name": "frontLargeScreen", - "component": "/goverment/frontLargeScreen/index", - "meta": { - "icon": "leftGover", - "title": "前台首页", - "isLink": "", - "isHide": false, - "isFull": true, - "isAffix": true, - "isKeepAlive": true - } - }, { "path": "/largeScreen", "name": "largeScreen", diff --git a/src/components/layoutTop/index.scss b/src/components/layoutTop/index.scss index df24686..50ac9e6 100644 --- a/src/components/layoutTop/index.scss +++ b/src/components/layoutTop/index.scss @@ -1,14 +1,31 @@ +@mixin selected { + background-image: url("@/assets/images/Mars3DIcon/selected.png"); + background-size: cover; + background-repeat: no-repeat; + span { + font-size: 24px; + font-family: YouSheBiaoTiHei-Regular, YouSheBiaoTiHei; + font-weight: 400; + line-height: 28px; + letter-spacing: 4px; + text-shadow: 0px 1px 0px rgba(255, 255, 255, 0.8); + background: linear-gradient(180deg, #ffffff 0%, #fff 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + } +} .back-model { .el-header { box-sizing: border-box; display: flex; align-items: center; height: 72px; - padding: 0 15px 0 0; + padding: 0; background-color: rgba(23, 49, 71, 0.8); background-image: url("@/assets/images/Mars3DIcon/headBg.png"); background-size: cover; background-repeat: no-repeat; + background-position: 0px 4px; position: relative; z-index: 100; .header-lf { @@ -17,7 +34,7 @@ overflow: hidden; white-space: nowrap; cursor: pointer; - height: 76px; + height: 100%; width: 460px; // background-image: url("@/assets/images/topHeader/heade-title-bg.png"); // background-size: 100% 100%; @@ -45,27 +62,54 @@ } } } + .angel { + width: 28px; + height: 38px; + } .header-menu { height: 100%; display: flex; align-items: center; margin-right: auto; > div { - height: 100%; + width: 184px; + height: 38px; display: flex; align-items: center; + justify-content: center; padding: 0 20px; cursor: pointer; + background-image: url("@/assets/images/Mars3DIcon/no-select.png"); + background-size: cover; + background-repeat: no-repeat; span { - color: white; - font-size: 18px; - margin-left: 3px; - white-space: nowrap; + font-size: 24px; + font-family: YouSheBiaoTiHei-Regular, YouSheBiaoTiHei; + font-weight: 400; + line-height: 28px; + letter-spacing: 4px; + text-shadow: 0px 1px 0px rgba(30, 96, 169, 0.6); + background: linear-gradient(180deg, #ffffff 0%, #d7e9fa 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; } } > div:hover { - background-color: rgba(0, 138, 255, 0.2); + @include selected(); } + .selected-class { + @include selected(); + } + } + .tool-bar-ri { + width: 260px; + height: 38px; + display: flex; + align-items: center; + justify-content: center; + background-image: url("@/assets/images/Mars3DIcon/RectangleBox.png"); + background-size: cover; + background-repeat: no-repeat; } } } diff --git a/src/components/layoutTop/index.vue b/src/components/layoutTop/index.vue index 0d09661..e3c8b4c 100644 --- a/src/components/layoutTop/index.vue +++ b/src/components/layoutTop/index.vue @@ -1,5 +1,5 @@