backup_master_20231211
飘泊客 1 year ago
parent 28f68493e6
commit c8b46558d2

@ -1,8 +1,8 @@
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-10-21 10:06:23 * @Date: 2021-10-21 10:06:23
* @LastEditTime: 2023-07-04 14:33:35 * @LastEditTime: 2023-07-04 18:27:38
* @LastEditors: 飘泊客 * @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: /byhl-taomi/src/api/index.js * @FilePath: /byhl-taomi/src/api/index.js
*/ */
@ -1110,7 +1110,7 @@ export function setLogSave(data) {
data data
}) })
} }
export function getCompensateInfo333(params) { export function getCompensateInfo(params) {
return request({ return request({
url: baseObj.url + 'api/boost/compensateInfo', url: baseObj.url + 'api/boost/compensateInfo',
method: 'get', method: 'get',

@ -276,9 +276,9 @@ export default {
}, },
formatter(data) { formatter(data) {
let matter = `${data[0].name}</br>` let matter = `${data[0].name}</br>`
matter += `${data[0].marker} 资源接通${data[0].value}</br> matter += `${data[0].marker} 资源接通${data[0].value}</br>
${data[1].marker} 接通率 ${data[1].value * 100}%</br> ${data[1].marker} 接通率 ${data[1].value * 100}%</br>
${data[2].marker} 资源使用${data[2].value}</br> ${data[2].marker} 资源使用${data[2].value}</br>
${data[3].marker} 使用率 ${data[3].value * ${data[3].marker} 使用率 ${data[3].value *
100}%</br>` 100}%</br>`
return matter return matter
@ -337,7 +337,7 @@ export default {
data: seriesArr[1] data: seriesArr[1]
} }
// { // {
// name: "使", // name: "使",
// type: "bar", // type: "bar",
// barGap: 0, // barGap: 0,
// label: labelOption, // label: labelOption,

@ -2,8 +2,8 @@
* @Description: router * @Description: router
* @Autor: 飘泊客 * @Autor: 飘泊客
* @Date: 2021-12-02 16:54:53 * @Date: 2021-12-02 16:54:53
* @LastEditors: 飘泊客 * @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
* @LastEditTime: 2022-12-09 13:21:52 * @LastEditTime: 2023-07-05 17:15:23
*/ */
import Vue from 'vue' import Vue from 'vue'
import Router from 'vue-router' import Router from 'vue-router'

@ -2,8 +2,8 @@
* @Description: JSSIP * @Description: JSSIP
* @Autor: 飘泊客 * @Autor: 飘泊客
* @Date: 2022-02-16 14:47:05 * @Date: 2022-02-16 14:47:05
* @LastEditors: 飘泊客 * @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
* @LastEditTime: 2023-06-25 10:36:32 * @LastEditTime: 2023-07-11 18:13:17
*/ */
import JsSIP from 'JsSIP' import JsSIP from 'JsSIP'
import store from '../store' import store from '../store'
@ -76,9 +76,9 @@ export default {
console.error('SIP注册失败,请联系管理员', e) console.error('SIP注册失败,请联系管理员', e)
store.commit('webrtc/SET_FSSTATUS', 'registrationFailed') store.commit('webrtc/SET_FSSTATUS', 'registrationFailed')
Message.error('SIP注册失败,请联系管理员') Message.error('SIP注册失败,请联系管理员')
setTimeout(() => { // setTimeout(() => {
store.commit('webrtc/SET_FSSTATUS', '') // store.commit('webrtc/SET_FSSTATUS', '')
}, 1000) // }, 1000)
}) })
this.RTC.ua.on('newMessage', e => { this.RTC.ua.on('newMessage', e => {
console.log('------im新消息事件------') console.log('------im新消息事件------')
@ -180,8 +180,8 @@ export default {
console.log('------呼叫失败: ', e) console.log('------呼叫失败: ', e)
Message.error('呼叫失败,请重试拨打') Message.error('呼叫失败,请重试拨打')
this.RTC.session = null this.RTC.session = null
callback('failed', e)
store.commit('webrtc/SET_CALLSTATUS', 'failed') store.commit('webrtc/SET_CALLSTATUS', 'failed')
callback('failed', e)
}, },
ended(e) { ended(e) {
console.log('------呼叫结束:' + e.originator === 'remote' ? '对方挂断' : '自己挂断', e) console.log('------呼叫结束:' + e.originator === 'remote' ? '对方挂断' : '自己挂断', e)

@ -11,7 +11,7 @@
<div class="card-panel-description"> <div class="card-panel-description">
<count-to :start-val="0" :end-val="statistics.usrNum" :duration="3000" class="card-panel-num" /> <count-to :start-val="0" :end-val="statistics.usrNum" :duration="3000" class="card-panel-num" />
<div class="card-panel-text"> <div class="card-panel-text">
资源使用 资源使用
</div> </div>
</div> </div>
</div> </div>
@ -22,7 +22,7 @@
<div class="card-panel-description"> <div class="card-panel-description">
<count-to :start-val="0" :end-val="statistics.turnOnNum" :duration="3000" class="card-panel-num" /> <count-to :start-val="0" :end-val="statistics.turnOnNum" :duration="3000" class="card-panel-num" />
<div class="card-panel-text"> <div class="card-panel-text">
资源接通 资源接通
</div> </div>
</div> </div>
</div> </div>
@ -57,7 +57,7 @@
</div> </div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text"> <div class="card-panel-text">
资源使用 资源使用
</div> </div>
<count-to :start-val="0" :end-val="statistics.usrNum" :duration="3000" class="card-panel-num" /> <count-to :start-val="0" :end-val="statistics.usrNum" :duration="3000" class="card-panel-num" />
</div> </div>
@ -70,7 +70,7 @@
</div> </div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text"> <div class="card-panel-text">
资源接通 资源接通
</div> </div>
<count-to :start-val="0" :end-val="statistics.turnOnNum" :duration="3000" class="card-panel-num" /> <count-to :start-val="0" :end-val="statistics.turnOnNum" :duration="3000" class="card-panel-num" />
</div> </div>

@ -17,7 +17,7 @@
<div class="card-panel-description"> <div class="card-panel-description">
<count-to :start-val="0" :end-val="tabActive == 1 ? statistics.talk.usrNum : statistics.crm.usrNum" :duration="3000" class="card-panel-num" /> <count-to :start-val="0" :end-val="tabActive == 1 ? statistics.talk.usrNum : statistics.crm.usrNum" :duration="3000" class="card-panel-num" />
<div class="card-panel-text"> <div class="card-panel-text">
资源使用 资源使用
<el-tooltip class="item" effect="dark" :content="`当日${tabActive == 1 ? '拓客' : '商机'}模块所有操作过的线索数量`" placement="top-start"> <el-tooltip class="item" effect="dark" :content="`当日${tabActive == 1 ? '拓客' : '商机'}模块所有操作过的线索数量`" placement="top-start">
<i class="el-icon-warning" /> <i class="el-icon-warning" />
</el-tooltip> </el-tooltip>
@ -42,7 +42,7 @@
<div class="card-panel-description"> <div class="card-panel-description">
<count-to :start-val="0" :end-val="tabActive == 1 ? statistics.talk.turnOnNum : statistics.crm.turnOnNum" :duration="3000" class="card-panel-num" /> <count-to :start-val="0" :end-val="tabActive == 1 ? statistics.talk.turnOnNum : statistics.crm.turnOnNum" :duration="3000" class="card-panel-num" />
<div class="card-panel-text"> <div class="card-panel-text">
资源接通 资源接通
</div> </div>
</div> </div>
</div> </div>
@ -68,7 +68,7 @@
</div> </div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text"> <div class="card-panel-text">
资源使用 资源使用
</div> </div>
<count-to :start-val="0" :end-val="statistics.crm.usrNum" :duration="3000" class="card-panel-num" /> <count-to :start-val="0" :end-val="statistics.crm.usrNum" :duration="3000" class="card-panel-num" />
</div> </div>
@ -94,7 +94,7 @@
</div> </div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text"> <div class="card-panel-text">
资源接通 资源接通
</div> </div>
<count-to :start-val="0" :end-val="statistics.crm.turnOnNum" :duration="3000" class="card-panel-num" /> <count-to :start-val="0" :end-val="statistics.crm.turnOnNum" :duration="3000" class="card-panel-num" />
</div> </div>

@ -2,8 +2,8 @@
* @Description: home * @Description: home
* @Autor: 飘泊客 * @Autor: 飘泊客
* @Date: 2021-12-02 16:54:53 * @Date: 2021-12-02 16:54:53
* @LastEditors: 飘泊客 * @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
* @LastEditTime: 2023-06-29 10:35:48 * @LastEditTime: 2023-07-12 15:58:49
--> -->
<template> <template>
<div> <div>
@ -199,7 +199,7 @@
<el-col :span="8"> <el-col :span="8">
<div class="grid-content"> <div class="grid-content">
<div class="grid-content-item"> <div class="grid-content-item">
<div class="card-panel-text">资源接通</div> <div class="card-panel-text">资源接通</div>
<div class="card-panel-num">{{ turnOnNum }}</div> <div class="card-panel-num">{{ turnOnNum }}</div>
</div> </div>
</div> </div>
@ -217,7 +217,7 @@
<el-col :span="8"> <el-col :span="8">
<div class="grid-content"> <div class="grid-content">
<div class="grid-content-item"> <div class="grid-content-item">
<div class="card-panel-text">资源使用</div> <div class="card-panel-text">资源使用</div>
<div class="card-panel-num">{{ usrNum }}</div> <div class="card-panel-num">{{ usrNum }}</div>
</div> </div>
</div> </div>
@ -262,7 +262,7 @@
</div> </div>
<div class="card-panel-description"> <div class="card-panel-description">
<div class="card-panel-text"> <div class="card-panel-text">
资源使用 资源使用
</div> </div>
<div class="card-panel-num">{{ usrNum }}</div> <div class="card-panel-num">{{ usrNum }}</div>
</div> </div>

@ -80,6 +80,7 @@
<el-table ref="table" v-loading="crud.loading" style="width: 100%;" :data="crud.data" :header-cell-style="{'text-align':'left'}" :row-class-name="tableRowClassName"> <el-table ref="table" v-loading="crud.loading" style="width: 100%;" :data="crud.data" :header-cell-style="{'text-align':'left'}" :row-class-name="tableRowClassName">
<el-table-column :show-overflow-tooltip="true" prop="id" label="ID" width="80" /> <el-table-column :show-overflow-tooltip="true" prop="id" label="ID" width="80" />
<el-table-column :show-overflow-tooltip="true" prop="taskName" label="任务名" width="120" /> <el-table-column :show-overflow-tooltip="true" prop="taskName" label="任务名" width="120" />
<el-table-column :show-overflow-tooltip="true" prop="address" width="100" label="归属地" />
<el-table-column :show-overflow-tooltip="true" prop="clueCallStatus" label="上次通话状态" width="100"> <el-table-column :show-overflow-tooltip="true" prop="clueCallStatus" label="上次通话状态" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ statecCmparison('conversationState', scope.row.clueCallStatus) }}</div> <div>{{ statecCmparison('conversationState', scope.row.clueCallStatus) }}</div>
@ -566,7 +567,7 @@ export default {
}, },
cruds() { cruds() {
return CRUD({ return CRUD({
title: '投流线索', title: 'DMP线索',
url: 'api-source/source/clue/queryAll', url: 'api-source/source/clue/queryAll',
crudMethod: { ...crudUser }, crudMethod: { ...crudUser },
optShow: { optShow: {
@ -909,7 +910,6 @@ export default {
} else { } else {
this.compensationObj.status = 3 this.compensationObj.status = 3
} }
console.log('🚀 ~ file: currentIndex.vue:898 ~ rowClick ~ this.compensationObj:', this.compensationObj)
this.drawer = true this.drawer = true
}, },
async dialTel(data) { async dialTel(data) {
@ -1027,12 +1027,12 @@ export default {
loading && loading.close() loading && loading.close()
this.responsePayObj = null this.responsePayObj = null
this.setLog(type, true, `FS注册${this.$store.getters.fsStatus}/WS连接${webrtc.RTC.isestablish}-接口呼叫挂断`) this.setLog(type, true, `FS注册${this.$store.getters.fsStatus}/WS连接${webrtc.RTC.isestablish}-接口呼叫挂断`)
if (res.status === 1) { // if (res.status === 1) {
this.$message({ // this.$message({
type: 'warning', // type: 'warning',
message: '请稍后重试' // message: ''
}) // })
} // }
}).catch(() => { loading && loading.close() }) }).catch(() => { loading && loading.close() })
} }
}) })

@ -1522,14 +1522,14 @@ export default {
}) })
rollStop(this.responsePayObj).then(res => { rollStop(this.responsePayObj).then(res => {
loading && loading.close() loading && loading.close()
this.setLog(type, true, `FS注册${this.$store.getters.fsStatus}/WS连接${webrtc.RTC.isestablish}-接口呼叫挂断`)
this.responsePayObj = null this.responsePayObj = null
if (res.status === 1) { this.setLog(type, true, `FS注册${this.$store.getters.fsStatus}/WS连接${webrtc.RTC.isestablish}-接口呼叫挂断`)
this.$message({ // if (res.status === 1) {
type: 'warning', // this.$message({
message: '请稍后重试' // type: 'warning',
}) // message: ''
} // })
// }
}).catch(() => { loading && loading.close() }) }).catch(() => { loading && loading.close() })
} }
}) })

