Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/views/recruit/enterprise/search/retrieval/components/position.vue

@@ -1,8 +1,8 @@
 <template>
-  <div class="d-flex font-size-14">
-    <div v-for="val in items" :key="val.id" class="mr-5 cursor-pointer" :class="{'active': val.active}" @click="handleFirst(val)">{{ val.nameCn }}</div>
+  <div class="d-flex font-size-14 flex-wrap">
+    <div v-for="val in items" :key="val.id" class="mr-5 cursor-pointer mb-3" :class="{'active': val.active}" @click="handleFirst(val)">{{ val.nameCn }}</div>
   </div>
-  <div class="mt-5 font-size-14 mb-3">
+  <div class="mt-3 font-size-14 mb-3">
     <span 
       v-for="k in children" 
       :key="k.id" 

src/views/recruit/enterprise/search/retrieval/index.vue

@@ -78,14 +78,13 @@
           </div>
         </template>
         
-        
         <div class="px-5 pb-8">
-          <div class="experience" v-if="item.workList.length">
+          <div v-if="item.workList.length">
             <div class="second-title">工作经验</div>
             <v-timeline density="compact" align="start" side="end" truncate-line="both">
               <v-timeline-item v-for="(j, i) in item.workList" :key="i" dot-color="primary" size="small">
                 <div v-if="j.show" class="timeline-item mt-1">
-                  <div>
+                  <div class="timeline-item-name ellipsis">
                     <span>{{ j.startTimeStr }}</span>
                     <span v-if="j.endTimeStr"> - {{ j.endTimeStr }}</span>
                     <span v-if="j.year"> ({{ j.year }})</span>
@@ -281,17 +280,17 @@ getDict('positionData', {}, 'positionData').then(({ data }) => {
 const total = ref(0)
 const items = ref([])
 const loading = ref(false)
-const headers = ref([
-  { title: '姓名', key: 'name', sortable: false },
-  { title: '求职状态', key: 'jobStatusName', sortable: false },
-  { title: '工作年限', key: 'expName', sortable: false },
-  { title: '最高学历', key: 'eduName', sortable: false },
-  { title: '所在城市', key: 'areaName', sortable: false },
-  { title: '户籍地', key: 'regName', sortable: false },
-  { title: '婚姻状况', key: 'maritalStatusName', sortable: false },
-  { title: '首次工作时间', key: 'firstWorkTime', sortable: false, value: item => timesTampChange(item.firstWorkTime, 'Y-M-D') },
-  { title: '操作', key: 'actions', sortable: false }
-])
+// const headers = ref([
+//   { title: '姓名', key: 'name', sortable: false },
+//   { title: '求职状态', key: 'jobStatusName', sortable: false },
+//   { title: '工作年限', key: 'expName', sortable: false },
+//   { title: '最高学历', key: 'eduName', sortable: false },
+//   { title: '所在城市', key: 'areaName', sortable: false },
+//   { title: '户籍地', key: 'regName', sortable: false },
+//   { title: '婚姻状况', key: 'maritalStatusName', sortable: false },
+//   { title: '首次工作时间', key: 'firstWorkTime', sortable: false, value: item => timesTampChange(item.firstWorkTime, 'Y-M-D') },
+//   { title: '操作', key: 'actions', sortable: false }
+// ])
 
 const getData = async () => {
   loading.value = true
@@ -458,11 +457,6 @@ const badgeIcon = computed(() => (item) => {
   color: var(--v-primary-base);
 }
 
-.experience {
-  width: 54%;
-  height: 100%;
-}
-
 .second-title {
   color: var(--color-666);
   font-size: 15px;
@@ -476,7 +470,11 @@ const badgeIcon = computed(() => (item) => {
   color: var(--color-666);
   font-size: 13px;
   .timeline-item-name {
-    width: 26%;
+    width: 33.3%;
+    margin-right: 12px;
+    &:nth-child(3n) {
+      margin-right: 0;
+    }
   }
 }
 :deep(.v-timeline-item__body) {