Skip to content

Commit 4954ff1

Browse files
krank666krank666
committed
Merge branch 'gin-vue-admin_v2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gin-vue-admin_v2_dev
2 parents 2d7c6a7 + 838fa27 commit 4954ff1

File tree

6 files changed

+253
-126
lines changed

6 files changed

+253
-126
lines changed

‎web/package.json

Lines changed: 63 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,66 @@
11
{
2-
"name": "qm-plus-vue-page",
3-
"version": "0.1.0",
4-
"private": true,
5-
"scripts": {
6-
"serve": "vue-cli-service serve",
7-
"build": "vue-cli-service build",
8-
"lint": "vue-cli-service lint"
2+
"name": "qm-plus-vue-page",
3+
"version": "0.1.0",
4+
"private": true,
5+
"scripts": {
6+
"serve": "vue-cli-service serve",
7+
"build": "vue-cli-service build",
8+
"lint": "vue-cli-service lint"
9+
},
10+
"dependencies": {
11+
"@moefe/vue-aplayer": "^2.0.0-beta.5",
12+
"axios": "^0.19.0",
13+
"core-js": "^2.6.5",
14+
"echarts": "^4.7.0",
15+
"element-ui": "^2.12.0",
16+
"mavon-editor": "^2.7.7",
17+
"node-sass": "^4.12.0",
18+
"path": "^0.12.7",
19+
"qs": "^6.8.0",
20+
"quill": "^1.3.7",
21+
"sass-loader": "^8.0.0",
22+
"screenfull": "^5.0.2",
23+
"script-ext-html-webpack-plugin": "^2.1.4",
24+
"spark-md5": "^3.0.1",
25+
"timeline-vuejs": "1.1.1",
26+
"vue": "^2.6.10",
27+
"vue-particle-line": "^0.1.4",
28+
"vue-quill-editor": "^3.0.6",
29+
"vue-router": "^3.1.3",
30+
"vuescroll": "^4.14.4",
31+
"vuex": "^3.1.1",
32+
"vuex-persist": "^2.1.0"
33+
},
34+
"devDependencies": {
35+
"@vue/cli-plugin-babel": "^3.11.0",
36+
"@vue/cli-plugin-eslint": "^3.11.0",
37+
"@vue/cli-service": "^3.11.0",
38+
"babel-eslint": "^10.0.1",
39+
"eslint": "^5.16.0",
40+
"eslint-plugin-vue": "^5.0.0",
41+
"vue-template-compiler": "^2.6.10"
42+
},
43+
"eslintConfig": {
44+
"root": true,
45+
"env": {
46+
"node": true
947
},
10-
"dependencies": {
11-
"@moefe/vue-aplayer": "^2.0.0-beta.5",
12-
"axios": "^0.19.0",
13-
"core-js": "^2.6.5",
14-
"echarts": "^4.7.0",
15-
"element-ui": "^2.12.0",
16-
"mavon-editor": "^2.7.7",
17-
"node-sass": "^4.12.0",
18-
"path": "^0.12.7",
19-
"qs": "^6.8.0",
20-
"quill": "^1.3.7",
21-
"sass-loader": "^8.0.0",
22-
"script-ext-html-webpack-plugin": "^2.1.4",
23-
"spark-md5": "^3.0.1",
24-
"vue": "^2.6.10",
25-
"vue-particle-line": "^0.1.4",
26-
"vue-quill-editor": "^3.0.6",
27-
"vue-router": "^3.1.3",
28-
"vuescroll": "^4.14.4",
29-
"vuex": "^3.1.1",
30-
"vuex-persist": "^2.1.0",
31-
"timeline-vuejs": "1.1.1"
32-
},
33-
"devDependencies": {
34-
"@vue/cli-plugin-babel": "^3.11.0",
35-
"@vue/cli-plugin-eslint": "^3.11.0",
36-
"@vue/cli-service": "^3.11.0",
37-
"babel-eslint": "^10.0.1",
38-
"eslint": "^5.16.0",
39-
"eslint-plugin-vue": "^5.0.0",
40-
"vue-template-compiler": "^2.6.10"
41-
},
42-
"eslintConfig": {
43-
"root": true,
44-
"env": {
45-
"node": true
46-
},
47-
"extends": [
48-
"plugin:vue/essential",
49-
"eslint:recommended"
50-
],
51-
"rules": {},
52-
"parserOptions": {
53-
"parser": "babel-eslint"
54-
}
55-
},
56-
"postcss": {
57-
"plugins": {
58-
"autoprefixer": {}
59-
}
60-
},
61-
"browserslist": [
62-
"> 1%",
63-
"last 2 versions"
64-
]
48+
"extends": [
49+
"plugin:vue/essential",
50+
"eslint:recommended"
51+
],
52+
"rules": {},
53+
"parserOptions": {
54+
"parser": "babel-eslint"
55+
}
56+
},
57+
"postcss": {
58+
"plugins": {
59+
"autoprefixer": {}
60+
}
61+
},
62+
"browserslist": [
63+
"> 1%",
64+
"last 2 versions"
65+
]
6566
}

‎web/src/assets/nav_logo.png

74.9 KB
Loading

‎web/src/style/main.scss

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -884,33 +884,6 @@ li {
884884
border-bottom: 1px solid #e8e8e8;
885885
}
886886
}
887-
.el-table__body-wrapper {
888-
tr {
889-
td {
890-
padding: 5px 0;
891-
.cell {
892-
height: 34px;
893-
line-height: 34px;
894-
overflow: hidden;
895-
}
896-
}
897-
}
898-
.el-cascader {
899-
line-height: 34px;
900-
}
901-
}
902-
.upload {
903-
.el-table__body-wrapper {
904-
tr {
905-
td {
906-
padding: 5px 0;
907-
.cell {
908-
height: auto;
909-
}
910-
}
911-
}
912-
}
913-
}
914887
.search-term {
915888
border-left: none;
916889
border-right: none;
@@ -992,15 +965,15 @@ li {
992965
.el-button.el-button--text.el-button--small {
993966
position: relative;
994967
}
995-
.el-button.el-button--text.el-button--small::after {
996-
content: '';
997-
position: absolute;
998-
width: 1px;
999-
height: 50%;
1000-
top: 5px;
1001-
margin-left: 15px;
1002-
background-color: #e8e8e8;
1003-
}
968+
// .el-button.el-button--text.el-button--small::after {
969+
// content: '';
970+
// position: absolute;
971+
// width: 1px;
972+
// height: 50%;
973+
// top: 5px;
974+
// margin-left: 15px;
975+
// background-color: #e8e8e8;
976+
// }
1004977
.cell {
1005978
button:last-child::after {
1006979
content: ''!important;

‎web/src/view/layout/aside/index.vue

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
<template>
22
<div>
3-
<el-scrollbar style="height:calc(100vh)">
4-
<el-menu
5-
class="el-menu-vertical"
6-
:collapse="isCollapse"
7-
:collapse-transition="true"
8-
:default-active="active"
9-
@select="selectMenuItem"
10-
active-text-color="#fff"
11-
text-color="rgb(191, 203, 217)"
12-
unique-opened
13-
>
14-
<template v-for="item in asyncRouters[0].children">
15-
<aside-component :key="item.name" :routerInfo="item" v-if="!item.hidden" />
16-
</template>
17-
</el-menu>
3+
<el-scrollbar style="height:calc(100vh - 64px)">
4+
<transition :duration="{ enter: 800, leave: 100 }" mode="out-in" name="el-fade-in-linear">
5+
<el-menu
6+
:collapse="isCollapse"
7+
:collapse-transition="true"
8+
:default-active="active"
9+
@select="selectMenuItem"
10+
active-text-color="#fff"
11+
class="el-menu-vertical"
12+
text-color="rgb(191, 203, 217)"
13+
unique-opened
14+
>
15+
<template v-for="item in asyncRouters[0].children">
16+
<aside-component :key="item.name" :routerInfo="item" v-if="!item.hidden" />
17+
</template>
18+
</el-menu>
19+
</transition>
1820
</el-scrollbar>
1921
</div>
2022
</template>
2123

2224
<script>
23-
import { mapGetters,mapMutations } from 'vuex'
25+
import { mapGetters, mapMutations } from 'vuex'
2426
import AsideComponent from '@/view/layout/aside/asideComponent'
2527
export default {
2628
name: 'Aside',
@@ -31,33 +33,31 @@ export default {
3133
}
3234
},
3335
methods: {
34-
...mapMutations("history",["addHistory"]),
36+
...mapMutations('history', ['addHistory']),
3537
selectMenuItem(index) {
3638
if (index === this.$route.name) return
3739
this.$router.push({ name: index })
3840
}
3941
},
4042
computed: {
4143
...mapGetters('router', ['asyncRouters'])
42-
4344
},
4445
components: {
4546
AsideComponent
4647
},
4748
created() {
4849
this.active = this.$route.name
4950
let screenWidth = document.body.clientWidth
50-
if(screenWidth<1000){
51-
this.isCollapse = !this.isCollapse
52-
}
51+
if (screenWidth < 1000) {
52+
this.isCollapse = !this.isCollapse
53+
}
5354
54-
this.$bus.on('collapse', (item) => {
55+
this.$bus.on('collapse', item => {
5556
this.isCollapse = item
5657
})
57-
5858
},
59-
watch:{
60-
$route(){
59+
watch: {
60+
$route() {
6161
this.active = this.$route.name
6262
}
6363
},

‎web/src/view/layout/index.vue

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
<el-container :class="[isSider?'openside':'hideside',isMobile ? 'mobile': '']">
44
<el-row :class="[isShadowBg?'shadowBg':'']" @click.native="changeShadow()"></el-row>
55
<el-aside class="main-cont main-left">
6+
<div class="tilte">
7+
<img src="~@/assets/nav_logo.png" alt="" class="logoimg">
8+
<h2 v-if="isSider" class="tit-text">Gin-Vue-Admin</h2>
9+
</div>
610
<Aside class="aside" />
711
</el-aside>
812
<!-- 分块滑动功能 -->
@@ -24,6 +28,7 @@
2428
>{{item.meta.title}}</el-breadcrumb-item>
2529
</el-breadcrumb>
2630
<div class="fl-right right-box">
31+
<Screenfull class="screenfull"></Screenfull>
2732
<el-dropdown>
2833
<span class="el-dropdown-link">
2934
<img :src="userInfo.headerImg" height="30" width="30" />
@@ -83,7 +88,7 @@
8388
<script>
8489
import Aside from "@/view/layout/aside";
8590
import HistoryComponent from "@/view/layout/aside/historyComponent/history";
86-
91+
import Screenfull from "@/view/layout/screenfull";
8792
import { mapGetters, mapActions } from "vuex";
8893
import { changePassword } from "@/api/user";
8994
export default {
@@ -124,7 +129,8 @@ export default {
124129
},
125130
components: {
126131
Aside,
127-
HistoryComponent
132+
HistoryComponent,
133+
Screenfull
128134
},
129135
methods: {
130136
...mapActions("user", ["LoginOut"]),
@@ -315,8 +321,15 @@ $mainHight: 100vh;
315321
&:not(.el-menu--collapse) {
316322
width: 220px;
317323
}
324+
318325
}
319-
326+
.el-menu--collapse{
327+
li{
328+
.el-tooltip,.el-submenu__title{
329+
padding:0px 15px !important;
330+
}
331+
}
332+
}
320333
&::-webkit-scrollbar {
321334
display: none;
322335
}
@@ -339,4 +352,30 @@ $mainHight: 100vh;
339352
}
340353
}
341354
}
355+
.tilte{
356+
background: #001529;
357+
min-height: 64px;
358+
line-height: 64px;
359+
background: #002140;
360+
text-align: center;
361+
.logoimg{
362+
width: 30px;
363+
height: 30px;
364+
vertical-align: middle;
365+
background: #fff;
366+
border-radius: 50%;
367+
padding: 3px;
368+
}
369+
.tit-text{
370+
display: inline-block;
371+
color: #fff;
372+
font-weight: 600;
373+
font-size: 20px;
374+
vertical-align: middle;
375+
}
376+
}
377+
.screenfull{
378+
display: inline-block;
379+
380+
}
342381
</style>

0 commit comments

Comments
 (0)