feat(用户管理): 新增根据用户ID和角色编码查询直属领导列表接口

fix(每日行李查缉): 修复查询详细接口URL路径错误

style(排行榜组件): 优化排行榜样式和表头配置

refactor(速率统计): 重构导入功能使用标准上传组件

refactor(每日各时段查堵行李): 重构导入功能并优化表单验证

refactor(漏检管理): 重构导入功能并优化表单交互

refactor(每日行李过检查堵): 重构导入功能并优化表格列宽

src/api/blockingData/dailyLuggageCheckInList.js

@@ -12,7 +12,7 @@ export function listDailyLuggageCheckIn(query) {
 // 查询每日行李查缉详细
 export function getDailyLuggageCheckIn(id) {
   return request({
-    url: `/blocked/daily${id}`,
+    url: `/blocked/daily/${id}`,
     method: 'get'
   })
 }

src/api/system/user.js

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

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

@@ -4,15 +4,15 @@
       <div class="chart-row">
         <div class="chart-item">
           <div class="chart-title">查堵-主管排行榜</div>
-          <rank-list :rank-data="rankData1" title="查堵-主管排行榜" />
+          <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="查堵-班组长排行榜" />
+          <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="查堵-员工排行榜" />
+          <rank-list :rank-data="rankData3" title="查堵-员工排行榜" header-label="排名" header-name="被回查人" header-count="计数" />
         </div>
       </div>
       

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

@@ -3,16 +3,16 @@
     <div class="module-two-content">
       <div class="top-row">
         <div class="table-card">
-          <div class="chart-title">查堵-主管分管榜</div>
-          <rank-list :rank-data="rankData1" title="查堵-主管分管榜" />
+          <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="查堵-班组排行" />
+          <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="查堵-人员榜" />
+          <div class="chart-title">查堵-人员排行榜</div>
+          <rank-list :rank-data="rankData3" title="查堵-人员排行榜" header-label="排名" header-name="被回查人" header-count="计数" />
         </div>
       </div>
 

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

@@ -1,9 +1,9 @@
 <template>
   <div class="rank-list-container">
     <div class="rank-list-header">
-      <span class="header-label">排名</span>
-      <span class="header-name">分管班组长</span>
-      <span class="header-count">计数</span>
+      <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 rankData" :key="index" class="rank-item" :class="'rank-item-' + getRankClass(index)">
@@ -31,6 +31,18 @@ const props = defineProps({
   title: {
     type: String,
     default: '排行榜'
+  },
+  headerLabel: {
+    type: String,
+    default: '排名'
+  },
+  headerName: {
+    type: String,
+    default: '分管班组长'
+  },
+  headerCount: {
+    type: String,
+    default: '计数'
   }
 })
 
@@ -57,7 +69,8 @@ const getProgressWidth = (value, max) => {
   height: 100%;
   background: #fff;
   border-radius: 8px;
-  padding: 16px;
+  border: 1px solid #e5e7eb;
+  // padding: 16px;
   display: flex;
   flex-direction: column;
 }
@@ -65,7 +78,7 @@ const getProgressWidth = (value, max) => {
 .rank-list-header {
   display: flex;
   align-items: center;
-  padding: 8px 0;
+  padding: 8px;
   border-bottom: 1px solid #e5e7eb;
   margin-bottom: 8px;
 }
@@ -100,9 +113,9 @@ const getProgressWidth = (value, max) => {
 .rank-item {
   display: flex;
   align-items: center;
-  padding: 10px 0;
-  border-radius: 8px;
-  transition: background-color 0.2s;
+  padding: 10px;
+
+  // transition: background-color 0.2s;
 }
 
 .rank-item-first {
@@ -122,7 +135,7 @@ const getProgressWidth = (value, max) => {
 }
 
 .rank-number {
-  width: 80px;
+  //width: 80px;
   font-weight: bold;
   font-size: 15px;
   padding: 4px 8px;
@@ -130,17 +143,17 @@ const getProgressWidth = (value, max) => {
 }
 
 .rank-number-first {
-  background-color: #fbbf24;
+  background: linear-gradient(135deg, #EFB63D, #F8CA4D);
   color: #fff;
 }
 
 .rank-number-second {
-  background-color: #9ca3af;
+  background: linear-gradient(135deg, #C4CAE1, #E0E4ED);
   color: #fff;
 }
 
 .rank-number-third {
-  background-color: #f87171;
+  background: linear-gradient(135deg, #D6A089, #E9C0AF);
   color: #fff;
 }
 
@@ -179,15 +192,15 @@ const getProgressWidth = (value, max) => {
 }
 
 .rank-bar-fill-first {
-  background: linear-gradient(90deg, #fbbf24, #f59e0b);
+  background: #FFCA00;
 }
 
 .rank-bar-fill-second {
-  background: linear-gradient(90deg, #9ca3af, #6b7280);
+  background: #C4C9DF;
 }
 
 .rank-bar-fill-third {
-  background: linear-gradient(90deg, #f87171, #ef4444);
+  background: #D99B86;
 }
 
 .rank-bar-fill-default {

src/views/blockingData/dailyLuggageCheckInList/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="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>
@@ -38,38 +38,38 @@
 
     <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" 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="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="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="aiMarkTotal" width="120" />
-      <el-table-column label="AI漏判图像总数" align="center" prop="aiMissImageTotal" width="120" />
-      <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">
+      <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>
@@ -102,8 +102,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="当班大队" prop="brigadeName">
-          <el-select v-model="form.brigadeName" 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>
@@ -132,11 +132,11 @@
           </el-col>
         </el-row>
         <el-row :gutter="20">
-          <el-col :span="12">
-            <!-- <el-form-item label="过检行李合计" prop="totalLuggageCount">
+          <!--  <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-form-item> 
+          </el-col> -->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
@@ -145,22 +145,15 @@
             </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="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="T2旅检万分率" prop="t2TravelBlockRate">
-              <el-input-number v-model="form.t2TravelBlockRate" :min="0" :precision="2" 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">
@@ -169,31 +162,38 @@
             </el-form-item>
           </el-col>
           <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-row>
-        <el-row :gutter="20">
-          <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="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="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="当日查堵万分率" prop="dailyBlockRate">
+
+
+        <!--  <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>
+            </el-form-item> 
+          </el-col>-->
+    
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="T1复查图像总数" prop="t1ReviewImageTotal">
@@ -245,7 +245,7 @@
         <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">
@@ -256,21 +256,24 @@
     </el-dialog>
 
     <!-- 导入对话框 -->
-    <el-dialog title="导入" v-model="importOpen" width="500px" append-to-body>
-      <el-upload ref="uploadRef" :auto-upload="false" :on-change="handleFileChange" :show-file-list="false"
-        accept=".xlsx,.xls">
-        <el-button type="primary">选取文件</el-button>
-        
+    <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>
-      <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>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitImport">确 定</el-button>
-          <el-button @click="importOpen = false">取 消</el-button>
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -281,6 +284,8 @@
 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()
 
@@ -302,10 +307,13 @@ const dailyLuggageCheckInList = ref([])
 const title = ref('')
 // 是否显示弹出层
 const open = ref(false)
-// 是否显示导入弹出层
-const importOpen = ref(false)
-// 导入文件
-const importFile = ref(null)
+
+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({
@@ -322,7 +330,7 @@ const form = reactive({})
 const rules = {
   statDate: [{ required: true, message: '日期不能为空', trigger: 'change' }],
   shiftType: [{ required: true, message: '班次不能为空', trigger: 'change' }],
-  brigadeName: [{ 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' }],
@@ -359,7 +367,7 @@ function getList() {
 function getDeptList() {
   listDept({}).then(response => {
     const deptList = response.data || []
-    brigadeOptions.value = deptList.filter(item => item.deptType === 'BRIGADE').map(item => ({
+    brigadeOptions.value = deptList.filter(item => item.deptType === 'BRIGADE' && [311, 314, 315].includes(item.deptId)).map(item => ({
       value: item.deptId,
       label: item.deptName
     }))
@@ -378,6 +386,7 @@ function reset() {
     id: null,
     statDate: null,
     shiftType: null,
+    brigadeId: null,
     brigadeName: null,
     t1TravelLuggageCount: 0,
     t2TravelLuggageCount: 0,
@@ -454,6 +463,12 @@ function handleUpdate(row) {
 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('修改成功')
@@ -484,40 +499,38 @@ function handleDelete(row) {
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download('dailyLuggageCheckIn/export', {
+  proxy.download('/blocked/daily/export', {
     ...queryParams
-  }, `每日行李查缉_${new Date().getTime()}.xlsx`)
+  }, `每日行李过检行李查堵_${new Date().getTime()}.xlsx`)
 }
 
 /** 导入按钮操作 */
 function handleImport() {
-  importOpen.value = true
-  importFile.value = null
+  upload.open = true
 }
 
 /** 下载模板操作 */
 function importTemplate() {
-  proxy.download('blocked/daily/importTemplate', {}, `daily_luggage_checkin_template_${new Date().getTime()}.xlsx`)
+  proxy.download('blocked/daily/importTemplate', {}, `每日行李过检行李查堵模板_${new Date().getTime()}.xlsx`)
 }
 
-/** 文件选择 */
-function handleFileChange(file) {
-  importFile.value = file.raw
+/** 文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true
 }
 
-/** 提交导入 */
-function submitImport() {
-  if (!importFile.value) {
-    proxy.$modal.msgWarning('请选择要导入的文件')
-    return
-  }
-  const formData = new FormData()
-  formData.append('file', importFile.value)
-  proxy.upload('dailyLuggageCheckIn/importData', formData).then(response => {
-    proxy.$modal.msgSuccess(response.msg)
-    importOpen.value = false
-    getList()
-  })
+/** 文件上传成功处理 */
+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(() => {

src/views/blockingData/dailyLuggageInspectionScheduleByTime/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>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -36,23 +36,24 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="dailyLuggageInspectionScheduleByTimeList" @selection-change="handleSelectionChange">
+    <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" 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)"
@@ -66,8 +67,8 @@
     <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>
-      <el-form ref="dailyLuggageInspectionScheduleByTimeRef" :model="form" :rules="rules" label-width="180px">
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body>
+      <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">
@@ -86,7 +87,10 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="时间段" prop="timePeriod">
-              <el-input v-model="form.timePeriod" placeholder="请输入时间段" style="width: 100%" />
+              <el-select v-model="form.timePeriod" placeholder="请选择时间段" 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">
@@ -143,8 +147,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-       
-       
+
+
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -154,21 +158,24 @@
       </template>
     </el-dialog>
 
-    <el-dialog title="导入" v-model="importOpen" width="500px" append-to-body>
-      <el-upload ref="uploadRef" :auto-upload="false" :on-change="handleFileChange" :show-file-list="false"
-        accept=".xlsx,.xls">
-        <el-button type="primary">选取文件</el-button>
-       
+    <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>
-       <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>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitImport">确 定</el-button>
-          <el-button @click="importOpen = false">取 消</el-button>
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -179,8 +186,12 @@
 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([])
@@ -191,8 +202,14 @@ const total = ref(0)
 const dailyLuggageInspectionScheduleByTimeList = ref([])
 const title = ref('')
 const open = ref(false)
-const importOpen = ref(false)
-const importFile = ref(null)
+
+
+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,
@@ -207,14 +224,38 @@ 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: 'change' }],
-  t1WalkBlockedCount: [{ required: true, message: 'T1行检查堵数不能为空', trigger: 'change' }],
-  t2WalkBagCount: [{ required: true, message: 'T2行检箱包数不能为空', trigger: 'change' }],
-  t2WalkBlockedCount: [{ required: true, message: 'T2行检查堵数不能为空', trigger: 'change' }],
-  t1TravelBagCount: [{ required: true, message: 'T1旅检箱包数不能为空', trigger: 'change' }],
-  t1TravelBlockedCount: [{ required: true, message: 'T1旅检查堵数不能为空', trigger: 'change' }],
-  t2TravelBagCount: [{ required: true, message: 'T2旅检箱包数不能为空', trigger: 'change' }],
-  t2TravelBlockedCount: [{ required: true, message: 'T2旅检查堵数不能为空', 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 不设置必填校验
 }
 
@@ -232,10 +273,11 @@ function getList() {
 function getDeptList() {
   listDept({}).then(response => {
     const deptList = response.data || []
-    brigadeOptions.value = deptList.filter(item => item.deptType === 'BRIGADE').map(item => ({
+    brigadeOptions.value = deptList.filter(item => item.deptType === 'BRIGADE' && [311, 314, 315].includes(item.deptId)).map(item => ({
       value: item.deptId,
       label: item.deptName
     }))
+
   })
 }
 
@@ -251,14 +293,14 @@ function reset() {
     brigadeId: null,
     timePeriod: null,
     remark: null,
-    t1WalkBagCount: 0,
-    t1WalkBlockedCount: 0,
-    t2WalkBagCount: 0,
-    t2WalkBlockedCount: 0,
-    t1TravelBagCount: 0,
-    t1TravelBlockedCount: 0,
-    t2TravelBagCount: 0,
-    t2TravelBlockedCount: 0,
+    t1WalkBagCount: null,
+    t1WalkBlockedCount: null,
+    t2WalkBagCount: null,
+    t2WalkBlockedCount: null,
+    t1TravelBagCount: null,
+    t1TravelBlockedCount: null,
+    t2TravelBagCount: null,
+    t2TravelBlockedCount: null,
     totalLuggageCount: 0,
     totalBlockedCount: 0,
     blockedRate: 0
@@ -303,6 +345,12 @@ function handleUpdate(row) {
 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('修改成功')
@@ -331,37 +379,37 @@ function handleDelete(row) {
 }
 
 function handleExport() {
-  proxy.download('dailyLuggageInspectionScheduleByTime/export', {
+  proxy.download('/blocked/pieceDaily/export', {
     ...queryParams
   }, `每日各时段查堵行李_${new Date().getTime()}.xlsx`)
 }
 
 function handleImport() {
-  importOpen.value = true
-  importFile.value = null
+  upload.open = true
 }
 
 /** 下载模板操作 */
 function importTemplate() {
-  proxy.download('blocked/pieceDaily/importTemplate', {}, `daily_luggage_inspection_schedule_template_${new Date().getTime()}.xlsx`)
+  proxy.download('blocked/pieceDaily/importTemplate', {}, `每日各时段查堵行李模板_${new Date().getTime()}.xlsx`)
 }
 
-function handleFileChange(file) {
-  importFile.value = file.raw
+/** 文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true
 }
 
-function submitImport() {
-  if (!importFile.value) {
-    proxy.$modal.msgWarning('请选择要导入的文件')
-    return
-  }
-  const formData = new FormData()
-  formData.append('file', importFile.value)
-  proxy.upload('dailyLuggageInspectionScheduleByTime/importData', formData).then(response => {
-    proxy.$modal.msgSuccess(response.msg)
-    importOpen.value = false
-    getList()
-  })
+/** 文件上传成功处理 */
+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(() => {
@@ -374,6 +422,4 @@ onMounted(() => {
 .app-container {
   padding: 20px;
 }
-
-
 </style>

src/views/blockingData/missedInspectionList/index.vue

@@ -59,41 +59,37 @@
 
     <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="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="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">
+      <el-table-column label="大队" align="center" prop="brigadeName" min-width="120" />
+      <el-table-column label="区域" align="center" prop="areaName" min-width="120" />
+      <el-table-column label="被回查人" align="center" prop="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">
-          <el-tag :type="scope.row.isRecovered === '是' ? 'success' : 'warning'">
-            {{ scope.row.isRecovered }}
-          </el-tag>
+          {{ scope.row.isRecovered == 1 ? '是' : '否' }}
         </template>
       </el-table-column>
-      <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="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">
+      <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">
         <template #default="scope">
-          <el-tag>
             {{ scope.row.selfTestHasMissCheck ? '有' : '无' }}
-          </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="漏检物品" align="center" prop="missCheckItem" width="120" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
+      <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>
@@ -128,7 +124,8 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="被回查人" prop="reviewedUserId">
-              <el-select v-model="form.reviewedUserId" placeholder="请选择被回查人" style="width: 100%">
+              <el-select v-model="form.reviewedUserId" placeholder="请选择被回查人" 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>
@@ -207,10 +204,10 @@
               </el-select>
             </el-form-item>
           </el-col>
-         
+
         </el-row>
         <el-row :gutter="20">
-           <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="简单/难" prop="difficultyLevel">
               <el-select v-model="form.difficultyLevel" placeholder="请选择简单/难" style="width: 100%">
                 <el-option label="简单" value="简单" />
@@ -225,10 +222,10 @@
               </el-select>
             </el-form-item>
           </el-col>
-         
+
         </el-row>
         <el-row :gutter="20">
-           <el-col :span="12">
+          <el-col :span="12">
             <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"
@@ -239,12 +236,12 @@
           <el-col :span="12">
             <el-form-item label="是否追回" prop="isRecovered">
               <el-select v-model="form.isRecovered" placeholder="请选择是否追回" style="width: 100%">
-                <el-option label="是" value="是" />
-                <el-option label="否" value="否" />
+                <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">
@@ -260,7 +257,7 @@
               <el-input v-model="form.certificateLevel" placeholder="请输入证书级别" />
             </el-form-item>
           </el-col>
-          
+
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
@@ -279,10 +276,10 @@
               </el-select>
             </el-form-item>
           </el-col>
-        
+
         </el-row>
         <el-row :gutter="20">
-            <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="月考成绩" prop="monthlyAssessment">
               <el-select v-model="form.monthlyAssessment" placeholder="请选择月考成绩" style="width: 100%">
                 <el-option v-for="item in blocked_monthly_exam_result" :key="item.value" :label="item.label"
@@ -292,7 +289,8 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="本月自测有无漏检" prop="selfTestHasMissCheck">
-              <el-input-number v-model="form.selfTestHasMissCheck" :min="0" :max="2" :precision="0" placeholder="请输入0-2的整数" style="width: 100%" />
+              <el-input-number v-model="form.selfTestHasMissCheck" :min="0" :max="2" :precision="0"
+                placeholder="请输入0-2的整数" style="width: 100%" />
             </el-form-item>
           </el-col>
 
@@ -307,21 +305,24 @@
     </el-dialog>
 
     <!-- 导入对话框 -->
-    <el-dialog title="导入" v-model="importOpen" width="500px" append-to-body>
-      <el-upload ref="uploadRef" :auto-upload="false" :on-change="handleFileChange" :show-file-list="false"
-        accept=".xlsx,.xls">
-        <el-button type="primary">选取文件</el-button>
-
+    <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>
-      <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>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitImport">确 定</el-button>
-          <el-button @click="importOpen = false">取 消</el-button>
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -333,8 +334,10 @@ 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 } from '@/api/system/user'
+import { listUser, selectUserLeaderListByCondition } from '@/api/system/user'
 import { useDict } from '@/utils/dict'
+import { getToken } from '@/utils/auth'
+import { UploadFilled } from '@element-plus/icons-vue'
 
 const { proxy } = getCurrentInstance()
 
@@ -356,12 +359,15 @@ const missedInspectionList = ref([])
 const title = ref('')
 // 是否显示弹出层
 const open = ref(false)
-// 是否显示导入弹出层
-const importOpen = ref(false)
 // 日期范围
 const dateRange = ref([])
-// 导入文件
-const importFile = ref(null)
+
+const upload = reactive({
+  open: false,
+  isUploading: false,
+  headers: { Authorization: 'Bearer ' + getToken() },
+  url: import.meta.env.VITE_APP_BASE_API + '/blocked/missReview/importData'
+})
 
 // 查询参数
 const queryParams = reactive({
@@ -402,7 +408,7 @@ const rules = {
   monthlyAssessment: [{ required: true, message: '月考成绩不能为空', trigger: 'change' }],
   selfTestHasMissCheck: [
     { required: true, message: '本月自测有无漏检不能为空', trigger: 'change' },
-    { 
+    {
       validator: (rule, value, callback) => {
         if (value === null || value === undefined || value === '') {
           callback(new Error('本月自测有无漏检不能为空'))
@@ -468,21 +474,57 @@ function getList() {
 function getDeptList() {
   listDept({}).then(response => {
     const deptList = response.data || []
-    brigadeOptions.value = deptList.filter(item => item.deptType === 'BRIGADE').map(item => ({
+    brigadeOptions.value = deptList.filter(item => item.deptType === 'BRIGADE' && [311, 314, 315].includes(item.deptId)).map(item => ({
       value: item.deptId,
       label: item.deptName
     }))
-    teamLeaderOptions.value = deptList.filter(item => item.deptType === 'TEAMS').map(item => ({
-      value: item.deptId,
-      label: item.deptName
+  })
+}
+
+/** 获取班组长选项 */
+function getTeamLeaderOptions() {
+  selectUserLeaderListByCondition({ roleKeyList: ['banzuzhang'] }).then(response => {
+    teamLeaderOptions.value = (response.data || []).map(item => ({
+      value: item.userId,
+      label: item.nickName
     }))
-    supervisorOptions.value = deptList.filter(item => item.deptType === 'MANAGER').map(item => ({
-      value: item.deptId,
-      label: item.deptName
+  })
+}
+
+/** 获取主管选项 */
+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
+      }
+    })
+  } else {
+    form.supervisorId = null
+    form.teamLeaderId = null
+    form.certificateLevel = null
+    form.gender = null
+  }
+}
+
 /** 获取用户列表 */
 function getUserList() {
   listUser({ pageNum: 1, pageSize: 1000 }).then(response => {
@@ -585,8 +627,9 @@ function submitForm() {
 
       // 处理区域ID和名称映射
       if (form.areaId) {
-        const area = areaOptions.value.find(item => item.positionId === form.areaId)
-        form.areaName = area ? area.positionName : null
+        
+        const area = areaOptions.value.find(item => item.id === form.areaId)
+        form.areaName = area ? area.name : null
       }
 
       // 处理被回查人ID和名称映射
@@ -597,8 +640,8 @@ function submitForm() {
 
       // 处理上岗位置ID和名称映射
       if (form.channelId) {
-        const channel = channelOptions.value.find(item => item.positionId === form.channelId)
-        form.channelName = channel ? channel.positionName : null
+        const channel = channelOptions.value.find(item => item.id === form.channelId)
+        form.channelName = channel ? channel.name : null
       }
 
       // 处理分管主管ID和名称映射
@@ -609,6 +652,7 @@ function submitForm() {
 
       // 处理代管主管ID和名称映射
       if (form.actingSupervisorId) {
+        
         const actingSupervisor = supervisorOptions.value.find(item => item.value === form.actingSupervisorId)
         form.actingSupervisorName = actingSupervisor ? actingSupervisor.label : null
       }
@@ -655,47 +699,48 @@ function handleDelete(row) {
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download('missedInspection/export', {
+  proxy.download('/blocked/missReview/export', {
     ...queryParams
   }, `漏检_${new Date().getTime()}.xlsx`)
 }
 
 /** 导入按钮操作 */
 function handleImport() {
-  importOpen.value = true
-  importFile.value = null
+  upload.open = true
 }
 
 /** 下载模板操作 */
 function importTemplate() {
-  proxy.download('blocked/missReview/importTemplate', {}, `missed_inspection_template_${new Date().getTime()}.xlsx`)
+  proxy.download('blocked/missReview/importTemplate', {}, `漏检模板_${new Date().getTime()}.xlsx`)
 }
 
-/** 文件选择 */
-function handleFileChange(file) {
-  importFile.value = file.raw
+/** 文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true
 }
 
-/** 提交导入 */
-function submitImport() {
-  if (!importFile.value) {
-    proxy.$modal.msgWarning('请选择要导入的文件')
-    return
-  }
-  const formData = new FormData()
-  formData.append('file', importFile.value)
-  proxy.upload('missedInspection/importData', formData).then(response => {
-    proxy.$modal.msgSuccess(response.msg)
-    importOpen.value = false
-    getList()
-  })
+/** 文件上传成功处理 */
+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()
-  getUserList()
+
   getPositionList()
+  getTeamLeaderOptions()
+  getSupervisorOptions()
 })
 </script>
 

src/views/blockingData/rateList/index.vue

@@ -44,7 +44,7 @@
     <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" />
+      <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" />
@@ -52,7 +52,7 @@
       <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" prop="internationalTransferAvgRatePeak" min-width="120"/>
       <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)"
@@ -66,8 +66,8 @@
     <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>
-      <el-form ref="rateListRef" :model="form" :rules="rules" label-width="240px">
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body>
+      <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">
@@ -144,20 +144,24 @@
       </template>
     </el-dialog>
 
-    <el-dialog title="导入" v-model="importOpen" width="500px" append-to-body>
-      <el-upload ref="uploadRef" :auto-upload="false" :on-change="handleFileChange" :show-file-list="false"
-        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-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="submitImport">确 定</el-button>
-          <el-button @click="importOpen = false">取 消</el-button>
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -168,6 +172,8 @@
 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')
@@ -181,8 +187,13 @@ const total = ref(0)
 const rateList = ref([])
 const title = ref('')
 const open = ref(false)
-const importOpen = ref(false)
-const importFile = ref(null)
+
+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,
@@ -221,7 +232,7 @@ function getList() {
 function getDeptList() {
   listDept({}).then(response => {
     const deptList = response.data || []
-    brigadeOptions.value = deptList.filter(item => item.deptType === 'BRIGADE').map(item => ({
+    brigadeOptions.value = deptList.filter(item => item.deptType === 'BRIGADE'&& [311, 314, 315].includes(item.deptId)).map(item => ({
       value: item.deptId,
       label: item.deptName
     }))
@@ -239,6 +250,7 @@ function reset() {
     statDate: null,
     dutyBrigadeId: null,
     shift: null,
+    shiftDesc: null,
     travelInspectionDomesticAvgRatePeak: 0,
     t1AAreaRatePeak: 0,
     t1BAreaRatePeak: 0,
@@ -287,6 +299,11 @@ function handleUpdate(row) {
 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.id != null) {
         updateRate(form).then(response => {
           proxy.$modal.msgSuccess('修改成功')
@@ -315,37 +332,37 @@ function handleDelete(row) {
 }
 
 function handleExport() {
-  proxy.download('rateList/export', {
+  proxy.download('blocked/rate/export', {
     ...queryParams
   }, `速率统计_${new Date().getTime()}.xlsx`)
 }
 
 function handleImport() {
-  importOpen.value = true
-  importFile.value = null
-}
-
-function handleFileChange(file) {
-  importFile.value = file.raw
+  upload.open = true
 }
 
 /** 下载模板操作 */
 function importTemplate() {
-  proxy.download('rateList/importTemplate', {}, `rate_list_template_${new Date().getTime()}.xlsx`)
+  proxy.download('/blocked/rate/importTemplate', {}, `速率统计模板${new Date().getTime()}.xlsx`)
 }
 
-function submitImport() {
-  if (!importFile.value) {
-    proxy.$modal.msgWarning('请选择要导入的文件')
-    return
-  }
-  const formData = new FormData()
-  formData.append('file', importFile.value)
-  proxy.upload('rateList/importData', formData).then(response => {
-    proxy.$modal.msgSuccess(response.msg)
-    importOpen.value = false
-    getList()
-  })
+/** 文件上传中处理 */
+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(() => {