ソースを参照

PC端加载外部网站逻辑修改 web版跳至新标签页,小程序版刷新当前页面

wandequan 1 年間 前
コミット
cc3b5f841f
4 ファイル変更192 行追加400 行削除
  1. 12 0
      src/components/JumpWeb.vue
  2. 92 201
      src/components/Tool.vue
  3. 2 1
      src/components2/JumpWeb.vue
  4. 86 198
      src/components2/Tool.vue

+ 12 - 0
src/components/JumpWeb.vue

@@ -52,5 +52,17 @@ export default {
         width: 100%;
         height: 100%;
     }
+
+    .back {
+        width: 64px;
+        height: 64px;
+        margin: 10px 30px;
+        background: #c5c5c5 url(~@/assets/img/tool/close.png) center center / 60% 60% no-repeat;
+        position: absolute;
+        top: 0px;
+        right: 0px;
+        z-index: 999;
+        border-radius: 32px;
+    }
 }
 </style>

+ 92 - 201
src/components/Tool.vue

@@ -1,48 +1,26 @@
 <template>
   <div class="tool">
     <ul class="func">
-      <li
-        v-for="(item, index) in funcList"
-        :key="index"
-        :class="{ active: item.active }"
-        @click="toolClickHandle(item)"
-      >
+      <li v-for="(item, index) in funcList" :key="index" :class="{ active: item.active }" @click="toolClickHandle(item)">
         <p></p>
         <!-- {{ item.label }} -->
       </li>
     </ul>
-    <div
-      :class="{ help: true, active: helpActive }"
-      v-show="false"
-      @click="showHelp"
-    ></div>
+    <div :class="{ help: true, active: helpActive }" v-show="false" @click="showHelp"></div>
 
     <!-- 展示索引页面 -->
-    <van-popup
-      v-model:show="indexesShow"
-      :class="'indexesListContent'"
-      :style="{ background: 'transparent' }"
-      :close-on-click-overlay="false"
-      :closed="hideIndexesInfoDailog"
-    >
+    <van-popup v-model:show="indexesShow" :class="'indexesListContent'" :style="{ background: 'transparent' }"
+      :close-on-click-overlay="false" :closed="hideIndexesInfoDailog">
       <div class="indexesList">
         <div class="listContent">
           <div class="header"></div>
           <div class="list_container">
             <div>
-              <div
-                class="first_content"
-                v-for="(item, index) in cameraInfo"
-                :key="index"
-              >
+              <div class="first_content" v-for="(item, index) in cameraInfo" :key="index">
                 <div class="title">{{ item.name }}</div>
                 <ul>
-                  <li
-                    v-for="(item_, index_) in item.children"
-                    :key="index_"
-                    :class="{ active: item_.active }"
-                    @click="changeView(item_)"
-                  >
+                  <li v-for="(item_, index_) in item.children" :key="index_" :class="{ active: item_.active }"
+                    @click="changeView(item_)">
                     {{ item_.name }}
                   </li>
                 </ul>
@@ -55,13 +33,8 @@
     </van-popup>
 
     <!-- 展示点位文字信息 -->
-    <van-popup
-      v-model:show="pointShow"
-      class="point_popup"
-      :style="{ background: 'transparent' }"
-      :close-on-click-overlay="false"
-      :closed="hidePointInfoDailog"
-    >
+    <van-popup v-model:show="pointShow" class="point_popup" :style="{ background: 'transparent' }"
+      :close-on-click-overlay="false" :closed="hidePointInfoDailog">
       <div class="pointInfoContent">
         <div v-html="pointInfos"></div>
       </div>
@@ -69,21 +42,12 @@
     </van-popup>
 
     <!-- 展示平面图 -->
-    <van-popup
-      v-model:show="planeShow"
-      class="plane_popup"
-      :style="{ background: 'transparent' }"
-      :close-on-click-overlay="false"
-      :closed="hidePlaneInfoDailog"
-    >
+    <van-popup v-model:show="planeShow" class="plane_popup" :style="{ background: 'transparent' }"
+      :close-on-click-overlay="false" :closed="hidePlaneInfoDailog">
       <div class="plane_container">
         <div class="image_container">
           <ul>
-            <li
-              v-for="(item, index) in planeArr"
-              :key="index"
-              v-show="item.active"
-            >
+            <li v-for="(item, index) in planeArr" :key="index" v-show="item.active">
               <img :src="item.src" alt="" />
             </li>
             <div class="close" @click="hidePlaneInfoDailog"></div>
@@ -91,12 +55,8 @@
         </div>
         <div class="image_header">
           <ul>
-            <li
-              v-for="(item, index) in planeArr"
-              :key="index"
-              :class="{ active: item.active }"
-              @click="choosePlane(index)"
-            >
+            <li v-for="(item, index) in planeArr" :key="index" :class="{ active: item.active }"
+              @click="choosePlane(index)">
               {{ item.name }}
             </li>
           </ul>
@@ -105,18 +65,12 @@
     </van-popup>
 
     <!-- 展示帮助 -->
