From a58bada03b0bfe05085446c023d98536a3a08b85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Tue, 28 Jun 2022 13:46:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B9=BF=E8=A5=BF=E8=81=94?=
 =?UTF-8?q?=E9=80=9A=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/api/configManage.js             |  4 +-
 src/components/closePage.vue                  | 19 +++++---
 src/views/projectAdmin/projectIndex.vue       | 48 ++++++++++++-------
 .../projectFront/configManage/roleManage.vue  | 25 +++++-----
 .../projectFront/imgRanging/overview.vue      | 10 ++--
 5 files changed, 63 insertions(+), 43 deletions(-)

diff --git a/src/assets/js/api/configManage.js b/src/assets/js/api/configManage.js
index e1d0b135..26c43efd 100644
--- a/src/assets/js/api/configManage.js
+++ b/src/assets/js/api/configManage.js
@@ -52,4 +52,6 @@ export const editNoticeRemindSoundApi = data => post('xmgl/noticeRemindSound/edi
 // 编辑通知提示音信息
 export const deleteNoticeRemindSoundApi = data => post('xmgl/noticeRemindSound/delete', data);
 //列表查询通知提示音信息 
-export const selectNoticeRemindSoundApi = data => post('xmgl/noticeRemindSound/list', data);
\ No newline at end of file
+export const selectNoticeRemindSoundApi = data => post('xmgl/noticeRemindSound/list', data); 
+
+
diff --git a/src/components/closePage.vue b/src/components/closePage.vue
index 6b206e7e..cf00504e 100644
--- a/src/components/closePage.vue
+++ b/src/components/closePage.vue
@@ -18,13 +18,18 @@ export default {
     },
     methods:{
         closePage(){
-            console.log(this.$route.path)
-            if(this.$route.path.indexOf('/project/dataBoard') != -1 || this.$route.path.indexOf('/project/videoOverview') != -1 || this.$route.path.indexOf('/project/environmentalOverview') != -1 || this.$route.path.indexOf('/project/projectSummary') != -1 || this.$route.path.indexOf('/project/imgRanging') != -1 || this.$route.path.indexOf('/project/warningManage') != -1){
-                // console.log(window.location.href.split('#/')[0]+'#/projectIndex')
-                window.location.href = window.location.href.split('#/')[0] + '#/projectIndex'
-            } else{
-                window.history.back()
-            }
+            // console.log(this.$route.path)
+            // getDockingUrlApi().then((res)=>{
+            //     console.log('路径',res)
+            // })
+           
+            // if(this.$route.path.indexOf('/project/dataBoard') != -1 || this.$route.path.indexOf('/project/videoOverview') != -1 || this.$route.path.indexOf('/project/environmentalOverview') != -1 || this.$route.path.indexOf('/project/projectSummary') != -1 || this.$route.path.indexOf('/project/imgRanging') != -1 || this.$route.path.indexOf('/project/warningManage') != -1){
+            //     // console.log(window.location.href.split('#/')[0]+'#/projectIndex')
+            //     // window.location.href = window.location.href.split('#/')[0] + '#/projectIndex' //注释
+            // } else{
+            //     window.history.back()
+            // }
+            
         }
     },
     mounted() {
diff --git a/src/views/projectAdmin/projectIndex.vue b/src/views/projectAdmin/projectIndex.vue
index 03781bc7..97ef40e5 100644
--- a/src/views/projectAdmin/projectIndex.vue
+++ b/src/views/projectAdmin/projectIndex.vue
@@ -104,6 +104,7 @@
 </template>
 <script>
 import vhead from "@/components/header";
+import axios from 'axios'
 import { getProjectDetail } from "@/assets/js/api/baseInfo.js";
 import {
   getProjectModuleList,
@@ -112,6 +113,10 @@ import {
 import {
     getSafeyHatSessionApi
 } from '@/assets/js/api/demo'
+import {
+  getDockingUrlApi
+} from "@/assets/js/api/configManage";
+import Axios from "axios";
 export default {
   name: "projectIndex",
   components: { vhead },
@@ -165,27 +170,38 @@ export default {
             })
         },
     itemClick(item) {
-      console.log(item)
+      console.log('item',item)
       // console.log(item,this.$store.state.userInfo.account)
       if(item.moduleName == "智能安全帽系统"){
-         let NodeRSA = require("node-rsa");
-          //请求参数
-          let params = JSON.stringify({
-            account: this.$store.state.userInfo.account,
-            page_flag: 3,
-          });
-          //公钥
-          const pubKey = `
-      -----BEGIN PUBLIC KEY-----
-      MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcmP0ug4NTHwW2oeHxheZjmYPDxVGFP770eECdLwRtaH0pPWvsXG6MSO/kCzgjEVEo1K1bvRxkkasQRu02fhI+gsZa8wvVeo3s4zJDA48Oj99JAXsx56/WN1RlNh+tsXcH9oQWy3gbX5cDkheuVZj8gsV7Ez59Ucj4e78zNJrUDwIDAQAB
-      -----END PUBLIC KEY-----`;
+        this.getSafeyHatSession()
+      // 次数更改因为原来跳转的是星璇  无法显示 所以更改跳转到 润德 龙光同一个页面
+      //    let NodeRSA = require("node-rsa");
+      //     //请求参数
+      //     let params = JSON.stringify({
+      //       account: this.$store.state.userInfo.account,
+      //       page_flag: 3,
+      //     });
+      //     //公钥
+      //     const pubKey = `
+      // -----BEGIN PUBLIC KEY-----
+      // MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcmP0ug4NTHwW2oeHxheZjmYPDxVGFP770eECdLwRtaH0pPWvsXG6MSO/kCzgjEVEo1K1bvRxkkasQRu02fhI+gsZa8wvVeo3s4zJDA48Oj99JAXsx56/WN1RlNh+tsXcH9oQWy3gbX5cDkheuVZj8gsV7Ez59Ucj4e78zNJrUDwIDAQAB
+      // -----END PUBLIC KEY-----`;
 
-        var publicKey = new NodeRSA(pubKey);
-        var async_key = publicKey.encrypt(params, 'base64')
+      //   var publicKey = new NodeRSA(pubKey);
+      //   var async_key = publicKey.encrypt(params, 'base64')
         
-        window.open("http://58.210.96.206:91/async_danzhou.html?async_key="+async_key)
-        // window.location.href = "http://58.210.96.206:91/async_danzhou.html?async_key="+async_key;
+      //   window.open("http://58.210.96.206:91/async_danzhou.html?async_key="+async_key)
+      //   // window.location.href = "http://58.210.96.206:91/async_danzhou.html?async_key="+async_key;
 
+      }
+      if(item.moduleName == "全景成像测距"){
+        axios({
+          method:"GET",
+          url:'http://139.9.66.234:18070/docking/url'
+        }).then((res)=>{
+          let toUrl = res.data[0]
+          window.open(toUrl)
+        })
       }
       if(item.moduleName == "智能穿戴管理系统"){
          this.getSafeyHatSession()
diff --git a/src/views/projectFront/configManage/roleManage.vue b/src/views/projectFront/configManage/roleManage.vue
index 89f3fa55..e99b63da 100644
--- a/src/views/projectFront/configManage/roleManage.vue
+++ b/src/views/projectFront/configManage/roleManage.vue
@@ -172,15 +172,14 @@
       <div class="dialog_content">
         <!-- default-expand-all -->
           <!-- <div>项目模块</div> -->
-          <!-- <div>
-            <el-checkbox v-model="checkAll" @change="selectAll">全选</el-checkbox>
-          </div> -->
+          <div>
+            <el-checkbox v-model="checkAll" @change="selectAll"></el-checkbox>全选
+          </div>
           <el-tree ref="tree"
             node-key="authorityId"
             :props="props"
             :data="projectMenus"
             show-checkbox
-
             @check-change="handleCheckChange"
           >
             <span class="custom-tree-node" slot-scope="{ node, data }">
@@ -499,16 +498,14 @@ export default {
       // console.log('选择',this.$refs.tree.getCheckedKeys());
     },
      // 全选反选
-    // selectAll(){
-    //   if(this.checkAll){
-    //     console.log('111111',this.$refs)
-    //       // this.$refs.tree.setCheckedNodes(this.projectMenus);
-    //   }else{
-    //     this.$nextTick(()=>{
-    //       this.$refs.tree.setCheckedNodes([])
-    //     })
-    //   }
-    // },
+    selectAll(){
+      // if(this.checkAll){
+      //   // console.log('111111',this.$refs)
+      //     this.$refs.tree.setCheckedNodes(this.projectMenus);
+      // }else{
+      //     this.$refs.tree.setCheckedKeys([])
+      // }
+    },
   },
 };
 </script>
diff --git a/src/views/projectFront/imgRanging/overview.vue b/src/views/projectFront/imgRanging/overview.vue
index 86d25f65..7b986459 100644
--- a/src/views/projectFront/imgRanging/overview.vue
+++ b/src/views/projectFront/imgRanging/overview.vue
@@ -2,15 +2,15 @@
     <div class="fullHeight imgRanging">
         <div class="imgBox">
             <img src="@/assets/images/qjcx.png" alt="">
-            <div class="closePage">
-                <closePage v-if="!isShowDialog"></closePage>
+            <div class="closePage" >
+                <!-- <closePage v-if="!isShowDialog"></closePage> -->
             </div>
-            <button class="add" @click="addHandler"></button>
+            <!-- <button class="add" @click="addHandler"></button> -->
         </div>
-        <div class="dialog" v-if="isShowDialog">
+        <!-- <div class="dialog" v-if="isShowDialog">
             <img src="@/assets/images/qjcx2.png" alt="">
             <button class="closeDialog" @click="closeDialog"></button>
-        </div>
+        </div> -->
     </div>
 </template>