From 8f9fa425d667e3d6330a3ed4553834783bb30099 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 05 六月 2025 09:53:44 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/deviceOperate/rgvOperate.html |  143 +++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 131 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index 8c3d4a9..2d11955 100644
--- a/src/main/webapp/views/deviceOperate/rgvOperate.html
+++ b/src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -13,12 +13,44 @@
 
 <body>
 	<div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
+		<div style="width: 100%;" class="demo-container">
+
+				<el-card class="box-card" >
+					<div slot="header" class="clearfix">
+						<span>璁惧浣嶇疆</span>
+					</div>
+					<el-row >
+						<el-col :span="1" :offset="3"><el-card class="card-bg"></el-card></el-col>
+						<el-col :span="1" ><el-card class="card-bg"></el-card></el-col>
+						<el-col :span="1" ><el-card class="card-bg"></el-card></el-col>
+					</el-row>
+					<el-row  type="flex" justify="center">
+						<el-col :span="18" >
+							<el-slider v-model="value1" :min="min" :max="max" :format-tooltip="formatTooltip" >
+							</el-slider>
+						</el-col>
+
+					</el-row>
+
+					<el-row >
+						<el-col :span="1" :offset="3"><el-card class="card-bg"></el-card></el-col>
+						<el-col :span="1" ><el-card class="card-bg"></el-card></el-col>
+						<el-col :span="1" ><el-card class="card-bg"></el-card></el-col>
+						<el-col :span="1" ><el-card class="card-bg"></el-card></el-col>
+						<el-col :span="1" :offset="13"><el-card class="card-bg"></el-card></el-col>
+						<el-col :span="1" ><el-card class="card-bg"></el-card></el-col>
+						<el-col :span="1" ><el-card class="card-bg"></el-card></el-col>
+					</el-row>
+				</el-card>
+		</div>
 		<div style="width: 100%;">
 			<el-table border ref="singleTable" :data="tableData" highlight-current-row @row-click="handleRowClick"
 				max-height="350" style="width: 100%">
 				<el-table-column property="rgvNo" label="RGV鍙�">
 				</el-table-column>
 				<el-table-column property="workNo1" label="宸ヤ綔鍙�">
+				</el-table-column>
+				<el-table-column property="wrkSts$" label="浠诲姟鐘舵��">
 				</el-table-column>
 				<el-table-column property="statusType" label="妯″紡">
 				</el-table-column>
@@ -27,6 +59,10 @@
 				<el-table-column property="walkPos" label="璁惧鐘舵��">
 				</el-table-column>
 				<el-table-column property="pakMk" label="閿佸畾鐘舵��">
+				</el-table-column>
+				<el-table-column property="warnCode" label="寮傚父浠g爜">
+				</el-table-column>
+				<el-table-column property="alarm" label="寮傚父鎻忚堪">
 				</el-table-column>
 			</el-table>
 		</div>
@@ -126,7 +162,7 @@
 				</el-card>
 			</div>
 			<div style="width: 45%;">
-				<el-card class="box-card">
+				<el-card style="width: 100%;">
 					<div slot="header" class="clearfix">
 						<span>璁惧鐘舵��</span>
 					</div>
@@ -135,7 +171,7 @@
 							<el-empty description="璇烽�夋嫨璁惧"></el-empty>
 						</div>
 						<div v-else>
-							<el-descriptions :title="currentTitle" direction="vertical" :column="4" border>
+							<el-descriptions :title="currentTitle" direction="vertical" :column="8" border>
 								<el-descriptions-item label="RGV">{{ tableData[currentIndex].rgvNo }}
 								</el-descriptions-item>
 								<el-descriptions-item label="宸ヤ綔鍙�">
@@ -146,20 +182,70 @@
 								</el-descriptions-item>
 								<el-descriptions-item label="浠诲姟鐘舵��">
 
-										<el-tag>{{ tableData[currentIndex].status}}</el-tag>
+									<el-tag>{{ tableData[currentIndex].status}}</el-tag>
 
 								</el-descriptions-item>
-								<el-descriptions-item label="璁惧鐘舵��">
-									<el-tag>{{ tableData[currentIndex].walkPos }}</el-tag>
+								<el-descriptions-item label="鍓嶅悗鏋侀檺">
+									{{ tableData[currentIndex].list32[0]}}
 								</el-descriptions-item>
-								<el-descriptions-item label="鏁呴殰浠g爜">{{ tableData[currentIndex].warnCode }}
+								<el-descriptions-item label="璐у弶涓綅1">{{ tableData[currentIndex].list32[1]}}
 								</el-descriptions-item>
