From e4a044944d7dafc5c7cfc8cb7037dac45dc9637e Mon Sep 17 00:00:00 2001 From: Esacpe <1113279529@qq.com> Date: Tue, 21 Apr 2026 19:42:00 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Consultation/demo.vue | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/components/Consultation/demo.vue b/src/components/Consultation/demo.vue index 9cc9475..92247f4 100644 --- a/src/components/Consultation/demo.vue +++ b/src/components/Consultation/demo.vue @@ -114,7 +114,6 @@ const conferenceActionSDK = async (record ) => { } ],//当前创建人 }); - console.log(createRes,'===========创建的会议'); if (createRes.result === 0) { ElMessage.success(jsonData.value['data']['conference.book.result.ok']); record.number = createRes.meeting.number; @@ -147,7 +146,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,7 +159,7 @@ const listenerEvents = () =>{ useConfernceEvent()// 注册会议管理相关事件 // 无人机对讲机的监听时事件 window.lemon.call.addMediaStream((call_id, stream, type) => { - console.log(call_id, stream, type,'=======无人机对讲机的监听时事件=='); + // console.log(call_id, stream, type,'=======无人机对讲机的监听时事件=='); }); } @@ -177,7 +175,6 @@ const getLoginAccountInfo =() =>{ // 加入会议 const openInit = (it,type) =>{ - log(it,type,'=======加入会议'); modleType.value = type; if(type == '会议'){ //判断是否有会议号 @@ -204,9 +201,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", @@ -219,7 +214,6 @@ const Init = () => { listenerEvents() }); } else { - console.log('融合通信链接=======token'); ConnectWebsocket(token); } }; @@ -244,7 +238,6 @@ const ConnectWebsocket = (token) => { }; onMounted(()=>{ - console.log('组件挂载了'); jsonData.value = require('./components/zh_CN.json'); nextTick(()=>{ Init(); From cf455216f9dbec03cfeb96ce13bb6366f50488ef Mon Sep 17 00:00:00 2001 From: Esacpe <1113279529@qq.com> Date: Tue, 21 Apr 2026 20:50:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Consultation/demo.vue | 17 +++++++++++++++-- .../JudgmentHome/MeetingRoom/index.vue | 1 + 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/components/Consultation/demo.vue b/src/components/Consultation/demo.vue index 92247f4..6facba2 100644 --- a/src/components/Consultation/demo.vue +++ b/src/components/Consultation/demo.vue @@ -97,6 +97,8 @@ const handleTime = (n=10) =>{ // 创建会议 const conferenceActionSDK = async (record ) => { + console.log(record,'=======创建会议的参数========='); + const createRes = await lemon.conference.createConference({ subject: record.glxsmc, //主题 type: 1, //会议类型 0=即时会议，1=预约会议 @@ -114,6 +116,8 @@ const conferenceActionSDK = async (record ) => { } ],//当前创建人 }); + console.log(createRes,'=======创建会议的结果========='); + if (createRes.result === 0) { ElMessage.success(jsonData.value['data']['conference.book.result.ok']); record.number = createRes.meeting.number; @@ -126,6 +130,7 @@ const conferenceActionSDK = async (record ) => { // 通过会议编号进入会议 const enterConferenceByNumber = (it) =>{ + console.log(it,'=============进入会议========'); openMeeting.value = true; nextTick(()=>{ let params = { @@ -136,7 +141,7 @@ const enterConferenceByNumber = (it) =>{ "camera_status": 1 } lemon.conference.enterConferenceByNumber(params).then(res=> { - console.log(res,'加入会议......'); + console.log(res,'=======加入会议======='); }).catch(err=> { console.log(err,' 加入会议失败......'); }) @@ -146,9 +151,11 @@ const enterConferenceByNumber = (it) =>{ // 获取会议 const fetchConferences = (it) =>{ lemon.conference.fetchConferences().then(res=> { + console.log(res,'===============获取会议'); meetList.value = res.conferenceList; let obj = meetList.value.find(v=>v.number == it.number); // 会议存在 ? 进入会议 : 创建会议 ; + console.log(obj,'=============会议是否存在'); obj ? enterConferenceByNumber(it) : conferenceActionSDK(it) ; }).catch(err=> {}) } @@ -165,6 +172,7 @@ const listenerEvents = () =>{ const getLoginAccountInfo =() =>{ lemon.login.getLoginAccountInfo().then(res => { + console.log(res,'=======获取登录账号信息========='); let info = JSON.stringify(res.account_info) window.localStorage.setItem("rhInfo",info); window.localStorage.setItem("user_basedata_id",res.account_info.basedata_id); @@ -175,6 +183,9 @@ const getLoginAccountInfo =() =>{ // 加入会议 const openInit = (it,type) =>{ + console.log(it,'===========假日会议的数据==========='); + console.log(type,'===========会议的类型==========='); + modleType.value = type; if(type == '会议'){ //判断是否有会议号 @@ -184,10 +195,11 @@ const openInit = (it,type) =>{ cancelButtonText:'取消', type:'warning', }).then(res=>{ + console.log(it.number,'===============会议号========'); + // 会议号存在 ? 获取会议列表里面是否包含该条会议 : 创建会议 ; it.number ? fetchConferences(it) : conferenceActionSDK(it); }).catch(()=>{ }) - } if(['对讲机','无人机'].includes(type)){ @@ -209,6 +221,7 @@ const Init = () => { webpucUrl: "https://89.40.9.95:16888" }; lemon.login.login(userInfo).then((esacpe) => { + console.log(esacpe,'=======登录成功========='); token = esacpe.access_token; window.localStorage.setItem("rhToken", esacpe.access_token); listenerEvents() diff --git a/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue b/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue index d1f5db6..6a63707 100644 --- a/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue +++ b/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue @@ -7,6 +7,7 @@ 新增 +
From dbc6ecf62d4f66fc5dd168cc6b1a2a4497e41f34 Mon Sep 17 00:00:00 2001 From: Esacpe <1113279529@qq.com> Date: Tue, 21 Apr 2026 23:17:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Consultation/demo.vue | 46 +++--- .../Communications/conferenceRoom.vue | 141 ------------------ .../components/Communications/personnel.vue | 20 +-- .../JudgmentHome/MeetingRoom/index.vue | 15 +- 4 files changed, 41 insertions(+), 181 deletions(-) delete mode 100644 src/views/backOfficeSystem/JudgmentHome/MeetingRoom/components/Communications/conferenceRoom.vue diff --git a/src/components/Consultation/demo.vue b/src/components/Consultation/demo.vue index 6facba2..9fb222d 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,10 +97,8 @@ const handleTime = (n=10) =>{ // 创建会议 const conferenceActionSDK = async (record ) => { - console.log(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, //预计时长 (分钟) @@ -109,15 +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; @@ -130,7 +127,6 @@ const conferenceActionSDK = async (record ) => { // 通过会议编号进入会议 const enterConferenceByNumber = (it) =>{ - console.log(it,'=============进入会议========'); openMeeting.value = true; nextTick(()=>{ let params = { @@ -151,11 +147,9 @@ const enterConferenceByNumber = (it) =>{ // 获取会议 const fetchConferences = (it) =>{ lemon.conference.fetchConferences().then(res=> { - console.log(res,'===============获取会议'); meetList.value = res.conferenceList; let obj = meetList.value.find(v=>v.number == it.number); // 会议存在 ? 进入会议 : 创建会议 ; - console.log(obj,'=============会议是否存在'); obj ? enterConferenceByNumber(it) : conferenceActionSDK(it) ; }).catch(err=> {}) } @@ -172,8 +166,8 @@ const listenerEvents = () =>{ const getLoginAccountInfo =() =>{ lemon.login.getLoginAccountInfo().then(res => { - console.log(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 => { @@ -183,9 +177,6 @@ const getLoginAccountInfo =() =>{ // 加入会议 const openInit = (it,type) =>{ - console.log(it,'===========假日会议的数据==========='); - console.log(type,'===========会议的类型==========='); - modleType.value = type; if(type == '会议'){ //判断是否有会议号 @@ -195,8 +186,6 @@ const openInit = (it,type) =>{ cancelButtonText:'取消', type:'warning', }).then(res=>{ - console.log(it.number,'===============会议号========'); - // 会议号存在 ? 获取会议列表里面是否包含该条会议 : 创建会议 ; it.number ? fetchConferences(it) : conferenceActionSDK(it); }).catch(()=>{ }) @@ -215,17 +204,17 @@ const Init = () => { let token = window.localStorage.getItem("rhToken"); if (!token || 'undefined' == token || token == 'null') { let userInfo = { - username: inDustRialId, //用户名 + username: 'sgxtcs', //用户名 + // username: inDustRialId, //用户名 password: "123456", realm: "puc.com", webpucUrl: "https://89.40.9.95:16888" }; lemon.login.login(userInfo).then((esacpe) => { - console.log(esacpe,'=======登录成功========='); - token = esacpe.access_token; - window.localStorage.setItem("rhToken", esacpe.access_token); + token = esacpe.token; + window.localStorage.setItem("rhToken", esacpe.token); listenerEvents() - }); + }) } else { ConnectWebsocket(token); } @@ -233,7 +222,8 @@ const Init = () => { const ConnectWebsocket = (token) => { lemon.login.reConnectWebsocket({ - username: inDustRialId, //用户名 + username: 'sgxtcs', //用户名 + // username: inDustRialId, //用户名 realm: "puc.com", webpucUrl: "https://89.40.9.95:16888", token: token @@ -262,7 +252,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 6a63707..08df1bc 100644 --- a/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue +++ b/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue @@ -1,12 +1,16 @@