feat(blockingData): 新增开机人员年限分布功能并优化接口路径

refactor(api): 统一接口路径前缀为/blocked
fix(views): 修复表格样式和字段命名不一致问题
docs(views): 更新字段说明和表单验证规则

src/api/blockingData/dailyLuggageCheckInList.js

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

src/api/blockingData/dailyLuggageInspectionScheduleByTime.js

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

src/api/blockingData/missedInspection.js

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

src/views/blockingData/dailyLuggageCheckInList/index.vue

@@ -1,17 +1,15 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"> <el-form-item label="大队"
+        prop="brigadeId">
+        <el-select v-model="queryParams.brigadeId" placeholder="请选择大队" clearable style="width: 200px">
+          <el-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="date">
         <el-date-picker clearable v-model="queryParams.date" 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 label="早班" value="早班" />
-          <el-option label="中班" value="中班" />
-          <el-option label="晚班" 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>
@@ -40,36 +38,37 @@
 
     <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="date" width="120" />
-      <el-table-column label="班次" align="center" prop="shift" width="100" />
-      <el-table-column label="当班大队" align="center" prop="dutyBrigade" width="120" />
-      <el-table-column label="t1T2旅检过检行李数" align="center" prop="t1T2LuggageCheckCount" width="150" />
-      <el-table-column label="过检行李合计" align="center" prop="totalLuggageCheckCount" width="120" />
-      <el-table-column label="T1旅检查堵件数" align="center" prop="t1LuggageCheckBlockCount" width="120" />
-      <el-table-column label="T1旅检万分率" align="center" prop="t1LuggageCheckBlockRate" width="120" />
-      <el-table-column label="T2旅检查堵件数" align="center" prop="t2LuggageCheckBlockCount" width="120" />
-      <el-table-column label="T2旅检万分率" align="center" prop="t2LuggageCheckBlockRate" width="120" />
-      <el-table-column label="T1行检过检行李数" align="center" prop="t1BaggageCheckCount" width="120" />
-      <el-table-column label="T2行检过检行李数" align="center" prop="t2BaggageCheckCount" width="120" />
-      <el-table-column label="T1行检查堵件数" align="center" prop="t1BaggageCheckBlockCount" width="120" />
-      <el-table-column label="T1行检万分率" align="center" prop="t1BaggageCheckBlockRate" width="120" />
-      <el-table-column label="T2行检查堵件数" align="center" prop="t2BaggageCheckBlockCount" width="120" />
-      <el-table-column label="T2行检万分率" align="center" prop="t2BaggageCheckBlockRate" width="120" />
-      <el-table-column label="查堵合计件数" align="center" prop="totalCheckBlockCount" width="120" />
-      <el-table-column label="当日查堵万分率" align="center" prop="dailyCheckBlockRate" width="120" />
+      <el-table-column label="日期" align="center" prop="statDate" width="120" />
+      <el-table-column label="班次" align="center" prop="shiftType" width="100" />
+      <el-table-column label="当班大队" align="center" prop="brigadeName" width="120" />
+      <el-table-column label="T1旅检过检行李数" align="center" prop="t1TravelLuggageCount" width="150" />
+      <el-table-column label="T2旅检过检行李数" align="center" prop="t2TravelLuggageCount" width="150" />
+      <el-table-column label="过检行李合计" align="center" prop="totalLuggageCount" width="120" />
+      <el-table-column label="T1旅检查堵件数" align="center" prop="t1TravelBlockedCount" width="120" />
+      <el-table-column label="T1旅检万分率" align="center" prop="t1TravelBlockRate" width="120" />
+      <el-table-column label="T2旅检查堵件数" align="center" prop="t2TravelBlockedCount" width="120" />
+      <el-table-column label="T2旅检万分率" align="center" prop="t2TravelBlockRate" width="120" />
+      <el-table-column label="T1行检过检行李数" align="center" prop="t1WalkLuggageCount" width="120" />
+      <el-table-column label="T2行检过检行李数" align="center" prop="t2WalkLuggageCount" width="120" />
+      <el-table-column label="T1行检查堵件数" align="center" prop="t1WalkBlockedCount" width="120" />
+      <el-table-column label="T1行检万分率" align="center" prop="t1WalkBlockRate" width="120" />
+      <el-table-column label="T2行检查堵件数" align="center" prop="t2WalkBlockedCount" width="120" />
+      <el-table-column label="T2行检万分率" align="center" prop="t2WalkBlockRate" width="120" />
+      <el-table-column label="查堵合计件数" align="center" prop="totalBlockedCount" width="120" />
+      <el-table-column label="当日查堵万分率" align="center" prop="dailyBlockRate" width="120" />
       <el-table-column label="T1复查图像总数" align="center" prop="t1ReviewImageTotal" width="120" />
-      <el-table-column label="T2-AI标记总数" align="center" prop="t2AiMarkTotal" width="120" />
-      <el-table-column label="T1-AI误判总数" align="center" prop="t1AiMisjudgeTotal" width="120" />
-      <el-table-column label="T1AI漏判总数" align="center" prop="t1AiMissTotal" width="120" />
+      <el-table-column label="T1-AI标记总数" align="center" prop="t1AiMarkTotal" width="120" />
+      <el-table-column label="T1-AI误判总数" align="center" prop="t1AiErrorTotal" width="120" />
+      <el-table-column label="T1-AI漏判总数" align="center" prop="t1AiMissTotal" width="120" />
       <el-table-column label="T2复查图像总数" align="center" prop="t2ReviewImageTotal" width="120" />
-      <el-table-column label="T2-AI标记总数" align="center" prop="t2AiMarkTotal2" width="120" />
-      <el-table-column label="T2AI误判总数" align="center" prop="t2AiMisjudgeTotal" width="120" />
-      <el-table-column label="T2AI漏判总数" align="center" prop="t2AiMissTotal" width="120" />
-      <el-table-column label="其他(VP通道)数量" align="center" prop="vpChannelCount" width="140" />
+      <el-table-column label="T2-AI标记总数" align="center" prop="t2AiMarkTotal" width="120" />
+      <el-table-column label="T2-AI误判总数" align="center" prop="t2AiErrorTotal" width="120" />
+      <el-table-column label="T2-AI漏判总数" align="center" prop="t2AiMissTotal" width="120" />
+      <el-table-column label="其他(VP通道)数量" align="center" prop="otherVipCount" width="140" />
       <el-table-column label="AI复查图像总数" align="center" prop="aiReviewImageTotal" width="120" />
