feat:调整加载

张含笑

2026-01-27 dd57e0e9a989e7ee8b3e3473a7ee6a1dff06a4ae

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

@@ -10,9 +10,22 @@
   >
      <div class="content" style="display: flex">
         <div class="processBox" v-if="dialogMode !== 'add' && processList.length">
            <el-steps direction="vertical" :active="processList.length">
               <el-step v-for="item in processList" :title="item.flowName" :description="item.flowDesc" />
            </el-steps>
            <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 class="leftBox">
            <div v-if="dialogReadonly">
@@ -43,7 +56,7 @@
                  </el-col>
               </el-row>
               <div class="detail-title" :style="{ marginTop: pxToRem(20) }">已选设备</div>
               <el-table class="setHeight" ref="deviceTableRef" :data="deviceList" row-key="id">
               <el-table class="setHeight gd-dialog-table" ref="deviceTableRef" :data="deviceList" row-key="id">
                  <el-table-column prop="nickname" label="设备名称" />
                  <el-table-column prop="deviceName" label="设备型号" />
                  <el-table-column prop="devicePayload" label="设备负载" />
@@ -63,13 +76,8 @@
                        </template>
                     </el-table-column>
                     <el-table-column prop="executeTime" show-overflow-tooltip label="任务执行时间" />
                     <el-table-column prop="feishou" show-overflow-tooltip label="选择飞手" />
                     <el-table-column prop="deviceId" show-overflow-tooltip label="选择设备" />
                     <el-table-column label="操作" class-name="operation-btns">
                        <template v-slot="{ row }">
                           <el-link type="primary" @click="">查看</el-link>
                        </template>
                     </el-table-column>
                     <el-table-column prop="recommendFlyerName" show-overflow-tooltip label="选择飞手" />
                     <el-table-column prop="deviceName" show-overflow-tooltip label="选择设备" />
                  </el-table>
               </template>
            </div>
@@ -141,7 +149,14 @@
                  </el-col>
                  <el-col :span="24">
                     <el-form-item label="工单备注" prop="remark">
                        <el-input class="gd-input" type="textarea" v-model="formData.remark" placeholder="请输入" clearable />
                        <el-input
                           class="gd-input"
                           type="textarea"
                           :rows="4"
                           v-model="formData.remark"
                           placeholder="请输入"
                           clearable
                        />
                     </el-form-item>
                  </el-col>
               </el-row>
@@ -149,7 +164,7 @@
            <div class="detail-title" :style="{ marginTop: pxToRem(20) }">工单执行范围</div>
            <CommonCesiumMap
               ref="mapRef"
               class="leftMap gd-cesium"
               class="gd-cesium"
               :active="visible"
               :flat-mode="false"
               :terrain="true"
