no message

newUI/YeWu/MemberUnitManage.html

@@ -66,6 +66,14 @@
 										<input class="photo x-color inputs laydate-icon" type="text" id="endTimes" />
 									</li>
 									<li>
+									   	 工单来源：
+									    <select class="select_" name="" id="sourceInfo"> 
+									    	<option value="">请选择</option>
+									    	<option value="92">网民诉求</option>
+									    	<option value="93">热线诉求</option>
+									    </select>
+									</li>
+									<li>
 										<a class="sc_btn btns db" style="padding: 7px 10px;">搜索</a>
 										<a class="sc_btn btns export">导出</a>
 									</li>
@@ -91,7 +99,9 @@
 			tabSecondText: '成员单位办理情况',
 			params: {}
 		}
-		var columns= [
+		
+		
+		var columnsRx = [
 			[
 				{ title: '序号', align: 'center',valign: 'middle',
 					formatter: function(value, row, index) {
@@ -100,43 +110,103 @@
 					colspan: 1, rowspan: 2
 				},
 				{ field: 'deptname', title: '12345成员单位', align: 'center', width:'150px',  valign: 'middle', colspan: 1, rowspan: 2 },
-				{ title: '热线诉求件', align: 'center', colspan: 15, rowspan: 1 },
-				{ title: '网民诉求件', align: 'center', colspan: 14, rowspan: 1 },
+				{ title: '热线诉求件', align: 'center', colspan: 15, rowspan: 1 }, 
 			],
 			[
 				{ field: 'total', title: '诉求总数', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'province', title: '省派件', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'ontime', title: '按时受理数', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'ontimerate', title: '按时受理率', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'Urging', title: '催办件数', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'Urgingrate', title: '催办率', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'feedback', title: '按时反馈数', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'feedbackrate', title: '按时反馈率', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'completion', title: '按时办结数', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'completionrate', title: '按时办结率', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'overtime', title: '超时受理数', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'overfeedback', title: '超时反馈数', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'overcompletion', title: '超时办结数', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'myd', title: '群众满意度', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'supervise', title: '市转督办', align: 'center', colspan: 1, rowspan: 1 },
-			 	
-			 	{ field: 'wmtotal', title: '诉求总数', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'wmontime', title: '按时受理数', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'wmontimerate', title: '按时受理率', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'wmUrging', title: '催办件数', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'wmUrgingrate', title: '催办率', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'wmfeedback', title: '按时反馈数', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'wmfeedbackrate', title: '按时反馈率', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'wmcompletion', title: '按时办结数', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'wmcompletionrate', title: '按时办结率', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'wmovertime', title: '超时受理数', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'wmoverfeedback', title: '超时反馈数', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'wmovercompletion', title: '超时办结数', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'wmmyd', title: '群众满意度', align: 'center', colspan: 1, rowspan: 1 },
-			 	{ field: 'wmsupervise', title: '市转督办', align: 'center', colspan: 1, rowspan: 1 },
-			 	
+				{ field: 'province', title: '省派件', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'ontime', title: '按时受理数', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'ontimerate', title: '按时受理率', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'Urging', title: '催办件数', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'Urgingrate', title: '催办率', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'feedback', title: '按时反馈数', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'feedbackrate', title: '按时反馈率', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'completion', title: '按时办结数', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'completionrate', title: '按时办结率', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'overtime', title: '超时受理数', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'overfeedback', title: '超时反馈数', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'overcompletion', title: '超时办结数', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'myd', title: '群众满意度', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'supervise', title: '市转督办', align: 'center', colspan: 1, rowspan: 1 },
+			]
+		]
+		var columnsWm = [
+			[
+				{ title: '序号', align: 'center',valign: 'middle',
+					formatter: function(value, row, index) {
+						return index+1
+					},
+					colspan: 1, rowspan: 2
+				},
+				{ field: 'deptname', title: '12345成员单位', align: 'center', width:'150px',  valign: 'middle', colspan: 1, rowspan: 2 },
+				{ title: '网民诉求件', align: 'center', colspan: 14, rowspan: 1 },
+			],
+			[
+				{ field: 'wmtotal', title: '诉求总数', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'wmontime', title: '按时受理数', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'wmontimerate', title: '按时受理率', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'wmUrging', title: '催办件数', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'wmUrgingrate', title: '催办率', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'wmfeedback', title: '按时反馈数', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'wmfeedbackrate', title: '按时反馈率', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'wmcompletion', title: '按时办结数', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'wmcompletionrate', title: '按时办结率', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'wmovertime', title: '超时受理数', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'wmoverfeedback', title: '超时反馈数', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'wmovercompletion', title: '超时办结数', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'wmmyd', title: '群众满意度', align: 'center', colspan: 1, rowspan: 1 },
+				{ field: 'wmsupervise', title: '市转督办', align: 'center', colspan: 1, rowspan: 1 },
 			]
 		]
+		
+		
+		// 原有列数据 
+			// var columns= [
+			// 	[
+			// 		{ title: '序号', align: 'center',valign: 'middle',
+			// 			formatter: function(value, row, index) {
+			// 				return index+1
+			// 			},
+			// 			colspan: 1, rowspan: 2
+			// 		},
+			// 		{ field: 'deptname', title: '12345成员单位', align: 'center', width:'150px',  valign: 'middle', colspan: 1, rowspan: 2 },
+			// 		{ title: '热线诉求件', align: 'center', colspan: 15, rowspan: 1 },
+			// 		{ title: '网民诉求件', align: 'center', colspan: 14, rowspan: 1 },
+			// 	],
+			// 	[
+			// 		{ field: 'total', title: '诉求总数', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'province', title: '省派件', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'ontime', title: '按时受理数', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'ontimerate', title: '按时受理率', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'Urging', title: '催办件数', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'Urgingrate', title: '催办率', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'feedback', title: '按时反馈数', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'feedbackrate', title: '按时反馈率', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'completion', title: '按时办结数', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'completionrate', title: '按时办结率', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'overtime', title: '超时受理数', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'overfeedback', title: '超时反馈数', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'overcompletion', title: '超时办结数', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'myd', title: '群众满意度', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'supervise', title: '市转督办', align: 'center', colspan: 1, rowspan: 1 },
+					
+			// 	 	{ field: 'wmtotal', title: '诉求总数', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'wmontime', title: '按时受理数', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'wmontimerate', title: '按时受理率', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'wmUrging', title: '催办件数', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'wmUrgingrate', title: '催办率', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'wmfeedback', title: '按时反馈数', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'wmfeedbackrate', title: '按时反馈率', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'wmcompletion', title: '按时办结数', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'wmcompletionrate', title: '按时办结率', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'wmovertime', title: '超时受理数', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'wmoverfeedback', title: '超时反馈数', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'wmovercompletion', title: '超时办结数', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'wmmyd', title: '群众满意度', align: 'center', colspan: 1, rowspan: 1 },
+			// 	 	{ field: 'wmsupervise', title: '市转督办', align: 'center', colspan: 1, rowspan: 1 },
+					
+			// 	]
+			// ] 
 
 		var reportString = '成员单位办理情况'
 		$(document).ready(function() {

newUI/YeWu/Number.html

@@ -99,6 +99,7 @@
                                 <li>
                                    	 工单来源：
                                     <select class="select_" name="" id="sourceInfo">
+                                    	<option value="0">全部</option>
                                     	<option value="92">网民诉求</option>
                                     	<option value="93">热线诉求</option>
                                     </select>

newUI/YeWu/js/reportCommon.js

@@ -6,6 +6,10 @@ $(function() {
 	})
     $(".export").click(function() {
     	exportParam.isExport = true
+    	exportParam.start = $("#startTimes").val()
+    	exportParam.end = $("#endTimes").val()
+    	exportParam.source = $("#sourceInfo").val()
+		 
 		exportFileFun(getParam.apiUrl, exportParam)
 	})
     
@@ -18,6 +22,7 @@ function load(paramsObj) {
 	var dataParam = {
 		start: $("#startTimes").val(),
 		end: $("#endTimes").val(),
+		source: $("#sourceInfo").val(),
 		token: $.cookie("token")
 	}
 	if (paramsObj.params !== '{}') {
@@ -63,7 +68,8 @@ function load(paramsObj) {
 		onLoadError: function() { //加载失败时执行
 			//layer.msg("加载数据失败", { time: 1500, icon: 2 });
 		},
-		columns:columns
+		// columns:columns
+		columns: $("#sourceInfo").val() == 92 ? columnsWm : columnsRx
 	});
 }
 // 导出列表

newUI/js/index.js

@@ -589,26 +589,32 @@ $(document).ready(function () {
         } else if (xmm == '') {
             layer.msg("密码不允许为空！");
         } else {
-            $('.wrong').hide();
-            $('.grzl tbody>tr>td input').attr('readonly', true);
-            $('.grzl tbody>tr>td input').css('border-bottom', "none");
-            $.ajax({
-                type: "post",
-                url: huayi.config.callcenter_url + "UserAccount/UpdatePwd",
-                async: true,
-                dataType: 'json',
-                data: {
-                    token: $.cookie("token"),
-                    usercode: gh,
-                    pwd: $.md5(xmm),
-                    oldpwd: $.md5(ymm)
-                },
-                success: function (result) {
-                    if (result.state.toLowerCase() == "success") {
-                        layer.msg("修改成功！");
-                    }
-                }
-            });
+			const reg = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[!#$%^&*])[\da-zA-Z!#$%^&*]{8,}$/
+			
+			if(reg.test(xmm)){
+				$('.wrong').hide();
+				$('.grzl tbody>tr>td input').attr('readonly', true);
+				$('.grzl tbody>tr>td input').css('border-bottom', "none");
+				$.ajax({
+				    type: "post",
+				    url: huayi.config.callcenter_url + "UserAccount/UpdatePwd",
+				    async: true,
+				    dataType: 'json',
+				    data: {
+				        token: $.cookie("token"),
+				        usercode: gh,
+				        pwd: $.md5(xmm),
+				        oldpwd: $.md5(ymm)
+				    },
+				    success: function (result) {
+				        if (result.state.toLowerCase() == "success") {
+				            layer.msg("修改成功！");
+				        }
+				    }
+				});
+			}else{
+				layer.msg("密码必须包含至少一个大小写字母，数字和特殊字符。并且长度不能小于8位！");
+			} 
         }
     })
 
@@ -785,6 +791,11 @@ $(document).ready(function () {
         }
         
     })
+	
+	
+	
+	// 密码过于简单提示
+	showTip()
 
     
 })
@@ -1824,5 +1835,15 @@ function Read(signid, e) {
 		});
 }
 
+
+// 密码过于简单提示
+function showTip(){
+	let data = sessionStorage.getItem('passTipShow') 
+	if(data == 'true'){
+		layer.msg("密码过于简单，请及时修改！");
+		sessionStorage.setItem('passTipShow' , false) 
+	}
+}
+
 //获取知识库消息
 //setInterval(getnew,15000)

newUI/login.html

@@ -102,6 +102,14 @@
 					var zx_user = $(".zx_user").val();
 					var zx_fj = $(".zx_fj").val();
 					var zx_psw = $(".zx_psw").val();
+						
+					const reg = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[!#$%^&*])[\da-zA-Z!#$%^&*]{8,}$/
+					if(reg.test(zx_psw)){
+						sessionStorage.setItem('passTipShow' , false) 
+					}else{
+						sessionStorage.setItem('passTipShow' , true)
+					}
+					
 					if (zx_user == "" || zx_fj == "" || zx_psw == "") {
 						$(".error_zx").addClass('errorShow');
 						if ($(".zx_user").val() == "") {