-      <el-table-column label="AI标记图像总数" align="center" prop="aiMarkImageTotal" width="120" />
+      <el-table-column label="AI标记图像总数" align="center" prop="aiMarkTotal" width="120" />
       <el-table-column label="AI漏判图像总数" align="center" prop="aiMissImageTotal" width="120" />
-      <el-table-column label="AI误判图像总数" align="center" prop="aiMisjudgeImageTotal" width="140" />
+      <el-table-column label="AI误判图像总数" align="center" prop="aiErrorImageTotal" width="140" />
       <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)"
@@ -88,14 +87,14 @@
       <el-form ref="dailyLuggageCheckInRef" :model="form" :rules="rules" label-width="140px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="日期" prop="date">
-              <el-date-picker v-model="form.date" type="date" placeholder="选择日期" value-format="YYYY-MM-DD"
+            <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="shift">
-              <el-select v-model="form.shift" placeholder="请选择班次" style="width: 100%">
+            <el-form-item label="班次" prop="shiftType">
+              <el-select v-model="form.shiftType" placeholder="请选择班次" style="width: 100%">
                 <el-option label="早班" value="早班" />
                 <el-option label="中班" value="中班" />
                 <el-option label="晚班" value="晚班" />
@@ -103,92 +102,99 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="当班大队" prop="dutyBrigade">
-          <el-select v-model="form.dutyBrigade" placeholder="请选择当班大队" style="width: 100%">
+        <el-form-item label="当班大队" prop="brigadeName">
+          <el-select v-model="form.brigadeName" 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-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="t1T2旅检过检行李数" prop="t1T2LuggageCheckCount">
-              <el-input-number v-model="form.t1T2LuggageCheckCount" :min="0" style="width: 100%" />
+            <el-form-item label="T1旅检过检行李数" prop="t1TravelLuggageCount">
+              <el-input-number v-model="form.t1TravelLuggageCount" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="过检行李合计" prop="totalLuggageCheckCount">
-              <el-input-number v-model="form.totalLuggageCheckCount" :min="0" style="width: 100%" />
+            <el-form-item label="T2旅检过检行李数" prop="t2TravelLuggageCount">
+              <el-input-number v-model="form.t2TravelLuggageCount" :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="t1LuggageCheckBlockCount">
-              <el-input-number v-model="form.t1LuggageCheckBlockCount" :min="0" style="width: 100%" />
+            <el-form-item label="T1行检过检行李数" prop="t1WalkLuggageCount">
+              <el-input-number v-model="form.t1WalkLuggageCount" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="T1旅检万分率" prop="t1LuggageCheckBlockRate">
-              <el-input-number v-model="form.t1LuggageCheckBlockRate" :min="0" :precision="2" style="width: 100%" />
+            <el-form-item label="T2行检过检行李数" prop="t2WalkLuggageCount">
+              <el-input-number v-model="form.t2WalkLuggageCount" :min="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="t2LuggageCheckBlockCount">
-              <el-input-number v-model="form.t2LuggageCheckBlockCount" :min="0" style="width: 100%" />
+            <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" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="T2旅检万分率" prop="t2LuggageCheckBlockRate">
-              <el-input-number v-model="form.t2LuggageCheckBlockRate" :min="0" :precision="2" style="width: 100%" />
+            <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="t1BaggageCheckCount">
-              <el-input-number v-model="form.t1BaggageCheckCount" :min="0" style="width: 100%" />
+            <el-form-item label="T2旅检查堵件数" prop="t2TravelBlockedCount">
+              <el-input-number v-model="form.t2TravelBlockedCount" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="T2行检过检行李数" prop="t2BaggageCheckCount">
-              <el-input-number v-model="form.t2BaggageCheckCount" :min="0" style="width: 100%" />
+            <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-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="T1行检查堵件数" prop="t1BaggageCheckBlockCount">
-              <el-input-number v-model="form.t1BaggageCheckBlockCount" :min="0" style="width: 100%" />
+            <el-form-item label="T1行检查堵件数" prop="t1WalkBlockedCount">
+              <el-input-number v-model="form.t1WalkBlockedCount" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="T1行检万分率" prop="t1BaggageCheckBlockRate">
-              <el-input-number v-model="form.t1BaggageCheckBlockRate" :min="0" :precision="2" style="width: 100%" />
+            <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-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="T2行检查堵件数" prop="t2BaggageCheckBlockCount">
-              <el-input-number v-model="form.t2BaggageCheckBlockCount" :min="0" style="width: 100%" />
+            <el-form-item label="T2行检查堵件数" prop="t2WalkBlockedCount">
+              <el-input-number v-model="form.t2WalkBlockedCount" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="T2行检万分率" prop="t2BaggageCheckBlockRate">
-              <el-input-number v-model="form.t2BaggageCheckBlockRate" :min="0" :precision="2" style="width: 100%" />
+            <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-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="查堵合计件数" prop="totalCheckBlockCount">
-              <el-input-number v-model="form.totalCheckBlockCount" :min="0" style="width: 100%" />
+            <el-form-item label="查堵合计件数" prop="totalBlockedCount">
+              <el-input-number v-model="form.totalBlockedCount" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="当日查堵万分率" prop="dailyCheckBlockRate">
-              <el-input-number v-model="form.dailyCheckBlockRate" :min="0" :precision="2" style="width: 100%" />
+            <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>
@@ -199,19 +205,19 @@
             </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" style="width: 100%" />
+            <el-form-item label="T1-AI标记总数" prop="t1AiMarkTotal">
+              <el-input-number v-model="form.t1AiMarkTotal" :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-AI误判总数" prop="t1AiMisjudgeTotal">
-              <el-input-number v-model="form.t1AiMisjudgeTotal" :min="0" style="width: 100%" />
+            <el-form-item label="T1-AI误判总数" prop="t1AiErrorTotal">
+              <el-input-number v-model="form.t1AiErrorTotal" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="T1AI漏判总数" prop="t1AiMissTotal">
+            <el-form-item label="T1-AI漏判总数" prop="t1AiMissTotal">
               <el-input-number v-model="form.t1AiMissTotal" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
@@ -223,15 +229,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="T2-AI标记总数" prop="t2AiMarkTotal2">
-              <el-input-number v-model="form.t2AiMarkTotal2" :min="0" style="width: 100%" />
+            <el-form-item label="T2-AI标记总数" prop="t2AiMarkTotal">
+              <el-input-number v-model="form.t2AiMarkTotal" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="T2AI误判总数" prop="t2AiMisjudgeTotal">
-              <el-input-number v-model="form.t2AiMisjudgeTotal" :min="0" style="width: 100%" />
+            <el-form-item label="T2-AI误判总数" prop="t2AiErrorTotal">
+              <el-input-number v-model="form.t2AiErrorTotal" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -240,8 +246,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="其他(VP通道)数量" prop="vpChannelCount">
-          <el-input-number v-model="form.vpChannelCount" :min="0" style="width: 100%" />
+        <el-form-item label="其他(VP通道)数量" prop="otherVipCount">
+          <el-input-number v-model="form.otherVipCount" :min="0" style="width: 100%" />
         </el-form-item>
         <el-row :gutter="20">
           <el-col :span="12">
@@ -250,8 +256,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="AI标记图像总数" prop="aiMarkImageTotal">
-              <el-input-number v-model="form.aiMarkImageTotal" :min="0" style="width: 100%" />
+            <el-form-item label="AI标记图像总数" prop="aiMarkTotal">
+              <el-input-number v-model="form.aiMarkTotal" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -262,8 +268,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="AI误判图像总数" prop="aiMisjudgeImageTotal">
-              <el-input-number v-model="form.aiMisjudgeImageTotal" :min="0" style="width: 100%" />
+            <el-form-item label="AI误判图像总数" prop="aiErrorImageTotal">
+              <el-input-number v-model="form.aiErrorImageTotal" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -282,6 +288,10 @@
         accept=".xlsx,.xls">
         <el-button type="primary">选取文件</el-button>
         <div class="el-upload__tip">只能上传xls/xlsx文件</div>
+        <div class="el-upload__tip">
+          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate">下载模板</el-link>
+        </div>
       </el-upload>
       <template #footer>
         <div class="dialog-footer">
@@ -295,7 +305,7 @@
 
 <script setup>
 import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
-import { listDailyLuggageCheckIn, getDailyLuggageCheckIn, delDailyLuggageCheckIn, addDailyLuggageCheckIn, updateDailyLuggageCheckIn, exportDailyLuggageCheckIn } from '@/api/blockingData/dailyLuggageCheckIn'
+import { listDailyLuggageCheckIn, getDailyLuggageCheckIn, delDailyLuggageCheckIn, addDailyLuggageCheckIn, updateDailyLuggageCheckIn, exportDailyLuggageCheckIn, downloadTemplate } from '@/api/blockingData/dailyLuggageCheckInList'
 import { listDept } from '@/api/system/dept'
 
 const { proxy } = getCurrentInstance()
@@ -327,8 +337,8 @@ const importFile = ref(null)
 const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
-  date: null,
-  shift: null
+  statDate: null,
+  shiftType: null
 })
 
 // 表单参数
@@ -336,9 +346,9 @@ const form = reactive({})
 
 // 表单校验
 const rules = {
-  date: [{ required: true, message: '日期不能为空', trigger: 'change' }],
-  shift: [{ required: true, message: '班次不能为空', trigger: 'change' }],
-  dutyBrigade: [{ required: true, message: '当班大队不能为空', trigger: 'change' }]
+  statDate: [{ required: true, message: '日期不能为空', trigger: 'change' }],
+  shiftType: [{ required: true, message: '班次不能为空', trigger: 'change' }],
+  brigadeName: [{ required: true, message: '当班大队不能为空', trigger: 'change' }]
 }
 
 // 大队选项
