Merge branch 'feature/v9.0/9.0.2' into prod

罗广辉

2025-12-20 21aca92a88e124a894c625c2161568a390e71e12

Merge branch 'feature/v9.0/9.0.2' into prod

 README.md

@@ -15,7 +15,10 @@
打开软件,发行,自定义发行，选择对应的环境

然后把代码拷贝到服务器上

测试
/software/service/drone/web/drone-app
正式
/app/service/drone/web/drone-app
# app更新步骤

修改 /src/config 里面的development的参数，改为对应环境的对应变量

 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({

 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;

 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 () {