diff --git a/contact-center/app/src/main/resources/static/js/CSKeFu_IM.v1.js b/contact-center/app/src/main/resources/static/js/CSKeFu_IM.v1.js index ee6d7ab8..24b22cca 100644 --- a/contact-center/app/src/main/resources/static/js/CSKeFu_IM.v1.js +++ b/contact-center/app/src/main/resources/static/js/CSKeFu_IM.v1.js @@ -98,7 +98,6 @@ $(document).ready(function(){ } }).on('audit_new', function(data){ // 会话监控:新建 - console.log(); if(skills.indexOf(data.skill)>-1 && $('#customerChatAudit').length > 0 && customerChatAudit != null && customerChatAudit.$){ customerChatAudit.Proxy.newAgentUserService(data,"cca"); if(data.type == 'message'){ @@ -113,6 +112,7 @@ $(document).ready(function(){ } } }).on('end', function(data) { + console.warn(111111, data) if($('#multiMediaDialogWin').length > 0){ if(multiMediaDialogWin.document.getElementById('agentusers') != null){ multiMediaDialogWin.Proxy.endAgentUserService(data); diff --git a/contact-center/app/src/main/resources/static/js/cskefu.js b/contact-center/app/src/main/resources/static/js/cskefu.js index e5a45d39..a0f17e02 100644 --- a/contact-center/app/src/main/resources/static/js/cskefu.js +++ b/contact-center/app/src/main/resources/static/js/cskefu.js @@ -344,18 +344,12 @@ function newMessageScorllBottom(type, msgType) { var Proxy = { newAgentUserService: function (data, type) { if ($('#tip_message_' + data.userid).length > 0) { - if (data.channel) { - var channel = data.channel; - switch (channel) { - case 'weixin': - $('#tip_icon_wenxin_' + data.userid).removeClass('ukefu-channel-icon-end').addClass("ukefu-channel-icon"); - break; - case 'webim': - $('#tip_icon_webim_' + data.userid).removeClass('ukefu-channel-icon-end').addClass("ukefu-channel-icon"); - break; - case 'phone': - $('#tip_icon_phone_' + data.userid).attr("src", "/images/phone-ico.png"); - break; + var channel = data.channeltype + if (channel) { + if (channel === 'phone') { + $('#tip_icon_phone_' + data.userid).attr("src", "/images/phone-ico.png"); + } else { + $('#tip_icon_' +channel+ '_' + data.userid).removeClass('ukefu-channel-icon-end').addClass("ukefu-channel-icon"); } } $('#tip_message_' + data.userid).removeClass('bg-gray').addClass("bg-green").text('在线'); @@ -486,18 +480,12 @@ var Proxy = { endAgentUserService: function (data) { if ($('#tip_message_' + data.userid).length > 0) { - if (data.channel) { - var channel = data.channel; - switch (channel) { - case 'weixin': - $('#tip_icon_wenxin_' + data.userid).removeClass("ukefu-channel-icon").addClass('ukefu-channel-icon-end'); - break; - case 'webim': - $('#tip_icon_webim_' + data.userid).removeClass("ukefu-channel-icon").addClass('ukefu-channel-icon-end'); - break; - case 'phone': - $('#tip_icon_phone_' + data.userid).attr("src", "/images/cde-ico-gray.png"); - break; + var channel = data.channeltype; + if (channel) { + if (channel === 'phone') { + $('#tip_icon_phone_' + data.userid).attr("src", "/images/cde-ico-gray.png"); + } else { + $('#tip_icon_'+ channel +'_' + data.userid).removeClass("ukefu-channel-icon").addClass('ukefu-channel-icon-end'); } } $('#tip_message_' + data.userid).removeClass("bg-green").addClass('bg-gray').text('离开'); diff --git a/contact-center/app/src/main/resources/templates/apps/agent/agentusers.pug b/contact-center/app/src/main/resources/templates/apps/agent/agentusers.pug index 3a7e108c..c049cc5b 100644 --- a/contact-center/app/src/main/resources/templates/apps/agent/agentusers.pug +++ b/contact-center/app/src/main/resources/templates/apps/agent/agentusers.pug @@ -39,34 +39,34 @@ img(src=(agentuser.headimgurl && agentuser.headimgurl != '' ? agentuser.headimgurl : '/images/im/user.png'), style="width:45px;height:45px;") if agentuser.status && agentuser.status == 'end' if agentuser.channeltype && agentuser.channeltype == "weixin" - i.kfont.ukefu-channel-icon-end(id="tip_icon_wenxin_#{agentuser.userid}") + i.kfont.ukefu-channel-icon-end(id="tip_icon_wenxin_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "webim" - i.kfont.ukefu-channel-icon-end(id="tip_icon_webim_#{agentuser.userid}") + i.kfont.ukefu-channel-icon-end(id="tip_icon_webim_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "skype" - i.csfont.ukefu-channel-icon-end(id="tip_icon_skype_#{agentuser.userid}") + i.csfont.ukefu-channel-icon-end(id="tip_icon_skype_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "messenger" - i.csfont.ukefu-channel-icon-end(id="tip_icon_messenger_#{agentuser.userid}") + i.csfont.ukefu-channel-icon-end(id="tip_icon_messenger_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "phone" - img.ukefu-channel-image(src="/images/cde-ico-gray.png", id="tip_icon_phone_#{agentuser.userid}") + img.ukefu-channel-image(src="/images/cde-ico-gray.png", id="tip_icon_phone_" + agentuser.userid) else if agentuser.channeltype && agentuser.channeltype == "weixin" - i.kfont.ukefu-channel-icon(id="tip_icon_wenxin_#{agentuser.userid}") + i.kfont.ukefu-channel-icon(id="tip_icon_wenxin_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "webim" - i.kfont.ukefu-channel-icon(id="tip_icon_webim_#{agentuser.userid}") + i.kfont.ukefu-channel-icon(id="tip_icon_webim_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "skype" - i.csfont.ukefu-channel-icon(id="tip_icon_skype_#{agentuser.userid}") + i.csfont.ukefu-channel-icon(id="tip_icon_skype_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "messenger" - i.csfont.ukefu-channel-icon(id="tip_icon_messenger_#{agentuser.userid}") + i.csfont.ukefu-channel-icon(id="tip_icon_messenger_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "phone" - img.ukefu-channel-image(src="/images/phone-ico.png", id="tip_icon_phone_#{agentuser.userid}") + img.ukefu-channel-image(src="/images/phone-ico.png", id="tip_icon_phone_" + agentuser.userid) .dialog-info .address span(style="width:90px;display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap: break-word;word-break: break-all;") @@ -74,9 +74,9 @@ .news | #{pugHelper.formatDate('yyyy-MM-dd HH:mm:ss', agentuser.servicetime)} if agentuser.status && agentuser.status == 'end' - small.label.bg-gray.pull-right(id="tip_message_#{agentuser.userid}") 离开 + small.label.bg-gray.pull-right(id="tip_message_" + agentuser.userid) 离开 else - small.label.bg-green.pull-right(id="tip_message_#{agentuser.userid}") 在线 + small.label.bg-green.pull-right(id="tip_message_" + agentuser.userid) 在线 .last-msg - small.ukefu-badge.bg-red(id="last_msg_#{agentuser.userid}",style="#{(agentuser.tokenum == 0 || (curagentuser && curagentuser.id == agentuser.id)) ? 'display:none' : ''}") + small.ukefu-badge.bg-red(id="last_msg_" + agentuser.userid,style="#{(agentuser.tokenum == 0 || (curagentuser && curagentuser.id == agentuser.id)) ? 'display:none' : ''}") | #{agentuser.tokenum ? agentuser.tokenum : 0} diff --git a/contact-center/app/src/main/resources/templates/apps/agent/index.pug b/contact-center/app/src/main/resources/templates/apps/agent/index.pug index d4ad2bd0..f34751af 100644 --- a/contact-center/app/src/main/resources/templates/apps/agent/index.pug +++ b/contact-center/app/src/main/resources/templates/apps/agent/index.pug @@ -27,12 +27,12 @@ block content #agentusers.layui-side-scroll include agentusers.pug #ukefu-chat-agent.layui-body.ukefu-chat-agent - //if curagentuser.channel == "phone" + //if curagentuser.channeltype == "phone" // include mainagentuser_callout.pug - //else if curagentuser.channel == "skype" + //else if curagentuser.channeltype == "skype" // include mainagentuser_skype.pug //else - if curagentuser.channel == "messenger" + if curagentuser.channeltype == "messenger" include mainagentuser_messenger.pug else include mainagentuser.pug diff --git a/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser.pug b/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser.pug index 6966d777..b89e57be 100644 --- a/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser.pug +++ b/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser.pug @@ -23,7 +23,7 @@ script(language='javascript'). div(style="width:250px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap: break-word;word-break: break-all;") | #{curagentuser.username}(#{curagentuser.region}) .ukefu-service-btn(style="float:right;") - a(href="/agent/summary.html?userid=" + curagentuser.userid + "&agentserviceid=" + curagentuser.agentserviceid + "&agentuserid=" + curagentuser.id + "&channel=" + curagentuser.channel, data-toggle="ajax", data-width="950", data-height="450", title="记录服务小结") + a(href="/agent/summary.html?userid=" + curagentuser.userid + "&agentserviceid=" + curagentuser.agentserviceid + "&agentuserid=" + curagentuser.id + "&channel=" + curagentuser.channeltype, data-toggle="ajax", data-width="950", data-height="450", title="记录服务小结") button.layui-btn.layui-btn-small i.kfont | 服务小结 @@ -230,9 +230,9 @@ script(language='javascript'). div(style='float:right;') button.layui-btn.layui-btn-small.layui-btn-radius.layui-btn-danger(href='/agent/blacklist/add.html?userid=#{curagentuser.userid}&agentserviceid=#{curagentuser.agentserviceid}&agentuserid=#{curagentuser.id}×=#{serviceCount ? serviceCount : 0}&chattime=#{(onlineUser && onlineUser.betweentime ? onlineUser.betweentime : 0)}', data-toggle='ajax', data-title='拉黑访客', data-width='900') 拉黑访客 .box-body(style='padding:0px 10px;position: relative;') - if curagentuser.channel && curagentuser.channel == "webim" + if curagentuser.channeltype && curagentuser.channeltype == "webim" include /apps/agent/channel/webim.pug - //else if curagentuser.channel && curagentuser.channel == "skype" + //else if curagentuser.channeltype && curagentuser.channeltype == "skype" // include /apps/agent/channel/skype.pug if curagentuser.name ul.info-list diff --git a/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser_messenger.pug b/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser_messenger.pug index 396765b4..659aea4d 100644 --- a/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser_messenger.pug +++ b/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser_messenger.pug @@ -24,7 +24,7 @@ script(language='javascript'). div(style="width:250px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap: break-word;word-break: break-all;") | #{curagentuser.username} .ukefu-service-btn(style="float:right;") - a(href="/agent/summary.html?userid=" + curagentuser.userid + "&agentserviceid=" + curagentuser.agentserviceid + "&agentuserid=" + curagentuser.id + "&channel=" + curagentuser.channel, data-toggle="ajax", data-width="950", data-height="450", title="记录服务小结") + a(href="/agent/summary.html?userid=" + curagentuser.userid + "&agentserviceid=" + curagentuser.agentserviceid + "&agentuserid=" + curagentuser.id + "&channel=" + curagentuser.channeltype, data-toggle="ajax", data-width="950", data-height="450", title="记录服务小结") button.layui-btn.layui-btn-small i.kfont | 服务小结 @@ -232,11 +232,11 @@ script(language='javascript'). div(style='float:right;') button.layui-btn.layui-btn-small.layui-btn-radius.layui-btn-danger(href='/agent/blacklist/add.html?userid=#{curagentuser.userid}&agentserviceid=#{curagentuser.agentserviceid}&agentuserid=#{curagentuser.id}×=#{serviceCount ? serviceCount : 0}&chattime=#{(onlineUser && onlineUser.betweentime ? onlineUser.betweentime : 0)}', data-toggle='ajax', data-title='拉黑访客', data-width='900') 拉黑访客 .box-body(style='padding:0px 10px;position: relative;') - if curagentuser.channel && curagentuser.channel == "webim" + if curagentuser.channeltype && curagentuser.channeltype == "webim" include /apps/agent/channel/webim.pug - else if curagentuser.channel && curagentuser.channel == "messenger" + else if curagentuser.channeltype && curagentuser.channeltype == "messenger" include /apps/agent/channel/messenger.pug - //else if curagentuser.channel && curagentuser.channel == "skype" + //else if curagentuser.channeltype && curagentuser.channeltype == "skype" // include /apps/agent/channel/skype.pug if curagentuser.name ul.info-list diff --git a/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser_skype.pug b/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser_skype.pug index cdcacfdc..bd619f9f 100644 --- a/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser_skype.pug +++ b/contact-center/app/src/main/resources/templates/apps/agent/mainagentuser_skype.pug @@ -31,7 +31,7 @@ body // word-break: break-all;"> // ${curagentuser.username!''}<#if curagentuser.region??> ( ${curagentuser.region!''} #if> //
@@ -193,11 +193,11 @@ body div(style='float:right;') button.layui-btn.layui-btn-small.layui-btn-radius.layui-btn-danger(href='/agent/blacklist/add.html?userid=${curagentuser.userid!\'\'}&agentserviceid=${curagentuser.agentserviceid!\'\'}&agentuserid=${curagentuser.id}×=${serviceCount!0}&chattime=<#if onlineUser?? && onlineUser.betweentime??>${onlineUser.betweentime}<#else>0#if>', data-toggle='ajax', data-title='拉黑访客', data-width='900') 拉黑访客 .box-body(style='padding:0px 10px;position: relative;') - // <#if curagentuser.channel?? && curagentuser.channel == "webim"> + // <#if curagentuser.channeltype?? && curagentuser.channeltype == "webim"> // <#include "/apps/agent/channel/webim.html"> - // <#elseif curagentuser.channel?? && curagentuser.channel == "weixin"> + // <#elseif curagentuser.channeltype?? && curagentuser.channeltype == "weixin"> // <#include "/apps/agent/channel/weixin.html"> - // <#elseif curagentuser.channel?? && curagentuser.channel == "skype"> + // <#elseif curagentuser.channeltype?? && curagentuser.channeltype == "skype"> // <#include "/apps/agent/channel/skype.html"> // #if> // <#if curagentuser.name??> diff --git a/contact-center/app/src/main/resources/templates/apps/cca/agentusers.pug b/contact-center/app/src/main/resources/templates/apps/cca/agentusers.pug index a3148cc8..d36e4b79 100644 --- a/contact-center/app/src/main/resources/templates/apps/cca/agentusers.pug +++ b/contact-center/app/src/main/resources/templates/apps/cca/agentusers.pug @@ -40,34 +40,34 @@ img(src=(agentuser.headimgurl && agentuser.headimgurl != '' ? agentuser.headimgurl : '/images/im/user.png'), style="width:45px;height:45px;") if agentuser.status && agentuser.status == 'end' if agentuser.channeltype && agentuser.channeltype == "weixin" - i.kfont.ukefu-channel-icon-end(id="tip_icon_wenxin_#{agentuser.userid}") + i.kfont.ukefu-channel-icon-end(id="tip_icon_wenxin_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "webim" - i.kfont.ukefu-channel-icon-end(id="tip_icon_webim_#{agentuser.userid}") + i.kfont.ukefu-channel-icon-end(id="tip_icon_webim_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "skype" - i.csfont.ukefu-channel-icon-end(id="tip_icon_skype_#{agentuser.userid}") + i.csfont.ukefu-channel-icon-end(id="tip_icon_skype_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "messenger" - i.csfont.ukefu-channel-icon-end(id="tip_icon_messenger_#{agentuser.userid}") + i.csfont.ukefu-channel-icon-end(id="tip_icon_messenger_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "phone" - img.ukefu-channel-image(src="/images/cde-ico-gray.png", id="tip_icon_phone_#{agentuser.userid}") + img.ukefu-channel-image(src="/images/cde-ico-gray.png", id="tip_icon_phone_" + agentuser.userid) else if agentuser.channeltype && agentuser.channeltype == "weixin" - i.kfont.ukefu-channel-icon(id="tip_icon_wenxin_#{agentuser.userid}") + i.kfont.ukefu-channel-icon(id="tip_icon_wenxin_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "webim" - i.kfont.ukefu-channel-icon(id="tip_icon_webim_#{agentuser.userid}") + i.kfont.ukefu-channel-icon(id="tip_icon_webim_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "skype" - i.csfont.ukefu-channel-icon(id="tip_icon_skype_#{agentuser.userid}") + i.csfont.ukefu-channel-icon(id="tip_icon_skype_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "messenger" - i.csfont.ukefu-channel-icon(id="tip_icon_messenger_#{agentuser.userid}") + i.csfont.ukefu-channel-icon(id="tip_icon_messenger_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "phone" - img.ukefu-channel-image(src="/images/phone-ico.png", id="tip_icon_phone_#{agentuser.userid}") + img.ukefu-channel-image(src="/images/phone-ico.png", id="tip_icon_phone_" + agentuser.userid) .dialog-info .address span(style="width:90px;display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap: break-word;word-break: break-all;") @@ -75,11 +75,11 @@ .news | #{pugHelper.formatDate('yyyy-MM-dd HH:mm:ss', agentuser.servicetime)} if agentuser.status && agentuser.status == 'end' - small.label.bg-gray.pull-right(id="tip_message_#{agentuser.userid}") 离开 + small.label.bg-gray.pull-right(id="tip_message_" + agentuser.userid) 离开 else - small.label.bg-green.pull-right(id="tip_message_#{agentuser.userid}") 在线 + small.label.bg-green.pull-right(id="tip_message_" + agentuser.userid) 在线 .last-msg - small.ukefu-badge.bg-red(id="last_msg_#{agentuser.userid}",style="#{(agentuser.tokenum == 0 || (curagentuser && curagentuser.id == agentuser.id)) ? 'display:none' : ''}") + small.ukefu-badge.bg-red(id="last_msg_" + agentuser.userid,style="#{(agentuser.tokenum == 0 || (curagentuser && curagentuser.id == agentuser.id)) ? 'display:none' : ''}") | #{agentuser.tokenum ? agentuser.tokenum : 0} script(src='/js/CSKeFu_Rest_Request.v1.js') script. diff --git a/contact-center/app/src/main/resources/templates/apps/cca/chatusers.pug b/contact-center/app/src/main/resources/templates/apps/cca/chatusers.pug index c15ae23c..a09d6fc8 100644 --- a/contact-center/app/src/main/resources/templates/apps/cca/chatusers.pug +++ b/contact-center/app/src/main/resources/templates/apps/cca/chatusers.pug @@ -20,28 +20,28 @@ if agentUserList img(src=(agentuser.headimgurl && agentuser.headimgurl != '' ? agentuser.headimgurl : '/images/im/user.png'), style="width:45px;height:45px;") if agentuser.status && agentuser.status == 'end' if agentuser.channeltype && agentuser.channeltype == "weixin" - i.kfont.ukefu-channel-icon-end(id="tip_icon_wenxin_#{agentuser.userid}") + i.kfont.ukefu-channel-icon-end(id="tip_icon_wenxin_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "webim" - i.kfont.ukefu-channel-icon-end(id="tip_icon_webim_#{agentuser.userid}") + i.kfont.ukefu-channel-icon-end(id="tip_icon_webim_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "skype" - i.csfont.ukefu-channel-icon-end(id="tip_icon_skype_#{agentuser.userid}") + i.csfont.ukefu-channel-icon-end(id="tip_icon_skype_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "phone" - img.ukefu-channel-image(src="/images/cde-ico-gray.png", id="tip_icon_phone_#{agentuser.userid}") + img.ukefu-channel-image(src="/images/cde-ico-gray.png", id="tip_icon_phone_" + agentuser.userid) else if agentuser.channeltype && agentuser.channeltype == "weixin" - i.kfont.ukefu-channel-icon(id="tip_icon_wenxin_#{agentuser.userid}") + i.kfont.ukefu-channel-icon(id="tip_icon_wenxin_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "webim" - i.kfont.ukefu-channel-icon(id="tip_icon_webim_#{agentuser.userid}") + i.kfont.ukefu-channel-icon(id="tip_icon_webim_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "skype" - i.csfont.ukefu-channel-icon(id="tip_icon_skype_#{agentuser.userid}") + i.csfont.ukefu-channel-icon(id="tip_icon_skype_" + agentuser.userid) | else if agentuser.channeltype && agentuser.channeltype == "phone" - img.ukefu-channel-image(src="/images/phone-ico.png", id="tip_icon_phone_#{agentuser.userid}") + img.ukefu-channel-image(src="/images/phone-ico.png", id="tip_icon_phone_" + agentuser.userid) .dialog-info .address span(style="width:90px;display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap: break-word;word-break: break-all;") @@ -49,9 +49,9 @@ if agentUserList .news | #{pugHelper.formatDate('yyyy-MM-dd HH:mm:ss', agentuser.servicetime)} if agentuser.status && agentuser.status == 'end' - small.label.bg-gray.pull-right(id="tip_message_#{agentuser.userid}") 离开 + small.label.bg-gray.pull-right(id="tip_message_" + agentuser.userid) 离开 else - small.label.bg-green.pull-right(id="tip_message_#{agentuser.userid}") 在线 + small.label.bg-green.pull-right(id="tip_message_" + agentuser.userid) 在线 .last-msg - small.ukefu-badge.bg-red(id="last_msg_#{agentuser.userid}",style="#{(agentuser.tokenum == 0 || (curagentuser && curagentuser.id == agentuser.id)) ? 'display:none' : ''}") + small.ukefu-badge.bg-red(id="last_msg_" + agentuser.userid,style="#{(agentuser.tokenum == 0 || (curagentuser && curagentuser.id == agentuser.id)) ? 'display:none' : ''}") | #{agentuser.tokenum ? agentuser.tokenum : 0} diff --git a/contact-center/app/src/main/resources/templates/apps/cca/index.pug b/contact-center/app/src/main/resources/templates/apps/cca/index.pug index cd5ede6b..6e9a5026 100644 --- a/contact-center/app/src/main/resources/templates/apps/cca/index.pug +++ b/contact-center/app/src/main/resources/templates/apps/cca/index.pug @@ -27,9 +27,9 @@ block content #agentuserscca.layui-side-scroll include agentusers.pug #ukefu-chat-agent.layui-body.ukefu-chat-agent - //if curagentuser.channel == "phone" + //if curagentuser.channeltype == "phone" // include mainagentuser_callout.pug - //else if curagentuser.channel == "skype" + //else if curagentuser.channeltype == "skype" // include mainagentuser_skype.pug //else include mainagentuser.pug diff --git a/contact-center/app/src/main/resources/templates/apps/cca/mainagentuser.pug b/contact-center/app/src/main/resources/templates/apps/cca/mainagentuser.pug index 22016cfd..7dcb100f 100644 --- a/contact-center/app/src/main/resources/templates/apps/cca/mainagentuser.pug +++ b/contact-center/app/src/main/resources/templates/apps/cca/mainagentuser.pug @@ -20,7 +20,7 @@ script(language='javascript'). h1.site-h1 if curagentuser div(style="width:250px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-wrap: break-word;word-break: break-all;") - | #{curagentuser.username} #{curagentuser.channel != "messenger" ? "(" + curagentuser.region + ")" : ""} + | #{curagentuser.username} #{curagentuser.channeltype != "messenger" ? "(" + curagentuser.region + ")" : ""} .ukefu-service-btn(style="float:right;") a(href="/apps/cca/transfer.html?userid=" + curagentuser.userid + "&agentserviceid=" + curagentuser.agentserviceid + "&agentuserid=" + curagentuser.id + "&agentnoid=" + curagentuser.agentno, data-toggle="ajax", data-width="750", data-height="550", title="选择转接对象") button.layui-btn.layui-btn-small @@ -232,11 +232,11 @@ script(language='javascript'). button.layui-btn.layui-btn-small.layui-btn-radius.layui-btn-danger(href='/agent/blacklist/add.html?userid=#{curagentuser.userid}&agentserviceid=#{curagentuser.agentserviceid}&agentuserid=#{curagentuser.id}×=#{serviceCount ? serviceCount : 0}&chattime=#{(onlineUser && onlineUser.betweentime ? onlineUser.betweentime : 0)}', data-toggle='ajax', data-title='拉黑访客', data-width='900') 拉黑访客 .box-body(style='padding:0px 10px;position: relative;') - if curagentuser.channel && curagentuser.channel == "webim" + if curagentuser.channeltype && curagentuser.channeltype == "webim" include /apps/agent/channel/webim.pug - else if curagentuser.channel && curagentuser.channel == "messenger" + else if curagentuser.channeltype && curagentuser.channeltype == "messenger" include /apps/agent/channel/messenger.pug - //else if curagentuser.channel && curagentuser.channel == "skype" + //else if curagentuser.channeltype && curagentuser.channeltype == "skype" // include /apps/agent/channel/skype.pug if curagentuser.name ul.info-list