From b964ff666ec4b0f31def2d1408d63bbea51b28a0 Mon Sep 17 00:00:00 2001 From: MTrunning <1262327911@qq.com> Date: Wed, 18 Mar 2020 17:01:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E5=B1=82=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 39 ++ package.json | 3 + src/assets/scss/style.scss | 18 +- src/components/echart/center.vue | 341 ++++++++++++++++++ src/components/echart/centreLeft1Chart.vue | 87 +++++ src/components/echart/centreLeft2Chart.vue | 208 +++++++++++ .../centreRight2/centreRight2Chart1.vue | 174 +++++++++ .../echart/centreRightListChart.vue | 0 src/main.js | 2 +- src/views/center.vue | 167 +++++++++ src/views/centreLeft1.vue | 60 +-- src/views/centreLeft2.vue | 57 +++ src/views/centreRight1.vue | 73 ++++ src/views/centreRight2.vue | 77 ++++ src/views/index.vue | 48 ++- 15 files changed, 1313 insertions(+), 41 deletions(-) create mode 100644 src/components/echart/center.vue create mode 100644 src/components/echart/centreLeft1Chart.vue create mode 100644 src/components/echart/centreLeft2Chart.vue create mode 100644 src/components/echart/centreRight2/centreRight2Chart1.vue create mode 100644 src/components/echart/centreRightListChart.vue create mode 100644 src/views/center.vue create mode 100644 src/views/centreLeft2.vue create mode 100644 src/views/centreRight1.vue create mode 100644 src/views/centreRight2.vue diff --git a/package-lock.json b/package-lock.json index 2df29c1..c7559f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1119,6 +1119,14 @@ "integrity": "sha1-HBJhu+qhCoBVu8XYq4S3sq/IRqA=", "dev": true }, + "@types/echarts": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@types/echarts/-/echarts-4.4.3.tgz", + "integrity": "sha512-HmDmg9hDJQC5KOpNOeVgcaBM+emDiduNyCCHVInDrVVfLDVPuK4fSSISy39kn1HqPa1hYDQ96FIGEhjRNGHhPA==", + "requires": { + "@types/zrender": "*" + } + }, "@types/events": { "version": "3.0.0", "resolved": "https://registry.npm.taobao.org/@types/events/download/@types/events-3.0.0.tgz", @@ -1160,6 +1168,11 @@ "integrity": "sha1-aQoUdbhPKohP0HzXl8APXzE1bqg=", "dev": true }, + "@types/zrender": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/zrender/-/zrender-4.0.0.tgz", + "integrity": "sha512-s89GOIeKFiod2KSqHkfd2rzx+T2DVu7ihZCBEBnhFrzvQPUmzvDSBot9Fi1DfMQm9Odg+rTqoMGC38RvrwJK2w==" + }, "@vue/babel-helper-vue-jsx-merge-props": { "version": "1.0.0", "resolved": "https://registry.npm.taobao.org/@vue/babel-helper-vue-jsx-merge-props/download/@vue/babel-helper-vue-jsx-merge-props-1.0.0.tgz", @@ -4073,6 +4086,14 @@ "safer-buffer": "^2.1.0" } }, + "echarts": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-4.6.0.tgz", + "integrity": "sha512-xKkcr6v9UVOSF+PMuj7Ngt3bnzLwN1sSXWCvpvX+jYb3mePYsZnABq7wGkPac/m0nV653uGHXoHK8DCKCprdNg==", + "requires": { + "zrender": "4.2.0" + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz", @@ -7617,6 +7638,11 @@ "dev": true, "optional": true }, + "nanoid": { + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz", + "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==" + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npm.taobao.org/nanomatch/download/nanomatch-1.2.13.tgz", @@ -11125,6 +11151,14 @@ "resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.11.tgz?cache=0&sync_timestamp=1583528900332&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.11.tgz", "integrity": "sha1-dllNh31LEiNEBuhONSdcbVFBJcU=" }, + "vue-awesome": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/vue-awesome/-/vue-awesome-4.0.2.tgz", + "integrity": "sha512-TE9hVwyVrGnBetO/MJwZ/7qLO6Vgr/WrDtIA7vwNryoLdA2jfRcKRw29KacpU5xj3wzZhHfYJ2xJLxfirhmH5Q==", + "requires": { + "nanoid": "^2.1.6" + } + }, "vue-eslint-parser": { "version": "7.0.0", "resolved": "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-7.0.0.tgz?cache=0&sync_timestamp=1573306368916&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-eslint-parser%2Fdownload%2Fvue-eslint-parser-7.0.0.tgz", @@ -11869,6 +11903,11 @@ "dev": true } } + }, + "zrender": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-4.2.0.tgz", + "integrity": "sha512-YJ9hxt5uFincYYU3KK31+Ce+B6PJmYYK0Q9fQ6jOUAoC/VHbe4kCKAPkxKeT7jGTxrK5wYu18R0TLGqj2zbEOA==" } } } diff --git a/package.json b/package.json index 8460db4..1305ff8 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,11 @@ }, "dependencies": { "@jiaminghi/data-view": "^2.7.3", + "@types/echarts": "^4.4.3", "core-js": "^3.6.4", + "echarts": "^4.6.0", "vue": "^2.6.11", + "vue-awesome": "^4.0.2", "vue-router": "^3.1.5", "vuex": "^3.1.2" }, diff --git a/src/assets/scss/style.scss b/src/assets/scss/style.scss index 883b919..b8f4a22 100644 --- a/src/assets/scss/style.scss +++ b/src/assets/scss/style.scss @@ -63,7 +63,7 @@ a { } .bg-color-black { - background-color: #0f1325; + background-color: rgba(19, 25, 47, .5); } .bg-color-blue { @@ -79,6 +79,22 @@ a { } } +.colorGrass { + color: #33CEA0; + + &:hover { + color: #33CEA0 !important; + } +} + +.colorRed { + color: #ff5722; + + &:hover { + color: #ff5722 !important; + } +} + .colorText { color: #D3D6DD !important; diff --git a/src/components/echart/center.vue b/src/components/echart/center.vue new file mode 100644 index 0000000..824b087 --- /dev/null +++ b/src/components/echart/center.vue @@ -0,0 +1,341 @@ + + + + + \ No newline at end of file diff --git a/src/components/echart/centreLeft1Chart.vue b/src/components/echart/centreLeft1Chart.vue new file mode 100644 index 0000000..4a5082f --- /dev/null +++ b/src/components/echart/centreLeft1Chart.vue @@ -0,0 +1,87 @@ + + + + + \ No newline at end of file diff --git a/src/components/echart/centreLeft2Chart.vue b/src/components/echart/centreLeft2Chart.vue new file mode 100644 index 0000000..b2f6f64 --- /dev/null +++ b/src/components/echart/centreLeft2Chart.vue @@ -0,0 +1,208 @@ + + + + + \ No newline at end of file diff --git a/src/components/echart/centreRight2/centreRight2Chart1.vue b/src/components/echart/centreRight2/centreRight2Chart1.vue new file mode 100644 index 0000000..73c3fcf --- /dev/null +++ b/src/components/echart/centreRight2/centreRight2Chart1.vue @@ -0,0 +1,174 @@ + + + + + \ No newline at end of file diff --git a/src/components/echart/centreRightListChart.vue b/src/components/echart/centreRightListChart.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/main.js b/src/main.js index f61d82b..6f94132 100644 --- a/src/main.js +++ b/src/main.js @@ -8,7 +8,7 @@ Vue.use(dataV) // 引入vue-awesome import Icon from 'vue-awesome/components/Icon' import 'vue-awesome/icons/index.js' -// 全局注册 +// 全局注册图标 Vue.component('icon', Icon) import './assets/scss/style.scss' diff --git a/src/views/center.vue b/src/views/center.vue new file mode 100644 index 0000000..e410275 --- /dev/null +++ b/src/views/center.vue @@ -0,0 +1,167 @@ + + + + + \ No newline at end of file diff --git a/src/views/centreLeft1.vue b/src/views/centreLeft1.vue index ab0fd4f..c90e566 100644 --- a/src/views/centreLeft1.vue +++ b/src/views/centreLeft1.vue @@ -1,34 +1,37 @@ + + \ No newline at end of file diff --git a/src/views/centreRight1.vue b/src/views/centreRight1.vue new file mode 100644 index 0000000..56e55a6 --- /dev/null +++ b/src/views/centreRight1.vue @@ -0,0 +1,73 @@ + + + + + \ No newline at end of file diff --git a/src/views/centreRight2.vue b/src/views/centreRight2.vue new file mode 100644 index 0000000..0268908 --- /dev/null +++ b/src/views/centreRight2.vue @@ -0,0 +1,77 @@ + + + + + \ No newline at end of file diff --git a/src/views/index.vue b/src/views/index.vue index 91a1830..859e97c 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -26,23 +26,26 @@ -
+
-
+
- 构建数据分析 + 构建数据分析
-
- 构建数据分析 +
+ 构建数据分析
-
+
构建数据分析
-
+
- 2020年03月16日 + 2020年03月16日 周一 12:00
@@ -55,11 +58,24 @@
-
-
-
-
-
+
+ + + +
+ +
+
+
+ +
+ +
+
+ + + +
@@ -75,13 +91,17 @@