From 5033bbb206c5a9ada6dd01b8410b7d8050f7f645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Tue, 28 Nov 2023 10:59:24 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/equipment/base/alarm/Record/index.vue | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/src/views/equipment/base/alarm/Record/index.vue b/src/views/equipment/base/alarm/Record/index.vue
index c4f93007..fc03d30b 100644
--- a/src/views/equipment/base/alarm/Record/index.vue
+++ b/src/views/equipment/base/alarm/Record/index.vue
@@ -59,14 +59,9 @@
+
+
diff --git a/src/views/core/analysis/balanceAnalysis/index.vue b/src/views/core/analysis/balanceAnalysis/index.vue
index 1898ec7b..a4877d42 100644
--- a/src/views/core/analysis/balanceAnalysis/index.vue
+++ b/src/views/core/analysis/balanceAnalysis/index.vue
@@ -1,46 +1,56 @@
-
+
From 9ed4c944c59ef56a16ea47227484aa47a75491ec Mon Sep 17 00:00:00 2001
From: lb
Date: Wed, 29 Nov 2023 13:36:53 +0800
Subject: [PATCH 6/6] fix bugs
---
.../core/analysis/balanceAnalysis/chart.vue | 61 ++++++++++++-------
.../equipment/timing-diagram/status/index.vue | 2 +
.../monitoring/equipmentFullParams/index.vue | 4 +-
3 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/src/views/core/analysis/balanceAnalysis/chart.vue b/src/views/core/analysis/balanceAnalysis/chart.vue
index 8de0dc23..3df9d162 100644
--- a/src/views/core/analysis/balanceAnalysis/chart.vue
+++ b/src/views/core/analysis/balanceAnalysis/chart.vue
@@ -36,10 +36,10 @@ export default {
trigger: 'axis',
},
legend: {
- icon: 'roundRect',
- itemWidth: 12,
- itemHeight: 12,
- },
+ icon: 'roundRect',
+ itemWidth: 12,
+ itemHeight: 12,
+ },
grid: {
top: '12%',
left: '6%',
@@ -63,8 +63,7 @@ export default {
],
},
yAxis: {
- // todo
- name: '产线TT',
+ name: ['设备CT', '设备TT', '产线CT', '产线TT'][this.activeIndex],
nameLocation: 'end',
nameGap: 28,
nameTextStyle: {
@@ -132,51 +131,71 @@ export default {
const eqCt = this.tableData.map((row) => ({
name: row.equName,
type: 'line',
- symbol: 'circle',
- symbolSize: 8,
+ symbol: 'circle',
+ symbolSize: 8,
data: this.getListFromTableRow(row, '_eq_ct'),
}));
- this.chart.setOption({ ...this.templateOption, series: eqCt });
+ this.chart.setOption({
+ ...this.templateOption,
+ yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
+ series: eqCt,
+ });
break;
case 1:
const eqTt = this.tableData.map((row) => ({
name: row.equName,
type: 'line',
- symbol: 'circle',
- symbolSize: 8,
+ symbol: 'circle',
+ symbolSize: 8,
data: this.getListFromTableRow(row, '_eq_tt'),
}));
- this.chart.setOption({ ...this.templateOption, series: eqTt });
+ this.chart.setOption({
+ ...this.templateOption,
+ yAxis: { ...this.templateOption.yAxis, name: '设备TT' },
+ series: eqTt,
+ });
break;
case 2:
const plCt = this.tableData.map((row) => ({
name: row.equName,
type: 'line',
- symbol: 'circle',
- symbolSize: 8,
+ symbol: 'circle',
+ symbolSize: 8,
data: this.getListFromTableRow(row, '_pl_ct'),
}));
- this.chart.setOption({ ...this.templateOption, series: plCt });
+ this.chart.setOption({
+ ...this.templateOption,
+ yAxis: { ...this.templateOption.yAxis, name: '产线CT' },
+ series: plCt,
+ });
break;
case 3:
const plTt = this.tableData.map((row) => ({
name: row.equName,
type: 'line',
- symbol: 'circle',
- symbolSize: 8,
+ symbol: 'circle',
+ symbolSize: 8,
data: this.getListFromTableRow(row, '_pl_tt'),
}));
- this.chart.setOption({ ...this.templateOption, series: plTt });
+ this.chart.setOption({
+ ...this.templateOption,
+ yAxis: { ...this.templateOption.yAxis, name: '产线TT' },
+ series: plTt,
+ });
break;
default:
const eqCt2 = this.tableData.map((row) => ({
name: row.equName,
type: 'line',
- symbol: 'circle',
- symbolSize: 8,
+ symbol: 'circle',
+ symbolSize: 8,
data: this.getListFromTableRow(row, '_eq_ct'),
}));
- this.chart.setOption({ ...this.templateOption, series: eqCt2 });
+ this.chart.setOption({
+ ...this.templateOption,
+ yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
+ series: eqCt2,
+ });
}
},
},
diff --git a/src/views/equipment/timing-diagram/status/index.vue b/src/views/equipment/timing-diagram/status/index.vue
index 6ea4f148..2c639b08 100644
--- a/src/views/equipment/timing-diagram/status/index.vue
+++ b/src/views/equipment/timing-diagram/status/index.vue
@@ -80,6 +80,8 @@