Ver Código Fonte

修改来电弹屏问题

zhangshuangnan 7 anos atrás
pai
commit
c87415e434

+ 2 - 3
CallCenterWeb.UI/Script/Common/huayi.http.js

545
 			crossDomain: true == !(document.all)
545
 			crossDomain: true == !(document.all)
546
 		});
546
 		});
547
 		 if (!!window.ActiveXObject || "ActiveXObject" in window){
547
 		 if (!!window.ActiveXObject || "ActiveXObject" in window){
548
-			
549
 			$.ajaxSetup({
548
 			$.ajaxSetup({
550
-			cache:false
551
-		});
549
+				cache:false
550
+			});
552
 		};
551
 		};
553
 		$(document).on("ajaxStart", function() {
552
 		$(document).on("ajaxStart", function() {
554
 			if(isload) {
553
 			if(isload) {

+ 2 - 1
CallCenterWeb.UI/callScreen/callScreen.html

21
             
21
             
22
 		</div>
22
 		</div>
23
 		<script>
23
 		<script>
24
-			var Number = helper.request.queryString("tel"),//来电号码
24
+			var Number = helper.request.queryString("Number"),//来电号码
25
 				CallID = helper.request.queryString("CallID"),//callid
25
 				CallID = helper.request.queryString("CallID"),//callid
26
 				callType = helper.request.queryString("callType"),//业务类型
26
 				callType = helper.request.queryString("callType"),//业务类型
27
 				userCode=top.$('#userCode').val();//工号
27
 				userCode=top.$('#userCode').val();//工号
39
 					}
39
 					}
40
 				}
40
 				}
41
 			$('.callIn_iframe').attr('src', 'http://192.168.128.246/400/?logid=' + userCode + '&Telephone=' + Number + '&calltype=' + callType + '&Media=' + CallID)
41
 			$('.callIn_iframe').attr('src', 'http://192.168.128.246/400/?logid=' + userCode + '&Telephone=' + Number + '&calltype=' + callType + '&Media=' + CallID)
42
+//			$('.callIn_iframe').attr('src', 'http://117.158.24.187:8001/400/?logid=' + userCode + '&Telephone=' + Number + '&calltype=' + callType + '&Media=' + CallID)
42
 		</script>
43
 		</script>
43
 	</body>
44
 	</body>
44
 
45
 

+ 9 - 8
CallCenterWeb.UI/js/newtx.js

579
                         DialIsOK = Phone.CallOutEx3(5, '', res.data.phone, '', 0, 3, '');
579
                         DialIsOK = Phone.CallOutEx3(5, '', res.data.phone, '', 0, 3, '');
580
                     }
580
                     }
581
                     else {   //呼叫外部电话
581
                     else {   //呼叫外部电话
582
-                        DialIsOK = Phone.CallOutEx3(5, '', res.data.phone, '', 0, 3, '');
582
+                        DialIsOK = Phone.CallOutEx3(5, $('.gd_whNum').text(), res.data.phone, '', 0, 3, '');
583
                     }
583
                     }
584
                     $('#Result').val('');
584
                     $('#Result').val('');
585
 					$(".WH").addClass("hidens");
585
 					$(".WH").addClass("hidens");
598
 	    ///转移
598
 	    ///转移
