소스 검색

环境页面修改

zjs_project 1 년 전
부모
커밋
0c3f18e129

+ 1 - 1
src/components/newBottomCom/viewShell/viewShell.scss

@@ -18,7 +18,7 @@
 	transition: height 1s;
 }
 .shell-view2{
-	height: 800px;
+	height: 748px;
 }
 .shell-signscoll{
 	position: absolute;

+ 2 - 2
src/components/newBottomCom/viewShell/viewShell.vue

@@ -98,8 +98,8 @@
 							this.shellHeight = '800px';
 							_endHeight = 800;
 						}else if(newVal==3){//变更为最小状态
-							this.shellHeight = '800';
-							_endHeight = 800;
+							this.shellHeight = '748';
+							_endHeight = 748;
 						}
 						// let currPage = getCurrentPages()[getCurrentPages().length - 1] ? getCurrentPages()[getCurrentPages().length - 1].$vm : null;
 						if(this.$parent && this.$parent.hasOwnProperty('canvasHeight')){

+ 0 - 4
src/pages/webgl_rxdz_env/webgl_rxdz_env.vue

@@ -16,10 +16,6 @@
 	import touchHandle from '@/mixins/touchHandle.js';
 	// import createImgHandle from '@/mixins/createImgHandle.js';
 	import commonPageMethod from '@/mixins/commonPageMethod.js';
-	// const app = getApp(); //获取应用实例
-	// import requestConfig from '@/static/lib/requestConfig.js';
-	// import commonPageMethod from '@/common/commonPageMethod.js';
-	// import commonMethod from '@/common/commonMethod.js';
 	export default {
 		mixins: [touchHandle, commonPageMethod],
 		/**

+ 6 - 5
src/pages/webgl_rxdz_test/webgl_rxdz_test.vue

@@ -84,7 +84,7 @@
 				curHouseFloor: null,	//当前选中的户型楼层
 				curHouseObj: null,
 				controlStarPosition : { x:0, y:0, z:0},	//控制器初始位置
-				cameraStarPosition : { x:0, y:20, z:0}	,//摄像头初始位置
+				cameraStarPosition : { x:0, y:30, z:0}	,//摄像头初始位置
 				// cameraLastPosition: null,		//摄像头上一次移动到的位置
 				// controlLastPosition: null,		//观察点上一次移动到的位置
 				canvasHeight:200,	//canvas视图的高度-计算得出
@@ -309,11 +309,11 @@
                 container.appendChild( renderer.domElement );
 				
 				controls = new OrbitControls(camera, renderer.domElement);
-				controls.screenSpacePanning = true;
+				controls.screenSpacePanning = false;//平移时确保不超过PolarAngle限制
 				controls.enableDamping = true;
 				controls.minDistance = 1;
 				controls.maxDistance = 400;
-				controls.minPolarAngle = 0;// 默认0
+				controls.minPolarAngle = Math.PI / 8;// 默认0
 				controls.maxPolarAngle = Math.PI / 2; // 默认Math.PI,即可以向下旋转到的视角。
 				controls.target.set(that.controlStarPosition.x, that.controlStarPosition.y, that.controlStarPosition.z);
 				controls.enableZoom = true;//启用摄像机的缩放
@@ -415,10 +415,11 @@
 				let oldUp = {};
 				let newUp = {};
 				if (isUserContorl === false) { // 非漫游状态
+					let _juli = camera.position.y * Math.tan(Math.PI / 8);
 					cameraNewPosition = {
 						x:spaceObj.centerX/100,
 						y:camera.position.y, 
-						z:-spaceObj.centerY/100 + 0.5,//增加偏差,防止极点翻转问题?不知道为啥会有用
+						z:-spaceObj.centerY/100 + _juli,//增加偏差,防止极点翻转问题?不知道为啥会有用
 					}
 					//新的观察点的位置-取模型的中心点坐标,加上高度,由于模型都是贴地的,所以高度设置为0
 					targetNewPosition = {
@@ -547,7 +548,7 @@
 				}).onComplete(()=>{
 					camera.aspect = screenWidth / that.canvasHeight;
 					camera.updateProjectionMatrix();
-					renderer.setSize( screenWidth, that.canvasHeight );
+					renderer.setSize(screenWidth, that.canvasHeight );
 					tweenCameraAnma = false;
 					// that.showLables = true;
 					// updateLables();//更新lable

+ 2 - 1
src/services/urlConfig.js

@@ -36,7 +36,8 @@ var config = function(env) {
             uploadUrl: 'http://106.14.187.241:5555', //文件上传
             api_url: 'https://gatewaytest1.elab-plus.com/', //測試
             redirect_uri: 'https://h5test1.elab-plus.com/krpano/template', // 授权回调地址
-            min_uri: 'https://dm.static.elab-plus.com/miniProgram/webgl/test1/index.html#/', // H5小程序的地址
+            // min_uri: 'https://dm.static.elab-plus.com/miniProgram/webgl/test1/index.html#/', // H5小程序的地址
+            min_uri: 'https://h5test1.elab-plus.com/web/qiance/index.html#/', // H5小程序的地址
 			ws_url: 'wss://wstest3.skyforestcity.com/',
 			// ws_url: 'ws://192.168.50.190:5556/',
             themeColor1: '#FFD09F',