Commit 250c26db authored by caicaicai's avatar caicaicai

修改

parent 3326b3b7
......@@ -845,6 +845,37 @@ var HttpReq = function(){
data:data,
})
},
//配矿管理——配矿管理
RegionalOreBlendingQuery: function(param){
return request({
url: '/api/Ore',
method: 'get',
params:param,
})
},
RegionalOreBlendingAdd: function(data){
return request({
url: '/api/Ore',
method: 'POST',
data:data,
}).then((res) => {
return res
})
},
RegionalOreBlendingUpdate: function(data){
return request({
url: '/api/Ore',
method: 'PUT',
data:data,
})
},
RegionalOreBlendingDel: function(data){
return request({
url: '/api/Ore',
method: 'Delete',
data:data,
})
},
......
......@@ -9,7 +9,7 @@
<el-input v-model="query.odd" clearable size="small" placeholder="请输入调度单号" style="width:180px;"/>
<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.carname" placeholder="请选择车辆类型" style="width:180px;">
<el-option label="挖机" value="挖机"></el-option>
<el-option label="铲车" value="铲车"></el-option>
<el-option label="卡车" value="卡车"></el-option>
......@@ -31,10 +31,10 @@
<div class="content">
<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
<el-table-column prop="odd" label="调度单号" align="center"></el-table-column>
<el-table-column prop="carclass" label="车辆类型" align="center"></el-table-column>
<el-table-column prop="createTime" label="调度时间" align="center"></el-table-column>
<el-table-column prop="endTime" label="调度截止日期" align="center"></el-table-column>
<el-table-column prop="finishTime" label="完成调度时间" align="center"></el-table-column>
<el-table-column prop="carname" label="车辆类型" align="center"></el-table-column>
<el-table-column prop="endTime" label="调度时间" align="center"></el-table-column>
<el-table-column prop="name" label="调度人" align="center"></el-table-column>
<el-table-column prop="startad" label="调度起点" align="center"></el-table-column>
<el-table-column prop="destination" label="调度目的地" align="center"></el-table-column>
<el-table-column prop="carshow" label="说明" align="center"></el-table-column>
<el-table-column label="操作" align="center" fixed="right">
......@@ -59,9 +59,6 @@
<div v-for="(obj,index) in carInformationData" :key="index">{{obj.name}}</div>
</div>
</el-form-item>
<el-form-item label="调度时长">
<div>{{dispatchDuration}}</div>
</el-form-item>
</el-form>
</el-dialog>
......@@ -98,29 +95,31 @@
<el-input v-model="formAdd.odd" clearable size="small" placeholder="请输入调度单号" style="width:220px;"/>
</el-form-item>
<el-form-item label="车辆类型" style="display: inline-block;">
<el-select v-model="formAdd.carclass" placeholder="请选择卡车类型" style="width:220px;">
<el-select v-model="formAdd.carname" placeholder="请选择卡车类型" style="width:220px;">
<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="调度目的地" style="display: inline-block;">
<el-select v-model="formAdd.destination" placeholder="请选择调度目的地" style="width:220px;">
<br>
<el-form-item label="起点" style="display: inline-block;">
<el-select v-model="formAdd.destination" placeholder="请选择起点" style="width:220px;">
<el-option v-for="(obj,index) in areaInformationDataAdd" :label="obj.name" :value="obj.name" :key="index"></el-option>
</el-select>
</el-form-item>
<br>
<el-form-item label="调度时长" style="display: inline-block;">
<el-select v-model="formAdd.duration" placeholder="请选择调度时长" style="width:220px;">
<el-option label="单次" value="单次"></el-option>
<el-option label="一天" value="一天"></el-option>
<el-option label="长期" value="长期"></el-option>
</el-select>
<el-form-item label="目的地" style="display: inline-block;">
<el-select v-model="formAdd.startad" placeholder="请选择目的地" style="width:220px;">
<el-option v-for="(obj,index) in areaInformationDataAdd" :label="obj.name" :value="obj.name" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="调度截止日期" style="display: inline-block;">
<br>
<el-form-item label="调度时间" style="display: inline-block;">
<el-date-picker v-model="formAdd.endTime" type="datetime" placeholder="选择日期时间" style="width:220px;"></el-date-picker>
</el-form-item>
<el-form-item label="调度人" style="display: inline-block;">
<el-input v-model="formAdd.name" clearable size="small" placeholder="请输入调度人" style="width:220px;"/>
</el-form-item>
<br>
<el-form-item label="说明" style="display: inline-block;">
<el-input type="textarea" v-model="formAdd.carshow" style="width:545px;"></el-input>
......@@ -149,7 +148,6 @@ export default {
tableData: [],
selectList:[],
carInformationData:[],
dispatchDuration:'',
form: {
title:'',
visible:false,
......@@ -228,7 +226,6 @@ export default {
//查看调度车辆
showCars(item){
let code = item.odd;
this.dispatchDuration = item.duration;
this.form.visible = true;
//获取车辆信息
HttpReq.truckDispatching.personRecordingCarsQuery({size:9999,odd:code}).then((res) => {
......
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