Merge branch 'master' into zz-dev

.gitignore

@@ -14,6 +14,7 @@ lerna-debug.log*
 
 # Dependencies
 node_modules
+*node_modules
 .pnpm
 .npm
 

src/App.vue

@@ -29,6 +29,25 @@ import { ElMessage } from "element-plus";
 const router = useRouter();
 const route = useRoute();
 
+import useTagsViewStore from '@/stores/tagsView.js'
+
+const tagsViewStore = useTagsViewStore()
+
+
+// 在路由全局守卫中处理
+router.beforeEach((to, from, next) => {
+  // 路由允许添加标签（排除掉隐藏的布局页如 /404, /login 等）
+  if (to.path.includes('dataLibrary')) {
+    tagsViewStore.addView({
+      path: to.path,
+      name: to.name, // 对应组件的 name，用于缓存
+      meta: { ...to.meta },
+      active: true
+    })
+  }
+  next()
+})
+
 
 const isShowAiBox = ref(false);
 

src/components/base/WarningPane/index.vue

 <template>
-  <div class="warnning-pane-wrapper" :style="{ width: width ? width : '1600px', height: height ? height : 'auto', minHeight: height ? undefined : '116px' }"
+  <div class="warnning-pane-wrapper" :style="{ width: width ? width : '1600px' }"
     :class="{
       level1: warnningLevel === '特别重大风险',
       level2: warnningLevel === '重大风险',
@@ -27,12 +27,22 @@
       </div>
     </div>
     <div class="warnning-pane-content text-regular">
-      {{ warnningContent }}
+      {{ showContent }}
+      <div class="show-all-btn" v-if="props.warnningContent.length > 185" @click.stop="handleClickShowAll">
+        <div class="text text-tip-2">
+          {{ isShowAllContent? '收起' : '展开' }}
+        </div>
+        <div class="icon">
+          <img v-if="!isShowAllContent" src="./icons/down.png" alt="">
+          <img v-else src="./icons/up.png" alt="">
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script setup>
+import {ref, computed} from 'vue'
 import { ElMessage } from 'element-plus'
 
 
@@ -50,6 +60,14 @@ const props = defineProps(
   }
 )
 
