Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-31 a8b8b40b8b849def3a02cd3d655bdfd449d1c44f

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

@@ -9,29 +9,33 @@
      width="80%"
   >
      <div class="detail-container" style="display: flex">
         <div class="detail-left" 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.createTime"
               >
                  <div class="item-content">
                     <div>{{ activity.operator }}</div>
                     <div class="flowName">{{ activity.flowName }}</div>
                  </div>
               </el-timeline-item>
            </el-timeline>
         <div class="processBox">
            <div class="detail-title">巡查需求记录</div>
            <div class="detail-left" 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.createTime"
                  >
                     <div class="item-content">
                        <div>{{ activity.operator }}</div>
                        <div class="flowName">{{ activity.flowName }}</div>
                     </div>
                  </el-timeline-item>
               </el-timeline>
            </div>

         </div>

         <div class="detail-right">
            <!-- 查看模式 -->
            <div class="view-container" v-if="dialogReadonly">
               <div class="detail-title">工单详情</div>
               <div class="detail-title">巡查任务详情</div>
               <el-row class="detail-row-view">
                  <el-col :span="12">
                     <div class="label">巡查任务名称</div>
@@ -39,7 +43,7 @@
                  </el-col>
                  <el-col :span="12">
                     <div class="label">巡查任务类型</div>
                     <div class="val">{{ getDictLabel(formData.patrolTaskType, dictObj.patrolTaskType) }}</div>
                     <div class="val">{{ getDictLabel(formData.patrolTaskType, dictObj.workOrderType) }}</div>
                  </el-col>
                  <el-col :span="12">
                     <div class="label">任务执行时间</div>
@@ -106,7 +110,7 @@
                           clearable
                        >
                           <el-option
                              v-for="item in dictObj.patrolTaskType"
                              v-for="item in dictObj.workOrderType"
                              :key="item.dictKey"
                              :label="item.dictValue"
                              :value="item.dictKey"
@@ -248,7 +252,7 @@
import { ElMessage } from 'element-plus'
import { fieldRules, flyVisual, getDictLabel } from '@ztzf/utils'
import { gdPatrolTaskRepublish, gdFlyerPageApi, gdPatrolTaskAuditApi } from './inspectionRequestApi'
import { gdWorkOrderFlowListApi, gdWorkOrderPageApi } from '../orderManage/orderManageApi'
import { gdWorkOrderFlowListApi, gdWorkOrderFlowPatrolListApi, gdWorkOrderPageApi } from '../orderManage/orderManageApi'
import { gdManageDeviceListApi } from '../orderManage/gdManageDeviceApi'
import { pxToRem } from '@/utils/rem'
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
@@ -400,9 +404,8 @@
const processList = ref([])
// 加载时间线list
function loadList() {
   gdWorkOrderFlowListApi({ workOrderId: formData.value.id, type: '1' }).then(res => {
   gdWorkOrderFlowPatrolListApi({ workOrderId: formData.value.id, type: '1' }).then(res => {
      processList.value = res.data.data
      console.log(processList.value, 'processList.value')
   })
}

@@ -432,6 +435,7 @@
   }
}
import { ArrowLineMaterialProperty } from '@/utils/cesium/Material'
import OrderStepBar from '@/views/orderView/orderManage/orderManage/OrderStepBar.vue'
let arrowLineMaterialProperty = new ArrowLineMaterialProperty({
   color: new Cesium.Color(128 / 255, 215 / 255, 255 / 255, 1),
   directionColor: new Cesium.Color(1, 1, 1, 1),
@@ -559,4 +563,14 @@
   color: #999;
   margin-top: 2px;
}

.processBox{
   display: flex;
   flex-direction: column;

   .detail-left{
      height: 100%;
      overflow: auto;
   }
}
</style>