From b434882adac3edd7bf24ca714219188c3978a3c7 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期日, 10 十一月 2024 19:35:53 +0800
Subject: [PATCH] 1
---
src/views/mdc/components/StationLiveSpeed.vue | 4 ++--
src/views/mdc/station-live.vue | 14 ++++++++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/views/mdc/components/StationLiveSpeed.vue b/src/views/mdc/components/StationLiveSpeed.vue
index ddfa6bd..02b2e04 100644
--- a/src/views/mdc/components/StationLiveSpeed.vue
+++ b/src/views/mdc/components/StationLiveSpeed.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-18 21:52:18
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-11-10 18:35:10
+ * @LastEditTime: 2024-11-10 19:30:59
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/TimeAlarm.vue
-->
<template>
@@ -135,7 +135,7 @@
var optionB = JSON.parse(JSON.stringify(this.option));
var optionC = JSON.parse(JSON.stringify(this.option));
optionA.graphic.style.text= ['涓昏酱璐熻浇'+a+'%',].join('\n');
- optionB.graphic.style.text= ['涓昏酱璐熻浇'+b+'%',].join('\n');
+ optionB.graphic.style.text= ['涓昏酱鍊嶇巼'+b+'%',].join('\n');
optionC.graphic.style.text= ['缁欒繘鍊嶇巼'+c+'%',].join('\n');
optionA.series[0].data = [{value: a}];
optionB.series[0].data = [{value: b}];
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index fa42bd7..16b79b6 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-11-10 18:49:17
+ * @LastEditTime: 2024-11-10 19:35:08
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -40,11 +40,21 @@
</el-table>
</div>
<div class="zhou-three content-zhou-border">
- <el-table :data="alarmtableData" style="width: 100%;height:300px;">
+ <el-table :data="alarmtableData" style="width: 100%;height:260px;">
<el-table-column prop="alarmCode" label="鎶ヨ鍙�"></el-table-column>
<el-table-column prop="alarmMsg" label="鎶ヨ鍐呭"></el-table-column>
<el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿"></el-table-column>
</el-table>
+ <el-pagination
+ style="margin-top: 6px;padding-left: 6px;padding-right: 6px;"
+ @size-change="alarmSizeChange"
+ @current-change="alarmCurrentChange"
+ :current-page="currentPage4"
+ :page-sizes="[15, 50, 100]"
+ :page-size="15"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="alarmtotal">
+ </el-pagination>
</div>
</div>
<div>------------------------------------</div>
--
Gitblit v1.9.3