Преглед изворни кода

refactor(rateList): 更新接口路径和字段命名以匹配后端变更

更新速率统计模块的API接口路径和前端字段命名,使其与后端保持一致。主要修改包括:
- 调整所有API端点路径为/blocked/rate前缀
- 统一字段命名规范,添加Peak后缀表示高峰期数据
- 使用字典管理班次选项
- 修改查询参数和表单字段以匹配后端接口
huoyi пре 3 дана
родитељ
комит
1e6dc83a59
2 измењених фајлова са 57 додато и 59 уклоњено
  1. 10 11
      src/api/blockingData/rateList.js
  2. 47 48
      src/views/blockingData/rateList/index.vue

+ 10 - 11
src/api/blockingData/rateList.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
3
 // 查询速率统计列表
3
 // 查询速率统计列表
4
 export function listRate(query) {
4
 export function listRate(query) {
5
   return request({
5
   return request({
6
-    url: '/rateList/list',
6
+    url: '/blocked/rate/list',
7
     method: 'get',
7
     method: 'get',
8
     params: query
8
     params: query
9
   })
9
   })
@@ -12,7 +12,7 @@ export function listRate(query) {
12
 // 查询速率统计详细
12
 // 查询速率统计详细
13
 export function getRate(id) {
13
 export function getRate(id) {
14
   return request({
14
   return request({
15
-    url: '/rateList/' + id,
15
+    url: `/blocked/rate/${id}`,
16
     method: 'get'
16
     method: 'get'
17
   })
17
   })
18
 }
18
 }
@@ -20,7 +20,7 @@ export function getRate(id) {
20
 // 新增速率统计
20
 // 新增速率统计
21
 export function addRate(data) {
21
 export function addRate(data) {
22
   return request({
22
   return request({
23
-    url: '/rateList',
23
+    url: '/blocked/rate/add',
24
     method: 'post',
24
     method: 'post',
25
     data: data
25
     data: data
26
   })
26
   })
@@ -29,25 +29,24 @@ export function addRate(data) {
29
 // 修改速率统计
29
 // 修改速率统计
30
 export function updateRate(data) {
30
 export function updateRate(data) {
31
   return request({
31
   return request({
32
-    url: '/rateList',
33
-    method: 'put',
32
+    url: '/blocked/rate/edit',
33
+    method: 'post',
34
     data: data
34
     data: data
35
   })
35
   })
36
 }
36
 }
37
 
37
 
38
 // 删除速率统计
38
 // 删除速率统计
39
-export function delRate(id) {
39
+export function delRate(ids) {
40
   return request({
40
   return request({
41
-    url: '/rateList/' + id,
41
+    url: `/blocked/rate/${ids}`,
42
     method: 'delete'
42
     method: 'delete'
43
   })
43
   })
44
 }
44
 }
45
 
45
 
46
 // 导出速率统计
46
 // 导出速率统计
47
-export function exportRate(query) {
47
+export function exportRate() {
48
   return request({
48
   return request({
49
-    url: '/rateList/export',
50
-    method: 'get',
51
-    params: query
49
+    url: `/blocked/rate/export`,
50
+    method: 'post',
52
   })
51
   })
53
 }
52
 }

+ 47 - 48
src/views/blockingData/rateList/index.vue

@@ -1,19 +1,18 @@
1
 <template>
1
 <template>
2
   <div class="app-container">
2
   <div class="app-container">
3
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
3
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
4
-      <el-form-item label="大队" prop="brigadeId">
5
-        <el-select v-model="queryParams.brigadeId" placeholder="请选择大队" clearable style="width: 200px">
4
+      <el-form-item label="当班大队" prop="dutyBrigadeId">
5
+        <el-select v-model="queryParams.dutyBrigadeId" placeholder="请选择当班大队" clearable style="width: 200px">
6
           <el-option v-for="item in brigadeOptions" :key="item.value" :label="item.label" :value="item.value" />
6
           <el-option v-for="item in brigadeOptions" :key="item.value" :label="item.label" :value="item.value" />
7
         </el-select>
7
         </el-select>
8
       </el-form-item>
8
       </el-form-item>
9
-      <el-form-item label="日期" prop="date">
10
-        <el-date-picker clearable v-model="queryParams.date" type="date" placeholder="选择日期" value-format="YYYY-MM-DD"
9
+      <el-form-item label="日期" prop="statDate">
10
+        <el-date-picker clearable v-model="queryParams.statDate" type="date" placeholder="选择日期" value-format="YYYY-MM-DD"
11
           style="width: 200px" />
11
           style="width: 200px" />
12
       </el-form-item>
12
       </el-form-item>
13
       <el-form-item label="班次" prop="shift">
13
       <el-form-item label="班次" prop="shift">
14
         <el-select v-model="queryParams.shift" placeholder="请选择班次" clearable style="width: 200px">
14
         <el-select v-model="queryParams.shift" placeholder="请选择班次" clearable style="width: 200px">
15
-          <el-option label="白班" value="白班" />
16
-          <el-option label="夜班" value="夜班" />
15
+          <el-option v-for="dict in shift" :key="dict.value" :label="dict.label" :value="dict.value" />
17
         </el-select>
16
         </el-select>
18
       </el-form-item>
17
       </el-form-item>
19
       <el-form-item>
18
       <el-form-item>
@@ -44,16 +43,16 @@
44
 
43
 
45
     <el-table v-loading="loading" :data="rateList" @selection-change="handleSelectionChange">
44
     <el-table v-loading="loading" :data="rateList" @selection-change="handleSelectionChange">
46
       <el-table-column type="selection" width="55" align="center" />
45
       <el-table-column type="selection" width="55" align="center" />
47
-      <el-table-column label="日期" align="center" prop="date" width="120" />
48
-      <el-table-column label="旅检国内区域平均速率(高峰期时段)" align="center" prop="domesticAvgRate" width="220" />
49
-      <el-table-column label="当班大队" align="center" prop="dutyBrigade" width="120" />
50
-      <el-table-column label="T1-A速率(高峰期时段)" align="center" prop="t1ARate" width="180" />
51
-      <el-table-column label="T1-B速率(高峰期时段)" align="center" prop="t1BRate" width="180" />
52
-      <el-table-column label="T2国内速率(高峰期时段)" align="center" prop="t2DomesticRate" width="180" />
53
-      <el-table-column label="T2国际速率(高峰期时段)" align="center" prop="t2InternationalRate" width="180" />
46
+      <el-table-column label="日期" align="center" prop="statDate" width="120" />
47
+      <el-table-column label="旅检国内区域平均速率(高峰期时段)" align="center" prop="travelInspectionDomesticAvgRatePeak" width="220" />
48
+      <el-table-column label="当班大队" align="center" prop="dutyBrigadeName" width="120" />
49
+      <el-table-column label="T1-A速率(高峰期时段)" align="center" prop="t1AAreaRatePeak" width="180" />
50
+      <el-table-column label="T1-B速率(高峰期时段)" align="center" prop="t1BAreaRatePeak" width="180" />
51
+      <el-table-column label="T2-国内速率(高峰期时段)" align="center" prop="t2DomesticRatePeak" width="180" />
52
+      <el-table-column label="T2-国际速率(高峰期时段)" align="center" prop="t2InternationalRatePeak" width="180" />
54
       <el-table-column label="班次" align="center" prop="shift" width="100" />
53
       <el-table-column label="班次" align="center" prop="shift" width="100" />
55
-      <el-table-column label="T2中转(高峰期时段)" align="center" prop="t2TransferRate" width="160" />
56
-      <el-table-column label="国际及中转区域平均速率(高峰期时段)" align="center" prop="internationalTransferAvgRate" width="240" />
54
+      <el-table-column label="T2-中转(高峰期时段)" align="center" prop="t2TransferRatePeak" width="160" />
55
+      <el-table-column label="国际及中转区域平均速率(高峰期时段)" align="center" prop="internationalTransferAvgRatePeak" width="240" />
57
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
56
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
58
         <template #default="scope">
57
         <template #default="scope">
59
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
58
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@@ -71,14 +70,14 @@
71
       <el-form ref="rateListRef" :model="form" :rules="rules" label-width="240px">
70
       <el-form ref="rateListRef" :model="form" :rules="rules" label-width="240px">
72
         <el-row :gutter="20">
71
         <el-row :gutter="20">
73
           <el-col :span="12">
72
           <el-col :span="12">
74
-            <el-form-item label="日期" prop="date">
75
-              <el-date-picker v-model="form.date" type="date" placeholder="选择日期" value-format="YYYY-MM-DD"
73
+            <el-form-item label="日期" prop="statDate">
74
+              <el-date-picker v-model="form.statDate" type="date" placeholder="选择日期" value-format="YYYY-MM-DD"
76
                 style="width: 100%" />
75
                 style="width: 100%" />
77
             </el-form-item>
76
             </el-form-item>
78
           </el-col>
77
           </el-col>
79
           <el-col :span="12">
78
           <el-col :span="12">
80
-            <el-form-item label="当班大队" prop="dutyBrigade">
81
-              <el-select v-model="form.dutyBrigade" placeholder="请选择当班大队" style="width: 100%">
79
+            <el-form-item label="当班大队" prop="dutyBrigadeId">
80
+              <el-select v-model="form.dutyBrigadeId" placeholder="请选择当班大队" style="width: 100%">
82
                 <el-option v-for="item in brigadeOptions" :key="item.value" :label="item.label" :value="item.value" />
81
                 <el-option v-for="item in brigadeOptions" :key="item.value" :label="item.label" :value="item.value" />
83
               </el-select>
82
               </el-select>
84
             </el-form-item>
83
             </el-form-item>
@@ -88,50 +87,49 @@
88
           <el-col :span="12">
87
           <el-col :span="12">
89
             <el-form-item label="班次" prop="shift">
88
             <el-form-item label="班次" prop="shift">
90
               <el-select v-model="form.shift" placeholder="请选择班次" style="width: 100%">
89
               <el-select v-model="form.shift" placeholder="请选择班次" style="width: 100%">
91
-                <el-option label="白班" value="白班" />
92
-                <el-option label="夜班" value="夜班" />
90
+                <el-option v-for="dict in shift" :key="dict.value" :label="dict.label" :value="dict.value" />
93
               </el-select>
91
               </el-select>
94
             </el-form-item>
92
             </el-form-item>
95
           </el-col>
93
           </el-col>
96
           <el-col :span="12">
94
           <el-col :span="12">
97
-            <el-form-item label="旅检国内区域平均速率(高峰期时段)" prop="domesticAvgRate">
98
-              <el-input-number v-model="form.domesticAvgRate" :min="0" :precision="2" style="width: 100%" />
95
+            <el-form-item label="旅检国内区域平均速率(高峰期时段)" prop="travelInspectionDomesticAvgRatePeak">
96
+              <el-input-number v-model="form.travelInspectionDomesticAvgRatePeak" :min="0" :precision="2" style="width: 100%" />
99
             </el-form-item>
97
             </el-form-item>
100
           </el-col>
98
           </el-col>
101
         </el-row>
99
         </el-row>
102
         <el-row :gutter="20">
100
         <el-row :gutter="20">
103
           <el-col :span="12">
101
           <el-col :span="12">
104
-            <el-form-item label="T1-A速率(高峰期时段)" prop="t1ARate">
105
-              <el-input-number v-model="form.t1ARate" :min="0" :precision="2" style="width: 100%" />
102
+            <el-form-item label="T1-A速率(高峰期时段)" prop="t1AAreaRatePeak">
103
+              <el-input-number v-model="form.t1AAreaRatePeak" :min="0" :precision="2" style="width: 100%" />
106
             </el-form-item>
104
             </el-form-item>
107
           </el-col>
105
           </el-col>
108
           <el-col :span="12">
106
           <el-col :span="12">
109
-            <el-form-item label="T1-B速率(高峰期时段)" prop="t1BRate">
110
-              <el-input-number v-model="form.t1BRate" :min="0" :precision="2" style="width: 100%" />
107
+            <el-form-item label="T1-B速率(高峰期时段)" prop="t1BAreaRatePeak">
108
+              <el-input-number v-model="form.t1BAreaRatePeak" :min="0" :precision="2" style="width: 100%" />
111
             </el-form-item>
109
             </el-form-item>
112
           </el-col>
110
           </el-col>
113
         </el-row>
111
         </el-row>
114
         <el-row :gutter="20">
112
         <el-row :gutter="20">
115
           <el-col :span="12">
113
           <el-col :span="12">
116
-            <el-form-item label="T2国内速率(高峰期时段)" prop="t2DomesticRate">
117
-              <el-input-number v-model="form.t2DomesticRate" :min="0" :precision="2" style="width: 100%" />
114
+            <el-form-item label="T2-国内速率(高峰期时段)" prop="t2DomesticRatePeak">
115
+              <el-input-number v-model="form.t2DomesticRatePeak" :min="0" :precision="2" style="width: 100%" />
118
             </el-form-item>
116
             </el-form-item>
119
           </el-col>
117
           </el-col>
120
           <el-col :span="12">
118
           <el-col :span="12">
121
-            <el-form-item label="T2国际速率(高峰期时段)" prop="t2InternationalRate">
122
-              <el-input-number v-model="form.t2InternationalRate" :min="0" :precision="2" style="width: 100%" />
119
+            <el-form-item label="T2-国际速率(高峰期时段)" prop="t2InternationalRatePeak">
120
+              <el-input-number v-model="form.t2InternationalRatePeak" :min="0" :precision="2" style="width: 100%" />
123
             </el-form-item>
121
             </el-form-item>
124
           </el-col>
122
           </el-col>
125
         </el-row>
123
         </el-row>
126
         <el-row :gutter="20">
124
         <el-row :gutter="20">
127
           <el-col :span="12">
125
           <el-col :span="12">
128
-            <el-form-item label="T2中转(高峰期时段)" prop="t2TransferRate">
129
-              <el-input-number v-model="form.t2TransferRate" :min="0" :precision="2" style="width: 100%" />
126
+            <el-form-item label="T2-中转(高峰期时段)" prop="t2TransferRatePeak">
127
+              <el-input-number v-model="form.t2TransferRatePeak" :min="0" :precision="2" style="width: 100%" />
130
             </el-form-item>
128
             </el-form-item>
131
           </el-col>
129
           </el-col>
132
           <el-col :span="12">
130
           <el-col :span="12">
133
-            <el-form-item label="国际及中转区域平均速率(高峰期时段)" prop="internationalTransferAvgRate">
134
-              <el-input-number v-model="form.internationalTransferAvgRate" :min="0" :precision="2" style="width: 100%" />
131
+            <el-form-item label="国际及中转区域平均速率(高峰期时段)" prop="internationalTransferAvgRatePeak">
132
+              <el-input-number v-model="form.internationalTransferAvgRatePeak" :min="0" :precision="2" style="width: 100%" />
135
             </el-form-item>
133
             </el-form-item>
136
           </el-col>
134
           </el-col>
137
         </el-row>
135
         </el-row>
@@ -166,6 +164,7 @@ import { listRate, getRate, delRate, addRate, updateRate, exportRate } from '@/a
166
 import { listDept } from '@/api/system/dept'
164
 import { listDept } from '@/api/system/dept'
167
 
165
 
168
 const { proxy } = getCurrentInstance()
166
 const { proxy } = getCurrentInstance()
167
+const { shift } = proxy.useDict('shift')
169
 
168
 
170
 const loading = ref(true)
169
 const loading = ref(true)
171
 const ids = ref([])
170
 const ids = ref([])
@@ -182,16 +181,16 @@ const importFile = ref(null)
182
 const queryParams = reactive({
181
 const queryParams = reactive({
183
   pageNum: 1,
182
   pageNum: 1,
184
   pageSize: 10,
183
   pageSize: 10,
185
-  brigadeId: null,
186
-  date: null,
184
+  dutyBrigadeId: null,
185
+  statDate: null,
187
   shift: null
186
   shift: null
188
 })
187
 })
189
 
188
 
190
 const form = reactive({})
189
 const form = reactive({})
191
 
190
 
192
 const rules = {
191
 const rules = {
193
-  date: [{ required: true, message: '日期不能为空', trigger: 'change' }],
194
-  dutyBrigade: [{ required: true, message: '当班大队不能为空', trigger: 'change' }],
192
+  statDate: [{ required: true, message: '日期不能为空', trigger: 'change' }],
193
+  dutyBrigadeId: [{ required: true, message: '当班大队不能为空', trigger: 'change' }],
195
   shift: [{ required: true, message: '班次不能为空', trigger: 'change' }]
194
   shift: [{ required: true, message: '班次不能为空', trigger: 'change' }]
196
 }
195
 }
197
 
196
 
@@ -224,16 +223,16 @@ function cancel() {
224
 function reset() {
223
 function reset() {
225
   form.value = {
224
   form.value = {
226
     id: null,
225
     id: null,
227
-    date: null,
228
-    dutyBrigade: null,
226
+    statDate: null,
227
+    dutyBrigadeId: null,
229
     shift: null,
228
     shift: null,
230
-    domesticAvgRate: 0,
231
-    t1ARate: 0,
232
-    t1BRate: 0,
233
-    t2DomesticRate: 0,
234
-    t2InternationalRate: 0,
235
-    t2TransferRate: 0,
236
-    internationalTransferAvgRate: 0
229
+    travelInspectionDomesticAvgRatePeak: 0,
230
+    t1AAreaRatePeak: 0,
231
+    t1BAreaRatePeak: 0,
232
+    t2DomesticRatePeak: 0,
233
+    t2InternationalRatePeak: 0,
234
+    t2TransferRatePeak: 0,
235
+    internationalTransferAvgRatePeak: 0
237
   }
236
   }
238
   proxy.resetForm('rateListRef')
237
   proxy.resetForm('rateListRef')
239
 }
238
 }