miaofuhao 1 anno fa
parent
commit
c800482901

+ 1 - 1
WebChartNewest/Script/Common/huayi.config.js

@@ -3,7 +3,7 @@ if (huayi == undefined) {
3 3
     var huayi = {};
4 4
 }
5 5
 huayi.config = {
6
-	// callcenter_url: "http://192.168.8.9:1042/",//生产环境  
6
+//	callcenter_url: "http://192.168.8.9:1042/",//生产环境  
7 7
 	callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/",
8 8
     socket_ip: "222.143.106.43",//ip 61.54.2.122:8081   ws://222.143.106.43:8081/
9 9
     socket_port: "8081",// 端口

+ 211 - 2
WebChartNewest/js/dispatTopic/dispatTopic.js

@@ -106,8 +106,217 @@ function cutHotThings() {
106 106
 			for(var i = 0; i < secData.length; i++) {
107 107
 				maxNum.push(Math.max.apply(null, conNum) + 200);
108 108
 			}
109
-			hotThingsChart('hotThings', nameData, conNum, maxNum, -30,conNumData)
109
+			newHotThingsChart('hotThings', nameData, conNum, maxNum, -30,conNumData)
110 110
 		}
111 111
 	});
112 112
 
113
-}
113
+}
114
+function newHotThingsChart(dom, data, count, count1, rotate = 0,conNumData) {
115
+	window.onresize = function() {
116
+		hotThings.resize()
117
+	}
118
+	option = {
119
+		textStyle: {
120
+			color: "#c0c3cd",
121
+			fontSize: 11
122
+		},
123
+		grid: {
124
+			top: '25%',
125
+			bottom: '30%'
126
+		},
127
+		dataZoom:[
128
+            {
129
+                type:'inside',//slider表示有滑动块的,inside表示内置的
130
+                show:true,
131
+                xAxisIndex:[0],
132
+                startValue:1,  // 数据窗口范围的起始数值
133
+       			endValue:10, 
134
+            }
135
+        ],
136
+		xAxis: {
137
+			nameTextStyle: {
138
+				color: "#c0c3cd",
139
+				padding: [0, 0, -10, 0],
140
+				fontSize: 11
141
+			},
142
+			axisLabel: {
143
+				color: "#c0c3cd",
144
+				fontSize: 11,
145
+				rotate: rotate,
146
+			},
147
+			axisTick: {
148
+				lineStyle: {
149
+					color: "#8398c4",
150
+					width: 1
151
+				},
152
+				show: false
153
+			},
154
+			minorTick: {
155
+				length: 8
156
+			},
157
+			splitLine: {
158
+				show: false
159
+			},
160
+			axisLine: {
161
+				lineStyle: {
162
+					color: "#8398c4",
163
+					width: 1,
164
+					type: "solid"
165
+				},
166
+				show: true
167
+			},
168
+			data: data,
169
+			type: "category"
170
+		},
171
+		yAxis: {
172
+			nameTextStyle: {
173
+				color: "#c0c3cd",
174
+				padding: [0, 0, 10, -5],
175
+				fontSize: 11
176
+			},
177
+			axisLabel: {
178
+				color: "#c0c3cd",
179
+				fontSize: 11
180
+			},
181
+			axisTick: {
182
+				lineStyle: {
183
+					color: "#8398c4",
184
+					width: 1
185
+				},
186
+				show: true
187
+			},
188
+			splitLine: {
189
+				show: true,
190
+				lineStyle: {
191
+					color: "#8398c4",
192
+					type: "dashed"
193
+				}
194
+			},
195
+			axisLine: {
196
+				lineStyle: {
197
+					color: "#8398c4",
198
+					width: 1,
199
+					type: "solid"
200
+				},
201
+				show: true,
202
+				// "symbol":['none', 'arrow'],
203
+				symbol: ['none', 'path://M5, 20 L5, 5 L8, 8 L5, 2 L2, 8 L5, 5 L5.3, 6 L5.3,                  20'],
204
+				symbolOffset: 5,
205
+				symbolSize: [35, 38],
206
+			},
207
+			name: "条"
208
+		},
209
+		series: [{
210
+				data: count,
211
+				type: "bar",
212
+				barMaxWidth: "auto",
213
+				barWidth: 15,
214
+//				barGap:'100%',/*多个并排柱子设置柱子之间的间距*/
215
+//	            barCategoryGap:'100%',/*多个并排柱子设置柱子之间的间距*/
216
+				itemStyle: {
217
+					color: {
218
+						x: 0,
219
+						y: 0,
220
+						x2: 0,
221
+						y2: 1,
222
+						type: "linear",
223
+						global: false,
224
+						colorStops: [{
225
+							offset: 0,
226
+							color: "#ff4519"
227
+						}, {
228
+							offset: 1,
229
+							color: "#fff500"
230
+						}]
231
+					},
232
+					barBorderRadius: [30, 30, 0, 0]
233
+				},
234
+				label: {
235
+					show: true,
236
+					position: "top",
237
+					distance: 10,
238
+					color: "#fff"
239
+				},
240
+				emphasis: {
241
+					itemStyle: {
242
+						color: new echarts.graphic.LinearGradient(
243
+							0, 0, 0, 1, [{
244
+									offset: 0,
245
+									color: '#fde301'
246
+								},
247
+								{
248
+									offset: 1,
249
+									color: '#0a2f3e'
250
+								}
251
+							]
252
+						)
253
+					}
254
+				},
255
+			},
256
+			{
257
+				data: conNumData,
258
+				type: "line",
259
+				symbolSize: 0, // symbol的大小设置为0
260
+			    showSymbol: false, // 不显示symbol
261
+			    lineStyle: {
262
+			        width: 0, // 线宽是0
263
+			        color: 'rgba(0, 0, 0, 0)' // 线的颜色是透明的
264
+			    }
265
+			},
266
+			{
267
+				data: [1, 1, 1, 1, 1, 1],
268
+				type: "pictorialBar",
269
+				barMaxWidth: "20",
270
+				symbol: "none",
271
+			},
272
+			{
273
+				type: "pictorialBar",
274
+				barMaxWidth: "20",
275
+				symbolPosition: "end",
276
+				symbol: "none",
277
+				symbolOffset: [0, "-50%"],
278
+				symbolSize: [30, 12],
279
+				zlevel: 1
280
+			},
281
+			{
282
+				data: count1,
283
+				type: "bar",
284
+				barMaxWidth: "auto",
285
+				barWidth: 15,
286
+				barGap: "-100%",
287
+				itemStyle: {
288
+					color: '#234caf'
289
+				},
290
+				zlevel: -1
291
+			}, {
292
+				data: [1, 1, 1, 1, 1, 1],
293
+				type: "pictorialBar",
294
+				barMaxWidth: "20",
295
+				symbol: "none",
296
+				symbolOffset: [0, "50%"],
297
+				symbolSize: [30, 15],
298
+				zlevel: -2
299
+			}, {
300
+				data: count1,
301
+				type: "pictorialBar",
302
+				barMaxWidth: "20",
303
+				symbolPosition: "end",
304
+				symbol: "circle",
305
+				symbolOffset: [0, "-60%"],
306
+				symbolSize: [15, 12],
307
+				itemStyle: {
308
+					color: '#234caf'
309
+				},
310
+				zlevel: -1
311
+			},
312
+		]
313
+	}
314
+	
315
+	if (domM === 'themeBarDownEle') {
316
+		themeBarDownEcharts.setOption(option);
317
+	} else{
318
+		domM = ''
319
+		hotThings.setOption(option);
320
+	}
321
+	
322
+}

