Merge branch 'feature/v9.0/9.0.3' of http://139.196.74.78:10010/r/drone/dro...

shuishen

2025-12-20 e743063c1a2cb5e7cc51897ad999284c0fcb1353

Merge branch 'feature/v9.0/9.0.3' of http://139.196.74.78:10010/r/drone/drone-app into feature/v9.0/9.0.3

 src/pages/inspectionTask/index.vue

@@ -40,7 +40,7 @@
    // #ifndef MP-WEIXIN
    if ([1, 2].includes(data.rowItem.status)) {
      uni.navigateTo({
        url: `/subPackages/taskDetail/inProgress/index?wayLineJobInfoId=${data.rowItem.id}`,
        url: `/subPackages/taskDetail/inProgress/index?wayLineJobInfoId=${data.rowItem.id}&batchNo=${data.rowItem.batch_no}`,
      });
    } else {
      uni.navigateTo({

 src/subPackages/taskDetail/inProgress/index.vue

@@ -1,13 +1,3 @@
<!--
 * @Author       : yuan
 * @Date         : 2025-12-05 11:32:36
 * @LastEditors  : yuan
 * @LastEditTime : 2025-12-19 15:56:31
 * @FilePath     : \src\subPackages\inProgress\index.vue
 * @Description  : 
 * Copyright 2025 OBKoro1, All Rights Reserved. 
 * 2025-12-05 11:32:36
-->
<template>
  <WebViewPlus
    v-if="showComponent"
@@ -22,6 +12,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) {
@@ -35,16 +26,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}`,
    });
  }
  // #endif
}

onLoad((options) => {
  wayLineJobInfoId.value = options.wayLineJobInfoId;
onLoad((queryParams) => {
  wayLineJobInfoId.value = queryParams.wayLineJobInfoId;
  batchNo.value = queryParams.batchNo
  viewUrl.value = getWebViewUrl("/TaskInProgress", {
    wayLineJobInfoId: wayLineJobInfoId.value,
    batchNo: batchNo.value,
  });
});