-    <van-popup
-      v-model:show="helpShow"
-      class="help_popup"
-      :style="{
-        height: '180px',
-        width: '75%',
-        top: '50%',
-        background: 'transparent',
-      }"
-      :close-on-click-overlay="false"
-      :closed="hideHelpInfoDailog"
-    >
+    <van-popup v-model:show="helpShow" class="help_popup" :style="{
+      height: '180px',
+      width: '75%',
+      top: '50%',
+      background: 'transparent',
+    }" :close-on-click-overlay="false" :closed="hideHelpInfoDailog">
       <div class="help_container">
         <div class="header">提示</div>
         <div class="content">
@@ -128,63 +82,35 @@
     </van-popup>
 
     <!-- 展示点位可办事项 -->
-    <van-popup
-      v-model:show="doThingShow"
-      class="doThing_popup"
-      :style="{ background: 'transparent' }"
-      :close-on-click-overlay="false"
-      :closed="hidePointInfoDailog"
-    >
+    <van-popup v-model:show="doThingShow" class="doThing_popup" :style="{ background: 'transparent' }"
+      :close-on-click-overlay="false" :closed="hidePointInfoDailog">
       <div class="content">
-        <div
-          class="doThingFirstContent"
-          v-if="
-            doThingFirst.length != 0 &&
-            Object.getOwnPropertyNames(doThingSecond).length == 0
-          "
-        >
+        <div class="doThingFirstContent" v-if="doThingFirst.length != 0 &&
+          Object.getOwnPropertyNames(doThingSecond).length == 0
+          ">
           <div class="header">部门</div>
           <div class="list">
             <ul>
-              <li
-                v-for="(item, index) in doThingFirst"
-                :key="index"
-                @click="chooseDBSecond(item)"
-              >
+              <li v-for="(item, index) in doThingFirst" :key="index" @click="chooseDBSecond(item)">
                 <span>{{ item.unit }}</span>
                 <span v-if="item.chiles">({{ item.chiles.length }})</span>
               </li>
             </ul>
           </div>
         </div>
-        <div
-          class="doThingSecondContent"
-          v-if="Object.getOwnPropertyNames(doThingSecond).length != 0"
-        >
+        <div class="doThingSecondContent" v-if="Object.getOwnPropertyNames(doThingSecond).length != 0">
           <div class="header">青浦区{{ doThingSecond.unit }}</div>
           <div class="list">
             <van-collapse v-model="activeNames" accordion>
               <div v-for="(item, index) in doThingSecond.chiles" :key="index">
-                <van-collapse-item
-                  :title="item.name"
-                  :name="index + 1 + ''"
-                  v-if="item.chiles[0].name.length != 0"
-                >
+                <van-collapse-item :title="item.name" :name="index + 1 + ''" v-if="item.chiles[0].name.length != 0">
                   <ul>
-                    <li
-                      v-for="(item_, index_) in item.chiles"
-                      :key="index_"
-                      @click="searchInfoAndJump(item_)"
-                    >
+                    <li v-for="(item_, index_) in item.chiles" :key="index_" @click="searchInfoAndJump(item_)">
                       {{ item_.name }}
                     </li>
                   </ul>
                 </van-collapse-item>
-                <span
-                  class="item"
-                  @click="searchInfoAndJump(item.chiles[0])"
-                  v-else
-                >
+                <span class="item" @click="searchInfoAndJump(item.chiles[0])" v-else>
                   {{ item.name }}
                 </span>
               </div>
@@ -195,23 +121,13 @@
 
       <div class="close" @click="closeDoThingPopup"></div>
 
-      <div
-        class="back"
-        @click="backDoThingPopup"
-        v-if="Object.getOwnPropertyNames(doThingSecond).length != 0"
-      ></div>
+      <div class="back" @click="backDoThingPopup" v-if="Object.getOwnPropertyNames(doThingSecond).length != 0"></div>
     </van-popup>
 
     <!-- 事项库 -->
-    <van-popup
-      v-model:show="showEventState"
-      class="event_popup"
-      :style="{
-        background: 'transparent',
-      }"
-      :close-on-click-overlay="false"
-      :closed="hideEventListDailog"
-    >
+    <van-popup v-model:show="showEventState" class="event_popup" :style="{
+      background: 'transparent',
+    }" :close-on-click-overlay="false" :closed="hideEventListDailog">
       <div class="event_container_event">
         <div class="close" @click="hideEventListDailog"></div>
         <div class="paramsBox">
@@ -225,23 +141,14 @@
         </div>
 
         <p v-for="(item, index) in eventData.data" :key="'event_' + index">
-          <span
-            v-if="
-              (item.link_ck || item.jsfs_ck) && (item.link_ws || item.jsfs_ws)
-            "
-            @click="windowOpenNewPage(item.link_ws || item.jsfs_ws)"
-            >{{ item.link_ck || item.jsfs_ck }}</span
-          >
+          <span v-if="(item.link_ck || item.jsfs_ck) && (item.link_ws || item.jsfs_ws)
+            " @click="windowOpenNewPage(item.link_ws || item.jsfs_ws)">{{ item.link_ck || item.jsfs_ck }}</span>
         </p>
       </div>
     </van-popup>
 