+ 1 - 0
WebChartNewest/js/index.js

@@ -49,6 +49,7 @@ $('.close_icon').click(function() {
49 49
 	if($('.bulletFrameT').css('display') == 'none') {
50 50
 		$('.body').css('opacity', '1')
51 51
 	}
52
+	$('#themeIdHidden').val('')
52 53
 })
53 54
 //关闭按钮退回工单列表
54 55
 $('.backProcedure').click(function() {

+ 1 - 0
WebChartNewest/js/second_index.js

@@ -29,6 +29,7 @@ $('.closeKey_icon').click(function () {
29 29
 	}
30 30
 	keyidArr = [];
31 31
 	keyid = 0
32
+	$('#themeIdHidden').val('')
32 33
 })
33 34
 
34 35
 

+ 2 - 1
WebChartNewest/js/workOrder.js

@@ -16,6 +16,7 @@ function workTable(KeyId,deptid,sourceId,PhoneType,keyword ,type,sourceArea,key,
16 16
 		$('.workList').hide();
17 17
 		$('.timeSta_wrap').show();
18 18
 		$('.timeSta_wrap').siblings().hide()
19
+		$('#themeIdHidden').val('')
19 20
 	})
20 21
 	
21 22
 	var param = {
@@ -99,7 +100,7 @@ function initTable(parm) {
99 100
 			};
100 101
 		},
