From f04f34fe6ce5bd9cd1cd1a682ad66133fa702531 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 17 六月 2024 13:47:53 +0800
Subject: [PATCH] 1

---
 src/views/mdc/realtime-status/index.vue |   43 ++++++++++++++++++++++++++++++-------------
 1 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/views/mdc/realtime-status/index.vue b/src/views/mdc/realtime-status/index.vue
index ec686cb..504c737 100644
--- a/src/views/mdc/realtime-status/index.vue
+++ b/src/views/mdc/realtime-status/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2024-04-09 22:11:21
- * @LastEditors: Sneed
- * @LastEditTime: 2024-04-09 22:12:14
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-06-17 13:46:52
  * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/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=> {
@@ -264,7 +280,6 @@
 									})
 								})
 							}
-							
 						})
 						this.total = res.data.total;
 						//鍙戦�亀ebsocket
@@ -316,8 +331,10 @@
 									    		item1.code = v.msg;
 									    		item1.color = "#370C0D";
 									    	}else {
-									    		item1.code = eventData.data[item1.key].v;
-									        	item1.color = "#75C0C0";
+												if(eventData.data[item1.key]) {
+													item1.code = eventData.data[item1.key].v;
+									        		item1.color = "#75C0C0";
+												}
 									    	}
 									    }
 					        		})
@@ -422,7 +439,7 @@
 		display: block;
 	}
 	.status-content-cardp {
-	    min-width: 266px;
+	    height: 50%;
 	    min-height: 170px;
 	    margin: 0;
 	    padding: 4px;

--
Gitblit v1.9.3