Merge branch 'blockingData' into dev

src/utils/dict.js

@@ -14,7 +14,7 @@ export function useDict(...args) {
         res.value[dictType] = dicts
       } else {
         getDicts(dictType).then(resp => {
-          res.value[dictType] = resp.data.map(p => ({ label: p.dictLabel, value: p.dictValue, elTagType: p.listClass, elTagClass: p.cssClass }))
+          res.value[dictType] = resp.data.map(p => ({ label: p.dictLabel, value: p.dictValue, elTagType: p.listClass, elTagClass: p.cssClass, remark: p.remark }))
           useDictStore().setDict(dictType, res.value[dictType])
         })
       }

src/utils/index.js

@@ -5,12 +5,12 @@ import { parseTime } from './ruoyi'
  */
 export function formatDate(cellValue) {
   if (cellValue == null || cellValue == "") return ""
-  var date = new Date(cellValue) 
+  var date = new Date(cellValue)
   var year = date.getFullYear()
   var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
-  var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() 
-  var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours() 
-  var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes() 
+  var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+  var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+  var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
   var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
   return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
 }
@@ -218,7 +218,7 @@ export function getTime(type) {
 export function debounce(func, wait, immediate) {
   let timeout, args, context, timestamp, result
 
-  const later = function() {
+  const later = function () {
     // 据上一次触发时间间隔
     const last = +new Date() - timestamp
 
@@ -235,7 +235,7 @@ export function debounce(func, wait, immediate) {
     }
   }
 
-  return function(...args) {
+  return function (...args) {
     context = this
     timestamp = +new Date()
     const callNow = immediate && !timeout
@@ -330,7 +330,7 @@ export function makeMap(str, expectsLowerCase) {
     ? val => map[val.toLowerCase()]
     : val => map[val]
 }
- 
+
 export const exportDefault = 'export default '
 
 export const beautifierConf = {
@@ -387,4 +387,12 @@ export function camelCase(str) {
 export function isNumberStr(str) {
   return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
 }
- 
+export function formatDateHy(dateString) {
+  if (!dateString) return ''
+  const date = new Date(dateString)
+  const year = date.getFullYear()
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const day = String(date.getDate()).padStart(2, '0')
+  return `${year}-${month}-${day}`
+}
+

src/views/blockingData/blockingDataScreen/components/ModuleOne.vue

@@ -7,7 +7,10 @@
           <div class="stat-card-inner">
             <div class="stat-left">
               <div class="stat-label">查堵总数（所有大队）</div>
-              <div class="stat-value">2327</div>
+              <div class="stat-content">
+                <div class="stat-value">{{ totalBlockedCount }}</div>
+                <div class="stat-unit">起</div>
+              </div>
             </div>
             <div class="stat-right">
               <div class="stat-title">查堵总数</div>
@@ -19,7 +22,10 @@
           <div class="stat-card-inner">
             <div class="stat-left">
               <div class="stat-label">总查堵万分率</div>
-              <div class="stat-value">2.22</div>
+              <div class="stat-content">
+                <div class="stat-value">{{ totalBlockedRate }}</div>
+                <div class="stat-unit">‱</div>
+              </div>
             </div>
             <div class="stat-right">
               <div class="stat-title">总查堵万分率</div>
@@ -28,7 +34,7 @@
           </div>
         </div>
       </div>
-      
+
       <!-- 第一行：每日查堵数量 -->
       <div class="chart-row">
         <div class="chart-item">
@@ -40,7 +46,7 @@
           <div ref="chart2" class="echarts"></div>
         </div>
       </div>
-      
+
       <!-- 第二行：每日查堵万分率 -->
       <div class="chart-row">
         <div class="chart-item">
@@ -52,7 +58,7 @@
           <div ref="chart4" class="echarts"></div>
         </div>
       </div>
-      
+
       <!-- 第三行：每日过检图像数 -->
       <div class="chart-row">
         <div class="chart-item">
@@ -64,7 +70,7 @@
           <div ref="chart6" class="echarts"></div>
         </div>
       </div>
-      
+
       <!-- 第四行：查堵物品分布和区域查堵数量分布 -->
       <div class="chart-row">
         <div class="chart-item">
@@ -76,7 +82,7 @@
           <div ref="chart8" class="echarts"></div>
         </div>
       </div>
-      
+
       <!-- 第五行：查堵类型分布 -->
       <div class="chart-row full-width">
         <div class="chart-item">
@@ -84,7 +90,7 @@
           <div ref="chart9" class="echarts"></div>
         </div>
       </div>
-      
+
       <!-- 第六行：查堵时间段过检行李数及万分率 -->
       <div class="chart-row full-width">
         <div class="chart-item">
@@ -92,7 +98,7 @@
           <div ref="chart10" class="echarts"></div>
         </div>
       </div>
-      
+
       <!-- 第七行：每日过检行李数及万分率 -->
       <div class="chart-row full-width">
         <div class="chart-item">
@@ -100,7 +106,7 @@
           <div ref="chart11" class="echarts"></div>
         </div>
       </div>
-      
+
       <!-- 第八行：查堵-AI复查图像总数 -->
       <div class="chart-row full-width">
         <div class="chart-item">
@@ -108,7 +114,7 @@
           <div ref="chart12" class="echarts"></div>
         </div>
       </div>
-      
+
       <!-- 第九行：AI漏判和误判图像总数 -->
       <div class="chart-row">
         <div class="chart-item">
@@ -125,10 +131,31 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, watch } from 'vue'
 import * as echarts from 'echarts'
+import { formatDateHy } from '@/utils/index.js'
 import ModuleContainer from './ModuleContainer.vue'
 import { useEcharts } from '@/hooks/chart.js'
+import {
+  totalCount,
+  brigadeChart,
+  totalRate,
+  brigadeRateChart,
+  dailyTrend,
+  dailyBrigadeComparison,
+  dailyRateTrend,
+  dailyBrigadeRateComparison,
+  dailyLuggageTrend,
+  dailyBrigadeLuggageComparison,
+  itemDistribution,
+  areaDistribution,
+  discriminationDistribution,
+  timePeriodStats,
+  dailyLuggageAndRate,
+  aiImageStats,
+  aiMissImageStats,
+  aiErrorImageStats
+} from '@/api/blockingData/blockingDataScreen.js'
 
 // 接收筛选参数
 const props = defineProps({
@@ -137,6 +164,28 @@ const props = defineProps({
     default: () => ({})
   }
 })
+const totalBlockedCount = ref(0)
+const totalBlockedRate = ref(0)
+// 处理filterParams，将dateRange拆分为startTime和endTime
+const processFilterParams = (params) => {
+  const { dateRange, ...rest } = params
+  const processed = { ...rest }
+
+  if (dateRange && Array.isArray(dateRange) && dateRange.length === 2) {
+    processed.startTime = formatDateHy(dateRange[0])
+    processed.endTime = formatDateHy(dateRange[1])
+  }
+  if (processed.brigadeId == 'all') {
+    delete processed.brigadeId
+  }
+  if (processed.terminalId == 'all') {
+    delete processed.terminalId
+  }
+
+  return processed
+}
+
+
 
 // 图表引用
 const chart0a = ref(null)
@@ -174,50 +223,282 @@ const { setOption: setOption12 } = useEcharts(chart12)
 const { setOption: setOption13 } = useEcharts(chart13)
 const { setOption: setOption14 } = useEcharts(chart14)
 
-// 生成模拟数据
-const generateData = (count, min, max) => {
-  const data = []
-  for (let i = 0; i < count; i++) {
-    data.push(Math.floor(Math.random() * (max - min + 1)) + min)
+// 加载所有数据
+const loadData = async () => {
+  const queryParams = processFilterParams(props.filterParams)
+
+  try {
+    // 统计卡片数据
+    const [totalCountRes, totalRateRes] = await Promise.allSettled([
+      totalCount(queryParams),
+      totalRate(queryParams)
+    ])
+
+    totalBlockedCount.value = totalCountRes.value?.data?.totalBlockedCount || 0
+    totalBlockedRate.value = totalRateRes.value?.data?.totalBlockedRate || 0
+
+
+    const [brigadeChartRes, brigadeRateRes] = await Promise.allSettled([
+      brigadeChart(queryParams),
+      brigadeRateChart(queryParams)
+    ])
+
+    const brigadeChartData = brigadeChartRes.value?.data || []
+    const brigadeRateData = brigadeRateRes.value?.data || []
+
+    const chart0aOption = {
+      grid: {
+        left: '5%',
+        top: '5%',
+        right: '5%',
+        bottom: '5%',
+        containLabel: true
+      },
+      xAxis: {
+        type: 'category',
+        data: brigadeChartData.map(d => d.brigadeName),
+        show: true,
+        axisLine: { lineStyle: { color: '#999' } },
+        axisLabel: { fontSize: 10, color: '#666' }
+      },
+      yAxis: {
+        type: 'value',
+        show: true,
+        axisLine: { lineStyle: { color: '#999' } },
+        axisLabel: { fontSize: 10, color: '#666' }
+      },
+      series: [{
+        type: 'bar',
+        data: brigadeChartData.map(d => d.totalBlockedCount),
+        itemStyle: { color: '#3b82f6' },
+        barWidth: 12,
+        label: {
+          show: true,
+          position: 'top',
+          fontSize: 10
+        }
+      }]
+    }
+
+    const chart0bOption = {
+      grid: {
+        left: '5%',
+        top: '5%',
+        right: '5%',
+        bottom: '5%',
+        containLabel: true
+      },
+      xAxis: {
+        type: 'value',
+        show: true,
+        axisLine: { lineStyle: { color: '#999' } },
+        axisLabel: { fontSize: 10, color: '#666' }
+      },
+      yAxis: {
+        type: 'category',
+        data: brigadeRateData.map(d => d.brigadeName),
+        show: true,
+        axisLine: { lineStyle: { color: '#999' } },
+        axisLabel: { fontSize: 10, color: '#666' }
+      },
+      series: [{
+        type: 'bar',
+        data: brigadeRateData.map(d => d.avgBlockedRate),
+        itemStyle: { color: '#3b82f6' },
+        barWidth: 8,
+        label: {
+          show: true,
+          position: 'right',
+          fontSize: 10
+        }
+      }]
+    }
+
+    setOption0a(chart0aOption)
+    setOption0b(chart0bOption)
+
+    // 每日查堵数量
+    const [dailyTrendRes, dailyBrigadeRes] = await Promise.allSettled([
+      dailyTrend(queryParams),
+      dailyBrigadeComparison(queryParams)
+    ])
+    console.log(dailyTrendRes, dailyBrigadeRes, 1)
+
+    const trendData = dailyTrendRes?.value?.data || []
+    const brigadeData = dailyBrigadeRes?.value?.data || []
+
+    setOption1(lineChartOption(
+      trendData.map(d => d.totalBlockedCount),
+      '#3b82f6',
+      '查堵数量',
+      trendData.map(d => d.statDate ? d.statDate.split('T')[0] : '')
+    ))
+
+    const uniqueBrigades = [...new Set(brigadeData.map(d => d.brigadeName))]
+    const allDates = [...new Set(brigadeData.map(d => d.statDate ? d.statDate.split('T')[0] : ''))].sort()
+    const brigadeDatasets = uniqueBrigades.map(brigadeName => {
+      return allDates.map(date => {
+        const found = brigadeData.find(d =>
+          d.brigadeName === brigadeName && d.statDate && d.statDate.split('T')[0] === date
+        )
+        return found ? found.totalBlockedCount : 0
+      })
+    })
+
+    setOption2(multiLineChartOption(
+      brigadeDatasets,
+      ['#3b82f6', '#22c55e', '#f97316'],
+      uniqueBrigades,
+      allDates
+    ))
+
+    // 每日查堵万分率
+    const [dailyRateTrendRes, dailyBrigadeRateRes] = await Promise.allSettled([
+      dailyRateTrend(queryParams),
+      dailyBrigadeRateComparison(queryParams)
+    ])
+    console.log(dailyRateTrendRes, dailyBrigadeRateRes, 3)
+    const rateTrendData = dailyRateTrendRes?.value?.data || []
+    const rateBrigadeData = dailyBrigadeRateRes?.value?.data || []
+
+    setOption3(lineChartOption(
+      rateTrendData.map(d => d.avgBlockedRate),
+      '#ec4899',
+      '万分率',
+      rateTrendData.map(d => d.statDate ? d.statDate.split('T')[0] : '')
+    ))
+
+    const rateAllDates = [...new Set(rateBrigadeData.map(d => d.statDate ? d.statDate.split('T')[0] : ''))].sort()
+    const rateUniqueBrigades = [...new Set(rateBrigadeData.map(d => d.brigadeName))]
+    const rateBrigadeDatasets = rateUniqueBrigades.map(brigadeName => {
+      return rateAllDates.map(date => {
+        const found = rateBrigadeData.find(d =>
+          d.brigadeName === brigadeName && d.statDate && d.statDate.split('T')[0] === date
+        )
+        return found ? found.avgBlockedRate : 0
+      })
+    })
+
+    setOption4(multiLineChartOption(
+      rateBrigadeDatasets,
+      ['#3b82f6', '#22c55e', '#f97316'],
+      rateUniqueBrigades,
+      rateAllDates
+    ))
+
+    // 每日过检图像数
+    const [dailyLuggageTrendRes, dailyBrigadeLuggageRes] = await Promise.allSettled([
+      dailyLuggageTrend(queryParams),
+      dailyBrigadeLuggageComparison(queryParams)
+    ])
+
+    const luggageTrendData = dailyLuggageTrendRes?.value?.data || []
+    const luggageBrigadeData = dailyBrigadeLuggageRes?.value?.data || []
+    console.log(luggageTrendData, luggageBrigadeData, 555)
+    if (luggageTrendData.length > 0) {
+      setOption5(lineChartOption(
+        luggageTrendData.map(d => d.totalLuggageCount),
+        '#8b5cf6',
+        '过检图像数',
+        luggageTrendData.map(d => d.statDate ? d.statDate.split('T')[0] : '')
+      ))
+    }
+
+
+    const luggageAllDates = [...new Set(luggageBrigadeData.map(d => d.statDate ? d.statDate.split('T')[0] : ''))].sort()
+    const luggageUniqueBrigades = [...new Set(luggageBrigadeData.map(d => d.brigadeName))]
+    const luggageBrigadeDatasets = luggageUniqueBrigades.map(brigadeName => {
+      return luggageAllDates.map(date => {
+        const found = luggageBrigadeData.find(d =>
+          d.brigadeName === brigadeName && d.statDate && d.statDate.split('T')[0] === date
+        )
+        return found ? found.totalLuggageCount : 0
+      })
+    })
+    if (luggageBrigadeDatasets.length > 0) {
+      setOption6(multiLineChartOption(
+        luggageBrigadeDatasets,
+        ['#3b82f6', '#22c55e', '#f97316'],
+        luggageUniqueBrigades,
+        luggageAllDates
+      ))
+    }
+
+    // 查堵物品分布和区域查堵数量分布
+    const [itemDistRes, areaDistRes] = await Promise.allSettled([
+      itemDistribution(queryParams),
+      areaDistribution(queryParams)
+    ])
+    console.log(itemDistRes, areaDistRes, 55555)
+    const itemDistData = itemDistRes?.value?.data || []
+    if (itemDistData.length > 0) {
+      setOption7(ringPieOption(
+        itemDistData.map(d => ({ name: d.name, value: d.value })),
+        ['#3b82f6', '#22c55e', '#f97316', '#ec4899', '#8b5cf6', '#14b8a6']
+      ))
+    }
+
+
+    const areaDistData = areaDistRes?.value?.data || []
+    if (areaDistData.length > 0) {
+      setOption8(ringPieOption(
+        areaDistData.map(d => ({ name: d.name, value: d.value })),
+        ['#3b82f6', '#22c55e', '#f97316', '#ec4899', '#8b5cf6', '#14b8a6']
+      ))
+    }
+
+
+    // 查堵类型分布
+    const discDistRes = await discriminationDistribution(queryParams)
+    const discDistData = discDistRes.data || []
+    setOption9(barChartOption(discDistData, '#3b82f6'))
+
+    // 查堵时间段过检行李数及万分率
+    const timePeriodRes = await timePeriodStats(queryParams)
+    const timePeriodData = timePeriodRes.data || []
+    setOption10(dualAxisBarChartOption(
+      timePeriodData.map(d => d.luggageCount),
+      timePeriodData.map(d => d.rate),
+      '#3b82f6',
+      '#ec4899'
+    ))
+
+    // 每日过检行李数及万分率
+    const dailyLuggageRes = await dailyLuggageAndRate(queryParams)
+    const dailyLuggageData = dailyLuggageRes.data || []
+    setOption11(dualAxisBarChartOption(
+      dailyLuggageData.map(d => d.luggageCount),
+      dailyLuggageData.map(d => d.rate),
+      '#3b82f6',
+      '#ec4899'
+    ))
+
+    // AI复查图像总数
+    const aiImageRes = await aiImageStats(queryParams)
+    const aiImageData = aiImageRes.data || []
+    setOption12(lineChartOption(aiImageData.map(d => d.value), '#14b8a6', 'AI复查图像数'))
+
+    // AI漏判和误判图像总数
+    const [aiMissRes, aiErrorRes] = await Promise.all([
+      aiMissImageStats(queryParams),
+      aiErrorImageStats(queryParams)
+    ])
+
+    const aiMissData = aiMissRes.data || []
+    const aiErrorData = aiErrorRes.data || []
+
+    setOption13(lineChartOption(aiMissData.map(d => d.value), '#ef4444', 'AI漏判图像数'))
+    setOption14(lineChartOption(aiErrorData.map(d => d.value), '#f97316', 'AI误判图像数'))
+
+  } catch (error) {
+    console.error('加载数据失败:', error)
   }
-  return data
 }
 
-// X轴数据（30天）
-const xAxisData = []
-for (let i = 1; i <= 30; i++) {
-  xAxisData.push(i + '日')
-}
 
-// 小型柱状图配置（用于统计卡片）
-const smallBarOption = (data, color, isHorizontal = false) => ({
-  grid: {
-    left: '5%',
-    top: '5%',
-    right: '5%',
-    bottom: '5%',
-    containLabel: true
-  },
-  xAxis: {
-    type: isHorizontal ? 'value' : 'category',
-    data: isHorizontal ? null : ['1', '2', '3'],
-    show: false
-  },
-  yAxis: {
-    type: isHorizontal ? 'category' : 'value',
-    data: isHorizontal ? ['1', '2', '3'] : null,
-    show: false
-  },
-  series: [{
-    type: 'bar',
-    data: data,
-    itemStyle: { color: color },
-    barWidth: isHorizontal ? 8 : 12
-  }]
-})
 
 // 折线图配置（总表）
-const lineChartOption = (data, color, title) => ({
+const lineChartOption = (data, color, title, xAxisData = []) => ({
   grid: {
     left: '10%',
     top: '15%',
@@ -229,7 +510,7 @@ const lineChartOption = (data, color, title) => ({
     type: 'category',
     data: xAxisData,
     axisLine: { lineStyle: { color: '#999' } },
-    axisLabel: { fontSize: 10, color: '#666' }
+    axisLabel: { fontSize: 10, color: '#666', rotate: 0 }
   },
   yAxis: {
     type: 'value',
@@ -250,7 +531,7 @@ const lineChartOption = (data, color, title) => ({
 })
 
 // 多折线图配置（大队对比）
-const multiLineChartOption = (dataList, colors, legends) => ({
+const multiLineChartOption = (dataList, colors, legends, xAxisData = []) => ({
   grid: {
     left: '10%',
     top: '15%',
@@ -262,7 +543,7 @@ const multiLineChartOption = (dataList, colors, legends) => ({
     type: 'category',
     data: xAxisData,
     axisLine: { lineStyle: { color: '#999' } },
-    axisLabel: { fontSize: 10, color: '#666' }
+    axisLabel: { fontSize: 10, color: '#666', rotate: 0 }
   },
   yAxis: {
     type: 'value',
@@ -349,7 +630,7 @@ const dualAxisBarChartOption = (data1, data2, color1, color2) => ({
   },
   xAxis: {
     type: 'category',
-    data: xAxisData,
+    data: [],
     axisLine: { lineStyle: { color: '#999' } },
     axisLabel: { fontSize: 10, color: '#666' }
   },
@@ -387,76 +668,15 @@ const dualAxisBarChartOption = (data1, data2, color1, color2) => ({
   ]
 })
 
+
+
+// 监听filterParams变化
+watch(() => props.filterParams, () => {
+  loadData()
+}, { deep: true })
+
 onMounted(() => {
-  // 统计卡片图表
-  setOption0a(smallBarOption([120, 80, 150], '#3b82f6'))
-  setOption0b(smallBarOption([2.2, 1.8, 2.5], '#3b82f6', true))
-  
-  // 第一行：每日查堵数量
-  setOption1(lineChartOption(generateData(30, 50, 150), '#3b82f6', '查堵数量'))
-  setOption2(multiLineChartOption(
-    [generateData(30, 20, 80), generateData(30, 15, 70), generateData(30, 10, 60)],
-    ['#3b82f6', '#22c55e', '#f97316'],
-    ['安检一大队', '安检二大队', '安检三大队']
-  ))
-  
-  // 第二行：每日查堵万分率
-  setOption3(lineChartOption(generateData(30, 0.5, 3.5), '#ec4899', '万分率'))
-  setOption4(multiLineChartOption(
-    [generateData(30, 0.3, 2.5), generateData(30, 0.2, 2.0), generateData(30, 0.1, 1.8)],
-    ['#3b82f6', '#22c55e', '#f97316'],
-    ['安检一大队', '安检二大队', '安检三大队']
-  ))
-  
-  // 第三行：每日过检图像数
-  setOption5(lineChartOption(generateData(30, 1000, 5000), '#8b5cf6', '过检图像数'))
-  setOption6(multiLineChartOption(
-    [generateData(30, 400, 2000), generateData(30, 300, 1800), generateData(30, 200, 1600)],
-    ['#3b82f6', '#22c55e', '#f97316'],
-    ['安检一大队', '安检二大队', '安检三大队']
-  ))
-  
-  // 第四行：查堵物品分布和区域查堵数量分布
-  setOption7(ringPieOption([
-    { name: '刀具', value: 25 },
-    { name: '液体', value: 20 },
-    { name: '电子产品', value: 18 },
-    { name: '其他', value: 15 },
-    { name: '打火机', value: 12 },
-    { name: '化妆品', value: 10 }
-  ], ['#3b82f6', '#22c55e', '#f97316', '#ec4899', '#8b5cf6', '#14b8a6']))
-  
-  setOption8(barChartOption([
-    { name: 'T1国内', value: 120 },
-    { name: 'T1国际', value: 80 },
-    { name: 'T2国内', value: 150 },
-    { name: 'T2国际', value: 60 },
-    { name: '中转区', value: 40 }
-  ], '#3b82f6', true))
-  
-  // 第五行：查堵类型分布
-  setOption9(barChartOption(generateData(6, 20, 100), '#3b82f6'))
-  
-  // 第六行：查堵时间段过检行李数及万分率
-  setOption10(dualAxisBarChartOption(
-    generateData(24, 100, 500), // 行李数
-    generateData(24, 0.5, 3.0), // 万分率
-    '#3b82f6', '#ec4899'
-  ))
-  
-  // 第七行：每日过检行李数及万分率
-  setOption11(dualAxisBarChartOption(
-    generateData(30, 1000, 5000), // 行李数
-    generateData(30, 0.5, 3.5),  // 万分率
-    '#3b82f6', '#ec4899'
-  ))
-  
-  // 第八行：查堵-AI复查图像总数
-  setOption12(lineChartOption(generateData(30, 50, 200), '#14b8a6', 'AI复查图像数'))
-  
-  // 第九行：AI漏判和误判图像总数
-  setOption13(lineChartOption(generateData(30, 5, 30), '#ef4444', 'AI漏判图像数'))
-  setOption14(lineChartOption(generateData(30, 3, 25), '#f97316', 'AI误判图像数'))
+  loadData()
 })
 </script>
 
@@ -467,7 +687,7 @@ onMounted(() => {
   flex-direction: column;
   gap: 10px;
   overflow-y: auto;
-  
+
 }
 
 .stats-row {
@@ -478,11 +698,8 @@ onMounted(() => {
 
 .stat-card {
   flex: 1;
-  background: #fff;
-  border-radius: 6px;
-  padding: 15px;
-  border: 1px solid #eee;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+
+
   min-height: 120px;
 }
 
@@ -490,47 +707,76 @@ onMounted(() => {
   display: flex;
   height: 100%;
   align-items: center;
+  gap: 10px;
+
 }
 
 .stat-left {
+  background: #fff;
+  border-radius: 6px;
+  border: 1px solid #eee;
+  padding: 15px;
+  height: 100%;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
   flex: 1;
   display: flex;
+  align-items: center;
   flex-direction: column;
-  align-items: flex-start;
+
   padding-right: 15px;
 }
 
 .stat-label {
-  font-size: 12px;
-  color: #666;
+  width: 100%;
+  font-size: 17px;
+  color: black;
   margin-bottom: 8px;
 }
 
+.stat-content {
+  margin-top: 15%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
 .stat-value {
+  font-size: 80px;
+  font-weight: bold;
+  color: #3b82f6;
+
+}
+
+.stat-unit {
   font-size: 24px;
   font-weight: bold;
   color: #3b82f6;
 }
 
 .stat-right {
+  background: #fff;
+  border-radius: 6px;
+  border: 1px solid #eee;
+  padding: 15px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
   flex: 1;
   display: flex;
   flex-direction: column;
-  align-items: flex-end;
+  align-items: flex-start;
   height: 100%;
 }
 
 .stat-title {
-  font-size: 12px;
-  color: #333;
+  font-size: 17px;
+  color: black;
   margin-bottom: 5px;
   font-weight: 500;
 }
 
 .echarts-small {
   width: 100%;
-  height: 60px;
-  min-height: 60px;
+  height: 300px;
+  min-height: 300px;
 }
 
 .chart-row {

src/views/blockingData/blockingDataScreen/index.vue

@@ -28,23 +28,19 @@
         </div>
         <div class="filter-item">
           <span class="filter-label">航站楼：</span>
-          <el-select v-model="filterParams.terminal" placeholder="请选择区域" clearable style="width: 200px">
+          <el-select v-model="filterParams.terminalId" placeholder="请选择区域" clearable style="width: 200px"
+            @change="terminalChange">
             <el-option v-for="item in terminalOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </div>
 
         <div class="filter-item">
           <span class="filter-label">漏检物品：</span>
-          <el-tree-select
-            v-model="filterParams.missCheckItem"
-            :data="missedItemOptions"
-            :props="{ value: 'id', label: 'name', children: 'children' }"
-            value-key="id"
-            placeholder="请选择漏检物品"
-            check-strictly
-            style="width: 200px"
-          />
+          <el-tree-select v-model="filterParams.missCheckItem" :data="missedItemOptions"
+            :props="{ value: 'id', label: 'name', children: 'children', disabled: data => data.children && data.children.length > 0 }"
+            value-key="id" placeholder="请选择漏检物品" check-strictly style="width: 200px" />
         </div>
+
         <div class="filter-item">
           <span class="filter-label">分大队：</span>
           <el-select v-model="filterParams.brigadeId" placeholder="请选择大队" clearable style="width: 200px">
@@ -116,8 +112,9 @@ const filterParams = reactive({
   supervisorId: '',
   teamLeaderId: '',
   terminal: '',
+  terminalId: '',
   missCheckItem: '',
-  brigadeId: '全站'
+  brigadeId: 'all'
 })
 
 // 选项数据
@@ -133,16 +130,19 @@ function getMissedItemOptions() {
     missedItemOptions.value = handleTree(response.data, "id", "parentId")
   })
 }
+const terminalChange = (value) => {
+  filterParams.terminal = terminalOptions.value.find(item => item.value === value).label
+}
 
 // 树形数据处理函数
 function handleTree(data, id, parentId) {
   const result = []
   const map = {}
-  
+
   data.forEach(item => {
     map[item[id]] = { ...item, children: [] }
   })
-  
+
   data.forEach(item => {
     const parent = map[item[parentId]]
     if (parent) {
@@ -151,7 +151,7 @@ function handleTree(data, id, parentId) {
       result.push(map[item[id]])
     }
   })
-  
+
   return result
 }
 
@@ -163,7 +163,7 @@ function getTerminalOptions() {
       label: item.name
     }))
     // 添加"整体"选项到最前面
-    terminalOptions.value.unshift({ label: '整体', value: null })
+    terminalOptions.value.unshift({ label: '整体', value: 'all' })
   })
 }
 function getTeamLeaderOptions() {
@@ -195,21 +195,33 @@ function getBrigadeOptions() {
       label: item.deptName
     }))
     // 添加"全站"选项到最前面
-    brigadeOptions.value.unshift({ label: '全站', value: null })
+    brigadeOptions.value.unshift({ label: '全站', value: 'all' })
   })
 }
 const setDefaultDateRange = () => {
   const now = new Date()
-  const startOfYear = new Date(now.getFullYear(), 0, 1, 0, 0, 0)
+  const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1)
   const endOfToday = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59)
 
-  filterParams.dateRange = [startOfYear, endOfToday]
+  // 格式化日期为 YYYY-MM-DD HH:mm:ss 格式
+  const formatDate = (date) => {
+    const year = date.getFullYear()
+    const month = String(date.getMonth() + 1).padStart(2, '0')
+    const day = String(date.getDate()).padStart(2, '0')
+    const hours = String(date.getHours()).padStart(2, '0')
+    const minutes = String(date.getMinutes()).padStart(2, '0')
+    const seconds = String(date.getSeconds()).padStart(2, '0')
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+  }
+
+  filterParams.dateRange = [formatDate(startOfMonth), formatDate(endOfToday)]
 }
 
 // 处理筛选
 const handleFilter = () => {
   console.log('筛选参数:', filterParams)
-  // 这里可以调用API或更新图表数据
+  // 强制触发响应式更新，确保子组件能监听到变化
+  filterParams.dateRange = [...filterParams.dateRange]
 }
 
 // 重置筛选
@@ -220,7 +232,8 @@ const resetFilter = () => {
     teamLeaderId: '',
     terminal: '',
     missCheckItem: '',
-    brigadeId: '全站'
+    terminalId: '',
+    brigadeId: 'all'
   })
   setDefaultDateRange()
 }

src/views/blockingData/dailyLuggageCheckInList/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"> <el-form-item label="大队"
         prop="brigadeId">
-        <el-select v-model="queryParams.brigadeId" placeholder="请选择大队" clearable style="width: 200px">
+        <el-select v-model="queryParams.brigadeId" placeholder="请选择大队" filterable clearable style="width: 200px">
           <el-option v-for="item in brigadeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
@@ -94,16 +94,15 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="班次" prop="shiftType">
-              <el-select v-model="form.shiftType" placeholder="请选择班次" style="width: 100%">
+              <el-select v-model="form.shiftType" placeholder="请选择班次" filterable style="width: 100%">
                 <el-option label="早班" value="早班" />
-                <el-option label="中班" value="中班" />
                 <el-option label="晚班" value="晚班" />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-form-item label="当班大队" prop="brigadeId">
-          <el-select v-model="form.brigadeId" placeholder="请选择当班大队" style="width: 100%">
+          <el-select v-model="form.brigadeId" placeholder="请选择当班大队" filterable style="width: 100%">
             <el-option v-for="item in brigadeOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>

src/views/blockingData/dailyLuggageInspectionScheduleByTime/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
       <el-form-item label="大队" prop="brigadeId">
-        <el-select v-model="queryParams.brigadeId" placeholder="请选择大队" clearable style="width: 200px">
+        <el-select v-model="queryParams.brigadeId" placeholder="请选择大队" filterable clearable style="width: 200px">
           <el-option v-for="item in brigadeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
@@ -78,7 +78,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="当班大队" prop="brigadeId">
-              <el-select v-model="form.brigadeId" placeholder="请选择当班大队" style="width: 100%">
+              <el-select v-model="form.brigadeId" placeholder="请选择当班大队" filterable style="width: 100%">
                 <el-option v-for="item in brigadeOptions" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -87,7 +87,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="时间段" prop="timePeriod">
-              <el-select v-model="form.timePeriod" placeholder="请选择时间段" style="width: 100%">
+              <el-select v-model="form.timePeriod" placeholder="请选择时间段" filterable style="width: 100%">
                 <el-option v-for="dict in blocked_time_period" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>

src/views/blockingData/missedInspectionList/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
       <el-form-item label="大队" prop="brigadeId">
-        <el-select v-model="queryParams.brigadeId" placeholder="请选择大队" clearable style="width: 200px">
+        <el-select v-model="queryParams.brigadeId" placeholder="请选择大队" filterable clearable style="width: 200px">
           <el-option v-for="item in brigadeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
@@ -12,22 +12,23 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="被回查人" prop="reviewedUserId">
-        <el-select v-model="queryParams.reviewedUserId" placeholder="请选择被回查人" clearable style="width: 200px">
+        <el-select v-model="queryParams.reviewedUserId" placeholder="请选择被回查人" filterable clearable style="width: 200px">
           <el-option v-for="item in personOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="分管班组长" prop="teamLeaderId">
-        <el-select v-model="queryParams.teamLeaderId" placeholder="请选择分管班组长" clearable style="width: 200px">
+        <el-select v-model="queryParams.teamLeaderId" placeholder="请选择分管班组长" filterable clearable style="width: 200px">
           <el-option v-for="item in teamLeaderOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="分管主管" prop="supervisorId">
-        <el-select v-model="queryParams.supervisorId" placeholder="请选择分管主管" clearable style="width: 200px">
+        <el-select v-model="queryParams.supervisorId" placeholder="请选择分管主管" filterable clearable style="width: 200px">
           <el-option v-for="item in supervisorOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="判别类型" prop="discriminationType">
-        <el-select v-model="queryParams.discriminationType" placeholder="请选择判别类型" clearable style="width: 200px">
+        <el-select v-model="queryParams.discriminationType" placeholder="请选择判别类型" filterable clearable
+          style="width: 200px">
           <el-option v-for="item in discrimination_type" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
@@ -60,7 +61,7 @@
     <el-table v-loading="loading" :data="missedInspectionList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="大队" align="center" prop="brigadeName" min-width="120" />
-      <el-table-column label="区域" align="center" prop="areaName" min-width="120" />
+      <el-table-column label="航站楼" align="center" prop="areaName" min-width="120" />
       <el-table-column label="被回查人" align="center" prop="reviewedUserName" min-width="120" />
       <el-table-column label="回查日期" align="center" prop="reviewDate" min-width="120" />
       <el-table-column label="漏检时间" align="center" prop="missCheckTime" min-width="180" />
@@ -83,11 +84,8 @@
       <el-table-column label="人员性别" align="center" prop="gender" min-width="100" />
       <el-table-column label="漏检原因分类" align="center" prop="missCheckReasonCategory" min-width="220" />
       <el-table-column label="月考成绩" align="center" prop="monthlyAssessment" min-width="100" />
-      <el-table-column label="本月自测有无漏检" align="center" prop="selfTestHasMissCheck" min-width="160">
-        <template #default="scope">
-            {{ scope.row.selfTestHasMissCheck ? '有' : '无' }}
-        </template>
-      </el-table-column>
+      <el-table-column label="本月自测有无漏检" align="center" prop="selfTestHasMissCheck" min-width="160" />
+
       <el-table-column label="漏检物品" align="center" prop="missCheckItem" min-width="120" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140" fixed="right">
         <template #default="scope">
@@ -108,15 +106,15 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="大队" prop="brigadeId">
-              <el-select v-model="form.brigadeId" placeholder="请选择大队" style="width: 100%">
+              <el-select v-model="form.brigadeId" placeholder="请选择大队" filterable style="width: 100%">
                 <el-option v-for="item in brigadeOptions" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="区域" prop="areaId">
-              <el-select v-model="form.areaId" placeholder="请选择区域" style="width: 100%">
-                <el-option v-for="item in areaOptions" :key="item.id" :label="item.name" :value="item.id" />
+            <el-form-item label="航站楼" prop="areaId">
+              <el-select v-model="form.areaId" placeholder="请选择航站楼" filterable style="width: 100%">
+                <el-option v-for="item in channelOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -124,7 +122,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="被回查人" prop="reviewedUserId">
-              <el-select v-model="form.reviewedUserId" placeholder="请选择被回查人" style="width: 100%"
+              <el-select v-model="form.reviewedUserId" placeholder="请选择被回查人" filterable style="width: 100%"
                 @change="handleReviewedUserChange">
                 <el-option v-for="item in personOptions" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
@@ -146,7 +144,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="漏检时间段" prop="missCheckTimePeriod">
-              <el-select v-model="form.missCheckTimePeriod" placeholder="请选择漏检时间段" style="width: 100%">
+              <el-select v-model="form.missCheckTimePeriod" placeholder="请选择漏检时间段" filterable style="width: 100%">
                 <el-option v-for="item in blocked_time_period" :key="item.value" :label="item.label"
                   :value="item.value" />
               </el-select>
@@ -156,22 +154,16 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="上岗位置" prop="channelId">
-              <el-select v-model="form.channelId" placeholder="请选择上岗位置" style="width: 100%">
-                <el-option v-for="item in channelOptions" :key="item.id" :label="item.name" :value="item.id" />
+              <el-select v-model="form.channelId" placeholder="请选择上岗位置" filterable style="width: 100%">
+                <el-option v-for="item in areaOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="漏检物品" prop="missCheckItem">
-              <el-tree-select
-                v-model="form.missCheckItem"
-                :data="missCheckItemOptions"
-                :props="{ value: 'name', label: 'name', children: 'children' }"
-                value-key="name"
-                placeholder="请选择漏检物品"
-                check-strictly
-                style="width: 100%"
-              />
+              <el-tree-select v-model="form.missCheckItem" :data="missCheckItemOptions"
+                :props="{ value: 'name', label: 'name', children: 'children', disabled: data => data.children && data.children.length > 0 }"
+                value-key="name" placeholder="请选择漏检物品" check-strictly style="width: 100%" />
             </el-form-item>
           </el-col>
 
@@ -179,7 +171,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="分管主管" prop="supervisorId">
-              <el-select v-model="form.supervisorId" placeholder="请选择分管主管" style="width: 100%">
+              <el-select v-model="form.supervisorId" placeholder="请选择分管主管" filterable style="width: 100%">
                 <el-option v-for="item in supervisorOptions" :key="item.value" :label="item.label"
                   :value="item.value" />
               </el-select>
@@ -187,7 +179,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="代管主管" prop="actingSupervisorId">
-              <el-select v-model="form.actingSupervisorId" placeholder="请选择代管主管" style="width: 100%">
+              <el-select v-model="form.actingSupervisorId" placeholder="请选择代管主管" filterable style="width: 100%">
                 <el-option v-for="item in supervisorOptions" :key="item.value" :label="item.label"
                   :value="item.value" />
               </el-select>
@@ -198,7 +190,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="分管班组长" prop="teamLeaderId">
-              <el-select v-model="form.teamLeaderId" placeholder="请选择分管班组长" style="width: 100%">
+              <el-select v-model="form.teamLeaderId" placeholder="请选择分管班组长" filterable style="width: 100%">
                 <el-option v-for="item in teamLeaderOptions" :key="item.value" :label="item.label"
                   :value="item.value" />
               </el-select>
@@ -206,7 +198,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="物品位置" prop="itemLocation">
-              <el-select v-model="form.itemLocation" placeholder="请选择物品位置" style="width: 100%">
+              <el-select v-model="form.itemLocation" placeholder="请选择物品位置" filterable style="width: 100%">
                 <el-option v-for="item in blocked_item_position" :key="item.value" :label="item.label"
                   :value="item.value" />
               </el-select>
@@ -217,7 +209,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="简单/难" prop="difficultyLevel">
-              <el-select v-model="form.difficultyLevel" placeholder="请选择简单/难" style="width: 100%">
+              <el-select v-model="form.difficultyLevel" placeholder="请选择简单/难" filterable style="width: 100%">
                 <el-option label="简单" value="简单" />
                 <el-option label="难" value="难" />
               </el-select>
@@ -225,7 +217,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="回查人" prop="reviewUserId">
-              <el-select v-model="form.reviewUserId" placeholder="请选择回查人" style="width: 100%">
+              <el-select v-model="form.reviewUserId" placeholder="请选择回查人" filterable style="width: 100%">
                 <el-option v-for="item in personOptions" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
@@ -235,7 +227,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="判别类型" prop="discriminationType">
-              <el-select v-model="form.discriminationType" placeholder="请选择判别类型" style="width: 100%">
+              <el-select v-model="form.discriminationType" placeholder="请选择判别类型" filterable style="width: 100%">
                 <el-option v-for="item in discrimination_type" :key="item.value" :label="item.label"
                   :value="item.value" />
               </el-select>
@@ -243,7 +235,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="是否追回" prop="isRecovered">
-              <el-select v-model="form.isRecovered" placeholder="请选择是否追回" style="width: 100%">
+              <el-select v-model="form.isRecovered" placeholder="请选择是否追回" filterable style="width: 100%">
                 <el-option label="是" value="1" />
                 <el-option label="否" value="0" />
               </el-select>
@@ -254,7 +246,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="开机年限" prop="machineOperatingYears">
-              <el-select v-model="form.machineOperatingYears" placeholder="请选择开机年限" style="width: 100%">
+              <el-select v-model="form.machineOperatingYears" placeholder="请选择开机年限" filterable style="width: 100%">
                 <el-option v-for="item in blocked_operating_years" :key="item.value" :label="item.label"
                   :value="item.value" />
               </el-select>
@@ -262,7 +254,11 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="证书级别" prop="certificateLevel">
-              <el-input v-model="form.certificateLevel" placeholder="请输入证书级别" />
+              <el-select v-model="form.certificateLevel" placeholder="请输入证书级别" filterable style="width: 100%">
+                <el-option label="高级" value="高级" />
+                <el-option label="中级" value="中级" />
+                <el-option label="初级" value="初级" />
+              </el-select>
             </el-form-item>
           </el-col>
 
@@ -270,7 +266,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="人员性别" prop="gender">
-              <el-select v-model="form.gender" placeholder="请选择人员性别" style="width: 100%">
+              <el-select v-model="form.gender" placeholder="请选择人员性别" filterable style="width: 100%">
                 <el-option label="男" value="男" />
                 <el-option label="女" value="女" />
               </el-select>
@@ -278,7 +274,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="漏检原因分类" prop="missCheckReasonCategory">
-              <el-select v-model="form.missCheckReasonCategory" placeholder="请选择漏检原因分类" style="width: 100%">
+              <el-select v-model="form.missCheckReasonCategory" placeholder="请选择漏检原因分类" filterable style="width: 100%">
                 <el-option v-for="item in blocked_miss_check_reason" :key="item.value" :label="item.label"
                   :value="item.value" />
               </el-select>
@@ -289,7 +285,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="月考成绩" prop="monthlyAssessment">
-              <el-select v-model="form.monthlyAssessment" placeholder="请选择月考成绩" style="width: 100%">
+              <el-select v-model="form.monthlyAssessment" placeholder="请选择月考成绩" filterable style="width: 100%">
                 <el-option v-for="item in blocked_monthly_exam_result" :key="item.value" :label="item.label"
                   :value="item.value" />
               </el-select>
@@ -297,8 +293,8 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="本月自测有无漏检" prop="selfTestHasMissCheck">
-              <el-input-number v-model="form.selfTestHasMissCheck" :min="0" :max="2" :precision="0"
-                placeholder="请输入0-2的整数" style="width: 100%" />
+              <el-input-number v-model="form.selfTestHasMissCheck" :min="0" :precision="0" placeholder="请输入0-2的整数"
+                style="width: 100%" />
             </el-form-item>
           </el-col>
 
@@ -342,7 +338,7 @@ import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
 import { listPosition } from '@/api/system/position'
 import { listMissedInspection, getMissedInspection, delMissedInspection, addMissedInspection, updateMissedInspection, exportMissedInspection, downloadTemplate } from '@/api/blockingData/missedInspection'
 import { listDept } from '@/api/system/dept'
-import { listUser, selectUserLeaderListByCondition } from '@/api/system/user'
+import { listUser, selectUserLeaderListByCondition, getUser } from '@/api/system/user'
 import { listCategory } from '@/api/system/category'
 import { useDict } from '@/utils/dict'
 import { getToken } from '@/utils/auth'
@@ -398,7 +394,7 @@ const form = reactive({})
 // 表单校验
 const rules = {
   brigadeId: [{ required: true, message: '大队不能为空', trigger: 'change' }],
-  areaId: [{ required: true, message: '区域不能为空', trigger: 'change' }],
+  areaId: [{ required: true, message: '航站楼不能为空', trigger: 'change' }],
   reviewedUserId: [{ required: true, message: '被回查人不能为空', trigger: 'change' }],
   reviewDate: [{ required: true, message: '回查日期不能为空', trigger: 'change' }],
   missCheckTime: [{ required: true, message: '漏检时间不能为空', trigger: 'change' }],
@@ -419,24 +415,13 @@ const rules = {
   monthlyAssessment: [{ required: true, message: '月考成绩不能为空', trigger: 'change' }],
   selfTestHasMissCheck: [
     { required: true, message: '本月自测有无漏检不能为空', trigger: 'change' },
-    {
-      validator: (rule, value, callback) => {
-        if (value === null || value === undefined || value === '') {
-          callback(new Error('本月自测有无漏检不能为空'))
-        } else if (![0, 1, 2].includes(Number(value))) {
-          callback(new Error('本月自测有无漏检只能输入0、1、2'))
-        } else {
-          callback()
-        }
-      },
-      trigger: 'change'
-    }
+
   ]
   // actingSupervisorId 不设置必填校验
 }
 
 // 字典数据
-const { discrimination_type, blocked_time_period, blocked_item_position, blocked_monthly_exam_result, blocked_operating_years, blocked_miss_check_reason } = useDict('discrimination_type', 'blocked_time_period', 'blocked_item_position', 'blocked_monthly_exam_result', 'blocked_operating_years', 'blocked_miss_check_reason')
+const { discrimination_type, blocked_time_period, blocked_item_position, blocked_monthly_exam_result, blocked_operating_years, blocked_miss_check_reason, sys_user_qualification_level } = useDict('discrimination_type', 'blocked_time_period', 'blocked_item_position', 'blocked_monthly_exam_result', 'blocked_operating_years', 'blocked_miss_check_reason', 'sys_user_qualification_level')
 
 // 大队选项
 const brigadeOptions = ref([])
@@ -446,15 +431,15 @@ const personOptions = ref([])
 const teamLeaderOptions = ref([])
 // 主管选项
 const supervisorOptions = ref([])
-// 区域选项
+// 航站楼选项
 const areaOptions = ref([])
 // 上岗位置选项
 const channelOptions = ref([])
 
 /** 获取职位列表 */
 function getPositionList() {
-  // 获取区域选项
-  listPosition({ positionType: 'REGIONAL' }).then(response => {
+  // 获取航站楼选项
+  listPosition({ positionType: 'CHANNEL' }).then(response => {
     areaOptions.value = response.data || []
   })
 
@@ -468,8 +453,8 @@ function getPositionList() {
 function getList() {
   loading.value = true
   if (dateRange.value && dateRange.value.length === 2) {
-    queryParams.reviewDateStart = dateRange.value[0]
-    queryParams.reviewDateEnd = dateRange.value[1]
+    queryParams.startDate = dateRange.value[0]
+    queryParams.endDate = dateRange.value[1]
   } else {
     queryParams.reviewDateStart = null
     queryParams.reviewDateEnd = null
@@ -533,6 +518,11 @@ function handleReviewedUserChange(userId) {
         form.supervisorId = data.userId
       }
     })
+    getUser(userId).then(response => {
+      const data = response?.data;
+      form.certificateLevel = sys_user_qualification_level.value.find(item => item.value == data?.qualificationLevel).remark
+      form.gender = data?.sex == '0' ? '男' : '女'
+    })
   } else {
     form.supervisorId = null
     form.teamLeaderId = null
@@ -583,7 +573,7 @@ function reset() {
     gender: null,
     missCheckReasonCategory: null,
     monthlyAssessment: null,
-    selfTestHasMissCheck: null,
+    selfTestHasMissCheck: 0,
     missCheckItem: null
   })
   proxy.resetForm('missedInspectionRef')
@@ -641,9 +631,9 @@ function submitForm() {
         form.brigadeName = brigade ? brigade.label : null
       }
 
-      // 处理区域ID和名称映射
+      // 处理航站楼ID和名称映射
       if (form.areaId) {
-        
+
         const area = areaOptions.value.find(item => item.id === form.areaId)
         form.areaName = area ? area.name : null
       }
@@ -668,7 +658,7 @@ function submitForm() {
 
       // 处理代管主管ID和名称映射
       if (form.actingSupervisorId) {
-        
+
         const actingSupervisor = supervisorOptions.value.find(item => item.value === form.actingSupervisorId)
         form.actingSupervisorName = actingSupervisor ? actingSupervisor.label : null
       }

src/views/blockingData/rateList/index.vue

@@ -51,11 +51,15 @@
       <el-table-column label="T1-B区速率（高峰期时段）" align="center" prop="t1BAreaRatePeak" />
       <el-table-column label="T2-国内速率（高峰期时段）" align="center" prop="t2DomesticRatePeak" />
       <el-table-column label="T2-国际速率（高峰期时段）" align="center" prop="t2InternationalRatePeak" />
-      <el-table-column label="班次" align="center" prop="shiftDesc" />
+      <el-table-column label="班次" align="center" prop="shift" min-width="100">
+        <template #default="scope">
+          {{ getDictLabel(shift, scope.row.shift) }}
+        </template>
+      </el-table-column>
       <el-table-column label="T2-中转（高峰期时段）" align="center" prop="t2TransferRatePeak" />
       <el-table-column label="国际及中转区域平均速率（高峰期时段）" align="center" prop="internationalTransferAvgRatePeak"
         min-width="120" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="180">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['rateList:rateList:edit']">修改</el-button>
@@ -194,7 +198,7 @@ const upload = reactive({
   open: false,
   isUploading: false,
   headers: { Authorization: 'Bearer ' + getToken() },
-  url: import.meta.env.VITE_APP_BASE_API + 'blocked/rate/importData'
+  url: import.meta.env.VITE_APP_BASE_API + '/blocked/rate/importData'
 })
 
 const queryParams = reactive({
@@ -231,6 +235,12 @@ function getList() {
   })
 }
 
+const getDictLabel = (dictList, value) => {
+  if (!dictList || !value) return ''
+  const dict = dictList.find(item => item.value === value)
+  return dict ? dict.label : value
+}
+
 function getDeptList() {
   listDept({}).then(response => {
     const deptList = response.data || []