Merge remote-tracking branch 'origin/visu_resources' into visu_resources

src/components/supermap.vue

@@ -1250,6 +1250,11 @@ export default {
     dropLocation: function(lat, lng) { //落点定位
       this.map.flyTo([lat, lng], 13, { duration: 2 })
     },
+    dropLocation: function(lat, lng,leve) { //落点定位
+      this.map.flyTo([lat, lng], leve, {
+        duration: 2
+      })
+    },
     dropLocation10: function(lat, lng) { //落点定位
       this.map.flyTo([lat, lng], 10, { duration: 2 })
     },

src/components/v-fastmenu.vue

@@ -83,6 +83,7 @@ import Cookies from 'js-cookie';
           this.phonenumber=response.data.phonenumber
           this.userId=response.data.userId
           Cookies.set('userId',response.data.userId);
+          Cookies.set('nickName',response.data.nickName);
         });
       },
       resetPwd(){

src/components/vBottomMenu.vue

@@ -434,17 +434,17 @@ export default {
           icon: 'iconfont sj-icon-clgj',
           click: 'editableLayers'
         },
-        {
-          name: '林班',
-          icon: 'iconfont sj-icon-lbzy',
-          click: 'forestban'
-        },
-
-        {
-          name: '林场',
-          icon: 'iconfont sj-icon-lczy',
-          click: 'forestchang'
-        },
+        // {
+        //   name: '林班',
+        //   icon: 'iconfont sj-icon-lbzy',
+        //   click: 'forestban'
+        // },
+        //
+        // {
+        //   name: '林场',
+        //   icon: 'iconfont sj-icon-lczy',
+        //   click: 'forestchang'
+        // },
         {
           name: '电视墙',
           icon: 'el-icon-s-grid',

src/views/eventdetailsdialog.vue

@@ -1024,6 +1024,8 @@ import {
   getDahuaVideoServer
 } from '@/api/dahua/dahua'
 import DHWs from '@/dahua/lib/DHWs'
+import { selectConfigKey } from "@/api/system/config";
+import Cookies from 'js-cookie';
 export default {
   dicts: ['task_source'],
   watch: {
@@ -2340,30 +2342,16 @@ export default {
       encrypt.setPublicKey(this.pubKey)
       return encrypt.encrypt(value)
     },
-    //加入华为视频会议方法
+    /** ----------------------------------海康摄像头预览结束------------------------------------- */
+    /** ----------------------------------视频会议开始------------------------------------- */
     joinMeeting(){
-      let eventId = this.eventId;
-      let subject = "视频会议";
-      let nickName;
-      getUserInfo().then(res => {
-        nickName = res.data.nickName;
-      });
-      hasConferences(eventId).then(res => {
-        let data = res.data;
-        /**如果没有正在开启的会议会返回空对象**/
-        if(res.code == 200 && Object.keys(data).length === 0){
-          createConferences(eventId,subject).then(res => {
-            let data = res.data;
-            if(res.code == 200){
-              window.open("/hwMeeting/meeting.html?nickName="+encodeURI(encodeURI(nickName))+"&conferenceID="+data.conferenceID+"&password="+data.password);
-            }
-          });
-        }else{
-          window.open("/hwMeeting/meeting.html?nickName="+encodeURI(encodeURI(nickName))+"&conferenceID="+data.conferenceID+"&password="+data.password);
-        }
-      });
+      let hwMeetingUrl;
+      selectConfigKey('hwMeetingUrl').then(res => {
+        hwMeetingUrl = res.data
+        window.open(hwMeetingUrl+"/"+this.eventId+"/"+this.eventName+"的会议"+"/"+Cookies.get("nickName"));
+      })
     }
-    /** ----------------------------------海康摄像头预览结束------------------------------------- */
+    /** ----------------------------------视频会议结束------------------------------------- */
   }
 }
 

src/views/forest.vue

@@ -252,7 +252,7 @@
                         <dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
                             <img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;" />
                             <div class="this-title">
-                                <span>曝光台</span>
+                                <span>超期事件</span>
                                 <dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;" />
                             </div>
                             <div class="i-list-con small-bottom-margin h-18">
@@ -289,7 +289,7 @@
                                     </el-input>
                                 </div>
                                 <div class="d-l-con padding-box nowrap" v-for="(item, index) in eventList"
-                                    @click="dropLocation(item.latitude, item.longitude)" data-html2canvas-ignore>
+                                    @click="dropLocation(item.latitude, item.longitude,item.eventCode)" data-html2canvas-ignore>
                                     <div class="bgt-img">
                                         <img v-if="item.picturePath != null && item.picturePath != '' && item.pictureType == 'image'"
                                             :src="item.picturePath" style="width: 93px;height: 64px" loading="lazy" />
@@ -639,8 +639,9 @@ export default {
         //     }
         //   })
         // },
-        dropLocation(lat, lng) {
-            this.$refs.supermap.dropLocation(lat, lng)
+        dropLocation(lat, lng,eventCode) {
+          this.$refs.supermap.dropLocation(lat, lng,18)
+          this.showEventDialog(eventCode)
         },
         showEventDialog(eventCode) {
             //事件信息弹出