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

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

@@ -84,13 +84,13 @@
             <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 class="timeline-item-name ellipsis">
+                  <div v-ellipse-tooltip.top style="width: 20%;">
                     <span>{{ j.startTimeStr }}</span>
                     <span v-if="j.endTimeStr"> - {{ j.endTimeStr }}</span>
                     <span v-if="j.year"> ({{ j.year }})</span>
                   </div>
-                  <div class="timeline-item-name ellipsis">{{ j.enterpriseName }}</div>
-                  <div class="timeline-item-name ellipsis">{{ j.positionName }}</div>
+                  <div v-ellipse-tooltip.top class="timeline-item-name mx-3">{{ j.enterpriseName }}广州辞图科技有限公司广州辞图科技有限公司</div>
+                  <div v-ellipse-tooltip.top class="timeline-item-name">{{ j.positionName }}</div>
                 </div>
               </v-timeline-item>
             </v-timeline>
@@ -316,7 +316,6 @@ const getData = async () => {
       }
       return e
     })
-    console.log(items.value)
     total.value = res.total
   } finally {
     loading.value = false
@@ -470,11 +469,7 @@ const badgeIcon = computed(() => (item) => {
   color: var(--color-666);
   font-size: 13px;
   .timeline-item-name {
-    width: 33.3%;
-    margin-right: 12px;
-    &:nth-child(3n) {
-      margin-right: 0;
-    }
+    width: 40%;
   }
 }
 :deep(.v-timeline-item__body) {

src/views/recruit/personal/PersonalCenter/jobFeedback/components/interview/item.vue

@@ -40,10 +40,13 @@
             </div>
             <div class="ellipsis" style="max-width: 400px;">
               <span class="mx-2 enterprise-name" @click.stop="jumpToEnterpriseDetail(val.enterprise.id, true)">{{ formatName(val.enterprise.anotherName || val.enterprise.name) }}</span>
-            [
-              <span>{{ val.enterprise.industryName }}</span>
-              <span>&nbsp;·&nbsp;{{ val.enterprise.scaleName }}</span>
-            ]
+              <span v-if="val.enterprise.industryName || val.enterprise.scaleName">
+                [
+                  <span>{{ val.enterprise.industryName }}</span>
+                  <span v-if="val.enterprise.industryName && val.enterprise.scaleName">&nbsp;·&nbsp;</span>
+                  <span>{{ val.enterprise.scaleName }}</span>
+                ]
+              </span>
             </div>
           </div>
         </div>