diff --git a/package.json b/package.json index 8fee601..95e6209 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "build": "node build/build.js" }, "dependencies": { + "moment": "^2.22.2", "viser-vue": "^2.2.5", "vue": "^2.5.2", "vue-antd-ui": "^0.7.0", @@ -54,6 +55,8 @@ "html-webpack-plugin": "^2.30.1", "jest": "^22.0.4", "jest-serializer-vue": "^0.3.0", + "less": "^3.7.1", + "less-loader": "^4.1.0", "nightwatch": "^0.9.12", "node-notifier": "^5.1.2", "optimize-css-assets-webpack-plugin": "^3.2.0", diff --git a/src/components/chart/MiniArea.vue b/src/components/chart/MiniArea.vue new file mode 100644 index 0000000..ede09fd --- /dev/null +++ b/src/components/chart/MiniArea.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/src/components/chart/MiniBar.vue b/src/components/chart/MiniBar.vue new file mode 100644 index 0000000..21cd93c --- /dev/null +++ b/src/components/chart/MiniBar.vue @@ -0,0 +1,59 @@ + + + + + diff --git a/src/components/chart/MiniChart.vue b/src/components/chart/MiniChart.vue deleted file mode 100644 index 9b93364..0000000 --- a/src/components/chart/MiniChart.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - - - diff --git a/src/components/chart/MiniProgress.vue b/src/components/chart/MiniProgress.vue new file mode 100644 index 0000000..d15a3eb --- /dev/null +++ b/src/components/chart/MiniProgress.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/src/components/chart/index.less b/src/components/chart/index.less new file mode 100644 index 0000000..1a75597 --- /dev/null +++ b/src/components/chart/index.less @@ -0,0 +1,9 @@ +.mini-chart{ + position: relative; + width: 100%; + .chart-content{ + position: absolute; + bottom: -28px; + width: 100%; + } +} diff --git a/src/components/dashboard/ChartCard.vue b/src/components/dashboard/ChartCard.vue index 1a2c902..1c869e0 100644 --- a/src/components/dashboard/ChartCard.vue +++ b/src/components/dashboard/ChartCard.vue @@ -7,10 +7,12 @@ -
¥ 1358.34
+
{{total}}
- +
+ +