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

src/api/bill.js

@@ -14,13 +14,13 @@ export function getBillInfo(params) {
 
 // 提出人-根据动议ID获取对应的提出人信息
 /**
- * @param {id} 
+ * @param {billId} 
  * @header token
  */
 export function getBillPerson(params) {
     return request({
         method: 'GET',
-        url: `/api/billInfoBean/person/${params.id}`,
+        url: `/api/billInfoBean/person/${params.billId}`,
         params,
     })
 }
@@ -63,6 +63,18 @@ export function getBillBackground(params) {
         params,
     })
 }
+// 相关事件-根据法案ID获取相关事件信息
+/**
+ * @param {id} 
+ * @header token
+ */
+export function getBillInfoEvent(params) {
+    return request({
+        method: 'GET',
+        url: `/api/billInfoBean/event/${params.id}`,
+        params,
+    })
+}
 
 // 议员相关性-根据法案ID获取议员分析信息（现在只包括名称 支持 反对，没有标签和事件动态）
 /**
@@ -92,20 +104,20 @@ export function getBillContentId(params) {
 
 // 主要条款-根据原文ID获取条款内容
 /**
- * @param {id,cRelated,currentPage,pageSize} 
+ * @param {billid,id,cRelated,currentPage,pageSize} 
  * @header token
  */
 export function getBillContentTk(params) {
     return request({
         method: 'GET',
-        url: `/api/billInfoBean/content/tk/${params.id}`,
+        url: `/api/billInfoBean/content/tk/${params.billid}/${params.id}`,
         params,
     })
 }
 
 // 限制方式-根据法案原文ID获取限制方式列表
 /**
- * @param {id} 
+ * @param {billId} 
  * @header token
  */
 export function getBillContentXzfs(params) {

src/api/bill/billHome.js

@@ -13,11 +13,11 @@ export function getBillIndustry(params) {
 }
 
 // 涉华法案统计
-export function getBillCount() {
+export function getBillCount(params) {
   return request({
     method: 'GET',
     url: `/api/BillOverview/billCount`,
-
+    params
   })
 }
 
@@ -39,10 +39,37 @@ export function getHotBills() {
 }
 
 // 获取法案风险信号
-export function getBillRiskSignal() {
+/**
+ * @param {moduleId} 
+ */
+export function getBillRiskSignal(params) {
     return request({
         method: 'GET',
-        url: '/api/BillOverview/riskSignal',
+        // 这个是之前的接口地址，现在接口地址换成新的了所以使用新地址
+        // url: '/api/BillOverview/riskSignal',
+        url: `/api/commonFeature/riskSignal/${params.moduleId}`,
+    })
+}
+
+// 获取新闻资讯
+/**
+ * @param {moduleId} 
+ */
+export function getNews(params) {
+    return request({
+        method: 'GET',
+        url: `/api/commonFeature/news/${params.moduleId}`,
+    })
+}
+
+// 获取社交媒体
+/**
+ * @param {moduleId} 
+ */
+export function getRemarks(params) {
+    return request({
+        method: 'GET',
+        url: `/api/commonFeature/remarks/${params.moduleId}`,
     })
 }
 
@@ -65,3 +92,51 @@ export function getHylyList() {
         url: `/api/billImpactAnalysis/industry/hylyList`,
     })
 }
+
+// 获取法案提出部门
+/**
+ * @param {year} 
+ */
+export function getBillPostOrg(params) {
+    return request({
+        method: 'GET',
+        url: `/api/BillOverview/billPostOrg/${params.year}`,
+    })
+}
+
+// 获取关键议员提案
+/**
+ * @param {year} 
+ */
+export function getMemberProposal(params) {
+    return request({
+        method: 'GET',
+        url: `/api/BillOverview/memberProposal/${params.year}`,
+    })
+}
+
+// 获取资源库
+export function getBills(params, signal) {
+    return request({
+        method: 'GET',
+        url: `/api/BillOverview/bills`,
+        params,
+        signal
+    })
+}
+
+// 获取提出部门列表
+export function getPostOrgList() {
+    return request({
+        method: 'GET',
+        url: `/api/BillDict/department`,
+    })
+}
+
+// 获取提出议员列表
+export function getPostMemberList() {
+    return request({
+        method: 'GET',
+        url: `/api/BillDict/member`,
+    })
+}
\ No newline at end of file

src/api/decree/background.js

+import request from "@/api/request.js";
+
+// 提出背景
+/**
+ * @param {cRelated, currentPage, id, pageSize} 
+ */
+export function getDecreeBackground(params) {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderInfo/background/${params.id}`,
+        params
+    })
+}
+
+// 相关事件
+/**
+ * @param { id } 
+ */
+export function getDecreeRelatedEvent(params) {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderInfo/relateEvent/${params.id}`,
+        params
+    })
+}
+
+// 法律依据
+/**
+ * @param { id } 
+ */
+export function getDecreeDepend(params) {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderInfo/depend/${params.id}`,
+        params
+    })
+}
\ No newline at end of file

src/api/decree/deepdig.js

+import request from "@/api/request.js";
+
+// 根据政令ID获取领域公司信息
+/**
+ * @param {cRelated, id} 
+ */
+export function getDecreeRelateOrder(params) {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderDeepDive/relateOrder/${params.id}`,
+        params
+    })
+}
\ No newline at end of file