-    <van-popup v-model:show="tipsShow" class="tips"
-      ><van-icon
-        name="warning-o"
-        style="color: red; margin-right: 5px"
-      />当前选项暂不支持跳转</van-popup
-    >
+    <van-popup v-model:show="tipsShow" class="tips"><van-icon name="warning-o"
+        style="color: red; margin-right: 5px" />当前选项暂不支持跳转</van-popup>
 
     <!-- 视频帮办 -->
     <van-popup v-model:show="videoHelpShow" class="videoHelp">
@@ -252,7 +159,7 @@
 </template>
 
 <script>
-import { get,postform } from "../utils/request.js";
+import { get, postform } from "../utils/request.js";
 // import api from "@/api/content";
 // import { postform } from "../utils/request.js";
 
@@ -580,7 +487,7 @@ export default {
           roll: systemConfig.mapDefault.roll,
           time: 1,
           pitchAdjustHeight: 1000,
-          callback: function () {},
+          callback: function () { },
         }).then(() => {
           resolve();
         });
@@ -713,12 +620,10 @@ export default {
           ) {
             document.getElementsByClassName(item.id)[0].style.display = "block";
             if (!document.getElementsByClassName(item.id)) return;
-            document.getElementsByClassName(item.id)[0].style.top = `${
-              canvasPosition.y - 15
-            }px`;
-            document.getElementsByClassName(item.id)[0].style.left = `${
-              canvasPosition.x - 15
-            }px`;
+            document.getElementsByClassName(item.id)[0].style.top = `${canvasPosition.y - 15
+              }px`;
+            document.getElementsByClassName(item.id)[0].style.left = `${canvasPosition.x - 15
+              }px`;
           } else {
             document.getElementsByClassName(item.id)[0].style.display = "none";
           }
@@ -825,8 +730,15 @@ export default {
       // }, 100);
 
       // this.$stroe.commit("changeJumpUrl", url);
-      this.$store.commit("changeJumpUrl", url);
-      this.$store.commit("changeIframeJudge", true);
+      // this.$store.commit("changeJumpUrl", url);
+      // this.$store.commit("changeIframeJudge", true);
+
+      if (this.$store.state.IsPC) {
+        let openUrl = url;
+        window.open(openUrl, "_blank");
+      } else {
+        window.location.href = url;
+      }
     },
 
     // 点位触发事件
@@ -869,7 +781,7 @@ export default {
               // closeHull(item.camera.sceneType);
               showTitle(item.details.areaName);
             },
-          }).then(() => {});
+          }).then(() => { });
           break;
         case 5:
           // $.getJSON(item.json, function (arr) {
@@ -884,14 +796,14 @@ export default {
         case 6:
           // 打开iframe
 
-          // if (this.$store.state.IsPC) {
-          //   let openUrl = item.pc_url ? item.pc_url : item.url;
-          //   window.open(openUrl, "_blank");
-          // } else {
-          //   window.location.href = item.pc_url ? item.pc_url : item.url;
-          // }
-          this.videoHelpUrl = item.url;
-          this.videoHelpShow = true;
+          if (this.$store.state.IsPC) {
+            let openUrl = item.pc_url ? item.pc_url : item.url;
+            window.open(openUrl, "_blank");
+          } else {
+            window.location.href = item.pc_url ? item.pc_url : item.url;
+          }
+          // this.videoHelpUrl = item.url;
+          // this.videoHelpShow = true;
           break;
         default:
           break;
@@ -962,7 +874,7 @@ export default {
         time: 1,
         pitchAdjustHeight: 1000,
         details: item,
-        callback: function () {},
+        callback: function () { },
       }).then(() => {
         // resolve();
       });
@@ -1127,73 +1039,61 @@ export default {
 
       &:nth-child(1) {
         p {
-          background: url(~@/assets/img/tool/new_tb/hotpoint.png) center
-            center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/hotpoint.png) center center/100% 100% no-repeat;
         }
 
         &.active p {
-          background: url(~@/assets/img/tool/new_tb/hotpoint_active.png) center
-            center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/hotpoint_active.png) center center/100% 100% no-repeat;
         }
       }
 
       &:nth-child(2) {
         p {
-          background: url(~@/assets/img/tool/new_tb/indexes.png) center
-            center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/indexes.png) center center/100% 100% no-repeat;
         }
 
         &.active p {
-          background: url(~@/assets/img/tool/new_tb/indexes_active.png) center
-            center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/indexes_active.png) center center/100% 100% no-repeat;
         }
       }
 
       &:nth-child(3) {
         p {
-          background: url(~@/assets/img/tool/new_tb/pan.png) center center/100%
-            100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/pan.png) center center/100% 100% no-repeat;
         }
 
         &.active p {
-          background: url(~@/assets/img/tool/new_tb/pan_active.png) center
-            center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/pan_active.png) center center/100% 100% no-repeat;
         }
       }
 
       &:nth-child(4) {
         p {
-          background: url(~@/assets/img/tool/new_tb/reposition.png) center
-            center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/reposition.png) center center/100% 100% no-repeat;
         }
 
         &.active p {
-          background: url(~@/assets/img/tool/new_tb/reposition_active.png)
-            center center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/reposition_active.png) center center/100% 100% no-repeat;
         }
       }
 
       &:nth-child(5) {
         p {
-          background: url(~@/assets/img/tool/new_tb/plan.png) center center/100%
-            100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/plan.png) center center/100% 100% no-repeat;
         }
 
         &.active p {
-          background: url(~@/assets/img/tool/new_tb/plan_active.png) center
-            center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/plan_active.png) center center/100% 100% no-repeat;
         }
       }
 
       &:nth-child(6) {
         p {
-          background: url(~@/assets/img/tool/new_tb/event_library.png) center
-            center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/event_library.png) center center/100% 100% no-repeat;
         }
 
         &.active p {
-          background: url(~@/assets/img/tool/new_tb/event_library_active.png)
-            center center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/event_library_active.png) center center/100% 100% no-repeat;
         }
       }
     }
