Yangwl
/
xy_tyrems
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

界面修改

Browse Source
master
杨万里 2 years ago
parent 748d5e9b58
commit e45982c29b
2 changed files with 270 additions and 190 deletions
Show Stats Download Patch File Download Diff File

99
ruoyi-ui/src/views/basecar/car/index.vue
Unescape Escape View File

@ -27,38 +27,39 @@
plain
type="primary"
@click="handleAdd"
v-hasPermi="['basecar:car:add']"
>{{ t('option.add') }}
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['basecar:car:edit']"
:disabled="single"
icon="Edit"
plain
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['basecar:car:edit']"
>{{ t('option.edit') }}
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['basecar:car:remove']"
:disabled="multiple"
icon="Delete"
plain
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['basecar:car:remove']"
>{{ t('option.remove') }}
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['basecar:car:export']"
icon="Download"
plain
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['basecar:car:export']"
>{{ t('option.export') }}
</el-button>
</el-col>
@ -67,39 +68,55 @@
<!-- 表格主体-->
<el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
<el-table-column align="center" fixed type="selection" width="55"/>
<el-table-column type="selection" width="55" align="center" fixed/>
<!-- <el-table-column :label="t('baseCar.car.companyCode')" align="center" prop="companyCode" width="150"/>-->
<!-- <el-table-column :label="t('baseCar.car.carQueueId')" align="center" prop="carQueueId" width="150"/>-->
<!-- <el-table-column :label="t('baseCar.car.carTypeId')" align="center" prop="carTypeId" :width="locale ? 150:170"/>-->
<el-table-column :label="t('baseCar.car.carLicense')" align="center" prop="carLicense" width="150"/>
<el-table-column align="center" label="所属车队" prop="carQueueId" width="150"/>
<el-table-column align="center" label="所属车型" prop="carTypeId" width="150"/>
<el-table-column label="所属车队" align="center" prop="carLicense" width="150"/>
<el-table-column label="所属车型" align="center" prop="carLicense" width="150"/>
<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"/>
<el-table-column :label="t('common.createTime')" align="center" prop="createTime" width="160"/>
<el-table-column :label="t('common.createBy')" align="center" prop="createBy" width="150"/>
<!-- <el-table-column :label="t('baseCar.car.carLicenseIn')" align="center" prop="carLicenseIn"-->
<!-- :width="locale ? 150:170"/>-->
<!-- <el-table-column :label="t('baseCar.car.carLicenseParent')" align="center" prop="carLicenseParent"-->
<!-- :width="locale ? 150:170"/>-->
<!-- <el-table-column :label="t('baseCar.car.carIdParent')" align="center" prop="carIdParent" width="150"/>-->
<!-- <el-table-column :label="t('baseCar.car.userId')" align="center" prop="userId" width="150"/>-->
<!-- <el-table-column :label="t('baseCar.car.userName')" align="center" prop="userName" width="150"/>-->
<!-- :width="locale ? 150:170"/>-->
<!-- <el-table-column :label="t('baseCar.car.firstChangeDate')" align="center" prop="firstChangeDate"-->
<!-- :width="locale ? 150:170"/>-->
<!-- <el-table-column :label="t('baseCar.car.trailerNum')" align="center" prop="trailerNum" width="150"/>-->
<!-- <el-table-column :label="t('baseCar.car.isHandDevice')" align="center" prop="isHandDevice"-->
<!-- :width="locale ? 150:310"/>-->
<!-- <el-table-column :label="t('baseCar.car.isHasDevice')" align="center" prop="isHasDevice"-->
<!-- :width="locale ? 150:260"/>-->
<!-- <el-table-column :label="t('baseCar.car.longitude')" align="center" prop="longitude" width="150"/>-->
<!-- <el-table-column :label="t('baseCar.car.latitude')" align="center" prop="latitude" width="150"/>-->
<!-- <el-table-column :label="t('baseCar.car.tiresTotal')" align="center" prop="tiresTotal" width="150"/>-->
<!-- <el-table-column :label="t('common.isRemove')" align="center" prop="isDelete" width="150"/>-->
<!-- <el-table-column :label="t('common.creatorId')" align="center" prop="createId" width="150"/>-->
<!-- <el-table-column :label="t('common.creatorName')" align="center" prop="createName" width="150"/>-->
<!-- <el-table-column :label="t('common.editTime')" align="center" prop="modifyTime" width="150"/>-->
<!-- <el-table-column :label="t('common.editID')" align="center" prop="modifyId" width="150"/>-->
<!-- <el-table-column :label="t('common.editBy')" align="center" prop="modifyBy" width="150"/>-->
<el-table-column :label="t('option.option')" align="center" class-name="small-padding fixed-width" fixed="right"
width="160">
<template #default="scope">
<el-button
v-hasPermi="['basecar:car:edit']"
icon="Edit"
type="text"
@click="handleUpdate(scope.row)"
>{{ t('option.edit') }}
</el-button>
<el-button
v-hasPermi="['basecar:car:remove']"
icon="Delete"
type="text"
@click="handleDelete(scope.row)"
>{{ t('option.remove') }}
icon="Finished"
@click="handleBang(scope.row)"
>
绑定接收器
</el-button>
<!-- <el-button-->
<!-- type="text"-->
<!-- icon="Delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['basecar:car:remove']"-->
<!-- >绑定接收器-->
<!-- </el-button>-->
</template>
</el-table-column>
</el-table>
@ -107,12 +124,15 @@
<!-- 分页-->
<pagination
v-show="total > 0"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.pageNum"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<el-dialog title="绑定接收器" v-model="bangOpen" width="500px" append-to-body>
</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">
@ -162,7 +182,7 @@
</div>
</template>
<script name="basetyre" setup>
<script setup name="basetyre">
import {addBaseCar, delBaseCar, getBaseCar, listBaseCar, updateBaseCar,getCarQueueList} from "@/api/basecar/car";
import {useI18n} from 'vue-i18n';
@ -181,6 +201,7 @@ const postList = ref([]);
const carQueue = ref([]);
const carType = ref([]);
// 模态框开关标识
const bangOpen = ref(false);
const open = ref(false);
// 表格加载状态开关标识
const loading = ref(true);
@ -202,6 +223,7 @@ const queryParams = ref({
pageNum: 1,
pageSize: 10,
carLicense: undefined,
})
// 表单验证规则
@ -290,10 +312,13 @@ function handleUpdate(row) {
title.value = t('baseCar.car.editTitle');
});
}
function handleBang(row){
// console.log(row.id)
bangOpen.value = true;
}
/** 提交按钮 */
function submitForm() {
console.log(form)
proxy.$refs["postRef"].validate(valid => {
if (valid) {
if (form.value.id != undefined) {

277
ruoyi-ui/src/views/tireManagement/info/index.vue
Unescape Escape View File

@ -3,134 +3,182 @@
<!-- 搜索栏-->
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"
:label-width=" locale ? '100px':'140px'">
<el-form-item :label="t('tireManagement.tireFactoryCode')" prop="tyreFacCode">
<el-input
v-model="queryParams.tyreFacCode"
:placeholder=" t('common.pleaseEnter') + t('tireManagement.tireFactoryCode')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="t('tireManagement.enterpriseCode')" prop="companyCode">
<el-form-item label="外胎号" prop="tureCode">
<el-input
v-model="queryParams.companyCode"
:placeholder="t('common.pleaseEnter') + t('tireManagement.enterpriseCode')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="t('tireManagement.plateNumber')" prop="carLicense">
<el-input
v-model="queryParams.carLicense"
:placeholder="t('common.pleaseEnter') + t('tireManagement.plateNumber')"
v-model="queryParams.tureCode"
placeholder="请输入外胎号"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="t('tireManagement.tireNo')" prop="tureCode">
<el-form-item label="品牌" prop="tureCode">
<el-input
v-model="queryParams.tureCode"
:placeholder="t('common.pleaseEnter') + t('tireManagement.tireNo')"
placeholder="请输入品牌"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="RFID" prop="tyreRfid">
<el-form-item label="花纹" prop="tureCode">
<el-input
v-model="queryParams.tyreRfid"
:placeholder="t('common.pleaseEnter') +'RFID'"
v-model="queryParams.tureCode"
placeholder="请输入花纹"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="t('tireManagement.wheelPosition')" prop="tyrePosition">
<el-form-item label="轮胎规格型号" prop="tureCode">
<el-input
v-model="queryParams.tyrePosition"
:placeholder="t('common.pleaseEnter') + t('tireManagement.wheelPosition')"
v-model="queryParams.tureCode"
placeholder="请输入型号规格"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="t('tireManagement.tireSensorID')" prop="sensorId">
<el-form-item label="传感器编号" prop="sensorId">
<el-input
v-model="queryParams.sensorId"
:placeholder="t('common.pleaseEnter') + t('tireManagement.tireSensorID')"
placeholder="请输入传感器编号"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="t('tireManagement.treadDepth')" prop="currentTextureDepth">
<el-form-item label="车牌号" prop="sensorId">
<el-input
v-model="queryParams.currentTextureDepth"
:placeholder="t('common.pleaseEnter') + t('tireManagement.treadDepth')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="t('common.state')" prop="state">
<el-input
v-model="queryParams.state"
:placeholder="t('common.pleaseEnter') + t('common.state')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="t('common.isRemove')" prop="isDelete">
<el-input
v-model="queryParams.isDelete"
:placeholder="t('common.pleaseEnter') + t('common.isRemove')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="t('common.creatorName')" prop="createName">
<el-input
v-model="queryParams.createName"
:placeholder="t('common.pleaseEnter') + t('common.creatorName')"
v-model="queryParams.sensorId"
placeholder="请输入车牌号"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="t('common.editTime')" prop="modifyTime">
<el-form-item label="创建时间" style="width: 308px;">
<el-date-picker
clearable
style="width: 200px"
v-model="queryParams.modifyTime"
type="date"
format="YYYY/MM/DD"
value-format="yyyy-MM-dd"
:placeholder="t('common.PleaseSelect') + t('common.editTime')"
/>
</el-form-item>
<el-form-item :label="t('common.editAccount')" prop="modifyBy">
<el-input
v-model="queryParams.modifyBy"
:placeholder="t('common.pleaseEnter') + t('common.editAccount')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="t('common.editName')" prop="modifyName">
<el-input
v-model="queryParams.modifyName"
:placeholder="t('common.pleaseEnter') + t('common.editName')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
v-model="dateRange"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<!-- <el-form-item :label="t('tireManagement.tireFactoryCode')" prop="tyreFacCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.tyreFacCode"-->
<!-- :placeholder=" t('common.pleaseEnter') + t('tireManagement.tireFactoryCode')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('tireManagement.enterpriseCode')" prop="companyCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.companyCode"-->
<!-- :placeholder="t('common.pleaseEnter') + t('tireManagement.enterpriseCode')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('tireManagement.plateNumber')" prop="carLicense">-->
<!-- <el-input-->
<!-- v-model="queryParams.carLicense"-->
<!-- :placeholder="t('common.pleaseEnter') + t('tireManagement.plateNumber')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="RFID" prop="tyreRfid">-->
<!-- <el-input-->
<!-- v-model="queryParams.tyreRfid"-->
<!-- :placeholder="t('common.pleaseEnter') +'RFID'"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('tireManagement.wheelPosition')" prop="tyrePosition">-->
<!-- <el-input-->
<!-- v-model="queryParams.tyrePosition"-->
<!-- :placeholder="t('common.pleaseEnter') + t('tireManagement.wheelPosition')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('tireManagement.treadDepth')" prop="currentTextureDepth">-->
<!-- <el-input-->
<!-- v-model="queryParams.currentTextureDepth"-->
<!-- :placeholder="t('common.pleaseEnter') + t('tireManagement.treadDepth')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('common.state')" prop="state">-->
<!-- <el-input-->
<!-- v-model="queryParams.state"-->
<!-- :placeholder="t('common.pleaseEnter') + t('common.state')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('common.isRemove')" prop="isDelete">-->
<!-- <el-input-->
<!-- v-model="queryParams.isDelete"-->
<!-- :placeholder="t('common.pleaseEnter') + t('common.isRemove')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('common.creatorName')" prop="createName">-->
<!-- <el-input-->
<!-- v-model="queryParams.createName"-->
<!-- :placeholder="t('common.pleaseEnter') + t('common.creatorName')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('common.editTime')" prop="modifyTime">-->
<!-- <el-date-picker-->
<!-- clearable-->
<!-- style="width: 200px"-->
<!-- v-model="queryParams.modifyTime"-->
<!-- type="date"-->
<!-- format="YYYY/MM/DD"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- :placeholder="t('common.PleaseSelect') + t('common.editTime')"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('common.editAccount')" prop="modifyBy">-->
<!-- <el-input-->
<!-- v-model="queryParams.modifyBy"-->
<!-- :placeholder="t('common.pleaseEnter') + t('common.editAccount')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="t('common.editName')" prop="modifyName">-->
<!-- <el-input-->
<!-- v-model="queryParams.modifyName"-->
<!-- :placeholder="t('common.pleaseEnter') + t('common.editName')"-->
<!-- style="width: 200px"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label=" ">
<el-button type="primary" icon="Search" @click="handleQuery">{{ t('option.search') }}</el-button>
<el-button icon="Refresh" @click="resetQuery">{{ t('option.reset') }}</el-button>
@ -187,30 +235,36 @@
<!-- 表格主体-->
<el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" fixed/>
<el-table-column :label="t('tireManagement.tireFactoryCode')" align="center" prop="tyreFacCode" width="150"/>
<el-table-column :label="t('tireManagement.enterpriseCode')" align="center" prop="companyCode" width="150"/>
<el-table-column :label="t('tireManagement.carId')" align="center" prop="carId" width="150"/>
<el-table-column :label="t('tireManagement.plateNumber')" align="center" prop="carLicense" width="150"/>
<!-- <el-table-column :label="t('tireManagement.tireFactoryCode')" align="center" prop="tyreFacCode" width="150"/>-->
<!-- <el-table-column :label="t('tireManagement.enterpriseCode')" align="center" prop="companyCode" width="150"/>-->
<el-table-column :label="t('tireManagement.tireNo')" align="center" prop="tureCode" width="150"/>
<el-table-column :label="t('tireManagement.tireModel')" align="center" prop="tureModel" width="150"/>
<el-table-column :label="t('tireManagement.tireModelId')" align="center" prop="tureModelId" width="150"/>
<el-table-column :label="t('tireManagement.brandId')" align="center" prop="tureBrandId" width="150"/>
<el-table-column label="RFID" align="center" prop="tyreRfid" width="150"/>
<el-table-column :label="t('tireManagement.wheelPosition')" align="center" prop="tyrePosition" width="150"/>
<el-table-column :label="t('tireManagement.tireSensorID')" align="center" prop="sensorId" width="150"/>
<el-table-column :label="t('tireManagement.treadDepth')" align="center" prop="currentTextureDepth" width="150"/>
<el-table-column :label="t('common.state')" align="center" prop="state" width="150"/>
<el-table-column :label="t('common.isRemove')" align="center" prop="isDelete" width="150"/>
<el-table-column :label="t('common.creatorId')" align="center" prop="createId" width="150"/>
<el-table-column :label="t('common.creatorName')" align="center" prop="createName" width="150"/>
<el-table-column :label="t('common.editTime')" align="center" prop="modifyTime" width="150">
<template #default="scope">
<span>{{ parseTime(scope.row.modifyTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="t('common.editID')" align="center" prop="modifyId" width="150"/>
<el-table-column :label="t('common.editAccount')" align="center" prop="modifyBy" width="150"/>
<el-table-column :label="t('common.creatorName')" align="center" prop="modifyName" width="150"/>
<el-table-column label="品牌" align="center" prop="tureBrandId" width="150"/>
<el-table-column label="规格型号" align="center" prop="tureModel" width="150"/>
<el-table-column label="花纹" align="center" prop="tureModel" width="150"/>
<!-- <el-table-column :label="t('tireManagement.carId')" align="center" prop="carId" width="150"/>-->
<el-table-column label="目前所安装车辆" align="center" prop="carLicense" width="150"/>
<!-- <el-table-column :label="t('tireManagement.tireModelId')" align="center" prop="tureModelId" width="150"/>-->
<!-- <el-table-column label="RFID" align="center" prop="tyreRfid" width="150"/>-->
<el-table-column label="安装轮位" align="center" prop="tyrePosition" width="150"/>
<el-table-column label="传感器编号" align="center" prop="sensorId" width="150"/>
<el-table-column label="最新花纹深度" align="center" prop="currentTextureDepth" width="150"/>
<el-table-column label="创建时间" align="center" prop="createName" width="150"/>
<el-table-column label="创建者" align="center" prop="createName" width="150"/>
<!-- <el-table-column :label="t('common.state')" align="center" prop="state" width="150"/>-->
<!-- <el-table-column :label="t('common.isRemove')" align="center" prop="isDelete" width="150"/>-->
<!-- <el-table-column :label="t('common.creatorId')" align="center" prop="createId" width="150"/>-->
<!-- <el-table-column :label="t('common.editTime')" align="center" prop="modifyTime" width="150">-->
<!-- <template #default="scope">-->
<!-- <span>{{ parseTime(scope.row.modifyTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column :label="t('common.editID')" align="center" prop="modifyId" width="150"/>-->
<!-- <el-table-column :label="t('common.editAccount')" align="center" prop="modifyBy" width="150"/>-->
<!-- <el-table-column :label="t('common.creatorName')" align="center" prop="modifyName" width="150"/>-->
<el-table-column :label="t('option.option')" align="center" class-name="small-padding fixed-width" fixed="right"
width="160">
<template #default="scope">
@ -326,6 +380,7 @@ const {sys_normal_disable} = proxy.useDict("sys_normal_disable");
// 表格数据
const postList = ref([]);
const dateRange = ref([]);
// 模态框开关标识
const open = ref(false);
// 表格加载状态开关标识

Write Preview
Loading…
Cancel
Save