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

Merge branch 'master' of http://192.168.1.222:3000/zhoufan/SQ12345_Web

zhengbingbing лет назад: 6
Родитель
Сommit
aab2cc54ec
100 измененных файлов с 206 добавлено и 268 удалено
  1. BIN
      WebChart/img/kuang.png
  2. 38 127
      WebChart/index.html
  3. 94 122
      WebChart/js/index.js
  4. 19 7
      WebChart/js/pieChat.js
  5. BIN
      WebChat.zip
  6. 22 9
      WebUI/CallCenterWeb.UI/SystemManager/js/yongHuManger.js
  7. 32 2
      WebUI/CallCenterWeb.UI/SystemManager/yongHuManger.html
  8. BIN
      WebUI/CallCenterWeb.UI/img/logintext.png
  9. 1 1
      WebUI/CallCenterWeb.UI/login.html
  10. 0 0
      商丘WebAPP/Add.html
  11. 0 0
      商丘WebAPP/App-Per.html
  12. 0 0
      商丘WebAPP/Common/Phone-list.html
  13. 0 0
      商丘WebAPP/Common/Setting-Bm.html
  14. 0 0
      商丘WebAPP/Common/Setting-FabKui.html
  15. 0 0
      商丘WebAPP/Common/Setting-wenti.html
  16. 0 0
      商丘WebAPP/Common/User-Setting-wenti.html
  17. 0 0
      商丘WebAPP/Common/Work-bianji.html
  18. 0 0
      商丘WebAPP/Common/Work-jiaoban.html
  19. 0 0
      商丘WebAPP/Common/Work-yijian.html
  20. 0 0
      商丘WebAPP/Dispatch/Work-banli.html
  21. 0 0
      商丘WebAPP/Dispatch/Work-banli__.html
  22. 0 0
      商丘WebAPP/Dispatch/Work-list.html
  23. 0 0
      商丘WebAPP/Dispatch/Work-ljbanli.html
  24. 0 0
      商丘WebAPP/Dispatch/Work-shenhe.html
  25. 0 0
      商丘WebAPP/Dispatch/Work-yijian.html
  26. 0 0
      商丘WebAPP/Dispatch/WorkDetails.html
  27. 0 0
      商丘WebAPP/Dispatch/iconfont.css
  28. 0 0
      商丘WebAPP/Leader-index.html
  29. 0 0
      商丘WebAPP/MenuFirst/Dispatch-index.html
  30. 0 0
      商丘WebAPP/MenuFirst/WTlist.html
  31. 0 0
      商丘WebAPP/MenuFirst/Work-DB.html
  32. 0 0
      商丘WebAPP/MenuFirst/Work-HT.html
  33. 0 0
      商丘WebAPP/MenuFirst/Work-JC.html
  34. 0 0
      商丘WebAPP/MenuFirst/Work-JieAn.html
  35. 0 0
      商丘WebAPP/MenuFirst/Work-LD.html
  36. 0 0
      商丘WebAPP/MenuFirst/Work-QZja.html
  37. 0 0
      商丘WebAPP/MenuFirst/Work-SZ.html
  38. 0 0
      商丘WebAPP/MenuFirst/Work-THsh.html
  39. 0 0
      商丘WebAPP/MenuFirst/Work-THsq.html
  40. 0 0
      商丘WebAPP/MenuFirst/Work-YSsh.html
  41. 0 0
      商丘WebAPP/MenuFirst/Work-YjbJieAn.html
  42. 0 0
      商丘WebAPP/MenuFirst/Work-YjbQZja.html
  43. 0 0
      商丘WebAPP/MenuFirst/Work-banli.html
  44. 0 0
      商丘WebAPP/MenuFirst/Work-bianji.html
  45. 0 0
      商丘WebAPP/MenuFirst/Work-jiaoban.html
  46. 0 0
      商丘WebAPP/MenuFirst/Work-jlist.html
  47. 0 0
      商丘WebAPP/MenuFirst/Work-list.html
  48. 0 0
      商丘WebAPP/MenuFirst/Work-paidan.html
  49. 0 0
      商丘WebAPP/MenuFirst/Work-yijian.html
  50. 0 0
      商丘WebAPP/MenuFirst/WorkDetails.html
  51. 0 0
      商丘WebAPP/MenuFirst/WorkYjbDetails.html
  52. 0 0
      商丘WebAPP/MenuFirst/work-Yjbcb.html
  53. 0 0
      商丘WebAPP/MenuFirst/work-cb.html
  54. 0 0
      商丘WebAPP/MenuSecond/Dispatch-index.html
  55. 0 0
      商丘WebAPP/MenuSecond/Work-THsq.html
  56. 0 0
      商丘WebAPP/MenuSecond/Work-YSsq.html
  57. 0 0
      商丘WebAPP/MenuSecond/Work-banli.html
  58. 0 0
      商丘WebAPP/MenuSecond/Work-jlist.html
  59. 0 0
      商丘WebAPP/MenuSecond/Work-list.html
  60. 0 0
      商丘WebAPP/MenuSecond/Work-ljbanli.html
  61. 0 0
      商丘WebAPP/MenuSecond/Work-paidan.html
  62. 0 0
      商丘WebAPP/MenuSecond/Work-shenhe.html
  63. 0 0
      商丘WebAPP/MenuSecond/Work-shenhebf.html
  64. 0 0
      商丘WebAPP/MenuSecond/Work-yijian.html
  65. 0 0
      商丘WebAPP/MenuSecond/Work-yjblist.html
  66. 0 0
      商丘WebAPP/MenuSecond/WorkDetails.html
  67. 0 0
      商丘WebAPP/MenuSecond/work-cb.html
  68. 0 0
      商丘WebAPP/MenuThird/Work-banli.html
  69. 0 0
      商丘WebAPP/MenuThird/Work-banli__.html
  70. 0 0
      商丘WebAPP/MenuThird/Work-list.html
  71. 0 0
      商丘WebAPP/MenuThird/Work-ljbanli.html
  72. 0 0
      商丘WebAPP/MenuThird/Work-shenhe.html
  73. 0 0
      商丘WebAPP/MenuThird/Work-yijian.html
  74. 0 0
      商丘WebAPP/MenuThird/WorkDetails.html
  75. 0 0
      商丘WebAPP/MenuThird/iconfont.css
  76. 0 0
      商丘WebAPP/ReportForms/Census.html
  77. 0 0
      商丘WebAPP/ReportForms/Dispatch-index.html
  78. 0 0
      商丘WebAPP/ReportForms/Source-Census.html
  79. 0 0
      商丘WebAPP/ReportForms/Transa-Census.html
  80. 0 0
      商丘WebAPP/ReportForms/Type-Census.html
  81. 0 0
      商丘WebAPP/ReportForms/Unit-Census.html
  82. 0 0
      商丘WebAPP/ReportForms/UnitNsign-Census.html
  83. 0 0
      商丘WebAPP/ReportForms/UnitSign-Census.html
  84. 0 0
      商丘WebAPP/ReportForms/Usercode-Census.html
  85. 0 0
      商丘WebAPP/Setting-1.html
  86. 0 0
      商丘WebAPP/Undertake/Despacho-list.html
  87. 0 0
      商丘WebAPP/Undertake/Dispatch-index.html
  88. 0 0
      商丘WebAPP/Undertake/Management.html
  89. 0 0
      商丘WebAPP/Undertake/Managment-detail.html
  90. 0 0
      商丘WebAPP/Undertake/Notification-list.html
  91. 0 0
      商丘WebAPP/Undertake/TimeOut-list.html
  92. 0 0
      商丘WebAPP/Undertake/Work-DB.html
  93. 0 0
      商丘WebAPP/Undertake/Work-HT.html
  94. 0 0
      商丘WebAPP/Undertake/Work-JC.html
  95. 0 0
      商丘WebAPP/Undertake/Work-JieAn.html
  96. 0 0
      商丘WebAPP/Undertake/Work-LD.html
  97. 0 0
      商丘WebAPP/Undertake/Work-QZja.html
  98. 0 0
      商丘WebAPP/Undertake/Work-SZ.html
  99. 0 0
      商丘WebAPP/Undertake/Work-Seach.html
  100. 0 0
      WebAPP/MenuFirst/Work-THsh.html

