diff --git a/package.json b/package.json
index d24b76ccd6888d21932f1ae43e3a8541b6f809d2..528c95542822b739c58bbdc53f51c0db67a39587 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
"axios": "^0.19.2",
"babel-polyfill": "^6.26.0",
"codemirror": "^5.45.0",
- "echarts": "^4.2.1",
+ "echarts": "^4.8.0",
"element-ui": "^2.11.1",
"js-yaml": "^3.13.1",
"json2yaml": "^1.1.0",
diff --git a/src/assets/imgs/data_img_default.gif b/src/assets/imgs/data_img_default.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7966e9be68f34b0227b0dc7a5d61080d41abc233
Binary files /dev/null and b/src/assets/imgs/data_img_default.gif differ
diff --git a/src/assets/imgs/data_img_service.gif b/src/assets/imgs/data_img_service.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4bb8b901e38626507e336505cf031adaffd4198d
Binary files /dev/null and b/src/assets/imgs/data_img_service.gif differ
diff --git a/src/assets/imgs/icon_down.png b/src/assets/imgs/icon_down.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c84e6e869b9989040765dd18a444ac182b3cb72
Binary files /dev/null and b/src/assets/imgs/icon_down.png differ
diff --git a/src/assets/imgs/icon_up.png b/src/assets/imgs/icon_up.png
new file mode 100644
index 0000000000000000000000000000000000000000..02d7ab4ba944bf40ca2904b7babdff5347e04488
Binary files /dev/null and b/src/assets/imgs/icon_up.png differ
diff --git a/src/assets/imgs/list_ic_topfive.png b/src/assets/imgs/list_ic_topfive.png
new file mode 100644
index 0000000000000000000000000000000000000000..07dcfd1da3a8f640df509124a362e87c20705791
Binary files /dev/null and b/src/assets/imgs/list_ic_topfive.png differ
diff --git a/src/assets/imgs/list_ic_topfour.png b/src/assets/imgs/list_ic_topfour.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd0010a0df2f56ddb26c01f0557628c644f34e52
Binary files /dev/null and b/src/assets/imgs/list_ic_topfour.png differ
diff --git a/src/assets/imgs/list_ic_topone.png b/src/assets/imgs/list_ic_topone.png
index 256716532fb40ab475cd03e0a3482e075522a8cf..6992116ff0578a33512d9552c4c035288b07d99f 100644
Binary files a/src/assets/imgs/list_ic_topone.png and b/src/assets/imgs/list_ic_topone.png differ
diff --git a/src/assets/imgs/list_ic_topthree.png b/src/assets/imgs/list_ic_topthree.png
index 4c434e8e80e80570613974bf58d6e4cc739e0814..d257ca06c7e54de7a1356125cec7e12c4bb01404 100644
Binary files a/src/assets/imgs/list_ic_topthree.png and b/src/assets/imgs/list_ic_topthree.png differ
diff --git a/src/assets/imgs/list_ic_toptwo.png b/src/assets/imgs/list_ic_toptwo.png
index 099d86c00c983317b68b40edec545c743d9bb059..a4ea096f3a81b91d56a6ad1cac1b6319fa8e058a 100644
Binary files a/src/assets/imgs/list_ic_toptwo.png and b/src/assets/imgs/list_ic_toptwo.png differ
diff --git a/src/assets/imgs/tool_ic_shujufxzx.png b/src/assets/imgs/tool_ic_shujufxzx.png
new file mode 100644
index 0000000000000000000000000000000000000000..c46025aef519b1605bbceb6b653f1ce192b9c3b5
Binary files /dev/null and b/src/assets/imgs/tool_ic_shujufxzx.png differ
diff --git a/src/components/shopping-cart/shopping-cart-com.vue b/src/components/shopping-cart/shopping-cart-com.vue
index c950b301286d0c3aef5dfeaf0865251b69d16150..928d2de0c2941751e5abfbbe1c8fd9b527eeb5ca 100644
--- a/src/components/shopping-cart/shopping-cart-com.vue
+++ b/src/components/shopping-cart/shopping-cart-com.vue
@@ -125,7 +125,7 @@ export default {
});
this.$api.serviceShop.delShoppingCart(query).then(response => {
console.log(response);
- this.getList()
+ this.getList();
});
},
changeCellMsg(val) {
@@ -136,7 +136,7 @@ export default {
let query = [val.data.id];
this.$api.serviceShop.delShoppingCart(query).then(response => {
console.log(response);
- this.getList()
+ this.getList();
});
},
oneClickApplication() {
@@ -146,7 +146,8 @@ export default {
arr.push(this.list[index]);
}
});
- this.$store.commit("setShoppingCart", arr);
+ window.sessionStorage.setItem("shoppingCart", JSON.stringify(arr));
+ // this.$store.commit("setShoppingCart", arr);
this.$router.push({ name: "shopCarApply" });
}
}
diff --git a/src/main.js b/src/main.js
index 4f9e14fa19d84bdec79762ae722484b8795f3f61..51f15659726d6d788bf0ced36b49dcc9b327ad23 100644
--- a/src/main.js
+++ b/src/main.js
@@ -22,6 +22,9 @@ import "@/icons"
import "./assets/css/index.css";
+import echarts from 'echarts'
+Vue.prototype.$echarts = echarts;
+
import VueI18n from 'vue-i18n'
Vue.use(VueI18n)
diff --git a/src/pages/data-analysis/my-service.vue b/src/pages/data-analysis/my-service.vue
index 24310e78ed45469a8879ef1e41d41e230ad0f9c6..9f2d7349ec5024486341b53c6c9f9b9130febc78 100644
--- a/src/pages/data-analysis/my-service.vue
+++ b/src/pages/data-analysis/my-service.vue
@@ -4,18 +4,254 @@
{{ $t("lang.dataAnalysis") }}
{{ $t("lang.myServiceDataAnalysis") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index a5ac9ff6201b12f4aa2bfff07c4a4f5a854c759c..27b68c34687c866dd828e06d686112e108ba5501 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1972,7 +1972,7 @@ commander@2.17.x:
resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
-commander@^2.18.0, commander@^2.20.0:
+commander@^2.18.0, commander@^2.20.0, commander@^2.20.3:
version "2.20.3"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -2279,6 +2279,11 @@ cssesc@^3.0.0:
resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+cssfilter@0.0.10:
+ version "0.0.10"
+ resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae"
+ integrity sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4=
+
cssnano-preset-default@^4.0.7:
version "4.0.7"
resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76"
@@ -2696,12 +2701,12 @@ duplexify@^3.4.2, duplexify@^3.6.0:
readable-stream "^2.0.0"
stream-shift "^1.0.0"
-echarts@^4.2.1:
- version "4.6.0"
- resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.6.0.tgz#b5a47a1046cec93ceeef954f9ee54751340558ec"
- integrity sha512-xKkcr6v9UVOSF+PMuj7Ngt3bnzLwN1sSXWCvpvX+jYb3mePYsZnABq7wGkPac/m0nV653uGHXoHK8DCKCprdNg==
+echarts@^4.8.0:
+ version "4.8.0"
+ resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.8.0.tgz#b2c1cfb9229b13d368ee104fc8eea600b574d4c4"
+ integrity sha512-YwShpug8fWngj/RlgxDaYrLBoD+LsZUArrusjNPHpAF+is+gGe38xx4W848AwWMGoi745t3OXM52JedNrv+F6g==
dependencies:
- zrender "4.2.0"
+ zrender "4.3.1"
ee-first@1.1.1:
version "1.1.1"
@@ -3513,6 +3518,16 @@ hex-color-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
+highlight.js-async-webpack@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/highlight.js-async-webpack/-/highlight.js-async-webpack-1.0.4.tgz#c06b67bf99f049045d62b756e5855b0912ec616c"
+ integrity sha1-wGtnv5nwSQRdYrdW5YVbCRLsYWw=
+
+highlight.js@^9.11.0:
+ version "9.18.1"
+ resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c"
+ integrity sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==
+
hmac-drbg@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -4414,6 +4429,15 @@ material-design-icons-iconfont@^4.0.5:
resolved "https://registry.yarnpkg.com/material-design-icons-iconfont/-/material-design-icons-iconfont-4.0.5.tgz#4107ba3b8a9d688a3d9325fc7363af51b17d3aee"
integrity sha512-ByJJ1yz8+RfCx2uNiC5WjVCR7K3UWRb8ytWV3RMaoFRzQLNr/J5x7+Wg1+3OlIZahNXrId9Hu+BfXfQIo01v7g==
+mavon-editor@^2.9.0:
+ version "2.9.0"
+ resolved "https://registry.yarnpkg.com/mavon-editor/-/mavon-editor-2.9.0.tgz#e51bbcdcde18b9236333a9ceb12fed2d84542900"
+ integrity sha512-eGEppkQwGg4Z9UOtCLwL5rcg1CQRw8HyaA8sWJeRJTjNJ4HwBMX6BH5XVnQeumUUVFqHr6cm7GjWgVkIxiSm+Q==
+ dependencies:
+ highlight.js "^9.11.0"
+ highlight.js-async-webpack "^1.0.4"
+ xss "^1.0.6"
+
md5.js@^1.3.4:
version "1.3.5"
resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
@@ -7460,6 +7484,14 @@ x-photoswipe@^4.1.3-rc.1:
resolved "https://registry.yarnpkg.com/x-photoswipe/-/x-photoswipe-4.1.3-rc.1.tgz#e761901752dd3dd1f718e538514b609b5df5f7db"
integrity sha512-ok+x+1ufLuBT9dfM5P2FcRefwNniQoVwwfBhGa5gLn8NrSTzNah2p4IElMLwzXuKLtyH4yb+z3IsdDef3FOL5A==
+xss@^1.0.6:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.7.tgz#a554cbd5e909324bd6893fb47fff441ad54e2a95"
+ integrity sha512-A9v7tblGvxu8TWXQC9rlpW96a+LN1lyw6wyhpTmmGW+FwRMactchBR3ROKSi33UPCUcUHSu8s9YP6F+K3Mw//w==
+ dependencies:
+ commander "^2.20.3"
+ cssfilter "0.0.10"
+
xtend@^4.0.0, xtend@~4.0.1:
version "4.0.2"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
@@ -7538,7 +7570,7 @@ yargs@13.2.4:
y18n "^4.0.0"
yargs-parser "^13.1.0"
-zrender@4.2.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/zrender/-/zrender-4.2.0.tgz#d001302e155f28de1f9fc7fcd5c254bad28471cf"
- integrity sha512-YJ9hxt5uFincYYU3KK31+Ce+B6PJmYYK0Q9fQ6jOUAoC/VHbe4kCKAPkxKeT7jGTxrK5wYu18R0TLGqj2zbEOA==
+zrender@4.3.1:
+ version "4.3.1"
+ resolved "https://registry.yarnpkg.com/zrender/-/zrender-4.3.1.tgz#baf8aa6dc8187a2f819692d7d5f9bedfa2b90fa3"
+ integrity sha512-CeH2TpJeCdG0TAGYoPSAcFX2ogdug1K7LIn9UO/q9HWqQ54gWhrMAlDP9AwWYMUDhrPe4VeazQ4DW3msD96nUQ==