diff --git a/ebike-maintenance/pages.json b/ebike-maintenance/pages.json index 81b3930..872fb1e 100644 --- a/ebike-maintenance/pages.json +++ b/ebike-maintenance/pages.json @@ -50,6 +50,11 @@ "style": { "navigationBarTitleText": "景上运维" } + }, { + "path": "pages/devops/workorder/workorderlist", + "style": { + "navigationBarTitleText": "工单列表" + } } ], "subPackages": [{ @@ -405,6 +410,11 @@ "iconPath": "static/tabbar/home.png", "selectedIconPath": "static/tabbar/home_active.png", "text": "主页" + }, { + "pagePath": "pages/devops/workorder/workorderlist", + "iconPath": "static/tabbar/order.png", + "selectedIconPath": "static/tabbar/order_active.png", + "text": "工单任务" }, { "pagePath": "pages/mine/mine", "iconPath": "static/tabbar/my.png", diff --git a/ebike-maintenance/pages/devops/faultreport/faultreport.vue b/ebike-maintenance/pages/devops/faultreport/faultreport.vue index d35f7b7..db0834d 100644 --- a/ebike-maintenance/pages/devops/faultreport/faultreport.vue +++ b/ebike-maintenance/pages/devops/faultreport/faultreport.vue @@ -380,7 +380,7 @@ const params = { "bikeCode": ebikeInfo.value.bikeCode, "faultIds": faultIds, - "receiver": userInfo.value.staffId + "receiverId": userInfo.value.staffId } api.callEbikeInfo("createWorkOrder", params).then((res) => { if (res.code == 200) { //工单生成成功 跳转 diff --git a/ebike-maintenance/pages/devops/workorder/workorderlist.vue b/ebike-maintenance/pages/devops/workorder/workorderlist.vue new file mode 100644 index 0000000..9fbe23e --- /dev/null +++ b/ebike-maintenance/pages/devops/workorder/workorderlist.vue @@ -0,0 +1,200 @@ + + + + + \ No newline at end of file diff --git a/ebike-maintenance/pages/user/login/TroubleReportUser.vue b/ebike-maintenance/pages/user/login/TroubleReportUser.vue index 9f7b912..76ad91b 100644 --- a/ebike-maintenance/pages/user/login/TroubleReportUser.vue +++ b/ebike-maintenance/pages/user/login/TroubleReportUser.vue @@ -338,7 +338,7 @@ const params = { "bikeCode": ebikeInfo.value.bikeCode, "faultIds": faultIds, - "receiver": userInfo.value.staffId + "receiverId": userInfo.value.staffId } api.callEbikeInfo("createWorkOrder", params).then((res) => { diff --git a/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue b/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue index f74a727..d759df4 100644 --- a/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue +++ b/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue @@ -301,7 +301,7 @@ "bikeCodes": customFormData.value.deviceValues, // 车辆编号 "status": statusZT.value, "siteId": customFormData.value.reginvalue, - "DispatchType": "仓库车调度" + "dispatchType": "仓库车调度" } // 例如,调用API处理投放 api.callEbikeInfo("createWorkOrderDispatch", params).then((res) => { diff --git a/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue b/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue index a2bf0d0..59e146b 100644 --- a/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue +++ b/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue @@ -70,7 +70,7 @@ } from '@/utils/tools.js'; const orderId = ref(""); - const fileLists = ref([]); + const fileLists = ref([]); const newbikeCode = ref(""); @@ -171,24 +171,46 @@ } const bikeCodeScanChange = (bikeCode) => { api.callEbikeInfo("getBikeINfoData?bikeCode=" + bikeCode).then((res) => { - if (res.code == 200) { - const params = { - "orderId": orderId.value, - "bikeCode": bikeCode, - "dispatchState": 0 - } - newbikeCode.value = bikeCode; - api.callEbikeInfo("createDispatchRecord", params) - .then(re => { - if (re.code == "200") { - dispatchRecords.value.push(re.data) - } else { - showModelMessage(re.msg) - } - }) + if (res.code == 200) { + const ecuSn = res.data.ecuSn; + const ecuId = res.data.ecuId; + const bikeId = res.data.bikeId; + //获取车辆经纬度 + api.callCoreApi("gps?ecuId=" + ecuSn + "&bikeId=" + bikeId, {}, 'get') + .then((res) => { + api.callCoreApi("gpsMsg" + "?ecuSn=" + ecuSn, {}, 'get').then((res) => { + + if (res.code == 200) { + const latitude = res.data.latitude; + const longitude = res.data.longitude; + const params = { + "orderId": orderId.value, + "bikeCode": bikeCode, + "dispatchState": 0, + "startVehicleLat":latitude, + "startVehicleLng":longitude + } + newbikeCode.value = bikeCode; + api.callEbikeInfo("createDispatchRecord", params) + .then(re => { + if (re.code == "200") { + dispatchRecords.value.push(re.data) + } else { + showModelMessage(re.msg) + } + + }) + } else { + showModelMessage("车辆经纬度获取失败!"); + } + }) + + + }); + } else { - showModelMessage("车辆不存在!") + showModelMessage("车辆不存在!"); } }); }; @@ -203,7 +225,7 @@ { const params = { "orderId": orderId.value, - "fileLists":fileLists.value + "fileLists": fileLists.value } api.callEbikeInfo("completeDeployment", params).then(res => { if (res.code == 200) { @@ -249,13 +271,13 @@ }); } }); - }) + }) } const pushCarHandler = () => { // 处理推车逻辑 console.log("推车操作"); } - const onRingClick=(bikeCode)=>{ + const onRingClick = (bikeCode) => { uni.showLoading({ title: "指令下发中...", mask: true