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

src/version.js

@@ -1,2 +1,2 @@
 // 版本号
-export const vue_version = 'v24.12.12.1752'
+export const vue_version = 'v24.12.12.1847'

src/views/recruit/enterprise/talentPool/components/details/jobIntention.vue

@@ -7,12 +7,12 @@
     >
       <div class="d-flex">
         <div>{{ k.position }}</div>
-        <div class="line">|</div>
+        <div class="line" v-if="k.position">|</div>
         <div v-if="!k.payFrom && !k.payTo">面议</div>
         <div v-else>{{k.payFrom ? k.payFrom + '-' : ''}}{{k.payTo}}</div>
         <div class="line">|</div>
         <div class="grey-text text-box">{{ k.industry?.map(e => e.nameCn).join('、') }}</div>
-        <div class="line">|</div>
+        <div class="line" v-if="k.industry?.length">|</div>
         <div class="grey-text">{{ k.jobTypeName }}</div>
         <div class="line" v-if="k.jobTypeName && k.workArea">|</div>
         <div class="grey-text">{{ k.workArea }}</div>

src/views/recruit/personal/PersonalCenter/resume/analysis/components/avatar.vue

@@ -23,7 +23,7 @@
 defineOptions({ name: 'resumeAnalysis-avatar'})
 import { getUserAvatar } from '@/utils/avatar'
 // import { blobToJson } from '@/utils'
-import { ref } from 'vue'
+import { ref, watch } from 'vue'
 const props = defineProps({
   id: {
     type: String,
@@ -63,7 +63,15 @@ const handleUploadFile = async (e) => {
   }
 }
 
-const avatarResult = ref(props.data)
+const avatarResult = ref('')
+
+watch(
+  () => props.data,
+  (newVal) => {
+    avatarResult.value = newVal
+  },
+  { immediate: true },
+)
 
 // 图片裁剪
 const handleHideCopper = async (res) => {

src/views/recruit/personal/PersonalCenter/resume/analysis/index.vue

@@ -21,7 +21,7 @@
             <div v-show="tab === 2" style="width: 100%; height: 100%; overflow: auto;" class="pb-5 px-3">
               <template v-if="resumeTxt?.length">
                 <div style="color: #999;" class="mb-3 text-center">简历解析（可复制文本使用）</div>
-                <div v-for="(text, resumeTxtIndex) in resumeTxt" :key="'简历解析' + resumeTxtIndex">{{ text }}</div>
+                <p v-for="(text, resumeTxtIndex) in resumeTxt" :key="'简历解析' + resumeTxtIndex" class="my-3">{{ text }}</p>
               </template>
               <div v-else style="color: #666;" class="mt-3 text-center">无简历解析文本可用</div>
             </div>
@@ -75,6 +75,7 @@ import Confirm from '@/plugins/confirm'
 import { saveResumeInfo, resumeParser2 } from '@/api/recruit/personal/resume'
 import { useUserStore } from '@/store/user'
 import attachmentPage from '../attachment'
+import { Base64 } from 'js-base64'
 const { t } = useI18n()
 const props = defineProps({
   data: {
@@ -144,7 +145,7 @@ const handleAnalysis = async (url) => {
   const baseUrl = import.meta.env.VITE_PREVIEW_URL
   fileUrl.value = !url.includes('.pdf') ?  `${baseUrl}/onlinePreview?url=${encodeURIComponent(Base64.encode(url))}` : url
   try {
-    const data = await resumeParser2({ fileUrl: fileUrl.value })
+    const data = await resumeParser2({ fileUrl: url })
     result.value = data || {}
     // result.value = {person: data.person} || {} // 测试
     await transformToLIst(result.value)

src/views/recruit/personal/PersonalCenter/resume/online/components/jobIntention.vue

@@ -15,7 +15,7 @@
         >
           <div class="d-flex">
             <div>{{ k.position }}</div>
-            <div class="line">|</div>
+            <div class="line" v-if="k.position">|</div>
             <div v-if="!k.payFrom && !k.payTo">面议</div>
             <div v-else>{{k.payFrom ? k.payFrom + '-' : ''}}{{k.payTo}}</div>
             <div class="line">|</div>