Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-app

shuishen

2025-10-16 310150e2731f87e818971f67137a02c39222f831

Merge branch 'master' of http://139.196.74.78:10010/r/drone/drone-app

 src/pages.json

@@ -165,6 +165,16 @@
        "text": "巡检任务"
      },
      {
        "iconPath": "static/images/tabbar/add-task.svg",
        "selectedIconPath": "static/images/tabbar/add-task.svg",
        "pagePath": "subPackages/taskDetail/addTask/index",
        "text": "",
        "style": {
          "width": "600",
          "height": "600"
        }
      },
      {
        "iconPath": "static/images/tabbar/icon_home.png",
        "selectedIconPath": "static/images/tabbar/icon_home_selected.png",
        "pagePath": "pages/work/index",

 src/pages/inspectionTask/DroneConsole/DroneConsole.vue

@@ -2,16 +2,21 @@
  <WebViewPlus :src="`${viewUrl}`" @webMessage="onPostMessage"/>
</template>
<script setup>
import {onHide, onShow} from "@dcloudio/uni-app";
import {onHide, onLoad, onShow} from "@dcloudio/uni-app";
import WebViewPlus from "@/components/WebViewPlus.vue";
import {getWebViewUrl} from "@/utils/index.js";

const viewUrl = getWebViewUrl('/DroneConsole', {wayLineJodInfoId: 6120})

const viewUrl = ref('')
const wayLineJodInfoId = ref(null)
function onPostMessage(event) {

}

onLoad((options) => {
  wayLineJodInfoId.value = options.wayLineJodInfoId
  viewUrl.value = getWebViewUrl('/DroneConsole', {wayLineJodInfoId: wayLineJodInfoId.value})
})


// onShow(() => {
//   // #ifdef APP-PLUS

 src/pages/inspectionTask/TaskDetails/TaskDetails.vue

@@ -3,25 +3,29 @@
</template>

<script setup>
import {useUserStore} from "@/store/index.js";
import WebViewPlus from "@/components/WebViewPlus.vue";
import {getWebViewUrl} from "@/utils/index.js";
import {onLoad} from "@dcloudio/uni-app";

const userStore = useUserStore()
const viewUrl = getWebViewUrl('/TaskInProgress', {wayLineJodInfoId: 6120})

const wayLineJodInfoId = ref(null)
const viewUrl = ref('')

function onPostMessage(data) {
  if (data.type === 'back'){
  if (data.type === 'back') {
    uni.switchTab({
      url: '/pages/inspectionTask/index'
    });
  }else if(data.type === 'control'){
  } else if (data.type === 'control') {
    uni.redirectTo({
      url: '/pages/inspectionTask/DroneConsole/DroneConsole'
      url: `/pages/inspectionTask/DroneConsole/DroneConsole?wayLineJodInfoId=${wayLineJodInfoId.value}`
    });
  }
}

onLoad((options) => {
  wayLineJodInfoId.value = options.wayLineJodInfoId
  viewUrl.value = getWebViewUrl('/TaskInProgress', {wayLineJodInfoId: wayLineJodInfoId.value})
})
</script>

<style scoped lang="scss">

 src/pages/inspectionTask/index.vue

@@ -13,7 +13,7 @@
  if (data.type === 'taskDetails'){
    if ([1,2].includes(data.rowItem.status)){
      uni.navigateTo({
        url: '/pages/inspectionTask/TaskDetails/TaskDetails'
        url: `/pages/inspectionTask/TaskDetails/TaskDetails?wayLineJodInfoId=${data.rowItem.id}`
      });
    }else{
      uni.navigateTo({

 src/pages/work/index.vue

@@ -1,36 +1,14 @@
<template>
    <view class="flex flex-col eventTickets">
         <web-view ref="sWebViewRef" :src="`${viewUrl}`" />
        <!-- <view class="searchTop">
            <up-search placeholder="请输入关键字搜索"  :animation="true"  v-model="listParams.keyword" :show-action="false"></up-search>
            <div>111</div>
        </view>
        <view>
            <up-tabs :list="tabList" @click="handleClick"></up-tabs>
            <view class="eventBox">
                <view class="eventItem"  v-for="(item,index) in dataList" :key="index">
                    <img :src="item.photo_url" alt="" @click="detailHandle(item)" />
                    <div class="itemTitle">{{item.event_name}}</div>
                    <div class="itemContent">
                        <div class="itemStatus">
                            <span v-if="item.status === 0" style="background-color: #ff7411;"></span>
                            <span v-else-if="item.status === 2" style="background-color: #ff472f;"></span>
                            <span v-else-if="item.status === 3" style="background-color: #ffc300;"></span>
                            <span v-else-if="item.status === 4" style="background-color: #06d957;"></span>
                            <p>{{formatDate(item.create_time) }}</p>
                        </div>
                        <div>全屏</div>
                    </div>
                </view>
            </view>
        </view> -->
         <WebViewPlus ref="sWebViewRef" :src="`${viewUrl}`" />
		
    </view>

</template>

<script setup>
    import {getWebViewUrl} from "@/utils/index.js";

import WebViewPlus from "@/components/WebViewPlus.vue";
const sWebViewRef = ref(null);
const viewUrl = getWebViewUrl('/work', {})


 src/subPackages/taskDetail/addTask/index.vue

@@ -1,18 +1,14 @@
<!--
 * @Author       : yuan
 * @Date         : 2025-09-29 13:50:59
 * @LastEditors  : yuan
 * @LastEditTime : 2025-09-29 13:59:49
 * @FilePath     : \src\subPackages\taskDetail\addTask\index.vue
 * @Description  :
 * Copyright 2025 OBKoro1, All Rights Reserved.
 * 2025-09-29 13:50:59
-->
<!-- 新建任务 -->
<template>
  <view> 基础 </view>
  <WebViewPlus :src="`${viewUrl}`"/>
</template>

<script setup></script>
<script setup>
import WebViewPlus from "@/components/WebViewPlus.vue";

import {getWebViewUrl} from "@/utils/index.js";

const viewUrl = ref(getWebViewUrl('/addTask'))
</script>

<style lang="scss" scoped></style>