Merge branch 'main' of http://139.155.124.81:8088/cloud-mediate/mediate-manage-web into main

src/pages/layout/components/LayoutHeader.vue

@@ -34,9 +34,9 @@
               <el-dropdown-item command="free">
                 空闲
               </el-dropdown-item>
-              <el-dropdown-item command="busy">
+              <!-- <el-dropdown-item command="busy">
                 忙碌
-              </el-dropdown-item>
+              </el-dropdown-item> -->
               <el-dropdown-item command="arrange">
                 话后整理
               </el-dropdown-item>
@@ -49,23 +49,6 @@
             </el-dropdown-menu>
           </el-dropdown>
         </div>
-        <!-- <div class="flex-row justify-content-between align-items-center border-t-solid-lighter-1 p-16 cursor-pointer">
-          <div class="f16 color-text-regular">坐席状态</div>
-          <div class="f16 color-text-secondary">
-            <el-dropdown @click="handleClick">
-              <span class="el-dropdown-link">
-                {{agentStatusName}}<i class="el-icon-arrow-down el-icon--right"></i>
-              </span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="free">空闲</el-dropdown-item>
-                <el-dropdown-item command="busy">忙碌</el-dropdown-item>
-                <el-dropdown-item command="arrange">话后整理</el-dropdown-item>
-                <el-dropdown-item command="notReady">示忙</el-dropdown-item>
-                <el-dropdown-item command="rest">小休</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </div>
-        </div> -->
       </div>
 
 
@@ -331,11 +314,14 @@ export default {
     // console.log('获取当前登录人的信息',this.userInfo)
     // console.log(this.userInfo.showName)
     console.log('判断是否绑定坐席agent',this.agent)
-    // if (this.agent) {
+    if (this.agent) {
-    //   setTimeout(() => {
+      setTimeout(() => {
-    //     this.getStatus()
+        window.tccc.Agent.online().then(res => {
-    //   }, 2000)
+          console.log('坐席上线', res)
-    // }
+          // this.getStatus()
+        })
+      }, 2000)
+    }
   },
   methods: {
     // 个人信息
@@ -413,11 +399,12 @@ export default {
     },
     handleCommand(command) {
       console.log(command)
+      if (this.agentStatus === command) {
+        return
+      }
       this.agentStatus = command
       if (command === 'free') {
         this.agentStatusName = '空闲'
-      } else if (command === 'busy') {
-        this.agentStatusName = '忙碌'
       } else if (command === 'arrange') {
         this.agentStatusName = '话后整理'
       } else if (command === 'notReady') {

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

@@ -49,7 +49,8 @@
             <div v-if="queue" class="flex-row justify-content-between align-items-center">
               <div v-if="calling" class="mr-8 f16 color-F53F3F cursor-p" @click="pauseTimer()"><i class="el-icon-video-pause"></i></div>
               <div v-else class="mr-8 f16 color-F53F3F cursor-p" @click="startCall()"><i class="el-icon-video-play"></i></div>
-              <div class="mr-8 cursor-p" v-if="calling" @click="pauseTimer()">已暂停自动拨打</div>
+              <div class="mr-8 cursor-p" v-if="calling && isRunning" @click="pauseTimer()">暂停拨打</div>
+              <div class="mr-8 cursor-p" v-else-if="calling && !isRunning">已暂停自动拨打</div>
               <div class="mr-8 cursor-p" v-else @click="startCall()">开始拨打</div>
               <div class="mr-8 f12 color-000" v-if="calling">{{formattedTime || '00:00'}}</div>
               <div class="mr-8 f20 cursor-p" v-if="calling" @click="hungUp(1)"><i class="el-icon-phone-up"></i></div>
@@ -66,13 +67,13 @@
                   <div class="f16 p-16 border-b-solid-lighter-1">{{queue ? '智能外呼案件列表' : '案件列表'}}</div>
                   <div class="p-16">
                     <el-scrollbar :style="'height:300px;'">
-                      <el-table ref="queueTable" :data="queueList" style="width: 100%;" highlight-current-row>
+                      <el-table ref="queueTable" :data="queueList" style="width: 100%;">
                         <el-table-column type="index" label="序号" width="50"></el-table-column>
                         <el-table-column prop="contact" label="被申请人姓名" width="150"></el-table-column>
                         <el-table-column prop="caseNo" label="案件编号">
                           <template slot-scope="scope">
                             <span>{{scope.row.caseNo}}</span>
-                            <span v-if="scope.$index === index && !queue" style="color:#4080FF;margin-left: 10px;">正在调解中...</span>
+                            <span v-if="scope.row.caseId == caseId && !queue" style="color:#4080FF;margin-left: 10px;">正在调解中...</span>
                           </template>
                         </el-table-column>
                         <el-table-column prop="phone" label="电话号码" width="150"></el-table-column>
@@ -686,7 +687,11 @@ export default {
         })
 
         this.queueList = caseCllList
-        
+        this.queueList.forEach((item, index) =>{
+          if (item.caseId == this.caseId) {
+            this.index = index
+          }
+        })
       })  
     },
     // 当前自动呼叫队列
@@ -807,7 +812,7 @@ export default {
     },
     // 静音会话
     async muteMic() {
-      if (!this.$clickThrottle()) {
+      if (!this.$clickThrottle(1000)) {
         return
       }
         try {
@@ -823,7 +828,7 @@ export default {
     },
     // 取消静音
     async unmuteMic() {
-      if (!this.$clickThrottle()) {
+      if (!this.$clickThrottle(1000)) {
         return
       }
         try {