diff --git a/src/assets/css/main.css b/src/assets/css/main.css index cb71802..b6531d8 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -84,11 +84,11 @@ a { .move-enter-active, .move-leave-active { - transition: opacity .5s; + transition: opacity .1s ease; } -.move-enter, -.move-leave { +.move-enter-from, +.move-leave-to { opacity: 0; } diff --git a/src/components/Tags.vue b/src/components/Tags.vue index da1754d..c0a811d 100644 --- a/src/components/Tags.vue +++ b/src/components/Tags.vue @@ -80,6 +80,7 @@ export default { this.$store.commit("delTagsItem", { index: 0 }); } this.$store.commit("setTagsItem", { + name: route.name, title: route.meta.title, path: route.fullPath }); diff --git a/src/router/index.js b/src/router/index.js index a729298..7bbd871 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -12,7 +12,7 @@ const routes = [ children: [ { path: "/dashboard", - name: "Dashboard", + name: "dashboard", meta: { title: '系统首页' }, @@ -21,7 +21,7 @@ const routes = [ "../views/Dashboard.vue") }, { path: "/table", - name: "BaseTable", + name: "basetable", meta: { title: '表格' }, @@ -30,7 +30,7 @@ const routes = [ "../views/BaseTable.vue") }, { path: "/charts", - name: "BaseCharts", + name: "basecharts", meta: { title: '图表' }, @@ -39,7 +39,7 @@ const routes = [ "../views/BaseCharts.vue") }, { path: "/form", - name: "BaseForm", + name: "baseform", meta: { title: '表单' }, @@ -48,7 +48,7 @@ const routes = [ "../views/BaseForm.vue") }, { path: "/tabs", - name: "Tabs", + name: "tabs", meta: { title: 'tab标签' }, @@ -57,7 +57,7 @@ const routes = [ "../views/Tabs.vue") }, { path: "/donate", - name: "Donate", + name: "donate", meta: { title: '鼓励作者' }, @@ -66,7 +66,7 @@ const routes = [ "../views/Donate.vue") }, { path: "/permission", - name: "Permission", + name: "permission", meta: { title: '权限管理', permission: true @@ -76,7 +76,7 @@ const routes = [ "../views/Permission.vue") }, { path: "/i18n", - name: "I18n", + name: "i18n", meta: { title: '国际化语言' }, @@ -85,7 +85,7 @@ const routes = [ "../views/I18n.vue") }, { path: "/upload", - name: "Upload", + name: "upload", meta: { title: '上传插件' }, @@ -94,7 +94,7 @@ const routes = [ "../views/Upload.vue") }, { path: "/icon", - name: "Icon", + name: "icon", meta: { title: '自定义图标' }, diff --git a/src/views/BaseTable.vue b/src/views/BaseTable.vue index a538212..37eca1a 100644 --- a/src/views/BaseTable.vue +++ b/src/views/BaseTable.vue @@ -14,35 +14,13 @@ icon="el-icon-delete" class="handle-del mr10" @click="delAllSelection" - >批量删除 - - - + >批量删除 + + + - - 搜索 + + 搜索 - - + + - + @@ -101,15 +67,13 @@ type="text" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)" - >编辑 + >编辑 删除 + >删除 @@ -138,9 +102,7 @@ @@ -150,13 +112,14 @@ diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue index 232dd18..8e316d8 100644 --- a/src/views/Dashboard.vue +++ b/src/views/Dashboard.vue @@ -4,11 +4,7 @@