From 26947db0d67342aa6e706047884f88697fc406e1 Mon Sep 17 00:00:00 2001
From: lsh <s>
Date: 星期四, 05 六月 2025 13:55:24 +0800
Subject: [PATCH] #
---
src/main/webapp/views/basErrLog/basErrLog.html | 2 +-
src/main/webapp/static/wms/js/basErrLog/basErrLog.js | 2 +-
src/main/java/com/zy/core/thread/SiemensRgvThread.java | 4 ++--
src/main/webapp/views/deviceOperate/rgvOperate.html | 18 +++++++++++-------
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensRgvThread.java b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
index e1e2829..13e064e 100644
--- a/src/main/java/com/zy/core/thread/SiemensRgvThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
@@ -142,7 +142,7 @@
}
rgvProtocol.setMode((short) -1);
rgvProtocol.setStatus((short)-1);
- rgvProtocol.setTaskNo1(1002);
+ rgvProtocol.setTaskNo1(0);
rgvProtocol.setStatus1((short)-1);
rgvProtocol.setLoaded1((short)0);
rgvProtocol.setWalkPos((short)0);
@@ -185,7 +185,7 @@
*/
private void readStatus(){
try {
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 30);
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 36);
if (result.IsSuccess) {
if (null == rgvProtocol || rgvProtocol.getRgvNo() == null) {
rgvProtocol = new RgvProtocol();
diff --git a/src/main/webapp/static/wms/js/basErrLog/basErrLog.js b/src/main/webapp/static/wms/js/basErrLog/basErrLog.js
index cdc88ff..ad27785 100644
--- a/src/main/webapp/static/wms/js/basErrLog/basErrLog.js
+++ b/src/main/webapp/static/wms/js/basErrLog/basErrLog.js
@@ -26,7 +26,7 @@
,{field: 'endTime$', align: 'center',title: '缁撴潫鏃堕棿'}
,{field: 'wrkSts$', align: 'center',title: '浠诲姟鐘舵��'}
,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
- ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈�'}
+ ,{field: 'crnNo', align: 'center',title: '璁惧鍙�'}
,{field: 'plcNo', align: 'center',title: 'plc', hide: true}
,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅', hide: true}
,{field: 'staNo', align: 'center',title: '鐩爣绔�', hide: true}
diff --git a/src/main/webapp/views/basErrLog/basErrLog.html b/src/main/webapp/views/basErrLog/basErrLog.html
index 3ba715f..752133c 100644
--- a/src/main/webapp/views/basErrLog/basErrLog.html
+++ b/src/main/webapp/views/basErrLog/basErrLog.html
@@ -21,7 +21,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="crn_no" placeholder="鍫嗗灈鏈�" autocomplete="off">
+ <input class="layui-input" type="text" name="crn_no" placeholder="璁惧鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index 2d11955..d5de858 100644
--- a/src/main/webapp/views/deviceOperate/rgvOperate.html
+++ b/src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -20,12 +20,13 @@
<span>璁惧浣嶇疆</span>
</div>
<el-row >
- <el-col :span="1" :offset="3"><el-card class="card-bg"></el-card></el-col>
+ <el-col :span="1" :offset="9"><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-row>
<el-row type="flex" justify="center">
- <el-col :span="18" >
+ <el-col :span="7" >
<el-slider v-model="value1" :min="min" :max="max" :format-tooltip="formatTooltip" >
</el-slider>
</el-col>
@@ -33,13 +34,15 @@
</el-row>
<el-row >
- <el-col :span="1" :offset="3"><el-card class="card-bg"></el-card></el-col>
+ <el-col :span="1" :offset="8"><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" :offset="2"><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>
@@ -305,8 +308,8 @@
demo: 'X',
rgvMode: 0,
value1:50000,
- min:8000,
- max:80000
+ min:8300,
+ max:75000
},
created() {
this.init()
@@ -382,7 +385,8 @@
method: 'post',
success: function (res) {
that.tableData = res.data
- that.value1 = res.data.rgvPos
+ that.value1 = res.data[0].rgvPos
+
}
});
},
--
Gitblit v1.9.1