Merge branch 'master' of http://192.168.1.222:3000/zhoufan/12345_Base_Web

# Conflicts:
#	WebUI/CallCenterWeb.UI/Report/CallTime.html

WebUI/CallCenterWeb.UI/Announcement/Add.html

@@ -6,7 +6,7 @@
     <script src="../Script/Common/huayi.config.js"></script>
     <link href="../css/layer/need/layer.css" />
     <link rel="stylesheet" href="../css/init.css" />
-    		   <title></title>
+     <title></title>
     		   <style>
     		   	.BiaoTi{
     		   		width: 100%;
@@ -39,6 +39,13 @@
 				</td>
 			</tr>
 			<tr>
+				<th>角色：</th>
+				<td>
+					<select name="" id="role" class="select_"></select>
+					<select name="" id="zx" class="select_"></select>
+				</td>
+			</tr>
+			<tr>
 				<th >内容:</th>
 				<td colspan="2">
 					<textarea data-adaptheight id="content" name="" rows="" cols=""></textarea>
@@ -60,7 +67,8 @@
              laydate({
                 elem: '#endTime',
                 event: 'focus'
-            });         
+            });  
+            
             $(document).ready(function(){         
             	$(".btns").click(function(){ 
             		if(!$("#title").val()){
@@ -71,19 +79,74 @@
             		}else if(!$("#endTime").val()){
             			layer.msg("输入选择日期");
             		}else{
-            			Add();
+//          			if($('#role').val()==0){
+//          				role=$('#role').val();
+//          			    user=0;
+//          			}else{
+//          				role=$('#role').val();
+//          				user=$('#role').val();
+//          			}
+						var user=$("#zx").val();
+			            var role=$('#role').val();
+            			Add(user,role)
             		}
             			
             	})
-            
+            	
+            	//获取下拉框
+				$.getJSON(huayi.config.callcenter_url + "Notice/GetRoleList", {
+					"token": $.cookie("token")
+				}, function(result) {
+					if(result.state.toLowerCase() == "success") {
+						goodslist = result.data;
+						bindseat($("#role"));
+					}
+				});
+				//下拉框
+				function bindseat(obj) {
+					obj.empty();
+					obj.append('<option value="0" selected="selected">所有角色</option>');
+					$(goodslist).each(function(i, n) {
+						obj.append('<option value="' + n.F_RoleId + '">' + n.F_RoleName + '</option>');
+					})
+				}
+				$.getJSON(huayi.config.callcenter_url + "Notice/GetUserListByRoleId", {
+							"token":$.cookie("token"),"roleid":0
+						}, function(result) {
+							if(result.state.toLowerCase() == "success") {
+								goodslist = result.data;
+								bindZX($("#zx"));
+							}
+						});
+				function bindZX(obj) {
+					obj.empty();
+						obj.append('<option value="0" selected="selected">所有人</option>');
+					$(goodslist).each(function(i, n) {
+						obj.append('<option value="' + n.F_UserId + '">' + n.F_UserCode + '</option>');
+					})
+				}
+				$("#role").change(function(){
+					var pid=$(this).val();
+					$.getJSON(huayi.config.callcenter_url + "Notice/GetUserListByRoleId", {
+							"token":$.cookie("token"),"roleid":pid
+						}, function(result) {
+							if(result.state.toLowerCase() == "success") {
+								goodslist = result.data;
+								bindZX($("#zx"));
+							}
+						});
+				})
             })
-            function Add(){   
+            
+            function Add(user,role){   
             	$.post(huayi.config.callcenter_url + "Notice/AddNotice", {
 						title:$("#title").val(),
 						content:$("#content").val(),
-						 stime:$("#startTime").val(),
-						  etime:$('#endTime').val(),
-						token: $.cookie("token")
+						stime:$("#startTime").val(),
+						etime:$('#endTime').val(),
+						token: $.cookie("token"),
+						userid:user,
+						roleid:role
 					}, function(result) {
 						result = JSON.parse(result);
 						if(result.state.toLowerCase() == "success") {
@@ -92,7 +155,6 @@
                     parent.layer.close(index); //再执行关闭
 						  parent.initTable();					 
 							parent.layer.msg("添加成功");
-						
 						}
 					})
             }

WebUI/CallCenterWeb.UI/Announcement/AnnDatil.html

@@ -39,6 +39,13 @@
 				</td>
 			</tr>
 			<tr>
+				<th>角色：</th>
+				<td>
+					<select name="" id="role" class="select_"></select>
+					<select name="" id="zx" class="select_"></select>
+				</td>
+			</tr>
+			<tr>
 				<th >内容:</th>
 				<td colspan="2">
 					<textarea data-adaptheight id="content" name="" rows="" cols=""></textarea>
@@ -62,6 +69,7 @@
                 elem: '#endTime',
                 event: 'focus'
             });
+           
             var wid = helper.request.queryString("wid");
             $(document).ready(function(){
             	$(".btns").click(function(){
@@ -73,7 +81,9 @@
             		}else if(!$("#endTime").val()){
             			layer.msg("输入选择日期");
             		}else{
-            			Add();
+ 						 var user=$("#zx").val();
+           				 var role=$('#role').val();
+            			Add(user,role)
             		}
             			
             		})
@@ -87,35 +97,65 @@
 										$("#content").val(result.data.F_Content);
 										$('#startTime').val(result.data.F_StartDate);
 										$('#endTime').val(result.data.F_EndDate);
+										$('#role').val(result.data.F_RoleId);
+           								$("#zx").val(result.data.F_UserId);
 										console.log(result.data);
 									}
 								});
             	}
             })
