diff --git a/public/img/bwg_icon.png b/public/img/bwg_icon.png
new file mode 100644
index 0000000..2babbd4
Binary files /dev/null and b/public/img/bwg_icon.png differ
diff --git a/public/img/tsg_icon.png b/public/img/tsg_icon.png
new file mode 100644
index 0000000..8924865
Binary files /dev/null and b/public/img/tsg_icon.png differ
diff --git a/public/img/tyc_icon.png b/public/img/tyc_icon.png
new file mode 100644
index 0000000..4f75e4b
Binary files /dev/null and b/public/img/tyc_icon.png differ
diff --git a/public/img/tyg_icon.png b/public/img/tyg_icon.png
new file mode 100644
index 0000000..6174fcc
Binary files /dev/null and b/public/img/tyg_icon.png differ
diff --git a/public/img/whg_icon.png b/public/img/whg_icon.png
new file mode 100644
index 0000000..09976df
Binary files /dev/null and b/public/img/whg_icon.png differ
diff --git a/public/img/yyg_icon.png b/public/img/yyg_icon.png
new file mode 100644
index 0000000..87f28c7
Binary files /dev/null and b/public/img/yyg_icon.png differ
diff --git a/src/App.vue b/src/App.vue
index 6f87c3b..e4372ea 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,16 +1,17 @@
-
+
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index b44e857..0911639 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -430,7 +430,7 @@ export default {
option = {
- color: ["#0780e2", "#fdff00"],
+ color: [ "#F2A0CE","#0780e2","#FF6504", "#01FE00","#00FFFF","#fdff00"],
series: [
{
@@ -458,11 +458,12 @@ export default {
show: false
},
data: [
- { value: 1048, name: 'Search Engine' },
- { value: 735, name: 'Direct' },
- { value: 580, name: 'Email' },
- { value: 484, name: 'Union Ads' },
- { value: 300, name: 'Video Ads' }
+ { value: 348, name: 'Search Engine' },
+ { value: 335, name: 'Direct' },
+ { value: 480, name: 'Email' },
+ { value: 384, name: 'Union Ads' },
+ { value: 600, name: 'Video Ads' },
+ { value: 700, name: 'Video Adss' }
]
}
]
@@ -767,6 +768,7 @@ export default {
background-position: 0 0;
padding-top: 2.26rem;
height: 20rem;
+ position: relative;
}
.gymbox .gympic {
@@ -788,11 +790,13 @@ export default {
}
.gymbox .gymnum {
- width: 60%;
+ width: 100%;
margin: 0.6rem auto;
text-align: center;
height: 3rem;
- padding-top: 1.4rem;
+ position: absolute;
+ bottom: 0.66rem;
+ /* padding-top: 0.7rem; */
}
.gymbox .gymnum span {
@@ -807,7 +811,9 @@ export default {
font-size: 18px;
font-weight: 600;
display: block;
- margin: 0.2667rem auto;
+ margin: 0;
+ margin-top: 0.5rem;
+ /* margin: 0.5rem 0 1.7rem; */
}
/* 數據box */
@@ -841,20 +847,21 @@ export default {
display: block;
float: left;
width: 100%;
- line-height: 0;
+ /* line-height: 0; */
}
.numbox .numdiv .ndtitle {
padding-top: 0.2rem;
font-size: 1.08rem;
font-size: 1.1rem;
- margin: 1.3rem 0 1rem;
+ margin: 0.7rem 0 0;
}
.numbox .numdiv .nddesc {
color: #ccc;
- font-size: 0.32rem;
- padding-bottom: 0.2rem;
+ font-size: 0.9rem !important;
+ /* padding-bottom: 0.2rem; */
+ margin: 0;
}
/** 客流趋势 */
@@ -994,7 +1001,7 @@ export default {
}
.today_rs .tdrs_title {
- background-image: url("../assets/img/left_t3_bg.png");
+ background-image: url("../assets/img/left_t2_bg.png");
background-repeat: no-repeat;
background-size: 100% 100%;
background-position: 0 0;
@@ -1014,7 +1021,7 @@ export default {
}
.pcgrs .pcgrs_title {
- background-image: url("../assets/img/left_t2_bg.png");
+ background-image: url("../assets/img/left_t3_bg.png");
background-repeat: no-repeat;
background-size: 100%;
height: 3.8rem;
diff --git a/src/views/TycView.vue b/src/views/TycView.vue
index 48fe2a2..fda8149 100644
--- a/src/views/TycView.vue
+++ b/src/views/TycView.vue
@@ -252,9 +252,9 @@
background-position: 0 0;
background-repeat: no-repeat;
background-size: 100% 100%;
- height: 1.8rem;
- line-height: 1.4rem;
- padding-left: 2.02rem;
+ height: 2.5rem;
+ line-height: 1.8rem;
+ padding-left: 2.62rem;
}
.gcgrs .gcgrs_charts {
@@ -480,13 +480,18 @@ export default {
legend: {
bottom: 0,
right: 20,
- itemGap: 15,
- itemWidth: 15,
+ itemGap: 20,
+ itemWidth: 20,
+ itemHeight: 20,
textStyle: {
color: '#fff',
fontSize: '14'
},
- data: name
+ data: [
+ { icon: 'image://img/tyc_icon.png', name: '体育场' },
+ { icon: 'image://img/tyg_icon.png', name: '体育馆' },
+ { icon: 'image://img/yyg_icon.png', name: '游泳场馆' },
+ ]
},
title: {
// text: "负面言论分领域趋势",
diff --git a/src/views/WhView.vue b/src/views/WhView.vue
index 1fa66a7..91de23b 100644
--- a/src/views/WhView.vue
+++ b/src/views/WhView.vue
@@ -95,16 +95,16 @@
background-repeat: no-repeat;
background-size: 100% 100%;
background-position: -1.8rem 0;
- height: 12rem;
+ height: 14rem;
}
.tyclogo .tyname {
- height: 3rem;
- line-height: 3rem;
+ height: 2.5rem;
+ line-height: 2.5rem;
text-align: right;
padding-right: 6.8rem;
- font-size: 2.02rem;
- padding-top: 4.8rem;
+ font-size: 1.7rem;
+ padding-top: 7.8rem;
}
.tyclogo .tydesc {
@@ -112,8 +112,8 @@
line-height: 2rem;
font-size: 1.03rem;
text-align: right;
- padding-right: 1.06rem;
- color: #999;
+ padding-right: 0.3rem;
+ color: #fff;
}
/* 总计进馆 */
@@ -234,8 +234,8 @@
background-position: 0 0;
background-repeat: no-repeat;
background-size: 100%;
- height: 1.8rem;
- line-height: 1.8rem;
+ height: 2.4rem;
+ line-height: 1.9rem;
padding-left: 2.02rem;
}
@@ -249,15 +249,15 @@
background-position: 0 0;
background-repeat: no-repeat;
background-size: 100%;
- height: 1.8rem;
- line-height: 1.8rem;
- padding-left: 2.02rem;
+ height: 2.4rem;
+ line-height: 2.4rem;
+ padding-left: 2.42rem;
}
.gcgrs .gcgrs_charts {
- margin-top: 2rem;
+ margin-top: 1.8rem;
width: 100%;
- height: 17rem;
+ height: 18rem;
}
/* 图书馆趋势 */
@@ -270,9 +270,9 @@
background-position: 0 0;
background-repeat: no-repeat;
background-size: 100%;
- height: 2.2rem;
- line-height: 2.2rem;
- padding-left: 2.02rem;
+ height: 2.4rem;
+ line-height: 2.4rem;
+ padding-left: 2.42rem;
}
.tsgbox .tsgc_charts {
@@ -506,13 +506,20 @@ export default {
// backgroundColor: "#141f56",
legend: {
top: 0,
+ right:30,
itemGap: 15,
- itemWidth: 15,
+ itemWidth: 20,
+ itemHeight: 20,
+ // icon: ['image://img/tyc_icon.png', 'image://img/tyg_icon.png', 'image://img/tyc_icon.png'],
textStyle: {
color: '#fff',
fontSize: '14'
},
- data: name
+ data: [
+ { icon: 'image://img/tyc_icon.png', name: '图书馆' },
+ { icon: 'image://img/tyg_icon.png', name: '文化馆' },
+ { icon: 'image://img/yyg_icon.png', name: '博物馆' },
+ ]
},
title: {
// text: "负面言论分领域趋势",