Merge branch 'blockingData'

# Conflicts:
#	src/api/system/user.js
#	src/hooks/chart.js

src/api/blockingData/blockingDataScreen.js

@@ -0,0 +1,406 @@
+import request from '@/utils/request'
+
+
+//查询查堵总数
+export function totalCount(query) {
+    return request({
+        url: '/blocked/dashboard/totalCount',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询查堵总数柱状图
+export function brigadeChart(query) {
+    return request({
+        url: '/blocked/dashboard/brigadeChart',
+        method: 'get',
+        params: query
+    })
+}
+
+//查询总查堵万分率
+export function totalRate(query) {
+    return request({
+        url: '/blocked/dashboard/totalRate',
+        method: 'get',
+        params: query
+    })
+}
+//查询查堵万分率条形图
+export function brigadeRateChart(query) {
+    return request({
+        url: '/blocked/dashboard/brigadeRateChart',
+        method: 'get',
+        params: query
+    })
+}
+//每日查堵数量(总表)
+export function dailyTrend(query) {
+    return request({
+        url: '/blocked/dashboard/dailyTrend',
+        method: 'get',
+        params: query
+    })
+}
+//每日查堵数量(大队对比)
+export function dailyBrigadeComparison(query) {
+    return request({
+        url: '/blocked/dashboard/dailyBrigadeComparison',
+        method: 'get',
+        params: query
+    })
+}
+//每日查堵万分率(总表)
+export function dailyRateTrend(query) {
+    return request({
+        url: '/blocked/dashboard/dailyRateTrend',
+        method: 'get',
+        params: query
+    })
+}
+//每日查堵万分率(大队对比)
+export function dailyBrigadeRateComparison(query) {
+    return request({
+        url: '/blocked/dashboard/dailyBrigadeRateComparison',
+        method: 'get',
+        params: query
+    })
+}
+//每日过检图像数(行检+旅检总表)
+export function dailyLuggageTrend(query) {
+    return request({
+        url: '/blocked/dashboard/dailyLuggageTrend',
+        method: 'get',
+        params: query
+    })
+}
+
+//每日过检图像数(行检+旅检 大队对比)
+export function dailyBrigadeLuggageComparison(query) {
+    return request({
+        url: '/blocked/dashboard/dailyBrigadeLuggageComparison',
+        method: 'get',
+        params: query
+    })
+}
+//查堵物品分布
+export function itemDistribution(query) {
+    return request({
+        url: '/blocked/dashboard/itemDistribution',
+        method: 'get',
+        params: query
+    })
+}
+//区域查堵数量分布
+export function areaDistribution(query) {
+    return request({
+        url: '/blocked/dashboard/areaDistribution',
+        method: 'get',
+        params: query
+    })
+}
+//查堵类型分布
+export function discriminationDistribution(query) {
+    return request({
+        url: '/blocked/dashboard/discriminationDistribution',
+        method: 'get',
+        params: query
+    })
+}
+//查堵时间段过检行李数及万分率
+export function timePeriodStats(query) {
+    return request({
+        url: '/blocked/dashboard/timePeriodStats',
+        method: 'get',
+        params: query
+    })
+}
+//每日过检行李数及万分率
+export function dailyLuggageAndRate(query) {
+    return request({
+        url: '/blocked/dashboard/dailyLuggageAndRate',
+        method: 'get',
+        params: query
+    })
+}
+//查堵-AI复查图像总数
+export function aiImageStats(query) {
+    return request({
+        url: '/blocked/dashboard/aiImageStats',
+        method: 'get',
+        params: query
+    })
+}
+//查堵-AI漏判图像总数
+export function aiMissImageStats(query) {
+    return request({
+        url: '/blocked/dashboard/aiMissImageStats',
+        method: 'get',
+        params: query
+    })
+}
+//查堵-AI误判图像总数
+export function aiErrorImageStats(query) {
+    return request({
+        url: '/blocked/dashboard/aiErrorImageStats',
+        method: 'get',
+        params: query
+    })
+}
+//查堵-主管排行榜
+export function supervisorRanking(query) {
+    return request({
+        url: '/blocked/dashboard/supervisorRanking',
+        method: 'get',
+        params: query
+    })
+}
+//查堵-班组排行榜
+export function teamLeaderRanking(query) {
+    return request({
+        url: '/blocked/dashboard/teamLeaderRanking',
+        method: 'get',
+        params: query
+    })
+}
+//查堵-人员排行榜
+export function reviewedUserRanking(query) {
+    return request({
+        url: '/blocked/dashboard/reviewedUserRanking',
+        method: 'get',
+        params: query
+    })
+}
+//查堵-物品位置分布
+export function itemLocationDistribution(query) {
+    return request({
+        url: '/blocked/dashboard/itemLocationDistribution',
+        method: 'get',
+        params: query
+    })
+}
+//查堵-原因分类分布
+export function missCheckReasonDistribution(query) {
+    return request({
+        url: '/blocked/dashboard/missCheckReasonDistribution',
+        method: 'get',
+        params: query
+    })
+}
+//查堵-图像难易程度分布
+export function difficultyDistribution(query) {
+    return request({
+        url: '/blocked/dashboard/difficultyDistribution',
+        method: 'get',
+        params: query
+    })
+}
+//查堵-开机人员持证比例
+export function certificateDistribution(query) {
+    return request({
+        url: '/blocked/dashboard/certificateDistribution',
+        method: 'get',
+        params: query
+    })
+}
+//查询开机人员年限分布列表全量
+export function tenureListAll(query) {
+    return request({
+        url: '/blocked/tenure/listAll',
+        method: 'get',
+        params: query
+    })
+}
+//大队开机人员证书分布
+export function brigadeCertificateDistribution(query) {
+    return request({
+        url: '/blocked/dashboard/brigadeCertificateDistribution',
+        method: 'get',
+        params: query
+    })
+}
+//T1速率统计数据
+export function t1RateStats(query) {
+    return request({
+        url: '/blocked/rate/screen/t1',
+        method: 'get',
+        params: query
+    })
+}
+//T2速率统计数据
+export function t2RateStats(query) {
+    return request({
+        url: '/blocked/rate/screen/t2',
+        method: 'get',
+        params: query
+    })
+}
+//国内速率统计数据
+export function insideRateStats(query) {
+    return request({
+        url: '/blocked/rate/screen/domestic',
+        method: 'get',
+        params: query
+    })
+}
+//国际速率统计数据
+export function outsideRateStats(query) {
+    return request({
+        url: '/blocked/rate/screen/international',
+        method: 'get',
+        params: query
+    })
+}
+//月考成绩统计
+export function monthlyAssessment(query) {
+    return request({
+        url: '/blocked/missReview/screen/monthlyAssessment',
+        method: 'get',
+        params: query
+    })
+}
+//本月自测有无漏检统计
+export function selfTestHasMissCheck(query) {
+    return request({
+        url: '/blocked/missReview/screen/selfTestHasMissCheck',
+        method: 'get',
+        params: query
+    })
+}
+//查询两楼每日查堵走势
+export function dailyTerminalTrend(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/dailyTerminalTrend',
+        method: 'get',
+        params: query
+    })
+}
+//查询两楼每日过检图像数
+export function dailyTerminalLuggageTrend(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/dailyTerminalLuggageTrend',
+        method: 'get',
+        params: query
+    })
+}
+//查询两楼查堵数（包含行检）
+export function terminalBlockedStats(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/terminalBlockedStats',
+        method: 'get',
+        params: query
+    })
+}
+//查询查堵时间段过检行李数
+export function timePeriodLuggageStats(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/timePeriodLuggageStats',
+        method: 'get',
+        params: query
+    })
+}
+//查询两楼每日查堵万分率
+export function dailyTerminalRateTrend(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/dailyTerminalRateTrend',
+        method: 'get',
+        params: query
+    })
+}
+//查询查堵物品分布
+export function brigadeItemDistribution(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/itemDistribution',
+        method: 'get',
+        params: query
+    })
+}
+//查堵-主管排行榜
+export function brigadeSupervisorRanking(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/supervisorRanking',
+        method: 'get',
+        params: query
+    })
+}
+//查堵-班组排行榜
+export function brigadeTeamLeaderRanking(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/teamLeaderRanking',
+        method: 'get',
+        params: query
+    })
+}
+//查堵-人员排行榜
+export function brigadeReviewedUserRanking(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/reviewedUserRanking',
+        method: 'get',
+        params: query
+    })
+}
+//查询查堵男女比例
+export function brigadeGenderDistribution(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/genderDistribution',
+        method: 'get',
+        params: query
+    })
+}
+//查询查堵人员证书级别分布
+export function brigadeCertificateDistributionDetail(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/certificateLevelDistribution',
+        method: 'get',
+        params: query
+    })
+}
+//查询证书级别人员基数
+export function personnelCertificateBase(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/personnelCertificateBase',
+        method: 'get',
+        params: query
+    })
+}
+//查询查堵物品位置分布
+export function brigadeItemLocationDistribution(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/itemLocationDistribution',
+        method: 'get',
+        params: query
+    })
+}
+//查询查堵-简单/困难图像数
+export function brigadeDifficultyDistribution(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/difficultyDistribution',
+        method: 'get',
+        params: query
+    })
+}
+//查询查堵-主管分管次数分布
+export function brigadeSupervisorDistribution(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/supervisorDistribution',
+        method: 'get',
+        params: query
+    })
+}
+//查询查堵原因分类分布
+export function brigadeMissCheckReasonDistribution(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/missCheckReasonDistribution',
+        method: 'get',
+        params: query
+    })
+}
+//查询查堵人员开机年限分布
+export function brigadeOperatingYearsDistribution(query) {
+    return request({
+        url: '/blocked/dashboard/brigade/operatingYearsDistribution',
+        method: 'get',
+        params: query
+    })
+}