+const showContent = computed(() => {
+  if(!isShowAllContent.value) {
+    return props.warnningContent.length > 185 ? props.warnningContent.slice(0,185) + '...' : props.warnningContent
+  } else {
+    return props.warnningContent
+  }
+})
+
 const emit = defineEmits(['clickPane'])
 
 const handleClickPane = () => {
@@ -57,6 +75,12 @@ const handleClickPane = () => {
   emit('clickPane')
 }
 
+const isShowAllContent = ref(false)
+
+const handleClickShowAll = () => {
+  isShowAllContent.value = !isShowAllContent.value
+}
+
 </script>
 
 <style lang="scss" scoped>
@@ -64,7 +88,8 @@ const handleClickPane = () => {
   border-radius: 10px;
   border: 1px solid var(--color-primary-100);
   box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
-  cursor: pointer;
+  // cursor: pointer;
+  height: max-content;
 }
 
 .level1 {
@@ -146,12 +171,40 @@ const handleClickPane = () => {
 .warnning-pane-content{
   width: calc(100% - 40px);
   margin: 0 auto;
-  margin-bottom: 16px;
-  min-height: 60px;
-  height: auto;
-  display: block;
-  overflow: visible;
-  white-space: pre-wrap;
-  word-break: break-word;
+  // height: 60px;
+  // display: -webkit-box;
+  // /* 2. 设置内部布局方向为垂直 */
+  // -webkit-box-orient: vertical;
+  // /* 3. 限制显示的行数为 2 行 */
+  // -webkit-line-clamp: 2;
+  // /* 4. 隐藏超出部分 */
+  // overflow: hidden;
+  // /* 5. 设置文本溢出显示省略号 */
+  // text-overflow: ellipsis;
+  position: relative;
+  .show-all-btn {
+    position: absolute;
+    right: 0px;
+    bottom: 4px;
+    width: 48px;
+    height: 22px;
+    display: flex;
+    gap: 4px;
+    cursor: pointer;
+    .text{
+      color: var(--text-primary-50-color);
+      &:hover{
+        color: var(--color-primary-100);
+      }
+    }
+    .icon{
+      width: 16px;
+      height: 16px;
+      img{
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
 }
 </style>
\ No newline at end of file

src/components/base/texts/IntelligentEntityText.vue

 <template>
 	<p class="p-regular-rereg">
 		<span class="text-regular" v-for="(segment, index) in processedText" :key="index">
-            <a v-if="segment.isEntity" :href="`https://cn.bing.com/search?q=${segment.entity?.text_span}`"
-                class="entity-link" target="_blank" rel="noopener noreferrer">
+			<span v-if="segment.isEntity" @click="$emit('onEntityClick', segment.entity)" class="entity-link">
 				{{ segment.entity?.text_span }}
 				<img :src="SearchIcon" :width="10" :height="10" alt="search" />
-            </a>
+			</span>
 			<span v-else>
 				{{ segment.text }}
 			</span>
@@ -13,110 +12,112 @@
 	</p>
 </template>
 <script lang="ts" setup>
-import { TextEntity } from '@/api/intelligent';
-import { ref, watch, onMounted } from 'vue';
-import SearchIcon from './images/search.png'
+import { TextEntity } from "@/api/intelligent";
+import { ref, watch, onMounted } from "vue";
+import SearchIcon from "./images/search.png";
 
 export interface ProcessedTextSegment {
-    text: string
-    isEntity: boolean
-    entity?: TextEntity
+	text: string;
+	isEntity: boolean;
+	entity?: TextEntity;
 }
 const props = defineProps({
 	text: {
 		type: String,
-        default: ''
+		default: ""
 	},
 	entities: {
 		type: Array<TextEntity>,
 		default: () => []
 	}
-})
-
+});
+const emit = defineEmits(["onEntityClick"]);
 // 处理后的文本段
-const processedText = ref<ProcessedTextSegment[]>([])
+const processedText = ref<ProcessedTextSegment[]>([]);
+
 // 处理文本，识别并替换实体
 const processText = () => {
-    console.log('props.entities.length', props.entities.length)
+	console.log("props.entities.length", props.entities.length);
 	if (!props.text || !props.entities) {
 		// console.log('props.text', props.entities.length)
-        processedText.value = [{ text: '', isEntity: false }]
-        return
+		processedText.value = [{ text: "", isEntity: false }];
+		return;
 	}
 
-    const result = []
-    let currentPosition = 0
+	const result = [];
+	let currentPosition = 0;
 
 	// 按实体文本长度排序，优先匹配长文本
-    const sortedEntities = [...props.entities].sort((a, b) =>
-        b.text_span.length - a.text_span.length
-    )
+	const sortedEntities = [...props.entities].sort((a, b) => b.text_span.length - a.text_span.length);
 
 	while (currentPosition < props.text.length) {
-        let matched = false
+		let matched = false;
 
 		for (const entity of sortedEntities) {
-            const entityText = entity.text_span
-            const endPosition = currentPosition + entityText.length
+			const entityText = entity.text_span;
+			const endPosition = currentPosition + entityText.length;
 
 			if (props.text.substring(currentPosition, endPosition) === entityText) {
 				// 如果当前位置是实体，添加到结果
 				result.push({
 					isEntity: true,
 					entity: { ...entity }
-                })
-                currentPosition = endPosition
-                matched = true
-                break
+				});
+				currentPosition = endPosition;
+				matched = true;
+				break;
 			}
 		}
 
 		if (!matched) {
 			// 如果不是实体，收集普通文本
-            let nextEntityStart = props.text.length
+			let nextEntityStart = props.text.length;
 
 			for (const entity of sortedEntities) {
-                const pos = props.text.indexOf(entity.text_span, currentPosition)
+				const pos = props.text.indexOf(entity.text_span, currentPosition);
 				if (pos !== -1 && pos < nextEntityStart) {
-                    nextEntityStart = pos
+					nextEntityStart = pos;
 				}
 			}
 
 			if (nextEntityStart > currentPosition) {
-                const plainText = props.text.substring(currentPosition, nextEntityStart)
+				const plainText = props.text.substring(currentPosition, nextEntityStart);
 				result.push({
 					text: plainText,
 					isEntity: false
-                })
-                currentPosition = nextEntityStart
+				});
+				currentPosition = nextEntityStart;
 			} else {
 				// 没有更多实体，添加剩余文本
-                const remainingText = props.text.substring(currentPosition)
+				const remainingText = props.text.substring(currentPosition);
 				if (remainingText) {
 					result.push({
 						text: remainingText,
 						isEntity: false
-                    })
+					});
 				}
-                currentPosition = props.text.length
+				currentPosition = props.text.length;
 			}
 		}
 	}
 