-//          	$.post(huayi.config.callcenter_url + "Notice/AddNotice", {
-//						title:$("#title").val(),
-//						content:$("#content").val(),
-//						 stime:$("#startTime").val(),
-//						  etime:$('#endTime').val(),
-//						token: $.cookie("token")
-//					}, function(result) {
-//						result = JSON.parse(result);
-//						if(result.state.toLowerCase() == "success") {
-//									
-//					var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
-//                  parent.layer.close(index); //再执行关闭
-//						  parent.initTable();					 
-//							parent.layer.msg("添加成功");
-//						
-//						}
-//					})
- function Add(){
+//获取下拉框
+				$.getJSON(huayi.config.callcenter_url + "Notice/GetRoleList", {
+					"token": $.cookie("token")
+				}, function(result) {
+					if(result.state.toLowerCase() == "success") {
+						goodslist = result.data;
+						bindseat($("#role"));
+					}
+				});
+				//下拉框
+				function bindseat(obj) {
+					obj.empty();
+					obj.append('<option value="0" selected="selected">所有角色</option>');
+					$(goodslist).each(function(i, n) {
+						obj.append('<option value="' + n.F_RoleId + '">' + n.F_RoleName + '</option>');
+					})
+				}
+				$.getJSON(huayi.config.callcenter_url + "Notice/GetUserListByRoleId", {
+							"token":$.cookie("token"),"roleid":0
+						}, function(result) {
+							if(result.state.toLowerCase() == "success") {
+								goodslist = result.data;
+								bindZX($("#zx"));
+							}
+						});
+				function bindZX(obj) {
+					obj.empty();
+					obj.append('<option value="0" selected="selected">所有人</option>');
+					$(goodslist).each(function(i, n) {
+						obj.append('<option value="' + n.F_UserId + '">' + n.F_UserCode + '</option>');
+					})
+				}
+				$("#role").change(function(){
+					var pid=$(this).val();
+					$.getJSON(huayi.config.callcenter_url + "Notice/GetUserListByRoleId", {
+							"token":$.cookie("token"),"roleid":pid
+						}, function(result) {
+							if(result.state.toLowerCase() == "success") {
+								goodslist = result.data;
+								bindZX($("#zx"));
+							}
+						});
+				})
+ function Add(user,role){
             	$.post(huayi.config.callcenter_url + "Notice/EditNotice", {
 						title:$("#title").val(),
 						content:$("#content").val(),
 						 stime:$("#startTime").val(),
 						  etime:$('#endTime').val(),
 						  nid:wid,
+						  userid:user,
+						  roleid:role,
 						token: $.cookie("token")
 					}, function(result) {
 						result = JSON.parse(result);

WebUI/CallCenterWeb.UI/Report/CallTime.html

@@ -121,6 +121,7 @@
 			})
 			//加载表头
 			function GetColumnList() {
+				$("#thead thead tr").html('');
 				/*请求后台*/
 				$.ajax({
 					type: "get",
@@ -143,6 +144,7 @@
 			}
 			//加载数据
 			function GetDataList() {
+				$(".hwbb tbody").html('');
 				/*请求后台*/
 				$.ajax({
 					type: "get",
@@ -162,6 +164,7 @@
 							for(var i = 0; i < content.length; i++) {
 							    //$("<tr><td>" + content[i].时间 + "</td><td>" + content[i].电话呼入次数 + "</td><td>" + content[i].电话呼出次数 + "</td><td>" + content[i].正常接听次数 + "</td><td>" + content[i].未接通次数 + "</td><td>" + content[i].语音留言次数 + "</td><td>" + content[i].主动放弃次数 + "</td><td>" + content[i].电话骚扰次数 + "</td><td>" + content[i].平均呼入时间 + "</td></tr>").appendTo(".hwbb tbody");
 							    $("<tr><td>" + content[i].时间 + "</td><td>" + content[i].电话呼入次数 + "</td><td>" + content[i].电话呼出次数 + "</td><td>" + content[i].正常接听次数 + "</td><td>" + content[i].未接通次数 + "</td><td>" + content[i].主动放弃次数 + "</td><td>" + content[i].电话骚扰次数 + "</td><td>" + content[i].平均呼入时间 + "</td></tr>").appendTo(".hwbb tbody");
+								//$("<tr><td>" + content[i].时间 + "</td><td>" + content[i].电话呼入次数 + "</td><td>" + content[i].电话呼出次数 + "</td><td>" + content[i].正常接听次数 + "</td><td>" + content[i].语音留言次数 + "</td><td>" + content[i].主动放弃次数 + "</td><td>" + content[i].平均呼入时间 + "</td></tr>").appendTo(".hwbb tbody");
 							}
 						}
 					}

WebUI/CallCenterWeb.UI/ReportForm/callTime.html

@@ -304,7 +304,7 @@
 					},
 					success:function(res){
 						con=res.data;
-						//console.log(con);
+						$('#thead thead tr').html('');
 						for(var i=0;i<con.length;i++){
 							$('<th>' + con[i]+ '</th>').appendTo('#thead thead tr')
 						}
@@ -333,6 +333,7 @@
 	       		 }
 			        //表格数据
 			        function Ajax(stime,endtime){
+			        	
 			        	var zx_name=[],
 			        	    huru=[],
 			        	    huruTime=[],
@@ -355,7 +356,7 @@
 			        		},
 			        		success:function(data) {
 			        			var tbodyCon=data.data;
-			        			console.log(tbodyCon);
+			        			$('.thTable tbody').html('');
 			        			for(var j=0;j<tbodyCon.length;j++){
 			        				$('<tr><td>' + tbodyCon[j].坐席名称+ '</td><td>' + tbodyCon[j].呼入次数+ '</td><td>' +  studyTime(tbodyCon[j].呼入时长)+ '</td><td>' + tbodyCon[j].呼出次数+ '</td><td>' + studyTime(tbodyCon[j].呼出时长)+ '</td><td>' + tbodyCon[j].呼出未接通次数+ '</td><td>' + studyTime(tbodyCon[j].振铃时长) + '</td><td>' + studyTime(tbodyCon[j].通话总时长)+ '</td><td>' + studyTime(tbodyCon[j].平均通话总时长)+ '</td></tr>').appendTo('.thTable tbody')
 			        			    zx_name.push(tbodyCon[j].坐席名称);

WebUI/CallCenterWeb.UI/ReportForm/riLiuLiang.html

@@ -232,6 +232,7 @@
         			})
              Ajax();
 			function Ajax(){
+				$('.thTable tbody').html('');
 				$.ajax({
 				type:"get",
 				url: huayi.config.callcenter_url + "FlowAnalysis/GetDayCount",

WebUI/CallCenterWeb.UI/ReportForm/seatsCheck.html

@@ -161,7 +161,6 @@
 				success:function(data){
 					if(data.state.toLowerCase()=='success'){
 						$('#table1 tbody').html('');
-						
 						$(data.data).each(function(i,n){
 //							console.log(n)
 								$('<tr>'+

WebUI/CallCenterWeb.UI/ReportForm/yueLiuLiang.html

@@ -260,6 +260,7 @@
         			})
              Ajax();
 			function Ajax(){
+				$('.thTable tbody').html('');
 				$.ajax({
 				type:"get",
 				url: huayi.config.callcenter_url + "FlowAnalysis/GetMonthCount",

WebUI/CallCenterWeb.UI/ReportForm/zuoXiTime.html

@@ -204,6 +204,7 @@
 		        			token:token
 		        		},
 		        		success:function(res){
+		        			$('#thead thead tr').html('');
 		        			var con=res.data;
 		        			for(var j=0;j<con.length;j++){
 							$('<th>' + con[j]+ '</th>').appendTo('#thead thead tr')
@@ -223,9 +224,9 @@
 		                		},
 		                		success:function(data){
 		                			var result=data.data;
-		                			console.log(result);
+		                		$('.thTable tbody').html('');
 		                			for(var i=0;i<result.length;i++){
-										$('<tr><td>' + result[i].坐席人员 + '</td><td>' + result[i].通话总时长 + '</td><td>' + result[i].呼出通话总时长 + '</td><td>' + result[i].呼出通话占比 + '</td><td>' + result[i].呼入通话总时长 + '</td><td>' + result[i].呼入通话占比 + '</td><td>' + result[i].平均日呼入通话时长 + '</td><td>' + result[i].平均日呼出通话时长 + '</td></tr>').appendTo('.thTable  tbody')
+										$('<tr><td>' + result[i].坐席人员 + '</td><td>' + result[i].通话总时长 + '</td><td>' + result[i].呼出通话总时长 + '</td><td>' + result[i].呼出通话占比 + '</td><td>' + result[i].呼入通话总时长 + '</td><td>' + result[i].呼入通话占比 + '</td><td>' + result[i].平均日呼入通话时长 + '</td><td>' + result[i].平均日呼出通话时长 + '</td></tr>').appendTo('.thTable tbody')
 		                			}
 		                		}
 		                	});

WebUI/CallCenterWeb.UI/SystemManager/GroupClassManage.html

@@ -0,0 +1,320 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <script src="../Script/Common/huayi.load.js"></script>
+    <script src="../Script/Common/huayi.config.js"></script>
+    <script src="../js/jquery-ui.min.js"></script>
+    <link rel="stylesheet" href="../css/init.css" />
+    <link href="../js/fullcalendar/fullcalendar.css" rel="stylesheet" />
+    <script src="../js/fullcalendar/fullcalendar.min.js"></script>
+    <title>系统管理-->排班管理</title>
+    <style>
+        .fc-event-title {
+            color:white;
+        }
+        .group {
+            margin-bottom:5px;
+        }
+        .seatuser {
+            color: black;
+            padding: 5px 10px;
+            border-radius: 2px;
+            cursor: pointer;
+            margin-bottom: 5px;
+            background-color: #f3f3f4;
+        }
+        .active {
+            background-color: #1ab394;
+            color: #fff;
+        }
+        .lable {
+            display: none;
+            background-color: #d1dade;
+            color: #5e5e5e;
+            font-size: 10px;
+            padding: 3px 8px;
+            text-shadow: none;
+            font-size: 75%;
+            font-weight: 700;
+            line-height: 1;
+            text-align: center;
+            white-space: nowrap;
+            vertical-align: baseline;
+            border-radius: .25em;
+            margin:3px;
+            float:left;
+            cursor: pointer;
+        }
+        .active ~ .lable {
+            display: inline;
+        }
+    </style>
+</head>
+<body class="gray-bg">
+    <div class="container-fluid wrapper-content animated fadeInRight">
+        <div class="daoHang clearfix">
+            <div class="dhLeft">
+                <sapn><i class="syIcon"></i>位置：<a id="ReIndex" href="javaScript:;">首页</a>&gt;<a href="javaScript:;">系统管理</a>&gt;<a href="" class="nowPosition">排班管理</a></sapn>
+            </div>
+            <div class="dhRight">
+                <a href="" title="刷新"><i class="fa fa-refresh"></i></a>
+            </div>
+        </div>
+        <div class="col-sm-2">
+            <div class="ibox float-e-margins">
+                <div class="ibox-content">
+                    <div id='external-events'>
+                        <p>班别</p>
+                    </div>
+                </div>
+            </div>
+            <div class="ibox float-e-margins zxarea" style="display:none;">
+                <div class="ibox-content">
+                    <div  style="margin-bottom:10px;">
+                        <p>班组</p>
+                        <div id="bzlist" >
+                            <div class='seatuser' code=''>全部</div>
+                        </div>
+                        <div class="clearfix"></div>
+                    </div>
+                    <div class="wfz" style="display:none;">
+                        <p>未分组坐席</p>
+                        <div id="zxlist" >
+                        </div>
+                        <div class="clearfix" ></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-sm-10">
+            <div id="calendar"></div>
+        </div>
+    </div>
+    <script>
+        var bl = false;
+        $(document).ready(function () {
+
+            var rl = $('#RoleCode', top.document).val();
+            var gcode = $('#GroupCode', top.document).val();
+            if (rl == "GLY") {
+                bl = true;
+                //$(".zxarea").show();
+            }
+            $(".zxarea").show();
+
+            $.getJSON(huayi.config.callcenter_url + 'Class/GetClassList', {
+                "token": $.cookie("token")
+            }, function (result) {
+                if (result.state.toLowerCase() == "success") {
+                    $(result.data).each(function (i, n) {
+                        var html = "<div class='external-event navy-bg' code='" + n.F_Code + "' intime='" + n.F_InTime
+                            + "' outtime='" + n.F_OutTime + "'>" + n.F_Name + "[" + n.F_InTime + "-" + n.F_OutTime + "]" + "</div>";
+                        $("#external-events").append(html);
+                    })
+                    if (bl) {
+                        $("#external-events div.external-event").each(function () {
+                            var d = { title: $.trim($(this).text()), classcode: $(this).attr("code"), intime: $(this).attr("intime"), outtime: $(this).attr("outtime") };
+                            $(this).data("eventObject", d);
+                            $(this).draggable({ zIndex: 999, revert: true, revertDuration: 0 })
+                        });
+                    }
+                }
+            });
+            //获取班组列表
+
+            $.getJSON(huayi.config.callcenter_url + 'Group/GetGroupList', { "token": $.cookie("token") }, function (result) {
+                if (result.state.toLowerCase() == "success") {
+                    var num = 0;
+                    $(result.data).each(function (i, n) {
+                        var html = "<div class='group drag' code='" + n.F_GroupCode + "'>";
+                        html += "<div class='seatuser ' code='" + n.F_GroupCode + "'>" + n.F_GroupName + "</div>";
+                        $(n.Users).each(function (j, m) {
+                            html += "<span class='lable' code='" + m.F_UserCode + "'>" + m.F_UserName + "</span>";
+                        })
+                        html += '<div class="clearfix"></div></div>';
+                        $("#bzlist").append(html);
+                        if (gcode == n.F_GroupCode) {
+                            num = i+1;
+                        }
+                    })
+                    $(".seatuser").click(function (i, n) {
+                        $(".seatuser").removeClass("active");
+                        $(this).addClass("active");
+                        bind();
+                    })
+                    if (bl) {
+                        $(".group span.lable").each(function () {
+                            var d = { code: $(this).attr("code"), name: $(this).text() };
+                            $(this).data("eventObject", d);
+                            $(this).draggable({ zIndex: 999, revert: "invalid" })
+                        });
+                        $(".drag").droppable({
+                            drop: function (event, ui) {
+                                var dragobj = $(ui.draggable[0]);
+                                var dropobj = $(this);
+                                var dragdata = dragobj.data("eventObject");
+                                if (dragdata.code) {
+                                    $.post(huayi.config.callcenter_url + 'GroupClass/GroupSeat', {
+                                        groupcode: dropobj.attr("code"), usercode: dragdata.code,
+                                        "token": $.cookie("token")
+                                    }, function (result) {
+                                        result = JSON.parse(result);
+                                        if (result.state.toLowerCase() == "success") {
+                                            var html = "<span class='lable' code='" + dragdata.code + "'>" + dragdata.name + "</span>";
+                                            $(html).insertBefore(dropobj.find(".clearfix")).data("eventObject", dragdata).draggable({
+                                                zIndex: 999, revert: "invalid"
+                                            });
+                                            dragobj.remove();
+                                        }
+                                    })
+                                }
+                            }
+                        })
+                    }
+                    $($(".seatuser")[num]).trigger("click");
+                }
+            });
+            $.getJSON(huayi.config.callcenter_url + 'GroupClass/GetNoGroupSeatList', { "token": $.cookie("token") }, function (result) {
+                if (result.state.toLowerCase() == "success") {
+                    if (result.data.length > 0) {
+                        $(".wfz").show();
+                        $(result.data).each(function (i, n) {
+                            var html = "<span class='lable' style='display: inline;' code='" + n.F_UserCode + "'>" + n.F_UserName + "</span>";
+                            $("#zxlist").append(html);
+                        })
+                        if (bl) {
+                            $("#zxlist span.lable").each(function () {
+                                var d = { code: $(this).attr("code"), name: $(this).text() };
+                                $(this).data("eventObject", d);
+                                $(this).draggable({
+                                    zIndex: 999, revert: "invalid"
+                                })
+                            });
+                        }
+                    }
+                }
+            });
+
+        });
+        function bind() {
+            $('#calendar').html("");
+            $('#calendar').fullCalendar({
+                header: {
+                    //left: 'month,agendaWeek,agendaDay',
+                    left: 'month',
+                    center: 'title',
+                    right: 'today, prev, next'
+                },
+                monthNames: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+                monthNamesShort: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+                titleFormat: {
+                    month: "yyyy MMMM "
+                },
+                firstDay: "1",
+                editable: bl,
+                droppable: bl,
+                drop: function (g, h) {
+                    var f = $(this).data("eventObject");
+                    var d = $.extend({}, f);
+                    if (f.classcode) {
+                        var groupcode = $(".active").attr("code");
+                        if (groupcode) {
+
+                            //d.start = g;
+                            //d.allDay = false;
+                            d.title = $(".active").text() + " " + d.title;
+                            var c = g.getDate();
+                            var a = g.getMonth() + 1;
+                            var e = g.getFullYear();
+                            var sdate = new Date(e + '-' + a + '-' + c + ' ' + f.intime);
+                            var edate = new Date(e + '-' + a + '-' + c + ' ' + f.outtime);
+                            d.start = sdate;
+                            d.end = edate;
+                            d.groupcode = groupcode;
+                            if (sdate > edate) {
+                                d.end = new Date(e + '-' + a + '-' + (c + 1) + ' ' + f.outtime);;
+                            }
+                            $.post(huayi.config.callcenter_url + 'GroupClass/AddGroupClass', {
+                                date: e + '-' + a + '-' + c, groupcode: groupcode, classcode: f.classcode,
+                                "token": $.cookie("token")
+                            }, function (result) {
+                                result = JSON.parse(result);
+                                if (result.state.toLowerCase() == "success") {
+                                    d.id = result.data;
+                                    $("#calendar").fullCalendar("renderEvent", d, true);
+                                }
+                            })
+                        }
+                        else {
+                            layer.confirm('请选择一个班组', {
+                                btn: ['确定'] //按钮
+                            });
+                        }
+                    }
+                },
+                //eventDragStart: function (event, jsEvent, ui, view) {
+                //    if (!$(".active").attr("code")) {
+                //        layer.confirm('请选择一个班组', {
+                //            btn: ['确定'] //按钮
+                //        });
+                //    }
+                //},
+                eventDrop: function (event, dayDelta, minuteDelta, allDay, revertFunc, jsEvent, ui, view) {
+                    var g = event.start;
+                    var c = g.getDate();
+                    var a = g.getMonth() + 1;
+                    var e = g.getFullYear();
+                    $.post(huayi.config.callcenter_url + 'GroupClass/AddGroupClass', {
+                        id: event.id, date: e + '-' + a + '-' + c, groupcode: event.groupcode, classcode: event.classcode,
+                        "token": $.cookie("token")
+                    }, function (result) {
+                        result = JSON.parse(result);
+                        if (result.state.toLowerCase() != "success") {
+                            revertFunc();
+                        }
+                    })
+                },
+                events: function (start, end, callback) {
+                    var st = $.fullCalendar.formatDate(start, "yyyy-MM-dd");
+                    var ed = $.fullCalendar.formatDate(end, "yyyy-MM-dd");
+
+                    $.getJSON(huayi.config.callcenter_url + "GroupClass/GetRLList", { "starttime": st, "endtime": ed, "groupcode": $(".active").attr("code"), "token": $.cookie("token") }, function (r) {
+
+                        //$(r).each(function (i, n) {
+                        //    n.allDay = false;
+                        //})
+                        callback(r);
+
+                    })
+                },
+                eventClick: function (calEvent, jsEvent, view) {
+                    if (bl) {
+                        var id = calEvent.id;
+                        layer.confirm('确定删除吗？', {
+                            btn: ['是', '否'] //按钮
+                        }, function () {
+                            /*发送请求*/
+                            $.post(huayi.config.callcenter_url + "GroupClass/DelGroupClass", {
+                                id: id,
+                                token: $.cookie("token")
+                            }, function (result) {
+                                result = JSON.parse(result);
+                                if (result.state.toLowerCase() == "success") {
+                                    layer.msg("删除成功");
+                                    $('#calendar').fullCalendar('removeEvents', id);
+                                }
+                            })
+                        });
+                    }
+                },
+                eventMouseover: function (calEvent, jsEvent, view) {
+                    var id = calEvent.id;
+                }
+            });
+        }
+    </script>
+</body>
+
+</html>

WebUI/CallCenterWeb.UI/SystemManager/GroupEdit.html

@@ -0,0 +1,171 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <title>班组编辑</title>
+    <script src="../Script/Common/huayi.load.js"></script>
+    <script src="../Script/Common/huayi.config.js"></script>
+    <link rel="stylesheet" href="../css/init.css" />
+    <style>
+        th {
+            padding: 5px 8px 5px 0;
+            text-align: right;
+        }
+
+        input {
+            background-color: #FFF;
+            background-image: none;
+            border: 1px solid #ccc;
+            border-radius: 1px;
+            color: inherit;
+            padding: 6px 12px;
+            width:200px;
+        }
+
+        td {
+            padding: 6px 0 5px 10px;
+        }
+
+        .addts {
+            background: #1ab394;
+            color: #fff;
+            padding: 6px 10px;
+            outline: none;
+            font-size: 12px;
+            margin-left: 15px;
+            border: 0;
+            border-radius: 3px;
+            box-sizing: border-box;
+        }
+        .time-box {
+            display: inline-block;
+            position: relative;
+        }
+
+        .tub {
+            position: absolute;
+            right: 8px;
+            top: 10px;
+            font-size: 18px;
+            color: #00a0ca;
+        }
+
+        #layui-laydate3 .layui-laydate-header {
+            height: 31px;
+            padding: 5px;
+        }
+
+        .laydate-theme-molv .layui-laydate-header i,
+        .laydate-theme-molv .layui-laydate-header span {
+            top: 2px;
+        }
+
+        .layui-laydate-header {
+            padding: 0;
+        }
+
+        .laydate-theme-molv .layui-laydate-content {
+            height: 195px;
+            overflow: hidden;
+        }
+
+        .laydate-month-list > li {
+            margin: 10px 0;
+        }
+
+        .laydate-footer-btns span:hover {
+            color: #00a1cb;
+        }
+    </style>
+</head>
+
+<body>
+    <div style="padding: 10px;">
+        <div style="padding: 10px;" class="clearFix">
+            <div>
+                <span>【班组信息】</span>
+                <div class="box_content">
+                    <table id="sqzx" style="width: 100%;" border="0" cellspacing="0" cellpadding="0">
+                        <tr>
+                            <th>班组名称：</th>
+                            <td>
+                                <input type="text" class="name" /><input type="hidden" class="id" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>班组代码：</th>
+                            <td>
+                                <input type="text" class="code" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>说明：</th>
+                            <td>
+                                <textarea type="text" class="remark" style="width:200px;" ></textarea>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+            <div class="bton" style="text-align: center;">
+                <input class="addts" type="button" value="保存" />
+            </div>
+        </div>
+    </div>
+    <script>
+        var id = helper.request.queryString("id");
+        $(document).ready(function () {
+
+            if (id) {
+                $.getJSON(huayi.config.callcenter_url + 'Group/GetGroup', {
+                    id: id,
+                    "token": $.cookie("token")
+                }, function (result) {
+                    if (result.state.toLowerCase() == "success") {
+                        var content = result.data;
+
+                        $(".id").val(content.F_Id);
+                        $(".name").val(content.F_GroupName);
+                        $(".code").val(content.F_GroupCode);
+                        $(".remark").val(content.F_Remark);
+                    }
+                })
+            }
+            $(".addts").click(function () {
+                var id = $(".id").val();
+                var name = $(".name").val();
+                var code = $(".code").val();
+                var remark = $(".remark").val();
+
+                if (!name) {
+                    layer.confirm('请输入班组名称！', {
+                        btn: ['确定']
+                    });
+                    return;
+                }
+                if (!code) {
+                    layer.confirm('请输入班组代码！', {
+                        btn: ['确定']
+                    });
+                    return;
+                }
+
+                $.post(huayi.config.callcenter_url + 'Group/AddGroup', {
+                    id: $(".id").val(), code: code, name: name, remark: remark, "token": $.cookie("token")
+                }, function (result) {
+                    result = $.parseJSON(result);
+                    if (result.state.toLowerCase() == "success") {
+                        layer.msg("操作成功");
+                        var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
+                        parent.layer.close(index); //再执行关闭
+                        parent.initTable()();
+                    }
+                })
+            })
+        });
+
+    </script>
+</body>
+
+</html>

WebUI/CallCenterWeb.UI/SystemManager/GroupManage.html

@@ -0,0 +1,178 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <script src="../Script/Common/huayi.load.js"></script>
+    <script src="../Script/Common/huayi.config.js"></script>
+    <link href="../css/init.css" rel="stylesheet" />
+    <link href="../css/Table/table1.css" rel="stylesheet" />
+    <title>班组管理</title>
+</head>
+<body class="gray-bg">
+    <div class="container-fluid wrapper-content animated fadeInRight">
+        <div class="daoHang clearfix">
+            <div class="dhLeft">
+                <sapn><i class="syIcon"></i>位置：<a id="ReIndex" href="javaScript:;">首页</a>&gt;<a href="javaScript:;">系统管理</a>&gt;<a href="" class="nowPosition">班组管理</a></sapn>
+            </div>
+            <div class="dhRight">
+                <a href="" title="刷新"><i class="fa fa-refresh"></i></a>
+            </div>
+        </div>
+        <div class="th-box">
+            <div class="th-bar clearfix">
+                <div class="operation fl">
+                    <a href="javascript:;" class="sc_btn add max-right">添加</a>
+                    <a class="sc_btn xg max-right">修改</a>
+                    <a class="sc_btn remove">删除</a>
+                </div>
+                <div class="seach-box fr">
+                    <ul>
+                        <li>班组名称：<input class="photo x-color" type="text" id="name" placeholder="请输入班组名称" /></li>
+                        <li>
+                            <a class="sc_btn  Block" id="sc_btns">搜索</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div style="width: 100%;padding: 10px;">
+            <table id="list" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
+                <thead>
+                    <tr>
+                        <th data-field="state" data-checkbox="true"></th>
+                        <th data-align="center" data-formatter="setCode">编号</th>
+                        <th data-field="F_GroupName">班组名称</th>
+                        <th data-field="F_GroupCode">班组代码</th>
+                        <th data-field="F_Remark">说明</th>
+                        <th data-field="UserName">创建人</th>
+                        <th data-field="F_CreateTime">创建时间</th>
+                    </tr>
+                </thead>
+                <tbody id="tbody"></tbody>
+            </table>
+        </div>
+
+    </div>
+
+    <script>
+
+        $(document).ready(function () {
+
+            /*搜索*/
+            $("#sc_btns").click(function () {
+                initTable();
+            })
+            $(".add").click(function () {
+                layer.open({
+                    type: 2,
+                    content: "GroupEdit.html" , //iframe的url，no代表不显示滚动条
+                    title: '新增班组',
+                    area: ['40%', '50%'] //宽高
+                });
+            });
+            $(".xg").click(function () {
+                var id = $.map($('#list').bootstrapTable('getSelections'),
+						function(row) {
+						    return row.F_Id;
+						});
+                if (id.length != 1) {
+                    layer.confirm('请选择一行进行修改？', {
+                        btn: ['确定'] //按钮
+                    });
+                    return;
+                } else {
+                    layer.open({
+                        type: 2,
+                        content: "GroupEdit.html?id=" + id, //iframe的url，no代表不显示滚动条
+                        title: '修改班组',
+                        area: ['40%', '50%'] //宽高
+                    });
+                }
+            });
+            /*删除内容*/
+            $(".remove").click(function () {
+                var ids = $.map($('#list').bootstrapTable('getSelections'),
+                    function (row) {
+                        return row.F_Id;
+                    });
+                /*判断长度*/
+                if (ids.length <= 0) {
+                    layer.confirm('没有可删除的选项？', {
+                        btn: ['确定'] //按钮
+                    });
+                    return;
+                }
+                layer.confirm('确定删除选中的选项？', {
+                    btn: ['是', '否'] //按钮
+                }, function () {
+
+                    /*执行删除*/
+                    var ids = $.map($('#list').bootstrapTable('getSelections'),
+						function (row) {
+						    return row.F_Id;
+						});
+                    /*发送请求*/
+                    $.post(huayi.config.callcenter_url + "Group/DelGroup", {
+                        ids: ids,
+                        token: $.cookie("token")
+                    }, function (result) {
+                        result = JSON.parse(result);
+                        if (result.state.toLowerCase() == "success") {
+                            layer.msg("删除成功");
+                            initTable();
+                        }
+                    })
+                });
+            });
+            $('#ReIndex').click(function () {
+                top.home_index();
+            })
+            initTable();
+        })
+
+        function initTable() {
+            //先销毁表格
+            $('#list').bootstrapTable('destroy');
+            //初始化表格,动态从服务器加载数据
+            $("#list").bootstrapTable({
+                method: "get", //使用get请求到服务器获取数据
+                url: huayi.config.callcenter_url + "Group/GetList", //获取数据的Servlet地址
+                contentType: "application/x-www-form-urlencoded", striped: true, //表格显示条纹
+                pagination: true, //启动分页
+                pageSize: 10, //每页显示的记录数
+                pageNumber: 1, //当前第几页
+                pageList: [10, 20, 50, 100], //记录数可选列表
+                search: false, //是否启用查询
+                showColumns: false, //显示下拉框勾选要显示的列
+                showRefresh: false, //显示刷新按钮
+                sidePagination: "server", //表示服务端请求
+                //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
+                //设置为limit可以获取limit, offset, search, sort, order
+                queryParamsType: "undefined",
+                queryParams: function queryParams(params) { //设置查询参数
+                    var param = {
+                        page: params.pageNumber,
+                        pagesize: params.pageSize,
+                        name: $("#name").val(),
+                        token: $.cookie("token")
+                    };
+                    return param;
+                },
+                onLoadSuccess: function (data) { //加载成功时执行
+                    //layer.msg("加载成功");
+                },
+                onLoadError: function () { //加载失败时执行
+                    //layer.msg("加载数据失败", { time: 1500, icon: 2 });
+                }
+            });
+        }
+        //编号
+        function setCode(val, row, index) {
+            return index + 1;
+        }
+    </script>
+</body>
+
+</html>

WebUI/CallCenterWeb.UI/TelCall/zxKong.html

@@ -339,6 +339,7 @@
 								<th>主叫号码</th>
 								<th>被叫号码</th>
 								<th>状态</th>
+								<th>实时时间</th>
 								<th>工号</th>
 								<th>姓名</th>
 								<th>分机号</th>
@@ -352,7 +353,7 @@
 								<th>当前签入时长 </th>
 								<th>呼入量</th>
 								<th>呼出量</th>
-
+								
 							</tr>
 						</thead>
 						<tbody>
@@ -426,30 +427,15 @@
 		<script src="../css/layer/layer.js"></script>
 		<script src="../js/zTree/jquery.ztree.core.js"></script>
 		<script>
-			var user;
-			var hour = 0,
-				minute = 0,
-				second = 0;
-//				var t;
-				var flag;
-			function studyTime(t) {
-				hour = Math.floor(t / 60 / 60);
-				minute = Math.floor(t / 60 % 60);
-				second = Math.floor(t % 60);
-				if(hour < 10) {
-					hour = "0" + hour;
-				}
-				if(minute < 10) {
-					minute = "0" + minute;
-				}
-				if(second < 10) {
-					second = "0" + second;
-				}
-				//      localStorage.setItem(,hour +":"+minute+":"+second);	
-//				t++;
-			}
+			
 
 			$(document).ready(function() {
+				
+				//=================================================================
+				var user;
+				var hour = 0,
+				minute = 0,
+				second = 0;
 					if(!top.ws) {
 						top.Connect();
 					}
@@ -468,7 +454,7 @@
 						$(".kqc").click(function() {
 //							alert(1)
 							if(!$(this).hasClass("dis")) {
-								Ajax();
+								Ajax(1);
 								setInterval(Ajax, 10000);
 							}
 						})
@@ -476,14 +462,6 @@
 					//停止监测
 					$(".jqc").click(function() {
 						if(!$(this).hasClass("dis")) {
-							//$(user).each(function (i, n) {
-							//    top.obj.Type = "SubScribeCancel";
-							//    top.obj.SubParmer = n.F_WorkNumber;
-							//    top.obj.SubType = "0";//根据工号取消订阅坐席状态
-							//    top.Send();
-							//    top.obj.SubType = "1";//根据工号取消订阅线路状态
-							//    top.Send();
-							//})
 							top.obj.Type = "SubScribeCancel";
 							top.obj.SubParmer = "-1";
 							top.obj.SubType = "0"; //根据工号取消订阅坐席状态
@@ -508,7 +486,8 @@
 				}
 
 			) //坐席表格
-			function Ajax() {
+			var userss=[];
+			function Ajax(jc) {
 				$.ajax({
 					type: "get",
 					url: huayi.config.callcenter_url + "SeatMonitoring/GetAgentList",
@@ -520,9 +499,26 @@
 					success: function(data) {
 						user = data.data;
 						$(".tjcount li").eq(0).find("b").text(user.length);
+						if(localStorage.getItem("userss")) {
+									userss=JSON.parse(localStorage.getItem("userss"));
+							}
 						if(data.state.toLowerCase() == 'success') {
 							$("#table1 tbody").html('');
 							$(user).each(function(i, n) {
+								var bl=0;
+								var ss=0;
+								var sts='lx';
+								$(userss).each(function(j,m){
+									if(m.code==n.UserCode){
+										bl=1;
+										ss=m.s;
+										sts=m.sts;
+									}
+								})
+								if(bl==0){
+									var users={code:n.UserCode,s:0,sts:'lx'};
+									userss.push(users);
+								}
 								if(localStorage.getItem(n.UserCode + "telnum")) {
 									var telNum = localStorage.getItem(n.UserCode + "telnum");
 									var beiTelnum = localStorage.getItem(n.UserCode + "beiTelnum");
@@ -536,7 +532,9 @@
 									+
 									'<td class=" ' + n.UserCode + 'beiTelnum">' + beiTelnum + '</td>' //被叫号码
 									+
-									'<td class=" ' + n.UserCode + 'state"><i class="lx" zx_item="0" xl_item="0"></i></td>' //状态
+									'<td class=" ' + n.UserCode + 'state"><i class="'+ sts +'" zx_item="0" xl_item="0"></i></td>' //状态
+									+
+									'<td class=" ' + n.UserCode + 'time" ></td>' //实时时间
 									+
 									'<td>' + n.UserCode + '</td>' //工号
 									+
@@ -544,13 +542,13 @@
 									+
 									'<td>' + n.ExtNumber + '</td>' //分机号
 									+
-									'<td class=" ' + n.UserCode + 'kxTime" second="0">' + n.free + '秒</td>' //空闲时长
+									'<td class=" ' + n.UserCode + 'kxTime">' + turnMin(n.free)+ '</td>' //空闲时长
 									+
-									'<td class=" ' + n.UserCode + 'zmTime" second="0">' + n.repose + '秒</td>' //置忙时长
+									'<td class=" ' + n.UserCode + 'zmTime">' + turnMin(n.repose) + '</td>' //置忙时长
 									+
-									'<td class=" ' + n.UserCode + 'thTime" second="0">' + n.talking + '秒</td>' //通话时长
+									'<td class=" ' + n.UserCode + 'thTime" >' + turnMin(n.talking) + '</td>' //通话时长
 									+
-									'<td class=" ' + n.UserCode + 'hhTime" second="0">' + n.postprocess + '秒</td>' //话后处理时长
+									'<td class=" ' + n.UserCode + 'hhTime">' + turnMin(n.postprocess) + '</td>' //话后处理时长
 									+
 									'<td>' + n.reposeconut + '</td>' //置忙次数
 									+
@@ -566,10 +564,7 @@
 									+
 									'</tr>';
 								$(html).appendTo($("#table1 tbody"));
-								//                  top.obj.Type = "SubScribe";
-								//                  top.obj.SubParmer = n.UserCode;
-								//                  top.obj.SubType = "0"; //根据工号订阅坐席状态
-								//                  top.Send();
+								intervalTime(ss,$('.'+ n.UserCode +'time'));
 								$('input:radio[name="seatSelect"]').click(function(event) {
 									event.stopPropagation();
 									if(top.obj.AgentID != $(this).attr("user-code")) {
@@ -583,13 +578,16 @@
 										$(this).prop("checked", false);
 									}
 								});
-								top.obj.Type = "SubScribe";
-								top.obj.SubParmer = n.UserCode * 1;
-								top.obj.SubType = "0"; //根据工号订阅坐席状态
-								top.Send();
-								top.obj.SubType = "1"; //根据工号订阅线路状态
-								top.Send();
+								if(jc){
+									top.obj.Type = "SubScribe";
+									top.obj.SubParmer = n.UserCode * 1;
+									top.obj.SubType = "0"; //根据工号订阅坐席状态
+									top.Send();
+									top.obj.SubType = "1"; //根据工号订阅线路状态
+									top.Send();
+								}
 							})
+							localStorage.setItem("userss",JSON.stringify(userss));
 						}
 					}
 				});
@@ -653,39 +651,42 @@
 
 			//坐席状态
 			function UpdateAgentState(WorkNumber, State) {
-				//      		console.log("坐席状态"+WorkNumber+","+State);
 				var sts = "";
-				var timeClass = "";
+//				var timeClass = "";
 				switch(State) {
 					case "0":sts = "lx";break; //离线
 					case "1":break; //登录中
-					case "2":sts = "kx";timeClass = "kxTime";break; //空闲
-					case "3":sts = "th";timeClass = "thTime";break; //通话中
-					case "4":sts = "hh";timeClass = "hhTime";break; //话后处理中
-					case "5":sts = "ml";timeClass = "zmTime";break; //小休
+					case "2":sts = "kx";break; //空闲
+					case "3":sts = "th";break; //通话中
+					case "4":sts = "hh";break; //话后处理中
+					case "5":sts = "ml";break; //小休
 					case "6":sts = "zl";break; //被请求
 					case "7":sts = "lx";break; //注销
 				}
 				if(WorkNumber * 1 < 10) {
 					WorkNumber = '0' + WorkNumber;
 				}
+				
+			if(localStorage.getItem("userss")) {
+				userss=JSON.parse(localStorage.getItem("userss"));
+							
+			   	$(userss).each(function(j,m){
+			   		if(m.code==WorkNumber){
+			   			m.s=0;
+			   			m.sts=sts;
+			   		}
+			   		var ele=$('.'+ m.code +'time');
+			   		intervalTime(m.s,ele);
+								})
+			   	localStorage.setItem("userss",JSON.stringify(userss));
+			   	}
 				var ele = $("." + WorkNumber + "state").find("i");
 				
-				//          console.log(sts);
 				if(sts) {
 					ele.removeClass().addClass(sts);
-					//              ele.addClass(sts);
 				}
 				ele.attr("zx_item", State);
-				if(timeClass){
-					t = $("." + WorkNumber + timeClass).attr("second");
-//					flag = setInterval(studyTime, 1000);
-					
-				}
 				if($(".zx-box_ul").attr('zxtp-code') == WorkNumber) {
-					//              if (sts) {
-					//                  $(".zxtp i").removeClass().addClass(sts);
-					//              }
 					UpdateSelState(State, ele.attr("xl_item"))
 				}
 				tjcount();
@@ -749,15 +750,27 @@
 				if(WorkNumber * 1 < 10) {
 					WorkNumber = '0' + WorkNumber;
 				}
+				if(localStorage.getItem("userss")) {
+						userss=JSON.parse(localStorage.getItem("userss"));
+							
+			   	$(userss).each(function(j,m){
+			   		if(m.code==WorkNumber){
+			   			m.s=0;
+			   			m.sts=sts;
+			   		}
+			   		var ele=$('.'+ m.code +'time');
+			   		intervalTime(m.s,ele);
+								})
+			   	localStorage.setItem("userss",JSON.stringify(userss));
+			   	}
+				
 				var ele = $("." + WorkNumber + "state").find("i");
+			
 				if(sts) {
 					ele.removeClass().addClass(sts);
 				}
 				ele.attr("xl_item", State);
 				if($(".zx-box_ul").attr('zxtp-code') == WorkNumber) {
-					//              if (sts) {
-					//                  $(".zxtp i").removeClass().addClass(sts);
-					//              }
 					UpdateSelState(ele.attr("zx_item"), State)
 				}
 				tjcount();
@@ -780,7 +793,54 @@
 					$(".zx-box_ul .dj").removeClass("dis");
 				}
 			}
+				 var flag;
+				 function intervalTime(t,ele) {
+			        hour = Math.floor(t / 60 / 60);
+			        minute = Math.floor(t / 60 % 60);
+			        second = Math.floor(t % 60);
+			        if(hour < 10) {
+			            hour = "0" + hour;
+			        }
+			        if(minute < 10) {
+			            minute = "0" + minute;
+			        }
+			        if(second < 10) {
+			            second = "0" + second;
+			        }
+			        $(ele).text(hour +":"+ minute +":"+ second) ;
+			    
+			   };
+			   setInterval(addTime, 1000);
+			   function addTime(){
+			   	if(localStorage.getItem("userss")) {
+						userss=JSON.parse(localStorage.getItem("userss"));
+							
+			   	$(userss).each(function(j,m){
+			   		m.s=m.s*1+1;
+			   		var ele=$('.'+ m.code +'time');
+			   		intervalTime(m.s,ele);
+								})
+			   	localStorage.setItem("userss",JSON.stringify(userss));
+			   	}
+			   }
+			   
+			function turnMin(t) {
+			        hour = Math.floor(t / 60 / 60);
+			        minute = Math.floor(t / 60 % 60);
+			        second = Math.floor(t % 60);
+			        if(hour < 10) {
+			            hour = "0" + hour;
+			        }
+			        if(minute < 10) {
+			            minute = "0" + minute;
+			        }
+			        if(second < 10) {
+			            second = "0" + second;
+			        }
+			       return hour +":"+ minute +":"+ second;
+			    
+			   };				     
+			     
 		</script>
 	</body>
-
 </html>

WebUI/CallCenterWeb.UI/chatWith.html

@@ -41,7 +41,7 @@
 			 	</div>
 			</div>
 			<div class="chat_main">
-				<div class="chat_person">
+				<div class="chat_person disnone">
 			 		<p class="chat_name"></p>
 				</div>
 				<div class="main_message">
@@ -67,7 +67,7 @@
 						
 					</ul>
 				</div>
-				<div class="main_sendMessage">
+				<div class="main_sendMessage disnone">
 					<textarea name="" rows="" cols="" placeholder="按Enter 发送" class="send_content"></textarea>
 				    
 				    <div class="send_btn">

WebUI/CallCenterWeb.UI/css/chat.css

@@ -90,6 +90,7 @@
 			    cursor: pointer;
 			    -webkit-transition: background-color .1s;
 			    transition: background-color .1s;
+			        position: relative;
 			}
 			.chat_sidebar_list li.actives ,.chat_left li.actives{
 			    background-color: hsla(0,0%,100%,.1);
@@ -102,7 +103,17 @@
 				}
 		/*chat_sidebar结束*/
 		/*聊天区域开始*/
-		
+		.message_count{
+			display: inline-block;
+			position: absolute;
+			right: 0;
+			border-radius: 50%;
+			background: red;
+			color: #fff;
+		}
+		.disnone{
+			display: none;
+		}
 		.main_message{
 			padding: 10px 15px;
 		    overflow-y: scroll;

WebUI/CallCenterWeb.UI/css/style.min862f.css

@@ -7231,11 +7231,17 @@ body.skin-3 {
 	background-color: #999
 }
 
+#chat .badge {
+    position: absolute;
+    top: -3px;
+    right: -4px;
+}
+
 .gohome {
 	position: fixed;
-	top: 20px;
+	top: 35%;
 	right: 20px;
-	z-index: 100
+	z-index: 100;
 }
 
 .gohome a {
@@ -7247,12 +7253,12 @@ body.skin-3 {
 	text-align: center;
 	color: #fff;
 	border-radius: 50%;
-	opacity: .5
+	/*opacity: .5*/
 }
 
-.gohome a:hover {
+/*.gohome a:hover {
 	opacity: 1
-}
+}*/
 
 @media only screen and (-webkit-min-device-pixel-ratio:2) {
 	#content-main {

WebUI/CallCenterWeb.UI/index.html

@@ -867,6 +867,7 @@
 									</span>
 								</a>
                                 <input id="RoleCode" type="hidden" />
+                                <input id="GroupCode" type="hidden" />
 							</div>
 							<div class="logo-element">
 							</div>

WebUI/CallCenterWeb.UI/js/chat.js

@@ -1,5 +1,9 @@
 			var token= $.cookie("token");
+			var username=$.cookie("zx_user");
 			$('.chat_sidebar_list ul').on('click','li',function(){
+				if($('.disnone').css('display')=="none"){
+						$('.disnone').css('display','block')
+				}
 				$(this).addClass("actives").siblings().removeClass("actives");
 				var person_name=$(this).find('.chat_name .names').html();
 				var person_userId=$(this).find('.chat_name .user_id').html();
@@ -33,6 +37,9 @@
 				});
 			}
 			$('.chat_left ul').on('click','li',function(){
+					if($('.disnone').css('display')=="none"){
+						$('.disnone').css('display','block')
+				}
 				$(this).addClass("actives").siblings().removeClass("actives");
 				var person_name=$(this).find('.chat_name').html();
 				$('.chat_person .chat_name').html(person_name);
@@ -60,21 +67,34 @@
 					success:function(data){
 						if(data.state.toLowerCase()=='success'){
 							$('.chat_sidebar_list ul').html('');
-//							var con=JSON.parse(data.data);
+							var html='';
 							var con=data.data;
+							console.log(username)
 							$(con).each(function(i,n){
-								if($.cookie("user")==n.F_UserId){
-									$('.chat_sidebar_head').find('chat_name').html(n.F_UserName+n.F_UserCode)
+								if(username==n.F_UserCode){
+									$('.chat_sidebar_head').find('.chat_name').html(n.F_UserName+n.F_UserCode)
+								}
+								 html='<li IsToAll="0" RoleId="'+n.F_RoleId +'" UserId="'+ n.F_UserId +'" UserCode="'+ n.F_UserCode +'">'+  
+		//								 src="'+ huayi.config.callcenter_url.substr(0, huayi.config.callcenter_url.length - 1) + n.F_See +'"
+										'<img class="ver_middle" src="img/chat_pic.jpg" alt="" width="30" height="30"/>'+
+										'<p class="chat_name"><span class="names">'+n.F_UserName +'</span><br/><span class="user_id">'+ n.F_UserCode +'</span></p>'
+								if(n.counts>0){
+									html+='<p class="message_count">'+n.counts+'</p>'
 								}
-								$('<li IsToAll="0" RoleId="'+n.F_RoleId +'" UserId="'+ n.F_UserId +'" UserCode="'+ n.F_UserCode +'">'+  
-//								 src="'+ huayi.config.callcenter_url.substr(0, huayi.config.callcenter_url.length - 1) + n.F_See +'"
-								'<img class="ver_middle" src="img/chat_pic.jpg" alt="" width="30" height="30"/>'+
-								'<p class="chat_name"><span class="names">'+n.F_UserName +'</span><br/><span class="user_id">'+ n.F_UserCode +'</span></p>'+
-								'</li>').appendTo('.chat_sidebar_list ul');
+								html+='</li>'
+								$('.chat_sidebar_list ul').append(html);
+								
 							})
 						}
 					}
 				});
+				if(	$('.UserId').val()!=0){
+					$('.chat_sidebar_list ul li').each(function(i,n){
+						if($(n).attr('UserId')==$('.UserId').val()){
+							$(this).addClass('actives');
+						}
+					})
+				}
 			}
 			$('.chat_sidebar_list ul').on('click','li',function(){
 				var userId=$(this).attr("userid");
@@ -85,7 +105,12 @@
 				$('.UserId').val(userId);
 				jiShi(userId);
 			})
-			//即时通讯
+		
+		 $('.sidebar_foot_seach').on('input focus',function(){
+			 	side()
+			 })
+		
+		//即时通讯
 			function jiShi(){
 				$.ajax({
 					type:"get",
@@ -118,7 +143,10 @@
 									'</div>'+
 								'</li>').appendTo('.main_message .chatlist_con')
 							}
+							
 						})
+						var farTop=$(".main_message").css('height');
+						$(".main_message").animate({ scrollTop:farTop});
 					}
 				});
 			}
@@ -152,7 +180,24 @@
          	 	}
          	 })
          }
-
+	//键盘发送事件
+	$('input').bind('keypress', function(event) {
+					if(event.keyCode == "13") {
+						$('.sendTo').trigger("click");
+					}
+				});
+				$(document).keydown(function(event){ 
+					if(event.keyCode==13){ 
+						$(".sendTo").click(); 
+					} 
+				}); 
+				
+		function Ajax(){
+			side();
+			jiShi();
+		}
+	setInterval(Ajax, 2000);//Ajax调用函数			
+				
 
 /*
  Index/SaveChatInfo?Content=&ToUserId=&ToRoleId=&IsToAll=
@@ -163,5 +208,5 @@
 
 当ToRoleId!=0时群发给所在角色
 
-当ToUserId!=0时发给该坐席人员
+当ToUserId!=0时发给该坐席人员ssss
 */

WebUI/CallCenterWeb.UI/js/hplus.min.js

@@ -28,7 +28,7 @@ layer.config({
 		railOpacity: .4,
 		wheelStep: 10
 	}), $(".open-small-chat").click(function() {
-		$(this).children().toggleClass("fa-comments").toggleClass("fa-remove"), $(".small-chat-box").toggleClass("active")
+		$(this).children().toggleClass("fa-comment").toggleClass("fa-remove"), $(".small-chat-box").toggleClass("active")
 	}), $(".small-chat-box .content").slimScroll({
 		height: "336px",
 //		height: "100%",

WebUI/CallCenterWeb.UI/js/huTotal.js

@@ -110,6 +110,7 @@
         		});
 
         		function Ajax(date) {
+        			$(".huTable tbody").html('');
         			$.ajax({
         				type: "get",
         				url: huayi.config.callcenter_url + "TotalCall/GetDataList",

WebUI/CallCenterWeb.UI/js/main.js

@@ -582,6 +582,7 @@ $(document).ready(function() {
 		$('.ldtp-con').css("display", "none");
 		obj.Type = "SayFree";
 		Send();
+		Clean();
 	})
 	//顶部小头像
 	var little_pic = $('.head-pic .hp-box img').attr("src");
@@ -699,7 +700,8 @@ $(document).ready(function() {
 	}, function(result) {
 		if(result.state.toLowerCase() == "success") {
 			//console.log(result);
-			$("#RoleCode").val(result.data.user.F_RoleCode);
+		    $("#RoleCode").val(result.data.user.F_RoleCode);
+		    $("#GroupCode").val(result.data.user.F_GroupCode);
 			//console.log($("#RoleCode").val());
 			$(".username").text(result.data.user.F_UserName);
 			if(result.data.role) {

WebUI/CallCenterWeb.UI/login.html

@@ -221,7 +221,6 @@
 			</div>
 
 		</div>
-
 		<script>
 			$(function() {
 				var a=0;