-								<el-descriptions-item label="鏁呴殰鎻忚堪">{{ tableData[currentIndex].alarm }}
+								<el-descriptions-item label="璐у弶涓綅2">{{ tableData[currentIndex].list32[2]}}
 								</el-descriptions-item>
-<!--								<el-descriptions-item label="婧愮珯">{{ tableData[currentIndex].staNo }}-->
-<!--								</el-descriptions-item>-->
-<!--								<el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].sourceStaNo }}-->
-<!--								</el-descriptions-item>-->
+								<el-descriptions-item label="璐у弶鍓嶆瀬闄�">{{ tableData[currentIndex].list32[3]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="璐у弶鍚庢瀬闄�">{{ tableData[currentIndex].list32[4]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="琛岃蛋寮哄噺閫�">{{ tableData[currentIndex].list32[5]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="鎬ュ仠">{{ tableData[currentIndex].list32[6]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="鐐瑰姩鍓嶈繘">{{ tableData[currentIndex].list32[7]}}
+								</el-descriptions-item>
+
+								<el-descriptions-item label="鐐瑰姩鍚庨��">{{ tableData[currentIndex].list33[0]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="鐐瑰姩宸︿几">{{ tableData[currentIndex].list33[1]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="鐐瑰姩鍙充几">{{ tableData[currentIndex].list33[2]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="鏈湴杩滅▼">{{ tableData[currentIndex].list33[3]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="澶嶄綅">{{ tableData[currentIndex].list33[4]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="琛岃蛋鎶遍椄">{{ tableData[currentIndex].list33[5]}}
+								</el-descriptions-item>
+
+
+								<el-descriptions-item label="鎵嬪姩椤跺崌">{{ tableData[currentIndex].list34[0]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="椤跺崌涓婂埌浣�">{{ tableData[currentIndex].list34[1]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="椤跺崌涓嬪埌浣�">{{ tableData[currentIndex].list34[2]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="宸﹁秴闄�">{{ tableData[currentIndex].list34[3]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="鍙宠秴闄�">{{ tableData[currentIndex].list34[4]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="鍓嶅嚫鍑�">{{ tableData[currentIndex].list34[5]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="鍚庡嚫鍑�">{{ tableData[currentIndex].list34[6]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="瓒呴珮">{{ tableData[currentIndex].list34[7]}}
+								</el-descriptions-item>
+
+
+								<el-descriptions-item label="杞借揣鍙版湁鐗�">{{ tableData[currentIndex].list32[0]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="宸︽帰璐�1">{{ tableData[currentIndex].list32[1]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="宸︽帰璐�2">{{ tableData[currentIndex].list32[2]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="鍙虫帰璐�1">{{ tableData[currentIndex].list32[3]}}
+								</el-descriptions-item>
+								<el-descriptions-item label="鍙虫帰璐�2">{{ tableData[currentIndex].list32[4]}}
+								</el-descriptions-item>
+
 							</el-descriptions>
 
 						</div>
@@ -217,7 +303,10 @@
 					}
 				],
 				demo: 'X',
-				rgvMode: 0
+				rgvMode: 0,
+				value1:50000,
+				min:8000,
+				max:80000
 			},
 			created() {
 				this.init()
@@ -226,6 +315,9 @@
 
 			},
 			methods: {
+				formatTooltip(){
+					return "RGV 1"
+				},
 				staTova(sta,end){
 					let that = this
 					that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
@@ -290,6 +382,7 @@
 						method: 'post',
 						success: function (res) {
 							that.tableData = res.data
+							that.value1 = res.data.rgvPos
 						}
 					});
 				},
@@ -518,6 +611,32 @@
 			}
 		})
 	</script>
+	<style>
+		 .el-slider__bar {
+			background-color: #e4e7ed;
+		}
+		 .el-slider__button{
+			 width: 30px !important;
+			 height: 30px !important;
+			 border-radius: 2px !important; /* 鍏抽敭灞炴�� */
+			 border: 2px solid #409EFF !important;
+
+		 }
+		 .el-slider__runway {
+			 cursor: not-allowed !important;
+			 pointer-events: none !important;
+		 }
+		 .card-bg{
+			 background-color: #9d9d9d;
+		 }
+		 .el-slider {
+			 transform: scaleX(-1);
+		 }
+		 /*.el-slider__button-wrapper {*/
+			/* transform: scaleX(-1);*/
+		 /*}*/
+
+	</style>
 </body>
 
 </html>
\ No newline at end of file

--
Gitblit v1.9.1