BIN
WebChart/img/kuang.png


+ 38 - 127
WebChart/index.html

@@ -64,6 +64,16 @@
64 64
 			#time1{
65 65
 				width: 220px;
66 66
 			}
67
+			.secondPos{
68
+				position: absolute;
69
+				right: 130px;
70
+				top: 20px;
71
+			}
72
+			.fivePos{
73
+				position: absolute;
74
+				right: 140px;
75
+				top: -15px;
76
+			}
67 77
 		</style>
68 78
 	</head>
69 79
 
@@ -267,12 +277,19 @@
267 277
 					</div>
268 278
 
269 279
 					<!--第二屏  工单渠道来源-->
270
-					<div class="swiper-slide" style="position: relative;">
271
-						<div class="orderSource slideCon_bg clearfix">
280
+					<div class="swiper-slide">
281
+						<div class="orderSource slideCon_bg clearfix" style="position: relative;">
282
+							<div class="secondPos">
283
+								<div class="time_box pull-right form-inline">
284
+									地区选择:
285
+									<select class="areaTwo selects" style="height: 30px;"></select>
286
+									日期
287
+									<input type="text" id="time2" class="times" />
288
+								</div>
289
+							</div>
272 290
 							<div class="secondPie" style="padding-top: 0;">
273 291
 								<div id="phoneTimeCount" style="width: 600px; height: 600px;"></div>
274 292
 							</div>
275
-							
276 293
 							<p class="slide_title slide_title2"></p>
277 294
 							<div class="source_left slide_left">
278 295
 								<ul>
@@ -293,15 +310,9 @@
293 310
 							</div>
294 311
 							<div class="source_middle slide_middle">
295 312
 								<div class="map_bg">
296
-
297 313
 								</div>
298 314
 							</div>
299 315
 							<div class="source_right slide_right">
300
-								<div class="timeWrap twotimeWarp">
301
-									<div class="time_box pull-right form-inline">
302
-										日期<input type="text" id="time2" class="times" />
303
-									</div>
304
-								</div>
305 316
 								<ul>
306 317
 									<li class="clearfix">
307 318
 										<div class="line_wrap one_line line oneRight_line"></div>
@@ -328,8 +339,13 @@
328 339
 					<div class="swiper-slide">
329 340
 						<div class="slideCon_bg orderType clearfix">
330 341
 							<p class="slide_title slide_title3"></p>
331
-							<div class="timeWrap twotimeWarp" style="float: right; margin-right: 200px;">
342
+							<div class="timeWrap twotimeWarp" style="float: right; margin-right: 140px; margin-top: 20px;">
343
+								<div class="time_box pull-right form-inline time_box_four">
344
+									
345
+								</div>
332 346
 								<div class="time_box pull-right form-inline time_box_three">
347
+									地区选择:
348
+									<select class="areaThree selects" style="height: 30px;"></select>
333 349
 									日期<input type="text" id="time3" class="times" />
334 350
 								</div>
335 351
 							</div>
@@ -431,118 +447,20 @@
431 447
 						</div>
432 448
 					</div>
433 449
 
