diff --git a/src/components/LeftCallBar.vue b/src/components/LeftCallBar.vue new file mode 100644 index 0000000..96d5857 --- /dev/null +++ b/src/components/LeftCallBar.vue @@ -0,0 +1,18 @@ + + + + + + diff --git a/src/components/LeftCallBar.vue b/src/components/LeftCallBar.vue new file mode 100644 index 0000000..96d5857 --- /dev/null +++ b/src/components/LeftCallBar.vue @@ -0,0 +1,18 @@ + + + + + + diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 9463f22..42b0e98 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -58,7 +58,7 @@ }, logout() { // 判断签入签出状态,如果已签入提醒先签出 - if (isReceiver() && this.$store.getters.online === '1') { + if (isReceiver() && this.$store.getters.signStatus === true) { this.$message.warning('请先签出!') } else { this.$store.dispatch('LogOut').then(() => { diff --git a/src/components/LeftCallBar.vue b/src/components/LeftCallBar.vue new file mode 100644 index 0000000..96d5857 --- /dev/null +++ b/src/components/LeftCallBar.vue @@ -0,0 +1,18 @@ + + + + + + diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 9463f22..42b0e98 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -58,7 +58,7 @@ }, logout() { // 判断签入签出状态,如果已签入提醒先签出 - if (isReceiver() && this.$store.getters.online === '1') { + if (isReceiver() && this.$store.getters.signStatus === true) { this.$message.warning('请先签出!') } else { this.$store.dispatch('LogOut').then(() => { diff --git a/src/layout/components/ivr/chooseExten.vue b/src/layout/components/ivr/chooseExten.vue new file mode 100644 index 0000000..ae8f567 --- /dev/null +++ b/src/layout/components/ivr/chooseExten.vue @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/LeftCallBar.vue b/src/components/LeftCallBar.vue new file mode 100644 index 0000000..96d5857 --- /dev/null +++ b/src/components/LeftCallBar.vue @@ -0,0 +1,18 @@ + + + + + + diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 9463f22..42b0e98 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -58,7 +58,7 @@ }, logout() { // 判断签入签出状态,如果已签入提醒先签出 - if (isReceiver() && this.$store.getters.online === '1') { + if (isReceiver() && this.$store.getters.signStatus === true) { this.$message.warning('请先签出!') } else { this.$store.dispatch('LogOut').then(() => { diff --git a/src/layout/components/ivr/chooseExten.vue b/src/layout/components/ivr/chooseExten.vue new file mode 100644 index 0000000..ae8f567 --- /dev/null +++ b/src/layout/components/ivr/chooseExten.vue @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/layout/components/ivr/chooseSeats.vue b/src/layout/components/ivr/chooseSeats.vue index 30e6012..330c74f 100644 --- a/src/layout/components/ivr/chooseSeats.vue +++ b/src/layout/components/ivr/chooseSeats.vue @@ -5,12 +5,12 @@ :visible.sync="dialogVisible" :before-close="handleClose" :close-on-click-modal = "false" - title="内呼" + :title="dialogTitles[type]" width="350px" append-to-body>
- {{ seat.exten }} + {{ seat.exten }}[{{ seat.name }}]
@@ -30,11 +30,20 @@ default: function() { return [] } - } + }, + self: { + type: String, + default: '' + } // 排除自己 }, data() { return { - type: 'in', // 内呼in, 会议meeting + type: 'in', // 内呼in, 会议meeting, 转接transfer + dialogTitles: { + in: '内呼', + meeting: '三方通话', + transfer: '转接' + }, dialogVisible: false, // 对话框显示状态 tel: '', // 电话 currentNumber: '' // 当前数字 @@ -124,18 +133,23 @@ input{ /*background-color: transparent;*/ } + .seat-radio{ + margin-bottom:10px; + margin-left:10px; + display: block; + } - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/components/LeftCallBar.vue b/src/components/LeftCallBar.vue new file mode 100644 index 0000000..96d5857 --- /dev/null +++ b/src/components/LeftCallBar.vue @@ -0,0 +1,18 @@ + + + + + + diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 9463f22..42b0e98 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -58,7 +58,7 @@ }, logout() { // 判断签入签出状态,如果已签入提醒先签出 - if (isReceiver() && this.$store.getters.online === '1') { + if (isReceiver() && this.$store.getters.signStatus === true) { this.$message.warning('请先签出!') } else { this.$store.dispatch('LogOut').then(() => { diff --git a/src/layout/components/ivr/chooseExten.vue b/src/layout/components/ivr/chooseExten.vue new file mode 100644 index 0000000..ae8f567 --- /dev/null +++ b/src/layout/components/ivr/chooseExten.vue @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/layout/components/ivr/chooseSeats.vue b/src/layout/components/ivr/chooseSeats.vue index 30e6012..330c74f 100644 --- a/src/layout/components/ivr/chooseSeats.vue +++ b/src/layout/components/ivr/chooseSeats.vue @@ -5,12 +5,12 @@ :visible.sync="dialogVisible" :before-close="handleClose" :close-on-click-modal = "false" - title="内呼" + :title="dialogTitles[type]" width="350px" append-to-body>
- {{ seat.exten }} + {{ seat.exten }}[{{ seat.name }}]
@@ -30,11 +30,20 @@ default: function() { return [] } - } + }, + self: { + type: String, + default: '' + } // 排除自己 }, data() { return { - type: 'in', // 内呼in, 会议meeting + type: 'in', // 内呼in, 会议meeting, 转接transfer + dialogTitles: { + in: '内呼', + meeting: '三方通话', + transfer: '转接' + }, dialogVisible: false, // 对话框显示状态 tel: '', // 电话 currentNumber: '' // 当前数字 @@ -124,18 +133,23 @@ input{ /*background-color: transparent;*/ } + .seat-radio{ + margin-bottom:10px; + margin-left:10px; + display: block; + } - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index 3f8c80f..2295c93 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -6,62 +6,30 @@ 解除保持 内呼 外呼 + 挂机 会议 退出示忙 示忙 退出工作态 进入工作态 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
来电号码:{{ number }}
-
通话时间:{{ timeFormat }}{{ call }}
+
通话时间:{{ time | timeFilter }}{{ callStatus | windowTextFilter }}
- + + + + - {{ statusDetailText }}... + {{ callStatus }}... @@ -79,7 +47,6 @@ diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 9463f22..42b0e98 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -58,7 +58,7 @@ }, logout() { // 判断签入签出状态,如果已签入提醒先签出 - if (isReceiver() && this.$store.getters.online === '1') { + if (isReceiver() && this.$store.getters.signStatus === true) { this.$message.warning('请先签出!') } else { this.$store.dispatch('LogOut').then(() => { diff --git a/src/layout/components/ivr/chooseExten.vue b/src/layout/components/ivr/chooseExten.vue new file mode 100644 index 0000000..ae8f567 --- /dev/null +++ b/src/layout/components/ivr/chooseExten.vue @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/layout/components/ivr/chooseSeats.vue b/src/layout/components/ivr/chooseSeats.vue index 30e6012..330c74f 100644 --- a/src/layout/components/ivr/chooseSeats.vue +++ b/src/layout/components/ivr/chooseSeats.vue @@ -5,12 +5,12 @@ :visible.sync="dialogVisible" :before-close="handleClose" :close-on-click-modal = "false" - title="内呼" + :title="dialogTitles[type]" width="350px" append-to-body>
- {{ seat.exten }} + {{ seat.exten }}[{{ seat.name }}]
@@ -30,11 +30,20 @@ default: function() { return [] } - } + }, + self: { + type: String, + default: '' + } // 排除自己 }, data() { return { - type: 'in', // 内呼in, 会议meeting + type: 'in', // 内呼in, 会议meeting, 转接transfer + dialogTitles: { + in: '内呼', + meeting: '三方通话', + transfer: '转接' + }, dialogVisible: false, // 对话框显示状态 tel: '', // 电话 currentNumber: '' // 当前数字 @@ -124,18 +133,23 @@ input{ /*background-color: transparent;*/ } + .seat-radio{ + margin-bottom:10px; + margin-left:10px; + display: block; + } - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index 3f8c80f..2295c93 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -6,62 +6,30 @@ 解除保持 内呼 外呼 + 挂机 会议 退出示忙 示忙 退出工作态 进入工作态 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
来电号码:{{ number }}
-
通话时间:{{ timeFormat }}{{ call }}
+
通话时间:{{ time | timeFilter }}{{ callStatus | windowTextFilter }}
- + + + + - {{ statusDetailText }}... + {{ callStatus }}... @@ -79,7 +47,6 @@ diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 9463f22..42b0e98 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -58,7 +58,7 @@ }, logout() { // 判断签入签出状态,如果已签入提醒先签出 - if (isReceiver() && this.$store.getters.online === '1') { + if (isReceiver() && this.$store.getters.signStatus === true) { this.$message.warning('请先签出!') } else { this.$store.dispatch('LogOut').then(() => { diff --git a/src/layout/components/ivr/chooseExten.vue b/src/layout/components/ivr/chooseExten.vue new file mode 100644 index 0000000..ae8f567 --- /dev/null +++ b/src/layout/components/ivr/chooseExten.vue @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/layout/components/ivr/chooseSeats.vue b/src/layout/components/ivr/chooseSeats.vue index 30e6012..330c74f 100644 --- a/src/layout/components/ivr/chooseSeats.vue +++ b/src/layout/components/ivr/chooseSeats.vue @@ -5,12 +5,12 @@ :visible.sync="dialogVisible" :before-close="handleClose" :close-on-click-modal = "false" - title="内呼" + :title="dialogTitles[type]" width="350px" append-to-body>
- {{ seat.exten }} + {{ seat.exten }}[{{ seat.name }}]
@@ -30,11 +30,20 @@ default: function() { return [] } - } + }, + self: { + type: String, + default: '' + } // 排除自己 }, data() { return { - type: 'in', // 内呼in, 会议meeting + type: 'in', // 内呼in, 会议meeting, 转接transfer + dialogTitles: { + in: '内呼', + meeting: '三方通话', + transfer: '转接' + }, dialogVisible: false, // 对话框显示状态 tel: '', // 电话 currentNumber: '' // 当前数字 @@ -124,18 +133,23 @@ input{ /*background-color: transparent;*/ } + .seat-radio{ + margin-bottom:10px; + margin-left:10px; + display: block; + } - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index 3f8c80f..2295c93 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -6,62 +6,30 @@ 解除保持 内呼 外呼 + 挂机 会议 退出示忙 示忙 退出工作态 进入工作态 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
来电号码:{{ number }}
-
通话时间:{{ timeFormat }}{{ call }}
+
通话时间:{{ time | timeFilter }}{{ callStatus | windowTextFilter }}
- + + + + - {{ statusDetailText }}... + {{ callStatus }}... @@ -79,7 +47,6 @@ diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 9463f22..42b0e98 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -58,7 +58,7 @@ }, logout() { // 判断签入签出状态,如果已签入提醒先签出 - if (isReceiver() && this.$store.getters.online === '1') { + if (isReceiver() && this.$store.getters.signStatus === true) { this.$message.warning('请先签出!') } else { this.$store.dispatch('LogOut').then(() => { diff --git a/src/layout/components/ivr/chooseExten.vue b/src/layout/components/ivr/chooseExten.vue new file mode 100644 index 0000000..ae8f567 --- /dev/null +++ b/src/layout/components/ivr/chooseExten.vue @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/layout/components/ivr/chooseSeats.vue b/src/layout/components/ivr/chooseSeats.vue index 30e6012..330c74f 100644 --- a/src/layout/components/ivr/chooseSeats.vue +++ b/src/layout/components/ivr/chooseSeats.vue @@ -5,12 +5,12 @@ :visible.sync="dialogVisible" :before-close="handleClose" :close-on-click-modal = "false" - title="内呼" + :title="dialogTitles[type]" width="350px" append-to-body>
- {{ seat.exten }} + {{ seat.exten }}[{{ seat.name }}]
@@ -30,11 +30,20 @@ default: function() { return [] } - } + }, + self: { + type: String, + default: '' + } // 排除自己 }, data() { return { - type: 'in', // 内呼in, 会议meeting + type: 'in', // 内呼in, 会议meeting, 转接transfer + dialogTitles: { + in: '内呼', + meeting: '三方通话', + transfer: '转接' + }, dialogVisible: false, // 对话框显示状态 tel: '', // 电话 currentNumber: '' // 当前数字 @@ -124,18 +133,23 @@ input{ /*background-color: transparent;*/ } + .seat-radio{ + margin-bottom:10px; + margin-left:10px; + display: block; + } - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index 3f8c80f..2295c93 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -6,62 +6,30 @@ 解除保持 内呼 外呼 + 挂机 会议 退出示忙 示忙 退出工作态 进入工作态 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
来电号码:{{ number }}
-
通话时间:{{ timeFormat }}{{ call }}
+
通话时间:{{ time | timeFilter }}{{ callStatus | windowTextFilter }}
- + + + + - {{ statusDetailText }}... + {{ callStatus }}... @@ -79,7 +47,6 @@ diff --git a/src/layout/components/AppHeader.vue b/src/layout/components/AppHeader.vue index 9463f22..42b0e98 100644 --- a/src/layout/components/AppHeader.vue +++ b/src/layout/components/AppHeader.vue @@ -58,7 +58,7 @@ }, logout() { // 判断签入签出状态,如果已签入提醒先签出 - if (isReceiver() && this.$store.getters.online === '1') { + if (isReceiver() && this.$store.getters.signStatus === true) { this.$message.warning('请先签出!') } else { this.$store.dispatch('LogOut').then(() => { diff --git a/src/layout/components/ivr/chooseExten.vue b/src/layout/components/ivr/chooseExten.vue new file mode 100644 index 0000000..ae8f567 --- /dev/null +++ b/src/layout/components/ivr/chooseExten.vue @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/layout/components/ivr/chooseSeats.vue b/src/layout/components/ivr/chooseSeats.vue index 30e6012..330c74f 100644 --- a/src/layout/components/ivr/chooseSeats.vue +++ b/src/layout/components/ivr/chooseSeats.vue @@ -5,12 +5,12 @@ :visible.sync="dialogVisible" :before-close="handleClose" :close-on-click-modal = "false" - title="内呼" + :title="dialogTitles[type]" width="350px" append-to-body>
- {{ seat.exten }} + {{ seat.exten }}[{{ seat.name }}]
@@ -30,11 +30,20 @@ default: function() { return [] } - } + }, + self: { + type: String, + default: '' + } // 排除自己 }, data() { return { - type: 'in', // 内呼in, 会议meeting + type: 'in', // 内呼in, 会议meeting, 转接transfer + dialogTitles: { + in: '内呼', + meeting: '三方通话', + transfer: '转接' + }, dialogVisible: false, // 对话框显示状态 tel: '', // 电话 currentNumber: '' // 当前数字 @@ -124,18 +133,23 @@ input{ /*background-color: transparent;*/ } + .seat-radio{ + margin-bottom:10px; + margin-left:10px; + display: block; + } - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index 3f8c80f..2295c93 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -6,62 +6,30 @@ 解除保持 内呼 外呼 + 挂机 会议 退出示忙 示忙 退出工作态 进入工作态 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
来电号码:{{ number }}
-
通话时间:{{ timeFormat }}{{ call }}
+
通话时间:{{ time | timeFilter }}{{ callStatus | windowTextFilter }}
- + + + + - {{ statusDetailText }}... + {{ callStatus }}... @@ -79,7 +47,6 @@