From 06e0f271f33e4e68d0ea52dacee836c44bd0296b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 13 十二月 2023 18:17:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/statistic/statisticPage.vue | 41 ++++++++++-------------------------------
1 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
index 9403436..093ef55 100644
--- a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
+++ b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
@@ -2,14 +2,14 @@
<!-- 鏂板鍙充晶鎸夐挳-->
<div>
<div style=" display: flex; justify-content: flex-end;">
- <el-button plain type="primary" @click="addHandler">鏂板</el-button>
+ <el-button plain type="primary" @click="addHandler">閰嶇疆</el-button>
</div>
<!-- 鏂板瀵硅瘽妗�-->
<el-dialog
:visible.sync="addVisible"
append-to-body
class="avue-dialog avue-dialog--top"
- title="鏂板鏁版嵁缁熻鍒嗘瀽"
+ title="閰嶇疆鏁版嵁缁熻鍒嗘瀽"
top="-50px"
>
<el-table
@@ -37,7 +37,7 @@
<el-option label="鎶樼嚎鍥�" value="0"></el-option>
<el-option label="楗肩姸鍥�" value="1"></el-option>
<el-option label="鏌辩姸鍥�" value="2"></el-option>
- <el-option label="鏌辩姸鎶樼嚎鍥�" value="3"></el-option>
+ <el-option label="鍫嗗彔鎶樼嚎鍥�" value="3"></el-option>
</el-select>
</template>
</el-table-column>
@@ -48,7 +48,7 @@
</span>
</el-dialog>
<!-- echarts缁勪欢-->
- <div style="margin-top: 15px">
+ <div style="margin-top: 15px;padding-bottom: 35px">
<lineChart v-for="(item,index) in lineList" :key="index" :chartName="item.menuName"
:lineData="item.menuData"></lineChart>
<pieChart v-for="(item,index) in pieList" :key="index" :chartName="item.menuName"
@@ -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,10 @@
const dataKey = typeList[item.codeType];
if (dataKey) {
this[dataKey].push(item);
+ this[dataKey].forEach(res=>{
+ console.log('this[dataKey]',this[dataKey])
+ console.log('res',res)
+ })
hasValidData = true;
}
});
--
Gitblit v1.9.3