From 963a2313f4f8959715293d38f69894078150d508 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 14 六月 2024 11:29:47 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/mdc/realtime-status/index.vue | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/realtime-status/index.vue b/src/views/mdc/realtime-status/index.vue
index ec686cb..fdb35ae 100644
--- a/src/views/mdc/realtime-status/index.vue
+++ b/src/views/mdc/realtime-status/index.vue
@@ -36,7 +36,7 @@
<div class="status-next" @click="next">
<el-icon><ArrowRight /></el-icon>
</div>
- <div class="status-content-cardp" v-for="item in timestatus" style="width: 33.3333%; height: 50%;">
+ <div class="status-content-cardp" v-for="item in timestatus" :style="{'width': (100/column) + '%'}">
<div class="status-card-box" style="border-color: #ccc;">
<div class="status-card-top">
<div class="status-card-detail">
@@ -104,17 +104,32 @@
stationlabel: "",
stationlabelList: [],
current: "1",
+ size: "9",
total: 0,
deviceStatus: [],
- workStationGroupIdList: []
+ workStationGroupIdList: [],
+ line: "",
+ column: ""
}
},
mounted() {
- this.getdevicestatus(); //鑾峰彇椤堕儴title
this.getstationlabelList(); //鑾峰彇鏍囩瑙嗗浘涓嬬殑list
this.setIntervalTime(); //鍗佺澧炲姞鏃堕棿
+ this.getSetting(); //璁剧疆鍑犺鍑犲垪
},
methods: {
+ getSetting() {
+ this.$HTTP.get(`/api/blade-system/param/detail?paramKey=mdc.realtime.setting`).then(res=> {
+ if(res.code == 200) {
+ var paramValue = JSON.parse(res.data.paramValue);
+ this.line = paramValue.line==0?1:paramValue.line;
+ this.column = paramValue.column;
+ this.current = "1";
+ this.size = this.line * this.column;
+ this.getdevicestatus(); //鑾峰彇椤堕儴title/鍏蜂綋鏁版嵁
+ }
+ })
+ },
setIntervalTime() {
function addTime(timeStr) {
var increaseByMilliseconds = 10 * 1000; // 10绉掕浆鎹负姣
@@ -205,9 +220,10 @@
this.gettimestatus();
},
next() {
- if((this.total/9 - this.current) < 0) return;
- this.current = Number(this.current) + 1;
- this.gettimestatus();
+ if((this.current * this.line) < this.total/this.column) {
+ this.current = Number(this.current) + 1;
+ this.gettimestatus();
+ }
},
goSet() {
this.$router.push('/mdc/configuration');
@@ -246,7 +262,7 @@
workStationGroupIdList: this.workStationGroupIdList
}
this.timestatus = [];
- this.$HTTP.post(`/api/blade-cps/workstation/real-time-status?current=${this.current}&size=9`,obj).then(res=> {
+ this.$HTTP.post(`/api/blade-cps/workstation/real-time-status?current=${this.current}&size=${this.size}`,obj).then(res=> {
if(res.code == 200) {
var ids = [];
res.data.records.forEach(item=> {
@@ -422,7 +438,7 @@
display: block;
}
.status-content-cardp {
- min-width: 266px;
+ height: 50%;
min-height: 170px;
margin: 0;
padding: 4px;
--
Gitblit v1.9.3