bill 5 年之前
父节点
当前提交
a679a65f60

+ 1 - 1
service/static/css/main.css

@@ -4066,7 +4066,7 @@ a.hasHover:hover, a:active {
     position: absolute;
     bottom: 2px;
     left: 2px;
-    width: 130px;
+    width: 133px;
     height: 20px;
     padding: 6px;
     color: #fff;

+ 0 - 1
service/static/edit.html

@@ -137,7 +137,6 @@
                                                 <span id="hotListText">热点列表</span>
                                                 <img id="hotListIcon" src="images/hotlist.png" alt="">
                                             </div>
-
                                         </div>
                                         <div id="hotListContent">
                                             <ul>

文件差异内容过多而无法显示
+ 637 - 598
service/static/index.html


+ 3 - 12
service/static/js/edit.js

@@ -269,24 +269,14 @@ function addListener(){
 //设置初始界面
 function getSeft(seft) {
     $('#camera-start').on('click', function () {
-				var snap = JSON.parse("{" + seft.getSnapAngleInfo() + "}")
-				if(!this.data){
-					this.data = {
-						camera:{
-							quaternion:''
-						},
-						pano:{
-							uuid:''
-						}
-					}
-				}
-				
+        var snap = JSON.parse("{" + seft.getSnapAngleInfo() + "}")
         this.data.camera.quaternion = snap.metadata.camera_quaternion;
         this.data.pano.uuid = snap.metadata.scan_id;
 
         var ev = document.createEvent("MouseEvent");//点击截取视图
         g_snapShotWidth = 240;
         g_snapShotHeight = 118;
+        window.screenSta = 'startScreen';
         ev.initMouseEvent("snapshotBegin", true, true, document.defaultView, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
         ev.__callback = function (imgData, info) {
             initialPicture(imgData, info)
@@ -807,6 +797,7 @@ EditGuide.prototype.init = function (data, data2) {
         ev.initMouseEvent("snapshotBegin", true, true, document.defaultView, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
         g_snapShotWidth = 200;
         g_snapShotHeight = 140;
+        window.screenSta = 'tour';   // 记录当前哪个功能截屏, 因为导览截屏需要做额外的校对调整, 初始画面截屏不需要
         ev.__callback = function (imgData, info) {
             that.uploadGuide(imgData, info, renew, that.targetTourPoint)
         }.bind(that);

文件差异内容过多而无法显示
+ 56679 - 1
service/static/js/main_2018.js


文件差异内容过多而无法显示
+ 1 - 0
service/static/js/备份/main_2018.js