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

src/views/menduner/system/talentMap/details/components/search.vue

@@ -145,6 +145,6 @@ onMounted(async () => {
       queryParams.name = props.searchName
     }
     getList()
-  }, 100)
+  }, 1000)
 })
 </script>

src/views/menduner/system/talentMap/details/index.vue

@@ -6,7 +6,7 @@
           <el-tab-pane label="简历解析" v-loading="loading" name="resumeAnalysis">
             <div v-if="fileUrl">
               <div class="text-right m-b-10px">
-                <el-button @click="handleText">查看文本信息</el-button>
+                <el-button v-if="!isEdit" @click="handleText">查看文本信息</el-button>
                 <el-button type="primary" @click="handleResetUpload">重新上传简历</el-button>
               </div>
               <IFrame :src="fileUrl" />

src/views/menduner/system/talentMap/store/businessCard/index.vue

@@ -182,7 +182,7 @@
               <div class="m-title">职业轨迹</div>
             </el-row>
             <el-row :gutter="10" class="trajectoryBox" v-for="(item, index) of careerTrajectory" :key="'trajectory' + index">
-              <el-col :span="18">
+              <el-col :span="20">
                 <el-form-item label="酒店名称" prop="company_name" label-width="128px">
                   <el-input v-model="item.company_name" placeholder="请输入酒店名称" />
                 </el-form-item>
@@ -199,10 +199,17 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <div class="action">
-                  <el-button class="button" type="primary" @click="addCareer(index)">添加</el-button>
-                  <el-button v-if="careerTrajectory.length > 1" @click="removeCareer(index)" type="danger">删除</el-button>
+              <el-col :span="4">
+                <div class="flex justify-center items-center !h-100%" style="flex-direction: column;">
+                  <el-button @click="addCareer(index)" type="primary" class="cursor-pointer" :icon="Plus" circle />
+                  <el-button
+                    v-if="careerTrajectory.length > 1"
+                    class="mt-15px ml-0 cursor-pointer"
+                    @click="removeCareer(index)"
+                    type="danger"
+                    :icon="Delete"
+                    circle
+                  />
                 </div>
               </el-col>
             </el-row>
@@ -253,6 +260,7 @@
 <script setup>
 import { dateFormatter } from '@/utils/formatTime'
 import { talentLabelingApi } from '@/api/menduner/system/talentMap/labeling'
+import { Delete, Plus } from '@element-plus/icons-vue'
 
 /** 人才地图 列表 */
 defineOptions({ name: 'TalentMapCard' })
@@ -497,13 +505,6 @@ onMounted(() => {
       border-radius: 5px;
       background-color: #fff;
     }
-    .action {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      // flex-direction: column;
-      height: 131px;
-    }
   }
 }
 </style>

src/views/menduner/system/talentMap/store/components/merge.vue

@@ -1,5 +1,5 @@
 <template>
-	<Dialog title="人才对比" v-model="dialogVisible" class="!w-60%">
+	<Dialog title="人才对比" v-model="dialogVisible" class="!w-65%">
 		<div class="color-orange-400">
 			提示：查询到当前导入的人才姓名与数据库中的记录重复，请选择处理方式
 			<br />
@@ -7,7 +7,15 @@
 			<br />
 			2、作为新记录提交
 		</div>
-		<div class="mt-50px font-700 text-17px">姓名重复记录</div>
+
+		<el-descriptions class="mt-50px" title="当前导入人才信息" border column="4">
+			<el-descriptions-item label="姓名">张三</el-descriptions-item>
+			<el-descriptions-item label="联系电话">18100000000</el-descriptions-item>
+			<el-descriptions-item label="邮箱">zhangsan@example.com</el-descriptions-item>
+			<el-descriptions-item label="性别">男</el-descriptions-item>
+		</el-descriptions>
+
+		<div class="mt-50px el-descriptions__title">重复记录</div>
 		<el-table :data="list" :stripe="true" class="my-10px">
       <el-table-column label="头像" align="center" prop="avatar" width="70px" fixed="left">
         <template #default="scope">
@@ -27,7 +35,7 @@
       <el-table-column label="性别" align="center" prop="sexStr" />
       <el-table-column label="操作" align="center" fixed="right" min-width="110">
         <template #default="scope">
-          <el-button link type="success" @click="handleMerge(scope.row.id)">合并</el-button>
+          <el-button link type="success" @click="handleMerge(scope.row.id)">合并到此记录</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -72,7 +80,9 @@ const open = async (data) => {
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 // 人才合并
-const handleMerge = async (id) => {}
+const handleMerge = async (id) => {
+	console.log(id, 'merge')
+}
 
 // 新记录提交
 const submitForm = async () => {

src/views/menduner/system/talentMap/store/resume/index.vue

@@ -57,7 +57,13 @@
       <el-table-column label="姓名" align="center" prop="person.name" fixed="left" />
       <el-table-column label="联系电话" align="center" prop="person.phone" />
       <el-table-column label="邮箱" align="center" prop="person.email" />
-      <el-table-column label="性别" align="center" prop="person.sexStr" />
+      <el-table-column label="性别" align="center" prop="person.sexStr">
+        <template #default="scope">
+          <el-tag v-if="scope.row?.person?.sexStr" :type="scope.row?.person?.sexStr === '男' ? 'primary' : 'danger'">
+            {{ scope.row?.person?.sexStr }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="出生日期" align="center" prop="person.birthday" :formatter="dateFormatter2" />
       <el-table-column label="学历" align="center" prop="person.eduTypeStr" />
       <el-table-column label="工作经验" align="center" prop="person.expTypeStr" />