diff --git a/src/views/index.vue b/src/views/index.vue
index e957520..8af907b 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -21,20 +21,20 @@
-
体育场
-
{{ proportionData }}
+
{{ groupNameData[0] }}
+
{{ proportionData[0] }}
-
体育馆
-
20%
+
{{ groupNameData[1] }}
+
{{ proportionData[1] }}
-
游泳场馆
-
20%
+
{{ groupNameData[2] }}
+
{{ proportionData[2] }}
@@ -43,20 +43,20 @@

-
20%
-
图书馆
+
{{ proportionData[3] }}
+
{{ groupNameData[3] }}

-
20%
-
文化馆
+
{{ proportionData[4] }}
+
{{ groupNameData[4] }}

-
20%
-
博物馆
+
{{ proportionData[5] }}
+
{{ groupNameData[5] }}
@@ -176,7 +176,9 @@ export default {
rsqsDatas: [],
rsqs_datas: {},
rsqsData_z: [],
- proportionData: []
+ proportionData: [],
+ proportionData_z: [],
+ groupNameData: []
};
},
//创建的时候修改背景图片
@@ -197,8 +199,8 @@ export default {
this.getInfoDatas();
this.getGcgNumDatas()
setTimeout(() => {
- this.home_bar(this.klqsDatas);
- this.line_zone(this.rsqsData_z);
+ this.home_bar();
+ this.line_zone();
}, 300)
// 首页线图
@@ -296,7 +298,7 @@ export default {
},
// 透明背景柱状统计图
- home_bar(klqsDatas) {
+ home_bar() {
var chartDom = document.getElementById("homebar");
var myChart = echarts.init(chartDom);
var option;
@@ -305,7 +307,7 @@ export default {
// var xData = ['09:00', '10:00', '11:00','12:00', '13:00', '14:00','15:00', '16:00', '17:00','18:00', '20:00', '21:00', '22:00'];
// var data = [100, 200, 100, 200, 100, 200, 250, 50, 30, 130, 150, 110, 120]
- console.log(klqsDatas);
+ console.log(this.klqsDatas);
var data = this.klqsDatas
// var data = [Math.random() * 300]
option = {
@@ -617,14 +619,7 @@ export default {
// [124, 147, 175, 134, 122, 175, 180, 110, 130, 154, 187, 125, 134],
// [154, 174, 157, 175, 121, 157, 200, 250, 280, 134, 174, 157, 175],
// ]
- var data = [
- this.rsqsData_z,
- this.rsqsData_z,
- this.rsqsData_z,
- this.rsqsData_z,
- this.rsqsData_z,
- this.rsqsData_z
- ]
+ var data = this.rsqsData_z
var series = [];
for (var i = 0; i < 6; i++) {
@@ -841,12 +836,29 @@ export default {
groupsData.forEach((item) => {
console.log(item);
- that.proportionData = item.proportion
+ // that.proportionData = item.proportion
+ // console.log(this.proportionData);
+ that.proportionData.push(item.proportion)
console.log(this.proportionData);
+ that.groupNameData.push(item.groupName)
+ console.log(this.groupNameData);
// console.log(value);
// datas.push(value)
})
+ // this.proportionData.forEach((item) => {
+ // console.log(item);
+ // let rsqsData = []
+ // Object.values(item).forEach((value) => {
+ // // console.log(value);
+ // rsqsData.push(value)
+ // console.log(rsqsData);
+
+ // });
+ // that.proportionData_z.push(rsqsData)
+ // console.log(that.proportionData_z);
+ // })
+
// let rsqsData = []
// Object.values(this.rsqsDatas).forEach((value) => {
// console.log(value);
@@ -919,22 +931,37 @@ export default {
const tmpdata = res.data.data
console.log(tmpdata);
tmpdata.forEach((item) => {
- // console.log(item);
- // console.log(item.list);
- that.rsqsDatas = item.list
+ console.log(item);
+ console.log(item.list);
+ that.rsqsDatas.push(item.list)
console.log(this.rsqsDatas);
// console.log(value);
// datas.push(value)
+ // let rsqsData = []
+ // Object.values(item.list).forEach((value) => {
+ // console.log(value);
+ // rsqsData.push(value)
+ // // console.log(rsqsData);
+ // that.rsqsData_z.push(rsqsData)
+ // console.log(that.rsqsData_z);
+ // // console.log(that.rsqsData_z);
+ // });
})
- let rsqsData = []
- Object.values(this.rsqsDatas).forEach((value) => {
- // console.log(value);
- rsqsData.push(value)
- // console.log(rsqsData);
- that.rsqsData_z = rsqsData
- // console.log(that.rsqsData_z);
- });
+ this.rsqsDatas.forEach((item) => {
+ console.log(item);
+ let rsqsData = []
+ Object.values(item).forEach((value) => {
+ // console.log(value);
+ rsqsData.push(value)
+ console.log(rsqsData);
+
+ });
+ that.rsqsData_z.push(rsqsData)
+ console.log(that.rsqsData_z);
+ })
+
+
// this.day_num = tmpdata.day.noRepeatInNum
// this.week_num_num = tmpdata.week.noRepeatInNum
// this.mon_num = tmpdata.month.noRepeatInNum
@@ -1044,6 +1071,8 @@ export default {
.leftbox .cgflow .cgfitem {
width: 100%;
height: 0.46rem;
+ display: flex;
+ justify-content: space-between;
}
.leftbox .cgflow .cgflow_leftbox .cgfitem:nth-child(3) .cgtitle {