diff --git a/src/components/Consultation/demo.vue b/src/components/Consultation/demo.vue index 9cc9475..428e134 100644 --- a/src/components/Consultation/demo.vue +++ b/src/components/Consultation/demo.vue @@ -24,7 +24,7 @@ const modleType = ref('') const store = useStore(); const inDustRialId = getItem('inDustRialId'); // 当前用户的警号 const sdkBDModule = useBaseDataModule(); -const baseInfo = getItem('rhInfo') || {}; +const baseInfo = ref(getItem('rhInfo') || {}); const showVideo = ref(false)//拖动视频 const showDailog = ref(false)//showDailog const openMeeting = ref(false) //打开会议 @@ -97,8 +97,8 @@ const handleTime = (n=10) =>{ // 创建会议 const conferenceActionSDK = async (record ) => { - const createRes = await lemon.conference.createConference({ - subject: record.glxsmc, //主题 + let data = { + subject: record.hsbt, //主题 type: 1, //会议类型 0=即时会议，1=预约会议 emergency_flag: 0, //会议紧急标识 0 = 非紧急会议，1 = 紧急会议 duration: 60, //预计时长 (分钟) @@ -107,14 +107,14 @@ const conferenceActionSDK = async (record ) => { appointment: handleTime(), // start_date 和 start_time 对应的 UTC 时间 members:[ { - alias:baseInfo.dispatcher_name, - basedata_id:baseInfo.basedata_id, - guid:baseInfo.user_guid, - number:baseInfo.user_id, + alias:baseInfo.value.dispatcher_name, + basedata_id:baseInfo.value.basedata_id, + guid:baseInfo.value.user_guid, + number:baseInfo.value.user_id, } ],//当前创建人 - }); - console.log(createRes,'===========创建的会议'); + } + const createRes = await lemon.conference.createConference(data); if (createRes.result === 0) { ElMessage.success(jsonData.value['data']['conference.book.result.ok']); record.number = createRes.meeting.number; @@ -137,7 +137,7 @@ const enterConferenceByNumber = (it) =>{ "camera_status": 1 } lemon.conference.enterConferenceByNumber(params).then(res=> { - console.log(res,'加入会议......'); + console.log(res,'=======加入会议======='); }).catch(err=> { console.log(err,' 加入会议失败......'); }) @@ -147,7 +147,6 @@ const enterConferenceByNumber = (it) =>{ // 获取会议 const fetchConferences = (it) =>{ lemon.conference.fetchConferences().then(res=> { - console.log(res.conferenceList,'获取会议'); meetList.value = res.conferenceList; let obj = meetList.value.find(v=>v.number == it.number); // 会议存在 ? 进入会议 : 创建会议 ; @@ -161,13 +160,14 @@ const listenerEvents = () =>{ useConfernceEvent()// 注册会议管理相关事件 // 无人机对讲机的监听时事件 window.lemon.call.addMediaStream((call_id, stream, type) => { - console.log(call_id, stream, type,'=======无人机对讲机的监听时事件=='); + // console.log(call_id, stream, type,'=======无人机对讲机的监听时事件=='); }); } const getLoginAccountInfo =() =>{ lemon.login.getLoginAccountInfo().then(res => { let info = JSON.stringify(res.account_info) + baseInfo.value = res.account_info; window.localStorage.setItem("rhInfo",info); window.localStorage.setItem("user_basedata_id",res.account_info.basedata_id); }).catch(err => { @@ -177,7 +177,6 @@ const getLoginAccountInfo =() =>{ // 加入会议 const openInit = (it,type) =>{ - log(it,type,'=======加入会议'); modleType.value = type; if(type == '会议'){ //判断是否有会议号 @@ -190,7 +189,6 @@ const openInit = (it,type) =>{ // 会议号存在 ? 获取会议列表里面是否包含该条会议 : 创建会议 ; it.number ? fetchConferences(it) : conferenceActionSDK(it); }).catch(()=>{ }) - } if(['对讲机','无人机'].includes(type)){ @@ -204,9 +202,7 @@ const openInit = (it,type) =>{ const Init = () => { let token = window.localStorage.getItem("rhToken"); - console.log(token,'=======token'); if (!token || 'undefined' == token || token == 'null') { - console.log('融合通信登录=======token'); let userInfo = { username: inDustRialId, //用户名 password: "123456", @@ -214,12 +210,11 @@ const Init = () => { webpucUrl: "https://89.40.9.95:16888" }; lemon.login.login(userInfo).then((esacpe) => { - token = esacpe.access_token; - window.localStorage.setItem("rhToken", esacpe.access_token); + token = esacpe.token; + window.localStorage.setItem("rhToken", esacpe.token); listenerEvents() - }); + }) } else { - console.log('融合通信链接=======token'); ConnectWebsocket(token); } }; @@ -244,7 +239,6 @@ const ConnectWebsocket = (token) => { }; onMounted(()=>{ - console.log('组件挂载了'); jsonData.value = require('./components/zh_CN.json'); nextTick(()=>{ Init(); @@ -256,7 +250,7 @@ onUnmounted(()=>{ lemon.login.removeLoginStatusChangeListener(loginStatusCallbackId.value); }) -defineExpose({openInit}); +defineExpose({openInit,Init}); - diff --git a/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/components/Communications/personnel.vue b/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/components/Communications/personnel.vue index db58218..b799507 100644 --- a/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/components/Communications/personnel.vue +++ b/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/components/Communications/personnel.vue @@ -42,16 +42,16 @@ const handleClick = (tab) => { console.log(tab) } onMounted(() => { - try { - lemon?.basedata?.fetchSystemOrg({ - flat: true, - key_word: "" - }).then(res => { - console.log(res); - }) - } catch (error) { - console.log('error: ', error); - } + // try { + // lemon?.basedata?.fetchSystemOrg({ + // flat: true, + // key_word: "" + // }).then(res => { + // console.log(res); + // }) + // } catch (error) { + // console.log('error: ', error); + // } }) const getJgList = () => { diff --git a/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue b/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue index d1f5db6..08df1bc 100644 --- a/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue +++ b/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue @@ -1,12 +1,17 @@