Your Name hace 3 años
padre
commit
f28c0eaf88
Se han modificado 2 ficheros con 15 adiciones y 5 borrados
  1. 1 1
      public/webClient/webClient_initWnd.js
  2. 14 4
      src/layout/BaseLayout/index.tsx

+ 1 - 1
public/webClient/webClient_initWnd.js

@@ -98,7 +98,7 @@ class VideoPlay {
     dragResize(width, height, posX, posY) {
         var c = this.space.getBoundingClientRect();
         posX = Math.round(   c.left* window.outerWidth/window.innerWidth  );
-        posY = Math.round(   c.top* window.outerWidth/window.innerWidth  + window.outerHeight - window.innerHeight);
+        posY = Math.round(   c.top* window.outerWidth/window.innerWidth  + window.outerHeight - window.innerHeight-10);
         width = Math.round(   c.width * window.outerWidth/window.innerWidth );
         height = Math.round(c.height* window.outerWidth/window.innerWidth );
 

+ 14 - 4
src/layout/BaseLayout/index.tsx

@@ -264,11 +264,21 @@ export default defineComponent({
 
 
        if(window.theSocket){
-        cremetting();
+         if(window.metting){
+          cremetting();
+         }else{
+          const meeting = new Meeting();
+          meeting.settargetId("vPlayArea");
+          window.metting = meeting;
+          cremetting();
+         }
+        
        }else{
-         console.log("-----------------")
         const meeting = new Meeting();
         meeting.openClient(() => {
+          
+          meeting.settargetId("vPlayArea");
+          window.metting = meeting;
           cremetting();
         });
 
@@ -330,7 +340,7 @@ export default defineComponent({
 
     return () => (
       <section class="base-layout-container">
-        {/* <iframe
+        <iframe
           style={{ visibility: 'hidden', height: '100%', width: '100%' }}
           class={clsx('dahua-content', {
             ['display']: daHuaStore.dahuaUserVisible,
@@ -339,7 +349,7 @@ export default defineComponent({
           name="DAHUA"
           src={sqdh.value}
           frameborder="0"
-        /> */}
+        />
         <div
           class="videoifram"
           style={mainStore.videoisshow ? 'display:block' : 'display:none'}