-    processedText.value = result
-}
+	processedText.value = result;
+};
 // 监听文本和实体变化
-watch(() => props.text, processText)
-watch(() => props.entities, processText, { deep: true })
+watch(() => props.text, processText);
+watch(() => props.entities, processText, { deep: true });
 
 // 初始化处理
-onMounted(processText)
+onMounted(processText);
 </script>
 <style lang="scss" scoped>
-@use '@/styles/common.scss';
+@use "@/styles/common.scss";
 
 .entity-link {
 	color: var(--color-primary-100);
+	&:hover {
+		cursor: pointer;
+	}
 }
 
 .p-regular-rereg {

src/components/base/texts/TextTranslatePane.vue

 <template>
 	<div class="full-width">
-        <div class="flex-display" style="align-items: center;">
-            <common-text class="text-title-3-bold" color="var(--text-primary-80-color)">{{ isOpenTranslation
-                ? '中文' : '原文' }}</common-text>
-            <div class="flex-fill" style="margin: 0 10px;">
+		<div class="flex-display" style="align-items: center">
+			<common-text class="text-title-3-bold" color="var(--text-primary-80-color)">{{
+				isOpenTranslation ? "中文" : "原文"
+			}}</common-text>
+			<div class="flex-fill" style="margin: 0 10px">
 				<el-divider></el-divider>
 			</div>
-            <el-button v-if="showMoreVisible" @click="() => { showMore = !showMore; updateText() }">
-                {{ showMore ? '收起' : '展开' }}
+			<el-button
+				v-if="showMoreVisible"
+				@click="
+					() => {
+						showMore = !showMore;
+						updateText();
+					}
+				"
+			>
+				{{ showMore ? "收起" : "展开" }}
 				<el-icon>
 					<arrow-up v-if="showMore" />
 					<arrow-down v-else />
@@ -17,21 +26,24 @@
 		<el-row :gutter="32">
 			<el-col :span="textColSpan" v-for="(item, index) in allTexts" :key="index">
 				<!-- <p class="p-news-content"> {{ item }}</p> -->
-                <intelligent-entity-text :text="item"
-                    :entities="isHighlightEntity ? textEntities : []"></intelligent-entity-text>
+				<intelligent-entity-text
+					:text="item"
+					@on-entity-click="e => $emit('onEntityClick', e)"
+					:entities="isHighlightEntity ? textEntities : []"
+				></intelligent-entity-text>
 			</el-col>
 		</el-row>
 	</div>
 </template>
 <script lang="ts" setup>
-import '@/styles/container.scss';
-import '@/styles/common.scss';
+import "@/styles/container.scss";
+import "@/styles/common.scss";
 
-import { ref, watch, onMounted } from 'vue';
-import { TextEntity } from '@/api/intelligent';
-import IntelligentEntityText from '@/components/base/texts/IntelligentEntityText.vue';
-import { ElIcon, ElButton, ElDivider, ElRow, ElCol } from 'element-plus';
-import CommonText from './CommonText.vue';
+import { ref, watch, onMounted } from "vue";
+import { TextEntity } from "@/api/intelligent";
+import IntelligentEntityText from "@/components/base/texts/IntelligentEntityText.vue";
+import { ElIcon, ElButton, ElDivider, ElRow, ElCol } from "element-plus";
+import CommonText from "./CommonText.vue";
 
 const allTexts = ref([]);
 const textColSpan = ref(12);
@@ -64,30 +76,30 @@ const props = defineProps({
 		type: Array<TextEntity>,
 		default: () => []
 	}
-})
-
+});
+const emit = defineEmits(["onEntityClick"]);
 function updateText() {
-    const tempTexts = []
-    const tempRaws = props.textsRaw ?? []
-    const tempTranslates = props.textsTranslate ?? []
-    hasTranslation.value = tempTranslates.length > 0
+	const tempTexts = [];
+	const tempRaws = props.textsRaw ?? [];
+	const tempTranslates = props.textsTranslate ?? [];
+	hasTranslation.value = tempTranslates.length > 0;
 
 	if (hasTranslation.value && props.isOpenTranslation) {
 		// 遍历原始文本和翻译文本，将它们交替添加到 tempTexts 中,并保持原始文本和翻译文本的的数量一致
-        const maxCount = Math.max(tempRaws.length, tempTranslates.length)
+		const maxCount = Math.max(tempRaws.length, tempTranslates.length);
 		for (let i = 0; i < maxCount; i++) {
 			if (i < tempTranslates.length) {
 				tempTexts.push(tempTranslates[i]);
 			} else {
-                tempTexts.push('');
+				tempTexts.push("");
 			}
 			if (i < tempRaws.length) {
 				tempTexts.push(tempRaws[i]);
 			} else {
-                tempTexts.push('');
+				tempTexts.push("");
 			}
 		}
-        console.log(tempTexts.length)
+		console.log(tempTexts.length);
 		textColSpan.value = 12;
 		showMoreVisible.value = tempTexts.length > 6;
 		allTexts.value = showMore.value ? tempTexts : tempTexts.slice(0, 6);
@@ -98,12 +110,14 @@ function updateText() {
 	}
 }
 
-watch(() => [props.textsRaw, props.textsTranslate, props.isOpenTranslation], () => {
+watch(
+	() => [props.textsRaw, props.textsTranslate, props.isOpenTranslation],
+	() => {
 		updateText();
-})
-
+	}
+);
 
 onMounted(() => {
 	updateText();
-})
+});
 </script>

