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

WebChart/index.html

 			#time1{
 				width: 220px;
 			}
+			.secondPos{
+				position: absolute;
+				right: 130px;
+				top: 20px;
+			}
+			.fivePos{
+				position: absolute;
+				right: 140px;
+				top: -15px;
+			}
 		</style>
 	</head>
 
 					</div>
 
 					<!--第二屏  工单渠道来源-->
-					<div class="swiper-slide" style="position: relative;">
-						<div class="orderSource slideCon_bg clearfix">
+					<div class="swiper-slide">
+						<div class="orderSource slideCon_bg clearfix" style="position: relative;">
+							<div class="secondPos">
+								<div class="time_box pull-right form-inline">
+									地区选择：
+									<select class="areaTwo selects" style="height: 30px;"></select>
+									日期
+									<input type="text" id="time2" class="times" />
+								</div>
+							</div>
 							<div class="secondPie" style="padding-top: 0;">
 								<div id="phoneTimeCount" style="width: 600px; height: 600px;"></div>
 							</div>
-							
 							<p class="slide_title slide_title2"></p>
 							<div class="source_left slide_left">
 								<ul>
 							</div>
 							<div class="source_middle slide_middle">
 								<div class="map_bg">
-
 								</div>
 							</div>
 							<div class="source_right slide_right">
-								<div class="timeWrap twotimeWarp">
-									<div class="time_box pull-right form-inline">
-										日期<input type="text" id="time2" class="times" />
-									</div>
-								</div>
 								<ul>
 									<li class="clearfix">
 										<div class="line_wrap one_line line oneRight_line"></div>
 					<div class="swiper-slide">
 						<div class="slideCon_bg orderType clearfix">
 							<p class="slide_title slide_title3"></p>
-							<div class="timeWrap twotimeWarp" style="float: right; margin-right: 200px;">
+							<div class="timeWrap twotimeWarp" style="float: right; margin-right: 140px; margin-top: 20px;">
+								<div class="time_box pull-right form-inline time_box_four">
+									
+								</div>
 								<div class="time_box pull-right form-inline time_box_three">
+									地区选择：
+									<select class="areaThree selects" style="height: 30px;"></select>
 									日期<input type="text" id="time3" class="times" />
 								</div>
 							</div>
 						</div>
 					</div>
 
-					<!--第四屏  工单状态-->
-					<!--<div class="swiper-slide">
-
-						<div class="slideCon_bg orderState clearfix">
-							<p class="slide_title slide_title4"></p>
-
-							<div class="orderCon_left slide_left">
-								<ul class="orderState_ul">
-									<li>
-										<img src="img/state_XZGD.png" alt="" />
-										<div class="num_word">
-											<p>新增工单</p>
-											<div id="state_xzgd"></div>
-										</div>
-									</li>
-
-									<li>
-										<img src="img/state_DJB.png" alt="" />
-										<div class="num_word">
-											<p>待交办</p>
-											<div id="state_djb"></div>
-										</div>
-									</li>
-									<li>
-										<img src="img/state_DCS.png" alt="" />
-										<div class="num_word">
-											<p>待查收</p>
-											<div id="state_dcs"></div>
-										</div>
-									</li>
-									<li>
-										<img src="img/state_THSH.png" alt="" />
-										<div class="num_word">
-											<p>退回审核</p>
-											<div id="state_thsh"></div>
-										</div>
-									</li>
-									<li>
-										<img src="img/state_BLZ.png" alt="" />
-										<div class="num_word">
-											<p>办理中</p>
-											<div id="state_blz"></div>
-										</div>
-									</li>
-
-								</ul>
-							</div>
-
-							<div class="orderCon_middle slide_middle">
-
-								<div class="earth_box">
-									<div class="earth_quan1"></div>
-									<div class="earth_quan2"></div>
-									<div class="earth_quan3"></div>
-									<div class="earth"></div>
-								</div>
-							</div>
-
-							<div class="orderCon_right slide_right">
-								<div class="timeWrap" style="left: 5px;">
-									<div class="time_box pull-right form-inline">
-										日期<input type="text" id="time4" class="times" />
-									</div>
-								</div>
-								<ul class="orderState_ul">
-									<li class="active">
-										<img src="img/state_YS.png" alt="" />
-										<div class="num_word">
-											<p>延时审核</p>
-											<div id="state_yssh"></div>
-										</div>
-									</li>
-									<li>
-										<img src="img/state_YBL.png" alt="" />
-										<div class="num_word">
-											<p>已办理</p>
-											<div id="state_ybl"></div>
-										</div>
-									</li>
-									<li>
-										<img src="img/state_YHF.png" alt="" />
-										<div class="num_word">
-											<p>已回访</p>
-											<div id="state_yhf"></div>
-										</div>
-									</li>
-									<li>
-										<img src="img/state_CBZ.png" alt="" />
-										<div class="num_word">
-											<p>重办中</p>
-											<div id="state_cbz"></div>
-										</div>
-									</li>
-									<li>
-										<img src="img/state_YJA.png" alt="" />
-										<div class="num_word">
-											<p>已结案</p>
-											<div id="state_yja"></div>
-										</div>
-									</li>
-								</ul>
-
-							</div>
-						</div>
-
-					</div>-->
-
 					<!--第五屏  话务量统计-->
 					<div class="swiper-slide">
