From fccf8364364c36d15de26aa699f91228a74b6e10 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 05 六月 2025 13:17:59 +0800
Subject: [PATCH] #
---
src/main/webapp/views/deviceOperate/rgvOperate.html | 163 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 144 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index d431789..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="寮傚父浠ｇ爜">
+ </el-table-column>
+ <el-table-column property="alarm" label="寮傚父鎻忚堪">
</el-table-column>
</el-table>
</div>
@@ -64,7 +100,8 @@
<el-form-item label="鍚姩">
<el-button @click="initiateD(1)" type="warning">鍙栬揣</el-button>
<el-button @click="initiateD(2)" type="warning">鏀捐揣</el-button>
- <el-button @click="initiateD(3)" type="warning">XY绉诲姩</el-button>
+ <el-button @click="initiateD(3)" type="warning">X绉诲姩</el-button>
+ <el-button @click="initiateD(4)" type="warning">鎼繍</el-button>
</el-form-item>
</el-form>
</div>
@@ -76,10 +113,6 @@
<el-button v-if="rgvMode === 1 " type="warning">鎵嬪姩</el-button>
</div>
<div v-if="demo === 'N' ">
- <div style="margin: 10px auto 10px auto">
- <el-button v-if="demo === 'N' " @click="demos('true')" type="info">婕旂ず</el-button>
- <el-button v-if="demo === 'Y' " @click="demos('false')" type="info">鍙栨秷婕旂ず</el-button>
- </div>
<div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
<el-button v-if="rgvMode !== 3 " @click="rgvStatus(15)" type="primary">鑱旀満</el-button>
<el-button v-if="rgvMode !== 2 " @click="rgvStatus(14)" type="primary">鍗曟満</el-button>
@@ -99,6 +132,13 @@
<el-button :style="" @click="rgvStatus(5)" type="danger">寮哄埗鍚姩</el-button>
<el-button @click="rgvStatus(10)" type="danger">鎬ュ仠</el-button>
<el-button @click="rgvStatus(16)" type="danger">璐у弶瀹氫綅鍥炰腑</el-button>
+ <el-button @click="rgvStatus(18)" type="danger">娓呴櫎浠诲姟</el-button>
+ </div>
+ </div>
+ <div>
+ <div style="margin: 10px auto 10px auto">
+ <el-button v-if="demo === 'N' " @click="demos('true')" type="info">婕旂ず</el-button>
+ <el-button v-if="demo === 'Y' " @click="demos('false')" type="info">鍙栨秷婕旂ず</el-button>
</div>
<div style="margin-top: 5px" v-if="demo === 'Y'">
<el-button @click="staTova(2,1)" type="warning">杈撻��-缃崲1</el-button>
@@ -122,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>
@@ -131,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="宸ヤ綔鍙�">
@@ -142,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="鏁呴殰浠ｇ爜">{{ 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>
@@ -187,7 +277,7 @@
emptyContainer:null
},
formParamD: {
- rgvNo: null,
+ rgvNo: 1,
sourceStaNo: null,
sourceRow: 1,
sourceBay: 0,
@@ -213,7 +303,10 @@
}
],
demo: 'X',
- rgvMode: 0
+ rgvMode: 0,
+ value1:50000,
+ min:8000,
+ max:80000
},
created() {
this.init()
@@ -222,6 +315,9 @@
},
methods: {
+ formatTooltip(){
+ return "RGV 1"
+ },
staTova(sta,end){
let that = this
that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
@@ -286,6 +382,7 @@
method: 'post',
success: function (res) {
that.tableData = res.data
+ that.value1 = res.data.rgvPos
}
});
},
@@ -346,6 +443,8 @@
urlS = "/rgv/operator/single/step/two/put";
}else if (method === 3){
urlS = "/rgv/operator/single/step/three/put";
+ }else if (method === 4){
+ urlS = "/rgv/operator/single/step/four/put";
}
let that = this
that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
@@ -358,7 +457,7 @@
headers: {
'token': localStorage.getItem('token')
},
- data: this.formParam,
+ data: this.formParamD,
method: 'POST',
success: function (res) {
if (res.code == 200) {
@@ -512,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