599
     function PhoneCallZY(tel) {
599
     function PhoneCallZY(tel) {
600
             try {
600
             try {
601
+            	 Form_setWinfromenble("false", "false", "false", "false", "false", "false", "false", "false", "false", "false");
601
                 var callinphone =$("#ZYNumber").val();
602
                 var callinphone =$("#ZYNumber").val();
602
             	Phone.TransOutEx2(5, callinphone, tel, 2, 0, '');
603
             	Phone.TransOutEx2(5, callinphone, tel, 2, 0, '');
603
-            	 console.log(Phone.GetPromptByErrorCode(Phone.TransOutEx2(5, callinphone, tel, 2, 0, '')))
604
+            	 console.log('转移'+Phone.GetPromptByErrorCode(Phone.TransOutEx2(5, callinphone, tel, 2, 0, '')))
604
             }
605
             }
605
             catch (e) {
606
             catch (e) {
606
                   layer.msg(e.message);
607
                   layer.msg(e.message);
613
     ///多方通话
614
     ///多方通话
614
     function PhoneCallDFTH(tel) {
615
     function PhoneCallDFTH(tel) {
615
             try {
616
             try {
617
+            	  Form_setWinfromenble("false", "false", "false", "false", "false", "false", "false", "false", "false", "false");
616
                 var callinphone = $("#ZYNumber").val();
618
                 var callinphone = $("#ZYNumber").val();
617
                 Phone.TransOutEx2(5, callinphone, tel, 4, 0, '');
619
                 Phone.TransOutEx2(5, callinphone, tel, 4, 0, '');
620
+                console.log('三方'+Phone.GetPromptByErrorCode(Phone.TransOutEx2(5, callinphone, tel, 4, 0, '')))
618
             }
621
             }
619
             catch (e) {
622
             catch (e) {
620
                   layer.msg(e.message);
623
                   layer.msg(e.message);
633
 			function MydTransToIVR() {
636
 			function MydTransToIVR() {
634
 				var rtn = Phone.TransToIVR(5, 0, '9999');
637
 				var rtn = Phone.TransToIVR(5, 0, '9999');
635
 			}
638
 			}
636
-	
637
-	
638
-	
639
 	//座席置忙 2.1.12
639
 	//座席置忙 2.1.12
640
 	function AgentBusy() {
640
 	function AgentBusy() {
641
 		//将座席状态设置为忙态。
641
 		//将座席状态设置为忙态。
649
 		$.get(huayi.config.callcenter_url + 'CallInScreen/AddTelBusyDelgate',{
649
 		$.get(huayi.config.callcenter_url + 'CallInScreen/AddTelBusyDelgate',{
650
 			"token": $.cookie("token")
650
 			"token": $.cookie("token")
651
 		},function(res){
651
 		},function(res){
652
-			if(res.state.toLowerCase() == "success") {
652
+//			if(res.state.toLowerCase() == "success") {
653
+			if(res.state== "success") {
653
 				$('#callLogid').val(res.data.calllogid);
654
 				$('#callLogid').val(res.data.calllogid);
654
 			}
655
 			}
655
 		});
656
 		});
868
 				function Form_callCommingCaller(callerNum, callid, calledType) {
869
 				function Form_callCommingCaller(callerNum, callid, calledType) {
869
 					becallout = false;
870
 					becallout = false;
870
 					becallcome = true;
871
 					becallcome = true;
871
-					var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + callerNum + '&CallID=' + callid + '&callType='+ calledType +'">来电弹屏' + callerNum + ' <i class="fa fa-times-circle"></i></a>';
872
+					var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?Number=' + callerNum + '&CallID=' + callid + '&callType='+ calledType +'">来电弹屏' + callerNum + ' <i class="fa fa-times-circle"></i></a>';
872
 					$(".J_menuTab").removeClass("active");
873
 					$(".J_menuTab").removeClass("active");
873
 //					var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ callid  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + callerNum + '&CallID=' + callid + '&ActionID=' + data.ActionID + '" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + callerNum + '&CallID=' + callid + '" seamless></iframe>';
874
 //					var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ callid  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + callerNum + '&CallID=' + callid + '&ActionID=' + data.ActionID + '" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + callerNum + '&CallID=' + callid + '" seamless></iframe>';
874
-					var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ callid  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + callerNum + '&CallID=' + callid + '" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + callerNum + '&CallID=' + callid + '" seamless></iframe>';
875
+					var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ callid  +'"  width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + callerNum + '&CallID=' + callid + '&callType='+ calledType +'" frameborder="0" data-id="./callScreen/callScreen.html?Number=' + callerNum + '&CallID=' + callid + '&callType='+ calledType +'" seamless></iframe>';
875
 					$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
876
 					$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
876
 					$(".J_menuTabs .page-tabs-content").append(p);
877
 					$(".J_menuTabs .page-tabs-content").append(p);
877
 					$("#ZYNumber").val(callerNum);//转移号码
878
 					$("#ZYNumber").val(callerNum);//转移号码