diff --git a/src/components/chart/Radar.vue b/src/components/chart/Radar.vue new file mode 100644 index 0000000..52fa8f3 --- /dev/null +++ b/src/components/chart/Radar.vue @@ -0,0 +1,83 @@ + + + + + diff --git a/src/components/dashboard/WorkPlace.vue b/src/components/dashboard/WorkPlace.vue index 2ec6565..07d73a4 100644 --- a/src/components/dashboard/WorkPlace.vue +++ b/src/components/dashboard/WorkPlace.vue @@ -70,7 +70,9 @@ -
+
+ +
@@ -102,12 +104,14 @@ import AList from 'vue-antd-ui/es/list/index' import AListItem from 'vue-antd-ui/es/list/Item' import AButton from 'vue-antd-ui/es/button/button' import AIcon from 'vue-antd-ui/es/icon/icon' +import Radar from '../chart/Radar' const AListItemMeta = AListItem.Meta export default { name: 'WorkPlace', components: { + Radar, AIcon, AButton, AListItemMeta, diff --git a/src/components/layout/GloablLayout.vue b/src/components/layout/GloablLayout.vue index 2c80266..fa2af77 100644 --- a/src/components/layout/GloablLayout.vue +++ b/src/components/layout/GloablLayout.vue @@ -7,7 +7,7 @@

Vue Ant Pro

- + diff --git a/src/components/menu/menu.js b/src/components/menu/menu.js index 2e4d8aa..ebe7ed2 100644 --- a/src/components/menu/menu.js +++ b/src/components/menu/menu.js @@ -42,6 +42,11 @@ export default { type: String, required: false, default: 'inline' + }, + collapsed: { + type: Boolean, + required: false, + default: false } }, data () { @@ -50,6 +55,13 @@ export default { openKeys: [] } }, + watch: { + collapsed (val) { + if (val) { + this.openKeys = [] + } + } + }, methods: { renderIcon: function (h, icon) { return icon === 'none' ? null diff --git a/src/main.js b/src/main.js index 4fd274b..15296f7 100644 --- a/src/main.js +++ b/src/main.js @@ -6,7 +6,7 @@ import router from './router' import 'vue-antd-ui/dist/antd.css' import Viser from 'viser-vue' import axios from 'axios' -import '@/mock/index' +import '@/mock' Vue.prototype.$axios = axios Vue.config.productionTip = false diff --git a/src/router/index.js b/src/router/index.js index 8c69e62..0b66a72 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -18,6 +18,7 @@ import CardList from '@/components/list/CardList' import SearchLayout from '@/components/list/SearchLayout' import ArticleList from '@/components/list/ArticleList' import WorkPlace from '@/components/dashboard/WorkPlace' +import Radar from '@/components/chart/Radar' Vue.use(Router) @@ -120,7 +121,7 @@ export default new Router({ path: '/detail/basic', name: '基础详情页', icon: 'none', - component: NotFound + component: Radar }, { path: '/detail/advanced',