|
@@ -3,7 +3,7 @@
|
|
* @Author: wangcc
|
|
* @Author: wangcc
|
|
* @Date: 2022-07-06 15:56:45
|
|
* @Date: 2022-07-06 15:56:45
|
|
* @LastEditors: gcz
|
|
* @LastEditors: gcz
|
|
- * @LastEditTime: 2022-07-20 17:40:58
|
|
|
|
|
|
+ * @LastEditTime: 2022-08-02 09:12:47
|
|
* @FilePath: \castgroup_bigscreen\src\views\index.vue
|
|
* @FilePath: \castgroup_bigscreen\src\views\index.vue
|
|
* @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved.
|
|
* @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved.
|
|
-->
|
|
-->
|
|
@@ -678,13 +678,15 @@ export default {
|
|
// console.log('x坐标', this.page2Char2.xAxis.data)
|
|
// console.log('x坐标', this.page2Char2.xAxis.data)
|
|
// 获取所有项
|
|
// 获取所有项
|
|
let seriesList = rows.map((item) => {
|
|
let seriesList = rows.map((item) => {
|
|
- return item.treeList;
|
|
|
|
|
|
+ return item.treeList||[];
|
|
});
|
|
});
|
|
// 数组扁平化
|
|
// 数组扁平化
|
|
seriesList = seriesList.flat();
|
|
seriesList = seriesList.flat();
|
|
// 去重
|
|
// 去重
|
|
let obj = {};
|
|
let obj = {};
|
|
seriesList = seriesList.reduce((newArr, next) => {
|
|
seriesList = seriesList.reduce((newArr, next) => {
|
|
|
|
+ // console.log('page2Char2 seriesList',seriesList);
|
|
|
|
+ // console.log('page2Char2 next',next);
|
|
obj[next.name] ? '' : (obj[next.name] = true && newArr.push(next));
|
|
obj[next.name] ? '' : (obj[next.name] = true && newArr.push(next));
|
|
return newArr;
|
|
return newArr;
|
|
}, []);
|
|
}, []);
|
|
@@ -719,7 +721,7 @@ export default {
|
|
rows.forEach((item) => {
|
|
rows.forEach((item) => {
|
|
seriesList.forEach((jtem, index) => {
|
|
seriesList.forEach((jtem, index) => {
|
|
let num = 0;
|
|
let num = 0;
|
|
- item.treeList.map((ktem) => {
|
|
|
|
|
|
+ item.treeList&&item.treeList.map((ktem) => {
|
|
if (ktem.name.indexOf(jtem.name) > -1) {
|
|
if (ktem.name.indexOf(jtem.name) > -1) {
|
|
num = ktem.value;
|
|
num = ktem.value;
|
|
}
|
|
}
|
|
@@ -769,7 +771,7 @@ export default {
|
|
// console.log('x坐标', this.page2Char2.xAxis.data)
|
|
// console.log('x坐标', this.page2Char2.xAxis.data)
|
|
// 获取所有项
|
|
// 获取所有项
|
|
let seriesList = rows.map((item) => {
|
|
let seriesList = rows.map((item) => {
|
|
- return item.treeList;
|
|
|
|
|
|
+ return item.treeList||[];
|
|
});
|
|
});
|
|
// 数组扁平化
|
|
// 数组扁平化
|
|
seriesList = seriesList.flat();
|
|
seriesList = seriesList.flat();
|
|
@@ -810,7 +812,7 @@ export default {
|
|
rows.forEach((item) => {
|
|
rows.forEach((item) => {
|
|
seriesList.forEach((jtem, index) => {
|
|
seriesList.forEach((jtem, index) => {
|
|
let num = 0;
|
|
let num = 0;
|
|
- item.treeList.map((ktem) => {
|
|
|
|
|
|
+ item.treeList&&item.treeList.map((ktem) => {
|
|
if (ktem.name.indexOf(jtem.name) > -1) {
|
|
if (ktem.name.indexOf(jtem.name) > -1) {
|
|
num = ktem.value;
|
|
num = ktem.value;
|
|
}
|
|
}
|