视频模块修改

src/api/forest.js

@@ -276,8 +276,9 @@ export function userFeginlist(param) {
 // 会议添加联系人并发送短信
 export function sendMessage(param) {
   return request({
-    url: '/center-fire/VisuForestCloudMapController/sendMeetingMsg',
+    url: '/center-message/SendMessageController/sendMeetingMsg',
     method: 'post',
     data:param
   })
 }
+

src/api/meeting.js

@@ -1,25 +1,9 @@
 import request from '@/utils/request'
 
 // 查询该事件是否有会议
-export function hasConferences(eventId) {
+export function joinConferences(eventId, meetingSubject, userName) {
   return request({
-    url: '/center-event/hwMeeting/hasConferences?eventId=' + eventId,
-    method: 'post'
-  })
-}
-
-// 根据事件ID和标题创建会议
-export function createConferences(eventId, subject) {
-  return request({
-    url: '/center-event/hwMeeting/createConferences?eventId='+eventId+'&subject='+subject,
-    method: 'post'
-  })
-}
-
-// 获取登录人信息
-export function getUserInfo() {
-  return request({
-    url: '/center-event/hwMeeting/getUserInfo',
+    url: '/system/hwMeeting/joinConferences/'+eventId+'/'+meetingSubject+'/'+userName,
     method: 'get'
   })
 }

src/views/eventdetailsdialog.vue

@@ -1131,6 +1131,7 @@ import DHWs from '@/dahua/lib/DHWs'
 import { selectConfigKey } from "@/api/system/config";
 import TVWall from '@/components/TVWall.vue' //电视墙弹窗
 import Cookies from 'js-cookie';
+import {joinConferences} from "@/api/meeting";
 export default {
   dicts: ['task_source'],
   watch: {
@@ -2644,26 +2645,41 @@ export default {
       }
       const param = {centereventTDutySystemList:this.dutysystemTableData,eventCode:this.eventCode,eventName:this.eventName,eventId:this.eventId}
       sendMessage(param).then(res => {
-        this.$message.success(res.msg);
+        //this.$message.success(res.msg);
         this.dutysystemSelect(this.iconCurrentIndex, this.dutysystemDeptName, this.depteventId);
         this.showMeetingMsgDialog = false;
         this.joinMeeting();
       })
     },
-    joinMeeting(){
-      let hwMeetingUrl;
-      selectConfigKey('hwMeetingUrl').then(res => {
-        hwMeetingUrl = res.data
-        window.open(hwMeetingUrl+"/joinConferences/"+this.eventId+"/"+this.eventName+"的会议"+"/"+Cookies.get("nickName"));
+    joinMeeting() {
+      this.$message({
+        message: '正在启动云会议客户端，请稍候...',
+        type: 'success',
+      });
+      joinConferences(this.eventId, this.eventName + "的会议", Cookies.get("nickName")).then(res => {
+        if (res.code == 200) {
+          let conferenceID = res.data.info.conferenceID;
+          let password = res.data.info.password;
+          let nickName = res.data.nickName;
+          let nonce = res.data.nonce;
+          window.open("cloudlink://welinksoftclient/h5page?page=LoginAndJoinConf&server_url=meeting.huaweicloud.com&port=8443&conf_id=" + conferenceID + "&enter_code=" + password + "&name=" + nickName + "&open_mic=true&open_camera=false&nonce=" + nonce);
+        }
       })
     },
     Meeting() {//弹出发送会议短信弹窗
-      let param = { eventCode: this.eventCode }
-      centereventtdepteventList(param).then(res => {
-        this.depteventList = res.data
-        this.showMeetingMsgDialog = true
-        this.initDutysystemTableData();
-      })
+      let that = this;
+      that.$alert("如您已经安装请点击【确定】，如未安装可<a style='text-decoration:underline;color:blue;' href='http://172.18.1.37:15001/CLOUDMeeting_Win.exe'>点击此处</a>进行下载", '该功能需要使用云会议客户端', {
+        confirmButtonText: '确定',
+        dangerouslyUseHTMLString: true,
+        callback: action => {
+          let param = { eventCode: that.eventCode }
+          centereventtdepteventList(param).then(res => {
+            that.depteventList = res.data
+            that.showMeetingMsgDialog = true
+            that.initDutysystemTableData();
+          })
+        }
+      });
     },
     /** ----------------------------------视频会议结束------------------------------------- */
   }

src/views/firespread.vue

@@ -975,7 +975,7 @@ import areaSupermap from '@/components/supermap'//区域标记地图
 import TcPlayer from '@/components/TcPlayer' //视频预览
 import leftRightSwiperScroll from '@/components/leftRightSwiperScroll.vue';//事件中心底部资源内容溢出组件
 import {getIconBg} from '@/api/components/sookaMapIcon';//资源底色控制文件
-
+import {joinConferences} from "@/api/meeting";
 import {
   getEventDetail,
   sendEventLog,
@@ -2711,29 +2711,87 @@ 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;
+    /** ----------------------------------视频会议开始------------------------------------- */
+    sendMsg() {// 视频会议发送短信
+      let reg_user = /^[\u4e00-\u9fa5]{2,4}$/;    //2-4个中文字符正则
+      let reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;    //11位手机号码正则
+      for(let i in this.dutysystemTableData){
+        if(!reg_user.test(this.dutysystemTableData[i].name)){
+          this.$message.error(`请输入正确姓名!`)
+          return;
+        }
+        if(!reg_tel.test(this.dutysystemTableData[i].telphone)){
+          this.$message.error(`请输入正确手机号码!`)
+          return;
+        }
+
+        if(this.dutysystemTableData[i].id==null || this.dutysystemTableData[i].id==''){
+          this.dutysystemTableData[i].dept = this.dutysystemDeptName;
+          this.dutysystemTableData[i].depteventId = this.depteventId;
+        }
+      }
+      const param = {centereventTDutySystemList:this.dutysystemTableData,eventCode:this.eventCode,eventName:this.eventName,eventId:this.eventId}
+      sendMessage(param).then(res => {
+        //this.$message.success(res.msg);
+        this.dutysystemSelect(this.iconCurrentIndex, this.dutysystemDeptName, this.depteventId);
+        this.showMeetingMsgDialog = false;
+        this.joinMeeting();
+      })
+    },
+    joinMeeting() {
+      this.$message({
+        message: '正在启动云会议客户端，请稍候...',
+        type: 'success',
       });
-      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);
+      joinConferences(this.eventId, this.eventName + "的会议", Cookies.get("nickName")).then(res => {
+        if (res.code == 200) {
+          let conferenceID = res.data.info.conferenceID;
+          let password = res.data.info.password;
+          let nickName = res.data.nickName;
+          let nonce = res.data.nonce;
+          window.open("cloudlink://welinksoftclient/h5page?page=LoginAndJoinConf&server_url=meeting.huaweicloud.com&port=8443&conf_id=" + conferenceID + "&enter_code=" + password + "&name=" + nickName + "&open_mic=true&open_camera=false&nonce=" + nonce);
+        }
+      })
+    },
+    Meeting() {//弹出发送会议短信弹窗
+      let that = this;
+      that.$alert("如您已经安装请点击【确定】，如未安装可<a style='text-decoration:underline;color:blue;' href='http://172.18.1.37:15001/CLOUDMeeting_Win.exe'>点击此处</a>进行下载", '该功能需要使用云会议客户端', {
+        confirmButtonText: '确定',
+        dangerouslyUseHTMLString: true,
+        callback: action => {
+          let param = { eventCode: that.eventCode }
+          centereventtdepteventList(param).then(res => {
+            that.depteventList = res.data
+            that.showMeetingMsgDialog = true
+            that.initDutysystemTableData();
+          })
         }
       });
-    }
+    },
+    /** ----------------------------------视频会议结束------------------------------------- */
+    //加入华为视频会议方法
+    // 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);
+    //     }
+    //   });
+    // }
     /** ----------------------------------海康摄像头预览结束------------------------------------- */
   }
 }