Merge branch 'main' into 'stg'

Main

See merge request cloud-mediate/mediate-manage-web!88

src/pages/mediation-page/components/MediationRoom.vue

@@ -734,7 +734,7 @@ export default {
             let res = await window.tccc.Call.startOutboundCall({phoneNumber: this.phoneNumber, uuid: this.caseId})
             this.sessionId = res.data.sessionId
             console.log('呼叫成功', res.data)
-
+            
             this.calling = true
             if (res.status === 'success') {
               this.callingSuccess()
@@ -756,11 +756,13 @@ export default {
         // this.getmediate_record()
         this.$refs.layoutContent.getmediate_record();
         this.$refs.layoutContent.openRecordDialog(res);
+        this.queueList[this.index].status.code = 2 // 已拨打
       } catch (err) { }
     },
     // 呼叫失败
     async callingFail () {
       try { 
+        this.queueList[this.index].status.code = 2 // 已拨打
         // let res = await api.callingFail({caseId: this.caseId,contactId: this.contactId,callingSessionId:this.sessionId})
       } catch (err) { }
     },
@@ -782,6 +784,7 @@ export default {
     // 自动拨打下一个会话
     nextCall() {
       console.log('自动拨打下一个会话')
+      console.log('this.queue：',this.queue, 'this.isPause：', this.isPause)
       if (!this.queue) return
       if (this.isPause) {
         this.isPause = false

src/pages/mediation-page/components/VideoRoom.vue

@@ -214,8 +214,6 @@ export default {
     // 获取进入房间的参数
     handleEnterRoom() {
       this.enterRoom();
-      this.handleStartLocalAudio();
-      this.handleStartLocalVideo();
     },
     async enterRoom() {
       console.log({
@@ -234,6 +232,9 @@ export default {
         });
         this.installEventHandlers();
         this.startGetAudioLevel();
+        
+        this.handleStartLocalAudio();
+        this.handleStartLocalVideo();
       }catch (e) {
         console.log('视频云初始化报错！', e)
         throw e;
@@ -241,7 +242,7 @@ export default {
 
     },
 
-    // 本地音频
+    // 开启本地音频的采集和发布
     async handleStartLocalAudio() {
       if (this.micStatus) {
         return;
@@ -312,10 +313,31 @@ export default {
       }
       await this.trtc.stopLocalAudio();// 停止本地麦克风的采集及发布
       await this.trtc.stopLocalVideo();// 停止本地摄像头的采集、预览及发布
+
       this.trtc = null;
+      // window.location.reload();
       // await this.trtc.stopScreenShare();// 停止屏幕分享
     },
-
+    // 停止摄像头预览
+    stopCamera() {
+      if (navigator.mediaDevices.getUserMedia) {
+        console.log('获取摄像头',navigator.mediaDevices.getUserMedia)
+        navigator.mediaDevices.getUserMedia({ video: true })
+          .then(stream => {
+            console.log('获取摄像头-stream',stream)
+            if (stream) {
+              const tracks = stream.getTracks();
+              console.log('获取摄像头-tracks',tracks)
+              tracks.forEach(track => track.stop());
+            }
+          })
+          .catch(error => {
+            console.error("Error accessing the camera.", error);
+          });
+      } else {
+          console.error("getUserMedia not supported on your browser.");
+      }
+    },
     // 音量
     startGetAudioLevel() {
       this.trtc.on(TRTC.EVENT.AUDIO_VOLUME, (event) => {

src/pages/mediation-page/components/cassWrit.vue

@@ -58,10 +58,13 @@
           <a class="color-86909C f12 pt-6 pb-6">{{item.handleBy}}&nbsp;&nbsp;{{ $util.formatDate(item.handleTime, 'YYYY-MM-DD HH:mm:ss')}}</a>
           <div class="flex-row align-items-center color-86909C" v-if="(item.signList.length > 0 || item.unsignList.length > 0)&&(item.signStatus != null && (item.signStatus.code != 1))">
             <div>签字</div>
-            <div class="flex-row" v-for="(item1, index1) in item.unsignList" :key="index1">
-              <el-tag v-if="item1.signStatus.code == 2" class="ml-4" size="small" type="success" effect="plain">{{item1.signName}}</el-tag>
-              <el-tag v-if="item1.signStatus.code == 0" class="ml-4" size="small" type="info" effect="plain">{{item1.signName}}</el-tag>
+            <div style="width: 240px; display: block;">
+              <div class="flex-row" v-for="(item1, index1) in item.unsignList" :key="index1" style="float: left;margin-bottom: 5px;">
+                <el-tag v-if="item1.signStatus.code == 2" class="ml-4" size="small" type="success" effect="plain">{{item1.signName}}</el-tag>
+                <el-tag v-if="item1.signStatus.code == 0" class="ml-4" size="small" type="info" effect="plain">{{item1.signName}}</el-tag>
+              </div>
             </div>
+            
             <!-- <el-tag class="ml-4" size="small" type="success" effect="plain"
               v-for="(item1, index1) in item.signList" :key="index1">{{item1.signName}}</el-tag>
             <el-tag class="ml-4" size="small" type="info" effect="plain"