From 5c19f7f0b38b27f99afb825de415c3035f50334e Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 25 十一月 2024 14:33:55 +0800
Subject: [PATCH] 1
---
src/views/mdc/station-live.vue | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index fa42bd7..b4bda24 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-12 18:33:14
* @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
-->
@@ -30,21 +30,30 @@
<div class="dataHr"></div>
<div class="content-zhou-box">
<div class="zhou-one content-zhou-border">
- <div><div id="wcs-left" style="width: 100%;height:300px;"></div></div>
+ <div><div id="wcs-left" style="width: 100%;height:340px;"></div></div>
</div>
<div class="zhou-two content-zhou-border">
- <el-table :data="tableData2" style="width: 100%;height:300px;">
+ <el-table :data="tableData2" style="width: 100%;height:340px;">
<el-table-column prop="test" label="杞�"></el-table-column>
<el-table-column prop="test" label="鍧愭爣"></el-table-column>
<el-table-column prop="test" label="鎵煩"></el-table-column>
</el-table>
</div>
<div class="zhou-three content-zhou-border">
- <el-table :data="alarmtableData" style="width: 100%;height:300px;">
+ <el-table :data="alarmtableData" style="height:300px;">
<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;width: 450;position:absolute;right:0;"
+ @size-change="alarmSizeChange"
+ @current-change="alarmCurrentChange"
+ :current-page="currentPage4"
+ :page-size="15"
+ layout="total, prev, pager, next"
+ :total="alarmtotal">
+ </el-pagination>
</div>
</div>
<div>------------------------------------</div>
@@ -859,6 +868,7 @@
}
.content-two,.zhou-three {
flex: 1;
+ position: relative;
}
.content-two {
border-left: 1px solid #eee;
@@ -869,7 +879,7 @@
width: 25%;
}
.zhou-one {
- width: 28%;
+ width: 330px;
}
.zhou-two {
width:28%;
--
Gitblit v1.9.3