Skip to content

A
admin-base
Commit 180c2c65 authored by 赵茹林's avatar 赵茹林
Browse files
Options

升级element ui版本 

后台优化（菜单展开、路由跳转、样式代码优化等）
parent 247f9dc5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 608 additions and 39 deletions
index.html
View file @ 180c2c65
......@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta name="referrer" content="never">
<link rel="stylesheet" href="https:////at.alicdn.com/t/font_746649_x1rivf5f5.css">
<link rel="stylesheet" href="https://lib.baomitu.com/element-ui/2.7.2/theme-chalk/index.css">
<link rel="stylesheet" href="https://lib.baomitu.com/element-ui/2.11.1/theme-chalk/index.css">
<title>唱唱启蒙-后台</title>
</head>
<body>
......
package-lock.json
View file @ 180c2c65
......@@ -303,9 +303,9 @@
"dev": true
},
"async-validator": {
"version": "1.8.2",
"resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.2.tgz",
"integrity": "sha1-t3WXIm6WJC+NUxwNRq4pX2JCK6Q=",
"version": "1.8.5",
"resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-1.8.5.tgz",
"integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=",
"requires": {
"babel-runtime": "6.x"
}
......@@ -2574,8 +2574,8 @@
},
"deepmerge": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
"integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
"resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz",
"integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M="
},
"define-properties": {
"version": "1.1.2",
......@@ -2878,9 +2878,9 @@
"dev": true
},
"element-ui": {
"version": "2.4.3",
"resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.4.3.tgz",
"integrity": "sha512-fHcpUGbJsfP1mvfErdnn4A7MglNbfL4uiukGHRZaFy1K7HhVKEpLficNqUtaYS3SKjKnzpkSdZkrJJCR1aNICw==",
"version": "2.11.1",
"resolved": "https://registry.npm.taobao.org/element-ui/download/element-ui-2.11.1.tgz?cache=0&sync_timestamp=1564126738326&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felement-ui%2Fdownload%2Felement-ui-2.11.1.tgz",
"integrity": "sha1-K2f57uPtouaISHPBxYnL4w2anWA=",
"requires": {
"async-validator": "~1.8.1",
"babel-helper-vue-jsx-merge-props": "^2.0.0",
......@@ -6123,7 +6123,7 @@
},
"normalize-wheel": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
"integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
},
"npm-run-path": {
......@@ -9249,9 +9249,9 @@
"dev": true
},
"resize-observer-polyfill": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.0.tgz",
"integrity": "sha512-M2AelyJDVR/oLnToJLtuDJRBBWUGUvvGigj1411hXhAdyFWqMaqHp7TixW3FpiLuVaikIcR1QL+zqoJoZlOgpg=="
"version": "1.5.1",
"resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz",
"integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
},
"resolve": {
"version": "1.8.1",
......@@ -10049,8 +10049,8 @@
},
"throttle-debounce": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
"integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
"resolved": "http://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz",
"integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0="
},
"through2": {
"version": "2.0.3",
......
src/App.vue
View file @ 180c2c65
......@@ -75,16 +75,17 @@ export default {
};
</script>
<style >
<style lang="less">
#app {
height: 100%;
}
html,
body {
html, body {
height: 100%;
margin: 0;
padding: 0;
}
.el-collapse-item__arrow {
margin-left: 0;
}
......@@ -119,7 +120,39 @@ body {
cursor: pointer;
user-select: none;
}
#app .el-main .menu-block{
height: 170vh;
.el-table {
/*padding: 0 20px;*/
}
@gutterSize: 10px;
.admin-refresh {
.section-search {
padding: @gutterSize;
background-color: #fff;
border-bottom: solid 1px #ebeef5;
&.search-single {
font-size: 0; // 去掉空隙
/*.el-form-item__content {
font-size: 0; // 去掉空隙
}*/
.el-form-item {
margin-bottom: 0;
}
}
.search-btn-wrapper {
display: flex;
}
}
.page-div {
padding: 0;
}
.el-pagination {
padding: @gutterSize 0;
background-color: #fff;
border-bottom: solid 1px #ebeef5;
}
}
</style>
src/components/framework/index.vue
View file @ 180c2c65
......@@ -54,7 +54,12 @@
.menu-block{
float: left;
height: 100%;
overflow: auto;
/*overflow: auto;
position: fixed;
left: 0;
top: 60px;
bottom: 0;
z-index: 10;*/
}
.content{
display: flex;
......
src/components/framework/leftMenu.vue
View file @ 180c2c65
......@@ -2,6 +2,7 @@
<el-menu
:default-active="$route.path"
:router="true"
:unique-opened="true"
text-color="#fff"
background-color="#333333"
active-text-color="#ffd04b"
......
src/components/login/index.vue
View file @ 180c2c65
......@@ -10,7 +10,7 @@
<el-input type="password" v-model="login.password" placeholder="密码"></el-input>
</el-form-item>
<el-form-item>
<el-button class="btn" size="medium" type="primary" @click="submitForm">登陆</el-button>
<el-button class="btn" size="medium" type="primary" @click="submitForm">登录</el-button>
<router-link class="fr" :to="{name:'register'}" >
班主任注册入口
</router-link>
......
src/components/system/admin.vue
View file @ 180c2c65
......@@ -56,7 +56,7 @@
</el-table-column>
<el-table-column
prop="last_login_at"
label="最后登陆时间" sortable>
label="最后登录时间" sortable>
</el-table-column>
<el-table-column
v-if="!$store.state.readonly"
......
src/components/system/adminLog.vue
View file @ 180c2c65
......@@ -37,7 +37,7 @@
prop="user_role">
</el-table-column>
<el-table-column
label="登陆名"
label="登录名"
prop="user_name">
</el-table-column>
<el-table-column
......
src/components/system/staff.vue
View file @ 180c2c65
......@@ -43,7 +43,7 @@
<el-form-item>
<!--<div class="flexRow">-->
<el-button @click="onSearch" type="primary" plain>搜索</el-button>
<el-button @click="onAdd" type="success" plain>添加</el-button>
<el-button v-if="!$store.state.readonly" @click="onAdd" type="success" plain>添加</el-button>
<!--</div>-->
</el-form-item>
</el-form>
......@@ -74,7 +74,7 @@
{{scope.row.status == 0 ? '在职' : '离职'}}
</template>
</el-table-column>
<el-table-column label="操作">
<el-table-column label="操作" v-if="!$store.state.readonly">
<template slot-scope="scope">
<el-button size="mini" plain type="primary" @click="onEdit(scope.row)">编辑</el-button>
</template>
......@@ -213,7 +213,6 @@
this.dialog.form.type = '';
this.dialog.form.in_at = '';*/
this.$nextTick(()=>{
console.log('tick')
this.$refs['dialogForm'].resetFields();
})
},
......
src/components/system/tag.vue 0 → 100644
View file @ 180c2c65
This diff is collapsed.
src/router/index.js
View file @ 180c2c65
......@@ -2,6 +2,7 @@ import store from "@/store"
import Router from 'vue-router'
import Cookie from '../util/cookie'
const router =new Router({
scrollBehavior: () => ({y: 0}),
routes: [
{
path: '/',
......
src/util/menuList.js
View file @ 180c2c65
......@@ -167,7 +167,7 @@ export default [{
{
name: '',
value: '用户管理',
icon: 'icon-laoshi',
icon: 'icon-yonghu',
list: [
{
value: '用户列表',
......@@ -630,6 +630,17 @@ export default [{
component: e => require(['@/components/system/staffRecord'], e),
}
},
{
value: '标签管理',
routerName: 'tag',
path: '/tag',
cover: '10-8',
router: {
path: '/tag',
name: 'tag',
component: e => require(['@/components/system/tag'], e),
}
},
{
value: '员工管理',
routerName: 'staff',
......
src/util/public.less
View file @ 180c2c65
......@@ -19,40 +19,42 @@
padding: 10px;
margin: 10px 0;
}
.new-block{
margin: 10px;
text-align: right;
}
.fl-r{
float: right;
}
.text-c{
text-align: center;
}
.text-b{
font-weight: bold;
}
.color-b{
color: #6ba8e6;
}
.text-r{
text-align: right;
}
.main-block{
margin: 5px;
background: white;
padding: 5px;
}
html{
font-family: "Helvetica Neue",
Helvetica,
"PingFang SC",
"Hiragino Sans GB",
"Microsoft YaHei",
"微软雅黑",
Arial,
sans-serif;
font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
}
.clear-both{
&:after{
content: '';
......@@ -60,8 +62,9 @@ html{
clear: both;
}
}
//滚动条样式
::-webkit-scrollbar-track-piece { //滚动条凹槽的颜色，还可以设置边框属性
/*::-webkit-scrollbar-track-piece { //滚动条凹槽的颜色，还可以设置边框属性
border-radius: 10px;
}
::-webkit-scrollbar {//滚动条的宽度
......@@ -73,4 +76,4 @@ html{
border-radius: 10px;
height: 10px;
min-height:10px;
}
}*/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment