goback

public/datav/detail/humidity-monitor.html

@@ -44,7 +44,7 @@
             </div>
         </div>
 
-        <div class="fixed flex-text maxIndex pointer" style="left: 30px;top: 45px;" @click="history.back()">
+        <div class="fixed flex-text maxIndex pointer" style="left: 30px;top: 45px;" @click="goPrePage('emergency')">
             <img style="width: 24px;height: 24px;" src="../static/backPage.png" alt="">
             <div class="f20 color-theme ml10">返回</div>
         </div>

public/datav/detail/people-monitor.html

@@ -43,7 +43,7 @@
             </div>
         </div>
 
-        <div class="fixed flex-text maxIndex pointer" style="left: 30px;top: 45px;" @click="history.back()">
+        <div class="fixed flex-text maxIndex pointer" style="left: 30px;top: 45px;" @click="goPrePage('emergency')">
             <img style="width: 24px;height: 24px;" src="../static/backPage.png" alt="">
             <div class="f20 color-theme ml10">返回</div>
         </div>

public/datav/detail/shape-monitor.html

@@ -44,7 +44,7 @@
             </div>
         </div>
 
-        <div class="fixed flex-text maxIndex pointer" style="left: 30px;top: 45px;" @click="history.back()">
+        <div class="fixed flex-text maxIndex pointer" style="left: 30px;top: 45px;" @click="goPrePage('emergency')">
             <img style="width: 24px;height: 24px;" src="../static/backPage.png" alt="">
             <div class="f20 color-theme ml10">返回</div>
         </div>

public/datav/detail/static/js/public-detail.js

@@ -45,8 +45,10 @@ let jessibucaPlayer = {};
 
 var gemhoUtil = {
     goToPage: function(url){
-        window.open(url)
+        // window.open(url)
+        location.href = url
     },
+
     detailPageMixin: {
         data: function() {
             return {
@@ -76,11 +78,15 @@ var gemhoUtil = {
             }
         },
         methods: {
+            goPrePage(url) {
+                history.back()
+            },
             changeMenu(item) {
                 localStorage.setItem('bigScreenDetailMenu', item.name)
                 this.bigScreenDetailMenu = item.name
                 // 跳转页面
-                window.open(item.url)
+                // window.open(item.url)
+                location.href = item.url
             },
         }
     }

public/datav/detail/temperature-monitor.html

@@ -44,7 +44,7 @@
             </div>
         </div>
 
-        <div class="fixed flex-text maxIndex pointer" style="left: 30px;top: 45px;" @click="history.back()">
+        <div class="fixed flex-text maxIndex pointer" style="left: 30px;top: 45px;" @click="goPrePage('emergency')">
             <img style="width: 24px;height: 24px;" src="../static/backPage.png" alt="">
             <div class="f20 color-theme ml10">返回</div>
         </div>

public/datav/detail/video-monitor.html

@@ -81,7 +81,7 @@
             </div>
         </div>
 
-        <div class="fixed flex-text maxIndex pointer" style="left: 30px;top: 45px;" @click="history.back()">
+        <div class="fixed flex-text maxIndex pointer" style="left: 30px;top: 45px;" @click="goPrePage('emergency')">
             <img style="width: 24px;height: 24px;" src="../static/backPage.png" alt="">
             <div class="f20 color-theme ml10">返回</div>
         </div>

public/datav/detail/water-monitor.html

@@ -42,7 +42,7 @@
             </div>
         </div>
 
-        <div class="fixed flex-text maxIndex pointer" style="left: 30px;top: 45px;" @click="history.back()">
+        <div class="fixed flex-text maxIndex pointer" style="left: 30px;top: 45px;" @click="goPrePage('emergency')">
             <img style="width: 24px;height: 24px;" src="../static/backPage.png" alt="">
             <div class="f20 color-theme ml10">返回</div>
         </div>

public/datav/detail/wind-monitor.html

@@ -44,7 +44,7 @@
             </div>
         </div>
 
-        <div class="fixed flex-text maxIndex pointer" style="left: 30px;top: 45px;" @click="history.back()">
+        <div class="fixed flex-text maxIndex pointer" style="left: 30px;top: 45px;" @click="goPrePage('emergency')">
             <img style="width: 24px;height: 24px;" src="../static/backPage.png" alt="">
             <div class="f20 color-theme ml10">返回</div>
         </div>