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

.env.development

 
 
-VITE_BASE_API= '/api'
\ No newline at end of file
+VITE_BASE_API= '/api'
+# 图表解读等 /aiAnalysis 代理服务密钥（勿提交到公开仓库时可改为本地 .env.local）
+VITE_AI_ANALYSIS_API_KEY=aircasKEY19491001
\ No newline at end of file

.env.production

 # 线上地址
 
-VITE_BASE_API= '/api'
\ No newline at end of file
+VITE_BASE_API= '/api'
+# 图表解读等 AI 服务（与部署环境一致时填写）
+VITE_AI_ANALYSIS_API_KEY=aircasKEY19491001
\ No newline at end of file

public/js/config.js

-const baseUrl = `http://8.140.26.4:9085/`
\ No newline at end of file
+const baseUrl = `http://8.140.26.4:9085`
\ No newline at end of file

src/App.vue

@@ -251,7 +251,7 @@ body {
 /* 可点击文本 鼠标悬浮样式 */
 #app .text-click-hover:hover {
 	text-decoration: underline;
-	color: rgb(5, 95, 194);
+	color: var(--color-primary-100);
 	cursor: pointer;
 }
 /* #endregion 公共样式类名 */

src/api/aiAnalysis/index.js

@@ -142,4 +142,4 @@ export function getChartAnalysis(data, options = {}) {
 			}
 		})();
 	});
-}
\ No newline at end of file
+}

src/api/decree/home.js

@@ -5,6 +5,7 @@ export function getDepartmentList(params) {
     return request({
         method: 'GET',
         url: `/api/administrativeDict/department`,
+        params
     })
 }
 
@@ -27,34 +28,36 @@ export function getDecreeRiskSignal(params) {
 // 行政令发布频度
 export function getDecreeYearOrder(params) {
     return request({
-        method: 'GET',
-        url: `/api/administrativeOrderOverview/yearOrder/${params.year}`,
-        params
+        method: 'POST',
+        url: `/api/administrativeOrderOverview/yearOrder`,
+        data: params
     })
 }
 
 // 政令涉及领域
 export function getDecreeArea(params) {
     return request({
-        method: 'GET',
-        url: `/api/administrativeOrderOverview/industry/${params.year}`,
-        params
+        method: 'POST',
+        url: `/api/administrativeOrderOverview/industry`,
+        data: params
     })
 }
 
 // 关键行政令
 export function getKeyDecree(params) {
     return request({
-        method: 'GET',
-        url: `/api/administrativeOrderOverview/action?pageSize=${params.pageSize}&pageNum=${params.pageNum}`,
+        method: 'POST',
+        url: `/api/administrativeOrderOverview/action`,
+        data: params
     })
 }
 
 // 政令重点条款
-export function getDecreeKeyInstruction() {
+export function getDecreeKeyInstruction(params) {
     return request({
-        method: 'GET',
+        method: 'POST',
         url: `/api/administrativeOrderOverview/instruction`,
+        data: params
     })
 }
 
@@ -85,4 +88,22 @@ export function getDecreeTypeList() {
         method: 'GET',
         url: `/api/administrativeDict/type`,
     })
+}
+
+// 关键机构
+export function getKeyOrganization() {
+    return request({
+        method: 'GET',
+        url: `/api/commonFeature/keyOrganization`,
+    })
+}
+
+// AI智能总结
+export function getChartInterpretation(params) {
+    return request({
+        method: 'POST',
+        url: `/aiAnalysis/chart_interpretation`,
+        headers: {"X-API-Key": "aircasKEY19491001"},
+        data: params
+    })
 }
\ No newline at end of file

src/api/decree/influence.js

@@ -20,6 +20,39 @@ export function getDecreehylyList() {
     })
 }
 
