diff --git a/server/config.yaml b/server/config.yaml index 0f10318aadbd1bb183a006fa3dcc123365adbbe3..c0bfed124e1a71fd42a70c31a271afeded2bdb2f 100644 --- a/server/config.yaml +++ b/server/config.yaml @@ -13,7 +13,7 @@ mysql: username: root password: 'Aa@6447985' path: '127.0.0.1:3306' - db-name: 'qmPlus' + db-name: 'yx' config: 'charset=utf8&parseTime=True&loc=Local' max-idle-conns: 10 max-open-conns: 10 diff --git a/web/package-lock.json b/web/package-lock.json index 334084a033f31579ac88855cd7bc5d00f708d33d..3a5897a4bcd776028d360ea0cc415d82e76721c6 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -870,6 +870,14 @@ "postcss": "^7.0.0" } }, + "@moefe/vue-aplayer": { + "version": "2.0.0-beta.5", + "resolved": "https://registry.npmjs.org/@moefe/vue-aplayer/-/vue-aplayer-2.0.0-beta.5.tgz", + "integrity": "sha512-ytzp4GStzjftuh7H1rIS/ziqwV1FO67iTLSkDxgN0J2bqlO+rBgDDr83Y+pZKBIgRUc30uu/UZHqmE4QiBHHeg==", + "requires": { + "vue": "^2.5.17" + } + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npm.taobao.org/@mrmlnc/readdir-enhanced/download/@mrmlnc/readdir-enhanced-2.2.1.tgz", @@ -1280,7 +1288,7 @@ "@vue/component-compiler-utils": "^3.0.0", "@vue/preload-webpack-plugin": "^1.1.0", "@vue/web-component-wrapper": "^1.2.0", - "acorn": "^6.4.1", + "acorn": "^6.1.1", "acorn-walk": "^6.1.1", "address": "^1.0.3", "autoprefixer": "^9.5.1", @@ -1310,7 +1318,7 @@ "lodash.mapvalues": "^4.6.0", "lodash.transform": "^4.6.0", "mini-css-extract-plugin": "^0.6.0", - "minimist": "^1.2.3", + "minimist": "^1.2.0", "ora": "^3.4.0", "portfinder": "^1.0.20", "postcss-loader": "^3.0.0", @@ -1331,6 +1339,18 @@ "webpack-merge": "^4.2.1" }, "dependencies": { + "acorn": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", + "dev": true + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, "semver": { "version": "6.3.0", "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz", @@ -4059,6 +4079,14 @@ "safer-buffer": "^2.1.0" } }, + "echarts": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-4.7.0.tgz", + "integrity": "sha512-NlOTdUcAsIyCCG+N4uh0ZEvXtrPW2jvcuqf03RyqYeCKzyPbiOQ4I3MdKXMhxG3lBdqQNdNXVT71SB4KTQjN0A==", + "requires": { + "zrender": "4.3.0" + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz", @@ -12379,6 +12407,11 @@ "dev": true } } + }, + "zrender": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-4.3.0.tgz", + "integrity": "sha512-Dii6j2bDsPkxQayuVf2DXJeruIB/mKVxxcGRZQ9GExiBd4c3w7+oBuvo1O/JGHeFeA1nCmSDVDs/S7yKZG1nrA==" } } -} \ No newline at end of file +} diff --git a/web/package.json b/web/package.json index 5080427d0eadd740b2ea9e812470e1592b847fb8..f4db3dbe29395f2aefbd7711c5a312d8e8dd6168 100644 --- a/web/package.json +++ b/web/package.json @@ -8,8 +8,10 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "@moefe/vue-aplayer": "^2.0.0-beta.5", "axios": "^0.19.0", "core-js": "^2.6.5", + "echarts": "^4.7.0", "element-ui": "^2.12.0", "mavon-editor": "^2.7.7", "node-sass": "^4.12.0", diff --git a/web/src/main.js b/web/src/main.js index 7d9129c47e10e3734bd5844659a68317b784ffee..ccba01db6c2cc819ddf8d65599a1dc3b24f626cd 100644 --- a/web/src/main.js +++ b/web/src/main.js @@ -35,8 +35,24 @@ Vue.config.productionTip = false // 路由守卫 import Bus from '@/utils/bus.js' Vue.use(Bus) + +import APlayer from '@moefe/vue-aplayer'; + +Vue.use(APlayer, { + defaultCover: 'https://github.com/u3u.png', + productionTip: true, +}); + + new Vue({ render: h => h(App), router, store -}).$mount('#app') \ No newline at end of file +}).$mount('#app') + +//引入echarts +import echarts from 'echarts' +Vue.prototype.$echarts = echarts; + + + diff --git a/web/src/view/dashboard/component/RaddarChart.vue b/web/src/view/dashboard/component/RaddarChart.vue new file mode 100644 index 0000000000000000000000000000000000000000..351f8f72a80e441c332a6fab155fac9e6fbdec34 --- /dev/null +++ b/web/src/view/dashboard/component/RaddarChart.vue @@ -0,0 +1,120 @@ + + + diff --git a/web/src/view/dashboard/component/Sunburst.vue b/web/src/view/dashboard/component/Sunburst.vue new file mode 100644 index 0000000000000000000000000000000000000000..01fac5c64549446e3cc089be8453f56b689d63c5 --- /dev/null +++ b/web/src/view/dashboard/component/Sunburst.vue @@ -0,0 +1,391 @@ + + + + + diff --git a/web/src/view/dashboard/component/musicPlayer.vue b/web/src/view/dashboard/component/musicPlayer.vue new file mode 100644 index 0000000000000000000000000000000000000000..7ed59f4a1fd53927235c8b68e09863287d7357c8 --- /dev/null +++ b/web/src/view/dashboard/component/musicPlayer.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/web/src/view/dashboard/component/stackMap.vue b/web/src/view/dashboard/component/stackMap.vue new file mode 100644 index 0000000000000000000000000000000000000000..ffb04947dd10178c8dee2e63b8686a2b7e225baf --- /dev/null +++ b/web/src/view/dashboard/component/stackMap.vue @@ -0,0 +1,167 @@ + + + + + diff --git a/web/src/view/dashboard/component/todoList/Todo.vue b/web/src/view/dashboard/component/todoList/Todo.vue new file mode 100644 index 0000000000000000000000000000000000000000..1ca0af9202b2735dabb85e2fcf19c92b523c948c --- /dev/null +++ b/web/src/view/dashboard/component/todoList/Todo.vue @@ -0,0 +1,81 @@ + + + diff --git a/web/src/view/dashboard/component/todoList/index.vue b/web/src/view/dashboard/component/todoList/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..4972fd2d3cd4c8a5d284bebf20fca9cab09ca8c4 --- /dev/null +++ b/web/src/view/dashboard/component/todoList/index.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/web/src/view/dashboard/index.vue b/web/src/view/dashboard/index.vue index b6b02927c321eb04070829692249158e8975a8e2..7c4213a29d6935460c19371e8002aad358008bbf 100644 --- a/web/src/view/dashboard/index.vue +++ b/web/src/view/dashboard/index.vue @@ -1,48 +1,204 @@ \ No newline at end of file + .big{ + width: 100%; + .top{ + width: 98%; + height: 360px; + margin-top: 20px; + overflow: hidden; + .chart-container{ + position: relative; + width: 100%; + height: 100%; + padding: 20px; + background-color: #fff; + } + } + .mid{ + width: 98%; + height: 380px; + .chart-wrapper { + height: 340px; + background: #fff; + padding: 16px 16px 0; + margin-bottom: 32px; + } + } + .bottom{ + width: 98%; + height: 230px; + margin-top: 20px; + .chart-player{ + width: 100%; + height: 100%; + padding: 20px; + background-color: #fff; + } + } + } + + diff --git a/web/src/view/layout/index.vue b/web/src/view/layout/index.vue index 356324003ba4ed4abe681e618f6fdf782c903925..6098ff294d16e5b8b21e9b02d16fec1584446071 100644 --- a/web/src/view/layout/index.vue +++ b/web/src/view/layout/index.vue @@ -60,10 +60,10 @@ - + - @@ -114,7 +114,7 @@ export default { } ] }, - + } }, components: { @@ -216,6 +216,9 @@ $mainHight: 100vh; .dropdown-group { min-width: 100px; } +.admin-box{ + background-color: rgb(243,243,243); +} .el-scrollbar__wrap { padding-bottom: 17px; } @@ -318,4 +321,4 @@ $mainHight: 100vh; } } } - \ No newline at end of file +