From a08a8766a0526a08dca2842da01711b4152db540 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期四, 22 五月 2025 15:39:15 +0800
Subject: [PATCH] 1
---
src/views/mdc/station-live.vue | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index fa42bd7..5852bba 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -1,8 +1,8 @@
<!--
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
- * @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-11-10 18:49:17
+ * @LastEditors: 鏉庡枂(寮�鍙戠粍) lzhe@yxqiche.com
+ * @LastEditTime: 2025-03-27 14:50:26
* @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
-->
@@ -10,7 +10,7 @@
<div class="aposcope-main">
<div class="aposcope-left">
<!-- <div class="left-title">鏌ヨ鏉′欢</div> -->
- <MYTree v-model="treeChecked" @loaded="query"></MYTree>
+ <MYTree v-model="treeChecked" @loaded="query" :isSelectId="$route.query.code"></MYTree>
</div>
<div class="aposcope-right">
<div class="content-machine-box" style="min-height: 450px;">
@@ -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="alarmsearchData.current"
+ :page-size="15"
+ layout="total, prev, pager, next"
+ :total="alarmtotal">
+ </el-pagination>
</div>
</div>
<div>------------------------------------</div>
@@ -167,6 +176,7 @@
name: "state-feedback",
data(){
return {
+ currentPage4: 1,
getwcsRData: [],
tableData1: [],
tableData2: [],
@@ -331,7 +341,7 @@
},
watch: {
treeChecked() {
- this.query()
+ this.query();
}
},
mounted(){
@@ -859,6 +869,7 @@
}
.content-two,.zhou-three {
flex: 1;
+ position: relative;
}
.content-two {
border-left: 1px solid #eee;
@@ -869,7 +880,7 @@
width: 25%;
}
.zhou-one {
- width: 28%;
+ width: 330px;
}
.zhou-two {
width:28%;
--
Gitblit v1.9.3