feat: update

This commit is contained in:
xiaoxian521 2021-11-06 16:15:25 +08:00
parent c18dbea3cd
commit 4b16bac5dc
15 changed files with 3278 additions and 1513 deletions

View File

@ -47,7 +47,7 @@
"cropperjs": "^1.5.11",
"dayjs": "^1.10.7",
"echarts": "^5.2.1",
"element-plus": "1.2.0-beta.1",
"element-plus": "^1.2.0-beta.2",
"element-resize-detector": "^1.2.3",
"font-awesome": "^4.7.0",
"lodash-es": "^4.17.21",
@ -121,4 +121,4 @@
"repository": "git@github.com:xiaoxian521/vue-pure-admin.git",
"author": "xiaoxian521",
"license": "MIT"
}
}

4620
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 2208059 */
src: url("iconfont.woff2?t=1634903299890") format("woff2"),
url("iconfont.woff?t=1634903299890") format("woff"),
url("iconfont.ttf?t=1634903299890") format("truetype");
src: url("iconfont.woff2?t=1636070926069") format("woff2"),
url("iconfont.woff?t=1636070926069") format("woff"),
url("iconfont.ttf?t=1636070926069") format("truetype");
}
.iconfont {
@ -13,24 +13,12 @@
-moz-osx-font-smoothing: grayscale;
}
.team-iconshuifei::before {
content: "\e62d";
.team-iconshuijin::before {
content: "\e621";
}
.team-iconshuiyuandi::before {
content: "\e64e";
}
.team-iconshuifei1::before {
content: "\e616";
}
.team-iconshui::before {
content: "\e61f";
}
.team-iconzuixinlianzai::before {
content: "\e6da";
.team-iconzu2148::before {
content: "\e620";
}
.team-iconxinpin::before {
@ -41,22 +29,6 @@
content: "\e615";
}
.team-iconinternationality::before {
content: "\e67a";
}
.team-iconshanchu::before {
content: "\e617";
}
.team-iconshow-main-container::before {
content: "\e878";
}
.team-iconhidden-main-container::before {
content: "\e881";
}
.team-iconexit-fullscreen::before {
content: "\e62a";
}

File diff suppressed because one or more lines are too long

View File

@ -6,39 +6,18 @@
"description": "pure-admin",
"glyphs": [
{
"icon_id": "1715043",
"name": "水",
"font_class": "shuifei",
"unicode": "e62d",
"unicode_decimal": 58925
"icon_id": "11758211",
"name": "水",
"font_class": "shuijin",
"unicode": "e621",
"unicode_decimal": 58913
},
{
"icon_id": "7873366",
"name": "水源地",
"font_class": "shuiyuandi",
"unicode": "e64e",
"unicode_decimal": 58958
},
{
"icon_id": "12257150",
"name": "水费",
"font_class": "shuifei1",
"unicode": "e616",
"unicode_decimal": 58902
},
{
"icon_id": "24810949",
"name": "水",
"font_class": "shui",
"unicode": "e61f",
"unicode_decimal": 58911
},
{
"icon_id": "2508809",
"name": "最新连载",
"font_class": "zuixinlianzai",
"unicode": "e6da",
"unicode_decimal": 59098
"icon_id": "22129506",
"name": "水能",
"font_class": "zu2148",
"unicode": "e620",
"unicode_decimal": 58912
},
{
"icon_id": "7795613",
@ -54,34 +33,6 @@
"unicode": "e615",
"unicode_decimal": 58901
},
{
"icon_id": "18367956",
"name": "中英文2 中文",
"font_class": "internationality",
"unicode": "e67a",
"unicode_decimal": 59002
},
{
"icon_id": "6184565",
"name": "删除",
"font_class": "shanchu",
"unicode": "e617",
"unicode_decimal": 58903
},
{
"icon_id": "9626913",
"name": "全屏",
"font_class": "show-main-container",
"unicode": "e878",
"unicode_decimal": 59512
},
{
"icon_id": "9626952",
"name": "退出全屏",
"font_class": "hidden-main-container",
"unicode": "e881",
"unicode_decimal": 59521
},
{
"icon_id": "5698509",
"name": "全屏缩小",

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -126,14 +126,7 @@ onUnmounted(() => {
</script>
<template>
<div
id="mapview"
ref="mapview"
v-loading="mapSet.loading"
element-loading-text="地图加载中"
element-loading-spinner="el-icon-loading"
element-loading-background="rgba(0, 0, 0, 0.8)"
></div>
<div id="mapview" ref="mapview" v-loading="mapSet.loading"></div>
</template>
<style lang="scss" scoped>

View File

@ -19,7 +19,7 @@ const title =
class="sidebar-logo-link"
to="/"
>
<Icon svg :width="35" :height="35" content="team-iconshuiyuandi" />
<Icon svg :width="35" :height="35" content="team-iconzu2148" />
<span class="sidebar-title">{{ title }}</span>
</router-link>
<router-link
@ -29,7 +29,7 @@ const title =
class="sidebar-logo-link"
to="/"
>
<Icon svg :width="35" :height="35" content="team-iconshuiyuandi" />
<Icon svg :width="35" :height="35" content="team-iconzu2148" />
<span class="sidebar-title">{{ title }}</span>
</router-link>
</transition>

View File

@ -80,6 +80,7 @@ function resolvePath(routePath) {
"
>
<el-menu-item
:hide-timeout="100000"
:index="resolvePath(onlyOneChild.path)"
:class="{ 'submenu-title-noDropdown': !isNest }"
style="display: flex; align-items: center"
@ -94,7 +95,6 @@ function resolvePath(routePath) {
<template #title>
<div
style="
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
@ -133,6 +133,7 @@ function resolvePath(routePath) {
<el-sub-menu
v-else
:hide-timeout="100000"
ref="subMenu"
:index="resolvePath(props.item.path)"
popper-append-to-body

View File

@ -37,10 +37,6 @@
box-sizing: content-box;
}
.el-loading-mask {
z-index: -1;
}
// el-tooltip的权重
.is-dark {
z-index: 99999 !important;

View File

@ -123,7 +123,7 @@
.el-menu-item,
.el-sub-menu__title {
color: $menuText;
padding: 0 16px 0 40px;
padding: 0 20px 0 40px;
&:hover {
color: $menuTitleHover !important;
@ -339,7 +339,7 @@
& > .el-menu {
i {
margin-right: 16px;
margin-right: 20px;
}
}