fix

WebChartNewest/Script/Common/huayi.config.js

     var huayi = {};
 }
 huayi.config = {
-	// callcenter_url: "http://192.168.8.9:1042/",//生产环境  
+//	callcenter_url: "http://192.168.8.9:1042/",//生产环境  
 	callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/",
     socket_ip: "222.143.106.43",//ip 61.54.2.122:8081   ws://222.143.106.43:8081/
     socket_port: "8081",// 端口

WebChartNewest/js/dispatTopic/dispatTopic.js

 			for(var i = 0; i < secData.length; i++) {
 				maxNum.push(Math.max.apply(null, conNum) + 200);
 			}
-			hotThingsChart('hotThings', nameData, conNum, maxNum, -30,conNumData)
+			newHotThingsChart('hotThings', nameData, conNum, maxNum, -30,conNumData)
 		}
 	});
 
-}
+}
+function newHotThingsChart(dom, data, count, count1, rotate = 0,conNumData) {
+	window.onresize = function() {
+		hotThings.resize()
+	}
+	option = {
+		textStyle: {
+			color: "#c0c3cd",
+			fontSize: 11
+		},
+		grid: {
+			top: '25%',
+			bottom: '30%'
+		},
+		dataZoom:[
+            {
+                type:'inside',//slider表示有滑动块的，inside表示内置的
+                show:true,
+                xAxisIndex:[0],
+                startValue:1,  // 数据窗口范围的起始数值
+       			endValue:10, 
+            }
+        ],
+		xAxis: {
+			nameTextStyle: {
+				color: "#c0c3cd",
+				padding: [0, 0, -10, 0],
+				fontSize: 11
+			},
+			axisLabel: {
+				color: "#c0c3cd",
+				fontSize: 11,
+				rotate: rotate,
+			},
+			axisTick: {
+				lineStyle: {
+					color: "#8398c4",
+					width: 1
+				},
+				show: false
+			},
+			minorTick: {
+				length: 8
+			},
+			splitLine: {
+				show: false
+			},
+			axisLine: {
+				lineStyle: {
+					color: "#8398c4",
+					width: 1,
+					type: "solid"
+				},
+				show: true
+			},
+			data: data,
+			type: "category"
+		},
+		yAxis: {
+			nameTextStyle: {
+				color: "#c0c3cd",
+				padding: [0, 0, 10, -5],
+				fontSize: 11
+			},
+			axisLabel: {
+				color: "#c0c3cd",
+				fontSize: 11
+			},
+			axisTick: {
+				lineStyle: {
+					color: "#8398c4",
+					width: 1
+				},
+				show: true
+			},
+			splitLine: {
+				show: true,
+				lineStyle: {
+					color: "#8398c4",
+					type: "dashed"
+				}
+			},
+			axisLine: {
+				lineStyle: {
+					color: "#8398c4",
+					width: 1,
+					type: "solid"
+				},
+				show: true,
+				// "symbol":['none', 'arrow'],
+				symbol: ['none', 'path://M5, 20 L5, 5 L8, 8 L5, 2 L2, 8 L5, 5 L5.3, 6 L5.3,                  20'],
+				symbolOffset: 5,
+				symbolSize: [35, 38],
+			},
+			name: "条"
+		},
+		series: [{
+				data: count,
+				type: "bar",
+				barMaxWidth: "auto",
+				barWidth: 15,
+//				barGap:'100%',/*多个并排柱子设置柱子之间的间距*/
+//	            barCategoryGap:'100%',/*多个并排柱子设置柱子之间的间距*/
+				itemStyle: {
+					color: {
+						x: 0,
+						y: 0,
+						x2: 0,
+						y2: 1,
+						type: "linear",
+						global: false,
+						colorStops: [{
+							offset: 0,
+							color: "#ff4519"
+						}, {
+							offset: 1,
+							color: "#fff500"
+						}]
+					},
+					barBorderRadius: [30, 30, 0, 0]
+				},
+				label: {
+					show: true,
+					position: "top",
+					distance: 10,
+					color: "#fff"
+				},
+				emphasis: {
+					itemStyle: {
+						color: new echarts.graphic.LinearGradient(
+							0, 0, 0, 1, [{
+									offset: 0,
+									color: '#fde301'
+								},
+								{
+									offset: 1,
+									color: '#0a2f3e'
+								}
+							]
+						)
+					}
+				},
+			},
+			{
+				data: conNumData,
+				type: "line",
+				symbolSize: 0, // symbol的大小设置为0
+			    showSymbol: false, // 不显示symbol
+			    lineStyle: {
+			        width: 0, // 线宽是0
+			        color: 'rgba(0, 0, 0, 0)' // 线的颜色是透明的
+			    }
+			},
+			{
+				data: [1, 1, 1, 1, 1, 1],
+				type: "pictorialBar",
+				barMaxWidth: "20",
+				symbol: "none",
+			},
+			{
+				type: "pictorialBar",
+				barMaxWidth: "20",
+				symbolPosition: "end",
+				symbol: "none",
+				symbolOffset: [0, "-50%"],
+				symbolSize: [30, 12],
+				zlevel: 1
+			},
+			{
+				data: count1,
+				type: "bar",
+				barMaxWidth: "auto",
+				barWidth: 15,
+				barGap: "-100%",
+				itemStyle: {
+					color: '#234caf'
+				},
+				zlevel: -1
+			}, {
+				data: [1, 1, 1, 1, 1, 1],
+				type: "pictorialBar",
+				barMaxWidth: "20",
+				symbol: "none",
+				symbolOffset: [0, "50%"],
+				symbolSize: [30, 15],
+				zlevel: -2
+			}, {
+				data: count1,
+				type: "pictorialBar",
+				barMaxWidth: "20",
+				symbolPosition: "end",
+				symbol: "circle",
+				symbolOffset: [0, "-60%"],
+				symbolSize: [15, 12],
+				itemStyle: {
+					color: '#234caf'
+				},
+				zlevel: -1
+			},
+		]
+	}
+	
+	if (domM === 'themeBarDownEle') {
+		themeBarDownEcharts.setOption(option);
+	} else{
+		domM = ''
+		hotThings.setOption(option);
+	}
+	
+}