@@ -1202,12 +1102,10 @@ export default {
   .help {
     width: 50px;
     height: 50px;
-    background: url(~@/assets/img/tool/new_tb/help.png) center center / 100%
-      100% no-repeat;
+    background: url(~@/assets/img/tool/new_tb/help.png) center center / 100% 100% no-repeat;
 
     &.active {
-      background: url(~@/assets/img/tool/new_tb/help_active.png) center
-        center/100% 100% no-repeat;
+      background: url(~@/assets/img/tool/new_tb/help_active.png) center center/100% 100% no-repeat;
     }
   }
 
@@ -1238,8 +1136,7 @@ export default {
           text-align: center;
           color: #ffffff;
           margin: 21px auto;
-          background: url(~@/assets/img/tool/indexes_header.png) center center /
-            100% 100% no-repeat;
+          background: url(~@/assets/img/tool/indexes_header.png) center center / 100% 100% no-repeat;
         }
 
         .list_container {
@@ -1285,8 +1182,7 @@ export default {
       width: 32px;
       height: 32px;
       margin: 8px 8px;
-      background: url(~@/assets/img/tool/close.png) center center / 100% 100%
-        no-repeat;
+      background: url(~@/assets/img/tool/close.png) center center / 100% 100% no-repeat;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1320,8 +1216,7 @@ export default {
       width: 32px;
       height: 32px;
       margin: 8px 8px;
-      background: url(~@/assets/img/tool/close.png) center center / 100% 100%
-        no-repeat;
+      background: url(~@/assets/img/tool/close.png) center center / 100% 100% no-repeat;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1396,8 +1291,7 @@ export default {
       width: 32px;
       height: 32px;
       margin: 8px 8px;
-      background: url(~@/assets/img/tool/close.png) center center / 100% 100%
-        no-repeat;
+      background: url(~@/assets/img/tool/close.png) center center / 100% 100% no-repeat;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1407,6 +1301,7 @@ export default {
   :deep(.event_popup) {
     width: 80vw;
     height: 80vw;
+
     .event_container_event {
       padding: 1.5rem 1rem;
       height: calc(100% - 3rem);
@@ -1501,13 +1396,13 @@ export default {
         }
       }
     }
+
     .close {
       width: 16px;
       height: 16px;
       margin: 4px 4px;
       // margin-right: 10px;
-      background: url(~@/assets/img/tool/close.png) center center / 100% 100%
-        no-repeat;
+      background: url(~@/assets/img/tool/close.png) center center / 100% 100% no-repeat;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1555,8 +1450,7 @@ export default {
       width: 16px;
       height: 16px;
       margin: 4px 4px;
-      background: url(~@/assets/img/tool/close.png) center center / 100% 100%
-        no-repeat;
+      background: url(~@/assets/img/tool/close.png) center center / 100% 100% no-repeat;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1610,16 +1504,14 @@ export default {
               height: 2px;
               width: 120px;
               position: absolute;
-              background: url(~@/assets/img/tool/indexes_point_bottom.png)
-                center center / 100% 100% no-repeat;
+              background: url(~@/assets/img/tool/indexes_point_bottom.png) center center / 100% 100% no-repeat;
               bottom: 0px;
               left: 15px;
             }
 
             &.active {
               color: #ffc44d;
-              background: url(~@/assets/img/tool/indexes_point_active.png)
-                center center / 100% 100% no-repeat;
+              background: url(~@/assets/img/tool/indexes_point_active.png) center center / 100% 100% no-repeat;
 
               &::after {
                 display: none;
@@ -1666,10 +1558,12 @@ export default {
                 padding: 10px 0px;
                 width: calc(100% - 32px);
                 border-bottom: 1px solid #ffffff;
+
                 .van-cell__title {
                   font-size: 32px;
                   line-height: 40px;
                 }
+
                 .van-cell__right-icon:before {
                   color: #ffffff;
                 }
@@ -1703,8 +1597,7 @@ export default {
       width: 32px;
       height: 32px;
       margin: 8px 8px;
-      background: url(~@/assets/img/tool/close.png) center center / 100% 100%
-        no-repeat;
+      background: url(~@/assets/img/tool/close.png) center center / 100% 100% no-repeat;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1714,8 +1607,7 @@ export default {
       width: 40px;
       height: 40px;
       margin: 8px 8px;
-      background: url(~@/assets/img/tool/back.png) center center / 100% 100%
-        no-repeat;
+      background: url(~@/assets/img/tool/back.png) center center / 100% 100% no-repeat;
       position: absolute;
       top: 0px;
       left: 0px;
@@ -1751,8 +1643,7 @@ export default {
     width: 64px;
     height: 64px;
     margin: 10px 30px;
-    background: #c5c5c5 url(~@/assets/img/tool/close.png) center center / 60%
-      60% no-repeat;
+    background: #c5c5c5 url(~@/assets/img/tool/close.png) center center / 60% 60% no-repeat;
     position: absolute;
     top: 0px;
     right: 0px;

+ 2 - 1
src/components2/JumpWeb.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="iframeContent" v-show="show">
         <div class="back" @click="back"></div>
-        <iframe :src="'https://www.baidu.com/s?ie=utf8&oe=utf8&tn=87048150_dg&ch=1&wd=vd'" frameborder="0"></iframe>
+        <iframe :src="url" frameborder="0"></iframe>
     </div>
 </template>
 
@@ -46,6 +46,7 @@ export default {
     width: 100%;
     height: 100%;
     z-index: 100;
+    background: #ffffff;
 
     iframe {
         width: 100%;

+ 86 - 198
src/components2/Tool.vue

@@ -1,48 +1,26 @@
 <template>
   <div class="tool">
     <ul class="func">
-      <li
-        v-for="(item, index) in funcList"
-        :key="index"
-        :class="{ active: item.active }"
-        @click="toolClickHandle(item)"
-      >
+      <li v-for="(item, index) in funcList" :key="index" :class="{ active: item.active }" @click="toolClickHandle(item)">
         <p></p>
         <!-- {{ item.label }} -->
       </li>
     </ul>
-    <div
-      :class="{ help: true, active: helpActive }"
-      v-show="false"
-      @click="showHelp"
-    ></div>
+    <div :class="{ help: true, active: helpActive }" v-show="false" @click="showHelp"></div>
 
     <!-- 展示索引页面 -->
-    <van-popup
-      v-model:show="indexesShow"
-      :class="'indexesListContent'"
-      :style="{ background: 'transparent' }"
-      :close-on-click-overlay="false"
-      :closed="hideIndexesInfoDailog"
-    >
+    <van-popup v-model:show="indexesShow" :class="'indexesListContent'" :style="{ background: 'transparent' }"
+      :close-on-click-overlay="false" :closed="hideIndexesInfoDailog">
       <div class="indexesList">
         <div class="listContent">
           <div class="header"></div>
           <div class="list_container">
             <div>
-              <div
-                class="first_content"
-                v-for="(item, index) in cameraInfo"
-                :key="index"
-              >
+              <div class="first_content" v-for="(item, index) in cameraInfo" :key="index">
                 <div class="title">{{ item.name }}</div>
                 <ul>
-                  <li
-                    v-for="(item_, index_) in item.children"
-                    :key="index_"
-                    :class="{ active: item_.active }"
-                    @click="changeView(item_)"
-                  >
+                  <li v-for="(item_, index_) in item.children" :key="index_" :class="{ active: item_.active }"
+                    @click="changeView(item_)">
                     {{ item_.name }}
                   </li>
                 </ul>
@@ -55,13 +33,8 @@
     </van-popup>
 
     <!-- 展示点位文字信息 -->
-    <van-popup
-      v-model:show="pointShow"
-      class="point_popup"
-      :style="{ background: 'transparent' }"
-      :close-on-click-overlay="false"
-      :closed="hidePointInfoDailog"
-    >
+    <van-popup v-model:show="pointShow" class="point_popup" :style="{ background: 'transparent' }"
+      :close-on-click-overlay="false" :closed="hidePointInfoDailog">
       <div class="pointInfoContent">
         <div v-html="pointInfos"></div>
       </div>
@@ -69,21 +42,12 @@
     </van-popup>
 
     <!-- 展示平面图 -->
-    <van-popup
-      v-model:show="planeShow"
-      class="plane_popup"
-      :style="{ background: 'transparent' }"
-      :close-on-click-overlay="false"
-      :closed="hidePlaneInfoDailog"
-    >
+    <van-popup v-model:show="planeShow" class="plane_popup" :style="{ background: 'transparent' }"
+      :close-on-click-overlay="false" :closed="hidePlaneInfoDailog">
       <div class="plane_container">
         <div class="image_container">
           <ul>
-            <li
-              v-for="(item, index) in planeArr"
-              :key="index"
-              v-show="item.active"
-            >
+            <li v-for="(item, index) in planeArr" :key="index" v-show="item.active">
               <img :src="item.src" alt="" />
             </li>
             <div class="close" @click="hidePlaneInfoDailog"></div>
@@ -91,12 +55,8 @@
         </div>
         <div class="image_header">
           <ul>
-            <li
-              v-for="(item, index) in planeArr"
-              :key="index"
-              :class="{ active: item.active }"
-              @click="choosePlane(index)"
-            >
+            <li v-for="(item, index) in planeArr" :key="index" :class="{ active: item.active }"
+              @click="choosePlane(index)">
               {{ item.name }}
             </li>
           </ul>
@@ -105,18 +65,12 @@
     </van-popup>
 
     <!-- 展示帮助 -->
-    <van-popup
-      v-model:show="helpShow"
-      class="help_popup"
-      :style="{
-        height: '180px',
-        width: '75%',
-        top: '50%',
-        background: 'transparent',
-      }"
-      :close-on-click-overlay="false"
-      :closed="hideHelpInfoDailog"
-    >
+    <van-popup v-model:show="helpShow" class="help_popup" :style="{
+      height: '180px',
+      width: '75%',
+      top: '50%',
+      background: 'transparent',
+    }" :close-on-click-overlay="false" :closed="hideHelpInfoDailog">
       <div class="help_container">
         <div class="header">提示</div>
         <div class="content">
@@ -128,63 +82,35 @@
     </van-popup>
 
     <!-- 展示点位可办事项 -->
-    <van-popup
-      v-model:show="doThingShow"
-      class="doThing_popup"
-      :style="{ background: 'transparent' }"
-      :close-on-click-overlay="false"
-      :closed="hidePointInfoDailog"
-    >
+    <van-popup v-model:show="doThingShow" class="doThing_popup" :style="{ background: 'transparent' }"
+      :close-on-click-overlay="false" :closed="hidePointInfoDailog">
       <div class="content">
-        <div
-          class="doThingFirstContent"
-          v-if="
-            doThingFirst.length != 0 &&
-            Object.getOwnPropertyNames(doThingSecond).length == 0
-          "
-        >
+        <div class="doThingFirstContent" v-if="doThingFirst.length != 0 &&
+          Object.getOwnPropertyNames(doThingSecond).length == 0
+          ">
           <div class="header">部门</div>
           <div class="list">
             <ul>
-              <li
-                v-for="(item, index) in doThingFirst"
-                :key="index"
-                @click="chooseDBSecond(item)"
-              >
+              <li v-for="(item, index) in doThingFirst" :key="index" @click="chooseDBSecond(item)">
                 <span>{{ item.unit }}</span>
                 <span v-if="item.chiles">({{ item.chiles.length }})</span>
               </li>
             </ul>
           </div>
         </div>
-        <div
-          class="doThingSecondContent"
-          v-if="Object.getOwnPropertyNames(doThingSecond).length != 0"
-        >
+        <div class="doThingSecondContent" v-if="Object.getOwnPropertyNames(doThingSecond).length != 0">
           <div class="header">青浦区{{ doThingSecond.unit }}</div>
           <div class="list">
             <van-collapse v-model="activeNames" accordion>
               <div v-for="(item, index) in doThingSecond.chiles" :key="index">
-                <van-collapse-item
-                  :title="item.name"
-                  :name="index + 1 + ''"
-                  v-if="item.chiles[0].name.length != 0"
-                >
+                <van-collapse-item :title="item.name" :name="index + 1 + ''" v-if="item.chiles[0].name.length != 0">
                   <ul>
-                    <li
-                      v-for="(item_, index_) in item.chiles"
-                      :key="index_"
-                      @click="searchInfoAndJump(item_)"
-                    >
+                    <li v-for="(item_, index_) in item.chiles" :key="index_" @click="searchInfoAndJump(item_)">
                       {{ item_.name }}
                     </li>
                   </ul>
                 </van-collapse-item>
-                <span
-                  class="item"
-                  @click="searchInfoAndJump(item.chiles[0])"
-                  v-else
-                >
+                <span class="item" @click="searchInfoAndJump(item.chiles[0])" v-else>
                   {{ item.name }}
                 </span>
               </div>
@@ -195,23 +121,13 @@
 
       <div class="close" @click="closeDoThingPopup"></div>
 
-      <div
-        class="back"
-        @click="backDoThingPopup"
-        v-if="Object.getOwnPropertyNames(doThingSecond).length != 0"
-      ></div>
+      <div class="back" @click="backDoThingPopup" v-if="Object.getOwnPropertyNames(doThingSecond).length != 0"></div>
     </van-popup>
 
     <!-- 事项库 -->
-    <van-popup
-      v-model:show="showEventState"
-      class="plane_popup"
-      :style="{
-        background: 'transparent',
-      }"
-      :close-on-click-overlay="false"
-      :closed="hideEventListDailog"
-    >
+    <van-popup v-model:show="showEventState" class="plane_popup" :style="{
+      background: 'transparent',
+    }" :close-on-click-overlay="false" :closed="hideEventListDailog">
       <div class="plane_container_event">
         <div class="close" @click="hideEventListDailog"></div>
         <div class="paramsBox">
@@ -225,23 +141,14 @@
         </div>
 
         <p v-for="(item, index) in eventData.data" :key="'event_' + index">
-          <span
-            v-if="
-              (item.link_ck || item.jsfs_ck) && (item.link_ws || item.jsfs_ws)
-            "
-            @click="windowOpenNewPage(item.link_ws || item.jsfs_ws)"
-            >{{ item.link_ck || item.jsfs_ck }}</span
-          >
+          <span v-if="(item.link_ck || item.jsfs_ck) && (item.link_ws || item.jsfs_ws)
+            " @click="windowOpenNewPage(item.link_ws || item.jsfs_ws)">{{ item.link_ck || item.jsfs_ck }}</span>
         </p>
       </div>
     </van-popup>
 
-    <van-popup v-model:show="tipsShow" class="tips"
-      ><van-icon
-        name="warning-o"
-        style="color: red; margin-right: 5px"
-      />当前选项暂不支持跳转</van-popup
-    >
+    <van-popup v-model:show="tipsShow" class="tips"><van-icon name="warning-o"
+        style="color: red; margin-right: 5px" />当前选项暂不支持跳转</van-popup>
 
     <!-- 视频帮办 -->
     <van-popup v-model:show="videoHelpShow" class="videoHelp">
@@ -592,7 +499,7 @@ export default {
           roll: systemConfig.mapDefault.roll,
           time: 1,
           pitchAdjustHeight: 1000,
-          callback: function () {},
+          callback: function () { },
         }).then(() => {
           resolve();
         });
@@ -725,12 +632,10 @@ export default {
           ) {
             document.getElementsByClassName(item.id)[0].style.display = "block";
             if (!document.getElementsByClassName(item.id)) return;
-            document.getElementsByClassName(item.id)[0].style.top = `${
-              canvasPosition.y - 15
-            }px`;
-            document.getElementsByClassName(item.id)[0].style.left = `${
-              canvasPosition.x - 15
-            }px`;
+            document.getElementsByClassName(item.id)[0].style.top = `${canvasPosition.y - 15
+              }px`;
+            document.getElementsByClassName(item.id)[0].style.left = `${canvasPosition.x - 15
+              }px`;
           } else {
             document.getElementsByClassName(item.id)[0].style.display = "none";
           }
@@ -838,8 +743,15 @@ export default {
       // }, 100);
 
       // this.$stroe.commit("changeJumpUrl", url);
-      this.$store.commit("changeJumpUrl", url);
-      this.$store.commit("changeIframeJudge", true);
+      // this.$store.commit("changeJumpUrl", url);
+      // this.$store.commit("changeIframeJudge", true);
+
+      if (this.$store.state.IsPC) {
+        let openUrl = url;
+        window.open(openUrl, "_blank");
+      } else {
+        window.location.href = url;
+      }
     },
 
     // 点位触发事件
@@ -882,7 +794,7 @@ export default {
               // closeHull(item.camera.sceneType);
               showTitle(item.details.areaName);
             },
-          }).then(() => {});
+          }).then(() => { });
           break;
         case 5:
           // $.getJSON(item.json, function (arr) {
@@ -897,14 +809,14 @@ export default {
         case 6:
           // 打开iframe
 
-          // if (this.$store.state.IsPC) {
-          //   let openUrl = item.pc_url ? item.pc_url : item.url;
-          //   window.open(openUrl, "_blank");
-          // } else {
-          //   window.location.href = item.pc_url ? item.pc_url : item.url;
-          // }
-          this.videoHelpUrl = item.url;
-          this.videoHelpShow = true;
+          if (this.$store.state.IsPC) {
+            let openUrl = item.pc_url ? item.pc_url : item.url;
+            window.open(openUrl, "_blank");
+          } else {
+            window.location.href = item.pc_url ? item.pc_url : item.url;
+          }
+          // this.videoHelpUrl = item.url;
+          // this.videoHelpShow = true;
           break;
         default:
           break;
@@ -975,7 +887,7 @@ export default {
         time: 1,
         pitchAdjustHeight: 1000,
         details: item,
-        callback: function () {},
+        callback: function () { },
       }).then(() => {
         // resolve();
       });
@@ -1114,73 +1026,61 @@ export default {
 
       &:nth-child(1) {
         p {
-          background: url(~@/assets/img/tool/new_tb/hotpoint.png) center
-            center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/hotpoint.png) center center/100% 100% no-repeat;
         }
 
         &.active p {
-          background: url(~@/assets/img/tool/new_tb/hotpoint_active.png) center
-            center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/hotpoint_active.png) center center/100% 100% no-repeat;
         }
       }
 
       &:nth-child(2) {
         p {
-          background: url(~@/assets/img/tool/new_tb/indexes.png) center
-            center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/indexes.png) center center/100% 100% no-repeat;
         }
 
         &.active p {
-          background: url(~@/assets/img/tool/new_tb/indexes_active.png) center
-            center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/indexes_active.png) center center/100% 100% no-repeat;
         }
       }
 
       &:nth-child(3) {
         p {
-          background: url(~@/assets/img/tool/new_tb/pan.png) center center/100%
-            100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/pan.png) center center/100% 100% no-repeat;
         }
 
         &.active p {
-          background: url(~@/assets/img/tool/new_tb/pan_active.png) center
-            center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/pan_active.png) center center/100% 100% no-repeat;
         }
       }
 
       &:nth-child(4) {
         p {
-          background: url(~@/assets/img/tool/new_tb/reposition.png) center
-            center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/reposition.png) center center/100% 100% no-repeat;
         }
 
         &.active p {
-          background: url(~@/assets/img/tool/new_tb/reposition_active.png)
-            center center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/reposition_active.png) center center/100% 100% no-repeat;
         }
       }
 
       &:nth-child(5) {
         p {
-          background: url(~@/assets/img/tool/new_tb/plan.png) center center/100%
-            100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/plan.png) center center/100% 100% no-repeat;
         }
 
         &.active p {
-          background: url(~@/assets/img/tool/new_tb/plan_active.png) center
-            center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/plan_active.png) center center/100% 100% no-repeat;
         }
       }
 
       &:nth-child(6) {
         p {
-          background: url(~@/assets/img/tool/new_tb/event_library.png) center
-            center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/event_library.png) center center/100% 100% no-repeat;
         }
 
         &.active p {
-          background: url(~@/assets/img/tool/new_tb/event_library_active.png)
-            center center/100% 100% no-repeat;
+          background: url(~@/assets/img/tool/new_tb/event_library_active.png) center center/100% 100% no-repeat;
         }
       }
     }