src/api/decree/home.js

+import request from "@/api/request.js";
+
+// 最新科技政令
+export function getDepartmentList() {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeDict/department`,
+    })
+}
+
+// 最新科技政令
+export function getLatestDecree() {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderOverview/info`,
+    })
+}
+
+// 风险信号
+export function getDecreeRiskSignal() {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderOverview/riskSignal`,
+    })
+}
+
+// 行政令发布频度
+export function getDecreeYearOrder() {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderOverview/yearOrder`,
+    })
+}
+
+// 政令涉及领域
+export function getDecreeArea() {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderOverview/industry`,
+    })
+}
+
+// 关键行政令
+export function getKeyDecree() {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderOverview/action`,
+    })
+}
+
+// 政令重点条款
+export function getDecreeKeyInstruction() {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderOverview/instruction`,
+    })
+}
+
+// 资源库
+/**
+ * @param {currentPage, pageSize, proposeName, researchTypeIds, sortFun, years} 
+ */
+export function getDecreeOrderList(params) {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderOverview/orderList`,
+        params
+    })
+}
+
+// 左侧行业领域列表
+export function getDecreehylyList(params) {
+    return request({
+        method: 'GET',
+        url: `/api/billImpactAnalysis/industry/hylyList`,
+        params
+    })
+}
\ No newline at end of file

src/api/decree/influence.js

+import request from "@/api/request.js";
+
+// 根据政令ID获取领域公司信息
+/**
+ * @param {cRelated, id} 
+ */
+export function getDecreeIndustry(params) {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderImpactAnalysis/industry/${params.id}`,
+        params
+    })
+}
+
+// 获取行业领域列表
+export function getDecreehylyList() {
+    return request({
+        method: 'GET',
+        url: `/api/billImpactAnalysis/industry/hylyList`,
+    })
+}
+
+// 根据政行业领域ID获取公司列表
+/**
+ * @param {cRelated, id} 
+ */
+export function getDecreeCompany(params) {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderImpactAnalysis/industry/company/${params.id}`,
+        params
+    })
+}
+
+// 获取政令举措落实分析
+/**
+ * @param {id} 
+ */
+export function getDecreeAction(params) {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderImpactAnalysis/action/${params.id}`,
+        params
+    })
+}

src/api/decree/introduction.js

+import request from "@/api/request.js";
+
+// 基本信息
+/**
+ * @param {id} 
+ */
+export function getDecreeBasicInfo(params) {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderInfo/basicInfo/${params.id}`,
+        params
+    })
+}
+
+// 主要指令
+/**
+ * @param {currentPage, id, pageSize} 
+ */
+export function getDecreeMainContent(params) {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderInfo/mainContent/${params.id}`,
+        params
+    })
+}
+
+// 执行机构
+/**
+ * @param {id} 
+ */
+export function getDecreeOrganization(params) {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderInfo/organization/${params.id}`,
+        params
+    })
+}
+
+// 获取全局信息
+/**
+ * @param {id} 
+ */
+export function getDecreeSummary(params) {
+    return request({
+        method: 'GET',
+        url: `/api/administrativeOrderInfo/summary/${params.id}`,
+        params
+    })
+}
\ No newline at end of file

src/api/deepdig.js

@@ -12,6 +12,18 @@ export function getBillTimeAnalyze(params) {
     })
 }
 
