Merge remote-tracking branch 'origin/master'

罗广辉

2025-10-15 cdb63229f73a9fd012440dd880f7f048b7205ee5

Merge remote-tracking branch 'origin/master'

 src/pages/work/index.vue

@@ -29,13 +29,15 @@
</template>

<script setup>
    import {getWebViewUrl} from "@/utils/index.js";
import { useUserStore } from '@/store/index.js'
import {getList,getstatusCount} from '/src/api/work/index.js'
    import dayjs from 'dayjs';
    const userStore = useUserStore()
    const userInfo = userStore.userInfo
const sWebViewRef = ref(null);
const viewUrl = `http://192.168.1.157:5173/drone-app-web-view/#/webViewWrapper/work?params=${JSON.stringify(userStore?.userInfo)}`;
const viewUrl = getWebViewUrl('/work', {})
// const viewUrl = `http://192.168.1.157:5173/drone-app-web-view/#/webViewWrapper/work?params=${JSON.stringify(userStore?.userInfo)}`;
    const dataList = ref([])
    const keyword = ref('')
    const currentTab=ref('myTickets')

 src/subPackages/workDetail/index.vue

@@ -1,7 +1,7 @@
<!-- 工单详情 - 包含待审核、待处理、处理中、已完成 -->
<template>
    <div class="workDetailContainer">
         <web-view ref="sWebViewRef" :src="`${viewUrl}`" />
         <WebViewPlus ref="sWebViewRef" :src="`${viewUrl}`" @webMessage="onPostMessage"/>
    </div>
</template>

@@ -17,6 +17,15 @@
        
        viewUrl.value =`http://192.168.1.157:5173/drone-app-web-view/#/webViewWrapper/workDetail?params=${JSON.stringify(userStore?.userInfo)}&eventNum=${eventNum}`
    });
	
    function onPostMessage(data) {
      if (data.type === 'workback'){
		
        uni.switchTab({
          url: '/pages/work/index'
        });
      }
    }
</script>

<style lang="scss" scoped>