src/router/index.js

@@ -65,4 +65,5 @@ router.beforeEach((to, from, next) => {
   next();
 });
 
+
 export default router;

src/router/modules/comprehensiveSearch.js

 // 综合搜索
-const ComprehensiveSearch = () => import('@/views/comprehensiveSearch/index.vue')
-const SearchResults = () => import('@/views/comprehensiveSearch/searchResults/index.vue')
-const Chat = () => import('@/views/comprehensiveSearch/chat/index.vue')
+const ComprehensiveSearch = () => import("@/views/comprehensiveSearch/index.vue");
+const SearchResults = () => import("@/views/comprehensiveSearch/searchResults/index.vue");
+const Chat = () => import("@/views/comprehensiveSearch/chat/index.vue");
 
 const comprehensiveSearchRoutes = [
 	// 综合搜索
@@ -29,19 +29,19 @@ const comprehensiveSearchRoutes = [
 		meta: {
 			title: "智能问答"
 		}
-  },
-
-]
+	}
+];
 
 import { useGotoPage } from "../common.js";
 
 export function useGotoComprehensiveSearch() {
 	const gotoPage = useGotoPage();
-  return (isNewTabs = true) => gotoPage("/comprehensiveSearch/", {}, isNewTabs)
+	return (isNewTabs = true) => gotoPage("/comprehensiveSearch/", {}, isNewTabs);
 }
 export function useGotoSearchResults() {
 	const gotoPage = useGotoPage();
-  return (isNewTabs = true) => gotoPage("/searchResults/", {searchText, areaName}, isNewTabs)
+  
+	return (searchText, areaName, isNewTabs = true) => gotoPage("/searchResults/", { searchText, areaName }, isNewTabs);
 }
 
-export default comprehensiveSearchRoutes
+export default comprehensiveSearchRoutes;
\ No newline at end of file

src/utils/setChart.js

