Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/resources/static/district/css/district_mobile.css

@@ -167,13 +167,13 @@ a {
 
 /* 鍙楃悊鍦烘墍鍜屾煡闃呭満鎵� */
 .top-title {
-	height: 50px !important;
+	height: 73px !important;
 	margin-top: 17px !important;
 }
 
 .top-title>li {
 	width: 35% !important;
-	font-size: 20px !important;
+	font-size: 34px !important;
 	text-align: center !important;
 	float: left !important;
 	color: #333 !important;
@@ -186,6 +186,7 @@ a {
 
 .top-title>li>img {
 	margin-right: 5px;
+	width: 21px;
 }
 
 /* 鍙楃悊鍦烘墍鍜屾煡闃呭満鎵�鐨勫浘鏍� */
@@ -210,7 +211,6 @@ a {
 }
 
 .layui-tab {
-	width: 500px;
     margin: 24px auto 0px !important;
     height: 93px;
 }
@@ -229,6 +229,7 @@ a {
 	overflow: hidden !important;
 	white-space: nowrap !important;
 	text-overflow: ellipsis !important;
+	font-size: 26px;
 }
 
 .second-title>.layui-this {
@@ -311,7 +312,7 @@ a {
 	text-overflow: ellipsis;
 	overflow: hidden;
 	white-space: nowrap;
-	font-size:20px;
+	font-size:29px;
 }
 
 .tab {
@@ -322,7 +323,9 @@ a {
 	width: 95%;
 	margin: 22px auto 30px;
 }
-
+.title-first{
+	height: 259px;
+}
 .title-first:hover {
 	background-color: #E9F3FF;
 	cursor: pointer;
@@ -330,7 +333,7 @@ a {
 
 .title-first>li {
 	/* width: 100%; */
-	font-size: 20px;
+	font-size: 29px;
 	margin-bottom: 10px;
 	color: #333333;
 	text-overflow: ellipsis;
@@ -342,7 +345,7 @@ a {
 
 .title-first>li>span {
 	color: #FF780B;
-	font-size: 20px;
+	font-size: 30px;
 }
 
 .differentdz {
@@ -371,7 +374,7 @@ a {
 
 .but-bus {
 	width: 64px;
-	height: 30px;
+	height: 41px;
 	background: #FFFFFF;
 	border: 1px solid #ccc;
 	outline: none;
@@ -381,7 +384,7 @@ a {
 
 .but-car {
 	width: 64px;
-	height: 30px;
+	height: 41px;
 	background: #FFFFFF;
 	border: 1px solid #ccc;
 	outline: none;
@@ -408,8 +411,8 @@ a {
 }
 
 .hide1 {
-	width: 318px;
-	height: 47px;
+	width: 432px;
+    height: 56px;
 	display: none;
 	position: relative;
 	background-color: rgba(253, 253, 253, .7);
@@ -429,8 +432,8 @@ a {
 }
 
 .hide2 {
-	width: 318px;
-    height: 47px;
+	width: 432px;
+    height: 56px;
 	display: none;
 	position: relative;
 	margin-top: 10px;
@@ -496,21 +499,8 @@ a {
 	left: 220px;
 }
 
-.inp-text2 {
-	height: 22px;
-	margin: 11px 0 0 0;
-	position: absolute;
-	left: 220px;
-}
 
-.imgSearch {
-	width: 16px;
-	height: 16px;
-	margin: 13px 0 0 0;
-	cursor: pointer;
-	position: absolute;
-	right: 10px;
-}
+
 
 .imgSearch2 {
 	width: 16px;
@@ -564,8 +554,8 @@ a {
 }
 
 .inps {
-	width: 160px;
-	height: 22px;
+	width: 208px;
+    height: 37px;
 	border: 1px solid #ccc;
 	margin: 10px 6px 0 0;
 	padding-left: 15px;
@@ -574,8 +564,8 @@ a {
 }
 
 .inpst {
-	width: 160px;
-	height: 22px;
+	width: 208px;
+    height: 37px;
 	border: 1px solid #ccc;
 	margin: 10px 6px 0 0;
 	padding-left: 15px;
@@ -585,12 +575,12 @@ a {
 
 .change-buts {
 	width: 30px;
-	height: 21px;
+	height: 33px;
 	cursor: pointer;
 	background: url(../img/switch.png) no-repeat center;
 	margin: 11px 0 0 0;
 	position: absolute;
-	left: 185px;
+	left: 242px;
 }
 
 .change-buts2 {
@@ -607,7 +597,7 @@ a {
 	height: 22px;
 	margin: 11px 0 0 0;
 	position: absolute;
-	left: 220px;
+	left: 288px;
 }
 
 .inp-text2 {
@@ -620,7 +610,7 @@ a {
 .imgSearch {
 	width: 16px;
 	height: 16px;
-	margin: 13px 0 0 0;
+	margin: 24px 0 0 0;
 	cursor: pointer;
 	position: absolute;
 	right: 10px;
@@ -914,7 +904,7 @@ a {
 }
 
 .titleFirst>li {
-	font-size: 14px;
+	font-size: 20px;
 	margin-bottom: 10px;
 	color: #333333;
 }
@@ -927,7 +917,7 @@ a {
 
 .titleFirst>li>p>span {
 	color: #2775CC;
-	font-size: 14px;
+	font-size: 20px;
 }
 
 .xz-active {

nngkxxdp/src/main/resources/static/district/js/district_mobile.js

@@ -762,18 +762,18 @@ $(function() {
 			$('.inps').css('left', '0px');
 		}
 		let inpText = $('.inp-text').css('left');
-		if (inpText == '220px') {
+		if (inpText == '288px') {
 			$('.inp-text').css('left', '0px');
 		}
 		if (inpText == '0px') {
-			$('.inp-text').css('left', '220px');
+			$('.inp-text').css('left', '288px');
 		}
 		let changeButs = $('.change-buts').css('left');
-		if (changeButs == '185px') {
+		if (changeButs == '242px') {
 			$('.change-buts').css('left', '50px');
 		}
 		if (changeButs == '50px') {
-			$('.change-buts').css('left', '185px');
+			$('.change-buts').css('left', '242px');
 		}
 	});
 
@@ -787,18 +787,18 @@ $(function() {
 			$('.inpst').css('left', '0px');
 		}
 		let inpText2 = $('.inp-text2').css('left');
-		if (inpText2 == '220px') {
+		if (inpText2 == '288px') {
 			$('.inp-text2').css('left', '0px');
 		}
 		if (inpText2 == '0px') {
-			$('.inp-text2').css('left', '220px');
+			$('.inp-text2').css('left', '288px');
 		}
 		let changeButs2 = $('.change-buts2').css('left');
-		if (changeButs2 == '185px') {
+		if (changeButs2 == '242px') {
 			$('.change-buts2').css('left', '50px');
 		}
 		if (changeButs2 == '50px') {
-			$('.change-buts2').css('left', '185px');
+			$('.change-buts2').css('left', '242px');
 		}
 	});
 
@@ -1490,12 +1490,12 @@ $(function() {
 		$(this).parents('.title-first').siblings().find('.hide1').css('display', 'none');
 		$(this).siblings('.hide2').css('display', 'none');
 		$(this).siblings('.hide1').find('.inps').css('left', '0px');
-		$(this).siblings('.hide1').find('.inp-text').css('left', '220px');
+		$(this).siblings('.hide1').find('.inp-text').css('left', '288px');
 		$(this).siblings('.hide1').find('.imgSearch').css('right', '10px');
-		$(this).siblings('.hide1').find('.change-buts').css('left', '185px');
+		$(this).siblings('.hide1').find('.change-buts').css('left', '242px');
 		$(this).siblings('.hide2').find('.inpst').css('left', '0px');
-		$(this).siblings('.hide2').find('.inp-text2').css('left', '220px');
-		$(this).siblings('.hide2').find('.change-buts2').css('left', '185px');
+		$(this).siblings('.hide2').find('.inp-text2').css('left', '292px');
+		$(this).siblings('.hide2').find('.change-buts2').css('left', '242px');
 		$(this).siblings('.hide2').find('.imgSearch2').css('right', '10px');
 		$(this).addClass("xz-active").siblings("input").removeClass("xz-active");
 		$(this).parents(".title-first").siblings("ul").find(".change-but").children("input").removeClass("xz-active");

nngkxxdp/src/main/resources/static/wzkp/wzkp.html

@@ -2013,7 +2013,7 @@
     function getYearMonthDay() {
         let date = new Date();
         date.setDate(0);
-        return date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate();
+        return date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
     }
 
     //是否展示时间选择器
@@ -2202,7 +2202,7 @@
             elem: '#monInput1',
             type: 'month',
             max: getYearMonthDay(),
-            min: '2000-01-01',
+            min: '2020-01-01',
             value: getYearMonth(),
             done: function (value, date, endDate) {
                 dateDone(value, hasDept, type);
@@ -2212,7 +2212,7 @@
             elem: '#monInput0',
             type: 'month',
             max: getYearMonthDay(),
-            min: '2000-01-01',
+            min: '2020-01-01',
             value: getYearMonth(),
             done: function (value, date, endDate) {
                 dateDone(value, hasDept, type);
@@ -2640,12 +2640,12 @@
             , page: false //开启分页
             , limit: obj.length
             , cols: [[ //表头
-                {field: 'target', title: '指标'}
+                {field: 'target', title: '指标',width:120}
                 , {field: 'targetScore', title: '分值', width: 70}
-                , {field: 'event', title: '指标要求', width: 560}
-                , {field: 'targetRequirement', title: '加扣分指标', width: 170}
+                , {field: 'event', title: '指标要求', width: 420}
+                , {field: 'targetRequirement', title: '加扣分指标', width: 270}
                 , {field: 'targetDeduct', title: '加扣分原因', width: 200}
-                , {field: 'addscore', title: '加(扣)分', width: 100, template: addscoreTemplate}
+                , {field: 'addscore', title: '加(扣)分', templet: addscoreTemplate}
             ]]
             , data: obj
         });