From 007e33dd8728b4557917a2ffa2e2449865602742 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 04 十二月 2023 16:10:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/statistic/statisticPage.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
index d5b0556..316ba94 100644
--- a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
+++ b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
@@ -17,7 +17,7 @@
border
style="width: 100%"
@selection-change="selectChange"
- >
+ >
<el-table-column
type="selection"
width="55">
@@ -47,10 +47,11 @@
</span>
</el-dialog>
<!-- echarts缁勪欢-->
- <div>
+ <div style="margin-top: 15px">
<lineChart v-for="(item,index) in lineList" :key="index" :chartName="item.menuName"
:lineData="item.menuData"></lineChart>
- <!-- <pieChart :pieData="pieData" :chartName="chartName"></pieChart>-->
+ <pieChart v-for="(item,index) in pieList" :key="index" :chartName="item.menuName"
+ :pieData="item.menuData"></pieChart>
<ColumnarChart v-for="(item,index) in columnarList" :key="index" :chartName="item.menuName"
:columnarData="item.menuData"></ColumnarChart>
<mixCart v-for="(item,index) in mixList" :key="index" :chartName="item.menuName"
@@ -93,7 +94,7 @@
},
{
menuName: "娴嬭瘯sc",
- codeType: "2",
+ 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],
@@ -101,7 +102,7 @@
},
{
menuName: "浜у搧鍨嬪彿",
- codeType: "0",
+ 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],
@@ -185,7 +186,6 @@
},
//淇濆瓨
addSaveHandler() {
- debugger
if (this.selectData.length <= 0) {
this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹紒');
return;
@@ -225,6 +225,6 @@
}
</script>
-<style scoped>
+<style scoped lang="scss">
</style>
--
Gitblit v1.9.3