From cc8ea05acb8339cc5aaa77c75454da20c6942193 Mon Sep 17 00:00:00 2001
From: cxc <quantulr@outlook.com>
Date: Thu, 9 Jun 2022 17:11:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A0=87=E7=AD=BE=E5=9D=90?=
 =?UTF-8?q?=E6=A0=87=E7=BC=A9=E5=B0=8F=E8=AF=AF=E5=B7=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/mediaCheck.vue |  1 -
 src/views/meeting.vue         | 20 ++++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/components/mediaCheck.vue b/src/components/mediaCheck.vue
index 81d5e41..3b09653 100644
--- a/src/components/mediaCheck.vue
+++ b/src/components/mediaCheck.vue
@@ -5,7 +5,6 @@
       destroy-on-close
       v-model="showCheckMediaVideo"
       :close-on-click-modal="false"
-      title="摄像头和麦克风"
       :fullscreen="screenWidth < 900"
       width="60%"
     >
diff --git a/src/views/meeting.vue b/src/views/meeting.vue
index e9bd9db..d6a0de5 100644
--- a/src/views/meeting.vue
+++ b/src/views/meeting.vue
@@ -12,6 +12,7 @@
             notInSharing: !inSharing,
           }"
         >
+          <div class="text-label-container" ref="textLabelContainerRef"></div>
           <div
             id="video-element"
             :class="`layout-template-${templateId}`"
@@ -152,6 +153,7 @@ joinName.value =
   store.getters.nickname || store.getters.phone || store.getters.icCard;
 
 const meetingContainerRef = ref(null); // 会议组件容器，包含背景和会议组件
+const textLabelContainerRef = ref(null); //文本标签容器
 const videoElementRef = ref(null); // zoom会议组件
 const meetingWidth = ref(0); // 视频和共享屏幕宽度
 const meetingHeight = ref(0); // 视频和共享屏幕高度
@@ -273,12 +275,13 @@ const setTextLabel = () => {
     textEl.id = `${uniqueId("tag-")}`;
     textEl.innerHTML = labelObj.content;
     textEl.className = "text-tag";
+    // textEl.style.zIndex = "999";
     textEl.style.backgroundColor = labelObj.backgroundColor;
     textEl.style.visibility =
       labelObj.visibility === "1" ? "visible" : "hidden";
     textEl.style.left = `${labelObj.x}`;
     textEl.style.top = `${labelObj.y}`;
-    meetingContainerRef.value.appendChild(textEl);
+    textLabelContainerRef.value.appendChild(textEl);
   });
 };
 
@@ -547,9 +550,10 @@ const initWebSocket = () => {
     // 会议信息更新时
     if (data.type === "isRefreshMeeting") {
       await store.dispatch("getMeetingInfo", store.getters.meetingId);
-      meetingContainerRef.value.style.background = `url(${store.getters.templateBackgroundPic}) 0% 0% / cover no-repeat`;
+      meetingContainerRef.value.style.background = `url(${
+        store.getters.templateBackgroundPic || store.getters.defaultBackground
+      }) 0% 0% / cover no-repeat`;
       templateId.value = store.getters.templateId;
-      // setLayout(templateId.value);
       setTextLabel();
     }
     // 收到聊天消息时
@@ -753,13 +757,21 @@ $meetingBackgroundHeight: 80vw * 9 / 16;
       justify-content: center;
       width: $meetingBackgroundWidth;
       position: relative;
+      .text-label-container {
+        position: absolute;
+        // z-index: -1;
+        top: 0;
+        left: 0;
+        width: $meetingBackgroundWidth;
+        height: $meetingComponentHeight + 6.4vw;
+      }
       #video-element {
         width: $meetingComponentWitdh;
         :deep(div[id*="suspension-view-tabpanel"]
             > .zmwebsdk-MuiBox-root.zmwebsdk-MuiBox-root
             > div[class*="inSharing"]
             > div) {
-          padding-top: 6px;
+          padding-top: 3px;
         }
       }
       .el-button {