合并分支 'zy-dev' 到 'pre'

src/api/decree/home.js

@@ -3,9 +3,9 @@ import request from "@/api/request.js";
 // 最新科技政令
 export function getDepartmentList(params) {
     return request({
-        method: 'GET',
+        method: 'POST',
         url: `/api/administrativeDict/department`,
-        params
+        data: params
     })
 }
 
@@ -99,15 +99,6 @@ export function getKeyOrganization(params) {
     })
 }
 
-// 所有机构
-export function getAllOrganization(params) {
-    return request({
-        method: 'POST',
-        url: `/api/administrativeOrderOverview/orderCount`,
-        data: params
-    })
-}
-
 // AI智能总结
 export function getChartInterpretation(params) {
     return request({

src/api/decree/influence.js

@@ -49,7 +49,8 @@ export function getDecreeChainNodes(params) {
 export function getDecreeRelatedEntitie(params) {
     return request({
         method: 'GET',
-        url: `/api/administrativeOrderInfo/listRelatedEntitie/${params.id}`,
+        url: `/api/organization/shareholding`,
+        params
     })
 }
 

src/views/decree/allOrganization/index.vue

@@ -30,12 +30,12 @@
       <div class="organization-list" ref="refOrganization" v-loading="organizationInfo.loading">
         <div class="organization-item" v-for="(item, index) in organizationInfo.list" :key="index" @click="handleToInstitution(item)">
           <div class="item-left">
-            <img :src="item.imgUrl || DefaultIcon2" alt="" />
+            <img :src="item.orgImage || DefaultIcon2" alt="" />
           </div>
           <div class="item-right one-line-ellipsis">{{ item.orgName }}</div>
-          <div class="item-total">{{ item.totalOrderNum }}项</div>
+          <div class="item-total">{{ item.total }}项</div>
           <el-icon color="var(--color-primary-100)"><ArrowRightBold /></el-icon>
-          <div class="item-dot" v-if="item.recentOrderNum">+{{item.recentOrderNum}}</div>
+          <div class="item-dot" v-if="item.totalRecent">+{{item.totalRecent}}</div>
         </div>
       </div>
       <div class="pagination-box">
@@ -56,7 +56,7 @@ import { Search } from '@element-plus/icons-vue'
 import router from "@/router";
 import TimeTabPane from '@/components/base/TimeTabPane/index.vue';
 
-import { getAllOrganization } from "@/api/decree/home";
+import { getDepartmentList } from "@/api/decree/home";
 
 import tipsTcon from "./assets/icons/tips-icon.png";
 import DefaultIcon2 from "@/assets/icons/default-icon2.png";
@@ -77,7 +77,7 @@ const onAllOrganization = async (num) => {
   organizationInfo.loading = true
   try {
     let {keyWord, pageNum, pageSize, day} = organizationInfo
-		const res = await getAllOrganization({day, pageNum:pageNum-1, pageSize, keyWord: keyWord||undefined});
+		const res = await getDepartmentList({day, pageNum:pageNum-1, pageSize, keyWord: keyWord||undefined});
 		console.log("机构列表", res);
 		if (res.code === 200) {
 			organizationInfo.list = res.data.orgList || [];

src/views/decree/decreeHome/index.vue

@@ -47,7 +47,7 @@
 						<div class="item-dot" v-if="item.recentOrderNum">+{{item.recentOrderNum}}</div>
 					</div>
 					<div class="organization-item" @click="onNavigateTo()">
-						<div class="item-more">查看全部机构 ({{govInsList.length+1}}家)</div>
+						<div class="item-more">查看全部机构 ({{govInsList.length}}家)</div>
 						<el-icon color="var(--color-primary-100)"><ArrowRightBold /></el-icon>
 					</div>
 				</div>
@@ -233,7 +233,7 @@
 							<div class="data-origin-icon">
 								<img :src="tipsTcon" alt="">
 							</div>
-							<div class="data-origin-text">科技政领领域分布情况，数据来源：美国各行政机构官网</div>
+							<div class="data-origin-text">科技政令领域分布情况，数据来源：美国各行政机构官网</div>
 						</div>
 						<div class="ai-pane">
 							<AiButton />
@@ -287,7 +287,7 @@
 							<div class="data-origin-icon">
 								<img :src="tipsTcon" alt="">
 							</div>
-							<div class="data-origin-text">关键科技政领列表，数据来源：美国各行政机构官网</div>
+							<div class="data-origin-text">关键科技政令列表，数据来源：美国各行政机构官网</div>
 						</div>
 					</div>
 					<div class="box8">
@@ -321,7 +321,7 @@
 							<div class="data-origin-icon">
 								<img :src="tipsTcon" alt="">
 							</div>
-							<div class="data-origin-text">科技政领重点条款词云，数据来源：美国各行政机构官网</div>
+							<div class="data-origin-text">科技政令重点条款词云，数据来源：美国各行政机构官网</div>
 						</div>
 					</div>
 				</div>
@@ -502,10 +502,10 @@ const govInsList = ref([]);
 const checkedGovIns = ref([]);
 const handleGetDepartmentList = async () => {
 	try {
-		const res = await getDepartmentList({day:7});
+		const res = await getDepartmentList({});
 		console.log("机构列表", res);
-		if (res.code === 200 && res.data) {
-			govInsList.value = res.data;
+		if (res.code === 200) {
+			govInsList.value = res.data.orgList;
 		}
 	} catch (error) {
 		console.error("获取机构列表error", error);

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

@@ -100,7 +100,7 @@ import {
 	getDecreeRelatedEntitie
 } from "@/api/decree/influence";
 import ChartChain from "./com/ChartChain.vue";
-import AiTips from "./com/AiTips.vue";
+// import AiTips from "./com/AiTips.vue";
 import GraphChart from "@/components/base/GraphChart/index.vue";
 import defaultIcon2 from "@/assets/icons/default-icon2.png";
 import noticeIcon from "./assets/images/notice-icon.png";
@@ -186,7 +186,7 @@ const headerChartData = (row) => {
 			onDecreeRelatedChain(row.id)
 		break;
 		case 2:
-			onDecreeRelatedEntitie(row.id)
+			onDecreeRelatedEntitie(row.orgId)
 		break;
 	}
 }
@@ -247,14 +247,17 @@ const graphInfo = reactive({
   nodes: [],
   links: [],
 });
-const onDecreeRelatedEntitie = async (id) => {
+const onDecreeRelatedEntitie = async (orgId) => {
 	try {
-		const res = await getDecreeRelatedEntitie({ id });
+		const res = await getDecreeRelatedEntitie({ orgId, rule:false, withSanInfo:false });
 		console.log("实体关系:", res);
 		if (res.code === 200) {
-			graphInfo.links = res.data.map(onFormatLink)
-			graphInfo.nodes = res.data.map(onFormatNode)
-			graphInfo.nodes.unshift(onFormatNode(entityInfo.node))
+			let arr1 = res.data.parentOrgList.map(item => ({ ...item, level: 1 }))
+			let arr3 = res.data.childrenOrgList.map(item => ({ ...item, level: 3 }))
+
+			graphInfo.links = [...arr1,...arr3].map(onFormatLink)
+			graphInfo.nodes = [...arr1,...arr3].map(onFormatNode)
+			graphInfo.nodes.unshift(onFormatNode({name:res.data.orgName, id:res.data.orgId}, -1))
 		}
 	} catch (error) {
 		console.log("获取实体关系失败", error);
@@ -262,17 +265,18 @@ const onDecreeRelatedEntitie = async (id) => {
 }
 const onFormatLink = (item, index) => {
 	return {
-		id: `link-${index+1}`,
-		source: item.id+'', target: entityInfo.id+'',
-		label: { show: true, color: "#055fc2", backgroundColor: "#eef7ff", borderWidth: 0, offset: [0, 15], formatter: item.relation },
+		id: `link-${index}-${item.id}`,
+		target: item.level==3 ? `${index}-${item.id}` : `-1-${entityInfo.node.orgId}`,
+		source: item.level==3 ? `-1-${entityInfo.node.orgId}` : `${index}-${item.id}`,
+		label: { show: true, color: "#055fc2", backgroundColor: "#eef7ff", borderWidth: 0, offset: [0, 15], formatter: item.description },
 		lineStyle: { color: '#B9DCFF', type: "solid", opacity: 1 }
 	}
 }
-const onFormatNode = (item) => {
-	let leader = item.id == entityInfo.id;
+const onFormatNode = (item, index) => {
+	let leader = item.id == entityInfo.node.orgId;
 	return {
-		id: item.id+'',
-		name: onWordWrap(item.companyName, 7),
+		id: `${index}-${item.id}`,
+		name: onWordWrap(item.name, 7),
 		label: {
 			show: true,
 			color: "#3b414b",