|
@@ -7,7 +7,8 @@
|
|
|
<el-text tag="b" v-if="['301', '303'].includes(m_strTelState)" type="danger">{{ formatDuration(talkTime) }}</el-text>
|
|
|
<el-text tag="b" v-else-if="m_strTelState === '200'">{{ formatDuration(idleTime) }}</el-text>
|
|
|
<el-text tag="b" v-else-if="m_strTelState === '201'">{{ formatDuration(busyTime) }}</el-text>
|
|
|
- <!-- <el-text tag="b" v-else-if="m_strTelState === '900'">{{ formatDuration(arrangeTime) }}</el-text>-->
|
|
|
+ <el-text tag="b" v-else-if="m_strTelState === '320'">{{ formatDuration(conferenceTime) }}</el-text>
|
|
|
+ <el-text tag="b" v-else-if="m_strTelState === '900'">{{ formatDuration(arrangeTime) }}</el-text>
|
|
|
<SvgIcon name="ele-CaretBottom" class="arrow" :class="showPop ? 'is-reverse' : ''" />
|
|
|
</div>
|
|
|
</template>
|
|
@@ -332,10 +333,10 @@ const activeArr = computed(() => {
|
|
|
'302': ['hangup'], // 呼出振铃
|
|
|
'303': ['hangup', 'hold', 'consult', 'transferMz', 'evaluate'], // 呼出通话
|
|
|
'310': ['hangup', 'hold'], // 通话保持
|
|
|
- '900': ['dutyOff', 'talkingDeal'], // 整理
|
|
|
'320': ['hangup', 'evaluate'], // 三方会议中
|
|
|
'330': ['hangup', 'hold', 'transfer', 'conference', 'evaluate'], // 转接 咨询
|
|
|
'331': ['hangup', 'hold', 'evaluate'], // 咨询 转接
|
|
|
+ '900': ['dutyOff', 'talkingDeal'], // 整理
|
|
|
};
|
|
|
let arr = <EmptyArrayType>[];
|
|
|
if (m_strTelState.value in switchCases) {
|
|
@@ -355,10 +356,10 @@ const currentStatusText = computed(() => {
|
|
|
'302': '呼出振铃',
|
|
|
'303': '呼出通话',
|
|
|
'310': '通话保持',
|
|
|
- '900': '整理',
|
|
|
'320': '三方会议',
|
|
|
'330': '转接',
|
|
|
'331': '转接',
|
|
|
+ '900': '整理',
|
|
|
};
|
|
|
return statusMap[m_strTelState.value] || '';
|
|
|
});
|
|
@@ -484,7 +485,6 @@ const arrangeTimer = useIntervalFn(
|
|
|
// 整理时长开始
|
|
|
const startArrangeTime = () => {
|
|
|
arrangeTimer.resume();
|
|
|
- stopBusyTime();
|
|
|
};
|
|
|
// 整理时长开始结束
|
|
|
const stopArrangeTime = () => {
|
|
@@ -1682,16 +1682,16 @@ const evtCallAlerting = (data) => {
|
|
|
// 振铃呼出弹屏
|
|
|
console.log(
|
|
|
'呼出是否弹屏[' +
|
|
|
- m_bIsOpen.value +
|
|
|
- '];弹屏方式[' +
|
|
|
- m_strOpenFlag.value +
|
|
|
- '];记录ID[' +
|
|
|
- callId.value +
|
|
|
- '];主叫号码[' +
|
|
|
- strTelNumber +
|
|
|
- '];被叫号码[' +
|
|
|
- strCalledNum +
|
|
|
- ']'
|
|
|
+ m_bIsOpen.value +
|
|
|
+ '];弹屏方式[' +
|
|
|
+ m_strOpenFlag.value +
|
|
|
+ '];记录ID[' +
|
|
|
+ callId.value +
|
|
|
+ '];主叫号码[' +
|
|
|
+ strTelNumber +
|
|
|
+ '];被叫号码[' +
|
|
|
+ strCalledNum +
|
|
|
+ ']'
|
|
|
);
|
|
|
m_bIsOpen.value = true;
|
|
|
// 呼出不再弹单
|
|
@@ -1812,16 +1812,16 @@ const evtEvtCallAnswer = (data) => {
|
|
|
if (!m_bIsOpen.value && m_strOpenFlag.value === '1') {
|
|
|
console.log(
|
|
|
'呼出是否弹屏[' +
|
|
|
- m_bIsOpen.value +
|
|
|
- '];弹屏方式[' +
|
|
|
- m_strOpenFlag.value +
|
|
|
- '];记录ID[' +
|
|
|
- callId.value +
|
|
|
- '];主叫号码[' +
|
|
|
- strTelNumber +
|
|
|
- '];被叫号码[' +
|
|
|
- strCalledNum +
|
|
|
- ']'
|
|
|
+ m_bIsOpen.value +
|
|
|
+ '];弹屏方式[' +
|
|
|
+ m_strOpenFlag.value +
|
|
|
+ '];记录ID[' +
|
|
|
+ callId.value +
|
|
|
+ '];主叫号码[' +
|
|
|
+ strTelNumber +
|
|
|
+ '];被叫号码[' +
|
|
|
+ strCalledNum +
|
|
|
+ ']'
|
|
|
);
|
|
|
m_bIsOpen.value = true;
|
|
|
// 呼出不再弹单
|
|
@@ -1853,16 +1853,16 @@ const evtEvtCallAnswer = (data) => {
|
|
|
callId.value = data.Param.Callid;
|
|
|
console.log(
|
|
|
'是否弹屏[' +
|
|
|
- m_bIsOpen.value +
|
|
|
- '];弹屏方式[' +
|
|
|
- m_strOpenFlag.value +
|
|
|
- '];记录ID[' +
|
|
|
- callId.value +
|
|
|
- '];主叫号码[' +
|
|
|
- strTelNumber +
|
|
|
- '];被叫号码[' +
|
|
|
- strCalledNum +
|
|
|
- ']'
|
|
|
+ m_bIsOpen.value +
|
|
|
+ '];弹屏方式[' +
|
|
|
+ m_strOpenFlag.value +
|
|
|
+ '];记录ID[' +
|
|
|
+ callId.value +
|
|
|
+ '];主叫号码[' +
|
|
|
+ strTelNumber +
|
|
|
+ '];被叫号码[' +
|
|
|
+ strCalledNum +
|
|
|
+ ']'
|
|
|
);
|
|
|
if (strTelNumber.length == strCalledNum.length && strTelNumber.length == 4) {
|
|
|
// 如果主叫号码、被叫号码都是分机号码,则不弹屏
|
|
@@ -1874,18 +1874,18 @@ const evtEvtCallAnswer = (data) => {
|
|
|
const strDigit = data.Param.Digit;
|
|
|
console.log(
|
|
|
'用户按键' +
|
|
|
- strDigit +
|
|
|
- '是否弹屏[' +
|
|
|
- m_bIsOpen.value +
|
|
|
- '];弹屏方式[' +
|
|
|
- m_strOpenFlag.value +
|
|
|
- '];记录ID[' +
|
|
|
- callId.value +
|
|
|
- '];主叫号码[' +
|
|
|
- strTelNumber +
|
|
|
- '];被叫号码[' +
|
|
|
- strCalledNum +
|
|
|
- ']'
|
|
|
+ strDigit +
|
|
|
+ '是否弹屏[' +
|
|
|
+ m_bIsOpen.value +
|
|
|
+ '];弹屏方式[' +
|
|
|
+ m_strOpenFlag.value +
|
|
|
+ '];记录ID[' +
|
|
|
+ callId.value +
|
|
|
+ '];主叫号码[' +
|
|
|
+ strTelNumber +
|
|
|
+ '];被叫号码[' +
|
|
|
+ strCalledNum +
|
|
|
+ ']'
|
|
|
);
|
|
|
router.push({
|
|
|
name: 'orderAccept',
|
|
@@ -1933,16 +1933,16 @@ const evtEvtCalling = (data) => {
|
|
|
m_bIsOpen.value = true;
|
|
|
console.log(
|
|
|
'呼出是否弹屏[' +
|
|
|
- m_bIsOpen.value +
|
|
|
- '];弹屏方式[' +
|
|
|
- m_strOpenFlag.value +
|
|
|
- '];记录ID[' +
|
|
|
- callId.value +
|
|
|
- '];主叫号码[' +
|
|
|
- strTelNumber +
|
|
|
- '];被叫号码[' +
|
|
|
- strCalledNum +
|
|
|
- ']'
|
|
|
+ m_bIsOpen.value +
|
|
|
+ '];弹屏方式[' +
|
|
|
+ m_strOpenFlag.value +
|
|
|
+ '];记录ID[' +
|
|
|
+ callId.value +
|
|
|
+ '];主叫号码[' +
|
|
|
+ strTelNumber +
|
|
|
+ '];被叫号码[' +
|
|
|
+ strCalledNum +
|
|
|
+ ']'
|
|
|
);
|
|
|
router.push({
|
|
|
name: 'orderAccept',
|
|
@@ -2042,10 +2042,12 @@ const e_TopStateChange = (state: string) => {
|
|
|
case '300': //呼入振铃
|
|
|
break;
|
|
|
case '301': // 呼入通话
|
|
|
+ stopConferenceTime();
|
|
|
break;
|
|
|
case '302': // 呼出振铃
|
|
|
break;
|
|
|
case '303': // 呼出通话
|
|
|
+ stopConferenceTime();
|
|
|
break;
|
|
|
case '310': // 通话保持
|
|
|
break;
|