Просмотр исходного кода

修改话务 增加highcharts 源码文件

zhangshuangnan лет назад: 7
Родитель
Сommit
f7c0c3928d

Разница между файлами не показана из-за своего большого размера
+ 1 - 0
CallCenterWeb.UI/js/highcharts/highcharts-zh_CN.js


Разница между файлами не показана из-за своего большого размера
+ 407 - 0
CallCenterWeb.UI/js/highcharts/highcharts.js


+ 13 - 10
CallCenterWeb.UI/js/main.js

@@ -247,9 +247,10 @@ function DropCallBack() {
247 247
 	$(".SayBusy").addClass("active");
248 248
 	$(".MakeCall").addClass("active");
249 249
 	var obj = $("iframe:visible")
250
-    if (obj.attr("data-id") == './callScreen/callScreen.html?tel=' + hidTel + '&CallID=' + hidCallID + '') {
251
-	        window.frames[obj.attr("name")].$(".td-call").hide();
252
-	    }
250
+//  if (obj.attr("data-id") == './callScreen/callScreen.html?tel=' + hidTel + '&CallID=' + hidCallID + '') {
251
+//	        window.frames[obj.attr("name")].$(".td-call").hide();
252
+	        window.frames['iframe'+ hidCallID +''].$(".td-call").hide();
253
+//	    }
253 254
 }
254 255
 //线路状态通知
255 256
 function LineStateAgentBack(data) {
@@ -265,9 +266,10 @@ function LineStateAgentBack(data) {
265 266
 		$(".hwzt").text('空闲'); //左下角状态显示
266 267
 		$(".fwzt").removeClass("br").addClass("bl");
267 268
 		$(".zxzt").removeClass("br").addClass("bl");//20180509 by fanlongfei 增加坐席状态灯
268
-	if (objiframe.attr("data-id") == './callScreen/callScreen.html?tel=' + hidTel + '&CallID=' + hidCallID + '') {
269
-	        window.frames[objiframe.attr("name")].clearInter();
270
-	    }
269
+//	if (objiframe.attr("data-id") == './callScreen/callScreen.html?tel=' + hidTel + '&CallID=' + hidCallID + '') {
270
+//	        window.frames[objiframe.attr("name")].clearInter();
271
+	        window.frames['iframe'+ hidCallID +''].clearInter();
272
+//	    }
271 273
 		 if (hidTel && hidCallID) {
272 274
             $.post(huayi.config.callcenter_url + 'CallInScreen/UpdateGJ', {
273 275
                 callid: hidTel,
@@ -281,9 +283,10 @@ function LineStateAgentBack(data) {
281 283
 		$(".Logout").addClass("active");
282 284
 		$(".SayBusy").addClass("active");
283 285
 		$(".MakeCall").addClass("active");
284
- 		if (objiframe.attr("data-id") == './callScreen/callScreen.html?tel=' + hidTel + '&CallID=' + hidCallID + '') {
285
-	        window.frames[objiframe.attr("name")].$(".td-call").hide();
286
-	    }
286
+// 		if (objiframe.attr("data-id") == './callScreen/callScreen.html?tel=' + hidTel + '&CallID=' + hidCallID + '') {
287
+//	        window.frames[objiframe.attr("name")].$(".td-call").hide();
288
+	        window.frames['iframe'+ hidCallID +''].$(".td-call").hide();
289
+//	    }
287 290
 
288 291
 	}
289 292
 	if(data.State == '2') {
@@ -331,7 +334,7 @@ function LineStateAgentBack(data) {
331 334
 		$(".Meeting").addClass("active");
332 335
 		if(data.CallDirection=="in"){
333 336
 			if (objiframe.attr("data-id") == './callScreen/callScreen.html?tel=' + hidTel + '&CallID=' + hidCallID + '') {
334
-				setTimeout('window.frames[objiframe.attr("name")].calling()',100);/*2018-05-19 zhangshuangnan 修改  ps: 因软电话设置为 自动应答 通话时间不计时问题*/
337
+				setTimeout(window.frames[objiframe.attr("name")].calling(),100);/*2018-05-19 zhangshuangnan 修改  ps: 因软电话设置为 自动应答 通话时间不计时问题*/
335 338
 	        	
336 339
 		    }
337 340
 		}

+ 2 - 2
CallCenterWeb.UI/widgets.html

@@ -510,8 +510,8 @@
510 510
     <script src="./js/jquery-ui-1.10.4.min.js"></script>
511 511
     <script src="./js/content.min.js?v=1.0.0"></script>
512 512
     <script src="./js/echarts.common.min.js"></script>
513
-    <script src="https://img.hcharts.cn/highcharts/highcharts.js"></script>
514
-    <script src="https://img.hcharts.cn/highcharts-plugins/highcharts-zh_CN.js"></script>
513
+    <script src="js/highcharts.js"></script>
514
+    <script src="js/highcharts/highcharts-zh_CN.js"></script>
515 515
     <script>
516 516
         var inval;
517 517
         $(document).ready(function () {