From 9fd3f7927d22e5f161b4a6e8b50717cc55b040c4 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 16 10月 2024 11:21:03 +0800
Subject: [PATCH] 整改细节
---
yiqi_screen/src/components/EquipmentRunStatus.vue | 13 ++++++++++---
yiqi_screen/src/components/ProdlineHealthy.vue | 5 +++--
yiqi_screen/src/components/ProductionStatistics.vue | 12 +++++++++---
yiqi_screen/src/components/Content.vue | 4 ++++
yiqi_screen/src/components/QualityDataTrends.vue | 7 ++++---
5 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/yiqi_screen/src/components/Content.vue b/yiqi_screen/src/components/Content.vue
index f0bca19..44e2d6e 100644
--- a/yiqi_screen/src/components/Content.vue
+++ b/yiqi_screen/src/components/Content.vue
@@ -101,10 +101,14 @@
</div>
<div class="echarts-box border_right1">
<div class="echarts-title">鏈彮/鏈湀浜ч噺缁熻</div>
+
+
<ProductionStatistics :produceStatisData="produceStatisData" />
<div class="pie-label-left">
+ <!-- 褰撳墠鐝粍瀹為檯鐢熶骇鏁伴噺 -->
{{ produceStatisData.currentShiftProduceNum }}
<span v-if="produceStatisData.currentShiftPlanNum||produceStatisData.currentShiftPlanNum==0">/</span>
+ <!-- 褰撳墠鐝粍璁″垝鐢熶骇鏁伴噺 -->
{{
produceStatisData.currentShiftPlanNum
}}
diff --git a/yiqi_screen/src/components/EquipmentRunStatus.vue b/yiqi_screen/src/components/EquipmentRunStatus.vue
index 808c8a8..e84d47c 100644
--- a/yiqi_screen/src/components/EquipmentRunStatus.vue
+++ b/yiqi_screen/src/components/EquipmentRunStatus.vue
@@ -68,8 +68,9 @@
orient: "vertical",
top: "25%",
right: "5%",
- // itemGap: 20,
+ itemGap: 2, //鍧椾箣闂寸殑闂磋窛
itemHeight: 5,
+ itemWidth: 5, // 璁剧疆鍥句緥椤圭殑瀹藉害
data: ["鐢熶骇", "瀹屾垚", "寰呮満", "璀﹀憡", "鏁呴殰"],
textStyle: {
color: "#fff",
@@ -83,8 +84,10 @@
series: [
{
type: "pie",
- radius: ["25%", "40%"],
- center: ["38%", "50%"],
+ // radius: ["20%", "30%"],
+ // center: ["33%", "50%"],
+ radius: ["20%", "30%"],
+ center: ["33%", "50%"],
avoidLabelOverlap: false,
// left: "-30%",
// top: "10%",
@@ -190,4 +193,8 @@
/* height:5.2rem; */
transform: scaleY(2);
}
+.box-container{
+ position: relative;
+ /* border: 1px solid red; */
+}
</style>
\ No newline at end of file
diff --git a/yiqi_screen/src/components/ProdlineHealthy.vue b/yiqi_screen/src/components/ProdlineHealthy.vue
index 0bcc33c..582367b 100644
--- a/yiqi_screen/src/components/ProdlineHealthy.vue
+++ b/yiqi_screen/src/components/ProdlineHealthy.vue
@@ -17,11 +17,12 @@
this.option = {
legend: {
orient: "vertical",
- bottom: '12%',
+ bottom: '10%',
right: '6%',
textStyle:{
color:'#fff'
},
+ itemWidth: 5, // 璁剧疆鍥句緥椤圭殑瀹藉害
data: [
{
name: "瀹為檯",
@@ -40,7 +41,7 @@
},
radar: {
center:['43%','55%'],
- radius:'70%',
+ radius:'65%',
indicator: [
{ name: "浜�", max: 100, color: "#fff" },
{ name: "鐜�", max: 100, color: "#fff" },
diff --git a/yiqi_screen/src/components/ProductionStatistics.vue b/yiqi_screen/src/components/ProductionStatistics.vue
index 82ab84c..5a50aa1 100644
--- a/yiqi_screen/src/components/ProductionStatistics.vue
+++ b/yiqi_screen/src/components/ProductionStatistics.vue
@@ -26,7 +26,13 @@
{ value: val.currentMonthProduceNum },
{ value: val.currentMonthPlanNum - val.currentMonthProduceNum },
]);
+ // 褰撳墠鐝粍瀹為檯鐢熶骇鏁伴噺 currentShiftProduceNum
+ // 褰撳墠鐝粍璁″垝鐢熶骇鏁伴噺 currentShiftPlanNum
this.$set(this.option.series[0], "data", [
+
+ // { value: 1 }, //瀹為檯鐢熶骇鏁伴噺 1/ (9+1) = 10%
+ // { value: 9 },
+
{ value: val.currentShiftProduceNum },
{ value: val.currentShiftPlanNum - val.currentShiftProduceNum },
]);
@@ -53,11 +59,11 @@
fontSize: 12,
},
- emphasis: {
+ emphasis: { //楗煎浘涓棿鐨勫瓧浣撳ぇ灏�
scale: false,
label: {
show: true,
- fontSize: 24,
+ fontSize: 14,
fontWeight: "normal",
},
},
@@ -93,7 +99,7 @@
scale: false,
label: {
show: true,
- fontSize: 24,
+ fontSize: 14, //楗煎浘涓棿鐨勫瓧浣撳ぇ灏�
fontWeight: "normal",
},
},
diff --git a/yiqi_screen/src/components/QualityDataTrends.vue b/yiqi_screen/src/components/QualityDataTrends.vue
index 9d99130..afdc693 100644
--- a/yiqi_screen/src/components/QualityDataTrends.vue
+++ b/yiqi_screen/src/components/QualityDataTrends.vue
@@ -1,5 +1,5 @@
<template>
- <div class="box-container" style="height: 1.52rem" id="echarts3"></div>
+ <div class="box-container echarts3Box" style="height: 1.52rem" id="echarts3"></div>
</template>
<script>
@@ -21,8 +21,8 @@
data: [],
},
grid: {
- left: 13,
- right: 13,
+ left: 33,
+ right: 33,
top: 20,
bottom:5,
},
@@ -141,4 +141,5 @@
</script>
<style>
+
</style>
\ No newline at end of file
--
Gitblit v1.9.3