“update”

src/views/exportControl/index.vue

@@ -573,7 +573,6 @@
 									</div>
 								</div>
 								<div class="right-footer">
-<<<<<<< HEAD
 									<div class="total-count">共{{ totalAll }}项</div>
 									<el-pagination
 										v-model:current-page="currentPageAll"
@@ -583,11 +582,6 @@
 										background
 										@current-change="handlePageChangeAll"
 									/>
-=======
-									<div class="total-count">共{{ totalAll }}项调查</div>
-									<el-pagination v-model:current-page="currentPageAll" :page-size="pageSizeAll" :total="totalAll"
-										layout="prev, pager, next" background @current-change="handlePageChangeAll" />
->>>>>>> bea204f6b0c426712984ef0245e831fffbbfef4d
 								</div>
 							</div>
 						</div>

src/views/exportControl/v2.0EntityList/components/sanctionsOverview/components/introductionPage/index.vue

@@ -291,6 +291,18 @@ watch([selectedDomain, onlyChina], () => {
 const handlePageChangeAll = val => {
 	currentPageAll.value = val;
 	getSanctionUpdate();
+	const container = document.querySelector(".entity-list");
+	const target = document.querySelector(".left-bottom");
+	if (container && target) {
+		const containerRect = container.getBoundingClientRect();
+		const targetRect = target.getBoundingClientRect();
+		// 148是吸顶头部的高度，减去它以避免标题被遮挡
+		const top = targetRect.top - containerRect.top + container.scrollTop - 148;
+		container.scrollTo({
+			top: top,
+			behavior: "smooth"
+		});
+	}
 };
 
 // 获取实体清单发布机构

src/views/exportControl/v2.0SingleSanction/components/sanctionsOverview/index.vue

@@ -514,7 +514,6 @@ onMounted(() => {
   margin: 0 auto;
   padding-top: 16px;
   padding-bottom: 50px;
-<<<<<<< HEAD
 	.main {
 		width: 100%;
 		height: 100%;
@@ -531,28 +530,6 @@ onMounted(() => {
 				box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
 				background-color: #fff;
 				margin-bottom: 16px;
-=======
-
-  .main {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    justify-content: space-between;
-
-    .left {
-      width: 520px;
-      height: 1119px;
-
-      .left-top {
-        width: 100%;
-        height: 582px;
-        padding-bottom: 20px;
-        border-radius: 10px;
-        box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
-        background-color: #fff;
-        margin-bottom: 16px;
-
->>>>>>> bea204f6b0c426712984ef0245e831fffbbfef4d
         .left-top-title {
           padding: 22px 20px 22px 27px;
           width: 100%;
@@ -610,28 +587,8 @@ onMounted(() => {
 
               &.tags {
                 gap: 8px;
-<<<<<<< HEAD
                 flex-wrap: wrap;
                 overflow: visible;
-=======
-                overflow-x: auto; // Allow horizontal scrolling
-                white-space: nowrap; // Prevent wrapping
-                padding-bottom: 4px; // Add some space for scrollbar
-
-                /* Custom Scrollbar */
-                &::-webkit-scrollbar {
-                  height: 4px;
-                }
-
-                &::-webkit-scrollbar-thumb {
-                  background: #ccc;
-                  border-radius: 2px;
-                }
-
-                &::-webkit-scrollbar-track {
-                  background: transparent;
-                }
->>>>>>> bea204f6b0c426712984ef0245e831fffbbfef4d
 
                 .tag {
                   padding: 1px 8px;