WebChartNewest/js/index.js

 	if($('.bulletFrameT').css('display') == 'none') {
 		$('.body').css('opacity', '1')
 	}
+	$('#themeIdHidden').val('')
 })
 //关闭按钮退回工单列表
 $('.backProcedure').click(function() {

WebChartNewest/js/second_index.js

 	}
 	keyidArr = [];
 	keyid = 0
+	$('#themeIdHidden').val('')
 })
 
 

WebChartNewest/js/workOrder.js

 		$('.workList').hide();
 		$('.timeSta_wrap').show();
 		$('.timeSta_wrap').siblings().hide()
+		$('#themeIdHidden').val('')
 	})
 	
 	var param = {
 			};
 		},
 		onLoadSuccess: function(res) { //加载成功时执行
-			$('#themeIdHidden').val('')
+			
 		},
 		onLoadError: function() { //加载失败时执行
 			//layer.msg("加载数据失败", { time: 1500, icon: 2 });

WebUI/CallCenterWeb.UI/Script/Common/huayi.config.js

 }
 //var AYWebUrl = window.document.location.href
 huayi.config = {
-//	callcenter_url: "http://192.168.8.9:1042/",// 生产环境	39.164.159.226
-//	callcenter_url: "http://39.164.159.226:1042/",// 生产环境	39.164.159.226
-		callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/", // 生产环境 
+	callcenter_url: "http://192.168.8.9:1042/",// 生产环境	39.164.159.226
+	//	callcenter_url: "http://39.164.159.226:1042/",// 生产环境	39.164.159.226
+	//	callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/", // 生产环境 
 	socket_ip: "ws://39.164.159.226:8081", //ip 
 	// socket_ip: "wss://12345sp.zwfw.anyang.gov.cn:8082", //ip 
 	//	translation_socket:"ws://125.45.12.102:12233",

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

 				if(ygcon.F_Birthday && ygcon.F_Birthday != "0001-01-01") {
 					$("#chan_ygbirth").val(ygcon.F_Birthday); //生日
 				}
-				$(".change_telphone").val(ygcon.F_Telephone); //电话
-				$(".change_mobile").val(ygcon.F_Mobile); //手机
+//				$(".change_telphone").val(ygcon.F_Telephone); //电话
+//				$(".change_mobile").val(ygcon.F_Mobile); //手机
 				
 				$(".change_telphone").val(decryptFn(ygcon.F_TelephoneShow)); //电话		
                 $(".change_mobile").val(decryptFn(ygcon.F_MobileShow)); //手机	decryptFn(F_MobileShow)	 

WebUI/CallCenterWeb.UI/spManage/editTheme.html

 							<tr class="theme">
 								<th>统计时段：</th>
 								<td>
-									<input type="text" id="time" style="margin-top: 5px;" />
+									<input type="text" id="time" style="margin-top: 5px;"  autocomplete="off" />
 								</td>
 							</tr>
 							<tr>
 									<input type="text" id="name" style="margin-top: 5px;" />
 								</td>
 							</tr>
+							<tr>
+								<th>排序：</th>
+								<td>
+									<input type="text" id="sort" style="margin-top: 5px;" autocomplete="off" />
+								</td>
+							</tr>
 							<tr class="theme">
 								<th>大屏展示：</th>
 								<td>
 //							$("#types").val(content.F_TypesOf);
 							$("#cycle").val(content.F_Cycle);
 							$("#time").val(content.F_StatisticsBeginTime + ' - ' + content.F_StatisticsEndTime );
-							
+							$('#sort').val(content.F_Sort)
 							if (content.F_IsDisplay) {
 								$("#isdisplay").prop("checked",true)
 							} else {
 					}
 
 					console.log($('#time').val(), 'time')
-					
+					console.log($('#sort').val(), 'sort')
 
 
 					var parentid = themeid;
 						statisticsBeginTime: startTime,
 						statisticsEndTime: endTime,
 						name: name,
+						sort:$('#sort').val(),
 						"token": $.cookie("token")
 					}, function(result) {
 						result = $.parseJSON(result);

WebUI/CallCenterWeb.UI/spManage/theme.html

 		<link rel="stylesheet" href="./css/yongHuManger.css" />
 		<!--<link rel="stylesheet" href="../js/layui/css/layui.css">-->
 		<link rel="stylesheet" href="../css/layui/css/layui.css" />
-		
+
 		<title>主题管理</title>
 		<style>
 			.toolRight input {
 			</div>
 			<div class="treeTable clearfix">
 				<div class="tree col-md-3">
-					
+
 					<div class="trTitle"> 月主题</div>
 					<div class="treeCon">
 						<ul id="treeDemo" class="ztree">
 					</div>
 				</div>
 				<div class="tableCon col-md-9">
-					<div class="trTitle">主题分类  <span id="time" style="color: darkgray;font-size: 14px;"></span>
+					<div class="trTitle">主题分类 <span id="time" style="color: darkgray;font-size: 14px;"></span>
 
 					</div>
 					<div class="layui-tab layui-tab-brief">
 							<li>订单管理</li>-->
 						</ul>
 						<div class="layui-tab-content" style="height: 100px;">
-							
+
 							<div class="layui-tab-item layui-show">
 								<div class="toolRight">
 									<button id="addClassBut" hidden="hidden" class="btns addclass" style="margin-bottom: 10px;">添加分类</button>
 									</thead>
 								</table>
 							</div>
-							
+
 							<div class="layui-tab-item">
 
 								<div class="toolRight">
 										<div class="layui-inline">
 											<label class="layui-form-label" style="width: 100px;">主题分类</label>
 											<div class="layui-input-inline" style="width: 200px;">
-																					<select name="" id="orderClass" class="form-control">
-											
-										</select>
+												<select name="" id="orderClass" class="form-control">
+
+												</select>
 											</div>
 										</div>
 										<div class="layui-inline">
 											<label class="layui-form-label" style="width: 100px;">是否典型</label>
 											<div class="layui-input-inline" style="width: 200px;">
-																					<select name="" id="orderRep" class="form-control">
-											<option selected="selected" value="">
-												请选择
-											</option>
-											<option value="0">否</option>
-											<option value="1">是</option>
-											
-										</select>
+												<select name="" id="orderRep" class="form-control">
+													<option selected="selected" value="">
+														请选择
+													</option>
+													<option value="0">否</option>
+													<option value="1">是</option>
+
+												</select>
 											</div>
 										</div>
 										<div class="layui-inline">
 									<button class="layui-btn" onclick="save()">保存</button>
 								</div>
 							</div>
-							
+
 							<div class="layui-tab-item">
-								
+
 								<table id="ThemeIdTable" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
 									<thead>
 										<tr>
 											<th data-field="F_DeptName" data-align="center">单位名称</th>
-											<th data-field="F_Sort"  data-align="center">排序</th>
+											<th data-field="F_Sort" data-align="center">排序</th>
 											<th data-field="F_CreateTime" data-align="center">创建时间</th>
 											<th data-field="F_ID" data-formatter="themeDispose" data-align="center">操作</th>
 										</tr>
 		<script src="../css/laydate/laydate.js"></script>
 		<script src="../css/layer/layer.js"></script>
 		<script src="../js/layui/layui.js"></script>
-		
+
 		<script src="../js/zTree/jquery.ztree.core.js"></script>
 		<script src="../js/comboSelect/jquery.combo.select.js"></script>
 		<script src="../js/WorkOrder/orderListOperation.js"></script>
 		<script src="../js/WorkOrder/WorkOrderList.js"></script>
 
 		<script>
+			var exportParams;
 			var table = $("#table1"); //右边表格
 			var orderTable = $("#workorder"); //右边表格 
 			var ThemeIdTable = $("#ThemeIdTable"); //右边表格
 				});
 
 			})