@@ -174,40 +189,49 @@
                  <el-table-column prop="devicePayload" label="设备负载" />
               </el-table>
            </template>
            <div v-else>请先选择设备需求并绘制范围</div>
            <div v-else class="tipSelect">请先选择设备需求并在地图上绘制工单范围</div>
         </div>
      </div>

      <template #footer>
         <template v-if="requester">
            <template v-if="!suddenlyEdit">
               <el-button
                  v-if="['11', '21', '23', '24', '25', '31', '60'].includes(gdStatus)"
                  @click="viewDescription"
                  color="#F2F3F5"
               >
                  {{ gdStatusObj[gdStatus].reason }}
               </el-button>
               <el-button @click="addDescription" v-if="['20', '24', '25', '50'].includes(gdStatus)" color="#F2F3F5">
                  {{ gdStatus === '50' ? '结算' : '申请取消' }}
               </el-button>
               <el-button color="#4C34FF" @click="requestModification" v-if="['20', '25'].includes(gdStatus)">
                  申请修改
               </el-button>
            </template>
            <el-button
               v-if="['11'].includes(gdStatus) || suddenlyEdit || (!dialogReadonly && !formData.id)"
               :loading="submitting"
               :disabled="submitting"
               color="#4C34FF"
               @click="handleSubmit"
            >
               {{ gdStatus === '11' || !gdStatus ? '发布' : '提交修改' }}
            </el-button>
            <el-button v-if="['11', '21', '23', '24', '25', '31', '60'].includes(gdStatus)" @click="viewDescription">
               {{ gdStatusObj[gdStatus].reason }}
            </el-button>
            <el-button @click="addDescription" v-if="['20', '24', '25', '50'].includes(gdStatus)">
               {{ gdStatus === '50' ? '结算' : '申请取消' }}
            </el-button>
            <el-button @click="requestModification" v-if="['20', '25'].includes(gdStatus)">申请修改</el-button>
         </template>
         <template v-else>
            <el-button v-if="['21', '23'].includes(gdStatus)" @click="viewDescription">
            <el-button v-if="['21', '23'].includes(gdStatus)" @click="viewDescription" color="#F2F3F5">
               {{ gdStatusObj[gdStatus].reason }}
            </el-button>
            <el-button v-if="gdStatus === '10'" @click="addDescription">拒绝接单</el-button>
            <el-button v-if="gdStatus === '10'" @click="statusChange(1)">接单</el-button>
            <el-button v-if="gdStatus === '22'" @click="statusChange(7)">同意修改</el-button>
            <el-button v-if="gdStatus === '22'" @click="statusChange(8)">不同意修改</el-button>
            <el-button v-if="gdStatus === '21'" @click="statusChange(5)">同意取消</el-button>
            <el-button v-if="gdStatus === '21'" @click="addDescription">不同意取消</el-button>
            <el-button v-if="gdStatus === '30'" @click="addDescription">协商修改</el-button>
            <el-button v-if="gdStatus === '31'" @click="statusChange(10)">同意</el-button>
            <el-button v-if="gdStatus === '10'" @click="addDescription" color="#F2F3F5">拒绝接单</el-button>
            <el-button v-if="gdStatus === '10'" @click="statusChange(1)" color="#4C34FF">接单</el-button>
            <el-button v-if="gdStatus === '22'" @click="addDescription" color="#F2F3F5">不同意修改</el-button>
            <el-button v-if="gdStatus === '22'" @click="statusChange(7)" color="#4C34FF">同意修改</el-button>
            <el-button v-if="gdStatus === '21'" @click="addDescription" color="#F2F3F5">不同意取消</el-button>
            <el-button v-if="gdStatus === '21'" @click="statusChange(5)" color="#4C34FF">同意取消</el-button>
            <el-button v-if="gdStatus === '30'" @click="addDescription" color="#4C34FF">协商修改</el-button>
            <el-button v-if="gdStatus === '31'" @click="statusChange(10)" color="#4C34FF">同意</el-button>
         </template>
      </template>

@@ -239,7 +263,7 @@
import RefuseOrderDialog from '@/views/orderView/orderManage/orderManage/RefuseOrderDialog.vue'
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import { gdPatrolTaskPageApi } from '@/views/orderView/orderManage/inspectionRequest/inspectionRequestApi'

import { Check } from '@element-plus/icons-vue'
// 初始化表单数据
const initForm = () => ({
   workOrderName: '',
@@ -277,13 +301,15 @@
const processList = ref([])
let viewPlane
const hasPatrolTaskList = computed(() => ['30', '40', '50', '60'].includes(String(formData.value.workOrderStatus)))
import droneIcon from '@/assets/images/orderView/orderManage/drone.png'
import droneActiveIcon from '@/assets/images/orderView/orderManage/droneActive.png'

const gdStatusObj = {
   '10': { reason: '拒绝原因', operationType: '2' },
   '11': { reason: '拒绝原因' },
   '20': { reason: '取消原因', operationType: '3' },
   '21': { reason: '原因', operationType: '6' },
   '22': { reason: '驳回原因' },
   '22': { reason: '驳回原因', operationType: '8' },
   '23': { reason: '取消原因' },
   '24': { reason: '驳回原因', operationType: '3' },
   '25': { reason: '驳回原因', operationType: '3' },
@@ -317,9 +343,11 @@
   })
}

function requestModification() {
// 申请修改按钮
async function requestModification() {
   suddenlyEdit.value = true
   dialogMode.value = 'edit'
   await getDeviceList()
   nextTick(() => {
      syncSelection()
      viewPlane && viewer.entities.remove(viewPlane)
@@ -327,6 +355,7 @@
   })
}

// 填写说明弹框回调
function rejectSuccess() {
   visible.value = false
   emit('success')
@@ -363,9 +392,9 @@
      const str = [...pointList.value, pointList.value[0]].map(item => `${item.longitude} ${item.latitude}`).join(',')
      let geom = `POLYGON((${str}))`
      const res = await gdManageDeviceListApi({
         deviceIds: formData.value.recommendDeviceIds,
         devicePayload: dialogMode.value === 'add' ? formData.value.deviceLoadDemand : '',
         geom: dialogMode.value === 'add' ? geom : '',
         deviceIds: dialogMode.value === 'add' ? '' : formData.value.recommendDeviceIds,
         devicePayload: formData.value?.deviceLoadDemand,
         geom: geom,
      })
      deviceList.value = res?.data?.data ?? []
   } catch (error) {
@@ -374,10 +403,10 @@
}

// 设备需求变化
function loadDemandChange() {
async function loadDemandChange() {
   formData.value.recommendDeviceIds = ''
   selectedDevices.value = []
   getDeviceList()
   await getDeviceList()
   syncSelection()
}

@@ -413,18 +442,9 @@
   }
}

