Merge branch 'main' into 'stg'

修改自动拨打bug

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

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

@@ -183,12 +183,15 @@ export default {
       this.mrObj.nextFollowDate = this.visiblemediatRecordObj.nextFollowDate
       this.mrObj.linkedPerson = this.visiblemediatRecordObj.linkedPerson
       // console.log(this.visiblemediatRecordObj,'this.visiblemediatRecordObj')
-      this.visiblemediatRecordObj.files.forEach(item =>{  
+      if(this.visiblemediatRecordObj.files != undefined)
-        this.fileList.push({
+      {
-          url: item,
+        this.visiblemediatRecordObj.files.forEach(item =>{  
-          fileName: '文件',
+          this.fileList.push({
+            url: item,
+            fileName: '文件',
+          })
         })
-      })
+      }
     }
     if(this.mrObj.id == ''){
       // 获取当前日期

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

@@ -489,10 +489,27 @@ export default {
   },
   methods: {
     handleBeforeUnload(event) {
-      // 刷新及离开挂断电话
+      this.handleBack()
-      if(this.calling){ 
+    },
-        window.tccc.Call.hungUp({sessionId: this.sessionId})
+    // 退出调解室
-      }
+    async handleBack() {
+      try {
+        if(this.timerInterval) { //如果定时器还在运行 或者直接关闭，不用判断
+          clearInterval(this.timerInterval); //关闭
+        }
+        if (this.videoCallInterval) {
+          clearInterval(this.videoCallInterval)
+        }
+        this.isPause = true
+        if(this.calling){ 
+          let res = await window.tccc.Call.hungUp({sessionId: this.sessionId})
+          this.$router.push('/mediation-management')
+        } else {
+          this.$router.push('/mediation-management')
+        }
+      } catch (err) {}
+      // this.$route.query.sourcePage == 'mediationManagement'
+      // this.$router.push('/mediation-management')
     },
     getSetTimeWritCaseList(){
       this.updateUnm ++;
@@ -600,26 +617,7 @@ export default {
       //   }
       // })
     },
-    // 退出调解室
+    
-    async handleBack() {
-      try {
-        if(this.timerInterval) { //如果定时器还在运行 或者直接关闭，不用判断
-          clearInterval(this.timerInterval); //关闭
-        }
-        if (this.videoCallInterval) {
-          clearInterval(this.videoCallInterval)
-        }
-        if(this.calling){ 
-          let res = await window.tccc.Call.hungUp({sessionId: this.sessionId})
-          console.log('挂断电话', res)
-          this.$router.push('/mediation-management')
-        } else {
-          this.$router.push('/mediation-management')
-        }
-      } catch (err) {}
-      // this.$route.query.sourcePage == 'mediationManagement'
-      // this.$router.push('/mediation-management')
-    },
     // 获取调解记录
     getmediate_record() {
       this.mediaterecordpm.caseId = this.caseId
@@ -728,13 +726,22 @@ export default {
       }
       console.log('queueList==================',this.queueList)
       if (this.queue) {
-        for (let i=0; i < this.queueList.length; i++) {
+
+        if(this.queueList.find(item=>{return item.status.code == 1})!=undefined)
+        {
+          for (let i=0; i < this.queueList.length; i++) {
           if (this.queueList[i].status.code === 1) {
-            this.index = i
+              this.index = i
-            this.startOutboundCall({phone:this.queueList[i].phone,contactId:this.queueList[i].contactId,queueName:this.queueList[i].queueName})
+              this.startOutboundCall({phone:this.queueList[i].phone,contactId:this.queueList[i].contactId,queueName:this.queueList[i].queueName})
-            return
+              return
+            }
           }
         }
+        else
+        {
+          this.$message.warning('该队列已呼叫完成！')
+        }
+        
       } else {
         
         let phone = this.baseInfo.debtorEntityList.find(item => (item.role == 'DEBTOR' && item.type == '本人')).phone
@@ -794,6 +801,7 @@ export default {
       }
         try {
             let res = await window.tccc.Call.hungUp({sessionId: this.sessionId})
+            console.log('挂断会话-hungUp')
             this.calling = false
             this.resetTimer()
             this.nextCall()

src/services/index.js

@@ -60,7 +60,7 @@
          setTimeout(() => {
              hideLoading()
          }, 200);
-         console.log('请求返回结果：', response)
+        //  console.log('请求返回结果：', response)
          
          // 处理Blob格式的数据
          const res = response.data
@@ -77,7 +77,7 @@
                          reject(dealResponseError(result))
                      } else {
                          resolve(response)
-                         console.log('请求返回结果11111：', response)
+                        //  console.log('请求返回结果11111：', response)
                      }
                  }
              })