-			
+
 			function Cr(val, row, index) {
-            return index + 1;
+				return index + 1;
 
-        }
+			}
 
 			function getProp(id) {
 				// 获取占比
 					area: ['50%', '80%'], //宽高
 					end: function() {
 						bindtree();
-//						initTable();
-//						initOrderTable();
+						//						initTable();
+						//						initOrderTable();
 					}
 				});
 			});
 				});
 
 			});
-			
+
 			$('#exportOrder').click(function() {
-//				$.getJSON(
-//					huayi.config.callcenter_url + "SamplePool/GetSampleList", {
-//						token: $.cookie("token"),
-//							workid: $('#orderId').val(),
-//							ComContent: $('#orderContent').val(),
-//							classification: $('#orderClass').val(),
-//							istypical: $('#orderRep').val(),
-//							isdc: 1,
-//
-//							specialid: selectThemeId,
-//					},
-//					function(result) {
-//						
-//					}
-//				);
-				
-				var url =
-                huayi.config.callcenter_url +
-                "SamplePool/GetSampleList?token=" +
-                $.cookie("token") +
-                "&isdc=1";
-            url +=
-                "&workid=" +
-                $('#orderId').val() +
-                "&ComContent=" +
-                $('#orderContent').val() +
-                "&classification=" +
-                $('#orderClass').val() +
-                "&istypical=" +
-                $('#orderRep').val() +
-                "&specialid=" +
-                $('#orderRep').val();
-            window.location.href = url;
+				exportParams.isdc = 1;
+				exportFileFun("SamplePool/GetSampleList", exportParams)
 			})
 
 			$('#searchOrder').click(function() {
 					'<a class="xg" onclick="remove(' + row.F_ID + ')">删除</a>' + '<a class="xg" onclick="getKeys(' + row.F_ID + ')">关键词 </a>' +
 					'</div>';
 			}
+
 			function themeDispose(val, row) {
-				
+
 				return '<div class="imgs" >' +
-					'<a class="xg" onclick="themeSortHandle(\''+row.F_ID+'\',\''+row.F_DeptName+'\')">编辑</a>' +
+					'<a class="xg" onclick="themeSortHandle(\'' + row.F_ID + '\',\'' + row.F_DeptName + '\')">编辑</a>' +
 					'</div>';
 			}
-		
+
 			function PoolDispose(val, row) {
 				var optionStr = '<div class="imgs" ><a class="xg" onclick="delPool(\'' + row.F_WorkOrderId + '\')">移除</a>';
 
 					}
 				});
 			}
