提交 8148dacc authored 作者: 张伊明's avatar 张伊明

合并分支 'liuyuqi' 到 'pre'

Liuyuqi 查看合并请求 !227
流水线 #57 已通过 于阶段
in 6 分 15 秒
...@@ -328,16 +328,20 @@ export function getProgressPrediction(billId) { ...@@ -328,16 +328,20 @@ export function getProgressPrediction(billId) {
/** /**
* 获取相似法案列表 * 获取相似法案列表
* @param {Object} params - 查询参数 * @param {Object} params - 查询参数
* @param {string} params.patternType - 政府结构类型,如 "统一政府" * @param {string} params.billIds - 当前法案的ID
* @param {string} params.proposalType - 提案类型,默认 "两党共同提案" * @param {string[]} params.domains - 领域名称列表
* @param {string} params.patternType - 政府结构类型,如 "统一政府"/"分裂政府"/"微弱多数"
* @param {string} params.proposalType - 提案类型,如 "两党共同提案"/"单政党提案(共和党提案)"/"单政党提案(民主党提案)"
* @returns {Promise<Object>} 相似法案列表 * @returns {Promise<Object>} 相似法案列表
*/ */
export function getSimiBills(params = {}) { export function getSimiBills(params = {}) {
return request('/api/BillProgressPrediction/simiBills', { return request('/api/BillProgressPrediction/simiBills', {
method: 'GET', method: 'GET',
params: { params: {
patternType: params.patternType || '统一政府', billIds: params.billIds,
proposalType: params.proposalType || '两党共同提案', domains: params.domains,
patternType: params.patternType ,
proposalType: params.proposalType ,
...params ...params
} }
}) })
...@@ -400,31 +404,42 @@ export function transformSimiBillsData(apiData) { ...@@ -400,31 +404,42 @@ export function transformSimiBillsData(apiData) {
const transformedBills = bills.map(bill => ({ const transformedBills = bills.map(bill => ({
id: bill.bill_id, id: bill.bill_id,
title: bill.bill_name || bill.bill_id, title: bill.bill_name || bill.bill_id,
tags: [bill.poli_pattern_type, bill.bill_proposal_type].filter(Boolean), proposalDate: extractProposalDate(bill.poli_pattern_desc),
passTime: extractPassTime(bill.bill_actions), areas: bill.domain_name ? (Array.isArray(bill.domain_name) ? bill.domain_name : [bill.domain_name]) : [],
totalDays: calculateTotalDays(bill.bill_actions), proposer: extractProposer(bill.bill_sponsors),
selected: true, // 默认全选 coProposers: bill.bill_proposal_desc || '',
_raw: bill governmentType: formatGovernmentType(bill.poli_pattern_type, bill.poli_pattern_desc),
passDays: calculateTotalDays(bill.bill_actions),
selected: true // 默认全选
})) }))
return { stats, bills: transformedBills } return { stats, bills: transformedBills }
} }
/** /**
* 从法案动作中提取通过时间 * 从政治格局描述中提取提案时间
* @param {Array} actions - 法案动作列表 * @param {string} desc - 政治格局描述
* @returns {string} 通过时间 * @returns {string} 提案时间
*/ */
function extractPassTime(actions) { function extractProposalDate(desc) {
if (!actions || actions.length === 0) return '' if (!desc) return ''
// 找到最后一个动作的日期 const match = desc.match(/(\d{4})-(\d{2})-(\d{2})/)
const lastAction = actions[actions.length - 1] if (match) {
if (lastAction && lastAction.action_date) { return `${match[1]}${parseInt(match[2])}${parseInt(match[3])}日`
const date = new Date(lastAction.action_date)
return `${date.getFullYear()}${date.getMonth() + 1}${date.getDate()}日`
} }
return '' return ''
} }
/**
* 从提案人列表中提取主提案人
* @param {Array} sponsors - 提案人列表
* @returns {string} 主提案人姓名
*/
function extractProposer(sponsors) {
if (!sponsors || sponsors.length === 0) return ''
const mainProposer = sponsors.find(s => s.sponsor_type === '提案人')
return mainProposer ? mainProposer.person_name : ''
}
/**
/** /**
* 计算法案总耗时 * 计算法案总耗时
...@@ -488,29 +503,30 @@ export function transformProposalInfo(apiData) { ...@@ -488,29 +503,30 @@ export function transformProposalInfo(apiData) {
} }
return { return {
// 提案标题 - 需要从其他 API 获取或使用默认值 // 提案标题
title: data.bill_title || 'H.R.1-大而美法案', title: data.bill_title || 'H.R.1-大而美法案',
// 提案时间 - 从政治格局描述中提取或使用默认值 // 提案时间 - 从政治格局描述中提取
date: extractDateFromDesc(data.poli_pattern_desc) || '2025年5月20日', date: extractDateFromDesc(data.poli_pattern_desc) || '2025年5月20日',
// 涉及领域 // 涉及领域 TAG - 使用 domain_name
areas: data.domain_name || [], areas: Array.isArray(data.domain_name) ? data.domain_name : (data.domain_name ? [data.domain_name] : []),
// 选举周期阶段 - 从政治格局描述推断 // 政策领域完整选项列表 - 使用 bill_domain(用于筛选下拉框)
electionPhase: inferElectionPhase(data.poli_pattern_desc) || '执政初期/蜜月期', billDomain: Array.isArray(data.bill_domain) ? data.bill_domain : [],
// 政策领域默认已选项 - 使用 domain_name
defaultDomains: Array.isArray(data.domain_name) ? data.domain_name : (data.domain_name ? [data.domain_name] : []),
// 提案人 // 提案人
proposer: mainProposer ? `${mainProposer.person_name}` : '', proposer: mainProposer ? mainProposer.person_name : '',
// 共同提案人 // 共同提案人
coProposers: coProposersDesc, coProposers: coProposersDesc,
// 提案人职务 - 需要从其他 API 获取
proposerPosition: data.proposer_position || '委员会主席',
// 政府结构类型 // 政府结构类型
governmentType: formatGovernmentType(data.poli_pattern_type, data.poli_pattern_desc), governmentType: formatGovernmentType(data.poli_pattern_type, data.poli_pattern_desc),
// 法案预算规模 - 需要从其他 API 获取 // 政治格局类型(用于筛选条件默认值)
budgetScale: data.budget_scale || '4万亿美元', patternType: data.poli_pattern_type || '统一政府',
// 原始数据,供筛选条件使用 // 原始数据,供筛选条件使用
_raw: data _raw: data
} }
} }
/** /**
* 从政治格局描述中提取日期 * 从政治格局描述中提取日期
* @param {string} desc - 政治格局描述 * @param {string} desc - 政治格局描述
...@@ -578,9 +594,7 @@ export function generateDefaultFilters(proposalInfo) { ...@@ -578,9 +594,7 @@ export function generateDefaultFilters(proposalInfo) {
// 提案人职务 // 提案人职务
proposerPosition: proposalInfo.proposerPosition === '委员会主席' ? ['chairman'] : [], proposerPosition: proposalInfo.proposerPosition === '委员会主席' ? ['chairman'] : [],
// 政府结构类型 // 政府结构类型
governmentType: proposalInfo.governmentType.includes('一致') ? ['unified'] : ['divided'], governmentType: proposalInfo.governmentType.includes('一致') ? ['unified'] : ['divided'],
// 选举周期阶段
electionPhase: proposalInfo.electionPhase.includes('蜜月') ? ['honeymoon'] : [],
// 法案预算规模 // 法案预算规模
budgetScale: ['trillion_plus'], budgetScale: ['trillion_plus'],
// 对方党派提案人 // 对方党派提案人
...@@ -589,3 +603,19 @@ export function generateDefaultFilters(proposalInfo) { ...@@ -589,3 +603,19 @@ export function generateDefaultFilters(proposalInfo) {
proposalTime: ['recent_5'] proposalTime: ['recent_5']
} }
} }
/**
* 获取预测分析结果
* @param {Object} params - 请求参数
* @param {string} params.bill_id - 当前法案ID
* @param {string} params.bill_name - 当前法案名称
* @param {Array} params.bill_actions - 当前法案动作列表
* @param {Array} params.bill_sponsors - 当前法案提案人列表
* @param {Array} params.simi_bills - 用户勾选的相似法案列表
* @returns {Promise<Object>} 预测分析结果
*/
export function getPassProd(params) {
return request('/api/BillProgressPrediction/passProd', {
method: 'POST',
data: params
})
}
\ No newline at end of file
...@@ -138,120 +138,118 @@ export function getPersonList(params) { ...@@ -138,120 +138,118 @@ export function getPersonList(params) {
params params
}) })
} }
//创新主体科研实力:专利数量统计 //合作情况:与中国合作数量变化
export function getPatentList(params) { export function getCooperateNumWithChina(params) {
return request({ return request({
method: 'GET', method: 'GET',
url: `/api/innovateSubject/patentList/${params.id}`, url: `/api/innovateSubject/cooperateNumWithChina/${params.id}`,
params params
}) })
} }
// 合作情况:与中国合作类型变化
// 创新主体科研实力:论文数量统计 export function getCooperateTypeWithChina(params) {
export function getPaperList(params) {
return request({ return request({
method: 'GET', method: 'GET',
url: `/api/innovateSubject/paperList/${params.id}`, url: `/api/innovateSubject/cooperateTypeWithChina/${params.year}/${params.id}`,
params params
}) })
} }
//创新主体科研实力:领域实力分布 // 合作情况:与中国合作领域变化
export function getStudyFieldList(params) { export function getCooperateAreaWithChina(params) {
return request({ return request({
method: 'GET', method: 'GET',
url: `/api/innovateSubject/studyFieldList/${params.id}`, url: `/api/innovateSubject/cooperateAreaWithChina/${params.id}`,
params
}) })
} }
//创新主体科研实力:经费增长情况 //合作情况:与中国合作经费变化
export function getFundGrowth(params) { export function getCooperateFundWithChina(params) {
return request({ return request({
method: 'GET', method: 'GET',
url: `/api/innovateSubject/fundGrowth/${params.id}`, url: `/api/innovateSubject/cooperateFundWithChina/${params.id}`,
params params
}) })
} }
//创新主体科研实力:经费来源 //合作情况:与中国合作事例
export function getFundFromList(params) { export function getCooperateExampleWithChina(params) {
return request({ return request({
method: 'GET', method: 'GET',
url: `/api/innovateSubject/fundFromList/${params.id}`, url: `/api/innovateSubject/cooperateExampleWithChina/${params.id}`,
params params
}) })
} }
//创新主体科研实力:经费分配
export function getFundToList(params) {
// 专利数量统计
export function getPatentList(orgId) {
return request({ return request({
method: 'GET', method: "GET",
url: `/api/innovateSubject/fundToList/${params.id}`, url: `/api/innovateSubject/patentList/${orgId}`
params
}) })
} }
//合作情况:与中国合作数量变化 // 论文数量统计
export function getCooperateNumWithChina(params) { export function getPaperList(orgId) {
return request({ return request({
method: 'GET', method: "GET",
url: `/api/innovateSubject/cooperateNumWithChina/${params.id}`, url: `/api/innovateSubject/paperList/${orgId}`
params
}) })
} }
// 合作情况:与中国合作类型变化 // 领域实力分布
export function getCooperateTypeWithChina(params) { export function getStudyFieldList(orgId) {
return request({ return request({
method: 'GET', method: "GET",
url: `/api/innovateSubject/cooperateTypeWithChina/${params.year}/${params.id}`, url: `/api/innovateSubject/studyFieldList/${orgId}`
params
}) })
} }
// 合作情况:与中国合作领域变化 // 经费增长情况
export function getCooperateAreaWithChina(params) { export function getFundGrowth(orgId) {
return request({ return request({
method: 'GET', method: "GET",
url: `/api/innovateSubject/cooperateAreaWithChina/${params.id}`, url: `/api/innovateSubject/fundGrowth/${orgId}`
params
}) })
} }
//合作情况:与中国合作经费变化 // 经费来源
export function getCooperateFundWithChina(params) { export function getFundFromList(orgId) {
return request({ return request({
method: 'GET', method: "GET",
url: `/api/innovateSubject/cooperateFundWithChina/${params.id}`, url: `/api/innovateSubject/fundFromList/${orgId}`
params
}) })
} }
//合作情况:与中国合作事例 // 经费分配
export function getCooperateExampleWithChina(params) { export function getFundToList(orgId) {
return request({ return request({
method: 'GET', method: "GET",
url: `/api/innovateSubject/cooperateExampleWithChina/${params.id}`, url: `/api/innovateSubject/fundToList/${orgId}`
params
}) })
} }
// 获取实验室列表
//创新主体其他情况:重点实验室 export function getLabList(orgId) {
export function getLabList(params) {
return request({ return request({
method: 'GET', method: 'GET',
url: `/api/innovateSubject/labList/${params.id}`, url: `/api/innovateSubject/labList/${orgId}`
}) })
} }
//创新主体其他情况:政策文件 // 获取政策文件列表
export function getPolicyList(params) { export function getPolicyList(orgId, currentPage = 1, pageSize = 6) {
return request({ return request({
method: 'GET', method: 'GET',
url: `/api/innovateSubject/policyList/${params.id}`, url: `/api/innovateSubject/policyList/${orgId}`,
params params: { currentPage, pageSize }
}) })
} }
\ No newline at end of file
...@@ -4,22 +4,20 @@ const InnovationInstitution = () => import('@/views/innovationSubject/innovative ...@@ -4,22 +4,20 @@ const InnovationInstitution = () => import('@/views/innovationSubject/innovative
const innovationSubjectRoutes = [ const innovationSubjectRoutes = [
//创新主体
{ {
path: "/innovationSubject", path: "/innovationSubject",
name: "InnovationSubject", name: "InnovationSubject",
component: InnovationSubject, component: InnovationSubject,
meta: { meta: {
title: "M国主要创新主体分析概览" title: "M "
} }
}, },
{ {
path: "/InnovativeInstitutions/:id", path: "/InnovativeInstitutions/:id/:type",
name: "InnovativeInstitutions", name: "InnovativeInstitutions",
component: InnovationInstitution, component: InnovationInstitution,
// meta: {
// title: "学校详情"
// },
} }
] ]
......
// 模拟 API 延迟
const delay = (ms: number) => new Promise(resolve => setTimeout(resolve, ms))
// 步骤数据类型 // 步骤数据类型
export interface Step { export interface Step {
id: number id: number
...@@ -12,13 +9,17 @@ export interface Step { ...@@ -12,13 +9,17 @@ export interface Step {
export interface ProposalInfo { export interface ProposalInfo {
title: string title: string
date: string date: string
areas: string[] areas: string[] // 涉及领域 TAG(domain_name)
billDomain: string[] // 政策领域完整选项列表(bill_domain)
defaultDomains: string[] // 政策领域默认已选项(domain_name)
electionPhase: string electionPhase: string
proposer: string proposer: string
coProposers: string coProposers: string
proposerPosition: string proposerPosition: string
governmentType: string governmentType: string
patternType: string
budgetScale: string budgetScale: string
proposalType: string
} }
// 筛选条件类型 // 筛选条件类型
...@@ -36,128 +37,24 @@ export interface FilterField { ...@@ -36,128 +37,24 @@ export interface FilterField {
hint?: string hint?: string
} }
// 获取步骤数据 // 步骤数据(固定配置,非接口数据)
export async function fetchSteps(): Promise<Step[]> { export const STEPS: Step[] = [
await delay(100) {
return [ id: 1,
{ title: '设置筛选条件',
id: 1, description: '基于核心相似度维度构建预测基准'
title: '设置筛选条件', },
description: '基于核心相似度维度构建预测基准' {
}, id: 2,
{ title: '筛选同类法案',
id: 2, description: '形成历史相似同类法案预测基准集'
title: '筛选同类法案', },
description: '形成历史相似同类法案预测基准集' {
}, id: 3,
{ title: '阶段预测分析',
id: 3, description: '基于相似法案的历史数据预测模型'
title: '阶段预测分析',
description: '基于相似法案的历史数据预测模型'
}
]
}
// 获取当前提案信息
export async function fetchProposalInfo(): Promise<ProposalInfo> {
await delay(100)
return {
title: 'H.R.1-大而美法案',
date: '2025年5月20日',
areas: ['能源', '集成电路'],
electionPhase: '执政初期/蜜月期',
proposer: '乔迪·阿灵顿(Jodey Arrington)',
coProposers: '共和党4人',
proposerPosition: '委员会主席',
governmentType: '一致政府(总统与两院同党)',
budgetScale: '4万亿美元'
} }
} ]
// 获取筛选字段配置
export async function fetchFilterFields(): Promise<FilterField[]> {
await delay(100)
return [
{
id: 'policyArea',
label: '政策领域:',
options: [
{ value: 'energy', label: '能源' },
{ value: 'ic', label: '集成电路' },
{ value: 'ai', label: '人工智能' },
{ value: 'biotech', label: '生物技术' }
],
selectedValues: ['energy', 'ic']
},
{
id: 'proposerPosition',
label: '提案人职务:',
options: [
{ value: 'chairman', label: '委员会主席' },
{ value: 'vice_chairman', label: '委员会副主席' },
{ value: 'member', label: '普通委员' }
],
selectedValues: ['chairman']
},
{
id: 'governmentType',
label: '政府结构类型:',
options: [
{ value: 'unified', label: '一致政府' },
{ value: 'divided', label: '分裂政府' }
],
selectedValues: ['unified'],
hint: '总统所属政党同时控制国会参众两院'
},
{
id: 'electionPhase',
label: '选举周期阶段:',
options: [
{ value: 'honeymoon', label: '执政初期/蜜月期' },
{ value: 'midterm', label: '中期选举期' },
{ value: 'election', label: '大选年' }
],
selectedValues: ['honeymoon'],
hint: '新总统上任初期,上任后约100天至1年。'
},
{
id: 'budgetScale',
label: '法案预算规模:',
options: [
{ value: 'trillion_plus', label: '1万亿元以上' },
{ value: 'billion_plus', label: '100亿-1万亿' },
{ value: 'below_billion', label: '100亿以下' }
],
selectedValues: ['trillion_plus']
},
{
id: 'oppositionProposer',
label: '对方党派提案人:',
options: [
{ value: 'none', label: '无对方党派提案人' },
{ value: 'has', label: '有对方党派提案人' }
],
selectedValues: ['none']
},
{
id: 'proposalTime',
label: '提案时间:',
options: [
{ value: 'recent_5', label: '近五年' },
{ value: 'recent_10', label: '近十年' },
{ value: 'all', label: '全部' }
],
selectedValues: ['recent_5']
}
]
}
// 提交筛选条件
export async function submitFilters(filters: Record<string, string[]>): Promise<{ success: boolean }> {
await delay(300)
console.log('提交筛选条件:', filters)
return { success: true }
}
// 筛选结果统计类型 // 筛选结果统计类型
export interface FilterStats { export interface FilterStats {
...@@ -173,31 +70,12 @@ export interface FilterStats { ...@@ -173,31 +70,12 @@ export interface FilterStats {
export interface BillInfo { export interface BillInfo {
id: string id: string
title: string title: string
proposalDate: string tags: string[]
areas: string[] passTime: string
electionPhase: string totalDays: number
proposer: string
coProposers: string
proposerPosition: string
governmentType: string
budgetScale: string
passDays: number
selected: boolean selected: boolean
} }
// 获取筛选结果统计
export async function fetchFilterStats(): Promise<FilterStats> {
await delay(100)
return {
totalBills: 50,
becameLaw: 24,
notPassedOrShelved: 26,
medianDays: 223,
passRate: 48.5,
selectedCount: 50
}
}
// 阶段预测分析类型 // 阶段预测分析类型
export type RiskLevel = 'passed' | 'high' | 'medium' | 'low' export type RiskLevel = 'passed' | 'high' | 'medium' | 'low'
...@@ -214,6 +92,7 @@ export interface PredictionPhase { ...@@ -214,6 +92,7 @@ export interface PredictionPhase {
progressLevel: number progressLevel: number
estimatedDays: string estimatedDays: string
modelInputs: string[] modelInputs: string[]
predictionBasis?: string
supportingFacts: { supportingFacts: {
title: string title: string
basedOn: string basedOn: string
...@@ -230,212 +109,3 @@ export interface PredictionAnalysis { ...@@ -230,212 +109,3 @@ export interface PredictionAnalysis {
highlightText: string highlightText: string
phases: PredictionPhase[] phases: PredictionPhase[]
} }
// 获取阶段预测分析数据
export async function fetchPredictionAnalysis(): Promise<PredictionAnalysis> {
await delay(200)
return {
title: '立法进展阶段预测分析',
subtitle: '基于50个相似法案的历史数据与预测模型',
overallRisk: 'high',
overallProgressLevel: 3,
overallEstimatedDays: '预计耗时120~150天',
highlightText: '《大而美法案》的通过概率非常高。\n\n该法案由众议院共和党领导层在5月正式提出,作为特朗普第二任期核心经济议程,旨在通过一揽子税收、贸易改革重塑经济。到6月初,法案已快速通过关键的筹款委员会和预算委员会审议,进入众议院辩论阶段。共和党当时控制众议院,党内团结支持;白宫已明确表示强烈支持。虽然民主党普遍反对,但共和党凭借微弱优势足以在众议院通过。主要不确定在于参议院,随着中期选举临近民主党议员可能支持,或通过预算和解程序(只需简单多数)规避阻挠议事。因此,该法案在6月初已势在必行,最终成法几无悬念。',
phases: [
{
id: 1,
title: '阶段一:法案提出',
description: '提案提交至参议院/众议院,此阶段为流程起点',
riskLevel: 'passed',
progressLevel: 3,
estimatedDays: '已通过',
modelInputs: [
'确定法案的固有特征:法案提出时确定的特征,如提案人党派、资历、共同提案人网络强度、法案主题分类、文本复杂度。这些特征在所有节点预测中都可使用。',
'确定法案的动态特征:随着流程推进才产生的特征,这是分阶段预测的核心。包括流程特征:在当前节点已停留时间、距国会会休会剩余时间;投票特征:上一节点投票结果(如委员会投票的赞成比例、党派支持度)。修正案特征:法案是否被附加了有争议的修正外部环境特征:当前新闻情绪指数、公众舆论压力、关键利益集团的态度。',
'确定法案的固有特征:法案提出时确定的特征,如提案人党派、资历、共同提案人网络强度、法案主题分类、文本复杂度。这些特征在所有节点预测中都可使用。'
],
supportingFacts: {
title: '支撑预测的客观事实',
basedOn: '基于142项历史提案',
stats: [
{ value: '100%', label: '提案提交率' },
{ value: '142', label: '匹配法案数' },
{ value: '62.7%', label: '进入委员会比例' },
{ value: '85天', label: '平均等待分配时间' }
]
}
},
{
id: 2,
title: '阶段二:参议院通过',
description: '包括委员会审议、听证、修正和全院表决',
riskLevel: 'high',
progressLevel: 3,
estimatedDays: '预计耗时60~120天',
modelInputs: [
'确定法案的固有特征:法案提出时确定的特征,如提案人党派、资历、共同提案人网络强度、法案主题分类、文本复杂度。这些特征在所有节点预测中都可使用。',
'确定法案的动态特征:随着流程推进才产生的特征,这是分阶段预测的核心。包括流程特征:在当前节点已停留时间、距国会会休会剩余时间;投票特征:上一节点投票结果(如委员会投票的赞成比例、党派支持度)。修正案特征:法案是否被附加了有争议的修正案;外部环境特征:当前新闻情绪指数、公众舆论压力、关键利益集团的态度。',
'确定法案的固有特征:法案提出时确定的特征,如提案人党派、资历、共同提案人网络强度、法案主题分类、文本复杂度。这些特征在所有节点预测中都可使用。'
],
supportingFacts: {
title: '支撑预测的客观事实',
basedOn: '基于98项历史提案',
stats: [
{ value: '62.7%', label: '历史通过率' },
{ value: '85天', label: '平均耗时' },
{ value: '78%', label: '委员会主席支持率' },
{ value: '31%', label: '对方党派平均支持' },
{ value: '8.5次', label: '平均听证会次数' },
{ value: '14.2个', label: '平均修正案数' },
{ value: '92.3%', label: '本党派支持率' },
{ value: '68天', label: '中位数耗时' }
]
}
},
{
id: 3,
title: '阶段三:众议院通过',
description: '众议院审议、委员会分配和全院表决',
riskLevel: 'medium',
progressLevel: 2,
estimatedDays: '预计耗时20~45天',
modelInputs: [
'确定法案的固有特征:法案提出时确定的特征,如提案人党派、资历、共同提案人网络强度、法案主题分类、文本复杂度。这些特征在所有节点预测中都可使用。',
'确定法案的动态特征:随着流程推进才产生的特征,这是分阶段预测的核心。包括流程特征:在当前节点已停留时间、距国会会休会剩余时间;投票特征:上一节点投票结果(如委员会投票的赞成比例、党派支持度)。修正案特征:法案是否被附加了有争议的修正案;外部环境特征:当前新闻情绪指数、公众舆论压力、关键利益集团的态度。',
'确定法案的固有特征:法案提出时确定的特征,如提案人党派、资历、共同提案人网络强度、法案主题分类、文本复杂度。这些特征在所有节点预测中都可使用。'
],
supportingFacts: {
title: '支撑预测的客观事实',
basedOn: '基于98项历史提案',
stats: [
{ value: '62.7%', label: '历史通过率' },
{ value: '85天', label: '平均耗时' },
{ value: '78%', label: '本党派支持率' },
{ value: '31%', label: '对方党派平均支持' },
{ value: '45%', label: '规则委员会支持率' },
{ value: '14.2个', label: '平均修正案数' },
{ value: '49.5天', label: '中位数耗时' },
{ value: '32%', label: '快速通道使用率' }
]
}
},
{
id: 4,
title: '阶段四:两院协商',
description: '协商委员会解决两院版本差异,形成统一文本',
riskLevel: 'medium',
progressLevel: 2,
estimatedDays: '预计耗时7~14天',
modelInputs: [
'确定法案的固有特征:法案提出时确定的特征,如提案人党派、资历、共同提案人网络强度、法案主题分类、文本复杂度。这些特征在所有节点预测中都可使用。',
'确定法案的动态特征:随着流程推进才产生的特征,这是分阶段预测的核心。包括流程特征:在当前节点已停留时间、距国会会休会剩余时间;投票特征:上一节点投票结果(如委员会投票的赞成比例、党派支持度)。修正案特征:法案是否被附加了有争议的修正案;外部环境特征:当前新闻情绪指数、公众舆论压力、关键利益集团的态度。',
'确定法案的固有特征:法案提出时确定的特征,如提案人党派、资历、共同提案人网络强度、法案主题分类、文本复杂度。这些特征在所有节点预测中都可使用。'
],
supportingFacts: {
title: '支撑预测的客观事实',
basedOn: '基于96项历史提案',
stats: [
{ value: '62.7%', label: '历史通过率' },
{ value: '85天', label: '平均耗时' },
{ value: '8.5个', label: '平均差异条款数' },
{ value: '3.2轮', label: '平均协商轮次' },
{ value: '78%', label: '协商成功法案比例' },
{ value: '42%', label: '需要领导层介入比例' },
{ value: '55天', label: '中位数耗时' },
{ value: '15%', label: '协商失败后重启比例' }
]
}
},
{
id: 5,
title: '阶段五:总统签署',
description: '总统审议、可能否决或签署成为法律',
riskLevel: 'low',
progressLevel: 1,
estimatedDays: '预计耗时1~5天',
modelInputs: [
'确定法案的固有特征:法案提出时确定的特征,如提案人党派、资历、共同提案人网络强度、法案主题分类、文本复杂度。这些特征在所有节点预测中都可使用。',
'确定法案的动态特征:随着流程推进才产生的特征,这是分阶段预测的核心。包括流程特征:在当前节点已停留时间、距国会会休会剩余时间;投票特征:上一节点投票结果(如委员会投票的赞成比例、党派支持度)。修正案特征:法案是否被附加了有争议的修正案;外部环境特征:当前新闻情绪指数、公众舆论压力、关键利益集团的态度。',
'确定法案的固有特征:法案提出时确定的特征,如提案人党派、资历、共同提案人网络强度、法案主题分类、文本复杂度。这些特征在所有节点预测中都可使用。'
],
supportingFacts: {
title: '支撑预测的客观事实',
basedOn: '基于33次送法总统法案',
stats: [
{ value: '62.7%', label: '历史签署率' },
{ value: '12天', label: '平均审议时间' },
{ value: '24.2%', label: '否决率' },
{ value: '3.2轮', label: '口袋否决率' },
{ value: '78%', label: '一致政府时签署率' },
{ value: '42%', label: '分立政府时签署率' },
{ value: '9天', label: '中位数审议时间' },
{ value: '15%', label: '附带声明签署比例' }
]
}
}
]
}
}
// 获取法案列表
export async function fetchBillList(): Promise<BillInfo[]> {
await delay(200)
return [
{
id: 'bill-1',
title: '激励创新的交通走廊以少碳和温室气体排放,提供允许对公共交通系统投资的税收结构,并帮助化石燃料劳动力向可持续工作领域转型',
proposalDate: '2025年5月20日',
areas: ['能源', '集成电路'],
electionPhase: '执政初期/蜜月期',
proposer: '乔迪·阿灵顿(Jodey Arrington)',
coProposers: '共和党4人;民主党2人',
proposerPosition: '委员会主席',
governmentType: '一致政府(总统与两院同党)',
budgetScale: '7500亿美元',
passDays: 245,
selected: true
},
{
id: 'bill-2',
title: '重新授权国家海洋和大气管理局切萨皮克湾办公室及其他用途',
proposalDate: '2025年5月20日',
areas: ['能源', '集成电路'],
electionPhase: '执政初期/蜜月期',
proposer: '乔迪·阿灵顿(Jodey Arrington)',
coProposers: '共和党4人;民主党2人',
proposerPosition: '委员会主席',
governmentType: '一致政府(总统与两院同党)',
budgetScale: '7500亿美元',
passDays: 245,
selected: true
},
{
id: 'bill-3',
title: '特朗普关税透明法案',
proposalDate: '2025年5月20日',
areas: ['能源', '集成电路'],
electionPhase: '执政初期/蜜月期',
proposer: '乔迪·阿灵顿(Jodey Arrington)',
coProposers: '共和党4人;民主党2人',
proposerPosition: '委员会主席',
governmentType: '一致政府(总统与两院同党)',
budgetScale: '7500亿美元',
passDays: 245,
selected: true
},
{
id: 'bill-4',
title: '禁止向关注国家销售最先进的人工智能芯片,并促进芯片安全高效地向海外获批美国人员转让',
proposalDate: '2025年5月20日',
areas: ['能源', '集成电路'],
electionPhase: '执政初期/蜜月期',
proposer: '乔迪·阿灵顿(Jodey Arrington)',
coProposers: '共和党4人;民主党2人',
proposerPosition: '委员会主席',
governmentType: '一致政府(总统与两院同党)',
budgetScale: '7500亿美元',
passDays: 245,
selected: true
}
]
}
...@@ -50,12 +50,9 @@ const emit = defineEmits<{ ...@@ -50,12 +50,9 @@ const emit = defineEmits<{
const billFields = [ const billFields = [
{ key: 'proposalDate', label: '提案时间:' }, { key: 'proposalDate', label: '提案时间:' },
{ key: 'areas', label: '涉及领域:' }, { key: 'areas', label: '涉及领域:' },
{ key: 'electionPhase', label: '选举周期阶段:' },
{ key: 'proposer', label: '提案人:' }, { key: 'proposer', label: '提案人:' },
{ key: 'coProposers', label: '共同提案人:' }, { key: 'coProposers', label: '共同提案人:' },
{ key: 'proposerPosition', label: '提案人职务:' },
{ key: 'governmentType', label: '政府结构类型:' }, { key: 'governmentType', label: '政府结构类型:' },
{ key: 'budgetScale', label: '法案预算规模:' },
{ key: 'passDays', label: '通过耗时:' } { key: 'passDays', label: '通过耗时:' }
] ]
</script> </script>
......
...@@ -2,59 +2,192 @@ ...@@ -2,59 +2,192 @@
<section class="filter-section"> <section class="filter-section">
<div class="section-header"> <div class="section-header">
<div class="header-left"> <div class="header-left">
<img src="../assets/fitller.svg" /> <img src="../assets/fitller.svg" />
<h2 class="section-title text-title-3-bold">核心相似度维度筛选</h2> <h2 class="section-title text-title-3-bold">核心相似度维度筛选</h2>
</div> </div>
<button class="btn-outline" @click="emit('setAsCurrent')">设置为当前提案</button> <button class="btn-outline" @click="setAsCurrent">设置为当前提案</button>
</div> </div>
<div class="divider" /> <div class="divider" />
<div class="fields-grid"> <div class="fields-grid">
<div
v-for="field in fields" <!-- 政策领域 -->
:key="field.id" <div class="field-item">
class="field-item" <span class="field-label text-tip-1 text-primary-65-clor">政策领域:</span>
> <div class="field-content">
<div class="field-label-wrapper"> <el-select
<span class="field-label text-tip-1 text-primary-65-clor">{{ field.label }}</span> v-model="localValues.policyArea"
multiple
placeholder="请选择"
style="width: 420px"
@change="handleChange"
>
<el-option
v-for="opt in fields.policyArea.options"
:key="opt.value"
:label="opt.label"
:value="opt.value"
/>
</el-select>
</div> </div>
</div>
<!-- 政府结构类型 -->
<div class="field-item">
<span class="field-label text-tip-1 text-primary-65-clor">政府结构类型:</span>
<div class="field-content"> <div class="field-content">
<FilterSelect <el-select
:options="field.options" v-model="localValues.governmentType"
:model-value="field.selectedValues" multiple
@update:model-value="(val) => handleFieldUpdate(field.id, val)" placeholder="请选择"
/> style="width: 420px"
<div v-if="field.hint" class="field-hint"> @change="handleChange"
<img src="../assets/importent.svg" /> >
<span class="text-tip-2 text-primary-50-clor">{{ field.hint }}</span> <el-option
v-for="opt in fields.governmentType.options"
:key="opt.value"
:label="opt.label"
:value="opt.value"
/>
</el-select>
<div v-if="fields.governmentType.hint" class="field-hint">
<img src="../assets/importent.svg" />
<span class="text-tip-2 text-primary-50-clor">{{ fields.governmentType.hint }}</span>
</div> </div>
</div> </div>
</div> </div>
<!-- 对方党派提案人 -->
<div class="field-item">
<span class="field-label text-tip-1 text-primary-65-clor">对方党派提案人:</span>
<div class="field-content">
<el-select
v-model="localValues.oppositionProposer"
multiple
placeholder="请选择"
style="width: 420px"
@change="handleChange"
>
<el-option
v-for="opt in fields.oppositionProposer.options"
:key="opt.value"
:label="opt.label"
:value="opt.value"
/>
</el-select>
</div>
</div>
<!-- 提案时间 -->
<div class="field-item">
<span class="field-label text-tip-1 text-primary-65-clor">提案时间:</span>
<div class="field-content">
<el-select
v-model="localValues.proposalTime"
multiple
placeholder="请选择"
style="width: 420px"
@change="handleChange"
>
<el-option
v-for="opt in fields.proposalTime.options"
:key="opt.value"
:label="opt.label"
:value="opt.value"
/>
</el-select>
</div>
</div>
</div> </div>
</section> </section>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import type { FilterField } from '../api' import { ref, computed, watch } from 'vue'
import FilterSelect from './FilterSelect.vue' import type { ProposalInfo } from '../api'
const props = defineProps<{ const props = defineProps<{
fields: FilterField[] proposalInfo?: ProposalInfo | null
defaultFilters?: Record<string, string[]>
}>() }>()
const emit = defineEmits<{ // 本地 v-model 值
'update:fields': [fields: FilterField[]] const localValues = ref({
setAsCurrent: [] policyArea: [] as string[],
}>() governmentType: [] as string[],
oppositionProposer: [] as string[],
proposalTime: [] as string[],
})
// 更新字段选中值 // 根据 proposalInfo 计算初始筛选值(即"设置为当前提案"的目标状态)
function handleFieldUpdate(fieldId: string, newValues: string[]) { function buildInitialValues(info?: ProposalInfo | null): Record<string, string[]> {
const updatedFields = props.fields.map(f => if (!info) return { policyArea: [], governmentType: [], oppositionProposer: [], proposalTime: [] }
f.id === fieldId return {
? { ...f, selectedValues: newValues } policyArea: info.defaultDomains?.length ? [...info.defaultDomains] : [...(info.areas || [])],
: f governmentType: info.patternType ? [info.patternType] : [],
) oppositionProposer: [],
emit('update:fields', updatedFields) proposalTime: [],
}
} }
// 监听 proposalInfo 首次传入时设置初始值
watch(
() => props.proposalInfo,
(newInfo) => {
Object.assign(localValues.value, buildInitialValues(newInfo))
},
{ immediate: true }
)
// 重置:清空所有已选项
function reset() {
localValues.value = {
policyArea: [],
governmentType: [],
oppositionProposer: [],
proposalTime: [],
}
}
// 设置为当前提案:恢复为 proposalInfo 的初始状态
function setAsCurrent() {
Object.assign(localValues.value, buildInitialValues(props.proposalInfo))
}
defineExpose({ reset, setAsCurrent, getValues: () => localValues.value })
// 固定的字段配置,options 由 proposalInfo 动态注入
const fields = computed(() => {
const billDomain = props.proposalInfo?.billDomain
const domainOptions = Array.isArray(billDomain) ? billDomain.map(d => ({ value: d, label: d })) : []
return {
policyArea: { options: domainOptions },
governmentType: {
options: [
{ value: '统一政府', label: '统一政府' },
{ value: '分裂政府', label: '分裂政府' },
{ value: '微弱多数', label: '微弱多数' }
],
hint: '总统所属政党同时控制国会参众两院'
},
oppositionProposer: {
options: [
{ value: '两党共同提案', label: '两党共同提案' },
{ value: '单政党提案(共和党提案)', label: '单政党提案(共和党提案)' },
{ value: '单政党提案(民主党提案)', label: '单政党提案(民主党提案)' }
]
},
proposalTime: {
options: [
{ value: '近五年', label: '近五年' },
{ value: '近十年', label: '近十年' },
{ value: '全部', label: '全部' }
]
}
}
})
function handleChange() {}
</script> </script>
<style scoped> <style scoped>
...@@ -75,12 +208,6 @@ function handleFieldUpdate(fieldId: string, newValues: string[]) { ...@@ -75,12 +208,6 @@ function handleFieldUpdate(fieldId: string, newValues: string[]) {
gap: 12px; gap: 12px;
} }
.section-icon {
width: 16px;
height: 16px;
color: var(--text-primary-80-color);
}
.btn-outline { .btn-outline {
padding: 6px 16px; padding: 6px 16px;
border: 1px solid var(--bg-black-10); border: 1px solid var(--bg-black-10);
...@@ -105,7 +232,7 @@ function handleFieldUpdate(fieldId: string, newValues: string[]) { ...@@ -105,7 +232,7 @@ function handleFieldUpdate(fieldId: string, newValues: string[]) {
.fields-grid { .fields-grid {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
gap: 24px 24px; gap: 24px;
padding-left: 30px; padding-left: 30px;
} }
...@@ -113,15 +240,14 @@ function handleFieldUpdate(fieldId: string, newValues: string[]) { ...@@ -113,15 +240,14 @@ function handleFieldUpdate(fieldId: string, newValues: string[]) {
width: 580px; width: 580px;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
} gap: 0;
.field-label-wrapper {
padding-top: 4px;
} }
.field-label { .field-label {
display: block; display: block;
width: 150px; width: 140px;
flex-shrink: 0;
padding-top: 6px;
} }
.field-content { .field-content {
...@@ -135,11 +261,4 @@ function handleFieldUpdate(fieldId: string, newValues: string[]) { ...@@ -135,11 +261,4 @@ function handleFieldUpdate(fieldId: string, newValues: string[]) {
align-items: center; align-items: center;
gap: 8px; gap: 8px;
} }
.hint-icon {
width: 16px;
height: 16px;
flex-shrink: 0;
color: var(--text-primary-50-color);
}
</style> </style>
...@@ -39,26 +39,19 @@ ...@@ -39,26 +39,19 @@
</p> </p>
</div> </div>
</div> </div>
<div class="facts-section"> <div v-if="phase.predictionBasis" class="facts-section">
<div class="box-header flex-display-start"> <div class="box-header flex-display-start">
<div class="box-title-row flex-display-center"> <div class="box-title-row flex-display-center">
<img src="../assets/icon1.svg"/> <img src="../assets/icon1.svg"/>
<span class="text-compact-bold">{{ phase.supportingFacts.title }}</span> <span class="text-compact-bold">通过性预测依据</span>
</div> </div>
<div class="box-hint flex-display-center text-tip-2 text-primary-50-clor"> <div class="box-hint flex-display-center text-tip-2 text-primary-50-clor">
<img src="../assets/importent.svg"/> <img src="../assets/importent.svg"/>
<span>{{ phase.supportingFacts.basedOn }}</span> <span>此阶段预测基于以下观点</span>
</div> </div>
</div> </div>
<div class="stats-grid"> <div class="prediction-basis-content">
<div <p class="text-tip-2 text-primary-65-clor">{{ phase.predictionBasis }}</p>
v-for="(stat, index) in phase.supportingFacts.stats"
:key="index"
class="stat-card"
>
<div class="stat-value main-color">{{ stat.value }}</div>
<div class="text-tip-3 text-primary-65-clor">{{ stat.label }}</div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -260,6 +253,16 @@ const riskLabel = computed(() => { ...@@ -260,6 +253,16 @@ const riskLabel = computed(() => {
line-height: 1.6; line-height: 1.6;
} }
.prediction-basis-content {
background-color: var(--bg-black-2);
border-radius: var(--radius-10);
padding: 16px;
}
.prediction-basis-content p {
line-height: 1.6;
}
.stats-grid { .stats-grid {
display: grid; display: grid;
grid-template-columns: repeat(4, 1fr); grid-template-columns: repeat(4, 1fr);
......
...@@ -33,13 +33,6 @@ ...@@ -33,13 +33,6 @@
<span class="info-label text-body-1">{{ field.label }}</span> <span class="info-label text-body-1">{{ field.label }}</span>
<template v-if="field.key === 'areas'"> <template v-if="field.key === 'areas'">
<div class="area-tags"> <div class="area-tags">
<!-- <span
v-for="area in info.areas"
:key="area"
class="area-tag"
>
{{ area }}
</span> -->
<AreaTag v-for="area in info.areas" :key="area" :tagName="area" /> <AreaTag v-for="area in info.areas" :key="area" :tagName="area" />
</div> </div>
...@@ -59,17 +52,14 @@ defineProps<{ ...@@ -59,17 +52,14 @@ defineProps<{
info: ProposalInfo info: ProposalInfo
}>() }>()
// 信息字段配置 // 信息字段配置 - 只保留:提案标题、提案时间、涉及领域、提案人、共同提案人、政府结构类型
const infoFields = [ const infoFields = [
{ key: 'title', label: '提案标题:' }, { key: 'title', label: '提案标题:' },
{ key: 'date', label: '提案时间:' }, { key: 'date', label: '提案时间:' },
{ key: 'areas', label: '涉及领域:' }, { key: 'areas', label: '涉及领域:' },
{ key: 'electionPhase', label: '选举周期阶段:' },
{ key: 'proposer', label: '提案人:' }, { key: 'proposer', label: '提案人:' },
{ key: 'coProposers', label: '共同提案人:' }, { key: 'coProposers', label: '共同提案人:' },
{ key: 'proposerPosition', label: '提案人职务:' }, { key: 'governmentType', label: '政府结构类型:' }
{ key: 'governmentType', label: '政府结构类型:' },
{ key: 'budgetScale', label: '法案预算规模:' }
] ]
</script> </script>
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
<div class="content-wrapper"> <div class="content-wrapper">
<ProposalInfoSection v-if="currentProposalInfo" :info="currentProposalInfo" /> <ProposalInfoSection v-if="currentProposalInfo" :info="currentProposalInfo" />
<FilterSection <FilterSection
:fields="filterFields" ref="filterSectionRef"
@update:fields="filterFields = $event" :proposal-info="currentProposalInfo"
@set-as-current="handleSetAsCurrent" :default-filters="defaultFilters"
/> />
</div> </div>
<ActionButtons <ActionButtons
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted, watch } from 'vue' import { ref, onMounted, watch } from 'vue'
import type { ProposalInfo, FilterField } from '../api' import type { ProposalInfo } from '../api'
import { fetchProposalInfo, fetchFilterFields } from '../api'
import ProposalInfoSection from './ProposalInfoSection.vue' import ProposalInfoSection from './ProposalInfoSection.vue'
import FilterSection from './FilterSection.vue' import FilterSection from './FilterSection.vue'
import ActionButtons from './ActionButtons.vue' import ActionButtons from './ActionButtons.vue'
...@@ -34,99 +33,42 @@ const props = defineProps<{ ...@@ -34,99 +33,42 @@ const props = defineProps<{
}>() }>()
const emit = defineEmits<{ const emit = defineEmits<{
next: [] next: [selectedFilters: Record<string, string[]>]
}>() }>()
// 提案信息(优先使用 props,否则从 API 获取 // 提案信息(优先使用 props)
const currentProposalInfo = ref<ProposalInfo | null>(null) const currentProposalInfo = ref<ProposalInfo | null>(null)
// 筛选字段列表 // FilterSection 组件引用
const filterFields = ref<FilterField[]>([]) const filterSectionRef = ref<InstanceType<typeof FilterSection> | null>(null)
// 加载状态 // 加载状态
const loading = ref(true) const loading = ref(true)
// 初始筛选字段(用于重置) // 默认筛选条件
const initialFilterFields = ref<FilterField[]>([]) const defaultFilters = ref<Record<string, string[]>>({})
// 监听 props.proposalInfo 变化 // 监听 props.proposalInfo 变化
watch(() => props.proposalInfo, (newInfo) => { watch(() => props.proposalInfo, (newInfo) => {
if (newInfo) { if (newInfo) {
currentProposalInfo.value = newInfo currentProposalInfo.value = newInfo
} // 根据提案信息生成默认筛选条件(仅用于 Step1 内部状态跟踪,不再传给 FilterSection)
}, { immediate: true }) defaultFilters.value = {
policyArea: newInfo.defaultDomains?.length ? newInfo.defaultDomains : newInfo.areas,
// 页面初始化时加载数据 governmentType: newInfo.patternType ? [newInfo.patternType] : [],
onMounted(async () => { oppositionProposer: [],
try { proposalTime: [],
// 如果没有从 props 获取到提案信息,则从 API 获取
if (!props.proposalInfo) {
currentProposalInfo.value = await fetchProposalInfo()
} }
// 获取筛选字段配置
const fields = await fetchFilterFields()
// 如果有默认筛选条件,应用到筛选字段
if (props.defaultFilters && Object.keys(props.defaultFilters).length > 0) {
filterFields.value = fields.map(field => ({
...field,
selectedValues: props.defaultFilters?.[field.id] || field.selectedValues
}))
} else {
filterFields.value = fields
}
// 保存初始状态用于重置
initialFilterFields.value = JSON.parse(JSON.stringify(filterFields.value))
} finally {
loading.value = false
} }
}) loading.value = false
}, { immediate: true })
// 重置所有筛选条件 // 重置所有筛选条件:清空所有已选项
function handleReset() { function handleReset() {
filterFields.value = JSON.parse(JSON.stringify(initialFilterFields.value)) filterSectionRef.value?.reset()
}
// 设置为当前提案
function handleSetAsCurrent() {
// 根据当前提案信息重新设置筛选条件
if (currentProposalInfo.value) {
filterFields.value = filterFields.value.map(field => {
// 根据提案信息设置默认值
const defaultValues = getDefaultValuesForField(field.id, currentProposalInfo.value!)
return {
...field,
selectedValues: defaultValues.length > 0 ? defaultValues : field.selectedValues
}
})
}
}
// 根据字段 ID 和提案信息获取默认值
function getDefaultValuesForField(fieldId: string, info: ProposalInfo): string[] {
const areaMap: Record<string, string> = {
'能源': 'energy',
'集成电路': 'ic',
'人工智能': 'ai',
'生物技术': 'biotech'
}
switch (fieldId) {
case 'policyArea':
return info.areas.map(area => areaMap[area] || area.toLowerCase())
case 'proposerPosition':
return info.proposerPosition === '委员会主席' ? ['chairman'] : []
case 'governmentType':
return info.governmentType.includes('一致') ? ['unified'] : ['divided']
case 'electionPhase':
return info.electionPhase.includes('蜜月') ? ['honeymoon'] : []
default:
return []
}
} }
// 下一步 // 下一步:获取已选的筛选条件并传给父组件
function handleNext() { function handleNext() {
emit('next') const selectedFilters = filterSectionRef.value?.getValues() || {}
emit('next', selectedFilters)
} }
</script> </script>
......
...@@ -77,13 +77,12 @@ ...@@ -77,13 +77,12 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, computed, onMounted, inject, watch } from 'vue' import { ref, computed, onMounted, inject, watch } from 'vue'
import type { FilterStats, BillInfo } from '../api' import type { FilterStats, BillInfo } from '../api'
import { fetchFilterStats, fetchBillList } from '../api'
import { getSimiBills, transformSimiBillsData } from '@/api/bill/billHome' import { getSimiBills, transformSimiBillsData } from '@/api/bill/billHome'
import BillCard from './BillCard.vue' import BillCard from './BillCard.vue'
const emit = defineEmits<{ const emit = defineEmits<{
previous: [] previous: []
next: [] next: [selectedBills: any[]]
}>() }>()
// 从父组件注入筛选参数 // 从父组件注入筛选参数
...@@ -93,6 +92,8 @@ const filterParams = inject<any>('filterParams', null) ...@@ -93,6 +92,8 @@ const filterParams = inject<any>('filterParams', null)
const stats = ref<FilterStats | null>(null) const stats = ref<FilterStats | null>(null)
// 法案列表 // 法案列表
const bills = ref<BillInfo[]>([]) const bills = ref<BillInfo[]>([])
// 原始法案数据(用于传给第三页)
const rawBillsData = ref<any[]>([])
// 加载状态 // 加载状态
const loading = ref(true) const loading = ref(true)
...@@ -121,36 +122,30 @@ const selectedCount = computed(() => { ...@@ -121,36 +122,30 @@ const selectedCount = computed(() => {
async function loadData() { async function loadData() {
loading.value = true loading.value = true
try { try {
// 优先使用真实 API // 使用真实 API,传入 billIds、domains、patternType、proposalType
const params = { const params = {
patternType: filterParams?.governmentType || '统一政府', billIds: filterParams?.value.billIds,
proposalType: '两党共同提案' domains:JSON.stringify(filterParams?.value.domains) || [],
patternType: filterParams?.value.patternType || '统一政府',
proposalType: filterParams?.value.proposalType || '两党共同提案'
} }
const response = await getSimiBills(params) const response = await getSimiBills(params)
if (response && response.success && response.data) { if (response && response.data) {
// 保存原始数据
rawBillsData.value = response.data
const { stats: apiStats, bills: apiBills } = transformSimiBillsData(response) const { stats: apiStats, bills: apiBills } = transformSimiBillsData(response)
stats.value = apiStats stats.value = apiStats
bills.value = apiBills bills.value = apiBills
} else { } else {
// 如果 API 失败,使用模拟数据 stats.value = null
const [statsData, billsData] = await Promise.all([ bills.value = []
fetchFilterStats(),
fetchBillList()
])
stats.value = statsData
bills.value = billsData
} }
} catch (error) { } catch (error) {
console.error('获取相似法案失败:', error) console.error('获取相似法案失败:', error)
// 使用模拟数据作为 fallback stats.value = null
const [statsData, billsData] = await Promise.all([ bills.value = []
fetchFilterStats(),
fetchBillList()
])
stats.value = statsData
bills.value = billsData
} finally { } finally {
loading.value = false loading.value = false
} }
...@@ -189,7 +184,11 @@ function handleBack() { ...@@ -189,7 +184,11 @@ function handleBack() {
// 开始预测分析 // 开始预测分析
function handleStartAnalysis() { function handleStartAnalysis() {
emit('next') // 获取用户勾选的法案ID列表
const selectedIds = bills.value.filter(b => b.selected).map(b => b.id)
// 从原始数据中筛选出用户勾选的法案
const selectedBills = rawBillsData.value.filter(b => selectedIds.includes(b.bill_id))
emit('next', selectedBills)
} }
</script> </script>
......
<template> <template>
<div class="step-container"> <div class="step-container">
<div v-if="predictionData" class="content-wrapper"> <div v-if="props.loading" class="loading-wrapper flex-display-center">
<span class="text-tip-2 text-primary-50-clor">预测分析中...</span>
</div>
<div v-else-if="predictionData" class="content-wrapper">
<div class="header-section flex-display-start"> <div class="header-section flex-display-start">
<div class="header-left flex-display-start"> <div class="header-left flex-display-start">
...@@ -27,8 +30,8 @@ ...@@ -27,8 +30,8 @@
<div class="highlight-box text-regular"> <div class="highlight-box text-regular">
<div class="highlight-wave text-regular"></div> <div class="highlight-wave text-regular"></div>
<div class="highlight-content text-regular"> <div class="highlight-content text-regular">
<p class="highlight-title text-regular">《大而美法案》的通过概率非常高</p> <p class="highlight-title text-regular">该法案的通过概率为 {{ predictionData?.overallProbability || '—' }}</p>
<p class="highlight-text text-regular">该法案由众议院共和党领导层在5月正式提出,作为特朗普第二任期核心经济议程,旨在通过一揽子税收、贸易和预算改革提振经济。到6月初,法案已快速通过关键的筹款委员会和预算委员会审议,进入众议院全院辩论阶段。共和党当时控制众议院,且党内团结支持;白宫已明确表示强烈支持。虽然民主党普遍反对,但共和党凭借席位优势足以在众议院通过。主要不确定性在于参议院,但预计部分温和民主党议员可能支持,或通过预算和解程序(只需简单多数)规避阻挠议事。因此,该法案在6月初已势在必行,最终成法几无悬念。</p> <p class="highlight-text text-regular">{{ predictionData?.highlightText }}</p>
</div> </div>
</div> </div>
<div v-if="predictionData?.phases?.length" class="phases-list"> <div v-if="predictionData?.phases?.length" class="phases-list">
...@@ -59,23 +62,22 @@ ...@@ -59,23 +62,22 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, onMounted, computed } from 'vue' import { ref, computed } from 'vue'
import { fetchPredictionAnalysis, type PredictionAnalysis } from '../api' import type { PredictionAnalysis } from '../api'
import PredictionPhaseCard from './PredictionPhaseCard.vue' import PredictionPhaseCard from './PredictionPhaseCard.vue'
const props = defineProps<{
data?: PredictionAnalysis | null
loading?: boolean
}>()
const emit = defineEmits<{ const emit = defineEmits<{
(e: 'prev'): void (e: 'prev'): void
(e: 'repredict'): void (e: 'repredict'): void
}>() }>()
// 预测分析数据 // 预测分析数据 - 从 props 获取,暂无真实接口
const predictionData = ref<PredictionAnalysis | null>(null) const predictionData = computed(() => props.data || null)
// 获取预测分析数据
onMounted(async () => {
const data = await fetchPredictionAnalysis()
predictionData.value = data
})
// 根据索引和progressLevel返回进度条格子的类名 // 根据索引和progressLevel返回进度条格子的类名
function getOverallSegmentClass(index: number) { function getOverallSegmentClass(index: number) {
...@@ -140,15 +142,16 @@ function handleRepredict() { ...@@ -140,15 +142,16 @@ function handleRepredict() {
</script> </script>
<style scoped> <style scoped>
/* .text-title-2-bold{
color: #3b414b;
} */
.step-container { .step-container {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
} }
.loading-wrapper {
flex: 1;
}
.content-wrapper { .content-wrapper {
flex: 1; flex: 1;
overflow: auto; overflow: auto;
...@@ -157,7 +160,6 @@ function handleRepredict() { ...@@ -157,7 +160,6 @@ function handleRepredict() {
.header-section { .header-section {
justify-content: space-between; justify-content: space-between;
align-items: flex-start; align-items: flex-start;
/* margin-bottom: 24px; */
} }
.header-left { .header-left {
......
...@@ -14,15 +14,17 @@ ...@@ -14,15 +14,17 @@
v-if="currentStep === 1" v-if="currentStep === 1"
:proposal-info="proposalInfo" :proposal-info="proposalInfo"
:default-filters="defaultFilters" :default-filters="defaultFilters"
@next="goToNextStep" @next="handleStep1Next"
/> />
<Step2FilterBills <Step2FilterBills
v-else-if="currentStep === 2" v-else-if="currentStep === 2"
@previous="goToPreviousStep" @previous="goToPreviousStep"
@next="goToNextStep" @next="handleStep2Next"
/> />
<Step3PredictionAnalysis <Step3PredictionAnalysis
v-else-if="currentStep === 3" v-else-if="currentStep === 3"
:data="predictionResult"
:loading="predictionLoading"
@prev="goToPreviousStep" @prev="goToPreviousStep"
@repredict="handleRepredict" @repredict="handleRepredict"
/> />
...@@ -40,8 +42,8 @@ ...@@ -40,8 +42,8 @@
import { ref, onMounted, provide } from 'vue' import { ref, onMounted, provide } from 'vue'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import type { Step, ProposalInfo } from './api' import type { Step, ProposalInfo } from './api'
import { fetchSteps } from './api' import { STEPS } from './api'
import { getProgressPrediction, parseBillId, transformProposalInfo, generateDefaultFilters } from '@/api/bill/billHome.js' import { getProgressPrediction, parseBillId, transformProposalInfo, generateDefaultFilters, getPassProd } from '@/api/bill/billHome.js'
import PageHeader from './components/PageHeader.vue' import PageHeader from './components/PageHeader.vue'
import StepSidebar from './components/StepSidebar.vue' import StepSidebar from './components/StepSidebar.vue'
import Step1FilterCondition from './components/Step1FilterCondition.vue' import Step1FilterCondition from './components/Step1FilterCondition.vue'
...@@ -62,35 +64,51 @@ const proposalInfo = ref<ProposalInfo | null>(null) ...@@ -62,35 +64,51 @@ const proposalInfo = ref<ProposalInfo | null>(null)
const defaultFilters = ref<Record<string, string[]>>({}) const defaultFilters = ref<Record<string, string[]>>({})
// 法案ID // 法案ID
const billId = ref('') const billId = ref('')
// 当前筛选参数(传递给 Step2)
const currentFilterParams = ref<any>(null)
// 第一页接口原始数据(包含 bill_actions、bill_sponsors)
const rawProposalData = ref<any>(null)
// 第三页预测结果
const predictionResult = ref<any>(null)
// 预测加载状态
const predictionLoading = ref(false)
// 向子组件提供提案信息 // 向子组件提供提案信息和筛选参数
provide('proposalInfo', proposalInfo) provide('proposalInfo', proposalInfo)
provide('defaultFilters', defaultFilters) provide('defaultFilters', defaultFilters)
provide('filterParams', currentFilterParams)
// 页面初始化时加载数据 // 页面初始化时加载数据
onMounted(async () => { onMounted(async () => {
try { try {
// 步骤数据使用固定配置
steps.value = STEPS
// 获取路由参数中的 id // 获取路由参数中的 id
const routeId = route.params.id as string || '1' const routeId = route.params.id as string || '1'
billId.value = parseBillId(routeId) billId.value = parseBillId(routeId)
// 并行加载步骤数据和提案信息 // 获取提案信息
const [stepsData, predictionData] = await Promise.all([ const predictionData = await getProgressPrediction(billId.value).catch(err => {
fetchSteps(), console.error('[v0] 获取预测数据失败:', err)
getProgressPrediction(billId.value).catch(err => { return null
console.error(' 获取预测数据失败:', err) })
return null
})
])
steps.value = stepsData
if (predictionData) { if (predictionData) {
// 保存原始数据(包含 bill_actions、bill_sponsors 等)
rawProposalData.value = predictionData.data
// 转换 API 数据为组件所需格式 // 转换 API 数据为组件所需格式
proposalInfo.value = transformProposalInfo(predictionData) proposalInfo.value = transformProposalInfo(predictionData)
// 根据提案信息生成默认筛选条件 // 根据提案信息生成默认筛选条件
if (proposalInfo.value) { if (proposalInfo.value) {
defaultFilters.value = generateDefaultFilters(proposalInfo.value) defaultFilters.value = generateDefaultFilters(proposalInfo.value)
// 初始化筛选参数(Step2 会用到)
currentFilterParams.value = {
billIds: billId.value,
domains: proposalInfo.value.areas || [],
patternType: proposalInfo.value.patternType || '统一政府',
proposalType: '两党共同提案'
}
} }
} }
} finally { } finally {
...@@ -105,6 +123,285 @@ function goToNextStep() { ...@@ -105,6 +123,285 @@ function goToNextStep() {
} }
} }
// Step1 下一步:更新筛选参数中的 domains
function handleStep1Next(selectedFilters: Record<string, string[]>) {
// 用已选的政策领域更新 currentFilterParams
if (currentFilterParams.value) {
currentFilterParams.value.domains = selectedFilters.policyArea || []
}
// 进入下一步
goToNextStep()
}
// Step2 下一步:调用预测接口
async function handleStep2Next(selectedBills: any[]) {
predictionLoading.value = true
predictionResult.value = null
// 先进入第三页显示加载状态
goToNextStep()
try {
// TODO: 暂行版本 - 使用固定参数,等后端接口完善后替换为真实数据
// 真实参数应从 rawProposalData 和 selectedBills 获取
const params = {
"bill_name": "《人工智能监督法案》(AI OVERWATCH Act)",
"bill_actions": [
{
"action_date": "2025-12-18",
"action_type": "IntroReferral",
"org_name": "House floor actions",
"action_content": "Referred to the House Committee on Foreign Affairs."
},
{
"action_date": "2025-12-18",
"action_type": "IntroReferral",
"org_name": "Library of Congress",
"action_content": "Introduced in House"
},
{
"action_date": "2025-12-18",
"action_type": "IntroReferral",
"org_name": "Library of Congress",
"action_content": "Introduced in House"
}
],
"bill_sponsors": [
{
"person_name": "Moolenaar, John R.",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Huizenga, Bill",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "LaHood, Darin",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Mast, Brian J.",
"sponsor_type": "提案人",
"party_name": "共和党"
},
{
"person_name": "Kim, Young",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Crawford, Eric A. &quot;Rick&quot;",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Self, Keith",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "McCaul, Michael T.",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Davidson, Warren",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Kean, Thomas H.",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Baird, James R.",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Moylan, James C.",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Fine, Randy",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Moran, Nathaniel",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Miller, Max L.",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Lawler, Michael",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Meeks, Gregory W.",
"sponsor_type": "共同提案人",
"party_name": "民主党"
},
{
"person_name": "Kamlager-Dove, Sydney",
"sponsor_type": "共同提案人",
"party_name": "民主党"
},
{
"person_name": "Sherman, Brad",
"sponsor_type": "共同提案人",
"party_name": "民主党"
},
{
"person_name": "Newhouse, Dan",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Biggs, Sheri",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Salazar, Maria Elvira",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Nunn, Zachary",
"sponsor_type": "共同提案人",
"party_name": "共和党"
},
{
"person_name": "Radewagen, Aumua Amata Coleman",
"sponsor_type": "共同提案人",
"party_name": "共和党"
}
],
"bill_proposal_type": "两党共同提案",
"poli_pattern_type": "统一政府",
"poli_pattern_desc": "2025年12月18日,美国处于统一政府:共和党籍总统就职,共和党在参议院以53席对47席掌握多数,在众议院以220席对215席占据多数。",
"simi_bills": [
{
"bill_name": "2025年NASA过渡授权法案",
"bill_actions": [
{
"action_date": "2025-03-11",
"action_type": "IntroReferral",
"org_name": "Senate",
"action_content": "Read twice and referred to the Committee on Commerce, Science, and Transportation."
},
{
"action_date": "2025-03-11",
"action_type": "IntroReferral",
"org_name": "Library of Congress",
"action_content": "Introduced in Senate"
},
{
"action_date": "2025-03-11",
"action_type": "IntroReferral",
"org_name": "Senate",
"action_content": "Read twice and referred to the Committee on Commerce, Science, and Transportation."
},
{
"action_date": "2025-03-11",
"action_type": "IntroReferral",
"org_name": "Library of Congress",
"action_content": "Introduced in Senate"
},
{
"action_date": "2026-03-04",
"action_type": "Committee",
"org_name": "Senate",
"action_content": "Committee on Commerce, Science, and Transportation. Ordered to be reported with an amendment in the nature of a substitute favorably."
}
],
"bill_proposal_type": "两党共同提案",
"bill_proposal_desc": "两党共同提案",
"poli_pattern_type": "统一政府",
"poli_pattern_desc": "2025-03-11,共和党总统唐纳德&middot;特朗普执政;参议院共和党53席、民主党47席;众议院共和党220席、民主党215席(含空缺)。"
}
]
}
const response = await getPassProd(params)
if (response && response.data) {
// 转换预测结果为组件所需格式
predictionResult.value = transformPredictionResult(response.data)
}
} catch (error) {
console.error('[v0] 获取预测分析失败:', error)
} finally {
predictionLoading.value = false
}
}
// 根据通过概率转换为风险等级
function probabilityToRisk(probability: string): 'high' | 'medium' | 'low' {
const num = parseInt(probability) || 0
if (num >= 70) return 'high'
if (num >= 40) return 'medium'
return 'low'
}
// 根据通过概率转换为进度等级 (1-3)
function probabilityToProgressLevel(probability: string): number {
const num = parseInt(probability) || 0
if (num >= 70) return 3
if (num >= 40) return 2
return 1
}
// 转换预测结果为组件所需格式
function transformPredictionResult(data: any) {
const overall = data?.overall_analysis || {}
const stages = data?.stage_analysis || []
const factors = data?.factor_analysis || []
// 转换阶段分析
const phases = stages.map((stage: any, index: number) => ({
id: index + 1,
title: `阶段${index + 1}${stage.stage}`,
description: stage.stage,
riskLevel: probabilityToRisk(stage.predicted_pass_probability),
progressLevel: probabilityToProgressLevel(stage.predicted_pass_probability),
estimatedDays: `预计耗时${stage.predicted_passing_time}天`,
modelInputs: [stage.analysis],
supportingFacts: {
title: '通过性预测依据',
basedOn: '此阶段预测基于以下观点',
stats: [
{ value: `${stage.predicted_pass_probability}`, label: '通过概率' },
{ value: `${stage.predicted_passing_time}天`, label: '预计耗时' }
]
},
predictionBasis: stage.prediction_basis
}))
return {
title: '立法进展阶段预测分析',
subtitle: `基于相似法案的历史数据与预测模型`,
overallRisk: probabilityToRisk(overall.predicted_pass_probability),
overallProgressLevel: probabilityToProgressLevel(overall.predicted_pass_probability),
overallEstimatedDays: `预计耗时${overall.predicted_passing_time || '—'}天`,
highlightText: overall.analysis || '',
overallProbability: overall.predicted_pass_probability || '',
phases,
factorAnalysis: factors
}
}
// 上一步 // 上一步
function goToPreviousStep() { function goToPreviousStep() {
if (currentStep.value > 1) { if (currentStep.value > 1) {
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
</div> </div>
<div class="meta-row"> <div class="meta-row">
<span class="meta-label">相关领域:</span> <span class="meta-label">相关领域:</span>
<div class="meta-tags"> <div class="meta-tags">
<TagBadge v-for="item in bill.industryList" :key="item.industryName" :label="item.industryName" tag-class="tag3" /> <AreaTag v-for="item in bill.industryList" :key="item.industryName" :tagName="item.industryName" />
</div> </div>
</div> </div>
<div class="meta-row"> <div class="meta-row">
...@@ -44,8 +44,7 @@ ...@@ -44,8 +44,7 @@
<script setup> <script setup>
import { computed } from 'vue' import { computed } from 'vue'
import DocumentPreview from './DocumentPreview.vue' import DocumentPreview from './DocumentPreview.vue'
import TagBadge from './TagBadge.vue'
import ProgressBar from './ProgressBar.vue' import ProgressBar from './ProgressBar.vue'
const props = defineProps({ const props = defineProps({
...@@ -179,23 +178,25 @@ const currentStageIndex = computed(() => { ...@@ -179,23 +178,25 @@ const currentStageIndex = computed(() => {
.bill-card-meta { .bill-card-meta {
width: 100%; width: 100%;
flex: 1; flex: 1;
position: relative; display: flex;
flex-direction: column;
gap: 12px;
min-height: 0; min-height: 0;
overflow: hidden;
} }
.meta-row { .meta-row {
display: flex; display: flex;
align-items: center; align-items: flex-start;
position: absolute;
left: 0;
width: 100%; width: 100%;
gap: 12px;
} }
.meta-row:nth-child(1) { top: 0; } .meta-row:nth-child(1) { }
.meta-row:nth-child(2) { top: 36px; } .meta-row:nth-child(2) { }
.meta-row:nth-child(3) { top: 72px; } .meta-row:nth-child(3) { }
.meta-row:nth-child(4) { top: 108px; } .meta-row:nth-child(4) { }
.meta-row:nth-child(5) { top: 144px; } .meta-row:nth-child(5) { }
.meta-label { .meta-label {
font-size: 16px; font-size: 16px;
...@@ -206,6 +207,7 @@ const currentStageIndex = computed(() => { ...@@ -206,6 +207,7 @@ const currentStageIndex = computed(() => {
white-space: nowrap; white-space: nowrap;
flex-shrink: 0; flex-shrink: 0;
width: 100px; width: 100px;
padding-top: 2px;
} }
.meta-value { .meta-value {
...@@ -213,6 +215,8 @@ const currentStageIndex = computed(() => { ...@@ -213,6 +215,8 @@ const currentStageIndex = computed(() => {
font-weight: 400; font-weight: 400;
color: rgba(95, 101, 108, 1); color: rgba(95, 101, 108, 1);
line-height: 24px; line-height: 24px;
flex: 1;
min-width: 0;
} }
.sponsor-name { .sponsor-name {
...@@ -225,11 +229,11 @@ const currentStageIndex = computed(() => { ...@@ -225,11 +229,11 @@ const currentStageIndex = computed(() => {
gap: 8px; gap: 8px;
flex-wrap: wrap; flex-wrap: wrap;
align-items: center; align-items: center;
flex: 1;
min-width: 0;
} }
.meta-row-progress { .meta-row-progress {
left: 0;
right: 0;
width: 100%; width: 100%;
} }
.meta-row-progress :deep(.progress-bar) { .meta-row-progress :deep(.progress-bar) {
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="line-test"></div> <!-- <div class="line-test"></div> -->
</div> </div>
<div class="pagination"> <div class="pagination">
<div class="total">{{ `共 ${total} 项` }}</div> <div class="total">{{ `共 ${total} 项` }}</div>
...@@ -853,10 +853,12 @@ onMounted(() => { ...@@ -853,10 +853,12 @@ onMounted(() => {
z-index: 110; z-index: 110;
margin-top: 10px; margin-top: 10px;
.main-item { .main-item {
width: 1014px; width: 1014px;
margin-bottom: 40px; display: flex;
display: flex; flex-direction: row;
align-items: flex-start;
margin-bottom: 20px;
position: relative;
.time { .time {
width: 77px; width: 77px;
box-sizing: border-box; box-sizing: border-box;
...@@ -995,7 +997,16 @@ onMounted(() => { ...@@ -995,7 +997,16 @@ onMounted(() => {
} }
} }
} }
.main-item::after {
content: '';
position: absolute;
left: 109px;
top: 24px;
bottom: -20px;
width: 1px;
background-color: rgb(230, 231, 232);
z-index: -1;
}
.line-test { .line-test {
position: absolute; position: absolute;
top: 10px; top: 10px;
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="line-test"></div> <!-- <div class="line-test"></div> -->
</div> </div>
<div class="pagination"> <div class="pagination">
<div class="total">{{ `共 ${total} 项` }}</div> <div class="total">{{ `共 ${total} 项` }}</div>
...@@ -605,10 +605,13 @@ const companyList = ref([ ...@@ -605,10 +605,13 @@ const companyList = ref([
z-index: 110; z-index: 110;
.main-item { .main-item {
width: 100%; width: 100%;
margin-bottom: 40px;
display: flex; display: flex;
display: flex;
flex-direction: row;
align-items: flex-start;
margin-bottom: 20px;
position: relative;
.time { .time {
width: 77px; width: 77px;
box-sizing: border-box; box-sizing: border-box;
...@@ -717,7 +720,16 @@ const companyList = ref([ ...@@ -717,7 +720,16 @@ const companyList = ref([
} }
} }
} }
.main-item::after {
content: '';
position: absolute;
left: 109px;
top: 24px;
bottom: -20px;
width: 1px;
background-color: rgb(230, 231, 232);
z-index: -1;
}
.line-test { .line-test {
position: absolute; position: absolute;
top: 10px; top: 10px;
......
...@@ -187,11 +187,11 @@ const handleMouseLeave = () => { ...@@ -187,11 +187,11 @@ const handleMouseLeave = () => {
isInChart.value = false; isInChart.value = false;
}; };
const handleNodeClick = (node) => { const handleNodeClick = node => {
selectedNode.value = node; selectedNode.value = node;
}; };
const handleLayoutChange = (type) => { const handleLayoutChange = type => {
controlActive.value = type; controlActive.value = type;
if (type !== 2) { if (type !== 2) {
isInChart.value = true; isInChart.value = true;
...@@ -201,9 +201,8 @@ const handleLayoutChange = (type) => { ...@@ -201,9 +201,8 @@ const handleLayoutChange = (type) => {
}; };
const updateGraphData = () => { const updateGraphData = () => {
const data = rightActiveTab.value === 'supplyChain' const data =
? singleSanctionEntitySupplyChainData.value rightActiveTab.value === "supplyChain" ? singleSanctionEntitySupplyChainData.value : singleSanctionEntityEquityData.value;
: singleSanctionEntityEquityData.value;
if (!data) return; if (!data) return;
...@@ -231,7 +230,7 @@ const updateGraphData = () => { ...@@ -231,7 +230,7 @@ const updateGraphData = () => {
links.push({ links.push({
source: `p-${item.id || index}`, source: `p-${item.id || index}`,
target: "0", target: "0",
name: rightActiveTab.value === 'supplyChain' ? "供应商" : (item.type || "持股") name: rightActiveTab.value === "supplyChain" ? "供应商" : item.type || "持股"
}); });
}); });
...@@ -248,14 +247,14 @@ const updateGraphData = () => { ...@@ -248,14 +247,14 @@ const updateGraphData = () => {
links.push({ links.push({
source: "0", source: "0",
target: `c-${item.id || index}`, target: `c-${item.id || index}`,
name: rightActiveTab.value === 'supplyChain' ? "客户" : (item.type || "投资") name: rightActiveTab.value === "supplyChain" ? "客户" : item.description || "投资"
}); });
}); });
graphData.value = { nodes, links }; graphData.value = { nodes, links };
}; };
const updateTreeData = (data) => { const updateTreeData = data => {
if (!data) return; if (!data) return;
treeData.value = { treeData.value = {
...@@ -336,17 +335,17 @@ const getSingleSanctionEntityListRequest = async () => { ...@@ -336,17 +335,17 @@ const getSingleSanctionEntityListRequest = async () => {
} }
}; };
watch(rightActiveTab, async (newTab) => { watch(rightActiveTab, async newTab => {
if (newTab === 'supplyChain') { if (newTab === "supplyChain") {
await getSingleSanctionEntitySupplyChainRequest(); await getSingleSanctionEntitySupplyChainRequest();
} else { } else {
await getSingleSanctionEntityEquityRequest(); await getSingleSanctionEntityEquityRequest();
} }
}); });
watch(activeEntityId, async (newId) => { watch(activeEntityId, async newId => {
if (newId) { if (newId) {
if (rightActiveTab.value === 'supplyChain') { if (rightActiveTab.value === "supplyChain") {
await getSingleSanctionEntitySupplyChainRequest(); await getSingleSanctionEntitySupplyChainRequest();
} else { } else {
await getSingleSanctionEntityEquityRequest(); await getSingleSanctionEntityEquityRequest();
...@@ -355,7 +354,7 @@ watch(activeEntityId, async (newId) => { ...@@ -355,7 +354,7 @@ watch(activeEntityId, async (newId) => {
}); });
watch(is50PercentRule, async () => { watch(is50PercentRule, async () => {
if (rightActiveTab.value === 'equity') { if (rightActiveTab.value === "equity") {
await getSingleSanctionEntityEquityRequest(); await getSingleSanctionEntityEquityRequest();
} }
}); });
......
...@@ -71,21 +71,19 @@ ...@@ -71,21 +71,19 @@
v-for="item in listData" v-for="item in listData"
:key="item.id" :key="item.id"
class="resource-card" class="resource-card"
@click="goToInstitution(item.id)"
> >
<div class="card-logo"> <div class="card-logo">
<img :src="item.logoUrl || defaultLogo" :alt="item.name" /> <img :src="item.logo || defaultLogo" :alt="item.name" />
</div> </div>
<div class="card-name">{{ item.name }}</div> <div class="card-name">{{ item.name }}</div>
<div class="card-location">{{ item.address }}</div> <div class="card-location">{{ item.location }}</div>
<div class="card-majors">{{ item.majors }}</div> <div class="card-majors">{{ item.majors }}</div>
<div class="card-tags"> <div class="card-tags">
<span
v-for="tag in item.tags" <AreaTag v-for="tag in item.tags"
:key="tag" :key="tag" :tagName="tag" />
class="tag"
>
{{ tag }}
</span>
</div> </div>
</div> </div>
</template> </template>
...@@ -134,7 +132,10 @@ ...@@ -134,7 +132,10 @@
import { ref, computed, onMounted, watch } from 'vue' import { ref, computed, onMounted, watch } from 'vue'
import { getIndustryKeyList } from '@/api/bill/billHome.js' import { getIndustryKeyList } from '@/api/bill/billHome.js'
import { getSubjectList } from '@/api/characterPage/characterPage.js' import { getSubjectList } from '@/api/characterPage/characterPage.js'
import AreaTag from '@/components/base/AreaTag/index.vue'
import { useRouter } from 'vue-router'
const router = useRouter()
// Props // Props
const props = defineProps<{ const props = defineProps<{
initialTab?: string initialTab?: string
...@@ -142,7 +143,9 @@ const props = defineProps<{ ...@@ -142,7 +143,9 @@ const props = defineProps<{
// 默认logo // 默认logo
const defaultLogo = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgdmlld0JveD0iMCAwIDMyIDMyIj48cmVjdCB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIGZpbGw9IiNhMzE4MWIiIHJ4PSI0Ii8+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTggOGgxNnYxNkg4eiIvPjwvc3ZnPg==' const defaultLogo = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgdmlld0JveD0iMCAwIDMyIDMyIj48cmVjdCB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIGZpbGw9IiNhMzE4MWIiIHJ4PSI0Ii8+PHBhdGggZmlsbD0iI2ZmZiIgZD0iTTggOGgxNnYxNkg4eiIvPjwvc3ZnPg=='
const goOrigin=(id)=>{
router.push(`/InnovativeInstitutions/${id}`)
}
// 标签配置 - 添加 subjectTypeId // 标签配置 - 添加 subjectTypeId
const tabs = ref([ const tabs = ref([
{ label: '大学', value: 'university', subjectTypeId: 1 }, { label: '大学', value: 'university', subjectTypeId: 1 },
...@@ -165,7 +168,17 @@ const fields = ref<{ label: string; value: string }[]>([ ...@@ -165,7 +168,17 @@ const fields = ref<{ label: string; value: string }[]>([
{ label: '全部领域', value: 'all' } { label: '全部领域', value: 'all' }
]) ])
const fieldsLoading = ref(false) const fieldsLoading = ref(false)
const goToInstitution = (id) => {
router.push({
name: 'InnovativeInstitutions',
params: {
id: id,
type: 1
}
})
}
// 获取科技领域选项 // 获取科技领域选项
async function fetchFieldOptions() { async function fetchFieldOptions() {
fieldsLoading.value = true fieldsLoading.value = true
...@@ -273,8 +286,7 @@ function goToPage(page: number | string) { ...@@ -273,8 +286,7 @@ function goToPage(page: number | string) {
fetchData() fetchData()
} }
} }
// 模拟API获取数据
async function fetchData() { async function fetchData() {
loading.value = true loading.value = true
try { try {
...@@ -299,12 +311,12 @@ async function fetchData() { ...@@ -299,12 +311,12 @@ async function fetchData() {
if (res.code === 200 && res.data) { if (res.code === 200 && res.data) {
// 映射 API 返回的数据到卡片显示格式 // 映射 API 返回的数据到卡片显示格式
const mappedData = (res.data.content || []).map((item: any) => ({ const mappedData = (res.data.content || []).map((item: any) => ({
id: item.id, id: item.orgId,
name: item.orgName, name: item.orgName,
location: item.countryName ? `${item.countryName}·${item.provinceName}` : item.provinceName || '--', location: item.address || '--',
majors: item.fieldList?.join('、') || '--', majors: item.fieldList?.join('、') || '--',
tags: item.areaList?.map((a: any) => a.areaName) || [], tags: item.taglist || [],
logo: defaultLogo logo: item.logoUrl
})) }))
listData.value = mappedData listData.value = mappedData
......
...@@ -70,13 +70,21 @@ ...@@ -70,13 +70,21 @@
</template> </template>
<script setup> <script setup>
import { ref } from 'vue' import { ref, computed, provide } from 'vue'
import { useRoute } from 'vue-router'
import AreaTag from '@/components/base/AreaTag/index.vue' import AreaTag from '@/components/base/AreaTag/index.vue'
import SchoolDetail from './tabs/SchoolDetail.vue' import SchoolDetail from './tabs/SchoolDetail.vue'
import ResearchStrength from './tabs/ResearchStrength.vue' import ResearchStrength from './tabs/ResearchStrength.vue'
import Cooperation from './tabs/Cooperation.vue' import Cooperation from './tabs/Cooperation.vue'
import OtherInfo from './tabs/OtherInfo.vue' import OtherInfo from './tabs/OtherInfo.vue'
// 从路由获取 orgId
const route = useRoute()
const orgId = computed(() => route.params.id || '')
// 提供给子组件使用
provide('orgId', orgId)
// 大学基本信息 // 大学基本信息
const universityInfo = ref({ const universityInfo = ref({
name: '哈佛大学', name: '哈佛大学',
......
...@@ -42,100 +42,127 @@ ...@@ -42,100 +42,127 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, computed } from 'vue' import { ref, computed, onMounted, watch } from 'vue'
import AnalysisBox from '@/components/base/boxBackground/analysisBox.vue' import AnalysisBox from '@/components/base/boxBackground/analysisBox.vue'
import LeftBtn from '@/components/base/pageBtn/leftBtn.vue' import LeftBtn from '@/components/base/pageBtn/leftBtn.vue'
import RightBtn from '@/components/base/pageBtn/rightBtn.vue' import RightBtn from '@/components/base/pageBtn/rightBtn.vue'
import AreaTag from '@/components/base/AreaTag/index.vue' import AreaTag from '@/components/base/AreaTag/index.vue'
import { getLabList, getPolicyList } from '@/api/innovationSubject/overview.js'
const props = defineProps<{
orgId?: string
}>()
const areaTypeMap: Record<string, string> = {
'人工智能': 'tag1',
'生物科技': 'tag2',
'太空': 'tag3',
'航空航天': 'tag4',
'先进制造': 'tag5',
'物理学': 'tag6',
'海洋': 'tag7',
'新能源': 'tag8',
'医学': 'tag9',
'化学': 'tag10',
'新一代通信网络': 'tag11',
'其他': 'tag12'
}
// 重点实验室数据 const labsData = ref<Array<{
const labsData = ref([ logo: string
{ name: string
logo: '/images/lab-wyss.png', description: string
name: '怀斯生物启发工程研究所', tags: Array<{ name: string; type: string }>
description: '成立于2009年,由汉斯约尔格·怀斯(Hansjörg Wyss)捐赠建立,聚焦仿生学与跨学科工程,推动医疗、机器人、材料等领域的突破。', }>>([])
tags: [{ name: '生物科技', type: 'tag2' }]
}, const policyData = ref<Array<{
{ title: string
logo: '/images/lab-rowland.png', description: string
name: '罗兰研究所', }>>([])
description: '原为独立研究机构,2002年并入哈佛,支持高风险、高回报的基础科学研究,尤其鼓励青年科学家。',
tags: [{ name: '物理学', type: 'tag6' }, { name: '化学', type: 'tag10' }] const currentPage = ref(1)
}, const pageSize = ref(6)
{ const totalCount = ref(0)
logo: '/images/lab-quantum.png', const totalPages = ref(0)
name: '哈佛量子计划', const loading = ref(false)
description: '跨学院合作平台,整合物理、工程、计算机科学等资源,推动量子科学与技术发展。',
tags: [{ name: '物理', type: 'tag6' }] const fetchLabList = async () => {
}, const orgId = props.orgId || '6789'
{ try {
logo: '/images/lab-broad.png', const result = await getLabList(orgId)
name: '博德研究所', if (result.success && result.data) {
description: '全球顶尖基因组学与生物医学研究中心,推动精准医学与疾病机制研究。', labsData.value = result.data.map((item: any) => ({
tags: [{ name: '医学', type: 'tag9' }] logo: item.logoUrl || '/images/lab-default.png',
}, name: item.labName,
{ description: item.introduction,
logo: '/images/lab-stem.png', tags: (item.arealist || []).map((area: string) => ({
name: '哈佛干细胞研究所', name: area,
description: '成立于2004年,联合哈佛医学院、牙医学院、文理学院等,推动干细胞基础研究与临床转化。', type: areaTypeMap[area] || 'tag12'
tags: [{ name: '医学', type: 'tag9' }] }))
}, }))
{ }
logo: '/images/lab-cfa.png', } catch (error) {
name: '哈佛大学天体物理中心', console.error('获取实验室列表失败:', error)
description: '由哈佛大学与史密森尼学会于1973年联合成立,是全球规模最大、最活跃的天体物理研究机构之一。',
tags: [{ name: '天体物理', type: 'tag3' }]
} }
]) }
// 政策文件数据 const fetchPolicyList = async () => {
const policyData = ref([ const orgId = props.orgId || '6789'
{ title: '《哈佛大学权利与责任声明》', description: '阐明学生在言论自由、学术自由、正当程序、尊重他人等方面的权利与义务。' }, loading.value = true
{ title: '《哈佛大学学术诚信政策》', description: '定义抄袭、作弊、伪造等学术不端行为,并规定处理流程。' }, try {
{ title: '《哈佛大学反歧视与反骚扰政策》', description: '禁止基于种族、性别、性取向、宗教、残疾等的歧视与骚扰,明确举报与调查机制。' }, const result = await getPolicyList(orgId, currentPage.value, pageSize.value)
{ title: '《研究合规与人类受试者保护政策》', description: '规范涉及人类受试者的研究(如医学、心理学、社会学实验),确保符合联邦法规(如Common Rule)。' }, if (result.success && result.data) {
{ title: '《哈佛法学院学术政策手册》', description: '详述J.D./LL.M./S.J.D.学位要求、课程规则、成绩制度、书面作业要求、出勤规定、荣誉毕业标准等。' }, policyData.value = result.data.content.map((item: any) => ({
{ title: '《哈佛文理研究生院学生手册》', description: '涵盖博士生资格考试、论文提交、助教职责、奖学金续期、学术进展评估等。' } title: `《${item.name}》`,
]) description: item.introduction
}))
// 分页相关 totalCount.value = result.data.totalElements
const currentPage = ref(5) totalPages.value = result.data.totalPages
const totalCount = ref(105) }
const totalPages = computed(() => Math.ceil(totalCount.value / 10)) } catch (error) {
console.error('获取政策文件列表失败:', error)
} finally {
loading.value = false
}
}
watch(currentPage, () => {
fetchPolicyList()
})
onMounted(() => {
fetchLabList()
fetchPolicyList()
})
const displayPages = computed(() => { const displayPages = computed(() => {
const pages: (number | string)[] = [] const pages: (number | string)[] = []
if (totalPages.value <= 7) { const total = totalPages.value
for (let i = 1; i <= totalPages.value; i++) pages.push(i) if (total <= 7) {
for (let i = 1; i <= total; i++) pages.push(i)
} else { } else {
pages.push(1) pages.push(1)
if (currentPage.value > 3) pages.push('...') if (currentPage.value > 3) pages.push('...')
const start = Math.max(2, currentPage.value - 1) const start = Math.max(2, currentPage.value - 1)
const end = Math.min(totalPages.value - 1, currentPage.value + 1) const end = Math.min(total - 1, currentPage.value + 1)
for (let i = start; i <= end; i++) pages.push(i) for (let i = start; i <= end; i++) pages.push(i)
if (currentPage.value < totalPages.value - 2) pages.push('...') if (currentPage.value < total - 2) pages.push('...')
pages.push(totalPages.value) pages.push(total)
} }
return pages return pages
}) })
// 上一页
const prevPage = () => { const prevPage = () => {
if (currentPage.value > 1) currentPage.value-- if (currentPage.value > 1) currentPage.value--
} }
// 下一页
const nextPage = () => { const nextPage = () => {
if (currentPage.value < totalPages.value) currentPage.value++ if (currentPage.value < totalPages.value) currentPage.value++
} }
// 跳转到指定页
const goToPage = (page: number | string) => { const goToPage = (page: number | string) => {
if (typeof page === 'number') currentPage.value = page if (typeof page === 'number') currentPage.value = page
} }
// 获取标签样式
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
......
...@@ -10,22 +10,18 @@ ...@@ -10,22 +10,18 @@
</Teleport> </Teleport>
<!-- 第一行 --> <!-- 第一行 -->
<div class="chart-row"> <div class="chart-row">
<!-- 专利数量统计 - 柱状图 --> <!-- 专利数量统计 - 柱状图 -->
<AnalysisBox title="专利数量统计" width="100%" height="500px" :show-all-btn="false" class="chart-box"> <AnalysisBox title="专利数量统计" width="100%" height="500px" :show-all-btn="false" class="chart-box">
<div class="chart-container"> <div class="chart-container">
<div class="bar-chart"> <div class="bar-chart">
<div class="y-axis"> <div class="y-axis">
<span>400</span> <span v-for="tick in patentYAxisTicks" :key="tick">{{ tick }}</span>
<span>300</span>
<span>200</span>
<span>100</span>
<span>0</span>
</div> </div>
<div class="chart-area"> <div class="chart-area">
<div class="bars"> <div class="bars">
<div v-for="(item, index) in patentData" :key="index" class="bar-item"> <div v-for="(item, index) in patentData" :key="index" class="bar-item">
<span class="bar-label">{{ item.year }}</span> <span class="bar-label">{{ item.year }}</span>
<div class="bar" :style="{ height: `${item.value / 400 * 100}%`, background: getPatentBarGradient() }"></div> <div class="bar" :style="{ height: `${item.value / patentMaxValue * 100}%`, background: getPatentBarGradient() }"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -34,16 +30,12 @@ ...@@ -34,16 +30,12 @@
<ChartSummary text="哈佛大学近十年专利数量呈现稳定增长趋势,尤其在生物技术和人工智能领域表现突出,2025年达到历史新高。" /> <ChartSummary text="哈佛大学近十年专利数量呈现稳定增长趋势,尤其在生物技术和人工智能领域表现突出,2025年达到历史新高。" />
</AnalysisBox> </AnalysisBox>
<!-- 论文数量统计 - 面积图 --> <!-- 论文数量统计 - 面积图 -->
<AnalysisBox title="论文数量统计" width="100%" height="500px" :show-all-btn="false" class="chart-box"> <AnalysisBox title="论文数量统计" width="100%" height="500px" :show-all-btn="false" class="chart-box">
<div class="chart-container"> <div class="chart-container">
<div class="area-chart"> <div class="area-chart">
<div class="y-axis"> <div class="y-axis">
<span>400</span> <span v-for="tick in paperYAxisTicks" :key="tick">{{ tick }}</span>
<span>300</span>
<span>200</span>
<span>100</span>
<span>0</span>
</div> </div>
<div class="chart-area"> <div class="chart-area">
<svg class="area-svg" viewBox="0 0 700 240" preserveAspectRatio="none"> <svg class="area-svg" viewBox="0 0 700 240" preserveAspectRatio="none">
...@@ -61,12 +53,12 @@ ...@@ -61,12 +53,12 @@
:cx="point.x" :cy="point.y" r="4" :cx="point.x" :cy="point.y" r="4"
fill="#FFFFFF" stroke="#FF954D" stroke-width="2" fill="#FFFFFF" stroke="#FF954D" stroke-width="2"
class="data-point" class="data-point"
@mouseenter="showTooltip($event, chartYears[idx], paperData[idx])" @mouseenter="showTooltip($event, paperYears[idx], paperData[idx]?.value)"
@mouseleave="hideTooltip" /> @mouseleave="hideTooltip" />
</g> </g>
</svg> </svg>
<div class="x-labels"> <div class="x-labels">
<span v-for="year in chartYears" :key="year">{{ year }}</span> <span v-for="year in paperYears" :key="year">{{ year }}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -116,16 +108,12 @@ ...@@ -116,16 +108,12 @@
<ChartSummary text="哈佛大学在生物科技和人工智能领域实力最为突出,同时在量子科技和能源领域也有显著优势,体现了其跨学科研究能力。" /> <ChartSummary text="哈佛大学在生物科技和人工智能领域实力最为突出,同时在量子科技和能源领域也有显著优势,体现了其跨学科研究能力。" />
</AnalysisBox> </AnalysisBox>
<!-- 大学经费增长情况 - 面积图 --> <!-- 大学经费增长情况 - 面积图 -->
<AnalysisBox title="大学经费增长情况" width="100%" height="500px" :show-all-btn="false" class="chart-box"> <AnalysisBox title="大学经费增长情况" width="100%" height="500px" :show-all-btn="false" class="chart-box">
<div class="chart-container"> <div class="chart-container">
<div class="area-chart"> <div class="area-chart">
<div class="y-axis"> <div class="y-axis">
<span>400</span> <span v-for="tick in fundingYAxisTicks" :key="tick">{{ tick }}</span>
<span>300</span>
<span>200</span>
<span>100</span>
<span>0</span>
</div> </div>
<div class="chart-area"> <div class="chart-area">
<svg class="area-svg" viewBox="0 0 700 240" preserveAspectRatio="none"> <svg class="area-svg" viewBox="0 0 700 240" preserveAspectRatio="none">
...@@ -143,12 +131,12 @@ ...@@ -143,12 +131,12 @@
:cx="point.x" :cy="point.y" r="4" :cx="point.x" :cy="point.y" r="4"
fill="#FFFFFF" stroke="#22C55E" stroke-width="2" fill="#FFFFFF" stroke="#22C55E" stroke-width="2"
class="data-point" class="data-point"
@mouseenter="showTooltip($event, chartYears[idx], fundingData[idx])" @mouseenter="showTooltip($event, fundingYears[idx], fundingData[idx]?.value)"
@mouseleave="hideTooltip" /> @mouseleave="hideTooltip" />
</g> </g>
</svg> </svg>
<div class="x-labels"> <div class="x-labels">
<span v-for="year in chartYears" :key="year">{{ year }}</span> <span v-for="year in fundingYears" :key="year">{{ year }}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -207,9 +195,13 @@ ...@@ -207,9 +195,13 @@
</template> </template>
<script setup> <script setup>
import { ref, computed } from 'vue' import { ref, computed, onMounted, inject, watch } from 'vue'
import AnalysisBox from '@/components/base/boxBackground/analysisBox.vue' import AnalysisBox from '@/components/base/boxBackground/analysisBox.vue'
import ChartSummary from '../components/ChartSummary.vue' import ChartSummary from '../components/ChartSummary.vue'
import { getPatentList, getPaperList, getStudyFieldList, getFundGrowth } from '@/api/innovationSubject/overview.js'
// 从父组件注入 orgId
const orgId = inject('orgId', ref(''))
// Tooltip 状态 // Tooltip 状态
const tooltipVisible = ref(false) const tooltipVisible = ref(false)
...@@ -227,40 +219,86 @@ const hideTooltip = () => { ...@@ -227,40 +219,86 @@ const hideTooltip = () => {
} }
// 专利数据 - 柱状图 // 专利数据 - 柱状图
const patentData = [ const patentData = ref([])
{ year: '2016', value: 80 },
{ year: '2017', value: 90 },
{ year: '2018', value: 120 },
{ year: '2019', value: 180 },
{ year: '2020', value: 220 },
{ year: '2021', value: 250 },
{ year: '2022', value: 280 },
{ year: '2023', value: 300 },
{ year: '2024', value: 340 },
{ year: '2025', value: 360 }
]
// 图表年份
const chartYears = ['2016', '2017', '2018', '2019', '2020', '2021', '2022', '2023', '2024', '2025']
// 论文数据 // 论文数据
const paperData = [120, 140, 150, 160, 180, 200, 220, 280, 350, 400] const paperData = ref([])
// 图表年份(从论文数据中提取)
const chartYears = computed(() => paperData.value.map(item => String(item.year)))
// 经费数据 // 经费数据
const fundingData = [80, 100, 120, 150, 180, 220, 260, 300, 340, 380] const fundingData = ref([])
// 领域实力分布数据
const studyFieldData = ref([])
// 加载数据
const loadData = async () => {
if (!orgId.value) return
try {
// 并行请求所有数据
const [patentRes, paperRes, fieldRes, fundRes] = await Promise.all([
getPatentList(orgId.value),
getPaperList(orgId.value),
getStudyFieldList(orgId.value),
getFundGrowth(orgId.value)
])
if (patentRes.success && patentRes.data) {
patentData.value = patentRes.data.map(item => ({
year: String(item.year),
value: item.countNum
}))
}
if (paperRes.success && paperRes.data) {
paperData.value = paperRes.data.map(item => ({
year: item.year,
value: item.countNum
}))
}
if (fieldRes.success && fieldRes.data) {
studyFieldData.value = fieldRes.data
}
if (fundRes.success && fundRes.data) {
fundingData.value = fundRes.data.map(item => ({
year: item.year,
value: item.fundAmount
}))
}
} catch (error) {
console.error('加载科研实力数据失败:', error)
}
}
// 监听 orgId 变化时重新加载数据
watch(orgId, (newVal) => {
if (newVal) {
loadData()
}
}, { immediate: true })
// 计算面积图路径 // 计算面积图路径
const createAreaPath = (data, maxValue = 400) => { const createAreaPath = (data, maxValue) => {
if (!data || data.length === 0) return { linePath: '', areaPath: '' }
const width = 700 const width = 700
const height = 240 const height = 240
const step = width / (data.length - 1) const step = data.length > 1 ? width / (data.length - 1) : width
const max = maxValue || Math.max(...data.map(d => d.value || d)) * 1.2 || 400
let linePath = `M 0 ${height - (data[0] / maxValue) * height}` const getValue = (item) => typeof item === 'object' ? item.value : item
let areaPath = `M 0 ${height} L 0 ${height - (data[0] / maxValue) * height}`
data.forEach((value, index) => { let linePath = `M 0 ${height - (getValue(data[0]) / max) * height}`
let areaPath = `M 0 ${height} L 0 ${height - (getValue(data[0]) / max) * height}`
data.forEach((item, index) => {
const x = index * step const x = index * step
const y = height - (value / maxValue) * height const y = height - (getValue(item) / max) * height
linePath += ` L ${x} ${y}` linePath += ` L ${x} ${y}`
areaPath += ` L ${x} ${y}` areaPath += ` L ${x} ${y}`
}) })
...@@ -270,22 +308,61 @@ const createAreaPath = (data, maxValue = 400) => { ...@@ -270,22 +308,61 @@ const createAreaPath = (data, maxValue = 400) => {
return { linePath, areaPath } return { linePath, areaPath }
} }
const { linePath: paperLinePath, areaPath: paperAreaPath } = createAreaPath(paperData) // 论文图表路径
const { linePath: fundingLinePath, areaPath: fundingAreaPath } = createAreaPath(fundingData) const paperLinePath = computed(() => createAreaPath(paperData.value).linePath)
const paperAreaPath = computed(() => createAreaPath(paperData.value).areaPath)
// 经费图表路径
const fundingLinePath = computed(() => createAreaPath(fundingData.value).linePath)
const fundingAreaPath = computed(() => createAreaPath(fundingData.value).areaPath)
// 计算节点坐标 // 计算节点坐标
const getDataPoints = (data, maxValue = 400) => { const getDataPoints = (data, maxValue) => {
if (!data || data.length === 0) return []
const width = 700 const width = 700
const height = 240 const height = 240
const step = width / (data.length - 1) const step = data.length > 1 ? width / (data.length - 1) : width
return data.map((value, index) => ({ const max = maxValue || Math.max(...data.map(d => d.value || d)) * 1.2 || 400
const getValue = (item) => typeof item === 'object' ? item.value : item
return data.map((item, index) => ({
x: index * step, x: index * step,
y: height - (value / maxValue) * height y: height - (getValue(item) / max) * height
})) }))
} }
const paperPoints = computed(() => getDataPoints(paperData)) const paperPoints = computed(() => getDataPoints(paperData.value))
const fundingPoints = computed(() => getDataPoints(fundingData)) const fundingPoints = computed(() => getDataPoints(fundingData.value))
// 论文/经费年份
const paperYears = computed(() => paperData.value.map(item => String(item.year)))
const fundingYears = computed(() => fundingData.value.map(item => String(item.year)))
// 计算Y轴刻度
const calculateYAxisTicks = (data, valueKey = 'value') => {
if (!data || data.length === 0) return [0, 100, 200, 300, 400].reverse()
const values = data.map(d => d[valueKey] || d)
const max = Math.max(...values)
const niceMax = Math.ceil(max / 100) * 100 || 400
const step = niceMax / 4
return [niceMax, niceMax - step, niceMax - step * 2, niceMax - step * 3, 0]
}
// 专利Y轴刻度和最大值
const patentMaxValue = computed(() => {
if (!patentData.value || patentData.value.length === 0) return 400
const max = Math.max(...patentData.value.map(d => d.value))
return Math.ceil(max / 100) * 100 || 400
})
const patentYAxisTicks = computed(() => calculateYAxisTicks(patentData.value))
// 论文Y轴刻度
const paperYAxisTicks = computed(() => calculateYAxisTicks(paperData.value))
// 经费Y轴刻度
const fundingYAxisTicks = computed(() => calculateYAxisTicks(fundingData.value))
// 雷达图数据和计算 // 雷达图数据和计算
const radarValues = [0.7, 0.9, 0.85, 0.6, 0.75, 0.65] // 各领域 const radarValues = [0.7, 0.9, 0.85, 0.6, 0.75, 0.65] // 各领域
...@@ -644,6 +721,7 @@ const getPatentBarGradient = () => { ...@@ -644,6 +721,7 @@ const getPatentBarGradient = () => {
} }
} }
} }
// 图表底部摘要
</style> </style>
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论