Skip to content

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

修改

parent 0635bb91
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 298 additions and 282 deletions
src/assets/js/common.js
View file @ 398f62e3
...@@ -409,6 +409,37 @@ var HttpReq = function(){ ...@@ -409,6 +409,37 @@ var HttpReq = function(){
data:data, data:data,
}) })
}, },
//区域管理——区域信息设置——选择车辆设置
RegionalInformationCarQuery: function(param){
return request({
url: '/api/AreaCar',
method: 'get',
params:param,
})
},
RegionalInformationCarAdd: function(data){
return request({
url: '/api/AreaCar',
method: 'POST',
data:data,
}).then((res) => {
return res
})
},
RegionalInformationCarUpdate: function(data){
return request({
url: '/api/AreaCar',
method: 'PUT',
data:data,
})
},
RegionalInformationCarDel: function(data){
return request({
url: '/api/AreaCar',
method: 'Delete',
data:data,
})
},
//视频监控——矿山监控管理——分区管理 //视频监控——矿山监控管理——分区管理
mineMonitoringPartitionQuery: function(param){ mineMonitoringPartitionQuery: function(param){
return request({ return request({
...@@ -535,6 +566,68 @@ var HttpReq = function(){ ...@@ -535,6 +566,68 @@ var HttpReq = function(){
data:data, data:data,
}) })
}, },
//生产计划管理——总生产计划设置
productionPlanAllQuery: function(param){
return request({
url: '/api/Plan',
method: 'get',
params:param,
})
},
productionPlanAllAdd: function(data){
return request({
url: '/api/Plan',
method: 'POST',
data:data,
}).then((res) => {
return res
})
},
productionPlanAllUpdate: function(data){
return request({
url: '/api/Plan',
method: 'PUT',
data:data,
})
},
productionPlanAllDel: function(data){
return request({
url: '/api/Plan',
method: 'Delete',
data:data,
})
},
//生产计划管理——各采区计划设置
productionPlanNewAllQuery: function(param){
return request({
url: '/api/PlanNews',
method: 'get',
params:param,
})
},
productionPlanNewAllAdd: function(data){
return request({
url: '/api/PlanNew',
method: 'POST',
data:data,
}).then((res) => {
return res
})
},
productionPlanNewAllUpdate: function(data){
return request({
url: '/api/PlanNew',
method: 'PUT',
data:data,
})
},
productionPlanNewAllDel: function(data){
return request({
url: '/api/PlanNew',
method: 'Delete',
data:data,
})
},
......
src/views/regionalManagement/regionalInformation/index.vue
View file @ 398f62e3
...@@ -93,14 +93,14 @@ ...@@ -93,14 +93,14 @@
<!-- 如果所属类型是电子围栏，要添加一下属性 --> <!-- 如果所属类型是电子围栏，要添加一下属性 -->
<el-form-item label="启用时间段" prop="period" v-show="form.item.areaclass == '电子围栏'"> <el-form-item label="启用时间段" v-show="form.item.areaclass == '电子围栏'">
<el-time-picker <el-time-picker
is-range v-model="form.item.startTime"
v-model="timePeriod" placeholder="开始时间">
range-separator="至" </el-time-picker>
start-placeholder="开始时间" <el-time-picker
end-placeholder="结束时间" v-model="form.item.endTime"
placeholder="选择时间范围"> placeholder="结束时间">
</el-time-picker> </el-time-picker>
</el-form-item> </el-form-item>
<el-form-item label="限制类型" prop="limitclass" v-show="form.item.areaclass == '电子围栏'"> <el-form-item label="限制类型" prop="limitclass" v-show="form.item.areaclass == '电子围栏'">
...@@ -193,7 +193,7 @@ export default { ...@@ -193,7 +193,7 @@ export default {
carInformationData:[], carInformationData:[],
checkAll: false, checkAll: false,
checkDataList:[], checkDataList:[],
timePeriod:[], oldCheckDataList:[],
form: { form: {
title:'新增区域信息', title:'新增区域信息',
visible:false, visible:false,
...@@ -291,11 +291,18 @@ export default { ...@@ -291,11 +291,18 @@ export default {
this.form.item = {...item}; this.form.item = {...item};
this.form.reqType = 'edit'; this.form.reqType = 'edit';
this.picFileName = this.form.item.card; this.picFileName = this.form.item.card;
this.checkDataList = this.form.item.cars; let oldCheckDataListCenterId = [];
let timePeriodCenter = []; let oldCheckDataListCenterCarIn = [];
timePeriodCenter.push(this.form.item.startTime); HttpReq.truckDispatching.RegionalInformationCarQuery({areaId:item.code}).then((res) => {
timePeriodCenter.push(this.form.item.endTime); if(res.code == 200){
this.timePeriod = timePeriodCenter; res.data.content.forEach((item)=>{
oldCheckDataListCenterId.push(item.id);
oldCheckDataListCenterCarIn.push(item.car);
})
}
})
this.checkDataList = oldCheckDataListCenterCarIn;
this.oldCheckDataList = oldCheckDataListCenterId;
}, },
toDelete(item) { toDelete(item) {
var id = item.id; var id = item.id;
...@@ -336,60 +343,86 @@ export default { ...@@ -336,60 +343,86 @@ export default {
reqAddItem(form, item){ reqAddItem(form, item){
let lastData = {...item}; let lastData = {...item};
lastData.card = this.picFileName; lastData.card = this.picFileName;
lastData.cars = this.checkDataList; HttpReq.truckDispatching.RegionalInformationAdd(lastData).then((res) => {
lastData.startTime = this.timePeriod[0]; form.visible = false;
lastData.endTime = this.timePeriod[1]; if(res.code == 200){
console.log(lastData); this.$notify({
// HttpReq.truckDispatching.RegionalInformationAdd(lastData).then((res) => { title: '区域信息新增成功！',
// form.visible = false; type: 'success',
// if(res.code == 200){ duration: 2500
// this.$notify({ });
// title: '区域信息新增成功！', this.loadData()
// type: 'success', }else{
// duration: 2500 this.$notify({
// }); title: res.msg,
// this.loadData() type: 'error',
// }else{ duration: 2500
// this.$notify({ })
// title: res.msg, }
// type: 'error', }).catch(function(error) {
// duration: 2500 form.status.cu = 0
// }) });
// }
// }).catch(function(error) { this.checkDataList.forEach((carItem,index)=>{
// form.status.cu = 0 let uploadCarData = {};
// }); uploadCarData.car = carItem;
form.status.cu = 0 uploadCarData.areaId = item.code;
console.log('uploadCarData',uploadCarData);
HttpReq.truckDispatching.RegionalInformationCarAdd(uploadCarData).then((res) => {
if(res.code == 200){
}else{
this.$notify({
title: res.msg,
type: 'error',
duration: 2500
})
}
}).catch(function(error) { });
})
}, },
//修改区域信息 //修改区域信息
reqUpdateItem(form, item){ reqUpdateItem(form, item){
let lastData = {...item}; let lastData = {...item};
lastData.card = this.picFileName; lastData.card = this.picFileName;
lastData.cars = this.checkDataList; lastData.cars = this.checkDataList;
lastData.startTime = this.timePeriod[0]; HttpReq.truckDispatching.RegionalInformationUpdate(lastData).then((res) => {
lastData.endTime = this.timePeriod[1]; form.visible = false;
console.log(lastData); if(res.code == 200){
// HttpReq.truckDispatching.RegionalInformationUpdate(lastData).then((res) => { this.$notify({
// form.visible = false; title: '区域信息修改成功！',
// if(res.code == 200){ type: 'success',
// this.$notify({ duration: 2500
// title: '区域信息修改成功！', });
// type: 'success', this.loadData()
// duration: 2500 }else{
// }); this.$notify({
// this.loadData() title: res.msg,
// }else{ type: 'error',
// this.$notify({ duration: 2500
// title: res.msg, })
// type: 'error', this.loadData()
// duration: 2500 }
// }) }).catch(function(error) {
// this.loadData() form.status.cu = 0
// } });
// }).catch(function(error) { HttpReq.truckDispatching.RegionalInformationCarDel(this.oldCheckDataList).then((res) => { })
// form.status.cu = 0 this.$nextTick(()=>{
// }); this.checkDataList.forEach((carItem,index)=>{
form.status.cu = 0 let uploadCarData = {};
uploadCarData.car = carItem;
uploadCarData.areaId = item.code;
HttpReq.truckDispatching.RegionalInformationCarAdd(uploadCarData).then((res) => {
if(res.code == 200){
}else{
this.$notify({
title: res.msg,
type: 'error',
duration: 2500
})
}
}).catch(function(error) { });
})
})
}, },
//删除区域信息 //删除区域信息
reqRemoveProject(item){ reqRemoveProject(item){
......
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