+// 获取受影响实体列表
+export function getDecreeEntities(params) {
+    return request({
+        method: 'POST',
+        url: `/api/administrativeOrderInfo/relatedEntities`,
+        data: params
+    })
+}
+
+// 获取实体产业链列表
+export function getDecreeRelatedChain(params) {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderInfo/relatedChain/${params.id}`,
+    })
+}
+
+// 获取产业链节点列表
+export function getDecreeChainNodes(params) {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderInfo/relatedChainNodes/${params.id}`,
+    })
+}
+
+// 获取实体关系节点列表
+export function getDecreeRelatedEntitie(params) {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderInfo/listRelatedEntitie/${params.id}`,
+    })
+}
+
 // 根据政行业领域ID获取公司列表
 /**
  * @param {cRelated, id} 

src/api/decree/introduction.js

@@ -77,4 +77,20 @@ export function getDecreeReport(params) {
         method: 'GET',
         url: `/api/administrativeOrderInfo/contentUrl/${params.id}`,
     })
+}
+
+// 政令关键词云
+export function getKeyWordUp() {
+    return request({
+        method: 'GET',
+        url: `/api/element/getKeyWordUp/2025-01-01`,
+    })
+}
+
+// 报告内容摘要
+export function getOverview(params) {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderInfo/overview/${params.id}`,
+    })
 }
\ No newline at end of file

src/api/request.js

