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 3cc92468..3a7e108c 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 @@ -35,37 +35,37 @@ 'chat-list-item': true, 'active': (curagentuser.id == agentuser.id) }, id='agentuser_' + agentuser.userid, remove-id=agentuser.id, data-id=agentuser.userid) - a(href='/agent/agentuser.html?id=' + agentuser.id + '&channel=' + agentuser.channel, data-toggle="load", data-target="#ukefu-chat-agent", onclick="$('.chat-list-item.active').removeClass('active');$(this).closest('li.chat-list-item').addClass('active');cleanTopMsgTip(this) ;$('#last_msg_#{agentuser.userid}').text(0).hide();") + a(href='/agent/agentuser.html?id=' + agentuser.id + '&channel=' + agentuser.channeltype, data-toggle="load", data-target="#ukefu-chat-agent", onclick="$('.chat-list-item.active').removeClass('active');$(this).closest('li.chat-list-item').addClass('active');cleanTopMsgTip(this) ;$('#last_msg_#{agentuser.userid}').text(0).hide();") 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.channel && agentuser.channel == "weixin" + if agentuser.channeltype && agentuser.channeltype == "weixin" i.kfont.ukefu-channel-icon-end(id="tip_icon_wenxin_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "webim" + else if agentuser.channeltype && agentuser.channeltype == "webim" i.kfont.ukefu-channel-icon-end(id="tip_icon_webim_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "skype" + else if agentuser.channeltype && agentuser.channeltype == "skype" i.csfont.ukefu-channel-icon-end(id="tip_icon_skype_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "messenger" + else if agentuser.channeltype && agentuser.channeltype == "messenger" i.csfont.ukefu-channel-icon-end(id="tip_icon_messenger_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "phone" + else if agentuser.channeltype && agentuser.channeltype == "phone" img.ukefu-channel-image(src="/images/cde-ico-gray.png", id="tip_icon_phone_#{agentuser.userid}") else - if agentuser.channel && agentuser.channel == "weixin" + if agentuser.channeltype && agentuser.channeltype == "weixin" i.kfont.ukefu-channel-icon(id="tip_icon_wenxin_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "webim" + else if agentuser.channeltype && agentuser.channeltype == "webim" i.kfont.ukefu-channel-icon(id="tip_icon_webim_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "skype" + else if agentuser.channeltype && agentuser.channeltype == "skype" i.csfont.ukefu-channel-icon(id="tip_icon_skype_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "messenger" + else if agentuser.channeltype && agentuser.channeltype == "messenger" i.csfont.ukefu-channel-icon(id="tip_icon_messenger_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "phone" + else if agentuser.channeltype && agentuser.channeltype == "phone" img.ukefu-channel-image(src="/images/phone-ico.png", id="tip_icon_phone_#{agentuser.userid}") .dialog-info .address 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 1a8b80ab..a3148cc8 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 @@ -36,37 +36,37 @@ 'chat-list-item': true, 'active': (curagentuser.id == agentuser.id) }, id='agentuser_' + agentuser.userid, remove-id=agentuser.id, data-id=agentuser.userid) - a(href='/apps/cca/agentuser.html?id=' + agentuser.id + '&channel=' + agentuser.channel, data-toggle="load", data-target="#ukefu-chat-agent", onclick="$('.chat-list-item.active').removeClass('active');$(this).closest('li.chat-list-item').addClass('active');cleanTopMsgTip(this) ;$('#last_msg_#{agentuser.userid}').text(0).hide();") + a(href='/apps/cca/agentuser.html?id=' + agentuser.id + '&channel=' + agentuser.channeltype, data-toggle="load", data-target="#ukefu-chat-agent", onclick="$('.chat-list-item.active').removeClass('active');$(this).closest('li.chat-list-item').addClass('active');cleanTopMsgTip(this) ;$('#last_msg_#{agentuser.userid}').text(0).hide();") 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.channel && agentuser.channel == "weixin" + if agentuser.channeltype && agentuser.channeltype == "weixin" i.kfont.ukefu-channel-icon-end(id="tip_icon_wenxin_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "webim" + else if agentuser.channeltype && agentuser.channeltype == "webim" i.kfont.ukefu-channel-icon-end(id="tip_icon_webim_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "skype" + else if agentuser.channeltype && agentuser.channeltype == "skype" i.csfont.ukefu-channel-icon-end(id="tip_icon_skype_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "messenger" + else if agentuser.channeltype && agentuser.channeltype == "messenger" i.csfont.ukefu-channel-icon-end(id="tip_icon_messenger_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "phone" + else if agentuser.channeltype && agentuser.channeltype == "phone" img.ukefu-channel-image(src="/images/cde-ico-gray.png", id="tip_icon_phone_#{agentuser.userid}") else - if agentuser.channel && agentuser.channel == "weixin" + if agentuser.channeltype && agentuser.channeltype == "weixin" i.kfont.ukefu-channel-icon(id="tip_icon_wenxin_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "webim" + else if agentuser.channeltype && agentuser.channeltype == "webim" i.kfont.ukefu-channel-icon(id="tip_icon_webim_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "skype" + else if agentuser.channeltype && agentuser.channeltype == "skype" i.csfont.ukefu-channel-icon(id="tip_icon_skype_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "messenger" + else if agentuser.channeltype && agentuser.channeltype == "messenger" i.csfont.ukefu-channel-icon(id="tip_icon_messenger_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "phone" + else if agentuser.channeltype && agentuser.channeltype == "phone" img.ukefu-channel-image(src="/images/phone-ico.png", id="tip_icon_phone_#{agentuser.userid}") .dialog-info .address 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 fe5aabf3..c15ae23c 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 @@ -16,31 +16,31 @@ if agentUserList 'chat-list-item': true, 'active': (curagentuser.id == agentuser.id) }, id='agentuser_' + agentuser.userid, remove-id=agentuser.id, data-id=agentuser.userid) - a(href='/apps/cca/agentuser.html?id=' + agentuser.id + '&channel=' + agentuser.channel, data-toggle="load", data-target="#ukefu-chat-agent", onclick="$('.chat-list-item.active').removeClass('active');$(this).closest('li.chat-list-item').addClass('active');Proxy.cleanTopMsgTip(1) ;$('#last_msg_#{agentuser.userid}').text(0).hide();") + a(href='/apps/cca/agentuser.html?id=' + agentuser.id + '&channel=' + agentuser.channeltype, data-toggle="load", data-target="#ukefu-chat-agent", onclick="$('.chat-list-item.active').removeClass('active');$(this).closest('li.chat-list-item').addClass('active');Proxy.cleanTopMsgTip(1) ;$('#last_msg_#{agentuser.userid}').text(0).hide();") 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.channel && agentuser.channel == "weixin" + if agentuser.channeltype && agentuser.channeltype == "weixin" i.kfont.ukefu-channel-icon-end(id="tip_icon_wenxin_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "webim" + else if agentuser.channeltype && agentuser.channeltype == "webim" i.kfont.ukefu-channel-icon-end(id="tip_icon_webim_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "skype" + else if agentuser.channeltype && agentuser.channeltype == "skype" i.csfont.ukefu-channel-icon-end(id="tip_icon_skype_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "phone" + else if agentuser.channeltype && agentuser.channeltype == "phone" img.ukefu-channel-image(src="/images/cde-ico-gray.png", id="tip_icon_phone_#{agentuser.userid}") else - if agentuser.channel && agentuser.channel == "weixin" + if agentuser.channeltype && agentuser.channeltype == "weixin" i.kfont.ukefu-channel-icon(id="tip_icon_wenxin_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "webim" + else if agentuser.channeltype && agentuser.channeltype == "webim" i.kfont.ukefu-channel-icon(id="tip_icon_webim_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "skype" + else if agentuser.channeltype && agentuser.channeltype == "skype" i.csfont.ukefu-channel-icon(id="tip_icon_skype_#{agentuser.userid}") |  - else if agentuser.channel && agentuser.channel == "phone" + else if agentuser.channeltype && agentuser.channeltype == "phone" img.ukefu-channel-image(src="/images/phone-ico.png", id="tip_icon_phone_#{agentuser.userid}") .dialog-info .address diff --git a/contact-center/app/src/main/resources/templates/apps/service/online/index.pug b/contact-center/app/src/main/resources/templates/apps/service/online/index.pug index 670e5c21..10e8257a 100644 --- a/contact-center/app/src/main/resources/templates/apps/service/online/index.pug +++ b/contact-center/app/src/main/resources/templates/apps/service/online/index.pug @@ -69,7 +69,7 @@ block content h1.site-h1(style='background-color:#EEEEEE;') | 访问信息 .box-body(style='padding:0px 10px;position: relative;') - if agentUser.channel && agentUser.channel == "webim" + if agentuser.channeltype && agentuser.channeltype == "webim" include /apps/agent/channel/webim.pug .layui-body.ukefu-chat-agent#ukefu-chat-agent .main-agentuser(style='overflow-y:auto;') diff --git a/contact-center/app/src/main/resources/templates/apps/service/quene/index.pug b/contact-center/app/src/main/resources/templates/apps/service/quene/index.pug index e91d348b..79935234 100644 --- a/contact-center/app/src/main/resources/templates/apps/service/quene/index.pug +++ b/contact-center/app/src/main/resources/templates/apps/service/quene/index.pug @@ -35,8 +35,8 @@ block content for agentUser in agentUserList.content tr.tdHasContorllor.design-dropable-td td.first_td_head - a(href="/service/online/index.html?userid=" + agentUser.userid + "&channel=" + agentUser.channel) #{agentUser.username} - td #{agentUser.channel} + a(href="/service/online/index.html?userid=" + agentUser.userid + "&channel=" + agentuser.channeltype) #{agentUser.username} + td #{agentuser.channeltype} td #{agentUser.skillname} td #{agentUser.region} td #{pugHelper.formatDate('yyyy-MM-dd HH:mm:ss', agentUser.createtime)}