修改分页

master
夜笙歌 2 years ago
parent 49a1b45e5b
commit 5b99db45bd

@ -59,3 +59,26 @@ export function getBindList(data) {
data
})
}
// 查询挂车
export function getTrailerList(query) {
return request({
url: '/basecar/car/list1',
method: 'get',
params: query
})
}
// 删除挂车
export function setTrailerRequest(data) {
return request({
url: '/basecar/car/getDeviceList1',
method: 'post',
data
})
}
// 删除挂车
export function delTrailerRequest(id) {
return request({
url: '/basecar/car/getDeviceLis1t' + id,
method: 'delete',
})
}

@ -68,25 +68,25 @@ export default {
newPassword: 'New Password',
confirmPassword: 'Confirm Password',
},
sizeSelect:{
large:'Large',
default:'Default',
small:'Small',
wait:'Please wait, setting layout size...',
},
request:{
repeatedSubmit:'The data is being processed, please do not submit repeatedly',
LoginStatusExpired:'The login status has expired, you can stay on this page, or log in again',
systemHint:'System hint',
reRegister:'Re-register',
cancel:'Cancel',
expired:'Invalid session, or session expired, please log in again.',
connectionException:'Abnormal backend interface connection',
timeout:'System interface request timed out',
interface:'System Interface ',
exception:' Exception',
download:'Downloading data, please wait',
downloadErr:'There was an error downloading the file, please contact the administrator!'
sizeSelect: {
large: 'Large',
default: 'Default',
small: 'Small',
wait: 'Please wait, setting layout size...',
},
request: {
repeatedSubmit: 'The data is being processed, please do not submit repeatedly',
LoginStatusExpired: 'The login status has expired, you can stay on this page, or log in again',
systemHint: 'System hint',
reRegister: 'Re-register',
cancel: 'Cancel',
expired: 'Invalid session, or session expired, please log in again.',
connectionException: 'Abnormal backend interface connection',
timeout: 'System interface request timed out',
interface: 'System Interface ',
exception: ' Exception',
download: 'Downloading data, please wait',
downloadErr: 'There was an error downloading the file, please contact the administrator!'
},
option: {
refresh: 'refresh',
@ -108,7 +108,7 @@ export default {
successfullyDeleted: 'Successfully Deleted'
},
common: {
loadTitle:'Loading system resources, please be patient',
loadTitle: 'Loading system resources, please be patient',
success: 'success',
show: 'show',
hide: 'hide',
@ -125,21 +125,21 @@ export default {
editAccount: 'Editor\'s account',
editName: 'Editor\'s name',
editBy: 'Editor',
startingTime:'starting Time',
startDate:'start Date',
endTime:'end Time',
endDate:'end Date'
startingTime: 'starting Time',
startDate: 'start Date',
endTime: 'end Time',
endDate: 'end Date'
},
tireManagement: {
info: {
factory: 'factory',
tireNumber: 'tire Number',
brand:'brand',
pattern:'pattern',
tireSpecificationModel:'tire Specification Model',
sensorNumber:'sensor Number',
numberPlate:'number Plate',
creationTime:'creation Time'
brand: 'brand',
pattern: 'pattern',
tireSpecificationModel: 'tire Specification Model',
sensorNumber: 'sensor Number',
numberPlate: 'number Plate',
creationTime: 'creation Time'
}
},
tireManagement1: {
@ -159,8 +159,8 @@ export default {
},
baseCar: {
car: {
team:'Team',
model:'BelongingToTheModel',
team: 'Team',
model: 'BelongingToTheModel',
companyCode: 'Enterprise number',
carQueueId: 'Fleet ID',
carTypeId: 'Model ID',

@ -69,15 +69,27 @@
<el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
<el-table-column align="center" fixed type="selection" width="55"/>
<el-table-column :label="t('baseCar.car.carLicense')" align="center" prop="carLicense" width="150"/>
<el-table-column :label="t('baseCar.car.team')" align="center" prop="carQueueId"/>
<el-table-column :label="t('baseCar.car.team')" align="center" prop="carQueue"/>
<el-table-column align="center" label="挂车" prop="carQueue">
<template #default="scope">
{{ scope.row.trailerNum === 0 ? '车头' : '挂' + scope.row.trailerNum }}
</template>
</el-table-column>
<el-table-column :label="t('baseCar.car.model')" align="center" prop="carTypeId"/>
<el-table-column :label="t('baseCar.car.deviceId')" align="center" prop="deviceId" width="150"/>
<el-table-column :label="t('baseCar.car.deviceBindTime')" align="center" prop="deviceBindTime" width="150"/>
<el-table-column :label="t('common.createTime')" align="center" prop="createTime" width="160"/>
<el-table-column :label="t('common.createBy')" align="center" prop="createName" width="150"/>
<el-table-column :label="t('option.option')" align="center" class-name="small-padding fixed-width" fixed="right"
width="160">
width="200">
<template #default="scope">
<el-button
v-if="scope.row.trailerNum === 0"
type="text"
@click="SetTrailer(scope.row)"
>
设置挂车
</el-button>
<el-button
icon="Finished"
type="text"
@ -133,6 +145,7 @@
</div>
</template>
</el-dialog>
<!-- 添加或修改岗位对话框 -->
<el-dialog v-model="open" :title="title" append-to-body width="500px">
<el-form ref="postRef" :label-width=" locale ? '120px':'140px'" :model="form" :rules="rules">
@ -144,7 +157,7 @@
<el-form-item :label="t('baseCar.car.team')" prop="carQueueId">
<el-select
v-model="form.carQueueId"
:placeholder="t('common.pleaseEnter') + t('baseCar.car.carQueueId')"
:placeholder="t('common.PleaseSelect')"
clearable
style="width: 240px"
>
@ -159,7 +172,7 @@
<el-form-item :label="t('baseCar.car.model')" prop="carTypeId">
<el-select
v-model="form.carTypeId"
:placeholder="t('common.pleaseEnter') + t('baseCar.car.carQueueId')"
:placeholder="t('common.PleaseSelect')"
clearable
style="width: 240px"
>
@ -179,6 +192,84 @@
</div>
</template>
</el-dialog>
<!--设置挂车-->
<el-dialog v-model="dialogOpen1" append-to-body title="设置挂车" width="1000px">
<el-form :inline="true" :label-width=" locale ? '110px':'170px'">
<el-form-item label="所属车型">
<el-select
v-model="SetTrailerForm.carTypeId"
:placeholder="t('common.PleaseSelect') "
clearable
style="width: 240px"
>
<el-option
v-for="dict in carType"
:key="dict.id"
:label="dict.title"
:value="dict.id"
/>
</el-select>
</el-form-item>
<el-form-item label="布局挂数">
<el-select
v-model="SetTrailerForm.trailerNum"
:placeholder="t('common.PleaseSelect') "
clearable
style="width: 240px"
>
<el-option
v-for="dict in option1"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="车牌号">
<el-input
v-model="SetTrailerForm.carLicense"
:placeholder="t('common.pleaseEnter') + t('baseCar.car.carLicense')"
clearable
style="width: 200px"
/>
</el-form-item>
<el-form-item label=" ">
<el-button icon="Search" type="primary" @click="saveTrailer">{{ t('option.save') }}</el-button>
<el-button icon="Refresh" @click="()=>{SetTrailerForm = {}}">{{ t('option.reset') }}</el-button>
</el-form-item>
</el-form>
<el-table :data="postList1">
<el-table-column align="center" fixed type="selection" width="55"/>
<el-table-column label="布局挂数" align="center" prop="carLicense" width="150">
<template #default="scope">
{{ scope.row.trailerNum === 0 ? '车头' : '挂' + scope.row.trailerNum }}
</template>
</el-table-column>
<el-table-column label="所属车型" align="center" prop="carTypeId"/>
<el-table-column label="车牌号" align="center" prop="carLicense"/>
<el-table-column label="车头牌号" align="center" prop="carLicenseParent" width="150"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right"
width="200">
<template #default="scope">
<el-button
type="text"
@click="delTrailer(scope.row.id)"
v-if="scope.row.trailerNum !== 0"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<template #footer>
<div class="dialog-footer">
<el-button @click="()=>{thisCarId ={};SetTrailerForm = {};dialogOpen1=false}">关闭</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
@ -190,7 +281,7 @@ import {
listBaseCar,
updateBaseCar,
getCarQueueList,
getBindList
getBindList,
} from "@/api/carManagement/info";
import {useI18n} from 'vue-i18n';
@ -236,7 +327,30 @@ const bindValue = ref('')
const bindInput = ref('')
//
const bindList = ref([])
//
const dialogOpen1 = ref(false);
const postList1 = ref([])
const thisCarId = ref({})
const SetTrailerForm = ref({
carTypeId: '',
trailerNum: '',
carLicense: ''
})
const option1 = [
{
value: 1,
label: '挂1'
},
{
value: 2,
label: '挂2'
},
{
value: 3,
label: '挂3'
},
]
//
const queryParams = ref({
pageNum: 1,
@ -317,6 +431,47 @@ function handleSelectionChange(selection) {
multiple.value = !selection.length;
}
//
const SetTrailer = (e) => {
dialogOpen1.value = true
getCarQueueList().then(response => {
carType.value = response.CarTypeList;
}).finally(() => {
loading.value = false;
});
listBaseCar({carLicenseParent:e.carLicense}).then(val => {
postList1.value = val.rows
})
thisCarId.value = e
}
const saveTrailer = () => {
addBaseCar({
carLicenseParent: thisCarId.value.carLicense,
carQueueId: thisCarId.value.carQueueId, ...SetTrailerForm.value,
}).then(val => {
proxy.$modal.msgSuccess('保存成功');
getList();
listBaseCar({carLicenseParent:thisCarId.value.carLicense}).then(val => {
postList1.value = val.rows
})
})
}
const delTrailer = (e) => {
proxy.$modal.confirm(t('option.confirmDeletion', {
key: t('baseCar.car.carLicense'), value: msg.value
})).then(function () {
return delBaseCar(e);
}).then(() => {
getList();
proxy.$modal.msgSuccess('删除成功');
listBaseCar({carLicenseParent:thisCarId.value.carLicense}).then(val => {
postList1.value = val.rows
})
}).catch(() => {
});
}
//
const bindHandleSelectionChange = (selection) => {
bindValue.value = selection
@ -324,7 +479,7 @@ const bindHandleSelectionChange = (selection) => {
//
const bindSearch = () => {
let params = {deviceId: bindInput.value,...queryParams1.value}
let params = {deviceId: bindInput.value, ...queryParams1.value}
getBindList(params).then(response => {
bindList.value = response.rows;
total1.value = response.total;
@ -396,7 +551,7 @@ function submitForm() {
getList();
});
} else {
addBaseCar(form.value).then(response => {
addBaseCar({...form.value, trailerNum: 0,}).then(response => {
proxy.$modal.msgSuccess(t('option.addedSuccessfully'));
open.value = false;
getList();

@ -40,15 +40,15 @@
@click="getTyreInfo(`${index+1}-1-1`)">
<div v-if="tyreDataList.includes(`${index+1}-1-1`)"
style="border-radius: 10%;width:100%;height:100%;background-color:green;vertical-align:top">
<div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 33px">
<div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
<div class="icon1"/>
{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].temperature }}
</div>
<div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 33px">
<div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
<div class="icon2"/>
{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].pressure }}
</div>
<!-- <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 33px">-->
<!-- <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">-->
<!-- 花纹:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-1`))[0].pattern }}-->
<!-- </div>-->
</div>
@ -58,15 +58,15 @@
@click="getTyreInfo(`${index+1}-1-2`)">
<div v-if="tyreDataList.includes(`${index+1}-1-2`)"
style="border-radius: 10%;width:100%;height:100%;background-color:green;vertical-align: top">
<div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 33px">
<div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
<div class="icon1"/>
{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].temperature }}
</div>
<div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 33px">
<div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
<div class="icon2"/>
{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].pressure }}
</div>
<!-- <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 33px">-->
<!-- <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">-->
<!-- 花纹:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-1-2`))[0].pattern }}-->
<!-- </div>-->
</div>
@ -78,15 +78,15 @@
@click="getTyreInfo(`${index+1}-2-2`)">
<div v-if="tyreDataList.includes(`${index+1}-2-2`)"
style="border-radius: 10%;width:100%;height:100%;background-color:green;vertical-align:top">
<div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 33px">
<div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
<div class="icon1"/>
{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].temperature }}
</div>
<div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 33px">
<div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
<div class="icon2"/>
{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].pressure }}
</div>
<!-- <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 33px">-->
<!-- <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">-->
<!-- 花纹:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-2`))[0].pattern }}-->
<!-- </div>-->
</div>
@ -96,15 +96,15 @@
@click="getTyreInfo(`${index+1}-2-1`)">
<div v-if="tyreDataList.includes(`${index+1}-2-1`)"
style="border-radius: 10%;width:100%;height:100%;background-color:green;vertical-align:top">
<div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 33px">
<div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
<div class="icon1"/>
{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].temperature }}
</div>
<div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 33px">
<div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">
<div class="icon2"/>
{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].pressure }}
</div>
<!-- <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 33px">-->
<!-- <div style="white-space:nowrap;width: 100%;color:#fff;font-size: 0.7vw;line-height: 50px">-->
<!-- 花纹:{{ tyreList.filter(e => e.tyrePositionS === (`${index + 1}-2-1`))[0].pattern }}-->
<!-- </div>-->
</div>
@ -180,7 +180,7 @@
<template #label>
传感器ID
</template>
{{ tyreInfo.internationalization2 }}
{{ tyreInfo.sensorId }}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
@ -210,7 +210,7 @@
<template #label>
当前花纹深度
</template>
{{ tyreInfo.patternDepth }}
{{ tyreInfo.currentTextureDepth }}mm
</el-descriptions-item>
<el-descriptions-item>
<template #label>
@ -222,50 +222,20 @@
<template #label>
温度
</template>
{{ tyreInfo.temperature }}
{{ tyreInfo.temperature }}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
压力热态
压力
</template>
{{ tyreInfo.pressure }}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
冷态气压
</template>
{{ tyreInfo.internationalization2 }}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
报警阈值热态
</template>
{{ tyreInfo.internationalization2 }}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
低压报警阈值冷态
</template>
{{ tyreInfo.internationalization2 }}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
当前状态
</template>
{{ tyreInfo.internationalization2 }}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
安装时间
</template>
{{ tyreInfo.internationalization2 }}
</el-descriptions-item>
<el-descriptions-item>
<template #label>
监测时间
</template>
{{ tyreInfo.internationalization2 }}
</el-descriptions-item>
</el-descriptions>
<template #footer>
<div class="dialog-footer">

@ -141,7 +141,6 @@ const handleQuery = () => {
one = !one
}
const setMarker = (e) => {
let markers = map.getAllOverlays('marker');
map.remove(markers)

@ -136,7 +136,7 @@
<el-table-column align="center" label="外胎号" prop="outerTireNumber" width="150"/>
<el-table-column align="center" label="品牌" prop="brand" width="150"/>
<el-table-column align="center" label="规格型号" prop="size" width="150"/>
<el-table-column align="center" label="花纹" prop="pattern" wXXXidth="150"/>
<el-table-column align="center" label="花纹" prop="pattern" width="150"/>
<el-table-column align="center" label="目前所安装车辆" prop="carLicense" width="150"/>
<el-table-column align="center" label="安装轮位" prop="tyrePosition" width="150"/>
<el-table-column align="center" label="传感器编号" prop="sensorId" width="150"/>

@ -34,9 +34,9 @@ export default defineConfig(({mode, command}) => {
// open: true,
proxy: {
'/dev-api': {
target: 'https://ticptest.tercelo.com/dev-api',
// target: 'https://ticptest.tercelo.com/dev-api',
// target: 'http://47.94.93.46/dev-api',
// target: 'http://10.11.41.249:8080',
target: 'http://10.11.41.249:8080',
// target: 'http://localhost:8080',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '')

Loading…
Cancel
Save