Merge branch 'master' of http://8.140.26.4:10003/caijian/risk-monitor

src/App.vue

@@ -519,7 +519,7 @@ body {
 		}
 		.menu-box {
 			position: absolute;
-			z-index: 9999;
+			z-index: 999999;
 			width: 713px;
 			height: 413px;
 			top: 65px;

src/views/ZMOverView/components/fourSuppress/components/addDomain/index.vue

@@ -144,10 +144,14 @@
 					<template v-else>
 						<div class="table-header">
 							<div class="col-rank"></div>
-							<div class="col-name" style="color: rgb(59, 65, 75);font-weight: 700;">{{ rankType === 'enterprise' ? '公司名称' : '院校名称' }}</div>
-							<div class="col-domain" style="color: rgb(59, 65, 75);font-weight: 700;">所属领域</div>
-							<div class="col-date" style="color: rgb(59, 65, 75);font-weight: 700;">制裁时间</div>
-							<div class="col-member" v-if="rankType !== 'school'" style="color: rgb(59, 65, 75);font-weight: 700;">关键人物</div>
+							<div class="col-name" style="color: rgb(59, 65, 75); font-weight: 700">
+								{{ rankType === "enterprise" ? "公司名称" : "院校名称" }}
+							</div>
+							<div class="col-domain" style="color: rgb(59, 65, 75); font-weight: 700">所属领域</div>
+							<div class="col-date" style="color: rgb(59, 65, 75); font-weight: 700">制裁时间</div>
+							<div class="col-member" v-if="rankType !== 'school'" style="color: rgb(59, 65, 75); font-weight: 700">
+								关键人物
+							</div>
 						</div>
 						<div class="table-list">
 							<div v-for="(item, index) in rankList" :key="index" class="table-row">
@@ -219,7 +223,7 @@
 							</foreignObject>
 						</g>
 
-						<g v-for="(node, index) in timelineNodes" :key="index">
+						<g v-for="(node, index) in timelineNodes" :key="index" @click="handleTimeLineNode(node)">
 							<line :x1="node.x" :y1="node.y" :x2="node.x" :y2="node.y + 150" stroke="#1677ff" stroke-width="1" />
 
 							<circle :cx="node.x" :cy="node.y" r="4" fill="#fff" stroke="#1677ff" stroke-width="3" />
@@ -277,7 +281,7 @@ import {
 	getDomainContainmentRanking,
 	getDomainContainmentTimeline
 } from "@/api/zmOverview/allDomains";
-import { getUSGovernmentLatestDynamic, getDepartmentList,	getSanTypeList, } from "@/api/allGovernment.js";
+import { getUSGovernmentLatestDynamic, getDepartmentList, getSanTypeList } from "@/api/allGovernment.js";
 
 const router = useRouter();
 
@@ -323,7 +327,7 @@ const handleGetSanList = async () => {
 };
 
 const getDepartmentListData = async () => {
-		const params = {
+	const params = {
 		sanTypeId: methodValue.value
 	};
 	try {
@@ -885,8 +889,6 @@ const processDomainTrendData = rawData => {
 	};
 };
 
-
-
 const rankList = ref([]);
 
 const maxCount = computed(() => {
@@ -920,7 +922,7 @@ const processRankingData = rawData => {
 		return {
 			name: item.orgName || "",
 			count: item.orgCount || 0,
-			orgPicture: item.orgPicture, 
+			orgPicture: item.orgPicture,
 			// 新增字段
 			domains: item.domainList ? item.domainList.map(d => d.name) : [],
 			date: formattedDate,
@@ -1007,6 +1009,20 @@ const prev = () => {
 	}
 };
 
+const handleTimeLineNode = node => {
+	// console.log("timeLineNode", node);
+	if (node.eventType === "科技法案") {
+		window.sessionStorage.setItem("curTabName", node.title);
+		const route = router.resolve({
+			path: "/billLayout",
+			query: {
+				billId: node.eventId
+			}
+		});
+		window.open(route.href, "_blank");
+	}
+};
+
 onMounted(() => {
 	// let Chart = getMultiLineChart(box5Data.value);
 	// setChart(Chart, "chartRef");

src/views/ZMOverView/components/fourSuppress/components/allElement/index.vue

@@ -156,6 +156,12 @@
 						<div class="inner-box1">
 							<div class="left">
 								<div class="left-main">
+									<el-empty
+										v-if="box3DataList.length === 0"
+										style="padding-top: 80px"
+										description="暂无数据"
+										:image-size="100"
+									/>
 									<div
 										class="left-item"
 										:class="{ leftItemActive: box3LeftActiveIndex === index }"
@@ -181,6 +187,12 @@
 								</div>
 							</div>
 							<div class="right" @click="handleToDecreeDetail(box3DetailInfo)">
+								<el-empty
+									v-if="box3DataList.length === 0"
+									style="padding-top: 80px"
+									description="暂无数据"
+									:image-size="100"
+								/>
 								<div class="title">{{ box3DetailInfo?.name }}</div>
 								<div class="tag-box">
 									<div class="tag" v-for="(item, index) in box3DetailInfo?.elemetList" :key="index">
@@ -210,6 +222,12 @@
 							</div>
 						</div>
 						<div class="inner-box2">
+							<el-empty
+								v-if="box3ChartData.length === 0"
+								style="padding-top: 80px"
+								description="暂无数据"
+								:image-size="100"
+							/>
 							<div class="chart-header">{{ "关键词云" }}</div>
 							<div class="box3Chart" id="box3Chart"></div>
 						</div>

src/views/ZMOverView/components/fourSuppress/components/allGovernment/index.vue

@@ -1545,6 +1545,8 @@ const prev = () => {
 								.dept-icon {
 									width: 24px;
 									height: 24px;
+									border-radius: 12px;
+									overflow: hidden;
 									margin-right: -8px; // 图标叠加效果
 
 									&:last-child {

src/views/bill/billHome/index.vue

@@ -719,8 +719,8 @@
 						<div class="right-main" v-loading="loading">
 							<div class="right-main-box" v-for="(item, index) in bills" :key="index">
 								<div class="header">
-									<div class="title" @click="handleClickToDetailO(item)">{{ item.name }}</div>
-									<div class="en-title">{{ item.eName }}</div>
+									<div class="title" @click="handleClickToDetailO(item)" :title="item.name">{{ item.name }}</div>
+									<div class="en-title" :title="item.eName">{{ item.eName }}</div>
 								</div>
 								<div class="main">
 									<div class="item">
@@ -3336,6 +3336,9 @@ onUnmounted(() => {
 									line-height: 26px;
 									letter-spacing: 0px;
 									text-align: left;
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  white-space: nowrap;
 								}
 								.en-title {
 									margin-top: 8px;
@@ -3347,6 +3350,9 @@ onUnmounted(() => {
 									line-height: 24px;
 									letter-spacing: 0px;
 									text-align: left;
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  white-space: nowrap;
 								}
 							}
 							.main {

src/views/comprehensiveSearch/chat/index.vue

 <template>
 	<div class="wrapper">
 		<div class="header">
-			<!-- <span>首页 </span>> <span>综合检索 </span>> <span>智能问答 </span> -->
-			<div class="header-item">首页</div>
-			<div class="header-item">></div>
-			<div class="header-item back-item" @click="handleBackHome">综合检索</div>
-			<div class="header-item">></div>
-			<div class="header-item">智能问答</div>
+			<div class="header-content">
+				<div class="header-item">首页</div>
+				<div class="header-item">></div>
+				<div class="header-item back-item" @click="handleBackHome">综合检索</div>
+				<div class="header-item">></div>
+				<div class="header-item">智能问答</div>
+			</div>
 		</div>
 		<div class="main">
 			<div class="left">
@@ -1050,15 +1051,19 @@ onUnmounted(() => {
 		line-height: 64px;
 		background: url("../assets/images/header-bg.png");
 		box-sizing: border-box;
-		padding-left: 160px;
-		display: flex;
-		.header-item {
-			margin: 0 3px;
-		}
-		.back-item {
-			cursor: pointer;
-			&:hover {
-				color: #ccc;
+
+		.header-content {
+			width: 1600px;
+			margin: 0 auto;
+			display: flex;
+			.header-item {
+				margin: 0 3px;
+			}
+			.back-item {
+				cursor: pointer;
+				&:hover {
+					color: #ccc;
+				}
 			}
 		}
 	}