Merge remote-tracking branch 'origin/master'

张含笑

2026-01-23 cabb1279e9370edfebdef62f6eba272eeae8fe67

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

@@ -10,7 +10,7 @@
   >
      <div class="content" style="display: flex">
         <div class="processBox" v-if="dialogMode !== 'add' && processList.length">
            <el-timeline>
            <el-timeline class="gd-timeline">
               <el-timeline-item
                  v-for="(activity, index) in processList"
                  :key="index"
@@ -149,7 +149,14 @@
                  </el-col>
                  <el-col :span="24">
                     <el-form-item label="工单备注" prop="remark">
                        <el-input class="gd-input" type="textarea" :rows="4" 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>
@@ -559,6 +566,7 @@
   // setMapDevice()
   await nextTick()
   syncSelection()
   getDeviceList()
}

// 初始化地图实例
@@ -603,21 +611,19 @@

   .processBox {
      width: 312px;
      .el-timeline {
         padding-left: 100px;
      }
      .item-content {
         position: relative;
         .flowName {
            width: 80px;
            position: absolute;
            left: -100px;
            top: 0;
            left: -120px;
            top: 0px;
         }
      }
   }
}

.tipSelect{
.tipSelect {
   text-align: center;
   height: 200px;
   line-height: 200px;