From 750bcef194d5e114d684e204b75b4581bb94183a Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期一, 29 一月 2024 12:59:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 +++---
jcdm-ui/src/views/main/bs/formulaChild/index.vue | 4 +++-
4 files changed, 23 insertions(+), 10 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>
diff --git a/jcdm-ui/src/views/main/bs/formulaChild/index.vue b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
index 94ecc1b..8b1aa2c 100644
--- a/jcdm-ui/src/views/main/bs/formulaChild/index.vue
+++ b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
@@ -236,7 +236,7 @@
<el-input v-model="form.processesCode" placeholder="璇疯緭鍏ュ伐搴�" />
</el-form-item>
<el-form-item label="浜у搧缂栧彿" prop="productCode">
- <el-input v-model="productCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�" />
+ <el-input v-model="headerInformationData.productCode" :disabled="true" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�" />
</el-form-item>
<el-form-item label="鎿嶄綔鍐呭" prop="operationSteps">
<el-input v-model="form.operationSteps" placeholder="璇疯緭鍏ユ搷浣滃唴瀹�" />
@@ -337,6 +337,7 @@
// 鎬绘潯鏁�
total: 0,
formulaCode: "",
+ productCode: "",
// 閰嶆柟閰嶇疆瀛愪俊鎭〃鏍兼暟鎹�
formulaChildList: [],
// 寮瑰嚭灞傛爣棰�
@@ -369,6 +370,7 @@
this.queryParams.formulaCode = formulaCode;
this.formulaCode = formulaCode;
this.form.formulaCode = formulaCode;
+
this.headerInformation();
this.getList();
},
--
Gitblit v1.9.3