编辑设备类型和出入库调度

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

@@ -9,10 +9,10 @@
         <div class="table-card">
           <div class="table-header">
             <span class="table-title">堆垛机监控</span>
-            <el-tag type="success" size="mini">总计: 6 台</el-tag>
+            <el-tag type="success" size="mini">总计: 1 台</el-tag>
           </div>
           <el-table :data="ddjData" size="mini" style="width: 100%">
-            <el-table-column label="id" align="center" prop="id"/>
+            <el-table-column label="堆垛机编号" align="center" prop="id"/>
             <el-table-column label="堆垛机名称" align="center" prop="name"/>
             <el-table-column label="当前巷道" align="center" prop="dqxd"/>
             <el-table-column label="任务号" align="center" prop="rwh"/>
@@ -49,63 +49,22 @@
     </el-row>
     <el-row>
       <el-col :span="24">
-        <div class="floor-title">二层</div>
+        <div class="floor-title">输送线</div>
       </el-col>
     </el-row>
     <el-row :gutter="20" class="table-container">
-      <!-- 表格1：入库输送机 -->
-      <el-col :span="8" class="table-col">
+      <!-- 表格2：入出库输送机 -->
+      <el-col :span="12" class="table-col">
         <div class="table-card">
           <div class="table-header">
-            <span class="table-title">产线输送机</span>
-            <el-tag type="success" size="mini">{{ table1Data.length }}台</el-tag>
-          </div>
-          <el-table :data="table1Data" size="mini" style="width: 100%">
-            <el-table-column label="设备编码" prop="deviceCode"/>
-            <!--            <el-table-column label="设备名称" prop="name"/>-->
-            <el-table-column label="任务号" prop="taskNo"/>
-            <el-table-column label="请求" prop="rkqq">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.ssj_rkqq" :value="scope.row.rkqq"/>
-              </template>
-            </el-table-column>
-            <el-table-column label="到位" prop="dw">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.ssj_dw" :value="scope.row.dw"/>
-              </template>
-            </el-table-column>
-            <el-table-column label="空闲" prop="kx">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.ssj_kx" :value="scope.row.kx"/>
-              </template>
-            </el-table-column>
-            <el-table-column label="状态" prop="sszt">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.ssj_ex" :value="scope.row.sszt"/>
-              </template>
-            </el-table-column>
-            <el-table-column label="托盘尺寸" prop="traySize" >
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.tray_size" :value="scope.row.traySize"/>
-              </template>
-            </el-table-column>
-            <el-table-column label="托盘码" prop="trayCode" width="600" />
-
-          </el-table>
-        </div>
-      </el-col>
-
-      <!-- 表格2：出库输送机 -->
-      <el-col :span="8" class="table-col">
-        <div class="table-card">
-          <div class="table-header">
-            <span class="table-title">入出库口输送机</span>
+            <span class="table-title">入出库输送机</span>
             <el-tag type="success" size="mini">{{ table2Data.length }}台</el-tag>
           </div>
           <el-table :data="table2Data" size="mini" style="width: 100%">
             <el-table-column label="设备编码" prop="deviceCode"/>
             <!--            <el-table-column label="设备名称" prop="name"/>-->
             <el-table-column label="任务号" prop="taskNo"/>
+            <el-table-column label="托盘条码" prop="trayCode"/>
             <el-table-column label="到位" prop="dw">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.ssj_dw" :value="scope.row.dw"/>
@@ -130,8 +89,8 @@
         </div>
       </el-col>
 
-      <!-- 表格3：分拣输送机 -->
-      <el-col :span="8" class="table-col">
+      <!-- 表格3：巷道口输送机 -->
+      <el-col :span="12" class="table-col">
         <div class="table-card">
           <div class="table-header">
             <span class="table-title">巷道口输送机</span>
@@ -163,31 +122,12 @@
       </el-col>
     </el-row>
 
-<!--    <el-row :gutter="20" class="table-container">-->
-<!--      <el-col :span="24" class="table-col">-->
-<!--        <div class="table-card">-->
-<!--          <div class="table-header">-->
-<!--            <span class="table-title">AGV</span>-->
-<!--            <el-tag type="success" size="mini">{{ agvData.length }}台</el-tag>-->
-<!--          </div>-->
-<!--          <el-table :data="agvData" size="mini" style="width: 100%">-->
-<!--            <el-table-column label="设备编码" align="center" prop="deviceCode" />-->
-<!--            <el-table-column label="设备名称" align="center" prop="name" />-->
-<!--            <el-table-column label="状态" align="center" prop="status" />-->
-<!--            <el-table-column label="起点" align="center" prop="spare1" />-->
-<!--            <el-table-column label="终点" align="center" prop="spare2" />-->
-<!--            <el-table-column label="任务号" align="center" prop="taskNo" />-->
-<!--            <el-table-column label="执行阶段" align="center" prop="zxjd" />-->
-<!--          </el-table>-->
-<!--        </div>-->
-<!--      </el-col>-->
-<!--    </el-row>-->
     <el-row>
-      <el-col :span="24">
-        <div class="floor-title">一层</div>
+      <el-col :span="24" v-if="isNone">
+        <div class="floor-title">巷道口输送机</div>
       </el-col>
     </el-row>
-    <el-row :gutter="20" class="table-container">
+    <el-row :gutter="20" class="table-container" v-if="isNone">
       <!-- 表格4：提升机 -->
       <el-col :span="8" class="table-col">
         <div class="table-card">
@@ -313,7 +253,9 @@ export default {
       table6Data: [], // 旋转台
       ddjData: [], // 汇总统计
       agvData: [], // AGV
-      timer: null
+      timer: null,
+
+      isNone: false
     };
   },
   created() {
@@ -335,12 +277,15 @@ export default {
         this.ddjData = response.rows
       })
       listSsj(this.queryParams).then(response => {
-        this.table1Data = response.rows.filter(item => item.deviceCode === 'G1005')
-        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 === 'G1005')
+        this.table1Data = 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')
+        
       })
       listDeviceCar(this.queryParams).then(response => {
         this.agvData = response.rows;