Explorar el Código

修改bug 1151(部门的,第一个和最后一个显示不出来)
bug1150(月份这个,1号和30号显示不出来)
bug 1149;
文件上传 增加 进度;
每个页面进入增加 loading;
数据统计 修改成每次切换加载数据;首屏请求一次;

fanlongfei %!s(int64=7) %!d(string=hace) años
padre
commit
8ab4b0acbc

+ 0 - 13
CallCenterWeb.WeChat/WeChart/Script/Common/huayi.cookies.js

@@ -1,13 +0,0 @@
1
-if (huayi == undefined) {
2
-    var huayi = {};
3
-}
4
-huayi.coookies = function() {
5
-    this.uid = helper.cookies.get("uid") != "" ? helper.cookies.get("uid") : "";
6
-    this.passtoken = helper.cookies.get("passtoken") != "" ? helper.cookies.get("passtoken") : "";
7
-    this.imgurl = helper.cookies.get("imgurl") != "" ? helper.cookies.get("imgurl") : "0";
8
-    this.avatarurl = helper.cookies.get("image_avatar_url") != "" ? helper.cookies.get("image_avatar_url") : "http://img.800100.com/PerRes/Common/user/avatar/";
9
-    this.siteurl = helper.cookies.get("image_site_url") != "" ? helper.cookies.get("image_site_url") : "http://img.800100.com/PerRes/Common/";
10
-    this.liang = helper.cookies.get("liang") != "" ? helper.cookies.get("liang") : "";
11
-    this.userlevel = helper.cookies.get("userlevel") != "" ? helper.cookies.get("userlevel") : "";
12
-    this.agent = helper.cookies.get("agent") != "" ? helper.cookies.get("agent") : "";
13
-};

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 562 - 576
CallCenterWeb.WeChat/WeChart/Script/Common/huayi.http.js


+ 44 - 3
CallCenterWeb.WeChat/WeChart/css/Common.css