-			function themeSortHandle(id,F_DeptName){
+
+			function themeSortHandle(id, F_DeptName) {
 				layer.open({
 					type: 2,
-					content: "./cpns/themeSortEdit.html?id=" + id+"&F_DeptName="+encodeURIComponent(F_DeptName), //iframe的url，no代表不显示滚动条
+					content: "./cpns/themeSortEdit.html?id=" + id + "&F_DeptName=" + encodeURIComponent(F_DeptName), //iframe的url，no代表不显示滚动条
 					title: '修改涉及单位排序',
 					area: ['40%', '50%'], //宽高
 					end: function() {
 					}
 				});
 			}
-			
+
 			function remove(id) {
 				layer.confirm('确定删除该分类吗?', function(index) {
 
 			}
 			//右边表格
 			function selectThemeIdTable(id) {
-				if (!id) id = selectThemeId;
+				if(!id) id = selectThemeId;
 				//先销毁表格
 				ThemeIdTable.bootstrapTable("destroy");
 				//初始化表格,动态从服务器加载数据
 					//每页显示的记录数
 					pageNumber: 1,
 					//当前第几页
-//					pageList: [10, 20, 50, 100],
+					//					pageList: [10, 20, 50, 100],
 					//记录数可选列表
 					search: false,
 					//是否启用查询
 					queryParamsType: "undefined",
 					queryParams: function queryParams(params) {
 						//设置查询参数
-						
+
 						var param = {
 							page: params.pageNumber,
 							pagesize: params.pageSize,
 						};
 						return param;
 					},
-					responseHandler:function(res){
-						return{
-							"total":res.data.length,
-							"rows":res.data
+					responseHandler: function(res) {
+						return {
+							"total": res.data.length,
+							"rows": res.data
 						}
 					},
 					onLoadSuccess: function(data) {
 						//加载成功时执行
-						
+
 						console.log(data, 'datas')
-						
-						
+
 						//layer.msg("加载成功");
 					},
 					onLoadError: function() {
 			}
 			//右边表格
 			function initTable(id) {
-				if (!id) id = selectThemeId;
+				if(!id) id = selectThemeId;
 				//先销毁表格
 				table.bootstrapTable("destroy");
 				//初始化表格,动态从服务器加载数据
 					//每页显示的记录数
 					pageNumber: 1,
 					//当前第几页
-//					pageList: [10, 20, 50, 100],
+					//					pageList: [10, 20, 50, 100],
 					//记录数可选列表
 					search: false,
 					//是否启用查询
 					},
 					onLoadSuccess: function(data) {
 						//加载成功时执行
-						
+
 						console.log(data, 'datas')
-						
-						if (data.rows && data.rows.length > 0) {
+
+						if(data.rows && data.rows.length > 0) {
 							// orderClass
 							var optionStr = '<option selected="selected" value="">请选择</option>';
 							data.rows.forEach(function(o) {
-								optionStr += '<option value="'+o.F_ID+'">'+ o.F_Name +'</option>';
+								optionStr += '<option value="' + o.F_ID + '">' + o.F_Name + '</option>';
 							})
-							
+
 							$('#orderClass').append(optionStr)
 						}
-						
+
 						//layer.msg("加载成功");
 					},
 					onLoadError: function() {
 
 			//右边表格
 			function initOrderTable(id) {
-				if (!id) id = selectThemeId;
+				if(!id) id = selectThemeId;
 				//先销毁表格
 				orderTable.bootstrapTable("destroy");
 				//初始化表格,动态从服务器加载数据
 							specialid: id,
 
 						};
+						exportParams = param
 						return param;
 					},
 					onLoadSuccess: function() {
 				$.getJSON(
 					huayi.config.callcenter_url + "Theme/GetList", {
 						token: $.cookie("token"),
+						page: 1,
+						pagesize: 9999,
 						type: 1,
 						types: 2,
 					},
 									onClick: zTreeOnClick,
 								},
 								view: {
-									nameIsHTML: true, 
+									nameIsHTML: true,
 									fontCss: setFontCss_ztree
 								}
 							}, rows);
 							var node = zTreeObj.getNodeByParam("F_ID", rows[0].F_ID);
 
 							zTreeObj.selectNode(node, '', true);
-//							node.highlight = true;
-							
-							zTreeObj.updateNode(node);
+							//							node.highlight = true;
 
+							zTreeObj.updateNode(node);
 
 							// 默认点击第一个
 							zTreeOnClick(null, null, {
 					}
 				);
 			}
-     function setFontCss_ztree(treeId, treeNode) {
-     	console.log(treeNode, 'treeNode')
-         if (treeNode.F_IsDisplay) {
-             //根节点
-             return { color: "red", "font-weight": "bold" };
-        } else if (treeNode.isParent == false) {
-             //叶子节点
-             return (!!treeNode.highlight) ? { color: "#ff0000", "font-weight": "bold" } : { color: "#000", "font-weight": "normal" };
-         } else {
-             //父节点
-             return (!!treeNode.highlight) ? { color: "#ff0000", "font-weight": "bold" } : { color: "#333", "font-weight": "normal" };
-         }
-     }
+
+			function setFontCss_ztree(treeId, treeNode) {
+				console.log(treeNode, 'treeNode')
+				if(treeNode.F_IsDisplay) {
+					//根节点
+					return {
+						color: "red",
+						"font-weight": "bold"
+					};
+				} else if(treeNode.isParent == false) {
+					//叶子节点
+					return(!!treeNode.highlight) ? {
+						color: "#ff0000",
+						"font-weight": "bold"
+					} : {
+						color: "#000",
+						"font-weight": "normal"
+					};
+				} else {
+					//父节点
+					return(!!treeNode.highlight) ? {
+						color: "#ff0000",
+						"font-weight": "bold"
+					} : {
+						color: "#333",
+						"font-weight": "normal"
+					};
+				}
+			}
+
 			function zTreeOnClick(event, treeId, treeNode) {
 				selectThemeId = treeNode.F_ID
 				selectTreeNode = treeNode

WebUI/CallCenterWeb.UI/spManage/weekTheme.html

 				$.getJSON(
 					huayi.config.callcenter_url + "Theme/GetList", {
 						token: $.cookie("token"),
+						page:1,
+						pagesize:9999,
 						type: 1,
 						types: 1,
 					},