Commit 24fb111fadcad12062606f71e029b26d2caceaa4
1 parent
91dbde74
司机健康数据
Showing
2 changed files
with
39 additions
and
23 deletions
src/api/driver/driver.js
| @@ -9,6 +9,15 @@ export function listDriver(query) { | @@ -9,6 +9,15 @@ export function listDriver(query) { | ||
| 9 | }) | 9 | }) |
| 10 | } | 10 | } |
| 11 | 11 | ||
| 12 | +// 选择列表 | ||
| 13 | +export function selectListOfDriver(params) { | ||
| 14 | + return request({ | ||
| 15 | + url: '/new/driver/list/select', | ||
| 16 | + method: 'post', | ||
| 17 | + params | ||
| 18 | + }) | ||
| 19 | +} | ||
| 20 | + | ||
| 12 | // 查询驾驶员信息详细 | 21 | // 查询驾驶员信息详细 |
| 13 | export function getDriver(id) { | 22 | export function getDriver(id) { |
| 14 | return request({ | 23 | return request({ |
src/views/driver/healthy/driverHealthy.vue
| @@ -2,11 +2,22 @@ | @@ -2,11 +2,22 @@ | ||
| 2 | <div class="app-container"> | 2 | <div class="app-container"> |
| 3 | <div class="query-from"> | 3 | <div class="query-from"> |
| 4 | <el-form :inline="true" :queryOfDriverHealthy="queryOfDriverHealthy" :model="queryParamsOfDriverHealthy" class="demo-form-inline"> | 4 | <el-form :inline="true" :queryOfDriverHealthy="queryOfDriverHealthy" :model="queryParamsOfDriverHealthy" class="demo-form-inline"> |
| 5 | + <el-form-item label="ID" props="id"> | ||
| 6 | + <el-form-item label="ID" props="id"> | ||
| 7 | + <el-input style="width: 120px;" v-model="queryParamsOfDriverHealthy.id" placeholder="请输入ID" clearable @keyup.enter="handleQueryOfDriverHealthy" /> | ||
| 8 | + </el-form-item> | ||
| 9 | + </el-form-item> | ||
| 5 | <el-form-item label="司机" props="driverId"> | 10 | <el-form-item label="司机" props="driverId"> |
| 6 | - <el-select v-model="queryParamsOfDriverHealthy.driverId" > | 11 | + <el-select v-model="queryParamsOfDriverHealthy.driverId" value-on-clear > |
| 7 | <el-option v-for="item in driverIds" :key="item.id" :label="item.personnelNameAndJobCode" :value="item.id" /> | 12 | <el-option v-for="item in driverIds" :key="item.id" :label="item.personnelNameAndJobCode" :value="item.id" /> |
| 8 | </el-select> | 13 | </el-select> |
| 9 | </el-form-item> | 14 | </el-form-item> |
| 15 | + | ||
| 16 | + | ||
| 17 | + <el-form-item> | ||
| 18 | + <el-button type="primary" icon="Search" @click="handleQueryOfDriverHealthy">搜索</el-button> | ||
| 19 | + <el-button icon="Refresh" @click="resetQueryOfDriverHealthy">重置</el-button> | ||
| 20 | + </el-form-item> | ||
| 10 | </el-form> | 21 | </el-form> |
| 11 | 22 | ||
| 12 | <el-row :gutter="10" class="mb8"> | 23 | <el-row :gutter="10" class="mb8"> |
| @@ -45,7 +56,6 @@ | @@ -45,7 +56,6 @@ | ||
| 45 | <el-table-column label="血压收缩值" align="center" prop="diastolicPressure" sortable /> | 56 | <el-table-column label="血压收缩值" align="center" prop="diastolicPressure" sortable /> |
| 46 | <el-table-column label="血氧值" align="center" prop="oxygenValue" sortable /> | 57 | <el-table-column label="血氧值" align="center" prop="oxygenValue" sortable /> |
| 47 | <el-table-column label="心率值" align="center" prop="heartRate" sortable /> | 58 | <el-table-column label="心率值" align="center" prop="heartRate" sortable /> |
| 48 | - | ||
| 49 | 59 | ||
| 50 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160"> | 60 | <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160"> |
| 51 | <template #default="scope"> | 61 | <template #default="scope"> |
| @@ -60,27 +70,24 @@ | @@ -60,27 +70,24 @@ | ||
| 60 | 70 | ||
| 61 | <el-dialog :title="titleOfDriverHealthy" v-model="openOfDriverHealthy" width="500px" append-to-body> | 71 | <el-dialog :title="titleOfDriverHealthy" v-model="openOfDriverHealthy" width="500px" append-to-body> |
| 62 | <el-form :model="formOfDriverHealthy" ref="rulesOfDriverHealthy" label-width="80px" :rules="checkRulesOfDriverHealthy"> | 72 | <el-form :model="formOfDriverHealthy" ref="rulesOfDriverHealthy" label-width="80px" :rules="checkRulesOfDriverHealthy"> |
| 63 | - <el-form-item label="ID" prop="id"> | ||
| 64 | - <el-input el-input="input" v-model="formOfDriverHealthy.id" placeholder="请输入ID" /> | ||
| 65 | - </el-form-item> | ||
| 66 | - <el-form-item label="司机" prop="driverId"> | ||
| 67 | - <el-select v-model="formOfDriverHealthy.driverId" > | 73 | + <el-form-item label="司机" prop="driverId" label-width="100px"> |
| 74 | + <el-select v-model="formOfDriverHealthy.driverId" style="width: 360px"> | ||
| 68 | <el-option v-for="item in driverIds" :key="item.id" :label="item.personnelNameAndJobCode" :value="item.id" /> | 75 | <el-option v-for="item in driverIds" :key="item.id" :label="item.personnelNameAndJobCode" :value="item.id" /> |
| 69 | </el-select> | 76 | </el-select> |
| 70 | </el-form-item> | 77 | </el-form-item> |
| 71 | - <el-form-item label="血压舒张值" prop="systolicPressure"> | ||
| 72 | - <el-input el-input="input" v-model="formOfDriverHealthy.systolicPressure" placeholder="请输入血压舒张值" /> | 78 | + <el-form-item label="血压舒张值" prop="systolicPressure" label-width="100px"> |
| 79 | + <el-input-number el-input="input" v-model="formOfDriverHealthy.systolicPressure" placeholder="请输入血压舒张值" style="width: 360px"/> | ||
| 73 | </el-form-item> | 80 | </el-form-item> |
| 74 | - <el-form-item label="血压收缩值" prop="diastolicPressure"> | ||
| 75 | - <el-input el-input="input" v-model="formOfDriverHealthy.diastolicPressure" placeholder="请输入血压收缩值" /> | 81 | + <el-form-item label="血压收缩值" prop="diastolicPressure" label-width="100px"> |
| 82 | + <el-input-number el-input="input" v-model="formOfDriverHealthy.diastolicPressure" placeholder="请输入血压收缩值" style="width: 360px"/> | ||
| 76 | </el-form-item> | 83 | </el-form-item> |
| 77 | - <el-form-item label="血氧值" prop="oxygenValue"> | ||
| 78 | - <el-input el-input="input" v-model="formOfDriverHealthy.oxygenValue" placeholder="请输入血氧值" /> | 84 | + <el-form-item label="血氧值" prop="oxygenValue" label-width="100px"> |
| 85 | + <el-input-number el-input="input" v-model="formOfDriverHealthy.oxygenValue" placeholder="请输入血氧值" style="width: 360px"/> | ||
| 79 | </el-form-item> | 86 | </el-form-item> |
| 80 | - <el-form-item label="心率值" prop="heartRate"> | ||
| 81 | - <el-input el-input="input" v-model="formOfDriverHealthy.heartRate" placeholder="请输入心率值" /> | 87 | + <el-form-item label="心率值" prop="heartRate" label-width="100px"> |
| 88 | + <el-input-number el-input="input" v-model="formOfDriverHealthy.heartRate" placeholder="请输入心率值" style="width: 360px"/> | ||
| 82 | </el-form-item> | 89 | </el-form-item> |
| 83 | - | 90 | + |
| 84 | </el-form> | 91 | </el-form> |
| 85 | 92 | ||
| 86 | <template #footer> | 93 | <template #footer> |
| @@ -107,7 +114,6 @@ | @@ -107,7 +114,6 @@ | ||
| 107 | const idsOfDriverHealthy = ref([]); | 114 | const idsOfDriverHealthy = ref([]); |
| 108 | const singleDriverHealthy = ref(true); | 115 | const singleDriverHealthy = ref(true); |
| 109 | const multipleDriverHealthy = ref(true); | 116 | const multipleDriverHealthy = ref(true); |
| 110 | - | ||
| 111 | 117 | ||
| 112 | 118 | ||
| 113 | const pageOfDriverHealthy = ref(1) //第几页 | 119 | const pageOfDriverHealthy = ref(1) //第几页 |
| @@ -119,7 +125,7 @@ | @@ -119,7 +125,7 @@ | ||
| 119 | 125 | ||
| 120 | const changeFlagOfDriverHealthy = ref(true) | 126 | const changeFlagOfDriverHealthy = ref(true) |
| 121 | 127 | ||
| 122 | - const DriverIds=ref([]); | 128 | + const driverIds=ref([]); |
| 123 | 129 | ||
| 124 | const dataOfDriverHealthy = reactive({ | 130 | const dataOfDriverHealthy = reactive({ |
| 125 | formOfDriverHealthy: {}, | 131 | formOfDriverHealthy: {}, |
| @@ -187,7 +193,6 @@ | @@ -187,7 +193,6 @@ | ||
| 187 | loadingOfDriverHealthy.value = false; | 193 | loadingOfDriverHealthy.value = false; |
| 188 | }); | 194 | }); |
| 189 | } | 195 | } |
| 190 | - | ||
| 191 | /**排序*/ | 196 | /**排序*/ |
| 192 | function sortChangeOfDriverHealthy(data){ | 197 | function sortChangeOfDriverHealthy(data){ |
| 193 | queryParamsOfDriverHealthy.value.order=data.order; | 198 | queryParamsOfDriverHealthy.value.order=data.order; |
| @@ -195,9 +200,6 @@ | @@ -195,9 +200,6 @@ | ||
| 195 | getListOfDriverHealthy(); | 200 | getListOfDriverHealthy(); |
| 196 | } | 201 | } |
| 197 | 202 | ||
| 198 | - function selectDrivers(){ | ||
| 199 | - selectListOfDriver().then(response=>{DriverIds.value=response.data}) | ||
| 200 | - } | ||
| 201 | 203 | ||
| 202 | // 取消按钮 | 204 | // 取消按钮 |
| 203 | function cancelOfDriverHealthy() { | 205 | function cancelOfDriverHealthy() { |
| @@ -310,8 +312,13 @@ | @@ -310,8 +312,13 @@ | ||
| 310 | } | 312 | } |
| 311 | 313 | ||
| 312 | function init_DriverId(){ | 314 | function init_DriverId(){ |
| 313 | - ().then(res=>{DriverIds.value=res.data}); | 315 | + selectListOfDriver().then(res=>{driverIds.value=res.data; |
| 316 | + console.log(driverIds); | ||
| 317 | + console.log(res.data); | ||
| 318 | + | ||
| 319 | + }); | ||
| 314 | } | 320 | } |
| 315 | 321 | ||
| 316 | getListOfDriverHealthy(); | 322 | getListOfDriverHealthy(); |
| 323 | + init_DriverId(); | ||
| 317 | </script> | 324 | </script> |
| 318 | \ No newline at end of file | 325 | \ No newline at end of file |