监控页面修改 设备锁页面修改

ruoyi-ui/src/views/job/mydoJob/index.vue

@@ -107,14 +107,14 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--&lt;!&ndash;      <el-form-item label="仓库ID" prop="warehouseId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.warehouseId"-->
-<!--          placeholder="请输入仓库ID"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="仓库ID" prop="warehouseId">
+        <el-input
+          v-model="queryParams.warehouseId"
+          placeholder="请输入仓库ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 <!--      <el-form-item label="重分标志" prop="faultFlag">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.faultFlag"-->
@@ -198,7 +198,7 @@
       <el-table-column label="结束时间" align="center" prop="finishTime" />
       <el-table-column label="入口ID" align="center" prop="entranceId" />
       <el-table-column label="出口ID" align="center" prop="exitId" />
-<!--      <el-table-column label="仓库ID" align="center" prop="warehouseId" />-->
+      <el-table-column label="仓库ID" align="center" prop="warehouseId" />
 <!--      <el-table-column label="重分标志" align="center" prop="faultFlag" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">