diff --git a/ebike-maintenance/App.vue b/ebike-maintenance/App.vue index 8c3cabb..e93006f 100644 --- a/ebike-maintenance/App.vue +++ b/ebike-maintenance/App.vue @@ -47,4 +47,3 @@ export default { @import "./colorui/icon.css"; @import "./common/uni-main.scss"; -、 \ No newline at end of file diff --git a/ebike-maintenance/components/devops-home-bikeinfo/devops-home-bikeinfo.vue b/ebike-maintenance/components/devops-home-bikeinfo/devops-home-bikeinfo.vue index 66cafb9..017382c 100644 --- a/ebike-maintenance/components/devops-home-bikeinfo/devops-home-bikeinfo.vue +++ b/ebike-maintenance/components/devops-home-bikeinfo/devops-home-bikeinfo.vue @@ -1,134 +1,186 @@ - - - {{data.bikeCode}} - - {{item.title}} - - - - - 电量刷新时间:{{data.time}} - - - - - - - {{data.soc}}% - - - ( - - - - {{data.distance}} - ) - - - - - - - - 寻车铃 - - - - 车辆详情 - 开锁 - 关锁 - 调度 - 换电 - - - - + + + {{ data.bikeCode }} + + {{ item.title }} + + + + 电量刷新时间:{{ data.time }} + + + + + + {{ data.soc }}% + + + ( + + + + {{ data.distance }} + ) + + + + + + + 寻车铃 + + + + 车辆详情 + 开锁 + 关锁 + 调度 + 换电 + + \ No newline at end of file +.lbTagRed { + color: #f98f93; + background-color: #ffeced; +} + diff --git a/ebike-maintenance/pages/home/home.vue b/ebike-maintenance/pages/home/home.vue index 38a5c5c..4372476 100644 --- a/ebike-maintenance/pages/home/home.vue +++ b/ebike-maintenance/pages/home/home.vue @@ -426,6 +426,7 @@ const selRight = ref({ ...arrRight.value[0], }); const statusHeight = ref(0); //顶部 +const isTouchDisable = ref(false); //是否禁止触摸 const mapRef = ref("mapRef"); let mapContext = null; diff --git a/ebike-maintenance/pages/warehouse/carDispatchByMine/carDispatchByMine.vue b/ebike-maintenance/pages/warehouse/carDispatchByMine/carDispatchByMine.vue index a40f9c7..c074dcb 100644 --- a/ebike-maintenance/pages/warehouse/carDispatchByMine/carDispatchByMine.vue +++ b/ebike-maintenance/pages/warehouse/carDispatchByMine/carDispatchByMine.vue @@ -81,8 +81,13 @@ const navButtonGroup = reactive([ }, ]); -onLoad(() => { +onLoad((options) => { scanCodeStore.clearCode(); + + if (options.bikeCode) { + scanCodeStore.addCode(options.bikeCode); + setCarList(); + } }); onShow(() => { diff --git a/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue b/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue index 78c42e5..da88b81 100644 --- a/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue +++ b/ebike-maintenance/pages/warehouse/ebikehouse/vehicleoperation.vue @@ -4,7 +4,7 @@ v-model="listdata" @query="loadMoreData" :default-page-no="1" - :default-page-size="5" + :default-page-size="10" :auto-show-back-to-top="true" :paging-style="{ 'background-color': ' #f3f4f6', @@ -345,7 +345,7 @@ const submit = (ref) => { const handleLeaveWarehouse = () => { isSubmit.value = true; // 设置提交状态为加载中 const params = { - bikeCode: customFormData.value.deviceValues, // 车辆编号 + bikeCode: stringToArray(customFormData.value.deviceValues, ""), // 车辆编号 status: statusZT.value, reginId: "", }; diff --git a/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue b/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue index 696ccd9..bdb98c4 100644 --- a/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue +++ b/ebike-maintenance/pages/warehouse/vehicledispatch/vehicledispatch.vue @@ -162,9 +162,11 @@ const delChangeImg = (res) => { }; const selectImg = (data) => { const file = data.tempFiles[0]; + console.log(file, "selectImg data"); api .fileUpload(file) .then((res) => { + console.log(res, "fileUpload"); if (res.code == 200) { fileLists.value.push(res.data); } else { @@ -291,6 +293,8 @@ const navButtonClick = (res) => { }); return; } + console.log("fileLists.value:", fileLists.value); + if (!fileLists.value.length) { uni.showToast({ title: "请上传投放的照片", diff --git a/ebike-maintenance/utils/config.js b/ebike-maintenance/utils/config.js index 51ac9a3..7d6653e 100644 --- a/ebike-maintenance/utils/config.js +++ b/ebike-maintenance/utils/config.js @@ -9,3 +9,4 @@ const config = { filePath: "https://www.cdzhuojing.cn/file" } export default config; + \ No newline at end of file