123

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

@@ -6,7 +6,6 @@ const MONTH_AXIS_LABEL = { color: '#9fb0c3', fontSize: 9, margin: 6 }
 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: 22, right: 8, top: 24, bottom: 6, containLabel: true }
-const MONTHS = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
 
 function emptyOption(text = '暂无数据') {
   return {
@@ -19,10 +18,6 @@ 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]
@@ -36,22 +31,59 @@ function pickNumber(row, fields) {
   return 0
 }
 
-function monthSeries(list, field, altFields = []) {
+/** 滚动最近 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]
-  const map = new Map(
-    sortByMonth(list).map((row) => [Number(row.month), pickNumber(row, fields)])
-  )
-  return MONTHS.map((_, i) => map.get(i + 1) ?? 0)
+  return sortRollingMonths(list).map((row) => pickNumber(row, fields))
 }
 
-/** 牦牛存栏变动：公牛 / 母牛折线 */
+/** 牦牛存栏变动：公牛 / 母牛折线（滚动 12 月） */
 export function buildInventoryTrendOption(monthlyTrend) {
   if (!monthlyTrend?.length) {
     return emptyOption()
   }
+  const axis = buildRollingAxis(monthlyTrend)
   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} 头`)
+        return `${title}<br/>${lines.join('<br/>')}`
+      }
+    },
     legend: {
       top: 0,
       right: 8,
@@ -62,7 +94,7 @@ export function buildInventoryTrendOption(monthlyTrend) {
     grid: GRID,
     xAxis: {
       type: 'category',
-      data: MONTHS,
+      data: axis.categories,
       axisLabel: { ...MONTH_AXIS_LABEL, interval: 0 },
       axisLine: AXIS_LINE,
       axisTick: { show: false }
@@ -80,7 +112,7 @@ export function buildInventoryTrendOption(monthlyTrend) {
         smooth: true,
         symbol: 'circle',
         symbolSize: 4,
-        data: monthSeries(monthlyTrend, 'bullCount')
+        data: rollingSeries(monthlyTrend, 'bullCount')
       },
       {
         name: '母牛',
@@ -88,20 +120,21 @@ export function buildInventoryTrendOption(monthlyTrend) {
         smooth: true,
         symbol: 'circle',
         symbolSize: 4,
-        data: monthSeries(monthlyTrend, 'cowCount')
+        data: rollingSeries(monthlyTrend, 'cowCount')
       }
     ]
   }
 }
 
-/** 年龄三档配色（对齐 doc/首页/耗牛年龄结构.png） */
+/** 年龄四档配色（母牛分龄：1岁以下 / 1～3岁 / 3～12岁 / 12岁以上） */
 const AGE_BAND_COLOR = {
-  M1_6: '#45c997',
-  M7_12: '#6eb5ff',
-  M13_PLUS: '#ecd27b'
+  COW_U1: '#45c997',
+  COW_1_3: '#6eb5ff',
+  COW_3_12: '#547233',
+  COW_O12: '#ecd27b'
 }
 
-const AGE_BAND_ORDER = ['M1_6', 'M7_12', 'M13_PLUS']
+const AGE_BAND_ORDER = ['COW_U1', 'COW_1_3', 'COW_3_12', 'COW_O12']
 
 function sortAgeBands(ageStructure) {
   const map = new Map((ageStructure || []).map((item) => [item.bandCode, item]))
@@ -116,7 +149,7 @@ function formatAgeRatio(ratio, percent) {
   return `${Math.round(percent)}%`
 }
 
-/** 牦牛年龄结构（环形图 + 右侧图例，固定三档） */
+/** 牦牛年龄结构（环形图 + 右侧图例，固定四档） */
 export function buildAgeStructureOption(ageStructure) {
   if (!ageStructure?.length) {
     return emptyOption()
@@ -167,7 +200,7 @@ export function buildAgeStructureOption(ageStructure) {
       icon: 'circle',
       itemWidth: 8,
       itemHeight: 8,
-      itemGap: 12,
+      itemGap: 10,
       textStyle: { color: '#e8eef5', fontSize: 10 }
     },
     graphic: [
@@ -227,7 +260,7 @@ export function buildAgeStructureOption(ageStructure) {
   }
 }
 
-/** 出栏柱图金色渐变（对齐 doc/首页/耗牛出栏统计.png） */
+/** 出栏柱图金色渐变 */
 const OUTBOUND_BAR_GRADIENT = {
   type: 'linear',
   x: 0,
@@ -246,33 +279,30 @@ const OUTBOUND_SPLIT_LINE = {
   lineStyle: { color: 'rgba(120, 140, 160, 0.28)', type: 'dashed' }
 }
 
-/** 牦牛出栏按月（柱 + 折线，设计稿样式） */
+/** 牦牛出栏按月（纯柱状图，滚动 12 月） */
 export function buildOutboundOption(outboundMonthly) {
   if (!outboundMonthly?.length) {
     return emptyOption()
   }
-  const values = monthSeries(outboundMonthly, 'outboundCount', ['outbound_count', 'count'])
+  const axis = buildRollingAxis(outboundMonthly)
+  const values = rollingSeries(outboundMonthly, 'outboundCount', ['outbound_count', 'count'])
   return {
     tooltip: {
       trigger: 'axis',
       axisPointer: { type: 'shadow' },
       formatter: (params) => {
-        const bar = params.find((p) => p.seriesType === 'bar') || params[0]
-        return `${bar.name}<br/>出栏 ${bar.value} 头`
+        const p = Array.isArray(params) ? params[0] : params
+        if (!p) {
+          return ''
+        }
+        const title = axis.titleAt(p.dataIndex)
+        return `${title}<br/>出栏 ${p.value} 头`
       }
     },
-    legend: {
-      top: 4,
-      left: 8,
-      itemWidth: 8,
-      itemHeight: 8,
-      textStyle: { color: '#a8d4c8', fontSize: 10 },
-      data: ['出栏', '趋势']
-    },
     grid: OUTBOUND_GRID,
     xAxis: {
       type: 'category',
-      data: MONTHS,
+      data: axis.categories,
       axisLabel: { ...MONTH_AXIS_LABEL, interval: 0 },
       axisLine: { lineStyle: { color: 'rgba(150, 170, 190, 0.45)' } },
       axisTick: { show: false }
@@ -290,27 +320,17 @@ export function buildOutboundOption(outboundMonthly) {
         name: '出栏',
         type: 'bar',
         barWidth: '46%',
-        z: 1,
         itemStyle: {
           color: OUTBOUND_BAR_GRADIENT,
           borderRadius: [10, 10, 10, 10]
         },
         data: values
-      },
-      {
-        name: '趋势',
-        type: 'line',
-        smooth: true,
-        symbol: 'none',
-        z: 2,
-        lineStyle: { color: '#b8e86a', width: 2 },
-        data: values
       }
     ]
   }
 }
 
-/** 草场退化五档配色（对齐 doc/首页/草场类型占比.png） */
+/** 草场退化五档配色 */
 const GRASSLAND_DEGRADATION_COLOR = {
   1: '#3b66d1',
   2: '#5dc3a1',
@@ -400,22 +420,6 @@ export function buildGrasslandOption(grassland) {
   }
 }
 
-/** 预约堆叠柱配色（对齐 doc/首页/线下服务预约.png，自下而上：机构蓝 / 兽医青 / 专家金） */
-const APPOINTMENT_MONTHS = [
-  '一月',
-  '二月',
-  '三月',
-  '四月',
-  '五月',
-  '六月',
-  '七月',
-  '八月',
-  '九月',
-  '十月',
-  '十一月',
-  '十二月'
-]
-
 const APPOINTMENT_ORG_GRADIENT = {
   type: 'linear',
   x: 0,
@@ -445,18 +449,23 @@ const APPOINTMENT_SPLIT_LINE = {
   lineStyle: { color: 'rgba(120, 140, 160, 0.28)', type: 'dashed' }
 }
 
-/** 线下服务预约堆叠柱 */
+/** 线下服务预约堆叠柱（滚动 12 月） */
 export function buildAppointmentStackedOption(monthlyStacked) {
   if (!monthlyStacked?.length) {
     return emptyOption()
   }
+  const axis = buildRollingAxis(monthlyStacked)
   return {
     tooltip: {
       trigger: 'axis',
       axisPointer: { type: 'shadow' },
       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} 人次`)
-        return `${params[0]?.name}<br/>${lines.join('<br/>')}`
+        return `${title}<br/>${lines.join('<br/>')}`
       }
     },
     legend: {
@@ -470,7 +479,7 @@ export function buildAppointmentStackedOption(monthlyStacked) {
     grid: APPOINTMENT_GRID,
     xAxis: {
       type: 'category',
-      data: APPOINTMENT_MONTHS,
+      data: axis.categories,
       axisLabel: { ...MONTH_AXIS_LABEL, interval: 0 },
       axisLine: { lineStyle: { color: 'rgba(150, 170, 190, 0.45)' } },
       axisTick: { show: false }
@@ -490,7 +499,7 @@ export function buildAppointmentStackedOption(monthlyStacked) {
         stack: 'apt',
         barMaxWidth: 10,
         itemStyle: { color: APPOINTMENT_ORG_GRADIENT },
-        data: monthSeries(monthlyStacked, 'orgCount', ['org_count'])
+        data: rollingSeries(monthlyStacked, 'orgCount', ['org_count'])
       },
       {
         name: '兽医',
@@ -498,7 +507,7 @@ export function buildAppointmentStackedOption(monthlyStacked) {
         stack: 'apt',
         barMaxWidth: 10,
         itemStyle: { color: '#52b89f' },
-        data: monthSeries(monthlyStacked, 'vetCount', ['vet_count'])
+        data: rollingSeries(monthlyStacked, 'vetCount', ['vet_count'])
       },
       {
         name: '专家',
@@ -506,13 +515,13 @@ export function buildAppointmentStackedOption(monthlyStacked) {
         stack: 'apt',
         barMaxWidth: 10,
         itemStyle: { color: APPOINTMENT_EXPERT_GRADIENT },
-        data: monthSeries(monthlyStacked, 'expertCount', ['expert_count'])
+        data: rollingSeries(monthlyStacked, 'expertCount', ['expert_count'])
       }
     ]
   }
 }
 
-/** 三类柱图配色（与线下服务预约堆叠柱一致：蓝 / 青 / 金） */
+/** 三类柱图配色 */
 const STACK_BAR_COLORS = [APPOINTMENT_ORG_GRADIENT, '#52b89f', APPOINTMENT_EXPERT_GRADIENT]
 
 /** 惠农补贴（万元） */
@@ -569,7 +578,6 @@ export function buildSubsidyOption(typeStats, hasSubsidyData) {
   }
 }
 
-/** 实战培训面积图配色（对齐 doc/首页/实战培训占比.png） */
 const TRAINING_ACTIVITY_LINE = '#ff9f43'
 const TRAINING_ACTIVITY_AREA = {
   type: 'linear',
@@ -601,12 +609,16 @@ const TRAINING_SPLIT_LINE = {
   lineStyle: { color: 'rgba(120, 140, 160, 0.28)', type: 'dashed' }
 }
 
-/** 实战培训报名趋势（双面积折线：活动数 + 报名人数） */
+/** 实战培训报名趋势（双面积折线，滚动 12 月） */
 export function buildTrainingOption(trainingTrend) {
   if (!trainingTrend?.hasTrainingData) {
     return emptyOption('暂无培训数据')
   }
   const monthly = trainingTrend.monthly || []
+  if (!monthly.length) {
+    return emptyOption('暂无培训数据')
+  }
+  const axis = buildRollingAxis(monthly)
   return {
     tooltip: {
       trigger: 'axis',
@@ -614,11 +626,12 @@ export function buildTrainingOption(trainingTrend) {
         if (!Array.isArray(params) || !params.length) {
           return ''
         }
+        const title = axis.titleAt(params[0].dataIndex)
         const lines = params.map((p) => {
           const unit = p.seriesName === '活动数' ? '个' : '人'
           return `${p.marker}${p.seriesName} ${p.value ?? 0} ${unit}`
         })
-        return `${params[0].name}<br/>${lines.join('<br/>')}`
+        return `${title}<br/>${lines.join('<br/>')}`
       }
     },
     legend: {
@@ -631,7 +644,7 @@ export function buildTrainingOption(trainingTrend) {
     grid: TRAINING_GRID,
     xAxis: {
       type: 'category',
-      data: MONTHS,
+      data: axis.categories,
       axisLabel: { ...MONTH_AXIS_LABEL, interval: 0, color: '#e8eef5' },
       axisLine: { lineStyle: { color: 'rgba(150, 170, 190, 0.45)' } },
       axisTick: { show: false }
@@ -672,7 +685,7 @@ export function buildTrainingOption(trainingTrend) {
           shadowBlur: 10
         },
         areaStyle: { color: TRAINING_ACTIVITY_AREA },
-        data: monthSeries(monthly, 'activityCount', ['activity_count'])
+        data: rollingSeries(monthly, 'activityCount', ['activity_count'])
       },
       {
         name: '报名人数',
@@ -687,7 +700,7 @@ export function buildTrainingOption(trainingTrend) {
           shadowBlur: 10
         },
         areaStyle: { color: TRAINING_ENROLL_AREA },
-        data: monthSeries(monthly, 'enrolledCount', ['enrolled_count'])
+        data: rollingSeries(monthly, 'enrolledCount', ['enrolled_count'])
       }
     ]
   }

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

@@ -1,6 +1,6 @@
 <template>
   <div class="screen-page screen-page--home" :class="{ 'is-loading': loading }">
-    <!-- <div v-if="loadError" class="home-error">{{ loadError }}</div>
+    <div v-if="loadError" class="home-error" @click="fetchDashboard">{{ loadError }}（点击重试）</div>
 
     <div class="home-year-bar">
       <label class="home-year-bar__label">统计年份</label>
@@ -12,11 +12,12 @@
       >
         <option v-for="y in availableYears" :key="y" :value="String(y)">{{ y }}年</option>
       </select>
-    </div> -->
+      <span v-if="statDate" class="home-year-bar__date">统计日 {{ statDate }}</span>
+    </div>
 
     <div class="screen-page--home-column">
       <div class="screen-page--home-column-top">
-        <div class="top_title">产值总览 ལས་རྩོམ་ཐོག་མའི་དོ་དམ།</div>
+        <div class="top_title">产业总览 ལས་རྩོམ་ཐོག་མའི་དོ་དམ།</div>
         <div class="top_content">
           <div class="content_1">
             <div class="content_num">
@@ -74,7 +75,12 @@
 
       <div class="screen-page--home-column-flex">
         <div class="screen-page--home-column-flex-item">
-          <div class="flex_title">牦牛存栏变动 གཡག་གསོལ་གྱི་འགྱུར་བ།</div>
+          <div class="flex_title flex_title--with-meta">
+            <span>牦牛存栏变动 གཡག་གསོལ་གྱི་འགྱུར་བ།</span>
+            <span v-if="inventoryChange" class="flex_title__meta">
+              公牛 {{ display(inventoryChange.bullCount) }} 头 · 母牛 {{ display(inventoryChange.cowCount) }} 头
+            </span>
+          </div>
           <div class="flex_content">
             <ScreenChart :option="inventoryChartOption" />
           </div>
@@ -103,7 +109,7 @@
                 <div class="grassland-stat__value">{{ display(dashboardGrassland?.availableCount) }}</div>
               </div>
               <div class="grassland-stat grassland-stat--inuse">
-                <div class="grassland-stat__label">已用草场数</div>
+                <div class="grassland-stat__label">使用中草场数</div>
                 <div class="grassland-stat__value">{{ display(dashboardGrassland?.inUseCount) }}</div>
               </div>
             </div>
@@ -123,22 +129,19 @@
             <div class="yu">
               <div class="yu_title">兽医人员</div>
               <div class="yu_num">
-                <!-- <strong>{{ display(appointment?.annualVetCount) }}</strong> 人 -->
-                <strong>150</strong> 人
+                <strong>{{ display(appointment?.annualVetCount) }}</strong> 人
               </div>
             </div>
             <div class="yu">
               <div class="yu_title">专家人员</div>
               <div class="yu_num">
-                <!-- <strong>{{ display(appointment?.annualExpertCount) }}</strong> 人 -->
-                <strong>1</strong> 人
+                <strong>{{ display(appointment?.annualExpertCount) }}</strong> 人
               </div>
             </div>
             <div class="yu">
               <div class="yu_title">诊疗机构</div>
               <div class="yu_num">
-                <!-- <strong>{{ display(appointment?.annualOrgCount) }}</strong> 个 -->
-                <strong>12</strong> 个
+                <strong>{{ display(appointment?.annualOrgCount) }}</strong> 个
               </div>
             </div>
           </div>
@@ -237,12 +240,10 @@ const STANDARD_TABS = [
 
 const STANDARD_FETCH_PAGE_SIZE = 50
 
-/** 产值总览：农牧户固定展示值（不走接口） */
-const FARMER_COUNT = 8988
-
 const loading = ref(false)
 const loadError = ref('')
 const statYear = ref(String(new Date().getFullYear()))
+const statDate = ref('')
 const availableYears = ref([])
 const overview = ref(null)
 const inventoryChange = ref(null)
@@ -307,6 +308,7 @@ 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)]
@@ -436,6 +438,11 @@ onMounted(() => {
   outline: none;
 }
 
+.home-year-bar__date {
+  font-size: 11px;
+  color: var(--screen-text-secondary, #a8d4c8);
+}
+
 .screen-page--home-column {
   width: 617px;
   height: 100%;
@@ -555,6 +562,22 @@ onMounted(() => {
   margin-bottom: 5px;
 }
 
+.flex_title--with-meta {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-right: 8px;
+}
+
+.flex_title__meta {
+  flex-shrink: 0;
+  font-size: 10px;
+  color: #a8d4c8;
+  line-height: 1.2;
+  text-align: right;
+  max-width: 48%;
+}
+
 .flex_content {
   width: 100%;
   height: 180px;

ruoyi-ui/src/api/dataModel/yakHerdInventory.js

@@ -51,6 +51,14 @@ export function listYakHerdInventoryYearOptions() {
   })
 }
 
+/** 可选月份（1～12） */
+export function listYakHerdInventoryMonthOptions() {
+  return request({
+    url: "/dataModel/yakHerdInventory/monthOptions",
+    method: "get"
+  })
+}
+
 /** 乡镇下拉 */
 export function listYakHerdInventoryTownOptions() {
   return request({
@@ -60,10 +68,11 @@ export function listYakHerdInventoryTownOptions() {
 }
 
 /** Excel 导入（multipart/form-data，file 为 el-upload 的 raw File） */
-export function importYakHerdInventory(file, statYear) {
+export function importYakHerdInventory(file, statYear, statMonth) {
   const formData = new FormData()
   formData.append("file", file, file.name)
   formData.append("statYear", String(statYear))
+  formData.append("statMonth", String(statMonth))
   return request({
     url: "/dataModel/yakHerdInventory/importData",
     method: "post",
@@ -83,12 +92,12 @@ export function downloadYakHerdInventoryTemplate() {
   })
 }
 
-/** 按年份导出（GET，后端 @GetMapping("/export")） */
-export function exportYakHerdInventory(statYear) {
+/** 按年月导出（GET，后端 @GetMapping("/export")） */
+export function exportYakHerdInventory(statYear, statMonth) {
   return request({
     url: "/dataModel/yakHerdInventory/export",
     method: "get",
-    params: { statYear },
+    params: { statYear, statMonth },
     responseType: "blob"
   })
 }

ruoyi-ui/src/api/dataModel/yakOutboundReport.js

@@ -51,6 +51,14 @@ export function listYakOutboundReportYearOptions() {
   })
 }
 
+/** 可选月份（1～12） */
+export function listYakOutboundReportMonthOptions() {
+  return request({
+    url: "/dataModel/yakOutboundReport/monthOptions",
+    method: "get"
+  })
+}
+
 /** 乡镇下拉 */
 export function listYakOutboundReportTownOptions() {
   return request({
@@ -60,10 +68,11 @@ export function listYakOutboundReportTownOptions() {
 }
 
 /** Excel 导入（multipart/form-data，file 为 el-upload 的 raw File） */
-export function importYakOutboundReport(file, statYear) {
+export function importYakOutboundReport(file, statYear, statMonth) {
   const formData = new FormData()
   formData.append("file", file, file.name)
   formData.append("statYear", String(statYear))
+  formData.append("statMonth", String(statMonth))
   return request({
     url: "/dataModel/yakOutboundReport/importData",
     method: "post",
@@ -83,12 +92,12 @@ export function downloadYakOutboundReportTemplate() {
   })
 }
 
-/** 按年份导出（GET） */
-export function exportYakOutboundReport(statYear) {
+/** 按年月导出（GET） */
+export function exportYakOutboundReport(statYear, statMonth) {
   return request({
     url: "/dataModel/yakOutboundReport/export",
     method: "get",
-    params: { statYear },
+    params: { statYear, statMonth },
     responseType: "blob"
   })
 }

ruoyi-ui/src/components/EzvizHlsPlayer/index.vue

@@ -19,14 +19,15 @@ export default {
     containerSeq += 1
     return {
       containerId: `ezviz-hls-player-${containerSeq}`,
-      player: null,
       resizeObserver: null
     }
   },
   computed: {
     decoderStaticPath() {
-      const base = process.env.BASE_URL || "/"
-      return `${base}ezuikit-player-hls/`
+      if (process.env.NODE_ENV === "production") {
+        return "/client/"
+      }
+      return "/"
     }
   },
   watch: {
@@ -34,6 +35,10 @@ export default {
       this.rebuildPlayer(val)
     }
   },
+  created() {
+    this.hlsPlayer = null
+    this.onPlayerParsed = null
+  },
   mounted() {
     this.bindResizeObserver()
     if (this.url) {
@@ -78,22 +83,42 @@ export default {
       }
     },
     syncPlayerSize() {
-      if (!this.player || typeof this.player.resize !== "function") {
+      if (!this.hlsPlayer || typeof this.hlsPlayer.resize !== "function") {
         return
       }
       const { width, height } = this.getContainerSize()
       if (width > 0 && height > 0) {
-        this.player.resize(width, height)
+        this.hlsPlayer.resize(width, height)
+      }
+    },
+    bindPlayerEvents() {
+      if (!this.hlsPlayer || !this.hlsPlayer.event) {
+        return
+      }
+      this.onPlayerParsed = () => {
+        if (typeof this.hlsPlayer.play === "function") {
+          this.hlsPlayer.play().catch(() => {
+            this.$emit("error")
+          })
+        }
+      }
+      this.hlsPlayer.event.on("parsed", this.onPlayerParsed)
+    },
+    unbindPlayerEvents() {
+      if (this.hlsPlayer && this.hlsPlayer.event && this.onPlayerParsed) {
+        this.hlsPlayer.event.off("parsed", this.onPlayerParsed)
       }
+      this.onPlayerParsed = null
     },
     destroyPlayer() {
-      if (this.player) {
+      this.unbindPlayerEvents()
+      if (this.hlsPlayer) {
         try {
-          this.player.destroy()
+          this.hlsPlayer.destroy()
         } catch (e) {
           // ignore teardown errors
         }
-        this.player = null
+        this.hlsPlayer = null
       }
       const el = this.$refs.containerRef
       if (el) {
@@ -127,15 +152,17 @@ export default {
         }
         return
       }
-      this.player = new HlsPlayer({
+      this.hlsPlayer = new HlsPlayer({
         id: this.containerId,
         url: text,
-        staticPath: '/',
+        staticPath: this.decoderStaticPath,
         isLive: true,
+        autoPlay: true,
         width,
         height
       })
-      this.player.play().catch(() => {
+      this.bindPlayerEvents()
+      this.hlsPlayer.play().catch(() => {
         this.$emit("error")
       })
     }

ruoyi-ui/src/lang/bo/dataModel.js

@@ -276,15 +276,19 @@ export default {
   },
   yakHerdInventory: {
     queryStatYear: "ལོ་ཚད།",
+    queryStatMonth: "ཟླ་ཚད།",
     queryTown: "ཤང་གྲོང་།",
     colStatYear: "ལོ་ཚད།",
+    colStatMonth: "ཟླ་ཚད།",
     colTownName: "ཤང་གྲོང་།",
+    statMonthLabel: "{month}ཟླ།",
     colVillageCount: "གྲོང་ཚོ་གྲངས།",
     colHerdsmanHouseholdCount: "འབྲོག་པ་ཁྱིམ་གྲངས།",
     colYakTotal: "གནས་ཚད།",
     colBullTotal: "ཕོ་བ་གནས་ཚད།",
     colCowTotal: "མོ་བ་གནས་ཚད།",
     formStatYear: "ལོ་ཚད།",
+    formStatMonth: "ཟླ་ཚད།",
     formTown: "ཤང་གྲོང་།",
     formVillageCount: "གྲོང་ཚོ་གྲངས།",
     formHerdsmanHouseholdCount: "འབྲོག་པ་ཁྱིམ་གྲངས།",
@@ -309,14 +313,19 @@ export default {
     exportTitle: "Excel 导出",
     exportStatYear: "所属年份",
     exportStatYearPh: "请选择所属年份",
+    exportStatMonth: "所属月份",
+    exportStatMonthPh: "请选择所属月份",
     exportStatYearRequired: "请选择所属年份",
-    exportStatYearInvalid: "年份不在可选范围",
+    exportStatMonthRequired: "请选择所属月份",
+    exportStatYearInvalid: "年月不在可选范围",
     exportLoading: "正在导出...",
     exportFail: "导出失败",
     importTitle: "Excel 导入",
     importStatYear: "填报年份",
     importStatYearPh: "请选择年份",
-    importTip: "先选年份再上传 .xlsx",
+    importStatMonth: "填报月份",
+    importStatMonthPh: "请选择月份",
+    importTip: "先选年月再上传 .xlsx",
     importLoading: "正在导入，请稍候...",
     importSummary: "导入：新增 {insert} 更新 {update} 失败 {fail}",
     importWarnTitle: "警告",
@@ -329,6 +338,8 @@ export default {
     unitHousehold: "户",
     unitHead: "头",
     ruleStatYearRequired: "请选择年份",
+    ruleStatMonthRequired: "请选择月份",
+    ruleStatMonthFuture: "未来月份不可填",
     ruleTownRequired: "请选择乡镇",
     ruleCountRequired: "请填写",
     ruleCountNonNegative: "≥0 整数",
@@ -338,14 +349,18 @@ export default {
   },
   yakOutboundReport: {
     queryStatYear: "所属年份",
+    queryStatMonth: "所属月份",
     queryTown: "所属乡镇",
     colStatYear: "所属年份",
+    colStatMonth: "所属月份",
+    statMonthLabel: "{month}月",
     colTownName: "所属乡镇",
     colFarmerHouseholdCount: "农牧户户数",
     colFarmerPopulationCount: "农牧户人数",
     colYakOutboundCount: "牦牛出栏数",
     colSelfConsumptionCattle: "自食情况（牛）",
     formStatYear: "所属年份",
+    formStatMonth: "所属月份",
     formTown: "所属乡镇",
     formFarmerHouseholdCount: "农牧户户数",
     formFarmerPopulationCount: "农牧户人数",
@@ -369,14 +384,19 @@ export default {
     exportTitle: "Excel 导出",
     exportStatYear: "所属年份",
     exportStatYearPh: "请选择所属年份",
+    exportStatMonth: "所属月份",
+    exportStatMonthPh: "请选择所属月份",
     exportStatYearRequired: "请选择所属年份",
-    exportStatYearInvalid: "年份不在可选范围",
+    exportStatMonthRequired: "请选择所属月份",
+    exportStatYearInvalid: "导出年月不在可选范围",
     exportLoading: "正在导出...",
     exportFail: "导出失败",
     importTitle: "Excel 导入",
     importStatYear: "填报年份",
     importStatYearPh: "请选择年份",
-    importTip: "请先选择填报年份，再上传 .xlsx 文件",
+    importStatMonth: "填报月份",
+    importStatMonthPh: "请选择月份",
+    importTip: "请先选择填报年月，再上传 .xlsx 文件",
     importLoading: "正在导入...",
     importSummary: "导入完成：新增 {insert} 条，更新 {update} 条，失败 {fail} 条",
     importWarnTitle: "导入警告",
@@ -391,8 +411,9 @@ export default {
     unitSheep: "只",
     unitHorse: "匹",
     ruleStatYearRequired: "请选择年份",
+    ruleStatMonthRequired: "请选择月份",
+    ruleStatMonthFuture: "不可填报未来月份",
     ruleTownRequired: "请选择乡镇",
-    ruleCountRequired: "请填写",
     ruleCountNonNegative: "≥0 整数"
   }
 }

ruoyi-ui/src/lang/bo/livestockIndustry.js

@@ -26,8 +26,9 @@ export default {
     bullCount: "ཕོ་གཡག་གྲངས།",
     cowCount: "མོ་གཡག་གྲངས།",
     unknownGenderHint: "ཕོ་མོ་མིང་བཀོད་མེད：{count} ཀོང་།",
+    seriesBullCount: "ཕོ་གཡག",
+    seriesCowCount: "མོ་གཡག",
     chartInventoryTrend: "གནས་ཁུངས་འགྱུར་རྒྱས།",
-    seriesInventoryCount: "གནས་ཁུངས་གྲངས།",
     chartAgeStructure: "ལོ་ཚད་གྲུབ་ཆ།",
     grassAvailableCount: "བཀོལ་ཆོག་རྩྭ་ཁང་།",
     grassInUseCount: "བཀོལ་སྤྱོད་རྩྭ་ཁང་།",

ruoyi-ui/src/lang/zh/dataModel.js

@@ -276,15 +276,19 @@ export default {
   },
   yakHerdInventory: {
     queryStatYear: "所属年份",
+    queryStatMonth: "所属月份",
     queryTown: "所属乡镇",
     colStatYear: "所属年份",
+    colStatMonth: "所属月份",
     colTownName: "乡镇",
+    statMonthLabel: "{month}月",
     colVillageCount: "村居数",
     colHerdsmanHouseholdCount: "牧户数",
     colYakTotal: "存栏数",
     colBullTotal: "公牛存栏数",
     colCowTotal: "母牛存栏数",
     formStatYear: "所属年份",
+    formStatMonth: "所属月份",
     formTown: "所属乡镇",
     formVillageCount: "村居数",
     formHerdsmanHouseholdCount: "牧户数",
@@ -309,14 +313,19 @@ export default {
     exportTitle: "Excel 导出",
     exportStatYear: "所属年份",
     exportStatYearPh: "请选择所属年份",
+    exportStatMonth: "所属月份",
+    exportStatMonthPh: "请选择所属月份",
     exportStatYearRequired: "请选择所属年份",
-    exportStatYearInvalid: "导出年份不在可选范围内",
+    exportStatMonthRequired: "请选择所属月份",
+    exportStatYearInvalid: "导出年月不在可选范围内",
     exportLoading: "正在导出，请稍候...",
     exportFail: "导出失败",
     importTitle: "Excel 导入",
     importStatYear: "填报年份",
     importStatYearPh: "请选择填报年份",
-    importTip: "请先选择填报年份，再上传与模板格式一致的 .xlsx 文件",
+    importStatMonth: "填报月份",
+    importStatMonthPh: "请选择填报月份",
+    importTip: "请先选择填报年月，再上传与模板格式一致的 .xlsx 文件",
     importLoading: "正在导入，请稍候...",
     importSummary: "导入完成：新增 {insert} 条，更新 {update} 条，失败 {fail} 条",
     importWarnTitle: "导入警告",
@@ -329,6 +338,8 @@ export default {
     unitHousehold: "户",
     unitHead: "头",
     ruleStatYearRequired: "请选择所属年份",
+    ruleStatMonthRequired: "请选择所属月份",
+    ruleStatMonthFuture: "不可填报未来月份",
     ruleTownRequired: "请选择所属乡镇",
     ruleCountRequired: "请填写该项",
     ruleCountNonNegative: "须为大于等于 0 的整数",
@@ -338,14 +349,18 @@ export default {
   },
   yakOutboundReport: {
     queryStatYear: "所属年份",
+    queryStatMonth: "所属月份",
     queryTown: "所属乡镇",
     colStatYear: "所属年份",
+    colStatMonth: "所属月份",
+    statMonthLabel: "{month}月",
     colTownName: "所属乡镇",
     colFarmerHouseholdCount: "农牧户户数",
     colFarmerPopulationCount: "农牧户人数",
     colYakOutboundCount: "牦牛出栏数",
     colSelfConsumptionCattle: "自食情况（牛）",
     formStatYear: "所属年份",
+    formStatMonth: "所属月份",
     formTown: "所属乡镇",
     formFarmerHouseholdCount: "农牧户户数",
     formFarmerPopulationCount: "农牧户人数",
@@ -369,14 +384,19 @@ export default {
     exportTitle: "Excel 导出",
     exportStatYear: "所属年份",
     exportStatYearPh: "请选择所属年份",
+    exportStatMonth: "所属月份",
+    exportStatMonthPh: "请选择所属月份",
     exportStatYearRequired: "请选择所属年份",
-    exportStatYearInvalid: "导出年份不在可选范围内",
+    exportStatMonthRequired: "请选择所属月份",
+    exportStatYearInvalid: "导出年月不在可选范围内",
     exportLoading: "正在导出，请稍候...",
     exportFail: "导出失败",
     importTitle: "Excel 导入",
     importStatYear: "填报年份",
     importStatYearPh: "请选择填报年份",
-    importTip: "请先选择填报年份，再上传与模板格式一致的 .xlsx 文件",
+    importStatMonth: "填报月份",
+    importStatMonthPh: "请选择填报月份",
+    importTip: "请先选择填报年月，再上传与模板格式一致的 .xlsx 文件",
     importLoading: "正在导入，请稍候...",
     importSummary: "导入完成：新增 {insert} 条，更新 {update} 条，失败 {fail} 条",
     importWarnTitle: "导入警告",
@@ -391,8 +411,9 @@ export default {
     unitSheep: "只",
     unitHorse: "匹",
     ruleStatYearRequired: "请选择所属年份",
+    ruleStatMonthRequired: "请选择所属月份",
+    ruleStatMonthFuture: "不可填报未来月份",
     ruleTownRequired: "请选择所属乡镇",
-    ruleCountRequired: "请填写该项",
     ruleCountNonNegative: "须为大于等于 0 的整数"
   }
 }

ruoyi-ui/src/lang/zh/livestockIndustry.js

@@ -26,8 +26,9 @@ export default {
     bullCount: "公牛数量",
     cowCount: "母牛数量",
     unknownGenderHint: "未标注性别：{count} 头",
+    seriesBullCount: "公牛",
+    seriesCowCount: "母牛",
     chartInventoryTrend: "存栏趋势",
-    seriesInventoryCount: "存栏数量",
     chartAgeStructure: "年龄结构占比",
     grassAvailableCount: "可用草场",
     grassInUseCount: "使用中草场",

ruoyi-ui/src/views/dataModel/yakHerdInventory/index.vue

@@ -8,6 +8,12 @@
             <el-option v-for="y in yearOptions" :key="y" :label="String(y)" :value="y" />
           </el-select>
         </el-form-item>
+        <el-form-item prop="statMonth">
+          <template slot="label">{{ dmT("queryStatMonth") }}</template>
+          <el-select v-model="queryParams.statMonth" :placeholder="dmCommon('pleaseSelect')" clearable style="width: 120px">
+            <el-option v-for="m in monthOptions" :key="'q-' + m" :label="formatStatMonth(m)" :value="m" />
+          </el-select>
+        </el-form-item>
         <el-form-item prop="townDeptId">
           <template slot="label">{{ dmT("queryTown") }}</template>
           <el-select v-model="queryParams.townDeptId" :placeholder="dmCommon('pleaseSelect')" clearable filterable style="width: 180px">
@@ -53,6 +59,9 @@
           <span>{{ dmT("emptyList") }}</span>
         </template>
         <el-table-column :label="dmT('colStatYear')" prop="statYear" align="center" width="100" />
+        <el-table-column :label="dmT('colStatMonth')" align="center" width="90">
+          <template slot-scope="scope">{{ formatStatMonth(scope.row.statMonth) }}</template>
+        </el-table-column>
         <el-table-column :label="dmT('colTownName')" prop="townName" align="center" min-width="120" :show-overflow-tooltip="true" />
         <el-table-column :label="dmT('colVillageCount')" align="center" width="90">
           <template slot-scope="scope">{{ formatCount(scope.row.villageCount) }}</template>
@@ -90,7 +99,7 @@
       <el-form :key="formKey" ref="form" :model="form" label-width="150px" size="small">
         <div class="yhi-section-title">{{ dmT("sectionBasic") }}</div>
         <el-row :gutter="16">
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item prop="statYear" :rules="formRules.statYear">
               <template slot="label">{{ dmT("formStatYear") }}</template>
               <el-select v-model="form.statYear" :placeholder="dmCommon('pleaseSelect')" style="width: 100%">
@@ -98,7 +107,15 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
+            <el-form-item prop="statMonth" :rules="formRules.statMonth">
+              <template slot="label">{{ dmT("formStatMonth") }}</template>
+              <el-select v-model="form.statMonth" :placeholder="dmCommon('pleaseSelect')" style="width: 100%">
+                <el-option v-for="m in monthOptions" :key="'fm-' + m" :label="formatStatMonth(m)" :value="m" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item prop="townDeptId" :rules="formRules.townDeptId">
               <template slot="label">{{ dmT("formTown") }}</template>
               <el-select v-model="form.townDeptId" :placeholder="dmCommon('pleaseSelect')" filterable style="width: 100%">
@@ -145,11 +162,26 @@
               <span>{{ viewRow.statYear || dash }}</span>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formStatMonth')">
+              <span>{{ formatStatMonth(viewRow.statMonth) }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item :label="dmT('formTown')">
               <span>{{ viewRow.townName || dash }}</span>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formVillageDeptId')">
+              <span>{{ viewRow.villageDeptId || dash }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formVillageName')">
+              <span>{{ viewRow.villageName || dash }}</span>
+            </el-form-item>
+          </el-col>
           <el-col v-for="field in countFields" :key="'v-' + field.prop" :span="12">
             <el-form-item :label="dmT(field.labelKey)">
               <span>{{ formatCount(viewRow[field.prop]) }}</span>
@@ -200,6 +232,12 @@
             <el-option v-for="y in yearOptions" :key="'i-' + y" :label="String(y)" :value="y" />
           </el-select>
         </el-form-item>
+        <el-form-item prop="statMonth" :rules="importRules.statMonth">
+          <template slot="label">{{ dmT("importStatMonth") }}</template>
+          <el-select v-model="importForm.statMonth" :placeholder="dmT('importStatMonthPh')" style="width: 100%">
+            <el-option v-for="m in monthOptions" :key="'im-' + m" :label="formatStatMonth(m)" :value="m" />
+          </el-select>
+        </el-form-item>
         <p class="yhi-import-tip">{{ dmT("importTip") }}</p>
         <el-upload
           ref="importUpload"
@@ -230,6 +268,12 @@
             <el-option v-for="y in yearOptions" :key="'e-' + y" :label="String(y)" :value="y" />
           </el-select>
         </el-form-item>
+        <el-form-item prop="statMonth" :rules="exportRules.statMonth">
+          <template slot="label">{{ dmT("exportStatMonth") }}</template>
+          <el-select v-model="exportForm.statMonth" :placeholder="dmT('exportStatMonthPh')" style="width: 100%">
+            <el-option v-for="m in monthOptions" :key="'em-' + m" :label="formatStatMonth(m)" :value="m" />
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" :loading="exporting" @click="handleExportSubmit">{{ dmCommon("ok") }}</el-button>
@@ -248,6 +292,7 @@ import {
   updateYakHerdInventory,
   delYakHerdInventory,
   listYakHerdInventoryYearOptions,
+  listYakHerdInventoryMonthOptions,
   listYakHerdInventoryTownOptions,
   importYakHerdInventory,
   downloadYakHerdInventoryTemplate,
@@ -270,10 +315,19 @@ const COUNT_FIELDS = [
   { prop: "cowOver12Count", labelKey: "formCowOver12Count", unitKey: "unitHead" }
 ]
 
+function getCurrentYearMonth() {
+  const now = new Date()
+  return {
+    statYear: now.getFullYear(),
+    statMonth: now.getMonth() + 1
+  }
+}
+
 function createEmptyForm() {
   const form = {
     id: undefined,
     statYear: undefined,
+    statMonth: undefined,
     townDeptId: undefined,
     remark: undefined
   }
@@ -310,18 +364,22 @@ export default {
       total: 0,
       tableList: [],
       yearOptions: [],
+      monthOptions: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
       townOptions: [],
       viewRow: {},
       importForm: {
-        statYear: undefined
+        statYear: undefined,
+        statMonth: undefined
       },
       exportForm: {
-        statYear: undefined
+        statYear: undefined,
+        statMonth: undefined
       },
       queryParams: {
         pageNum: 1,
         pageSize: 20,
         statYear: undefined,
+        statMonth: undefined,
         townDeptId: undefined
       },
       form: createEmptyForm()
@@ -340,6 +398,10 @@ export default {
     formRules() {
       return {
         statYear: [{ required: true, message: this.dmT("ruleStatYearRequired"), trigger: "change" }],
+        statMonth: [
+          { required: true, message: this.dmT("ruleStatMonthRequired"), trigger: "change" },
+          { validator: this.validateFormStatMonth, trigger: "change" }
+        ],
         townDeptId: [{ required: true, message: this.dmT("ruleTownRequired"), trigger: "change" }],
         count: [
           { required: true, message: this.dmT("ruleCountRequired"), trigger: "change" },
@@ -350,12 +412,20 @@ export default {
     },
     importRules() {
       return {
-        statYear: [{ required: true, message: this.dmT("ruleStatYearRequired"), trigger: "change" }]
+        statYear: [{ required: true, message: this.dmT("ruleStatYearRequired"), trigger: "change" }],
+        statMonth: [
+          { required: true, message: this.dmT("ruleStatMonthRequired"), trigger: "change" },
+          { validator: this.validateImportStatMonth, trigger: "change" }
+        ]
       }
     },
     exportRules() {
       return {
-        statYear: [{ required: true, message: this.dmT("exportStatYearRequired"), trigger: "change" }]
+        statYear: [{ required: true, message: this.dmT("exportStatYearRequired"), trigger: "change" }],
+        statMonth: [
+          { required: true, message: this.dmT("exportStatMonthRequired"), trigger: "change" },
+          { validator: this.validateExportStatMonth, trigger: "change" }
+        ]
       }
     }
   },
@@ -368,10 +438,54 @@ export default {
       listYakHerdInventoryYearOptions().then((res) => {
         this.yearOptions = Array.isArray(res.data) ? res.data : []
       })
+      listYakHerdInventoryMonthOptions().then((res) => {
+        if (Array.isArray(res.data) && res.data.length) {
+          this.monthOptions = res.data
+        }
+      })
       listYakHerdInventoryTownOptions().then((res) => {
         this.townOptions = Array.isArray(res.data) ? res.data : []
       })
     },
+    formatStatMonth(month) {
+      if (month == null || month === "") {
+        return this.dash
+      }
+      return this.dmT("statMonthLabel", { month })
+    },
+    isFutureStatPeriod(statYear, statMonth) {
+      if (statYear == null || statMonth == null) {
+        return false
+      }
+      const now = new Date()
+      const currentYear = now.getFullYear()
+      const currentMonth = now.getMonth() + 1
+      if (statYear > currentYear) {
+        return true
+      }
+      return statYear === currentYear && statMonth > currentMonth
+    },
+    validateFormStatMonth(rule, value, callback) {
+      if (this.isFutureStatPeriod(this.form.statYear, value)) {
+        callback(new Error(this.dmT("ruleStatMonthFuture")))
+        return
+      }
+      callback()
+    },
+    validateImportStatMonth(rule, value, callback) {
+      if (this.isFutureStatPeriod(this.importForm.statYear, value)) {
+        callback(new Error(this.dmT("ruleStatMonthFuture")))
+        return
+      }
+      callback()
+    },
+    validateExportStatMonth(rule, value, callback) {
+      if (this.isFutureStatPeriod(this.exportForm.statYear, value)) {
+        callback(new Error(this.dmT("ruleStatMonthFuture")))
+        return
+      }
+      callback()
+    },
     formatCount(val) {
       if (val == null || val === "") {
         return this.dash
@@ -397,6 +511,9 @@ export default {
       if (this.queryParams.statYear != null) {
         q.statYear = this.queryParams.statYear
       }
+      if (this.queryParams.statMonth != null) {
+        q.statMonth = this.queryParams.statMonth
+      }
       if (this.queryParams.townDeptId != null) {
         q.townDeptId = this.queryParams.townDeptId
       }
@@ -406,6 +523,7 @@ export default {
       const remarkText = this.form.remark != null ? String(this.form.remark).trim() : ""
       const payload = {
         statYear: this.form.statYear,
+        statMonth: this.form.statMonth,
         townDeptId: this.form.townDeptId,
         remark: remarkText !== "" ? remarkText : undefined
       }
@@ -431,13 +549,17 @@ export default {
     },
     resetQuery() {
       this.queryParams.statYear = undefined
+      this.queryParams.statMonth = undefined
       this.queryParams.townDeptId = undefined
       this.resetForm("queryForm")
       this.handleQuery()
     },
     handleAdd() {
       this.formKey += 1
+      const current = getCurrentYearMonth()
       this.form = createEmptyForm()
+      this.form.statYear = current.statYear
+      this.form.statMonth = current.statMonth
       this.dialogEdit = false
       this.open = true
       this.$nextTick(() => {
@@ -508,7 +630,9 @@ export default {
       this.form = createEmptyForm()
     },
     handleImportOpen() {
-      this.importForm.statYear = this.queryParams.statYear
+      const current = getCurrentYearMonth()
+      this.importForm.statYear = current.statYear
+      this.importForm.statMonth = current.statMonth
       this.importOpen = true
       this.$nextTick(() => {
         this.resetImportFiles()
@@ -522,6 +646,7 @@ export default {
     resetImport() {
       this.importing = false
       this.importForm.statYear = undefined
+      this.importForm.statMonth = undefined
       this.resetImportFiles()
     },
     handleDownloadTemplate() {
@@ -545,7 +670,9 @@ export default {
         })
     },
     handleExportOpen() {
-      this.exportForm.statYear = this.queryParams.statYear
+      const current = getCurrentYearMonth()
+      this.exportForm.statYear = current.statYear
+      this.exportForm.statMonth = current.statMonth
       this.exportOpen = true
       this.$nextTick(() => {
         if (this.$refs.exportFormRef) {
@@ -556,6 +683,7 @@ export default {
     resetExport() {
       this.exporting = false
       this.exportForm.statYear = undefined
+      this.exportForm.statMonth = undefined
     },
     handleExportSubmit() {
       this.$refs.exportFormRef.validate((valid) => {
@@ -563,14 +691,15 @@ export default {
           return
         }
         const statYear = this.exportForm.statYear
-        if (!this.yearOptions.includes(statYear)) {
+        const statMonth = this.exportForm.statMonth
+        if (!this.yearOptions.includes(statYear) || !this.monthOptions.includes(statMonth)) {
           this.$modal.msgError(this.dmT("exportStatYearInvalid"))
           return
         }
-        const filename = `${statYear}年牦牛存栏数据.xlsx`
+        const filename = `${statYear}年${statMonth}月牦牛存栏数据.xlsx`
         this.exporting = true
         this.$modal.loading(this.dmT("exportLoading"))
-        exportYakHerdInventory(statYear)
+        exportYakHerdInventory(statYear, statMonth)
           .then(async (data) => {
             if (blobValidate(data)) {
               saveAs(new Blob([data], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" }), filename)
@@ -609,7 +738,7 @@ export default {
         }
         this.importing = true
         this.$modal.loading(this.dmT("importLoading"))
-        importYakHerdInventory(raw, this.importForm.statYear)
+        importYakHerdInventory(raw, this.importForm.statYear, this.importForm.statMonth)
           .then((res) => {
             this.importOpen = false
             this.showImportResult(res.data || {})

ruoyi-ui/src/views/dataModel/yakOutboundReport/index.vue

@@ -8,6 +8,12 @@
             <el-option v-for="y in yearOptions" :key="y" :label="String(y)" :value="y" />
           </el-select>
         </el-form-item>
+        <el-form-item prop="statMonth">
+          <template slot="label">{{ dmT("queryStatMonth") }}</template>
+          <el-select v-model="queryParams.statMonth" :placeholder="dmCommon('pleaseSelect')" clearable style="width: 120px">
+            <el-option v-for="m in monthOptions" :key="'q-' + m" :label="formatStatMonth(m)" :value="m" />
+          </el-select>
+        </el-form-item>
         <el-form-item prop="townDeptId">
           <template slot="label">{{ dmT("queryTown") }}</template>
           <el-select v-model="queryParams.townDeptId" :placeholder="dmCommon('pleaseSelect')" clearable filterable style="width: 180px">
@@ -53,6 +59,9 @@
           <span>{{ dmT("emptyList") }}</span>
         </template>
         <el-table-column :label="dmT('colStatYear')" prop="statYear" align="center" width="100" />
+        <el-table-column :label="dmT('colStatMonth')" align="center" width="90">
+          <template slot-scope="scope">{{ formatStatMonth(scope.row.statMonth) }}</template>
+        </el-table-column>
         <el-table-column :label="dmT('colTownName')" prop="townName" align="center" min-width="120" :show-overflow-tooltip="true" />
         <el-table-column :label="dmT('colFarmerHouseholdCount')" align="center" width="100">
           <template slot-scope="scope">{{ formatCount(scope.row.farmerHouseholdCount) }}</template>
@@ -87,7 +96,7 @@
       <el-form :key="formKey" ref="form" :model="form" label-width="168px" size="small">
         <div class="yor-section-title">{{ dmT("sectionBasic") }}</div>
         <el-row :gutter="16">
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item prop="statYear" :rules="formRules.statYear">
               <template slot="label">{{ dmT("formStatYear") }}</template>
               <el-select v-model="form.statYear" :placeholder="dmCommon('pleaseSelect')" style="width: 100%">
@@ -95,7 +104,15 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
+            <el-form-item prop="statMonth" :rules="formRules.statMonth">
+              <template slot="label">{{ dmT("formStatMonth") }}</template>
+              <el-select v-model="form.statMonth" :placeholder="dmCommon('pleaseSelect')" style="width: 100%">
+                <el-option v-for="m in monthOptions" :key="'fm-' + m" :label="formatStatMonth(m)" :value="m" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item prop="townDeptId" :rules="formRules.townDeptId">
               <template slot="label">{{ dmT("formTown") }}</template>
               <el-select v-model="form.townDeptId" :placeholder="dmCommon('pleaseSelect')" filterable style="width: 100%">
@@ -180,6 +197,11 @@
               <span>{{ viewRow.statYear || dash }}</span>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item :label="dmT('formStatMonth')">
+              <span>{{ formatStatMonth(viewRow.statMonth) }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item :label="dmT('formTown')">
               <span>{{ viewRow.townName || dash }}</span>
@@ -210,6 +232,12 @@
             <el-option v-for="y in yearOptions" :key="'i-' + y" :label="String(y)" :value="y" />
           </el-select>
         </el-form-item>
+        <el-form-item prop="statMonth" :rules="importRules.statMonth">
+          <template slot="label">{{ dmT("importStatMonth") }}</template>
+          <el-select v-model="importForm.statMonth" :placeholder="dmT('importStatMonthPh')" style="width: 100%">
+            <el-option v-for="m in monthOptions" :key="'im-' + m" :label="formatStatMonth(m)" :value="m" />
+          </el-select>
+        </el-form-item>
         <p class="yor-import-tip">{{ dmT("importTip") }}</p>
         <el-upload
           ref="importUpload"
@@ -240,6 +268,12 @@
             <el-option v-for="y in yearOptions" :key="'e-' + y" :label="String(y)" :value="y" />
           </el-select>
         </el-form-item>
+        <el-form-item prop="statMonth" :rules="exportRules.statMonth">
+          <template slot="label">{{ dmT("exportStatMonth") }}</template>
+          <el-select v-model="exportForm.statMonth" :placeholder="dmT('exportStatMonthPh')" style="width: 100%">
+            <el-option v-for="m in monthOptions" :key="'em-' + m" :label="formatStatMonth(m)" :value="m" />
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" :loading="exporting" @click="handleExportSubmit">{{ dmCommon("ok") }}</el-button>
@@ -258,6 +292,7 @@ import {
   updateYakOutboundReport,
   delYakOutboundReport,
   listYakOutboundReportYearOptions,
+  listYakOutboundReportMonthOptions,
   listYakOutboundReportTownOptions,
   importYakOutboundReport,
   downloadYakOutboundReportTemplate,
@@ -287,10 +322,19 @@ const VIEW_FIELDS = [
   { prop: "selfConsumptionCattleCount", labelKey: "formSelfConsumptionCattleCount" }
 ]
 
+function getCurrentYearMonth() {
+  const now = new Date()
+  return {
+    statYear: now.getFullYear(),
+    statMonth: now.getMonth() + 1
+  }
+}
+
 function createEmptyForm() {
   const form = {
     id: undefined,
     statYear: undefined,
+    statMonth: undefined,
     townDeptId: undefined,
     remark: undefined
   }
@@ -327,18 +371,22 @@ export default {
       total: 0,
       tableList: [],
       yearOptions: [],
+      monthOptions: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
       townOptions: [],
       viewRow: {},
       importForm: {
-        statYear: undefined
+        statYear: undefined,
+        statMonth: undefined
       },
       exportForm: {
-        statYear: undefined
+        statYear: undefined,
+        statMonth: undefined
       },
       queryParams: {
         pageNum: 1,
         pageSize: 20,
         statYear: undefined,
+        statMonth: undefined,
         townDeptId: undefined
       },
       form: createEmptyForm()
@@ -366,22 +414,31 @@ export default {
     formRules() {
       return {
         statYear: [{ required: true, message: this.dmT("ruleStatYearRequired"), trigger: "change" }],
-        townDeptId: [{ required: true, message: this.dmT("ruleTownRequired"), trigger: "change" }],
-        count: [
-          { required: true, message: this.dmT("ruleCountRequired"), trigger: "change" },
-          { validator: this.validateRequiredCount, trigger: "change" }
+        statMonth: [
+          { required: true, message: this.dmT("ruleStatMonthRequired"), trigger: "change" },
+          { validator: this.validateFormStatMonth, trigger: "change" }
         ],
+        townDeptId: [{ required: true, message: this.dmT("ruleTownRequired"), trigger: "change" }],
+        count: [{ validator: this.validateOptionalCount, trigger: "change" }],
         remark: [{ max: 500, message: this.dmCommon("ruleLen500"), trigger: "blur" }]
       }
     },
     importRules() {
       return {
-        statYear: [{ required: true, message: this.dmT("ruleStatYearRequired"), trigger: "change" }]
+        statYear: [{ required: true, message: this.dmT("ruleStatYearRequired"), trigger: "change" }],
+        statMonth: [
+          { required: true, message: this.dmT("ruleStatMonthRequired"), trigger: "change" },
+          { validator: this.validateImportStatMonth, trigger: "change" }
+        ]
       }
     },
     exportRules() {
       return {
-        statYear: [{ required: true, message: this.dmT("exportStatYearRequired"), trigger: "change" }]
+        statYear: [{ required: true, message: this.dmT("exportStatYearRequired"), trigger: "change" }],
+        statMonth: [
+          { required: true, message: this.dmT("exportStatMonthRequired"), trigger: "change" },
+          { validator: this.validateExportStatMonth, trigger: "change" }
+        ]
       }
     }
   },
@@ -394,19 +451,63 @@ export default {
       listYakOutboundReportYearOptions().then((res) => {
         this.yearOptions = Array.isArray(res.data) ? res.data : []
       })
+      listYakOutboundReportMonthOptions().then((res) => {
+        if (Array.isArray(res.data) && res.data.length) {
+          this.monthOptions = res.data
+        }
+      })
       listYakOutboundReportTownOptions().then((res) => {
         this.townOptions = Array.isArray(res.data) ? res.data : []
       })
     },
+    formatStatMonth(month) {
+      if (month == null || month === "") {
+        return this.dash
+      }
+      return this.dmT("statMonthLabel", { month })
+    },
+    isFutureStatPeriod(statYear, statMonth) {
+      if (statYear == null || statMonth == null) {
+        return false
+      }
+      const now = new Date()
+      const currentYear = now.getFullYear()
+      const currentMonth = now.getMonth() + 1
+      if (statYear > currentYear) {
+        return true
+      }
+      return statYear === currentYear && statMonth > currentMonth
+    },
+    validateFormStatMonth(rule, value, callback) {
+      if (this.isFutureStatPeriod(this.form.statYear, value)) {
+        callback(new Error(this.dmT("ruleStatMonthFuture")))
+        return
+      }
+      callback()
+    },
+    validateImportStatMonth(rule, value, callback) {
+      if (this.isFutureStatPeriod(this.importForm.statYear, value)) {
+        callback(new Error(this.dmT("ruleStatMonthFuture")))
+        return
+      }
+      callback()
+    },
+    validateExportStatMonth(rule, value, callback) {
+      if (this.isFutureStatPeriod(this.exportForm.statYear, value)) {
+        callback(new Error(this.dmT("ruleStatMonthFuture")))
+        return
+      }
+      callback()
+    },
     formatCount(val) {
       if (val == null || val === "") {
         return this.dash
       }
       return val
     },
-    validateRequiredCount(rule, value, callback) {
+    validateOptionalCount(rule, value, callback) {
       if (value == null || value === "") {
-        callback(new Error(this.dmT("ruleCountRequired")))
+        callback()
         return
       }
       if (!Number.isInteger(value) || value < 0) {
@@ -423,6 +524,9 @@ export default {
       if (this.queryParams.statYear != null) {
         q.statYear = this.queryParams.statYear
       }
+      if (this.queryParams.statMonth != null) {
+        q.statMonth = this.queryParams.statMonth
+      }
       if (this.queryParams.townDeptId != null) {
         q.townDeptId = this.queryParams.townDeptId
       }
@@ -432,6 +536,7 @@ export default {
       const remarkText = this.form.remark != null ? String(this.form.remark).trim() : ""
       const payload = {
         statYear: this.form.statYear,
+        statMonth: this.form.statMonth,
         townDeptId: this.form.townDeptId,
         remark: remarkText !== "" ? remarkText : undefined
       }
@@ -457,13 +562,17 @@ export default {
     },
     resetQuery() {
       this.queryParams.statYear = undefined
+      this.queryParams.statMonth = undefined
       this.queryParams.townDeptId = undefined
       this.resetForm("queryForm")
       this.handleQuery()
     },
     handleAdd() {
       this.formKey += 1
+      const current = getCurrentYearMonth()
       this.form = createEmptyForm()
+      this.form.statYear = current.statYear
+      this.form.statMonth = current.statMonth
       this.dialogEdit = false
       this.open = true
       this.$nextTick(() => {
@@ -534,7 +643,9 @@ export default {
       this.form = createEmptyForm()
     },
     handleImportOpen() {
-      this.importForm.statYear = this.queryParams.statYear
+      const current = getCurrentYearMonth()
+      this.importForm.statYear = current.statYear
+      this.importForm.statMonth = current.statMonth
       this.importOpen = true
       this.$nextTick(() => {
         this.resetImportFiles()
@@ -548,6 +659,7 @@ export default {
     resetImport() {
       this.importing = false
       this.importForm.statYear = undefined
+      this.importForm.statMonth = undefined
       this.resetImportFiles()
     },
     handleDownloadTemplate() {
@@ -571,7 +683,9 @@ export default {
         })
     },
     handleExportOpen() {
-      this.exportForm.statYear = this.queryParams.statYear
+      const current = getCurrentYearMonth()
+      this.exportForm.statYear = current.statYear
+      this.exportForm.statMonth = current.statMonth
       this.exportOpen = true
       this.$nextTick(() => {
         if (this.$refs.exportFormRef) {
@@ -582,6 +696,7 @@ export default {
     resetExport() {
       this.exporting = false
       this.exportForm.statYear = undefined
+      this.exportForm.statMonth = undefined
     },
     handleExportSubmit() {
       this.$refs.exportFormRef.validate((valid) => {
@@ -589,14 +704,15 @@ export default {
           return
         }
         const statYear = this.exportForm.statYear
-        if (!this.yearOptions.includes(statYear)) {
+        const statMonth = this.exportForm.statMonth
+        if (!this.yearOptions.includes(statYear) || !this.monthOptions.includes(statMonth)) {
           this.$modal.msgError(this.dmT("exportStatYearInvalid"))
           return
         }
-        const filename = `${statYear}年牦牛出栏数据.xlsx`
+        const filename = `${statYear}年${statMonth}月牦牛出栏数据.xlsx`
         this.exporting = true
         this.$modal.loading(this.dmT("exportLoading"))
-        exportYakOutboundReport(statYear)
+        exportYakOutboundReport(statYear, statMonth)
           .then(async (data) => {
             if (blobValidate(data)) {
               saveAs(new Blob([data], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" }), filename)
@@ -635,7 +751,7 @@ export default {
         }
         this.importing = true
         this.$modal.loading(this.dmT("importLoading"))
-        importYakOutboundReport(raw, this.importForm.statYear)
+        importYakOutboundReport(raw, this.importForm.statYear, this.importForm.statMonth)
           .then((res) => {
             this.importOpen = false
             this.showImportResult(res.data || {})

ruoyi-ui/src/views/livestockIndustry/breedingIndustry/index.vue

@@ -42,25 +42,18 @@
     <el-card shadow="never" class="bi-section-card">
       <div slot="header" class="bi-section-header">{{ biT("sectionInventoryChange") }}</div>
       <el-row :gutter="16" class="bi-inventory-stats">
-        <el-col :xs="24" :sm="8">
+        <el-col :xs="24" :sm="12">
           <div class="bi-stat-block">
             <div class="bi-stat-block__value">{{ formatHead(inventoryChange.bullCount) }}</div>
             <div class="bi-stat-block__label">{{ biT("bullCount") }}</div>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="8">
+        <el-col :xs="24" :sm="12">
           <div class="bi-stat-block">
             <div class="bi-stat-block__value">{{ formatHead(inventoryChange.cowCount) }}</div>
             <div class="bi-stat-block__label">{{ biT("cowCount") }}</div>
           </div>
         </el-col>
-        <el-col v-if="inventoryChange.unknownGenderCount > 0" :xs="24" :sm="8">
-          <div class="bi-stat-block bi-stat-block--hint">
-            <div class="bi-stat-block__value bi-stat-block__value--hint">
-              {{ biT("unknownGenderHint", { count: inventoryChange.unknownGenderCount }) }}
-            </div>
-          </div>
-        </el-col>
       </el-row>
       <div class="bi-chart-title">{{ biT("chartInventoryTrend") }}</div>
       <div ref="chartInventory" class="bi-chart-box" />
@@ -126,9 +119,7 @@ import { getBreedingDashboard } from "@/api/livestockIndustry/breedingIndustry"
 
 const CHART_REFS = ["chartInventory", "chartAge", "chartDegradation"]
 
-/** 产业总览：牦牛存栏/出栏固定展示值（不走接口） */
-const YAK_INVENTORY_TOTAL = 238067
-const YAK_ANNUAL_OUTBOUND = 37449
+const AGE_BAND_ORDER = ["COW_U1", "COW_1_3", "COW_3_12", "COW_O12"]
 
 export default {
   name: "BreedingIndustry",
@@ -160,9 +151,8 @@ export default {
     },
     inventoryChange() {
       return (this.dashboardData && this.dashboardData.inventoryChange) || {
-        bullCount: 37466,
-        cowCount: 37449,
-        unknownGenderCount: 0,
+        bullCount: 0,
+        cowCount: 0,
         monthlyTrend: []
       }
     },
@@ -179,11 +169,14 @@ export default {
     degradationTable() {
       return this.grassland.degradationStats || []
     },
-    monthLabels() {
-      return Array.from({ length: 12 }, (_, i) => this.biT("monthLabel", { m: i + 1 }))
-    },
-    currentMonth() {
-      return new Date().getMonth() + 1
+    sortedAgeStructure() {
+      const list = this.ageStructure || []
+      if (!list.length) {
+        return []
+      }
+      const map = new Map(list.map((item) => [item.bandCode, item]))
+      const ordered = AGE_BAND_ORDER.map((code) => map.get(code)).filter(Boolean)
+      return ordered.length ? ordered : list
     }
   },
   mounted() {
@@ -315,19 +308,35 @@ export default {
       this.renderAgeChart()
       this.renderDegradationChart()
     },
-    buildTrendSeries() {
-      const trend = this.inventoryChange.monthlyTrend || []
-      const map = {}
-      trend.forEach((p) => {
-        map[p.month] = p.inventoryCount
+    buildRollingTrendAxis(monthlyTrend) {
+      const rows = [...(monthlyTrend || [])].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
       })
-      return Array.from({ length: 12 }, (_, i) => {
-        const m = i + 1
-        if (m > this.currentMonth) {
-          return null
+      return {
+        rows,
+        categories: rows.map((row) => this.biT("monthLabel", { m: Number(row.month) })),
+        titleAt: (dataIndex) => {
+          const row = rows[dataIndex]
+          if (!row) {
+            return ""
+          }
+          return `${row.statYear}年${Number(row.month)}月`
         }
-        return map[m] != null ? map[m] : null
-      })
+      }
+    },
+    pickTrendCount(row, field) {
+      const val = row?.[field]
+      if (val == null || val === "") {
+        return 0
+      }
+      const n = Number(val)
+      return Number.isNaN(n) ? 0 : n
+    },
+    buildRollingTrendSeries(monthlyTrend, field) {
+      const axis = this.buildRollingTrendAxis(monthlyTrend)
+      return axis.rows.map((row) => this.pickTrendCount(row, field))
     },
     renderInventoryChart() {
       const dom = this.$refs.chartInventory
@@ -335,25 +344,58 @@ export default {
       if (!chart) {
         return
       }
-      const seriesData = this.buildTrendSeries()
-      const hasPoints = seriesData.some((v) => v != null)
+      const trend = this.inventoryChange.monthlyTrend || []
+      if (!trend.length) {
+        chart.setOption(
+          {
+            graphic: [
+              {
+                type: "text",
+                left: "center",
+                top: "middle",
+                style: {
+                  text: this.biT("emptyChart"),
+                  fill: "#909399",
+                  fontSize: 14
+                }
+              }
+            ]
+          },
+          true
+        )
+        this.charts.inventory = chart
+        return
+      }
+      const axis = this.buildRollingTrendAxis(trend)
+      const bullData = this.buildRollingTrendSeries(trend, "bullCount")
+      const cowData = this.buildRollingTrendSeries(trend, "cowCount")
+      const hasPoints = bullData.some((v) => v > 0) || cowData.some((v) => v > 0)
       chart.setOption(
         {
           tooltip: {
             trigger: "axis",
             formatter: (params) => {
-              const p = params.find((x) => x.value != null)
-              if (!p) {
+              if (!Array.isArray(params) || !params.length) {
                 return ""
               }
-              return `${p.name}<br/>${p.seriesName}: ${p.value} ${this.biCommon("unitHead")}`
+              const title = axis.titleAt(params[0].dataIndex)
+              const lines = params.map(
+                (p) => `${p.marker}${p.seriesName}: ${p.value ?? 0} ${this.biCommon("unitHead")}`
+              )
+              return `${title}<br/>${lines.join("<br/>")}`
             }
           },
-          grid: { left: "3%", right: "4%", bottom: "3%", top: 32, containLabel: true },
+          legend: {
+            top: 0,
+            right: 8,
+            data: [this.biT("seriesBullCount"), this.biT("seriesCowCount")]
+          },
+          grid: { left: "3%", right: "4%", bottom: "3%", top: 40, containLabel: true },
           xAxis: {
             type: "category",
             boundaryGap: false,
-            data: this.monthLabels
+            data: axis.categories,
+            axisLabel: { interval: 0, fontSize: 10 }
           },
           yAxis: {
             type: "value",
@@ -362,11 +404,20 @@ export default {
           },
           series: [
             {
-              name: this.biT("seriesInventoryCount"),
+              name: this.biT("seriesBullCount"),
+              type: "line",
+              smooth: true,
+              symbol: "circle",
+              symbolSize: 4,
+              data: bullData
+            },
+            {
+              name: this.biT("seriesCowCount"),
               type: "line",
               smooth: true,
-              connectNulls: false,
-              data: seriesData
+              symbol: "circle",
+              symbolSize: 4,
+              data: cowData
             }
           ],
           graphic: hasPoints
@@ -394,7 +445,7 @@ export default {
       if (!chart) {
         return
       }
-      const list = this.ageStructure
+      const list = this.sortedAgeStructure
       const pieData = list.map((item) => ({
         name: item.bandLabel,
         value: item.count