From c73d1e4b05ad210d87b696536a4afde36f10f725 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 11 十二月 2023 18:14:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/statistic/statisticPage.vue | 32 +++++---------------------------
1 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
index cf4ee2f..0a62428 100644
--- a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
+++ b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
@@ -79,7 +79,7 @@
name: "statisticPage",
data() {
return {
- menuList:[],
+ menuList: [],
dataKeyList: [],
addVisible: false,
chartName: "",
@@ -124,37 +124,12 @@
this.dataKeyList = this.selectData.map(obj => obj.code)
const btmName = this.dataKeyList.join(",");
if (btmName) {
- // this.menuList=[
- // {
- // menuData: [
- // [0, 0, 0, 0, 0, 0, 4, 9, 12, 12, 12, 12],
- // [0, 0, 0, 0, 0, 0, 4, 5, 3, 0, 0, 0]
- // ],
- // code:1
- // },
- // {
- // menuData: [
- // [0, 0, 0, 1, 1, 1, 1, 1, 1, 29, 5315, 5315],
- // [0, 0, 0, 1, 0, 0, 0, 0, 0, 28, 5286, 0]
- // ],
- // code:2
- // },
- // {
- // menuData: [
- // [0, 58, 60, 61, 75, 84, 145, 162, 166, 177, 186, 186],
- // [0, 58, 2, 1, 14, 9, 61, 17, 4, 11, 9, 0]
- // ],
- // code:3
- // }
- // ]
- // this.nextSave();
- // this.$message.success('淇濆瓨鎴愬姛')
getStatisticAnalysis({btmNames: btmName}).then(res => {
this.menuList = res.data.data;
this.nextSave();
this.$message.success('淇濆瓨鎴愬姛')
});
- }else {
+ } else {
this.$message.warning('璇烽�夋嫨鏁版嵁锛�')
}
},
@@ -173,6 +148,9 @@
const dataKey = typeList[item.codeType];
if (dataKey) {
this[dataKey].push(item);
+ this[dataKey].forEach(res=>{
+ console.log('res',res)
+ })
hasValidData = true;
}
});
--
Gitblit v1.9.3