From 1f6e35ee5e0215f0c0497a767b33c93df4b37040 Mon Sep 17 00:00:00 2001 From: piexlmax Date: Thu, 2 Sep 2021 15:11:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/package-lock.json | 41 ++- .../components/dashbordCharts/echartsLine.vue | 226 ++++++++------- .../dashbordTable/dashbordTable.vue | 69 +++-- web/src/view/dashboard/index.vue | 273 +++++++++--------- 4 files changed, 329 insertions(+), 280 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index fd4ac33c..7143d427 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,6 +1,6 @@ { "name": "gin-vue-admin", - "version": "0.1.0", + "version": "2.3.5", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2381,6 +2381,7 @@ "version": "3.1.2", "resolved": "https://registry.npm.taobao.org/anymatch/download/anymatch-3.1.2.tgz?cache=0&sync_timestamp=1617747806715&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fanymatch%2Fdownload%2Fanymatch-3.1.2.tgz", "integrity": "sha1-wFV8CWrzLxBhmPT04qODU343hxY=", + "dev": true, "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -2800,7 +2801,8 @@ "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-2.2.0.tgz", - "integrity": "sha1-dfUC7q+f/eQvyYgpZFvk6na9ni0=" + "integrity": "sha1-dfUC7q+f/eQvyYgpZFvk6na9ni0=", + "dev": true }, "bindings": { "version": "1.5.0", @@ -3256,6 +3258,7 @@ "version": "3.5.2", "resolved": "https://registry.nlark.com/chokidar/download/chokidar-3.5.2.tgz", "integrity": "sha1-26OXb8rbAW9m/TZQIdkWANAcHnU=", + "dev": true, "requires": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -3271,6 +3274,7 @@ "version": "3.0.2", "resolved": "https://registry.npm.taobao.org/braces/download/braces-3.0.2.tgz", "integrity": "sha1-NFThpGLujVmeI23zNs2epPiv4Qc=", + "dev": true, "requires": { "fill-range": "^7.0.1" } @@ -3279,6 +3283,7 @@ "version": "7.0.1", "resolved": "https://registry.npm.taobao.org/fill-range/download/fill-range-7.0.1.tgz", "integrity": "sha1-GRmmp8df44ssfHflGYU12prN2kA=", + "dev": true, "requires": { "to-regex-range": "^5.0.1" } @@ -3286,12 +3291,14 @@ "is-number": { "version": "7.0.0", "resolved": "https://registry.npm.taobao.org/is-number/download/is-number-7.0.0.tgz", - "integrity": "sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss=" + "integrity": "sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss=", + "dev": true }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npm.taobao.org/to-regex-range/download/to-regex-range-5.0.1.tgz", "integrity": "sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ=", + "dev": true, "requires": { "is-number": "^7.0.0" } @@ -4773,6 +4780,14 @@ "safer-buffer": "^2.1.0" } }, + "echarts": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-4.9.0.tgz", + "integrity": "sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA==", + "requires": { + "zrender": "4.3.2" + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz", @@ -5806,6 +5821,7 @@ "version": "2.3.2", "resolved": "https://registry.npm.taobao.org/fsevents/download/fsevents-2.3.2.tgz?cache=0&sync_timestamp=1612536546156&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffsevents%2Fdownload%2Ffsevents-2.3.2.tgz", "integrity": "sha1-ilJveLj99GI7cJ4Ll1xSwkwC/Ro=", + "dev": true, "optional": true }, "function-bind": { @@ -5892,6 +5908,7 @@ "version": "5.1.2", "resolved": "https://registry.nlark.com/glob-parent/download/glob-parent-5.1.2.tgz?cache=0&sync_timestamp=1626760200164&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.2.tgz", "integrity": "sha1-hpgyxYA0/mikCTwX3BXoNA2EAcQ=", + "dev": true, "requires": { "is-glob": "^4.0.1" } @@ -6766,6 +6783,7 @@ "version": "2.1.0", "resolved": "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-2.1.0.tgz", "integrity": "sha1-6h9/O4DwZCNug0cPhsCcJU+0Wwk=", + "dev": true, "requires": { "binary-extensions": "^2.0.0" } @@ -6892,7 +6910,8 @@ "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true }, "is-fullwidth-code-point": { "version": "3.0.0", @@ -6904,6 +6923,7 @@ "version": "4.0.1", "resolved": "https://registry.npm.taobao.org/is-glob/download/is-glob-4.0.1.tgz", "integrity": "sha1-dWfb6fL14kZ7x3q4PEopSCQHpdw=", + "dev": true, "requires": { "is-extglob": "^2.1.1" } @@ -7922,7 +7942,8 @@ "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npm.taobao.org/normalize-path/download/normalize-path-3.0.0.tgz", - "integrity": "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU=" + "integrity": "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU=", + "dev": true }, "normalize-range": { "version": "0.1.2", @@ -8472,7 +8493,8 @@ "picomatch": { "version": "2.3.0", "resolved": "https://registry.nlark.com/picomatch/download/picomatch-2.3.0.tgz", - "integrity": "sha1-8fBh3o9qS/AiiS4tEoI0+5gwKXI=" + "integrity": "sha1-8fBh3o9qS/AiiS4tEoI0+5gwKXI=", + "dev": true }, "pify": { "version": "4.0.1", @@ -9468,6 +9490,7 @@ "version": "3.6.0", "resolved": "https://registry.nlark.com/readdirp/download/readdirp-3.6.0.tgz", "integrity": "sha1-dKNwvYVxFuJFspzJc0DNQxoCpsc=", + "dev": true, "requires": { "picomatch": "^2.2.1" } @@ -9866,6 +9889,7 @@ "version": "1.38.1", "resolved": "https://registry.nlark.com/sass/download/sass-1.38.1.tgz?cache=0&sync_timestamp=1629764768435&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsass%2Fdownload%2Fsass-1.38.1.tgz", "integrity": "sha1-VN+xf7FohGtYUDJLgvxi3Gj1G60=", + "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0" } @@ -12539,6 +12563,11 @@ "dev": true } } + }, + "zrender": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-4.3.2.tgz", + "integrity": "sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g==" } } } diff --git a/web/src/components/dashbordCharts/echartsLine.vue b/web/src/components/dashbordCharts/echartsLine.vue index 01696017..e3511a3e 100644 --- a/web/src/components/dashbordCharts/echartsLine.vue +++ b/web/src/components/dashbordCharts/echartsLine.vue @@ -1,119 +1,143 @@ \ No newline at end of file + diff --git a/web/src/components/dashbordTable/dashbordTable.vue b/web/src/components/dashbordTable/dashbordTable.vue index 72c69c36..5c17a3c8 100644 --- a/web/src/components/dashbordTable/dashbordTable.vue +++ b/web/src/components/dashbordTable/dashbordTable.vue @@ -1,56 +1,53 @@ \ No newline at end of file + diff --git a/web/src/view/dashboard/index.vue b/web/src/view/dashboard/index.vue index 9c489dc1..d00789b9 100644 --- a/web/src/view/dashboard/index.vue +++ b/web/src/view/dashboard/index.vue @@ -1,152 +1,151 @@ @@ -277,4 +276,4 @@ export default { } } } - \ No newline at end of file + -- GitLab