1

src/components/mars3d/Map.vue

@@ -23,8 +23,13 @@ Vue.prototype.mars3d = mars3d
 Vue.prototype.Cesium = mars3d.Cesium
 
 var map;
+//画导航线
 var graphicLayerZ;
 var graphicZ;
+//路障展示
+var graphicLayerR;
+var graphicR;
+
 export default {
   name: 'mars3dViewer',
 
@@ -44,6 +49,8 @@ export default {
       realjd:140.71212,
       realwd:52.158,
       carnumber:'',
+      //装车点卸车点数据
+      mapControlPointData:[],
     }
   },
 
@@ -106,8 +113,16 @@ export default {
                 })
               })
               this.allCarInforData = arr11;
+
+              //获取所有关键控制点信息
+              httpGet(apiCpointQuery,{size:9999}).then((res) => {
+                if(res.code == 200){
+                  this.mapControlPointData = res.data.content;
                   this.getCoordinate();
                 }
+              })
+              
+            }
           });
         }
       });
@@ -271,7 +286,7 @@ export default {
       }, 2500)
       
     },
-    // 装车箭头线 graphicLayer.removeGraphic(graphic);
+    //装车箭头线 graphicLayer.removeGraphic(graphic);
     addArrowGraphic3(boo,points) {
       graphicLayerZ = new mars3d.layer.GraphicLayer();
       map.addLayer(graphicLayerZ);
@@ -291,6 +306,10 @@ export default {
       }else{
         graphicLayerZ.removeGraphic(graphicZ);
       }
+    },
+    //路障展示
+    roadblockShowFn(arr){
+
     },
     // 在图层绑定Popup弹窗
     bindLayerPopup(graphicLayer,number) {

src/views/MLargeScreen/index.vue

@@ -169,6 +169,8 @@ export default {
 			indexSituationPic1:indexSituationPic1,
 			//语音组件显示
 			audioTishiViewShow:false,
+			//路障申报数量
+			roadblockNum:0,
 		}
 	},
 	mounted(){
@@ -219,6 +221,10 @@ export default {
 					}
 				}
             });
+			//获取路障信息failureDeclarationAdd
+			httpGet(failureDeclarationAdd,{fault:'路障申报',createTime:this.currentTime()}).then((res) => {
+				console.log(res);
+			})
 
         }, 8000)
 
@@ -235,7 +241,7 @@ export default {
 					this.carnumber = res.data.content[0].car;
 					this.personalName = res.data.content[0].name;
 					//展示二维地图
-					this.$refs.mars3dViewerMapMethod.getCarInforFn(this.carnumber);
+					//this.$refs.mars3dViewerMapMethod.getCarInforFn(this.carnumber);
 					//开启接受订单
 					this.$refs.startOrderReceivingMethod.loadData(this.carnumber);
 					//开启语音接收
@@ -664,7 +670,40 @@ export default {
 		//删除语音
 		indexListeningDelFn(index){
 			this.$refs.voiceApplicationMethod.selectDeleteSituation(index);
-		}
+		},
+		//获取当前时间
+		currentTime(){
+			var date = new Date();
+			var year = date.getFullYear();        //年 ,从 Date 对象以四位数字返回年份
+			var month = date.getMonth() + 1;      //月 ,从 Date 对象返回月份 (0 ~ 11) ,date.getMonth()比实际月份少 1 个月
+			var day = date.getDate();             //日 ,从 Date 对象返回一个月中的某一天 (1 ~ 31)
+			var hours = date.getHours();          //小时 ,返回 Date 对象的小时 (0 ~ 23)
+			var minutes = date.getMinutes();      //分钟 ,返回 Date 对象的分钟 (0 ~ 59)
+			var seconds = date.getSeconds();      //秒 ,返回 Date 对象的秒数 (0 ~ 59)   
+			//修改月份格式
+			if (month >= 1 && month <= 9) {
+				month = "0" + month;
+			}
+			//修改日期格式
+			if (day >= 0 && day <= 9) {
+				day = "0" + day;
+			}
+			//修改小时格式
+			if (hours >= 0 && hours <= 9) {
+				hours = "0" + hours;
+			}
+			//修改分钟格式
+			if (minutes >= 0 && minutes <= 9) {
+				minutes = "0" + minutes;
+			}
+			//修改秒格式
+			if (seconds >= 0 && seconds <= 9) {
+				seconds = "0" + seconds;
+			}
+			//获取当前系统时间  格式(yyyy-mm-dd hh:mm:ss)
+			let currentFormatDate = year + "-" + month + "-" + day;
+			return currentFormatDate;
+		},
 	},
     beforeDestroy(){
 		this.$refs.voiceApplicationMethod.xintiaoCloseFn();

vue.config.js

@@ -49,7 +49,7 @@ module.exports = {
       // },
       
     },
-    https: true,
+    //https: true,
   },
   configureWebpack: {
     plugins: [