101 102
 		onLoadSuccess: function(res) { //加载成功时执行
102
-			$('#themeIdHidden').val('')
103
+			
103 104
 		},
104 105
 		onLoadError: function() { //加载失败时执行
105 106
 			//layer.msg("加载数据失败", { time: 1500, icon: 2 });

+ 3 - 3
WebUI/CallCenterWeb.UI/Script/Common/huayi.config.js

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

+ 2 - 2
WebUI/CallCenterWeb.UI/SystemManager/js/yongHuManger.js

@@ -573,8 +573,8 @@ function getYG() {
573 573
 				if(ygcon.F_Birthday && ygcon.F_Birthday != "0001-01-01") {
574 574
 					$("#chan_ygbirth").val(ygcon.F_Birthday); //生日
575 575
 				}
576
-				$(".change_telphone").val(ygcon.F_Telephone); //电话
577
-				$(".change_mobile").val(ygcon.F_Mobile); //手机
576
+//				$(".change_telphone").val(ygcon.F_Telephone); //电话
577
+//				$(".change_mobile").val(ygcon.F_Mobile); //手机
578 578
 				
579 579
 				$(".change_telphone").val(decryptFn(ygcon.F_TelephoneShow)); //电话		
580 580
                 $(".change_mobile").val(decryptFn(ygcon.F_MobileShow)); //手机	decryptFn(F_MobileShow)	 

+ 10 - 3
WebUI/CallCenterWeb.UI/spManage/editTheme.html

@@ -117,7 +117,7 @@
117 117
 							<tr class="theme">
118 118
 								<th>统计时段:</th>
119 119
 								<td>
120
-									<input type="text" id="time" style="margin-top: 5px;" />
120
+									<input type="text" id="time" style="margin-top: 5px;"  autocomplete="off" />
121 121
 								</td>
122 122
 							</tr>
123 123
 							<tr>
@@ -126,6 +126,12 @@
126 126
 									<input type="text" id="name" style="margin-top: 5px;" />
127 127
 								</td>
128 128
 							</tr>
129
+							<tr>
130
+								<th>排序:</th>
131
+								<td>
132
+									<input type="text" id="sort" style="margin-top: 5px;" autocomplete="off" />
133
+								</td>
134
+							</tr>
129 135
 							<tr class="theme">
130 136
 								<th>大屏展示:</th>
131 137
 								<td>
@@ -244,7 +250,7 @@
244 250
 //							$("#types").val(content.F_TypesOf);
245 251
 							$("#cycle").val(content.F_Cycle);
246 252
 							$("#time").val(content.F_StatisticsBeginTime + ' - ' + content.F_StatisticsEndTime );
247
-							
253
+							$('#sort').val(content.F_Sort)
248 254
 							if (content.F_IsDisplay) {
249 255
 								$("#isdisplay").prop("checked",true)
250 256
 							} else {
@@ -300,7 +306,7 @@
300 306
 					}
301 307
 
302 308
 					console.log($('#time').val(), 'time')
303
-					
309
+					console.log($('#sort').val(), 'sort')
304 310
 
305 311
 
306 312
 					var parentid = themeid;
@@ -319,6 +325,7 @@
319 325
 						statisticsBeginTime: startTime,
320 326
 						statisticsEndTime: endTime,
321 327
 						name: name,
328
+						sort:$('#sort').val(),
322 329
 						"token": $.cookie("token")
323 330
 					}, function(result) {
324 331
 						result = $.parseJSON(result);

+ 91 - 101
WebUI/CallCenterWeb.UI/spManage/theme.html

@@ -11,7 +11,7 @@
11 11
 		<link rel="stylesheet" href="./css/yongHuManger.css" />
12 12
 		<!--<link rel="stylesheet" href="../js/layui/css/layui.css">-->
13 13
 		<link rel="stylesheet" href="../css/layui/css/layui.css" />
14
-		
14
+
15 15
 		<title>主题管理</title>
16 16
 		<style>
17 17
 			.toolRight input {
@@ -86,7 +86,7 @@
86 86
 			</div>
87 87
 			<div class="treeTable clearfix">
88 88
 				<div class="tree col-md-3">
89
-					
89
+
90 90
 					<div class="trTitle"> 月主题</div>
91 91
 					<div class="treeCon">
92 92
 						<ul id="treeDemo" class="ztree">
@@ -95,7 +95,7 @@
95 95
 					</div>
96 96
 				</div>
97 97
 				<div class="tableCon col-md-9">
98
-					<div class="trTitle">主题分类  <span id="time" style="color: darkgray;font-size: 14px;"></span>
98
+					<div class="trTitle">主题分类 <span id="time" style="color: darkgray;font-size: 14px;"></span>
99 99
 
100 100
 					</div>
101 101
 					<div class="layui-tab layui-tab-brief">
@@ -108,7 +108,7 @@
108 108
 							<li>订单管理</li>-->
109 109
 						</ul>
110 110
 						<div class="layui-tab-content" style="height: 100px;">
111
-							
111
+
112 112
 							<div class="layui-tab-item layui-show">
113 113
 								<div class="toolRight">
114 114
 									<button id="addClassBut" hidden="hidden" class="btns addclass" style="margin-bottom: 10px;">添加分类</button>
@@ -124,7 +124,7 @@
124 124
 									</thead>
125 125
 								</table>
126 126
 							</div>
127
-							
127
+
128 128
 							<div class="layui-tab-item">
129 129
 
130 130
 								<div class="toolRight">
@@ -146,22 +146,22 @@
146 146
 										<div class="layui-inline">
147 147
 											<label class="layui-form-label" style="width: 100px;">主题分类</label>
148 148
 											<div class="layui-input-inline" style="width: 200px;">
149
-																					<select name="" id="orderClass" class="form-control">
150
-											
151
-										</select>
149
+												<select name="" id="orderClass" class="form-control">
150
+
151
+												</select>
152 152
 											</div>
153 153
 										</div>
154 154
 										<div class="layui-inline">
155 155
 											<label class="layui-form-label" style="width: 100px;">是否典型</label>
156 156
 											<div class="layui-input-inline" style="width: 200px;">
157
-																					<select name="" id="orderRep" class="form-control">
158
-											<option selected="selected" value="">
159
-												请选择
160
-											</option>
161
-											<option value="0">否</option>
162
-											<option value="1">是</option>
163
-											
164
-										</select>
157
+												<select name="" id="orderRep" class="form-control">
158
+													<option selected="selected" value="">
159
+														请选择
160
+													</option>
161
+													<option value="0">否</option>
162
+													<option value="1">是</option>
163
+
164
+												</select>
165 165
 											</div>
166 166
 										</div>
167 167
 										<div class="layui-inline">
@@ -214,14 +214,14 @@
214 214
 									<button class="layui-btn" onclick="save()">保存</button>
215 215
 								</div>
216 216
 							</div>
217
-							
217
+
218 218
 							<div class="layui-tab-item">
219
-								
219
+
220 220
 								<table id="ThemeIdTable" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
221 221
 									<thead>
222 222
 										<tr>
223 223
 											<th data-field="F_DeptName" data-align="center">单位名称</th>
224
-											<th data-field="F_Sort"  data-align="center">排序</th>
224
+											<th data-field="F_Sort" data-align="center">排序</th>
225 225
 											<th data-field="F_CreateTime" data-align="center">创建时间</th>
226 226
 											<th data-field="F_ID" data-formatter="themeDispose" data-align="center">操作</th>
227 227
 										</tr>
@@ -240,13 +240,14 @@
240 240
 		<script src="../css/laydate/laydate.js"></script>
241 241
 		<script src="../css/layer/layer.js"></script>
242 242
 		<script src="../js/layui/layui.js"></script>
243
-		
243
+
244 244
 		<script src="../js/zTree/jquery.ztree.core.js"></script>
245 245
 		<script src="../js/comboSelect/jquery.combo.select.js"></script>
246 246
 		<script src="../js/WorkOrder/orderListOperation.js"></script>
247 247
 		<script src="../js/WorkOrder/WorkOrderList.js"></script>
248 248
 
249 249
 		<script>
250
+			var exportParams;
250 251
 			var table = $("#table1"); //右边表格
251 252
 			var orderTable = $("#workorder"); //右边表格 
252 253
 			var ThemeIdTable = $("#ThemeIdTable"); //右边表格
@@ -269,11 +270,11 @@
269 270
 				});
270 271
 
271 272
 			})