@@ -1189,12 +1089,10 @@ export default {
   .help {
     width: 50px;
     height: 50px;
-    background: url(~@/assets/img/tool/new_tb/help.png) center center / 100%
-      100% no-repeat;
+    background: url(~@/assets/img/tool/new_tb/help.png) center center / 100% 100% no-repeat;
 
     &.active {
-      background: url(~@/assets/img/tool/new_tb/help_active.png) center
-        center/100% 100% no-repeat;
+      background: url(~@/assets/img/tool/new_tb/help_active.png) center center/100% 100% no-repeat;
     }
   }
 
@@ -1225,8 +1123,7 @@ export default {
           text-align: center;
           color: #ffffff;
           margin: 21px auto;
-          background: url(~@/assets/img/tool/indexes_header.png) center center /
-            100% 100% no-repeat;
+          background: url(~@/assets/img/tool/indexes_header.png) center center / 100% 100% no-repeat;
         }
 
         .list_container {
@@ -1274,8 +1171,7 @@ export default {
       width: 16px;
       height: 16px;
       margin: 4px 4px;
-      background: url(~@/assets/img/tool/close.png) center center / 100% 100%
-        no-repeat;
+      background: url(~@/assets/img/tool/close.png) center center / 100% 100% no-repeat;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1309,8 +1205,7 @@ export default {
       width: 16px;
       height: 16px;
       margin: 4px 4px;
-      background: url(~@/assets/img/tool/close.png) center center / 100% 100%
-        no-repeat;
+      background: url(~@/assets/img/tool/close.png) center center / 100% 100% no-repeat;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1433,8 +1328,7 @@ export default {
       height: 16px;
       margin: 4px 4px;
       margin-right: 10px;
-      background: url(~@/assets/img/tool/close.png) center center / 100% 100%
-        no-repeat;
+      background: url(~@/assets/img/tool/close.png) center center / 100% 100% no-repeat;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1482,8 +1376,7 @@ export default {
       width: 16px;
       height: 16px;
       margin: 4px 4px;
-      background: url(~@/assets/img/tool/close.png) center center / 100% 100%
-        no-repeat;
+      background: url(~@/assets/img/tool/close.png) center center / 100% 100% no-repeat;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1537,16 +1430,14 @@ export default {
               height: 2px;
               width: 120px;
               position: absolute;
-              background: url(~@/assets/img/tool/indexes_point_bottom.png)
-                center center / 100% 100% no-repeat;
+              background: url(~@/assets/img/tool/indexes_point_bottom.png) center center / 100% 100% no-repeat;
               bottom: 0px;
               left: 15px;
             }
 
             &.active {
               color: #ffc44d;
-              background: url(~@/assets/img/tool/indexes_point_active.png)
-                center center / 100% 100% no-repeat;
+              background: url(~@/assets/img/tool/indexes_point_active.png) center center / 100% 100% no-repeat;
 
               &::after {
                 display: none;
@@ -1635,8 +1526,7 @@ export default {
       width: 16px;
       height: 16px;
       margin: 4px 4px;
-      background: url(~@/assets/img/tool/close.png) center center / 100% 100%
-        no-repeat;
+      background: url(~@/assets/img/tool/close.png) center center / 100% 100% no-repeat;
       position: absolute;
       top: 0px;
       right: 0px;
@@ -1645,8 +1535,7 @@ export default {
     .back {
       width: 24px;
       height: 24px;
-      background: url(~@/assets/img/tool/back.png) center center / 100% 100%
-        no-repeat;
+      background: url(~@/assets/img/tool/back.png) center center / 100% 100% no-repeat;
       position: absolute;
       top: 0px;
       left: 0px;
@@ -1690,8 +1579,7 @@ export default {
     width: 32px;
     height: 32px;
     margin: 10px 20px;
-    background: #c5c5c5 url(~@/assets/img/tool/close.png) center center / 60%
-      60% no-repeat;
+    background: #c5c5c5 url(~@/assets/img/tool/close.png) center center / 60% 60% no-repeat;
     position: absolute;
     top: 0px;
     right: 0px;