@@ -11,7 +11,6 @@ const setChart = (option, chartId, allowClick, selectParam) => {
   let chart = echarts.init(chartDom);
   chart.setOption(option);
   if (allowClick) {
-    // 3. 添加点击事件监听
     chart.on('click', function (params) {
       switch (selectParam.moduleType) {
         case '国会法案':

src/views/bill/billHome/index.vue

@@ -988,7 +988,9 @@ const handleBox9Data = async () => {
 		const selectParam = {
 			moduleType: '国会法案',
 			proposedDateStart: box9selectetedTime.value,
-			status: box9LegislativeStatus.value === '提出法案' ? 0 : 1
+			status: box9LegislativeStatus.value === '提出法案' ? 0 : 1,
+			isInvolveCn: 1
+
 
 		}
 		box9ChartInstance = setChart(box9Chart, "box9Chart", true, selectParam);

src/views/dataLibrary/index.vue

@@ -111,13 +111,13 @@ const siderList = ref([
   {
     name: '科技法案',
     icon: Icon1,
-    active: true,
-    isExpanded: true,
+    active: false,
+    isExpanded: false,
     children: [
       {
         name: '国会法案',
         path: '/dataLibrary/countryBill',
-        active: true,
+        active: false,
       },
       {
         name: '州法案',
@@ -477,6 +477,118 @@ const handleClickToolBox = () => {
 };
 
 onMounted(() => {
+  const path = route.path
+  switch (path) {
+    case '/dataLibrary/countryBill':
+      siderList.value[0].active = true
+      siderList.value[0].isExpanded = true
+      siderList.value[0].children[0].active = true
+
+      break
+    case '/dataLibrary/stateBill':
+      siderList.value[0].active = true
+      siderList.value[0].isExpanded = true
+      siderList.value[0].children[1].active = true
+      break
+    case '/dataLibrary/dataDecree':
+      siderList.value[1].active = true
+      break
+    case '/dataLibrary/dataThinkTank':
+      siderList.value[2].active = true
+      break
+    case '/dataLibrary/dataEntityList':
+      siderList.value[3].active = true
+      siderList.value[3].isExpanded = true
+      siderList.value[3].children[0].active = true
+      break
+    case '/dataLibrary/dataCommerceControlList':
+      siderList.value[3].active = true
+      siderList.value[3].isExpanded = true
+      siderList.value[3].children[1].active = true
+      break
+    case '/dataLibrary/dataEntityListEvent':
+      siderList.value[3].active = true
+      siderList.value[3].isExpanded = true
+      siderList.value[3].children[2].active = true
+      break
+    case '/dataLibrary/dataCommerceControlListEvent':
+      siderList.value[3].active = true
+      siderList.value[3].isExpanded = true
+      siderList.value[3].children[3].active = true
+      break
+    case '/dataLibrary/sDNList':
+      siderList.value[4].active = true
+      siderList.value[4].isExpanded = true
+      siderList.value[4].children[0].active = true
+      break
+    case '/dataLibrary/mREList':
+      siderList.value[4].active = true
+      siderList.value[4].isExpanded = true
+      siderList.value[4].children[1].active = true
+      break
+    case '/dataLibrary/sDNListEvent':
+      siderList.value[4].active = true
+      siderList.value[4].isExpanded = true
+      siderList.value[4].children[2].active = true
+      break
+    case '/dataLibrary/mREListEvent':
+      siderList.value[4].active = true
+      siderList.value[4].isExpanded = true
+      siderList.value[4].children[3].active = true
+      break
+    case '/dataLibrary/case337':
+      siderList.value[5].active = true
+      siderList.value[5].isExpanded = true
+      siderList.value[5].children[0].active = true
+      break
+    case '/dataLibrary/case232':
+      siderList.value[5].active = true
+      siderList.value[5].isExpanded = true
+      siderList.value[5].children[1].active = true
+      break
+    case '/dataLibrary/case301':
+      siderList.value[5].active = true
+      siderList.value[5].isExpanded = true
+      siderList.value[5].children[2].active = true
+      break
+    case '/dataLibrary/congressMan':
+      siderList.value[6].active = true
+      siderList.value[6].isExpanded = true
+      siderList.value[6].children[0].active = true
+      break
+    case '/dataLibrary/technologyLeader':
+      siderList.value[6].active = true
+      siderList.value[6].isExpanded = true
+      siderList.value[6].children[1].active = true
+      break
+    case '/dataLibrary/minister':
+      siderList.value[6].active = true
+      siderList.value[6].isExpanded = true
+      siderList.value[6].children[2].active = true
+      break
+    case '/dataLibrary/thinkTankResearcher':
+      siderList.value[6].active = true
+      siderList.value[6].isExpanded = true
+      siderList.value[6].children[3].active = true
+      break
+    case '/dataLibrary/technologyCompany':
+      siderList.value[7].active = true
+      siderList.value[7].isExpanded = true
+      siderList.value[7].children[0].active = true
+      break
+    case '/dataLibrary/researchUniversity':
+      siderList.value[7].active = true
+      siderList.value[7].isExpanded = true
+      siderList.value[7].children[1].active = true
+      break
+    case '/dataLibrary/keyLab':
+      siderList.value[7].active = true
+      siderList.value[7].isExpanded = true
+      siderList.value[7].children[2].active = true
+      break
+  }
+
+
 
 })
 
@@ -683,7 +795,8 @@ onMounted(() => {
           .icon {
             width: 16px;
             height: 16px;
-            &:hover{
+
+            &:hover {
               border-radius: 8px;
               background: var(--color-primary-10);
             }

src/views/home/index.vue

@@ -77,7 +77,7 @@ import { useRoute } from "vue-router";
 import AiBox from "@/components/AiBox.vue";
 import { getPersonType } from "@/api/common/index";
 // import { useDraggable } from "@vueuse/core";
-import ModuleHeader from '@/components/base/ModuleHeader/index.vue'
+import ModuleHeader from '@/components/base/moduleHeader/index.vue'
 
 import Menu1 from "@/assets/icons/overview/menu1.png";
 import Menu2 from "@/assets/icons/overview/menu2.png";
@@ -120,7 +120,7 @@ const handleGetPersonType = async () => {
 			personTypeList.value = [];
 		}
 		window.sessionStorage.setItem("personTypeList", JSON.stringify(personTypeList.value));
-	} catch (error) {}
+	} catch (error) { }
 };
 
 const isCurrentOverview = computed(() => {
@@ -298,7 +298,7 @@ body {
 	text-align: justify;
 }
 
-.el-popper[data-popper-placement^="top"] > .el-popper__arrow:before {
+.el-popper[data-popper-placement^="top"]>.el-popper__arrow:before {
 	display: none;
 }
 

src/views/newsBrief/NewsDetial.vue

 <template>
 	<el-scrollbar>
-        <div class="flex-display common-page top-box-news-deatail" style="align-items: center;">
+		<div class="flex-display common-page top-box-news-deatail" style="align-items: center">
 			<!-- <color-svg :svg-url="NewsLogo" :size="72" style="margin-right:10px"></color-svg> -->
-            <img :src="NewsLogo" style="margin-right:24px">
+			<img :src="NewsLogo" style="margin-right: 24px" />
 			<el-space direction="vertical" class="flex-fill" alignment="flex-start">
 				<common-text class="text-title-1-bold" color="var(--text-primary-80-color)">
 					{{ newsDetail.titleZh }}
@@ -28,38 +28,63 @@
 		</div>
 		<div class="flex-display common-page content-box-news-detail">
 			<el-space direction="vertical" class="background-as-card flex-fill" fill alignment="flex-start">
-                <div style="margin-top: 10px; margin-right: 24px;gap:10px" class="flex-display">
+				<div style="margin-top: 10px; margin-right: 24px; gap: 10px" class="flex-display">
 					<color-prefix-title height="20px">
 						<div class="text-title-2-bold">新闻内容</div>
 					</color-prefix-title>
 					<div class="flex-fill"></div>
 					<el-switch v-model="isHightLightEntity" active-text="高亮实体" @change="handleHighlightEntity" />
-                    <el-button v-if="textZns.length > 0" :type="isOpenTranslation ? 'primary' : ''" plain
-                        @click="handleTranslation">
-                        <color-svg :svg-url="TranslationSvg" color="var(--color-primary-100)" :size="18"
-                            style="margin-right:10px"></color-svg>
+					<el-button
+						v-if="textZns.length > 0"
+						:type="isOpenTranslation ? 'primary' : ''"
+						plain
+						@click="handleTranslation"
+					>
+						<color-svg
+							:svg-url="TranslationSvg"
+							color="var(--color-primary-100)"
+							:size="18"
+							style="margin-right: 10px"
+						></color-svg>
 						译文
 					</el-button>
 				</div>
-                <text-translate-pane class="common-padding-h" :texts-raw="textEns" :texts-translate="textZns"
-                    :text-entities="textEntities" :is-open-translation="isOpenTranslation"
-                    :is-highlight-entity="isHightLightEntity">
+				<text-translate-pane
+					class="common-padding-h"
+					:texts-raw="textEns"
+					:texts-translate="textZns"
+					:text-entities="textEntities"
+					:is-open-translation="isOpenTranslation"
+					:is-highlight-entity="isHightLightEntity"
+					@on-entity-click="e => gotoSearchResults(e.text_span, '')"
+				>
 				</text-translate-pane>
 				<div>
-                    <img v-if="newsDetail.coverUrl" class="common-padding" :src="newsDetail.coverUrl" :width="320"
-                        :height="240" />
+					<img
+						v-if="newsDetail.coverUrl"
+						class="common-padding"
+						:src="newsDetail.coverUrl"
+						:width="320"
+						:height="240"
+					/>
 				</div>
 			</el-space>
 			<el-space direction="vertical" class="background-as-card relation-news-box" fill>
-                <el-space style="margin-top: 10px;">
+				<el-space style="margin-top: 10px">
 					<color-prefix-title height="20px">
 						<div class="text-title-2-bold">相关新闻</div>
 					</color-prefix-title>
 				</el-space>
 				<el-space v-if="relationNews?.length > 0" direction="vertical" fill class="common-padding">
-                    <news-item-mini v-for="item in relationNews" :key="item.newsId" :news="item" :img="item.newsImage"
-                        :title="item.newsTitle" :from="`${item.newsDate} · ${item.newsOrg}`"
-                        @click="gotoNewsDetail(item.newsId)" />
+					<news-item-mini
+						v-for="item in relationNews"
+						:key="item.newsId"
+						:news="item"
+						:img="item.newsImage"
+						:title="item.newsTitle"
+						:from="`${item.newsDate} · ${item.newsOrg}`"
+						@click="gotoNewsDetail(item.newsId)"
+					/>
 				</el-space>
 				<el-empty v-else style=""></el-empty>
 			</el-space>
@@ -68,21 +93,22 @@
 </template>
 <script setup>
 import { getNewsDetail } from "@/api/news/newsBrief";
-import '@/styles/container.scss';
-import '@/styles/common.scss';
+import "@/styles/container.scss";
+import "@/styles/common.scss";
 import { ref, onMounted } from "vue";
 import { useRoute } from "vue-router";
 import { ElSpace, ElButton, ElScrollbar, ElSwitch, ElEmpty, ElImage } from "element-plus";
 import CommonText from "@/components/base/texts/CommonText.vue";
 import AreaTag from "@/components/base/AreaTag/index.vue";
-import ColorPrefixTitle from '@/components/base/texts/ColorPrefixTitle.vue';
+import ColorPrefixTitle from "@/components/base/texts/ColorPrefixTitle.vue";
 import { getRelationNews } from "@/api/news/newsDetail";
 import NewsItemMini from "@/components/base/newsList/NewsItemMini.vue";
 import ColorSvg from "@/components/base/images/ColorSvg.vue";
-import TranslationSvg from './assets/images/翻译 1.svg';
-import NewsLogo from './assets/images/组合 293.svg';
+import TranslationSvg from "./assets/images/翻译 1.svg";
+import NewsLogo from "./assets/images/组合 293.svg";
 import { extractTextEntity } from "@/api/intelligent";
 import { useGotoNewsDetail } from "@/router/modules/news";
+import { useGotoSearchResults } from "@/router/modules/comprehensiveSearch";
 import TextTranslatePane from "@/components/base/texts/TextTranslatePane.vue";
 
 const newsDetail = ref({});
@@ -94,35 +120,34 @@ const textZns = ref([]);
 const textEns = ref([]);
 const route = useRoute();
 const gotoNewsDetail = useGotoNewsDetail();
+const gotoSearchResults = useGotoSearchResults();
 
 onMounted(async () => {
 	const params = {
 		newsId: route.params.id
-    }
+	};
 	const { data: newsDetailData } = await getNewsDetail(params);
 	newsDetail.value = newsDetailData ?? {};
-    textZns.value = newsDetail.value?.contentZh?.split('\n') ?? [];
-    textEns.value = newsDetail.value?.content?.split('\n') ?? [];
+	textZns.value = newsDetail.value?.contentZh?.split("\n") ?? [];
+	textEns.value = newsDetail.value?.content?.split("\n") ?? [];
 	const { data: relationNewsData } = await getRelationNews(params);
 	relationNews.value = relationNewsData ?? [];
 	await handleHighlightEntity();
-
 });
 
 async function handleHighlightEntity() {
-    if (textEntities.value.length > 0) return
-    const { result: entityDataZh } = await extractTextEntity(newsDetail.value?.contentZh ?? '');
-    textEntities.value = [...entityDataZh ?? []]
+	if (textEntities.value.length > 0 || (!newsDetail.value?.contentZh && !newsDetail.value?.content)) return;
+	const { result: entityDataZh } = await extractTextEntity(newsDetail.value.contentZh ?? "");
+	textEntities.value = [...(entityDataZh ?? [])];
 	if (newsDetail.value.contentZh !== newsDetail.value.content) {
-        const { result: entityData } = await extractTextEntity(newsDetail.value?.content ?? '');
-        textEntities.value = [...textEntities.value, ...entityData ?? []]
+		const { result: entityData } = await extractTextEntity(newsDetail.value.content ?? "");
+		textEntities.value = [...textEntities.value, ...(entityData ?? [])];
 	}
-    console.log(isHightLightEntity.value)
+	console.log(isHightLightEntity.value);
 }
 function handleTranslation() {
 	isOpenTranslation.value = !isOpenTranslation.value;
 }
-
 </script>
 <style lang="scss" scoped>
 @import url("./style.css");

src/views/newsBrief/NewsMain.vue

@@ -25,18 +25,19 @@
                     <img src="@/assets/icons/subject-icon.png" />
                 </template>
                 <el-space :size="16" direction="vertical" fill class="full-width common-padding">
-                    <el-space v-for="(item, index) in subjectData.slice(0, 3)" :key="index" class="mouse-hover"
+                    <el-space v-for="(item, index) in subjectData.slice(0, 3)" :key="index"
                         @click="() => gotoNewsDetail(item.newsId)" alignment="center">
-                        <common-text class="text-bold"
+                        <common-text class="text-bold text-hover"
                             :color="index === 0 ? 'var(--color-red-100)' : (index === 1 ? 'var(--color-orange-100)' : 'var(--text-primary-65-color)')">
                             {{ `${index + 1}` }}
                         </common-text>
-                        <common-text class="text-bold" color="var(--text-primary-80-color)">{{
+                        <common-text class="text-bold text-hover" color="var(--text-primary-80-color)">{{
                             item.newsTitle
                             }}</common-text>
                     </el-space>
-                    <el-space v-for="(item, index) in subjectData.slice(3)" :key="index" class="mouse-hover">
-                        <common-text class="text-regular" color="var(--text-primary-80-color)">{{
+                    <el-space v-for="(item, index) in subjectData.slice(3)" :key="index"
+                        @click="() => gotoNewsDetail(item.newsId)">
+                        <common-text class="text-regular text-hover" color="var(--text-primary-80-color)">{{
                             "• " + item.newsTitle
                             }}</common-text>
                     </el-space>
@@ -48,6 +49,7 @@
 </template>
 <script setup>
 import { ref, onMounted } from "vue";
+import '@/styles/common.scss';
 import '@/styles/container.scss';
 import '@/styles/radio.scss';
 import { useGotoNewsModule, useGotoNewsDetail } from "@/router/modules/news";