diff --git a/src/components/e-charts/multiple_circle.vue b/src/components/e-charts/multiple_circle.vue index c1113495fd4471e0a468cead11b45a6ad9d45b57..9475a7d2b09277aed87e267c6351ba811cf3120e 100644 --- a/src/components/e-charts/multiple_circle.vue +++ b/src/components/e-charts/multiple_circle.vue @@ -72,7 +72,7 @@ export default { }, }, { - value: temp2_data / 20, + value: temp2_data / 30, name: "", itemStyle: placeHolderStyle, } diff --git a/src/components/e-charts/single_circle.vue b/src/components/e-charts/single_circle.vue index 02ed4ecb2d145b740aa16389754c98f1901ce6e7..cea0bb7810b432209909fd4d92075de0441078b1 100644 --- a/src/components/e-charts/single_circle.vue +++ b/src/components/e-charts/single_circle.vue @@ -26,14 +26,15 @@ export default { text: num + "%", textStyle: { color: "#000", - fontSize: 40, + fontSize: 26, fontWeight: 200, }, subtext: text, subtextStyle: { - color: "#c9cedd", + color: "#707693", + fontSize: 12, }, - itemGap: -10, // 主副标题距离 + itemGap: 0, // 主副标题距离 left: "center", top: "center", }, @@ -94,7 +95,7 @@ export default { ], coordinateSystem: "polar", roundCap: true, - barWidth: 10, + barWidth: 8, barGap: "-100%", // 两环重叠 z: 2, @@ -115,7 +116,7 @@ export default { ], coordinateSystem: "polar", roundCap: true, - barWidth: 10, + barWidth: 8, barGap: "-100%", // 两环重叠 z: 1, }, diff --git a/src/pages/data-analysis/my-application.vue b/src/pages/data-analysis/my-application.vue index a4085ac8ba195066fa20986d84564804b6d947f5..7a1d9b2462a947f1fb8f045b4356602cf3144f54 100644 --- a/src/pages/data-analysis/my-application.vue +++ b/src/pages/data-analysis/my-application.vue @@ -100,12 +100,38 @@

搜索用户数

+

+ {{sparkline1.num}} + {{sparkline1.up>0?sparkline1.up:0-sparkline1.up}}% +

+ + +
-

搜索用户数

+

人均搜索次数

+

+ {{sparkline2.num}} + {{sparkline2.up>0?sparkline2.up:0-sparkline2.up}}% +

+ + +
@@ -175,7 +201,8 @@ - + + @@ -232,10 +259,39 @@ export default { { name: "业务应用", value: 2 } ], text: "应用总数", + spIndicatorStyles1: false, + spRefLineStyles3: { + stroke: "#d14", + strokeOpacity: 0, + strokeDasharray: "2, 2", + }, + spCurveStyles2: { + stroke: "#274fee", + fill: "#274fee", + }, + spCurveStyles3: { + stroke: "#e56600", + fill: "#e56600", + }, + sparkline1:{ + arr:[1,2,3,4,8,9,10,21], + num:1231, + up:15.3 + }, + sparkline2:{ + arr:[1,2,3,4,8,9,10,21], + num:182, + up:-19.3 + }, single_data: { - num: 12, - color: "#515fe7", - text: "共享" + num: 60, + color: "#274fee", + text: "平台应用" + }, + single_data1: { + num: 40, + color: "#e56600", + text: "开发者应用" }, line_data: { xaxis: [ @@ -674,7 +730,33 @@ export default { } .hot-line-chart { height: calc(100% - 36px); - background-color: pink; +} +.single-charts{ + float: left; + width: 50%; +} +.sparkline-text{ + width: 100%; + line-height: 20px; +} +.sparkline-text span:nth-of-type(1){ + font-size: 20px; + color: #274fee; +} +.sparkline-text span:nth-of-type(2){ + font-size: 12px; + width: 62px; + float: right; + text-align: center; + line-height: 20px; + height: 20px; + border-radius: 3px; + margin-top: 3px; + margin-right: 2px; +} +.sparkline-text-user span:nth-of-type(1){ + font-size: 20px; + color: #e56600; } diff --git a/src/pages/data-analysis/my-service.vue b/src/pages/data-analysis/my-service.vue index 06eed9571a13f1e0e1a66522a5f95b1fe9ce830e..7d3750a193bc52eae1dec1bcd6dae6cc77c66439 100644 --- a/src/pages/data-analysis/my-service.vue +++ b/src/pages/data-analysis/my-service.vue @@ -74,7 +74,7 @@ {{sparkline1.num}} {{sparkline1.up>0?sparkline1.up:0-sparkline1.up}}%

- +
-

搜索用户数

+

人均搜索次数

{{sparkline2.num}} {{sparkline2.up>0?sparkline2.up:0-sparkline2.up}}%

- + - + + + @@ -269,10 +271,20 @@ export default { }, text: "应用总数", single_data: { - num: 12, - color: "#515fe7", + num: 50, + color: "#25bdb1", text: "共享" }, + single_data1: { + num: 30, + color: "#f5ab4c", + text: "受限" + }, + single_data2: { + num: 20, + color: "#e15260", + text: "敏感" + }, line_data: { xaxis: [ "01-01", @@ -282,20 +294,26 @@ export default { "01-05", "01-06", "01-07", - "01-08" + "01-08", + "01-09", + "01-10", + "01-11", + "01-12", + "01-13", + "01-14", ], data: [ { name: "开发者应用", - arr: [100, 120, 130, 150, 160, 120, 110, 100] + arr: [10, 12, 13, 15, 16, 12, 11, 10,15,16,19,20,22,15,18] }, { name: "平台应用", - arr: [120, 130, 140, 130, 140, 120, 100, 90] + arr: [12, 13, 14, 13, 14, 12, 10, 9,11,10,9,12,13,10,9] }, { name: "未上架", - arr: [80, 90, 100, 110, 100, 70, 80, 90] + arr: [8, 9, 10, 11, 10, 7, 8, 9 ,7,6,5,8,6,7,5] } ] }, @@ -694,6 +712,7 @@ export default { } .sparkline-text{ width: 100%; + line-height: 20px; } .sparkline-text span:nth-of-type(1){ font-size: 20px; @@ -718,6 +737,10 @@ export default { width: 100%; height: calc(100% - 20px); } +.single-charts{ + float: left; + width: 33.3%; +}