434
-					<!--第四屏  工单状态-->
435
-					<!--<div class="swiper-slide">
436
-
437
-						<div class="slideCon_bg orderState clearfix">
438
-							<p class="slide_title slide_title4"></p>
439
-
440
-							<div class="orderCon_left slide_left">
441
-								<ul class="orderState_ul">
442
-									<li>
443
-										<img src="img/state_XZGD.png" alt="" />
444
-										<div class="num_word">
445
-											<p>新增工单</p>
446
-											<div id="state_xzgd"></div>
447
-										</div>
448
-									</li>
449
-
450
-									<li>
451
-										<img src="img/state_DJB.png" alt="" />
452
-										<div class="num_word">
453
-											<p>待交办</p>
454
-											<div id="state_djb"></div>
455
-										</div>
456
-									</li>
457
-									<li>
458
-										<img src="img/state_DCS.png" alt="" />
459
-										<div class="num_word">
460
-											<p>待查收</p>
461
-											<div id="state_dcs"></div>
462
-										</div>
463
-									</li>
464
-									<li>
465
-										<img src="img/state_THSH.png" alt="" />
466
-										<div class="num_word">
467
-											<p>退回审核</p>
468
-											<div id="state_thsh"></div>
469
-										</div>
470
-									</li>
471
-									<li>
472
-										<img src="img/state_BLZ.png" alt="" />
473
-										<div class="num_word">
474
-											<p>办理中</p>
475
-											<div id="state_blz"></div>
476
-										</div>
477
-									</li>
478
-
479
-								</ul>
480
-							</div>
481
-
482
-							<div class="orderCon_middle slide_middle">
483
-
484
-								<div class="earth_box">
485
-									<div class="earth_quan1"></div>
486
-									<div class="earth_quan2"></div>
487
-									<div class="earth_quan3"></div>
488
-									<div class="earth"></div>
489
-								</div>
490
-							</div>
491
-
492
-							<div class="orderCon_right slide_right">
493
-								<div class="timeWrap" style="left: 5px;">
494
-									<div class="time_box pull-right form-inline">
495
-										日期<input type="text" id="time4" class="times" />
496
-									</div>
497
-								</div>
498
-								<ul class="orderState_ul">
499
-									<li class="active">
500
-										<img src="img/state_YS.png" alt="" />
501
-										<div class="num_word">
502
-											<p>延时审核</p>
503
-											<div id="state_yssh"></div>
504
-										</div>
505
-									</li>
506
-									<li>
507
-										<img src="img/state_YBL.png" alt="" />
508
-										<div class="num_word">
509
-											<p>已办理</p>
510
-											<div id="state_ybl"></div>
511
-										</div>
512
-									</li>
513
-									<li>
514
-										<img src="img/state_YHF.png" alt="" />
515
-										<div class="num_word">
516
-											<p>已回访</p>
517
-											<div id="state_yhf"></div>
518
-										</div>
519
-									</li>
520
-									<li>
521
-										<img src="img/state_CBZ.png" alt="" />
522
-										<div class="num_word">
523
-											<p>重办中</p>
524
-											<div id="state_cbz"></div>
525
-										</div>
526
-									</li>
527
-									<li>
528
-										<img src="img/state_YJA.png" alt="" />
529
-										<div class="num_word">
530
-											<p>已结案</p>
531
-											<div id="state_yja"></div>
532
-										</div>
533
-									</li>
534
-								</ul>
535
-
536
-							</div>
537
-						</div>
538
-
539
-					</div>-->
540
-
541 450
 					<!--第五屏  话务量统计-->
542 451
 					<div class="swiper-slide">
543
-
544
-						<div class="slideCon_bg trafficVolume clearfix">
452
+						<div class="slideCon_bg trafficVolume clearfix" style="position: relative;">
545 453
 							<p class="slide_title slide_title5"></p>
454
+							<div class="fivePos" style="width: 100% !important;">
455
+								<div class="time_box pull-right form-inline">
456
+									地区选择:
457
+									<select class="areaFive selects" style="height: 30px; margin-right: 20px;"></select>
458
+									部门
459
+									<select class="depart selects"></select>
460
+									日期
461
+									<input type="text" id="test6" class="times lasttime" style="margin-right: 0px;" /> 
462
+								</div>
463
+							</div>
546 464
 							<div class="orderCon_left slide_left">
547 465
 								<div class="keyW_t">
548 466
 									投诉关键字
@@ -553,14 +471,7 @@
553 471
 								</div>
554 472
 							</div>
555 473
 							<div class="orderCon_right slide_right">
556
-								<div class="timeWrap lasttimeWrap timeWrapPosi">
557
-									<div class="time_box pull-right form-inline">
558
-										日期
559
-										<input type="text" id="test6" class="times lasttime" style="margin-right: 50px;" /> 部门
560
-										<select class="depart selects"></select>
561
-									</div>
562
-								</div>
563
-
474
+								
564 475
 								<div class="keyBottom_left pull-left">
565 476
 									<div class="table_box table_box_key">
566 477
 										<table class="table">

+ 94 - 122
WebChart/js/index.js

@@ -43,7 +43,8 @@ $(function() {
43 43
 					format: 'yyyy-MM-dd',
44 44
 					theme: '#114a97',
45 45
 						done: function(value, date) {
46
-						twoScreen(value && value.split(' ~ ')[0], value && value.split(' ~ ')[1])
46
+						twoScreen(value && value.split(' ~ ')[0], value && value.split(' ~ ')[1],$(".areaTwo").val())
47
+						satisfaction(value && value.split(' ~ ')[0], value && value.split(' ~ ')[1],$(".areaTwo").val())
47 48
 					}
48 49
 				});
49 50
 	laydate.render({
@@ -51,25 +52,16 @@ $(function() {
51 52
 					format: 'yyyy-MM-dd',
52 53
 					theme: '#114a97',
53 54
 					done: function(value) {
54
-						threeScreen(value)
55
+						threeScreen(value,$(".areaThree").val())
55 56
 					}
56
-				});
57
-	laydate.render({
58
-					elem: '#time4',
59
-					range: '~',
60
-					format: 'yyyy-MM-dd',
61
-					theme: '#114a97',
62
-						done: function(value, date) {
63
-						fourScreen(value && value.split(' ~ ')[0], value && value.split(' ~ ')[1])
64
-					}
65
-				});
57
+			});
66 58
 	laydate.render({
67 59
 					elem: '#test6',
68 60
 					range: '~',
69 61
 					format: 'yyyy-MM-dd',
70 62
 					theme: '#114a97',
71 63
 					done: function(value, date) {
72
-						fiveScreen(value && value.split(' ~ ')[0], value && value.split(' ~ ')[1])
64
+						fiveScreen(value && value.split(' ~ ')[0], value && value.split(' ~ ')[1],$(".areaFive").val())
73 65
 					}
74 66
 				});
75 67
 })
@@ -201,7 +193,7 @@ function turn(aa) {
201 193
 	}