272
-			
273
+
273 274
 			function Cr(val, row, index) {
274
-            return index + 1;
275
+				return index + 1;
275 276
 
276
-        }
277
+			}
277 278
 
278 279
 			function getProp(id) {
279 280
 				// 获取占比
@@ -470,8 +471,8 @@
470 471
 					area: ['50%', '80%'], //宽高
471 472
 					end: function() {
472 473
 						bindtree();
473
-//						initTable();
474
-//						initOrderTable();
474
+						//						initTable();
475
+						//						initOrderTable();
475 476
 					}
476 477
 				});
477 478
 			});
@@ -507,41 +508,10 @@
507 508
 				});
508 509
 
509 510
 			});
510
-			
511
+
511 512
 			$('#exportOrder').click(function() {
512
-//				$.getJSON(
513
-//					huayi.config.callcenter_url + "SamplePool/GetSampleList", {
514
-//						token: $.cookie("token"),
515
-//							workid: $('#orderId').val(),
516
-//							ComContent: $('#orderContent').val(),
517
-//							classification: $('#orderClass').val(),
518
-//							istypical: $('#orderRep').val(),
519
-//							isdc: 1,
520
-//
521
-//							specialid: selectThemeId,
522
-//					},
523
-//					function(result) {
524
-//						
525
-//					}
526
-//				);
527
-				
528
-				var url =
529
-                huayi.config.callcenter_url +
530
-                "SamplePool/GetSampleList?token=" +
531
-                $.cookie("token") +
532
-                "&isdc=1";
533
-            url +=
534
-                "&workid=" +
535
-                $('#orderId').val() +
536
-                "&ComContent=" +
537
-                $('#orderContent').val() +
538
-                "&classification=" +
539
-                $('#orderClass').val() +
540
-                "&istypical=" +
541
-                $('#orderRep').val() +
542
-                "&specialid=" +
543
-                $('#orderRep').val();
544
-            window.location.href = url;
513
+				exportParams.isdc = 1;
514
+				exportFileFun("SamplePool/GetSampleList", exportParams)
545 515
 			})
