update

src/views/technologyFigures/component/SourceLibrary.vue

 <!-- SourceLibrary.vue -->
 <template>
-<<<<<<< HEAD
 	<div class="source-library-container">
 		<div class="source-library-grid">
 			<div v-for="(item, index) in sourceLibraryData" :key="index" class="source-library-card">
@@ -37,42 +36,6 @@
 			/>
 		</div>
 	</div>
-=======
-  <div class="source-library-container">
-    <div class="source-library-grid">
-      <div v-for="(item, index) in sourceLibraryData" :key="index" class="source-library-card">
-        <div class="source-library-avatar-wrapper">
-          <img :src="item.avatar" alt="" class="source-library-avatar" />
-          <div class="person-tags">
-            <div class="person-tag-bg" v-for="(tag, tIdx) in item.icon" :key="tIdx">
-              <img :src="'/public/icon/header-icon' + tag + '.png'" class="tag-icon" alt="tag" />
-            </div>
-          </div>
-
-        </div>
-        <div class="source-library-text-content">
-          <div style="  width: 240px;">
-            <h3 class="source-library-name">{{ item.name }}</h3>
-            <p class="source-library-title">{{ item.title }}</p>
-            <p class="source-library-tag" :style="{
-              background: item.colorArray[2],
-              color: item.colorArray[0],
-              borderColor: item.colorArray[1],
-            }">{{ item.tag }}</p>
-          </div>
-
-
-        </div>
-      </div>
-    </div>
-    <div class="page">
-      <div class="count">共1205项调查</div>
-      <el-pagination v-model:current-page="currentPage" :page-size="pageSize" :total="total" layout="prev, pager, next"
-        background @current-change="handlePageChange" />
-    </div>
-  </div>
-
->>>>>>> af566f60d3ab2563ec38173a60323b1404cd7081
 </template>
 
 <script setup>
@@ -204,7 +167,6 @@ const handlePageChange = p => {
 }
 
 .page {
-<<<<<<< HEAD
 	/* width: 1221px; */
 	width: 1600px;
 	height: 40px;
@@ -222,27 +184,6 @@ const handlePageChange = p => {
 		letter-spacing: 0px;
 		text-align: left;
 	}
-=======
-  width: 1600px;
-  height: 40px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin: 36px 0 0 0;
-  padding-left: 11px;
-
-  .count {
-    color: rgba(59, 65, 75, 1);
-
-    font-family: Microsoft YaHei;
-    font-size: 16px;
-    font-weight: 400;
-    line-height: 24px;
-    letter-spacing: 0px;
-    text-align: left;
-  }
-
->>>>>>> af566f60d3ab2563ec38173a60323b1404cd7081
 }
 
 :deep(.el-pagination) {