Skip to content

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

修改

parent 76946ce8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 432 additions and 38 deletions
src/assets/js/common.js
View file @ b0b7c5c3
......@@ -192,6 +192,37 @@ var HttpReq = function(){
data:data,
})
},
//司机管理——人员管理
driverManagementPCQuery: function(param){
return request({
url: '/api/Drivers',
method: 'get',
params:param,
})
},
driverManagementPCAdd: function(data){
return request({
url: '/api/Drivers',
method: 'POST',
data:data,
}).then((res) => {
return res
})
},
driverManagementPCUpdate: function(data){
return request({
url: '/api/Drivers',
method: 'PUT',
data:data,
})
},
driverManagementPCDel: function(data){
return request({
url: '/api/Drivers',
method: 'Delete',
data:data,
})
},
//车辆管理——车辆类型
carTypeQuery: function(param){
return request({
......@@ -288,14 +319,14 @@ var HttpReq = function(){
//车辆管理——车辆信息
carInformationQuery: function(param){
return request({
url: '/api/Car',
url: '/api/CarPeop',
method: 'get',
params:param,
})
},
carInformationAdd: function(data){
return request({
url: '/api/Car',
url: '/api/CarPeop',
method: 'POST',
data:data,
}).then((res) => {
......@@ -304,14 +335,14 @@ var HttpReq = function(){
},
carInformationUpdate: function(data){
return request({
url: '/api/Car',
url: '/api/CarPeop',
method: 'PUT',
data:data,
})
},
carInformationDel: function(data){
return request({
url: '/api/Car',
url: '/api/CarPeop',
method: 'Delete',
data:data,
})
......@@ -1716,7 +1747,7 @@ var HttpReq = function(){
//大屏——数据总览——司机信息
screenDriverInformationQuery: function(param){
return request({
url: '/api/Driver',
url: '/api/Drivers',
method: 'get',
params:param,
})
......
src/layout/components/MainNavbar.vue
View file @ b0b7c5c3
......@@ -88,7 +88,7 @@ export default {
position:relative;height:6.018vh;width:100%;min-height:60px;
figure{position:absolute;top:0;left:1.562vw;right:9.01vw;height:100%;margin:0;padding:0;
background:no-repeat top center url('~@/assets/images/layout/top.png');background-size:100% 100%;
background:no-repeat top center url('~@/assets/images/cutGraph/top_title.png');background-size:120% 100%;
}
.navbar{
......
src/layout/components/Sidebar/index.vue
View file @ b0b7c5c3
<template>
<div :class="{'has-logo':showLogo}">
<logo v-if="showLogo" :collapse="isCollapse" />
<!-- <logo v-if="showLogo" :collapse="isCollapse" /> -->
<el-scrollbar wrap-class="scrollbar-wrapper">
<el-menu
:default-active="activeMenu"
......
src/views/DeviceManage/deviceMan/index.vue
View file @ b0b7c5c3
......@@ -36,8 +36,7 @@
<el-table-column prop="name" label="设备名称" align="center"></el-table-column>
<el-table-column prop="code" label="设备编码" align="center"></el-table-column>
<el-table-column prop="status" label="设备状态" align="center"></el-table-column>
<el-table-column prop="carclass" label="终端车辆类型" align="center"></el-table-column>
<el-table-column prop="carname" label="安装车辆" align="center"></el-table-column>
<el-table-column prop="number" label="设备账号" align="center"></el-table-column>
<el-table-column prop="remarks" label="备注" align="center"></el-table-column>
<el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope">
......@@ -69,16 +68,11 @@
<el-option label="故障" value="故障"></el-option>
</el-select>
</el-form-item>
<el-form-item label="终端车辆类型" prop="carclass">
<el-select v-model="form.item.carclass" placeholder="请选择终端车辆类型" style="width:280px;">
<el-option label="卡车" value="卡车"></el-option>
<el-option label="电铲" value="电铲"></el-option>
</el-select>
<el-form-item label="设备账号" prop="number">
<el-input v-model="form.item.number" style="width:280px;" placeholder="请输入设备账号"/>
</el-form-item>
<el-form-item label="安装车辆" prop="carname">
<el-select v-model="form.item.carname" placeholder="请选择安装车辆" style="width:280px;">
<el-option :label="item.name + '/' + item.number" :value="item.name + '/' + item.number" v-for="(item,index) in selectList" :key="index"></el-option>
</el-select>
<el-form-item label="设备密码" prop="password">
<el-input v-model="form.item.password" style="width:280px;" show-password placeholder="请输入设备密码"/>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input type="textarea" v-model="form.item.remarks" style="width:280px;"></el-input>
......@@ -116,9 +110,9 @@ export default {
item:{},
},
rules: {
number: [
{required: true, message: '请输入车牌号', trigger: 'blur' }
],
// number: [
// {required: true, message: '请输入车牌号', trigger: 'blur' }
// ],
},
}
},
......
src/views/MLargeScreen/components/carManagement/index.vue
View file @ b0b7c5c3
......@@ -112,7 +112,10 @@
<div>
<div class="carManScrView_rightView_title">卡车动态</div>
<div class="carManScrView_rightView_content">
<div class="carDynamicTitleStyle">
<img src="../../../../assets/images/cutGraph/huoche11.png" height="28">
<div>KK35125</div>
</div>
</div>
</div>
<!-- 电铲动态-->
......@@ -580,4 +583,22 @@ export default {
width: 100%;
height: 28vh;
}
.carDynamicTitleStyle{
display: flex;
width: 100%;
height: 3.5vh;
align-items: center;
}
.carDynamicTitleStyle>div{
margin-left: 10px;
height: 3.5vh;
width: 5vw;
background:no-repeat center center url('~@/assets/images/cutGraph/xingzhuang9kaobei2.png');
background-size:100% 100%;
line-height: 3.5vh;
text-align: center;
color: #06EFFE;
font-weight: 600;
font-size: 17px;
}
</style>
\ No newline at end of file
src/views/carManagement/carInformation/index.vue
View file @ b0b7c5c3
......@@ -66,13 +66,13 @@
<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:280px;" placeholder="请输入车辆名称"/>
<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:280px;" placeholder="请输入车牌号"/>
<el-input v-model="form.item.number" style="width:160px;" placeholder="请输入车牌号"/>
</el-form-item>
<el-form-item label="卡车类型" prop="carclass">
<el-select v-model="form.item.carclass" placeholder="请选择卡车类型" style="width:280px;">
<el-select v-model="form.item.carclass" placeholder="请选择卡车类型" style="width:160px;">
<el-option label="挖机" value="挖机"></el-option>
<el-option label="铲车" value="铲车"></el-option>
<el-option label="卡车" value="卡车"></el-option>
......@@ -80,38 +80,40 @@
</el-select>
</el-form-item>
<el-form-item label="车队名称" prop="road">
<el-select v-model="form.item.road" placeholder="请选择所属车队名称" style="width:280px;">
<el-select v-model="form.item.road" placeholder="请选择所属车队名称" style="width:160px;">
<el-option v-for="(obj,index) in selectList" :label="obj.name" :value="obj.name" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="车辆型号" prop="model">
<el-input v-model="form.item.model" style="width:280px;" placeholder="请输入车辆型号"/>
<el-input v-model="form.item.model" style="width:160px;" placeholder="请输入车辆型号"/>
</el-form-item>
<el-form-item label="运重(kg)" prop="weight">
<el-input v-model="form.item.weight" style="width:280px;" placeholder="请输入运重(kg)"/>
<el-input v-model="form.item.weight" style="width:160px;" placeholder="请输入运重(kg)"/>
</el-form-item>
<el-form-item label="车辆状态" prop="status">
<el-select v-model="form.item.status" placeholder="请选择车辆状态" style="width:280px;">
<el-select v-model="form.item.status" placeholder="请选择车辆状态" style="width:160px;">
<el-option label="正常" value="0"></el-option>
<el-option label="故障" value="1"></el-option>
<el-option label="停用" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="超速预警(km/h)" prop="alarm">
<el-input v-model="form.item.alarm" style="width:280px;" placeholder="请输入超速预警(km/h)"/>
<el-input v-model="form.item.alarm" style="width:160px;" placeholder="请输入超速预警(km/h)"/>
</el-form-item>
<el-form-item label="保养周期(月)" prop="month">
<el-input v-model="form.item.month" style="width:280px;" placeholder="请输入保养周期(月)"/>
<el-input v-model="form.item.month" style="width:160px;" placeholder="请输入保养周期(月)"/>
</el-form-item>
<el-form-item label="车辆年限" prop="year">
<el-input v-model="form.item.year" style="width:280px;" placeholder="请输入车辆年限"/>
<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:280px;" placeholder="请输入最新一次保养时间"/>
<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-form-item>
<el-form-item label="终端设备编号" prop="plant">
<el-input v-model="form.item.plant" style="width:280px;" placeholder="请输入终端设备编号"/>
<el-select v-model="form.item.plant" placeholder="请选择终端设备" style="width:160px;">
<el-option v-for="(obj,index) in terminalList" :label="obj.code" :value="obj.code" :key="index"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -138,6 +140,7 @@ export default {
query:{},
tableData: [],
selectList:[],
terminalList:[],
form: {
title:'新增车辆',
visible:false,
......@@ -146,9 +149,9 @@ export default {
item:{},
},
rules: {
number: [
{required: true, message: '请输入车牌号', trigger: 'blur' }
],
// number: [
// {required: true, message: '请输入车牌号', trigger: 'blur' }
// ],
},
}
},
......@@ -176,11 +179,17 @@ export default {
}
})
//获取车队
HttpReq.truckDispatching.carFleetQuery().then((res) => {
HttpReq.truckDispatching.carFleetQuery({size:9999}).then((res) => {
if(res.code == 200){
this.selectList = res.data.content;
}
})
//获取终端信息
HttpReq.truckDispatching.deviceManagementQuery({size:9999}).then((res) => {
if(res.code == 200){
this.terminalList = res.data.content;
}
})
})
},
......
src/views/driverManagement/index.vue 0 → 100644
View file @ b0b7c5c3
This diff is collapsed.
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