From 291769f73e1b60bde6953aa72be4e0f632eba0a6 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 23 十一月 2024 14:45:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java | 12 ++++++
src/main/resources/mapper/BasJarMapper.xml | 7 +++
src/main/java/com/zy/asrs/controller/BasJarController.java | 6 +++
src/main/java/com/zy/asrs/entity/BasJar.java | 48 ++++++++++++++++++++++++
src/main/webapp/views/deviceOperate/jarOperate.html | 25 +++++++++---
5 files changed, 91 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarController.java b/src/main/java/com/zy/asrs/controller/BasJarController.java
index 5af2626..3af53de 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarController.java
@@ -142,6 +142,12 @@
vo.setRegion(basJar.getRegion());
vo.setJarCode(basJar.getJarCode());
vo.setJarErr(basJar.getJarErr$());
+ vo.setJarTemperature(basJar.getJarTemperature());
+ vo.setJarTemperature$(basJar.getJarTemperature().toString()+"鈩�");
+ vo.setJarPressure(basJar.getJarPressure());
+ vo.setJarPressure$(basJar.getJarPressure().toString()+"Pa");
+ vo.setJarCount(basJar.getJarCount());//鏈�澶у偍閲�
+ vo.setJarCount$(basJar.getJarCount().toString()+"鎵�");//鏈�澶у偍閲�
}
return R.ok().add(list);
diff --git a/src/main/java/com/zy/asrs/entity/BasJar.java b/src/main/java/com/zy/asrs/entity/BasJar.java
index 36765c6..31ead83 100644
--- a/src/main/java/com/zy/asrs/entity/BasJar.java
+++ b/src/main/java/com/zy/asrs/entity/BasJar.java
@@ -119,6 +119,54 @@
@TableField("right_out_enable")
private String rightOutEnable;
+ /**
+ * 鍏ョ綈灏忚溅
+ */
+ @ApiModelProperty(value= "鍏ョ綈灏忚溅")
+ @TableField("enter_ste_no")
+ private Integer enterSteNo;
+
+ /**
+ * 鍑虹綈灏忚溅
+ */
+ @ApiModelProperty(value= "鍑虹綈灏忚溅")
+ @TableField("out_ste_no")
+ private Integer outSteNo;
+
+ /**
+ * 鍏ョ綈RGV
+ */
+ @ApiModelProperty(value= "鍏ョ綈RGV")
+ @TableField("enter_rgv_no")
+ private Integer enterRgvNo;
+
+ /**
+ * 鍑虹綈RGV
+ */
+ @ApiModelProperty(value= "鍑虹綈RGV")
+ @TableField("out_rgv_no")
+ private Integer outRgvNo;
+
+ /**
+ * 鍐峰嵈
+ */
+ @ApiModelProperty(value= "鍐峰嵈")
+ private Integer burial;
+
+ /**
+ * 娓╁害
+ */
+ @ApiModelProperty(value= "娓╁害")
+ @TableField("jar_temperature")
+ private Float jarTemperature;
+
+ /**
+ * 鍘嬪姏
+ */
+ @ApiModelProperty(value= "鍘嬪姏")
+ @TableField("jar_pressure")
+ private Float jarPressure;
+
public BasJar() {}
public BasJar(Integer jarNo,Integer region,Integer jarCode,Integer staNo,Integer jarStatus,Integer jarCount,Integer jarErr,String leftDoor,String rightDoor,String leftInEnable,String leftOutEnable,String autoing,Integer jarMode,String rightInEnable,String rightOutEnable) {
diff --git a/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java b/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java
index 26ffe8c..9657a19 100644
--- a/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java
+++ b/src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java
@@ -30,5 +30,17 @@
//寮傚父浠ｇ爜
private String jarErr = "-";
+ //娓╁害
+ private Float jarTemperature = 0.0F;
+ private String jarTemperature$ = "-";
+
+ //鍘嬪姏
+ private Float jarPressure = 0.0F;
+ private String jarPressure$ = "-";
+
+ //鏈�澶у偍閲�
+ private Integer jarCount = 0;
+ private String jarCount$ = "-";
+
private List<JarMastTableVo> jarMastTableVoList;
}
diff --git a/src/main/resources/mapper/BasJarMapper.xml b/src/main/resources/mapper/BasJarMapper.xml
index 0b91213..753f9a8 100644
--- a/src/main/resources/mapper/BasJarMapper.xml
+++ b/src/main/resources/mapper/BasJarMapper.xml
@@ -19,6 +19,13 @@
<result column="jar_mode" property="jarMode" />
<result column="right_in_enable" property="rightInEnable" />
<result column="right_out_enable" property="rightOutEnable" />
+ <result column="enter_ste_no" property="enterSteNo" />
+ <result column="out_ste_no" property="outSteNo" />
+ <result column="enter_rgv_no" property="enterRgvNo" />
+ <result column="out_rgv_no" property="outRgvNo" />
+ <result column="burial" property="burial" />
+ <result column="jar_temperature" property="jarTemperature" />
+ <result column="jar_pressure" property="jarPressure" />
</resultMap>
diff --git a/src/main/webapp/views/deviceOperate/jarOperate.html b/src/main/webapp/views/deviceOperate/jarOperate.html
index fb8b24d..6d7d971 100644
--- a/src/main/webapp/views/deviceOperate/jarOperate.html
+++ b/src/main/webapp/views/deviceOperate/jarOperate.html
@@ -15,7 +15,7 @@
<div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
<div style="width: 100%;">
<el-table border ref="singleTable" :data="tableData" highlight-current-row @row-click="handleRowClick"
- max-height="350" style="width: 100%">
+ max-height="420" style="width: 100%">
<el-table-column property="jarNo" label="纭寲缃�">
</el-table-column>
<!-- <el-table-column property="workNo" label="宸ヤ綔鍙�">-->
@@ -24,11 +24,16 @@
</el-table-column>
<el-table-column property="jarMode" label="妯″紡">
</el-table-column>
- <el-table-column property="region" label="鍖哄煙">
+ <el-table-column property="jarTemperature$" label="娓╁害">
</el-table-column>
- <el-table-column property="jarCode" label="浠ｅ彿">
+ <el-table-column property="jarPressure$" label="鍘嬪姏">
+ </el-table-column>
+ <el-table-column property="jarCount$" label="鏈�澶у偍閲�">
</el-table-column>
<el-table-column property="jarErr" label="寮傚父浠ｇ爜">
+ </el-table-column>
+ <el-table-column label="鎿嶄綔">
+ <el-button style="" type="primary" plain size="medium" @click="updateJarCount()">淇敼</el-button>
</el-table-column>
</el-table>
</div>
@@ -81,12 +86,18 @@
<el-descriptions-item label="璁惧鐘舵��">
<el-tag>{{ tableData[currentIndex].jarStatus }}</el-tag>
</el-descriptions-item>
+ <el-descriptions-item label="鍖哄煙">{{ tableData[currentIndex].region }}
+ </el-descriptions-item>
+ <el-descriptions-item label="浠ｅ彿">{{ tableData[currentIndex].jarCode }}
+ </el-descriptions-item>
+ <el-descriptions-item label="娓╁害">{{ tableData[currentIndex].jarTemperature$ }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鍘嬪姏">{{ tableData[currentIndex].jarPressure$ }}
+ </el-descriptions-item>
+ <el-descriptions-item label="鏈�澶у偍閲�">{{ tableData[currentIndex].jarCount$ }}
+ </el-descriptions-item>
<el-descriptions-item label="鏁呴殰浠ｇ爜">{{ tableData[currentIndex].jarErr }}
</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>
</div>
--
Gitblit v1.9.1