diff --git a/src/views/cultrue/index.vue b/src/views/cultrue/index.vue
index 4b25d52..b001b81 100644
--- a/src/views/cultrue/index.vue
+++ b/src/views/cultrue/index.vue
@@ -42,7 +42,7 @@
@@ -159,9 +159,11 @@ export default {
lineChart1 = echarts.init(chartDom);
function run(){
- var xData = that.data24hX;
+ var xData = that.data24hX
+ // .slice(-10,that.data24hX.length);
- var data = that.data24h;
+ var data = that.data24h
+ // .slice(-10,that.data24h.length);
let max=data[0];
for (let i = 0; i < data.length; i++) {
if (data[i]>max) {
@@ -191,7 +193,7 @@ export default {
left: 0,
right: 0,
bottom: 0,
- top: '10%',
+ top: '-1%',//隐藏最高一条刻度线
containLabel: true
},
xAxis: [{
@@ -237,6 +239,7 @@ export default {
},
axisLabel: {
color: '#0095FF',
+ showMaxLabel: false//显示最大刻度
}
}],
series: [{
diff --git a/src/views/index.vue b/src/views/index.vue
index 8eaddec..48dac9d 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -472,7 +472,7 @@ export default {
// that.getGcgNumDatas();
var xData = that.rsqsXData;
- var gcolor = ['#ff9acc', '#6666FF', '#FF6600', '#02ff00', '#00ffff', '#fdff00'];
+ var gcolor = ['#a9eeff', '#6666FF', '#FF6600', '#02ff00', '#00ffff', '#fdff00'];
var data = that.rsqsData_z;
@@ -716,7 +716,7 @@ export default {
getGcgNumDatas() {
let that = this
that.rsqsDatas = [];
- this.rsqsDataName = [];
+ that.rsqsDataName = [];
that.rsqsData_z = [];
homeApi.allGcgNumDatas().then(res => {
// /pass.passcc/toDayGroupsEnterNum'
@@ -778,7 +778,7 @@ export default {
function run(){
var dataP = that.dataP;
- let color = ['#ff9acc', '#6666ff', '#ff6600', '#02ff00','#00ffff', '#fdff00'];
+ let color = ['#a9eeff', '#6666ff', '#ff6600', '#02ff00','#00ffff', '#fdff00'];
let color1=[], color2=[], color3=[];
// 设置每层圆环颜色和添加间隔的透明色
color.forEach((item) => {
@@ -898,6 +898,7 @@ export default {
}
const pieData = jstr.realTimeData.data;
+ // 饼图数据
that.proportionData = [];that.groupNameData=[];that.dataP=[];
pieData.forEach((item) => {
that.proportionData.push(item.proportion);
@@ -907,6 +908,28 @@ export default {
value:item.proportion.split('%')[0]
})
})
+ // 折线图数据
+ that.rsqsDatas = [];that.rsqsDataName = [];that.rsqsData_z = [];
+ const tmpdata = jstr.toDayGroupsEnterNum;
+ tmpdata.forEach((item) => {
+ that.rsqsDataName.push(item.groupName);
+ that.rsqsDatas.push(item.list)
+ })
+
+ that.rsqsXData = jstr.toDayGroupsEnterNum[0].list.dkeys;
+ that.rsqsDatas.forEach((item) => {
+ let rsqsData = []
+ Object.getOwnPropertyNames(item).forEach((value) => {
+
+ if(value=='dkeys'){}
+ if(value=='dvalue'){
+ rsqsData = item[value];
+ }
+ });
+ that.rsqsData_z.push(rsqsData)
+ })
+ // console.log(that.rsqsData_z, 'rsqsData_z')
+
};
},
},
@@ -1018,16 +1041,23 @@ export default {
/* 场馆左侧 */
.indexleftbox .cgflow_leftbox {
width: 2.16rem;
+ height: 1.2rem;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
}
.indexleftbox .cgflow_rightbox {
width: 2.16rem;
- /* text-align: right; */
+ height: 1.2rem;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
}
.indexleftbox .cgflow .cgfitem {
width: 100%;
- height: 0.46rem;
+ height: 0.29rem;
display: flex;
justify-content: space-between;
}
@@ -1065,8 +1095,8 @@ export default {
}
.indexleftbox .cgflow .cgfitem .cgimg img {
- width: 26px;
- height: 26px;
+ width: 0.29rem;
+ height: 0.29rem;
overflow: hidden;
text-align: center;
vertical-align: bottom;
diff --git a/src/views/ty/index.vue b/src/views/ty/index.vue
index 4718238..ebc625f 100644
--- a/src/views/ty/index.vue
+++ b/src/views/ty/index.vue
@@ -64,11 +64,11 @@
{{ cgdata[2]&&cgdata[2].gval }}
- 体育场
+ {{ cgdata[2]&&cgdata[2].gname }}
{{ cgdata[0]&&cgdata[0].gval }}
- 体育馆
+ {{ cgdata[0]&&cgdata[0].gname }}
{{ cgdata[1]&&cgdata[1].gval }}
- 游泳场馆
+ {{ cgdata[1]&&cgdata[1].gname }}
@@ -267,7 +267,9 @@ export default {
lineChart1 = echarts.init(this.$refs.dinschart);
function run(){
- var data24h = that.data24h;
+ var data24h = that.data24h
+ // .slice(-10,that.data24h.length);
+;
let max=data24h[0];
for (let i = 0; i < data24h.length; i++) {
if (data24h[i]>max) {
@@ -293,10 +295,11 @@ export default {
left: 0,
right: 0,
bottom: '3%',
- top: '10%',
+ top: '-1%',//隐藏最高一条刻度线
containLabel: true
},
xAxis: [{
+ // data: that.data24hX.slice(-10,that.data24hX.length),
data: that.data24hX,
axisLine: {
lineStyle: {
@@ -338,6 +341,7 @@ export default {
},
axisLabel: {
color: '#0095FF',
+ showMaxLabel: false//显示最大刻度
}
}],
series: [{
@@ -376,7 +380,7 @@ export default {
color: '#fff'
}
},
- symbolSize: 13,
+ symbolSize: 11,//改圆点大小,改不出自适应
zlevel: 10,
z: 2,
},
@@ -804,7 +808,7 @@ export default {
// that.groupsData = [];
// 场馆人次占比
- homeApi.homeBarData({groupsId:idArr}).then(res=>{
+ homeApi.allTygGroupTimeNum({groupsId:idArr, granularity:'daily'}).then(res=>{
if(!res.data){
return;
}