diff --git a/LICENSE b/LICENSE index 0c4dc810e62738f602e14e7f465511732080ef71..1ef7d3ef61a96426d7b455e29e10619a18afebed 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2016 vue-manage-system +Copyright (c) 2016-2019 vue-manage-system Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index fc4da7877b9b72e07e75743fdb1b749d26a80810..7f681e027c4b75f83de5f3ac22e63661f7779775 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,8 @@ donate -基于 Vue.js + Element UI 的后台管理系统解决方案。[线上地址](https://lin-xin.github.io/example/work/) +基于 Vue + Element UI 的后台管理系统解决方案。[线上地址](https://lin-xin.github.io/example/work/) -本项目基于 vue-cli3 构建,如果是 vue-cli2 的请下载[旧版本 V3.2.0](https://github.com/lin-xin/vue-manage-system/releases/tag/V3.2.0) > React + Ant Design 的版本正在开发中,仓库地址:[react-manage-system](https://github.com/lin-xin/react-manage-system) diff --git a/package.json b/package.json index fe19de90162392a5a4b4014e1d84587556179c17..5d6ca3d6576a3c42b039d3e97f91446d3c9fc110 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-manage-system", - "version": "4.1.0", + "version": "4.2.0", "private": true, "scripts": { "dev": "npm run serve", @@ -17,7 +17,7 @@ "vue-i18n": "^8.10.0", "vue-quill-editor": "^3.0.6", "vue-router": "^3.0.3", - "vue-schart": "^1.0.0", + "vue-schart": "^2.0.0", "vuedraggable": "^2.17.0" }, "devDependencies": { diff --git a/public/table.json b/public/table.json new file mode 100644 index 0000000000000000000000000000000000000000..ddd2e322d56df5a58f240463b5e943fd6919cc5d --- /dev/null +++ b/public/table.json @@ -0,0 +1,40 @@ +{ + "list": [{ + "id": 1, + "name": "张三", + "money": 123, + "address": "广东省东莞市长安镇", + "state": "成功", + "date": "2019-11-1", + "thumb": "https://lin-xin.gitee.io/images/post/wms.png" + }, + { + "id": 2, + "name": "李四", + "money": 456, + "address": "广东省广州市白云区", + "state": "成功", + "date": "2019-10-11", + "thumb": "https://lin-xin.gitee.io/images/post/node3.png" + }, + { + "id": 3, + "name": "王五", + "money": 789, + "address": "湖南省长沙市", + "state": "失败", + "date": "2019-11-11", + "thumb": "https://lin-xin.gitee.io/images/post/parcel.png" + }, + { + "id": 4, + "name": "赵六", + "money": 1011, + "address": "福建省厦门市鼓浪屿", + "state": "成功", + "date": "2019-10-20", + "thumb": "https://lin-xin.gitee.io/images/post/notice.png" + } + ], + "pageTotal": 4 +} \ No newline at end of file diff --git a/src/api/index.js b/src/api/index.js index 77cdf6a7d240b1bdffd2eef0c0c586420b60a8d1..3035ba903320f7c1d4fce1f7212daa3337259c6c 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,9 +1,9 @@ import request from '../utils/request'; -export const fetchData = (query) => { +export const fetchData = query => { return request({ - url: '/ms/table/list', - method: 'post', - data: query - }) -} \ No newline at end of file + url: './table.json', + method: 'get', + params: query + }); +}; diff --git a/src/components/page/BaseCharts.vue b/src/components/page/BaseCharts.vue index b0ca9e16f20f4aeef4425e180fa6fdc6ab01f799..a2699255bd21e2fe2346be673a06c5e35515c426 100644 --- a/src/components/page/BaseCharts.vue +++ b/src/components/page/BaseCharts.vue @@ -2,108 +2,148 @@
- schart图表 + + schart图表 +
vue-schart:vue.js封装sChart.js的图表组件。 - 访问地址:vue-schart + 访问地址: + vue-schart
柱状图
- +
-
折线图
- +
折线图
+
-
饼状图
- +
饼状图
+
-
环形图
- +
环形图
+
\ No newline at end of file diff --git a/src/components/page/BaseTable.vue b/src/components/page/BaseTable.vue index 570be5b4023de22ddd615add71489465bc7b5dd4..f4d333db5e40048693ef4cbb7f34ed22d1207d03 100644 --- a/src/components/page/BaseTable.vue +++ b/src/components/page/BaseTable.vue @@ -130,6 +130,7 @@ export default { // 获取 easy-mock 的模拟数据 getData() { fetchData(this.query).then(res => { + console.log(res); this.tableData = res.list; this.pageTotal = res.pageTotal || 50; }); diff --git a/src/components/page/Dashboard.vue b/src/components/page/Dashboard.vue index 4c61e9b6235ad00020a6364c20eb61905d329527..d142c1e5940728d52199e8711dce664c15afb796 100644 --- a/src/components/page/Dashboard.vue +++ b/src/components/page/Dashboard.vue @@ -4,27 +4,29 @@ - - + +
语言详情 -
- Vue - - JavaScript - - CSS - - HTML - + Vue + JavaScript + CSS + HTML +
@@ -68,7 +70,7 @@ 待办事项 添加 - +