From 77ac95e45f0366d152809a1b09d4a204ccdd344b Mon Sep 17 00:00:00 2001 From: yyy <2605810609@qq.com> Date: Mon, 31 Mar 2025 14:47:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/map/mapTask.ts | 5 + src/assets/imgs/jinyong-2.png | Bin 580 -> 0 bytes src/assets/imgs/suoding.png | Bin 522 -> 0 bytes src/views/carError/index.vue | 8 +- src/views/mapPage/locationList/index.vue | 18 +++- src/views/mapPage/logList/index.vue | 3 + .../realTimeMap/components/storeDialog.vue | 89 ++++++------------ src/views/mapPage/realTimeMap/index.vue | 19 ++-- src/views/mapPage/taskManagement/taskList.vue | 5 +- 9 files changed, 76 insertions(+), 71 deletions(-) delete mode 100644 src/assets/imgs/jinyong-2.png delete mode 100644 src/assets/imgs/suoding.png diff --git a/src/api/map/mapTask.ts b/src/api/map/mapTask.ts index ac1a347b..c5a67160 100644 --- a/src/api/map/mapTask.ts +++ b/src/api/map/mapTask.ts @@ -30,6 +30,11 @@ export const updateTask = (data) => { return request.post({ url: '/system/robot/task-detail/manuallyCompleted?id=' + data.id }) } +// 更新机器人任务主表 +export const closeTask = (data) => { + return request.put({ url: '/system/robot/task/close', data }) +} + //更新优先级 export const updateRobotTask = (data) => { return request.put({ url: '/system/robot/task/update', data }) diff --git a/src/assets/imgs/jinyong-2.png b/src/assets/imgs/jinyong-2.png deleted file mode 100644 index 9c30e36668c17a0ab0eb1491d31f374caaba8d86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 580 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uw}2VJ1}Qw{XwC{$w$9VVF~o!S zZJ4*;VFQ7=CcTZ)2X^ULFnXjqZcbzudaC32iucEzMrD?j*(yhxyh3Cee8Y5333e=; zVt&YjQ|`K=>h2zqm6gWtZL5=Zt7R>I>)mN7jA#VzWr{lV|*EX@A+o1@8{{Sn+$sE>Jr9*f>>jo#)KM zF>En{yM%h=wMzS@&Cy*wvFO2@{VflVeXXg}ekxhK?bep*>ASpmVspiND;3vje&so? z^)}XQgUEp2fz#&xat%PtlRxkkL% znxwYTCHc!M!TZZnd>joXu+&IwSr*iLBdZ~KN^5+IfWVg?501&j>LK$;OGwtxvPE4Y9e&K3bFbSsuA1S%`>ba4!^ z5L_E#>&@&aP`g?1kHuOR*UqVPr*^aoUh&e|vhA~cL}$XAEdjzzTxS0mtXm^~u;={I z*s@VjhnMBeSxJL?Ki)ANzx(vgkBPQzbLX0WE=y0#XVrB6J|{6HMf`&0p~!Rn0h-Bs z%5+x$@M-h7wBYw%ONnC7-wIDVgBJP(wRw~^@7k?lU9gj{ozqk+s)<>7`ITLo+LPA% z222ZB-z#Xxk|JhX+nV9iz0Nh=m%A@(W4$fsDyJ_8b}HTDFzdEB;>W~)+4qdLdks@4 z%aVhv;*vEyKVG&f`z0AXQr`45%(;KXqDx!4``peJPSW_qy;oV~kkiwduR}I$R61^X z`fKGY$B-MUa}y7h>lC+!K2le=>pb2t?e`?FNqIJ(FaP9kl-HGA**Vwc$uxD_MSGT| zU)plZW8TMqX6Li_GhThVe^SWL#imUOrut@+^tg8%IG20q^SZ>6+mG0#JMV85n$H?t t)3Eh>hBsqL&y#=bvumF(s { /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 + if (queryParams.warnCode) { + queryParams.warnCode = queryParams.warnCode.replace(/\s/g, '') + } + if (queryParams.robotNo) { + queryParams.robotNo = queryParams.robotNo.replace(/\s/g, '') + } getList() } diff --git a/src/views/mapPage/locationList/index.vue b/src/views/mapPage/locationList/index.vue index 2d6cbda9..5a9ddd8e 100644 --- a/src/views/mapPage/locationList/index.vue +++ b/src/views/mapPage/locationList/index.vue @@ -79,6 +79,7 @@ style="width: 100%" row-class-name="table-row-class" :header-cell-style="{ backgroundColor: '#EBF1FF', padding: '13px 0' }" + show-overflow-tooltip > @@ -148,7 +149,8 @@ const queryParams = reactive({ taskStage: null, laneName: null, areaName: null, - skuInfo: null + skuInfo: null, + locationNo: null }) const queryFormRef = ref() // 搜索的表单 @@ -176,6 +178,20 @@ const submitSuccess = () => { /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 + + if (queryParams.locationNo) { + queryParams.locationNo = queryParams.locationNo.replace(/\s/g, '') + } + if (queryParams.laneName) { + queryParams.laneName = queryParams.laneName.replace(/\s/g, '') + } + if (queryParams.areaName) { + queryParams.areaName = queryParams.areaName.replace(/\s/g, '') + } + if (queryParams.skuInfo) { + queryParams.skuInfo = queryParams.skuInfo.replace(/\s/g, '') + } + getList() } diff --git a/src/views/mapPage/logList/index.vue b/src/views/mapPage/logList/index.vue index 5aae917a..3fa5b3d0 100644 --- a/src/views/mapPage/logList/index.vue +++ b/src/views/mapPage/logList/index.vue @@ -422,6 +422,9 @@ const handleQuery = () => { getCarLogList() } else if (activeName.value == 3) { taskLogParams.pageNo = 1 + if (taskLogParams.taskNo) { + taskLogParams.taskNo = taskLogParams.taskNo.replace(/\s/g, '') + } getTaskLogList() } } diff --git a/src/views/mapPage/realTimeMap/components/storeDialog.vue b/src/views/mapPage/realTimeMap/components/storeDialog.vue index 154a5053..2f5ba108 100644 --- a/src/views/mapPage/realTimeMap/components/storeDialog.vue +++ b/src/views/mapPage/realTimeMap/components/storeDialog.vue @@ -1,5 +1,5 @@