wenhongquan %!s(int64=2) %!d(string=hai) anos
pai
achega
35ff080469
Modificáronse 1 ficheiros con 39 adicións e 22 borrados
  1. 39 22
      src/layout/BaseLayout/index.tsx

+ 39 - 22
src/layout/BaseLayout/index.tsx

@@ -322,7 +322,7 @@ export default defineComponent({
 
 
 
-        async function cremetting11(){
+          async function cremetting11() {
 
 
           try{
@@ -336,26 +336,42 @@ export default defineComponent({
           if(!isc) return;
           isc = false;
 
-            await window.metting.getLocalUserInfo();
-          const res = await window.metting.queryUser('6599345191780352');
+           await window.metting.getLocalUserInfo();
+           
+           window.metting.queryUser(localStorage.getItem("userId")).then(res => { 
+           
+             const chartParams = {
+               chatName: "测试会商名称",
+               groupType: 2,
+               bOpenDirect: true,
+
+              //  groupType: 2, //1 群聊 传2 会商 传3 群聊会会商
+               memberInfo: [
+                 {
+                 memberId: res.userCode, // 成员id
+                 memberName: res.name, // 成员名称
+                 memberType: 4, // 成员类型,Integer ,1 单兵;2 普通电话;3 对讲机;4 app|客户端;6 可是话机; 7 汇接话机(PSTN、手机号码等); 8 车载;9 无人机喊话云台; 10 无人机地面站对讲平台; 11 ipc; 12 NVR
+                 isOpenVideo: true,
+                 
+
+                 }
+               ]
+
+
+
+             };
+
+            //  window.theSocket && window.theSocket.openCreateGroupChatDlg();
+             window.theSocket && window.theSocket.createGroupChat(chartParams);
+
+             commonstore.isclick = false;
+           });
 
           // _this.localUserInfo.masterName = res.userName;
           // _this.localUserInfo.masterId = res.userCode;
           // _this.localUserInfo.masterNumber = res.userPhone;
           // _this.localUserInfo.region = res.paasId;
-          const chartParams = {
-            chatName: "测试会商名称",
-            bOpenDirect: true,
-            memberId: res.userCode, // 成员id
-            memberName: res.name, // 成员名称
-            regionId: res.paasId, // 成员的pass域id
-            memberType: 4, // 成员类型,Integer ,1 单兵;2 普通电话;3 对讲机;4 app|客户端;6 可是话机; 7 汇接话机(PSTN、手机号码等); 8 车载;9 无人机喊话云台; 10 无人机地面站对讲平台; 11 ipc; 12 NVR
-            memberCode: "", // 成员设备编码
-            memberNumber: ""// 成员号码
-          };
-          window.theSocket&&window.theSocket.createGroupChat(chartParams);
-
-          commonstore.isclick = false;
+          
 
 
           }
@@ -409,13 +425,14 @@ export default defineComponent({
             mainStore.videoisshow = false;
             if(window.metting){
               window.metting.closeVideo();
+             
+              if (window.isdanbing) {
+                 window.metting.deleteAllMeeting(() => { });
+                //  window.metting.closeClient()
+                //  window.metting = false;
+                //  window.theSocket = false;
+              }
               window.metting = false;
-            if(window.isdanbing){
-              window.metting.deleteMeeting();
-              window.metting.closeClient()
-              window.metting = false;
-              window.theSocket = false;
-            }
             }
           }}>
             <img src={closeicon} />