法案预测接入接口

src/api/bill/billHome.js

@@ -335,81 +335,73 @@ export function getProgressPrediction(billId) {
  * @returns {Promise<Object>} 相似法案列表
  */
 export function getSimiBills(params = {}) {
+
+  // domains 如果是数组则用逗号拼接
+  const domains = Array.isArray(params.domains) 
+    ? params.domains.join(',') 
+    : params.domains 
   return request('/api/BillProgressPrediction/simiBills', {
     method: 'GET',
     params: {
       billIds: params.billIds,
-      domains: params.domains,
-      patternType: params.patternType  ,
-      proposalType: params.proposalType  ,
-      ...params
+      domains: domains,
+      patternType: params.patternType,
+      proposalType: params.proposalType
     }
   })
 }
-
+/**
+ * 格式化日期 YYYY-MM-DD -> YYYY年M月D日
+ * @param {string} dateStr - 日期字符串
+ * @returns {string} 格式化后的日期
+ */
+function formatDate(dateStr) {
+  if (!dateStr) return ''
+  const match = dateStr.match(/(\d{4})-(\d{2})-(\d{2})/)
+  if (match) {
+    return `${match[1]}年${parseInt(match[2])}月${parseInt(match[3])}日`
+  }
+  return dateStr
+}
 /**
  * 转换相似法案 API 返回的数据为组件所需格式
  * @param {Object} apiData - API 返回的原始数据
  * @returns {Object} 转换后的统计数据和法案列表
  */
 export function transformSimiBillsData(apiData) {
-  if (!apiData || !apiData.data || !Array.isArray(apiData.data)) {
+  if (!apiData || !apiData.data) {
     return { stats: null, bills: [] }
   }
 
-  const bills = apiData.data
+  const data = apiData.data
+  const simiBills = data.simi_bills || []
   
-  // 计算统计数据
-  let becameLaw = 0
-  let notPassedOrShelved = 0
-  let totalDays = 0
-  let completedBills = 0
-
-  bills.forEach(bill => {
-    const actions = bill.bill_actions || []
-    const hasBecameLaw = actions.some(a => 
-      a.action_type === 'BecameLaw' || 
-      a.action_type === 'President' && a.action_desc?.includes('签署')
-    )
-    
-    if (hasBecameLaw) {
-      becameLaw++
-      // 计算耗时
-      if (actions.length >= 2) {
-        const firstDate = new Date(actions[0].action_date)
-        const lastDate = new Date(actions[actions.length - 1].action_date)
-        const days = Math.ceil((lastDate - firstDate) / (1000 * 60 * 60 * 24))
-        if (days > 0) {
-          totalDays += days
-          completedBills++
-        }
-      }
-    } else {
-      notPassedOrShelved++
-    }
-  })
-
-  const medianDays = completedBills > 0 ? Math.round(totalDays / completedBills) : 223
-  const passRate = bills.length > 0 ? ((becameLaw / bills.length) * 100).toFixed(1) : '0'
-
+  // 直接使用 API 返回的统计数据
   const stats = {
-    totalBills: bills.length,
-    becameLaw,
-    notPassedOrShelved,
-    medianDays,
-    passRate
+    totalBills: data.count || simiBills.length,
+    becameLaw: data.become_law || 0,
+    notPassedOrShelved: (data.count || simiBills.length) - (data.become_law || 0),
+    medianDays: data.become_law_avg_days || 0,
+    passRate: data.become_law_prop ? (data.become_law_prop * 100).toFixed(1) : '0'
   }
 
   // 转换法案列表格式
-  const transformedBills = bills.map(bill => ({
+  const transformedBills = simiBills.map(bill => ({
     id: bill.bill_id,
     title: bill.bill_name || bill.bill_id,
-    proposalDate: extractProposalDate(bill.poli_pattern_desc),
-    areas: bill.domain_name ? (Array.isArray(bill.domain_name) ? bill.domain_name : [bill.domain_name]) : [],
-    proposer: extractProposer(bill.bill_sponsors),
-    coProposers: bill.bill_proposal_desc || '',
+    proposalDate: bill.proposed_date ? formatDate(bill.proposed_date) : '',
+    areas: bill.bill_domain ? (Array.isArray(bill.bill_domain) ? bill.bill_domain : [bill.bill_domain]) : [],
+    proposer: bill.key_sponsor_name || extractProposer(bill.bill_sponsors),
+    proposerParty: bill.key_sponsor_party || '',
+    coProposers: bill.co_sponsor_desc || bill.bill_proposal_desc || '',
+    proposalType: bill.bill_proposal_type || '',
     governmentType: formatGovernmentType(bill.poli_pattern_type, bill.poli_pattern_desc),
-    passDays: calculateTotalDays(bill.bill_actions),
+    patternType: bill.poli_pattern_type || '',
+    billStatus: bill.bill_status || '',
+    passDays: bill.bill_action_days || calculateTotalDays(bill.bill_actions),
+    yearsDifference: bill.years_difference || 0,
+    billActions: bill.bill_actions || [],
+    billSponsors: bill.bill_sponsors || [],
     selected: true // 默认全选
   }))
 

src/views/bill/influence/ProgressForecast/components/Step2FilterBills.vue

@@ -125,7 +125,7 @@ async function loadData() {
     // 使用真实 API，传入 billIds、domains、patternType、proposalType
     const params = {
       billIds: filterParams?.value.billIds,
-      domains:JSON.stringify(filterParams?.value.domains) || [],
+      domains: filterParams?.value.domains  || [],
       patternType: filterParams?.value.patternType || '统一政府',
       proposalType: filterParams?.value.proposalType || '两党共同提案'
     }
@@ -133,14 +133,15 @@ async function loadData() {
     const response = await getSimiBills(params)
     
     if (response && response.data) {
-      // 保存原始数据
-      rawBillsData.value = response.data
+      // 保存原始数据（新 API 返回结构中 simi_bills 是法案数组）
+      rawBillsData.value = response.data.simi_bills || []
       const { stats: apiStats, bills: apiBills } = transformSimiBillsData(response)
       stats.value = apiStats
       bills.value = apiBills
     } else {
       stats.value = null
       bills.value = []
+      rawBillsData.value = []
     }
   } catch (error) {
     console.error('获取相似法案失败:', error)