@@ -375,36 +385,37 @@ function cancel() {
 function reset() {
   form.value = {
     id: null,
-    date: null,
-    shift: null,
-    dutyBrigade: null,
-    t1T2LuggageCheckCount: 0,
-    totalLuggageCheckCount: 0,
-    t1LuggageCheckBlockCount: 0,
-    t1LuggageCheckBlockRate: 0,
-    t2LuggageCheckBlockCount: 0,
-    t2LuggageCheckBlockRate: 0,
-    t1BaggageCheckCount: 0,
-    t2BaggageCheckCount: 0,
-    t1BaggageCheckBlockCount: 0,
-    t1BaggageCheckBlockRate: 0,
-    t2BaggageCheckBlockCount: 0,
-    t2BaggageCheckBlockRate: 0,
-    totalCheckBlockCount: 0,
-    dailyCheckBlockRate: 0,
+    statDate: null,
+    shiftType: 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,
-    t2AiMarkTotal: 0,
-    t1AiMisjudgeTotal: 0,
+    t1AiMarkTotal: 0,
+    t1AiErrorTotal: 0,
     t1AiMissTotal: 0,
     t2ReviewImageTotal: 0,
-    t2AiMarkTotal2: 0,
-    t2AiMisjudgeTotal: 0,
+    t2AiMarkTotal: 0,
+    t2AiErrorTotal: 0,
     t2AiMissTotal: 0,
-    vpChannelCount: 0,
+    otherVipCount: 0,
     aiReviewImageTotal: 0,
-    aiMarkImageTotal: 0,
+    aiMarkTotal: 0,
     aiMissImageTotal: 0,
-    aiMisjudgeImageTotal: 0
+    aiErrorImageTotal: 0
   }
   proxy.resetForm('dailyLuggageCheckInRef')
 }
@@ -491,6 +502,11 @@ function handleImport() {
   importFile.value = null
 }
 
+/** 下载模板操作 */
+function importTemplate() {
+  proxy.download('blocked/daily/importTemplate', {}, `daily_luggage_checkin_template_${new Date().getTime()}.xlsx`)
+}
+
 /** 文件选择 */
 function handleFileChange(file) {
   importFile.value = file.raw
@@ -521,14 +537,4 @@ onMounted(() => {
 .app-container {
   padding: 20px;
 }
-
-:deep(.el-table) {
-  .el-table__header-wrapper {
-    th {
-      background-color: #303133;
-      color: #ffffff;
-      font-weight: 600;
-    }
-  }
-}
 </style>

src/views/blockingData/dailyLuggageInspectionScheduleByTime/index.vue

@@ -6,8 +6,8 @@
           <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="date">
-        <el-date-picker clearable v-model="queryParams.date" type="date" placeholder="选择日期" value-format="YYYY-MM-DD"
+      <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>
@@ -38,21 +38,21 @@
 
     <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="date" width="120" />
-      <el-table-column label="当班大队" align="center" prop="dutyBrigade" width="120" />
-      <el-table-column label="时间段" align="center" prop="timePeriod" width="120" />
-      <el-table-column label="备注" align="center" prop="remark" width="120" />
-      <el-table-column label="T1行检箱包数" align="center" prop="t1BaggageCount" width="120" />
-      <el-table-column label="查堵数3" align="center" prop="checkBlockCount3" width="100" />
-      <el-table-column label="T2行检箱包数（国内+）" align="center" prop="t2BaggageCountDomestic" width="150" />
-      <el-table-column label="查堵数2" align="center" prop="checkBlockCount2" width="100" />
-      <el-table-column label="T1旅检箱包数" align="center" prop="t1LuggageCount" width="120" />
-      <el-table-column label="查堵数5" align="center" prop="checkBlockCount5" width="100" />
-      <el-table-column label="T2旅检箱包数（国内+）" align="center" prop="t2LuggageCountDomestic" width="150" />
-      <el-table-column label="查堵数" align="center" prop="checkBlockCount" width="100" />
-      <el-table-column label="过检行李数" align="center" prop="checkLuggageCount" width="120" />
-      <el-table-column label="时段查堵件数" align="center" prop="timePeriodCheckBlockCount" width="120" />
-      <el-table-column label="查堵万分率" align="center" prop="checkBlockRate" width="120" />
+      <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)"
@@ -70,14 +70,14 @@
       <el-form ref="dailyLuggageInspectionScheduleByTimeRef" :model="form" :rules="rules" label-width="180px">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="日期" prop="date">
-              <el-date-picker v-model="form.date" type="date" placeholder="选择日期" value-format="YYYY-MM-DD"
+            <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="dutyBrigade">
-              <el-select v-model="form.dutyBrigade" placeholder="请选择当班大队" style="width: 100%">
+            <el-form-item label="当班大队" prop="brigadeId">
+              <el-select v-model="form.brigadeId" 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>
@@ -97,66 +97,66 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="T1行检箱包数" prop="t1BaggageCount">
-              <el-input-number v-model="form.t1BaggageCount" :min="0" style="width: 100%" />
+            <el-form-item label="T1行检箱包数" prop="t1WalkBagCount">
+              <el-input-number v-model="form.t1WalkBagCount" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="查堵数3" prop="checkBlockCount3">
-              <el-input-number v-model="form.checkBlockCount3" :min="0" style="width: 100%" />
+            <el-form-item label="T1行检查堵数" prop="t1WalkBlockedCount">
+              <el-input-number v-model="form.t1WalkBlockedCount" :min="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="t2BaggageCountDomestic">
-              <el-input-number v-model="form.t2BaggageCountDomestic" :min="0" style="width: 100%" />
+            <el-form-item label="T2行检箱包数" prop="t2WalkBagCount">
+              <el-input-number v-model="form.t2WalkBagCount" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="查堵数2" prop="checkBlockCount2">
-              <el-input-number v-model="form.checkBlockCount2" :min="0" style="width: 100%" />
+            <el-form-item label="T2行检查堵数" prop="t2WalkBlockedCount">
+              <el-input-number v-model="form.t2WalkBlockedCount" :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="t1LuggageCount">
-              <el-input-number v-model="form.t1LuggageCount" :min="0" style="width: 100%" />
+            <el-form-item label="T1旅检箱包数" prop="t1TravelBagCount">
+              <el-input-number v-model="form.t1TravelBagCount" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="查堵数5" prop="checkBlockCount5">
-              <el-input-number v-model="form.checkBlockCount5" :min="0" style="width: 100%" />
+            <el-form-item label="T1旅检查堵数" prop="t1TravelBlockedCount">
+              <el-input-number v-model="form.t1TravelBlockedCount" :min="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="t2LuggageCountDomestic">
-              <el-input-number v-model="form.t2LuggageCountDomestic" :min="0" style="width: 100%" />
+            <el-form-item label="T2旅检箱包数" prop="t2TravelBagCount">
+              <el-input-number v-model="form.t2TravelBagCount" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="查堵数" prop="checkBlockCount">
-              <el-input-number v-model="form.checkBlockCount" :min="0" style="width: 100%" />
+            <el-form-item label="T2旅检查堵数" prop="t2TravelBlockedCount">
+              <el-input-number v-model="form.t2TravelBlockedCount" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="过检行李数" prop="checkLuggageCount">
-              <el-input-number v-model="form.checkLuggageCount" :min="0" style="width: 100%" />
+            <el-form-item label="过检行李数" prop="totalLuggageCount">
+              <el-input-number v-model="form.totalLuggageCount" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="时段查堵件数" prop="timePeriodCheckBlockCount">
-              <el-input-number v-model="form.timePeriodCheckBlockCount" :min="0" style="width: 100%" />
+            <el-form-item label="时段查堵件数" prop="totalBlockedCount">
+              <el-input-number v-model="form.totalBlockedCount" :min="0" style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="查堵万分率" prop="checkBlockRate">
-          <el-input-number v-model="form.checkBlockRate" :min="0" :precision="2" style="width: 100%" />
+        <el-form-item label="查堵万分率" prop="blockedRate">
+          <el-input-number v-model="form.blockedRate" :min="0" :precision="2" style="width: 100%" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -172,6 +172,10 @@
         accept=".xlsx,.xls">
         <el-button type="primary">选取文件</el-button>
         <div class="el-upload__tip">只能上传xls/xlsx文件</div>
+        <div class="el-upload__tip">
+          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate">下载模板</el-link>
+        </div>
       </el-upload>
       <template #footer>
         <div class="dialog-footer">
@@ -185,7 +189,7 @@
 
 <script setup>
 import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
-import { listDailyLuggageInspectionScheduleByTime, getDailyLuggageInspectionScheduleByTime, delDailyLuggageInspectionScheduleByTime, addDailyLuggageInspectionScheduleByTime, updateDailyLuggageInspectionScheduleByTime, exportDailyLuggageInspectionScheduleByTime } from '@/api/blockingData/dailyLuggageInspectionScheduleByTime'
+import { listDailyLuggageInspectionScheduleByTime, getDailyLuggageInspectionScheduleByTime, delDailyLuggageInspectionScheduleByTime, addDailyLuggageInspectionScheduleByTime, updateDailyLuggageInspectionScheduleByTime, exportDailyLuggageInspectionScheduleByTime, downloadTemplate } from '@/api/blockingData/dailyLuggageInspectionScheduleByTime'
 import { listDept } from '@/api/system/dept'
 
 const { proxy } = getCurrentInstance()
@@ -206,14 +210,14 @@ const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
   brigadeId: null,
-  date: null
+  statDate: null
 })
 
 const form = reactive({})
 
 const rules = {
-  date: [{ required: true, message: '日期不能为空', trigger: 'change' }],
-  dutyBrigade: [{ required: true, message: '当班大队不能为空', trigger: 'change' }]
+  statDate: [{ required: true, message: '统计日期不能为空', trigger: 'change' }],
+  brigadeId: [{ required: true, message: '当班大队不能为空', trigger: 'change' }]
 }
 
 const brigadeOptions = ref([])
@@ -243,24 +247,24 @@ function cancel() {
 }
 
 function reset() {
-  form.value = {
+  Object.assign(form, {
     id: null,
-    date: null,
-    dutyBrigade: null,
+    statDate: null,
+    brigadeId: null,
     timePeriod: null,
     remark: null,
-    t1BaggageCount: 0,
-    checkBlockCount3: 0,
-    t2BaggageCountDomestic: 0,
-    checkBlockCount2: 0,
-    t1LuggageCount: 0,
-    checkBlockCount5: 0,
-    t2LuggageCountDomestic: 0,
-    checkBlockCount: 0,
-    checkLuggageCount: 0,
-    timePeriodCheckBlockCount: 0,
-    checkBlockRate: 0
-  }
+    t1WalkBagCount: 0,
+    t1WalkBlockedCount: 0,
+    t2WalkBagCount: 0,
+    t2WalkBlockedCount: 0,
+    t1TravelBagCount: 0,
+    t1TravelBlockedCount: 0,
+    t2TravelBagCount: 0,
+    t2TravelBlockedCount: 0,
+    totalLuggageCount: 0,
+    totalBlockedCount: 0,
+    blockedRate: 0
+  })
   proxy.resetForm('dailyLuggageInspectionScheduleByTimeRef')
 }
 
@@ -337,6 +341,11 @@ function handleImport() {
   importFile.value = null
 }
 
+/** 下载模板操作 */
+function importTemplate() {
+  proxy.download('blocked/pieceDaily/importTemplate', {}, `daily_luggage_inspection_schedule_template_${new Date().getTime()}.xlsx`)
+}
+
 function handleFileChange(file) {
   importFile.value = file.raw
 }
@@ -366,13 +375,5 @@ onMounted(() => {
   padding: 20px;
 }
 
-:deep(.el-table) {
-  .el-table__header-wrapper {
-    th {
-      background-color: #303133;
-      color: #ffffff;
-      font-weight: 600;
-    }
-  }
-}
+
 </style>

src/views/blockingData/experienceDistributionStartupPerson/index.vue

@@ -0,0 +1,200 @@
+<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="name" label="业务大队"  align="center">
+          <template #default="{ row }">
+            <span class="team-name">{{ row.name }}</span>
+          </template>
+        </el-table-column>
+        
+        <el-table-column label="5年及5年以上人员数"  align="center">
+          <template #default="{ row }">
+            <el-input-number
+              v-model="row.fiveYearsPlus"
+              :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.fourYears"
+              :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.threeYears"
+              :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.twoYears"
+              :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.oneYear"
+              :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.lessThanOneYear"
+              :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>
+export default {
+  name: 'ExperienceDistributionStartupPerson',
+  data() {
+    return {
+      teams: [
+        {
+          id: 1,
+          name: '安检一大队',
+          fiveYearsPlus: 0,
+          fourYears: 0,
+          threeYears: 0,
+          twoYears: 0,
+          oneYear: 0,
+          lessThanOneYear: 0
+        },
+        {
+          id: 2,
+          name: '安检二大队',
+          fiveYearsPlus: 0,
+          fourYears: 0,
+          threeYears: 0,
+          twoYears: 0,
+          oneYear: 0,
+          lessThanOneYear: 0
+        },
+        {
+          id: 3,
+          name: '安检三大队',
+          fiveYearsPlus: 0,
+          fourYears: 0,
+          threeYears: 0,
+          twoYears: 0,
+          oneYear: 0,
+          lessThanOneYear: 0
+        }
+      ]
+    }
+  },
+  methods: {
+    handleConfirm() {
+      console.log('提交数据:', this.teams)
+      this.$message.success('数据提交成功！')
+    }
+  }
+}
+</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

@@ -6,13 +6,13 @@
           <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="checkDate">
+      <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="checkedPerson">
-        <el-select v-model="queryParams.checkedPerson" placeholder="请选择被回查人" clearable style="width: 200px">
+      <el-form-item label="被回查人" prop="reviewedUserId">
+        <el-select v-model="queryParams.reviewedUserId" placeholder="请选择被回查人" 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>
@@ -26,9 +26,9 @@
           <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="judgeType">
-        <el-select v-model="queryParams.judgeType" placeholder="请选择判别类型" clearable style="width: 200px">
-          <el-option v-for="item in judgeTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
+      <el-form-item label="判别类型" prop="discriminationType">
+        <el-select v-model="queryParams.discriminationType" placeholder="请选择判别类型" 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>
@@ -60,19 +60,19 @@
     <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" width="120" />
-      <el-table-column label="区域" align="center" prop="area" width="120" />
-      <el-table-column label="被回查人" align="center" prop="checkedPerson" width="120" />
-      <el-table-column label="回查日期" align="center" prop="checkDate" width="120" />
-      <el-table-column label="漏检时间" align="center" prop="missedTime" width="120" />
-      <el-table-column label="漏检时间段" align="center" prop="missedTimePeriod" width="150" />
-      <el-table-column label="上岗位置" align="center" prop="workPosition" width="120" />
+      <el-table-column label="区域" align="center" prop="areaName" width="120" />
+      <el-table-column label="被回查人" align="center" prop="reviewedUserName" width="120" />
+      <el-table-column label="回查日期" align="center" prop="reviewDate" width="120" />
+      <el-table-column label="漏检时间" align="center" prop="missCheckTime" width="120" />
+      <el-table-column label="漏检时间段" align="center" prop="missCheckTimePeriod" width="150" />
+      <el-table-column label="上岗位置" align="center" prop="channelName" width="120" />
       <el-table-column label="分管主管" align="center" prop="supervisorName" width="120" />
       <el-table-column label="代管主管" align="center" prop="actingSupervisorName" width="120" />
       <el-table-column label="分管班组长" align="center" prop="teamLeaderName" width="120" />
-      <el-table-column label="物品位置" align="center" prop="itemPosition" width="120" />
-      <el-table-column label="简单/难" align="center" prop="difficulty" width="100" />
-      <el-table-column label="回查人" align="center" prop="checker" width="120" />
-      <el-table-column label="判别类型" align="center" prop="judgeType" width="100" />
+      <el-table-column label="物品位置" align="center" prop="itemLocation" width="120" />
+      <el-table-column label="简单/难" align="center" prop="difficultyLevel" width="100" />
+      <el-table-column label="回查人" align="center" prop="reviewUserName" width="120" />
+      <el-table-column label="判别类型" align="center" prop="discriminationType" width="100" />
       <el-table-column label="是否追回" align="center" prop="isRecovered" width="100">
         <template #default="scope">
           <el-tag :type="scope.row.isRecovered === '是' ? 'success' : 'warning'">
@@ -80,19 +80,19 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="开机年限" align="center" prop="machineYears" width="100" />
+      <el-table-column label="开机年限" align="center" prop="machineOperatingYears" width="100" />
       <el-table-column label="证书级别" align="center" prop="certificateLevel" width="100" />
-      <el-table-column label="人员性别" align="center" prop="personGender" width="100" />
-      <el-table-column label="漏检原因分类" align="center" prop="missedReasonCategory" width="120" />
-      <el-table-column label="月考成绩" align="center" prop="monthlyExamScore" width="100" />
-      <el-table-column label="本月自测有无漏检" align="center" prop="monthlySelfTestMissed" width="120">
+      <el-table-column label="人员性别" align="center" prop="gender" width="100" />
+      <el-table-column label="漏检原因分类" align="center" prop="missCheckReasonCategory" width="120" />
+      <el-table-column label="月考成绩" align="center" prop="monthlyAssessment" width="100" />
+      <el-table-column label="本月自测有无漏检" align="center" prop="selfTestHasMissCheck" width="120">
         <template #default="scope">
-          <el-tag :type="scope.row.monthlySelfTestMissed === '是' ? 'warning' : 'success'">
-            {{ scope.row.monthlySelfTestMissed }}
+          <el-tag :type="scope.row.selfTestHasMissCheck === '是' ? 'warning' : 'success'">
+            {{ scope.row.selfTestHasMissCheck }}
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="漏检物品" align="center" prop="missedItem" width="120" />
+      <el-table-column label="漏检物品" align="center" prop="missCheckItem" width="120" />
       <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)"
@@ -114,26 +114,26 @@
             <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="area">
-          <el-input v-model="form.area" placeholder="请输入区域" />
+        <el-form-item label="区域" prop="areaName">
+          <el-input v-model="form.areaName" placeholder="请输入区域" />
         </el-form-item>
-        <el-form-item label="被回查人" prop="checkedPerson">
-          <el-select v-model="form.checkedPerson" placeholder="请选择被回查人" style="width: 100%">
+        <el-form-item label="被回查人" prop="reviewedUserId">
+          <el-select v-model="form.reviewedUserId" placeholder="请选择被回查人" 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-form-item label="回查日期" prop="checkDate">
-          <el-date-picker v-model="form.checkDate" type="date" placeholder="选择回查日期" value-format="YYYY-MM-DD"
+        <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-form-item label="漏检时间" prop="missedTime">
-          <el-input v-model="form.missedTime" placeholder="请输入漏检时间" />
+        <el-form-item label="漏检时间" prop="missCheckTime">
+          <el-input v-model="form.missCheckTime" placeholder="请输入漏检时间" />
         </el-form-item>
-        <el-form-item label="漏检时间段" prop="missedTimePeriod">
-          <el-input v-model="form.missedTimePeriod" placeholder="请输入漏检时间段" />
+        <el-form-item label="漏检时间段" prop="missCheckTimePeriod">
+          <el-input v-model="form.missCheckTimePeriod" placeholder="请输入漏检时间段" />
         </el-form-item>
-        <el-form-item label="上岗位置" prop="workPosition">
-          <el-input v-model="form.workPosition" placeholder="请输入上岗位置" />
+        <el-form-item label="上岗位置" prop="channelName">
+          <el-input v-model="form.channelName" placeholder="请输入上岗位置" />
         </el-form-item>
         <el-form-item label="分管主管" prop="supervisorId">
           <el-select v-model="form.supervisorId" placeholder="请选择分管主管" style="width: 100%">
@@ -150,23 +150,23 @@
             <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="itemPosition">
-          <el-input v-model="form.itemPosition" placeholder="请输入物品位置" />
+        <el-form-item label="物品位置" prop="itemLocation">
+          <el-input v-model="form.itemLocation" placeholder="请输入物品位置" />
         </el-form-item>
-        <el-form-item label="简单/难" prop="difficulty">
-          <el-select v-model="form.difficulty" placeholder="请选择简单/难" style="width: 100%">
+        <el-form-item label="简单/难" prop="difficultyLevel">
+          <el-select v-model="form.difficultyLevel" placeholder="请选择简单/难" style="width: 100%">
             <el-option label="简单" value="简单" />
             <el-option label="难" value="难" />
           </el-select>
         </el-form-item>
-        <el-form-item label="回查人" prop="checker">
-          <el-select v-model="form.checker" placeholder="请选择回查人" style="width: 100%">
+        <el-form-item label="回查人" prop="reviewUserId">
+          <el-select v-model="form.reviewUserId" placeholder="请选择回查人" 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-form-item label="判别类型" prop="judgeType">
-          <el-select v-model="form.judgeType" placeholder="请选择判别类型" style="width: 100%">
-            <el-option v-for="item in judgeTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
+        <el-form-item label="判别类型" prop="discriminationType">
+          <el-select v-model="form.discriminationType" placeholder="请选择判别类型" 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-form-item label="是否追回" prop="isRecovered">
@@ -175,8 +175,8 @@
             <el-option label="否" value="否" />
           </el-select>
         </el-form-item>
-        <el-form-item label="开机年限" prop="machineYears">
-          <el-input v-model="form.machineYears" placeholder="请输入开机年限" />
+        <el-form-item label="开机年限" prop="machineOperatingYears">
+          <el-input v-model="form.machineOperatingYears" placeholder="请输入开机年限" />
         </el-form-item>
         <el-form-item label="证书级别" prop="certificateLevel">
           <el-select v-model="form.certificateLevel" placeholder="请选择证书级别" style="width: 100%">
@@ -185,26 +185,26 @@
             <el-option label="高级" value="高级" />
           </el-select>
         </el-form-item>
-        <el-form-item label="人员性别" prop="personGender">
-          <el-select v-model="form.personGender" placeholder="请选择人员性别" style="width: 100%">
+        <el-form-item label="人员性别" prop="gender">
+          <el-select v-model="form.gender" placeholder="请选择人员性别" style="width: 100%">
             <el-option label="男" value="男" />
             <el-option label="女" value="女" />
           </el-select>
         </el-form-item>
-        <el-form-item label="漏检原因分类" prop="missedReasonCategory">
-          <el-input v-model="form.missedReasonCategory" placeholder="请输入漏检原因分类" />
+        <el-form-item label="漏检原因分类" prop="missCheckReasonCategory">
+          <el-input v-model="form.missCheckReasonCategory" placeholder="请输入漏检原因分类" />
         </el-form-item>
-        <el-form-item label="月考成绩" prop="monthlyExamScore">
-          <el-input v-model="form.monthlyExamScore" placeholder="请输入月考成绩" />
+        <el-form-item label="月考成绩" prop="monthlyAssessment">
+          <el-input v-model="form.monthlyAssessment" placeholder="请输入月考成绩" />
         </el-form-item>
-        <el-form-item label="本月自测有无漏检" prop="monthlySelfTestMissed">
-          <el-select v-model="form.monthlySelfTestMissed" placeholder="请选择本月自测有无漏检" style="width: 100%">
+        <el-form-item label="本月自测有无漏检" prop="selfTestHasMissCheck">
+          <el-select v-model="form.selfTestHasMissCheck" placeholder="请选择本月自测有无漏检" style="width: 100%">
             <el-option label="是" value="是" />
             <el-option label="否" value="否" />
           </el-select>
         </el-form-item>
-        <el-form-item label="漏检物品" prop="missedItem">
-          <el-input v-model="form.missedItem" placeholder="请输入漏检物品" />
+        <el-form-item label="漏检物品" prop="missCheckItem">
+          <el-input v-model="form.missCheckItem" placeholder="请输入漏检物品" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -221,6 +221,10 @@
         accept=".xlsx,.xls">
         <el-button type="primary">选取文件</el-button>
         <div class="el-upload__tip">只能上传xls/xlsx文件</div>
+        <div class="el-upload__tip">
+          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate">下载模板</el-link>
+        </div>
       </el-upload>
       <template #footer>
         <div class="dialog-footer">
@@ -234,9 +238,10 @@
 
 <script setup>
 import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
-import { listMissedInspection, getMissedInspection, delMissedInspection, addMissedInspection, updateMissedInspection, exportMissedInspection } from '@/api/blockingData/missedInspection'
+import { listMissedInspection, getMissedInspection, delMissedInspection, addMissedInspection, updateMissedInspection, exportMissedInspection, downloadTemplate } from '@/api/blockingData/missedInspection'
 import { listDept } from '@/api/system/dept'
 import { listUser } from '@/api/system/user'
+import { useDict } from '@/utils/dict'
 
 const { proxy } = getCurrentInstance()
 
@@ -270,11 +275,11 @@ const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
   brigadeId: null,
-  checkDate: null,
-  checkedPerson: null,
+  reviewDate: null,
+  reviewedUserId: null,
   teamLeaderId: null,
   supervisorId: null,
-  judgeType: null
+  discriminationType: null
 })
 
 // 表单参数
