Merge remote-tracking branch 'origin/master'

罗广辉

2026-02-04 17a1e95a0230c21fa2a4aac7f9b8cecd2d65f78d

Merge remote-tracking branch 'origin/master'

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

@@ -3,13 +3,11 @@
        <div class="detailTop">
            <div class="image-container">
                <van-swipe class="detailSwipe" :autoplay="3000" indicator-color="#4C85FF">
                    <van-swipe-item v-for="(img, index) in getImageList" :key="index">
                        <van-image class="detailImage" :src="img" fit="cover" width="100%" height="200px"
                            @click="openPreview(index)" preview-visible="false" />
                    </van-swipe-item>
                </van-swipe>

                <van-image-preview v-model:show="previewShow" :images="getImageList" :initial-index="previewIndex" />
                <van-swipe-item v-for="(img, index) in getImageList" :key="index">
                    <van-image class="detailImage" :src="img" fit="cover" width="100%" height="235px"
                        @click="openPreview(index)" preview-visible="false" />
                </van-swipe-item>
            </van-swipe>
            </div>
        </div>
    <!-- 工单内容 -->
@@ -66,8 +64,6 @@
const workDetailData = ref({})

// 预览图片
const previewShow = ref(false)
const previewIndex = ref(0)
const getImageList = computed(() => {
    const imageArr = []
    const detail = workDetailData.value
@@ -79,35 +75,30 @@
})
const openPreview = index => {
    const detail = workDetailData.value
    const showUrl = getShowImg(detail.eventImageUrl)	
    const showUrl = getShowImg(detail.eventImageUrl)
    showImagePreview({
        images: [showUrl],
        startPosition: 0,
    })
    previewIndex.value = index
    previewShow.value = true
}
// 跳转地图
const jumpMap = item => {
    const transmitData = { data: { type: 'jumpMapNav', eventNum: item.event_num } }
    wx.miniProgram.navigateTo({ url: `/subPackages/workDetail/mapWork/index?currentItem=${item.event_num}` })
    wx.miniProgram.postMessage(transmitData)
console.log('item',item);
    const transmitData = { data: { type: 'jumpMapNav', eventNum: item } }
    uni.postMessage(transmitData)
}

onMounted(async () => {
workDetailData.value = JSON.parse(route.query.workDetailData)
console.log('route.query',workDetailData.value);
})
</script>
<style lang="scss" scoped>
.workDetailContainer {
  padding-top: 44px;
    .detailTop {
        .image-container {
            position: relative;
            width: 100%;
            height: 205px;
            // height: 205px;

            .detailImage {
                width: 100%;

 applications/task-work-order/src/styles/common/cockpit.scss

@@ -522,7 +522,7 @@

        .label {
          display: inline-block;
          width: 88px;
          min-width: 88px;
          flex-shrink: 0;
          font-family: Source Han Sans CN, Source Han Sans CN;
          font-weight: 500;

 applications/task-work-order/src/views/orderView/flyingHand/FlyingHandDialog.vue

@@ -17,7 +17,7 @@
        <div class="val">{{ formData.flyerPhone }}</div>
      </el-col>
      <el-col :span="12">
        <div class="label">飞行时长</div>
        <div class="label">飞行时长(小时)</div>
        <div class="val">{{ formData.flightHours }}</div>
      </el-col>
      <el-col :span="12">