fix

.env.dev

@@ -5,4 +5,4 @@ NODE_ENV = development
 VITE_API_SERVER = 'http://61.147.254.211:30876'
 VITE_MAP_SERVER = 'http://61.147.254.211:21009'
 VITE_LOGIN_SERVER = 'http://61.147.254.211:9999'
-VITE_DH_SERVER = 'http://sqtestdh.xt.wenhq.top:8083'
+VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'

src/components/Card/index.tsx

@@ -12,7 +12,8 @@ export type CardType =
   | 'accident-scene'
   | 'wz-all'
   | 'em-ex'
-  | 'live-monitoring';
+  | 'live-monitoring'
+  | 'vdeo-userlist';
 
 export default defineComponent({
   name: 'Card',

src/components/MarkerMap/dialog.ts

@@ -245,7 +245,7 @@ export const GET_SINGLE_DEVICE_DIALOG_HTML = (
 
   // el.appendChild(action2);
 
-  console.log(el);
+  // console.log(el);
 
   return el;
 };

src/components/MarkerMap/index.tsx

@@ -292,6 +292,7 @@ export default defineComponent({
                           const dievicecode = marker['deviceCode']+"";
 
                           const channelid = marker['channelId']+"";
+                          window.isdanbing = true;
 
                           async function cremetting(){
                             await window.metting.getLocalUserInfo();
@@ -422,6 +423,7 @@ export default defineComponent({
 
         case '视频监控':
           return GET_VIDEO_DIALOG_HTML(marker, (type=1) => {
+            window.isdanbing = false;
             if (marker['status'] == 1) {
               // mainstore.videourl =
               //   (import.meta.env.VITE_DH_SERVER as string) +

src/layout/BaseLayout/index.tsx

@@ -248,23 +248,86 @@ export default defineComponent({
       //   daHuaStore.DAHUADeviceList('S4NbecfYB1DGB68AN187Q8'); //执法人员设备列表
       //   daHuaStore.DAHUADeviceList('S4NbecfYB1DGB68S6S0UFC'); //执法车辆列表
       // }
-      const DAHUA = document.getElementById('DAHUA') as HTMLIFrameElement;
-      if (!DAHUA) return
-      DAHUA.onload = function () {
-        // @ts-ignore
-        DAHUA.contentWindow.postMessage('onload', '*');
-      }
-      window.addEventListener('message', e => {
-        if (e.data === 'closeIframe') {
-          daHuaStore.dahuaUserVisible = false;
+      // const DAHUA = document.getElementById('DAHUA') as HTMLIFrameElement;
+      // if (!DAHUA) return
+      // DAHUA.onload = function () {
+      //   // @ts-ignore
+      //   DAHUA.contentWindow.postMessage('onload', '*');
+      // }
+      // window.addEventListener('message', e => {
+      //   if (e.data === 'closeIframe') {
+      //     daHuaStore.dahuaUserVisible = false;
+      //   }
+      // }, false);
+      try {
+        (yjzh_btn.value)?.addEventListener("click", () => {
+
+        //   if(!this.memberInfos.userCode){
+        //     this.$Message.warning("请先选择会商用户!");
+        //     return;
+        //   }
+        //   //邀请用户写 memberTyp=4；邀请用户绑定的设备则对应不同值。且需要传递memberCode与memberNumber【通过用户接口查询】
+
+        async function cremetting(){
+
+
+          const meeting = new Meeting();
+         
+          await window.metting.getLocalUserInfo();
+          const res = await window.metting.queryUser("5269850340392960");
+
+          // _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);
         }
-      }, false);
 
-      (yjzh_btn.value)?.addEventListener("click", () => {
+        if(window.metting){
+          const meeting = window.metting;
+          meeting.settargetId("vPlayArea");
+          cremetting();
+            
+
+         }else{
+          const meeting = new Meeting();
+          if(window.theSocket){
+            cremetting();
 
-        handleDaHuaSystem();
+          }else{
+            meeting.openClient(() => {
+            
+              meeting.settargetId("vPlayArea");
+              window.metting = meeting;
+              cremetting();
+              
+           
+            });
 
-      })
+          }
+
+          }
+
+        
+         
+  
+        })
+        
+      } catch (error) {
+        
+      }
+
+     
 
     });
     const timetext = ref("-");
@@ -302,7 +365,12 @@ export default defineComponent({
             mainStore.videoisshow = false;
             if(window.metting){
               window.metting.closeVideo();
+            if(window.isdanbing){
               window.metting.deleteMeeting();
+              window.metting.closeClient()
+              window.metting =false; window.theSocket = false;
+            }
+             
             }
             
           }}>

src/views/IncidentDetail/VideoUserListCard/index.tsx

@@ -0,0 +1,17 @@
+import Card from '@/components/Card';
+import { useIncidentStore, useMarkerStore } from '@/store';
+import { computed, defineComponent, ref } from 'vue-demi';
+
+export default defineComponent({
+  name: 'VideoUserListCard',
+  setup() {
+    const store = useIncidentStore();
+    const markerStore = useMarkerStore();
+
+    return () => (
+      <>
+       dfsdfsd
+      </>
+    );
+  },
+});

src/views/IncidentDetail/index.tsx

@@ -28,6 +28,7 @@ import { BaseReg } from '@/constants/constants';
 // @ts-ignore
 import Iconback from '@/assets/icons/detail/back@2x.png';
 import MessageCard from '../HomePage/MessageCard';
+import VideoUserListCard from './VideoUserListCard';
 
 
 
@@ -225,6 +226,11 @@ export default defineComponent({
               {/* <LiveMonitoringCard /> */}
             </div>
           }
+
+          {
+            // <VideoUserListCard></VideoUserListCard>
+          }
+
         </div>
         {/*大华 相关的通讯录可以放这里*/}
         {/*{daHuaStore.dahuaUserVisible && (*/}