From 784674adf576fa94d0c6bbff260ceba58f1d41b8 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Mon, 9 Sep 2024 20:35:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?=
 =?UTF-8?q?=201.=E5=A2=9E=E5=8A=A0=E6=8B=A3=E9=80=89=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/pickTaskMonitor.vue | 40 +++++++++++++++-------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/layout/pickTaskMonitor.vue b/src/layout/pickTaskMonitor.vue
index d167fe0..144160a 100644
--- a/src/layout/pickTaskMonitor.vue
+++ b/src/layout/pickTaskMonitor.vue
@@ -3,34 +3,29 @@
         <el-config-provider :locale="zhCn">
             <div style="display: flex;justify-content: space-between;">
                 <el-row>
-                    <el-input v-model="workStationQuery" style="width: 256px; margin-right: 10px;" placeholder="工站"
+                    <el-input v-model="vehicleIdQuery" style="width: 256px; margin-right: 10px;" placeholder="箱号"
                         :suffix-icon="Search" />
-                        <el-input v-model="smallBoxQuery" style="width: 256px; margin-right: 10px;" placeholder="小盒子"
+                    <el-input v-model="standQuery" style="width: 256px; margin-right: 10px;" placeholder="工站"
                         :suffix-icon="Search" />
                     <el-button type="primary" @click="search()">搜索</el-button>
                     <el-button type="warning" @click="reset()">重置</el-button>
                 </el-row>
             </div>
             <br />
-            <el-table :data="stationConfigList" stripe border v-loading="loading" class="table-class" highlight-current-row
-                max-height="650px" @row-click="getCurrentRow" :header-cell-style="{ 'text-align': 'center' }"
-                :cell-style="{ 'text-align': 'center' }">
+            <el-table :data="stationConfigList" stripe border v-loading="loading" class="table-class"
+                highlight-current-row max-height="650px" @row-click="getCurrentRow"
+                :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }">
                 <el-table-column width="65px" fixed="left">
                     <template v-slot="scope">
-                        <el-radio :label="scope.row.configId" v-model="configId">&nbsp;</el-radio>
+                        <el-radio :label="scope.row.pickTaskId" v-model="pickTaskId">&nbsp;</el-radio>
                     </template>
                 </el-table-column>
-                <el-table-column prop="configId" label="id" fixed="left" min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="workStation" label="工站" fixed="left" min-width="120px" />
-                <el-table-column prop="smallBox" label="小盒子" fixed="left" min-width="120px" />
-                <el-table-column prop="model" label="机型" min-width="120px" />
-                <el-table-column prop="workCenter" label="工位" min-width="120px" />
-                <el-table-column prop="bigBox" label="工位大盒子" min-width="120px" />
-                <el-table-column prop="vehicle" label="车辆" min-width="120px" />
-                <el-table-column prop="vehicleLocation" label="线边架/车位置" min-width="120px" />
-                <el-table-column prop="startDateAdjust" label="开工时间调整" min-width="120px" />
-                <el-table-column prop="lastUpdateTime" label="最近更新时间" :formatter="timeFormat" show-overflow-tooltip min-width="120px" />
-                <el-table-column prop="lastUpdateUser" label="最近更新用户" min-width="120px" />
+                <el-table-column prop="pickTaskId" label="id" fixed="left" min-width="120px" show-overflow-tooltip />
+                <el-table-column prop="vehicleId" label="工站" fixed="left" min-width="120px" />
+                <el-table-column prop="standId" label="小盒子" fixed="left" min-width="120px" />
+                <el-table-column prop="pickStatus" label="开工时间调整" min-width="120px" />
+                <el-table-column prop="lastUpdateTime" label="最近更新时间" :formatter="timeFormat" show-overflow-tooltip
+                    min-width="120px" />
                 <el-table-column fixed="right" label="操作" width="120px">
                     <template v-slot="scope">
                         <el-button plain type="primary" @click="editCurrentRowConfig(scope.row)">编辑</el-button>
@@ -147,17 +142,16 @@
 
 <script setup>
 import store from '@/store'
-import { getStationConfigs, deleteStationConfigs, updateStationConfigs } from '@/api/kateWork.js'
+import { getPickTasksByPage } from '@/api/taskMonitor.js'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
 import { dateFormatter, timeFormatter } from '@/utils/formatter.js'
-import UploadExcelStationConfig from '@/excel/UploadExcelStationConfig.vue'
 import { Search } from '@element-plus/icons-vue'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 </script>
 <script>
 export default {
-    name: 'kateOrders',
+    name: 'pickTaskMonitor',
     data() {
         return {
             stationConfigList: [],
@@ -169,12 +163,12 @@ export default {
             }),
             pageSize: 10,
             total: 0,
-            workStationQuery: '',
-            smallBoxQuery: '',
+            vehicleIdQuery: '',
+            standQuery: '',
             loading: true,
             dialogVisible: false,
             uploadDialogVisible: false,
-            configId: '',
+            pickTaskId: '',
             configFormEntity: reactive({}),
             labelPosition: 'top',
             configFormRef: ref(),