大屏后台修改

ruoyi-screen/src/views/commonProsperity/chartOptions.js

@@ -1,13 +1,14 @@
-/** 共同富裕大屏 ECharts 配置（对齐 doc/共同富裕 设计稿） */
+/** 共同富裕大屏 ECharts 配置（对齐 doc/大屏/共同富裕 v1.1 滚动 12 月） */
 
 const AXIS_LABEL = { color: '#9fb0c3', fontSize: 10 }
 const AXIS_LINE = { lineStyle: { color: 'rgba(61, 217, 176, 0.35)' } }
 const SPLIT_LINE = { lineStyle: { color: 'rgba(61, 217, 176, 0.12)' } }
 const GRID = { left: 40, right: 16, top: 28, bottom: 28, containLabel: true }
-const MONTHS = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
 
 const PROJECT_TYPE_COLOR = ['#45f0b8', '#6eb5ff', '#ecd27b']
 
+const ACHIEVEMENT_EMPTY = '暂无该年度共富成果数据'
+
 function emptyOption(text = '暂无数据') {
   return {
     title: {
@@ -19,45 +20,72 @@ function emptyOption(text = '暂无数据') {
   }
 }
 
-function monthSeries(monthly, field) {
-  if (!monthly?.length) {
-    return MONTHS.map(() => 0)
+function pickNumber(row, fields) {
+  for (const key of fields) {
+    const raw = row?.[key]
+    if (raw != null && raw !== '') {
+      const n = Number(raw)
+      if (!Number.isNaN(n)) {
+        return n
+      }
+    }
   }
-  const map = new Map(monthly.map((row) => [row.month, row[field] ?? 0]))
-  return MONTHS.map((_, i) => {
-    const val = map.get(i + 1) ?? 0
-    return typeof val === 'object' && val !== null ? Number(val) : Number(val)
+  return 0
+}
+
+/** 滚动最近 12 月：按 statYear、month 升序 */
+function sortRollingMonths(list) {
+  return [...(list || [])].sort((a, b) => {
+    const ak = (Number(a.statYear) || 0) * 100 + (Number(a.month) || 0)
+    const bk = (Number(b.statYear) || 0) * 100 + (Number(b.month) || 0)
+    return ak - bk
   })
 }
 
-function hasMonthlyData(monthly, field) {
-  return monthly?.length && monthSeries(monthly, field).some((v) => v > 0)
+function rollingMonthLabel(row) {
+  return `${Number(row.month)}月`
+}
+
+function rollingTooltipTitle(row) {
+  if (!row) {
+    return ''
+  }
+  return `${row.statYear}年${Number(row.month)}月`
+}
+
+function buildRollingAxis(list) {
+  const rows = sortRollingMonths(list)
+  return {
+    rows,
+    categories: rows.map(rollingMonthLabel),
+    titleAt: (dataIndex) => rollingTooltipTitle(rows[dataIndex])
+  }
+}
+
+function rollingSeries(list, field, altFields = []) {
+  const fields = [field, ...altFields]
+  return sortRollingMonths(list).map((row) => pickNumber(row, fields))
 }
 
-/** 横轴为去掉「月」的类目时，tooltip 标题补回「月」 */
-function formatMonthAxisTooltip(params) {
-  const list = Array.isArray(params) ? params : [params]
-  const raw = list[0]?.axisValue
-  const title =
-    raw != null && raw !== ''
-      ? String(raw).endsWith('月')
-        ? String(raw)
-        : `${raw}月`
-      : ''
-  const body = list
-    .map((p) =>
-      p.seriesName ? `${p.marker}${p.seriesName}：${p.value}` : `${p.marker}${p.value}`
-    )
-    .join('<br/>')
-  return title ? `${title}<br/>${body}` : body
+function rollingAxisTooltip(params, axis, valueFormatter) {
+  if (!Array.isArray(params) || !params.length) {
+    return ''
+  }
+  const title = axis.titleAt(params[0].dataIndex)
+  const lines = params.map((p) => {
+    const val = valueFormatter ? valueFormatter(p) : `${p.value ?? 0}`
+    return `${p.marker}${p.seriesName}：${val}`
+  })
+  return `${title}<br/>${lines.join('<br/>')}`
 }
 
-/** 经济收入对比 — 横向柱（集体经济收入，万元） */
+/** 经济收入对比 — 横向柱（集体经济收入，万元，滚动 12 月） */
 export function buildCollectiveIncomeBarOption(monthly, hasData) {
-  if (!hasData || !hasMonthlyData(monthly, 'collectiveEconomyIncome')) {
-    return emptyOption('暂无收入数据')
+  if (!hasData || !monthly?.length) {
+    return emptyOption(ACHIEVEMENT_EMPTY)
   }
-  const values = monthSeries(monthly, 'collectiveEconomyIncome')
+  const axis = buildRollingAxis(monthly)
+  const values = rollingSeries(monthly, 'collectiveEconomyIncome')
   const maxVal = Math.max(...values, 1)
   return {
     color: ['#ecd27b'],
@@ -70,7 +98,8 @@ export function buildCollectiveIncomeBarOption(monthly, hasData) {
         if (!row) {
           return ''
         }
-        return `${row.name}<br/>收入：${Number(row.value).toFixed(1)} 万元`
+        const title = axis.titleAt(row.dataIndex)
+        return `${title}<br/>收入：${Number(row.value).toFixed(1)} 万元`
       }
     },
     grid: { left: 4, right: 36, top: 10, bottom: 0, containLabel: true },
@@ -81,7 +110,7 @@ export function buildCollectiveIncomeBarOption(monthly, hasData) {
     },
     yAxis: {
       type: 'category',
-      data: MONTHS,
+      data: axis.categories,
       inverse: true,
       boundaryGap: false,
       axisLabel: {
@@ -104,7 +133,7 @@ export function buildCollectiveIncomeBarOption(monthly, hasData) {
         silent: true,
         tooltip: { show: false },
         itemStyle: { color: 'rgba(15, 80, 68, 0.55)', borderRadius: [0, 4, 4, 0] },
-        data: MONTHS.map(() => maxVal),
+        data: axis.categories.map(() => maxVal),
         z: 1
       },
       {
@@ -139,18 +168,18 @@ export function buildCollectiveIncomeBarOption(monthly, hasData) {
   }
 }
 
-/** 就业带动 — 就业人数 + 就业岗位双折线 */
+/** 就业带动 — 带动就业人数 + 新增就业岗位双折线（滚动 12 月） */
 export function buildEmploymentOption(monthly, hasData) {
-  if (
-    !hasData ||
-    (!hasMonthlyData(monthly, 'employmentDrivenCount') &&
-      !hasMonthlyData(monthly, 'newJobPositions'))
-  ) {
-    return emptyOption('暂无就业数据')
+  if (!hasData || !monthly?.length) {
+    return emptyOption(ACHIEVEMENT_EMPTY)
   }
+  const axis = buildRollingAxis(monthly)
   return {
     color: ['#ecd27b', '#5ef0c8'],
-    tooltip: { trigger: 'axis', formatter: formatMonthAxisTooltip },
+    tooltip: {
+      trigger: 'axis',
+      formatter: (params) => rollingAxisTooltip(params, axis)
+    },
     legend: {
       top: 4,
       left: 'center',
@@ -161,7 +190,7 @@ export function buildEmploymentOption(monthly, hasData) {
     grid: { ...GRID, left: 10, top: 36, bottom: 8 },
     xAxis: {
       type: 'category',
-      data: MONTHS.map((m) => m.replace('月', '')),
+      data: axis.categories,
       axisLabel: { ...AXIS_LABEL, fontSize: 9, interval: 0 },
       axisLine: AXIS_LINE
     },
@@ -187,40 +216,44 @@ export function buildEmploymentOption(monthly, hasData) {
     ],
     series: [
       {
-        name: '就业人数',
+        name: '带动就业人数',
         type: 'line',
         smooth: true,
         symbol: 'circle',
         symbolSize: 4,
         areaStyle: { color: 'rgba(236, 210, 123, 0.2)' },
-        data: monthSeries(monthly, 'employmentDrivenCount')
+        data: rollingSeries(monthly, 'employmentDrivenCount')
       },
       {
-        name: '就业岗位',
+        name: '新增就业岗位',
         type: 'line',
         yAxisIndex: 1,
         smooth: true,
         symbol: 'circle',
         symbolSize: 4,
         areaStyle: { color: 'rgba(94, 240, 200, 0.15)' },
-        data: monthSeries(monthly, 'newJobPositions')
+        data: rollingSeries(monthly, 'newJobPositions')
       }
     ]
   }
 }
 
-/** 环境治理 — 项目数月度柱图 */
+/** 环境治理 — 项目数月度柱图（滚动 12 月） */
 export function buildEnvGovernanceOption(monthly, hasData) {
-  if (!hasData || !hasMonthlyData(monthly, 'envProjectCount')) {
-    return emptyOption('暂无环境治理数据')
+  if (!hasData || !monthly?.length) {
+    return emptyOption(ACHIEVEMENT_EMPTY)
   }
+  const axis = buildRollingAxis(monthly)
   return {
     color: ['#ecd27b'],
-    tooltip: { trigger: 'axis', formatter: formatMonthAxisTooltip },
+    tooltip: {
+      trigger: 'axis',
+      formatter: (params) => rollingAxisTooltip(params, axis, (p) => `${p.value ?? 0} 个`)
+    },
     grid: { ...GRID, left: 10, right: 8, top: 36, bottom: 20, containLabel: true },
     xAxis: {
       type: 'category',
-      data: MONTHS.map((m) => m.replace('月', '')),
+      data: axis.categories,
       axisLabel: {
         ...AXIS_LABEL,
         fontSize: 9,
@@ -244,24 +277,28 @@ export function buildEnvGovernanceOption(monthly, hasData) {
         barMaxWidth: 8,
         barCategoryGap: '35%',
         itemStyle: { color: '#ecd27b', borderRadius: [3, 3, 0, 0] },
-        data: monthSeries(monthly, 'envProjectCount')
+        data: rollingSeries(monthly, 'envProjectCount')
       }
     ]
   }
 }
 
-/** 绿化建设 — 新增绿化面积折线面积图 */
+/** 绿化建设 — 新增绿化面积折线面积图（滚动 12 月） */
 export function buildGreenAreaOption(monthly, hasData) {
-  if (!hasData || !hasMonthlyData(monthly, 'newGreenArea')) {
-    return emptyOption('暂无绿化数据')
+  if (!hasData || !monthly?.length) {
+    return emptyOption(ACHIEVEMENT_EMPTY)
   }
+  const axis = buildRollingAxis(monthly)
   return {
     color: ['#5ef0c8'],
-    tooltip: { trigger: 'axis' },
-    grid: {...GRID, left: 10,  bottom: 8},
+    tooltip: {
+      trigger: 'axis',
+      formatter: (params) => rollingAxisTooltip(params, axis, (p) => `${p.value ?? 0} 亩`)
+    },
+    grid: { ...GRID, left: 10, bottom: 8 },
     xAxis: {
       type: 'category',
-      data: MONTHS,
+      data: axis.categories,
       axisLabel: { ...AXIS_LABEL, rotate: 35, interval: 0, fontSize: 9 },
       axisLine: AXIS_LINE
     },
@@ -275,30 +312,34 @@ export function buildGreenAreaOption(monthly, hasData) {
     },
     series: [
       {
-        name: '绿化面积',
+        name: '新增绿化面积',
         type: 'line',
         smooth: true,
         symbol: 'circle',
         symbolSize: 4,
         areaStyle: { color: 'rgba(94, 240, 200, 0.3)' },
-        data: monthSeries(monthly, 'newGreenArea')
+        data: rollingSeries(monthly, 'newGreenArea')
       }
     ]
   }
 }
 
-/** 文化传承 — 月度柱图 */
+/** 文化传承 — 月度柱图（滚动 12 月） */
 export function buildCulturalHeritageOption(monthly, hasData) {
-  if (!hasData || !hasMonthlyData(monthly, 'culturalHeritageCount')) {
-    return emptyOption('暂无文化传承数据')
+  if (!hasData || !monthly?.length) {
+    return emptyOption(ACHIEVEMENT_EMPTY)
   }
+  const axis = buildRollingAxis(monthly)
   return {
     color: ['#5ef0c8'],
-    tooltip: { trigger: 'axis', formatter: formatMonthAxisTooltip },
+    tooltip: {
+      trigger: 'axis',
+      formatter: (params) => rollingAxisTooltip(params, axis, (p) => `${p.value ?? 0} 人`)
+    },
     grid: { ...GRID, left: 10, right: 8, bottom: 20, containLabel: true },
     xAxis: {
       type: 'category',
-      data: MONTHS.map((m) => m.replace('月', '')),
+      data: axis.categories,
       axisLabel: {
         ...AXIS_LABEL,
         fontSize: 9,
@@ -317,32 +358,29 @@ export function buildCulturalHeritageOption(monthly, hasData) {
     },
     series: [
       {
-        name: '人数',
+        name: '文化传承人数',
         type: 'bar',
         barMaxWidth: 8,
         barCategoryGap: '35%',
         itemStyle: { color: '#5ef0c8', borderRadius: [3, 3, 0, 0] },
-        data: monthSeries(monthly, 'culturalHeritageCount')
+        data: rollingSeries(monthly, 'culturalHeritageCount')
       }
     ]
   }
 }
 
-/** 民族团结 — 堆叠柱 */
+/** 民族团结 — 堆叠柱（滚动 12 月） */
 export function buildEthnicUnityStackedOption(monthly, hasData) {
-  if (
-    !hasData ||
-    (!hasMonthlyData(monthly, 'ethnicIntegrationProjectCount') &&
-      !hasMonthlyData(monthly, 'ethnicUnityActivityCount'))
-  ) {
-    return emptyOption('暂无民族团结数据')
+  if (!hasData || !monthly?.length) {
+    return emptyOption(ACHIEVEMENT_EMPTY)
   }
+  const axis = buildRollingAxis(monthly)
   return {
     color: ['#5ef0c8', '#1a4a6e'],
     tooltip: {
       trigger: 'axis',
       axisPointer: { type: 'shadow' },
-      formatter: formatMonthAxisTooltip
+      formatter: (params) => rollingAxisTooltip(params, axis, (p) => `${p.value ?? 0} 个`)
     },
     legend: {
       top: 4,
@@ -354,7 +392,7 @@ export function buildEthnicUnityStackedOption(monthly, hasData) {
     grid: { ...GRID, left: 10, right: 8, top: 36, bottom: 20, containLabel: true },
     xAxis: {
       type: 'category',
-      data: MONTHS.map((m) => m.replace('月', '')),
+      data: axis.categories,
       axisLabel: {
         ...AXIS_LABEL,
         fontSize: 9,
@@ -373,19 +411,19 @@ export function buildEthnicUnityStackedOption(monthly, hasData) {
     },
     series: [
       {
-        name: '民族融合案例',
+        name: '民族融合项目数',
         type: 'bar',
         stack: 'ethnic',
         barMaxWidth: 8,
         barCategoryGap: '35%',
-        data: monthSeries(monthly, 'ethnicIntegrationProjectCount')
+        data: rollingSeries(monthly, 'ethnicIntegrationProjectCount')
       },
       {
-        name: '民族团结活动',
+        name: '民族团结活动数',
         type: 'bar',
         stack: 'ethnic',
         barMaxWidth: 8,
-        data: monthSeries(monthly, 'ethnicUnityActivityCount')
+        data: rollingSeries(monthly, 'ethnicUnityActivityCount')
       }
     ]
   }
@@ -394,7 +432,7 @@ export function buildEthnicUnityStackedOption(monthly, hasData) {
 /** 共富项目分类 — 饼图 */
 export function buildProjectTypePieOption(projectTypeStats, hasProjectData) {
   if (!hasProjectData || !projectTypeStats?.length) {
-    return emptyOption('暂无项目数据')
+    return emptyOption('本年度暂无共富项目')
   }
   const data = projectTypeStats
     .filter((item) => (item.count ?? 0) > 0)
@@ -404,7 +442,7 @@ export function buildProjectTypePieOption(projectTypeStats, hasProjectData) {
       itemStyle: { color: PROJECT_TYPE_COLOR[i % PROJECT_TYPE_COLOR.length] }
     }))
   if (!data.length) {
-    return emptyOption('暂无项目数据')
+    return emptyOption('本年度暂无共富项目')
   }
   return {
     tooltip: {

ruoyi-screen/src/views/commonProsperity/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="screen-page cp-page" :class="{ 'is-loading': loading }">
-    <div v-if="loadError" class="cp-error">{{ loadError }}</div>
+    <div v-if="loadError" class="cp-error" @click="fetchDashboard">{{ loadError }}（点击重试）</div>
 
     <!-- <div class="cp-year-bar">
       <label class="cp-year-bar__label">统计年份</label>
@@ -17,67 +17,72 @@
     <div class="screen-page--home-column">
       <div class="screen-page--home-column-top">
         <div class="top_title">共同富裕 མཉམ་འདུས་འབྲིག་སྐྱིད།</div>
-        <div class="top_content">
-          <div class="content_1">
-            <div class="content_num">
-              <ScreenScrollNumber :value="summary?.collectiveEconomyIncome" format="money" />
-              万元
+        <template v-if="hasAchievementData">
+          <div class="top_content">
+            <div class="content_1">
+              <div class="content_num">
+                <ScreenScrollNumber :value="summary?.collectiveEconomyIncome" format="money" />
+                万元
+              </div>
+              <div class="content_title"><div>集体经济收入</div></div>
             </div>
-            <div class="content_title"><div>集体经济收入</div></div>
-          </div>
-          <div class="content_2">
-            <div class="content_num">
-              <ScreenScrollNumber :value="summary?.employmentDrivenCount" />
-              人
+            <div class="content_2">
+              <div class="content_num">
+                <ScreenScrollNumber :value="summary?.employmentDrivenCount" />
+                人
+              </div>
+              <div class="content_title"><div>带动就业人数</div></div>
             </div>
-            <div class="content_title"><div>就业人数</div></div>
-          </div>
-          <div class="content_3">
-            <div class="content_num">
-              <ScreenScrollNumber :value="summary?.newJobPositions" />
-              个
+            <div class="content_3">
+              <div class="content_num">
+                <ScreenScrollNumber :value="summary?.newJobPositions" />
+                个
+              </div>
+              <div class="content_title"><div>新增就业岗位</div></div>
             </div>
-            <div class="content_title"><div>就业岗位数</div></div>
-          </div>
-          <div class="content_4">
-            <div class="content_num">
-              <ScreenScrollNumber :value="summary?.envProjectCount" />
-              个
+            <div class="content_4">
+              <div class="content_num">
+                <ScreenScrollNumber :value="summary?.envProjectCount" />
+                个
+              </div>
+              <div class="content_title"><div>环境治理项目数</div></div>
             </div>
-            <div class="content_title"><div>环境治理项目数</div></div>
           </div>
-        </div>
-        <div class="top_content">
-          <div class="content_1">
-            <div class="content_num">
-              <ScreenScrollNumber :value="summary?.newGreenArea" format="area" />
-              亩
+          <div class="top_content">
+            <div class="content_1">
+              <div class="content_num">
+                <ScreenScrollNumber :value="summary?.newGreenArea" format="area" />
+                亩
+              </div>
+              <div class="content_title"><div>新增绿化面积</div></div>
             </div>
-            <div class="content_title"><div>绿化面积</div></div>
-          </div>
-          <div class="content_2">
-            <div class="content_num">
-              <ScreenScrollNumber :value="summary?.culturalHeritageCount" />
-              人
+            <div class="content_2">
+              <div class="content_num">
+                <ScreenScrollNumber :value="summary?.culturalHeritageCount" />
+                人
+              </div>
+              <div class="content_title"><div>文化传承人数</div></div>
             </div>
-            <div class="content_title"><div>文化传承人数</div></div>
-          </div>
-          <div class="content_3">
-            <div class="content_num">
-              <ScreenScrollNumber :value="summary?.ethnicIntegrationProjectCount" />
-              个
+            <div class="content_3">
+              <div class="content_num">
+                <ScreenScrollNumber :value="summary?.ethnicIntegrationProjectCount" />
+                个
+              </div>
+              <div class="content_title"><div>民族融合项目数</div></div>
             </div>
-            <div class="content_title"><div>民族团结项目数</div></div>
-          </div>
-          <div class="content_4">
-            <div class="content_num">
-              <ScreenScrollNumber :value="summary?.regionalPublicBrandCount" />
-              个
+            <div class="content_4">
+              <div class="content_num">
+                <ScreenScrollNumber :value="summary?.regionalPublicBrandCount" />
+                个
+              </div>
+              <div class="content_title"><div>区域公共品牌数</div></div>
             </div>
-            <div class="content_title"><div>区域公共品牌数</div></div>
           </div>
+        </template>
+        <div v-else class="cp-overview-empty">
+          <p>暂无该年度共富成果数据</p>
+          <p class="cp-overview-empty__hint">请在共同富裕成果中维护</p>
         </div>
-        <p v-if="achievement && !achievement.hasData" class="cp-no-achievement">本年度暂无成果台账数据</p>
       </div>
 
       <div class="screen-page--home-column-flex">
@@ -114,7 +119,7 @@
     <div class="screen-page--home-column">
       <div class="screen-page--home-column-right cp-digital-panel">
         <div class="top_title">数字赋能 གྲངས་ཀ་སྟོབས་སྦྱོང་།</div>
-        <div class="cp-digital-body">
+        <div v-if="hasAchievementData" class="cp-digital-body">
           <div class="cp-digital-group">
             <div class="cp-digital-group__title">品牌增值</div>
             <div class="cp-rings">
@@ -162,6 +167,10 @@
             </div>
           </div>
         </div>
+        <div v-else class="cp-digital-empty">
+          <p>暂无该年度共富成果数据</p>
+          <p class="cp-digital-empty__hint">请在共同富裕成果中维护</p>
+        </div>
       </div>
 
       <div class="screen-page--home-column-flex">
@@ -191,7 +200,7 @@
           <div class="flex_content flex_content--projects">
             <div class="cp-project-scroll" @scroll="onProjectScroll">
               <div v-if="projectLoading && !projectRows.length" class="cp-project-empty">加载中…</div>
-              <div v-else-if="!projectRows.length" class="cp-project-empty">暂无共富项目</div>
+              <div v-else-if="!projectRows.length" class="cp-project-empty">本年度暂无共富项目</div>
               <div
                 v-for="row in projectRows"
                 :key="row.id"
@@ -637,6 +646,7 @@ onUnmounted(() => {
   color: #ffb4b4;
   background: rgba(80, 20, 20, 0.75);
   border-radius: 4px;
+  cursor: pointer;
 }
 
 .cp-year-bar {
@@ -682,15 +692,48 @@ onUnmounted(() => {
   position: relative;
 }
 
-.cp-no-achievement {
-  position: absolute;
-  bottom: 4px;
-  left: 0;
-  right: 0;
+.cp-overview-empty {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 0 24px 12px;
   text-align: center;
-  font-size: 11px;
-  color: rgba(168, 212, 200, 0.7);
+}
+
+.cp-overview-empty p {
   margin: 0;
+  font-size: 13px;
+  color: rgba(168, 212, 200, 0.85);
+}
+
+.cp-overview-empty__hint {
+  margin-top: 6px !important;
+  font-size: 11px !important;
+  color: rgba(106, 159, 144, 0.9) !important;
+}
+
+.cp-digital-empty {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 20px 16px;
+  text-align: center;
+}
+
+.cp-digital-empty p {
+  margin: 0;
+  font-size: 13px;
+  color: rgba(168, 212, 200, 0.85);
+}
+
+.cp-digital-empty__hint {
+  margin-top: 6px !important;
+  font-size: 11px !important;
+  color: rgba(106, 159, 144, 0.9) !important;
 }
 
 .screen-page--home-column-right {

ruoyi-screen/src/views/epidemicRisk/chartOptions.js

@@ -6,7 +6,8 @@ const SPLIT_LINE = { lineStyle: { color: 'rgba(61, 217, 176, 0.12)' } }
 const GRID = { left: 40, right: 16, top: 36, bottom: 28, containLabel: true }
 /** 解除时效柱图：预留 y 轴单位「天」空间，下边距收紧 */
 const RELIEVE_DURATION_GRID = { left: 40, right: 12, top: 30, bottom: 4, containLabel: true }
-const MONTHS = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
+const LAB_GRID = { left: 28, right: 10, top: 30, bottom: 6, containLabel: true }
+const LAB_MONTH_AXIS_LABEL = { color: '#9fb0c3', fontSize: 9, margin: 4 }
 
 /** 样本来源展示顺序：日常→场点→调运→上报（与设计稿一致） */
 const SAMPLE_SOURCE_ORDER = [4, 1, 3, 2]
@@ -169,13 +170,38 @@ function pickAvgRelieveDays(item) {
   return null
 }
 
-function sortByMonth(list) {
-  return [...(list || [])].sort((a, b) => (a.month || 0) - (b.month || 0))
+function sortRollingMonths(list) {
+  return [...(list || [])].sort((a, b) => {
+    const ak = (Number(a.statYear) || 0) * 100 + (Number(a.month) || 0)
+    const bk = (Number(b.statYear) || 0) * 100 + (Number(b.month) || 0)
+    return ak - bk
+  })
 }
 
-function monthSeries(list, field) {
-  const map = new Map(sortByMonth(list).map((row) => [row.month, row[field] ?? 0]))
-  return MONTHS.map((_, i) => map.get(i + 1) ?? 0)
+function buildRollingAxis(list) {
+  const rows = sortRollingMonths(list)
+  return {
+    rows,
+    categories: rows.map((row) => `${Number(row.month)}月`),
+    titleAt: (dataIndex) => {
+      const row = rows[dataIndex]
+      if (!row) {
+        return ''
+      }
+      return `${row.statYear}年${Number(row.month)}月`
+    }
+  }
+}
+
+function rollingSeries(list, field) {
+  return sortRollingMonths(list).map((row) => {
+    const val = row?.[field]
+    if (val == null || val === '') {
+      return 0
+    }
+    const n = Number(val)
+    return Number.isNaN(n) ? 0 : n
+  })
 }
 
 function pickSampleSourceRows(stats) {
@@ -264,19 +290,26 @@ export function buildSampleSourceBarOption(sampleSourceStats) {
   }
 }
 
-/** 实验室检测专用 grid（仅本图，收紧左/下留白） */
-const LAB_GRID = { left: 28, right: 10, top: 30, bottom: 6, containLabel: true }
-const LAB_MONTH_AXIS_LABEL = { color: '#9fb0c3', fontSize: 9, margin: 4 }
-
-/** 实验室检测 — 检测量折线 + 阳性数面积 */
-export function buildLabDetectionOption(labDetection, hasLabData) {
-  if (!hasLabData || !labDetection?.monthly?.length) {
+/** 实验室检测 — 检测量折线 + 阳性数面积（滚动最近 12 月） */
+export function buildLabDetectionOption(labDetection) {
+  const monthly = labDetection?.monthly
+  if (!monthly?.length) {
     return emptyOption('暂无实验室数据')
   }
-  const monthly = labDetection.monthly
+  const axis = buildRollingAxis(monthly)
   return {
     color: ['#5ef0c8', '#ecd27b'],
-    tooltip: { trigger: 'axis' },
+    tooltip: {
+      trigger: 'axis',
+      formatter: (params) => {
+        if (!Array.isArray(params) || !params.length) {
+          return ''
+        }
+        const title = axis.titleAt(params[0].dataIndex)
+        const lines = params.map((p) => `${p.marker}${p.seriesName}: ${p.value ?? 0} 份`)
+        return `${title}<br/>${lines.join('<br/>')}`
+      }
+    },
     legend: {
       top: 2,
       left: 'center',
@@ -287,7 +320,7 @@ export function buildLabDetectionOption(labDetection, hasLabData) {
     grid: LAB_GRID,
     xAxis: {
       type: 'category',
-      data: MONTHS,
+      data: axis.categories,
       axisLabel: { ...LAB_MONTH_AXIS_LABEL, interval: 0 },
       axisLine: AXIS_LINE,
       axisTick: { show: false }
@@ -306,7 +339,7 @@ export function buildLabDetectionOption(labDetection, hasLabData) {
         smooth: true,
         symbol: 'circle',
         symbolSize: 4,
-        data: monthSeries(monthly, 'testQuantity')
+        data: rollingSeries(monthly, 'testQuantity')
       },
       {
         name: '阳性数',
@@ -315,7 +348,7 @@ export function buildLabDetectionOption(labDetection, hasLabData) {
         symbol: 'circle',
         symbolSize: 4,
         areaStyle: { color: 'rgba(236, 210, 123, 0.25)' },
-        data: monthSeries(monthly, 'positiveCount')
+        data: rollingSeries(monthly, 'positiveCount')
       }
     ]
   }

ruoyi-screen/src/views/epidemicRisk/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="screen-page er-page" :class="{ 'is-loading': loading }">
-    <div v-if="loadError" class="er-error">{{ loadError }}</div>
+    <div v-if="loadError" class="er-error" @click="fetchDashboard">{{ loadError }}（点击重试）</div>
 
     <!-- <div class="er-year-bar">
       <label class="er-year-bar__label">统计年份</label>
@@ -67,13 +67,19 @@
           <div class="flex_content flex_content--lab">
             <div class="lab-summary">
               <div class="lab-summary__item">
-                <div class="lab-summary__label">样本检测数</div>
+                <div class="lab-summary__label">检测量</div>
                 <div class="lab-summary__val">
                   <strong>{{ display(labDetection?.testQuantityTotal) }}</strong> 份
                 </div>
               </div>
+              <div class="lab-summary__item">
+                <div class="lab-summary__label">阳性检出数</div>
+                <div class="lab-summary__val">
+                  <strong>{{ display(labDetection?.positiveCountTotal) }}</strong> 份
+                </div>
+              </div>
               <div class="lab-summary__item lab-summary__item--rate">
-                <div class="lab-summary__label">阳性检测率</div>
+                <div class="lab-summary__label">阳性检出率</div>
                 <div class="lab-summary__val">
                   <strong>{{ formatRate(labDetection?.positiveRate) }}</strong>
                 </div>
@@ -261,9 +267,7 @@ const reportLoadingMore = ref(false)
 const reportScrollLoading = ref(false)
 
 const sampleSourceChartOption = computed(() => buildSampleSourceBarOption(sampleSourceStats.value))
-const labChartOption = computed(() =>
-  buildLabDetectionOption(labDetection.value, hasLabData.value)
-)
+const labChartOption = computed(() => buildLabDetectionOption(labDetection.value))
 const riskLevelChartOption = computed(() =>
   buildRiskLevelPieOption(riskLevelStats.value, hasEpidemicData.value)
 )
@@ -547,6 +551,7 @@ onUnmounted(() => {
   color: #ffb4b4;
   background: rgba(80, 20, 20, 0.75);
   border-radius: 4px;
+  cursor: pointer;
 }
 
 .er-year-bar {
@@ -950,8 +955,8 @@ onUnmounted(() => {
 .lab-summary {
   display: flex;
   flex-direction: row;
-  gap: 6px;
-  height: 28px;
+  gap: 4px;
+  height: 32px;
   flex-shrink: 0;
 }
 
@@ -967,9 +972,9 @@ onUnmounted(() => {
 }
 
 .lab-summary__label {
-  font-size: 10px;
+  font-size: 9px;
   color: #a8d4c8;
-  line-height: 14px;
+  line-height: 13px;
 }
 
 .lab-summary__val {
@@ -979,7 +984,7 @@ onUnmounted(() => {
 }
 
 .lab-summary__val strong {
-  font-size: 14px;
+  font-size: 13px;
   background: linear-gradient(to bottom, #98e9aa, #ecd27b);
   -webkit-background-clip: text;
   background-clip: text;

ruoyi-screen/src/views/home/index.vue

@@ -2,7 +2,7 @@
   <div class="screen-page screen-page--home" :class="{ 'is-loading': loading }">
     <div v-if="loadError" class="home-error" @click="fetchDashboard">{{ loadError }}（点击重试）</div>
 
-    <div class="home-year-bar">
+    <!-- <div class="home-year-bar">
       <label class="home-year-bar__label">统计年份</label>
       <select
         v-model="statYear"
@@ -13,7 +13,7 @@
         <option v-for="y in availableYears" :key="y" :value="String(y)">{{ y }}年</option>
       </select>
       <span v-if="statDate" class="home-year-bar__date">统计日 {{ statDate }}</span>
-    </div>
+    </div> -->
 
     <div class="screen-page--home-column">
       <div class="screen-page--home-column-top">

ruoyi-screen/src/views/livestockResources/chartOptions.js

@@ -54,7 +54,19 @@ export function buildActivityTrendOption(activityTrend) {
   return {
     ...chartBase(),
     color: ['#5ef0c8', '#ecd27b'],
-    tooltip: { trigger: 'axis' },
+    tooltip: {
+      trigger: 'axis',
+      formatter: (params) => {
+        if (!Array.isArray(params) || !params.length) {
+          return ''
+        }
+        const idx = params[0].dataIndex
+        const row = series[idx] || {}
+        const title = row.date || dates[idx] || ''
+        const lines = params.map((p) => `${p.marker}${p.seriesName}: ${p.value ?? 0}`)
+        return `${title}<br/>${lines.join('<br/>')}`
+      }
+    },
     legend: {
       top: 0,
       right: 8,
@@ -81,7 +93,6 @@ export function buildActivityTrendOption(activityTrend) {
       {
         name: '会话数',
         type: 'line',
-        stack: 'total',
         smooth: true,
         symbol: 'circle',
         symbolSize: 4,
@@ -91,7 +102,6 @@ export function buildActivityTrendOption(activityTrend) {
       {
         name: '提问量',
         type: 'line',
-        stack: 'total',
         smooth: true,
         symbol: 'circle',
         symbolSize: 4,
@@ -235,19 +245,31 @@ export function buildModelCallOption(modelCallAnalysis) {
   }
 }
 
-/** 分时使用热度 — 会话柱 + 提问量折线（24 小时） */
+/** 分时使用热度 — 最近 24 整点小时（会话柱 + 提问量折线） */
 export function buildHourlyHeatOption(hourlyHeat) {
   const series = hourlyHeat?.hourlySeries || []
   if (!series.length) {
     return emptyOption('暂无热度数据')
   }
-  const labels = series.map((d) => d.bucketStart || '')
-  const sessions = series.map((d) => toNum(d.sessionCount))
-  const questions = series.map((d) => toNum(d.questionCount))
+  const labels = series.map((d) => d.bucketStart || d.bucket_start || '')
+  const sessions = series.map((d) => toNum(d.sessionCount ?? d.session_count))
+  const questions = series.map((d) => toNum(d.questionCount ?? d.question_count))
   return {
     ...chartBase(),
     color: ['#5ef0c8', '#ecd27b'],
-    tooltip: { trigger: 'axis' },
+    tooltip: {
+      trigger: 'axis',
+      formatter: (params) => {
+        if (!Array.isArray(params) || !params.length) {
+          return ''
+        }
+        const idx = params[0].dataIndex
+        const row = series[idx] || {}
+        const title = row.bucketDateTime || row.bucket_date_time || row.bucketStart || ''
+        const lines = params.map((p) => `${p.marker}${p.seriesName}: ${p.value ?? 0}`)
+        return `${title}<br/>${lines.join('<br/>')}`
+      }
+    },
     legend: {
       top: 0,
       right: 8,
@@ -262,7 +284,7 @@ export function buildHourlyHeatOption(hourlyHeat) {
       axisLabel: {
         ...AXIS_LABEL,
         fontSize: 8,
-        interval: (idx) => idx % 4 === 0
+        interval: (idx) => idx % 3 === 0
       },
       axisLine: AXIS_LINE
     },

ruoyi-screen/src/views/livestockResources/index.vue

@@ -1,6 +1,19 @@
 <template>
   <div class="screen-page lr-page" :class="{ 'is-loading': loading }">
-    <div v-if="loadError" class="lr-error">{{ loadError }}</div>
+    <div v-if="loadError" class="lr-error" @click="fetchDashboard">{{ loadError }}（点击重试）</div>
+
+    <!-- <div class="lr-year-bar">
+      <label class="lr-year-bar__label">统计年份</label>
+      <select
+        v-model="statYear"
+        class="lr-year-bar__select"
+        :disabled="loading"
+        @change="onYearChange"
+      >
+        <option v-for="y in availableYears" :key="y" :value="String(y)">{{ y }}年</option>
+      </select>
+      <span v-if="statDate" class="lr-year-bar__date">统计日 {{ statDate }}</span>
+    </div> -->
 
     <!-- 左栏：核心总览 + 活跃/用户/分类/模型 -->
     <div class="screen-page--home-column">
@@ -157,6 +170,8 @@ import {
 const loading = ref(false)
 const loadError = ref('')
 const statYear = ref(String(new Date().getFullYear()))
+const statDate = ref('')
+const availableYears = ref([Number(statYear.value)])
 
 const overview = ref(null)
 const activityTrend = ref(null)
@@ -298,6 +313,10 @@ function applyDashboard(data) {
   if (data.statYear) {
     statYear.value = String(data.statYear)
   }
+  statDate.value = data.statDate || ''
+  availableYears.value = data.availableYears?.length
+    ? [...data.availableYears]
+    : [Number(statYear.value)]
   overview.value = data.overview || null
   activityTrend.value = normalizeActivityTrend(data.activityTrend)
   userStructure.value = data.userStructure || null
@@ -326,6 +345,10 @@ async function fetchDashboard() {
   }
 }
 
+function onYearChange() {
+  fetchDashboard()
+}
+
 onMounted(() => {
   fetchDashboard()
 })
@@ -358,6 +381,39 @@ onMounted(() => {
   color: #ffb4b4;
   background: rgba(80, 20, 20, 0.75);
   border-radius: 4px;
+  cursor: pointer;
+}
+
+.lr-year-bar {
+  position: absolute;
+  top: 8px;
+  right: 24px;
+  z-index: 5;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.lr-year-bar__label {
+  font-size: 12px;
+  color: var(--screen-text-secondary, #a8d4c8);
+}
+
+.lr-year-bar__select {
+  min-width: 88px;
+  height: 28px;
+  padding: 0 8px;
+  font-size: 13px;
+  color: #e8eef5;
+  background: rgba(4, 48, 40, 0.85);
+  border: 1px solid var(--screen-line-dim, rgba(61, 217, 176, 0.42));
+  border-radius: 4px;
+  outline: none;
+}
+
+.lr-year-bar__date {
+  font-size: 11px;
+  color: var(--screen-text-secondary, #a8d4c8);
 }
 
 .screen-page--home-column {

ruoyi-screen/src/views/tradeSales/chartOptions.js

@@ -1,4 +1,4 @@
-/** 交易销售大屏 ECharts 配置（对齐 doc/交易销售 设计稿） */
+/** 交易销售大屏 ECharts 配置（对齐 doc/大屏/交易销售 v1.3 滚动 12 月） */
 
 import { buildMallPie2DOption } from '@/utils/mallPie2d'
 
@@ -6,7 +6,6 @@ const AXIS_LABEL = { color: '#9fb0c3', fontSize: 10 }
 const AXIS_LINE = { lineStyle: { color: 'rgba(61, 217, 176, 0.35)' } }
 const SPLIT_LINE = { lineStyle: { color: 'rgba(61, 217, 176, 0.12)' } }
 const GRID = { left: 40, right: 16, top: 36, bottom: 28, containLabel: true }
-const MONTHS = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
 
 const DESTINATION_COLOR = ['#5ef0c8', '#ecd27b', '#6eb5ff']
 const GRADE_COLOR = ['#6eb5ff', '#ecd27b', '#5ef0c8', '#0f8f72']
@@ -22,16 +21,63 @@ function emptyOption(text = '暂无数据') {
   }
 }
 
-function sortByMonth(list) {
-  return [...(list || [])].sort((a, b) => (a.month || 0) - (b.month || 0))
+function pickNumber(row, fields) {
+  for (const key of fields) {
+    const raw = row?.[key]
+    if (raw != null && raw !== '') {
+      const n = Number(raw)
+      if (!Number.isNaN(n)) {
+        return n
+      }
+    }
+  }
+  return 0
+}
+
+/** 滚动最近 12 月：按 statYear、month 升序 */
+function sortRollingMonths(list) {
+  return [...(list || [])].sort((a, b) => {
+    const ak = (Number(a.statYear) || 0) * 100 + (Number(a.month) || 0)
+    const bk = (Number(b.statYear) || 0) * 100 + (Number(b.month) || 0)
+    return ak - bk
+  })
+}
+
+function rollingMonthLabel(row) {
+  return `${Number(row.month)}月`
+}
+
+function rollingTooltipTitle(row) {
+  if (!row) {
+    return ''
+  }
+  return `${row.statYear}年${Number(row.month)}月`
+}
+
+function buildRollingAxis(list) {
+  const rows = sortRollingMonths(list)
+  return {
+    rows,
+    categories: rows.map(rollingMonthLabel),
+    titleAt: (dataIndex) => rollingTooltipTitle(rows[dataIndex])
+  }
+}
+
+function rollingSeries(list, field, altFields = []) {
+  const fields = [field, ...altFields]
+  return sortRollingMonths(list).map((row) => pickNumber(row, fields))
 }
 
-function monthSeries(list, field) {
-  const map = new Map(sortByMonth(list).map((row) => [row.month, row[field] ?? 0]))
-  return MONTHS.map((_, i) => {
-    const val = map.get(i + 1) ?? 0
-    return typeof val === 'object' && val !== null ? Number(val) : Number(val)
+function rollingAxisTooltip(params, axis, valueFormatter) {
+  if (!Array.isArray(params) || !params.length) {
+    return ''
+  }
+  const title = axis.titleAt(params[0].dataIndex)
+  const lines = params.map((p) => {
+    const val = valueFormatter ? valueFormatter(p) : `${p.value ?? 0}`
+    return `${p.marker}${p.seriesName}：${val}`
   })
+  return `${title}<br/>${lines.join('<br/>')}`
 }
 
 function formatQuoteDate(quoteDate) {
@@ -40,7 +86,9 @@ function formatQuoteDate(quoteDate) {
   }
   const parts = String(quoteDate).split('-')
   if (parts.length >= 3) {
-    return `${Number(parts[1])}/${Number(parts[2])}`
+    const mm = String(parts[1]).padStart(2, '0')
+    const dd = String(parts[2]).padStart(2, '0')
+    return `${mm}-${dd}`
   }
   return quoteDate
 }
@@ -63,11 +111,13 @@ export function buildOriginQuoteOption(originQuote) {
     tooltip: {
       trigger: 'axis',
       formatter: (params) => {
-        const lines = [params[0]?.name || '']
-        params.forEach((p) => {
-          lines.push(`${p.marker}${p.seriesName} ${p.value}${unit}`)
-        })
-        return lines.join('<br/>')
+        if (!Array.isArray(params) || !params.length) {
+          return ''
+        }
+        const row = originQuote.dailyTrend[params[0].dataIndex]
+        const title = row?.quoteDate || params[0]?.name || ''
+        const lines = params.map((p) => `${p.marker}${p.seriesName} ${p.value}${unit}`)
+        return `${title}<br/>${lines.join('<br/>')}`
       }
     },
     legend: {
@@ -120,19 +170,26 @@ export function buildOriginQuoteOption(originQuote) {
   }
 }
 
-/** 牦牛交易数额趋势 — 销售量(头) + 销售额(元) */
+/** 牦牛交易数额趋势 — 销售量(头)柱 + 销售额(元)折线（滚动 12 月） */
 export function buildTradeMonthlyOption(tradeMonthlyTrend) {
   if (!tradeMonthlyTrend?.length) {
-    return emptyOption()
-  }
-  const heads = monthSeries(tradeMonthlyTrend, 'tradeHeads')
-  const amounts = monthSeries(tradeMonthlyTrend, 'tradeAmount')
-  if (!heads.some((v) => v > 0) && !amounts.some((v) => v > 0)) {
     return emptyOption('暂无交易数据')
   }
+  const axis = buildRollingAxis(tradeMonthlyTrend)
+  const heads = rollingSeries(tradeMonthlyTrend, 'tradeHeads')
+  const amounts = rollingSeries(tradeMonthlyTrend, 'tradeAmount')
   return {
     color: ['#5ef0c8', '#ecd27b'],
-    tooltip: { trigger: 'axis' },
+    tooltip: {
+      trigger: 'axis',
+      formatter: (params) =>
+        rollingAxisTooltip(params, axis, (p) => {
+          if (p.seriesName === '销售额') {
+            return `${Number(p.value).toFixed(2)} 万元`
+          }
+          return `${p.value ?? 0} 头`
+        })
+    },
     legend: {
       top: 0,
       left: 'center',
@@ -143,7 +200,7 @@ export function buildTradeMonthlyOption(tradeMonthlyTrend) {
     grid: { ...GRID, bottom: 10 },
     xAxis: {
       type: 'category',
-      data: MONTHS,
+      data: axis.categories,
       axisLabel: { ...AXIS_LABEL, rotate: 35, interval: 0, fontSize: 9 },
       axisLine: AXIS_LINE
     },
@@ -172,11 +229,9 @@ export function buildTradeMonthlyOption(tradeMonthlyTrend) {
     series: [
       {
         name: '销售量',
-        type: 'line',
-        smooth: true,
-        symbol: 'circle',
-        symbolSize: 4,
-        areaStyle: { color: 'rgba(94, 240, 200, 0.2)' },
+        type: 'bar',
+        barMaxWidth: 10,
+        itemStyle: { color: 'rgba(94, 240, 200, 0.75)', borderRadius: [3, 3, 0, 0] },
         data: heads
       },
       {
@@ -186,6 +241,7 @@ export function buildTradeMonthlyOption(tradeMonthlyTrend) {
         smooth: true,
         symbol: 'circle',
         symbolSize: 4,
+        lineStyle: { width: 2, color: '#ecd27b' },
         data: amounts.map((v) => Number(v) / 10000)
       }
     ]
@@ -331,25 +387,28 @@ export function buildCategorySalesPieOption(categorySales, mallStatsAvailable =
   })
 }
 
-/** 商城订单趋势 — 曲线 */
+/** 商城订单趋势 — 曲线（滚动 12 月） */
 export function buildMallOrderTrendOption(mallOrderTrend, mallStatsAvailable = true) {
   if (mallStatsAvailable === false) {
     return emptyOption(MALL_UNAVAILABLE_TEXT)
   }
-  if (!mallOrderTrend?.items?.length) {
+  const items = mallOrderTrend?.items || []
+  if (!items.length) {
     return emptyOption(resolveMallEmptyText(mallStatsAvailable, '暂无订单数据'))
   }
-  const counts = monthSeries(mallOrderTrend.items, 'orderCount')
-  if (!counts.some((v) => v > 0)) {
-    return emptyOption('暂无订单数据')
-  }
+  const axis = buildRollingAxis(items)
+  const counts = rollingSeries(items, 'orderCount')
   return {
     color: ['#6eb5ff'],
-    tooltip: { trigger: 'axis' },
+    tooltip: {
+      trigger: 'axis',
+      formatter: (params) =>
+        rollingAxisTooltip(params, axis, (p) => `${p.value ?? 0} 单`)
+    },
     grid: { ...GRID, top: 12, bottom: 10 },
     xAxis: {
       type: 'category',
-      data: MONTHS,
+      data: axis.categories,
       axisLabel: { ...AXIS_LABEL, rotate: 35, interval: 0, fontSize: 9 },
       axisLine: AXIS_LINE
     },

ruoyi-screen/src/views/tradeSales/index.vue

@@ -3,8 +3,7 @@
     <div v-if="loadError" class="ts-error" @click="onRetry">
       {{ loadError }}（点击重试）
     </div>
-<!-- 
-    <div class="ts-year-bar">
+    <!-- <div class="ts-year-bar">
       <label class="ts-year-bar__label">统计年份</label>
       <select
         v-model="statYear"
@@ -116,7 +115,6 @@
       <div class="screen-page--home-column-right ts-mall-panel">
         <div class="top_title">
           农资品类销售 ཞིང་ལས་རྒྱུ་ཆ་རིགས་ཀྱི་ཚོང་འདོན།
-          <!-- <span v-if="categoryStatYearLabel" class="ts-mall-stat-year">（{{ categoryStatYearLabel }}）</span> -->
         </div>
         <div class="ts-mall-top">
           <div class="ts-mall-top__pie">