Merge remote-tracking branch 'origin/master'

张含笑

2026-01-26 d2fe0f77d28865f5684ed440e244f92708c93992

Merge remote-tracking branch 'origin/master'

 applications/task-work-order/src/api/zkxt/index.js

@@ -18,3 +18,14 @@
        data:{"size":100,"current":1},
    })
}

// 获取飞手信息
export const deviceFlyerApi = (data) => {
    return request({
        url: `/deviceFlyer/deviceFlyer/queryList`,
        method: 'post',
        data: data,
    })
}



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

New file
@@ -0,0 +1,7 @@
<template>
    <basic-container>飞手</basic-container>
</template>

<script setup></script>

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

 applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue

@@ -8,6 +8,24 @@
        :close-on-click-modal="false"
    >
        <div class="content" style="display: flex">
            <div class="processBox" v-if="dialogMode !== 'add' && processList.length">
                <el-timeline class="gd-timeline">
                    <el-timeline-item
                        v-for="(activity, index) in processList"
                        :key="index"
                        :icon="Check"
                        :type="index === processList.length - 1 ? 'success' : 'info'"
                        :color="activity.color"
                        :hollow="activity.hollow"
                        :timestamp="activity.flowDesc.split(' ')[1]"
                    >
                        <div class="item-content">
                            <div>{{ activity.flowDesc.split(' ')[0] }}</div>
                            <div class="flowName">{{ activity.flowName }}</div>
                        </div>
                    </el-timeline-item>
                </el-timeline>
            </div>
            <div class="leftBox">
                <!-- 查看模式 -->
                <div class="detail-container" v-if="dialogReadonly">
@@ -218,13 +236,14 @@
import { ElMessage } from 'element-plus'
import { fieldRules, getDictLabel } from '@ztzf/utils'
import { gdPatrolTaskRepublish, gdFlyerPageApi, gdPatrolTaskAuditApi } from './inspectionRequestApi'
import { gdWorkOrderPageApi } from '../orderManage/orderManageApi'
import { gdWorkOrderFlowListApi, gdWorkOrderPageApi } from '../orderManage/orderManageApi'
import { gdManageDeviceListApi } from '../orderManage/gdManageDeviceApi'
import { pxToRem } from '@/utils/rem'
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import { gdTaskResultListApi } from '@/views/orderView/orderManage/clueEvents/achievementApi'
import RefuseOrderDialog from '@/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue'
import RefuseOrderDialog1 from '@/views/orderView/orderManage/inspectionRequest/RefuseOrderDialog1.vue'
import { Check } from '@element-plus/icons-vue'

// 初始化表单数据
const initForm = () => ({
@@ -366,6 +385,14 @@
    deviceList.value = res?.data?.data ?? []
}

const processList = ref([])
// 加载时间线list
function loadList() {
    gdWorkOrderFlowListApi({ workOrderId: formData.value.id,type: '1' }).then(res => {
        processList.value = res.data.data
    })
}

// 提交编辑
async function handleSubmit() {
    const isValid = await formRef.value?.validate().catch(() => false)
@@ -396,7 +423,9 @@
async function open({ mode = 'view', row } = {}) {
    dialogMode.value = mode
    formData.value = { ...initForm(), ...row }
    console.log(row)
    ;['6', '7', '8'].includes(row.taskStatus) && getList()
    loadList()
    initMap()
}

@@ -427,8 +456,20 @@
            width: 100%;
            height: 423px;
        }
    }

    }
    .processBox {
        width: 312px;
        .item-content {
            position: relative;
            .flowName {
                width: 80px;
                position: absolute;
                left: -120px;
                top: 0px;
            }
        }
    }
    .imgBox {
        display: flex;
        flex-wrap: wrap;

 applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue

@@ -439,7 +439,7 @@

// 加载时间线list
function loadList() {
    gdWorkOrderFlowListApi({ workOrderId: formData.value.id }).then(res => {
    gdWorkOrderFlowListApi({ workOrderId: formData.value.id,type: '0' }).then(res => {
        processList.value = res.data.data
    })
}

 applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue

@@ -82,7 +82,7 @@
        <div class="gd-table-container" v-loading="loading">
            <div class="gd-table-content gd-table-content-bg">
                <el-table class="gd-table" :data="list" @selection-change="handleSelectionChange">
                    <el-table-column type="selection" width="46" />
                    <el-table-column type="selection" width="46" v-if="requester"/>
                    <el-table-column type="index" width="64" label="序号" />
                    <el-table-column prop="workOrderName" show-overflow-tooltip label="工单名称" />
                    <el-table-column prop="workOrderCode" show-overflow-tooltip label="工单编号" />