watch(
   () => dateRange.value,
   newVal => {
      const range = dateRangeFormat(dateRange.value)
      formData.value.executeStartTime = range[0]
      formData.value.executeEndTime = range[1]
   }
)

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

// 同步关联场景
// 回显选中设备
function syncSelection() {
   if (!deviceTableRef.value) return
   deviceTableRef.value.clearSelection()
@@ -512,25 +532,27 @@
   })
}

function setMapDevice() {
   gdManageDeviceListApi().then(res => {
      renderingDevice(res?.data?.data || [])
   })
}

import droneIcon from '@/assets/images/orderView/orderManage/drone.png'

function renderingDevice(list) {
   // 渲染红点
//  渲染
function renderingAllDevice(list) {
   list.forEach(item => {
      const position = Cesium.Cartesian3.fromDegrees(item.longitude || 115.0, item.latitude || 27.11)
      viewer.entities.add({
         position: position,
         billboard: {
            image: droneIcon,
            width: 40,
            height: 40,
            width: 30,
            height: 30,
            verticalOrigin: Cesium.VerticalOrigin.CENTER,
         },
         label: {
            text: item.nickname,
            font: '12px/1.5 Microsoft YaHei',
            style: Cesium.LabelStyle.FILL_AND_OUTLINE,
            outlineWidth: 2,
            outlineColor: Cesium.Color.WHITE,
            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
            pixelOffset: new Cesium.Cartesian2(0, -20),
         },
      })
   })
@@ -539,8 +561,10 @@
// 打开弹框
async function open({ mode = 'add', row } = {}) {
   dialogMode.value = mode
   formData.value = dialogMode.value === 'add' ? initForm() : row
   initMap()
   const allDeviceRes = await gdManageDeviceListApi()
   formData.value = dialogMode.value === 'add' ? initForm() : row
   renderingAllDevice(allDeviceRes?.data?.data || [])
   if (dialogMode.value === 'add') {
      addPolygon()
   } else {
@@ -548,10 +572,11 @@
      hasPatrolTaskList.value && gdPatrolTaskPage()
      dialogMode.value === 'edit' ? editPolygon() : viewPolygon()
   }
   await getDeviceList()
   // setMapDevice()

   await nextTick()
   await getDeviceList()
   syncSelection()
   highlightSelectedDevices()
}

// 初始化地图实例
@@ -561,6 +586,33 @@
   viewer = map?.viewer || null
}

// 高亮选中的设备
function highlightSelectedDevices() {
   const selectedIds = (formData.value.recommendDeviceIds || '').split(',').filter(Boolean)
   if (!viewer?.entities) return
   viewer.entities.values.forEach(entity => {
      const image = entity.billboard?.image?._value
      if ((image === droneIcon || image === droneActiveIcon) && entity.label) {
         const device = deviceList.value.find(d => d.nickname === entity.label.text._value)
         entity.billboard.image = device && selectedIds.includes(String(device.id))
            ? droneActiveIcon
            : droneIcon
      }
   })
}

watch(() => formData.value.recommendDeviceIds, highlightSelectedDevices)

watch(
   () => dateRange.value,
   newVal => {
      const range = dateRangeFormat(dateRange.value)
      formData.value.executeStartTime = range[0]
      formData.value.executeEndTime = range[1]
   }
)

// 地图加载完毕
function mapReady() {
   dialogMode.value === 'add' && mapRef.value.flyBoundary()
}
@@ -572,16 +624,19 @@
.content {
   display: flex;
   gap: 0 20px;
   height: 680px;

   .leftBox {
      width: 0;
      flex: 1;
      display: flex;
      overflow: auto;
      flex-direction: column;

      .gd-cesium {
         width: 100%;
         height: 423px;
         min-height: 380px;
         flex: 1;
      }
   }

@@ -595,12 +650,26 @@
   }

   .processBox {
      padding: 24px 0;
      width: 312px;
      border: 1px solid #e4e4e4;
      overflow: auto;

      .item-content {
         position: relative;
         .flowName {
            width: 80px;
            position: absolute;
            left: -120px;
            top: 0px;
         }
      }
   }
}

.setHeight {
   //max-height: 300px;
   //min-height: 200px;
.tipSelect {
   text-align: center;
   height: 200px;
   line-height: 200px;
}
</style>