sd-jg-school-web.git

			@@ -2,10 +2,10 @@
			<public-box class="campus-nav-box">
			<template slot="public-box-header">
			<div class="title">
			<img class="icon deblurring" src="/zhxy/img/icon/xndh.png" alt />
			<img class="icon deblurring" src="/zhjg/img/icon/xndh.png" alt />
			<span>校区内导航</span>
			</div>
			<img class="close deblurring" src="/zhxy/img/navicon/close.png" alt @click="closeModel" />
			<img class="close deblurring" src="/zhjg/img/navicon/close.png" alt @click="closeModel" />
			</template>
			<template slot="public-box-content">
			<div class="tab">
			@@ -21,7 +21,7 @@
			</ul>
			<v-else>
			<ul>
			<li>智慧校园欢迎您！</li>
			<li>江西经济管理干部学院欢迎您！</li>
			</ul>
			</v-else>
			</div>
			@@ -183,7 +183,7 @@
			Number(this.terminus[1]),
			Number(this.terminus[2])
			),
			'/zhxy/img/navicon/end.png'
			'/zhjg/img/navicon/end.png'
			)
			CamPusNavLayer.campusEndLayer.addOverlay(endEntity)
			} else if (val == 'end') {
			@@ -202,7 +202,7 @@
			Number(this.startingPoint[1]),
			Number(this.startingPoint[2])
			),
			'/zhxy/img/navicon/start.png'
			'/zhjg/img/navicon/start.png'
			)
			CamPusNavLayer.campusStartLayer.addOverlay(startEntity)
			}
			@@ -256,7 +256,7 @@
			Number(lnglat[1]),
			Number(0)
			),
			'/zhxy/img/navicon/start.png'
			'/zhjg/img/navicon/start.png'
			)
			CamPusNavLayer.campusStartLayer.addOverlay(startEntity)
			} else if (that.butChouse == 'end') {
			@@ -270,7 +270,7 @@
			Number(lnglat[1]),
			Number(0)
			),
			'/zhxy/img/navicon/end.png'
			'/zhjg/img/navicon/end.png'
			)
			CamPusNavLayer.campusEndLayer.addOverlay(endEntity)
			}
			@@ -362,7 +362,7 @@
			Number(this.startingPoint[1]),
			Number(this.startingPoint[2])
			),
			'/zhxy/img/navicon/start.png'
			'/zhjg/img/navicon/start.png'
			)
			CamPusNavLayer.campusRouteLayer.addOverlay(startEntity)
			// var end = global.DC.Transform.transformWGS84ToCartesian()
			@@ -372,7 +372,7 @@
			Number(this.terminus[1]),
			Number(this.terminus[2])
			),
			'/zhxy/img/navicon/end.png'
			'/zhjg/img/navicon/end.png'
			)
			CamPusNavLayer.campusRouteLayer.addOverlay(endEntity)

			@@ -438,12 +438,7 @@
			polyline.setStyle({
			width: 6,
			arcType: true,
			material: new global.DC.PolylineImageTrailMaterialProperty({
			color: global.DC.Namespace.Cesium.Color.fromBytes(10, 255, 10),
			speed: 60,
			image: '/zhxy/img/icon/right.png',
			repeat: { x: 320, y: 1 }
			}),
			material: global.DC.Color.RED,
			clampToGround: true
			})

			@@ -526,12 +521,7 @@
			polyline.setStyle({
			width: 6,
			arcType: true,
			material: new global.DC.PolylineImageTrailMaterialProperty({
			color: global.DC.Namespace.Cesium.Color.fromBytes(10, 255, 10),
			speed: 60,
			image: '/zhxy/img/icon/right.png',
			repeat: { x: 320, y: 1 }
			}),
			material: global.DC.Color.RED,
			clampToGround: true
			})

			@@ -579,9 +569,10 @@
			} else {
			if (this.navigationWay == '步行') {
			axios
			.get('https://dev.jxpskj.com:8023/arcgis/rest/services/shidalw1103/NAServer/%E8%B7%AF%E5%BE%84/solve', {
			.get('https://dev.jxpskj.com:8023/arcgis/rest/services/jglw/NAServer/%E8%B7%AF%E5%BE%84/solve', {
			params: {
			stops: { features: [{ geometry: { x: startLog, y: startLat } }, { geometry: { x: endLog, y: endLat } }] },
			returnDirections: false,
			returnRoutes: true,
			f: 'json'
			}
			@@ -610,12 +601,7 @@
			polyline.setStyle({
			width: 6,
			arcType: true,
			material: new global.DC.PolylineImageTrailMaterialProperty({
			color: global.DC.Namespace.Cesium.Color.fromBytes(10, 255, 10),
			speed: 60,
			image: '/zhxy/img/icon/right.png',
			repeat: { x: 320, y: 1 }
			}),
			material: global.DC.Color.RED,
			clampToGround: true
			})

			@@ -660,10 +646,11 @@
			})
			} else {
			axios
			.get('https://dev.jxpskj.com:8023/arcgis/rest/services/shidalw1103/NAServer/%E8%B7%AF%E5%BE%84/solve', {
			.get('https://dev.jxpskj.com:8023/arcgis/rest/services/jglw/NAServer/%E8%B7%AF%E5%BE%84/solve', {
			params: {
			// stops: {features:[{geometry:{x:116.026051,y:28.686474}},{geometry:{x:116.024876,y:28.678025}}]},
			stops: { features: [{ geometry: { x: startLog, y: startLat } }, { geometry: { x: endLog, y: endLat } }] },
			returnDirections: false,
			returnRoutes: true,
			f: 'json'
			}
			@@ -680,12 +667,7 @@
			polyline.setStyle({
			width: 6,
			arcType: true,
			material: new global.DC.PolylineImageTrailMaterialProperty({
			color: global.DC.Namespace.Cesium.Color.fromBytes(10, 255, 10),
			speed: 60,
			image: '/zhxy/img/icon/right.png',
			repeat: { x: 320, y: 1 }
			}),
			material: global.DC.Color.RED,
			clampToGround: true
			})