Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/xinjiang_army into master

web/public/static/js/main_2020_show.js

@@ -5134,10 +5134,10 @@ window.Modernizr = function(n, e, t) {
                 if(null === this.currentItem || void 0 === this.currentItem){
                     // this.setDestinationItem(this.firstDestination()) 
                     // this.setDestinationItem([currentPanoDestinations[0], 0]) 
-                    this.setDestinationItem([this.currentItem[0], 0]) 
+                    this.setDestinationItem([this.currentItem[0]||0, 0]) 
                 }
                 else if(this.currentItem[1] == null) {
-                    this.setDestinationItem([this.currentItem[0], 0])
+                    this.setDestinationItem([this.currentItem[0]||0, 0])
                 }
                 else{ 
                     
@@ -6996,7 +6996,7 @@ window.Modernizr = function(n, e, t) {
                     var r, a, s;
                     if (null !== n.currentItem) {
                         var p, f;
-                        $("#status").find(".curIdx").text(n.currentItem[0] + 1),
+                        $("#status").find(".curIdx").text(n.currentItem[0] || 0  + 1),
                         n.onTheBus ? (p = "active",
                         f = "recent") : (f = "active",
                         p = "recent");

web/public/static/js/manage.js

@@ -3,7 +3,7 @@ var g_ProjectName=window.location.pathname.substring(window.location.pathname.in
 
 var g_Prefix=window.location.origin+'/';
 window.isLocal = true
-var g_Prefix="http://192.168.0.245:8003/";
+// var g_Prefix="http://192.168.0.245:8003/";
 
 var g_index=null;
 var g_modeldata=null;