From 21aca92a88e124a894c625c2161568a390e71e12 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 20 Dec 2025 11:32:47 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.2' into prod
---
src/pages/login/index.vue | 28 +++++++++++++++++++---------
src/subPackages/inProgress/index.vue | 13 +++++++++----
README.md | 5 ++++-
src/pages/inspectionTask/index.vue | 2 +-
4 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/README.md b/README.md
index 43db26e..5adcafd 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,10 @@
打开软件,发行,自定义发行，选择对应的环境
然后把代码拷贝到服务器上
-
+测试
+/software/service/drone/web/drone-app
+正式
+/app/service/drone/web/drone-app
# app更新步骤
修改 /src/config 里面的development的参数，改为对应环境的对应变量
diff --git a/src/pages/inspectionTask/index.vue b/src/pages/inspectionTask/index.vue
index b76d02f..23665c8 100644
--- a/src/pages/inspectionTask/index.vue
+++ b/src/pages/inspectionTask/index.vue
@@ -29,7 +29,7 @@
if (data.type === 'taskDetails'){
if ([1,2].includes(data.rowItem.status)){
uni.navigateTo({
- url: `/subPackages/inProgress/index?wayLineJobInfoId=${data.rowItem.id}`
+ url: `/subPackages/inProgress/index?wayLineJobInfoId=${data.rowItem.id}batchNo=${data.rowItem.batch_no}`
});
} else {
uni.navigateTo({
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index e8db5f3..6589ac9 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -73,16 +73,16 @@
icon: "none",
duration: 2000
});
- return;
+ return;
}
-
+
if (!loginForm.value.password.trim()) {
uni.showToast({
title: "请输入密码",
icon: "none",
duration: 2000
});
- return;
+ return;
}
let userInfo = {
tenantId: "000000",
@@ -200,12 +200,22 @@
margin-right: 12rpx;
}
- :deep(uni-input) {
- height: 40rpx;
- line-height: 40rpx;
- width: 80%;
- margin-top: 20rpx;
- }
+ :deep(uni-input) {
+ height: 40rpx;
+ line-height: 40rpx;
+ width: 80%;
+ margin-top: 20rpx;
+ padding: 0 !important;
+ }
+
+ :deep(input) {
+ height: 40rpx;
+ line-height: 40rpx;
+ width: 80%;
+ margin-top: 20rpx;
+ padding: 0 !important;
+ margin: 0 !important;
+ }
:deep(.uni-input-placeholder) {
font-size: 32rpx;
diff --git a/src/subPackages/inProgress/index.vue b/src/subPackages/inProgress/index.vue
index 9026fa0..c13c04b 100644
--- a/src/subPackages/inProgress/index.vue
+++ b/src/subPackages/inProgress/index.vue
@@ -8,6 +8,7 @@
import {onHide, onLoad, onShow} from "@dcloudio/uni-app";
const wayLineJobInfoId = ref(null)
+const batchNo = ref(null)
const viewUrl = ref('')
const showComponent = ref(false)
function onPostMessage(data) {
@@ -17,14 +18,18 @@
});
} else if (data.type === 'control') {
uni.navigateTo({
- url: `/subPackages/droneConsole/index?wayLineJobInfoId=${wayLineJobInfoId.value}&dockSn=${data.dockSn}`
+ url: `/subPackages/droneConsole/index?wayLineJobInfoId=${wayLineJobInfoId.value}&dockSn=${data.dockSn}&batchNo=${batchNo.value}`,
});
}
}
-onLoad((options) => {
- wayLineJobInfoId.value = options.wayLineJobInfoId
- viewUrl.value = getWebViewUrl('/TaskInProgress', {wayLineJobInfoId: wayLineJobInfoId.value})
+onLoad((queryParams) => {
+ wayLineJobInfoId.value = queryParams.wayLineJobInfoId
+ batchNo.value = queryParams.batchNo
+ viewUrl.value = getWebViewUrl('/TaskInProgress', {
+ wayLineJobInfoId: wayLineJobInfoId.value,
+ batchNo: batchNo.value
+ })
})
onShow(function () {
--
Gitblit v1.9.3