Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

shuishen

2026-01-26 38e3bb79544ed4a18fb61b892d4832cafc83c211

 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">
@@ -27,7 +45,7 @@
                  </el-col>
                  <el-col :span="12">
                     <div class="label">巡查任务航线</div>
                     <div class="val">{{ getRouteName(formData.patrolRouteUrl) }}</div>
                     <div class="val">{{ getAirName(formData.patrolRouteUrl) }}</div>
                  </el-col>
                  <el-col :span="12">
                     <div class="label">推荐飞手</div>
@@ -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 = () => ({
@@ -258,11 +277,8 @@
const flyerList = ref([])
const deviceList = ref([])
const workOrderList = ref([])
const routeOptions = ref([
   { name: '航线1', id: '1' },
   { name: '航线2', id: '2' },
   { name: '航线3', id: '3' },
])
const routeOptions = inject('routeOptions')
const getAirName = inject('getAirName')

const gdStatusObj = {
   '0': { reason: '拒绝原因', operationType: '2' },
@@ -366,6 +382,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 +420,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 +453,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;