-
-						<div class="slideCon_bg trafficVolume clearfix">
+						<div class="slideCon_bg trafficVolume clearfix" style="position: relative;">
 							<p class="slide_title slide_title5"></p>
+							<div class="fivePos" style="width: 100% !important;">
+								<div class="time_box pull-right form-inline">
+									地区选择：
+									<select class="areaFive selects" style="height: 30px; margin-right: 20px;"></select>
+									部门
+									<select class="depart selects"></select>
+									日期
+									<input type="text" id="test6" class="times lasttime" style="margin-right: 0px;" /> 
+								</div>
+							</div>
 							<div class="orderCon_left slide_left">
 								<div class="keyW_t">
 									投诉关键字
 								</div>
 							</div>
 							<div class="orderCon_right slide_right">
-								<div class="timeWrap lasttimeWrap timeWrapPosi">
-									<div class="time_box pull-right form-inline">
-										日期
-										<input type="text" id="test6" class="times lasttime" style="margin-right: 50px;" /> 部门
-										<select class="depart selects"></select>
-									</div>
-								</div>
-
+								
 								<div class="keyBottom_left pull-left">
 									<div class="table_box table_box_key">
 										<table class="table">

WebChart/js/index.js

 					format: 'yyyy-MM-dd',
 					theme: '#114a97',
 						done: function(value, date) {
-						twoScreen(value && value.split(' ~ ')[0], value && value.split(' ~ ')[1])
+						twoScreen(value && value.split(' ~ ')[0], value && value.split(' ~ ')[1],$(".areaTwo").val())
+						satisfaction(value && value.split(' ~ ')[0], value && value.split(' ~ ')[1],$(".areaTwo").val())
 					}
 				});
 	laydate.render({
 					format: 'yyyy-MM-dd',
 					theme: '#114a97',
 					done: function(value) {
-						threeScreen(value)
+						threeScreen(value,$(".areaThree").val())
 					}
-				});
-	laydate.render({
-					elem: '#time4',
-					range: '~',
-					format: 'yyyy-MM-dd',
-					theme: '#114a97',
-						done: function(value, date) {
-						fourScreen(value && value.split(' ~ ')[0], value && value.split(' ~ ')[1])
-					}
-				});
+			});
 	laydate.render({
 					elem: '#test6',
 					range: '~',
 					format: 'yyyy-MM-dd',
 					theme: '#114a97',
 					done: function(value, date) {
-						fiveScreen(value && value.split(' ~ ')[0], value && value.split(' ~ ')[1])
+						fiveScreen(value && value.split(' ~ ')[0], value && value.split(' ~ ')[1],$(".areaFive").val())
 					}
 				});
 })
 	}
 	$.ajax({
 		type: "get",
-		url: huayi.config.callcenter_url + "info/GetSourceByDate",
+		url: huayi.config.callcenter_url + "info/GetSourceByDateNew",
 		async: true,
 		dataType: 'json',
 		data: {
 		},
 		success: function(data) {
 			if(data.state.toLowerCase() == 'success') {
-				// 	   			layer.close(index);
+				//layer.close(index);
 				$('.orderSource ul li .rectangle').remove();
 				var con = data.data;
-
+				var Percent;
 				$(con).each(function(i, n) {
-					if(!n.Percent) {
-						n.Percent = '0.00%'
-					}
 					if(n.Source.indexOf('信箱') != -1) {
 						n.Source = '信箱'
 					}
 						'<div class="percent_box">' +
 						'<div class="percent_out"></div>	' +
 						' <div class="percent_in"></div>' +
-						' <div class="percent_word"><p>' + n.Percent.split('%')[0] + '</p>%<p style="margin-top: 16px;">占总量</p>' +
+						' <div class="percent_word"><p>' + n.Rate.split('%')[0] + '</p>%<p style="margin-top: 16px;">占总量</p>' +
 						'</div>' +
 						'</div>' +
 						'</div>' +
 }
 
 	//第三屏
-	function threeScreen(sd) {
+	function threeScreen(sd,areaTwoVal) {
 		$.ajax({
 			type: "get",
 			url: huayi.config.callcenter_url + "Info/GetTypeCountNew",
 			dataType: 'json',
 			data: {
 				date: sd,
+				branchcode: areaTwoVal
 			},
 			success: function(data) {
 				if(data.state.toLowerCase() == 'success') {
 			}
 		});
 	}
-
-		//第四屏 数字滚动
-	function fourScreen(sd,ed) {
-		$.ajax({
-			type: "get",
-			url: huayi.config.callcenter_url + "Info/GetStateCountByMonth",
-			async: true,
-			dataType: 'json',
-			data:{
-				start: sd,
-				end: ed,
-			},
-			success: function(data) {
-				if(data.state.toLowerCase() == 'success') {
-					// 	   			layer.close(index);
-					var con = data.data;
-					$(con).each(function(i, n) {
-						if(n.Name.indexOf('延时审核') != -1) {
-							$("#state_yssh").rollNum({
-								deVal: n.Count
-							});
-						}
-						if(n.Name.indexOf('已办理') != -1) {
-							$("#state_ybl").rollNum({
-								deVal: n.Count
-							});
-						}
-						if(n.Name.indexOf('已回访') != -1) {
-
-							$("#state_yhf").rollNum({
-								deVal: n.Count
-							});
-						}
-						if(n.Name.indexOf('重办中') != -1) {
-							$("#state_cbz").rollNum({
-								deVal: n.Count
-							});
-						}
-						if(n.Name.indexOf('已结案') != -1) {
-							$("#state_yja").rollNum({
-								deVal: n.Count
-							});
-						}
-						if(n.Name.indexOf('新工单') != -1) {
-							$("#state_xzgd").rollNum({
-								deVal: n.Count
-							});
-						}
-						if(n.Name.indexOf('待交办') != -1) {
-							$("#state_djb").rollNum({
-								deVal: n.Count
-							});
-						}
-						if(n.Name.indexOf('待查收') != -1) {
-							$("#state_dcs").rollNum({
-								deVal: n.Count
-							});
-						}
-						if(n.Name.indexOf('退回审核') != -1) {
-							$("#state_thsh").rollNum({
-								deVal: n.Count
-							});
-						}
-						if(n.Name.indexOf('办理中') != -1) {
-							$("#state_blz").rollNum({
-								deVal: n.Count
-							});
-						}
-					});
-				}
-			}
-		});
-
-	}
 	//第五屏js
-	function fiveScreen(sd,ed) {
-        keyWord(sd, ed);
+	function fiveScreen(sd,ed,areaTwoVal) {
+        keyWord(sd, ed,areaTwoVal);
 	} 
 	$(".depart").change(function() {
-        keyWordDetail($('#test6').val() && $('#test6').val().split(' ~ ')[0], $('#test6').val() && $('#test6').val().split(' ~ ')[1]);
+        keyWordDetail($('#test6').val() && $('#test6').val().split(' ~ ')[0], $('#test6').val() && $('#test6').val().split(' ~ ')[1],$(".areaFive").val());
 	})
+	//	第二屏
+	$(".areaTwo").change(function() {
+      	var areaTwoVal=$(this).val();
+    	twoScreen($('#time2').val() && $('#time2').val().split(' ~ ')[0], $('#time2').val() && $('#time2').val().split(' ~ ')[1],areaTwoVal);
+		satisfaction($('#time2').val() && $('#time2').val().split(' ~ ')[0], $('#time2').val() && $('#time2').val().split(' ~ ')[1],areaTwoVal)
+	});
+	//第三屏
+	$(".areaThree").change(function() {
+      	var areaTwoVal=$(this).val();
+    	threeScreen($('#time3').val(),areaTwoVal);
+	});
+	//第五屏
+	$(".areaFive").change(function() {
+      	var areaTwoVal=$(this).val();
+    	fiveScreen($('#test6').val() && $('#test6').val().split(' ~ ')[0], $('#test6').val() && $('#test6').val().split(' ~ ')[1],areaTwoVal);
+		deprtment ()
+	});
 	//部门下拉框
 	function deprtment () {
-		$.getJSON( huayi.config.callcenter_url +"info/GetDeptList", function(result) {
+		$.getJSON( huayi.config.callcenter_url +"info/GetDeptList", 
+			{
+                branchcode: $(".areaFive").val()
+			},
+			function(result) {
 			if(result.state.toLowerCase() == "success") {
 				goodslist = result.data;
 				$(".depart").empty();
 			}
 		});
 	}
-	
+	//区县筛选
+	areaSelect ();
+	function areaSelect () {
+		$.getJSON( huayi.config.callcenter_url +"CountyBranch/GetBranchListS", function(result) {
+			if(result.state.toLowerCase() == "success") {
+				goodslist = result.data;
+//				第五屏
+				$(".areaFive").empty();
+				$(goodslist).each(function(i, n) {
+					$('<option value="' + n.F_Code 
+					+ '">' + n.F_Name 
+					+ '</option>').appendTo($(".areaFive"));
+				});
+				//第3屏
+				$(".areaThree").empty();
+				$(goodslist).each(function(i, n) {
+					$('<option value="' + n.F_Code 
+					+ '">' + n.F_Name 
+					+ '</option>').appendTo($(".areaThree"));
+				});
+				//第2屏
+				$(".areaTwo").empty();
+				$(goodslist).each(function(i, n) {
+					$('<option value="' + n.F_Code 
+					+ '">' + n.F_Name 
+					+ '</option>').appendTo($(".areaTwo"));
+				});
+			}
+		});
+	}
 //	左侧关键词
-function keyWord(sd, ed) {
+function keyWord(sd, ed,areaTwoVal) {
 		$.ajax({
 			type: "get",
 			url: huayi.config.callcenter_url + "info/GetKeyCountRankByDate",
 			dataType: 'json',
             data: {
                 start: sd,
-                end: ed
+                end: ed,
+                branchcode: areaTwoVal
 			},
 			success: function(data) {
 				if(data.state.toLowerCase() == 'success') {
 					var con = data.data;
-					$(".keyW_t").text(con[0].TypeName)
-					$('.tagcloud').html('');
-					$(con).each(function(k, j) {
-						if(k < 12) {
-							var strs = '<div index="'+j.Id+'" class="tagcloud_bj">' +
-								'<p class="tag_title">' + j.TypeName + '</p>' +
-								'<p class="imgs">' + j.Count + '</p>' +
-								'</div>'
-							$('.tagcloud').append(strs);
-						}
-					})
-					$(".tagcloud div:first-child").removeClass("tagcloud_bj");
-                    $(".tagcloud div:first-child").addClass("tagcloud_bjShine");
-                    keyWordDetail(sd, ed);
+					if (con.length>0) {
+						$(".keyW_t").text(con[0].TypeName)
+						$('.tagcloud').html('');
+						$(con).each(function(k, j) {
+							if(k < 12) {
+								var strs = '<div index="'+j.Id+'" class="tagcloud_bj">' +
+									'<p class="tag_title">' + j.TypeName + '</p>' +
+									'<p class="imgs">' + j.Count + '</p>' +
+									'</div>'
+								$('.tagcloud').append(strs);
+							}
+						})
+						$(".tagcloud div:first-child").removeClass("tagcloud_bj");
+	                    $(".tagcloud div:first-child").addClass("tagcloud_bjShine");
+	                    keyWordDetail(sd, ed,areaTwoVal);
+					}else{
+						$('.tagcloud').html('');
+					}
+					
 				}
 			}
 		});
 	}
 	
 //	右侧部门
-function keyWordDetail(sd, ed) {
+function keyWordDetail(sd, ed,areaTwoVal) {
 		$.ajax({
 			type: "get",
 			url: huayi.config.callcenter_url + "info/GetDeptKeyCountByDateNew",
 			data: {
                 start: sd,
                 end: ed,
+                branchcode: areaTwoVal,
                 deptid: $('.depart').val(),
                 keyid: $(".tagcloud_bjShine").eq(0).attr("index")
 			},
 		$(".tagcloud div").removeClass("tagcloud_bjShine");
 		$(this).removeClass("tagcloud_bj");
 		$(this).addClass("tagcloud_bjShine");
-
-        keyWordDetail($('#test6').val() && $('#test6').val().split(' ~ ')[0], $('#test6').val() && $('#test6').val().split(' ~ ')[1]);
+        keyWordDetail($('#test6').val() && $('#test6').val().split(' ~ ')[0], $('#test6').val() && $('#test6').val().split(' ~ ')[1],$(".areaFive").val());
 	});
 	function Ajax() {
 		oneScreen($('#time1').val() && $('#time1').val().split(' ~ ')[0], $('#time1').val() && $('#time1').val().split(' ~ ')[1])
 		twoScreen($('#time2').val() && $('#time2').val().split(' ~ ')[0], $('#time2').val() && $('#time2').val().split(' ~ ')[1])
-		threeScreen();
-		fourScreen($('#time4').val() && $('#time4').val().split(' ~ ')[0], $('#time4').val() && $('#time4').val().split(' ~ ')[1])
-        fiveScreen($('#test6').val() && $('#test6').val().split(' ~ ')[0], $('#test6').val() && $('#test6').val().split(' ~ ')[1])
+		satisfaction($('#time2').val() && $('#time2').val().split(' ~ ')[0], $('#time2').val() && $('#time2').val().split(' ~ ')[1])
+		threeScreen($('#time3').val(),$(".areaThree").val());
+        fiveScreen($('#test6').val() && $('#test6').val().split(' ~ ')[0], $('#test6').val() && $('#test6').val().split(' ~ ')[1],$(".areaFive").val())
 }

WebChart/js/pieChat.js

-satisfaction()
 
-function satisfaction() {
+function satisfaction(start, end, areaTwoVal) {
+	if(!areaTwoVal) {
+		areaTwoVal = "sqs12345"
+	}
 	$.ajax({
 		type: "get",
 		url: huayi.config.callcenter_url + '/info/GetSourceByDateNew',
 		async: true,
 		dataType: 'json',
-		data: {},
+		data: {
+			start: start,
+			end: end,
+			branchcode: areaTwoVal
+		},
 		success: function(data) {
 			if(data.state == "success") {
 				var sorceData=data.data
 						x: 'top',
 						left: 10,
 						top: 0,
-						data: ['即时办结', '网络转办', '转办办结']
+						//data: ['12345邮箱', '电话', '市县转单', '手机APP', '网站', '微博', '微信', '政府服务网']
 					},
 					series: [{
 						type: 'pie',
 						center: ['50%', '50%'],
 						label: {
 							normal: {
-								formatter: "{b} : {c} ",
-
+								show: false,
+//								formatter: "{b} : {c} ",
+//								textStyle: {
+//						            color:''  // 改变标示文字的颜色
+//						        }
 							}
 						},
 						itemStyle: {
 			           },
 						labelLine: {
 							normal: {
-								show: false
+								show: false,
+//								lineStyle: {
+//						            color: ""  // 改变标示线的颜色
+//								}
 							}
 						},
 

WebUI/CallCenterWeb.UI/SystemManager/js/yongHuManger.js

     bindrole();
     //搜索按钮
     $('.searchGo').click(function () {
-        initTable();
+    	deid = $("#testInput1").val();
+        initTable(deid);
     })
 
     //===============添加功能开始=============================
             addCun();
         }
     })
+    bumen();
+//  用户部门
+    function bumen() {
+		$("#testInput1").empty();
+		$.getJSON(huayi.config.callcenter_url + "Department/GetDeptList", {
+			iscbdw:-1,
+			"token": $.cookie("token"),
+		}, function(data) {
+			if(data.state.toLowerCase() == "success") {
+				var content = data.data;
+				$(content).each(function(i, n) {
+					$("<option value='" + n.F_DeptId + "'>" + n.F_DeptName + "</option>").appendTo("#testInput1");
+				})
+				$('#testInput1').comboSelect();
+			}
+		})
+	}
     //所属角色列表
 
     $('.xlAdd_one ul').on('click', 'li', function () {
 //      keyWord = $('.searCon').val();
         initTable(deid);
     }
+    
 };
 
 //获取所属部门
         }
     });
 }
-
 //右边表格
-function initTable(deid) {
-    if (tree) {
-        var nodes = tree.getSelectedNodes();
-        if (nodes.length > 0) {
-            deid = nodes[0].F_DeptId;
-        }
-    }
+function initTable() {
+    
     //先销毁表格
     table.bootstrapTable('destroy');
     //初始化表格,动态从服务器加载数据

WebUI/CallCenterWeb.UI/SystemManager/yongHuManger.html

     <script src="../Script/Common/huayi.config.js"></script>
     <link rel="stylesheet" href="../js/zTree/zTreeStyle.css" />
     <link rel="stylesheet" href="../css/init.css" />
+    <link rel="stylesheet" href="../js/comboSelect/combo.select.css" />
     <link rel="stylesheet" href="./css/yongHuManger.css" />
     <title>系统管理-->用户管理</title>
+    <style>
+    	.toolRight input{
+    		width: 100%;
+    	}
+    	.toolRight select{
+    		float: left;
+    	}
+    	.toolRight{
+    		position: relative;
+    		line-height: 30px;
+    	}
+    	.toolRight .tooldiv1{
+    		position: absolute;
+    		margin-right: 10px;
+    	}
+    </style>
 </head>
 <body class="gray-bg">
     <div class="container-fluid wrapper-content animated fadeInRight">
                 <button class="btns del">删除用户</button>
             </div>
             <div class="toolRight">
-                <span>搜索内容：<input type="text" class="searCon" placeholder="输入用户编号或用户名称" style="width: 200px;"/></span>
-                <button class="btns searchGo">搜索</button>
+            	<div class="tooldiv1" style="right: 480px; width: 150px;">搜索内容：</div>
+                <div class="tooldiv1" style="right: 320px; width: 240px;">
+                	<select id="testInput1"></select>
+                </div>
+                <div class="tooldiv1" style="right: 160px; width: 150px;">
+                	<input type="text" class="searCon" placeholder="输入用户编号或用户名称" style="width: 200px;"/>
+                </div>
+                <div class="tooldiv1" style="right: 0px; width: 80px;">
+                	<button class="btns searchGo">搜索</button>
+                </div>
+                
             </div>
         </div>
         <div class="treeTable clearfix">
     <script src="../css/laydate/laydate.js"></script>
     <script src="../css/layer/layer.js"></script>
     <script src="../js/zTree/jquery.ztree.core.js"></script>
+    <script src="../js/comboSelect/jquery.combo.select.js"></script>
     <script src="./js/yongHuManger.js"></script>
+    <script>
+    	
+    </script>
 </body>
 </html>

WebUI/CallCenterWeb.UI/login.html

 			.leftCon{
 				width: 30%;
 				position: absolute;
-				top: 43%;
+				top: 41%;
 				bottom: 0;
 				right: 0;
 				left: 50%;