作业票执行页面

src/views/mes/job/jobplay/index.vue

@@ -8,69 +8,26 @@
       v-show="showSearch"
       label-width="100px"
     >
-      <el-form-item label="作业票编号" prop="ticketCode">
+      <el-form-item label="作业编号" prop="ticketCode">
         <el-input
           v-model="queryParams.ticketCode"
-          placeholder="请输入作业票编号"
+          placeholder="请输入作业编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="作业票名称" prop="ticketName">
+      <el-form-item label="作业名称" prop="ticketName">
         <el-input
           v-model="queryParams.ticketName"
-          placeholder="请输入作业票名称"
+          placeholder="请输入作业名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="ticketStatus">
-        <el-select v-model="queryParams.ticketStatus" placeholder="状态">
-          <el-option
-            v-for="dict in dict.type.ticket_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
 
       <el-form-item label="工作区域" prop="workareaId">
         <el-select v-model="queryParams.workareaId" placeholder="请选择区域">
-          <el-option
-            v-for="dict in this.workareaList"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="创建时间">
-        <el-date-picker
-          style="width: 218px"
-          v-model="createTime"
-          type="daterange"
-          align="right"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :picker-options="pickerOptions"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="作业类型" prop="ticketType">
-        <el-select
-          v-model="queryParams.ticketType"
-          placeholder="请选择作业类型"
-        >
-          <el-option
-            v-for="dict in dict.type.ticket_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+         
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -96,22 +53,28 @@
       :data="jobList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="70" align="center" />
       <el-table-column
         label="作业编号"
         align="center"
         prop="ticketCode"
-        width="180"
+        width="200"
       >
       </el-table-column>
       <el-table-column
         label="作业名称"
         align="center"
         prop="ticketName"
-        width="230"
+        width="200"
+      />
+      <el-table-column
+        label="工作区域"
+        align="center"
+        prop="workareaName"
+        width="200"
       />
       <!-- 上锁状态 -->
-      <el-table-column label="上锁状态" align="center" width="200">
+      <el-table-column label="上锁状态" align="center" width="230">
         <template slot-scope="scope">
           <div
             class="status-container"
@@ -125,22 +88,23 @@
               style="
                 width: 30px;
                 height: 30px;
-                border: 1px solid #e7e5e5;
+                border: 1px solid black;
                 background-color: #fff;
+                margin: 0 auto;
               "
             >
-              <span v-if="index < scope.row.lockNum"></span>
+              <!-- <span v-if="index < scope.row.lockNum"></span> -->
               <!-- 显示错号 -->
               <span
-                v-else-if="index < scope.row.lockedNum"
-                style="font-size: 20px; line-height: 30px"
+                v-if="index < scope.row.lockedNum"
+                style="font-size: 20px; line-height: 26px"
                 >🔒</span
               >
               <!-- 显示对号 -->
-              <span
+              <b
                 v-else-if="index < scope.row.removeLockNum"
                 style="font-size: 20px; line-height: 30px"
-                >✓</span
+                >✓</b
               >
             </div>
           </div>
@@ -148,15 +112,19 @@
       </el-table-column>
 
       <!-- 共锁状态 -->
-      <el-table-column label="共锁状态" align="center">
+      <el-table-column label="共锁状态" align="center" width="500">
         <template slot-scope="scope">
           <div
             class="status-container"
             style="
               width: 100%;
-              height: 100%;
               display: flex;
+              flex-wrap: wrap;
+              gap: 4px;
+              justify-content: flex-start;
               tetx-align: center;
+              box-sizing: border-box;
+              margin: 0 auto;
             "
           >
             <!-- 渲染 removeColockNum -->
@@ -167,13 +135,14 @@
               style="
                 width: 30px;
                 height: 30px;
-                border: 1px solid #e7e5e5;
+                border: 1px solid black;
                 background-color: #fff;
                 margin: 0 2px;
+
                 box-sizing: border-box;
               "
             >
-              <span style="font-size: 20px">✓</span>
+              <b style="font-size: 20px; line-height: 30px">✓</b>
             </div>
             <!-- 渲染 colockedNum -->
             <div
@@ -184,12 +153,12 @@
                 width: 30px;
                 height: 30px;
                 margin: 0 2px;
-                border: 1px solid #e7e5e5;
+                border: 1px solid black;
                 background-color: #fff;
                 box-sizing: border-box;
               "
             >
-              <span style="font-size: 20px">🔒</span>
+              <span style="font-size: 20px; line-height: 26px">🔒</span>
             </div>
             <!-- 渲染 colockNum -->
             <div
@@ -199,7 +168,7 @@
               style="
                 width: 30px;
                 height: 30px;
-                border: 1px solid #e7e5e5;
+                border: 1px solid black;
                 background-color: #fff;
                 margin: 0 2px;
                 box-sizing: border-box;