Merge remote-tracking branch 'origin/master'

张含笑

2026-01-31 c7781a42356330032669743e98d471bc72baacc3

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

@@ -10,8 +10,10 @@
   >
      <div class="content" style="display: flex">
         <div class="processBox" v-if="dialogMode !== 'add' && processList.length">
<!--            <div class="detail-title">工单记录</div>-->
            <OrderStepBar :processList="processList" />
            <div class="detail-title">工单记录</div>
            <div class="process" >
               <OrderStepBar :processList="processList"/>
            </div>
         </div>
         <div class="leftBox">
            <div v-if="dialogReadonly">
@@ -657,7 +659,7 @@

      .gd-cesium {
         width: 100%;
         min-height: 380px;
         min-height: 360px;
         flex: 1;
      }
   }
@@ -674,12 +676,18 @@
   }

   .processBox {
      padding: 12px 16px 24px 16px;
      width: 312px;
      border: 1px solid #e4e4e4;
      border-radius: 8px;
      overflow: auto;
      background: #fff;
      display: flex;
      flex-direction: column;

      .process{
         height: 100%;
         padding: 12px 16px 24px 16px;
         width: 312px;
         border: 1px solid #e4e4e4;
         border-radius: 8px;
         background: #fff;
         overflow: auto;
      }
   }
}