@@ -283,9 +288,12 @@ const form = reactive({})
 // 表单校验
 const rules = {
   brigadeId: [{ required: true, message: '大队不能为空', trigger: 'change' }],
-  checkDate: [{ required: true, message: '回查日期不能为空', trigger: 'change' }]
+  reviewDate: [{ required: true, message: '回查日期不能为空', trigger: 'change' }]
 }
 
+// 字典数据
+const { discrimination_type } = useDict('discrimination_type')
+
 // 大队选项
 const brigadeOptions = ref([])
 // 人员选项
@@ -294,24 +302,17 @@ const personOptions = ref([])
 const teamLeaderOptions = ref([])
 // 主管选项
 const supervisorOptions = ref([])
-// 判别类别选项
-const judgeTypeOptions = ref([
-  { label: '火灾', value: '火灾' },
-  { label: '打火机', value: '打火机' },
-  { label: '火柴', value: '火柴' },
-  { label: '火种', value: '火种' },
-  { label: '其他', value: '其他' }
-])
+
 
 /** 查询漏检列表 */
 function getList() {
   loading.value = true
   if (dateRange.value && dateRange.value.length === 2) {
-    queryParams.checkDateStart = dateRange.value[0]
-    queryParams.checkDateEnd = dateRange.value[1]
+    queryParams.reviewDateStart = dateRange.value[0]
+    queryParams.reviewDateEnd = dateRange.value[1]
   } else {
-    queryParams.checkDateStart = null
-    queryParams.checkDateEnd = null
+    queryParams.reviewDateStart = null
+    queryParams.reviewDateEnd = null
   }
   listMissedInspection(queryParams).then(response => {
     missedInspectionList.value = response.rows
@@ -357,31 +358,31 @@ function cancel() {
 
 // 表单重置
 function reset() {
-  form.value = {
+  Object.assign(form, {
     id: null,
     brigadeId: null,
-    area: null,
-    checkedPerson: null,
-    checkDate: null,
-    missedTime: null,
-    missedTimePeriod: null,
-    workPosition: null,
+    areaName: null,
+    reviewedUserId: null,
+    reviewDate: null,
+    missCheckTime: null,
+    missCheckTimePeriod: null,
+    channelName: null,
     supervisorId: null,
     actingSupervisorId: null,
     teamLeaderId: null,
-    itemPosition: null,
-    difficulty: null,
-    checker: null,
-    judgeType: null,
+    itemLocation: null,
+    difficultyLevel: null,
+    reviewUserId: null,
+    discriminationType: null,
     isRecovered: null,
-    machineYears: null,
+    machineOperatingYears: null,
     certificateLevel: null,
-    personGender: null,
-    missedReasonCategory: null,
-    monthlyExamScore: null,
-    monthlySelfTestMissed: null,
-    missedItem: null
-  }
+    gender: null,
+    missCheckReasonCategory: null,
+    monthlyAssessment: null,
+    selfTestHasMissCheck: null,
+    missCheckItem: null
+  })
   proxy.resetForm('missedInspectionRef')
 }
 
@@ -468,6 +469,11 @@ function handleImport() {
   importFile.value = null
 }
 
+/** 下载模板操作 */
+function importTemplate() {
+  proxy.download('blocked/missReview/importTemplate', {}, `missed_inspection_template_${new Date().getTime()}.xlsx`)
+}
+
 /** 文件选择 */
 function handleFileChange(file) {
   importFile.value = file.raw
@@ -500,13 +506,5 @@ onMounted(() => {
   padding: 20px;
 }
 
-:deep(.el-table) {
-  .el-table__header-wrapper {
-    th {
-      background-color: #303133;
-      color: #ffffff;
-      font-weight: 600;
-    }
-  }
-}
+
 </style>

src/views/blockingData/rateList/index.vue

@@ -7,8 +7,8 @@
         </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-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">
@@ -43,17 +43,17 @@
 
     <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" width="120" />
-      <el-table-column label="旅检国内区域平均速率（高峰期时段）" align="center" prop="travelInspectionDomesticAvgRatePeak" width="220" />
-      <el-table-column label="当班大队" align="center" prop="dutyBrigadeName" width="120" />
-      <el-table-column label="T1-A区速率（高峰期时段）" align="center" prop="t1AAreaRatePeak" width="180" />
-      <el-table-column label="T1-B区速率（高峰期时段）" align="center" prop="t1BAreaRatePeak" width="180" />
-      <el-table-column label="T2-国内速率（高峰期时段）" align="center" prop="t2DomesticRatePeak" width="180" />
-      <el-table-column label="T2-国际速率（高峰期时段）" align="center" prop="t2InternationalRatePeak" width="180" />
-      <el-table-column label="班次" align="center" prop="shift" width="100" />
-      <el-table-column label="T2-中转（高峰期时段）" align="center" prop="t2TransferRatePeak" width="160" />
-      <el-table-column label="国际及中转区域平均速率（高峰期时段）" align="center" prop="internationalTransferAvgRatePeak" width="240" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
+      <el-table-column label="日期" align="center" prop="statDate" />
+      <el-table-column label="旅检国内区域平均速率（高峰期时段）" align="center" prop="travelInspectionDomesticAvgRatePeak" />
+      <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" />
+      <el-table-column label="T2-中转（高峰期时段）" align="center" prop="t2TransferRatePeak" />
+      <el-table-column label="国际及中转区域平均速率（高峰期时段）" align="center" prop="internationalTransferAvgRatePeak" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['rateList:rateList:edit']">修改</el-button>
@@ -93,7 +93,8 @@
           </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-input-number v-model="form.travelInspectionDomesticAvgRatePeak" :min="0" :precision="2"
+                style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -129,7 +130,8 @@
           </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-input-number v-model="form.internationalTransferAvgRatePeak" :min="0" :precision="2"
+                style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -338,14 +340,4 @@ onMounted(() => {
 .app-container {
   padding: 20px;
 }
-
-:deep(.el-table) {
-  .el-table__header-wrapper {
-    th {
-      background-color: #303133;
-      color: #ffffff;
-      font-weight: 600;
-    }
-  }
-}
 </style>