Merge branch 'main' into 'stg'

Main

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

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

@@ -50,7 +50,7 @@
                   </div>
                   <!-- 电话 -->
                   <div v-if="itemrecord.linkedWay == 1" class="flex-row align-items-center pt-6">
-                    <div v-if="itemrecord.linkedType == 1">通话{{itemrecord.linkedDuration}}秒</div>
+                    <div v-if="itemrecord.linkedType == 1">通话{{itemrecord.linkedDuration | secondsToMinutes}}</div>
                     <el-divider v-if="itemrecord.linkedType == 1" direction="vertical"></el-divider>
                     <div class="text-center cursor-pointer" v-for="(item,index) in itemrecord.files" :key="index" @click="handleCaseShowFile(item)">
                         <i class="f14 el-icon-video-play"></i> 播放录音 {{index > 0 ? index : ''}}
@@ -122,9 +122,8 @@
                 <div class="timeline-layout-w-records mt-8 mb-8">
                   <div class="flex-column align-items-start">
                     <div>
-                      <span v-for="(itemperson,index) in itemrecord.linkedPersonInfo" :key="index">
+                      <span v-for="(itemperson,index) in itemrecord.linkedPersonInfo" :key="index" style="float: left;margin-bottom: 2px;">
                         {{ itemperson.name}}
-                        {{ itemrecord.linkedWay == 1 ? itemperson.phone :''}}
                         <el-tag class="mr-8" size="small" effect="plain" style="height: 22px;">{{itemperson.type}}</el-tag>
                       </span>
                     </div>

src/services/caseManagement.js

@@ -328,11 +328,11 @@ const caseManagementApi = {
     },
     // 今日呼叫统计
     callingTodayCount: data => {
-        return service.service.post(`${apiAdmin}api/trace/calling/todayCount`, data)
+        return service.service.post(`${apiAdmin}api/trace/calling/todayCount`, data, {hideLoading:true})
     },
     // 当前调解员案件列表
     callingCaseList: data => {
-        return service.service.post(`${apiAdmin}api/trace/calling/caseList`, data)
+        return service.service.post(`${apiAdmin}api/trace/calling/caseList`, data, {hideLoading:true})
     },
 
 

src/services/systemManage.js

@@ -6,7 +6,7 @@ const systemLogApi = {
     //========================start::用户管理======================================
     // 用户管理
     getUserList: data => {
-        return service.service.post(`${apiAdmin}system/user/getUserList`, data)
+        return service.service.post(`${apiAdmin}system/user/getUserList`, data, {hideLoading:true})
     },
     // 删除用户管理
     deleteUserById: data => {

src/services/voiceCall.js

@@ -19,7 +19,7 @@ const api = {
     },
     // 呼叫未接列表
     notAnswerList: data => {
-        return service.service.post(`${apiAdmin}call/notAnswerList`, data)
+        return service.service.post(`${apiAdmin}call/notAnswerList`, data,{hideLoading:true})
     },
 }
 export default api;

src/utils/clickThrottle.js

@@ -2,7 +2,7 @@
 /* 防止重复点击 */
 let clickTimer = 0
 
-function clickThrottle(interval = 1500) {
+function clickThrottle(interval = 500) {
     let now = +new Date(); // 获取当前时间的时间戳
     let timer = clickTimer; // 记录触发事件的事件戳