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

修改轮胎生命周期

Browse Source
master
夜笙歌 2 years ago
parent 033f48da71
commit 7562fb8fee
6 changed files with 51 additions and 506 deletions
Show Stats Download Patch File Download Diff File

40
ruoyi-ui/src/api/realTimeMonitoring/alarmSendingSettings.js
Unescape Escape View File

@ -2,44 +2,10 @@
import request from '@/utils/request'
// 查询轮胎基础信息列表
export function listTest(query) {
export function listBaseCar(query) {
return request({
url: '/test/test/list',
url: '/basecar/car/list',
method: 'get',
params: query
})
}
// 查询轮胎基础信息详细
export function getTest(id) {
return request({
url: '/test/test/' + id,
method: 'get'
})
}
// 新增轮胎基础信息
export function addTest(data) {
return request({
url: '/test/test',
method: 'post',
data: data
})
}
// 修改轮胎基础信息
export function updateTest(data) {
return request({
url: '/test/test',
method: 'put',
data: data
})
}
// 删除轮胎基础信息
export function delTest(id) {
return request({
url: '/test/test/' + id,
method: 'delete'
})
}
}

38
ruoyi-ui/src/api/realTimeMonitoring/alarmStatistics.js
Unescape Escape View File

@ -2,44 +2,10 @@
import request from '@/utils/request'
// 查询轮胎基础信息列表
export function listTest(query) {
export function alarmList(query) {
return request({
url: '/test/test/list',
url: '/basetyre/CollectMachineGps/alarmrecord',
method: 'get',
params: query
})
}
// 查询轮胎基础信息详细
export function getTest(id) {
return request({
url: '/test/test/' + id,
method: 'get'
})
}
// 新增轮胎基础信息
export function addTest(data) {
return request({
url: '/test/test',
method: 'post',
data: data
})
}
// 修改轮胎基础信息
export function updateTest(data) {
return request({
url: '/test/test',
method: 'put',
data: data
})
}
// 删除轮胎基础信息
export function delTest(id) {
return request({
url: '/test/test/' + id,
method: 'delete'
})
}

25
ruoyi-ui/src/views/realTimeMonitoring/alarmSendingSettings/index.vue
Unescape Escape View File

@ -36,7 +36,7 @@
:remote-method="remoteMethod"
v-model="form.internationalization8"
class="m-2"
placeholder="Select" >
placeholder="请选择车辆" >
<el-option
v-for="item in options"
:key="item.value"
@ -47,7 +47,7 @@
</el-select>
</el-form-item>
<el-form-item label=" ">
<el-button icon="Search" type="primary" @click="handleQuery">{{ t('option.search') }}</el-button>
<el-button icon="Search" type="primary" @click="handleQuery">立即创建</el-button>
<el-button icon="Refresh" @click="resetQuery">{{ t('option.reset') }}</el-button>
</el-form-item>
</el-form>
@ -56,10 +56,11 @@
<script name="Test" setup>
import {addTest, delTest, getTest, listTest, updateTest} from "@/api/realTimeMonitoring/alarmSendingSettings";
import {listBaseCar} from "@/api/realTimeMonitoring/alarmSendingSettings";
import {useI18n} from 'vue-i18n';
import Cookies from "js-cookie";
import {parseTime} from "@/utils/ruoyi";
const {t} = useI18n();
@ -67,10 +68,10 @@ const locale = (Cookies.get('language') || 'zhCn') === 'zhCn'
const {proxy} = getCurrentInstance();
const remoteMethod = (e) => {
console.log(e)
console.log( form.value.internationalization8)
}
const options = [
const options = ref([
{
value: 'Option1',
label: 'Option1',
@ -91,15 +92,23 @@ const options = [
value: 'Option5',
label: 'Option5',
},
]
])
const form = ref({
internationalization1:10,
internationalization2:10,
internationalization3:10,
internationalization4:10,
internationalization5:10,
internationalization6:'2023-3-3',
internationalization6: parseTime(new Date(), '{y}-{m}-{d}'),
internationalization7:true,
internationalization8:'Option4',
internationalization8:'',
})
listBaseCar().then(e=>{
options.value = e.rows.map(val => {
return {
label: val.carLicense,
value: val.id,
}
})
})
</script>

445
ruoyi-ui/src/views/realTimeMonitoring/alarmStatistics/index.vue
Unescape Escape View File

@ -3,9 +3,9 @@
<!-- 搜索栏-->
<el-form v-show="showSearch" ref="queryRef" :inline="true" :label-width=" locale ? '90px':'140px'"
:model="queryParams">
<el-form-item label="车牌号" prop="internationalization1">
<el-form-item label="车牌号" prop="carLicense">
<el-input
v-model="queryParams.internationalization1"
v-model="queryParams.carLicense"
:placeholder=" t('common.pleaseEnter') + '车牌号'"
clearable
style="width: 200px"
@ -14,12 +14,13 @@
</el-form-item>
<el-form-item label="时间" prop="internationalization2">
<el-date-picker
v-model="queryParams.internationalization2"
type="datetimerange"
range-separator="到"
start-placeholder="开始时间"
end-placeholder="结束时间"
/>
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=" ">
<el-button icon="Search" type="primary" @click="handleQuery">{{ t('option.search') }}</el-button>
@ -29,38 +30,6 @@
<!-- 顶部操作按钮-->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
v-hasPermi="['test:test:add']"
icon="Plus"
plain
type="primary"
@click="handleAdd"
>{{ t('option.add') }}
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['test:test:edit']"
:disabled="single"
icon="Edit"
plain
type="success"
@click="handleUpdate"
>{{ t('option.edit') }}
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['test:test:remove']"
:disabled="multiple"
icon="Delete"
plain
type="danger"
@click="handleDelete"
>{{ t('option.remove') }}
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-hasPermi="['test:test:export']"
@ -77,39 +46,22 @@
<!-- 表格主体-->
<el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
<el-table-column align="center" fixed type="selection" width="55"/>
<el-table-column label="轮胎号" align="center" prop="internationalization1"
<el-table-column align="center" label="轮胎号" prop="outerTireNumber"
width="150"/>
<el-table-column label="品牌" align="center" prop="internationalization2"
/>
<el-table-column label="型号" align="center" prop="internationalization3"
/>
<el-table-column label="高压报警" align="center" prop="internationalization4"
/>
<el-table-column label="低压报警" align="center" prop="internationalization5"
/>
<el-table-column label="高温报警" align="center" prop="internationalization6"
/>
<el-table-column label="低气压报警" align="center" prop="internationalization7"
/>
<el-table-column label="时间段总里程" align="center" prop="internationalization8"
/>
<el-table-column :label="t('option.option')" align="center" class-name="small-padding fixed-width" fixed="right"
width="160">
<el-table-column align="center" label="品牌" prop="brand"
/>
<el-table-column align="center" label="型号" prop="size"
/>
<el-table-column align="center" label="压力" prop="pressvalue"
/>
<el-table-column align="center" label="温度" prop="temperaturevalue"
/>
<el-table-column align="center" label="报警信息" prop="internationalization7" width="200"
>
<template #default="scope">
<el-button
v-hasPermi="['test:test:edit']"
icon="Edit"
type="text"
@click="handleUpdate(scope.row)"
>{{ t('option.edit') }}
</el-button>
<el-button
v-hasPermi="['test:test:remove']"
icon="Delete"
type="text"
@click="handleDelete(scope.row)"
>{{ t('option.remove') }}
</el-button>
<el-tag style="margin-right: 4px" class="ml-2" type="danger" v-if="scope.row.ispresshigh === '1'"> 高压 </el-tag>
<el-tag style="margin-right: 4px" class="ml-2" type="danger" v-if="scope.row.ispresslower === '1'"> 低压 </el-tag>
<el-tag class="ml-2" type="danger" v-if="scope.row.istemperaturehigh === '1'"> 高温 </el-tag>
</template>
</el-table-column>
</el-table>
@ -123,180 +75,11 @@
@pagination="getList"
/>
<!-- 添加或修改岗位对话框 -->
<el-dialog v-model="open" :title="title" append-to-body width="500px">
<el-form ref="postRef" :label-width=" locale ? '90px':'140px'" :model="form" :rules="rules">
<el-form-item v-if="false" prop="id">
<el-input v-model="form.id"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization1')" prop="internationalization1">
<el-input
v-model="form.internationalization1"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization1')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization2')" prop="internationalization2">
<el-input
v-model="form.internationalization2"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization2')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization3')" prop="internationalization3">
<el-input
v-model="form.internationalization3"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization3')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization4')" prop="internationalization4">
<el-input
v-model="form.internationalization4"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization4')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization5')" prop="internationalization5">
<el-input
v-model="form.internationalization5"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization5')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization6')" prop="internationalization6">
<el-input
v-model="form.internationalization6"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization6')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization7')" prop="internationalization7">
<el-input
v-model="form.internationalization7"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization7')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization8')" prop="internationalization8">
<el-input
v-model="form.internationalization8"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization8')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization9')" prop="internationalization9">
<el-input
v-model="form.internationalization9"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization9')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization10')" prop="internationalization10">
<el-input
v-model="form.internationalization10"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization10')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization11')" prop="internationalization11">
<el-input
v-model="form.internationalization11"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization11')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization12')" prop="internationalization12">
<el-input
v-model="form.internationalization12"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization12')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization13')" prop="internationalization13">
<el-input
v-model="form.internationalization13"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization13')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization14')" prop="internationalization14">
<el-input
v-model="form.internationalization14"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization14')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization15')" prop="internationalization15">
<el-input
v-model="form.internationalization15"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization15')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization16')" prop="internationalization16">
<el-input
v-model="form.internationalization16"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization16')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization17')" prop="internationalization17">
<el-input
v-model="form.internationalization17"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization17')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization18')" prop="internationalization18">
<el-input
v-model="form.internationalization18"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization18')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization19')" prop="internationalization19">
<el-input
v-model="form.internationalization19"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization19')"/>
</el-form-item>
<el-form-item :label="t('test.test.internationalization20')" prop="internationalization20">
<el-input
v-model="form.internationalization20"
:placeholder="t('common.pleaseEnter') + t('test.test.internationalization20')"/>
</el-form-item>
<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="t('common.createTime')" prop="createTime">
<el-date-picker
v-model="form.createTime"
:placeholder="t('common.PleaseSelect') + t('common.createTime')"
clearable
format="YYYY/MM/DD"
type="date"
value-format="YYYY-MM-DD"
/>
</el-form-item>
<el-form-item :label="t('common.creatorId')" prop="createId">
<el-input
v-model="form.createId"
:placeholder="t('common.pleaseEnter') + t('common.creatorId')"/>
</el-form-item>
<el-form-item :label="t('common.createBy')" prop="createBy">
<el-input
v-model="form.createBy"
:placeholder="t('common.pleaseEnter') + t('common.createBy')"/>
</el-form-item>
<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="t('common.editTime')" prop="modifyTime">
<el-date-picker
v-model="form.modifyTime"
:placeholder="t('common.PleaseSelect') + t('common.editTime')"
clearable
format="YYYY/MM/DD"
type="date"
value-format="YYYY-MM-DD"
/>
</el-form-item>
<el-form-item :label="t('common.editID')" prop="modifyId">
<el-input
v-model="form.modifyId"
:placeholder="t('common.pleaseEnter') + t('common.editID')"/>
</el-form-item>
<el-form-item :label="t('common.editBy')" prop="modifyBy">
<el-input
v-model="form.modifyBy"
:placeholder="t('common.pleaseEnter') + t('common.editBy')"/>
</el-form-item>
<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>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm">{{ t('option.ok') }}</el-button>
<el-button @click="cancel">{{ t('option.cancel') }}</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script name="Test" setup>
import {addTest, delTest, getTest, listTest, updateTest} from "@/api/realTimeMonitoring/alarmStatistics";
import {alarmList} from "@/api/realTimeMonitoring/alarmStatistics";
import {useI18n} from 'vue-i18n';
import Cookies from "js-cookie";
@ -309,6 +92,7 @@ const {proxy} = getCurrentInstance();
// 表格数据
const postList = ref([]);
const dateRange = ref([]);
// 模态框开关标识
const open = ref(false);
// 表格加载状态开关标识
@ -330,83 +114,12 @@ const title = ref("");
const queryParams = ref({
pageNum: 1,
pageSize: 10,
internationalization1: undefined,
internationalization2: undefined,
internationalization3: undefined,
internationalization4: undefined,
internationalization5: undefined,
internationalization6: undefined,
internationalization7: undefined,
internationalization8: undefined,
internationalization9: undefined,
internationalization10: undefined,
internationalization11: undefined,
internationalization12: undefined,
internationalization13: undefined,
internationalization14: undefined,
internationalization15: undefined,
internationalization16: undefined,
internationalization17: undefined,
internationalization18: undefined,
internationalization19: undefined,
internationalization20: undefined,
isDelete: undefined,
createTime: undefined,
createId: undefined,
createBy: undefined,
createName: undefined,
modifyTime: undefined,
modifyId: undefined,
modifyBy: undefined,
modifyName: undefined,
carLicense: undefined,
})
// 表单验证规则
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"}],
}
// 表单数据
const form = ref({
id: null,
internationalization1: null,
internationalization2: null,
internationalization3: null,
internationalization4: null,
internationalization5: null,
internationalization6: null,
internationalization7: null,
internationalization8: null,
internationalization9: null,
internationalization10: null,
internationalization11: null,
internationalization12: null,
internationalization13: null,
internationalization14: null,
internationalization15: null,
internationalization16: null,
internationalization17: null,
internationalization18: null,
internationalization19: null,
internationalization20: null,
isDelete: null,
createTime: null,
createId: null,
createBy: null,
createName: null,
modifyTime: null,
modifyId: null,
modifyBy: null,
modifyName: null,
});
/** 查询岗位列表 */
function getList() {
loading.value = true;
listTest(queryParams.value).then(response => {
alarmList(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
postList.value = response.rows;
total.value = response.total;
}).finally(() => {
@ -414,48 +127,6 @@ function getList() {
});
}
/** 取消按钮 */
function cancel() {
open.value = false;
reset();
}
/** 表单重置 */
function reset() {
form.value = {
id: null,
internationalization1: null,
internationalization2: null,
internationalization3: null,
internationalization4: null,
internationalization5: null,
internationalization6: null,
internationalization7: null,
internationalization8: null,
internationalization9: null,
internationalization10: null,
internationalization11: null,
internationalization12: null,
internationalization13: null,
internationalization14: null,
internationalization15: null,
internationalization16: null,
internationalization17: null,
internationalization18: null,
internationalization19: null,
internationalization20: null,
isDelete: null,
createTime: null,
createId: null,
createBy: null,
createName: null,
modifyTime: null,
modifyId: null,
modifyBy: null,
modifyName: null,
};
proxy.resetForm("postRef");
}
/** 搜索按钮操作 */
function handleQuery() {
@ -468,68 +139,6 @@ const resetQuery = () => {
proxy.resetForm("queryRef");
handleQuery();
}
/** 多选框选中数据 */
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id);
single.value = selection.length !== 1;
multiple.value = !selection.length;
}
/** 新增按钮操作 */
function handleAdd() {
reset();
open.value = true;
title.value = t('test.test.addTitle');
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset();
const postId = row.id || ids.value;
getTest(postId).then(response => {
form.value = response.data;
open.value = true;
title.value = t('test.test.editTitle');
});
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["postRef"].validate(valid => {
if (valid) {
if (form.value.id != undefined) {
updateTest(form.value).then(response => {
proxy.$modal.msgSuccess(t('option.modificationSuccessful'));
open.value = false;
getList();
});
} else {
addTest(form.value).then(response => {
proxy.$modal.msgSuccess(t('option.addedSuccessfully'));
open.value = false;
getList();
});
}
}
});
}
/** 删除按钮操作 */
function handleDelete(row) {
const postIds = row.postId || ids.value;
proxy.$modal.confirm(t('option.confirmDeletion', {
key: t('test.test.internationalization1'),
value: postIds
})).then(function () {
return delTest(postIds);
}).then(() => {
getList();
proxy.$modal.msgSuccess(t('option.successfullyDeleted'));
}).catch(() => {
});
}
/** 导出按钮操作 */
function handleExport() {
proxy.download("system/post/export", {

5
ruoyi-ui/src/views/tireManagement/lifecycle/index.vue
Unescape Escape View File

@ -123,11 +123,6 @@ const getList = () => {
})
wayList.value = arr
repetitiveBackground.value = Math.round(arr.at(-1).step / 10) + 1
arr.push({
// datetime: 1678199843735,
description: '终点',
step: (Math.round(arr.at(-1).step / 10) + 1) * 10 - 1
})
}
const outerTireNumberSearchClick = async () => {
if(!tireInfo.value.title) return

4
ruoyi-ui/vite.config.js
Unescape Escape View File

@ -31,8 +31,8 @@ export default defineConfig(({mode, command}) => {
proxy: {
// https://cn.vitejs.dev/config/#server-proxy
'/dev-api': {
// target: 'http://10.11.41.249:8080',
target: 'http://localhost:8080',
target: 'http://10.11.41.249:8080',
// target: 'http://localhost:8080',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '')
}

Write Preview
Loading…
Cancel
Save