Merge branch 'dev' of git.1000my.com:huangmh/client_iot-daoshi-template-v into dev

public/static/qm/MainMap_QM.js

@@ -1124,7 +1124,7 @@ MainMap_QM = function (callBack, options) {
 	this.cameraPerspective.position.set(this.util.guiOptions.cameraX, this.util.guiOptions.cameraY, this.util.guiOptions.cameraZ);   //x 水平   y 垂直旋转   z 展示大小
 	this.cameraPerspective.lookAt(new THREE.Vector3(0, 0, 0));
 
-	this.cameraOrtho = new THREE.OrthographicCamera(340 * this.aspect / - 2, 340 * this.aspect / 2, 340 / 2, 340 / - 2, 10, 10000);
+	this.cameraOrtho = new THREE.OrthographicCamera(-150 * this.aspect, 150 * this.aspect, 150, -150, 10, 10000);
 	this.cameraOrtho.position.set(this.util.guiOptions.cameraX, this.util.guiOptions.cameraY, this.util.guiOptions.cameraZ);
 	this.cameraOrtho.lookAt(new THREE.Vector3(0, 0, 0));
 	this.camera = this.cameraPerspective;
@@ -1947,7 +1947,7 @@ MainMap_QM.prototype = {
 			Map_QM.camera = Map_QM.cameraOrtho;
 			Map_QM.controls.object = Map_QM.camera;
 			Map_QM.shawLight.castShadow = false;
-			Map_QM.controls.setZoom(1.5);
+			Map_QM.controls.setZoom(1.2);
 			Map_QM.camera.updateProjectionMatrix(); //必须update
 			Map_QM.controls.maxPolarAngle = 0;
 			Map_QM.changeIconState(state);
@@ -4586,10 +4586,8 @@ MainMap_QM.prototype = {
 		Map_QM.aspect = width / height;
 		Map_QM.cameraPerspective.aspect = Map_QM.aspect;
 		Map_QM.cameraPerspective.updateProjectionMatrix();
-		Map_QM.cameraOrtho.left = 340 * Map_QM.aspect / -2;
-		Map_QM.cameraOrtho.right = 340 * Map_QM.aspect / 2;
-		Map_QM.cameraOrtho.top = 340 / 2;
-		Map_QM.cameraOrtho.bottom = 340 / -2;
+		Map_QM.cameraOrtho.left = -150* Map_QM.aspect;
+		Map_QM.cameraOrtho.right = 150* Map_QM.aspect;
 		Map_QM.cameraOrtho.updateProjectionMatrix();
 		Map_QM.renderer.setSize(width, height);
 		Map_QM.labelRenderer.setSize(width, height);