来电弹屏

CallCenterWeb.UI/js/contabs.min.js

@@ -139,10 +139,10 @@ $(function() {
 					$(".J_menuTab").eq(0).addClass("active").text(l);
 					$(".J_menuTab.active").attr("data-id",o);
 				}
-			}
+		}
 		}
 		
-		//改之前
+//		//改之前
 //		$(".J_mainContent").empty();
 //		var p = '<a href="javascript:;" class="active J_menuTab" data-id="' + o + '">' + l + ' <i class="fa fa-times-circle"></i></a>';
 //			$(".J_menuTab").removeClass("active");
@@ -150,8 +150,8 @@ $(function() {
 //			$(".J_mainContent").append(n);
 //			$(".J_menuTabs .page-tabs-content").append(p);
 //			g($(".J_menuTab.active"));
-			
-			//多标签
+//			
+//			//多标签
 //		$(".J_menuTab").each(function() {
 //			if($(this).data("id") == o) {
 //				if(!$(this).hasClass("active")) {
@@ -177,8 +177,8 @@ $(function() {
 //			$(".J_menuTabs .page-tabs-content").append(p);
 //			g($(".J_menuTab.active"))
 //		}
-			///多标签结束
-		return false
+//			///多标签结束
+//		return false
 	}
 	$(".J_menuItem").on("click", c);
 

CallCenterWeb.UI/js/main.js

@@ -1,5 +1,5 @@
 var ws, n = 0,
-	timer,hidTel,hidCallID;
+	timer,hidTel,hidCallID,hidActionID;
 var lockReconnect = false; //避免重复连接
 var obj = {};
 
@@ -219,14 +219,28 @@ function LogoutBack() {
 }
 //来电
 function IncomingBack(data) {
-	var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID=' + data.CallID + '">来电弹屏' + data.Number + ' <i class="fa fa-times-circle"></i></a>';
+	if(data.CallID!=0){
+		var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID=' + data.CallID + '">来电弹屏' + data.Number + ' <i class="fa fa-times-circle"></i></a>';
+		$(".J_menuTab").removeClass("active");
+		var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ data.CallID  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + data.Number + '&CallID=' + data.CallID + '&ActionID=' + data.ActionID + '" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID=' + data.CallID + '" seamless></iframe>';
+		$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
+		$(".J_menuTabs .page-tabs-content").append(p);
+		hidTel=data.Number;
+		hidCallID=data.CallID;
+		hidActionID=data.ActionID;
+	}else{
+		var timestamp = Date.parse(new Date());
+	var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID='+timestamp+'">来电弹屏' + data.Number + ' <i class="fa fa-times-circle"></i></a>';
 	$(".J_menuTab").removeClass("active");
-	var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ data.CallID  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + data.Number + '&CallID=' + data.CallID + '" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID=' + data.CallID + '" seamless></iframe>';
+	var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+timestamp+'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + data.Number + '&CallID='+timestamp+'" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID='+timestamp+'" seamless></iframe>';
 	$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
 	$(".J_menuTabs .page-tabs-content").append(p);
 	hidTel=data.Number;
-	hidCallID=data.CallID;
+	hidCallID=timestamp;
+	}
+	
 }
+
 //***************************************************
 function CallIDBack(data) {
 	//$(".hidCallID").val(data.CurrID);
@@ -254,7 +268,7 @@ function LineStateAgentBack(data) {
 	if(data.State == '1') {
 		$(".hwzt").text('空闲'); //左下角状态显示
 		$(".fwzt").removeClass("br").addClass("bl");
-//		clearInterval(timer);
+		clearInterval(timer);
 	if (obj.attr("data-id") == './callScreen/callScreen.html?tel=' + hidTel + '&CallID=' + hidCallID + '') {
 	        window.frames[obj.attr("name")].clearInter();
 	    }
@@ -321,7 +335,7 @@ function LineStateAgentBack(data) {
 		$(".Transfer").addClass("active");
 		$(".Meeting").addClass("active");
  		if (obj.attr("data-id") == './callScreen/callScreen.html?tel=' + hidTel + '&CallID=' + hidCallID + '') {
-	        window.frames[obj.attr("name")].calling();
+        window.frames[obj.attr("name")].calling();
 	    }
 	}
 	if(data.State == '7') {
@@ -423,6 +437,7 @@ function LineStateBack(data) {
 }
 //录音返回
 function RecordPathBack(data) {
+	$(".hidCallID").val(data.CallID);
 	//if ($(".hidTel").val() && $(".hidCallID").val()) {
 	//    $.post(huayi.config.callcenter_url + 'CallInScreen/UpdateLY', { callid: $(".hidCallID").val(),path:data.RecPath, "token": $.cookie("token") }, function (result) {
 	//        result = JSON.parse(result);