From 556ea2f59ce3721ea94656f7f171feaf16e65b0f Mon Sep 17 00:00:00 2001 From: 5g0Wp7Zy Date: Tue, 12 Aug 2025 11:45:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E6=96=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ebike-maintenance/App.vue | 3 +- ebike-maintenance/pages.json | 17 + .../pages/devops/workorder/workorderlist.vue | 552 ++++++++++-------- ebike-maintenance/pages/home/home.vue | 8 +- ebike-maintenance/pages/mine/mine.vue | 28 +- .../warehouse/ebikehouse/vehicleoperation.vue | 11 +- .../components/maintainOrderCard.vue | 106 ++++ .../maintainOrder/maintainOrderDetail.vue | 252 ++++++++ .../maintainOrder/maintainOrderList.vue | 80 +++ .../vehicledispatch/vehicledispatch.vue | 2 +- ebike-maintenance/utils/config.js | 2 +- 11 files changed, 788 insertions(+), 273 deletions(-) create mode 100644 ebike-maintenance/pages/warehouse/maintainOrder/components/maintainOrderCard.vue create mode 100644 ebike-maintenance/pages/warehouse/maintainOrder/maintainOrderDetail.vue create mode 100644 ebike-maintenance/pages/warehouse/maintainOrder/maintainOrderList.vue diff --git a/ebike-maintenance/App.vue b/ebike-maintenance/App.vue index bd2dd27..8c3cabb 100644 --- a/ebike-maintenance/App.vue +++ b/ebike-maintenance/App.vue @@ -24,7 +24,7 @@ export default { .then((res) => { if (res.code == 200) { // let url = "/pages/devops/ebikeinfo/ebikeinfo"; - // let url = "/pages/warehouse/carDispatchByMine/carDispatchByMine"; + // let url = "/pages/warehouse/maintainOrder/maintainOrderList"; // let url = "/pages/mine/mine"; let url = "/pages/home/home"; setTimeout(() => { @@ -47,3 +47,4 @@ export default { @import "./colorui/icon.css"; @import "./common/uni-main.scss"; +、 \ No newline at end of file diff --git a/ebike-maintenance/pages.json b/ebike-maintenance/pages.json index 381114a..57243de 100644 --- a/ebike-maintenance/pages.json +++ b/ebike-maintenance/pages.json @@ -358,6 +358,23 @@ } ] }, + { + "root": "pages/warehouse/maintainOrder", + "pages": [ + { + "path": "maintainOrderList", + "style": { + "navigationBarTitleText": "维修接单列表" + } + }, + { + "path": "maintainOrderDetail", + "style": { + "navigationBarTitleText": "维修接单详情" + } + } + ] + }, { "root": "pages/devops/bikesite", "pages": [ diff --git a/ebike-maintenance/pages/devops/workorder/workorderlist.vue b/ebike-maintenance/pages/devops/workorder/workorderlist.vue index 031548d..52443f0 100644 --- a/ebike-maintenance/pages/devops/workorder/workorderlist.vue +++ b/ebike-maintenance/pages/devops/workorder/workorderlist.vue @@ -1,283 +1,323 @@ \ No newline at end of file +.uni-forms-item { + position: relative; + display: flex; + margin-bottom: 2px !important; + flex-direction: row; +} + diff --git a/ebike-maintenance/pages/home/home.vue b/ebike-maintenance/pages/home/home.vue index 3d1ca07..38a5c5c 100644 --- a/ebike-maintenance/pages/home/home.vue +++ b/ebike-maintenance/pages/home/home.vue @@ -545,7 +545,6 @@ function changeDDLX() { //获取行政区划 function getZone(callback) { api.callOperateApi("ebikeRegion/getZone", null, "get").then((res) => { - console.log(res); const arrData = []; const { code, data, message } = res; if (code != 200) { @@ -632,7 +631,7 @@ function changeArea(data, refresh) { uni.showLoading({ title: "加载中", }); - console.log(zoneId, "zoneId"); + console.log(zoneId); map.getOperation(zoneId, (res) => { uni.hideLoading(); @@ -780,7 +779,10 @@ function loadMapRegionData(show, data) { //刷新 function refreshArea() { - changeArea(selArea, true); + getZone((arrData) => { + arrAreaData.value = arrData || []; + changeArea(selArea, true); + }); } //缩放 diff --git a/ebike-maintenance/pages/mine/mine.vue b/ebike-maintenance/pages/mine/mine.vue index ff7ab3e..4d5be90 100644 --- a/ebike-maintenance/pages/mine/mine.vue +++ b/ebike-maintenance/pages/mine/mine.vue @@ -124,7 +124,13 @@ const btnList = [ key: "dispatch", name: "调度", path: "/pages/warehouse/carDispatchByMine/carDispatchByMine", - customsrc: "icon-ebikeditu2", + customsrc: "icon-ebikeditu", + }, + { + key: "maintainOrder", + name: "调度", + path: "/pages/warehouse/carDispatchByMine/carDispatchByMine", + customsrc: "icon-ebikeweixiuoff", }, ], }, @@ -232,12 +238,20 @@ onMounted(() => { } }); - menus[0].children.push({ - key: "dispatch", - name: "调度", - path: "/pages/warehouse/carDispatchByMine/carDispatchByMine", - customsrc: "icon-ebikeditu", - }); + menus[0].children.push( + { + key: "dispatch", + name: "调度", + path: "/pages/warehouse/carDispatchByMine/carDispatchByMine", + customsrc: "icon-ebikeditu", + }, + { + key: "maintainOrder", + name: "维修接单", + path: "/pages/warehouse/maintainOrder/maintainOrderList", + customsrc: "icon-ebikeweixiuoff", + } + ); dataList.value = menus; } diff --git a/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue b/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue index 377a02c..78c42e5 100644 --- a/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue +++ b/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue @@ -349,6 +349,9 @@ const handleLeaveWarehouse = () => { status: statusZT.value, reginId: "", }; + + console.log(params); + api.callEbikeInfo("vehicleLeaveWarehouse", params).then((res) => { isSubmit.value = false; if (res.code == 200) { @@ -361,8 +364,8 @@ const handleLeaveWarehouse = () => { searchInfo(); } else { uni.showToast({ - title: "操作失败", - icon: "error", + title: res.message || "操作失败", + icon: "none", duration: 2000, }); } @@ -401,8 +404,8 @@ const handleLaunch = () => { }, 1000); // 跳转延迟与提示时长一致 } else { uni.showToast({ - title: "操作失败", - icon: "error", + title: res.message || "操作失败", + icon: "none", duration: 2000, }); } diff --git a/ebike-maintenance/pages/warehouse/maintainOrder/components/maintainOrderCard.vue b/ebike-maintenance/pages/warehouse/maintainOrder/components/maintainOrderCard.vue new file mode 100644 index 0000000..fc912f2 --- /dev/null +++ b/ebike-maintenance/pages/warehouse/maintainOrder/components/maintainOrderCard.vue @@ -0,0 +1,106 @@ + + + + + + diff --git a/ebike-maintenance/pages/warehouse/maintainOrder/maintainOrderDetail.vue b/ebike-maintenance/pages/warehouse/maintainOrder/maintainOrderDetail.vue new file mode 100644 index 0000000..c54d6a2 --- /dev/null +++ b/ebike-maintenance/pages/warehouse/maintainOrder/maintainOrderDetail.vue @@ -0,0 +1,252 @@ + + + + + + + diff --git a/ebike-maintenance/pages/warehouse/maintainOrder/maintainOrderList.vue b/ebike-maintenance/pages/warehouse/maintainOrder/maintainOrderList.vue new file mode 100644 index 0000000..5f5f913 --- /dev/null +++ b/ebike-maintenance/pages/warehouse/maintainOrder/maintainOrderList.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue b/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue index ac5ee5b..696ccd9 100644 --- a/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue +++ b/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue @@ -51,7 +51,7 @@ {{ item.bikeCode }} - 离线 + {{ item.connected ? "在线" : "离线" }} diff --git a/ebike-maintenance/utils/config.js b/ebike-maintenance/utils/config.js index 971ed5a..51ac9a3 100644 --- a/ebike-maintenance/utils/config.js +++ b/ebike-maintenance/utils/config.js @@ -1,5 +1,5 @@ const config = { - // apiUrl: "http://192.168.2.142:10010/", + // apiUrl: "http://192.168.2.140:10010/", // apiUrl: "https://www.cdzhuojing.cn/ebike/", apiUrl: "https://www.cx.cdzhuojing.cn/ebike/", cdnPath: "/",