Merge branch 'main' of https://gitlab.365jft.com/wml/jft-vue-platform

src/views/archives/personnel/details.vue

 <template>
   <div class="app-container" style="padding: 20px 50px">
+    <el-card style="margin-bottom: 20px">
       <div class="basic-info">
         基本信息
       </div>
@@ -50,7 +51,8 @@
           </el-row>
         </el-form>
       </div>
-
+    </el-card>
+    <el-card>
       <div class="basic-info">
         履历
       </div>
@@ -62,53 +64,51 @@
               :timestamp="getTimestamp(item,index)"
               placement="top"
           >
-          <el-card>
             <el-form :model="form" label-width="120px">
               <el-row :gutter="80" type="flex">
-                <el-col :span="8">
+                <el-col :span="6">
                   <el-form-item label="所在单位">
                     {{ item.manufacturer }}
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8">
+                <el-col :span="6">
                   <el-form-item label="所属派遣公司">
                     {{ item.dispatch }}
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8">
+                <el-col :span="12">
                   <el-form-item label="所属渠道">
                     {{ item.channel }}
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row :gutter="80" type="flex">
-                <el-col :span="8">
+                <el-col :span="6">
                   <el-form-item label="岗位">
                     {{ item.post }}
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8">
+                <el-col :span="6">
                   <el-form-item label="宿舍">
                     {{ item.dormitory }}
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8">
+                <el-col :span="12">
                   <el-form-item label="车间">
                     {{ item.workshop }}
                   </el-form-item>
                 </el-col>
               </el-row>
             </el-form>
-          </el-card>
-
           </el-timeline-item>
         </el-timeline>
 
       </div>
+    </el-card>
   </div>
 
 </template>
@@ -135,7 +135,7 @@ function getDetails(){
   loading.value = true;
   details({id:proxy.$route.query.id}).then(response => {
     form.value=response.data
-    records.value = response.data.record;
+    records.value = [...response.data.record,...response.data.record];
     loading.value = false;
   });
 }
@@ -159,6 +159,10 @@ function getTimestamp(item,idx){
 .submitForm{
   padding: 20px;
 }
-
+.timeline-container{
+  .el-form-item{
+    margin-bottom: 0;
+  }
+}
 
 </style>