@@ -51,6 +51,14 @@ service.interceptors.request.use(config => {
         config.headers['token'] = token
         // config.headers['Authorization'] = `Bearer ${token}` // 如果后端需要Bearer格式可以使用这个
     }
+    // 图表解读等 AI 分析服务（Vite 代理 /aiAnalysis）需要 X-API-Key
+    const reqUrl = String(config.url || '')
+    if (reqUrl.includes('aiAnalysis')) {
+        const aiApiKey = import.meta.env.VITE_AI_ANALYSIS_API_KEY
+        if (aiApiKey) {
+            config.headers['X-API-Key'] = aiApiKey
+        }
+    }
     return config
 }, error => {
     console.log(error)
@@ -82,8 +90,14 @@ service.interceptors.response.use(
         // 重复请求触发的取消不提示错误
         if (isCanceledError) return Promise.reject(error)
         
-        // 处理token过期或无效的情况
-        if (error.response && (error.response.status === 401 || error.response.status === 403)) {
+        // 处理token过期或无效的情况（排除 AI 分析服务：其 401 多为 API Key 问题）
+        const errUrl = String(error.config?.url || '')
+        const isAiAnalysisRequest = errUrl.includes('aiAnalysis')
+        if (
+            error.response &&
+            (error.response.status === 401 || error.response.status === 403) &&
+            !isAiAnalysisRequest
+        ) {
             ElMessage({
                 message: 'Token已过期，请重新登录',
                 type: 'error',

src/api/thinkTank/overview.js

@@ -10,6 +10,13 @@ export function getThinkTankList() {
   })
 }
 
+export function getAllThinkTankList(params) {
+  return request({
+    method: 'GET',
+    url: '/api/thinkTankOverview/thinkTanks/page',
+    params: params  
+  })
+}
 //智库概览:获取智库发布
 export function getNewReport() {
   return request({
@@ -28,13 +35,19 @@ export function getThinkTankRiskSignal() {
   })
 }
 
-// 政策建议趋势分布
+/**
+ * 政策建议趋势分布（数量变化趋势）
+ * @param {{ startDate: string, endDate: string }} params - 如 2024-01-01 ~ 2024-12-31
+ */
 export function getThinkTankPolicyIndustryChange(params) {
   return request({
-    method: 'GET',
-    url: `/api/thinkTankOverview/policyIndustryChange/${params}`,
-
-  })
+    method: "GET",
+    url: `/api/thinkTankOverview/policyIndustryChange`,
+    params: {
+      startDate: params.startDate,
+      endDate: params.endDate
+    }
+  });
 }
 
 // 政策建议领域分布
@@ -113,10 +126,44 @@ export function getThinkDynamicsReportType() {
 
 //智库动态:获取智库报告
 export function getThinkDynamicsReport(params) {
+  const safe = params || {}
+  // 兼容两种调用方式：
+  // 1) { id, startDate, authorName, currentPage, pageSize, researchTypeIds, searchText, sortFun, years }
+  // 2) { id, startDate, parmas: { authorName, currentPage, pageSize, researchTypeIds, searchText, sortFun, years } }
+  const inner = safe.parmas && typeof safe.parmas === 'object' ? safe.parmas : {}
+  const id = safe.id
+  const startDate = safe.startDate
+
+  const authorName = inner.authorName ?? safe.authorName ?? ''
+  const currentPage = inner.currentPage ?? safe.currentPage ?? 1
+  const pageSize = inner.pageSize ?? safe.pageSize ?? 10
+  const researchTypeIds = inner.researchTypeIds ?? safe.researchTypeIds ?? ''
+  const searchText = inner.searchText ?? safe.searchText ?? ''
+  const sortFun = inner.sortFun ?? safe.sortFun ?? false
+  const years = inner.years ?? safe.years ?? null
+
+  const query = { currentPage, pageSize, sortFun }
+  // 仅在有值时才传，避免后端按空值筛选
+  if (authorName) query.authorName = authorName
+  if (researchTypeIds) query.researchTypeIds = researchTypeIds
+  if (searchText) query.searchText = searchText
+  if (years !== null && years !== undefined && years !== '') query.years = years
+
   return request({
     method: 'GET',
-    url: `/api/thinkTankInfo/report/${params.id}/${params.startDate}`,
-    params: params.parmas
+    url: `/api/thinkTankInfo/report/${id}/${startDate}`,
+    params: query
+  })
+}
+
+// 智库领域观点分析（流式）
+// [POST] 8.140.26.4:10029/report-domain-view-analysis
+export function postReportDomainViewAnalysis(data) {
+  return request({
+    method: 'POST',
+    // 开发环境走 Vite 同源代理，避免浏览器跨域（见 vite.config.js：/intelligent-api -> 8.140.26.4:10029）
+    url: '/intelligent-api/report-domain-view-analysis',
+    data
   })
 }
 
@@ -152,15 +199,31 @@ export function getThinkPolicyIndustryChange(params) {
   })
 }
 
-//获取智库政策
+/**
+ * 获取智库政策（政策追踪列表）
+ * GET /api/thinkTankInfo/policy
+ * Query: thinkTankId, startDate, endDate, orgIds, domainIds（科技领域/智库领域，逗号分隔 id）, pageNum, pageSize, sortField, sortOrder, sortFun, reportId 等
+ */
 export function getThinkPolicy(params) {
   return request({
     method: 'GET',
-    url: `/api/thinkTankInfo/policy/${params.id}/${params.startDate}`,
+    url: '/api/thinkTankInfo/policy',
     params
   })
 }
 
+/**
+ * 政府机构字典（政策追踪-涉及部门筛选项）
+ * GET /api/commonDict/gov/agency
+ * @returns {Promise<{ code: number, data: Array<{ id: string, name: string }> }>}
+ */
+export function getGovAgencyDict() {
+  return request({
+    method: 'GET',
+    url: '/api/commonDict/gov/agency'
+  })
+}
+
 //智库百科基本信息
 export function getThinkTankInfoBasic(params) {
   return request({
@@ -299,9 +362,26 @@ export function getThinkTankReportPolicy(params) {
 
 //获取相关政策动态
 export function getThinkTankReportPolicyAction(params) {
-  return request({
-    method: 'GET',
-    url: `/api/thinkTankReport/policyAction/${params}`,
+  const {
+    reportId,
+    currentPage,
+    pageSize,
+    keyword = "",
+    orgIds = "",
+    // 新增：按科技领域 / 标签过滤
+    industryName = ""
+  } = params;
+  return request({
+    method: 'GET',
+    url: `/api/thinkTankReport/policyDetail/${reportId}`,
+    params: {
+      currentPage,
+      pageSize,
+      keyword,
+      // 后端按标签过滤使用的字段
+      industryName,
+      orgIds,
+    }
   })
 }
 

src/components/base/DecreeOriginal/index.vue

@@ -326,9 +326,8 @@ watch(isTranslate, () => {
 
 			.report-main {
 				flex: auto;
-				min-height: 0;
-				box-sizing: border-box;
-				padding-top: 10px;
+				height: 20px;
+				padding: 10px 0;
 
 				:deep(.el-scrollbar) {
 					height: 100%;

src/components/base/GraphChart/index.vue

@@ -5,10 +5,11 @@
 </template>
 
 <script setup>
-import { onMounted, nextTick } from 'vue';
+import { onMounted, onBeforeUnmount } from 'vue';
 import setChart from '@/utils/setChart';
 import getGraphChart from './graphChart';
 
+const emits = defineEmits(["handleClickNode"])
 const props = defineProps({
   nodes: {
     type: Array,
@@ -27,16 +28,22 @@ const props = defineProps({
     default: 'force'
   },
   height: {
-        type: String,
+    type: String,
     default: 'force'
   }
 })
 
+let chart = null
 onMounted(() => {
   const graph = getGraphChart(props.nodes, props.links, props.layoutType)
-  setChart(graph, 'graph')
+  chart = setChart(graph, 'graph')
+  chart.on("click", (event) => { emits("handleClickNode", event) })
 })
 
+onBeforeUnmount(() => {
+  chart.off("click")
+  chart.dispose()
+})
 
 </script>
 

src/components/base/TipTab/index.vue

@@ -24,17 +24,19 @@ const props = defineProps({
 </script>
 
 <style lang="scss" scoped>
-.tip-wrapper{
+.tip-wrapper {
   width: 100%;
   display: flex;
   gap: 8px;
   justify-content: center;
   align-items: center;
   height: 22px;
-  .icon{
+
+  .icon {
     width: 16px;
     height: 16px;
-    img{
+
+    img {
       width: 100%;
       height: 100%;
     }

src/components/base/moduleHeader/index.vue

@@ -96,16 +96,16 @@ const homeTitleList = ref([
 		path: "/ZMOverView",
 		disabled: false
 	},
-	{
-		name: "主要国家科技动向感知",
-		path: "",
-		disabled: true
-	},
-	{
-		name: "主要国家竞争科技安全",
-		path: "",
-		disabled: true
-	}
+	// {
+	// 	name: "主要国家科技动向感知",
+	// 	path: "",
+	// 	disabled: true
+	// },
+	// {
+	// 	name: "主要国家竞争科技安全",
+	// 	path: "",
+	// 	disabled: true
+	// }
 ]);
 
 const homeActiveTitleIndex = ref(0);

src/router/modules/thinktank.js

@@ -3,6 +3,8 @@ const thinkTank = () => import('@/views/thinkTank/index.vue')
 const ThinkTankDetail = () => import('@/views/thinkTank/ThinkTankDetail/index.vue')
 const ReportDetail = () => import('@/views/thinkTank/ReportDetail/index.vue')
 const ReportOriginal = () => import('@/views/thinkTank/reportOriginal/index.vue')
+const allThinkTank= () => import('@/views/thinkTank/allThinkTank/index.vue')
+const MultiThinkTankViewAnalysis= () => import('@/views/thinkTank/MultiThinkTankViewAnalysis/index.vue')
 
 const thinktankRoutes = [
   // 智库系统的主要路由
@@ -36,9 +38,19 @@ const thinktankRoutes = [
     path: "/thinkTank/reportOriginal/:id",
     name: "ReportOriginal",
     component: ReportOriginal,
-    // meta: {
-    //   title: "报告原文"
-    // }
+  
+  },
+   {
+    path: "/thinkTank/allThinkTank",
+    name: "allThinkTank",
+    component: allThinkTank,
+
+  },
+  {
+    path: "/thinkTank/MultiThinkTankViewAnalysis/:id",
+    name: "MultiThinkTankViewAnalysis",
+    component: MultiThinkTankViewAnalysis,
+
   },
 
 ]

src/utils/setChart.js

@@ -9,6 +9,10 @@ const setChart = (option, chartId) => {
   chartDom.removeAttribute("_echarts_instance_");
   let chart = echarts.init(chartDom);
   chart.setOption(option);
+  // 容器可能受布局/异步渲染影响，强制一次 resize 保证 canvas 与容器一致
+  setTimeout(() => {
+    chart.resize();
+  }, 0);
   return chart;
 };
 

src/views/bill/billHome/index.vue

@@ -5,9 +5,8 @@
 
 			<div class="home-content">
 				<div class="home-content-header">
-					<SearchContainer style="margin-bottom: 0; height: fit-content" v-if="containerRef"
-						placeholder="搜索科技法案" :containerRef="containerRef" areaName="法案" :enableBillTypeSwitch="true"
-						defaultBillSearchType="federal" />
+					<SearchContainer style="margin-bottom: 0; height: fit-content" v-if="containerRef" placeholder="搜索科技法案"
+						:containerRef="containerRef" areaName="法案" :enableBillTypeSwitch="true" defaultBillSearchType="federal" />
 				</div>
 
 				<div class="committee-cards-section">
@@ -55,8 +54,8 @@
 								</div>
 							</div>
 							<div class="box1-main" style="display: block">
-								<el-carousel ref="carouselRef" height="354px" :autoplay="true" :interval="3000"
-									arrow="never" indicator-position="none" @change="handleCarouselChange">
+								<el-carousel ref="carouselRef" height="354px" :autoplay="true" :interval="3000" arrow="never"
+									indicator-position="none" @change="handleCarouselChange">
 									<el-carousel-item v-for="(bill, billIndex) in hotBillList" :key="billIndex">
 										<div class="carousel-content" style="display: flex; height: 100%">
 											<div class="box1-main-left">
@@ -64,8 +63,7 @@
 													{{ bill.billName }}
 												</div>
 												<div class="box1-main-left-info">
-													<AreaTag v-for="(item, index) in bill.hylyList" :key="index"
-														:tagName="item.industryName">
+													<AreaTag v-for="(item, index) in bill.hylyList" :key="index" :tagName="item.industryName">
 													</AreaTag>
 												</div>
 												<div class="box1-main-left-info1">
@@ -83,18 +81,15 @@
 													</div>
 												</div>
 												<div class="box1-main-left-info2">
-													<div class="info2-item" v-for="(item, index) in bill.dyqkList"
-														:key="index">
-														<div class="time-line"
-															v-if="index !== bill.dyqkList.length - 1"></div>
+													<div class="info2-item" v-for="(item, index) in bill.dyqkList" :key="index">
+														<div class="time-line" v-if="index !== bill.dyqkList.length - 1"></div>
 														<div class="item-icon">
 															<img src="./assets/images/info2-icon.png" alt="" />
 														</div>
 														<div class="item-time" :class="{ itemTimeActive: index === 0 }">
 															{{ item.actionDate }}
 														</div>
-														<div class="item-title"
-															:class="{ itemTitleActive: index === 0 }">
+														<div class="item-title" :class="{ itemTitleActive: index === 0 }">
 															{{ item.actionContentCn }}
 														</div>
 													</div>
@@ -121,9 +116,8 @@
 								</el-carousel>
 							</div>
 						</overviewMainBox>
-						<RiskSignal :list="warningList" @more-click="handleToMoreRiskSignal"
-							@item-click="handleClickToDetailO" riskLevel="signalLevel" postDate="signalTime"
-							name="signalTitle" />
+						<RiskSignal :list="warningList" @more-click="handleToMoreRiskSignal" @item-click="handleClickToDetailO"
+							riskLevel="signalLevel" postDate="signalTime" name="signalTitle" />
 					</div>
 
 					<DivideHeader id="position2" class="divide2" :titleText="'资讯要闻'"></DivideHeader>

src/views/decree/decreeLayout/deepdig/index.vue

@@ -3,7 +3,7 @@
 		<div class="box1">
 			<AnalysisBox title="相关政令" :showAllBtn="false">
 				<div class="box1-main">
-					<el-empty v-if="!siderList?.length" style="padding-top: 40%;" description="暂无数据" :image-size="100" />
+					<el-empty v-if="!siderList?.length" style="padding: 60px 0;" description="暂无数据" :image-size="100" />
 					<el-scrollbar height="100%" always>
 						<div class="left-item" :class="{ 'item-active': false }" v-for="(item, index) in siderList" :key="index" @click="handleClickDecree(item)">
 							<div class="item-head">
@@ -18,9 +18,9 @@
 		</div>
 		<div class="box2">
 			<AnalysisBox title="政令关系挖掘" :showAllBtn="false">
-				<el-empty v-if="!siderList?.length" style="padding-top: 20%;" description="暂无数据" :image-size="100" />
-				<div class="box2-main">
-					<div ref="containerRef" class="graph-container"></div>
+				<el-empty v-if="!siderList?.length" style="padding: 60px 0;" description="暂无数据" :image-size="100" />
+				<div class="box2-main" v-if="graphData.nodes?.length">
+					<GraphChart :nodes="graphData.nodes" :links="graphData.links" layoutType="force" @handleClickNode="handleClickNode" />
 				</div>
 			</AnalysisBox>
 		</div>
@@ -48,12 +48,13 @@
 </template>
 
 <script setup>
-import { ref, onMounted, onBeforeUnmount } from "vue";
+import { ref, onMounted, onBeforeUnmount, reactive } from "vue";
 import { useRoute } from "vue-router";
 import router from "@/router";
 import * as G6 from '@antv/g6';
 import { getDecreeRelatedOrder } from "@/api/decree/deepdig";
 import { getDecreeSummary } from "@/api/decree/introduction";
+import GraphChart from "@/components/base/GraphChart/index.vue";
 
 import icon1628 from "./assets/icons/icon1628.png";
 import icon1629 from "./assets/icons/icon1629.png";
@@ -64,7 +65,7 @@ const route = useRoute();
 const dialogVisible = ref(false);
 
 // 基本信息
-const mainInfo = ref({});
+const mainInfo = ref({ label: "", time: "", id: "" });
 const nodeInfo = ref({});
 const onDecreeSummaryData = async () => {
 	try {
@@ -74,10 +75,9 @@ const onDecreeSummaryData = async () => {
 			mainInfo.value.label = res.data.name;
 			mainInfo.value.time = res.data.postDate;
 			mainInfo.value.id = route.query.id;
-			mainInfo.value.isCenter = true
 		}
 	} catch (error) {
-		mainInfo.value = {};
+		mainInfo.value = { label: "", time: "", id: "" };
 		console.log("获取基本信息数据失败:", error);
 	}
 };
@@ -109,8 +109,53 @@ const handleGetRelateOrder = async () => {
 };
 
 // 政令关系挖掘
-const containerRef = ref();
-let graphInstance = null;
+const graphData = reactive({
+	nodes: [],
+	links: [],
+})
+// 节点点击处理
+const handleClickNode = ({data}) => {
+	if (data.target) {
+		let node = siderList.value.find(item => item.id==data.target)
+		if (node) handleClickSider(node)
+	} else {
+		let node = siderList.value.find(item => item.id==data.id)
+		if (node) handleClickDecree(node)
+	}
+}
+const initGraphChart = () => {
+	Promise.all([onDecreeSummaryData(), handleGetRelateOrder()]).then(() => {
+		if (mainInfo.value.id && siderList.value.length) {
+			graphData.links = siderList.value.map(onFormatLink)
+			graphData.nodes = siderList.value.map(onFormatNode)
+			graphData.nodes.unshift(onFormatNode(mainInfo.value))
+		}
+	})
+}
+const onFormatLink = (item, index) => {
+	return {
+		id: `link-${index+1}`,
+		source: route.query.id, target: item.id+'',
+		label: { show: true, color: "#055fc2", backgroundColor: "#eef7ff", borderWidth: 0, offset: [0, 15], formatter: item.relation },
+		lineStyle: { color: '#B9DCFF', type: "solid", opacity: 1 }
+	}
+}
+const onFormatNode = (item) => {
+	let leader = item.id == mainInfo.value.id;
+	return {
+		id: item.id+'',
+		name: onWordWrap(item.label, 8),
+		label: {
+			show: true,
+			color: leader ? "#055fc2" : "#3b414b",
+			fontSize: leader ? 16 : 14,
+			fontWeight: leader ? 700 : 400,
+			fontFamily: 'Source Han Sans CN',
+		},
+		symbolSize: leader ? 60 : 40,
+		symbol: `image://${leader ? icon1628 : icon1629}`
+	}
+}
 // 文本插入换行符
 const onWordWrap = (word, num) => {
 	const list = word.split('');
@@ -123,132 +168,6 @@ const onWordWrap = (word, num) => {
 	}
 	return label;
 }
-const onFormatNode = (item) => {
-	let isCenter = item.isCenter || false
-	return {
-		id: item.id+'', label:onWordWrap(item.label, 15), isCenter,
-		img: isCenter ? icon1628 : icon1629,
-		clipCfg: { r: isCenter ? 40 : 30 },
-		labelCfg: {
-			style: { 
-				fill: isCenter ? "#1459BB" : "#333333",
-				fontSize: isCenter ? 13 : 13,
-				fontWeight: isCenter ? "bold" : "normal"
-			}
-		}
-	}
-}
-const onFormatEdge = (item, index) => {
-	return {
-		id: `edge-${index+1}`,
-		target: item.id+'',
-		source: route.query.id,
-		// label: ["", "相似", "继承", "冲突"][1],
-		label: item.relation,
-		style: {
-			stroke: ["", "#B9DCFF", "#87E8DE", "#FFCCC7"][1],
-		},
-		labelCfg: {
-			style: {
-				fill: ["", "#055FC2", "#13A8A8", "#CE4F51"][1],
-				background: {
-					fill: ["", "#E7F3FF", "#E6FFFB", "#FFE0E0"][1],
-				}
-			}
-		}
-	}
-}
-const initChart = () => {
-	let edgeList = siderList.value.map(onFormatEdge)
-	let nodeList = siderList.value.map(onFormatNode)
-	nodeList.unshift(onFormatNode(mainInfo.value))
-	console.log(nodeList)
-
-	const width = containerRef.value.offsetWidth || 800
-	const height = containerRef.value.offsetHeight || 600
-  const centerX = width / 2
-  const centerY = height / 2
-  const radius = Math.min(width, height) / 2 - 120
-
-	const otherNodes = nodeList.filter(n => !n.isCenter)
-  const nodeCount = otherNodes.length
-  otherNodes.forEach((node, index) => {
-    const angle = (2 * Math.PI * index) / nodeCount - Math.PI / 2
-    node.x = centerX + radius * Math.cos(angle)
-    node.y = centerY + radius * Math.sin(angle)
-  })
-  const centerNode = nodeList.find(n => n.isCenter)
-  if (centerNode) {
-    centerNode.x = centerX
-    centerNode.y = centerY
-    centerNode.fx = centerX
-    centerNode.fy = centerY
-  }
-
-	graphInstance = new G6.Graph({
-		container: containerRef.value,
-		width,
-		height,
-		fitView: false,
-		fitCenter: false,
-		animate: true,
-		animateCfg: {
-			duration: 300,
-			easing: 'easeLinear'
-		},
-		minZoom: 0.1,
-		maxZoom: 10,
-		modes: {
-			default: [ 'drag-canvas', 'zoom-canvas', 'drag-node' ]
-		},
-		defaultNode: {
-			type: 'image',
-			size: 50,
-			style: { cursor: "pointer" },
-			clipCfg: { show: true, type: 'circle' },
-			labelCfg: {
-				position: "bottom", offset: 12,
-				style: {
-					fill: '#333',
-					fontSize: 11,
-					fontFamily: 'Microsoft YaHei',
-					textAlign: 'center',
-					background: {
-						fill: 'rgba(255, 255, 255, 0.95)',
-						padding: [4, 6, 4, 6],
-						radius: 4
-					}
-				}
-			}
-		},
-		defaultEdge: {
-			type: "line",
-			style: { lineWidth: 1, endArrow: true },
-			labelCfg: {
-				autoRotate: true,
-				style: {
-					cursor: "pointer",
-					fontSize: 12,
-					fontFamily: 'Microsoft YaHei',
-					background: { padding: [4, 4, 4, 4] }
-				}
-			}
-		}
-	})
-
-	// 节点点击处理
-	graphInstance.on('node:click', (evt) => {
-		let node = siderList.value.find(item => item.id==evt.item._cfg.model.id)
-		if (node) handleClickDecree(node)
-	});
-	graphInstance.on('edge:click', (evt) => {
-		let node = siderList.value.find(item => item.id==evt.item._cfg.model.target)
-		if (node) handleClickSider(node)
-	});
-
-	graphInstance.data({nodes: nodeList, edges: edgeList})
-  graphInstance.render()
-}
 
 const handleClickDecree = decree => {
 	window.sessionStorage.setItem("curTabName", decree.name);
@@ -293,9 +212,9 @@ const onRelationChart = () => {
 					},
 					labelCfg: {
 						style: {
-							fill: ["", "#055FC2", "#13A8A8", "#CE4F51"][1],
+							fill: ["", "#055fc2", "#13A8A8", "#CE4F51"][1],
 							background: {
-								fill: ["", "#E7F3FF", "#E6FFFB", "#FFE0E0"][1],
+								fill: ["", "#eef7ff", "#E6FFFB", "#FFE0E0"][1],
 							}
 						}
 					}
@@ -363,13 +282,10 @@ const onRelationChart = () => {
 }
 
 onMounted(() => {
-	Promise.all([onDecreeSummaryData(), handleGetRelateOrder()]).then(() => {
-		if (mainInfo.value.id && siderList.value.length) initChart()
-	})
+	initGraphChart()
 });
 
 onBeforeUnmount(() => {
-	graphInstance?.destroy()
 	graph?.destroy()
 })
 </script>
@@ -462,10 +378,6 @@ onBeforeUnmount(() => {
 		.box2-main {
 			height: 100%;
 			padding: 10px;
-			.graph-container {
-				width: 100%;
-				height: 600px;
-			}
 		}
 	}
 }

src/views/decree/decreeLayout/overview/index.vue

@@ -79,7 +79,7 @@ onMounted(() => {
 		.left {
 			position: absolute;
 			left: -160px;
-			top: 0px;
+			top: 25px;
 			width: 160px;
 			padding: 0px 16px;
 		}