调整设备监控页面

ruoyi-admin/src/main/java/com/ruoyi/device/ddj/controller/MsgDdjController.java

@@ -107,7 +107,7 @@ public class MsgDdjController extends BaseController
 
     @GetMapping("/getStackerStatus/{id}")
     public StackerStatus getStackerStatus(@PathVariable Long id){
-        //返回堆垛机状态映射
+        //返回堆垛机部分参数的状态映射
         if (id == 1) {
             MsgDdj msg = msgDdjService.selectMsgDdjById(id);
             StackerStatus status = new StackerStatus();
@@ -122,6 +122,7 @@ public class MsgDdjController extends BaseController
             status.setCurrentRow(msg.getCurrentRow());
             status.setCurrentColumn(msg.getCurrentColumn());
             status.setCurrentFloor(msg.getCurrentFloor());
+//            status.setCurrentRoad(msg.getId());
             status.setCurrentPosition(msg.getCurrentRow() + "排" + msg.getCurrentColumn() + "列" + msg.getCurrentFloor() + "层");
 
             return status;

ruoyi-admin/src/main/java/com/ruoyi/device/ddj/domain/StackerStatus.java

@@ -73,15 +73,11 @@ public class StackerStatus {
     @JsonProperty("当前位置")
     private String currentPosition;
 
-    /** 心跳信号 */
-    @Excel(name = "心跳信号")
-    private Integer xtxh;
-
     /** 当前巷道 */
-    @Excel(name = "当前巷道")
-    @JsonProperty("当前巷道")
-    @JsonIgnore
-    private Integer currentRoad;
+//    @Excel(name = "当前巷道")
+//    @JsonProperty("当前巷道")
+//    @JsonIgnore
+//    private Integer currentRoad;
 
     /** 货叉状态 */
     @Excel(name = "货叉状态")

ruoyi-admin/src/main/resources/mapper/device/DeviceSsjMapper.xml

@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDeviceSsjList" parameterType="DeviceSsj" resultMap="DeviceSsjResult">
         <include refid="selectDeviceSsjVo"/>
         <where>
-            <if test="deviceCode  != null and deviceCode != ''"> and device_code  = #{deviceCode}</if>
+            <if test="deviceCode  != null and deviceCode != ''"> and device_code = #{deviceCode}</if>
             <if test="name  != null and name != ''"> and name  = #{name}</if>
             <if test="type != null and type != ''"> and type = #{type}</if>
             <if test="ipAddress != null and ipAddress != ''"> and ip_address = #{ipAddress}</if>

ruoyi-ui/src/views/device/ddj/index.vue

@@ -4,6 +4,11 @@
 
 
     <!-- 7个表格区域 -->
+     <el-row>
+      <el-col :span="24">
+        <div class="floor-title">堆垛机</div>
+      </el-col>
+    </el-row>
     <el-row :gutter="20" class="table-container">
       <el-col :span="24" class="table-col">
         <div class="table-card">
@@ -54,7 +59,7 @@
     </el-row>
     <el-row :gutter="20" class="table-container">
       <!-- 表格2：入出库输送机 -->
-      <el-col :span="12" class="table-col">
+      <el-col :span="24" class="table-col">
         <div class="table-card">
           <div class="table-header">
             <span class="table-title">入出库输送机</span>
@@ -90,7 +95,7 @@
       </el-col>
 
       <!-- 表格3：巷道口输送机 -->
-      <el-col :span="12" class="table-col">
+      <el-col :span="24" class="table-col">
         <div class="table-card">
           <div class="table-header">
             <span class="table-title">巷道口输送机</span>
@@ -278,13 +283,13 @@ export default {
       })
       listSsj(this.queryParams).then(response => {
         // this.table1Data = response.rows.filter(item => item.deviceCode === 'G1005')
-        this.table1Data = response.rows.filter(item => item.deviceCode === 'G1004')
+        this.table2Data = response.rows.filter(item => item.deviceCode === 'G1004')
         // this.table2Data = response.rows.filter(item => item.deviceCode === 'L1001' || item.deviceCode === 'L1003')
         // this.table3Data = response.rows.filter(item => item.deviceCode === 'L1002' || item.deviceCode === 'L1004')
         // this.table4Data = response.rows.filter(item => item.deviceCode === 'L2004' || item.deviceCode === 'L2006')
         // this.table5Data = response.rows.filter(item => item.deviceCode === 'L2002' || item.deviceCode === 'L2008')
         // this.table6Data = response.rows.filter(item => item.deviceCode === 'L2001' || item.deviceCode === 'L2003' || item.deviceCode === 'L2005' || item.deviceCode === 'L2007')
-        this.table1Data = response.rows.filter(item => item.deviceCode === 'L1001')
+        this.table3Data = response.rows.filter(item => item.deviceCode === 'L1001')
         
       })
       listDeviceCar(this.queryParams).then(response => {
@@ -296,7 +301,7 @@ export default {
 </script>
 <style scoped>
 .floor-title {
-  font-size: 20px;
+  font-size: 25px;
   font-weight: bold;
   margin: 20px 0;
 }
@@ -340,7 +345,7 @@ export default {
 }
 
 .table-title {
-  font-size: 14px;
+  font-size: 16px;
   font-weight: 600;
 }
 
@@ -383,4 +388,11 @@ export default {
 .el-progress {
   width: 100%;
 }
+
+
+::v-deep .table-container .el-table th > .cell,
+::v-deep .table-container .el-table td > .cell {
+  text-align: center !important;
+}
+
 </style>