202 194
 	$.ajax({
203 195
 		type: "get",
204
-		url: huayi.config.callcenter_url + "info/GetSourceByDate",
196
+		url: huayi.config.callcenter_url + "info/GetSourceByDateNew",
205 197
 		async: true,
206 198
 		dataType: 'json',
207 199
 		data: {
@@ -211,14 +203,11 @@ function turn(aa) {
211 203
 		},
212 204
 		success: function(data) {
213 205
 			if(data.state.toLowerCase() == 'success') {
214
-				// 	   			layer.close(index);
206
+				//layer.close(index);
215 207
 				$('.orderSource ul li .rectangle').remove();
216 208
 				var con = data.data;
217
-
209
+				var Percent;
218 210
 				$(con).each(function(i, n) {
219
-					if(!n.Percent) {
220
-						n.Percent = '0.00%'
221
-					}
222 211
 					if(n.Source.indexOf('信箱') != -1) {
223 212
 						n.Source = '信箱'
224 213
 					}
@@ -233,7 +222,7 @@ function turn(aa) {
233 222
 						'<div class="percent_box">' +
234 223
 						'<div class="percent_out"></div>	' +
235 224
 						' <div class="percent_in"></div>' +
236
-						' <div class="percent_word"><p>' + n.Percent.split('%')[0] + '</p>%<p style="margin-top: 16px;">占总量</p>' +
225
+						' <div class="percent_word"><p>' + n.Rate.split('%')[0] + '</p>%<p style="margin-top: 16px;">占总量</p>' +
237 226
 						'</div>' +
238 227
 						'</div>' +
239 228
 						'</div>' +
@@ -249,7 +238,7 @@ function turn(aa) {
249 238
 }
250 239
 
251 240
 	//第三屏
252
-	function threeScreen(sd) {
241
+	function threeScreen(sd,areaTwoVal) {
253 242
 		$.ajax({
254 243
 			type: "get",
255 244
 			url: huayi.config.callcenter_url + "Info/GetTypeCountNew",
@@ -257,6 +246,7 @@ function turn(aa) {
257 246
 			dataType: 'json',
258 247
 			data: {
259 248
 				date: sd,
249
+				branchcode: areaTwoVal
260 250
 			},
261 251
 			success: function(data) {
262 252
 				if(data.state.toLowerCase() == 'success') {
@@ -304,90 +294,37 @@ function turn(aa) {
304 294
 			}
305 295
 		});
306 296
 	}
307
-
308
-		//第四屏 数字滚动
309
-	function fourScreen(sd,ed) {
310
-		$.ajax({
311
-			type: "get",
312
-			url: huayi.config.callcenter_url + "Info/GetStateCountByMonth",
313
-			async: true,
314
-			dataType: 'json',
315
-			data:{
316
-				start: sd,
317
-				end: ed,
318
-			},
319
-			success: function(data) {
320
-				if(data.state.toLowerCase() == 'success') {
321
-					// 	   			layer.close(index);
322
-					var con = data.data;
323
-					$(con).each(function(i, n) {
324
-						if(n.Name.indexOf('延时审核') != -1) {
325
-							$("#state_yssh").rollNum({
326
-								deVal: n.Count
327
-							});
328
-						}
329
-						if(n.Name.indexOf('已办理') != -1) {
330
-							$("#state_ybl").rollNum({
331
-								deVal: n.Count
332
-							});
333
-						}
334
-						if(n.Name.indexOf('已回访') != -1) {
335
-
336
-							$("#state_yhf").rollNum({
337
-								deVal: n.Count
338
-							});
339
-						}
340
-						if(n.Name.indexOf('重办中') != -1) {
341
-							$("#state_cbz").rollNum({
342
-								deVal: n.Count
343
-							});
344
-						}
345
-						if(n.Name.indexOf('已结案') != -1) {
346
-							$("#state_yja").rollNum({
347
-								deVal: n.Count
348
-							});
349
-						}
350
-						if(n.Name.indexOf('新工单') != -1) {
351
-							$("#state_xzgd").rollNum({
352
-								deVal: n.Count
353
-							});
354
-						}
355
-						if(n.Name.indexOf('待交办') != -1) {
356
-							$("#state_djb").rollNum({
357
-								deVal: n.Count
358
-							});
359
-						}
360
-						if(n.Name.indexOf('待查收') != -1) {
361
-							$("#state_dcs").rollNum({
362
-								deVal: n.Count
363
-							});
364
-						}
365
-						if(n.Name.indexOf('退回审核') != -1) {
366
-							$("#state_thsh").rollNum({
367
-								deVal: n.Count
368
-							});
369
-						}
370
-						if(n.Name.indexOf('办理中') != -1) {
371
-							$("#state_blz").rollNum({
372
-								deVal: n.Count
373
-							});
374
-						}
375
-					});
376
-				}
377
-			}
378
-		});
379
-
380
-	}
381 297
 	//第五屏js
382
-	function fiveScreen(sd,ed) {
383
-        keyWord(sd, ed);
298
+	function fiveScreen(sd,ed,areaTwoVal) {
299
+        keyWord(sd, ed,areaTwoVal);
384 300
 	} 
385 301
 	$(".depart").change(function() {
386
-        keyWordDetail($('#test6').val() && $('#test6').val().split(' ~ ')[0], $('#test6').val() && $('#test6').val().split(' ~ ')[1]);
302
+        keyWordDetail($('#test6').val() && $('#test6').val().split(' ~ ')[0], $('#test6').val() && $('#test6').val().split(' ~ ')[1],$(".areaFive").val());
387 303
 	})
304
+	//	第二屏
305
+	$(".areaTwo").change(function() {
306
+      	var areaTwoVal=$(this).val();
307
+    	twoScreen($('#time2').val() && $('#time2').val().split(' ~ ')[0], $('#time2').val() && $('#time2').val().split(' ~ ')[1],areaTwoVal);
308
+		satisfaction($('#time2').val() && $('#time2').val().split(' ~ ')[0], $('#time2').val() && $('#time2').val().split(' ~ ')[1],areaTwoVal)
309
+	});
310
+	//第三屏
311
+	$(".areaThree").change(function() {
312
+      	var areaTwoVal=$(this).val();
313
+    	threeScreen($('#time3').val(),areaTwoVal);
314
+	});
315
+	//第五屏
316
+	$(".areaFive").change(function() {
317
+      	var areaTwoVal=$(this).val();
318
+    	fiveScreen($('#test6').val() && $('#test6').val().split(' ~ ')[0], $('#test6').val() && $('#test6').val().split(' ~ ')[1],areaTwoVal);
319
+		deprtment ()
320
+	});
388 321
 	//部门下拉框
389 322
 	function deprtment () {
390
-		$.getJSON( huayi.config.callcenter_url +"info/GetDeptList", function(result) {
323
+		$.getJSON( huayi.config.callcenter_url +"info/GetDeptList", 
324
+			{
325
+                branchcode: $(".areaFive").val()
326
+			},
327
+			function(result) {
391 328
 			if(result.state.toLowerCase() == "success") {
392 329
 				goodslist = result.data;
393 330
 				$(".depart").empty();
@@ -400,9 +337,38 @@ function turn(aa) {
400 337
 			}
401 338
 		});
402 339
 	}
403
-	
340
+	//区县筛选
341
+	areaSelect ();
342
+	function areaSelect () {
343
+		$.getJSON( huayi.config.callcenter_url +"CountyBranch/GetBranchListS", function(result) {
344
+			if(result.state.toLowerCase() == "success") {
345
+				goodslist = result.data;
346
+//				第五屏
347
+				$(".areaFive").empty();
348
+				$(goodslist).each(function(i, n) {
349
+					$('<option value="' + n.F_Code 
350
+					+ '">' + n.F_Name 
351
+					+ '</option>').appendTo($(".areaFive"));
352
+				});
353
+				//第3屏
354
+				$(".areaThree").empty();
355
+				$(goodslist).each(function(i, n) {
356
+					$('<option value="' + n.F_Code 
357
+					+ '">' + n.F_Name 
358
+					+ '</option>').appendTo($(".areaThree"));
359
+				});
360
+				//第2屏
361
+				$(".areaTwo").empty();
362
+				$(goodslist).each(function(i, n) {
363
+					$('<option value="' + n.F_Code 
364
+					+ '">' + n.F_Name 
365
+					+ '</option>').appendTo($(".areaTwo"));
366
+				});
367
+			}
368
+		});
369
+	}
404 370
 //	左侧关键词
405
-function keyWord(sd, ed) {
371
+function keyWord(sd, ed,areaTwoVal) {
406 372
 		$.ajax({
407 373
 			type: "get",
408 374
 			url: huayi.config.callcenter_url + "info/GetKeyCountRankByDate",
@@ -410,32 +376,38 @@ function keyWord(sd, ed) {
410 376
 			dataType: 'json',
411 377
             data: {
412 378
                 start: sd,
413
-                end: ed
379
+                end: ed,
380
+                branchcode: areaTwoVal
414 381
 			},
415 382
 			success: function(data) {
416 383
 				if(data.state.toLowerCase() == 'success') {
417 384
 					var con = data.data;
418
-					$(".keyW_t").text(con[0].TypeName)
419
-					$('.tagcloud').html('');
420
-					$(con).each(function(k, j) {
421
-						if(k < 12) {
422
-							var strs = '<div index="'+j.Id+'" class="tagcloud_bj">' +
423
-								'<p class="tag_title">' + j.TypeName + '</p>' +
424
-								'<p class="imgs">' + j.Count + '</p>' +
425
-								'</div>'
426
-							$('.tagcloud').append(strs);
427
-						}
428
-					})
429
-					$(".tagcloud div:first-child").removeClass("tagcloud_bj");
430
-                    $(".tagcloud div:first-child").addClass("tagcloud_bjShine");
431
-                    keyWordDetail(sd, ed);
385
+					if (con.length>0) {
386
+						$(".keyW_t").text(con[0].TypeName)
387
+						$('.tagcloud').html('');
388
+						$(con).each(function(k, j) {
389
+							if(k < 12) {
390
+								var strs = '<div index="'+j.Id+'" class="tagcloud_bj">' +
391
+									'<p class="tag_title">' + j.TypeName + '</p>' +
392
+									'<p class="imgs">' + j.Count + '</p>' +
393
+									'</div>'
394
+								$('.tagcloud').append(strs);
395
+							}
396
+						})
397
+						$(".tagcloud div:first-child").removeClass("tagcloud_bj");
398
+	                    $(".tagcloud div:first-child").addClass("tagcloud_bjShine");
399
+	                    keyWordDetail(sd, ed,areaTwoVal);
400
+					}else{
401
+						$('.tagcloud').html('');
402
+					}
403
+					
432 404
 				}
433 405
 			}
434 406
 		});
435 407
 	}
436 408
 	
437 409
 //	右侧部门
438
-function keyWordDetail(sd, ed) {
410
+function keyWordDetail(sd, ed,areaTwoVal) {
439 411
 		$.ajax({
440 412
 			type: "get",
441 413
 			url: huayi.config.callcenter_url + "info/GetDeptKeyCountByDateNew",
@@ -444,6 +416,7 @@ function keyWordDetail(sd, ed) {
444 416
 			data: {
445 417
                 start: sd,
446 418
                 end: ed,
419
+                branchcode: areaTwoVal,
447 420
                 deptid: $('.depart').val(),
448 421
                 keyid: $(".tagcloud_bjShine").eq(0).attr("index")
449 422
 			},
@@ -471,13 +444,12 @@ function keyWordDetail(sd, ed) {
471 444
 		$(".tagcloud div").removeClass("tagcloud_bjShine");
472 445
 		$(this).removeClass("tagcloud_bj");
473 446
 		$(this).addClass("tagcloud_bjShine");
474
-
475
-        keyWordDetail($('#test6').val() && $('#test6').val().split(' ~ ')[0], $('#test6').val() && $('#test6').val().split(' ~ ')[1]);
447
+        keyWordDetail($('#test6').val() && $('#test6').val().split(' ~ ')[0], $('#test6').val() && $('#test6').val().split(' ~ ')[1],$(".areaFive").val());
476 448
 	});
477 449
 	function Ajax() {
478 450
 		oneScreen($('#time1').val() && $('#time1').val().split(' ~ ')[0], $('#time1').val() && $('#time1').val().split(' ~ ')[1])
479 451
 		twoScreen($('#time2').val() && $('#time2').val().split(' ~ ')[0], $('#time2').val() && $('#time2').val().split(' ~ ')[1])
480
-		threeScreen();
481
-		fourScreen($('#time4').val() && $('#time4').val().split(' ~ ')[0], $('#time4').val() && $('#time4').val().split(' ~ ')[1])
482
-        fiveScreen($('#test6').val() && $('#test6').val().split(' ~ ')[0], $('#test6').val() && $('#test6').val().split(' ~ ')[1])
452
+		satisfaction($('#time2').val() && $('#time2').val().split(' ~ ')[0], $('#time2').val() && $('#time2').val().split(' ~ ')[1])
453
+		threeScreen($('#time3').val(),$(".areaThree").val());
454
+        fiveScreen($('#test6').val() && $('#test6').val().split(' ~ ')[0], $('#test6').val() && $('#test6').val().split(' ~ ')[1],$(".areaFive").val())
483 455
 }

+ 19 - 7
WebChart/js/pieChat.js

@@ -1,12 +1,18 @@
1
-satisfaction()
2 1
 
3
-function satisfaction() {
2
+function satisfaction(start, end, areaTwoVal) {
3
+	if(!areaTwoVal) {
4
+		areaTwoVal = "sqs12345"
5
+	}
4 6
 	$.ajax({
5 7
 		type: "get",
6 8
 		url: huayi.config.callcenter_url + '/info/GetSourceByDateNew',
7 9
 		async: true,
8 10
 		dataType: 'json',
9
-		data: {},
11
+		data: {
12
+			start: start,
13
+			end: end,
14
+			branchcode: areaTwoVal
15
+		},
10 16
 		success: function(data) {
11 17
 			if(data.state == "success") {
12 18
 				var sorceData=data.data
@@ -20,7 +26,7 @@ function satisfaction() {
20 26
 						x: 'top',
21 27
 						left: 10,
22 28
 						top: 0,
23
-						data: ['即时办结', '网络转办', '转办办结']
29
+						//data: ['12345邮箱', '电话', '市县转单', '手机APP', '网站', '微博', '微信', '政府服务网']
24 30
 					},
25 31
 					series: [{
26 32
 						type: 'pie',
@@ -29,8 +35,11 @@ function satisfaction() {
29 35
 						center: ['50%', '50%'],
30 36
 						label: {
31 37
 							normal: {
32
-								formatter: "{b} : {c} ",
33
-
38
+								show: false,
39
+//								formatter: "{b} : {c} ",
40
+//								textStyle: {
41
+//						            color:''  // 改变标示文字的颜色
42
+//						        }
34 43
 							}
35 44
 						},
36 45
 						itemStyle: {
@@ -53,7 +62,10 @@ function satisfaction() {
53 62
 			           },
54 63
 						labelLine: {
55 64
 							normal: {
56
-								show: false
65
+								show: false,
66
+//								lineStyle: {
67
+//						            color: ""  // 改变标示线的颜色
68
+//								}
57 69
 							}
58 70
 						},
59 71
 


+ 22 - 9
WebUI/CallCenterWeb.UI/SystemManager/js/yongHuManger.js

@@ -12,7 +12,8 @@ $(document).ready(function () {
12 12
     bindrole();
13 13
     //搜索按钮
14 14
     $('.searchGo').click(function () {
15
-        initTable();
15
+    	deid = $("#testInput1").val();
16
+        initTable(deid);
16 17
     })
17 18
 
18 19
     //===============添加功能开始=============================
@@ -75,6 +76,23 @@ $(document).ready(function () {
75 76
             addCun();
76 77
         }
77 78
     })
79
+    bumen();
80
+//  用户部门
81
+    function bumen() {
82
+		$("#testInput1").empty();
83
+		$.getJSON(huayi.config.callcenter_url + "Department/GetDeptList", {
84
+			iscbdw:-1,
85
+			"token": $.cookie("token"),
86
+		}, function(data) {
87
+			if(data.state.toLowerCase() == "success") {
88
+				var content = data.data;
89
+				$(content).each(function(i, n) {
90
+					$("<option value='" + n.F_DeptId + "'>" + n.F_DeptName + "</option>").appendTo("#testInput1");
91
+				})
92
+				$('#testInput1').comboSelect();
93
+			}
94
+		})
95
+	}
78 96
     //所属角色列表
79 97
 
80 98
     $('.xlAdd_one ul').on('click', 'li', function () {
@@ -328,6 +346,7 @@ function zTreeOnClick(event, treeId, treeNode) {
328 346
 //      keyWord = $('.searCon').val();
329 347
         initTable(deid);
330 348
     }
349
+    
331 350
 };
332 351
 
333 352
 //获取所属部门
@@ -486,15 +505,9 @@ function bu(state) {
486 505
         }
487 506
     });
488 507
 }
489
-
490 508
 //右边表格
491
-function initTable(deid) {
492
-    if (tree) {
493
-        var nodes = tree.getSelectedNodes();
494
-        if (nodes.length > 0) {
495
-            deid = nodes[0].F_DeptId;
496
-        }
497
-    }
509
+function initTable() {
510
+    
498 511
     //先销毁表格
499 512
     table.bootstrapTable('destroy');
500 513
     //初始化表格,动态从服务器加载数据

+ 32 - 2
WebUI/CallCenterWeb.UI/SystemManager/yongHuManger.html

@@ -7,8 +7,25 @@
7 7
     <script src="../Script/Common/huayi.config.js"></script>
8 8
     <link rel="stylesheet" href="../js/zTree/zTreeStyle.css" />
9 9
     <link rel="stylesheet" href="../css/init.css" />
10
+    <link rel="stylesheet" href="../js/comboSelect/combo.select.css" />
10 11
     <link rel="stylesheet" href="./css/yongHuManger.css" />
11 12
     <title>系统管理-->用户管理</title>
13
+    <style>
14
+    	.toolRight input{
15
+    		width: 100%;
16
+    	}
17
+    	.toolRight select{
18
+    		float: left;
19
+    	}
20
+    	.toolRight{
21
+    		position: relative;
22
+    		line-height: 30px;
23
+    	}
24
+    	.toolRight .tooldiv1{
25
+    		position: absolute;
26
+    		margin-right: 10px;
27
+    	}
28
+    </style>
12 29
 </head>
13 30
 <body class="gray-bg">
14 31
     <div class="container-fluid wrapper-content animated fadeInRight">
@@ -28,8 +45,17 @@
28 45
                 <button class="btns del">删除用户</button>
29 46
             </div>
30 47
             <div class="toolRight">
31
-                <span>搜索内容:<input type="text" class="searCon" placeholder="输入用户编号或用户名称" style="width: 200px;"/></span>
32
-                <button class="btns searchGo">搜索</button>
48
+            	<div class="tooldiv1" style="right: 480px; width: 150px;">搜索内容:</div>
49
+                <div class="tooldiv1" style="right: 320px; width: 240px;">
50
+                	<select id="testInput1"></select>
51
+                </div>
52
+                <div class="tooldiv1" style="right: 160px; width: 150px;">
53
+                	<input type="text" class="searCon" placeholder="输入用户编号或用户名称" style="width: 200px;"/>
54
+                </div>
55
+                <div class="tooldiv1" style="right: 0px; width: 80px;">
56
+                	<button class="btns searchGo">搜索</button>
57
+                </div>
58
+                
33 59
             </div>
34 60
         </div>
35 61
         <div class="treeTable clearfix">
@@ -339,6 +365,10 @@
339 365
     <script src="../css/laydate/laydate.js"></script>
340 366
     <script src="../css/layer/layer.js"></script>
341 367
     <script src="../js/zTree/jquery.ztree.core.js"></script>
368
+    <script src="../js/comboSelect/jquery.combo.select.js"></script>
342 369
     <script src="./js/yongHuManger.js"></script>
370
+    <script>
371
+    	
372
+    </script>
343 373
 </body>
344 374
 </html>

BIN
WebUI/CallCenterWeb.UI/img/logintext.png


+ 1 - 1
WebUI/CallCenterWeb.UI/login.html

@@ -148,7 +148,7 @@
148 148
 			.leftCon{
149 149
 				width: 30%;
150 150
 				position: absolute;
151
-				top: 43%;
151
+				top: 41%;
152 152
 				bottom: 0;
153 153
 				right: 0;
154 154
 				left: 50%;

WebAPP/Add.html → 商丘WebAPP/Add.html


WebAPP/App-Per.html → 商丘WebAPP/App-Per.html


WebAPP/Common/Phone-list.html → 商丘WebAPP/Common/Phone-list.html


WebAPP/Common/Setting-Bm.html → 商丘WebAPP/Common/Setting-Bm.html


WebAPP/Common/Setting-FabKui.html → 商丘WebAPP/Common/Setting-FabKui.html


WebAPP/Common/Setting-wenti.html → 商丘WebAPP/Common/Setting-wenti.html


WebAPP/Common/User-Setting-wenti.html → 商丘WebAPP/Common/User-Setting-wenti.html


WebAPP/search/Work-bianji.html → 商丘WebAPP/Common/Work-bianji.html


WebAPP/Undertake/Work-jiaoban.html → 商丘WebAPP/Common/Work-jiaoban.html


WebAPP/MenuFirst/Work-yijian.html → 商丘WebAPP/Common/Work-yijian.html


WebAPP/Dispatch/Work-banli.html → 商丘WebAPP/Dispatch/Work-banli.html


WebAPP/Dispatch/Work-banli__.html → 商丘WebAPP/Dispatch/Work-banli__.html


WebAPP/Dispatch/Work-list.html → 商丘WebAPP/Dispatch/Work-list.html


WebAPP/Dispatch/Work-ljbanli.html → 商丘WebAPP/Dispatch/Work-ljbanli.html


WebAPP/Dispatch/Work-shenhe.html → 商丘WebAPP/Dispatch/Work-shenhe.html


WebAPP/Dispatch/Work-yijian.html → 商丘WebAPP/Dispatch/Work-yijian.html


WebAPP/Dispatch/WorkDetails.html → 商丘WebAPP/Dispatch/WorkDetails.html


WebAPP/MenuThird/iconfont.css → 商丘WebAPP/Dispatch/iconfont.css


WebAPP/Leader-index.html → 商丘WebAPP/Leader-index.html


WebAPP/MenuFirst/Dispatch-index.html → 商丘WebAPP/MenuFirst/Dispatch-index.html


WebAPP/search/WTlist.html → 商丘WebAPP/MenuFirst/WTlist.html


WebAPP/search/Work-DB.html → 商丘WebAPP/MenuFirst/Work-DB.html


WebAPP/Undertake/Work-HT.html → 商丘WebAPP/MenuFirst/Work-HT.html


WebAPP/search/Work-JC.html → 商丘WebAPP/MenuFirst/Work-JC.html


WebAPP/Undertake/Work-JieAn.html → 商丘WebAPP/MenuFirst/Work-JieAn.html


WebAPP/search/Work-LD.html → 商丘WebAPP/MenuFirst/Work-LD.html


WebAPP/Undertake/Work-QZja.html → 商丘WebAPP/MenuFirst/Work-QZja.html


WebAPP/search/Work-SZ.html → 商丘WebAPP/MenuFirst/Work-SZ.html


WebAPP/Undertake/Work-THsh.html → 商丘WebAPP/MenuFirst/Work-THsh.html


WebAPP/MenuFirst/Work-THsq.html → 商丘WebAPP/MenuFirst/Work-THsq.html


WebAPP/MenuFirst/Work-YSsh.html → 商丘WebAPP/MenuFirst/Work-YSsh.html


WebAPP/search/Work-YjbJieAn.html → 商丘WebAPP/MenuFirst/Work-YjbJieAn.html


WebAPP/search/Work-YjbQZja.html → 商丘WebAPP/MenuFirst/Work-YjbQZja.html


WebAPP/MenuFirst/Work-banli.html → 商丘WebAPP/MenuFirst/Work-banli.html


WebAPP/Undertake/Work-bianji.html → 商丘WebAPP/MenuFirst/Work-bianji.html


WebAPP/MenuFirst/Work-jiaoban.html → 商丘WebAPP/MenuFirst/Work-jiaoban.html


WebAPP/MenuFirst/Work-jlist.html → 商丘WebAPP/MenuFirst/Work-jlist.html


WebAPP/MenuFirst/Work-list.html → 商丘WebAPP/MenuFirst/Work-list.html


WebAPP/MenuFirst/Work-paidan.html → 商丘WebAPP/MenuFirst/Work-paidan.html


WebAPP/Common/Work-yijian.html → 商丘WebAPP/MenuFirst/Work-yijian.html


WebAPP/MenuFirst/WorkDetails.html → 商丘WebAPP/MenuFirst/WorkDetails.html


WebAPP/MenuFirst/WorkYjbDetails.html → 商丘WebAPP/MenuFirst/WorkYjbDetails.html


WebAPP/search/work-Yjbcb.html → 商丘WebAPP/MenuFirst/work-Yjbcb.html


WebAPP/search/work-cb.html → 商丘WebAPP/MenuFirst/work-cb.html


WebAPP/MenuSecond/Dispatch-index.html → 商丘WebAPP/MenuSecond/Dispatch-index.html


WebAPP/Undertake/Work-THsq.html → 商丘WebAPP/MenuSecond/Work-THsq.html


WebAPP/MenuSecond/Work-YSsq.html → 商丘WebAPP/MenuSecond/Work-YSsq.html


WebAPP/MenuSecond/Work-banli.html → 商丘WebAPP/MenuSecond/Work-banli.html


WebAPP/MenuSecond/Work-jlist.html → 商丘WebAPP/MenuSecond/Work-jlist.html


WebAPP/MenuSecond/Work-list.html → 商丘WebAPP/MenuSecond/Work-list.html


WebAPP/MenuSecond/Work-ljbanli.html → 商丘WebAPP/MenuSecond/Work-ljbanli.html


WebAPP/MenuSecond/Work-paidan.html → 商丘WebAPP/MenuSecond/Work-paidan.html


WebAPP/MenuSecond/Work-shenhe.html → 商丘WebAPP/MenuSecond/Work-shenhe.html


WebAPP/MenuSecond/Work-shenhebf.html → 商丘WebAPP/MenuSecond/Work-shenhebf.html


WebAPP/MenuSecond/Work-yijian.html → 商丘WebAPP/MenuSecond/Work-yijian.html


WebAPP/MenuSecond/Work-yjblist.html → 商丘WebAPP/MenuSecond/Work-yjblist.html


WebAPP/MenuSecond/WorkDetails.html → 商丘WebAPP/MenuSecond/WorkDetails.html


WebAPP/MenuSecond/work-cb.html → 商丘WebAPP/MenuSecond/work-cb.html


WebAPP/MenuThird/Work-banli.html → 商丘WebAPP/MenuThird/Work-banli.html


WebAPP/MenuThird/Work-banli__.html → 商丘WebAPP/MenuThird/Work-banli__.html


WebAPP/MenuThird/Work-list.html → 商丘WebAPP/MenuThird/Work-list.html


WebAPP/MenuThird/Work-ljbanli.html → 商丘WebAPP/MenuThird/Work-ljbanli.html


WebAPP/MenuThird/Work-shenhe.html → 商丘WebAPP/MenuThird/Work-shenhe.html


WebAPP/MenuThird/Work-yijian.html → 商丘WebAPP/MenuThird/Work-yijian.html


WebAPP/MenuThird/WorkDetails.html → 商丘WebAPP/MenuThird/WorkDetails.html


WebAPP/Dispatch/iconfont.css → 商丘WebAPP/MenuThird/iconfont.css


WebAPP/ReportForms/Census.html → 商丘WebAPP/ReportForms/Census.html


WebAPP/ReportForms/Dispatch-index.html → 商丘WebAPP/ReportForms/Dispatch-index.html


WebAPP/ReportForms/Source-Census.html → 商丘WebAPP/ReportForms/Source-Census.html


WebAPP/ReportForms/Transa-Census.html → 商丘WebAPP/ReportForms/Transa-Census.html


WebAPP/ReportForms/Type-Census.html → 商丘WebAPP/ReportForms/Type-Census.html


WebAPP/ReportForms/Unit-Census.html → 商丘WebAPP/ReportForms/Unit-Census.html


WebAPP/ReportForms/UnitNsign-Census.html → 商丘WebAPP/ReportForms/UnitNsign-Census.html


WebAPP/ReportForms/UnitSign-Census.html → 商丘WebAPP/ReportForms/UnitSign-Census.html


WebAPP/ReportForms/Usercode-Census.html → 商丘WebAPP/ReportForms/Usercode-Census.html


WebAPP/Setting-1.html → 商丘WebAPP/Setting-1.html


WebAPP/Undertake/Despacho-list.html → 商丘WebAPP/Undertake/Despacho-list.html


WebAPP/Undertake/Dispatch-index.html → 商丘WebAPP/Undertake/Dispatch-index.html


WebAPP/Undertake/Management.html → 商丘WebAPP/Undertake/Management.html


WebAPP/Undertake/Managment-detail.html → 商丘WebAPP/Undertake/Managment-detail.html


WebAPP/Undertake/Notification-list.html → 商丘WebAPP/Undertake/Notification-list.html


WebAPP/Undertake/TimeOut-list.html → 商丘WebAPP/Undertake/TimeOut-list.html


WebAPP/Undertake/Work-DB.html → 商丘WebAPP/Undertake/Work-DB.html


WebAPP/MenuFirst/Work-HT.html → 商丘WebAPP/Undertake/Work-HT.html


WebAPP/Undertake/Work-JC.html → 商丘WebAPP/Undertake/Work-JC.html


WebAPP/MenuFirst/Work-JieAn.html → 商丘WebAPP/Undertake/Work-JieAn.html


WebAPP/Undertake/Work-LD.html → 商丘WebAPP/Undertake/Work-LD.html


WebAPP/MenuFirst/Work-QZja.html → 商丘WebAPP/Undertake/Work-QZja.html


WebAPP/Undertake/Work-SZ.html → 商丘WebAPP/Undertake/Work-SZ.html


WebAPP/Undertake/Work-Seach.html → 商丘WebAPP/Undertake/Work-Seach.html


+ 0 - 0
WebAPP/MenuFirst/Work-THsh.html


Некоторые файлы не были показаны из-за большого количества измененных файлов