Merge branch 'main' into 'stg'

Main

See merge request cloud-mediate/mediate-manage-web!70
This commit is contained in:
刘翕 2025-02-24 10:13:54 +00:00
commit 7b7907813c
4 changed files with 40 additions and 43 deletions

View File

@ -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) {
// setTimeout(() => {
// this.getStatus()
// }, 2000)
// }
if (this.agent) {
setTimeout(() => {
window.tccc.Agent.online().then(res => {
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') {
@ -484,7 +471,8 @@ export default {
box-sizing: border-box;
// background: url('~@/assets/image/header-bg-1920.png') no-repeat ;
background-size: cover;
background-color: #C66A5B;
// background-color: #C66A5B;
background-color: #5d7eeac7;
.el-badge__content {
height: $height20;
@ -508,7 +496,7 @@ export default {
background-color: transparent;
}
.el-menu--horizontal > .el-menu-item {
.el-menu--horizontal > .el-menu-item,.el-menu--horizontal > .el-menu-item i {
color: #FFFFFFB2;
}
@ -516,7 +504,7 @@ export default {
color: #FFFFFFB2;
}
.el-menu--horizontal > .el-menu-item:hover {
.el-menu--horizontal > .el-menu-item:hover, .el-menu--horizontal > .el-menu-item:hover i {
color: #C66A5B;
background-color: transparent;
color: #fff;
@ -532,7 +520,7 @@ export default {
color: #FFFFFFB2;
}
.el-menu--horizontal > .el-menu-item.is-active {
.el-menu--horizontal > .el-menu-item.is-active, .el-menu--horizontal > .el-menu-item.is-active i {
border-bottom: 2px solid #fff;
background-color: transparent;
color: #fff;

View File

@ -1,8 +1,8 @@
<template>
<el-submenu v-if="menu.children && menu.children.length >= 1" :index="menu.url">
<template slot="title">
<svg-icon :icon-class="menu.menuIcon"></svg-icon>
<span slot="title" class="ml-8 f14">{{ menu.name }}</span>
<!-- <svg-icon :icon-class="menu.menuIcon"></svg-icon> -->
<span slot="title" class="ml-8 f16">{{ menu.name }}</span>
</template>
<MenuTree v-for="item in menu.children" :key="item.url"
:menu="item"
@ -11,8 +11,9 @@
<el-menu-item v-else @click="handleRoute(menu)" :index="menu.url"
class="zd-el-menu-item__custom-class">
<svg-icon :icon-class="menu.menuIcon"></svg-icon>
<span slot="title" class="ml-8 f14">{{ menu.name }}</span>
<!-- <svg-icon :icon-class="menu.menuIcon"></svg-icon> -->
<i :class="menu.menuIcon"></i>
<span slot="title" class="ml-8 f16">{{ menu.name }}</span>
</el-menu-item>
</template>
<script>
@ -28,6 +29,9 @@
default: 0
}
},
mounted() {
console.log(this.menu,'menu')
},
methods: {
handleRoute(menu) {
// console.log('menu',menu)

View File

@ -51,17 +51,17 @@
if(identifier.includes('manager') || identifier.includes('admin'))
{
//
this.menuTree.unshift({children:[],id:0,menuIcon:"menu-home",name:"调解首页",nameEn:"",pid:0,prefix:"mediate",sort:0,type:1,typeName:"",url:"/workbench"})
this.menuTree.unshift({children:[],id:0,menuIcon:"el-icon-s-home",name:"调解首页",nameEn:"",pid:0,prefix:"mediate",sort:0,type:1,typeName:"",url:"/workbench"})
}
else
{
//
this.menuTree.unshift({children:[],id:0,menuIcon:"menu-home",name:"调解首页",nameEn:"",pid:0,prefix:"mediate",sort:0,type:1,typeName:"",url:"/workbenchcm"})
this.menuTree.unshift({children:[],id:0,menuIcon:"el-icon-s-home",name:"调解首页",nameEn:"",pid:0,prefix:"mediate",sort:0,type:1,typeName:"",url:"/workbenchcm"})
}
}
else
{
this.menuTree.push({children:[],id:0,menuIcon:"menu-home",name:"调解首页",nameEn:"",pid:0,prefix:"mediate",sort:0,type:1,typeName:"",url:"/workbenchcm"})
this.menuTree.push({children:[],id:0,menuIcon:"el-icon-s-home",name:"调解首页",nameEn:"",pid:0,prefix:"mediate",sort:0,type:1,typeName:"",url:"/workbenchcm"})
}
},
methods: {

View File

@ -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 {