refactor: 统一优化运行数据相关页面的字段命名与交互

1. 调整多个运行数据页面的字段名，统一命名规范
2. 将时间段选择改为时间范围选择器，优化查询交互
3. 重构大队查获图表的渲染逻辑，支持多班组数据展示
4. 调整表单弹窗宽度与布局，优化编辑体验
5. 更新接口请求地址与后端接口对齐

src/views/runData/collectWaitingAreaData/index.vue

@@ -2,12 +2,14 @@
   <div class="app-container">
     <!-- 查询条件 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="日期" prop="date">
-        <el-date-picker v-model="queryParams.date" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD" 
+      <el-form-item label="日期" prop="recordDate">
+        <el-date-picker v-model="queryParams.recordDate" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD"
           style="width: 200px" />
       </el-form-item>
-      <el-form-item label="时间段" prop="timePeriod">
-        <el-input v-model="queryParams.timePeriod" placeholder="请输入时间段" clearable style="width: 200px" />
+      <el-form-item label="时间段" prop="timeSlot">
+        <el-time-picker v-model="queryParams.timeSlot" is-range range-separator="-" start-placeholder="开始时间"
+          end-placeholder="结束时间" value-format="HH:mm" format="HH:mm" placeholder="请选择时间段" clearable
+          style="width: 200px" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -21,10 +23,7 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['runData:collectWaitingAreaData:add']">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['runData:collectWaitingAreaData:edit']">修改</el-button>
-      </el-col>
+
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['runData:collectWaitingAreaData:remove']">删除</el-button>
@@ -43,29 +42,29 @@
     <!-- 数据表格 -->
     <el-table v-loading="loading" :data="collectWaitingAreaDataList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="日期" align="center" prop="date" />
-      <el-table-column label="时间段" align="center" prop="timePeriod" />
-      
+      <el-table-column label="日期" align="center" prop="recordDate" />
+      <el-table-column label="时间段" align="center" prop="timeSlot" />
+
       <!-- T1区域数据 -->
-      <el-table-column label="T1A区火种" align="center" prop="t1aFire" />
-      <el-table-column label="T1A区液态物品" align="center" prop="t1aLiquid" />
-      <el-table-column label="T1A区其他物品" align="center" prop="t1aOther" />
-      <el-table-column label="T1B区火种" align="center" prop="t1bFire" />
-      <el-table-column label="T1B区液态物品" align="center" prop="t1bLiquid" />
-      <el-table-column label="T1B区其他物品" align="center" prop="t1bOther" />
-      
+      <el-table-column label="T1A区火种" align="center" prop="t1AFireSource" />
+      <el-table-column label="T1A区液态物品" align="center" prop="t1ALiquid" />
+      <el-table-column label="T1A区其他物品" align="center" prop="t1AOther" />
+      <el-table-column label="T1B区火种" align="center" prop="t1BFireSource" />
+      <el-table-column label="T1B区液态物品" align="center" prop="t1BLiquid" />
+      <el-table-column label="T1B区其他物品" align="center" prop="t1BOther" />
+
       <!-- T2区域数据 -->
-      <el-table-column label="T2国内火种" align="center" prop="t2DomesticFire" />
+      <el-table-column label="T2国内火种" align="center" prop="t2DomesticFireSource" />
       <el-table-column label="T2国内液态物品" align="center" prop="t2DomesticLiquid" />
       <el-table-column label="T2国内其他物品" align="center" prop="t2DomesticOther" />
-      <el-table-column label="T2国际火种" align="center" prop="t2InternationalFire" />
-      <el-table-column label="T2国际液态物品" align="center" prop="t2InternationalLiquid" />
-      <el-table-column label="T2国际中转火种" align="center" prop="t2InternationalTransitFire" />
-      <el-table-column label="T2中转火种" align="center" prop="t2TransitFire" />
+      <el-table-column label="T2国际火种" align="center" prop="t2IntlFireSource" />
+      <el-table-column label="T2国际液态物品" align="center" prop="t2IntlLiquid" />
+      <el-table-column label="T2国际其他物品" align="center" prop="t2IntlOther" />
+      <el-table-column label="T2中转火种" align="center" prop="t2TransitFireSource" />
       <el-table-column label="T2中转液态物品" align="center" prop="t2TransitLiquid" />
       <el-table-column label="T2中转其他物品" align="center" prop="t2TransitOther" />
-      
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+
+      <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['runData:collectWaitingAreaData:edit']">修改</el-button>
@@ -79,88 +78,91 @@
       v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改候检区数据对话框 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body>
       <el-form ref="collectWaitingAreaDataRef" :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="recordDate">
+              <el-date-picker v-model="form.recordDate" 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="timePeriod">
-              <el-input v-model="form.timePeriod" placeholder="请输入时间段" />
+            <el-form-item label="时间段" prop="timeSlot">
+              <el-time-picker v-model="form.timeSlot" is-range range-separator="至" start-placeholder="开始时间"
+                end-placeholder="结束时间" value-format="HH:mm" format="HH:mm" placeholder="请选择时间段" style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
-        
+
         <!-- T1区域 -->
         <el-divider content-position="left">T1区域数据</el-divider>
         <el-row :gutter="20">
           <el-col :span="12">
             <h4 style="margin-bottom: 15px;">T1A区</h4>
-            <el-form-item label="T1A区火种" prop="t1aFire">
-              <el-input-number v-model="form.t1aFire" :min="0" placeholder="请输入T1A区火种" style="width: 100%" />
+            <el-form-item label="T1A区火种" prop="t1AFireSource">
+              <el-input-number :precision="0" v-model="form.t1AFireSource" :min="0" placeholder="请输入T1A区火种" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="T1A区液态物品" prop="t1aLiquid">
-              <el-input-number v-model="form.t1aLiquid" :min="0" placeholder="请输入T1A区液态物品" style="width: 100%" />
+            <el-form-item label="T1A区液态物品" prop="t1ALiquid">
+              <el-input-number :precision="0" v-model="form.t1ALiquid" :min="0" placeholder="请输入T1A区液态物品" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="T1A区其他物品" prop="t1aOther">
-              <el-input-number v-model="form.t1aOther" :min="0" placeholder="请输入T1A区其他物品" style="width: 100%" />
+            <el-form-item label="T1A区其他物品" prop="t1AOther">
+              <el-input-number :precision="0" v-model="form.t1AOther" :min="0" placeholder="请输入T1A区其他物品" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <h4 style="margin-bottom: 15px;">T1B区</h4>
-            <el-form-item label="T1B区火种" prop="t1bFire">
-              <el-input-number v-model="form.t1bFire" :min="0" placeholder="请输入T1B区火种" style="width: 100%" />
+            <el-form-item label="T1B区火种" prop="t1BFireSource">
+              <el-input-number :precision="0" v-model="form.t1BFireSource" :min="0" placeholder="请输入T1B区火种" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="T1B区液态物品" prop="t1bLiquid">
-              <el-input-number v-model="form.t1bLiquid" :min="0" placeholder="请输入T1B区液态物品" style="width: 100%" />
+            <el-form-item label="T1B区液态物品" prop="t1BLiquid">
+              <el-input-number :precision="0" v-model="form.t1BLiquid" :min="0" placeholder="请输入T1B区液态物品" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="T1B区其他物品" prop="t1bOther">
-              <el-input-number v-model="form.t1bOther" :min="0" placeholder="请输入T1B区其他物品" style="width: 100%" />
+            <el-form-item label="T1B区其他物品" prop="t1BOther">
+              <el-input-number :precision="0" v-model="form.t1BOther" :min="0" placeholder="请输入T1B区其他物品" style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
-        
+
         <!-- T2区域 -->
         <el-divider content-position="left">T2区域数据</el-divider>
         <el-row :gutter="20">
           <el-col :span="8">
             <h4 style="margin-bottom: 15px;">T2国内</h4>
-            <el-form-item label="T2国内火种" prop="t2DomesticFire">
-              <el-input-number v-model="form.t2DomesticFire" :min="0" placeholder="请输入T2国内火种" style="width: 100%" />
+            <el-form-item label="T2国内火种" prop="t2DomesticFireSource">
+              <el-input-number :precision="0" v-model="form.t2DomesticFireSource" :min="0" placeholder="请输入T2国内火种"
+                style="width: 100%" />
             </el-form-item>
             <el-form-item label="T2国内液态物品" prop="t2DomesticLiquid">
-              <el-input-number v-model="form.t2DomesticLiquid" :min="0" placeholder="请输入T2国内液态物品" style="width: 100%" />
+              <el-input-number :precision="0" v-model="form.t2DomesticLiquid" :min="0" placeholder="请输入T2国内液态物品" style="width: 100%" />
             </el-form-item>
             <el-form-item label="T2国内其他物品" prop="t2DomesticOther">
-              <el-input-number v-model="form.t2DomesticOther" :min="0" placeholder="请输入T2国内其他物品" style="width: 100%" />
+              <el-input-number :precision="0" v-model="form.t2DomesticOther" :min="0" placeholder="请输入T2国内其他物品" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <h4 style="margin-bottom: 15px;">T2国际</h4>
-            <el-form-item label="T2国际火种" prop="t2InternationalFire">
-              <el-input-number v-model="form.t2InternationalFire" :min="0" placeholder="请输入T2国际火种" style="width: 100%" />
+            <el-form-item label="T2国际火种" prop="t2IntlFireSource">
+              <el-input-number :precision="0" v-model="form.t2IntlFireSource" :min="0" placeholder="请输入T2国际火种" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="T2国际液态物品" prop="t2InternationalLiquid">
-              <el-input-number v-model="form.t2InternationalLiquid" :min="0" placeholder="请输入T2国际液态物品" style="width: 100%" />
+            <el-form-item label="T2国际液态物品" prop="t2IntlLiquid">
+              <el-input-number :precision="0" v-model="form.t2IntlLiquid" :min="0" placeholder="请输入T2国际液态物品" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="T2国际中转火种" prop="t2InternationalTransitFire">
-              <el-input-number v-model="form.t2InternationalTransitFire" :min="0" placeholder="请输入T2国际中转火种" style="width: 100%" />
+            <el-form-item label="T2国际其他物品" prop="t2IntlOther">
+              <el-input-number :precision="0" v-model="form.t2IntlOther" :min="0" placeholder="请输入T2国际其他物品" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <h4 style="margin-bottom: 15px;">T2中转</h4>
-            <el-form-item label="T2中转火种" prop="t2TransitFire">
-              <el-input-number v-model="form.t2TransitFire" :min="0" placeholder="请输入T2中转火种" style="width: 100%" />
+            <el-form-item label="T2中转火种" prop="t2TransitFireSource">
+              <el-input-number :precision="0" v-model="form.t2TransitFireSource" :min="0" placeholder="请输入T2中转火种"
+                style="width: 100%" />
             </el-form-item>
             <el-form-item label="T2中转液态物品" prop="t2TransitLiquid">
