Merge remote-tracking branch 'origin/master'

罗广辉

2026-02-04 0c92fd00fae033a2aa04bb65b2d32bd2c8f9fd4a

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

@@ -9,7 +9,7 @@
      :close-on-click-modal="false"
   >
      <div class="content" style="display: flex">
         <div class="processBox" v-if="dialogMode !== 'add' && processList.length">
         <div class="processBox" v-if="dialogMode !== 'add'">
            <div class="detail-title">工单记录</div>
            <div class="process">
               <OrderStepBar :processList="processList" />
@@ -108,7 +108,6 @@
                     <el-form-item label="执行时间" prop="executeStartTime">
                        <el-date-picker
                           class="gd-date-picker"
                           popper-class="gd-date-picker-popper"
                           v-model="dateRange"
                           type="daterange"
                           range-separator="至"
@@ -142,7 +141,7 @@
                        <el-input
                           class="gd-input"
                           type="textarea"
                           :rows="4"
                           :rows="3"
                           v-model="formData.remark"
                           placeholder="请输入"
                           clearable
@@ -555,7 +554,8 @@
//  渲染
function renderingAllDevice(list) {
   list.forEach(item => {
      const position = Cesium.Cartesian3.fromDegrees(item.longitude || 115.0, item.latitude || 27.11)
      if (!item.longitude || !item.latitude) return
      const position = Cesium.Cartesian3.fromDegrees(item.longitude, item.latitude)
      viewer.entities.add({
         position: position,
         billboard: {
@@ -563,6 +563,7 @@
            width: 30,
            height: 30,
            verticalOrigin: Cesium.VerticalOrigin.CENTER,
            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
         },
         label: {
            text: item.nickname,
@@ -571,6 +572,7 @@
            outlineWidth: 2,
            outlineColor: Cesium.Color.WHITE,
            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
            pixelOffset: new Cesium.Cartesian2(0, -20),
         },
@@ -664,6 +666,8 @@
      flex-direction: column;

      .gd-cesium {
         position: relative;
         overflow: hidden;
         width: 100%;
         min-height: 360px;
         flex: 1;