1

src/views/MLargeScreen/components/intelligentSchedul/index.vue

@@ -17,7 +17,12 @@
                         <div class="voiceAppContent_2_content">
                             <el-checkbox-group v-model="selectCarRadioArray">
                                 <el-checkbox v-for="(item,index) in carsInforData" :label="item" :key="index" style="margin-top:7px;">
-                                    <div style="width:12vw;margin-left:1.7vw;text-align: center;">{{item.number}}</div>
+                                    <div style="width:12vw;margin-left:1.7vw;text-align: center;">
+                                        {{item.number}}
+                                        (
+                                        {{item.odo == 0 ? '离线' :item.odo == 1 ? '智能调度' : item.odo == 2 ? '人工调度' : '其他作业'}}
+                                        )
+                                    </div>
                                 </el-checkbox>
                             </el-checkbox-group>
                         </div>
@@ -199,9 +204,14 @@
             <div style="color:white;font-size:14px;margin-bottom:1vh;font-size: 18px;font-weight: 600;">人工调度详情</div>
 
             <el-form size="small" label-width="100px" :rules="rules">
-                <el-form-item label="目的地" style="display: inline-block;" class="des1">
-					<el-select v-model="desform.destination" placeholder="请选择目的地" style="width:200px;">
-						<el-option v-for="(obj,index) in destinationDataAll" :label="obj.number ? obj.number : obj.name" :value="obj.number ? obj.number : obj.name" :key="index"></el-option>
+                <el-form-item label="装载区" style="display: inline-block;" class="des1">
+					<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-select>
+				</el-form-item>
+                <el-form-item label="卸点区" style="display: inline-block;" class="des1">
+					<el-select v-model="xzDestination" placeholder="请选择卸点区" style="width:200px;">
+						<el-option v-for="(obj,index) in xiequData1" :label="obj.name" :value="obj.name" :key="index"></el-option>
 					</el-select>
 				</el-form-item>
                 <el-form-item label="时长" style="display: inline-block;" class="des1">
@@ -275,6 +285,10 @@ export default {
 
             //人工调度配置
             desform:{},
+            caiquData1:[],
+            xiequData1:[],
+            zaDestination:'',
+            xzDestination:'',
             destinationDataAll:[],//人工调度调度目的地列表
             peopleScheAssemblyShow:false,
             rules: {
@@ -463,7 +477,7 @@ export default {
                 this.srcUrl = null;
             }
         },
-        //获取车辆信息
+        //获取车辆信息以及区域信息
 		loadData2() {
 			let query = {};
 			query.size = 9999;
@@ -472,13 +486,22 @@ export default {
 			HttpReq.truckDispatching.carInformationQuery(query).then((res) => {
 				if(res.code == 200){
 					this.carsInforData = res.data.content;
-                    let destination1 = [];
+				};
+			})
+			//区域信息
+			HttpReq.truckDispatching.RegionalInformationQuery({size:9999}).then((res) => {
+				if(res.code == 200){
+                    let caiqu1 = [];
+                    let xiequ1 = [];
 					res.data.content.forEach((item,index)=>{
-                        if(item.carclass == '铲车'){
-                            destination1.push(item);
+                        if(item.areaclass == '采区'){
+                            caiqu1.push(item);
+                        }else if(item.areaclass == '卸区'){
+                            xiequ1.push(item);
                         }
-                    })
-                    this.destinationDataAll = destination1;
+                    });
+                    this.caiquData1 = caiqu1;
+                    this.xiequData1 = xiequ1;
 				};
 			})
 		},
@@ -581,9 +604,9 @@ export default {
 				});
                 return
             }
-            if(!this.desform.destination){
+            if(!this.zaDestination && !this.xzDestination){
                 this.$notify({
-					title: '请选择调度目的地！',
+					title: '请选择调度装载区或卸点区！',
 					type: 'warning',
 					duration: 2500
 				});
@@ -606,8 +629,10 @@ export default {
                 return
             }
             this.selectCarRadioArray.forEach((item,index)=>{
+                if(this.zaDestination){
                     let query1 = {...this.desform};
 				    query1.carNo = item.number;
+                    query1.destination = this.zaDestination;
                     HttpReq.truckDispatching.manualSchedulingAdd(query1).then((res) => {
                         if(res.code == 200){
                             
@@ -630,6 +655,34 @@ export default {
                             })
                         }
                     }).catch(function(error) { });
+                }
+                if(this.xzDestination){
+                    let query2 = {...this.desform};
+				    query2.carNo = item.number;
+                    query2.destination = this.xzDestination;
+                    HttpReq.truckDispatching.manualSchedulingAdd(query2).then((res) => {
+                        if(res.code == 200){
+                            
+                        }else{
+                            this.$notify({
+                                title: res.msg,
+                                type: 'error',
+                                duration: 2500
+                            })
+                        }
+                    }).catch(function(error) { });
+                    HttpReq.truckDispatching.manualOrderAdd(query2).then((res) => {
+                        if(res.code == 200){
+                            
+                        }else{
+                            this.$notify({
+                                title: res.msg,
+                                type: 'error',
+                                duration: 2500
+                            })
+                        }
+                    }).catch(function(error) { });
+                }
 			})
 			this.$notify({
 				title: '人工调度发起成功！',