Merge remote-tracking branch 'origin/master'

罗广辉

2026-02-04 b14677f9db4f5e0c96386127e602c32f9353049c

Merge remote-tracking branch 'origin/master'

 applications/drone-command/src/views/system/menu.vue

@@ -210,6 +210,10 @@
                                label: '任务工单',
                                value: 6,
                            },
              {
                                label: '系统',
                                value: 7,
                            },
            ],
            hide: true,
            rules: [

 applications/mobile-web-view/src/appPages/work/workDetail/index.vue

@@ -57,9 +57,10 @@
<script setup>
import { showToast, showNotify, showImagePreview } from 'vant'
import { getShowImg, getSmallImg } from '@/utils/util'
import { useRoute } from 'vue-router'
import { useRoute,useRouter } from 'vue-router'

const route = useRoute()
const router = useRouter()

const workDetailData = ref({})

@@ -83,9 +84,12 @@
}
// 跳转地图
const jumpMap = item => {
console.log('item',item);
    const transmitData = { data: { type: 'jumpMapNav', eventNum: item } }
    uni.postMessage(transmitData)
router.push({
        path: '/webViewWrapper/mapWork',
        query: {
            currentItem: JSON.stringify(item)  
        }
    })
}

onMounted(async () => {

 applications/mobile-web-view/src/appPages/work/workDetail/mapWork/index.vue

@@ -20,7 +20,8 @@
const route = useRoute()
const mapCurrentDetail = ref({})
onMounted(async () => {
mapCurrentDetail.value = JSON.parse(decodeURIComponent(route.query.currentItem))
// mapCurrentDetail.value = JSON.parse(decodeURIComponent(route.query.currentItem))
mapCurrentDetail.value = JSON.parse(route.query.currentItem)

})
</script>

 uniapps/work-app/src/subPackages/workDetail/index.vue

@@ -162,7 +162,8 @@
})
// 跳转地图
const jumpMap = item => {
  const contactStr = encodeURIComponent(JSON.stringify(item))
  // const contactStr = encodeURIComponent(JSON.stringify(item))
    const contactStr = JSON.stringify(item)
  uni.navigateTo({
    url: `/subPackages/workDetail/mapWork/index?eventNum=${contactStr}`,
  })

 uniapps/work-wx/src/pages/login/index.vue

@@ -181,10 +181,10 @@
  width: 100%;

  .logo {
    width: 67px;
    height: 67px;
    width: 107px;
    height: 103px;
    margin: 0 auto;
    margin-top: 162px;
    margin-top: 119px;
    margin-bottom: 16px;
  }


 uniapps/work-wx/src/static/images/logo.png