Skip to content

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

修改

parent 33f630ef
Expand all Show whitespace changes
Inline Side-by-side
Showing with 499 additions and 45 deletions
src/views/DeviceManage/deviceMan/index.vue
View file @ 4d95d96f
...@@ -5,18 +5,15 @@ ...@@ -5,18 +5,15 @@
<!--工具栏--> <!--工具栏-->
<div class="head-container"> <div class="head-container">
<!-- 搜索 --> <!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">终端车辆类型</label> <!-- <label class="el-form-item-label" style="font-weight: 500;">终端车辆类型</label>
<el-select v-model="query.carclass" placeholder="请选择终端车辆类型" style="width:180px;"> <el-select v-model="query.carclass" placeholder="请选择终端车辆类型" style="width:180px;">
<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-select> -->
<label class="el-form-item-label" style="font-weight: 500;">设备编码</label> <label class="el-form-item-label" style="font-weight: 500;">设备编码</label>
<el-input v-model="query.code" clearable size="small" placeholder="请输入设备编码" style="width:180px;"/> <el-input v-model="query.code" clearable size="small" placeholder="请输入设备编码" style="width:180px;"/>
<label class="el-form-item-label" style="font-weight: 500;">安装车辆</label>
<el-input v-model="query.carname" clearable size="small" placeholder="请输入安装车辆" style="width:180px;"/>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button> <el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button> <el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
</div> </div>
......
src/views/carManagement/carFault/index.vue
View file @ 4d95d96f
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
</div> </div>
<div class="content"> <div class="content">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="id" label="序号" align="center"></el-table-column>
<el-table-column prop="name" label="编码" align="center"></el-table-column> <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="number" label="车辆名称" align="center"></el-table-column>
<el-table-column prop="driver" label="司机" align="center"></el-table-column> <el-table-column prop="driver" label="司机" align="center"></el-table-column>
......
src/views/carManagement/carFleet/index.vue
View file @ 4d95d96f
...@@ -12,9 +12,7 @@ ...@@ -12,9 +12,7 @@
</div> </div>
<div class="content"> <div class="content">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="id" label="序号" align="center"></el-table-column>
<el-table-column prop="name" label="车队名称" align="center"></el-table-column> <el-table-column prop="name" label="车队名称" align="center"></el-table-column>
<el-table-column prop="carclass" label="车辆类型" align="center"></el-table-column>
<el-table-column prop="area" label="所属矿区" align="center"></el-table-column> <el-table-column prop="area" label="所属矿区" align="center"></el-table-column>
<el-table-column prop="createTime" label="日期" align="center"></el-table-column> <el-table-column prop="createTime" label="日期" align="center"></el-table-column>
<el-table-column label="操作" align="center" fixed="right"> <el-table-column label="操作" align="center" fixed="right">
...@@ -38,18 +36,9 @@ ...@@ -38,18 +36,9 @@
<el-form-item label="车队名称" prop="name"> <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:280px;" placeholder="请输入车队名称"/>
</el-form-item> </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-option label="卡车" value="卡车"></el-option>
<el-option label="清扫车" value="清扫车"></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属矿区" prop="area"> <el-form-item label="所属矿区" prop="area">
<el-select v-model="form.item.area" placeholder="请选择所属矿区" style="width:280px;"> <el-select v-model="form.item.area" placeholder="请选择所属矿区" style="width:280px;">
<el-option label="矿区1" value="矿区1"></el-option> <el-option v-for="(obj,index) in belongAreaData" :label="obj.name" :value="obj.name" :key="index"></el-option>
<el-option label="矿区2" value="矿区2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -76,6 +65,7 @@ export default { ...@@ -76,6 +65,7 @@ export default {
total: 0, total: 0,
query:{}, query:{},
tableData: [], tableData: [],
belongAreaData:[],
form: { form: {
title:'新增车队', title:'新增车队',
visible:false, visible:false,
...@@ -112,6 +102,12 @@ export default { ...@@ -112,6 +102,12 @@ export default {
this.total = res.data.totalElements; this.total = res.data.totalElements;
} }
}) })
//获取区域
HttpReq.truckDispatching.RegionalInformationQuery(param).then((res) => {
if(res.code == 200){
this.belongAreaData = res.data.content;
}
})
}) })
}, },
......
src/views/carManagement/carInformation/index.vue
View file @ 4d95d96f
...@@ -73,10 +73,7 @@ ...@@ -73,10 +73,7 @@
</el-form-item> </el-form-item>
<el-form-item label="卡车类型" prop="carclass"> <el-form-item label="卡车类型" prop="carclass">
<el-select v-model="form.item.carclass" placeholder="请选择卡车类型" style="width:160px;"> <el-select v-model="form.item.carclass" placeholder="请选择卡车类型" style="width:160px;">
<el-option label="挖机" value="挖机"></el-option> <el-option v-for="(obj,index) in carTypeData" :label="obj.name" :value="obj.name" :key="index"></el-option>
<el-option label="铲车" value="铲车"></el-option>
<el-option label="卡车" value="卡车"></el-option>
<el-option label="清扫车" value="清扫车"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="车队名称" prop="road"> <el-form-item label="车队名称" prop="road">
...@@ -130,7 +127,6 @@ import { Tools, HttpReq, Dates} from '@/assets/js/common.js'; ...@@ -130,7 +127,6 @@ import { Tools, HttpReq, Dates} from '@/assets/js/common.js';
export default { export default {
name: 'CarInformation', name: 'CarInformation',
components: {},
data() { data() {
return { return {
loading: false, loading: false,
...@@ -141,6 +137,7 @@ export default { ...@@ -141,6 +137,7 @@ export default {
tableData: [], tableData: [],
selectList:[], selectList:[],
terminalList:[], terminalList:[],
carTypeData:[],
form: { form: {
title:'新增车辆', title:'新增车辆',
visible:false, visible:false,
...@@ -190,6 +187,12 @@ export default { ...@@ -190,6 +187,12 @@ export default {
this.terminalList = res.data.content; this.terminalList = res.data.content;
} }
}) })
//获取车辆类型
HttpReq.truckDispatching.carTypeQuery({size:9999}).then((res) => {
if(res.code == 200){
this.carTypeData = res.data.content;
}
})
}) })
}, },
......
src/views/carManagement/carModel/index.vue
View file @ 4d95d96f
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
</div> </div>
<div class="content"> <div class="content">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="id" label="序号" align="center"></el-table-column>
<el-table-column prop="model" label="车辆型号" align="center"></el-table-column> <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="carclass" label="所属车辆类型" align="center"></el-table-column>
<el-table-column prop="weight" label="运重（kg）" align="center"></el-table-column> <el-table-column prop="weight" label="运重（kg）" align="center"></el-table-column>
...@@ -41,10 +40,7 @@ ...@@ -41,10 +40,7 @@
</el-form-item> </el-form-item>
<el-form-item label="所属车辆类型"> <el-form-item label="所属车辆类型">
<el-select v-model="form.item.carclass" placeholder="请选择所属车辆类型" style="width:280px;"> <el-select v-model="form.item.carclass" placeholder="请选择所属车辆类型" style="width:280px;">
<el-option label="挖机" value="挖机"></el-option> <el-option v-for="(obj,index) in carTypeData" :label="obj.name" :value="obj.name" :key="index"></el-option>
<el-option label="铲车" value="铲车"></el-option>
<el-option label="卡车" value="卡车"></el-option>
<el-option label="清扫车" value="清扫车"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="运重（kg）" prop="weight"> <el-form-item label="运重（kg）" prop="weight">
...@@ -77,6 +73,7 @@ export default { ...@@ -77,6 +73,7 @@ export default {
total: 0, total: 0,
query:{}, query:{},
tableData: [], tableData: [],
carTypeData:[],
form: { form: {
title:'新增车辆型号', title:'新增车辆型号',
visible:false, visible:false,
...@@ -113,6 +110,12 @@ export default { ...@@ -113,6 +110,12 @@ export default {
this.total = res.data.totalElements; this.total = res.data.totalElements;
} }
}) })
//获取车辆类型
HttpReq.truckDispatching.carTypeQuery({size:9999}).then((res) => {
if(res.code == 200){
this.carTypeData = res.data.content;
}
})
}) })
}, },
......
src/views/carManagement/carRepair/index.vue
View file @ 4d95d96f
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
</div> </div>
<div class="content"> <div class="content">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="id" label="序号" align="center"></el-table-column>
<el-table-column prop="number" label="编码" align="center"></el-table-column> <el-table-column prop="number" label="编码" align="center"></el-table-column>
<el-table-column prop="name" label="车辆名称" align="center"></el-table-column> <el-table-column prop="name" label="车辆名称" align="center"></el-table-column>
<el-table-column prop="driver" label="司机" align="center"></el-table-column> <el-table-column prop="driver" label="司机" align="center"></el-table-column>
......
src/views/carManagement/carType/index.vue
View file @ 4d95d96f
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
</div> </div>
<div class="content"> <div class="content">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="id" label="序号" align="center"></el-table-column>
<el-table-column prop="code" label="编码" align="center"></el-table-column> <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="name" label="车辆类型名称" align="center"></el-table-column>
<el-table-column prop="card" label="车辆标识图" align="center"> <el-table-column prop="card" label="车辆标识图" align="center">
...@@ -43,13 +42,16 @@ ...@@ -43,13 +42,16 @@
<el-input v-model="form.item.code" style="width:280px;" placeholder="请输入编码"/> <el-input v-model="form.item.code" style="width:280px;" placeholder="请输入编码"/>
</el-form-item> </el-form-item>
<el-form-item label="车辆类型名称"> <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-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-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-select>
</el-form-item> </el-form-item> -->
<el-form-item label="车辆标识图" prop="position"> <el-form-item label="车辆标识图" prop="position">
<el-input v-model="picFileName" style="width:160px;" placeholder="请上传设备位置" disabled /> <el-input v-model="picFileName" style="width:160px;" placeholder="请上传设备位置" disabled />
<input type="file" name="image" @change="excelImport($event)" /> <input type="file" name="image" @change="excelImport($event)" />
......
src/views/performanceStatistics/caiquOutput/day/index.vue
View file @ 4d95d96f
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="head-container"> <div class="head-container">
<!-- 搜索 --> <!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">选择日期</label> <label class="el-form-item-label" style="font-weight: 500;">选择日期</label>
<el-date-picker v-model="query.addTime" type="date" placeholder="选择日期"></el-date-picker> <el-date-picker v-model="query.createTime" type="date" placeholder="选择日期"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button> <el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button> <el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
...@@ -69,10 +69,10 @@ export default { ...@@ -69,10 +69,10 @@ export default {
param.page = this.page - 1; param.page = this.page - 1;
param.size = this.size; param.size = this.size;
param.sort = sort; param.sort = sort;
if(this.query.addTime){ if(this.query.createTime){
param.addTime = this.changeTimeFn(this.query.addTime); param.createTime = this.changeTimeFn(this.query.createTime);
}else{ }else{
param.addTime = this.currentTime; param.createTime = this.currentTime;
} }
this.$nextTick(()=>{ this.$nextTick(()=>{
......
src/views/regionalManagement/regionalType/index.vue
View file @ 4d95d96f
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
</div> </div>
<div class="content"> <div class="content">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName"> <el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="id" label="序号" align="center"></el-table-column>
<el-table-column prop="code" label="区域编码" align="center"></el-table-column> <el-table-column prop="code" label="区域编码" align="center"></el-table-column>
<el-table-column prop="classname" label="类别名称" align="center"></el-table-column> <el-table-column prop="classname" label="类别名称" align="center"></el-table-column>
<el-table-column prop="color" label="区域遮罩层颜色" align="center"></el-table-column> <el-table-column prop="color" label="区域遮罩层颜色" align="center"></el-table-column>
...@@ -59,7 +58,6 @@ import { Tools, HttpReq, Dates} from '@/assets/js/common.js'; ...@@ -59,7 +58,6 @@ import { Tools, HttpReq, Dates} from '@/assets/js/common.js';
export default { export default {
name: 'RegionalType', name: 'RegionalType',
components: {},
data() { data() {
return { return {
loading: false, loading: false,
......
vue.config.js
View file @ 4d95d96f
...@@ -22,7 +22,8 @@ module.exports = { ...@@ -22,7 +22,8 @@ module.exports = {
lintOnSave: process.env.NODE_ENV === 'development', lintOnSave: process.env.NODE_ENV === 'development',
productionSourceMap: false, productionSourceMap: false,
devServer: { devServer: {
host: 'localhost', // 也可以直接写IP地址这样方便真机测试 //host: 'localhost', // 也可以直接写IP地址这样方便真机测试
host: '192.168.0.101', // 也可以直接写IP地址这样方便真机测试
port: port, port: port,
open: true, open: true,
overlay: { overlay: {
......
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