-              <el-input-number v-model="form.t2TransitLiquid" :min="0" placeholder="请输入T2中转液态物品" style="width: 100%" />
+              <el-input-number :precision="0" v-model="form.t2TransitLiquid" :min="0" placeholder="请输入T2中转液态物品" style="width: 100%" />
             </el-form-item>
             <el-form-item label="T2中转其他物品" prop="t2TransitOther">
-              <el-input-number v-model="form.t2TransitOther" :min="0" placeholder="请输入T2中转其他物品" style="width: 100%" />
+              <el-input-number :precision="0" v-model="form.t2TransitOther" :min="0" placeholder="请输入T2中转其他物品" style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -229,7 +231,7 @@ const upload = reactive({
   // 设置上传的请求头部
   headers: { Authorization: "Bearer " + getToken() },
   // 上传的地址
-  url: import.meta.env.VITE_APP_BASE_API + "/runData/collectWaitingAreaData/importData"
+  url: import.meta.env.VITE_APP_BASE_API + "/item/hkPendingConfiscate/importData"
 })
 
 const uploadRef = ref()
@@ -239,35 +241,35 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    date: null,
-    timePeriod: null
+    recordDate: null,
+    timeSlot: null
   },
   rules: {
-    date: [
-      { required: true, message: "日期不能为空", trigger: "blur" }
+    recordDate: [
+      { required: true, message: "日期不能为空", trigger: "change" }
     ],
-    timePeriod: [
-      { required: true, message: "时间段不能为空", trigger: "blur" }
+    timeSlot: [
+      { required: true, message: "时间段不能为空", trigger: "change" }
     ],
-    t1aFire: [
+    t1AFireSource: [
       { type: "integer", message: "T1A区火种必须为整数", trigger: "blur" }
     ],
-    t1aLiquid: [
+    t1ALiquid: [
       { type: "integer", message: "T1A区液态物品必须为整数", trigger: "blur" }
     ],
-    t1aOther: [
+    t1AOther: [
       { type: "integer", message: "T1A区其他物品必须为整数", trigger: "blur" }
     ],
-    t1bFire: [
+    t1BFireSource: [
       { type: "integer", message: "T1B区火种必须为整数", trigger: "blur" }
     ],
-    t1bLiquid: [
+    t1BLiquid: [
       { type: "integer", message: "T1B区液态物品必须为整数", trigger: "blur" }
     ],
-    t1bOther: [
+    t1BOther: [
       { type: "integer", message: "T1B区其他物品必须为整数", trigger: "blur" }
     ],
-    t2DomesticFire: [
+    t2DomesticFireSource: [
       { type: "integer", message: "T2国内火种必须为整数", trigger: "blur" }
     ],
     t2DomesticLiquid: [
@@ -276,16 +278,16 @@ const data = reactive({
     t2DomesticOther: [
       { type: "integer", message: "T2国内其他物品必须为整数", trigger: "blur" }
     ],
-    t2InternationalFire: [
+    t2IntlFireSource: [
       { type: "integer", message: "T2国际火种必须为整数", trigger: "blur" }
     ],
-    t2InternationalLiquid: [
+    t2IntlLiquid: [
       { type: "integer", message: "T2国际液态物品必须为整数", trigger: "blur" }
     ],
-    t2InternationalTransitFire: [
-      { type: "integer", message: "T2国际中转火种必须为整数", trigger: "blur" }
+    t2IntlOther: [
+      { type: "integer", message: "T2国际其他物品必须为整数", trigger: "blur" }
     ],
-    t2TransitFire: [
+    t2TransitFireSource: [
       { type: "integer", message: "T2中转火种必须为整数", trigger: "blur" }
     ],
     t2TransitLiquid: [
@@ -302,7 +304,11 @@ const { queryParams, form, rules } = toRefs(data)
 /** 查询候检区数据列表 */
 function getList() {
   loading.value = true
-  listCollectWaitingAreaData(queryParams.value).then(response => {
+  const params = { ...queryParams.value }
+  if (params.timeSlot && Array.isArray(params.timeSlot)) {
+    params.timeSlot = params.timeSlot.join('-')
+  }
+  listCollectWaitingAreaData(params).then(response => {
     collectWaitingAreaDataList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -319,23 +325,23 @@ function cancel() {
 function reset() {
   form.value = {
     id: null,
-    date: null,
-    timePeriod: null,
+    recordDate: null,
+    timeSlot: null,
     // T1区域数据
-    t1aFire: null,
-    t1aLiquid: null,
-    t1aOther: null,
-    t1bFire: null,
-    t1bLiquid: null,
-    t1bOther: null,
+    t1AFireSource: null,
+    t1ALiquid: null,
+    t1AOther: null,
+    t1BFireSource: null,
+    t1BLiquid: null,
+    t1BOther: null,
     // T2区域数据
-    t2DomesticFire: null,
+    t2DomesticFireSource: null,
     t2DomesticLiquid: null,
     t2DomesticOther: null,
-    t2InternationalFire: null,
-    t2InternationalLiquid: null,
-    t2InternationalTransitFire: null,
-    t2TransitFire: null,
+    t2IntlFireSource: null,
+    t2IntlLiquid: null,
+    t2IntlOther: null,
+    t2TransitFireSource: null,
     t2TransitLiquid: null,
     t2TransitOther: null
   }
@@ -373,7 +379,12 @@ function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
   getCollectWaitingAreaData(_id).then(response => {
-    form.value = response.data
+    const data = response.data
+    // 转换时间段字符串为数组格式
+    if (data.timeSlot && typeof data.timeSlot === 'string' && data.timeSlot.includes('-')) {
+      data.timeSlot = data.timeSlot.split('-')
+    }
+    form.value = data
     open.value = true
     title.value = "修改候检区数据"
   })
@@ -383,14 +394,19 @@ function handleUpdate(row) {
 function submitForm() {
   proxy.$refs["collectWaitingAreaDataRef"].validate(valid => {
     if (valid) {
-      if (form.value.id != null) {
-        updateCollectWaitingAreaData(form.value).then(response => {
+      const submitData = { ...form.value }
+      // 转换时间段为字符串格式 08:00-17:00
+      if (submitData.timeSlot && Array.isArray(submitData.timeSlot)) {
+        submitData.timeSlot = submitData.timeSlot.join('-')
+      }
+      if (submitData.id != null) {
+        updateCollectWaitingAreaData(submitData).then(response => {
           proxy.$modal.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        addCollectWaitingAreaData(form.value).then(response => {
+        addCollectWaitingAreaData(submitData).then(response => {
           proxy.$modal.msgSuccess("新增成功")
           open.value = false
           getList()
@@ -422,8 +438,8 @@ function handleExport() {
       return value !== null
     })
   )
-  
-  proxy.download('/runData/collectWaitingAreaData/export', filteredParams, `collectWaitingAreaData_${new Date().getTime()}.xlsx`)
+
+  proxy.download('/item/hkPendingConfiscate/export', filteredParams, `collectWaitingAreaData_${new Date().getTime()}.xlsx`)
 }
 
 /** 导入按钮操作 */
@@ -434,7 +450,7 @@ function handleImport() {
 
 /** 下载模板操作 */
 function importTemplate() {
-  proxy.download('/runData/collectWaitingAreaData/importTemplate', {
+  proxy.download('/item/hkPendingConfiscate/importTemplate', {
   }, `候检区数据导入模板_${new Date().getTime()}.xlsx`)
 }
 

src/views/runData/dailyRunData/index.vue

@@ -3,7 +3,7 @@
     <!-- 查询条件 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="日期" prop="date">
-        <el-date-picker v-model="queryParams.date" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD" 
+        <el-date-picker v-model="queryParams.recordDate" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD"
           style="width: 200px" />
       </el-form-item>
       <el-form-item>
@@ -18,10 +18,7 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['runData:dailyRunData:add']">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['runData:dailyRunData:edit']">修改</el-button>
-      </el-col>
+
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['runData:dailyRunData:remove']">删除</el-button>
@@ -40,31 +37,30 @@
     <!-- 数据表格 -->
     <el-table v-loading="loading" :data="dailyRunDataList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="日期" align="center" prop="date" />
-      <el-table-column label="A区" align="center" prop="areaA" />
-      <el-table-column label="B区" align="center" prop="areaB" />
+      <el-table-column label="日期" align="center" prop="recordDate" />
+      <el-table-column label="A区" align="center" prop="azone" />
+      <el-table-column label="B区" align="center" prop="bzone" />
       <el-table-column label="贵宾" align="center" prop="vip" />
-      <el-table-column label="国内旅检" align="center" prop="domesticTravelInspection" />
-      <el-table-column label="国际旅检" align="center" prop="internationalTravelInspection" />
+      <el-table-column label="国内旅检" align="center" prop="domesticPassenger" />
+      <el-table-column label="国际旅检" align="center" prop="intlPassenger" />
       <el-table-column label="贵宾通道" align="center" prop="vipChannel" />
       <el-table-column label="T1回流通道" align="center" prop="t1ReturnChannel" />
-      <el-table-column label="T1行检" align="center" prop="t1Inspection" />
-      <el-table-column label="一楼员工" align="center" prop="firstFloorStaff" />
+      <el-table-column label="T1行检" align="center" prop="t1LuggageCheck" />
+      <el-table-column label="一楼员工" align="center" prop="floor1Staff" />
       <el-table-column label="T2回流通道" align="center" prop="t2ReturnChannel" />
-      <el-table-column label="T2行检" align="center" prop="t2Inspection" />
-      <el-table-column label="三楼" align="center" prop="thirdFloor" />
-      <el-table-column label="一楼" align="center" prop="firstFloor" />
-      <el-table-column label="负一楼" align="center" prop="basementFloor" />
+      <el-table-column label="T2行检" align="center" prop="t2LuggageCheck" />
+      <el-table-column label="三楼" align="center" prop="floor3EastStaff" />
+      <el-table-column label="一楼" align="center" prop="floor1CenterStaff" />
+      <el-table-column label="负一楼" align="center" prop="floorB1WestStaff" />
       <el-table-column label="国内货站" align="center" prop="domesticCargo" />
-      <el-table-column label="道口" align="center" prop="gate" />
-      <el-table-column label="南侧车检" align="center" prop="southVehicleInspection" />
-      <el-table-column label="防爆" align="center" prop="explosionProof" />
-      <el-table-column label="国际货站" align="center" prop="internationalCargo" />
-      <el-table-column label="道口" align="center" prop="gate2" />
-      <el-table-column label="北侧车检" align="center" prop="northVehicleInspection" />
-      <el-table-column label="防爆" align="center" prop="explosionProof2" />
-      <el-table-column label="车检总数" align="center" prop="totalVehicleInspection" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="道口" align="center" prop="domesticGate" />
+      <el-table-column label="南侧车检" align="center" prop="southVehicleCheck" />
+      <el-table-column label="防爆" align="center" prop="domesticBomb" />
+      <el-table-column label="国际货站" align="center" prop="intlCargo" />
+      <el-table-column label="道口" align="center" prop="intlGate" />
+      <el-table-column label="北侧车检" align="center" prop="northVehicleCheck" />
+      <el-table-column label="防爆" align="center" prop="intlBomb" />
+      <el-table-column label="操作" width="180px" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['runData:dailyRunData:edit']">修改</el-button>
@@ -80,84 +76,86 @@
     <!-- 添加或修改日常运行数据对话框 -->
     <el-dialog :title="title" v-model="open" width="800px" append-to-body>
       <el-form ref="dailyRunDataRef" :model="form" :rules="rules" label-width="120px">
-        <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="recordDate">
+          <el-date-picker v-model="form.recordDate" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD"
             style="width: 100%" />
         </el-form-item>
-        
+
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="A区" prop="areaA">
-              <el-input-number v-model="form.areaA" :min="0" placeholder="请输入A区数据" style="width: 100%" />
+            <el-form-item label="A区" prop="azone">
+              <el-input-number :precision="0" v-model="form.azone" :min="0" placeholder="请输入A区数据" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="B区" prop="areaB">
-              <el-input-number v-model="form.areaB" :min="0" placeholder="请输入B区数据" style="width: 100%" />
+            <el-form-item label="B区" prop="bzone">
+              <el-input-number :precision="0" v-model="form.bzone" :min="0" placeholder="请输入B区数据" style="width: 100%" />
             </el-form-item>
             <el-form-item label="贵宾" prop="vip">
-              <el-input-number v-model="form.vip" :min="0" placeholder="请输入贵宾数据" style="width: 100%" />
+              <el-input-number :precision="0" v-model="form.vip" :min="0" placeholder="请输入贵宾数据" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="国内旅检" prop="domesticTravelInspection">
-              <el-input-number v-model="form.domesticTravelInspection" :min="0" placeholder="请输入国内旅检数据" style="width: 100%" />
+            <el-form-item label="国内旅检" prop="domesticPassenger">
+              <el-input-number :precision="0" v-model="form.domesticPassenger" :min="0" placeholder="请输入国内旅检数据"
+                style="width: 100%" />
             </el-form-item>
-            <el-form-item label="国际旅检" prop="internationalTravelInspection">
-              <el-input-number v-model="form.internationalTravelInspection" :min="0" placeholder="请输入国际旅检数据" style="width: 100%" />
+            <el-form-item label="国际旅检" prop="intlPassenger">
+              <el-input-number :precision="0" v-model="form.intlPassenger" :min="0" placeholder="请输入国际旅检数据"
+                style="width: 100%" />
             </el-form-item>
             <el-form-item label="贵宾通道" prop="vipChannel">
-              <el-input-number v-model="form.vipChannel" :min="0" placeholder="请输入贵宾通道数据" style="width: 100%" />
+              <el-input-number :precision="0" v-model="form.vipChannel" :min="0" placeholder="请输入贵宾通道数据" style="width: 100%" />
             </el-form-item>
             <el-form-item label="T1回流通道" prop="t1ReturnChannel">
-              <el-input-number v-model="form.t1ReturnChannel" :min="0" placeholder="请输入T1回流通道数据" style="width: 100%" />
+              <el-input-number :precision="0" v-model="form.t1ReturnChannel" :min="0" placeholder="请输入T1回流通道数据" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="T1行检" prop="t1Inspection">
-              <el-input-number v-model="form.t1Inspection" :min="0" placeholder="请输入T1行检数据" style="width: 100%" />
+            <el-form-item label="T1行检" prop="t1LuggageCheck">
+              <el-input-number :precision="0" v-model="form.t1LuggageCheck" :min="0" placeholder="请输入T1行检数据" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="一楼员工" prop="firstFloorStaff">
-              <el-input-number v-model="form.firstFloorStaff" :min="0" placeholder="请输入一楼员工数据" style="width: 100%" />
+            <el-form-item label="一楼员工" prop="floor1Staff">
+              <el-input-number :precision="0" v-model="form.floor1Staff" :min="0" placeholder="请输入一楼员工数据" style="width: 100%" />
             </el-form-item>
             <el-form-item label="T2回流通道" prop="t2ReturnChannel">
-              <el-input-number v-model="form.t2ReturnChannel" :min="0" placeholder="请输入T2回流通道数据" style="width: 100%" />
+              <el-input-number :precision="0" v-model="form.t2ReturnChannel" :min="0" placeholder="请输入T2回流通道数据" style="width: 100%" />
+            </el-form-item>
+            <el-form-item label="T2行检" prop="t2LuggageCheck">
+              <el-input-number :precision="0" v-model="form.t2LuggageCheck" :min="0" placeholder="请输入T2行检数据" style="width: 100%" />
             </el-form-item>
+
           </el-col>
-          
+
           <el-col :span="12">
-            <el-form-item label="T2行检" prop="t2Inspection">
-              <el-input-number v-model="form.t2Inspection" :min="0" placeholder="请输入T2行检数据" style="width: 100%" />
-            </el-form-item>
-            <el-form-item label="三楼" prop="thirdFloor">
-              <el-input-number v-model="form.thirdFloor" :min="0" placeholder="请输入三楼数据" style="width: 100%" />
+            <el-form-item label="三楼" prop="floor3EastStaff">
+              <el-input-number :precision="0" v-model="form.floor3EastStaff" :min="0" placeholder="请输入三楼数据" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="一楼" prop="firstFloor">
-              <el-input-number v-model="form.firstFloor" :min="0" placeholder="请输入一楼数据" style="width: 100%" />
+            <el-form-item label="一楼" prop="floor1CenterStaff">
+              <el-input-number :precision="0" v-model="form.floor1CenterStaff" :min="0" placeholder="请输入一楼数据" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="负一楼" prop="basementFloor">
-              <el-input-number v-model="form.basementFloor" :min="0" placeholder="请输入负一楼数据" style="width: 100%" />
+            <el-form-item label="负一楼" prop="floorB1WestStaff">
+              <el-input-number :precision="0" v-model="form.floorB1WestStaff" :min="0" placeholder="请输入负一楼数据" style="width: 100%" />
             </el-form-item>
             <el-form-item label="国内货站" prop="domesticCargo">
-              <el-input-number v-model="form.domesticCargo" :min="0" placeholder="请输入国内货站数据" style="width: 100%" />
-            </el-form-item>
-            <el-form-item label="道口" prop="gate">
-              <el-input-number v-model="form.gate" :min="0" placeholder="请输入道口数据" style="width: 100%" />
+              <el-input-number :precision="0" v-model="form.domesticCargo" :min="0" placeholder="请输入国内货站数据" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="南侧车检" prop="southVehicleInspection">
-              <el-input-number v-model="form.southVehicleInspection" :min="0" placeholder="请输入南侧车检数据" style="width: 100%" />
+            <el-form-item label="道口" prop="domesticGate">
+              <el-input-number :precision="0" v-model="form.domesticGate" :min="0" placeholder="请输入道口数据" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="防爆" prop="explosionProof">
-              <el-input-number v-model="form.explosionProof" :min="0" placeholder="请输入防爆数据" style="width: 100%" />
+            <el-form-item label="南侧车检" prop="southVehicleCheck">
+              <el-input-number :precision="0" v-model="form.southVehicleCheck" :min="0" placeholder="请输入南侧车检数据"
+                style="width: 100%" />
             </el-form-item>
-            <el-form-item label="国际货站" prop="internationalCargo">
-              <el-input-number v-model="form.internationalCargo" :min="0" placeholder="请输入国际货站数据" style="width: 100%" />
+            <el-form-item label="防爆" prop="domesticBomb">
+              <el-input-number :precision="0" v-model="form.domesticBomb" :min="0" placeholder="请输入防爆数据" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="道口" prop="gate2">
-              <el-input-number v-model="form.gate2" :min="0" placeholder="请输入道口数据" style="width: 100%" />
+            <el-form-item label="国际货站" prop="intlCargo">
+              <el-input-number :precision="0" v-model="form.intlCargo" :min="0" placeholder="请输入国际货站数据" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="北侧车检" prop="northVehicleInspection">
-              <el-input-number v-model="form.northVehicleInspection" :min="0" placeholder="请输入北侧车检数据" style="width: 100%" />
+            <el-form-item label="道口" prop="intlGate">
+              <el-input-number :precision="0" v-model="form.intlGate" :min="0" placeholder="请输入道口数据" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="防爆" prop="explosionProof2">
-              <el-input-number v-model="form.explosionProof2" :min="0" placeholder="请输入防爆数据" style="width: 100%" />
+            <el-form-item label="北侧车检" prop="northVehicleCheck">
+              <el-input-number :precision="0" v-model="form.northVehicleCheck" :min="0" placeholder="请输入北侧车检数据"
+                style="width: 100%" />
             </el-form-item>
-            <el-form-item label="车检总数" prop="totalVehicleInspection">
-              <el-input-number v-model="form.totalVehicleInspection" :min="0" placeholder="请输入车检总数" style="width: 100%" />
+            <el-form-item label="防爆" prop="intlBomb">
+              <el-input-number :precision="0" v-model="form.intlBomb" :min="0" placeholder="请输入防爆数据" style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -226,7 +224,7 @@ const upload = reactive({
   // 设置上传的请求头部
   headers: { Authorization: "Bearer " + getToken() },
   // 上传的地址
-  url: import.meta.env.VITE_APP_BASE_API + "/runData/dailyRunData/importData"
+  url: import.meta.env.VITE_APP_BASE_API + "/item/hkOperationData/importData"
 })
 
 const uploadRef = ref()
@@ -236,17 +234,17 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    date: null
+    recordDate: null
   },
   rules: {
-    date: [
+    recordDate: [
       { required: true, message: "日期不能为空", trigger: "blur" }
     ],
-    areaA: [
+    azone: [
       { required: true, message: "A区数据不能为空", trigger: "blur" },
       { type: "integer", message: "A区数据必须为整数", trigger: "blur" }
     ],
-    areaB: [
+    bzone: [
       { required: true, message: "B区数据不能为空", trigger: "blur" },
       { type: "integer", message: "B区数据必须为整数", trigger: "blur" }
     ],
@@ -254,11 +252,11 @@ const data = reactive({
       { required: true, message: "贵宾数据不能为空", trigger: "blur" },
       { type: "integer", message: "贵宾数据必须为整数", trigger: "blur" }
     ],
-    domesticTravelInspection: [
+    domesticPassenger: [
       { required: true, message: "国内旅检数据不能为空", trigger: "blur" },
       { type: "integer", message: "国内旅检数据必须为整数", trigger: "blur" }
     ],
-    internationalTravelInspection: [
+    intlPassenger: [
       { required: true, message: "国际旅检数据不能为空", trigger: "blur" },
       { type: "integer", message: "国际旅检数据必须为整数", trigger: "blur" }
     ],
@@ -270,11 +268,11 @@ const data = reactive({
       { required: true, message: "T1回流通道数据不能为空", trigger: "blur" },
       { type: "integer", message: "T1回流通道数据必须为整数", trigger: "blur" }
     ],
-    t1Inspection: [
+    t1LuggageCheck: [
       { required: true, message: "T1行检数据不能为空", trigger: "blur" },
       { type: "integer", message: "T1行检数据必须为整数", trigger: "blur" }
     ],
-    firstFloorStaff: [
+    floor1Staff: [
       { required: true, message: "一楼员工数据不能为空", trigger: "blur" },
       { type: "integer", message: "一楼员工数据必须为整数", trigger: "blur" }
     ],
@@ -282,19 +280,19 @@ const data = reactive({
       { required: true, message: "T2回流通道数据不能为空", trigger: "blur" },
       { type: "integer", message: "T2回流通道数据必须为整数", trigger: "blur" }
     ],
-    t2Inspection: [
+    t2LuggageCheck: [
       { required: true, message: "T2行检数据不能为空", trigger: "blur" },
       { type: "integer", message: "T2行检数据必须为整数", trigger: "blur" }
     ],
-    thirdFloor: [
+    floor3EastStaff: [
       { required: true, message: "三楼数据不能为空", trigger: "blur" },
       { type: "integer", message: "三楼数据必须为整数", trigger: "blur" }
     ],
-    firstFloor: [
+    floor1CenterStaff: [
       { required: true, message: "一楼数据不能为空", trigger: "blur" },
       { type: "integer", message: "一楼数据必须为整数", trigger: "blur" }
     ],
-    basementFloor: [
+    floorB1WestStaff: [
       { required: true, message: "负一楼数据不能为空", trigger: "blur" },
       { type: "integer", message: "负一楼数据必须为整数", trigger: "blur" }
     ],
@@ -302,36 +300,33 @@ const data = reactive({
       { required: true, message: "国内货站数据不能为空", trigger: "blur" },
       { type: "integer", message: "国内货站数据必须为整数", trigger: "blur" }
     ],
-    gate: [
+    domesticGate: [
       { required: true, message: "道口数据不能为空", trigger: "blur" },
       { type: "integer", message: "道口数据必须为整数", trigger: "blur" }
     ],
-    southVehicleInspection: [
+    southVehicleCheck: [
       { required: true, message: "南侧车检数据不能为空", trigger: "blur" },
       { type: "integer", message: "南侧车检数据必须为整数", trigger: "blur" }
     ],
-    explosionProof: [
+    domesticBomb: [
       { required: true, message: "防爆数据不能为空", trigger: "blur" },
       { type: "integer", message: "防爆数据必须为整数", trigger: "blur" }
     ],
-    internationalCargo: [
+    intlCargo: [
       { required: true, message: "国际货站数据不能为空", trigger: "blur" },
       { type: "integer", message: "国际货站数据必须为整数", trigger: "blur" }
     ],
-    gate2: [
+    intlGate: [
       { required: true, message: "道口数据不能为空", trigger: "blur" },
       { type: "integer", message: "道口数据必须为整数", trigger: "blur" }
     ],
-    northVehicleInspection: [
+    northVehicleCheck: [
       { required: true, message: "北侧车检数据不能为空", trigger: "blur" },
       { type: "integer", message: "北侧车检数据必须为整数", trigger: "blur" }
     ],
-    explosionProof2: [
+    intlBomb: [
       { required: true, message: "防爆数据不能为空", trigger: "blur" },
       { type: "integer", message: "防爆数据必须为整数", trigger: "blur" }
-    ],
-    totalVehicleInspection: [
-      { type: "integer", message: "车检总数必须为整数", trigger: "blur" }
     ]
   }
 })
@@ -358,30 +353,30 @@ function cancel() {
 function reset() {
   form.value = {
     id: null,
-    date: null,
-    areaA: null,
-    areaB: null,
+    recordDate: null,
+    azone: null,
+    bzone: null,
     vip: null,
-    domesticTravelInspection: null,
-    internationalTravelInspection: null,
+    domesticPassenger: null,
+    intlPassenger: null,
     vipChannel: null,
     t1ReturnChannel: null,
-    t1Inspection: null,
-    firstFloorStaff: null,
+    t1LuggageCheck: null,
+    floor1Staff: null,
     t2ReturnChannel: null,
-    t2Inspection: null,
-    thirdFloor: null,
-    firstFloor: null,
-    basementFloor: null,
+    t2LuggageCheck: null,
+    floor3EastStaff: null,
+    floor1CenterStaff: null,
+    floorB1WestStaff: null,
+    floor3WestStaff: null,
     domesticCargo: null,
-    gate: null,
-    southVehicleInspection: null,
-    explosionProof: null,
-    internationalCargo: null,
-    gate2: null,
-    northVehicleInspection: null,
-    explosionProof2: null,
-    totalVehicleInspection: null
+    domesticGate: null,
+    southVehicleCheck: null,
+    domesticBomb: null,
+    intlCargo: null,
+    intlGate: null,
+    northVehicleCheck: null,
+    intlBomb: null
   }
   proxy.resetForm("dailyRunDataRef")
 }
@@ -466,8 +461,8 @@ function handleExport() {
       return value !== null
     })
   )
-  
-  proxy.download('/runData/dailyRunData/export', filteredParams, `dailyRunData_${new Date().getTime()}.xlsx`)
+
+  proxy.download('/item/hkOperationData/export', filteredParams, `dailyRunData_${new Date().getTime()}.xlsx`)
 }
 
 /** 导入按钮操作 */
@@ -478,7 +473,7 @@ function handleImport() {
 
 /** 下载模板操作 */
 function importTemplate() {
-  proxy.download('/runData/dailyRunData/importTemplate', {
+  proxy.download('/item/hkOperationData/importTemplate', {
   }, `日常运行数据导入模板_${new Date().getTime()}.xlsx`)
 }
 

src/views/runData/discouragePowerBanksData/index.vue

@@ -2,12 +2,22 @@
   <div class="app-container">
     <!-- 查询条件 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="日期" prop="date">
-        <el-date-picker v-model="queryParams.date" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD" 
+      <el-form-item label="日期" prop="recordDate">
+        <el-date-picker v-model="queryParams.recordDate" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD"
           style="width: 200px" />
       </el-form-item>
-      <el-form-item label="时间段" prop="timePeriod">
-        <el-input v-model="queryParams.timePeriod" placeholder="请输入时间段" clearable style="width: 200px" />
+      <el-form-item label="时间段" prop="timeSlot">
+        <el-time-picker
+          v-model="queryParams.timeSlot"
+          is-range
+          range-separator="-"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          value-format="HH:mm"
+          format="HH:mm"
+          placeholder="请选择时间段"
+          clearable
+          style="width: 200px" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -21,10 +31,7 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['runData:discouragePowerBanksData:add']">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['runData:discouragePowerBanksData:edit']">修改</el-button>
-      </el-col>
+   
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['runData:discouragePowerBanksData:remove']">删除</el-button>
@@ -43,26 +50,26 @@
     <!-- 数据表格 -->
     <el-table v-loading="loading" :data="discouragePowerBanksDataList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="日期" align="center" prop="date" />
-      <el-table-column label="时间段" align="center" prop="timePeriod" />
+      <el-table-column label="日期" align="center" prop="recordDate" />
+      <el-table-column label="时间段" align="center" prop="timeSlot" />
       
       <!-- T1区域数据 -->
       <el-table-column label="T1召回充电宝" align="center" prop="t1Recall" />
-      <el-table-column label="T1无3C标识" align="center" prop="t1No3C" />
-      <el-table-column label="T1标识不清" align="center" prop="t1Unclear" />
-      <el-table-column label="T1超规数量" align="center" prop="t1OverSize" />
+      <el-table-column label="T1无3C标识" align="center" prop="t1No3c" />
+      <el-table-column label="T1标识不清" align="center" prop="t1UnclearMark" />
+      <el-table-column label="T1超规数量" align="center" prop="t1ExcessQty" />
       <el-table-column label="T1邮寄" align="center" prop="t1Mail" />
-      <el-table-column label="T1自弃" align="center" prop="t1SelfAbandon" />
-      <el-table-column label="T1暂存" align="center" prop="t1Temporary" />
+      <el-table-column label="T1自弃" align="center" prop="t1Abandon" />
+      <el-table-column label="T1暂存" align="center" prop="t1TempStore" />
       
       <!-- T2区域数据 -->
       <el-table-column label="T2召回充电宝" align="center" prop="t2Recall" />
-      <el-table-column label="T2无3C标识" align="center" prop="t2No3C" />
-      <el-table-column label="T2标识不清" align="center" prop="t2Unclear" />
-      <el-table-column label="T2超规数量" align="center" prop="t2OverSize" />
+      <el-table-column label="T2无3C标识" align="center" prop="t2No3c" />
+      <el-table-column label="T2标识不清" align="center" prop="t2UnclearMark" />
+      <el-table-column label="T2超规数量" align="center" prop="t2ExcessQty" />
       <el-table-column label="T2邮寄" align="center" prop="t2Mail" />
-      <el-table-column label="T2自弃" align="center" prop="t2SelfAbandon" />
-      <el-table-column label="T2暂存" align="center" prop="t2Temporary" />
+      <el-table-column label="T2自弃" align="center" prop="t2Abandon" />
+      <el-table-column label="T2暂存" align="center" prop="t2TempStore" />
       
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -82,14 +89,23 @@
       <el-form ref="discouragePowerBanksDataRef" :model="form" :rules="rules" label-width="120px">
         <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="recordDate">
+              <el-date-picker v-model="form.recordDate" 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="timePeriod">
-              <el-input v-model="form.timePeriod" placeholder="请输入时间段" />
+            <el-form-item label="时间段" prop="timeSlot">
+              <el-time-picker
+                v-model="form.timeSlot"
+                is-range
+                range-separator="-"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                value-format="HH:mm"
+                format="HH:mm"
+                placeholder="请选择时间段"
+                style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -99,27 +115,27 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="T1召回充电宝" prop="t1Recall">
-              <el-input-number v-model="form.t1Recall" :min="0" placeholder="请输入T1召回充电宝" style="width: 100%" />
-            </el-form-item>
-            <el-form-item label="T1无3C标识" prop="t1No3C">
-              <el-input-number v-model="form.t1No3C" :min="0" placeholder="请输入T1无3C标识" style="width: 100%" />
+              <el-input-number :precision="0" v-model="form.t1Recall" :min="0" placeholder="请输入T1召回充电宝" style="width: 100%"  />
             </el-form-item>
-            <el-form-item label="T1标识不清" prop="t1Unclear">
-              <el-input-number v-model="form.t1Unclear" :min="0" placeholder="请输入T1标识不清" style="width: 100%" />
+            <el-form-item label="T1无3C标识" prop="t1No3c">
+              <el-input-number :precision="0" v-model="form.t1No3c" :min="0" placeholder="请输入T1无3C标识" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="T1超规数量" prop="t1OverSize">
-              <el-input-number v-model="form.t1OverSize" :min="0" placeholder="请输入T1超规数量" style="width: 100%" />
+            <el-form-item label="T1标识不清" prop="t1UnclearMark">
+              <el-input-number :precision="0" v-model="form.t1UnclearMark" :min="0" placeholder="请输入T1标识不清" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="T1超规数量" prop="t1ExcessQty">
+              <el-input-number :precision="0" v-model="form.t1ExcessQty" :min="0" placeholder="请输入T1超规数量" style="width: 100%" />
+            </el-form-item>
             <el-form-item label="T1邮寄" prop="t1Mail">
-              <el-input-number v-model="form.t1Mail" :min="0" placeholder="请输入T1邮寄" style="width: 100%" />
+              <el-input-number :precision="0" v-model="form.t1Mail" :min="0" placeholder="请输入T1邮寄" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="T1自弃" prop="t1SelfAbandon">
-              <el-input-number v-model="form.t1SelfAbandon" :min="0" placeholder="请输入T1自弃" style="width: 100%" />
+            <el-form-item label="T1自弃" prop="t1Abandon">
+              <el-input-number :precision="0" v-model="form.t1Abandon" :min="0" placeholder="请输入T1自弃" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="T1暂存" prop="t1Temporary">
-              <el-input-number v-model="form.t1Temporary" :min="0" placeholder="请输入T1暂存" style="width: 100%" />
+            <el-form-item label="T1暂存" prop="t1TempStore">
+              <el-input-number :precision="0" v-model="form.t1TempStore" :min="0" placeholder="请输入T1暂存" style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -129,27 +145,27 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="T2召回充电宝" prop="t2Recall">
-              <el-input-number v-model="form.t2Recall" :min="0" placeholder="请输入T2召回充电宝" style="width: 100%" />
+              <el-input-number :precision="0" v-model="form.t2Recall" :min="0" placeholder="请输入T2召回充电宝" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="T2无3C标识" prop="t2No3C">
-              <el-input-number v-model="form.t2No3C" :min="0" placeholder="请输入T2无3C标识" style="width: 100%" />
+            <el-form-item label="T2无3C标识" prop="t2No3c">
+              <el-input-number :precision="0" v-model="form.t2No3c" :min="0" placeholder="请输入T2无3C标识" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="T2标识不清" prop="t2Unclear">
-              <el-input-number v-model="form.t2Unclear" :min="0" placeholder="请输入T2标识不清" style="width: 100%" />
-            </el-form-item>
-            <el-form-item label="T2超规数量" prop="t2OverSize">
-              <el-input-number v-model="form.t2OverSize" :min="0" placeholder="请输入T2超规数量" style="width: 100%" />
+            <el-form-item label="T2标识不清" prop="t2UnclearMark">
+              <el-input-number :precision="0" v-model="form.t2UnclearMark" :min="0" placeholder="请输入T2标识不清" style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="T2超规数量" prop="t2ExcessQty">
+              <el-input-number :precision="0" v-model="form.t2ExcessQty" :min="0" placeholder="请输入T2超规数量" style="width: 100%" />
+            </el-form-item>
             <el-form-item label="T2邮寄" prop="t2Mail">
-              <el-input-number v-model="form.t2Mail" :min="0" placeholder="请输入T2邮寄" style="width: 100%" />
+              <el-input-number :precision="0" v-model="form.t2Mail" :min="0" placeholder="请输入T2邮寄" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="T2自弃" prop="t2SelfAbandon">
-              <el-input-number v-model="form.t2SelfAbandon" :min="0" placeholder="请输入T2自弃" style="width: 100%" />
+            <el-form-item label="T2自弃" prop="t2Abandon">
+              <el-input-number :precision="0" v-model="form.t2Abandon" :min="0" placeholder="请输入T2自弃" style="width: 100%" />
             </el-form-item>
-            <el-form-item label="T2暂存" prop="t2Temporary">
-              <el-input-number v-model="form.t2Temporary" :min="0" placeholder="请输入T2暂存" style="width: 100%" />
+            <el-form-item label="T2暂存" prop="t2TempStore">
+              <el-input-number :precision="0" v-model="form.t2TempStore" :min="0" placeholder="请输入T2暂存" style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -218,7 +234,7 @@ const upload = reactive({
   // 设置上传的请求头部
   headers: { Authorization: "Bearer " + getToken() },
   // 上传的地址
-  url: import.meta.env.VITE_APP_BASE_API + "/runData/discouragePowerBanksData/importData"
+  url: import.meta.env.VITE_APP_BASE_API + "/item/hkPersuadePowerBank/importData"
 })
 
 const uploadRef = ref()
@@ -228,56 +244,56 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    date: null,
-    timePeriod: null
+    recordDate: null,
+    timeSlot: null
   },
   rules: {
-    date: [
-      { required: true, message: "日期不能为空", trigger: "blur" }
+    recordDate: [
+      { required: true, message: "日期不能为空", trigger: "change" }
     ],
-    timePeriod: [
-      { required: true, message: "时间段不能为空", trigger: "blur" }
+    timeSlot: [
+      { required: true, message: "时间段不能为空", trigger: "change" }
     ],
     t1Recall: [
       { type: "integer", message: "T1召回充电宝必须为整数", trigger: "blur" }
     ],
-    t1No3C: [
+    t1No3c: [
       { type: "integer", message: "T1无3C标识必须为整数", trigger: "blur" }
     ],
-    t1Unclear: [
+    t1UnclearMark: [
       { type: "integer", message: "T1标识不清必须为整数", trigger: "blur" }
     ],
-    t1OverSize: [
+    t1ExcessQty: [
       { type: "integer", message: "T1超规数量必须为整数", trigger: "blur" }
     ],
     t1Mail: [
       { type: "integer", message: "T1邮寄必须为整数", trigger: "blur" }
     ],
-    t1SelfAbandon: [
+    t1Abandon: [
       { type: "integer", message: "T1自弃必须为整数", trigger: "blur" }
     ],
-    t1Temporary: [
+    t1TempStore: [
       { type: "integer", message: "T1暂存必须为整数", trigger: "blur" }
     ],
     t2Recall: [
       { type: "integer", message: "T2召回充电宝必须为整数", trigger: "blur" }
     ],
-    t2No3C: [
+    t2No3c: [
       { type: "integer", message: "T2无3C标识必须为整数", trigger: "blur" }
     ],
-    t2Unclear: [
+    t2UnclearMark: [
       { type: "integer", message: "T2标识不清必须为整数", trigger: "blur" }
     ],
-    t2OverSize: [
+    t2ExcessQty: [
       { type: "integer", message: "T2超规数量必须为整数", trigger: "blur" }
     ],
     t2Mail: [
       { type: "integer", message: "T2邮寄必须为整数", trigger: "blur" }
     ],
-    t2SelfAbandon: [
+    t2Abandon: [
       { type: "integer", message: "T2自弃必须为整数", trigger: "blur" }
     ],
-    t2Temporary: [
+    t2TempStore: [
       { type: "integer", message: "T2暂存必须为整数", trigger: "blur" }
     ]
   }
@@ -288,7 +304,11 @@ const { queryParams, form, rules } = toRefs(data)
 /** 查询劝阻充电宝数据列表 */
 function getList() {
   loading.value = true
-  listDiscouragePowerBanksData(queryParams.value).then(response => {
+  const params = { ...queryParams.value }
+  if (params.timeSlot && Array.isArray(params.timeSlot)) {
+    params.timeSlot = params.timeSlot.join('-')
+  }
+  listDiscouragePowerBanksData(params).then(response => {
     discouragePowerBanksDataList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -305,24 +325,24 @@ function cancel() {
 function reset() {
   form.value = {
     id: null,
-    date: null,
-    timePeriod: null,
+    recordDate: null,
+    timeSlot: null,
     // T1区域数据
     t1Recall: null,
-    t1No3C: null,
-    t1Unclear: null,
-    t1OverSize: null,
+    t1No3c: null,
+    t1UnclearMark: null,
+    t1ExcessQty: null,
     t1Mail: null,
-    t1SelfAbandon: null,
-    t1Temporary: null,
+    t1Abandon: null,
+    t1TempStore: null,
     // T2区域数据
     t2Recall: null,
-    t2No3C: null,
-    t2Unclear: null,
-    t2OverSize: null,
+    t2No3c: null,
+    t2UnclearMark: null,
+    t2ExcessQty: null,
     t2Mail: null,
-    t2SelfAbandon: null,
-    t2Temporary: null
+    t2Abandon: null,
+    t2TempStore: null
   }
   proxy.resetForm("discouragePowerBanksDataRef")
 }
@@ -358,7 +378,12 @@ function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
   getDiscouragePowerBanksData(_id).then(response => {
-    form.value = response.data
+    const data = response.data
+    // 转换时间段字符串为数组格式
+    if (data.timeSlot && typeof data.timeSlot === 'string' && data.timeSlot.includes('-')) {
+      data.timeSlot = data.timeSlot.split('-')
+    }
+    form.value = data
     open.value = true
     title.value = "修改劝阻充电宝数据"
   })
@@ -368,14 +393,19 @@ function handleUpdate(row) {
 function submitForm() {
   proxy.$refs["discouragePowerBanksDataRef"].validate(valid => {
     if (valid) {
-      if (form.value.id != null) {
-        updateDiscouragePowerBanksData(form.value).then(response => {
+      const submitData = { ...form.value }
+      // 转换时间段为字符串格式 08:00-17:00
+      if (submitData.timeSlot && Array.isArray(submitData.timeSlot)) {
+        submitData.timeSlot = submitData.timeSlot.join('-')
+      }
+      if (submitData.id != null) {
+        updateDiscouragePowerBanksData(submitData).then(response => {
           proxy.$modal.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        addDiscouragePowerBanksData(form.value).then(response => {
+        addDiscouragePowerBanksData(submitData).then(response => {
           proxy.$modal.msgSuccess("新增成功")
           open.value = false
           getList()
@@ -408,7 +438,7 @@ function handleExport() {
     })
   )
   
-  proxy.download('/runData/discouragePowerBanksData/export', filteredParams, `discouragePowerBanksData_${new Date().getTime()}.xlsx`)
+  proxy.download('/item/hkPersuadePowerBank/export', filteredParams, `discouragePowerBanksData_${new Date().getTime()}.xlsx`)
 }
 
 /** 导入按钮操作 */
@@ -419,7 +449,7 @@ function handleImport() {
 
 /** 下载模板操作 */
 function importTemplate() {
-  proxy.download('/runData/discouragePowerBanksData/importTemplate', {
+  proxy.download('/item/hkPersuadePowerBank/importTemplate', {
   }, `劝阻充电宝数据导入模板_${new Date().getTime()}.xlsx`)
 }
 

src/views/runData/runScreen/index.vue

@@ -21,7 +21,7 @@
             <div class="data-card">
               <div class="card-title">旅检过检总人数</div>
               <div class="card-value-wrapper" style="color: #E8B140;">
-                <span class="card-value">{{ runData.travelInspectionTotal }}</span>
+                <span class="card-value">{{ runData.passengerTotal }}</span>
                 <span class="card-unit">人</span>
               </div>
             </div>
@@ -30,7 +30,7 @@
             <div class="data-card">
               <div class="card-title">行检过检总行李数</div>
               <div class="card-value-wrapper" style="color: #26B6BE;">
-                <span class="card-value">{{ runData.luggageInspectionTotal }}</span>
+                <span class="card-value">{{ runData.luggageTotal }}</span>
                 <span class="card-unit">件</span>
               </div>
             </div>
@@ -77,7 +77,7 @@
         <div class="data-card">
           <div class="card-title">国际货站总过检数</div>
           <div class="card-value-wrapper" style="color: #26B6BE;padding: 30px;">
-            <span class="card-value">{{ runData.internationalCargoTotal }}</span>
+            <span class="card-value">{{ runData.intlCargoTotal }}</span>
             <span class="card-unit">件</span>
           </div>
         </div>
@@ -86,7 +86,7 @@
         <div class="data-card">
           <div class="card-title">道口车辆过检数</div>
           <div class="card-value-wrapper" style="color: #5680C9;padding: 30px;">
-            <span class="card-value">{{ runData.vehicleInspectionTotal }}</span>
+            <span class="card-value">{{ runData.vehicleCheckTotal }}</span>
             <span class="card-unit">辆</span>
           </div>
         </div>
@@ -313,15 +313,16 @@ function initCharts() {
     const t1Data = t1PassengerData.value || []
     t1TravelChartInstance.setOption({
       tooltip: { trigger: 'axis' },
+      legend: { data: ['A区', 'B区'], top: 30 },
       xAxis: {
         type: 'category',
-        data: t1Data.map(item => item.recordDate || item.aZone || '')
+        data: t1Data.map(item => item.recordDate || item.azone || '')
       },
       yAxis: { type: 'value' },
       series: [
         {
           name: 'A区',
-          data: t1Data.map(item => item.aZone || 0),
+          data: t1Data.map(item => item.azone || 0),
           type: 'line',
           smooth: true,
           lineStyle: { color: '#E8B140' },
@@ -329,7 +330,7 @@ function initCharts() {
         },
         {
           name: 'B区',
-          data: t1Data.map(item => item.bZone || 0),
+          data: t1Data.map(item => item.bzone || 0),
           type: 'line',
           smooth: true,
           lineStyle: { color: '#5470c6' },
@@ -345,6 +346,7 @@ function initCharts() {
     const t2Data = t2PassengerData.value || []
     t2TravelChartInstance.setOption({
       tooltip: { trigger: 'axis' },
+      legend: { data: ['国内旅检', '国际旅检'], top: 30 },
       xAxis: {
         type: 'category',
         data: t2Data.map(item => item.recordDate || '')
@@ -377,6 +379,7 @@ function initCharts() {
     const luggageData = luggageCheckData.value || []
     luggageChartInstance.setOption({
       tooltip: { trigger: 'axis' },
+      legend: { data: ['T1行检', 'T2行检'], top: 30 },
       xAxis: {
         type: 'category',
         data: luggageData.map(item => item.recordDate || '')
@@ -409,6 +412,7 @@ function initCharts() {
     const cargoTrendData = cargoData.value || []
     cargoChartInstance.setOption({
       tooltip: { trigger: 'axis' },
+      legend: { data: ['国内货站', '国际货站'], top: 30 },
       xAxis: {
         type: 'category',
         data: cargoTrendData.map(item => item.recordDate || '')
@@ -441,6 +445,7 @@ function initCharts() {
     const vehicleData = vehicleCheckData.value || []
     vehicleChartInstance.setOption({
       tooltip: { trigger: 'axis' },
+      legend: { data: ['南侧车检', '北侧车检'], top: 30 },
       xAxis: {
         type: 'category',
         data: vehicleData.map(item => item.recordDate || '')
@@ -495,71 +500,77 @@ function initCharts() {
   if (teamSeizeBarChart.value) {
     teamSeizeBarChartInstance = echarts.init(teamSeizeBarChart.value)
     const brigadeData = brigadeSeizureData.value || []
+    const shifts = [...new Set(brigadeData.map(item => item.shift))]
+    const brigades = [...new Set(brigadeData.map(item => item.brigade))]
+    const series = brigades.map(brigade => ({
+      name: brigade,
+      data: shifts.map(shift => {
+        const item = brigadeData.find(d => d.shift === shift && d.brigade === brigade)
+        return item ? item.grandTotal : 0
+      }),
+      type: 'bar'
+    }))
     teamSeizeBarChartInstance.setOption({
       tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
-      legend: { data: ['T1区', 'T2区', '总量'] },
+      legend: { data: brigades, top: 30 },
       xAxis: {
         type: 'category',
-        data: [...new Set(brigadeData.map(item => item.brigade))]
+        data: shifts
       },
       yAxis: { type: 'value' },
-      series: [
-        {
-          name: 'T1区',
-          data: brigadeData.filter(item => item.shift === '白班').map(item => ({ value: item.t1Total, brigade: item.brigade })),
-          type: 'bar'
-        },
-        {
-          name: 'T2区',
-          data: brigadeData.filter(item => item.shift === '白班').map(item => ({ value: item.t2Total, brigade: item.brigade })),
-          type: 'bar'
-        },
-        {
-          name: '总量',
-          data: brigadeData.filter(item => item.shift === '白班').map(item => ({ value: item.grandTotal, brigade: item.brigade })),
-          type: 'bar'
-        }
-      ]
+      series: series
     })
   }
 
   // T1区域各大队查获数对比柱状图
   if (t1TeamBarChart.value) {
     t1TeamBarChartInstance = echarts.init(t1TeamBarChart.value)
-    const t1BrigadeData = (brigadeSeizureData.value || []).filter(item => item.shift === '白班')
+    const brigadeData = brigadeSeizureData.value || []
+    const shifts = [...new Set(brigadeData.map(item => item.shift))]
+    const brigades = [...new Set(brigadeData.map(item => item.brigade))]
+    const series = brigades.map(brigade => ({
+      name: brigade,
+      data: shifts.map(shift => {
+        const item = brigadeData.find(d => d.shift === shift && d.brigade === brigade)
+        return item ? item.t1Total : 0
+      }),
+      type: 'bar'
+    }))
     t1TeamBarChartInstance.setOption({
       tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
+      legend: { data: brigades, top: 30 },
       xAxis: {
         type: 'category',
-        data: [...new Set(t1BrigadeData.map(item => item.brigade))]
+        data: shifts
       },
       yAxis: { type: 'value' },
-      series: [{
-        name: 'T1查获数',
-        data: t1BrigadeData.map(item => item.t1Total),
-        type: 'bar',
-        itemStyle: { color: '#91cc75' }
-      }]
+      series: series
     })
   }
 
   // T2区域各大队查获数对比柱状图
   if (t2TeamBarChart.value) {
     t2TeamBarChartInstance = echarts.init(t2TeamBarChart.value)
-    const t2BrigadeData = (brigadeSeizureData.value || []).filter(item => item.shift === '夜班')
+    const brigadeData = brigadeSeizureData.value || []
+    const shifts = [...new Set(brigadeData.map(item => item.shift))]
+    const brigades = [...new Set(brigadeData.map(item => item.brigade))]
+    const series = brigades.map(brigade => ({
+      name: brigade,
+      data: shifts.map(shift => {
+        const item = brigadeData.find(d => d.shift === shift && d.brigade === brigade)
+        return item ? item.t2Total : 0
+      }),
+      type: 'bar'
+    }))
     t2TeamBarChartInstance.setOption({
       tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
+      legend: { data: brigades, top: 30 },
       xAxis: {
         type: 'category',
-        data: [...new Set(t2BrigadeData.map(item => item.brigade))]
+        data: shifts
       },
       yAxis: { type: 'value' },
-      series: [{
-        name: 'T2查获数',
-        data: t2BrigadeData.map(item => item.t2Total),
-        type: 'bar',
-        itemStyle: { color: '#fac858' }
-      }]
+      series: series
     })
   }
 

src/views/runData/seizeData/index.vue

@@ -2,15 +2,19 @@
   <div class="app-container">
     <!-- 查询条件 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="日期" prop="date">
-        <el-date-picker v-model="queryParams.date" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD" 
+      <el-form-item label="日期" prop="recordDate">
+        <el-date-picker v-model="queryParams.recordDate" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD" 
           style="width: 200px" />
       </el-form-item>
       <el-form-item label="班次" prop="shift">
-        <el-input v-model="queryParams.shift" placeholder="请输入班次" clearable style="width: 200px" />
+        <el-select v-model="queryParams.shift" placeholder="请选择班次" clearable style="width: 200px">
+          <el-option v-for="item in shiftOptions" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
       </el-form-item>
-      <el-form-item label="当班大队" prop="team">
-        <el-input v-model="queryParams.team" placeholder="请输入当班大队" clearable style="width: 200px" />
+      <el-form-item label="当班大队" prop="brigade">
+        <el-select v-model="queryParams.brigade" placeholder="请选择当班大队" clearable style="width: 200px">
+          <el-option v-for="item in brigadeOptions" :key="item.value" :label="item.label" :value="item.label" />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -24,10 +28,7 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['runData:seizeData:add']">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['runData:seizeData:edit']">修改</el-button>
-      </el-col>
+
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['runData:seizeData:remove']">删除</el-button>
@@ -46,43 +47,43 @@
     <!-- 数据表格 -->
     <el-table v-loading="loading" :data="seizeDataList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="日期" align="center" prop="date" />
+      <el-table-column label="日期" align="center" prop="recordDate" />
       <el-table-column label="班次" align="center" prop="shift" />
-      <el-table-column label="当班大队" align="center" prop="team" />
+      <el-table-column label="当班大队" align="center" prop="brigade" />
       
       <!-- T1区域数据 -->
-      <el-table-column label="T1火种" align="center" prop="t1Fire" />
+      <el-table-column label="T1火种" align="center" prop="t1FireSource" />
       <el-table-column label="T1刀具" align="center" prop="t1Knife" />
-      <el-table-column label="T1警械器具" align="center" prop="t1PoliceEquipment" />
-      <el-table-column label="T1烟花爆竹" align="center" prop="t1Fireworks" />
+      <el-table-column label="T1警械器具" align="center" prop="t1PoliceWeapon" />
+      <el-table-column label="T1烟花爆竹" align="center" prop="t1Firework" />
       <el-table-column label="T1活体动物" align="center" prop="t1LiveAnimal" />
       <el-table-column label="T1腐蚀性物品" align="center" prop="t1Corrosive" />
-      <el-table-column label="T1用假冒他" align="center" prop="t1Counterfeit" />
+      <el-table-column label="T1用假冒他" align="center" prop="t1FakeId" />
       <el-table-column label="T1爆炸装置" align="center" prop="t1Explosive" />
       <el-table-column label="T1工具" align="center" prop="t1Tool" />
-      <el-table-column label="T1枪支弹药" align="center" prop="t1Gun" />
-      <el-table-column label="T1扫黄打非" align="center" prop="t1Pornography" />
+      <el-table-column label="T1枪支弹药" align="center" prop="t1GunAmmo" />
+      <el-table-column label="T1扫黄打非" align="center" prop="t1Illegal" />
       <el-table-column label="T1其他" align="center" prop="t1Other" />
       <el-table-column label="T1总数" align="center" prop="t1Total" />
       
       <!-- T2区域数据 -->
-      <el-table-column label="T2火种" align="center" prop="t2Fire" />
+      <el-table-column label="T2火种" align="center" prop="t2FireSource" />
       <el-table-column label="T2刀具" align="center" prop="t2Knife" />
-      <el-table-column label="T2警械器具" align="center" prop="t2PoliceEquipment" />
-      <el-table-column label="T2烟花爆竹" align="center" prop="t2Fireworks" />
+      <el-table-column label="T2警械器具" align="center" prop="t2PoliceWeapon" />
+      <el-table-column label="T2烟花爆竹" align="center" prop="t2Firework" />
       <el-table-column label="T2活体动物" align="center" prop="t2LiveAnimal" />
       <el-table-column label="T2腐蚀性物品" align="center" prop="t2Corrosive" />
-      <el-table-column label="T2用假冒他" align="center" prop="t2Counterfeit" />
+      <el-table-column label="T2用假冒他" align="center" prop="t2FakeId" />
       <el-table-column label="T2爆炸装置" align="center" prop="t2Explosive" />
       <el-table-column label="T2工具" align="center" prop="t2Tool" />
-      <el-table-column label="T2枪支弹药" align="center" prop="t2Gun" />
-      <el-table-column label="T2扫黄打非" align="center" prop="t2Pornography" />
+      <el-table-column label="T2枪支弹药" align="center" prop="t2GunAmmo" />
+      <el-table-column label="T2扫黄打非" align="center" prop="t2Illegal" />
       <el-table-column label="T2其他" align="center" prop="t2Other" />
       <el-table-column label="T2总数" align="center" prop="t2Total" />
       
       <el-table-column label="T1总数+T2总数" align="center" prop="total" />
       
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">  
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['runData:seizeData:edit']">修改</el-button>
@@ -96,23 +97,27 @@
       v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 添加或修改查获数据对话框 -->
-    <el-dialog :title="title" v-model="open" width="900px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="1000px" append-to-body>
       <el-form ref="seizeDataRef" :model="form" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="8">
-            <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="recordDate">
+              <el-date-picker v-model="form.recordDate" type="date" placeholder="请选择日期" value-format="YYYY-MM-DD" 
                 style="width: 100%" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="班次" prop="shift">
-              <el-input v-model="form.shift" placeholder="请输入班次" />
+              <el-select v-model="form.shift" placeholder="请选择班次" filterable style="width: 100%">
+                <el-option v-for="item in shiftOptions" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="当班大队" prop="team">
-              <el-input v-model="form.team" placeholder="请输入当班大队" />
+            <el-form-item label="当班大队" prop="brigade">
+              <el-select v-model="form.brigade" placeholder="请选择当班大队" filterable style="width: 100%">
+                <el-option v-for="item in brigadeOptions" :key="item.value" :label="item.label" :value="item.label" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -120,49 +125,51 @@
         <!-- T1区域 -->
         <el-divider content-position="left">T1区域数据</el-divider>
         <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="T1火种" prop="t1Fire">
-              <el-input-number v-model="form.t1Fire" :min="0" placeholder="请输入T1火种" style="width: 100%" @change="calculateTotals" />
+          <el-col :span="8">
+            <el-form-item label="T1火种" prop="t1FireSource">
+              <el-input-number :precision="0" v-model="form.t1FireSource" :min="0" placeholder="请输入T1火种" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
             <el-form-item label="T1刀具" prop="t1Knife">
-              <el-input-number v-model="form.t1Knife" :min="0" placeholder="请输入T1刀具" style="width: 100%" @change="calculateTotals" />
+              <el-input-number :precision="0" v-model="form.t1Knife" :min="0" placeholder="请输入T1刀具" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
-            <el-form-item label="T1警械器具" prop="t1PoliceEquipment">
-              <el-input-number v-model="form.t1PoliceEquipment" :min="0" placeholder="请输入T1警械器具" style="width: 100%" @change="calculateTotals" />
+            <el-form-item label="T1警械器具" prop="t1PoliceWeapon">
+              <el-input-number :precision="0" v-model="form.t1PoliceWeapon" :min="0" placeholder="请输入T1警械器具" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
-            <el-form-item label="T1烟花爆竹" prop="t1Fireworks">
-              <el-input-number v-model="form.t1Fireworks" :min="0" placeholder="请输入T1烟花爆竹" style="width: 100%" @change="calculateTotals" />
+            <el-form-item label="T1烟花爆竹" prop="t1Firework">
+              <el-input-number :precision="0" v-model="form.t1Firework" :min="0" placeholder="请输入T1烟花爆竹" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="T1活体动物" prop="t1LiveAnimal">
-              <el-input-number v-model="form.t1LiveAnimal" :min="0" placeholder="请输入T1活体动物" style="width: 100%" @change="calculateTotals" />
+              <el-input-number :precision="0" v-model="form.t1LiveAnimal" :min="0" placeholder="请输入T1活体动物" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
             <el-form-item label="T1腐蚀性物品" prop="t1Corrosive">
-              <el-input-number v-model="form.t1Corrosive" :min="0" placeholder="请输入T1腐蚀性物品" style="width: 100%" @change="calculateTotals" />
+              <el-input-number :precision="0" v-model="form.t1Corrosive" :min="0" placeholder="请输入T1腐蚀性物品" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
-            <el-form-item label="T1用假冒他" prop="t1Counterfeit">
-              <el-input-number v-model="form.t1Counterfeit" :min="0" placeholder="请输入T1用假冒他" style="width: 100%" @change="calculateTotals" />
+            <el-form-item label="T1用假冒他" prop="t1FakeId">
+              <el-input-number :precision="0" v-model="form.t1FakeId" :min="0" placeholder="请输入T1用假冒他" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
             <el-form-item label="T1爆炸装置" prop="t1Explosive">
-              <el-input-number v-model="form.t1Explosive" :min="0" placeholder="请输入T1爆炸装置" style="width: 100%" @change="calculateTotals" />
+              <el-input-number :precision="0" v-model="form.t1Explosive" :min="0" placeholder="请输入T1爆炸装置" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="T1工具" prop="t1Tool">
-              <el-input-number v-model="form.t1Tool" :min="0" placeholder="请输入T1工具" style="width: 100%" @change="calculateTotals" />
+              <el-input-number :precision="0" v-model="form.t1Tool" :min="0" placeholder="请输入T1工具" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
-            <el-form-item label="T1枪支弹药" prop="t1Gun">
-              <el-input-number v-model="form.t1Gun" :min="0" placeholder="请输入T1枪支弹药" style="width: 100%" @change="calculateTotals" />
+            <el-form-item label="T1枪支弹药" prop="t1GunAmmo">
+              <el-input-number :precision="0" v-model="form.t1GunAmmo" :min="0" placeholder="请输入T1枪支弹药" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
-            <el-form-item label="T1扫黄打非" prop="t1Pornography">
-              <el-input-number v-model="form.t1Pornography" :min="0" placeholder="请输入T1扫黄打非" style="width: 100%" @change="calculateTotals" />
+            <el-form-item label="T1扫黄打非" prop="t1Illegal">
+              <el-input-number :precision="0" v-model="form.t1Illegal" :min="0" placeholder="请输入T1扫黄打非" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
             <el-form-item label="T1其他" prop="t1Other">
-              <el-input-number v-model="form.t1Other" :min="0" placeholder="请输入T1其他" style="width: 100%" @change="calculateTotals" />
+              <el-input-number :precision="0" v-model="form.t1Other" :min="0" placeholder="请输入T1其他" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
             <el-form-item label="T1总数" prop="t1Total">
               <el-input v-model="form.t1Total" placeholder="自动计算" readonly style="width: 100%" />
             </el-form-item>
@@ -172,52 +179,56 @@
         <!-- T2区域 -->
         <el-divider content-position="left">T2区域数据</el-divider>
         <el-row :gutter="20">
-          <el-col :span="6">
-            <el-form-item label="T2火种" prop="t2Fire">
-              <el-input-number v-model="form.t2Fire" :min="0" placeholder="请输入T2火种" style="width: 100%" @change="calculateTotals" />
+          <el-col :span="8">
+            <el-form-item label="T2火种" prop="t2FireSource">
+              <el-input-number :precision="0" v-model="form.t2FireSource" :min="0" placeholder="请输入T2火种" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
             <el-form-item label="T2刀具" prop="t2Knife">
-              <el-input-number v-model="form.t2Knife" :min="0" placeholder="请输入T2刀具" style="width: 100%" @change="calculateTotals" />
+              <el-input-number :precision="0" v-model="form.t2Knife" :min="0" placeholder="请输入T2刀具" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
-            <el-form-item label="T2警械器具" prop="t2PoliceEquipment">
-              <el-input-number v-model="form.t2PoliceEquipment" :min="0" placeholder="请输入T2警械器具" style="width: 100%" @change="calculateTotals" />
+            <el-form-item label="T2警械器具" prop="t2PoliceWeapon">
+              <el-input-number :precision="0" v-model="form.t2PoliceWeapon" :min="0" placeholder="请输入T2警械器具" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
-            <el-form-item label="T2烟花爆竹" prop="t2Fireworks">
-              <el-input-number v-model="form.t2Fireworks" :min="0" placeholder="请输入T2烟花爆竹" style="width: 100%" @change="calculateTotals" />
+            <el-form-item label="T2烟花爆竹" prop="t2Firework">
+              <el-input-number :precision="0" v-model="form.t2Firework" :min="0" placeholder="请输入T2烟花爆竹" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="T2活体动物" prop="t2LiveAnimal">
-              <el-input-number v-model="form.t2LiveAnimal" :min="0" placeholder="请输入T2活体动物" style="width: 100%" @change="calculateTotals" />
+              <el-input-number :precision="0" v-model="form.t2LiveAnimal" :min="0" placeholder="请输入T2活体动物" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
             <el-form-item label="T2腐蚀性物品" prop="t2Corrosive">
-              <el-input-number v-model="form.t2Corrosive" :min="0" placeholder="请输入T2腐蚀性物品" style="width: 100%" @change="calculateTotals" />
+              <el-input-number :precision="0" v-model="form.t2Corrosive" :min="0" placeholder="请输入T2腐蚀性物品" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
-            <el-form-item label="T2用假冒他" prop="t2Counterfeit">
-              <el-input-number v-model="form.t2Counterfeit" :min="0" placeholder="请输入T2用假冒他" style="width: 100%" @change="calculateTotals" />
+            <el-form-item label="T2用假冒他" prop="t2FakeId">
+              <el-input-number :precision="0" v-model="form.t2FakeId" :min="0" placeholder="请输入T2用假冒他" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
             <el-form-item label="T2爆炸装置" prop="t2Explosive">
-              <el-input-number v-model="form.t2Explosive" :min="0" placeholder="请输入T2爆炸装置" style="width: 100%" @change="calculateTotals" />
+              <el-input-number :precision="0" v-model="form.t2Explosive" :min="0" placeholder="请输入T2爆炸装置" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="T2工具" prop="t2Tool">
-              <el-input-number v-model="form.t2Tool" :min="0" placeholder="请输入T2工具" style="width: 100%" @change="calculateTotals" />
+              <el-input-number :precision="0" v-model="form.t2Tool" :min="0" placeholder="请输入T2工具" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
-            <el-form-item label="T2枪支弹药" prop="t2Gun">
-              <el-input-number v-model="form.t2Gun" :min="0" placeholder="请输入T2枪支弹药" style="width: 100%" @change="calculateTotals" />
+            <el-form-item label="T2枪支弹药" prop="t2GunAmmo">
+              <el-input-number :precision="0" v-model="form.t2GunAmmo" :min="0" placeholder="请输入T2枪支弹药" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
-            <el-form-item label="T2扫黄打非" prop="t2Pornography">
-              <el-input-number v-model="form.t2Pornography" :min="0" placeholder="请输入T2扫黄打非" style="width: 100%" @change="calculateTotals" />
+            <el-form-item label="T2扫黄打非" prop="t2Illegal">
+              <el-input-number :precision="0" v-model="form.t2Illegal" :min="0" placeholder="请输入T2扫黄打非" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
             <el-form-item label="T2其他" prop="t2Other">
-              <el-input-number v-model="form.t2Other" :min="0" placeholder="请输入T2其他" style="width: 100%" @change="calculateTotals" />
+              <el-input-number :precision="0" v-model="form.t2Other" :min="0" placeholder="请输入T2其他" style="width: 100%" @change="calculateTotals" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
             <el-form-item label="T2总数" prop="t2Total">
               <el-input v-model="form.t2Total" placeholder="自动计算" readonly style="width: 100%" />
             </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="T1总数+T2总数" prop="total">
               <el-input v-model="form.total" placeholder="自动计算" readonly style="width: 100%" />
             </el-form-item>
@@ -261,6 +272,7 @@
 
 <script setup name="SeizeData">
 import { listSeizeData, getSeizeData, delSeizeData, addSeizeData, updateSeizeData } from "@/api/runData/seizeData"
+import { listDept } from '@/api/system/dept'
 import { getToken } from '@/utils/auth'
 
 const { proxy } = getCurrentInstance()
@@ -275,6 +287,15 @@ const multiple = ref(true)
 const total = ref(0)
 const title = ref("")
 
+// 班次字典
+const shiftOptions = [
+  { value: '早班', label: '早班' },
+  { value: '晚班', label: '晚班' }
+]
+
+// 大队选项
+const brigadeOptions = ref([])
+
 // 导入参数
 const upload = reactive({
   // 是否显示弹出层
@@ -288,7 +309,7 @@ const upload = reactive({
   // 设置上传的请求头部
   headers: { Authorization: "Bearer " + getToken() },
   // 上传的地址
-  url: import.meta.env.VITE_APP_BASE_API + "/runData/seizeData/importData"
+  url: import.meta.env.VITE_APP_BASE_API + "/item/hkSeizureStat/importData"
 })
 
 const uploadRef = ref()
@@ -298,30 +319,30 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    date: null,
+    recordDate: null,
     shift: null,
-    team: null
+    brigade: null
   },
   rules: {
-    date: [
+    recordDate: [
       { required: true, message: "日期不能为空", trigger: "blur" }
     ],
     shift: [
       { required: true, message: "班次不能为空", trigger: "blur" }
     ],
-    team: [
+    brigade: [
       { required: true, message: "当班大队不能为空", trigger: "blur" }
     ],
-    t1Fire: [
+    t1FireSource: [
       { type: "integer", message: "T1火种必须为整数", trigger: "blur" }
     ],
     t1Knife: [
       { type: "integer", message: "T1刀具必须为整数", trigger: "blur" }
     ],
-    t1PoliceEquipment: [
+    t1PoliceWeapon: [
       { type: "integer", message: "T1警械器具必须为整数", trigger: "blur" }
     ],
-    t1Fireworks: [
+    t1Firework: [
       { type: "integer", message: "T1烟花爆竹必须为整数", trigger: "blur" }
     ],
     t1LiveAnimal: [
@@ -330,7 +351,7 @@ const data = reactive({
     t1Corrosive: [
       { type: "integer", message: "T1腐蚀性物品必须为整数", trigger: "blur" }
     ],
-    t1Counterfeit: [
+    t1FakeId: [
       { type: "integer", message: "T1用假冒他必须为整数", trigger: "blur" }
     ],
     t1Explosive: [
@@ -339,25 +360,25 @@ const data = reactive({
     t1Tool: [
       { type: "integer", message: "T1工具必须为整数", trigger: "blur" }
     ],
-    t1Gun: [
+    t1GunAmmo: [
       { type: "integer", message: "T1枪支弹药必须为整数", trigger: "blur" }
     ],
-    t1Pornography: [
+    t1Illegal: [
       { type: "integer", message: "T1扫黄打非必须为整数", trigger: "blur" }
     ],
     t1Other: [
       { type: "integer", message: "T1其他必须为整数", trigger: "blur" }
     ],
-    t2Fire: [
+    t2FireSource: [
       { type: "integer", message: "T2火种必须为整数", trigger: "blur" }
     ],
     t2Knife: [
       { type: "integer", message: "T2刀具必须为整数", trigger: "blur" }
     ],
-    t2PoliceEquipment: [
+    t2PoliceWeapon: [
       { type: "integer", message: "T2警械器具必须为整数", trigger: "blur" }
     ],
-    t2Fireworks: [
+    t2Firework: [
       { type: "integer", message: "T2烟花爆竹必须为整数", trigger: "blur" }
     ],
     t2LiveAnimal: [
@@ -366,7 +387,7 @@ const data = reactive({
     t2Corrosive: [
       { type: "integer", message: "T2腐蚀性物品必须为整数", trigger: "blur" }
     ],
-    t2Counterfeit: [
+    t2FakeId: [
       { type: "integer", message: "T2用假冒他必须为整数", trigger: "blur" }
     ],
     t2Explosive: [
@@ -375,10 +396,10 @@ const data = reactive({
     t2Tool: [
       { type: "integer", message: "T2工具必须为整数", trigger: "blur" }
     ],
-    t2Gun: [
+    t2GunAmmo: [
       { type: "integer", message: "T2枪支弹药必须为整数", trigger: "blur" }
     ],
-    t2Pornography: [
+    t2Illegal: [
       { type: "integer", message: "T2扫黄打非必须为整数", trigger: "blur" }
     ],
     t2Other: [
@@ -392,18 +413,18 @@ const { queryParams, form, rules } = toRefs(data)
 /** 计算总数 */
 function calculateTotals() {
   // 计算T1总数
-  const t1Fields = ['t1Fire', 't1Knife', 't1PoliceEquipment', 't1Fireworks', 't1LiveAnimal', 
-                   't1Corrosive', 't1Counterfeit', 't1Explosive', 't1Tool', 't1Gun', 
-                   't1Pornography', 't1Other']
+  const t1Fields = ['t1FireSource', 't1Knife', 't1PoliceWeapon', 't1Firework', 't1LiveAnimal', 
+                   't1Corrosive', 't1FakeId', 't1Explosive', 't1Tool', 't1GunAmmo', 
+                   't1Illegal', 't1Other']
   const t1Total = t1Fields.reduce((sum, field) => {
     return sum + (form.value[field] || 0)
   }, 0)
   form.value.t1Total = t1Total
   
   // 计算T2总数
-  const t2Fields = ['t2Fire', 't2Knife', 't2PoliceEquipment', 't2Fireworks', 't2LiveAnimal', 
-                   't2Corrosive', 't2Counterfeit', 't2Explosive', 't2Tool', 't2Gun', 
-                   't2Pornography', 't2Other']
+  const t2Fields = ['t2FireSource', 't2Knife', 't2PoliceWeapon', 't2Firework', 't2LiveAnimal', 
+                   't2Corrosive', 't2FakeId', 't2Explosive', 't2Tool', 't2GunAmmo', 
+                   't2Illegal', 't2Other']
   const t2Total = t2Fields.reduce((sum, field) => {
     return sum + (form.value[field] || 0)
   }, 0)
@@ -433,35 +454,36 @@ function cancel() {
 function reset() {
   form.value = {
     id: null,
-    date: null,
+    recordDate: null,
     shift: null,
-    team: null,
+    brigade: null,
+    brigadeName: null,
     // T1区域数据
-    t1Fire: null,
+    t1FireSource: null,
     t1Knife: null,
-    t1PoliceEquipment: null,
-    t1Fireworks: null,
+    t1PoliceWeapon: null,
+    t1Firework: null,
     t1LiveAnimal: null,
     t1Corrosive: null,
-    t1Counterfeit: null,
+    t1FakeId: null,
     t1Explosive: null,
     t1Tool: null,
-    t1Gun: null,
-    t1Pornography: null,
+    t1GunAmmo: null,
+    t1Illegal: null,
     t1Other: null,
     t1Total: null,
     // T2区域数据
-    t2Fire: null,
+    t2FireSource: null,
     t2Knife: null,
-    t2PoliceEquipment: null,
-    t2Fireworks: null,
+    t2PoliceWeapon: null,
+    t2Firework: null,
     t2LiveAnimal: null,
     t2Corrosive: null,
-    t2Counterfeit: null,
+    t2FakeId: null,
     t2Explosive: null,
     t2Tool: null,
-    t2Gun: null,
-    t2Pornography: null,
+    t2GunAmmo: null,
+    t2Illegal: null,
     t2Other: null,
     t2Total: null,
     total: null
@@ -553,7 +575,7 @@ function handleExport() {
     })
   )
   
-  proxy.download('/runData/seizeData/export', filteredParams, `seizeData_${new Date().getTime()}.xlsx`)
+  proxy.download('/item/hkSeizureStat/export', filteredParams, `seizeData_${new Date().getTime()}.xlsx`)
 }
 
 /** 导入按钮操作 */
@@ -564,7 +586,7 @@ function handleImport() {
 
 /** 下载模板操作 */
 function importTemplate() {
-  proxy.download('/runData/seizeData/importTemplate', {
+  proxy.download('/item/hkSeizureStat/importTemplate', {
   }, `查获数据导入模板_${new Date().getTime()}.xlsx`)
 }
 
@@ -588,4 +610,15 @@ function submitFileForm() {
 }
 
 getList()
+getDeptList()
+
+function getDeptList() {
+  listDept({}).then(response => {
+    const deptList = response.data || []
+    brigadeOptions.value = deptList.filter(item => item.deptType === 'BRIGADE' && [311, 314, 315].includes(item.deptId)).map(item => ({
+      value: item.deptId,
+      label: item.deptName
+    }))
+  })
+}
 </script>