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

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

@@ -1,5 +1,5 @@
 <template>
-  <div style="height: 65vh; overflow-y: auto;" >
+  <div class="!h-65vh overflow-y-auto">
     <slot name="header"></slot>
     <el-descriptions title="基础信息" :column="2" border>
       <el-descriptions-item min-width="120" label="姓名（中）">{{ data?.title || '--' }}</el-descriptions-item>
@@ -9,22 +9,22 @@
       <el-descriptions-item min-width="120" label="生日">--</el-descriptions-item>
       <el-descriptions-item min-width="120" label="居住地">--</el-descriptions-item>
     </el-descriptions>
-    <el-descriptions title="联系方式" class="module" :column="2" border>
+    <el-descriptions title="联系方式" class="mt-20px" :column="2" border>
       <el-descriptions-item min-width="120" label="手机号码">--</el-descriptions-item>
       <el-descriptions-item min-width="120" label="固定电话">--</el-descriptions-item>
       <el-descriptions-item min-width="120" label="电子邮箱">--</el-descriptions-item>
     </el-descriptions>
-    <el-descriptions title="酒店/公司信息" class="module" border>
+    <el-descriptions title="酒店/公司信息" class="mt-20px" :column="2" border>
       <el-descriptions-item min-width="120" label="酒店/公司名称(中)">--</el-descriptions-item>
       <el-descriptions-item min-width="120" label="酒店/公司名称(英)">--</el-descriptions-item>
-      <el-descriptions-item min-width="120" label="品牌名称（中）">--</el-descriptions-item>
-      <el-descriptions-item min-width="120" label="品牌名称（英）">--</el-descriptions-item>
       <el-descriptions-item min-width="120" label="隶属关系（中）">--</el-descriptions-item>
       <el-descriptions-item min-width="120" label="隶属关系（英）">--</el-descriptions-item>
+      <el-descriptions-item min-width="120" label="品牌名称（中）">--</el-descriptions-item>
+      <el-descriptions-item min-width="120" label="品牌名称（英）">--</el-descriptions-item>
       <el-descriptions-item min-width="120" label="品牌组合">--</el-descriptions-item>
     </el-descriptions>
-    <el-descriptions title="职业轨迹" class="module" border />
-    <el-timeline style="padding-left: 12px;">
+    <el-descriptions title="职业轨迹" class="mt-20px" border />
+    <el-timeline class="ml-12px">
       <el-timeline-item color="#0bbd87" center>
         <el-descriptions title="" border>
           <el-descriptions-item min-width="120" label="酒店名称">--</el-descriptions-item>
@@ -33,13 +33,13 @@
         </el-descriptions>
       </el-timeline-item>
     </el-timeline>
-    <el-descriptions title="地址信息" class="module" :column="2" border>
+    <el-descriptions title="地址信息" class="mt-20px" :column="2" border>
       <el-descriptions-item min-width="120" label="中文地址">--</el-descriptions-item>
       <el-descriptions-item min-width="120" label="英文地址">--</el-descriptions-item>
       <el-descriptions-item min-width="120" label="邮政编码（中）">--</el-descriptions-item>
       <el-descriptions-item min-width="120" label="邮政编码（英）">--</el-descriptions-item>
     </el-descriptions>
-    <el-descriptions title="人才标签" class="module" :column="2" border />
+    <el-descriptions title="人才标签" class="mt-20px" :column="2" border />
     <el-tag v-for="k in talentTags" :key="k.talent" type="success" class="mr-10px my-10px">{{ k.tag }}</el-tag>
     <slot name="thumbnail"></slot>
   </div>
@@ -56,10 +56,4 @@ const props = defineProps({
 
 const talentTags = ref(props.data?.talentTags || [])
 
-</script>
-
-<style scoped>
-.module {
-	margin-top: 20px;
-}
-</style>
+</script>

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

@@ -1,5 +1,5 @@
 <template>
-	<Dialog title="人才对比" v-model="dialogVisible" class="!w-full !h-full">
+	<Dialog title="人才对比" v-model="dialogVisible" class="!wh-full">
 		<!-- <div class="color-orange-400">
 			提示：查询到当前导入的人才姓名与数据库中的记录重复，请选择处理方式
 			<br />
@@ -7,7 +7,7 @@
 			<br />
 			2、作为新记录提交
 		</div> -->
-		<el-row :gutter="10" class="mt-30px">
+		<el-row :gutter="10">
 			<el-col :span="12">
 				<el-card>
 					<template #header>
@@ -17,21 +17,21 @@
 				</el-card>
 			</el-col>
 			<el-col :span="12">
-				<el-card style="position: relative;">
+				<el-card class="position-relative">
 					<template #header>
 						<CardTitle title="重复记录" />
 					</template>
 					<infoForm :data="activeThumbnail">
 						<template #header>
-							<el-button type="primary" size="small" style="margin-bottom: 10px;">点击合并到此记录</el-button>
+							<el-button type="primary" size="small" class="mb-10px">点击合并到此记录</el-button>
 						</template>
 						<template #thumbnail>
-							<div style="height: 140px;"></div>
+							<div class="!h-140px"></div>
 						</template>
 						<!-- 缩略图 -->
 					</infoForm>
 					<div class="thumbnail">
-						<el-carousel :autoplay="false" :indicator-position="thumbnails?.length > 1 ? '' : 'none'" height="120px" :arrow="thumbnails?.length > 1 ? 'always' : 'none'" style="padding: 10px 80px;">
+						<el-carousel :autoplay="false" height="120px" class="px-80px py-10px" :arrow="infoList?.length > 1 ? 'always' : 'none'">
 							<el-carousel-item v-for="(val, index) in thumbnails" :key="index+'carousel'">
 								<div class="carouselContent">
 									<div
@@ -206,22 +206,6 @@ const submitForm = async () => {
 </script>
 
 <style scoped>
-/* .el-carousel__item h3 {
-  margin: 0;
-  text-align: center;
-} */
-
-/* .el-carousel__item:nth-child(2n) {
-  background-color: #99a9bf;
-}
-
-.el-carousel__item:nth-child(2n + 1) {
-  background-color: #d3dce6;
-} */
-
-.module {
-	margin-top: 20px;
-}
 .thumbnail {
 	position: absolute;
 	bottom: 0;