From af7941929b2898dbb5c92e622ed4241aecb968e7 Mon Sep 17 00:00:00 2001 From: wangxg2016 Date: Tue, 18 Oct 2016 20:33:43 +0800 Subject: [PATCH] chart --- package.json | 7 +- src/components/page/navmenu.vue | 1 + src/demos/Charts.vue | 269 ++++++++++++++++++++++++++++++++ src/main.js | 5 + 4 files changed, 279 insertions(+), 3 deletions(-) create mode 100644 src/demos/Charts.vue diff --git a/package.json b/package.json index 140abfb..3eefba0 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs" }, "dependencies": { - "vue": "^2.0.1", + "vue": "^2.0.3", "babel-runtime": "^6.11.6" }, "devDependencies": { @@ -23,6 +23,7 @@ "babel-preset-stage-2": "^6.16.0", "bulma": "0.2.1", "chai": "^3.5.0", + "chart.js": "^2.3.0", "connect-history-api-fallback": "^1.3.0", "css-loader": "^0.25.0", "eslint": "^3.7.0", @@ -65,9 +66,9 @@ "url-loader": "^0.5.7", "vue-hot-reload-api": "^2.0.6", "vue-html-loader": "^1.2.3", - "vue-loader": "^9.5.1", + "vue-loader": "^9.7.0", "vue-resource": "^1.0.3", - "vue-router": "^2.0.0", + "vue-router": "^2.0.1", "vue-style-loader": "^1.0.0", "vuex": "^2.0.0", "webpack": "^1.13.2", diff --git a/src/components/page/navmenu.vue b/src/components/page/navmenu.vue index 504fd59..95cfc8c 100644 --- a/src/components/page/navmenu.vue +++ b/src/components/page/navmenu.vue @@ -97,6 +97,7 @@ export default { title: '功能组件', icon: 'puzzle-piece', sub: [ + {title: 'Charts', url: '/charts'}, {title: 'Collapse', url: '/collapse'}, {title: 'Modal', url: '/modal'}, {title: 'Pagination', url: '/pagination'}, diff --git a/src/demos/Charts.vue b/src/demos/Charts.vue new file mode 100644 index 0000000..98d50f1 --- /dev/null +++ b/src/demos/Charts.vue @@ -0,0 +1,269 @@ + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 346a808..1d563e0 100644 --- a/src/main.js +++ b/src/main.js @@ -16,6 +16,7 @@ import Pagination from './demos/Pagination' import Progress from './demos/Progress' import Notfound from './demos/404' import Timeline from './demos/Timeline' +import Charts from './demos/Charts' // UI import Icons from './demos/Icons' @@ -199,6 +200,10 @@ const routes = [ path: '/title', component: Title }, + { + path: '/charts', + component: Charts + }, { path: '/tags', component: Tags