Skip to content

卡
卡车调度系统
Commit 96e95ba2 authored by caicaicai's avatar caicaicai
Browse files
Options

修改

parent 961a8a7f
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 56 deletions
src/assets/js/common.js
View file @ 96e95ba2
......@@ -1953,6 +1953,22 @@ var HttpReq = function(){
method: 'get',
params:param,
})
},
//获取人员管理中的部门
getAllDepartmentQuery:function(param){
return request({
url: '/api/dept',
method: 'get',
params:param,
})
},
//获取人员管理中的岗位
getAllPostQuery:function(param){
return request({
url: '/api/job',
method: 'get',
params:param,
})
}
......
src/views/carManagement/carFleet/index.vue
View file @ 96e95ba2
......@@ -95,6 +95,7 @@ export default {
param.sort = sort;
this.$nextTick(()=>{
//获取车队信息
HttpReq.truckDispatching.carFleetQuery(param).then((res) => {
if(res.code == 200){
this.loading = false;
......
src/views/carManagement/carInformation/index.vue
View file @ 96e95ba2
<template>
<div class="common-page device-manage">
<div class="option page-row">
<!--工具栏-->
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">车辆名称</label>
<el-input v-model="query.name" clearable size="small" placeholder="请输入车辆名称" style="width:180px;"/>
<label class="el-form-item-label" style="font-weight: 500;">车牌号</label>
<el-input v-model="query.number" clearable size="small" placeholder="请输入车牌号" style="width:180px;"/>
<label class="el-form-item-label" style="font-weight: 500;">所属车队</label>
<el-select v-model="query.road" placeholder="请选择所属车队" style="width:180px;">
......@@ -23,6 +24,7 @@
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
</div>
</div>
<!-- 表格 -->
<div class="panel-bottom page-row">
<h3>车辆信息</h3>
......@@ -34,7 +36,6 @@
</div>
<div class="content">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="name" label="车辆名称" align="center"></el-table-column>
<el-table-column prop="number" label="车牌号" align="center"></el-table-column>
<el-table-column prop="carclass" label="卡车类型" align="center"></el-table-column>
<el-table-column prop="road" label="车队名称" align="center"></el-table-column>
......@@ -44,8 +45,7 @@
<el-table-column prop="alarm" label="超速预警(km/h)" align="center"></el-table-column>
<el-table-column prop="month" label="保养周期(月)" align="center"></el-table-column>
<el-table-column prop="year" label="车辆年限" align="center"></el-table-column>
<el-table-column prop="time" label="最新一次保养时间" align="center"></el-table-column>
<!-- <el-table-column prop="time" label="最新一次保养时间" align="center" :formatter="timeChange"></el-table-column> -->
<el-table-column prop="time" label="最新一次保养时间" align="center" :formatter="timeChange"></el-table-column>
<el-table-column prop="equipmentName" label="终端设备名称" align="center"></el-table-column>
<el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope">
......@@ -65,9 +65,6 @@
<!-- 表单渲染 -->
<el-dialog append-to-body :close-on-click-modal="true" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" width="700px">
<el-form :model="form.item" :rules="rules" ref="form1" :inline="true" size="small" label-width="150px">
<el-form-item label="车辆名称" prop="name">
<el-input v-model="form.item.name" style="width:160px;" placeholder="请输入车辆名称"/>
</el-form-item>
<el-form-item label="车牌号" prop="number">
<el-input v-model="form.item.number" style="width:160px;" placeholder="请输入车牌号"/>
</el-form-item>
......@@ -82,7 +79,9 @@
</el-select>
</el-form-item>
<el-form-item label="车辆型号" prop="model">
<el-input v-model="form.item.model" style="width:160px;" placeholder="请输入车辆型号"/>
<el-select v-model="form.item.model" placeholder="请选择车辆型号" style="width:160px;">
<el-option v-for="(obj,index) in carModelData" :label="obj.model" :value="obj.model" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="运重(kg)" prop="weight">
<el-input v-model="form.item.weight" style="width:160px;" placeholder="请输入运重(kg)"/>
......@@ -104,8 +103,7 @@
<el-input v-model="form.item.year" style="width:160px;" placeholder="请输入车辆年限"/>
</el-form-item>
<el-form-item label="最新一次保养时间" prop="time">
<el-input v-model="form.item.time" style="width:160px;" placeholder="请输入最新一次保养时间"/>
<!-- <el-date-picker v-model="form.item.time" type="date" placeholder="选择日期"></el-date-picker> -->
<el-date-picker v-model="form.item.time" type="date" placeholder="选择日期" style="width:160px;"></el-date-picker>
</el-form-item>
<el-form-item label="终端设备名称" prop="equipmentName">
<el-select v-model="form.item.equipmentName" placeholder="请选择终端设备" style="width:160px;">
......@@ -138,17 +136,22 @@ export default {
selectList:[],
terminalList:[],
carTypeData:[],
carModelData:[],
form: {
title:'新增车辆',
visible:false,
reqType:'add',
status:{cu:0},
item:{},
item:{
weight:'',
alarm:'',
model:'',
},
},
rules: {
// number: [
// {required: true, message: '请输入车牌号', trigger: 'blur' }
// ],
number: [
{required: true, message: '请输入车牌号', trigger: 'blur' }
],
},
}
},
......@@ -193,6 +196,12 @@ export default {
this.carTypeData = res.data.content;
}
})
//获取车辆型号
HttpReq.truckDispatching.carModelQuery({size:9999}).then((res) => {
if(res.code == 200){
this.carModelData = res.data.content;
}
})
})
},
......@@ -224,7 +233,11 @@ export default {
this.form.status.cu = 0;
this.form.visible = true;
this.form.reqType = 'add';
this.form.item = {};
this.form.item = {
weight:'',
alarm:'',
model:'',
};
},
toEdit(item) {
// 请除表单验证
......@@ -341,7 +354,7 @@ export default {
},
//保养时间转换
timeChange(row){
return this.currentTime(row.time);
return row.time == '' ? '' : this.currentTime(row.time);
},
currentTime(time){
var date = new Date(time);
......@@ -359,8 +372,18 @@ export default {
//获取当前系统时间 格式(yyyy-mm-dd hh:mm:ss)
let currentFormatDate = year + "-" + month + "-" + day;
return currentFormatDate;
},
},
watch:{
'form.item.model':function(){
HttpReq.truckDispatching.carModelQuery({model:this.form.item.model}).then((res) => {
if(res.code == 200){
this.form.item.weight = res.data.content[0].weight;
this.form.item.alarm = res.data.content[0].alarm;
}
}
})
},
},
}
</script>
......
src/views/carManagement/carModel/index.vue
View file @ 96e95ba2
......@@ -15,7 +15,7 @@
<el-table-column prop="model" label="车辆型号" align="center"></el-table-column>
<el-table-column prop="carclass" label="所属车辆类型" align="center"></el-table-column>
<el-table-column prop="weight" label="运重（kg）" align="center"></el-table-column>
<el-table-column prop="alarm" label="超速预警" align="center"></el-table-column>
<el-table-column prop="alarm" label="超速预警（km/h）" align="center"></el-table-column>
<el-table-column prop="createTime" label="日期" align="center"></el-table-column>
<el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope">
......@@ -82,9 +82,9 @@ export default {
item:{},
},
rules: {
// time: [
// {required: true, message: '请输入车辆型号', trigger: 'blur' }
// ],
model: [
{required: true, message: '请输入车辆型号', trigger: 'blur' }
],
},
}
},
......
src/views/carManagement/carType/index.vue
View file @ 96e95ba2
......@@ -12,7 +12,6 @@
</div>
<div class="content">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="code" label="编码" align="center"></el-table-column>
<el-table-column prop="name" label="车辆类型名称" align="center"></el-table-column>
<el-table-column prop="card" label="车辆标识图" align="center">
<template slot-scope="scope">
......@@ -38,20 +37,9 @@
<!-- 表单渲染 -->
<el-dialog append-to-body :close-on-click-modal="true" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" width="700px">
<el-form :model="form.item" :rules="rules" ref="form1" :inline="true" size="small" label-width="150px">
<el-form-item label="编码">
<el-input v-model="form.item.code" style="width:280px;" placeholder="请输入编码"/>
</el-form-item>
<el-form-item label="车辆类型名称">
<el-input v-model="form.item.name" style="width:280px;" placeholder="请输入车辆类型"/>
</el-form-item>
<!-- <el-form-item label="车辆类型名称">
<el-select v-model="form.item.name" placeholder="请选择车辆类型" style="width:280px;">
<el-option label="挖机" value="挖机"></el-option>
<el-option label="铲车" value="铲车"></el-option>
<el-option label="卡车" value="卡车"></el-option>
<el-option label="清扫车" value="清扫车"></el-option>
</el-select>
</el-form-item> -->
<el-form-item label="车辆标识图" prop="position">
<el-input v-model="picFileName" style="width:160px;" placeholder="请上传设备位置" disabled />
<input type="file" name="image" @change="excelImport($event)" />
......@@ -68,7 +56,6 @@
<script>
import { Tools, HttpReq, Dates} from '@/assets/js/common.js';
import Axios from 'axios'
export default {
name: 'CarType',
......@@ -270,23 +257,6 @@ export default {
});
that.picFileName = res.avatar;
})
// Axios({
// url: process.env.VUE_APP_LOCAL_API2 + '/api/users/updateAvatar',
// method: "post",
// data: formData1,
// }).then(
// response => {
// if (response.status == 200) {
// this.$message.success("上传成功");
// that.picFileName = response.data.avatar;
// } else {
// this.$message.error("上传失败");
// }
// },
// )
// .catch(error => {
// console.log(error);
// });
},
}
}
......
src/views/driverManagement/index.vue
View file @ 96e95ba2
......@@ -72,10 +72,14 @@
<el-input v-model="form.item.age" style="width:280px;" placeholder="请输入驾龄"/>
</el-form-item>
<el-form-item label="部门" prop="depart">
<el-input v-model="form.item.depart" style="width:280px;" placeholder="请输入部门"/>
<el-select v-model="form.item.depart" placeholder="请选择部门" style="width:280px;">
<el-option v-for="(obj,index) in allDepartmentData" :label="obj.name" :value="obj.name" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="岗位" prop="post">
<el-input v-model="form.item.post" style="width:280px;" placeholder="请输入岗位"/>
<el-select v-model="form.item.post" placeholder="请选择岗位" style="width:280px;">
<el-option v-for="(obj,index) in allPostData" :label="obj.name" :value="obj.name" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="公司名称" prop="company">
<el-input v-model="form.item.company" style="width:280px;" placeholder="请输入公司名称"/>
......@@ -114,6 +118,8 @@ export default {
tableData: [],
selectList:[],
allSystemUserNameData:[],
allDepartmentData:[],
allPostData:[],
form: {
title:'新增司机人员',
visible:false,
......@@ -159,9 +165,18 @@ export default {
})
//获取用于选择的用户名
HttpReq.truckDispatching.getAllSystemUserNameQuery({size:9999}).then((res) => {
console.log(res);
this.allSystemUserNameData = res.content;
})
//获取用于选择的用户名
HttpReq.truckDispatching.getAllDepartmentQuery({size:9999}).then((res) => {
console.log(res);
this.allDepartmentData = res.content;
})
//获取用于选择的用户名
HttpReq.truckDispatching.getAllPostQuery({size:9999}).then((res) => {
console.log(res);
this.allPostData = res.content;
})
})
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment