From 2720ac86c1ff922f3335d2152ab00963b2e8e2f7 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期六, 27 一月 2024 10:17:56 +0800
Subject: [PATCH] change 首页样式
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java | 8 ++++++--
jcdm-ui/src/views/dashboard/LineChart.vue | 15 +++++++++++----
jcdm-ui/src/views/dashboard/PanelGroup.vue | 6 +++---
3 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
index 94ad69c..5965407 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
@@ -94,12 +94,16 @@
String s3 = string.split(StringUtils.SPACE)[1];
if (StringUtils.isNotEmpty(s3)){
int i = Integer.parseInt(s3);
- temp.put(i,size);
+ temp.put(i+1,size);
}
}
}
for (int i = 8; i < 23; i++) {
- arr.add(temp.getOrDefault(i, 0));
+ if (i==8){
+ arr.add(0);
+ }else {
+ arr.add(temp.getOrDefault(i, 0));
+ }
}
vo.setData(arr);
vo.setType("line");
diff --git a/jcdm-ui/src/views/dashboard/LineChart.vue b/jcdm-ui/src/views/dashboard/LineChart.vue
index 37320d2..8efc27c 100644
--- a/jcdm-ui/src/views/dashboard/LineChart.vue
+++ b/jcdm-ui/src/views/dashboard/LineChart.vue
@@ -87,11 +87,16 @@
boundaryGap: false,
axisTick: {
show: false
- }
+ },
+ type: 'category',
+ axisLabel: {
+ interval: 0,
+ rotate: 45,
+ },
},
grid: {
- left: 10,
- right: 10,
+ left: 20,
+ right: 20,
bottom: 20,
top: 30,
containLabel: true
@@ -106,7 +111,9 @@
yAxis: {
axisTick: {
show: false
- }
+ },
+ min:0,
+ max: this.data.length === 0 ? 100 : null
},
legend: {
data: this.legendTitle
diff --git a/jcdm-ui/src/views/dashboard/PanelGroup.vue b/jcdm-ui/src/views/dashboard/PanelGroup.vue
index 5400808..04b2434 100644
--- a/jcdm-ui/src/views/dashboard/PanelGroup.vue
+++ b/jcdm-ui/src/views/dashboard/PanelGroup.vue
@@ -14,7 +14,7 @@
<span class="nextLine">{{data1}}</span>
</div>
</div>
- <div class="transition-box" style="background-color: cornflowerblue">
+ <div class="transition-box" style="background-color: orange">
<i class="el-icon-setting"></i>
<el-divider direction="vertical" content-position="left" style="height: 20px"></el-divider>
<div>
@@ -31,7 +31,7 @@
<span class="nextLine">{{data3}}</span>
</div>
</div>
- <div class="transition-box" style="background-color: green">
+ <div class="transition-box" style="background-color: cornflowerblue">
<i class="el-icon-cpu"></i>
<el-divider direction="vertical" content-position="left" style="height: 20px"></el-divider>
<div>
@@ -39,7 +39,7 @@
<span class="nextLine">{{data4}}</span>
</div>
</div>
- <div class="transition-box" style="background-color: orange">
+ <div class="transition-box" style="background-color: green">
<i class="el-icon-upload2"></i>
<el-divider direction="vertical" content-position="left" style="height: 20px"></el-divider>
<div>
--
Gitblit v1.9.3