From abf8822cfc6fe397d1f7216620f8ba5d3b4d0aab Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 12 十二月 2023 10:49:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/statistic/statisticPage.vue | 150 +++++++++++++++----------------------------------
1 files changed, 47 insertions(+), 103 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
index 316ba94..da3bcf1 100644
--- a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
+++ b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
@@ -2,17 +2,18 @@
<!-- 鏂板鍙充晶鎸夐挳-->
<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
+ ref="table"
:data="tableData"
border
style="width: 100%"
@@ -47,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"
@@ -65,6 +66,8 @@
import pieChart from "../../components/StatisticsComponent/pieChart"
import ColumnarChart from "../../components/StatisticsComponent/ColumnarChart"
import mixCart from "../../components/StatisticsComponent/mixCart"
+import {getStatisticAnalysis} from "@/api/statistic/chart"
+import {getList} from "@/api/system/statistic";
export default {
components: {
@@ -76,6 +79,8 @@
name: "statisticPage",
data() {
return {
+ menuList: [],
+ dataKeyList: [],
addVisible: false,
chartName: "",
lineList: [],
@@ -83,99 +88,19 @@
columnarList: [],
mixList: [],
selectData: [],
- tableData: [
- {
- menuName: "宸ヨ壓鏂囦欢",
- codeType: "1",
- menuData: [
- [222, 232, 301, 334, 290, 330, 410, 330, 212, 322, 200, 234],
- [120, 132, 101, 134, 90, 230, 210, 130, 10, 122, 100, 80],
- ]
- },
- {
- menuName: "娴嬭瘯sc",
- codeType: null,
- menuData: [
- [220, 232, 301, 334, 290, 330, 410, 330, 212, 322, 200, 234],
- [120, 132, 101, 134, 90, 230, 210, 130, 10, 122, 100, 80],
- ]
- },
- {
- menuName: "浜у搧鍨嬪彿",
- codeType: null,
- menuData: [
- [220, 232, 301, 334, 290, 330, 410, 330, 212, 322, 200, 234],
- [120, 132, 101, 134, 90, 230, 210, 130, 10, 122, 100, 80],
- ]
- },
- {
- menuName: "鍥哄畾璧勪骇",
- codeType: null,
- menuData: [
- [220, 232, 301, 334, 290, 330, 410, 330, 212, 322, 200, 234],
- [120, 132, 101, 134, 90, 230, 210, 130, 10, 122, 100, 80],
- ]
- },
- {
- menuName: "鏉庤埅涓绘暟鎹�",
- codeType: null,
- menuData: [
- [220, 232, 301, 334, 290, 330, 410, 330, 212, 322, 200, 234],
- [120, 132, 101, 134, 90, 230, 210, 130, 10, 122, 100, 80],
- ]
- },
- {
- menuName: "Part",
- codeType: null,
- menuData: [
- [220, 232, 301, 334, 290, 330, 410, 330, 212, 322, 200, 234],
- [120, 132, 101, 134, 90, 230, 210, 130, 10, 122, 100, 80],
- ]
- },
- {
- menuName: "浜哄憳涓绘暟鎹�",
- codeType: null,
- menuData: [
- [220, 232, 301, 334, 290, 330, 410, 330, 212, 322, 200, 234],
- [120, 132, 101, 134, 90, 230, 210, 130, 10, 122, 100, 80],
- ]
- },
- {
- menuName: "浜哄憳",
- codeType: null,
- menuData: [
- [220, 232, 301, 334, 290, 330, 410, 330, 212, 322, 200, 234],
- [120, 132, 101, 134, 90, 230, 210, 130, 10, 122, 100, 80],
- ]
- },
- {
- menuName: "鏍囧噯",
- codeType: null,
- menuData: [
- [220, 232, 301, 334, 290, 330, 410, 330, 212, 322, 200, 234],
- [120, 132, 101, 134, 90, 230, 210, 130, 10, 122, 100, 80],
- ]
- },
- {
- menuName: "鐗╁搧涓绘暟鎹�",
- codeType: null,
- menuData: [
- [220, 232, 301, 334, 290, 330, 410, 330, 212, 322, 200, 234],
- [120, 132, 101, 134, 90, 230, 210, 130, 10, 122, 100, 80],
- ]
- },
- {
- menuName: "鍨嬪彿",
- codeType: null,
- menuData: [
- [220, 232, 301, 334, 290, 330, 410, 330, 212, 322, 200, 234],
- [120, 132, 101, 134, 90, 230, 210, 130, 10, 122, 100, 80],
- ]
- }
- ]
+ tableData: []
}
},
+ created() {
+ this.getMasterList()
+ },
methods: {
+ getMasterList() {
+ const userId = localStorage.getItem('userId');
+ getList({userId: userId}).then(res => {
+ this.tableData = res.data.data;
+ })
+ },
//鏂板
addHandler() {
this.addVisible = true;
@@ -190,7 +115,25 @@
this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒');
return;
}
+ let codeStatus = this.selectData.every(key => key.codeType)
+ if (!codeStatus) {
+ this.$message.warning("璇锋鏌ュ凡鍕鹃�夋暟鎹被鍨嬫槸鍚︿负绌猴紒");
+ return;
+ }
+ this.dataKeyList = this.selectData.map(obj => obj.code)
+ const btmName = this.dataKeyList.join(",");
+ if (btmName) {
+ getStatisticAnalysis({btmNames: btmName}).then(res => {
+ this.menuList = res.data.data;
+ this.nextSave();
+ this.$message.success('淇濆瓨鎴愬姛')
+ });
+ } else {
+ this.$message.warning('璇烽�夋嫨鏁版嵁锛�')
+ }
+ },
+ nextSave() {
const typeList = {
"0": "lineList",
"1": "pieList",
@@ -199,32 +142,33 @@
};
let hasValidData = false; // 娣诲姞涓�涓爣蹇楁潵璁板綍鏄惁鏈夋湁鏁堢殑閫夋嫨鏁版嵁
- let codeStatus = this.selectData.every(key => key.codeType)
- if (!codeStatus) {
- this.$message.warning("璇锋鏌ュ凡鍕鹃�夋暟鎹被鍨嬫槸鍚︿负绌猴紒");
- return;
- }
- this.selectData.forEach(item => {
+
+ this.selectData.forEach((item, index) => {
+ item.menuData = this.menuList[index].menuData;
const dataKey = typeList[item.codeType];
if (dataKey) {
this[dataKey].push(item);
- hasValidData = true; // 鏍囪鏈夋湁鏁堟暟鎹娣诲姞
+ this[dataKey].forEach(res=>{
+ console.log('this[dataKey]',this[dataKey])
+ console.log('res',res)
+ })
+ hasValidData = true;
}
});
if (hasValidData) {
+ // this.$refs.table.clearSelection();
this.addVisible = false;
}
},
//琛ㄦ牸澶氶��
- selectChange(selection, row) {
- // console.log(selection, row)
+ selectChange(selection) {
this.selectData = selection;
},
}
}
</script>
-<style scoped lang="scss">
+<style lang="scss" scoped>
</style>
--
Gitblit v1.9.3