From f02a461cd0e0c6ad326cd71e3af733e3292407fc Mon Sep 17 00:00:00 2001
From: xiejun <309858992@qq.com>
Date: 星期五, 29 十二月 2023 13:31:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/statistic/statisticPage.vue | 56 ++++++++++++++++++++++++--------------------------------
1 files changed, 24 insertions(+), 32 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
index cf657d2..f896de9 100644
--- a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
+++ b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
@@ -7,7 +7,7 @@
<!--鏂板瀵硅瘽妗�-->
<el-dialog :visible.sync="addVisible" append-to-body class="avue-dialog avue-dialog--top" title="閰嶇疆鏁版嵁缁熻鍒嗘瀽"
top="-50px">
- <el-table ref="table" :data="tableData" border style="width: 100%" @selection-change="selectChange">
+ <el-table ref="table" :data="tableData" border style="width: 100%" @selection-change="selectChange" @row-click="rowHandlerClick">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column align="center" label="涓绘暟鎹簱鍚�" prop="menuName" width="300"></el-table-column>
<el-table-column align="center" label="绫诲瀷" prop="codeType">
@@ -63,7 +63,8 @@
import pieChart from "../../components/StatisticsComponent/pieChart"
import ColumnarChart from "../../components/StatisticsComponent/ColumnarChart"
import mixCart from "../../components/StatisticsComponent/mixCart"
-import {getStatisticAnalysis, getBtmAndChart, saveStatisticAnalysis, deleteChartId} from "@/api/statistic/chart"
+import {getStatisticAnalysis, getBtmAndChart, saveStatisticAnalysis} from "@/api/statistic/chart"
+//閰嶇疆琛ㄥ崟涓绘暟鎹垪琛ㄦ帴鍙�
import {getList} from "@/api/system/statistic";
export default {
@@ -129,8 +130,6 @@
async getEcharts() {
try {
const firstResponse = await getBtmAndChart();
- this.ResponseData = await getBtmAndChart();
- this.loading = false;
const btmNames = Object.keys(firstResponse.data.data).join(',');
const btmValue = Object.values(firstResponse.data.data);
if (!btmNames) {
@@ -138,36 +137,23 @@
this.pieList = [];
this.columnarList = [];
this.mixList = [];
+ this.loading = false;
return;
}
- for (const value of btmValue) {
- if (value.includes('0')) {
- await this.handleStatisticAnalysis('lineList', btmNames, firstResponse);
- } else {
- this.lineList = [];
- }
- if (value.includes('1')) {
- await this.handleStatisticAnalysis('pieList', btmNames, firstResponse);
- } else {
- this.pieList = [];
- }
- if (value.includes('2')) {
- await this.handleStatisticAnalysis('columnarList', btmNames, firstResponse);
- } else {
- this.columnarList = [];
- }
- if (value.includes('3')) {
- await this.handleStatisticAnalysis('mixList', btmNames, firstResponse);
- } else {
- this.mixList = [];
- }
- }
+ const typeList = {
+ '0': 'lineList',
+ '1': 'pieList',
+ '2': 'columnarList',
+ '3': 'mixList'
+ };
+ await this.handleStatisticAnalysis(btmNames, firstResponse);
+ this.loading = false;
} catch (error) {
this.loading = false;
- console.error('Error:', error);
+ // console.error('Error:', error);
}
},
- async handleStatisticAnalysis(type, btmNames, firstResponse) {
+ async handleStatisticAnalysis(btmNames, firstResponse) {
const secondResponse = await getStatisticAnalysis({btmNames});
const secondData = secondResponse.data.data;
const typeList = {
@@ -176,6 +162,10 @@
"2": "columnarList",
"3": "mixList"
};
+ this.lineList = [];
+ this.pieList = [];
+ this.columnarList = [];
+ this.mixList = [];
const firstData = firstResponse.data.data;
//Object.keys瀵艰嚧瀵硅薄椤哄簭涓嶄竴鑷达紝浣跨敤sort鎺掑簭涓庡悗绔繑鍥炴牸寮忎竴鑷�
Object.keys(firstData).sort().forEach((key, index) => {
@@ -190,7 +180,6 @@
btmname: key
};
});
- this[listType] = [];
this.$nextTick(() => {
list.forEach((i, j) => {
if (index === j) {
@@ -234,12 +223,12 @@
this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒');
return;
}
- let codeStatus = this.selectData.every(key => key.codeType)
+ let codeStatus = this.selectData.every(key => key.codeType.length > 0);
+
if (!codeStatus) {
this.$message.warning("璇锋鏌ュ凡鍕鹃�夋暟鎹被鍨嬫槸鍚︿负绌猴紒");
return;
}
-
const newArray = this.selectData.map(item => {
return {
btmname: item.code,
@@ -281,9 +270,12 @@
},
//琛ㄦ牸澶氶��
selectChange(selection) {
- console.log('selection', selection)
this.selectData = selection;
},
+ rowHandlerClick(row){
+ this.selectData = row;
+ this.$refs.table.toggleRowSelection(row);
+ }
}
}
--
Gitblit v1.9.3