546 516
 
547 517
 			$('#searchOrder').click(function() {
@@ -604,13 +574,14 @@
604 574
 					'<a class="xg" onclick="remove(' + row.F_ID + ')">删除</a>' + '<a class="xg" onclick="getKeys(' + row.F_ID + ')">关键词 </a>' +
605 575
 					'</div>';
606 576
 			}
577
+
607 578
 			function themeDispose(val, row) {
608
-				
579
+
609 580
 				return '<div class="imgs" >' +
610
-					'<a class="xg" onclick="themeSortHandle(\''+row.F_ID+'\',\''+row.F_DeptName+'\')">编辑</a>' +
581
+					'<a class="xg" onclick="themeSortHandle(\'' + row.F_ID + '\',\'' + row.F_DeptName + '\')">编辑</a>' +
611 582
 					'</div>';
612 583
 			}
613
-		
584
+
614 585
 			function PoolDispose(val, row) {
615 586
 				var optionStr = '<div class="imgs" ><a class="xg" onclick="delPool(\'' + row.F_WorkOrderId + '\')">移除</a>';
616 587
 
@@ -705,10 +676,11 @@
705 676
 					}
706 677
 				});
707 678
 			}
708
-			function themeSortHandle(id,F_DeptName){
679
+
680
+			function themeSortHandle(id, F_DeptName) {
709 681
 				layer.open({
710 682
 					type: 2,
711
-					content: "./cpns/themeSortEdit.html?id=" + id+"&F_DeptName="+encodeURIComponent(F_DeptName), //iframe的url,no代表不显示滚动条
683
+					content: "./cpns/themeSortEdit.html?id=" + id + "&F_DeptName=" + encodeURIComponent(F_DeptName), //iframe的url,no代表不显示滚动条
712 684
 					title: '修改涉及单位排序',
713 685
 					area: ['40%', '50%'], //宽高
714 686
 					end: function() {
@@ -716,7 +688,7 @@
716 688
 					}
717 689
 				});
718 690
 			}
719
-			
691
+
720 692
 			function remove(id) {
721 693
 				layer.confirm('确定删除该分类吗?', function(index) {
722 694
 
@@ -736,7 +708,7 @@
736 708
 			}
737 709
 			//右边表格
738 710
 			function selectThemeIdTable(id) {
739
-				if (!id) id = selectThemeId;
711
+				if(!id) id = selectThemeId;
740 712
 				//先销毁表格
741 713
 				ThemeIdTable.bootstrapTable("destroy");
742 714
 				//初始化表格,动态从服务器加载数据
@@ -753,7 +725,7 @@
753 725
 					//每页显示的记录数
754 726
 					pageNumber: 1,
755 727
 					//当前第几页
756
-//					pageList: [10, 20, 50, 100],
728
+					//					pageList: [10, 20, 50, 100],
757 729
 					//记录数可选列表
758 730
 					search: false,
759 731
 					//是否启用查询
@@ -768,7 +740,7 @@
768 740
 					queryParamsType: "undefined",
769 741
 					queryParams: function queryParams(params) {
770 742
 						//设置查询参数
771
-						
743
+
772 744
 						var param = {
773 745
 							page: params.pageNumber,
774 746
 							pagesize: params.pageSize,
@@ -778,18 +750,17 @@
778 750
 						};
779 751
 						return param;
780 752
 					},
781
-					responseHandler:function(res){
782
-						return{
783
-							"total":res.data.length,
784
-							"rows":res.data
753
+					responseHandler: function(res) {
754
+						return {
755
+							"total": res.data.length,
756
+							"rows": res.data
785 757
 						}
786 758
 					},
787 759
 					onLoadSuccess: function(data) {
788 760
 						//加载成功时执行
789
-						
761
+
790 762
 						console.log(data, 'datas')
791
-						
792
-						
763
+
793 764
 						//layer.msg("加载成功");
794 765
 					},
795 766
 					onLoadError: function() {
@@ -800,7 +771,7 @@
800 771
 			}
801 772
 			//右边表格
802 773
 			function initTable(id) {
803
-				if (!id) id = selectThemeId;
774
+				if(!id) id = selectThemeId;
804 775
 				//先销毁表格
805 776
 				table.bootstrapTable("destroy");
806 777
 				//初始化表格,动态从服务器加载数据
@@ -817,7 +788,7 @@
817 788
 					//每页显示的记录数
818 789
 					pageNumber: 1,
819 790
 					//当前第几页
820
-//					pageList: [10, 20, 50, 100],
791
+					//					pageList: [10, 20, 50, 100],
821 792
 					//记录数可选列表
822 793
 					search: false,
823 794
 					//是否启用查询
@@ -844,19 +815,19 @@
844 815
 					},
845 816
 					onLoadSuccess: function(data) {
846 817
 						//加载成功时执行
847
-						
818
+
848 819
 						console.log(data, 'datas')
849
-						
850
-						if (data.rows && data.rows.length > 0) {
820
+
821
+						if(data.rows && data.rows.length > 0) {
851 822
 							// orderClass
852 823
 							var optionStr = '<option selected="selected" value="">请选择</option>';
853 824
 							data.rows.forEach(function(o) {
854
-								optionStr += '<option value="'+o.F_ID+'">'+ o.F_Name +'</option>';
825
+								optionStr += '<option value="' + o.F_ID + '">' + o.F_Name + '</option>';
855 826
 							})
856
-							
827
+
857 828
 							$('#orderClass').append(optionStr)
858 829
 						}
859
-						
830
+
860 831
 						//layer.msg("加载成功");
861 832
 					},
862 833
 					onLoadError: function() {
@@ -868,7 +839,7 @@
868 839
 
869 840
 			//右边表格
870 841
 			function initOrderTable(id) {
871
-				if (!id) id = selectThemeId;
842
+				if(!id) id = selectThemeId;
872 843
 				//先销毁表格
873 844
 				orderTable.bootstrapTable("destroy");
874 845
 				//初始化表格,动态从服务器加载数据
@@ -912,6 +883,7 @@
912 883
 							specialid: id,
913 884
 
914 885
 						};
886
+						exportParams = param
915 887
 						return param;
916 888
 					},
917 889
 					onLoadSuccess: function() {
@@ -933,6 +905,8 @@
933 905
 				$.getJSON(
934 906
 					huayi.config.callcenter_url + "Theme/GetList", {
935 907
 						token: $.cookie("token"),
908
+						page: 1,
909
+						pagesize: 9999,
936 910
 						type: 1,
937 911
 						types: 2,
938 912
 					},
@@ -969,7 +943,7 @@
969 943
 									onClick: zTreeOnClick,
970 944
 								},
971 945
 								view: {
972
-									nameIsHTML: true, 
946
+									nameIsHTML: true,
973 947
 									fontCss: setFontCss_ztree
974 948
 								}
975 949
 							}, rows);
@@ -979,10 +953,9 @@
979 953
 							var node = zTreeObj.getNodeByParam("F_ID", rows[0].F_ID);
980 954
 
981 955
 							zTreeObj.selectNode(node, '', true);
982
-//							node.highlight = true;
983
-							
984
-							zTreeObj.updateNode(node);
956
+							//							node.highlight = true;
985 957
 
958
+							zTreeObj.updateNode(node);
986 959
 
987 960
 							// 默认点击第一个
988 961
 							zTreeOnClick(null, null, {
@@ -996,19 +969,36 @@
996 969
 					}
997 970
 				);
998 971
 			}
999
-     function setFontCss_ztree(treeId, treeNode) {
1000
-     	console.log(treeNode, 'treeNode')
1001
-         if (treeNode.F_IsDisplay) {
1002
-             //根节点
1003
-             return { color: "red", "font-weight": "bold" };
1004
-        } else if (treeNode.isParent == false) {
1005
-             //叶子节点
1006
-             return (!!treeNode.highlight) ? { color: "#ff0000", "font-weight": "bold" } : { color: "#000", "font-weight": "normal" };
1007
-         } else {
1008
-             //父节点
1009
-             return (!!treeNode.highlight) ? { color: "#ff0000", "font-weight": "bold" } : { color: "#333", "font-weight": "normal" };
1010
-         }
1011
-     }
972
+
973
+			function setFontCss_ztree(treeId, treeNode) {
974
+				console.log(treeNode, 'treeNode')
975
+				if(treeNode.F_IsDisplay) {
976
+					//根节点
977
+					return {
978
+						color: "red",
979
+						"font-weight": "bold"
980
+					};
981
+				} else if(treeNode.isParent == false) {
982
+					//叶子节点
983
+					return(!!treeNode.highlight) ? {
984
+						color: "#ff0000",
985
+						"font-weight": "bold"
986
+					} : {
987
+						color: "#000",
988
+						"font-weight": "normal"
989
+					};
990
+				} else {
991
+					//父节点
992
+					return(!!treeNode.highlight) ? {
993
+						color: "#ff0000",
994
+						"font-weight": "bold"
995
+					} : {
996
+						color: "#333",
997
+						"font-weight": "normal"
998
+					};
999
+				}
1000
+			}
1001
+
1012 1002
 			function zTreeOnClick(event, treeId, treeNode) {
1013 1003
 				selectThemeId = treeNode.F_ID
1014 1004
 				selectTreeNode = treeNode

+ 2 - 0
WebUI/CallCenterWeb.UI/spManage/weekTheme.html

@@ -834,6 +834,8 @@
834 834
 				$.getJSON(
835 835
 					huayi.config.callcenter_url + "Theme/GetList", {
836 836
 						token: $.cookie("token"),
837
+						page:1,
838
+						pagesize:9999,
837 839
 						type: 1,
838 840
 						types: 1,
839 841
 					},