Commit b02efa5f authored by xxx's avatar xxx

1

parent 5567fffd
...@@ -205,9 +205,10 @@ ...@@ -205,9 +205,10 @@
<el-form size="small" label-width="100px" :rules="rules"> <el-form size="small" label-width="100px" :rules="rules">
<el-form-item label="装载区" style="display: inline-block;" class="des1"> <el-form-item label="装载区" style="display: inline-block;" class="des1">
<el-select v-model="zaDestination" placeholder="请选择装载区" style="width:200px;"> <!-- <el-select v-model="zaDestination" placeholder="请选择装载区" style="width:200px;">
<el-option v-for="(obj,index) in caiquData1" :label="obj.name" :value="obj.name" :key="index"></el-option> <el-option v-for="(obj,index) in caiquData1" :label="obj.name" :value="obj.name" :key="index"></el-option>
</el-select> </el-select> -->
<el-cascader v-model="zaDestination" :options="caiquData1"></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="卸点区" style="display: inline-block;" class="des1"> <el-form-item label="卸点区" style="display: inline-block;" class="des1">
<el-select v-model="xzDestination" placeholder="请选择卸点区" style="width:200px;"> <el-select v-model="xzDestination" placeholder="请选择卸点区" style="width:200px;">
...@@ -287,7 +288,7 @@ export default { ...@@ -287,7 +288,7 @@ export default {
desform:{}, desform:{},
caiquData1:[], caiquData1:[],
xiequData1:[], xiequData1:[],
zaDestination:'', zaDestination:[],
xzDestination:'', xzDestination:'',
destinationDataAll:[],//人工调度调度目的地列表 destinationDataAll:[],//人工调度调度目的地列表
peopleScheAssemblyShow:false, peopleScheAssemblyShow:false,
...@@ -320,7 +321,9 @@ export default { ...@@ -320,7 +321,9 @@ export default {
this.selectCarRadioArray = []; this.selectCarRadioArray = [];
this.tanchuCarListArray = []; this.tanchuCarListArray = [];
this.peopleScheAssemblyShow = false; this.peopleScheAssemblyShow = false;
this.desform = {}, this.desform = {};
this.zaDestination = [];
this.xzDestination = '';
this.$nextTick(()=>{ this.$nextTick(()=>{
//车队信息 //车队信息
...@@ -331,6 +334,8 @@ export default { ...@@ -331,6 +334,8 @@ export default {
}) })
//车辆信息 //车辆信息
this.loadData2(); this.loadData2();
//获取区域信息
this.loadData4();
//近期通知列表 //近期通知列表
HttpReq.truckDispatching.recentNoticeQuery({size:50,sort:'id,desc'}).then((res) => { HttpReq.truckDispatching.recentNoticeQuery({size:50,sort:'id,desc'}).then((res) => {
if(res.code == 200){ if(res.code == 200){
...@@ -478,18 +483,19 @@ export default { ...@@ -478,18 +483,19 @@ export default {
this.srcUrl = null; this.srcUrl = null;
} }
}, },
//获取车辆信息以及区域信息 //获取车辆信息
loadData2() { loadData2() {
let query = {}; let query = {};
query.size = 9999; query.size = 9999;
query.road = this.selectCarFleet; query.road = this.selectCarFleet;
//车辆
HttpReq.truckDispatching.carInformationQuery(query).then((res) => { HttpReq.truckDispatching.carInformationQuery(query).then((res) => {
if(res.code == 200){ if(res.code == 200){
this.carsInforData = res.data.content; this.carsInforData = res.data.content;
}; };
}) })
//区域信息 },
//获取区域信息
loadData4() {
HttpReq.truckDispatching.RegionalInformationQuery({size:9999}).then((res) => { HttpReq.truckDispatching.RegionalInformationQuery({size:9999}).then((res) => {
if(res.code == 200){ if(res.code == 200){
let caiqu1 = []; let caiqu1 = [];
...@@ -501,8 +507,29 @@ export default { ...@@ -501,8 +507,29 @@ export default {
xiequ1.push(item); xiequ1.push(item);
} }
}); });
this.caiquData1 = caiqu1; this.$nextTick(()=>{
let caiquCenArr1 = [];
caiqu1.forEach((item1,index1)=>{
let caiquCenObj1 = {};
caiquCenObj1.value = item1.name;
caiquCenObj1.label = item1.name;
HttpReq.truckDispatching.RegionalCaiDianQuery({size:9999,areaName:item1.name}).then((res1) => {
if(res1.code == 200 && res1.data.totalElements != 0){
let caiquCenArr2 = [];
res1.data.content.forEach((item2,index2)=>{
let caiquCenObj2 = {};
caiquCenObj2.value = item2.name;
caiquCenObj2.label = item2.name;
caiquCenArr2.push(caiquCenObj2);
})
caiquCenObj1.children = caiquCenArr2;
};
})
caiquCenArr1.push(caiquCenObj1);
});
this.caiquData1 = caiquCenArr1;
this.xiequData1 = xiequ1; this.xiequData1 = xiequ1;
})
}; };
}) })
}, },
...@@ -551,6 +578,8 @@ export default { ...@@ -551,6 +578,8 @@ export default {
//关闭人工调度组件 //关闭人工调度组件
this.peopleScheAssemblyShow = false; this.peopleScheAssemblyShow = false;
this.desform = {}; this.desform = {};
this.zaDestination = [];
this.xzDestination = '';
}, },
//取消发送语音 //取消发送语音
quxiaoVideo(){ quxiaoVideo(){
...@@ -605,7 +634,7 @@ export default { ...@@ -605,7 +634,7 @@ export default {
}); });
return return
} }
if(!this.zaDestination && !this.xzDestination){ if(JSON.stringify(this.zaDestination) == '[]' && !this.xzDestination){
this.$notify({ this.$notify({
title: '请选择调度装载区或卸点区!', title: '请选择调度装载区或卸点区!',
type: 'warning', type: 'warning',
...@@ -630,10 +659,10 @@ export default { ...@@ -630,10 +659,10 @@ export default {
return return
} }
this.selectCarRadioArray.forEach((item,index)=>{ this.selectCarRadioArray.forEach((item,index)=>{
if(this.zaDestination){ if(JSON.stringify(this.zaDestination) != '[]'){
let query1 = {...this.desform}; let query1 = {...this.desform};
query1.carNo = item.number; query1.carNo = item.number;
query1.destination = this.zaDestination; query1.destination = this.zaDestination[this.zaDestination.length - 1];
HttpReq.truckDispatching.manualSchedulingAdd(query1).then((res) => { HttpReq.truckDispatching.manualSchedulingAdd(query1).then((res) => {
if(res.code == 200){ if(res.code == 200){
...@@ -692,6 +721,8 @@ export default { ...@@ -692,6 +721,8 @@ export default {
}); });
this.peopleScheAssemblyShow = false; this.peopleScheAssemblyShow = false;
this.desform = {}, this.desform = {},
this.zaDestination = [];
this.xzDestination = '';
this.selectCarRadioArray = []; this.selectCarRadioArray = [];
//切换智能调度 //切换智能调度
...@@ -721,6 +752,8 @@ export default { ...@@ -721,6 +752,8 @@ export default {
peopleScheAssemblyCloseFn(){ peopleScheAssemblyCloseFn(){
this.peopleScheAssemblyShow = false; this.peopleScheAssemblyShow = false;
this.desform = {}; this.desform = {};
this.zaDestination = [];
this.xzDestination = '';
this.selectCarRadioArray = []; this.selectCarRadioArray = [];
}, },
//车辆区域分布Echarts //车辆区域分布Echarts
...@@ -1823,4 +1856,19 @@ dd>div{ ...@@ -1823,4 +1856,19 @@ dd>div{
color: #31E5F5; color: #31E5F5;
font-size: 16px; font-size: 16px;
} }
.el-cascader-panel{
background-color: #021445 !important;
color: #31E5F5;
font-size: 16px;
}
.el-cascader-menu{
border: 0px;
}
.el-cascader-menu__list{
color: #31E5F5;
border: 1px solid #01f5fe;
}
.el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus{
background-color: #021445 !important;
}
</style> </style>
\ No newline at end of file
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