| src/main/java/com/zy/asrs/controller/BasJarController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/BasJar.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/vo/JarStateTableVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/mapper/BasJarMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/views/deviceOperate/jarOperate.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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); 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) { 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; } 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>
@@ -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>
