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

Merge remote-tracking branch 'origin/master'

Browse Source
master
杨万里 2 years ago
parent 336446076a 04b5e0705f
commit d7ae593a2e
6 changed files with 200 additions and 103 deletions
Show Stats Download Patch File Download Diff File

33
ruoyi-ui/src/components/RightToolbar/index.vue
Unescape Escape View File

@ -1,28 +1,42 @@
<template>
<div class="top-right-btn" :style="style">
<el-row>
<el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top" v-if="search">
<el-button circle icon="Search" @click="toggleSearch()" />
<el-tooltip
class="item"
effect="dark"
:content="showSearch ? t('common.hide') + space + t('option.search') : t('common.show') + space + t('option.search')"
placement="top" v-if="search">
<el-button circle icon="Search" @click="toggleSearch()"/>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="刷新" placement="top">
<el-button circle icon="Refresh" @click="refresh()" />
<el-tooltip class="item" effect="dark" :content=" t('option.refresh') " placement="top">
<el-button circle icon="Refresh" @click="refresh()"/>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="columns">
<el-button circle icon="Menu" @click="showColumn()" />
<el-button circle icon="Menu" @click="showColumn()"/>
</el-tooltip>
</el-row>
<el-dialog :title="title" v-model="open" append-to-body>
<el-transfer
:titles="['显示', '隐藏']"
v-model="value"
:data="columns"
@change="dataChange"
:titles="[ t('common.show'),t('common.hide')]"
v-model="value"
:data="columns"
@change="dataChange"
></el-transfer>
</el-dialog>
</div>
</template>
<script setup>
import {useI18n} from 'vue-i18n';
import Cookies from "js-cookie";
const {t} = useI18n();
const isEN = (Cookies.get('language') || 'zh-cn') === 'en'
const space = isEN ? ' ' : ''
const props = defineProps({
showSearch: {
type: Boolean,
@ -95,6 +109,7 @@ for (let item in props.columns) {
display: block;
margin-left: 0px;
}
:deep(.el-transfer__button:first-child) {
margin-bottom: 10px;
}

37
ruoyi-ui/src/lang/en.js
Unescape Escape View File

@ -17,5 +17,42 @@ export default {
tagsView: 'Open Tags-View',
fixedHeader: 'Fixed Header',
sidebarLogo: 'Sidebar Logo'
},
option: {
refresh:'refresh',
option: 'option',
edit: 'Edit',
remove: 'Remove',
add: 'Add',
export: 'Export',
search: 'Search',
reset: 'reset'
},
common: {
show: 'show',
hide: 'hide',
pleaseEnter: 'please enter ',
PleaseSelect: 'Please select ',
state: 'State',
isRemove: 'Is it deleted',
creatorId: 'Creator ID',
creatorName: 'Creator name',
editTime: 'Edit time',
editID: 'Editor\'s ID',
editAccount: 'Editor\'s account',
editName: 'Editor\'s name'
},
tireManagement: {
tireFactoryCode: 'Tire Factory Code',
enterpriseCode: 'Enterprise Code',
plateNumber: 'Plate Number',
tireNo: 'Tire No',
wheelPosition: 'Wheel Position',
tireSensorID: 'Tire Sensor ID',
treadDepth: 'Tread Depth',
carId:'Car ID',
tireModel:'Tire Model',
tireModelId:'Tire ModelId',
brandId:'Brand ID'
}
}

2
ruoyi-ui/src/lang/index.js
Unescape Escape View File

@ -16,7 +16,7 @@ const messages = {
const i18n = createI18n({
legacy: false,
globalInjection: true,
locale: Cookies.get('language') || 'zh',
locale: Cookies.get('language') || 'zh-cn',
messages
});

37
ruoyi-ui/src/lang/zhCn.js
Unescape Escape View File

@ -17,5 +17,42 @@ export default {
tagsView: '开启 Tags-View',
fixedHeader: '固定 Header',
sidebarLogo: '侧边栏 Logo'
},
option: {
refresh:'刷新',
option: '操作',
edit: '修改',
remove: '删除',
add: '新增',
export: '导出',
search: '搜索',
reset: '重置'
},
common: {
show:'显示',
hide:'隐藏',
pleaseEnter: '请输入',
PleaseSelect: '请选择',
state: '状态',
isRemove: '是否删除',
creatorId: '创建者Id',
creatorName: '创建者姓名',
editTime: '修改时间',
editID: '修改者ID',
editAccount: '修改者账号',
editName: '编辑者姓名'
},
tireManagement: {
tireFactoryCode: '轮胎厂编码',
enterpriseCode: '企业编码',
plateNumber: '车牌号',
tireNo: '轮胎编号',
wheelPosition: '轮位',
tireSensorID: '轮胎传感器ID',
treadDepth: '花纹深度',
carId:'车辆ID',
tireModel:'轮胎型号',
tireModelId:'轮胎型号表ID',
brandId:'品牌ID'
}
}

3
ruoyi-ui/src/layout/components/Navbar.vue
Unescape Escape View File

@ -7,7 +7,6 @@
<div class="right-menu">
<template v-if="appStore.device !== 'mobile'">
{{ t('login.title') }}
<el-tooltip content="中英文切换" effect="dark" placement="bottom">
<el-icon style="width: 18px;height: 100%;cursor:pointer;" @click="lang">
<SwitchFilled style="width: 18px;height: 18px"/>
@ -78,7 +77,7 @@ const appStore = useAppStore()
const userStore = useUserStore()
const settingsStore = useSettingsStore()
const lang = () => {
let type = Cookies.get('language')
let type = Cookies.get('language') || 'zh-cn'
Cookies.set('language', type === 'zh-cn' ? 'en' : 'zh-cn')
location.reload()
}

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

@ -1,38 +1,39 @@
<template>
<div class="app-container">
<!-- 搜索栏-->
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="轮胎厂编码" prop="tyreFacCode">
<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="请输入轮胎厂编码"
:placeholder=" t('common.pleaseEnter') + t('tireManagement.tireFactoryCode')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="企业编码" prop="companyCode">
<el-form-item :label="t('tireManagement.enterpriseCode')" prop="companyCode">
<el-input
v-model="queryParams.companyCode"
placeholder="请输入企业编码"
:placeholder="t('common.pleaseEnter') + t('tireManagement.enterpriseCode')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="车牌号" prop="carLicense">
<el-form-item :label="t('tireManagement.plateNumber')" prop="carLicense">
<el-input
v-model="queryParams.carLicense"
placeholder="请输入车牌号"
:placeholder="t('common.pleaseEnter') + t('tireManagement.plateNumber')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="轮胎编号" prop="tureCode">
<el-form-item :label="t('tireManagement.tireNo')" prop="tureCode">
<el-input
v-model="queryParams.tureCode"
placeholder="请输入轮胎编号"
:placeholder="t('common.pleaseEnter') + t('tireManagement.tireNo')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
@ -41,97 +42,97 @@
<el-form-item label="RFID" prop="tyreRfid">
<el-input
v-model="queryParams.tyreRfid"
placeholder="请输入RFID"
:placeholder="t('common.pleaseEnter') +'RFID'"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="轮位" prop="tyrePosition">
<el-form-item :label="t('tireManagement.wheelPosition')" prop="tyrePosition">
<el-input
v-model="queryParams.tyrePosition"
placeholder="请输入轮位"
:placeholder="t('common.pleaseEnter') + t('tireManagement.wheelPosition')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="当前轮胎传感器ID" prop="sensorId">
<el-form-item :label="t('tireManagement.tireSensorID')" prop="sensorId">
<el-input
v-model="queryParams.sensorId"
placeholder="请输入当前轮胎传感器ID"
:placeholder="t('common.pleaseEnter') + t('tireManagement.tireSensorID')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="当前花纹深度" prop="currentTextureDepth">
<el-form-item :label="t('tireManagement.treadDepth')" prop="currentTextureDepth">
<el-input
v-model="queryParams.currentTextureDepth"
placeholder="请输入当前花纹深度"
:placeholder="t('common.pleaseEnter') + t('tireManagement.treadDepth')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="state">
<el-form-item :label="t('common.state')" prop="state">
<el-input
v-model="queryParams.state"
placeholder="请输入状态"
:placeholder="t('common.pleaseEnter') + t('common.state')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否删除" prop="isDelete">
<el-form-item :label="t('common.isRemove')" prop="isDelete">
<el-input
v-model="queryParams.isDelete"
placeholder="请输入是否删除"
:placeholder="t('common.pleaseEnter') + t('common.isRemove')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建者姓名" prop="createName">
<el-form-item :label="t('common.creatorName')" prop="createName">
<el-input
v-model="queryParams.createName"
placeholder="请输入创建者姓名"
:placeholder="t('common.pleaseEnter') + t('common.creatorName')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="修改时间" prop="modifyTime">
<el-form-item :label="t('common.editTime')" prop="modifyTime">
<el-date-picker
clearable
style="width: 200px"
v-model="queryParams.modifyTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择修改时间">
</el-date-picker>
:placeholder="t('common.PleaseSelect') + t('common.editTime')"
/>
</el-form-item>
<el-form-item label="修改者账号" prop="modifyBy">
<el-form-item :label="t('common.editAccount')" prop="modifyBy">
<el-input
v-model="queryParams.modifyBy"
placeholder="请输入修改者账号"
:placeholder="t('common.pleaseEnter') + t('common.editAccount')"
style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="编辑者姓名" prop="modifyName">
<el-form-item :label="t('common.editName')" prop="modifyName">
<el-input
v-model="queryParams.modifyName"
placeholder="请输入编辑者姓名"
: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">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="Search" @click="handleQuery">{{ t('option.search') }}</el-button>
<el-button icon="Refresh" @click="resetQuery">{{ t('option.reset') }}</el-button>
</el-form-item>
</el-form>
@ -144,7 +145,7 @@
icon="Plus"
@click="handleAdd"
v-hasPermi="['basetyre:basetyre:add']"
>新增
>{{ t('option.add') }}
</el-button>
</el-col>
<el-col :span="1.5">
@ -155,7 +156,7 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['basetyre:basetyre:edit']"
>修改
>{{ t('option.edit') }}
</el-button>
</el-col>
<el-col :span="1.5">
@ -166,7 +167,7 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['basetyre:basetyre:remove']"
>删除
>{{ t('option.remove') }}
</el-button>
</el-col>
<el-col :span="1.5">
@ -176,7 +177,7 @@
icon="Download"
@click="handleExport"
v-hasPermi="['basetyre:basetyre:export']"
>导出
>{{ t('option.export') }}
</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@ -185,47 +186,46 @@
<!-- 表格主体-->
<el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" fixed/>
<el-table-column label="轮胎厂编码" align="center" prop="tyreFacCode" width="150"/>
<el-table-column label="企业编码" align="center" prop="companyCode" width="150"/>
<el-table-column label="车辆ID" align="center" prop="carId" width="150"/>
<el-table-column label="车牌号" align="center" prop="carLicense" width="150"/>
<el-table-column label="轮胎编号" align="center" prop="tureCode" width="150"/>
<el-table-column label="轮胎型号" align="center" prop="tureModel" width="150"/>
<el-table-column label="轮胎型号表ID" align="center" prop="tureModelId" width="150"/>
<el-table-column label="品牌ID" align="center" prop="tureBrandId" 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.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.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="轮位" align="center" prop="tyrePosition" width="150"/>
<el-table-column label="当前轮胎传感器ID" align="center" prop="sensorId" width="150"/>
<el-table-column label="当前花纹深度" align="center" prop="currentTextureDepth" width="150"/>
<el-table-column label="状态" align="center" prop="state" width="150"/>
<el-table-column label="是否删除" align="center" prop="isDelete" width="150"/>
<el-table-column label="创建者ID" align="center" prop="createId" width="150"/>
<el-table-column label="创建者姓名" align="center" prop="createName" width="150"/>
<el-table-column label="修改时间" align="center" prop="modifyTime" 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="修改者ID" align="center" prop="modifyId" width="150"/>
<el-table-column label="修改者账号" align="center" prop="modifyBy" width="150"/>
<el-table-column label="编辑者姓名" align="center" prop="modifyName" width="150"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150">
<template slot-scope="scope">
<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">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['basetyre:basetyre:edit']"
>修改
>{{ t('option.edit') }}
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['basetyre:basetyre:remove']"
>删除
>{{ t('option.remove') }}
</el-button>
</template>
</el-table-column>
@ -242,55 +242,59 @@
<!-- 添加或修改岗位对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="postRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="轮胎厂编码" prop="tyreFacCode">
<el-input v-model="form.tyreFacCode" placeholder="请输入轮胎厂编码"/>
<el-form ref="postRef" :model="form" :rules="rules" :label-width=" locale ? '100px':'140px'">
<el-form-item :label="t('tireManagement.tireFactoryCode')" prop="tyreFacCode">
<el-input v-model="form.tyreFacCode"
:placeholder=" t('common.pleaseEnter') + t('tireManagement.tireFactoryCode')"/>
</el-form-item>
<el-form-item label="企业编码" prop="companyCode">
<el-input v-model="form.companyCode" placeholder="请输入企业编码"/>
<el-form-item :label="t('tireManagement.enterpriseCode')" prop="companyCode">
<el-input v-model="form.companyCode"
:placeholder="t('common.pleaseEnter') + t('tireManagement.enterpriseCode')"/>
</el-form-item>
<el-form-item label="车牌号" prop="carLicense">
<el-input v-model="form.carLicense" placeholder="请输入车牌号"/>
<el-form-item :label="t('tireManagement.plateNumber')" prop="carLicense">
<el-input v-model="form.carLicense" :placeholder="t('common.pleaseEnter') + t('tireManagement.plateNumber')"/>
</el-form-item>
<el-form-item label="轮胎编号" prop="tureCode">
<el-input v-model="form.tureCode" placeholder="请输入轮胎编号"/>
<el-form-item :label="t('tireManagement.tireNo')" prop="tureCode">
<el-input v-model="form.tureCode" :placeholder="t('common.pleaseEnter') + t('tireManagement.tireNo')"/>
</el-form-item>
<el-form-item label="RFID" prop="tyreRfid">
<el-input v-model="form.tyreRfid" placeholder="请输入RFID"/>
<el-input v-model="form.tyreRfid" :placeholder="t('common.pleaseEnter') +'RFID'"/>
</el-form-item>
<el-form-item label="轮位" prop="tyrePosition">
<el-input v-model="form.tyrePosition" placeholder="请输入轮位"/>
<el-form-item :label="t('tireManagement.wheelPosition')" prop="tyrePosition">
<el-input v-model="form.tyrePosition"
:placeholder="t('common.pleaseEnter') + t('tireManagement.wheelPosition')"/>
</el-form-item>
<el-form-item label="当前轮胎传感器ID" prop="sensorId">
<el-input v-model="form.sensorId" placeholder="请输入当前轮胎传感器ID"/>
<el-form-item :label="t('tireManagement.tireSensorID')" prop="sensorId">
<el-input v-model="form.sensorId" :placeholder="t('common.pleaseEnter') + t('tireManagement.tireSensorID')"/>
</el-form-item>
<el-form-item label="当前花纹深度" prop="currentTextureDepth">
<el-input v-model="form.currentTextureDepth" placeholder="请输入当前花纹深度"/>
<el-form-item :label="t('tireManagement.treadDepth')" prop="currentTextureDepth">
<el-input v-model="form.currentTextureDepth"
:placeholder="t('common.pleaseEnter') + t('tireManagement.treadDepth')"/>
</el-form-item>
<el-form-item label="状态" prop="state">
<el-input v-model="form.state" placeholder="请输入状态"/>
<el-form-item :label="t('common.state')" prop="state">
<el-input v-model="form.state" :placeholder="t('common.pleaseEnter') + t('common.state')"/>
</el-form-item>
<el-form-item label="是否删除" prop="isDelete">
<el-input v-model="form.isDelete" placeholder="请输入是否删除"/>
<el-form-item :label="t('common.isRemove')" prop="isDelete">
<el-input v-model="form.isDelete" :placeholder="t('common.pleaseEnter') + t('common.isRemove')"/>
</el-form-item>
<el-form-item label="创建者姓名" prop="createName">
<el-input v-model="form.createName" placeholder="请输入创建者姓名"/>
<el-form-item :label="t('common.creatorName')" prop="createName">
<el-input v-model="form.createName" :placeholder="t('common.pleaseEnter') + t('common.creatorName')"/>
</el-form-item>
<el-form-item label="修改时间" prop="modifyTime">
<el-form-item :label="t('common.editTime')" prop="modifyTime">
<el-date-picker
clearable
v-model="form.modifyTime"
type="date"
format="YYYY/MM/DD"
value-format="YYYY-MM-DD"
placeholder="请选择修改时间">
:placeholder="t('common.PleaseSelect') + t('common.editTime')">
</el-date-picker>
</el-form-item>
<el-form-item label="修改者账号" prop="modifyBy">
<el-input v-model="form.modifyBy" placeholder="请输入修改者账号"/>
<el-form-item :label="t('common.editAccount')" prop="modifyBy">
<el-input v-model="form.modifyBy" :placeholder="t('common.pleaseEnter') + t('common.editAccount')"/>
</el-form-item>
<el-form-item label="编辑者姓名" prop="modifyName">
<el-input v-model="form.modifyName" placeholder="请输入编辑者姓名"/>
<el-form-item :label="t('common.editName')" prop="modifyName">
<el-input v-model="form.modifyName" :placeholder="t('common.pleaseEnter') + t('common.editName')"/>
</el-form-item>
</el-form>
<template #footer>
@ -306,7 +310,12 @@
<script setup name="basetyre">
import {addBasetyre, delBasetyre, getBasetyre, listBasetyre, updateBasetyre} from "@/api/basetyre/basetyre";
import {useI18n} from 'vue-i18n';
import Cookies from "js-cookie";
const {t} = useI18n();
const locale = (Cookies.get('language') || 'zh-cn') === 'zh-cn'
const {proxy} = getCurrentInstance();
const {sys_normal_disable} = proxy.useDict("sys_normal_disable");
@ -361,7 +370,7 @@ const rules = {
brand: [{required: true, message: "轮胎品牌不能为空", trigger: "blur"}],
type: [{required: true, message: "轮胎型号不能为空", trigger: "blur"}],
serialNumber: [{required: true, message: "轮胎编号不能为空", trigger: "blur"}],
depth: [{required: true, message: "当前花纹深度不能为空", trigger: "blur"}],
depth: [{required: true, message: "花纹深度不能为空", trigger: "blur"}],
}
const form = ref({});

Write Preview
Loading…
Cancel
Save