src/api/blockingData/dailyLuggageCheckInList.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询每日行李查缉列表
+export function listDailyLuggageCheckIn(query) {
+  return request({
+    url: '/blocked/daily/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询每日行李查缉详细
+export function getDailyLuggageCheckIn(id) {
+  return request({
+    url: `/blocked/daily/${id}`,
+    method: 'get'
+  })
+}
+
+// 新增每日行李查缉
+export function addDailyLuggageCheckIn(data) {
+  return request({
+    url: '/blocked/daily',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改每日行李查缉
+export function updateDailyLuggageCheckIn(data) {
+  return request({
+    url: '/blocked/daily',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除每日行李查缉
+export function delDailyLuggageCheckIn(ids) {
+  return request({
+    url: `/blocked/daily/${ids}`,
+    method: 'delete'
+  })
+}
+
+// 导出每日行李查缉
+export function exportDailyLuggageCheckIn(data) {
+  return request({
+    url: '/blocked/daily/export',
+    method: 'post',
+    data: data
+  })
+}
+
+// 下载导入模板
+export function downloadTemplate() {
+  return request({
+    url: '/blocked/daily/importTemplate',
+    method: 'get',
+    responseType: 'blob'
+  })
+}

src/api/blockingData/dailyLuggageInspectionScheduleByTime.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询每日各时段查堵行李列表
+export function listDailyLuggageInspectionScheduleByTime(query) {
+  return request({
+    url: '/blocked/pieceDaily/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询每日各时段查堵行李详细
+export function getDailyLuggageInspectionScheduleByTime(id) {
+  return request({
+    url: `/blocked/pieceDaily/${id}`,
+    method: 'get'
+  })
+}
+
+// 新增每日各时段查堵行李
+export function addDailyLuggageInspectionScheduleByTime(data) {
+  return request({
+    url: '/blocked/pieceDaily',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改每日各时段查堵行李
+export function updateDailyLuggageInspectionScheduleByTime(data) {
+  return request({
+    url: '/blocked/pieceDaily',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除每日各时段查堵行李
+export function delDailyLuggageInspectionScheduleByTime(ids) {
+  return request({
+    url: `/blocked/pieceDaily/${ids}`,
+    method: 'delete'
+  })
+}
+
+// 导出每日各时段查堵行李
+export function exportDailyLuggageInspectionScheduleByTime(data) {
+  return request({
+    url: '/blocked/pieceDaily/export',
+    method: 'post',
+    data: data
+  })
+}
+
+// 下载导入模板
+export function downloadTemplate() {
+  return request({
+    url: '/blocked/pieceDaily/importTemplate',
+    method: 'get',
+    responseType: 'blob'
+  })
+}

src/api/blockingData/experienceDistributionStartupPerson.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 查询开机人员年限分布列表全量
+export function getTenurelistAll(query) {
+  return request({
+    url: '/blocked/tenure/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+//修改开机人员年限分布
+export function editTenure(data) {
+  return request({
+    url: '/blocked/tenure/edit',
+    method: 'post',
+    data: data
+  })
+}

src/api/blockingData/missedInspection.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询漏检列表
+export function listMissedInspection(query) {
+  return request({
+    url: '/blocked/missReview/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询漏检详细
+export function getMissedInspection(id) {
+  return request({
+    url: `/blocked/missReview/${id}`,
+    method: 'get'
+  })
+}
+
+// 新增漏检
+export function addMissedInspection(data) {
+  return request({
+    url: '/blocked/missReview',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改漏检
+export function updateMissedInspection(data) {
+  return request({
+    url: '/blocked/missReview',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除漏检
+export function delMissedInspection(ids) {
+  return request({
+    url: `/blocked/missReview/${ids}`,
+    method: 'delete'
+  })
+}
+
+// 导出漏检
+export function exportMissedInspection(data) {
+  return request({
+    url: '/blocked/missReview/export',
+    method: 'post',
+    data: data
+  })
+}
+
+// 下载导入模板
+export function downloadTemplate() {
+  return request({
+    url: '/blocked/missReview/importTemplate',
+    method: 'get',
+    responseType: 'blob'
+  })
+}

src/api/blockingData/rateList.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 查询速率统计列表
+export function listRate(query) {
+  return request({
+    url: '/blocked/rate/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询速率统计详细
+export function getRate(id) {
+  return request({
+    url: `/blocked/rate/${id}`,
+    method: 'get'
+  })
+}
+
+// 新增速率统计
+export function addRate(data) {
+  return request({
+    url: '/blocked/rate/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改速率统计
+export function updateRate(data) {
+  return request({
+    url: '/blocked/rate/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除速率统计
+export function delRate(ids) {
+  return request({
+    url: `/blocked/rate/${ids}`,
+    method: 'delete'
+  })
+}
+
+// 导出速率统计
+export function exportRate() {
+  return request({
+    url: `/blocked/rate/export`,
+    method: 'post',
+  })
+}
+
+
+// 下载导入模板
+export function downloadTemplate() {
+  return request({
+    url: '/blocked/rate/importTemplate',
+    method: 'get',
+    responseType: 'blob'
+  })
+}

src/api/system/user.js

@@ -151,3 +151,12 @@ export function getDeptUserTree(params) {
     params: params
   })
 }
+
+//根据用户ID和角色编码列表查询各级直属领导列表
+export function selectUserLeaderListByCondition(data) {
+  return request({
+    url: '/system/user/selectUserLeaderListByCondition',
+    method: 'post',
+    data: data
+  })
+}

src/router/index.js

@@ -92,9 +92,9 @@ export const constantRoutes = [
     children: [
       {
         path: '/index',
-        component: () => import('@/views/dataBigScreen/dashboard'),
+        component: () => import('@/views/blockingData/blockingDataScreen/index'),
         name: 'Index',
-        meta: { title: '智慧大屏监控中心', icon: 'dashboard' }
+        meta: { title: '查堵大屏', icon: 'dashboard' }
       },
       // {
       //   path: '/dashboard-work',

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/ModuleBrigadeOne.vue

@@ -0,0 +1,428 @@
+<template>
+  <module-container title="模块一 运行数据分析">
+    <div class="module-brigade-content">
+      <div class="combined-row">
+        <div class="stat-card">
+          <div class="stat-card-inner">
+            <div class="stat-left">
+              <div class="stat-label">查堵总数</div>
+              <div class="stat-content">
+                <div class="stat-value">{{ statValue || 0 }}</div>
+                <div class="stat-unit">起</div>
+              </div>
+
+            </div>
+          </div>
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">两楼每日查堵走势</div>
+          <div ref="chart1" class="echarts"></div>
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">两楼每日过检图像数</div>
+          <div ref="chart2" class="echarts"></div>
+        </div>
+      </div>
+
+      <div class="chart-row">
+        <div class="chart-item">
+          <div class="chart-title">两楼查堵数（包含行检）</div>
+          <div ref="chart3" class="echarts"></div>
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">查堵时间段过检行李数</div>
+          <div ref="chart4" class="echarts"></div>
+        </div>
+      </div>
+
+      <div class="chart-row">
+        <div class="chart-item">
+          <div class="chart-title">两楼每日查堵万分率</div>
+          <div ref="chart5" class="echarts"></div>
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">查堵物品分布</div>
+          <div ref="chart6" class="echarts"></div>
+        </div>
+      </div>
+    </div>
+  </module-container>
+</template>
+
+<script setup>
+import { ref, onMounted, watch } from 'vue'
+import * as echarts from 'echarts'
+import ModuleContainer from './ModuleContainer.vue'
+import { useEcharts } from '@/hooks/chart.js'
+import { formatDateHy } from '@/utils/index.js'
+import {
+  dailyTerminalTrend,
+  dailyTerminalLuggageTrend,
+  terminalBlockedStats,
+  timePeriodLuggageStats,
+  dailyTerminalRateTrend,
+  brigadeItemDistribution
+} from '@/api/blockingData/blockingDataScreen'
+
+const props = defineProps({
+  filterParams: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const loading = ref(false)
+const statValue = ref(0)
+
+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 chart1 = ref(null)
+const chart2 = ref(null)
+const chart3 = ref(null)
+const chart4 = ref(null)
+const chart5 = ref(null)
+const chart6 = ref(null)
+
+const { setOption: setOption1 } = useEcharts(chart1)
+const { setOption: setOption2 } = useEcharts(chart2)
+const { setOption: setOption3 } = useEcharts(chart3)
+const { setOption: setOption4 } = useEcharts(chart4)
+const { setOption: setOption5 } = useEcharts(chart5)
+const { setOption: setOption6 } = useEcharts(chart6)
+
+const fetchData = async () => {
+  loading.value = true
+  try {
+    const processedParams = processFilterParams(props.filterParams)
+    const [trendRes, luggageRes, blockedRes, timeRes, rateRes, itemRes] = await Promise.allSettled([
+      dailyTerminalTrend(processedParams),
+      dailyTerminalLuggageTrend(processedParams),
+      terminalBlockedStats(processedParams),
+      timePeriodLuggageStats(processedParams),
+      dailyTerminalRateTrend(processedParams),
+      brigadeItemDistribution(processedParams)
+    ])
+
+    if (trendRes.value?.data) {
+      const dates = trendRes.value.data.map(item => item.statDate?.split('T')[0] || item.date || item.name || '')
+      const t1TravelData = trendRes.value.data.map(item => item.t1TravelBlockedCount || 0)
+      const t2TravelData = trendRes.value.data.map(item => item.t2TravelBlockedCount || 0)
+      const t1WalkData = trendRes.value.data.map(item => item.t1WalkBlockedCount || 0)
+      const t2WalkData = trendRes.value.data.map(item => item.t2WalkBlockedCount || 0)
+      setOption1(multiLineChartOption(dates, [
+        { name: 'T1旅检查堵件数', data: t1TravelData, color: '#3b82f6' },
+        { name: 'T2旅检查堵件数', data: t2TravelData, color: '#22c55e' },
+        { name: 'T1行检查堵件数', data: t1WalkData, color: '#f97316' },
+        { name: 'T2行检查堵件数', data: t2WalkData, color: '#ec4899' }
+      ]))
+    }
+
+    if (luggageRes.value?.data) {
+      const dates = luggageRes.value.data.map(item => item.statDate?.split('T')[0] || item.date || item.name || '')
+      const t1TravelData = luggageRes.value.data.map(item => item.t1TravelBagCount || 0)
+      const t2TravelData = luggageRes.value.data.map(item => item.t2TravelBagCount || 0)
+      const t1WalkData = luggageRes.value.data.map(item => item.t1WalkBagCount || 0)
+      const t2WalkData = luggageRes.value.data.map(item => item.t2WalkBagCount || 0)
+      setOption2(multiLineChartOption(dates, [
+        { name: 'T1旅检过检行李数', data: t1TravelData, color: '#3b82f6' },
+        { name: 'T2旅检过检行李数', data: t2TravelData, color: '#22c55e' },
+        { name: 'T1行检过检行李数', data: t1WalkData, color: '#f97316' },
+        { name: 'T2行检过检行李数', data: t2WalkData, color: '#ec4899' }
+      ]))
+    }
+
+    if (blockedRes.value?.data) {
+      const terminal = processedParams?.terminal || '';
+
+      const blockedData = [
+        ...(terminal.includes('T1') || terminal.includes('整体') || !terminal ? [{ name: 'T1', value: blockedRes.value.data.t1BlockedCount || 0 }] : []),
+        ...(terminal.includes('T2') || terminal.includes('整体') || !terminal ? [{ name: 'T2', value: blockedRes.value.data.t2BlockedCount || 0 }] : [])
+      ]
+      setOption3(horizontalBarChartOption(blockedData, '#3b82f6'))
+      const total = blockedRes.value.data.totalBlockedCount || 0
+      statValue.value = total
+    }
+
+    if (timeRes.value?.data) {
+      const timePeriods = timeRes.value.data.map(item => item.timePeriod || '')
+      const avgLuggageData = timeRes.value.data.map(item => item.avgLuggageCount || 0)
+      const avgBlockedData = timeRes.value.data.map(item => item.avgBlockedCount || 0)
+      setOption4(barLineChartOption(timePeriods, avgLuggageData, avgBlockedData))
+    }
+
+    if (rateRes.value?.data) {
+      const dates = rateRes.value.data.map(item => item.statDate?.split('T')[0] || item.date || item.name || '')
+      const t1TravelRate = rateRes.value.data.map(item => item.t1TravelBlockRate || 0)
+      const t2TravelRate = rateRes.value.data.map(item => item.t2TravelBlockRate || 0)
+      const t1WalkRate = rateRes.value.data.map(item => item.t1WalkBlockRate || 0)
+      const t2WalkRate = rateRes.value.data.map(item => item.t2WalkBlockRate || 0)
+      setOption5(multiLineChartOption(dates, [
+        { name: 'T1旅检万分率', data: t1TravelRate, color: '#3b82f6' },
+        { name: 'T2旅检万分率', data: t2TravelRate, color: '#22c55e' },
+        { name: 'T1行检万分率', data: t1WalkRate, color: '#f97316' },
+        { name: 'T2行检万分率', data: t2WalkRate, color: '#ec4899' }
+      ]))
+    }
+
+    if (itemRes.value?.data) {
+      const colors = ['#3b82f6', '#22c55e', '#f97316', '#ec4899', '#8b5cf6', '#10b981', '#f59e0b', '#ef4444']
+      const itemData = itemRes.value.data.map((item, index) => ({
+        name: item.missCheckItem,
+        value: item.count
+      }))
+      setOption6(pieChartOption(itemData, colors))
+    }
+  } catch (error) {
+    console.error('获取数据失败:', error)
+  } finally {
+    loading.value = false
+  }
+}
+
+watch(() => props.filterParams, () => {
+  fetchData()
+}, { deep: true })
+
+const xAxisData = Array.from({ length: 30 }, (_, i) => `${i + 1}日`)
+
+const generateData = (count, min, max) => {
+  const data = []
+  for (let i = 0; i < count; i++) {
+    data.push(Math.floor(Math.random() * (max - min + 1)) + min)
+  }
+  return data
+}
+
+const multiLineChartOption = (xAxisData, series) => ({
+  grid: { left: '10%', top: '15%', right: '5%', bottom: '15%', containLabel: true },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: { type: 'cross' }
+  },
+  xAxis: { type: 'category', data: xAxisData, axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' } },
+  yAxis: { type: 'value', axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' }, splitLine: { lineStyle: { color: '#eee' } } },
+  legend: {
+    data: series.map(s => s.name),
+    top: '0%',
+    textStyle: { fontSize: 10 }
+  },
+  series: series.map(s => ({
+    name: s.name,
+    type: 'line',
+    smooth: true,
+    symbol: 'circle',
+    symbolSize: 6,
+    data: s.data,
+    itemStyle: { color: s.color },
+    lineStyle: { color: s.color },
+    label: { show: true, position: 'top', fontSize: 9, color: s.color }
+  }))
+})
+
+
+
+const horizontalBarChartOption = (data, color) => ({
+  grid: { left: '20%', top: '15%', right: '5%', bottom: '15%', containLabel: true },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: { type: 'shadow' }
+  },
+  xAxis: { type: 'value', axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' }, splitLine: { lineStyle: { color: '#eee' } } },
+  yAxis: { type: 'category', data: data.map(d => d.name), axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' } },
+  series: [{
+    type: 'bar',
+    data: data.map(d => d.value),
+    itemStyle: { color: color },
+    barWidth: 15,
+    label: { show: true, position: 'right', fontSize: 10, color: color }
+  }]
+})
+
+const barLineChartOption = (xAxisData, barData, lineData) => ({
+  grid: { left: '10%', top: '15%', right: '5%', bottom: '15%', containLabel: true },
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: { type: 'cross' }
+  },
+  xAxis: { type: 'category', data: xAxisData, axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' } },
+  yAxis: { type: 'value', axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' }, splitLine: { lineStyle: { color: '#eee' } } },
+  legend: {
+    data: ['平均过检行李数', '平均查堵件数'],
+    top: '0%',
+    textStyle: { fontSize: 10 }
+  },
+  series: [
+    {
+      name: '平均过检行李数',
+      type: 'bar',
+      data: barData,
+      itemStyle: { color: '#3b82f6' },
+      barWidth: 20,
+      label: { show: true, position: 'top', fontSize: 9, color: '#3b82f6' }
+    },
+    {
+      name: '平均查堵件数',
+      type: 'line',
+      smooth: true,
+      symbol: 'circle',
+      symbolSize: 6,
+      data: lineData,
+      itemStyle: { color: '#ec4899' },
+      lineStyle: { color: '#ec4899' },
+      label: { show: true, position: 'top', fontSize: 9, color: '#ec4899' }
+    }
+  ]
+})
+
+const pieChartOption = (data, colors) => ({
+  color: colors,
+  legend: {
+    show: true,
+    textStyle: { fontSize: 10 }
+  },
+  tooltip: { trigger: 'item' },
+  series: [{
+    type: 'pie',
+    radius: '65%',
+    center: ['50%', '55%'],
+    data: data,
+    label: { show: true, formatter: '{b}\n{c} ({d}%)', fontSize: 10 }
+  }]
+})
+
+onMounted(() => {
+  fetchData()
+
+})
+</script>
+
+<style lang="less" scoped>
+.module-brigade-content {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  overflow-y: auto;
+}
+
+.stats-row {
+  display: flex;
+  gap: 10px;
+  flex-shrink: 0;
+}
+
+.stat-card {
+  flex: 1;
+  min-height: 120px;
+}
+
+.stat-card-inner {
+  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;
+
+  padding-right: 15px;
+}
+
+.stat-label {
+  width: 100%;
+  font-size: 17px;
+  color: black;
+  margin-bottom: 8px;
+}
+
+.stat-content {
+  margin-top: 25%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.stat-value {
+  font-size: 48px;
+  font-weight: bold;
+  color: #3b82f6;
+}
+
+.stat-unit {
+  font-size: 14px;
+  color: #666;
+  margin-top: 5px;
+}
+
+.combined-row {
+  display: flex;
+  gap: 10px;
+  flex-shrink: 0;
+}
+
+.combined-row .stat-card {
+  flex: 0.5;
+  min-height: 200px;
+}
+
+.combined-row .chart-item {
+  flex: 1;
+}
+
+.chart-row {
+  display: flex;
+  gap: 10px;
+  flex-shrink: 0;
+}
+
+.chart-item {
+  flex: 1;
+  background: #fff;
+  border-radius: 6px;
+  padding: 15px;
+  border: 1px solid #eee;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  display: flex;
+  flex-direction: column;
+  min-height: 400px;
+}
+
+.chart-title {
+  font-size: 17px;
+  color: black;
+  margin-bottom: 5px;
+  text-align: left;
+}
+
+.echarts {
+  flex: 1;
+  width: 100%;
+  min-height: 0;
+}
+</style>

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

@@ -0,0 +1,169 @@
+<template>
+  <module-container title="模块三 培训质控分析">
+    <div class="module-brigade-content">
+      <div class="chart-row">
+        <div class="chart-item">
+          <div class="chart-title">查堵-人员自测漏检次数</div>
+          <div ref="chart1" class="echarts"></div>
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">查堵人员月考成绩</div>
+          <div ref="chart2" class="echarts"></div>
+        </div>
+      </div>
+    </div>
+  </module-container>
+</template>
+
+<script setup>
+import { ref, onMounted, watch } from 'vue'
+import * as echarts from 'echarts'
+import ModuleContainer from './ModuleContainer.vue'
+import { useEcharts } from '@/hooks/chart.js'
+import { formatDateHy } from '@/utils/index.js'
+import {
+  selfTestHasMissCheck,
+  monthlyAssessment
+} from '@/api/blockingData/blockingDataScreen'
+
+const props = defineProps({
+  filterParams: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const loading = ref(false)
+
+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 chart1 = ref(null)
+const chart2 = ref(null)
+
+const { setOption: setOption1 } = useEcharts(chart1)
+const { setOption: setOption2 } = useEcharts(chart2)
+
+const fetchData = async () => {
+  loading.value = true
+  try {
+    const processedParams = processFilterParams(props.filterParams)
+    const [missCheckRes, assessmentRes] = await Promise.all([
+      selfTestHasMissCheck(processedParams),
+      monthlyAssessment(processedParams)
+    ])
+
+    if (missCheckRes.data) {
+      const colors = ['#22c55e', '#3b82f6', '#f97316']
+      const missCheckData = missCheckRes.data.map(item => ({
+        name: item.name || item.level || '未知',
+        value: item.total || item.count || 0
+      }))
+      setOption1(ringChartOption(missCheckData, colors))
+    }
+
+    if (assessmentRes.data) {
+      const colors = ['#22c55e', '#3b82f6', '#fbbf24', '#ef4444']
+      const assessmentData = assessmentRes.data.map(item => ({
+        name: item.level || item.name || '',
+        value: item.total || 0
+      }))
+      setOption2(ringChartOption(assessmentData, colors))
+    }
+  } catch (error) {
+    console.error('获取数据失败:', error)
+  } finally {
+    loading.value = false
+  }
+}
+
+watch(() => props.filterParams, () => {
+  fetchData()
+}, { deep: true })
+
+const ringChartOption = (data, colors) => ({
+  color: colors,
+  tooltip: { trigger: 'item', formatter: '{b}: {c}' },
+  legend: {
+    data: data.map(item => item.name),
+    top: '0%',
+    textStyle: { fontSize: 10 }
+  },
+  series: [{
+    type: 'pie',
+    radius: ['35%', '45%'],
+    center: ['50%', '55%'],
+    data: data,
+    label: {
+      show: true,
+      formatter: (params) => {
+        const total = data.reduce((sum, item) => sum + item.value, 0)
+        const percentage = ((params.value / total) * 100).toFixed(2)
+        return `${params.name}\n${params.value}(${percentage}%)`
+      },
+      fontSize: 10
+    }
+  }]
+})
+
+onMounted(() => {
+  fetchData()
+
+})
+</script>
+
+<style lang="less" scoped>
+.module-brigade-content {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  overflow-y: auto;
+}
+
+.chart-row {
+  display: flex;
+  gap: 10px;
+  flex-shrink: 0;
+}
+
+.chart-item {
+  flex: 1;
+  background: #fff;
+  border-radius: 6px;
+  padding: 10px;
+  border: 1px solid #eee;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  display: flex;
+  flex-direction: column;
+  min-height: 400px;
+}
+
+.chart-title {
+  font-size: 17px;
+  color: black;
+  margin-bottom: 5px;
+  text-align: left;
+}
+
+.echarts {
+  flex: 1;
+  width: 100%;
+  min-height: 0;
+}
+</style>

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

@@ -0,0 +1,471 @@
+<template>
+  <module-container title="模块二 查堵人员分析">
+    <div class="module-brigade-content">
+      <div class="chart-row">
+        <div class="chart-item">
+          <div class="chart-title">查堵-困难图像数</div>
+          <div class="number-display">
+            <div class="number-value">{{ difficultValue || 0 }}</div>
+            <div class="number-unit">幅</div>
+          </div>
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">查堵-简单图像数</div>
+          <div class="number-display">
+            <div class="number-value">{{ simpleValue || 0 }}</div>
+            <div class="number-unit">幅</div>
+          </div>
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">查堵物品位置</div>
+          <div ref="chart7" class="echarts"></div>
+        </div>
+      </div>
+      <div class="chart-row">
+        <div class="chart-item">
+          <div class="chart-title">查堵-主管排行榜</div>
+          <rank-list :rank-data="rankData1" title="查堵-主管排行榜" header-label="排名" header-name="分管主管" header-count="计数" />
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">查堵-班组长排行榜</div>
+          <rank-list :rank-data="rankData2" title="查堵-班组长排行榜" header-label="排名" header-name="分管班组长" header-count="计数" />
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">查堵-员工排行榜</div>
+          <rank-list :rank-data="rankData3" title="查堵-员工排行榜" header-label="排名" header-name="被回查人" header-count="计数" />
+        </div>
+      </div>
+
+      <div class="chart-row">
+        <div class="chart-item">
+          <div class="chart-title">查堵男女比例</div>
+          <div ref="chart4" class="echarts"></div>
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">查堵人员证书级别分布</div>
+          <div ref="chart5" class="echarts"></div>
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">证书级别人员基数</div>
+          <div ref="chart6" class="echarts"></div>
+        </div>
+      </div>
+
+
+
+      <div class="chart-row">
+        <div class="chart-item">
+          <div class="chart-title">查堵-主管分管次数</div>
+          <div ref="chart10" class="echarts"></div>
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">查堵原因分类</div>
+          <div ref="chart11" class="echarts"></div>
+        </div>
+      </div>
+
+      <div class="chart-row">
+        <div class="chart-item">
+          <div class="chart-title">查堵人员开机年限分布</div>
+          <div ref="chart12" class="echarts"></div>
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">大队开机年限人员分布</div>
+          <div ref="chart13" class="echarts"></div>
+        </div>
+      </div>
+    </div>
+  </module-container>
+</template>
+
+<script setup>
+import { ref, onMounted, reactive, watch } from 'vue'
+import * as echarts from 'echarts'
+import ModuleContainer from './ModuleContainer.vue'
+import RankList from './RankList.vue'
+import { useEcharts } from '@/hooks/chart.js'
+import { formatDateHy } from '@/utils/index.js'
+import {
+  brigadeSupervisorRanking,
+  brigadeTeamLeaderRanking,
+  brigadeReviewedUserRanking,
+  brigadeGenderDistribution,
+  brigadeCertificateDistributionDetail,
+  personnelCertificateBase,
+  brigadeItemLocationDistribution,
+  brigadeDifficultyDistribution,
+  brigadeSupervisorDistribution,
+  brigadeMissCheckReasonDistribution,
+  brigadeOperatingYearsDistribution,
+  tenureListAll
+} from '@/api/blockingData/blockingDataScreen'
+
+const props = defineProps({
+  filterParams: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const loading = ref(false)
+const rankData1 = reactive([])
+const rankData2 = reactive([])
+const rankData3 = reactive([])
+const difficultValue = ref(0)
+const simpleValue = ref(0)
+
+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 chart4 = ref(null)
+const chart5 = ref(null)
+const chart6 = ref(null)
+const chart7 = ref(null)
+const chart10 = ref(null)
+const chart11 = ref(null)
+const chart12 = ref(null)
+const chart13 = ref(null)
+
+const { setOption: setOption4 } = useEcharts(chart4)
+const { setOption: setOption5 } = useEcharts(chart5)
+const { setOption: setOption6 } = useEcharts(chart6)
+const { setOption: setOption7 } = useEcharts(chart7)
+const { setOption: setOption10 } = useEcharts(chart10)
+const { setOption: setOption11 } = useEcharts(chart11)
+const { setOption: setOption12 } = useEcharts(chart12)
+const { setOption: setOption13 } = useEcharts(chart13)
+
+const fetchData = async () => {
+  loading.value = true
+  try {
+    const processedParams = processFilterParams(props.filterParams)
+    const [supervisorRes, teamRes, userRes, genderRes, certDetailRes, certBaseRes, locationRes, difficultyRes, supervisorDistRes, reasonRes, yearsRes, tenureRes] = await Promise.allSettled([
+      brigadeSupervisorRanking(processedParams),
+      brigadeTeamLeaderRanking(processedParams),
+      brigadeReviewedUserRanking(processedParams),
+      brigadeGenderDistribution(processedParams),
+      brigadeCertificateDistributionDetail(processedParams),
+      personnelCertificateBase(processedParams),
+      brigadeItemLocationDistribution(processedParams),
+      brigadeDifficultyDistribution(processedParams),
+      brigadeSupervisorDistribution(processedParams),
+      brigadeMissCheckReasonDistribution(processedParams),
+      brigadeOperatingYearsDistribution(processedParams),
+      tenureListAll(processedParams)
+    ])
+
+    if (supervisorRes.value?.data) {
+      rankData1.length = 0
+      supervisorRes.value.data.slice(0, 10).forEach(item => {
+        rankData1.push({
+          name: item.supervisorName || item.name || '',
+          value: item.totalCount || item.value || 0
+        })
+      })
+    }
+
+    if (teamRes.value?.data) {
+      rankData2.length = 0
+      teamRes.value.data.slice(0, 10).forEach(item => {
+        rankData2.push({
+          name: item.teamLeaderName || item.name || '',
+          value: item.totalCount || item.value || 0
+        })
+      })
+    }
+
+    if (userRes.value?.data) {
+      rankData3.length = 0
+      userRes.value.data.slice(0, 10).forEach(item => {
+        rankData3.push({
+          name: item.userName || item.name || '',
+          value: item.totalCount || item.value || 0
+        })
+      })
+    }
+
+    if (genderRes.value?.data) {
+      const genderData = genderRes.value.data.map(item => ({
+        name: item.gender || item.name || '',
+        value: item.count || item.value || 0
+      }))
+      setOption4(pieChartOption(genderData, ['#ec4899', '#3b82f6']))
+    }
+
+    if (certDetailRes.value?.data) {
+      const certData = certDetailRes.value.data.map(item => ({
+        name: item.certificateLevel || item.name || '',
+        value: item.count || item.value || 0
+      }))
+      setOption5(pieChartOption(certData, ['#22c55e', '#3b82f6']))
+    }
+
+    if (certBaseRes.value?.data) {
+      const baseData = certBaseRes.value.data.map(item => ({
+        name: item.certificateLevel || item.name || '',
+        value: item.count || item.value || 0
+      }))
+      setOption6(pieChartOption(baseData, ['#22c55e', '#3b82f6']))
+    }
+
+    if (locationRes.value?.data) {
+      const colors = ['#8b5cf6', '#ec4899', '#f97316', '#22c55e', '#3b82f6', '#14b8a6', '#ef4444', '#fbbf24', '#6366f1', '#06b6d4', '#84cc16', '#e11d48']
+      const locationData = locationRes.value.data.map(item => ({
+        name: item.itemLocation || item.name || '',
+        value: item.count || item.value || 0
+      }))
+      setOption7(donutChartOption(locationData, colors))
+    }
+
+    if (difficultyRes.value?.data) {
+      let difficult = 0
+      let simple = 0
+      difficultyRes.value.data.forEach(item => {
+        if (item.difficultyLevel === '难') {
+          difficult = item.count || item.value || 0
+        } else if (item.difficultyLevel === '简单') {
+          simple = item.count || item.value || 0
+        }
+      })
+      difficultValue.value = difficult
+      simpleValue.value = simple
+    }
+
+    if (supervisorDistRes.value?.data) {
+      const colors = ['#3b82f6', '#22c55e', '#f97316', '#ec4899', '#8b5cf6', '#14b8a6', '#ef4444', '#fbbf24', '#6366f1', '#06b6d4', '#84cc16', '#e11d48', '#a855f7', '#f59e0b']
+      const supervisorData = supervisorDistRes.value.data.map(item => ({
+        name: item.supervisorName || item.name || '',
+        value: item.totalCount || item.value || 0
+      }))
+      setOption10(donutChartOption(supervisorData, colors))
+    }
+
+    if (reasonRes.value?.data) {
+      const colors = ['#3b82f6', '#22c55e', '#f97316', '#ec4899', '#8b5cf6', '#14b8a6', '#ef4444', '#fbbf24']
+      const reasonData = reasonRes.value.data.map(item => ({
+        name: item.missCheckReasonCategory || '',
+        value: item.count || 0
+      }))
+      setOption11(pieChartOption(reasonData, colors))
+    }
+
+    if (yearsRes.value?.data) {
+      const colors = ['#3b82f6', '#22c55e', '#f97316', '#ec4899', '#8b5cf6', '#14b8a6']
+      const yearsData = yearsRes.value.data.map(item => ({
+        name: item.operatingYears || '',
+        value: item.count || 0
+      }))
+      setOption12(pieChartOption(yearsData, colors))
+    }
+
+    if (tenureRes.value?.data) {
+      const xAxisData = tenureRes.value.data.map(item => item.brigadeName || '')
+      const seriesData = [
+        {
+          name: '5年及以上',
+          data: tenureRes.value.data.map(item => item.cntGe5Year || 0),
+          color: '#3b82f6'
+        },
+        {
+          name: '4年',
+          data: tenureRes.value.data.map(item => item.cnt4Years || 0),
+          color: '#22c55e'
+        },
+        {
+          name: '3年',
+          data: tenureRes.value.data.map(item => item.cnt3Years || 0),
+          color: '#f97316'
+        },
+        {
+          name: '2年',
+          data: tenureRes.value.data.map(item => item.cnt2Years || 0),
+          color: '#ec4899'
+        },
+        {
+          name: '1年',
+          data: tenureRes.value.data.map(item => item.cnt1Years || 0),
+          color: '#8b5cf6'
+        },
+        {
+          name: '不足1年',
+          data: tenureRes.value.data.map(item => item.cntLt1Year || 0),
+          color: '#14b8a6'
+        }
+      ]
+      setOption13(multiSeriesBarChartOption(xAxisData, seriesData))
+    }
+  } catch (error) {
+    console.error('获取数据失败:', error)
+  } finally {
+    loading.value = false
+  }
+}
+
+watch(() => props.filterParams, () => {
+  fetchData()
+}, { deep: true })
+
+const pieChartOption = (data, colors) => ({
+  color: colors,
+  tooltip: { trigger: 'item', formatter: '{b}: {c}' },
+  legend: {
+    data: data.map(item => item.name),
+    top: '0%',
+    textStyle: { fontSize: 10 }
+  },
+  series: [{
+    type: 'pie',
+    radius: ['35%', '45%'],
+    center: ['50%', '55%'],
+    data: data,
+    label: {
+      show: true,
+      formatter: '{b}\n{c} ({d}%)',
+      fontSize: 10
+    },
+  }]
+})
+
+const donutChartOption = (data, colors) => ({
+  color: colors,
+  tooltip: { trigger: 'item', formatter: '{b}: {c}' },
+  legend: {
+    data: data.map(item => item.name),
+    top: '0%',
+    textStyle: { fontSize: 10 }
+  },
+  series: [{
+    type: 'pie',
+    radius: ['30%', '55%'],
+    center: ['50%', '55%'],
+    data: data,
+    label: {
+      show: true,
+      position: 'outside',
+      formatter: (params) => {
+        const total = data.reduce((sum, item) => sum + item.value, 0)
+        const percentage = ((params.value / total) * 100).toFixed(2)
+        return `${params.name} ${params.value}(${percentage}%)`
+      },
+      fontSize: 10
+    }
+  }]
+})
+
+const multiBarChartOption = (data, color) => ({
+  grid: { left: '15%', top: '15%', right: '5%', bottom: '15%', containLabel: true },
+  xAxis: { type: 'category', data: data.map(d => d.name), axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' } },
+  yAxis: { type: 'value', axisLine: { lineStyle: { color: '#999' } }, axisLabel: { fontSize: 10, color: '#666' }, splitLine: { lineStyle: { color: '#eee' } } },
+  series: [{ type: 'bar', data: data.map(d => d.value), itemStyle: { color: color }, barWidth: 20 }]
+})
+
+const multiSeriesBarChartOption = (xAxisData, series) => ({
+  grid: { left: '10%', top: '15%', right: '5%', bottom: '15%', containLabel: true },
+  xAxis: {
+    type: 'category',
+    data: xAxisData,
+    axisLine: { lineStyle: { color: '#999' } },
+    axisLabel: { fontSize: 10, color: '#666' }
+  },
+  yAxis: {
+    type: 'value',
+    axisLine: { lineStyle: { color: '#999' } },
+    axisLabel: { fontSize: 10, color: '#666' },
+    splitLine: { lineStyle: { color: '#eee' } }
+  },
+  legend: {
+    data: series.map(s => s.name),
+    top: '0%',
+    textStyle: { fontSize: 10 }
+  },
+  series: series.map(s => ({
+    name: s.name,
+    type: 'bar',
+    data: s.data,
+    itemStyle: { color: s.color },
+    barWidth: 15,
+    label: { show: true, position: 'top', fontSize: 9, color: s.color }
+  }))
+})
+
+onMounted(() => {
+  fetchData()
+
+})
+</script>
+
+<style lang="less" scoped>
+.module-brigade-content {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  overflow-y: auto;
+}
+
+.chart-row {
+  display: flex;
+  gap: 10px;
+  flex-shrink: 0;
+}
+
+.chart-item {
+  flex: 1;
+  background: #fff;
+  border-radius: 6px;
+  padding: 15px;
+  border: 1px solid #eee;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  display: flex;
+  flex-direction: column;
+  min-height: 320px;
+}
+
+.chart-title {
+  font-size: 17px;
+  color: black;
+  margin-bottom: 5px;
+  text-align: left;
+}
+
+.echarts {
+  flex: 1;
+  width: 100%;
+  min-height: 0;
+}
+
+.number-display {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.number-value {
+  font-size: 48px;
+  font-weight: bold;
+  color: #3b82f6;
+}
+
+.number-unit {
+  font-size: 14px;
+  color: #3b82f6;
+  margin-top: 5px;
+}
+</style>

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

@@ -0,0 +1,57 @@
+<template>
+  <div class="module-container">
+    <div class="module-header">
+      <span class="module-title">{{ title }}</span>
+    </div>
+    <div class="module-content">
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script setup>
+defineProps({
+  title: {
+    type: String,
+    default: ''
+  }
+})
+</script>
+
+<style lang="less" scoped>
+.module-container {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  // background: rgba(13, 80, 122, 0.3);
+  // border: 1px solid rgba(112, 207, 231, 0.3);
+  // border-radius: 4px;
+
+}
+
+.module-header {
+  width: 100%;
+  padding: 10px;
+  display: flex;
+  align-items: center;
+  text-align: center;
+  border: 1px solid #eee;
+  justify-content: center;
+  margin-bottom: 10px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+}
+
+.module-title {
+  font-size: 27px;
+  font-weight: 600;
+  color: #2E75B6;
+  text-align: center;
+}
+
+.module-content {
+  flex: 1;
+
+
+}
+</style>

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

@@ -0,0 +1,419 @@
+<template>
+  <module-container title="模块四 放行速率分析">
+    <div class="module-four-content">
+      <div class="chart-row">
+        <div class="chart-item">
+          <div class="chart-title">T1航站楼放行速率</div>
+          <div ref="rateChart1" class="echarts"></div>
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">T2航站楼放行速率</div>
+          <div ref="rateChart2" class="echarts"></div>
+        </div>
+      </div>
+      <div class="chart-row">
+        <div class="chart-item">
+          <div class="chart-title">大队总平均速率对比（国内）</div>
+          <div ref="rateChart3" class="echarts"></div>
+        </div>
+        <div class="chart-item">
+          <div class="chart-title">大队总平均速率对比（国际+中转）</div>
+          <div ref="rateChart4" class="echarts"></div>
+        </div>
+      </div>
+    </div>
+  </module-container>
+</template>
+
+<script setup>
+import { ref, onMounted, onBeforeUnmount, watch } from 'vue'
+import * as echarts from 'echarts'
+import ModuleContainer from './ModuleContainer.vue'
+import { useEcharts } from '@/hooks/chart.js'
+import { t1RateStats, t2RateStats, insideRateStats, outsideRateStats } from '@/api/blockingData/blockingDataScreen.js'
+import { formatDateHy } from '@/utils/index.js'
+
+// 接收筛选参数
+const props = defineProps({
+  filterParams: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const rateChart1 = ref(null)
+const rateChart2 = ref(null)
+const rateChart3 = ref(null)
+const rateChart4 = ref(null)
+
+const { setOption: setOption1 } = useEcharts(rateChart1)
+const { setOption: setOption2 } = useEcharts(rateChart2)
+const { setOption: setOption3 } = useEcharts(rateChart3)
+const { setOption: setOption4 } = useEcharts(rateChart4)
+
+// 处理filterParams，将dateRange拆分为startTime和endTime
+const processFilterParams = (params) => {
+  const { dateRange, ...rest } = params
+  const processed = { ...rest }
+
+  if (dateRange && Array.isArray(dateRange) && dateRange.length === 2) {
+    processed.startDate = formatDateHy(dateRange[0])
+    processed.endDate = formatDateHy(dateRange[1])
+  }
+  if (processed.brigadeId == 'all') {
+    delete processed.brigadeId
+  }
+  if (processed.terminalId == 'all') {
+    delete processed.terminalId
+  }
+
+  return processed
+}
+
+// 数据加载函数
+const loadData = async () => {
+  try {
+    const queryParams = processFilterParams(props.filterParams)
+    console.log('查询参数:', queryParams)
+
+    // 并行请求所有速率数据
+    const [t1RateRes, t2RateRes, insideRateRes, outsideRateRes] = await Promise.allSettled([
+      t1RateStats(queryParams),
+      t2RateStats(queryParams),
+      insideRateStats(queryParams),
+      outsideRateStats(queryParams)
+    ])
+
+    console.log('T1速率响应:', t1RateRes)
+    console.log('T2速率响应:', t2RateRes)
+    console.log('国内速率响应:', insideRateRes)
+    console.log('国际中转速率响应:', outsideRateRes)
+
+    // T1航站楼放行速率
+    const t1RateData = t1RateRes?.value?.data || []
+    console.log('T1速率数据:', t1RateData)
+    console.log('T1速率数据长度:', t1RateData.length)
+    console.log('T1速率数据类型:', typeof t1RateData)
+    console.log('T1速率数据是否为数组:', Array.isArray(t1RateData))
+    console.log('T1速率数据:', t1RateData)
+    if (t1RateData.length > 0) {
+      const dates = [...new Set(t1RateData.map(d => d.statDate))].sort()
+      
+      const seriesData = [
+        {
+          name: 'T1-A区速率（高峰期时段）',
+          type: 'line',
+          data: dates.map(date => {
+            const item = t1RateData.find(d => d.statDate === date)
+            return item ? item.t1AAreaRatePeak : 0
+          }),
+          itemStyle: { color: '#3b82f6' },
+          lineStyle: { width: 3 },
+          symbol: 'circle',
+          symbolSize: 8
+        },
+        {
+          name: 'T1-B区速率（高峰期时段）',
+          type: 'line',
+          data: dates.map(date => {
+            const item = t1RateData.find(d => d.statDate === date)
+            return item ? item.t1BAreaRatePeak : 0
+          }),
+          itemStyle: { color: '#22c55e' },
+          lineStyle: { width: 3 },
+          symbol: 'circle',
+          symbolSize: 8
+        }
+      ]
+
+      console.log('准备设置T1图表选项')
+      console.log('日期数据:', dates)
+      console.log('系列数据:', seriesData)
+
+      setOption1({
+        tooltip: {
+          trigger: 'axis',
+          formatter: function(params) {
+            let result = params[0].name + '<br/>'
+            params.forEach(param => {
+              result += `${param.marker} ${param.seriesName}: ${param.value} 件/小时<br/>`
+            })
+            return result
+          }
+        },
+        legend: {
+          data: ['T1-A区速率（高峰期时段）', 'T1-B区速率（高峰期时段）']
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: dates,
+          axisLabel: {
+            rotate: 45
+          }
+        },
+        yAxis: {
+          type: 'value',
+          name: '速率',
+          axisLabel: {
+            formatter: '{value} 件/小时'
+          }
+        },
+        series: seriesData
+      })
+      console.log('T1图表设置完成')
+    }
+
+    // T2航站楼放行速率
+    const t2RateData = t2RateRes?.value?.data || []
+    if (t2RateData.length > 0) {
+      const dates = [...new Set(t2RateData.map(d => d.statDate))].sort()
+      
+      const seriesData = [
+        {
+          name: 'T2-国内速率（高峰期时段）',
+          type: 'line',
+          data: dates.map(date => {
+            const item = t2RateData.find(d => d.statDate === date)
+            return item ? item.t2DomesticRatePeak : 0
+          }),
+          itemStyle: { color: '#3b82f6' },
+          lineStyle: { width: 3 },
+          symbol: 'circle',
+          symbolSize: 8
+        },
+        {
+          name: 'T2-国际速率（高峰期时段）',
+          type: 'line',
+          data: dates.map(date => {
+            const item = t2RateData.find(d => d.statDate === date)
+            return item ? item.t2InternationalRatePeak : 0
+          }),
+          itemStyle: { color: '#22c55e' },
+          lineStyle: { width: 3 },
+          symbol: 'circle',
+          symbolSize: 8
+        }
+      ]
+
+      setOption2({
+        tooltip: {
+          trigger: 'axis',
+          formatter: function(params) {
+            let result = params[0].name + '<br/>'
+            params.forEach(param => {
+              result += `${param.marker} ${param.seriesName}: ${param.value} 件/小时<br/>`
+            })
+            return result
+          }
+        },
+        legend: {
+          data: ['T2-国内速率（高峰期时段）', 'T2-国际速率（高峰期时段）']
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: dates,
+          axisLabel: {
+            rotate: 45
+          }
+        },
+        yAxis: {
+          type: 'value',
+          name: '速率',
+          axisLabel: {
+            formatter: '{value} 件/小时'
+          }
+        },
+        series: seriesData
+      })
+    }
+
+    // 大队总平均速率对比（国内）
+    const insideRateData = insideRateRes?.value?.data || []
+    if (insideRateData.length > 0) {
+      const dates = [...new Set(insideRateData.map(d => d.statDate))].sort()
+      const brigadeNames = [...new Set(insideRateData.map(d => d.dutyBrigadeName))]
+      
+      const seriesData = brigadeNames.map((brigade, index) => ({
+        name: brigade,
+        type: 'line',
+        data: dates.map(date => {
+          const item = insideRateData.find(d => d.statDate === date && d.dutyBrigadeName === brigade)
+          return item ? item.avgRatePeak : 0
+        }),
+        itemStyle: {
+          color: ['#3b82f6', '#22c55e', '#f97316', '#ec4899', '#8b5cf6'][index % 5]
+        },
+        lineStyle: { width: 3 },
+        symbol: 'circle',
+        symbolSize: 8
+      }))
+
+      setOption3({
+        tooltip: {
+          trigger: 'axis',
+          formatter: function(params) {
+            let result = params[0].name + '<br/>'
+            params.forEach(param => {
+              result += `${param.marker} ${param.seriesName}: ${param.value} 件/小时<br/>`
+            })
+            return result
+          }
+        },
+        legend: {
+          data: brigadeNames
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: dates,
+          axisLabel: {
+            rotate: 45
+          }
+        },
+        yAxis: {
+          type: 'value',
+          name: '速率',
+          axisLabel: {
+            formatter: '{value} 件/小时'
+          }
+        },
+        series: seriesData
+      })
+    }
+
+    // 大队总平均速率对比（国际+中转）
+    const outsideRateData = outsideRateRes?.value?.data || []
+    if (outsideRateData.length > 0) {
+      const dates = [...new Set(outsideRateData.map(d => d.statDate))].sort()
+      const brigadeNames = [...new Set(outsideRateData.map(d => d.dutyBrigadeName))]
+      
+      const seriesData = brigadeNames.map((brigade, index) => ({
+        name: brigade,
+        type: 'line',
+        data: dates.map(date => {
+          const item = outsideRateData.find(d => d.statDate === date && d.dutyBrigadeName === brigade)
+          return item ? item.avgRatePeak : 0
+        }),
+        itemStyle: {
+          color: ['#3b82f6', '#22c55e', '#f97316', '#ec4899', '#8b5cf6'][index % 5]
+        },
+        lineStyle: { width: 3 },
+        symbol: 'circle',
+        symbolSize: 8
+      }))
+
+      setOption4({
+        tooltip: {
+          trigger: 'axis',
+          formatter: function(params) {
+            let result = params[0].name + '<br/>'
+            params.forEach(param => {
+              result += `${param.marker} ${param.seriesName}: ${param.value} 件/小时<br/>`
+            })
+            return result
+          }
+        },
+        legend: {
+          data: brigadeNames
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: dates,
+          axisLabel: {
+            rotate: 45
+          }
+        },
+        yAxis: {
+          type: 'value',
+          name: '速率',
+          axisLabel: {
+            formatter: '{value} 件/小时'
+          }
+        },
+        series: seriesData
+      })
+    }
+
+  } catch (error) {
+    console.error('加载速率数据失败:', error)
+  }
+}
+
+// 监听筛选参数变化
+watch(() => props.filterParams, () => {
+  loadData()
+}, { deep: true })
+
+
+
+onMounted(() => {
+  loadData()
+})
+</script>
+
+<style lang="less" scoped>
+.module-four-content {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+.chart-row {
+  flex: 1;
+  display: flex;
+  gap: 10px;
+  min-height: 400px;
+  height: 400px;
+}
+
+.chart-item {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  background: #fff;
+  border-radius: 6px;
+  padding: 15px;
+  border: 1px solid #eee;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  min-height: 400px;  /* 400px */
+  height: 100%;
+}
+
+.chart-title {
+  font-size: 17px;
+  color: black;
+  margin-bottom: 5px;
+  text-align: left;
+}
+
+.echarts {
+  flex: 1;
+  width: 100%;
+  min-height: 400px;  /* 400px */
+  height: 400px;
+}
+</style>

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

@@ -0,0 +1,167 @@
+<template>
+  <module-container title="模块三 培训质控分析">
+    <div class="module-three-content">
+      <div class="chart-card">
+        <div class="chart-title">查堵-人员自测漏检次数（总累积）</div>
+        <div ref="chart1" class="echarts"></div>
+      </div>
+      <div class="chart-card">
+        <div class="chart-title">查堵培训-人员月考成绩（总累积）</div>
+        <div ref="chart2" class="echarts"></div>
+      </div>
+    </div>
+  </module-container>
+</template>
+
+<script setup>
+import { ref, onMounted, watch } from 'vue'
+import * as echarts from 'echarts'
+import ModuleContainer from './ModuleContainer.vue'
+import { useEcharts } from '@/hooks/chart.js'
+import { monthlyAssessment, selfTestHasMissCheck } from '@/api/blockingData/blockingDataScreen.js'
+import { formatDateHy } from '@/utils/index.js'
+
+// 接收筛选参数
+const props = defineProps({
+  filterParams: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const chart1 = ref(null)
+const chart2 = ref(null)
+
+const { setOption: setOption1 } = useEcharts(chart1)
+const { setOption: setOption2 } = useEcharts(chart2)
+
+// 处理filterParams，将dateRange拆分为startTime和endTime
+const processFilterParams = (params) => {
+  const { dateRange, ...rest } = params
+  const processed = { ...rest }
+
+  if (dateRange && Array.isArray(dateRange) && dateRange.length === 2) {
+    processed.startDate = formatDateHy(dateRange[0])
+    processed.endDate = formatDateHy(dateRange[1])
+  }
+  if (processed.brigadeId == 'all') {
+    delete processed.brigadeId
+  }
+  if (processed.terminalId == 'all') {
+    delete processed.terminalId
+  }
+
+  return processed
+}
+
+// 数据加载函数
+const loadData = async () => {
+  try {
+    const queryParams = processFilterParams(props.filterParams)
+
+    // 并行请求培训质控数据
+    const [selfTestRes, monthlyAssessmentRes] = await Promise.allSettled([
+      selfTestHasMissCheck(queryParams),
+      monthlyAssessment(queryParams)
+    ])
+
+    // 查堵-人员自测漏检次数（总累积）
+    const selfTestData = selfTestRes?.value?.data || []
+
+    if (selfTestData.length > 0) {
+      setOption1(ringPieOption(
+        selfTestData.map(item => ({
+          name: item.name || item.level || '未知',
+          value: item.total || item.count || 0
+        })),
+        ['#3b82f6', '#22c55e', '#f97316', '#cbd5e1']
+      ))
+    }
+
+    // 查堵培训-人员月考成绩（总累积）
+    const monthlyAssessmentData = monthlyAssessmentRes?.value?.data || []
+    if (monthlyAssessmentData.length > 0) {
+      setOption2(ringPieOption(
+        monthlyAssessmentData.map(item => ({
+          name: item.name || item.grade || '未知',
+          value: item.total || item.count || 0
+        })),
+        ['#64748b', '#ef4444', '#22c55e', '#3b82f6', '#cbd5e1']
+      ))
+    }
+
+  } catch (error) {
+    console.error('加载培训质控数据失败:', error)
+  }
+}
+
+// 监听筛选参数变化
+watch(() => props.filterParams, () => {
+  loadData()
+}, { deep: true })
+
+const ringPieOption = (data, colors, centerOffset = ['50%', '55%']) => ({
+  color: colors,
+  legend: {
+    data: data.map(item => item.name),
+    top: '0%',
+    textStyle: { fontSize: 10 }
+  },
+  series: [{
+    type: 'pie',
+    radius: ['45%', '70%'],
+    center: centerOffset,
+    data: data,
+    label: {
+      show: true,
+      formatter: '{b}\n{c} ({d}%)',
+      fontSize: 10
+    },
+    labelLine: {
+      show: true,
+      length: 15,
+      length2: 10
+    }
+  }]
+})
+
+onMounted(() => {
+  loadData()
+})
+</script>
+
+<style lang="less" scoped>
+.module-three-content {
+  height: 100%;
+  display: flex;
+  gap: 10px;
+
+}
+
+.chart-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);
+  display: flex;
+  flex-direction: column;
+  min-height: 400px;  /* 400px */
+  height: 100%;
+}
+
+.chart-title {
+  font-size: 17px;
+  color: black;
+  margin-bottom: 5px;
+  text-align: left;
+}
+
+.echarts {
+  flex: 1;
+  width: 100%;
+  min-height: 400px;  /* 400px */
+  height: 400px;
+}
+</style>

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

@@ -0,0 +1,457 @@
+<template>
+  <module-container title="模块二 查堵人员分析">
+    <div class="module-two-content">
+      <div class="top-row">
+        <div class="table-card">
+          <div class="chart-title">查堵-主管排行榜</div>
+          <rank-list :rank-data="rankData1" title="查堵-主管排行榜" header-label="排名" header-name="分管主管" header-count="计数" />
+        </div>
+        <div class="table-card">
+          <div class="chart-title">查堵-班组排行榜</div>
+          <rank-list :rank-data="rankData2" title="查堵-班组排行榜" header-label="排名" header-name="分管班组长" header-count="计数" />
+        </div>
+        <div class="table-card">
+          <div class="chart-title">查堵-人员排行榜</div>
+          <rank-list :rank-data="rankData3" title="查堵-人员排行榜" header-label="排名" header-name="被回查人" header-count="计数" />
+        </div>
+      </div>
+
+      <div class="middle-row">
+        <div class="chart-card">
+          <div class="chart-title">查堵-物品位置分布</div>
+          <div ref="chart1" class="echarts"></div>
+        </div>
+        <div class="chart-card">
+          <div class="chart-title">查堵-原因分类</div>
+          <div ref="chart2" class="echarts"></div>
+        </div>
+      </div>
+
+      <div class="bottom-row">
+        <div class="chart-card">
+          <div class="chart-title">查堵-开机人员年限分布</div>
+          <div ref="chart3" class="echarts"></div>
+        </div>
+        <div class="chart-card">
+          <div class="chart-title">查堵-开机人员性别比例</div>
+          <div ref="chart4" class="echarts"></div>
+        </div>
+        <div class="chart-card">
+          <div class="chart-title">查堵-图像难易程度比例</div>
+          <div ref="chart5" class="echarts"></div>
+        </div>
+      </div>
+
+      <div class="extra-row">
+        <div class="chart-card">
+          <div class="chart-title">大队开机人员年限分布</div>
+          <div ref="chart6" class="echarts"></div>
+        </div>
+        <div class="chart-card">
+          <div class="chart-title">大队开机人员证书分布</div>
+          <div ref="chart7" class="echarts"></div>
+        </div>
+      </div>
+    </div>
+  </module-container>
+</template>
+
+<script setup>
+import { ref, onMounted, reactive, watch } from 'vue'
+import * as echarts from 'echarts'
+import ModuleContainer from './ModuleContainer.vue'
+import RankList from './RankList.vue'
+import { useEcharts } from '@/hooks/chart.js'
+import {
+  supervisorRanking,
+  teamLeaderRanking,
+  reviewedUserRanking,
+  itemLocationDistribution,
+  missCheckReasonDistribution,
+  brigadeOperatingYearsDistribution,
+  brigadeGenderDistribution,
+  brigadeDifficultyDistribution,
+  brigadeCertificateDistribution,
+  tenureListAll
+} from '@/api/blockingData/blockingDataScreen.js'
+import { formatDateHy } from '@/utils/index.js'
+// 接收筛选参数
+const props = defineProps({
+  filterParams: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const chart1 = ref(null)
+const chart2 = ref(null)
+const chart3 = ref(null)
+const chart4 = ref(null)
+const chart5 = ref(null)
+const chart6 = ref(null)
+const chart7 = ref(null)
+
+const { setOption: setOption1 } = useEcharts(chart1)
+const { setOption: setOption2 } = useEcharts(chart2)
+const { setOption: setOption3 } = useEcharts(chart3)
+const { setOption: setOption4 } = useEcharts(chart4)
+const { setOption: setOption5 } = useEcharts(chart5)
+const { setOption: setOption6 } = useEcharts(chart6)
+const { setOption: setOption7 } = useEcharts(chart7)
+// 处理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 loadData = async () => {
+  try {
+    const queryParams = processFilterParams(props.filterParams)
+
+    // 排行榜数据
+    const [supervisorRankRes, teamLeaderRankRes, reviewedUserRankRes] = await Promise.allSettled([
+      supervisorRanking(queryParams),
+      teamLeaderRanking(queryParams),
+      reviewedUserRanking(queryParams)
+    ])
+
+    // 更新排行榜数据
+    if (supervisorRankRes?.value?.data) {
+      rankData1.splice(0, rankData1.length, ...supervisorRankRes.value.data.map((item, index) => ({
+        name: item.name || '未知',
+        value: item.totalCount || 0
+      })))
+    }
+
+    if (teamLeaderRankRes?.value?.data) {
+      rankData2.splice(0, rankData2.length, ...teamLeaderRankRes.value.data.map((item, index) => ({
+        name: item.name || '未知',
+        value: item.totalCount || 0
+      })))
+    }
+
+    if (reviewedUserRankRes?.value?.data) {
+      rankData3.splice(0, rankData3.length, ...reviewedUserRankRes.value.data.map((item, index) => ({
+        name: item.name || '未知',
+        value: item.totalCount || 0
+      })))
+    }
+
+    // 图表数据
+    const [itemLocationRes, missCheckReasonRes, operatingYearsRes, genderRes, difficultyRes, certificateRes, tenureListRes] = await Promise.allSettled([
+      itemLocationDistribution(queryParams),
+      missCheckReasonDistribution(queryParams),
+      brigadeOperatingYearsDistribution(queryParams),
+      brigadeGenderDistribution(queryParams),
+      brigadeDifficultyDistribution(queryParams),
+      brigadeCertificateDistribution(queryParams),
+      tenureListAll(queryParams)
+    ])
+
+    // 设置图表数据
+    setOption1(pieOption(
+      itemLocationRes?.value?.data?.map(item => ({
+        name: item.itemLocation || '未知',
+        value: item.count || 0
+      })) || [],
+      ['#3b82f6', '#22c55e', '#f97316', '#ec4899', '#8b5cf6', '#14b8a6', '#64748b']
+    ))
+
+    setOption2(pieOption(
+      missCheckReasonRes?.value?.data?.map(item => ({
+        name: item.missCheckReasonCategory || item.reason || '未知',
+        value: item.value || item.count || 0
+      })) || [],
+      ['#ef4444', '#f97316', '#eab308', '#22c55e', '#3b82f6', '#64748b'],
+      true
+    ))
+
+    setOption3(barOption(
+      operatingYearsRes?.value?.data?.map(item => ({
+        name: item.operatingYears || '未知',
+        value: item.count || 0
+      })) || [],
+      ['#3b82f6', '#60a5fa', '#93c5fd', '#bfdbfe', '#dbeafe', '#eff6ff']
+    ))
+    setOption4(pieOption(
+      genderRes?.value?.data?.map(item => ({
+        name: item.gender || '未知',
+        value: item.count || 0
+      })) || [],
+      ['#3b82f6', '#ec4899']
+    ))
+
+    setOption5(pieOption(
+      difficultyRes?.value?.data?.map(item => ({
+        name: item.difficultyLevel || '未知',
+        value: item.count || 0
+      })) || [],
+      ['#93c5fd', '#3b82f6', '#64748b', '#e2e8f0']
+    ))
+
+    // 大队开机人员年限分布
+    const tenureListData = tenureListRes?.value?.data || []
+    if (tenureListData.length > 0) {
+      const categories = [...new Set(tenureListData.map(item => item.brigadeName))]
+      const tenureLevels = [
+        { name: '1年', key: 'cnt1Years' },
+        { name: '2年', key: 'cnt2Years' },
+        { name: '3年', key: 'cnt3Years' },
+        { name: '4年', key: 'cnt4Years' },
+        { name: '5年', key: 'cntGe5Year' }
+      ]
+
+      const seriesData = tenureLevels.map(level => ({
+        name: level.name,
+        type: 'bar',
+        data: categories.map(brigade => {
+          const item = tenureListData.find(d => d.brigadeName === brigade)
+          return item ? item[level.key] : 0
+        }),
+        itemStyle: {
+          color: ['#3b82f6', '#22c55e', '#f97316', '#ec4899', '#8b5cf6'][tenureLevels.indexOf(level) % 5]
+        },
+        barWidth: 15,
+        label: { show: true, position: 'top', fontSize: 9 }
+      }))
+
+      setOption6({
+        grid: { left: '15%', top: '10%', right: '5%', bottom: '15%', containLabel: true },
+        xAxis: {
+          type: 'category',
+          data: categories,
+          axisLabel: { fontSize: 9 },
+          axisTick: {
+            alignWithLabel: true
+          }
+        },
+        yAxis: { type: 'value', axisLabel: { fontSize: 9 } },
+        legend: { top: 0, right: 10, textStyle: { fontSize: 9 } },
+        series: seriesData
+      })
+    }
+
+    // 大队开机人员证书分布
+    const certificateData = certificateRes?.value?.data || []
+    if (certificateData.length > 0) {
+      const certificateCategories = ['高级证书', '中级证书', '初级证书']
+      const brigadeNames = [...new Set(certificateData.map(item => item.brigadeName))]
+
+      const certificateSeriesData = brigadeNames.map((brigadeName, index) => {
+        const brigadeData = certificateData.find(d => d.brigadeName === brigadeName)
+        return {
+          name: brigadeName,
+          type: 'bar',
+          data: [
+            brigadeData?.seniorCount || 0,
+            brigadeData?.middleCount || 0,
+            brigadeData?.juniorCount || 0
+          ],
+          itemStyle: {
+            color: ['#3b82f6', '#22c55e', '#f97316', '#ec4899', '#8b5cf6', '#14b8a6'][index % 6]
+          },
+          barWidth: 20,
+          label: { show: true, position: 'top', fontSize: 9 }
+        }
+      })
+
+      setOption7({
+        grid: { left: '15%', top: '10%', right: '5%', bottom: '15%', containLabel: true },
+        xAxis: {
+          type: 'category',
+          data: certificateCategories,
+          axisLabel: { fontSize: 10 },
+          axisLine: { lineStyle: { color: '#999' } }
+        },
+        yAxis: {
+          type: 'value',
+          axisLabel: { fontSize: 10 },
+          axisLine: { lineStyle: { color: '#999' } },
+          splitLine: { lineStyle: { color: '#eee' } }
+        },
+        legend: {
+          top: 0,
+          right: 10,
+          textStyle: { fontSize: 10 }
+        },
+        series: certificateSeriesData
+      })
+    }
+
+  } catch (error) {
+    console.error('加载数据失败:', error)
+  }
+}
+
+// 监听筛选参数变化
+watch(() => props.filterParams, () => {
+  loadData()
+}, { deep: true })
+
+const rankData1 = reactive([
+
+])
+
+const rankData2 = reactive([
+
+])
+
+const rankData3 = reactive([
+
+])
+
+const pieOption = (data, colors, isRing = false) => ({
+  color: colors,
+  legend: {
+    orient: 'horizontal',
+    top: 'top',
+    textStyle: { fontSize: 10 }
+  },
+  series: [{
+    type: 'pie',
+    radius: isRing ? ['40%', '50%'] : '60%',
+    center: ['50%', '55%'],
+    data: data,
+    label: {
+      show: true,
+      formatter: '{b}\n{c} ({d}%)',
+      fontSize: 10
+    },
+
+  }]
+})
+
+const barOption = (data, colors) => ({
+  grid: { left: '15%', top: '10%', right: '5%', bottom: '10%', containLabel: true },
+  xAxis: { type: 'value', axisLabel: { fontSize: 9 } },
+  yAxis: { type: 'category', data: data.map(d => d.name), axisLabel: { fontSize: 9 } },
+  series: [{
+    type: 'bar',
+    data: data.map(d => d.value),
+    itemStyle: {
+      color: (params) => colors[params.dataIndex % colors.length]
+    },
+    barWidth: 15,
+    label: { show: true, position: 'right', fontSize: 10 }
+  }]
+})
+
+
+
+onMounted(() => {
+  loadData()
+})
+</script>
+
+<style lang="less" scoped>
+.module-two-content {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  overflow-y: auto;
+}
+
+.top-row,
+.middle-row,
+.bottom-row,
+.extra-row {
+  display: flex;
+  gap: 8px;
+  flex-shrink: 0;
+}
+
+.table-card {
+  flex: 1;
+  background: #fff;
+  border-radius: 6px;
+  padding: 8px;
+  border: 1px solid #eee;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  display: flex;
+  flex-direction: column;
+  min-height: 200px;
+}
+
+.chart-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);
+  display: flex;
+  flex-direction: column;
+  min-height: 400px;  
+}
+
+.chart-title {
+  font-size: 17px;
+  color: black;
+  margin-bottom: 5px;
+  text-align: left;
+}
+
+.rank-table {
+  flex: 1;
+  overflow-y: auto;
+}
+
+.rank-row {
+  display: flex;
+  align-items: center;
+  padding: 4px 6px;
+  border-bottom: 1px solid #f0f0f0;
+  font-size: 11px;
+}
+
+.rank-row:last-child {
+  border-bottom: none;
+}
+
+.rank-number {
+  width: 45px;
+  font-weight: bold;
+  margin-right: 8px;
+}
+
+.rank-1 {
+  color: #eab308;
+}
+
+.rank-2 {
+  color: #94a3b8;
+}
+
+.rank-3 {
+  color: #f97316;
+}
+
+.rank-name {
+  flex: 1;
+  color: #333;
+}
+
+.rank-value {
+  color: #666;
+}
+
+.echarts {
+  flex: 1;
+  width: 100%;
+  min-height: 250px;
+}
+</style>

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

@@ -0,0 +1,283 @@
+<template>
+  <div class="rank-list-container">
+    <div class="rank-list-header">
+      <span class="header-label">{{ headerLabel }}</span>
+      <span class="header-name">{{ headerName }}</span>
+      <span class="header-count">{{ headerCount }}</span>
+    </div>
+    <div class="rank-list-body">
+      <div v-for="(item, index) in rankedData" :key="index" class="rank-item" :class="getItemClass(item.rank, index)">
+        <span class="rank-number" :class="'rank-number-' + getRankClass(item.rank)">NO.{{ item.rank }}</span>
+        <div class="rank-info">
+          <span class="rank-name">{{ item.name }}</span>
+          <div class="rank-bar">
+            <div class="rank-bar-fill" :class="'rank-bar-fill-' + getRankClass(item.rank)" :style="{ width: getProgressWidth(item.value, maxValue) + '%' }"></div>
+          </div>
+        </div>
+        <span class="rank-count">{{ item.value }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+
+const props = defineProps({
+  rankData: {
+    type: Array,
+    default: () => []
+  },
+  title: {
+    type: String,
+    default: '排行榜'
+  },
+  headerLabel: {
+    type: String,
+    default: '排名'
+  },
+  headerName: {
+    type: String,
+    default: '分管班组长'
+  },
+  headerCount: {
+    type: String,
+    default: '计数'
+  }
+})
+
+const maxValue = computed(() => {
+  if (props.rankData.length === 0) return 100
+  return Math.max(...props.rankData.map(item => item.value))
+})
+
+// 计算并列排名（中国式排名：并列后下一个排名+1）
+const rankedData = computed(() => {
+  if (props.rankData.length === 0) return []
+  
+  // 按value降序排序
+  const sorted = [...props.rankData].sort((a, b) => b.value - a.value)
+  
+  let currentRank = 1
+  let previousValue = null
+  
+  return sorted.map((item) => {
+    // 如果当前value小于前一个value，排名+1
+    if (previousValue !== null && item.value < previousValue) {
+      currentRank++
+    }
+    previousValue = item.value
+    return {
+      ...item,
+      rank: currentRank
+    }
+  })
+})
+
+const getRankClass = (rank) => {
+  if (rank === 1) return 'first'
+  if (rank === 2) return 'second'
+  if (rank === 3) return 'third'
+  return 'default'
+}
+
+const getProgressWidth = (value, max) => {
+  return (value / max) * 100
+}
+
+const getItemClass = (rank, index) => {
+  const baseClass = 'rank-item rank-item-' + getRankClass(rank)
+  if (rank <= 3) return baseClass
+  const isGray = (index - 3) % 2 === 0
+  return baseClass + (isGray ? ' rank-item-gray' : '')
+}
+</script>
+
+<style lang="less" scoped>
+.rank-list-container {
+  width: 100%;
+  height: 400px; /* 固定高度 */
+  background: #fff;
+  border-radius: 8px;
+  border: 1px solid #e5e7eb;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden; /* 防止容器溢出 */
+}
+
+.rank-list-header {
+  display: flex;
+  align-items: center;
+  padding: 8px;
+  border-bottom: 1px solid #e5e7eb;
+ 
+  flex-shrink: 0; /* 防止头部被压缩 */
+}
+
+.header-label {
+  width: 80px;
+  font-size: 16px;
+  font-weight: 600;
+  color: #374151;
+}
+
+.header-name {
+  flex: 1;
+  font-size: 16px;
+  font-weight: 600;
+  color: #374151;
+}
+
+.header-count {
+  width: 80px;
+  text-align: right;
+  font-size: 16px;
+  font-weight: 600;
+  color: #374151;
+}
+
+.rank-list-body {
+  flex: 1;
+  overflow-y: auto; /* 启用垂直滚动 */
+
+  
+  /* 自定义滚动条样式 */
+  &::-webkit-scrollbar {
+    width: 6px;
+  }
+  
+  &::-webkit-scrollbar-track {
+    background: #f1f1f1;
+    border-radius: 3px;
+  }
+  
+  &::-webkit-scrollbar-thumb {
+    background: #c1c1c1;
+    border-radius: 3px;
+  }
+  
+  &::-webkit-scrollbar-thumb:hover {
+    background: #a8a8a8;
+  }
+}
+
+.rank-item {
+  display: flex;
+  align-items: center;
+  padding: 10px;
+  border-radius: 4px;
+  
+  min-height: 40px; /* 最小高度确保项目可见 */
+}
+
+.rank-item:last-child {
+  margin-bottom: 0;
+}
+
+.rank-item-first {
+  background-color: #fef9e7;
+}
+
+.rank-item-second {
+  background-color: #f3f4f6;
+}
+
+.rank-item-third {
+  background-color: #fef2f2;
+}
+
+.rank-item:hover {
+  background-color: #f9fafb;
+}
+
+.rank-item-gray {
+  background-color: #f3f4f6;
+}
+
+.rank-number {
+  font-weight: bold;
+  font-size: 15px;
+  padding: 4px 8px;
+  border-radius: 4px;
+  margin-right: 8px;
+  min-width: 60px;
+  text-align: center;
+}
+
+.rank-number-first {
+  background: linear-gradient(135deg, #EFB63D, #F8CA4D);
+  color: #fff;
+}
+
+.rank-number-second {
+  background: linear-gradient(135deg, #C4CAE1, #E0E4ED);
+  color: #fff;
+}
+
+.rank-number-third {
+  background: linear-gradient(135deg, #D6A089, #E9C0AF);
+  color: #fff;
+}
+
+.rank-number-default {
+  background-color: #e5e7eb;
+  color: #6b7280;
+}
+
+.rank-info {
+  flex: 1;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 8px;
+}
+
+.rank-name {
+  font-size: 15px;
+  color: #1f2937;
+  font-weight: 500;
+  min-width: 80px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.rank-bar {
+  flex: 1;
+  height: 12px;
+  background-color: #e5e7eb;
+  border-radius: 6px;
+  overflow: hidden;
+}
+
+.rank-bar-fill {
+  height: 100%;
+  border-radius: 6px;
+  transition: width 0.5s ease-out;
+}
+
+.rank-bar-fill-first {
+  background: #FFCA00;
+}
+
+.rank-bar-fill-second {
+  background: #C4C9DF;
+}
+
+.rank-bar-fill-third {
+  background: #D99B86;
+}
+
+.rank-bar-fill-default {
+  background: linear-gradient(90deg, #60a5fa, #3b82f6);
+}
+
+.rank-count {
+  width: 80px;
+  text-align: right;
+  font-size: 15px;
+  font-weight: 600;
+  color: #1f2937;
+  margin-left: 8px;
+}
+</style>

src/views/blockingData/blockingDataScreen/index.vue

@@ -0,0 +1,347 @@
+<template>
+  <div class="blocking-data-screen">
+    <div class="screen-header">
+      <div class="header-title">盛世鹰眸质控系统【查堵】</div>
+    </div>
+
+    <div class="filter-section">
+      <div class="filter-row">
+        <div class="filter-item">
+          <span class="filter-label">日期：</span>
+          <el-date-picker v-model="filterParams.dateRange" type="daterange" range-separator="-" start-placeholder="开始日期"
+            end-placeholder="结束日期" value-format="YYYY-MM-DD HH:mm:ss" :default-time="defaultTime"
+            style="width: 280px" />
+        </div>
+
+        <div class="filter-item">
+          <span class="filter-label">分管主管：</span>
+          <el-select v-model="filterParams.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>
+        </div>
+
+        <div class="filter-item">
+          <span class="filter-label">分管班组长：</span>
+          <el-select v-model="filterParams.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>
+        </div>
+        <div class="filter-item">
+          <span class="filter-label">航站楼：</span>
+          <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: 'name', label: 'name', children: 'children', disabled: data => data.children && data.children.length > 0 }"
+            value-key="id" placeholder="请选择漏检物品" check-strictly style="width: 200px" clearable @change="missCheckItemChange"/>
+        </div>
+
+        <div class="filter-item">
+          <span class="filter-label">分大队：</span>
+          <el-select v-model="filterParams.brigadeId" placeholder="请选择大队" clearable style="width: 200px">
+            <el-option v-for="item in brigadeOptions" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </div>
+        <!-- <div class="filter-actions">
+          <el-button type="primary" @click="handleFilter">查询</el-button>
+          <el-button @click="resetFilter">重置</el-button>
+        </div> -->
+      </div>
+
+
+    </div>
+
+    <div class="screen-content">
+      <div v-if="filterParams.brigadeId=='all'" class="grid-layout">
+        <div class="grid-item">
+          <module-one :filter-params="filterParams" />
+        </div>
+        <div class="grid-item">
+          <module-two :filter-params="filterParams" />
+        </div>
+        <div class="grid-item">
+          <module-three :filter-params="filterParams" />
+        </div>
+        <div class="grid-item">
+          <module-four :filter-params="filterParams" />
+        </div>
+      </div>
+      <div v-else class="grid-layout">
+        <div class="grid-item">
+          <module-brigade-one :filter-params="filterParams" />
+        </div>
+        <div class="grid-item">
+          <module-brigade-two :filter-params="filterParams" />
+        </div>
+        <div class="grid-item">
+          <module-brigade-three :filter-params="filterParams" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue'
+import { listDept } from '@/api/system/dept'
+import { selectUserLeaderListByCondition } from '@/api/system/user'
+import { listCategory } from '@/api/system/category'
+import { listPosition } from '@/api/system/position'
+import ModuleOne from './components/ModuleOne.vue'
+import ModuleTwo from './components/ModuleTwo.vue'
+import ModuleThree from './components/ModuleThree.vue'
+import ModuleFour from './components/ModuleFour.vue'
+import ModuleBrigadeOne from './components/ModuleBrigadeOne.vue'
+import ModuleBrigadeTwo from './components/ModuleBrigadeTwo.vue'
+import ModuleBrigadeThree from './components/ModuleBrigadeThree.vue'
+
+// 默认时间设置
+const defaultTime = [
+  new Date(2000, 1, 1, 0, 0, 0),
+  new Date(2000, 1, 1, 23, 59, 59)
+]
+
+// 筛选参数
+const filterParams = reactive({
+  dateRange: [],
+  supervisorId: '',
+  teamLeaderId: '',
+  terminal: '',
+  terminalId: '',
+  missCheckItem: '',
+  brigadeId: 'all'
+})
+
+// 选项数据
+const supervisorOptions = ref([])
+const teamLeaderOptions = ref([])
+const brigadeOptions = ref([])
+const missedItemOptions = ref([])
+const terminalOptions = ref([])
+
+// 获取漏检物品树状选项
+function getMissedItemOptions() {
+  listCategory().then(response => {
+    missedItemOptions.value = handleTree(response.data, "id", "parentId")
+  })
+}
+const terminalChange = (value) => {
+  if(!value){
+    filterParams.terminal = ''
+    filterParams.terminalId = ''
+    return;
+  }
+
+  filterParams.terminal = terminalOptions.value.find(item => item.value === value).label
+}
+
+const missCheckItemChange = (value) => { 
+  if(!value){
+    filterParams.missCheckItem = ''
+    return;
+
+  }
+}
+
+// 树形数据处理函数
+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) {
+      parent.children.push(map[item[id]])
+    } else {
+      result.push(map[item[id]])
+    }
+  })
+
+  return result
+}
+
+// 获取航站楼选项
+function getTerminalOptions() {
+  listPosition({ positionType: 'TERMINL' }).then(response => {
+    terminalOptions.value = (response.data || []).map(item => ({
+      value: item.id,
+      label: item.name
+    }))
+    // 添加"整体"选项到最前面
+    terminalOptions.value.unshift({ label: '整体', value: 'all' })
+  })
+}
+function getTeamLeaderOptions() {
+  selectUserLeaderListByCondition({ roleKeyList: ['banzuzhang'] }).then(response => {
+    teamLeaderOptions.value = (response.data || []).map(item => ({
+      value: item.userId,
+      label: item.nickName
+    }))
+  })
+}
+
+// 获取主管选项
+function getSupervisorOptions() {
+  selectUserLeaderListByCondition({ roleKeyList: ['kezhang'] }).then(response => {
+    supervisorOptions.value = (response.data || []).map(item => ({
+      value: item.userId,
+      label: item.nickName
+    }))
+  })
+}
+
+// 获取大队选项
+function getBrigadeOptions() {
+  listDept({}).then(response => {
+    const deptList = response.data || []
+    // 筛选类型为 BRIGADE 的部门，并过滤特定的大队ID
+    brigadeOptions.value = deptList.filter(item => item.deptType === 'BRIGADE' && [311, 314, 315].includes(item.deptId)).map(item => ({
+      value: item.deptId,
+      label: item.deptName
+    }))
+    // 添加"全站"选项到最前面
+    brigadeOptions.value.unshift({ label: '全站', value: 'all' })
+  })
+}
+const setDefaultDateRange = () => {
+  const now = new Date()
+  const startOfYear = new Date(now.getFullYear(), 0, 1, 0, 0, 0)
+  const endOfToday = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59)
+
+  // 格式化日期为 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(startOfYear), formatDate(endOfToday)]
+}
+
+// 处理筛选
+const handleFilter = () => {
+  console.log('筛选参数:', filterParams)
+  // 强制触发响应式更新，确保子组件能监听到变化
+  filterParams.dateRange = [...filterParams.dateRange]
+}
+
+// 重置筛选
+const resetFilter = () => {
+  Object.assign(filterParams, {
+    dateRange: [],
+    supervisorId: '',
+    teamLeaderId: '',
+    terminal: '',
+    missCheckItem: '',
+    terminalId: '',
+    brigadeId: 'all'
+  })
+  setDefaultDateRange()
+}
+
+// 组件挂载时设置默认日期和获取用户数据
+onMounted(() => {
+  setDefaultDateRange()
+  getTeamLeaderOptions()
+  getSupervisorOptions()
+  getBrigadeOptions()
+  getMissedItemOptions()
+  getTerminalOptions()
+})
+</script>
+
+<style lang="less" scoped>
+.blocking-data-screen {
+  width: 100%;
+  height: 100vh;
+
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.screen-header {
+  height: 60px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 30px;
+
+  // border-bottom: 2px solid rgba(112, 207, 231, 0.5);
+}
+
+.header-title {
+  font-size: 24px;
+  font-weight: bold;
+  color: black;
+  // text-shadow: 0 0 10px rgba(112, 207, 231, 0.5);
+}
+
+.filter-section {
+  // background: #f8f9fa;
+  padding: 20px 30px;
+  border-bottom: 1px solid #e8e8e8;
+}
+
+.filter-row {
+  display: flex;
+  align-items: center;
+  gap: 20px;
+  margin-bottom: 15px;
+  flex-wrap: wrap;
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.filter-item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.filter-label {
+  font-size: 14px;
+  color: #606266;
+  font-weight: 500;
+  white-space: nowrap;
+}
+
+.filter-actions {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin-left: auto;
+}
+
+.screen-content {
+  flex: 1;
+  padding: 20px;
+  overflow: auto;
+}
+
+.grid-layout {
+  display: grid;
+  grid-template-columns: 1fr;
+  gap: 20px;
+  height: 100%;
+}
+
+.grid-item {
+  width: 100%;
+}
+</style>

src/views/blockingData/dailyLuggageCheckInList/index.vue

@@ -0,0 +1,547 @@
+<template>
+  <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="请选择大队" 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>
+      <el-form-item label="日期" prop="startDate">
+        <el-date-picker clearable v-model="queryParams.startDate" type="date" placeholder="选择日期" value-format="YYYY-MM-DD"
+          style="width: 200px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+          v-hasPermi="['dailyLuggageCheckIn:dailyLuggageCheckIn:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['dailyLuggageCheckIn:dailyLuggageCheckIn:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['dailyLuggageCheckIn:dailyLuggageCheckIn:export']">导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="Upload" @click="handleImport"
+          v-hasPermi="['dailyLuggageCheckIn:dailyLuggageCheckIn:import']">导入</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dailyLuggageCheckInList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="日期" align="center" prop="statDate" min-width="120" />
+      <el-table-column label="班次" align="center" prop="shiftType" min-width="100" />
+      <el-table-column label="当班大队" align="center" prop="brigadeName" min-width="120" />
+      <el-table-column label="T1旅检过检行李数" align="center" prop="t1TravelLuggageCount" min-width="150" />
+      <el-table-column label="T2旅检过检行李数" align="center" prop="t2TravelLuggageCount" min-width="150" />
+      <el-table-column label="过检行李合计" align="center" prop="totalLuggageCount" min-width="120" />
+      <el-table-column label="T1旅检查堵件数" align="center" prop="t1TravelBlockedCount" min-width="140" />
+      <el-table-column label="T1旅检万分率" align="center" prop="t1TravelBlockRate" min-width="130" />
+      <el-table-column label="T2旅检查堵件数" align="center" prop="t2TravelBlockedCount" min-width="140" />
+      <el-table-column label="T2旅检万分率" align="center" prop="t2TravelBlockRate" min-width="130" />
+      <el-table-column label="T1行检过检行李数" align="center" prop="t1WalkLuggageCount" min-width="150" />
+      <el-table-column label="T2行检过检行李数" align="center" prop="t2WalkLuggageCount" min-width="150" />
+      <el-table-column label="T1行检查堵件数" align="center" prop="t1WalkBlockedCount" min-width="140" />
+      <el-table-column label="T1行检万分率" align="center" prop="t1WalkBlockRate" min-width="130" />
+      <el-table-column label="T2行检查堵件数" align="center" prop="t2WalkBlockedCount" min-width="140" />
+      <el-table-column label="T2行检万分率" align="center" prop="t2WalkBlockRate" min-width="130" />
+      <el-table-column label="查堵合计件数" align="center" prop="totalBlockedCount" min-width="120" />
+      <el-table-column label="当日查堵万分率" align="center" prop="dailyBlockRate" min-width="130" />
+      <el-table-column label="T1复查图像总数" align="center" prop="t1ReviewImageTotal" min-width="140" />
+      <el-table-column label="T1-AI标记总数" align="center" prop="t1AiMarkTotal" min-width="140" />
+      <el-table-column label="T1-AI误判总数" align="center" prop="t1AiErrorTotal" min-width="140" />
+      <el-table-column label="T1-AI漏判总数" align="center" prop="t1AiMissTotal" min-width="140" />
+      <el-table-column label="T2复查图像总数" align="center" prop="t2ReviewImageTotal" min-width="140" />
+      <el-table-column label="T2-AI标记总数" align="center" prop="t2AiMarkTotal" min-width="140" />
+      <el-table-column label="T2-AI误判总数" align="center" prop="t2AiErrorTotal" min-width="140" />
+      <el-table-column label="T2-AI漏判总数" align="center" prop="t2AiMissTotal" min-width="140" />
+      <el-table-column label="其他(VP通道)数量" align="center" prop="otherVipCount" min-width="150" />
+      <el-table-column label="AI复查图像总数" align="center" prop="aiReviewImageTotal" min-width="150" />
+      <el-table-column label="AI标记图像总数" align="center" prop="aiMarkTotal" min-width="150" />
+      <el-table-column label="AI漏判图像总数" align="center" prop="aiMissImageTotal" min-width="150" />
+      <el-table-column label="AI误判图像总数" align="center" prop="aiErrorImageTotal" min-width="150" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140" fixed="right">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['dailyLuggageCheckIn:dailyLuggageCheckIn:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['dailyLuggageCheckIn:dailyLuggageCheckIn:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改每日行李查缉对话框 -->
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body @closed="reset" destroy-on-close>
+      <el-form ref="dailyLuggageCheckInRef" :model="form" :rules="rules" label-width="140px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="日期" prop="statDate">
+              <el-date-picker v-model="form.statDate" type="date" placeholder="选择日期" value-format="YYYY-MM-DD"
+                style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="班次" prop="shiftType">
+              <el-select v-model="form.shiftType" placeholder="请选择班次" filterable style="width: 100%">
+                <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="请选择当班大队" 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-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="T1旅检过检行李数" prop="t1TravelLuggageCount">
+              <el-input-number v-model="form.t1TravelLuggageCount" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="T2旅检过检行李数" prop="t2TravelLuggageCount">
+              <el-input-number v-model="form.t2TravelLuggageCount" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="T1行检过检行李数" prop="t1WalkLuggageCount">
+              <el-input-number v-model="form.t1WalkLuggageCount" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="T2行检过检行李数" prop="t2WalkLuggageCount">
+              <el-input-number v-model="form.t2WalkLuggageCount" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <!--  <el-col :span="12">
+          <el-form-item label="过检行李合计" prop="totalLuggageCount">
+              <el-input-number v-model="form.totalLuggageCount" :min="0" style="width: 100%" />
+            </el-form-item> 
+          </el-col> -->
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="T1旅检查堵件数" prop="t1TravelBlockedCount">
+              <el-input-number v-model="form.t1TravelBlockedCount" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="T2旅检查堵件数" prop="t2TravelBlockedCount">
+              <el-input-number v-model="form.t2TravelBlockedCount" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <!--  <el-col :span="12">
+            <el-form-item label="T1旅检万分率" prop="t1TravelBlockRate">
+              <el-input-number v-model="form.t1TravelBlockRate" :min="0" :precision="2" style="width: 100%" />
+            </el-form-item> 
+          </el-col>-->
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="T1行检查堵件数" prop="t1WalkBlockedCount">
+              <el-input-number v-model="form.t1WalkBlockedCount" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="T2行检查堵件数" prop="t2WalkBlockedCount">
+              <el-input-number v-model="form.t2WalkBlockedCount" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <!--<el-col :span="12">
+             <el-form-item label="T2旅检万分率" prop="t2TravelBlockRate">
+              <el-input-number v-model="form.t2TravelBlockRate" :min="0" :precision="2" style="width: 100%" />
+            </el-form-item> 
+          </el-col>-->
+        </el-row>
+
+
+        <!--  <el-col :span="12">
+          <el-form-item label="T1行检万分率" prop="t1WalkBlockRate">
+              <el-input-number v-model="form.t1WalkBlockRate" :min="0" :precision="2" style="width: 100%" />
+            </el-form-item> 
+          </el-col>-->
+
+
+        <!-- <el-col :span="12">
+            <el-form-item label="T2行检万分率" prop="t2WalkBlockRate">
+              <el-input-number v-model="form.t2WalkBlockRate" :min="0" :precision="2" style="width: 100%" />
+            </el-form-item>
+          </el-col> -->
+
+
+          <!--   <el-col :span="12">
+           <el-form-item label="当日查堵万分率" prop="dailyBlockRate">
+              <el-input-number v-model="form.dailyBlockRate" :min="0" :precision="2" style="width: 100%" />
+            </el-form-item> 
+          </el-col>-->
+    
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="T1复查图像总数" prop="t1ReviewImageTotal">
+              <el-input-number v-model="form.t1ReviewImageTotal" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="T1-AI标记总数" prop="t1AiMarkTotal">
+              <el-input-number v-model="form.t1AiMarkTotal" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="T1-AI误判总数" prop="t1AiErrorTotal">
+              <el-input-number v-model="form.t1AiErrorTotal" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="T1-AI漏判总数" prop="t1AiMissTotal">
+              <el-input-number v-model="form.t1AiMissTotal" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="T2复查图像总数" prop="t2ReviewImageTotal">
+              <el-input-number v-model="form.t2ReviewImageTotal" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="T2-AI标记总数" prop="t2AiMarkTotal">
+              <el-input-number v-model="form.t2AiMarkTotal" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="T2-AI误判总数" prop="t2AiErrorTotal">
+              <el-input-number v-model="form.t2AiErrorTotal" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="T2-AI漏判总数" prop="t2AiMissTotal">
+              <el-input-number v-model="form.t2AiMissTotal" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="其他(VP通道)数量" prop="otherVipCount">
+          <el-input-number v-model="form.otherVipCount" :min="0" style="width: 100%" />
+        </el-form-item>
+
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 导入对话框 -->
+    <el-dialog title="导入" v-model="upload.open" width="500px" append-to-body>
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url"
+        :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
+        :auto-upload="false" drag>
+        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+              @click="importTemplate">下载模板</el-link>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
+import { listDailyLuggageCheckIn, getDailyLuggageCheckIn, delDailyLuggageCheckIn, addDailyLuggageCheckIn, updateDailyLuggageCheckIn, exportDailyLuggageCheckIn, downloadTemplate } from '@/api/blockingData/dailyLuggageCheckInList'
+import { listDept } from '@/api/system/dept'
+import { getToken } from '@/utils/auth'
+import { UploadFilled } from '@element-plus/icons-vue'
+
+const { proxy } = getCurrentInstance()
+
+// 遮罩层
+const loading = ref(true)
+// 选中数组
+const ids = ref([])
+// 非单个禁用
+const single = ref(true)
+// 非多个禁用
+const multiple = ref(true)
+// 显示搜索条件
+const showSearch = ref(true)
+// 总条数
+const total = ref(0)
+// 每日行李查缉表格数据
+const dailyLuggageCheckInList = ref([])
+// 弹出层标题
+const title = ref('')
+// 是否显示弹出层
+const open = ref(false)
+
+const upload = reactive({
+  open: false,
+  isUploading: false,
+  headers: { Authorization: 'Bearer ' + getToken() },
+  url: import.meta.env.VITE_APP_BASE_API + '/blocked/daily/importData'
+})
+
+// 查询参数
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  statDate: null,
+  shiftType: null
+})
+
+// 表单参数
+const form = reactive({})
+
+// 表单校验
+const rules = {
+  statDate: [{ required: true, message: '日期不能为空', trigger: 'change' }],
+  shiftType: [{ required: true, message: '班次不能为空', trigger: 'change' }],
+  brigadeId: [{ required: true, message: '当班大队不能为空', trigger: 'change' }],
+  t1TravelLuggageCount: [{ required: true, message: 'T1旅检过检行李数不能为空', trigger: 'change' }],
+  t2TravelLuggageCount: [{ required: true, message: 'T2旅检过检行李数不能为空', trigger: 'change' }],
+  t1WalkLuggageCount: [{ required: true, message: 'T1行检过检行李数不能为空', trigger: 'change' }],
+  t2WalkLuggageCount: [{ required: true, message: 'T2行检过检行李数不能为空', trigger: 'change' }],
+  t1TravelBlockedCount: [{ required: true, message: 'T1旅检查堵件数不能为空', trigger: 'change' }],
+  t2TravelBlockedCount: [{ required: true, message: 'T2旅检查堵件数不能为空', trigger: 'change' }],
+  t1WalkBlockedCount: [{ required: true, message: 'T1行检查堵件数不能为空', trigger: 'change' }],
+  t2WalkBlockedCount: [{ required: true, message: 'T2行检查堵件数不能为空', trigger: 'change' }],
+  t1ReviewImageTotal: [{ required: true, message: 'T1复查图像总数不能为空', trigger: 'change' }],
+  t1AiMarkTotal: [{ required: true, message: 'T1-AI标记总数不能为空', trigger: 'change' }],
+  t1AiErrorTotal: [{ required: true, message: 'T1-AI误判总数不能为空', trigger: 'change' }],
+  t1AiMissTotal: [{ required: true, message: 'T1-AI漏判总数不能为空', trigger: 'change' }],
+  t2ReviewImageTotal: [{ required: true, message: 'T2复查图像总数不能为空', trigger: 'change' }],
+  t2AiMarkTotal: [{ required: true, message: 'T2-AI标记总数不能为空', trigger: 'change' }],
+  t2AiErrorTotal: [{ required: true, message: 'T2-AI误判总数不能为空', trigger: 'change' }],
+  t2AiMissTotal: [{ required: true, message: 'T2-AI漏判总数不能为空', trigger: 'change' }]
+  // otherVipCount 不设置必填校验
+}
+
+// 大队选项
+const brigadeOptions = ref([])
+
+/** 查询每日行李查缉列表 */
+function getList() {
+  loading.value = true
+  listDailyLuggageCheckIn(queryParams).then(response => {
+    dailyLuggageCheckInList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+/** 获取部门列表 */
+function getDeptList() {
+  listDept({}).then(response => {
+    const deptList = response.data || []
+    brigadeOptions.value = deptList.filter(item => item.deptType === 'BRIGADE' && [311, 314, 315].includes(item.deptId)).map(item => ({
+      value: item.deptId,
+      label: item.deptName
+    }))
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  Object.assign(form, {
+    id: null,
+    statDate: null,
+    shiftType: null,
+    brigadeId: null,
+    brigadeName: null,
+    t1TravelLuggageCount: 0,
+    t2TravelLuggageCount: 0,
+    t1WalkLuggageCount: 0,
+    t2WalkLuggageCount: 0,
+    totalLuggageCount: 0,
+    t1TravelBlockedCount: 0,
+    t1TravelBlockRate: 0,
+    t2TravelBlockedCount: 0,
+    t2TravelBlockRate: 0,
+    t1WalkBlockedCount: 0,
+    t1WalkBlockRate: 0,
+    t2WalkBlockedCount: 0,
+    t2WalkBlockRate: 0,
+    totalBlockedCount: 0,
+    dailyBlockRate: 0,
+    t1ReviewImageTotal: 0,
+    t1AiMarkTotal: 0,
+    t1AiErrorTotal: 0,
+    t1AiMissTotal: 0,
+    t2ReviewImageTotal: 0,
+    t2AiMarkTotal: 0,
+    t2AiErrorTotal: 0,
+    t2AiMissTotal: 0,
+    otherVipCount: 0,
+    aiReviewImageTotal: 0,
+    aiMarkTotal: 0,
+    aiMissImageTotal: 0,
+    aiErrorImageTotal: 0
+  })
+  proxy.resetForm('dailyLuggageCheckInRef')
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length !== 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  // 设置默认当前日期
+  form.statDate = new Date().toISOString().split('T')[0]
+  open.value = true
+  title.value = '添加每日行李查缉'
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const id = row.id || ids.value[0]
+  getDailyLuggageCheckIn(id).then(response => {
+    Object.assign(form, response.data)
+    open.value = true
+    title.value = '修改每日行李查缉'
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs.dailyLuggageCheckInRef.validate(valid => {
+    if (valid) {
+      // 获取brigadeName
+      const selectedBrigade = brigadeOptions.value.find(item => item.value === form.brigadeId)
+      if (selectedBrigade) {
+        form.brigadeName = selectedBrigade.label
+      }
+
+      if (form.id != null) {
+        updateDailyLuggageCheckIn(form).then(response => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          reset()
+          getList()
+        })
+      } else {
+        addDailyLuggageCheckIn(form).then(response => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          reset()
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const id = row.id || ids.value
+  proxy.$modal.confirm('是否确认删除每日行李查缉编号为"' + id + '"的数据项？').then(function () {
+    return delDailyLuggageCheckIn(id)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess('删除成功')
+  }).catch(() => { })
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('/blocked/daily/export', {
+    ...queryParams
+  }, `每日行李过检行李查堵_${new Date().getTime()}.xlsx`)
+}
+
+/** 导入按钮操作 */
+function handleImport() {
+  upload.open = true
+}
+
+/** 下载模板操作 */
+function importTemplate() {
+  proxy.download('blocked/daily/importTemplate', {}, `每日行李过检行李查堵模板_${new Date().getTime()}.xlsx`)
+}
+
+/** 文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true
+}
+
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.open = false
+  upload.isUploading = false
+  proxy.$refs.uploadRef.handleRemove(file)
+  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+  getList()
+}
+
+/** 提交上传文件 */
+function submitFileForm() {
+  proxy.$refs.uploadRef.submit()
+}
+
+onMounted(() => {
+  getList()
+  getDeptList()
+})
+</script>
+
+<style lang="less" scoped>
+.app-container {
+  padding: 20px;
+}
+</style>

src/views/blockingData/dailyLuggageInspectionScheduleByTime/index.vue

@@ -0,0 +1,427 @@
+<template>
+  <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="请选择大队" 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>
+      <el-form-item label="统计日期" prop="statDate">
+        <el-date-picker clearable v-model="queryParams.statDate" type="date" placeholder="选择统计日期"
+          value-format="YYYY-MM-DD" style="width: 200px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+          v-hasPermi="['dailyLuggageInspectionScheduleByTime:dailyLuggageInspectionScheduleByTime:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['dailyLuggageInspectionScheduleByTime:dailyLuggageInspectionScheduleByTime:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['dailyLuggageInspectionScheduleByTime:dailyLuggageInspectionScheduleByTime:export']">导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="Upload" @click="handleImport"
+          v-hasPermi="['dailyLuggageInspectionScheduleByTime:dailyLuggageInspectionScheduleByTime:import']">导入</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dailyLuggageInspectionScheduleByTimeList"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="统计日期" align="center" prop="statDate" />
+      <el-table-column label="当班大队" align="center" prop="brigadeName" />
+      <el-table-column label="时间段" align="center" prop="timePeriod" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="T1行检箱包数" align="center" prop="t1WalkBagCount" />
+      <el-table-column label="T1行检查堵数" align="center" prop="t1WalkBlockedCount" />
+      <el-table-column label="T2行检箱包数" align="center" prop="t2WalkBagCount" />
+      <el-table-column label="T2行检查堵数" align="center" prop="t2WalkBlockedCount" />
+      <el-table-column label="T1旅检箱包数" align="center" prop="t1TravelBagCount" />
+      <el-table-column label="T1旅检查堵数" align="center" prop="t1TravelBlockedCount" />
+      <el-table-column label="T2旅检箱包数" align="center" prop="t2TravelBagCount" />
+      <el-table-column label="T2旅检查堵数" align="center" prop="t2TravelBlockedCount" />
+      <el-table-column label="过检行李数" align="center" prop="totalLuggageCount" />
+      <el-table-column label="时段查堵件数" align="center" prop="totalBlockedCount" />
+      <el-table-column label="查堵万分率" align="center" prop="blockedRate" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['dailyLuggageInspectionScheduleByTime:dailyLuggageInspectionScheduleByTime:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['dailyLuggageInspectionScheduleByTime:dailyLuggageInspectionScheduleByTime:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body @closed="reset" destroy-on-close>
+      <el-form ref="dailyLuggageInspectionScheduleByTimeRef" :model="form" :rules="rules" label-width="250px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="统计日期" prop="statDate">
+              <el-date-picker v-model="form.statDate" type="date" placeholder="选择统计日期" value-format="YYYY-MM-DD"
+                style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="当班大队" prop="brigadeId">
+              <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-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="时间段" prop="timePeriod">
+              <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>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="T1行检箱包数" prop="t1WalkBagCount">
+              <el-input-number v-model="form.t1WalkBagCount" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="T1行检查堵数" prop="t1WalkBlockedCount">
+              <el-input-number v-model="form.t1WalkBlockedCount" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="T2行检箱包数（国内+国际）" prop="t2WalkBagCount">
+              <el-input-number v-model="form.t2WalkBagCount" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="T2行检查堵数" prop="t2WalkBlockedCount">
+              <el-input-number v-model="form.t2WalkBlockedCount" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="T1旅检箱包数（国内+国际+中转）" prop="t1TravelBagCount">
+              <el-input-number v-model="form.t1TravelBagCount" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="T1旅检查堵数" prop="t1TravelBlockedCount">
+              <el-input-number v-model="form.t1TravelBlockedCount" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="T2旅检箱包数" prop="t2TravelBagCount">
+              <el-input-number v-model="form.t2TravelBagCount" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="T2旅检查堵数" prop="t2TravelBlockedCount">
+              <el-input-number v-model="form.t2TravelBlockedCount" :min="0" :precision="0" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-dialog title="导入" v-model="upload.open" width="500px" append-to-body>
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url"
+        :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
+        :auto-upload="false" drag>
+        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+              @click="importTemplate">下载模板</el-link>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
+import { listDailyLuggageInspectionScheduleByTime, getDailyLuggageInspectionScheduleByTime, delDailyLuggageInspectionScheduleByTime, addDailyLuggageInspectionScheduleByTime, updateDailyLuggageInspectionScheduleByTime, exportDailyLuggageInspectionScheduleByTime, downloadTemplate } from '@/api/blockingData/dailyLuggageInspectionScheduleByTime'
+import { listDept } from '@/api/system/dept'
+import { useDict } from '@/utils/dict'
+import { getToken } from '@/utils/auth'
+import { UploadFilled } from '@element-plus/icons-vue'
+
+const { proxy } = getCurrentInstance()
+const { blocked_time_period } = useDict('blocked_time_period')
+
+const loading = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const showSearch = ref(true)
+const total = ref(0)
+const dailyLuggageInspectionScheduleByTimeList = ref([])
+const title = ref('')
+const open = ref(false)
+
+
+const upload = reactive({
+  open: false,
+  isUploading: false,
+  headers: { Authorization: 'Bearer ' + getToken() },
+  url: import.meta.env.VITE_APP_BASE_API + '/blocked/pieceDaily/importData'
+})
+
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  brigadeId: null,
+  statDate: null
+})
+
+const form = reactive({})
+
+const rules = {
+  statDate: [{ required: true, message: '统计日期不能为空', trigger: 'change' }],
+  brigadeId: [{ required: true, message: '当班大队不能为空', trigger: 'change' }],
+  timePeriod: [{ required: true, message: '时间段不能为空', trigger: 'change' }],
+  t1WalkBagCount: [
+    { required: true, message: 'T1行检箱包数不能为空', trigger: 'blur' },
+    { type: 'number', message: '请输入有效的数字', trigger: 'blur' }
+  ],
+  t1WalkBlockedCount: [
+    { required: true, message: 'T1行检查堵数不能为空', trigger: 'blur' },
+    { type: 'number', message: '请输入有效的数字', trigger: 'blur' }
+  ],
+  t2WalkBagCount: [
+    { required: true, message: 'T2行检箱包数不能为空', trigger: 'blur' },
+    { type: 'number', message: '请输入有效的数字', trigger: 'blur' }
+  ],
+  t2WalkBlockedCount: [
+    { required: true, message: 'T2行检查堵数不能为空', trigger: 'blur' },
+    { type: 'number', message: '请输入有效的数字', trigger: 'blur' }
+  ],
+  t1TravelBagCount: [
+    { required: true, message: 'T1旅检箱包数不能为空', trigger: 'blur' },
+    { type: 'number', message: '请输入有效的数字', trigger: 'blur' }
+  ],
+  t1TravelBlockedCount: [
+    { required: true, message: 'T1旅检查堵数不能为空', trigger: 'blur' },
+    { type: 'number', message: '请输入有效的数字', trigger: 'blur' }
+  ],
+  t2TravelBagCount: [
+    { required: true, message: 'T2旅检箱包数不能为空', trigger: 'blur' },
+    { type: 'number', message: '请输入有效的数字', trigger: 'blur' }
+  ],
+  t2TravelBlockedCount: [
+    { required: true, message: 'T2旅检查堵数不能为空', trigger: 'blur' },
+    { type: 'number', message: '请输入有效的数字', trigger: 'blur' }
+  ]
+  // remark 不设置必填校验
+}
+
+const brigadeOptions = ref([])
+
+function getList() {
+  loading.value = true
+  listDailyLuggageInspectionScheduleByTime(queryParams).then(response => {
+    dailyLuggageInspectionScheduleByTimeList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+function getDeptList() {
+  listDept({}).then(response => {
+    const deptList = response.data || []
+    brigadeOptions.value = deptList.filter(item => item.deptType === 'BRIGADE' && [311, 314, 315].includes(item.deptId)).map(item => ({
+      value: item.deptId,
+      label: item.deptName
+    }))
+
+  })
+}
+
+function cancel() {
+  open.value = false
+  reset()
+}
+
+function reset() {
+  Object.assign(form, {
+    id: null,
+    statDate: null,
+    brigadeId: null,
+    timePeriod: null,
+    remark: null,
+    t1WalkBagCount: null,
+    t1WalkBlockedCount: null,
+    t2WalkBagCount: null,
+    t2WalkBlockedCount: null,
+    t1TravelBagCount: null,
+    t1TravelBlockedCount: null,
+    t2TravelBagCount: null,
+    t2TravelBlockedCount: null,
+    totalLuggageCount: 0,
+    totalBlockedCount: 0,
+    blockedRate: 0
+  })
+  proxy.resetForm('dailyLuggageInspectionScheduleByTimeRef')
+}
+
+function handleQuery() {
+  queryParams.pageNum = 1
+  getList()
+}
+
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length !== 1
+  multiple.value = !selection.length
+}
+
+function handleAdd() {
+  reset()
+  // 设置默认当前日期
+  form.statDate = new Date().toISOString().split('T')[0]
+  open.value = true
+  title.value = '添加每日各时段查堵行李'
+}
+
+function handleUpdate(row) {
+  reset()
+  const id = row.id || ids.value[0]
+  getDailyLuggageInspectionScheduleByTime(id).then(response => {
+    Object.assign(form, response.data)
+    open.value = true
+    title.value = '修改每日各时段查堵行李'
+  })
+}
+
+function submitForm() {
+  proxy.$refs.dailyLuggageInspectionScheduleByTimeRef.validate(valid => {
+    if (valid) {
+      // 获取brigadeName
+      const selectedBrigade = brigadeOptions.value.find(item => item.value === form.brigadeId)
+      if (selectedBrigade) {
+        form.brigadeName = selectedBrigade.label
+      }
+
+      if (form.id != null) {
+        updateDailyLuggageInspectionScheduleByTime(form).then(response => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          reset()
+          getList()
+        })
+      } else {
+        addDailyLuggageInspectionScheduleByTime(form).then(response => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          reset()
+          getList()
+        })
+      }
+    }
+  })
+}
+
+function handleDelete(row) {
+  const id = row.id || ids.value
+  proxy.$modal.confirm('是否确认删除每日各时段查堵行李编号为"' + id + '"的数据项？').then(function () {
+    return delDailyLuggageInspectionScheduleByTime(id)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess('删除成功')
+  }).catch(() => { })
+}
+
+function handleExport() {
+  proxy.download('/blocked/pieceDaily/export', {
+    ...queryParams
+  }, `每日各时段查堵行李_${new Date().getTime()}.xlsx`)
+}
+
+function handleImport() {
+  upload.open = true
+}
+
+/** 下载模板操作 */
+function importTemplate() {
+  proxy.download('blocked/pieceDaily/importTemplate', {}, `每日各时段查堵行李模板_${new Date().getTime()}.xlsx`)
+}
+
+/** 文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true
+}
+
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.open = false
+  upload.isUploading = false
+  proxy.$refs.uploadRef.handleRemove(file)
+  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+  getList()
+}
+
+/** 提交上传文件 */
+function submitFileForm() {
+  proxy.$refs.uploadRef.submit()
+}
+
+onMounted(() => {
+  getList()
+  getDeptList()
+})
+</script>
+
+<style lang="less" scoped>
+.app-container {
+  padding: 20px;
+}
+</style>

src/views/blockingData/experienceDistributionStartupPerson/index.vue

@@ -0,0 +1,171 @@
+<template>
+  <div class="experience-distribution">
+    <h1 class="page-title">开机人员年限分布</h1>
+
+    <div class="table-container">
+      <el-table :data="teams" border stripe class="distribution-table"
+        :header-cell-style="{ background: '#f5f7fa', color: '#606266' }">
+        <el-table-column prop="brigadeName" label="业务大队" align="center">
+          <template #default="{ row }">
+            <span class="team-name">{{ row.brigadeName }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="5年及5年以上人员数" align="center">
+          <template #default="{ row }">
+            <el-input-number v-model="row.cntGe5Year" :min="0" :controls="false" size="small" placeholder="0"
+              class="number-input" />
+          </template>
+        </el-table-column>
+
+        <el-table-column label="4年人员数" align="center">
+          <template #default="{ row }">
+            <el-input-number v-model="row.cnt4Years" :min="0" :controls="false" size="small" placeholder="0"
+              class="number-input" />
+          </template>
+        </el-table-column>
+
+        <el-table-column label="3年人员数" align="center">
+          <template #default="{ row }">
+            <el-input-number v-model="row.cnt3Years" :min="0" :controls="false" size="small" placeholder="0"
+              class="number-input" />
+          </template>
+        </el-table-column>
+
+        <el-table-column label="2年人员数" align="center">
+          <template #default="{ row }">
+            <el-input-number v-model="row.cnt2Years" :min="0" :controls="false" size="small" placeholder="0"
+              class="number-input" />
+          </template>
+        </el-table-column>
+
+        <el-table-column label="1年人员数" align="center">
+          <template #default="{ row }">
+            <el-input-number v-model="row.cnt1Years" :min="0" :controls="false" size="small" placeholder="0"
+              class="number-input" />
+          </template>
+        </el-table-column>
+
+        <el-table-column label="不足1年人员数" width="130" align="center">
+          <template #default="{ row }">
+            <el-input-number v-model="row.cntLt1Year" :min="0" :controls="false" size="small" placeholder="0"
+              class="number-input" />
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div class="button-container">
+      <el-button type="primary" size="medium" @click="handleConfirm" class="confirm-button">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getTenurelistAll, editTenure } from '@/api/blockingData/experienceDistributionStartupPerson'
+export default {
+  name: 'ExperienceDistributionStartupPerson',
+  data() {
+    return {
+      teams: []
+    }
+  },
+  mounted() {
+    this.fetchData()
+  },
+  methods: {
+    async fetchData() {
+      try {
+        const response = await getTenurelistAll()
+        if (response.code === 200) {
+          this.teams = response.data || []
+        } else {
+          this.$message.error('获取数据失败：' + response.msg)
+        }
+      } catch (error) {
+        console.error('获取数据失败:', error)
+        this.$message.error('获取数据失败')
+      }
+    },
+    async handleConfirm() {
+      try {
+        const savePromises = this.teams.map(row => {
+          const saveData = {
+            id: row.id,
+            brigadeId: row.brigadeId,
+            brigadeName: row.brigadeName,
+            cntGe5Year: row.cntGe5Year || 0,
+            cnt4Years: row.cnt4Years || 0,
+            cnt3Years: row.cnt3Years || 0,
+            cnt2Years: row.cnt2Years || 0,
+            cnt1Years: row.cnt1Years || 0,
+            cntLt1Year: row.cntLt1Year || 0
+          }
+          return editTenure(saveData)
+        })
+        
+        const results = await Promise.all(savePromises)
+        const allSuccess = results.every(result => result.code === 200)
+        
+        if (allSuccess) {
+          this.$message.success('数据保存成功！')
+        } else {
+          this.$message.error('部分数据保存失败，请检查后重试')
+        }
+      } catch (error) {
+        console.error('保存数据失败:', error)
+        this.$message.error('保存数据失败')
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.experience-distribution {
+  padding: 20px;
+  max-width: 1200px;
+  margin: 0 auto;
+}
+
+.page-title {
+  text-align: center;
+  margin-bottom: 30px;
+  color: #333;
+  font-size: 24px;
+  font-weight: bold;
+}
+
+.table-container {
+  margin-bottom: 30px;
+}
+
+.distribution-table {
+  width: 100%;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+}
+
+.team-name {
+  font-weight: bold;
+  color: #333;
+}
+
+.number-input {
+  width: 100px;
+}
+
+.number-input :deep(.el-input__inner) {
+  text-align: center;
+}
+
+.button-container {
+  text-align: center;
+}
+
+.confirm-button {
+  width: 120px;
+  height: 40px;
+  font-size: 16px;
+}
+</style>

src/views/blockingData/missedInspectionList/index.vue

@@ -0,0 +1,762 @@
+<template>
+  <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="请选择大队" 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>
+      <el-form-item label="回查日期" prop="reviewDate">
+        <el-date-picker clearable v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期" style="width: 300px">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="被回查人" prop="reviewedUserId">
+        <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="请选择分管班组长" 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="请选择分管主管" 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="请选择判别类型" 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>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+          v-hasPermi="['missedInspection:missedInspection:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['missedInspection:missedInspection:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['missedInspection:missedInspection:export']">导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="Upload" @click="handleImport"
+          v-hasPermi="['missedInspection:missedInspection:import']">导入</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <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="terminalName" 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" />
+      <el-table-column label="漏检时间段" align="center" prop="missCheckTimePeriod" min-width="150" />
+      <el-table-column label="上岗位置" align="center" prop="channelName" min-width="120" />
+      <el-table-column label="分管主管" align="center" prop="supervisorName" min-width="120" />
+      <el-table-column label="代管主管" align="center" prop="actingSupervisorName" min-width="120" />
+      <el-table-column label="分管班组长" align="center" prop="teamLeaderName" min-width="120" />
+      <el-table-column label="物品位置" align="center" prop="itemLocation" min-width="120" />
+      <el-table-column label="简单/难" align="center" prop="difficultyLevel" min-width="100" />
+      <el-table-column label="回查人" align="center" prop="reviewUserName" min-width="120" />
+      <el-table-column label="判别类型" align="center" prop="discriminationType" min-width="100" />
+      <el-table-column label="是否追回" align="center" prop="isRecovered" min-width="100">
+        <template #default="scope">
+          {{ scope.row.isRecovered == 1 ? '是' : '否' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="开机年限" align="center" prop="machineOperatingYears" min-width="100" />
+      <el-table-column label="证书级别" align="center" prop="certificateLevel" min-width="100" />
+      <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" />
+
+      <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">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['missedInspection:missedInspection:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['missedInspection:missedInspection:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改漏检对话框 -->
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body @closed="reset" destroy-on-close>
+      <el-form ref="missedInspectionRef" :model="form" :rules="rules" label-width="140px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="大队" prop="brigadeId">
+              <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="terminalId">
+              <el-select v-model="form.terminalId" 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>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="被回查人" prop="reviewedUserId">
+              <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>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="回查日期" prop="reviewDate">
+              <el-date-picker v-model="form.reviewDate" type="date" placeholder="选择回查日期" value-format="YYYY-MM-DD"
+                style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="漏检时间" prop="missCheckTime">
+              <el-date-picker v-model="form.missCheckTime" type="datetime" placeholder="请选择漏检时间"
+                value-format="YYYY-MM-DD HH:mm" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="漏检时间段" prop="missCheckTimePeriod">
+              <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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="上岗位置" prop="channelId">
+              <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', disabled: data => data.children && data.children.length > 0 }"
+                value-key="name" placeholder="请选择漏检物品" check-strictly style="width: 100%" />
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="分管主管" prop="supervisorId">
+              <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>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="代管主管" prop="actingSupervisorId">
+              <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>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="分管班组长" prop="teamLeaderId">
+              <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>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="物品位置" prop="itemLocation">
+              <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>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="简单/难" prop="difficultyLevel">
+              <el-select v-model="form.difficultyLevel" placeholder="请选择简单/难" filterable style="width: 100%">
+                <el-option label="简单" value="简单" />
+                <el-option label="难" value="难" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="回查人" prop="reviewUserId">
+              <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>
+          </el-col>
+
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="判别类型" prop="discriminationType">
+              <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>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否追回" prop="isRecovered">
+              <el-select v-model="form.isRecovered" placeholder="请选择是否追回" filterable style="width: 100%">
+                <el-option label="是" :value="1" />
+                <el-option label="否" :value="0" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="开机年限" prop="machineOperatingYears">
+              <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>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="证书级别" prop="certificateLevel">
+              <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>
+
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="人员性别" prop="gender">
+              <el-select v-model="form.gender" placeholder="请选择人员性别" filterable style="width: 100%">
+                <el-option label="男" value="男" />
+                <el-option label="女" value="女" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="漏检原因分类" prop="missCheckReasonCategory">
+              <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>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="月考成绩" prop="monthlyAssessment">
+              <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>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="本月自测有无漏检" prop="selfTestHasMissCheck">
+              <el-input-number v-model="form.selfTestHasMissCheck" :min="0" :precision="0" placeholder="请输入0-2的整数"
+                style="width: 100%" />
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 导入对话框 -->
+    <el-dialog title="导入" v-model="upload.open" width="500px" append-to-body>
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url"
+        :data="upload.data" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
+        :auto-upload="false" drag>
+        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+              @click="importTemplate">下载模板</el-link>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm" :loading="upload.isUploading">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+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, getUser } from '@/api/system/user'
+import { listCategory } from '@/api/system/category'
+import { useDict } from '@/utils/dict'
+import { getToken } from '@/utils/auth'
+import { UploadFilled } from '@element-plus/icons-vue'
+
+const { proxy } = getCurrentInstance()
+
+// 遮罩层
+const loading = ref(true)
+// 选中数组
+const ids = ref([])
+// 非单个禁用
+const single = ref(true)
+// 非多个禁用
+const multiple = ref(true)
+// 显示搜索条件
+const showSearch = ref(true)
+// 总条数
+const total = ref(0)
+// 漏检表格数据
+const missedInspectionList = ref([])
+// 弹出层标题
+const title = ref('')
+// 是否显示弹出层
+const open = ref(false)
+// 日期范围
+const dateRange = ref([])
+// 漏检物品树状选项
+const missCheckItemOptions = ref([])
+
+const upload = reactive({
+  open: false,
+  isUploading: false,
+  headers: { Authorization: 'Bearer ' + getToken() },
+  url: import.meta.env.VITE_APP_BASE_API + '/blocked/missReview/importData',
+  data: { updateSupport: true }
+})
+
+// 查询参数
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  brigadeId: null,
+  reviewDate: null,
+  reviewedUserId: null,
+  teamLeaderId: null,
+  supervisorId: null,
+  discriminationType: null
+})
+
+// 表单参数
+const form = reactive({})
+
+// 表单校验
+const rules = {
+  brigadeId: [{ required: true, message: '大队不能为空', trigger: 'change' }],
+  terminalId: [{ required: true, message: '航站楼不能为空', trigger: 'change' }],
+  reviewedUserId: [{ required: true, message: '被回查人不能为空', trigger: 'change' }],
+  reviewDate: [{ required: true, message: '回查日期不能为空', trigger: 'change' }],
+  missCheckTime: [{ required: true, message: '漏检时间不能为空', trigger: 'change' }],
+  missCheckTimePeriod: [{ required: true, message: '漏检时间段不能为空', trigger: 'change' }],
+  channelId: [{ required: true, message: '上岗位置不能为空', trigger: 'change' }],
+  missCheckItem: [{ required: true, message: '漏检物品不能为空', trigger: 'change' }],
+  supervisorId: [{ required: true, message: '分管主管不能为空', trigger: 'change' }],
+  teamLeaderId: [{ required: true, message: '分管班组长不能为空', trigger: 'change' }],
+  itemLocation: [{ required: true, message: '物品位置不能为空', trigger: 'change' }],
+  difficultyLevel: [{ required: true, message: '简单/难不能为空', trigger: 'change' }],
+  reviewUserId: [{ required: true, message: '回查人不能为空', trigger: 'change' }],
+  discriminationType: [{ required: true, message: '判别类型不能为空', trigger: 'change' }],
+  isRecovered: [{ required: true, message: '是否追回不能为空', trigger: 'change' }],
+  machineOperatingYears: [{ required: true, message: '开机年限不能为空', trigger: 'change' }],
+  certificateLevel: [{ required: true, message: '证书级别不能为空', trigger: 'change' }],
+  gender: [{ required: true, message: '人员性别不能为空', trigger: 'change' }],
+  missCheckReasonCategory: [{ required: true, message: '漏检原因分类不能为空', trigger: 'change' }],
+  monthlyAssessment: [{ required: true, message: '月考成绩不能为空', trigger: 'change' }],
+  selfTestHasMissCheck: [
+    { required: true, message: '本月自测有无漏检不能为空', trigger: 'change' },
+
+  ]
+  // actingSupervisorId 不设置必填校验
+}
+
+// 字典数据
+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([])
+// 人员选项
+const personOptions = ref([])
+// 班组长选项
+const teamLeaderOptions = ref([])
+// 主管选项
+const supervisorOptions = ref([])
+// 航站楼选项
+const areaOptions = ref([])
+// 上岗位置选项
+const channelOptions = ref([])
+
+/** 获取职位列表 */
+function getPositionList() {
+  // 获取航站楼选项
+  listPosition({ positionType: 'CHANNEL' }).then(response => {
+    areaOptions.value = response.data || []
+  })
+
+  // 获取上岗位置选项
+  listPosition({ positionType: 'TERMINL' }).then(response => {
+    channelOptions.value = response.data || []
+  })
+}
+
+/** 查询漏检列表 */
+function getList() {
+  loading.value = true
+  if (dateRange.value && dateRange.value.length === 2) {
+    queryParams.startDate = dateRange.value[0]
+    queryParams.endDate = dateRange.value[1]
+  } else {
+    queryParams.reviewDateStart = null
+    queryParams.reviewDateEnd = null
+  }
+  listMissedInspection(queryParams).then(response => {
+    missedInspectionList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+/** 获取部门列表 */
+function getDeptList() {
+  listDept({}).then(response => {
+    const deptList = response.data || []
+    brigadeOptions.value = deptList.filter(item => item.deptType === 'BRIGADE' && [311, 314, 315].includes(item.deptId)).map(item => ({
+      value: item.deptId,
+      label: item.deptName
+    }))
+  })
+}
+
+/** 获取漏检物品树状选项 */
+function getMissCheckItemOptions() {
+  listCategory().then(response => {
+    missCheckItemOptions.value = proxy.handleTree(response.data, "id", "parentId")
+  })
+}
+function getTeamLeaderOptions() {
+  selectUserLeaderListByCondition({ roleKeyList: ['banzuzhang'] }).then(response => {
+    teamLeaderOptions.value = (response.data || []).map(item => ({
+      value: item.userId,
+      label: item.nickName
+    }))
+  })
+}
+
+/** 获取主管选项 */
+function getSupervisorOptions() {
+  selectUserLeaderListByCondition({ roleKeyList: ['kezhang'] }).then(response => {
+    supervisorOptions.value = (response.data || []).map(item => ({
+      value: item.userId,
+      label: item.nickName
+    }))
+  })
+}
+
+/** 被回查人变更事件 */
+function handleReviewedUserChange(userId) {
+  if (userId) {
+    //请求回查人班组长
+    selectUserLeaderListByCondition({ userId: userId, roleKeyList: ['banzuzhang'] }).then(response => {
+      if (response.data && response.data.length > 0) {
+        const data = response.data[0]
+        form.teamLeaderId = data.userId
+      }
+    })
+    selectUserLeaderListByCondition({ userId: userId, roleKeyList: ['kezhang'] }).then(response => {
+      if (response.data && response.data.length > 0) {
+        const data = response.data[0]
+        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
+    form.certificateLevel = null
+    form.gender = null
+  }
+}
+
+/** 获取用户列表 */
+function getUserList() {
+  listUser({ pageNum: 1, pageSize: 1000 }).then(response => {
+    personOptions.value = response.rows.map(item => ({
+      value: item.userId,
+      label: item.nickName
+    }))
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  Object.assign(form, {
+    id: null,
+    brigadeId: null,
+    terminalId: null,
+    terminalName: null,
+    reviewedUserId: null,
+    reviewDate: null,
+    missCheckTime: null,
+    missCheckTimePeriod: null,
+    channelId: null,
+    channelName: null,
+    supervisorId: null,
+    actingSupervisorId: null,
+    teamLeaderId: null,
+    itemLocation: null,
+    difficultyLevel: null,
+    reviewUserId: null,
+    discriminationType: null,
+    isRecovered: null,
+    machineOperatingYears: null,
+    certificateLevel: null,
+    gender: null,
+    missCheckReasonCategory: null,
+    monthlyAssessment: null,
+    selfTestHasMissCheck: 0,
+    missCheckItem: null
+  })
+  proxy.resetForm('missedInspectionRef')
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  dateRange.value = []
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length !== 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  // 设置默认当前时间
+  form.missCheckTime = new Date().toISOString().replace('T', ' ').substring(0, 16)
+  // 设置默认当前日期
+  form.reviewDate = new Date().toISOString().split('T')[0]
+  open.value = true
+  title.value = '添加漏检'
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const id = row.id || ids.value[0]
+  getMissedInspection(id).then(response => {
+    Object.assign(form, response.data)
+    open.value = true
+    title.value = '修改漏检'
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs.missedInspectionRef.validate(valid => {
+    if (valid) {
+      // 处理大队ID和名称映射
+      if (form.brigadeId) {
+        const brigade = brigadeOptions.value.find(item => item.value === form.brigadeId)
+        form.brigadeName = brigade ? brigade.label : null
+      }
+
+      // 处理航站楼ID和名称映射
+      if (form.terminalId) {
+      
+        const area = channelOptions.value.find(item => item.id === form.terminalId)
+        form.terminalName = area ? area.name : null
+      }
+
+      // 处理被回查人ID和名称映射
+      if (form.reviewedUserId) {
+        const reviewedUser = personOptions.value.find(item => item.value === form.reviewedUserId)
+        form.reviewedUserName = reviewedUser ? reviewedUser.label : null
+      }
+
+      // 处理上岗位置ID和名称映射
+      if (form.channelId) {
+      
+        const channel = areaOptions.value.find(item => item.id === form.channelId)
+        form.channelName = channel ? channel.name : null
+      }
+
+      // 处理分管主管ID和名称映射
+      if (form.supervisorId) {
+        const supervisor = supervisorOptions.value.find(item => item.value === form.supervisorId)
+        form.supervisorName = supervisor ? supervisor.label : null
+      }
+
+      // 处理代管主管ID和名称映射
+      if (form.actingSupervisorId) {
+      
+        const actingSupervisor = supervisorOptions.value.find(item => item.value === form.actingSupervisorId)
+        form.actingSupervisorName = actingSupervisor ? actingSupervisor.label : null
+      }
+
+      // 处理分管班组长ID和名称映射
+      if (form.teamLeaderId) {
+        const teamLeader = teamLeaderOptions.value.find(item => item.value === form.teamLeaderId)
+        form.teamLeaderName = teamLeader ? teamLeader.label : null
+      }
+
+      // 处理回查人ID和名称映射
+      if (form.reviewUserId) {
+        const reviewUser = personOptions.value.find(item => item.value === form.reviewUserId)
+        form.reviewUserName = reviewUser ? reviewUser.label : null
+      }
+
+      if (form.id != null) {
+        updateMissedInspection(form).then(response => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          reset()
+          getList()
+        })
+      } else {
+        addMissedInspection(form).then(response => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          reset()
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const id = row.id || ids.value
+  proxy.$modal.confirm('是否确认删除漏检编号为"' + id + '"的数据项？').then(function () {
+    return delMissedInspection(id)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess('删除成功')
+  }).catch(() => { })
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('/blocked/missReview/export', {
+    ...queryParams
+  }, `漏检_${new Date().getTime()}.xlsx`)
+}
+
+/** 导入按钮操作 */
+function handleImport() {
+  upload.open = true
+}
+
+/** 下载模板操作 */
+function importTemplate() {
+  proxy.download('blocked/missReview/importTemplate', {}, `漏检模板_${new Date().getTime()}.xlsx`)
+}
+
+/** 文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true
+}
+
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.open = false
+  upload.isUploading = false
+  proxy.$refs.uploadRef.handleRemove(file)
+  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+  getList()
+}
+
+/** 提交上传文件 */
+function submitFileForm() {
+  proxy.$refs.uploadRef.submit()
+}
+
+onMounted(() => {
+  getUserList()
+  getList()
+  getDeptList()
+
+  getPositionList()
+  getTeamLeaderOptions()
+  getSupervisorOptions()
+  getMissCheckItemOptions()
+})
+</script>
+
+<style lang="less" scoped>
+.app-container {
+  padding: 20px;
+}
+</style>

src/views/blockingData/rateList/index.vue

@@ -0,0 +1,396 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="当班大队" prop="dutyBrigadeId">
+        <el-select v-model="queryParams.dutyBrigadeId" placeholder="请选择当班大队" 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>
+      <el-form-item label="日期" prop="statDate">
+        <el-date-picker clearable v-model="queryParams.statDate" type="date" placeholder="选择日期"
+          value-format="YYYY-MM-DD" style="width: 200px" />
+      </el-form-item>
+      <el-form-item label="班次" prop="shift">
+        <el-select v-model="queryParams.shift" placeholder="请选择班次" clearable style="width: 200px">
+          <el-option v-for="dict in shift" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+          v-hasPermi="['rateList:rateList:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['rateList:rateList:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport"
+          v-hasPermi="['rateList:rateList:export']">导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="Upload" @click="handleImport"
+          v-hasPermi="['rateList:rateList:import']">导入</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="rateList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="日期" align="center" prop="statDate" />
+      <el-table-column label="旅检国内区域平均速率（高峰期时段）" align="center" prop="travelInspectionDomesticAvgRatePeak"
+        min-width="120" />
+      <el-table-column label="当班大队" align="center" prop="dutyBrigadeName" />
+      <el-table-column label="T1-A区速率（高峰期时段）" align="center" prop="t1AAreaRatePeak" />
+      <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="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" min-width="180">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['rateList:rateList:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['rateList:rateList:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body @closed="reset" destroy-on-close>
+      <el-form ref="rateListRef" :model="form" :rules="rules" label-width="280px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="日期" prop="statDate">
+              <el-date-picker v-model="form.statDate" type="date" placeholder="选择日期" value-format="YYYY-MM-DD"
+                style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="当班大队" prop="dutyBrigadeId">
+              <el-select v-model="form.dutyBrigadeId" placeholder="请选择当班大队" 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-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="班次" prop="shift">
+              <el-select v-model="form.shift" placeholder="请选择班次" style="width: 100%">
+                <el-option v-for="dict in shift" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="旅检国内区域平均速率（高峰期时段）" prop="travelInspectionDomesticAvgRatePeak">
+              <el-input-number v-model="form.travelInspectionDomesticAvgRatePeak" :min="0" :precision="2"
+                style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="T1-A区速率（高峰期时段）" prop="t1AAreaRatePeak">
+              <el-input-number v-model="form.t1AAreaRatePeak" :min="0" :precision="2" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="T1-B区速率（高峰期时段）" prop="t1BAreaRatePeak">
+              <el-input-number v-model="form.t1BAreaRatePeak" :min="0" :precision="2" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="T2-国内速率（高峰期时段）" prop="t2DomesticRatePeak">
+              <el-input-number v-model="form.t2DomesticRatePeak" :min="0" :precision="2" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="T2-国际速率（高峰期时段）" prop="t2InternationalRatePeak">
+              <el-input-number v-model="form.t2InternationalRatePeak" :min="0" :precision="2" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="T2-中转（高峰期时段）" prop="t2TransferRatePeak">
+              <el-input-number v-model="form.t2TransferRatePeak" :min="0" :precision="2" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="国际及中转区域平均速率（高峰期时段）" prop="internationalTransferAvgRatePeak">
+              <el-input-number v-model="form.internationalTransferAvgRatePeak" :min="0" :precision="2"
+                style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-dialog title="导入" v-model="upload.open" width="500px" append-to-body>
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url"
+        :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
+        :auto-upload="false" drag>
+        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+              @click="importTemplate">下载模板</el-link>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
+import { listRate, getRate, delRate, addRate, updateRate, exportRate, downloadTemplate } from '@/api/blockingData/rateList'
+import { listDept } from '@/api/system/dept'
+import { getToken } from '@/utils/auth'
+import { UploadFilled } from '@element-plus/icons-vue'
+
+const { proxy } = getCurrentInstance()
+const { shift } = proxy.useDict('shift')
+
+const loading = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const showSearch = ref(true)
+const total = ref(0)
+const rateList = ref([])
+const title = ref('')
+const open = ref(false)
+
+const upload = reactive({
+  open: false,
+  isUploading: false,
+  headers: { Authorization: 'Bearer ' + getToken() },
+  url: import.meta.env.VITE_APP_BASE_API + '/blocked/rate/importData'
+})
+
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  dutyBrigadeId: null,
+  statDate: null,
+  shift: null
+})
+
+const form = reactive({})
+
+const rules = {
+  statDate: [{ required: true, message: '日期不能为空', trigger: 'change' }],
+  dutyBrigadeId: [{ required: true, message: '当班大队不能为空', trigger: 'change' }],
+  shift: [{ required: true, message: '班次不能为空', trigger: 'change' }],
+  travelInspectionDomesticAvgRatePeak: [{ required: true, message: '旅检国内区域平均速率（高峰期时段）不能为空', trigger: 'change' }],
+  t1AAreaRatePeak: [{ required: true, message: 'T1-A区速率（高峰期时段）不能为空', trigger: 'change' }],
+  t1BAreaRatePeak: [{ required: true, message: 'T1-B区速率（高峰期时段）不能为空', trigger: 'change' }],
+  t2DomesticRatePeak: [{ required: true, message: 'T2-国内速率（高峰期时段）不能为空', trigger: 'change' }],
+  t2InternationalRatePeak: [{ required: true, message: 'T2-国际速率（高峰期时段）不能为空', trigger: 'change' }],
+  t2TransferRatePeak: [{ required: true, message: 'T2-中转（高峰期时段）不能为空', trigger: 'change' }],
+  internationalTransferAvgRatePeak: [{ required: true, message: '国际及中转区域平均速率（高峰期时段）不能为空', trigger: 'change' }]
+}
+
+const brigadeOptions = ref([])
+
+function getList() {
+  loading.value = true
+  listRate(queryParams).then(response => {
+    rateList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+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 || []
+    brigadeOptions.value = deptList.filter(item => item.deptType === 'BRIGADE' && [311, 314, 315].includes(item.deptId)).map(item => ({
+      value: item.deptId,
+      label: item.deptName
+    }))
+  })
+}
+
+function cancel() {
+  open.value = false
+  reset()
+}
+
+function reset() {
+  Object.assign(form, {
+    id: null,
+    statDate: null,
+    dutyBrigadeId: null,
+    shift: null,
+    shiftDesc: null,
+    travelInspectionDomesticAvgRatePeak: 0,
+    t1AAreaRatePeak: 0,
+    t1BAreaRatePeak: 0,
+    t2DomesticRatePeak: 0,
+    t2InternationalRatePeak: 0,
+    t2TransferRatePeak: 0,
+    internationalTransferAvgRatePeak: 0
+  })
+  proxy.resetForm('rateListRef')
+}
+
+function handleQuery() {
+  queryParams.pageNum = 1
+  getList()
+}
+
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length !== 1
+  multiple.value = !selection.length
+}
+
+function handleAdd() {
+  reset()
+  // 设置默认当前日期
+  form.statDate = new Date().toISOString().split('T')[0]
+  open.value = true
+  title.value = '添加速率统计'
+}
+
+function handleUpdate(row) {
+  reset()
+  const id = row.id || ids.value[0]
+  getRate(id).then(response => {
+    Object.assign(form, response.data)
+    open.value = true
+    title.value = '修改速率统计'
+  })
+}
+
+function submitForm() {
+  proxy.$refs.rateListRef.validate(valid => {
+    if (valid) {
+      if (form.shift) {
+        const shiftItem = shift.value.find(item => item.value === form.shift)
+        form.shiftDesc = shiftItem ? shiftItem.label : null
+      }
+      if (form.dutyBrigadeId) {
+        const brigadeItem = brigadeOptions.value.find(item => item.value === form.dutyBrigadeId)
+        form.dutyBrigadeName = brigadeItem ? brigadeItem.label : null
+      }
+
+      if (form.id != null) {
+        updateRate(form).then(response => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          reset()
+          getList()
+        })
+      } else {
+        addRate(form).then(response => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          reset()
+          getList()
+        })
+      }
+    }
+  })
+}
+
+function handleDelete(row) {
+  const id = row.id || ids.value
+  proxy.$modal.confirm('是否确认删除速率统计编号为"' + id + '"的数据项？').then(function () {
+    return delRate(id)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess('删除成功')
+  }).catch(() => { })
+}
+
+function handleExport() {
+  proxy.download('blocked/rate/export', {
+    ...queryParams
+  }, `速率统计_${new Date().getTime()}.xlsx`)
+}
+
+function handleImport() {
+  upload.open = true
+}
+
+/** 下载模板操作 */
+function importTemplate() {
+  proxy.download('/blocked/rate/importTemplate', {}, `速率统计模板${new Date().getTime()}.xlsx`)
+}
+
+/** 文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true
+}
+
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.open = false
+  upload.isUploading = false
+  proxy.$refs.uploadRef.handleRemove(file)
+  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+  getList()
+}
+
+/** 提交上传文件 */
+function submitFileForm() {
+  proxy.$refs.uploadRef.submit()
+}
+
+onMounted(() => {
+  getList()
+  getDeptList()
+})
+</script>
+
+<style lang="less" scoped>
+.app-container {
+  padding: 20px;
+}
+</style>

src/views/system/dept/index.vue

@@ -124,6 +124,18 @@
                      </el-select>
                   </el-form-item>
                </el-col>
+               <el-col :span="12" v-if="form.deptType === 'BRIGADE'">
+                  <el-form-item label="大队性质" prop="brigadeNature">
+                     <el-select v-model="form.brigadeNature" placeholder="请选择大队性质">
+                        <el-option
+                        v-for="dict in brigade_nature"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                        ></el-option>
+                     </el-select>
+                  </el-form-item>
+               </el-col>
                <el-col :span="12">
                   <el-form-item label="显示排序" prop="orderNum">
                      <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
@@ -173,6 +185,7 @@ import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild }
 const { proxy } = getCurrentInstance()
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable")
 const { base_dept_type } = proxy.useDict('base_dept_type')
+const { brigade_nature } = proxy.useDict('brigade_nature')
 const deptList = ref([])
 const open = ref(false)
 const loading = ref(true)
@@ -222,6 +235,7 @@ function reset() {
     parentId: undefined,
     deptName: undefined,
     deptType: undefined,
+    brigadeNature: undefined,
     orderNum: 0,
     leader: undefined,
     phone: undefined,