diff --git a/src/assets/index/安静.png b/src/assets/index/安静.png new file mode 100644 index 0000000..b9311d6 Binary files /dev/null and b/src/assets/index/安静.png differ diff --git a/src/assets/index/拥挤.png b/src/assets/index/拥挤.png new file mode 100644 index 0000000..e27b607 Binary files /dev/null and b/src/assets/index/拥挤.png differ diff --git a/src/assets/index/舒适.png b/src/assets/index/舒适.png new file mode 100644 index 0000000..5dd4aa0 Binary files /dev/null and b/src/assets/index/舒适.png differ diff --git a/src/assets/ty/右1-2.png b/src/assets/ty/右1-2.png new file mode 100644 index 0000000..3366a56 Binary files /dev/null and b/src/assets/ty/右1-2.png differ diff --git a/src/assets/ty/右1-3.png b/src/assets/ty/右1-3.png new file mode 100644 index 0000000..d7c75f8 Binary files /dev/null and b/src/assets/ty/右1-3.png differ diff --git a/src/assets/ty/右1-4.png b/src/assets/ty/右1-4.png new file mode 100644 index 0000000..678d099 Binary files /dev/null and b/src/assets/ty/右1-4.png differ diff --git a/src/assets/ty/右1-5.png b/src/assets/ty/右1-5.png new file mode 100644 index 0000000..7c81fc7 Binary files /dev/null and b/src/assets/ty/右1-5.png differ diff --git a/src/views/index.vue b/src/views/index.vue index 34b88fa..c523aa4 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -99,43 +99,44 @@
各场馆实施实时进馆人数
+
体育场 当前人数 4,738 40%
- +
- 体育场 + 图书馆 当前人数 4,738 50%
- +
- 体育场 + 体育馆 当前人数 4,738 80%
- +
- 体育场 + 文化馆 当前人数 4,738 25%
- +
- 体育场 + 游泳场馆 当前人数 4,738 90%
- +
- 体育场 + 博物馆 当前人数 4,738 75% @@ -849,6 +850,9 @@ export default { // get allTimeData const tmpdata = res.data.returnData console.log(tmpdata); + // console.log(tmpdata.01.proportion); + // let arr = JSON.stringify(tmpdata) + // console.log(arr); // this.day_num = tmpdata.day.noRepeatInNum // this.week_num_num = tmpdata.week.noRepeatInNum // this.mon_num = tmpdata.month.noRepeatInNum @@ -1059,9 +1063,11 @@ export default { display: block; color: white; font-size: 26px; - position: absolute; + /* position: absolute; bottom: 54px; - left: 48px; + left: 48px; */ + text-align: center; + margin-top: 32px; } .centerbox .jgdesc { @@ -1076,6 +1082,7 @@ export default { .centerbox .jgval1 { bottom: 54px; left: 70px; + margin-left: 44px; } .centerbox .jgdesc1 { @@ -1086,6 +1093,7 @@ export default { .centerbox .jgval3 { bottom: 54px; left: 25px; + margin-right: 44px; } .centerbox .jgdesc3 { @@ -1176,7 +1184,7 @@ export default { .rbox .rbox_con .rbitem .rbtitle { text-align: left; padding-left: 0.66rem; - padding-top: 0.1rem; + padding-top: 0.17rem; } .rbox .rbox_con .rbitem .rbval { @@ -1190,15 +1198,29 @@ export default { } .rbox .rbox_con .rbitem .rbrate { - width: 30%; + width: 32%; /* float: left; */ - height: 118px; + height: 82px; text-align: center; - line-height: 118px; + line-height: 82px; position: absolute; - bottom: -12px; - right: 16px; + bottom: 8px; + right: 15px; color: #00D8FF; + background-image: url(../assets/index/安静.png); + background-size: 100% 100%; + background-position: 100% 100%; + background-repeat: no-repeat; + +} + +.rbox .rbox_con .rbitem .rbrate2 { + background-image: url(../assets/index/舒适.png); + +} + +.rbox .rbox_con .rbitem .rbrate3 { + background-image: url(../assets/index/拥挤.png); } diff --git a/src/views/ty/index.vue b/src/views/ty/index.vue index a141374..4cf0905 100644 --- a/src/views/ty/index.vue +++ b/src/views/ty/index.vue @@ -82,36 +82,36 @@
各场馆人次占比
- 25%
- + 体育场
- + 25%
- - 体育场 + + 体育馆
- + 25%
- - 体育场 + + 游泳场馆
-
--> +
@@ -647,7 +647,7 @@ export default { color: '#32346c ', } }, - splitNumber:10, + splitNumber: 10, // interval:4.10, axisLabel: { textStyle: { @@ -930,26 +930,60 @@ export default { justify-content: space-around; align-items: center; color: #00A7FF; + font-size: 13px; .venue_proportion { flex: 1; // text-align: center; + .venue_proportion_top { text-align: center; + width: 75%; + height: 9vh; + line-height: 9vh; + margin: 0 auto; + background-image: url('../../assets/ty/右1-4.png'); + background-size: 100% 100%; + background-position: 100% 100%; + background-repeat: no-repeat; .venue_proportion_box_num { color: white; + font-size: 16px; + font-weight: bold; + display: block; + width: 60%; + height: 9vh; + line-height: 9vh; + margin: 0 auto; + background-image: url('../../assets/ty/右1-3.png'); + background-size: 100% 100%; + background-position: 100% 100%; + background-repeat: no-repeat; } } .venue_proportion_bo { - // text-align: center; - img { - margin-left: 48px; + text-align: center; + width: 50%; + height: 3vh; + margin: 0 auto; + margin-top: 20px; + background-image: url('../../assets/ty/右1-5.png'); + background-size: 100% 100%; + background-position: 100% 100%; + background-repeat: no-repeat; + + span { + line-height: 3vh; } + // img { + // margin-left: 48px; + // } + } } }