更新

2026-04-21 23:17:28 +08:00
parent cf455216f9
commit dbc6ecf62d
4 changed files with 41 additions and 181 deletions
--- 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});
 </script>

 <style lang="scss" scoped>
--- a/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/components/Communications/conferenceRoom.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/components/Communications/conferenceRoom.vue
@ -1,141 +0,0 @@
-<template>
-  <el-dialog width="1400px" :draggable="true" custom-class="bgData" :model-value="modelValue" append-to-body
-    @close="close" :show-close="false">
-    <template #title>
-      <div class="title">
-        <div class="titleName">测试数据</div>
-        <div>
-          <el-icon :size="25" class="titleIcon">
-            <BottomLeft />
-          </el-icon>
-          <el-icon :size="25" class="titleIcon">
-            <FullScreen />
-          </el-icon>
-          <el-icon @click="close" :size="25" class="titleIcon">
-            <Close />
-          </el-icon>
-        </div>
-      </div>
-      <div class="statusBar">
-        <div>00:04</div>
-        <div>正在讲话...</div>
-        <div>
-          <el-icon :size="25" class="titleIcon">
-            <InfoFilled />
-          </el-icon>
-          <el-icon :size="25" class="titleIcon">
-            <CircleCheckFilled />
-          </el-icon>
-          <el-icon @click="close" :size="25" class="titleIcon">
-            <Unlock />
-          </el-icon>
-        </div>
-      </div>
-    </template>
-    <div class="content"></div>
-    <template #footer>
-      <Footer @close="close" />
-    </template>
-  </el-dialog>
-
-</template>
-
-<script setup>
-import { ref, watch, reactive, toRaw, computed, getCurrentInstance } from "vue";
-import Footer from './footer.vue'
-// import useCallModule from '../sdk/call.js'
-const { proxy } = getCurrentInstance();
-// const Call = useCallModule()
-try {
-  window.lemon.login.login({
-    username: "linzhigongan1",
-    password: "linzhigongan1",
-    realm: "puc.com",
-    webpucUrl: "https://192.168.0.1:16888",
-   }).then(res => {
-     console.log(res,"登录成功");
-   }).catch(err => {
-     console.log(err,"登录失败");
-
-    })
-
-} catch (error) {
-  console.log('error: ', error);
-}
-
-
-const props = defineProps({
-  modelValue: {
-    type: Boolean,
-    default: false
-  },
-  titleValue: {
-    type: String,
-    default: ''
-  }
-})
-const emit = defineEmits(['update:modelValue']);
-const close = () => {
-  emit('update:modelValue', false);
-}
-</script>
-
-<style lang="scss" scoped>
-@import "@/assets/css/layout.scss";
-@import "@/assets/css/element-plus.scss";
-
-.title {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-bottom: 1px solid #e4e7ed;
-  padding: 10px;
-
-  .titleName {
-    font-size: 20px;
-    margin-bottom: 5px;
-    width: 40%;
-
-  }
-
-  .titleIcon {
-    margin-left: 15px;
-  }
-}
-
-.statusBar {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 10px 6px;
-}
-
-.content {
-  padding: 0 10px;
-  height: 60vh;
-  overflow: auto;
-  background-color: #000;
-}
-
-.tabBoxRadio .el-checkbox__inner {
-  border-radius: 50% !important;
-}
-
-.tabBoxRadio .el-table__header-wrapper .el-checkbox {
-  display: none;
-}
-
-.bgData {
-  padding: 10px;
-}
-
-::v-deep .el-dialog__body {
-  padding: 0 !important;
-}
-</style>
-<style>
-.bgData .el-dialog__header,
-.el-dialog__body {
-  padding: 0;
-}
-</style>
--- 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 = () => {
--- a/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue
@ -1,12 +1,16 @@
 <template>
  <div ref="searchBox"  class="mt10">
    <Search :searchArr="searchConfiger" @submit="onSearch" >
-       <el-button size="small" type="primary" @click="addEdit('add', '')">
+      <el-button size="small" type="primary" @click="addEdit('add', '')">
        <el-icon style="vertical-align: middle">
          <CirclePlus />
        </el-icon>
        <span style="vertical-align: middle">新增</span>
      </el-button>
+
+      <el-button size="small" type="primary" @click="handleLogin">
+        <span style="vertical-align: middle">登录</span>
+      </el-button>
      
    </Search>
  </div>
@ -223,9 +227,13 @@ const handleSumbit = (item) => {
 const joinMeeting = (item, type) => {
  item.number = item.hybh;
  refMeetingView.value.openInit(item, type)
-  
 };

+
+const handleLogin = () =>{
+  refMeetingView.value.Init();
+}
+
 // 反馈情况
 const feedBack = (item) => {
  feedbackFormRef.value.open(item.id);
@ -237,6 +245,7 @@ const viewFeedback = (item) => {
  viewFeedbackRef.value.open(item.fkList || []);
 };

+
 // 删除
 const delDictItem = (id) => {
  proxy.$confirm("确定要删除", "警告", { type: "warning" }).then(() => {
@ -252,6 +261,8 @@ const addEdit = (type, row) => {
  detailDiloag.value.init(type, row);
 };

+
+
 // 表格高度计算
 const tabHeightFn = () => {
  pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 210;