From cd8ef141141bfe8d926beb77507d992d09743d56 Mon Sep 17 00:00:00 2001
From: whycwx <1272078254@qq.com>
Date: 星期五, 16 七月 2021 15:38:32 +0800
Subject: [PATCH] 修改告警、折线图
---
src/pages/testedMotor/testedMotor.vue | 12 +++--
src/pages/boostingTransformer/boostingTransformer.vue | 11 +++--
src/pages/AFEinverter/afeInverter.vue | 12 +++--
src/pages/monitoring/intoLineMonitoring.vue | 12 +++--
src/pages/switchboard/switchboard.vue | 8 ++-
src/pages/dcSwitchboard/dcSwitchboard.vue | 12 +++--
src/pages/dynamometerMmotor/dynamometerMmotor.vue | 12 +++--
7 files changed, 46 insertions(+), 33 deletions(-)
diff --git a/src/pages/AFEinverter/afeInverter.vue b/src/pages/AFEinverter/afeInverter.vue
index 4b6c077..c123dec 100644
--- a/src/pages/AFEinverter/afeInverter.vue
+++ b/src/pages/AFEinverter/afeInverter.vue
@@ -71,14 +71,14 @@
<div class="clear"></div>
</div>
<div class="content_bottom">
- <p class="title_into">鍛婅鎯呭喌</p>
+ <p class="title_into">鎶ヨ鎯呭喌</p>
<!-- 琛ㄥ崟 -->
<div class="flex-page-content">
<div class="batteryrHistoryquery" style="width: 100%;height: 100%;">
<el-table :data="tableData" style="width: 100%" max-height="145px">
- <el-table-column prop="date" label="鍛婅鏃堕棿" width="180"></el-table-column>
- <el-table-column prop="name" label="鍛婅鍚嶇О" width="180"></el-table-column>
- <el-table-column prop="address" label="鍛婅鎻忚堪"></el-table-column>
+ <el-table-column prop="date" label="鎶ヨ鏃堕棿" width="180"></el-table-column>
+ <el-table-column prop="name" label="鎶ヨ鍚嶇О" width="180"></el-table-column>
+ <el-table-column prop="address" label="鎶ヨ鎻忚堪"></el-table-column>
</el-table>
</div>
</div>
@@ -248,7 +248,7 @@
// 鍏抽棴websocket
if (this.isOpen) {
// 鎵撳嵃鍏抽棴淇℃伅
- console.log("鍏抽棴鐢垫簮瀹炴椂鍛婅WebSocket");
+ console.log("鍏抽棴鐢垫簮瀹炴椂鎶ヨWebSocket");
this.socket.close();
}
},
@@ -302,6 +302,7 @@
// xAxisIndex: 0,
yAxisIndex: 0,//浣跨敤鐨� y 杞寸殑 index锛屽湪鍗曚釜鍥捐〃瀹炰緥涓瓨鍦ㄥ涓� y杞寸殑鏃跺�欐湁鐢ㄣ��
type: 'line',
+ symbol: 'none',
step: false,
smooth: true
},{
@@ -309,6 +310,7 @@
// xAxisIndex: 0,
yAxisIndex: 1,//浣跨敤鐨� y 杞寸殑 index锛屽湪鍗曚釜鍥捐〃瀹炰緥涓瓨鍦ㄥ涓� y杞寸殑鏃跺�欐湁鐢ㄣ��
type: 'line',
+ symbol: 'none',
// step: false,
smooth: true
},]
diff --git a/src/pages/boostingTransformer/boostingTransformer.vue b/src/pages/boostingTransformer/boostingTransformer.vue
index d0b9b0d..a9155e0 100644
--- a/src/pages/boostingTransformer/boostingTransformer.vue
+++ b/src/pages/boostingTransformer/boostingTransformer.vue
@@ -51,14 +51,14 @@
<div class="clear"></div>
</div>
<div class="content_bottom">
- <p class="title_into">鍛婅鎯呭喌</p>
+ <p class="title_into">鎶ヨ鎯呭喌</p>
<!-- 琛ㄥ崟 -->
<div class="flex-page-content">
<div class="batteryrHistoryquery" style="width: 100%;height: 100%;">
<el-table :data="tableData" style="width: 100%" max-height="145px">
- <el-table-column prop="date" label="鍛婅鏃堕棿" width="180"></el-table-column>
- <el-table-column prop="name" label="鍛婅鍚嶇О" width="180"></el-table-column>
- <el-table-column prop="address" label="鍛婅鎻忚堪"></el-table-column>
+ <el-table-column prop="date" label="鎶ヨ鏃堕棿" width="180"></el-table-column>
+ <el-table-column prop="name" label="鎶ヨ鍚嶇О" width="180"></el-table-column>
+ <el-table-column prop="address" label="鎶ヨ鎻忚堪"></el-table-column>
</el-table>
</div>
</div>
@@ -206,7 +206,7 @@
// 鍏抽棴websocket
if (this.isOpen) {
// 鎵撳嵃鍏抽棴淇℃伅
- console.log("鍏抽棴鐢垫簮瀹炴椂鍛婅WebSocket");
+ console.log("鍏抽棴鐢垫簮瀹炴椂鎶ヨWebSocket");
this.socket.close();
}
},
@@ -249,6 +249,7 @@
// xAxisIndex: 0,
yAxisIndex: 0,//浣跨敤鐨� y 杞寸殑 index锛屽湪鍗曚釜鍥捐〃瀹炰緥涓瓨鍦ㄥ涓� y杞寸殑鏃跺�欐湁鐢ㄣ��
type: 'line',
+ symbol: 'none',
step: false,
smooth: true
}]
diff --git a/src/pages/dcSwitchboard/dcSwitchboard.vue b/src/pages/dcSwitchboard/dcSwitchboard.vue
index 0779e16..48c8244 100644
--- a/src/pages/dcSwitchboard/dcSwitchboard.vue
+++ b/src/pages/dcSwitchboard/dcSwitchboard.vue
@@ -90,14 +90,14 @@
<div class="clear"></div>
</div>
<div class="content_bottom">
- <p class="title_into">鍛婅鎯呭喌</p>
+ <p class="title_into">鎶ヨ鎯呭喌</p>
<!-- 琛ㄥ崟 -->
<div class="flex-page-content">
<div class="batteryrHistoryquery" style="width: 100%;height: 100%;">
<el-table :data="tableData" style="width: 100%" max-height="145px">
- <el-table-column prop="date" label="鍛婅鏃堕棿" width="180"></el-table-column>
- <el-table-column prop="name" label="鍛婅鍚嶇О" width="180"></el-table-column>
- <el-table-column prop="address" label="鍛婅鎻忚堪"></el-table-column>
+ <el-table-column prop="date" label="鎶ヨ鏃堕棿" width="180"></el-table-column>
+ <el-table-column prop="name" label="鎶ヨ鍚嶇О" width="180"></el-table-column>
+ <el-table-column prop="address" label="鎶ヨ鎻忚堪"></el-table-column>
</el-table>
</div>
</div>
@@ -262,7 +262,7 @@
// 鍏抽棴websocket
if (this.isOpen) {
// 鎵撳嵃鍏抽棴淇℃伅
- console.log("鍏抽棴鐢垫簮瀹炴椂鍛婅WebSocket");
+ console.log("鍏抽棴鐢垫簮瀹炴椂鎶ヨWebSocket");
this.socket.close();
}
},
@@ -316,6 +316,7 @@
// xAxisIndex: 0,
yAxisIndex: 0,//浣跨敤鐨� y 杞寸殑 index锛屽湪鍗曚釜鍥捐〃瀹炰緥涓瓨鍦ㄥ涓� y杞寸殑鏃跺�欐湁鐢ㄣ��
type: 'line',
+ symbol: 'none',
step: false,
smooth: true
},{
@@ -323,6 +324,7 @@
// xAxisIndex: 0,
yAxisIndex: 1,//浣跨敤鐨� y 杞寸殑 index锛屽湪鍗曚釜鍥捐〃瀹炰緥涓瓨鍦ㄥ涓� y杞寸殑鏃跺�欐湁鐢ㄣ��
type: 'line',
+ symbol: 'none',
// step: false,
smooth: true
},]
diff --git a/src/pages/dynamometerMmotor/dynamometerMmotor.vue b/src/pages/dynamometerMmotor/dynamometerMmotor.vue
index 4ece7a1..a143113 100644
--- a/src/pages/dynamometerMmotor/dynamometerMmotor.vue
+++ b/src/pages/dynamometerMmotor/dynamometerMmotor.vue
@@ -89,14 +89,14 @@
</div>
</div>
<div class="content_bottom list_box">
- <p class="title_into">鍛婅鎯呭喌</p>
+ <p class="title_into">鎶ヨ鎯呭喌</p>
<!-- 琛ㄥ崟 -->
<div class="flex-page-content">
<div class="batteryrHistoryquery" style="width: 100%;height: 100%;">
<el-table :data="tableData" style="width: 100%" max-height="145px">
- <el-table-column prop="date" label="鍛婅鏃堕棿"></el-table-column>
- <el-table-column prop="name" label="鍛婅鍚嶇О"></el-table-column>
- <el-table-column prop="address" label="鍛婅鎻忚堪"></el-table-column>
+ <el-table-column prop="date" label="鎶ヨ鏃堕棿"></el-table-column>
+ <el-table-column prop="name" label="鎶ヨ鍚嶇О"></el-table-column>
+ <el-table-column prop="address" label="鎶ヨ鎻忚堪"></el-table-column>
</el-table>
</div>
</div>
@@ -253,7 +253,7 @@
// 鍏抽棴websocket
if (this.isOpen) {
// 鎵撳嵃鍏抽棴淇℃伅
- console.log("鍏抽棴鐢垫簮瀹炴椂鍛婅WebSocket");
+ console.log("鍏抽棴鐢垫簮瀹炴椂鎶ヨWebSocket");
this.socket.close();
}
},
@@ -307,6 +307,7 @@
// xAxisIndex: 0,
yAxisIndex: 0,//浣跨敤鐨� y 杞寸殑 index锛屽湪鍗曚釜鍥捐〃瀹炰緥涓瓨鍦ㄥ涓� y杞寸殑鏃跺�欐湁鐢ㄣ��
type: 'line',
+ symbol: 'none',
step: false,
smooth: true
},{
@@ -314,6 +315,7 @@
// xAxisIndex: 0,
yAxisIndex: 1,//浣跨敤鐨� y 杞寸殑 index锛屽湪鍗曚釜鍥捐〃瀹炰緥涓瓨鍦ㄥ涓� y杞寸殑鏃跺�欐湁鐢ㄣ��
type: 'line',
+ symbol: 'none',
// step: false,
smooth: true
},]
diff --git a/src/pages/monitoring/intoLineMonitoring.vue b/src/pages/monitoring/intoLineMonitoring.vue
index 54f6bed..939ef4e 100644
--- a/src/pages/monitoring/intoLineMonitoring.vue
+++ b/src/pages/monitoring/intoLineMonitoring.vue
@@ -94,14 +94,14 @@
<div class="clear"></div>
</div>
<div class="content_bottom">
- <p class="title_into">鍛婅鎯呭喌</p>
+ <p class="title_into">鎶ヨ鎯呭喌</p>
<!-- 琛ㄥ崟 -->
<div class="flex-page-content">
<div class="batteryrHistoryquery" style="width: 100%;height: 100%;">
<el-table :data="tableData" style="width: 100%" max-height="145px">
- <el-table-column prop="date" label="鍛婅鏃堕棿" width="180"></el-table-column>
- <el-table-column prop="name" label="鍛婅鍚嶇О" width="180"></el-table-column>
- <el-table-column prop="address" label="鍛婅鎻忚堪"></el-table-column>
+ <el-table-column prop="date" label="鎶ヨ鏃堕棿" width="180"></el-table-column>
+ <el-table-column prop="name" label="鎶ヨ鍚嶇О" width="180"></el-table-column>
+ <el-table-column prop="address" label="鎶ヨ鎻忚堪"></el-table-column>
</el-table>
</div>
</div>
@@ -267,7 +267,7 @@
// 鍏抽棴websocket
if (this.isOpen) {
// 鎵撳嵃鍏抽棴淇℃伅
- console.log("鍏抽棴鐢垫簮瀹炴椂鍛婅WebSocket");
+ console.log("鍏抽棴鐢垫簮瀹炴椂鎶ヨWebSocket");
this.socket.close();
}
},
@@ -321,6 +321,7 @@
// xAxisIndex: 0,
yAxisIndex: 0,//浣跨敤鐨� y 杞寸殑 index锛屽湪鍗曚釜鍥捐〃瀹炰緥涓瓨鍦ㄥ涓� y杞寸殑鏃跺�欐湁鐢ㄣ��
type: 'line',
+ symbol: 'none',
step: false,
smooth: true
},{
@@ -328,6 +329,7 @@
// xAxisIndex: 0,
yAxisIndex: 1,//浣跨敤鐨� y 杞寸殑 index锛屽湪鍗曚釜鍥捐〃瀹炰緥涓瓨鍦ㄥ涓� y杞寸殑鏃跺�欐湁鐢ㄣ��
type: 'line',
+ symbol: 'none',
// step: false,
smooth: true
},]
diff --git a/src/pages/switchboard/switchboard.vue b/src/pages/switchboard/switchboard.vue
index 3b4aa06..edf2ac5 100644
--- a/src/pages/switchboard/switchboard.vue
+++ b/src/pages/switchboard/switchboard.vue
@@ -89,9 +89,9 @@
<div class="flex-page-content">
<div class="batteryrHistoryquery" style="width: 100%;height: 100%;">
<el-table :data="tableData" style="width: 100%" max-height="145px">
- <el-table-column prop="date" label="鍛婅鏃堕棿" width="180"></el-table-column>
- <el-table-column prop="name" label="鍛婅鍚嶇О" width="180"></el-table-column>
- <el-table-column prop="address" label="鍛婅鎻忚堪"></el-table-column>
+ <el-table-column prop="date" label="鎶ヨ鏃堕棿" width="180"></el-table-column>
+ <el-table-column prop="name" label="鎶ヨ鍚嶇О" width="180"></el-table-column>
+ <el-table-column prop="address" label="鎶ヨ鎻忚堪"></el-table-column>
</el-table>
</div>
</div>
@@ -305,6 +305,7 @@
// xAxisIndex: 0,
yAxisIndex: 0,//浣跨敤鐨� y 杞寸殑 index锛屽湪鍗曚釜鍥捐〃瀹炰緥涓瓨鍦ㄥ涓� y杞寸殑鏃跺�欐湁鐢ㄣ��
type: 'line',
+ symbol: 'none',
step: false,
smooth: true
},{
@@ -312,6 +313,7 @@
// xAxisIndex: 0,
yAxisIndex: 1,//浣跨敤鐨� y 杞寸殑 index锛屽湪鍗曚釜鍥捐〃瀹炰緥涓瓨鍦ㄥ涓� y杞寸殑鏃跺�欐湁鐢ㄣ��
type: 'line',
+ symbol: 'none',
// step: false,
smooth: true
},]
diff --git a/src/pages/testedMotor/testedMotor.vue b/src/pages/testedMotor/testedMotor.vue
index 1b48305..5e33c76 100644
--- a/src/pages/testedMotor/testedMotor.vue
+++ b/src/pages/testedMotor/testedMotor.vue
@@ -89,14 +89,14 @@
</div>
</div>
<div class="content_bottom list_box">
- <p class="title_into">鍛婅鎯呭喌</p>
+ <p class="title_into">鎶ヨ鎯呭喌</p>
<!-- 琛ㄥ崟 -->
<div class="flex-page-content">
<div class="batteryrHistoryquery" style="width: 100%;height: 100%;">
<el-table :data="tableData" style="width: 100%" max-height="145px">
- <el-table-column prop="date" label="鍛婅鏃堕棿"></el-table-column>
- <el-table-column prop="name" label="鍛婅鍚嶇О"></el-table-column>
- <el-table-column prop="address" label="鍛婅鎻忚堪"></el-table-column>
+ <el-table-column prop="date" label="鎶ヨ鏃堕棿"></el-table-column>
+ <el-table-column prop="name" label="鎶ヨ鍚嶇О"></el-table-column>
+ <el-table-column prop="address" label="鎶ヨ鎻忚堪"></el-table-column>
</el-table>
</div>
</div>
@@ -252,7 +252,7 @@
// 鍏抽棴websocket
if (this.isOpen) {
// 鎵撳嵃鍏抽棴淇℃伅
- console.log("鍏抽棴鐢垫簮瀹炴椂鍛婅WebSocket");
+ console.log("鍏抽棴鐢垫簮瀹炴椂鎶ヨWebSocket");
this.socket.close();
}
},
@@ -306,6 +306,7 @@
// xAxisIndex: 0,
yAxisIndex: 0,//浣跨敤鐨� y 杞寸殑 index锛屽湪鍗曚釜鍥捐〃瀹炰緥涓瓨鍦ㄥ涓� y杞寸殑鏃跺�欐湁鐢ㄣ��
type: 'line',
+ symbol: 'none',
step: false,
smooth: true
},{
@@ -313,6 +314,7 @@
// xAxisIndex: 0,
yAxisIndex: 1,//浣跨敤鐨� y 杞寸殑 index锛屽湪鍗曚釜鍥捐〃瀹炰緥涓瓨鍦ㄥ涓� y杞寸殑鏃跺�欐湁鐢ㄣ��
type: 'line',
+ symbol: 'none',
// step: false,
smooth: true
},]
--
Gitblit v1.9.1