1

src/main/resources/static/app/supervise/controller/sptCtrl.js

@@ -439,14 +439,13 @@ angular.module('app.supervise').controller("sptSxtgzsCtrl", function ($scope, $r
 
         $scope.yearflag = false;
 		$scope.monthflag = true;
-        now = new Date();
-		year = now.getFullYear();
+        var now = new Date();
+		var year = now.getFullYear();
 		var month2 = String(now.getMonth()+1).padStart(2,'0');
 		$scope.search.monthTime = year+"-"+month2;
 		$("#monthTime").val($scope.search.monthTime);
 
         $scope.conditionsSelect = function(param) {
-        	var now = null;
         	if(param == 'year'){
         		$scope.yearflag = true; 
         		$scope.monthflag = false;
@@ -465,14 +464,13 @@ angular.module('app.supervise').controller("sptSxtgzsCtrl", function ($scope, $r
         	} else if (param == 'month') {
         		$scope.yearflag = false;
         		$scope.monthflag = true;
-        		var year = null;
         		var month = null;
         		var firstDay = "01";
         		$scope.search.monthTime = $("#monthTime").val();
         		if ($scope.search.monthTime == null || $scope.search.monthTime == undefined || $scope.search.monthTime == "") {
         			now = new Date();
             		year = now.getFullYear();
-            		var month2 = String(now.getMonth()+1).padStart(2,'0');
+            		month2 = String(now.getMonth()+1).padStart(2,'0');
             		$scope.search.monthTime = year+"-"+month2;
             		$scope.search.xxcjsjks = $scope.search.monthTime+"-"+firstDay;//初始化开始时间
             		month = String(now.getMonth()+2).padStart(2,'0');//这个参数主要是为了生成最后一天

src/main/resources/static/app/system/controller/userCtrl.js

@@ -734,6 +734,7 @@ angular.module('app.system').controller("pwdCtrl",
 
         });
         $scope.submit = function() {
+        	//alert("您已经连续90天未更换密码，请先修改密码！")
         	if (validator.form()) {
                 userService.modifyPwd($scope.oldPassword, $scope.newPassword).then(function(data) {
                     if (data != null) {