合并分支 'zy-tmp' 到 'master'

src/views/decree/decreeOriginal/index.vue

@@ -2,25 +2,25 @@
 	<div class="layout-container">
 		<!-- 导航菜单 -->
 		<div class="layout-main">
-			<div class="layout-main-box">
+			<div class="header-main">
 				<div class="layout-main-header">
 					<div class="icon">
 						<img :src="summaryInfo.imageUrl" alt="" />
 					</div>
 					<div class="info">
-						<div class="info-box1 one-line-ellipsis">{{ summaryInfo.name }}</div>
+						<div class="info-box1 one-line-ellipsis">{{ summaryInfo.name || "--" }}</div>
 						<div class="info-box2">
-							<div class="info-box2-item">{{ summaryInfo.postDate }}</div>
+							<div class="info-box2-item">{{ summaryInfo.postDate || "--" }}</div>
 							|
-							<div class="info-box2-item">{{ summaryInfo.orgName }}</div>
+							<div class="info-box2-item">{{ summaryInfo.orgName || "--" }}</div>
 							|
-							<div class="info-box2-item one-line-ellipsis">{{ summaryInfo.ename }}</div>
+							<div class="info-box2-item one-line-ellipsis">{{ summaryInfo.ename || "--" }}</div>
 						</div>
 					</div>
 					<div class="layout-main-header-right-box">
 						<div class="right-box-top">
-							<div class="time">{{ summaryInfo.postDate }}</div>
-							<div class="name">{{ summaryInfo.orgName }}</div>
+							<div class="time">{{ summaryInfo.postDate || "--" }}</div>
+							<div class="name">{{ summaryInfo.orgName || "--" }}</div>
 						</div>
 					</div>
 				</div>
@@ -28,16 +28,20 @@
 			<div class="layout-main-center">
 					<div class="report-header">
 						<div class="report-title">政令原文</div>
-						<!-- <el-switch v-model="isHighlight" />
-						<div style="margin-left: 6px; margin-right: 10px;">高亮实体</div> -->
+						<el-switch v-model="isHighlight" />
+						<div style="margin-left: 6px; margin-right: 10px;">高亮实体</div>
 						<el-switch v-model="isTranslate" />
 						<div style="margin-left: 6px;">原文显示</div>
-						<!-- <div class="btn" @click="handleDownload">
-							<el-icon><Document /></el-icon>
+						<div class="btn" @click="handleDownload">
+							<div class="icon" style="margin-right: 4px;">
+								<img :src="download" alt="">
+							</div>
 							<div class="text">下载</div>
-						</div> -->
+						</div>
 						<div class="btn" @click="handleFindWord('open')">
-							<el-icon><Search /></el-icon>
+							<div class="icon" style="margin-right: 6px;">
+								<img :src="search" alt="">
+							</div>
 							<div class="text">查找</div>
 						</div>
 						<div class="find-word-box" v-if="findWordBox">
@@ -79,6 +83,8 @@ import { ElMessage } from "element-plus";
 import { debounce } from "lodash";
 import { getDecreeSummary } from "@/api/decree/introduction";
 import { getDecreeReport } from "@/api/decree/introduction";
+import download from "./assets/icons/download.png";
+import search from "./assets/icons/search.png";
 
 const route = useRoute();
 
@@ -178,7 +184,10 @@ const handleUpdateWord = debounce(() => {
 			}
 		});
 		if (findWordMax.value > 0) {
-			nextTick(() => { handleFindWord('next') })
+			nextTick(() => {
+				findWordNum.value = findWordNum.value==findWordMax.value ? 1 : findWordNum.value+1;
+				handleHighlight()
+			})
 		}
 	} else {
 		originData.forEach((item, index) => {
@@ -257,11 +266,10 @@ onMounted(() => {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		.layout-main-box {
-			padding: 16px 0;
+		.header-main {
+			padding: 17px 0;
 			width: 100%;
 			border-bottom: 1px solid rgba(234, 236, 238, 1);
-			border-top: 1px solid rgba(234, 236, 238, 1);
 			box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
 			background: rgba(255, 255, 255, 1);
 		}
@@ -412,7 +420,6 @@ onMounted(() => {
 					background: rgba(255, 255, 255, 1);
 					display: flex;
 					justify-content: center;
-					gap: 8px;
 					align-items: center;
 					cursor: pointer;
 					.text {
@@ -426,6 +433,15 @@ onMounted(() => {
 						letter-spacing: 0px;
 						text-align: left;
 					}
+					.icon {
+						width: 16px;
+						height: 16px;
+						font-size: 0px;
+						img {
+							width: 100%;
+							height: 100%;
+						}
+					}
 				}
 			}