From 6f8abc975816e2183165882e464e2c2319b37ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Wed, 17 Apr 2024 16:15:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/ISRAChart.vue | 30 +++++++----
.../OperationalOverview/processingBoard.vue | 51 +++++++++----------
2 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/src/views/OperationalOverview/components/ISRAChart.vue b/src/views/OperationalOverview/components/ISRAChart.vue
index b38edf38..2dc04a67 100644
--- a/src/views/OperationalOverview/components/ISRAChart.vue
+++ b/src/views/OperationalOverview/components/ISRAChart.vue
@@ -1,7 +1,7 @@
@@ -125,7 +125,13 @@ export default {
fontSize: 20,
color: '#fff00',
},
- },
+ },
+ grid: {
+ left: '1%',
+ right: '1%',
+ bottom: '0',
+ containLabel: true
+ },
// legend: {
// bottom: '10%',
// left: 'center',
@@ -213,15 +219,19 @@ export default {
.isra-chart {
width: 100%;
height: 100%;
+ position: absolute;
+ top: 7%;
}
+ .isra-chart-tooltip {
+ background: #0a2b4f77 !important;
+ border: none !important;
+ backdrop-filter: blur(12px);
+ }
+
+ .isra-chart-tooltip * {
+ color: #fff !important;
+ }
diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index f73da45b..aff0f1d2 100644
--- a/src/views/OperationalOverview/processingBoard.vue
+++ b/src/views/OperationalOverview/processingBoard.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-07-19 15:18:30
* @LastEditors: zhp
- * @LastEditTime: 2024-04-16 14:03:31
+ * @LastEditTime: 2024-04-17 16:08:08
* @Description:
-->
@@ -58,7 +58,7 @@
}}
-
@@ -111,25 +111,25 @@ const qualityYearList = [
name: '翻转机',
code: 'EQ20240110112358000235',
status: '正常',
- error: 'true',
+ error: true,
},
{
name: '烘干炉',
code: 'EQ20240110112537000241',
status: '计划停机',
- error: 'true',
+ error: true,
},
{
name: '清洗机',
code: ' EQ20240110112310000232',
status: '正常',
- error: 'true',
+ error: true,
},
{
name: '钢化清洗机',
code: 'EQ20240110111700000208',
status: '正常',
- error: 'true',
+ error: true,
},
{
name: '固化机',
@@ -141,49 +141,48 @@ const qualityYearList = [
name: '磨边清洗机',
code: ' EQ20240110111700000208',
status: '正常',
- error: 'true',
+ error: true,
},
{
name: '预热机',
code: 'EQ20240110111700000205',
status: '故障',
- error: 'true',
+ error: true,
},
{
name: '下片机',
code: 'EQ20240115151435000279',
- status: '正常',
- error: 'false',
+ error: true,
},
{
name: '冷却机',
code: 'EQ20240110111700000203',
status: '正常',
- error: 'false',
+ error: true,
},
{
name: 'A储片机106',
code: 'EQ20240110111700000202',
status: '正常',
- error: 'false',
+ error: true,
},
{
name: '二次清洗机',
code: 'EQ20240110111700000209',
status: '正常',
- error: 'false',
+ error: true,
},
{
name: '二次磨边机',
code: ' EQ20240110110927000181',
status: '正常',
- error: 'false',
+ error: true,
},
{
name: '测试设备',
code: 'EQ20240110111700000201',
status: '正常',
- error: 'true',
+ error: true,
},
];
const qualityMonthList = [
@@ -232,37 +231,37 @@ const qualityMonthList = [
];
const orderProcessList = [
{
- id: '1',
+ id: 1,
outRate: '.8',
name: '凯盛0322',
},
{
- id: '2',
+ id: 2,
outRate: '.4',
name: '光伏玻璃4.0',
},
{
- id: '3',
+ id: 3,
outRate: '.5',
name: '光伏玻璃3.0',
},
{
- id: '4',
+ id: 4,
outRate: '.3',
name: '光伏玻璃2.0',
},
{
- id: '5',
+ id: 5,
outRate: '.5',
name: '光伏玻璃1.0',
},
{
- id: '6',
+ id: 6,
outRate: '.8',
name: '光伏玻璃',
},
{
- id: '7',
+ id: 7,
outRate: '.8',
name: '统计订单',
},
@@ -483,7 +482,7 @@ export default {
`,
`${item.code || ''}`,
` ${item.status || ''}`,
- ` ${item.error || ''}`,
+ ` ${item.error == true ? '是' : '否' || ''}`,
]);
this.eqConfig.data = eqArr;
let data = [
@@ -750,7 +749,7 @@ export default {
item.code || ''
}`,
` ${item.status || ''}`,
- ` ${item.error || ''}`,
+ ` ${item.error == true ?'是' :'否' || ''}`,
]);
this.eqConfig.data = eqArr;
// this.$nextTick(() => {
@@ -868,7 +867,7 @@ export default {
margin-left: 8px;
opacity:calc(.6);
margin-right: 8px;
- background-color: #C8CDD7;
+ background-color: rgba(0, 255, 247, 1);
// border: 1px solid #C8CDD7;
}
.myLegend {
@@ -993,7 +992,7 @@ export default {
font-size: 14px;
line-height: 2em;
text-align: right;
- color: #fff;
+ color: rgba(0, 255, 247, 1);
}
.orderPlan {
display: inline-block;