Merge remote-tracking branch 'origin/master'

张含笑

2026-01-23 cabb1279e9370edfebdef62f6eba272eeae8fe67

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

@@ -4,7 +4,6 @@
      v-model="visible"
      :title="titleEnum[dialogMode]"
      @closed="visible = false"
      :style="{ width: pxToRem(1216) }"
      destroy-on-close
      :close-on-click-modal="false"
   >
@@ -12,6 +11,7 @@
         <div class="leftBox">
            <!-- 查看模式 -->
            <div class="detail-container" v-if="dialogReadonly">
               <div class="detail-title">工单详情</div>
               <el-row class="detail-row-view">
                  <el-col :span="12">
                     <div class="label">巡查任务名称</div>
@@ -47,15 +47,14 @@
                  </el-col>
               </el-row>
               <template v-if="['6', '7', '8'].includes(taskStatus)">
                  <div>任务成功({{ list.length || 0 }}条)</div>
                  <div style="display: flex">
                  <div class="detail-title" :style="{ marginTop: pxToRem(10) }">任务成功({{ list.length || 0 }}条)</div>
                  <div class="imgBox">
                     <div v-for="item in list">
                        <el-image
                           v-if="item.resultUrl"
                           :src="item.resultUrl"
                           :preview-src-list="[item.resultUrl]"
                           fit="cover"
                           style="width: 80px; height: 60px"
                           preview-teleported
                        />
                     </div>
@@ -149,7 +148,14 @@
                  </el-col>
                  <el-col :span="24">
                     <el-form-item label="巡查任务描述" prop="taskDesc">
                        <el-input class="gd-input" type="textarea" :rows="4" v-model="formData.taskDesc" placeholder="请输入" clearable />
                        <el-input
                           class="gd-input"
                           type="textarea"
                           :rows="4"
                           v-model="formData.taskDesc"
                           placeholder="请输入"
                           clearable
                        />
                     </el-form-item>
                  </el-col>
               </el-row>
@@ -158,13 +164,14 @@
            <!-- 地图组件 -->
            <CommonCesiumMap
               ref="mapRef"
               class="leftMap gd-cesium"
               class="gd-cesium"
               :active="visible"
               :flat-mode="false"
               :terrain="true"
               :layer-mode="4"
               :boundary="false"
               :zoomToBoundary="false"
               @ready="() => mapRef.flyBoundary()"
            />
         </div>
      </div>
@@ -414,12 +421,27 @@
   display: flex;
   gap: 0 20px;
   .leftBox {
      width: 0;
      flex: 1;
      width: 920px;
      .gd-cesium {
         padding-top: 10px;
         width: 100%;
         height: 423px;
      }
   }

   .imgBox {
      display: flex;
      flex-wrap: wrap;
      gap: 10px;
      > div {
         width: calc((100% - 40px) / 5); /* 5列布局，减去4个10px间隙 */
         height: 110px;
         flex-shrink: 0;
      }
      .el-image {
         width: 100%;
         height: 100%;
      }
   }
}
</style>