@@ -170,6 +170,7 @@ body {
170 170
 .noThumb {
171 171
 	color: #1aaad0;
172 172
 	font-size: 49px;
173
+	padding-bottom: 20px;
173 174
 }
174 175
 
175 176
 
@@ -269,6 +270,7 @@ body {
269 270
 	-webkit-font-smoothing: antialiased;
270 271
 	-webkit-text-stroke-width: 0.2px;
271 272
 	-moz-osx-font-smoothing: grayscale;
273
+	color: #007aff;
272 274
 }
273 275
 
274 276
 .workSchedule .message-box li {
@@ -531,10 +533,49 @@ body {
531 533
 	font-size: 14px!important;
532 534
 }
533 535
 
534
-.file_tips{
536
+.file_tips {
535 537
 	color: #f8ac59;
536 538
 	position: absolute;
537 539
 	top: 12px;
538
-    left: 54px;
539
-    font-size: 12px;
540
+	left: 54px;
541
+	font-size: 12px;
542
+}
543
+
544
+
545
+/*loading*/
546
+
547
+.hy_loading {
548
+	position: fixed;
549
+	left: 0;
550
+	top: 0;
551
+	width: 100%;
552
+	height: 100%;
553
+	background-color: rgba(0, 0, 0, .3);
554
+	z-index: 9998;
555
+	transition: all .2s;
540 556
 }
557
+
558
+.hy_loading .loading_img {
559
+	position: absolute;
560
+	left: 0;
561
+	top: 0;
562
+	bottom: 0;
563
+	right: 0;
564
+	overflow: hidden;
565
+	margin: auto;
566
+	width: 60px;
567
+	height: 24px;
568
+	z-index: 9999;
569
+}
570
+.hy_loading .load_percentage {
571
+	position: absolute;
572
+	left: 0;
573
+	top: 0;
574
+	bottom: 0;
575
+	right: 0;
576
+	overflow: hidden;
577
+	margin: auto;
578
+	width: 120px;
579
+	height: 120px;
580
+	z-index: 9999;
581
+}

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 2
CallCenterWeb.WeChat/WeChart/css/layui.css


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1 - 4666
CallCenterWeb.WeChat/WeChart/css/mui.min.css


+ 31 - 0
CallCenterWeb.WeChat/WeChart/html/AnnDeal.html

@@ -64,10 +64,37 @@
64 64
 			body {
65 65
 				background: #FFF;
66 66
 			}
67
+			
68
+			.hy_loading {
69
+				position: fixed;
70
+				left: 0;
71
+				top: 0;
72
+				width: 100%;
73
+				height: 100%;
74
+				background-color: rgba(0, 0, 0, .3);
75
+				z-index: 9998;
76
+				transition: all .2s;
77
+			}
78
+			
79
+			.hy_loading .loading_img {
80
+				position: absolute;
81
+				left: 0;
82
+				top: 0;
83
+				bottom: 0;
84
+				right: 0;
85
+				overflow: hidden;
86
+				margin: auto;
87
+				width: 60px;
88
+				height: 24px;
89
+				z-index: 9999;
90
+			}
67 91
 		</style>
68 92
 	</head>
69 93
 
70 94
 	<body>
95
+		<div class="hy_loading" id="hy_loading">
96
+			<img class="loading_img" src="../images/loading-0.gif" alt="加载中" />
97
+		</div>
71 98
 		<div class="mui-content">
72 99
 			<div class="" style="padding: 15px 10px;">
73 100
 				<h4 class="Title"></h4>
@@ -97,6 +124,10 @@
97 124
 				openid: helper.cookies.get("openid"),
98 125
 			},
99 126
 			success: function(data) {
127
+				if(document.getElementById('hy_loading')) {
128
+					document.getElementById('hy_loading').style.opacity = 0;
129
+					document.getElementById('hy_loading').remove();
130
+				}
100 131
 				var time = data.data.F_CreateOn.substring(0, data.data.F_CreateOn.indexOf(' '));
101 132
 				$(".Title").text(data.data.F_Title);
102 133
 				$(".Content").text(data.data.F_Content);

+ 170 - 84
CallCenterWeb.WeChat/WeChart/html/Census.html

@@ -9,7 +9,7 @@
9 9
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
10 10
 		<title>数据统计</title>
11 11
 		<link rel="stylesheet" type="text/css" href="../css/mui.min.css" />
12
-		<link rel="stylesheet" type="text/css" href="../css/Common.css?v=0614" />
12
+		<link rel="stylesheet" type="text/css" href="../css/Common.css?v=0619" />
13 13
 		<style>
14 14
 			.mui-control-content {
15 15
 				background-color: white;
@@ -27,8 +27,8 @@
27 27
 			}
28 28
 			
29 29
 			#item3mobile .chart,
30
-			#item6mobile .chart {
31
-				height: 500px;
30
+			#item5mobile .chart {
31
+				height: 580px;
32 32
 			}
33 33
 			
34 34
 			.mui-slider .mui-slider-group {
@@ -74,6 +74,9 @@
74 74
 	</head>
75 75
 
76 76
 	<body>
77
+		<div class="hy_loading" id="hy_loading">
78
+			<img class="loading_img" src="../images/loading-0.gif" alt="加载中" />
79
+		</div>
77 80
 		<div class="mui-content mui-scroll-wrapper">
78 81
 			<div id="slider" class="mui-slider">
79 82
 				<div id="sliderSegmentedControl" class="mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
@@ -89,7 +92,7 @@
89 92
 					<a class="mui-control-item" href="#item4mobile">
90 93
 						全部
91 94
 					</a>
92
-					<a class="mui-control-item" href="#item6mobile">
95
+					<a class="mui-control-item" href="#item5mobile">
93 96
 						乡镇
94 97
 					</a>
95 98
 				</div>
@@ -174,7 +177,7 @@
174 177
 
175 178
 					</div>
176 179
 					<div id="item4mobile" class="mui-slider-item mui-control-content">
177
-						<div id="scroll3" class="mui-scroll-wrapper">
180
+						<div id="scroll4" class="mui-scroll-wrapper">
178 181
 							<div class="mui-scroll">
179 182
 								<div>
180 183
 									<span></span>
@@ -212,8 +215,8 @@
212 215
 						</div>
213 216
 
214 217
 					</div>
215
-					<div id="item6mobile" class="mui-slider-item mui-control-content">
216
-						<div id="scroll3" class="mui-scroll-wrapper">
218
+					<div id="item5mobile" class="mui-slider-item mui-control-content">
219
+						<div id="scroll5" class="mui-scroll-wrapper">
217 220
 							<div class="mui-scroll">
218 221
 
219 222
 								<div class="chart" id="bar-Chart2"></div>
@@ -223,38 +226,115 @@
223 226
 					</div>
224 227
 				</div>
225 228
 			</div>
226
-
227 229
 		</div>
228 230
 		<script src="../js/mui.min.js"></script>
229
-		<script src="../js/echarts-all.js?v=4.1.0"></script>
230
-		<!--<script src="https://cdn.bootcss.com/echarts/4.1.0/echarts.min.js"></script>-->
231
+		<!--常用版-->
232
+		<script src="../js/echarts.common.min.js?v=4.1.0"></script>
231 233
 		<script src="../Script/Common/huayi.config.js"></script>
232 234
 		<script type="text/javascript">
233 235
 			mui.init();
234 236
 			var openid = helper.cookies.get("openid");
235
-			window.onload = function() {
237
+			Zepto(function($) {
238
+				//获取今天的信息
239
+				getDayReport();
240
+
241
+				$('#sliderSegmentedControl').on('tap', '.mui-control-item', function() {
242
+					var aIndex = $(this).index();
243
+					//console.log(aIndex);
244
+					loadDatas(aIndex, 'tap')
245
+				});
246
+
236 247
 				mui('.mui-scroll-wrapper').scroll({
237 248
 					deceleration: 0.0005 //flick 减速系数,系数越大,滚动速度越慢,滚动距离越小,默认值0.0006
238 249
 				});
239
-			}
240 250
 
241
-			Zepto(function($) {
242
-				//获取今天的信息
243
-				getDayReport();
244
-				//获取本周的信息
245
-				getWeekReport();
246
-				//获取本月的信息
247
-				getMonthReport();
248
-				//获取全部的信息
249
-				getAllReport();
250
-				//获取乡镇的信息
251
-				getDeptReport();
251
+				document.querySelector('.mui-slider').addEventListener('slide', function(event) {
252
+					var itemIndex = event.detail.slideNumber;
253
+					//console.log(itemIndex);
254
+					loadDatas(itemIndex, 'slide');
255
+				});
256
+
252 257
 			});
258
+
259
+			function loadDatas(index, handle) {
260
+				if(handle === "slide") {
261
+					switch(index) {
262
+						case 0:
263
+							getDayReport();
264
+							break;
265
+						case 1:
266
+							getWeekReport(); //获取本周的信息
267
+							break;
268
+						case 2:
269
+							getMonthReport(); //获取本月的信息
270
+							break;
271
+						case 3:
272
+							getAllReport(); //获取全部的信息
273
+							break;
274
+						case 4:
275
+							getDeptReport(); //获取乡镇的信息
276
+							break;
277
+						default:
278
+							break;
279
+					}
280
+				}
281
+			}
282
+
253 283
 			//获取今天的信息
254 284
 			function getDayReport() {
255 285
 				var myChart = echarts.init(document.getElementById('pieChart'));
256 286
 				myChart.clear();
257 287
 				myChart.showLoading();
288
+				var option = {
289
+					color: ['#f29999', '#3792f5'],
290
+					title: {
291
+						text: '今日工单量统计',
292
+						//subtext: '纯属虚构',
293
+						x: 'center'
294
+					},
295
+					tooltip: {
296
+						trigger: 'item',
297
+						formatter: "{a} <br/>{b} : {c} ({d}%)"
298
+					},
299
+					legend: {
300
+						orient: 'vertical',
301
+						left: 20,
302
+						data: ['未完成', '已完成']
303
+					},
304
+					series: [{
305
+						name: '工单量',
306
+						type: 'pie',
307
+						radius: '55%',
308
+						center: ['50%', '60%'],
309
+						data: [{
310
+								name: '未完成',
311
+								value: 100,
312
+								label: {
313
+									normal: {
314
+										formatter: "{d}%"
315
+									}
316
+								}
317
+							},
318
+							{
319
+								name: '已完成',
320
+								value: 0,
321
+								label: {
322
+									normal: {
323
+										formatter: "{d}%"
324
+									}
325
+								}
326
+							}
327
+						],
328
+						itemStyle: {
329
+							emphasis: {
330
+								shadowBlur: 10,
331
+								shadowOffsetX: 0,
332
+								shadowColor: 'rgba(0, 0, 0, 0.5)'
333
+							}
334
+						}
335
+					}]
336
+				};
337
+				myChart.setOption(option);
258 338
 				$.ajax({
259 339
 					type: "get",
260 340
 					url: huayi.config.callcenter_url + "WorkOrder/GetDayReport",
@@ -265,33 +345,18 @@
265 345
 					},
266 346
 					success: function(data) {
267 347
 						myChart.hideLoading();
348
+						if(document.getElementById('hy_loading')){
349
+							document.getElementById('hy_loading').style.opacity = 0;
350
+							document.getElementById('hy_loading').remove();
351
+						}
268 352
 						if(data.state.toLowerCase() == "success") {
269 353
 							data = data.data;
270 354
 							if(data && data.length > 0) {
271 355
 								var dfinish = data[0].finish;
272 356
 								var dufinish = data[0].unfinish;
357
+								myChart.setOption({
273 358
 
274
-								var option = {
275
-									color: ['#f29999', '#3792f5'],
276
-									title: {
277
-										text: '今日工单量统计',
278
-										//subtext: '纯属虚构',
279
-										x: 'center'
280
-									},
281
-									tooltip: {
282
-										trigger: 'item',
283
-										formatter: "{a} <br/>{b} : {c} ({d}%)"
284
-									},
285
-									legend: {
286
-										orient: 'vertical',
287
-										left: 20,
288
-										data: ['未完成', '已完成']
289
-									},
290 359
 									series: [{
291
-										name: '工单量',
292
-										type: 'pie',
293
-										radius: '55%',
294
-										center: ['50%', '60%'],
295 360
 										data: [{
296 361
 												name: '未完成',
297 362
 												value: dufinish,
@@ -311,17 +376,9 @@
311 376
 												}
312 377
 											}
313 378
 										],
314
-										itemStyle: {
315
-											emphasis: {
316
-												shadowBlur: 10,
317
-												shadowOffsetX: 0,
318
-												shadowColor: 'rgba(0, 0, 0, 0.5)'
319
-											}
320
-										}
321
-									}]
322
-								};
323 379
 
324
-								myChart.setOption(option);
380
+									}]
381
+								});
325 382
 								$("#Dayfinish").text(dfinish);
326 383
 								$("#Dayunfinifh").text(dufinish)
327 384
 								$("#Total").text(dfinish + dufinish);
@@ -664,7 +721,59 @@
664 721
 				var myChart = echarts.init(document.getElementById('lineCharts'));
665 722
 				myChart.clear();
666 723
 				myChart.showLoading();
724
+				var option = {
725
+					color: ['#f29999', '#3792f5'],
726
+					title: {
727
+						text: '全部工单量统计',
728
+						//subtext: '纯属虚构',
729
+						x: 'center'
730
+					},
731
+					tooltip: {
732
+						formatter: "{a} <br/>{b} : {c} ({d}%)"
733
+					},
734
+					legend: {
735
+						orient: 'vertical',
736
+						left: 20,
737
+						data: ['未完成', '已完成']
738
+					},
739
+					series: [{
740
+						name: '工单量',
741
+						type: 'pie',
742
+						radius: '65%',
743
+						center: ['50%', '50%'],
744
+						selectedMode: 'single',
745
+						data: [
746
+
747
+							{
748
+								value: 100,
749
+								name: '未完成',
750
+								label: {
751
+									normal: {
752
+										formatter: "{d}%"
753
+									}
754
+								}
755
+							},
756
+							{
757
+								value: 0,
758
+								name: '已完成',
759
+								label: {
760
+									normal: {
761
+										formatter: "{d}%"
762
+									}
763
+								}
764
+							}
667 765
 
766
+						],
767
+						itemStyle: {
768
+							emphasis: {
769
+								shadowBlur: 10,
770
+								shadowOffsetX: 0,
771
+								shadowColor: 'rgba(0, 0, 0, 0.5)'
772
+							}
773
+						}
774
+					}]
775
+				};
776
+				myChart.setOption(option);
668 777
 				$.ajax({
669 778
 					type: "get",
670 779
 					url: huayi.config.callcenter_url + "WorkOrder/GetTotalReport",
@@ -677,28 +786,10 @@
677 786
 						myChart.hideLoading();
678 787
 						if(data.state.toLowerCase() == "success") {
679 788
 							data = data.data;
680
-
681 789
 							if(data && data.length > 0) {
682
-								var option = {
683
-									color: ['#f29999', '#3792f5'],
684
-									title: {
685
-										text: '全部工单量统计',
686
-										//subtext: '纯属虚构',
687
-										x: 'center'
688
-									},
689
-									tooltip: {
690
-										formatter: "{a} <br/>{b} : {c} ({d}%)"
691
-									},
692
-									legend: {
693
-										orient: 'vertical',
694
-										left: 20,
695
-										data: ['未完成', '已完成']
696
-									},
790
+								myChart.setOption({
791
+
697 792
 									series: [{
698
-										type: 'pie',
699
-										radius: '65%',
700
-										center: ['50%', '50%'],
701
-										selectedMode: 'single',
702 793
 										data: [
703 794
 
704 795
 											{
@@ -721,16 +812,9 @@
721 812
 											}
722 813
 
723 814
 										],
724
-										itemStyle: {
725
-											emphasis: {
726
-												shadowBlur: 10,
727
-												shadowOffsetX: 0,
728
-												shadowColor: 'rgba(0, 0, 0, 0.5)'
729
-											}
730
-										}
815
+
731 816
 									}]
732
-								};
733
-								myChart.setOption(option);
817
+								});
734 818
 								$("#finish").text(data[0].finish);
735 819
 								$("#unfinifh").text(data[0].unfinish);
736 820
 								$("#RTotal").text(data[0].finish + data[0].unfinish);
@@ -753,13 +837,15 @@
753 837
 						x: 'center'
754 838
 					},
755 839
 					grid: {
756
-						bottom: 180
840
+						bottom: 180,
841
+						left: 70,
842
+						right: 64
757 843
 					},
758 844
 					dataZoom: [{ // 这个dataZoom组件,默认控制x轴。
759 845
 							type: 'slider', // 这个 dataZoom 组件是 slider 型 dataZoom 组件
760 846
 							xAxisIndex: 0,
761 847
 							start: 0, // 左边在 0% 的位置。
762
-							end: 40, // 右边在 100% 的位置。
848
+							end: 40, // 右边在 40% 的位置。
763 849
 							bottom: 100,
764 850
 						},
765 851
 

+ 11 - 3
CallCenterWeb.WeChat/WeChart/html/Schedule.html

@@ -6,14 +6,16 @@
6 6
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
7 7
 		<link rel="stylesheet" type="text/css" href="../css/mui.min.css" />
8 8
 		<link rel="stylesheet" type="text/css" href="../css/app.css" />
9
-		<!--<link rel="stylesheet" href="../css/layui.css" />-->
10 9
 		<link rel="stylesheet" type="text/css" href="../css/feedback-page.css" />
11 10
 		<link rel="stylesheet" href="../css/webuploader.css" />
12
-		<link rel="stylesheet" type="text/css" href="../css/Common.css?v=0614" />
11
+		<link rel="stylesheet" type="text/css" href="../css/Common.css?v=0619" />
13 12
 		<title>工单详情</title>
14 13
 	</head>
15 14
 
16 15
 	<body>
16
+		<div class="hy_loading" id="hy_loading">
17
+			<img class="loading_img" src="../images/loading-0.gif" alt="加载中" />
18
+		</div>
17 19
 		<div class="mui-content workSchedule">
18 20
 			<div class="mui-card">
19 21
 				<ul class="mui-table-view">
@@ -87,6 +89,10 @@
87 89
 						workorderid: id
88 90
 					},
89 91
 					success: function(data) {
92
+						if(document.getElementById('hy_loading')){
93
+							document.getElementById('hy_loading').style.opacity = 0;
94
+							document.getElementById('hy_loading').remove();
95
+						}
90 96
 						var con = JSON.parse(data);
91 97
 						if(con.state.toLowerCase() == "success"){
92 98
 							var Str = con.data.data;
@@ -141,7 +147,9 @@
141 147
 									}
142 148
 									$list.prepend($li);
143 149
 								}); 
144
-							} 
150
+							}else{
151
+								$('#image-list').html('<span class="mui-h5">暂无数据</span>');
152
+							}
145 153
 							
146 154
 						}
147 155
 						

+ 32 - 1
CallCenterWeb.WeChat/WeChart/html/WorkAnn.html

@@ -40,10 +40,37 @@
40 40
 			.mui-bar-nav {
41 41
 				background-color: #00a1cb;
42 42
 			}
43
+			
44
+			.hy_loading {
45
+				position: fixed;
46
+				left: 0;
47
+				top: 0;
48
+				width: 100%;
49
+				height: 100%;
50
+				background-color: rgba(0, 0, 0, .3);
51
+				z-index: 9998;
52
+				transition: all .2s;
53
+			}
54
+			
55
+			.hy_loading .loading_img {
56
+				position: absolute;
57
+				left: 0;
58
+				top: 0;
59
+				bottom: 0;
60
+				right: 0;
61
+				overflow: hidden;
62
+				margin: auto;
63
+				width: 60px;
64
+				height: 24px;
65
+				z-index: 9999;
66
+			}
43 67
 		</style>
44 68
 	</head>
45 69
 
46 70
 	<body>
71
+		<div class="hy_loading" id="hy_loading">
72
+			<img class="loading_img" src="../images/loading-0.gif" alt="加载中" />
73
+		</div>
47 74
 		<div class="mui-content mui-content mui-scroll-wrapper" id="pullrefresh">
48 75
 			<div class="mui-scroll">
49 76
 
@@ -130,6 +157,10 @@
130 157
 					pagesize: pageSize
131 158
 				},
132 159
 				success: function(data) {
160
+					if(document.getElementById('hy_loading')){
161
+						document.getElementById('hy_loading').style.opacity = 0;
162
+						document.getElementById('hy_loading').remove();
163
+					}
133 164
 					total = data.total;
134 165
 					var a = "";
135 166
 					$(data.rows).each(function(i, n) {
@@ -147,7 +178,7 @@
147 178
 							'</li>'
148 179
 						$(a).appendTo($("#order_list"));
149 180
 					})
150
-					////详情
181
+					//详情
151 182
 					$('.order').on('tap', function() {
152 183
 						var index = $(this).attr("index");
153 184
 						window.location.href = "AnnDeal.html?index=" + index;

+ 9 - 2
CallCenterWeb.WeChat/WeChart/html/WorkCL.html

@@ -9,7 +9,7 @@
9 9
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
10 10
 		<link href="../css/mui.min.css" rel="stylesheet" />
11 11
 		<link rel="stylesheet" href="../css/iconfont.css" />
12
-		<link rel="stylesheet" href="../css/Common.css?v=0614" />
12
+		<link rel="stylesheet" href="../css/Common.css?v=0619" />
13 13
 		<script src="../js/zepto.js"></script>
14 14
 		<script src="../Script/Common/huayi.http.js"></script>
15 15
 		<script type="text/javascript">
@@ -21,6 +21,9 @@
21 21
 	</head>
22 22
 
23 23
 	<body>
24
+		<div class="hy_loading" id="hy_loading">
25
+			<img class="loading_img" src="../images/loading-0.gif" alt="加载中" />
26
+		</div>
24 27
 		<div class="mui-content mui-content mui-scroll-wrapper workList" id="pullrefresh">
25 28
 			<div class="mui-scroll">
26 29
 
@@ -39,7 +42,7 @@
39 42
 		<script src="../Script/Common/huayi.config.js"></script>
40 43
 		<script src="../js/mui.min.js"></script>
41 44
 		<script type="text/javascript">
42
-//			mui.alert('左滑列表项可以处理工单',' ',);
45
+			//			mui.alert('左滑列表项可以处理工单',' ',);
43 46
 			var page = 1; //页数
44 47
 			var pageSize = 10; //每页显示条目
45 48
 			var total; //数据总条数
@@ -162,6 +165,10 @@
162 165
 					dataType: 'json',
163 166
 					type: 'get', //HTTP请求类型
164 167
 					success: function(data) {
168
+						if(document.getElementById('hy_loading')){
169
+							document.getElementById('hy_loading').style.opacity = 0;
170
+							document.getElementById('hy_loading').remove();
171
+						}
165 172
 						total = data.total;
166 173
 						$(data.rows).each(function(i, n) {
167 174
 							var States = n.State;

+ 8 - 1
CallCenterWeb.WeChat/WeChart/html/WorkList.html

@@ -8,11 +8,14 @@
8 8
 		<meta name="apple-mobile-web-app-capable" content="yes">
9 9
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
10 10
 		<link href="../css/mui.min.css" rel="stylesheet" />
11
-		<link href="../css/Common.css?v=0614" rel="stylesheet" />
11
+		<link href="../css/Common.css?v=0619" rel="stylesheet" />
12 12
 		<link rel="stylesheet" href="../css/iconfont.css" />
13 13
 	</head>
14 14
 
15 15
 	<body>
16
+		<div class="hy_loading" id="hy_loading">
17
+			<img class="loading_img" src="../images/loading-0.gif" alt="加载中" />
18
+		</div>
16 19
 		<div class="mui-content mui-content mui-scroll-wrapper workList" id="pullrefresh">
17 20
 			<div class="mui-scroll">
18 21
 				<ul class="mui-table-view" id="OA_task_2">
@@ -149,6 +152,10 @@
149 152
 					dataType: 'json',
150 153
 					type: 'get', //HTTP请求类型
151 154
 					success: function(data) {
155
+						if(document.getElementById('hy_loading')){
156
+							document.getElementById('hy_loading').style.opacity = 0;
157
+							document.getElementById('hy_loading').remove();
158
+						}
152 159
 						if(data.state.toLowerCase() == "success") {
153 160
 							total = data.total;
154 161
 							if(data.rows && data.rows.length > 0) {

+ 1 - 1
CallCenterWeb.WeChat/WeChart/html/WorkSearch.html

@@ -9,7 +9,7 @@
9 9
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
10 10
 		<link href="../css/mui.min.css" rel="stylesheet" />
11 11
 		<link href="../css/mui.picker.min.css" rel="stylesheet" type="text/css" />
12
-		<link href="../css/Common.css?v=0614" rel="stylesheet" />
12
+		<link href="../css/Common.css?v=0619" rel="stylesheet" />
13 13
 	</head>
14 14
 
15 15
 	<body>

+ 9 - 6
CallCenterWeb.WeChat/WeChart/html/Workdeal.html

@@ -11,11 +11,13 @@
11 11
 		<link rel="stylesheet" type="text/css" href="../css/mui.min.css" />
12 12
 		<link rel="stylesheet" type="text/css" href="../css/feedback-page.css" />
13 13
 		<link rel="stylesheet" type="text/css" href="../css/mui.picker.min.css" />
14
-		<link rel="stylesheet" type="text/css" href="../css/Common.css?v=0614" />
14
+		<link rel="stylesheet" type="text/css" href="../css/Common.css?v=0619" />
15 15
 	</head>
16 16
 
17 17
 	<body>
18
-
18
+		<div class="hy_loading" id="hy_loading">
19
+			<img class="loading_img" src="../images/loading-0.gif" alt="加载中" />
20
+		</div>
19 21
 		<div class="mui-card">
20 22
 			<div class="mui-card-header">基本信息</div>
21 23
 			<form class="mui-input-group">
@@ -26,7 +28,7 @@
26 28
 				<div id="showCountyPicker">
27 29
 					<div class="mui-input-row">
28 30
 						<label for="h_county" class="label">乡镇:</label>
29
-						<input type="text" id="h_county" class="ui-alert type_con" placeholder="请选择乡镇" data-index="0">
31
+						<input type="text" readonly="readonly" id="h_county" class="ui-alert type_con" placeholder="请选择乡镇" data-index="0">
30 32
 						<a><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
31 33
 					</div>
32 34
 				</div>
@@ -50,19 +52,20 @@
50 52
 				</div>
51 53
 				<div class="mui-input-row">
52 54
 					<label for="h_inqtime">调查时间:</label>
53
-					<input id="h_inqtime" type="text" data-options='{"type":"date"}' class="btn" placeholder="选择调查时间 ">
55
+					<input id="h_inqtime" readonly="readonly" type="text" data-options='{"type":"date"}' class="ui-alert type_con btn" placeholder="选择调查时间 ">
56
+					<a><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
54 57
 				</div>
55 58
 				<div id="showInfoTypePicker">
56 59
 					<div class="mui-input-row">
57 60
 						<label for="h_infoType" class="label">信息分类:</label>
58
-						<input type="text" id="h_infoType" class="ui-alert type_con" placeholder="请选择信息分类" data-index="0">
61
+						<input type="text" readonly="readonly" id="h_infoType" class="ui-alert type_con" placeholder="请选择信息分类" data-index="0">
59 62
 						<a><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
60 63
 					</div>
61 64
 				</div>
62 65
 				<div id="showUnitPicker">
63 66
 					<div class="mui-input-row">
64 67
 						<label for="h_unit" class="label">交办单位:</label>
65
-						<input type="text" id="h_unit" class="ui-alert type_con" placeholder="请选择交办单位" data-index="0">
68
+						<input type="text" readonly="readonly" id="h_unit" class="ui-alert type_con" placeholder="请选择交办单位" data-index="0">
66 69
 						<a><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
67 70
 					</div>
68 71
 				</div>

+ 22 - 6
CallCenterWeb.WeChat/WeChart/html/index.html

@@ -13,7 +13,7 @@
13 13
 		<link rel="stylesheet" type="text/css" href="../css/mui.picker.min.css" />
14 14
 		<link rel="stylesheet" type="text/css" href="../css/feedback-page.css" />
15 15
 		<link rel="stylesheet" href="../css/webuploader.css" />
16
-		<link rel="stylesheet" type="text/css" href="../css/Common.css?v=0614" />
16
+		<link rel="stylesheet" type="text/css" href="../css/Common.css?v=0619" />
17 17
 	</head>
18 18
 
19 19
 	<body>
@@ -57,10 +57,11 @@
57 57
 		</div>
58 58
 
59 59
 		<div class="mui-button-row" id="Btns-box">
60
-			<button type="button" data-loading-text="提交中" id="submit" class="mui-btn mui-btn-primary" onclick="return false;">提交</button>
60
+			<button type="button" data-loading-text="提交中" id="submit" class="mui-btn mui-btn-primary">提交</button>
61 61
 		</div>
62 62
 
63 63
 		<script src="../js/jquery.min.js"></script>
64
+		<script src="../js/radialIndicator.min.js"></script>
64 65
 		<script src="../js/zepto.js"></script>
65 66
 		<script src="../js/mui.min.js"></script>
66 67
 		<script src="../js/mui.zoom.js"></script>
@@ -76,7 +77,7 @@
76 77
 			var uploader; //上传实例
77 78
 			Zepto(function($) {
78 79
 				getCounty(); //获取乡镇地址
79
-				uploaderImages();//上传附件
80
+				uploaderImages(); //上传附件
80 81
 				$('#submit').on('tap', submitHandle);
81 82
 			});
82 83
 
@@ -111,7 +112,7 @@
111 112
 						mui(that).button('loading');
112 113
 					},
113 114
 					data: {
114
-						openid: helper.cookies.get("openid"),//string	是
115
+						openid: helper.cookies.get("openid"), //string	是
115 116
 						cusname: $('#h_userName').val(), //string	是	客户姓名	
116 117
 						cusphone: $('#h_phone').val(), //	string	是	电话
117 118
 						country: $('#h_county').attr('data-index'), //string	否	乡镇	
@@ -151,7 +152,7 @@
151 152
 					dataType: 'json',
152 153
 					async: true,
153 154
 					data: {
154
-						openid: helper.cookies.get("openid"),//string	是
155
+						openid: helper.cookies.get("openid"), //string	是
155 156
 					},
156 157
 					success: function(data) {
157 158
 						if(data.state.toLowerCase() == "success") {
@@ -161,7 +162,10 @@
161 162
 								(function($, doc) {
162 163
 									$.init();
163 164
 									$.ready(function() {
164
-										var t_countyDatas = [{value: 0,text: '请选择乡镇'}];
165
+										var t_countyDatas = [{
166
+											value: 0,
167
+											text: '请选择乡镇'
168
+										}];
165 169
 										res.forEach(function(item, index) {
166 170
 											t_countyDatas.push({
167 171
 												value: item.F_DictionaryValueId,
@@ -275,6 +279,17 @@
275 279
 
276 280
 					$percent.eq(0).text(Math.round(percentage * 100) + '%');
277 281
 					$percent.eq(1).css('width', Math.round(percentage * 100) + '%');
282
+					$('.hy_loading').remove();
283
+					$('body').prepend('<div class="hy_loading" id="hy_loading">'+
284
+										'<div class="load_percentage" id="indicatorContainer"></div></div>');
285
+					$('#indicatorContainer').radialIndicator({
286
+						barColor: '#007aff',
287
+						barWidth: 10,
288
+						initValue: Math.round(percentage * 100),
289
+						roundCorner: true,
290
+						percentage: true
291
+					});
292
+
278 293
 				});
279 294
 
280 295
 				// 文件上传成功,给item添加成功class, 用样式标记上传成功。 
@@ -284,6 +299,7 @@
284 299
 					$('#' + file.id).find('img').attr('src', huayi.config.callcenter_url + res.data.F_FileUrl);
285 300
 					$('#fileNum').text(EnclosureList.length + '/' + limitNum);
286 301
 					$('#' + file.id).addClass('upload-state-done');
302
+					$('.hy_loading').remove();
287 303
 				});
288 304
 
289 305
 				// 文件上传失败,显示上传出错。 

+ 5 - 2
CallCenterWeb.WeChat/WeChart/html/questionnaire.html

@@ -11,10 +11,13 @@
11 11
 		<link rel="stylesheet" type="text/css" href="../css/mui.min.css" />
12 12
 		<link rel="stylesheet" type="text/css" href="../css/feedback-page.css" />
13 13
 		<link rel="stylesheet" type="text/css" href="../css/mui.picker.min.css" />
14
-		<link rel="stylesheet" type="text/css" href="../css/Common.css?v=0614" />
14
+		<link rel="stylesheet" type="text/css" href="../css/Common.css?v=0619" />
15 15
 	</head>
16 16
 
17 17
 	<body class="questionnaire">
18
+		<div class="hy_loading" id="hy_loading">
19
+			<img class="loading_img" src="../images/loading-0.gif" alt="加载中" />
20
+		</div>
18 21
 		<header>
19 22
 			<h4 class="que_header_title" id="que_header_title"></h4>
20 23
 			<p class="que_header_content" id="que_header_content"></p>
@@ -51,7 +54,7 @@
51 54
 			<div class="mui-card-header">问卷信息</div>
52 55
 		</div>
53 56
 		<div id="questionBody">
54
-			
57
+
55 58
 		</div>
56 59
 		<div class="mui-button-row" id="Btns-box">
57 60
 			<button type="button" id="submit" data-loading-text="提交中" class="mui-btn mui-btn-primary" onclick="return false;">提交</button>

BIN
CallCenterWeb.WeChat/WeChart/images/loading-0.gif


+ 34 - 11
CallCenterWeb.WeChat/WeChart/js/Workdeal.js

@@ -5,12 +5,16 @@ var openid = helper.cookies.get("openid");
5 5
 var id = helper.request.queryString("id");
6 6
 var countyPicker; //乡镇
7 7
 if(id) {
8
-
9 8
 	//获取信息分类 、乡镇 及交办单位后获取 详情信息
10 9
 	$.when(getTypeList(), getCounty()).then(function() {
11 10
 		getWorkDetails(); //获取工单详情
12 11
 	});
13
-
12
+	
13
+	var userCode = helper.cookies.get("usercode");
14
+	$('#h_inquser').val(userCode);
15
+	//获取当前日期
16
+	var nowDate = helper.DateFormat.getNowDate();
17
+	$('#h_inqtime').val(nowDate);
14 18
 	$("#submit").on('tap', submitHandle);
15 19
 }
16 20
 
@@ -24,6 +28,10 @@ function getWorkDetails() {
24 28
 			workorderid: id
25 29
 		},
26 30
 		success: function(data) {
31
+			if($('#hy_loading')){
32
+				$('#hy_loading').fadeOut();
33
+				$('#hy_loading').remove();
34
+			}
27 35
 			data = JSON.parse(data);
28 36
 			if(data.state.toLowerCase() == "success") {
29 37
 				var con = data.data;
@@ -32,11 +40,10 @@ function getWorkDetails() {
32 40
 						var res = con.data[0];
33 41
 						$('#h_userName').val(res.Customer); //string	是	客户姓名	
34 42
 
35
-						countyPicker.pickers[0].setSelectedValue(res.County, 200, function() {
36
-							var sItems = countyPicker.getSelectedItems();
37
-							$('#h_county').val(sItems[0].text);
38
-							$('#h_county').attr('data-index', sItems[0].value);
39
-						}); //int	否	乡镇
43
+						countyPicker.pickers[0].setSelectedValue(res.County); //int	否	乡镇
44
+						var sItems = countyPicker.getSelectedItems();
45
+						$('#h_county').val(sItems[0].text);
46
+						$('#h_county').attr('data-index', sItems[0].value);
40 47
 
41 48
 						$('#h_address').val(res.Address); //string	否	住址
42 49
 						$('#h_contents').val(res.Detail); //string	是	反映问题	
@@ -142,7 +149,10 @@ function getTypeList() {
142 149
 					(function($, doc) {
143 150
 						$.init();
144 151
 						$.ready(function() {
145
-							var t_countyDatas = [];
152
+							var t_countyDatas = [{
153
+								value: 0,
154
+								text: '请选择信息分类'
155
+							}];
146 156
 							res.forEach(function(item, index) {
147 157
 								t_countyDatas.push({
148 158
 									value: item.F_DictionaryValueId,
@@ -189,17 +199,30 @@ function getCounty() {
189 199
 					(function($, doc) {
190 200
 						$.init();
191 201
 						$.ready(function() {
192
-							var t_countyDatas = [{value: 0,text: '请选择乡镇'}];
202
+							var t_countyDatas = [{
203
+								value: 0,
204
+								text: '请选择乡镇'
205
+							}];
193 206
 							res.forEach(function(item, index) {
194 207
 								t_countyDatas.push({
195 208
 									value: item.F_DictionaryValueId,
196 209
 									text: item.F_Name
197 210
 								});
198 211
 							});
212
+							var t_unitDatas = [{
213
+								value: 0,
214
+								text: '请选择交办单位'
215
+							}];
216
+							res.forEach(function(item, index) {
217
+								t_unitDatas.push({
218
+									value: item.F_DictionaryValueId,
219
+									text: item.F_Name
220
+								});
221
+							});
199 222
 							countyPicker = new $.PopPicker();
200 223
 							countyPicker.setData(t_countyDatas);
201 224
 							var unitPicker = new $.PopPicker();
202
-							unitPicker.setData(t_countyDatas);
225
+							unitPicker.setData(t_unitDatas);
203 226
 							//乡镇
204 227
 							var showCountybtn = doc.getElementById('showCountyPicker');
205 228
 							var countyRes = doc.getElementById('h_county');
@@ -255,4 +278,4 @@ function getCounty() {
255 278
 
256 279
 		}, false);
257 280
 	});
258
-})(mui, document);
281
+})(mui, document);

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 21
CallCenterWeb.WeChat/WeChart/js/echarts-all.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 21 - 0
CallCenterWeb.WeChat/WeChart/js/echarts.common.min.js


+ 4 - 0
CallCenterWeb.WeChat/WeChart/js/questionnarire.js

@@ -145,6 +145,10 @@ function getPagers() {
145 145
 		},
146 146
 		success: function(data) {
147 147
 			$('#questionBody').empty();
148
+			if(document.getElementById('hy_loading')){
149
+				document.getElementById('hy_loading').style.opacity = 0;
150
+				document.getElementById('hy_loading').remove();
151
+			}
148 152
 			data = JSON.parse(data);
149 153
 			if(data.state.toLowerCase() == "success") {
150 154
 				var res = data.data;

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 7 - 0
CallCenterWeb.WeChat/WeChart/js/radialIndicator.min.js