no message

src/api/emergencyCommandMap/communication.ts

@@ -1,7 +1,7 @@
 import request from '@/utils/request';
 
 // 获取融合通信链接
-export function getStartMiniParan(data) {
+export function getStartMiniParam(data) {
   return request({
     url: '/api/videoResource/avcon/get_start_mini_param',
     method: 'post',
@@ -9,6 +9,15 @@ export function getStartMiniParan(data) {
   });
 }
 
+// 获取融合通信链接(会议号入会)
+export function getStartMiniWithNoParam(data) {
+  return request({
+    url: '/api/videoResource/avcon/get_start_mini_with_no_param',
+    method: 'post',
+    data: data
+  });
+}
+
 // 视频会商-部门树
 export function getAvconDeptTree(params) {
   return request({

src/types/components.d.ts

@@ -18,10 +18,10 @@ declare module 'vue' {
     Dialog: typeof import('./../components/Dialog/index.vue')['default']
     DictTag: typeof import('./../components/DictTag/index.vue')['default']
     Editor: typeof import('./../components/Editor/index.vue')['default']
-    ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
@@ -36,25 +36,36 @@ declare module 'vue' {
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElIconUser: typeof import('@element-plus/icons-vue')['User']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
+    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElPopover: typeof import('element-plus/es')['ElPopover']
+    ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
     ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
     ElSlider: typeof import('element-plus/es')['ElSlider']
+    ElStep: typeof import('element-plus/es')['ElStep']
+    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
+    ElTable: typeof import('element-plus/es')['ElTable']
+    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTabPane: typeof import('element-plus/es')['ElTabPane']
+    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElText: typeof import('element-plus/es')['ElText']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
+    ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
+    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     FileUpload: typeof import('./../components/FileUpload/index.vue')['default']
     FooterSection: typeof import('./../components/FooterSection/index.vue')['default']
@@ -65,6 +76,7 @@ declare module 'vue' {
     HikvisionPlayer: typeof import('./../components/HKVideo/hikvision-player.vue')['default']
     HKVideo: typeof import('./../components/HKVideo/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
+    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']
@@ -101,4 +113,7 @@ declare module 'vue' {
     YMap: typeof import('./../components/Map/YMap.vue')['default']
     YztMap: typeof import('./../components/Map/YztMap/index.vue')['default']
   }
+  export interface ComponentCustomProperties {
+    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
+  }
 }

src/views/emergencyCommandMap/LeftSection/Communication.vue

@@ -102,7 +102,7 @@
 
 <script lang="ts" setup>
 import { Search } from '@element-plus/icons-vue';
-import { getAvconDeptList, getAvconDeptTree, getStartMiniParan } from '@/api/emergencyCommandMap/communication';
+import { getAvconDeptList, getAvconDeptTree, getStartMiniParam, getStartMiniWithNoParam } from '@/api/emergencyCommandMap/communication';
 import { deepClone } from '@/utils';
 
 const proxy = getCurrentInstance()?.proxy;
@@ -208,19 +208,15 @@ const deleteItem = (item) => {
 
 // 会议号入会
 const handleJoinMeeting = () => {
-  proxy?.$modal.msgError('融合通信新开发功能，暂未对接');
-  return false;
-
   const screenWidth = window.screen.width * window.devicePixelRatio;
   const screenHeight = window.screen.height * window.devicePixelRatio;
   const data = {
-    'userid': '', // 空表示后台获取当前用户对应融合通信dev_id
+    'userid': 'mmyj0010@mm.zw.yj', // 空表示后台获取当前用户对应融合通信dev_id
     'password': '123',
-    roomid: '715724498', // 会议号
-    windowpos: { 'x': 0, 'y': 0, 'width': screenWidth, 'height': screenHeight, 'top': true },
-    members: { num: 1 } // 不用邀请别人
+    roomcode: '749428988', // 会议号
+    windowpos: { 'x': 0, 'y': 0, 'width': screenWidth, 'height': screenHeight, 'top': true }
   };
-  getStartMiniParan(data).then((res) => {
+  getStartMiniWithNoParam(data).then((res) => {
     // 创建一个a标签元素
     const a = document.createElement('a');
     // 设置a标签的href属性
@@ -246,15 +242,14 @@ const handleStartCall = () => {
   const screenHeight = window.screen.height * window.devicePixelRatio;
   const data = {
     userid: '', // 空表示后台获取当前用户对应融合通信dev_id
-    password: '123',
-    roomid: '', // 空表示新会议室
+    password: '',
     windowpos: { 'x': 0, 'y': 0, 'width': screenWidth, 'height': screenHeight, 'top': true },
     members: {
       num: dev_list.length + 2, // 配置多少个座位，一般就是邀请人多少个就多少个
       'dev-list': dev_list
     }
   };
-  getStartMiniParan(data).then((res) => {
+  getStartMiniParam(data).then((res) => {
     // 创建一个a标签元素
     const a = document.createElement('a');
     // 设置a标签的href属性
@@ -280,15 +275,14 @@ const handleStartMeeting = () => {
   const screenHeight = window.screen.height * window.devicePixelRatio;
   const data = {
     'userid': '', // 空表示后台获取当前用户对应融合通信dev_id
-    'password': '123',
-    roomid: '', // 空表示新会议室
+    'password': '',
     windowpos: { 'x': 0, 'y': 0, 'width': screenWidth, 'height': screenHeight, 'top': true },
     members: {
       num: dev_list.length + 2, // 配置多少个座位，一般就是邀请人多少个就多少个
       'dev-list': dev_list
     }
   };
-  getStartMiniParan(data).then((res) => {
+  getStartMiniParam(data).then((res) => {
     // 创建一个a标签元素
     const a = document.createElement('a');
     // 设置a标签的href属性