+// 修正案次数分析
+/**
+ * @param {id} 
+ */
+export function getBillAmeAnalyzeCount(params) {
+    return request({
+        method: 'GET',
+        url: `/api/billDeepDive/ameAnalyze/count/${params.id}`,
+        params,
+    })
+}
+
 // 根据法案ID获取党派政治献金
 /**
  * @param {id, personCongress} 
@@ -83,3 +95,38 @@ export function getProcessSummary(params) {
         params,
     })
 }
+
+// 获取党派政治献金
+/**
+ * @param {id, personCongress} 
+ */
+export function getBillPoliContribution(params) {
+    return request({
+        method: 'GET',
+        url: `/api/billDeepDive/processAnalyze/totalxj/${params.id}`,
+        params
+    })
+}
+
+// 获取主要议员政治献金
+/**
+ * @param {id, personCongress} 
+ */
+export function getBillMainPoliContribution(params) {
+    return request({
+        method: 'GET',
+        url: `/api/billDeepDive/processAnalyze/xj/${params.id}`,
+        params
+    })
+}
+
+// 根据法案ID获取人员政治献金来源及行业领域分布
+/**
+ * @param {id, personId} 
+ */
+export function getBillPersonPoliContribution(params) {
+    return request({
+        method: 'GET',
+        url: `/api/billDeepDive/processAnalyze/xj/${params.id}/${params.personId}`
+    })
+}

src/api/exportControl.js

@@ -23,7 +23,8 @@ export function getEntitiesDataCount() {
 	return request200(
 		request({
 			method: "GET",
-			url: "/api/entitiesDataCount/countData"
+			// url: "/api/entitiesDataCount/countData",
+			url: "/api/sanctionList/export/getTotalInfo"
 		})
 	);
 }
@@ -62,12 +63,15 @@ export function getEntitiesDataInfo() {
  * maxCount: number
  * }[]>}
  */
-export function getIndustryCountByYear() {
+export function getIndustryCountByYear(sanTypeId) {
 	return request200(
 		request({
 			method: "GET",
 			// url: "/api/entitiesDataCount/industryCountByYear"
-			url: "/api/entitiesDataCount/getAnnualCount"
+			url: "/api/entitiesDataCount/getAnnualCount",
+			params: {
+				sanTypeId
+			}
 		})
 	);
 }
@@ -84,11 +88,16 @@ export function getIndustryCountByYear() {
  * domains: string[]
  * }>}
  */
-export function getCountDomainByYear() {
+export function getCountDomainByYear(isRule, startYear = "2020", endYear = String(new Date().getFullYear())) {
 	return request200(
 		request({
-			method: "GET",
-			url: "/api/entitiesDataCount/countDomainByYear"
+			method: "POST",
+			url: "/api/entitiesDataCount/getAnnualSanDomain",
+			data: {
+				isRule,
+				startYear,
+				endYear
+			}
 		})
 	);
 }
@@ -153,6 +162,42 @@ export function getOrganizationInfo(sanTypeId = 1) {
 	);
 }
 
+/**
+ * 风险信号
+ */
+export function getRiskSignal(moduleId = "0103") {
+	return request200(
+		request({
+			method: "GET",
+			url: `/api/commonFeature/riskSignal/${moduleId}`
+		})
+	);
+}
+
+/**
+ * 社交媒体
+ */
+export function getSocialMediaInfo(moduleId = "0103") {
+	return request200(
+		request({
+			method: "GET",
+			url: `/api/commonFeature/remarks/${moduleId}`
+		})
+	);
+}
+
+/**
+ * 新闻资讯
+ */
+export function getNewsInfo(moduleId = "0103") {
+	return request200(
+		request({
+			method: "GET",
+			url: `/api/commonFeature/news/${moduleId}`
+		})
+	);
+}
+
 /**
  * 查询重点人物
  * @returns {Promise<{
@@ -187,6 +232,21 @@ export function getKeyEntityList(date, keyword = "") {
 	);
 }
 
+/**
+ * 区域分布查询
+ */
+export function getAreaDistribution(date) {
+	return request200(
+		request({
+			method: "GET",
+			url: "/api/entitiesDataInfo/getRegionDistribution",
+			params: {
+				sanctionDate: date || "2025-11-11"
+			}
+		})
+	);
+}
+
 /**
  * 不同领域实体统计
  * @param {string} startTime - 统计开始时间，格式为 'YYYY-MM-DD'
@@ -292,7 +352,7 @@ export function getDomainDistribution(sanctionDate = "2025-11-11") {
  * startTime: string
  * }[]>}
  */