@ -169,6 +169,7 @@
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column :show-overflow-tooltip="true" prop="taskName" label="任务名" width="120" /> <el-table-column :show-overflow-tooltip="true" prop="taskName" label="任务名" width="120" />
<el-table-column :show-overflow-tooltip="true" prop="nid" width="100" label="线索ID" /> <el-table-column :show-overflow-tooltip="true" prop="nid" width="100" label="线索ID" />
<el-table-column :show-overflow-tooltip="true" prop="address" width="100" label="归属地" />
<el-table-column :show-overflow-tooltip="true" prop="memberStatus" label="分配状态"> <el-table-column :show-overflow-tooltip="true" prop="memberStatus" label="分配状态">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="scope.row.memberStatus == 0 ? 'warning' : 'success'">{{ scope.row.memberStatus == 0 ? '未分配' : '已分配' }}</el-tag> <el-tag :type="scope.row.memberStatus == 0 ? 'warning' : 'success'">{{ scope.row.memberStatus == 0 ? '未分配' : '已分配' }}</el-tag>

@ -2,8 +2,8 @@
* @Description: home * @Description: home
* @Autor: 飘泊客 * @Autor: 飘泊客
* @Date: 2021-12-02 16:54:53 * @Date: 2021-12-02 16:54:53
* @LastEditors: 飘泊客 * @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
* @LastEditTime: 2023-05-17 17:33:09 * @LastEditTime: 2023-07-12 15:57:44
--> -->
<template> <template>
<div class="dashboard-container"> <div class="dashboard-container">
@ -865,7 +865,7 @@ export default {
xAxis, xAxis,
type: 'managers', type: 'managers',
seriesArr: [arr4, arr2], seriesArr: [arr4, arr2],
legend: ['资源接通数', '资源使用数'], legend: ['资源接通数', '资源使用数'],
fontSize: 16 fontSize: 16
} }
this.tokerBarChartDatasLeft = chartDatasLeft this.tokerBarChartDatasLeft = chartDatasLeft

Loading…
Cancel
Save