diff --git a/src/api/index.js b/src/api/index.js
index 3dc0a29..98d7cd6 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,8 +1,8 @@
/*
* @Author: your name
* @Date: 2021-10-21 10:06:23
- * @LastEditTime: 2023-07-04 14:33:35
- * @LastEditors: 飘泊客
+ * @LastEditTime: 2023-07-04 18:27:38
+ * @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
* @FilePath: /byhl-taomi/src/api/index.js
*/
@@ -1110,7 +1110,7 @@ export function setLogSave(data) {
data
})
}
-export function getCompensateInfo333(params) {
+export function getCompensateInfo(params) {
return request({
url: baseObj.url + 'api/boost/compensateInfo',
method: 'get',
diff --git a/src/components/Echarts/BarChart.vue b/src/components/Echarts/BarChart.vue
index 8da55e2..24fe945 100644
--- a/src/components/Echarts/BarChart.vue
+++ b/src/components/Echarts/BarChart.vue
@@ -276,10 +276,10 @@ export default {
},
formatter(data) {
let matter = `${data[0].name}`
- matter += `${data[0].marker} 资源接通数 :${data[0].value}
- ${data[1].marker} 接通率 :${data[1].value * 100}%
- ${data[2].marker} 资源使用数 :${data[2].value}
- ${data[3].marker} 使用率 :${data[3].value *
+ matter += `${data[0].marker} 资源接通次数 :${data[0].value}
+ ${data[1].marker} 接通率 :${data[1].value * 100}%
+ ${data[2].marker} 资源使用次数 :${data[2].value}
+ ${data[3].marker} 使用率 :${data[3].value *
100}%`
return matter
}
@@ -337,7 +337,7 @@ export default {
data: seriesArr[1]
}
// {
- // name: "资源使用数",
+ // name: "资源使用次数",
// type: "bar",
// barGap: 0,
// label: labelOption,
diff --git a/src/router/routers.js b/src/router/routers.js
index f8a1921..2f36f4d 100644
--- a/src/router/routers.js
+++ b/src/router/routers.js
@@ -2,8 +2,8 @@
* @Description: router
* @Autor: 飘泊客
* @Date: 2021-12-02 16:54:53
- * @LastEditors: 飘泊客
- * @LastEditTime: 2022-12-09 13:21:52
+ * @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-07-05 17:15:23
*/
import Vue from 'vue'
import Router from 'vue-router'
diff --git a/src/utils/JSsip.js b/src/utils/JSsip.js
index eb34d28..6d9441e 100644
--- a/src/utils/JSsip.js
+++ b/src/utils/JSsip.js
@@ -2,8 +2,8 @@
* @Description: JSSIP
* @Autor: 飘泊客
* @Date: 2022-02-16 14:47:05
- * @LastEditors: 飘泊客
- * @LastEditTime: 2023-06-25 10:36:32
+ * @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-07-11 18:13:17
*/
import JsSIP from 'JsSIP'
import store from '../store'
@@ -76,9 +76,9 @@ export default {
console.error('SIP注册失败,请联系管理员', e)
store.commit('webrtc/SET_FSSTATUS', 'registrationFailed')
Message.error('SIP注册失败,请联系管理员')
- setTimeout(() => {
- store.commit('webrtc/SET_FSSTATUS', '')
- }, 1000)
+ // setTimeout(() => {
+ // store.commit('webrtc/SET_FSSTATUS', '')
+ // }, 1000)
})
this.RTC.ua.on('newMessage', e => {
console.log('------im新消息事件------')
@@ -180,8 +180,8 @@ export default {
console.log('------呼叫失败: ', e)
Message.error('呼叫失败,请重试拨打')
this.RTC.session = null
- callback('failed', e)
store.commit('webrtc/SET_CALLSTATUS', 'failed')
+ callback('failed', e)
},
ended(e) {
console.log('------呼叫结束:' + e.originator === 'remote' ? '对方挂断' : '自己挂断', e)
diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue
index 0df59db..6a214b6 100644
--- a/src/views/dashboard/PanelGroup.vue
+++ b/src/views/dashboard/PanelGroup.vue
@@ -11,7 +11,7 @@
@@ -22,7 +22,7 @@
@@ -57,7 +57,7 @@
@@ -70,7 +70,7 @@
diff --git a/src/views/dashboard/PanelGroupManager.vue b/src/views/dashboard/PanelGroupManager.vue
index 0e35674..ecc65f6 100644
--- a/src/views/dashboard/PanelGroupManager.vue
+++ b/src/views/dashboard/PanelGroupManager.vue
@@ -17,7 +17,7 @@
- 资源使用数
+ 资源使用次数
@@ -42,7 +42,7 @@
@@ -68,7 +68,7 @@
@@ -94,7 +94,7 @@
diff --git a/src/views/home.vue b/src/views/home.vue
index a472618..9099126 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -2,8 +2,8 @@
* @Description: home
* @Autor: 飘泊客
* @Date: 2021-12-02 16:54:53
- * @LastEditors: 飘泊客
- * @LastEditTime: 2023-06-29 10:35:48
+ * @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-07-12 15:58:49
-->
@@ -199,7 +199,7 @@
-
资源接通数
+
资源接通次数
{{ turnOnNum }}
@@ -217,7 +217,7 @@
-
资源使用数
+
资源使用次数
{{ usrNum }}
@@ -262,7 +262,7 @@
- 资源使用数
+ 资源使用次数
{{ usrNum }}
diff --git a/src/views/teamMember/resources/currentIndex.vue b/src/views/teamMember/resources/currentIndex.vue
index 8f9d61f..d80d22f 100644
--- a/src/views/teamMember/resources/currentIndex.vue
+++ b/src/views/teamMember/resources/currentIndex.vue
@@ -80,6 +80,7 @@
+
{{ statecCmparison('conversationState', scope.row.clueCallStatus) }}
@@ -566,7 +567,7 @@ export default {
},
cruds() {
return CRUD({
- title: '投流线索',
+ title: 'DMP线索',
url: 'api-source/source/clue/queryAll',
crudMethod: { ...crudUser },
optShow: {
@@ -909,7 +910,6 @@ export default {
} else {
this.compensationObj.status = 3
}
- console.log('🚀 ~ file: currentIndex.vue:898 ~ rowClick ~ this.compensationObj:', this.compensationObj)
this.drawer = true
},
async dialTel(data) {
@@ -1027,12 +1027,12 @@ export default {
loading && loading.close()
this.responsePayObj = null
this.setLog(type, true, `FS注册:${this.$store.getters.fsStatus}/WS连接:${webrtc.RTC.isestablish}-接口呼叫挂断`)
- if (res.status === 1) {
- this.$message({
- type: 'warning',
- message: '请稍后重试'
- })
- }
+ // if (res.status === 1) {
+ // this.$message({
+ // type: 'warning',
+ // message: '请稍后重试'
+ // })
+ // }
}).catch(() => { loading && loading.close() })
}
})
diff --git a/src/views/teamMember/resources/index.vue b/src/views/teamMember/resources/index.vue
index 9a9371b..bfe9461 100644
--- a/src/views/teamMember/resources/index.vue
+++ b/src/views/teamMember/resources/index.vue
@@ -1522,14 +1522,14 @@ export default {
})
rollStop(this.responsePayObj).then(res => {
loading && loading.close()
- this.setLog(type, true, `FS注册:${this.$store.getters.fsStatus}/WS连接:${webrtc.RTC.isestablish}-接口呼叫挂断`)
this.responsePayObj = null
- if (res.status === 1) {
- this.$message({
- type: 'warning',
- message: '请稍后重试'
- })
- }
+ this.setLog(type, true, `FS注册:${this.$store.getters.fsStatus}/WS连接:${webrtc.RTC.isestablish}-接口呼叫挂断`)
+ // if (res.status === 1) {
+ // this.$message({
+ // type: 'warning',
+ // message: '请稍后重试'
+ // })
+ // }
}).catch(() => { loading && loading.close() })
}
})
diff --git a/src/views/tokerModular/currentTask.vue b/src/views/tokerModular/currentTask.vue
index e2e5f27..9dd3e07 100644
--- a/src/views/tokerModular/currentTask.vue
+++ b/src/views/tokerModular/currentTask.vue
@@ -169,6 +169,7 @@
+
{{ scope.row.memberStatus == 0 ? '未分配' : '已分配' }}
diff --git a/src/views/tokerModular/tokerChart.vue b/src/views/tokerModular/tokerChart.vue
index 6633a13..1c9f328 100644
--- a/src/views/tokerModular/tokerChart.vue
+++ b/src/views/tokerModular/tokerChart.vue
@@ -2,8 +2,8 @@
* @Description: home
* @Autor: 飘泊客
* @Date: 2021-12-02 16:54:53
- * @LastEditors: 飘泊客
- * @LastEditTime: 2023-05-17 17:33:09
+ * @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-07-12 15:57:44
-->
@@ -865,7 +865,7 @@ export default {
xAxis,
type: 'managers',
seriesArr: [arr4, arr2],
- legend: ['资源接通数', '资源使用数'],
+ legend: ['资源接通次数', '资源使用次数'],
fontSize: 16
}
this.tokerBarChartDatasLeft = chartDatasLeft