-export function getEntitiesList(typeName = "实体清单", pageNum = 1, pageSize = 10) {
+export function getEntitiesList(typeName = "实体清单", pageNum = 1, pageSize = 10, sanctionDate = "", rule = false) {
 	return request200(
 		request({
 			method: "POST",
@@ -300,7 +360,9 @@ export function getEntitiesList(typeName = "实体清单", pageNum = 1, pageSize
 			data: {
 				typeName,
 				pageNum,
-				pageSize
+				pageSize,
+				sanctionDate,
+				rule
 			}
 		})
 	);
@@ -340,15 +402,16 @@ export function getCompareCountSan(startTime) {
  * count:number
  * }[]>}
  */
-export function getEntitiesChangeCount(domain, type) {
+export function getEntitiesChangeCount(domianId, typeId) {
 	return request200(
 		request({
 			method: "GET",
 			// url: '/api/entitiesDataCount/entitiesChangeCount',
-			url: "/api/entitiesDataCount/sanCountByYear",
+			// url: "/api/entitiesDataCount/sanCountByYear",
+			url: "/api/entitiesDataInfo/getCountByDomianAndType",
 			params: {
-				domain,
-				type
+				domianId,
+				typeId
 			}
 		})
 	);
@@ -377,11 +440,14 @@ export function getEntitiesGrowthTrend() {
  * xAxis: string[]
  * }>}
  */
-export function getEntitiesUpdateCount() {
+export function getEntitiesUpdateCount(sanTypeId = 1) {
 	return request200(
 		request({
 			method: "GET",
-			url: "/api/entitiesDataCount/entitiesUpdateCount"
+			url: "/api/entitiesDataCount/getAnnualCount",
+			params: {
+				sanTypeId
+			}
 		})
 	);
 }
@@ -389,11 +455,14 @@ export function getEntitiesUpdateCount() {
 /**
  * 制裁领域分析
  */
-export function getSanDomainCount() {
+export function getSanDomainCount(rule) {
 	return request200(
 		request({
 			method: "GET",
-			url: "/api/entitiesDataCount/getSanDomainCount"
+			url: "/api/entitiesDataCount/getSanDomainCount",
+			params: {
+				rule
+			}
 		})
 	);
 }
@@ -494,9 +563,10 @@ export function getCountSanTypeByTime(startTime) {
 	return request200(
 		request({
 			method: "GET",
-			url: "/api/entitiesDataCount/countSanTypeByTime",
+			// url: "/api/entitiesDataCount/countSanTypeByTime",
+			url: "/api/entitiesDataInfo/getTypeDistribution",
 			params: {
-				startTime
+				sanctionDate: startTime || "2025-11-11"
 			}
 		})
 	);

src/api/general/index.js

+import request from "@/api/request.js";
+
+// 新闻资讯
+/**
+ * @param {moduleId} 
+ */
+export function getNews(params) {
+    return request({
+        method: 'GET',
+        url: `/api/commonFeature/news/${params.moduleId}`,
+        params
+    })
+}
+
+// 社交媒体
+/**
+ * @param {moduleId} 
+ */
+export function getSocialMedia(params) {
+    return request({
+        method: 'GET',
+        url: `/api/commonFeature/remarks/${params.moduleId}`,
+        params
+    })
+}
+
+// 风险信号
+/**
+ * @param {moduleId} 
+ */
+export function getRiskSignal(params) {
+    return request({
+        method: 'GET',
+        url: `/api/commonFeature/riskSignal/${params.moduleId}`,
+        params
+    })
+}
\ No newline at end of file

src/api/influence.js

@@ -31,3 +31,16 @@ export function getHylyList() {
         url: `/api/billImpactAnalysis/industry/hylyList`,
     })
 }
+
+
+// 获取公司详情
+/**
+ * @param {billId,companyId,id} 
+ */
+export function getCompanyDetail(params) {
+    return request({
+        method: 'GET',
+        url: `/api/billImpactAnalysis/industry/companyDetail/${params.billId}/${params.id}/${params.companyId}`,
+        params,
+    })
+}
\ No newline at end of file

src/components/button/button.vue

@@ -32,6 +32,7 @@ const emit = defineEmits(["click"]);
 	cursor: pointer;
 	padding-left: 8px;
 	padding-right: 8px;
+	flex-shrink: 0;
 }
 .activeButton {
 	border: 1px solid rgb(10, 87, 166);

src/components/buttonList/buttonList.vue

@@ -61,5 +61,7 @@ function setActiveIndex(item) {
 .buttonList {
 	display: flex;
 	gap: 8px;
+	overflow-x: auto;
+	flex-wrap: wrap;
 }
 </style>

src/router/modules/decree.js

@@ -6,7 +6,6 @@ import DecreeIntroduction from "@/views/decree/decreeLayout/overview/introductio
 import DecreeBackground from "@/views/decree/decreeLayout/overview/background/index.vue";
 import DecreeDeepDig from "@/views/decree/decreeLayout/deepdig/index.vue";
 import DecreeInfluence from "@/views/decree/decreeLayout/influence/index.vue";
-
 import Institution from "@/views/decree/institution/index.vue"
 
 const decreeRoutes = [

src/router/modules/portal.js

-import Portal1 from "@/views/portals/portal1/index.vue";
+import Portal from "@/views/portals/portal1/index.vue";
 import Portal2 from "@/views/portals/portal2/index.vue";
 
 const portalRoutes = [
   // 门户
   {
-    path: "/portal1",
-    name: "portal1",
-    component: Portal1,
+    path: "/portal",
+    name: "portal",
+    component: Portal,
     meta: {
       title: "门户"
     }

src/views/bill/background/index.vue

@@ -35,8 +35,8 @@
               v-for="(item, index) in backgroundList"
               :key="item.id"
             >
-              <div class="id">{{ index + 1 }}</div>
-              <div class="title">{{ item.bjnr }}</div>
+              <div class="id">{{ (currentPage - 1) * 10 + index + 1 }}</div>
+              <div class="title">{{ item.backgroundTitle }}</div>
               <div class="share">
                 <img src="./assets/icons/open.png" alt="打开" />
               </div>
@@ -45,7 +45,7 @@
           <div class="box1-main-footer">
             <div class="info">
               {{
-                `共有${backgroundList.length}条${
+                `共有${total}条${
                   box1BtnActive === 1 ? "涉华" : "全部"
                 }背景`
               }}
@@ -54,7 +54,9 @@
               <el-pagination
                 background
                 layout="prev, pager, next"
-                :total="backgroundList.length"
+                :total="total"
+                v-model:current-page="currentPage"
+                @current-change="handleGetBillBackground"
               />
             </div>
           </div>
@@ -80,7 +82,7 @@
             :key="index"
           >
             <div class="left">
-              <img :src="item.image" alt="" />
+              <img :src="item.imageUrl || item.image" alt="" />
             </div>
             <div class="center">
               <div class="title">{{ item.sjbt }}</div>
@@ -157,7 +159,7 @@
               /></el-icon>
             </div>
             <div class="right-box1-main-bottom">
-              <WordCloudMap :data="wordCloudData" :shape="circle" />
+              <WordCloudMap :data="wordCloudData" shape="circle" />
             </div>
           </div>
         </div>
@@ -214,25 +216,26 @@ import {
   getBillBackground,
   getBillEvent,
   getBillPersonAnalyze,
+  getBillInfoEvent
 } from "@/api/bill";
 
 const box1BtnActive = ref(1);
+const currentPage = ref(1);
+const total = ref(0);
+
 const handleClickBox1Btn = (index) => {
   box1BtnActive.value = index;
-  if (index === 2) {
-    handleGetBillBackground(false);
-  } else {
-    handleGetBillBackground(true);
-  }
+  currentPage.value = 1;
+  handleGetBillBackground();
 };
 
 const box2BtnActive = ref(1);
 const handleClickBox2Btn = (index) => {
   box2BtnActive.value = index;
   if (index === 1) {
-    handleGetBillPersonAnalyze(true);
-  } else {
     handleGetBillPersonAnalyze(false);
+  } else {
+    handleGetBillPersonAnalyze(true);
   }
 };
 
@@ -439,27 +442,29 @@ const wordCloudData = [
 ];
 
 // 获取立法背景内容
-const handleGetBillBackground = async (cRelated) => {
+const handleGetBillBackground = async () => {
+  const cRelated = box1BtnActive.value === 1 ? 'Y' : 'N';
   const params = {
     cRelated: cRelated,
     id: window.sessionStorage.getItem("billId"),
-    currentPage: 0,
+    currentPage: currentPage.value - 1,
     pageSize: 10,
   };
   try {
     const res = await getBillBackground(params);
     console.log("立法背景", res);
     backgroundList.value = res.data.content;
+    total.value = res.data.totalElements; // 假设API返回totalElements
   } catch (error) {}
 };
 
 // 获取相关事件
 const handleGetRelatedEvent = async () => {
   const params = {
-    id: 1,
+    id: window.sessionStorage.getItem("billId"),
   };
   try {
-    const res = await getBillEvent(params);
+    const res = await getBillInfoEvent(params);
     console.log("相关事件", res);
     eventList.value = res.data;
     eventList.value.forEach((item, index) => {
@@ -488,8 +493,9 @@ const handleGetBillPersonAnalyze = async (isOppose) => {
     const res = await getBillPersonAnalyze(params);
     console.log("议员相关性分析", res);
     personList.value = res.data;
-    personList.value.forEach((item) => {
-      item.image = user1;
+    personList.value.forEach((item, index) => {
+      const imgList = [user1, user2, user3, user4, user5];
+      item.image = imgList[index % imgList.length];
       item.icon = userIcon;
       item.icon1 = userIcon1;
     });
@@ -497,9 +503,9 @@ const handleGetBillPersonAnalyze = async (isOppose) => {
 };
 
 onMounted(() => {
-  handleGetBillBackground(true);
+  handleGetBillBackground();
   handleGetRelatedEvent();
-  handleGetBillPersonAnalyze(true);
+  // handleGetBillPersonAnalyze(false);
 });
 </script>
 
@@ -572,7 +578,7 @@ onMounted(() => {
           display: flex;
           flex-wrap: wrap;
           justify-content: space-between;
-
+          align-content: flex-start;
           .box1-main-item {
             width: 544px;
             height: 48px;
@@ -598,11 +604,12 @@ onMounted(() => {
               width: 440px;
               height: 48px;
               line-height: 48px;
-              color: rgba(95, 101, 108, 1);
-              font-family: Microsoft YaHei;
-              font-size: 14px;
+              color: rgb(59, 65, 75);
+              font-family: "Microsoft YaHei";
+              font-size: 16px;
               font-weight: 400;
               text-align: left;
+              overflow: hidden;
             }
             .share {
               margin-left: 13px;
@@ -626,8 +633,8 @@ onMounted(() => {
           .info {
             height: 22px;
             line-height: 22px;
-            color: rgba(132, 136, 142, 1);
-            font-family: Microsoft YaHei;
+            color: rgb(132, 136, 142);
+            font-family: "Microsoft YaHei";
             font-size: 14px;
             font-weight: 400;
             text-align: left;
@@ -645,6 +652,7 @@ onMounted(() => {
         margin-top: 9px;
         margin-left: 23px;
         height: 300px;
+        overflow: auto;
         .box2-main-item {
           width: 1103px;
           height: 60px;
@@ -659,9 +667,9 @@ onMounted(() => {
             width: 64px;
             height: 48px;
             border-radius: 2px;
-            image {
-              width: 100px;
-              height: 100%;
+            img {
+              width: 64px;
+              height: 48px;
             }
           }
           .center {

src/views/bill/billHome/utils/doublePieChart.js

@@ -16,11 +16,9 @@ const getDoublePieChart = (data1, data2) => {
         },
         label: {
           position: 'inside',
-          textStyle: {
           fontSize: '16px',
           fontWeight: 700,
           // color: '#333'
-          }
         },
         data: data1.map(item => {
           return {

src/views/bill/billHome/utils/multiLineChart.js

 import * as echarts from 'echarts'
 
-const getMultiLineChart = (dataX, dataY1, dataY2) => {
+const getMultiLineChart = (dataX, dataY1, dataY2, dataY3) => {
   return {
     tooltip: {
       trigger: 'axis',
@@ -9,25 +9,34 @@ const getMultiLineChart = (dataX, dataY1, dataY2) => {
         label: {
           backgroundColor: '#6a7985'
         }
+      },
+      formatter: function (params) {
+        let res = params[0].name + '<br/>';
+        params.forEach(item => {
+            res += item.marker + item.seriesName + ': ' + item.value + (item.seriesName === '通过率' ? '%' : '') + '<br/>';
+        });
+        return res;
       }
     },
     grid: {
-      top: '8%',
+      top: '15%',
       right: '5%',
       bottom: '5%',
       left: '5%',
       containLabel: true
     },
     legend: {
-      data: ['提出法案', '通过法案'],
+      data: ['提出法案', '通过法案', '通过率'],
       show: true,
+      top: 0,
+      icon: 'circle',
       textStyle: {
         color: 'rgba(95, 101, 108, 1)',
         fontFamily: 'Microsoft YaHei',
-        fontSize: '16px',
+        fontSize: '14px',
       }
     },
-    color: ['#1459bb', '#fa8c16'],
+    color: ['#1677FF', '#FA8C16', '#D9001B'],
     xAxis: [
       {
         type: 'category',
@@ -37,44 +46,80 @@ const getMultiLineChart = (dataX, dataY1, dataY2) => {
     ],
     yAxis: [
       {
-        type: 'value'
+        type: 'value',
+        position: 'left',
+        axisLabel: {
+            color: '#666'
+        }
+      },
+      {
+        type: 'value',
+        position: 'right',
+        min: 0,
+        max: 100,
+        interval: 20,
+        axisLabel: {
+            formatter: '{value}%',
+            color: '#666'
+        },
+        splitLine: {
+            show: false
+        }
       }
     ],
     series: [
       {
         name: '提出法案',
         type: 'line',
-
+        symbol: 'emptyCircle',
+        symbolSize: 6,
         areaStyle: {
           color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
             offset: 0,
-            color: 'rgba(22, 119, 255, 1)' // 起始颜色
+            color: 'rgba(22, 119, 255, 0.4)' // 起始颜色
           }, {
             offset: 1,
             color: 'rgba(22, 119, 255, 0)' // 结束颜色
           }])
         },
-        emphasis: {
-          focus: 'series'
+        itemStyle: {
+            color: '#1677FF'
         },
         data: dataY1
       },
       {
         name: '通过法案',
         type: 'line',
+        symbol: 'emptyCircle',
+        symbolSize: 6,
         areaStyle: {
           color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
             offset: 0,
-            color: 'rgba(255, 172, 77, 1)' // 起始颜色
+            color: 'rgba(250, 140, 22, 0.4)' // 起始颜色
           }, {
             offset: 1,
-            color: 'rgba(255, 172, 77, 0)' // 结束颜色
+            color: 'rgba(250, 140, 22, 0)' // 结束颜色
           }])
         },
-        emphasis: {
-          focus: 'series'
+        itemStyle: {
+            color: '#FA8C16'
         },
         data: dataY2
+      },
+      {
+        name: '通过率',
+        type: 'line',
+        yAxisIndex: 1,
+        symbol: 'emptyCircle',
+        symbolSize: 4,
+        lineStyle: {
+            type: 'dashed',
+            width: 2
+        },
+        itemStyle: {
+            color: '#D9001B'
+        },
+        data: dataY3
       }
     ]
   }

src/views/bill/billHome/utils/worldCloudChart.js

@@ -11,6 +11,8 @@ const getWordCloudChart = (data) => {
     series: [
       {
         type: "wordCloud",
+        width: '80%',
+        height: '80%',
         shape: "rect",  // 
         // 其他形状你可以使用形状路径
         // 或者自定义路径

src/views/bill/billLayout/index.vue

@@ -212,6 +212,7 @@ onMounted(() => {
 	height: 1016px;
 	background: rgba(249, 250, 252, 1);
 	position: relative;
+	// margin: 0 auto;
 	.layout-header {
 		width: 1920px;
 		height: 64px;

src/views/bill/deepDig/poliContribution/utils/piechart.js

@@ -14,14 +14,19 @@ const getPieChart = (data,colorList) => {
       },
       label: {
         alignTo: 'edge',
-        formatter: '{name|{b}}\n{time|{c} 条 {d}%}',
+        formatter: '{name|{b}}\n{time|{d}%}',
         minMargin: 5,
         edgeDistance: 10,
         lineHeight: 15,
         rich: {
           time: {
-            fontSize: 10,
-            color: '#999'
+            fontSize: 12,
+            color: '#666'
+          },
+          name: {
+            fontSize: 14,
+            color: '#333',
+            fontWeight: 'bold'
           }
         }
       },

src/views/bill/deepDig/poliContribution/utils/sankey.js

 
 
-const getSankeyChart = () => {
+const getSankeyChart = (data = [], links = []) => {
   const option = {
+    tooltip: {
+      trigger: 'item',
+      triggerOn: 'mousemove'
+    },
     series: {
       type: 'sankey',
       layout: 'none',
-      left: '5%',
-      right: '5%',
+      left: '1%',
+      right: '1%',
       top: '5%',
       bottom: '5%',
       emphasis: {
         focus: 'adjacency'
       },
       nodeWidth: 50,
+      nodeGap: 2,
+      layoutIterations: 32,
+      lineStyle: {
+        color: 'source',
+        curveness: 0.5
+      },
       label: {
         show: true,
         formatter: function (params) {
-          return `${params.name} $${params.value}`;
+          return `${params.name} $${params.value.toLocaleString()}`;
         },
         position: 'right',
-        textStyle: {
-          fontSize: '16px',
+        fontSize: 16,
         color: '#555'
-        }
-      },
-      data: [
-        {
-          name: '马尔科·卢比奥',
-          label: {
-            position: 'left'
-          }
-        },
-        {
-          name: '成长俱乐部'
-        },
-        {
-          name: '埃利奥特管理公司'
-        },
-        {
-          name: '高盛集团'
-        },
-        {
-          name: '黑石集团'
       },
-        {
-          name: '佛罗里达水晶'
-        },
-        {
-          name: '美国银行'
-        }
-
-      ],
-      links: [
-        {
-          source: '成长俱乐部',
-          target: '马尔科·卢比奥',
-          value: 680751
-        },
-        {
-          source: '埃利奥特管理公司',
-          target: '马尔科·卢比奥',
-          value: 440120
-        },
-        {
-          source: '高盛集团',
-          target: '马尔科·卢比奥',
-          value: 371517
-        },
-        {
-          source: '黑石集团',
-          target: '马尔科·卢比奥',
-          value: 259321
-        },
-        {
-          source: '佛罗里达水晶',
-          target: '马尔科·卢比奥',
-          value: 203775
-        },
-        {
-          source: '美国银行',
-          target: '马尔科·卢比奥',
-          value: 150892
-        }
-      ]
+      data: data,
+      links: links
     }
   };
 

src/views/bill/deepDig/processAnalysis/utils/boxplot.js

 
-const getBoxPlotChcart = (data,unit) => {
+const getBoxPlotChcart = (data, unit, labelConfig = {}) => {
+  const labels = {
+    max: labelConfig.max || '最大耗时',
+    q3: labelConfig.q3 || '平均耗时大',
+    median: labelConfig.median || '耗时中位数',
+    q1: labelConfig.q1 || '平均耗时小',
+    min: labelConfig.min || '最小耗时',
+    current: labelConfig.current || '该法案耗时'
+  };
+
   let option = {
     // title: [
     //   {
@@ -11,6 +20,22 @@ const getBoxPlotChcart = (data,unit) => {
       trigger: 'item',
       axisPointer: {
         type: 'shadow'
+      },
+      formatter: function (params) {
+        if (params.seriesType === 'scatter') {
+            return `${params.name}<br/>${labels.current}: ${params.data[1]} ${unit}`;
+        }
+        const { name, data } = params;
+        let tip = `${name}<br/>`;
+        tip += `${labels.max}: ${data[5]} ${unit}<br/>`;
+        tip += `${labels.q3}: ${data[4]} ${unit}<br/>`;
+        tip += `${labels.median}: ${data[3]} ${unit}<br/>`;
+        tip += `${labels.q1}: ${data[2]} ${unit}<br/>`;
+        tip += `${labels.min}: ${data[1]} ${unit}<br/>`;
+        if (data[6] !== undefined && data[6] !== null) {
+          tip += `${labels.current}: ${data[6]} ${unit}`;
+        }
+        return tip;
       }
     },
     grid: {
@@ -48,13 +73,20 @@ const getBoxPlotChcart = (data,unit) => {
       {
         name: 'boxplot',
         type: 'boxplot',
-        datasetIndex: 1,
         data: data.dataY,
       },
       {
-        name: 'outlier',
+        name: labels.current,
         type: 'scatter',
-        datasetIndex: 2
+        data: data.dataY.map((item, index) => [index, item[5]]),
+        itemStyle: {
+          color: '#ff5722'
+        },
+        tooltip: {
+          formatter: function (params) {
+            return `${params.name}<br/>${labels.current}: ${params.data[1]} ${unit}`;
+          }
+        }
       }
     ]
   }