ws 3 жил өмнө
parent
commit
0f4912c895

+ 2 - 0
nngkxxdp/src/main/java/com/example/nngkxxdp/entity/PostManagement.java

@@ -63,4 +63,6 @@ public class PostManagement {
     private Integer type;
     
     private String deptName;
+    
+    private String pdfContent;
 }

+ 2 - 1
nngkxxdp/src/main/resources/mapper/PostManagementDao.xml

@@ -104,7 +104,8 @@
             hp.policy_interpretation,
             hp.make_policy,
             hp.type,
-            hp.dept_name
+            hp.dept_name, 
+            hp.pdf_content
         FROM
             h_post_management AS hp
         WHERE hp.id = #{id}

+ 1 - 0
nngkxxdp/src/main/resources/mapper/SmsMessageDao.xml

@@ -47,6 +47,7 @@
     
     <select id="getAllOfa" resultType="java.util.Map">
     	select * from w_ofa
+    	order by update_time desc
     </select>
     
     <insert id="saveOfaSms" useGeneratedKeys="true" >

+ 164 - 4
nngkxxdp/src/main/resources/static/district/css/district.css

@@ -10,6 +10,7 @@ li {
 a {
 	text-decoration: none;
 }
+
 body {
 	min-width: 1366px;
 }
@@ -28,9 +29,6 @@ body {
 	width: 446px;
 	margin-left: 31px;
 	margin-top: 17px;
-	display: flex;
-	flex-wrap: wrap;
-	justify-content: space-between;
 }
 
 .logo-img {
@@ -862,7 +860,7 @@ body {
 	font-size: 14px;
 }
 
-.xz-active{
+.xz-active {
 	background-color: #2775CC;
 	color: #FFFFFF;
 }
@@ -877,3 +875,165 @@ body {
 		width: 23.79% !important;
 	}
 }
+
+@media screen and (min-device-width: 375px) and (max-device-width: 768px) {
+	body {
+		min-width: 375px;
+		height: 100%;
+	}
+
+	.left-logo {
+		/* transform: scale(0.8); */
+		transform-origin: left top;
+		margin-left: 0;
+		margin-right: 5px;
+	}
+
+	.right-search {
+		transform: scale(0.8);
+		transform-origin: left top;
+		margin: 8px 0 20px 0px;
+		height: 79px;
+	}
+
+	.left-map {
+		width: 44%;
+		position: absolute;
+		z-index: 999;
+		left: 0;
+		background: #fff;
+	}
+
+	.right-map {
+		width: 100%;
+		height: 100%;
+	}
+
+	.top-title>li {
+		margin-left: 2% !important;
+	}
+
+	.second-title {
+		margin: 0px !important;
+	}
+
+	.second-title>li {
+		margin-left: 10% !important;
+	}
+
+	.layui-unselect {
+		display: none;
+	}
+
+	.text-first {
+		min-width: 327px;
+	}
+
+	.content-title {
+		min-width: 300px !important;
+	}
+
+	.main-third {
+		min-width: 284px !important;
+	}
+
+	.main-third>li {
+		padding: 0px !important;
+	}
+
+	.input-icon {
+		width: 350px !important;
+	}
+	
+	.hide1 {
+		width: 290px;
+	}
+	
+	.hide2 {
+		width: 290px;
+	}
+}
+
+@media screen and (max-device-width: 375px) {
+	html {
+		height: 100%;
+	}
+
+	body {
+		height: 100%;
+	}
+
+	.head {
+		width: 100% !important;
+	}
+
+	.left-logo {
+		/* transform: scale(0.8); */
+		transform-origin: left top;
+		margin-left: 0;
+		margin-right: 5px;
+	}
+
+	.right-search {
+		transform: scale(0.8);
+		transform-origin: left top;
+		margin: 8px 0 20px 0px;
+	}
+
+	.left-map {
+		width: 44%;
+		position: absolute;
+		z-index: 999;
+		left: 0;
+		background: #fff;
+	}
+
+	.right-map {
+		width: 100%;
+		height: 100%;
+	}
+
+	.top-title>li {
+		margin-left: 2% !important;
+	}
+
+	.second-title {
+		margin: 0px !important;
+	}
+
+	.second-title>li {
+		margin-left: 10% !important;
+	}
+
+	.layui-unselect {
+		display: none;
+	}
+
+	.text-first {
+		min-width: 327px;
+	}
+
+	.content-title {
+		min-width: 300px !important;
+	}
+
+	.main-third {
+		min-width: 284px !important;
+	}
+
+	.main-third>li {
+		padding: 0px !important;
+	}
+
+	.input-icon {
+		width: 350px !important;
+	}
+	
+	.hide1 {
+		width: 290px;
+	}
+	
+	.hide2 {
+		width: 290px;
+	}
+}

+ 13 - 13
nngkxxdp/src/main/resources/static/district/district.html

@@ -7,24 +7,13 @@
 		<link href="img/favicon.ico" rel="shortcut icon">
 		<link rel="stylesheet" href="./layui/css/layui.css">
 		<link rel="stylesheet" href="./css/district.css">
-		<script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=nSxiPohfziUaCuONe4ViUP2N"></script>
-		<script type="text/javascript" src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js">
-		</script>
-		<script type="text/javascript" src="//api.map.baidu.com/library/DistanceTool/1.2/src/DistanceTool_min.js">
-		</script>
-		<script type="text/javascript" src="//api.map.baidu.com/library/MarkerManager/1.2/src/MarkerManager_min.js">
-		</script>
-		<script src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=nSxiPohfziUaCuONe4ViUP2N"></script>
-		<script type="text/javascript" src="./layui/layui.js"></script>
-		<script type="text/javascript" src="./js/jquery-3.5.1.min.js"></script>
-		<script type="text/javascript" src="./js/district.js"></script>
 		<title>重庆市南岸区人民政府--地图搜索页</title>
 	</head>
 	<body>
 		<div class="head">
 			<!-- 左边的logo和文字 -->
 			<div class="left-logo">
-				<img class="logo-img" src="img/map-logo.png">
+				<img class="logo-img" src="img/map-logo.png" style="width: 446px">
 			</div>
 			<!-- 右边的搜索框 -->
 			<div class="right-search">
@@ -46,7 +35,7 @@
 							<div class="input-icon">
 								<input type="text" id="gj-one" value="" />
 								<div id="change-word"></div>
-								<input type="text" name="" id="gj-two" value=""/>
+								<input type="text" name="" id="gj-two" value="" />
 								<img src="img/ss2.png" class="inp-icon2" id="inp-icon2">
 							</div>
 						</div>
@@ -209,5 +198,16 @@
 			</div>
 			<div class="right-map" id="right-map"></div>
 		</div>
+		<script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=nSxiPohfziUaCuONe4ViUP2N"></script>
+		<script type="text/javascript" src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js">
+		</script>
+		<script type="text/javascript" src="//api.map.baidu.com/library/DistanceTool/1.2/src/DistanceTool_min.js">
+		</script>
+		<script type="text/javascript" src="//api.map.baidu.com/library/MarkerManager/1.2/src/MarkerManager_min.js">
+		</script>
+		<script src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=nSxiPohfziUaCuONe4ViUP2N"></script>
+		<script type="text/javascript" src="./layui/layui.js"></script>
+		<script type="text/javascript" src="./js/jquery-3.5.1.min.js"></script>
+		<script type="text/javascript" src="./js/district.js"></script>
 	</body>
 </html>

+ 85 - 119
nngkxxdp/src/main/resources/static/district/js/district.js

@@ -2,24 +2,34 @@ layui.use('element', function() {
 	var element = layui.element;
 	layer = layui.layer;
 });
+
+// if (screen.availWidth <= 750) {
+//     $('.logo-img').attr('src', '/img/map-logo2.png');
+// 	$('.logo-img').css("width", "257px");
+// }
+
 $(function() {
-	$("input").bind('keyup blur',function(){
-	    var reg= /[^\w\u4e00-\u9fa5\/\-]/gi;
-	    var val=$(this).val();
-	    if(reg.test(val)){
-	        $(this).val($(this).val().replace(reg,''));
-	    }
-	});
-	
-	
+	// 全部输入框特殊字符不能输入
+	// 匹配标志: g:全局匹配  i:忽略大小写
+	// / 是表达式开始和结束的标记
+	// \ 可以将后面出现的字符标记为特殊字符
+	// ^ 匹配输入字符串的开始位置,除非在方括号表达式中使用,当该符号在方括号表达式中使用时,表示不接受该方括号表达式中的字符集合。要匹配 ^ 字符本身,请使用 \^。
+	// \w 匹配字母、数字、下划线。等价于 [A-Za-z0-9_]
+	// $("input").bind('keyup blur', function() {
+	// 	// var reg= /[^\w\u4e00-\u9fa5\/\-]/gi;
+	// 	var reg = /[^\w\u4e00-\u9fa5]/gi;
+	// 	var val = $(this).val();
+	// 	if (reg.test(val)) {
+	// 		$(this).val($(this).val().replace(reg, ''));
+	// 	}
+	// });
+
 	// 点击市级部门下的文字地址选择切换样式	 街镇选择开始
 	$('.text-first p').click(function() {
 		$(this).addClass('tab');
 		$(this).siblings().removeClass('tab');
 		const jztext = $(this).text();
 		var index = $(this).index() - 1;
-
-
 		// console.log(index)
 		if (jztext == "南坪镇") {
 			var jd = ['重庆市南岸区响水路7号'];
@@ -108,20 +118,6 @@ $(function() {
 	$('.inp-icon2').click(function() {
 		let start = $('#gj-one').val();
 		let end = $('#gj-two').val();
-		if (!/^([\u4e00-\u9fa5A-Za-z0-9,.?!;,。?!、;])*$/.test(start)) {
-			return false;
-			$('.show-first').css('display', 'block');
-			$('.show-second').css('display', 'none');
-			$('.show-third').css('display', 'none');
-			$('.show-fourth').css('display', 'none');
-		}
-		if (!/^([\u4e00-\u9fa5A-Za-z0-9,.?!;,。?!、;])*$/.test(end)) {
-			return false;
-			$('.show-first').css('display', 'block');
-			$('.show-second').css('display', 'none');
-			$('.show-third').css('display', 'none');
-			$('.show-fourth').css('display', 'none');
-		}
 		if (start === "" || end === "") {
 			$('.show-first').css('display', 'block');
 			$('.show-second').css('display', 'none');
@@ -157,7 +153,7 @@ $(function() {
 		$('.show-fourth').css('display', 'none');
 		// bdGEO(jzadds);
 		bdGEO(jzs);
-	})
+	});
 	// 点击公交的出现结果部分的路径选择查看具体路径
 	$('.line-first').click(function() {
 		$(this).parent('.line').siblings().find(".line-hide").css('display', 'none');
@@ -191,20 +187,6 @@ $(function() {
 	$('.inp-icon3').click(function() {
 		let start = $('#zj-one').val();
 		let end = $('#zj-two').val();
-		if (!/^([\u4e00-\u9fa5A-Za-z0-9,.?!;,。?!、;])*$/.test(start)) {
-			return false;
-			$('.show-first').css('display', 'block');
-			$('.show-second').css('display', 'none');
-			$('.show-third').css('display', 'none');
-			$('.show-fourth').css('display', 'none');
-		}
-		if (!/^([\u4e00-\u9fa5A-Za-z0-9,.?!;,。?!、;])*$/.test(end)) {
-			return false;
-			$('.show-first').css('display', 'block');
-			$('.show-second').css('display', 'none');
-			$('.show-third').css('display', 'none');
-			$('.show-fourth').css('display', 'none');
-		}
 		if (start === "" || end === "") {
 			$('.show-first').css('display', 'block');
 			$('.show-second').css('display', 'none');
@@ -219,8 +201,6 @@ $(function() {
 			$('#end2').text(end);
 		}
 	});
-	// 点击头部的搜索的搜索按钮在左边出现结果
-
 
 	// 写受理场所和查阅场所前的icon切换
 	$('.top-title>li').click(function() {
@@ -597,22 +577,25 @@ $(function() {
 			"<span>" + sum + "</span>" +
 			"条记录"
 		);
-		$(".title-first").bind('keyup blur','.inps',function(){
-		    var reg= /[^\w\u4e00-\u9fa5\/\-]/gi;
-			var item = $(this).find('.inps');
-		    var val=item.val();
-		    if(reg.test(val)){
-		        item.val(item.val().replace(reg,''));
-		    }
-		});
-		$(".title-first").bind('keyup blur','.inpst',function(){
-		    var reg= /[^\w\u4e00-\u9fa5\/\-]/gi;
-			var item = $(this).find('.inpst');
-		    var val=item.val();
-		    if(reg.test(val)){
-		        item.val(item.val().replace(reg,''));
-		    }
-		});
+		// 点击公交或者自驾出现隐藏层中的输入框,让其不能输入特殊字符
+		// $(".title-first").bind('keyup blur', '.inps', function() {
+		// 	// var reg= /[^\w\u4e00-\u9fa5\/\-]/gi;
+		// 	var reg = /[^\w\u4e00-\u9fa5]/gi;
+		// 	var item = $(this).find('.inps');
+		// 	var val = item.val();
+		// 	if (reg.test(val)) {
+		// 		item.val(item.val().replace(reg, ''));
+		// 	}
+		// });
+		// $(".title-first").bind('keyup blur', '.inpst', function() {
+		// 	// var reg= /[^\w\u4e00-\u9fa5\/\-]/gi;
+		// 	var reg = /[^\w\u4e00-\u9fa5]/gi;
+		// 	var item = $(this).find('.inpst');
+		// 	var val = item.val();
+		// 	if (reg.test(val)) {
+		// 		item.val(item.val().replace(reg, ''));
+		// 	}
+		// });
 	}
 
 	// 区级部门循环渲染
@@ -658,13 +641,13 @@ $(function() {
 			"<span>" + num + "</span>" +
 			"条记录"
 		);
-		$(".districtLevel>input").bind('keyup blur',function(){
-		    var reg= /[^\w\u4e00-\u9fa5\/\-]/gi;
-		    var val=$(this).val();
-		    if(reg.test(val)){
-		        $(this).val($(this).val().replace(reg,''));
-		    }
-		});
+		// $(".districtLevel>input").bind('keyup blur', function() {
+		// 	var reg = /[^\w\u4e00-\u9fa5\/\-]/gi;
+		// 	var val = $(this).val();
+		// 	if (reg.test(val)) {
+		// 		$(this).val($(this).val().replace(reg, ''));
+		// 	}
+		// });
 	};
 
 	// 点击市级部门下公交出现输入框并点击中间的切换按钮能够切换起点和终点
@@ -672,14 +655,14 @@ $(function() {
 		let inps = $('.inps').css('left');
 		if (inps == '0px') {
 			$('.inps').css('left', '90px');
-		} 
+		}
 		if (inps == '90px') {
 			$('.inps').css('left', '0px');
 		}
 		let inpText = $('.inp-text').css('left');
 		if (inpText == '220px') {
 			$('.inp-text').css('left', '0px');
-		} 
+		}
 		if (inpText == '0px') {
 			$('.inp-text').css('left', '220px');
 		}
@@ -697,15 +680,15 @@ $(function() {
 		let inpst = $('.inpst').css('left');
 		if (inpst == '0px') {
 			$('.inpst').css('left', '90px');
-		} 
+		}
 		if (inpst == '90px') {
 			$('.inpst').css('left', '0px');
 		}
 		let inpText2 = $('.inp-text2').css('left');
 		if (inpText2 == '220px') {
 			$('.inp-text2').css('left', '0px');
-		} 
-		if (inpText2 == '0px'){
+		}
+		if (inpText2 == '0px') {
 			$('.inp-text2').css('left', '220px');
 		}
 		let changeButs2 = $('.change-buts2').css('left');
@@ -831,7 +814,6 @@ $(function() {
 		if (index == 0) {
 			marker.openInfoWindow(infoWindow)
 		}
-		// marker.openInfoWindow(infoWindow); //开启信息窗口
 		marker.addEventListener("click", function() {
 			map.openInfoWindow(infoWindow, point); //开启信息窗口
 		});
@@ -840,8 +822,6 @@ $(function() {
 
 	//区级部门与街镇解析地址批量解析结束
 	$('.second-title>li').click(function() {
-		// 解决点击事件,多次执行的问题
-		// $('.second-title>li').unbind('click');
 		const xz = $(this).text();
 		if (xz == "区级部门") {
 			bdGEO(adds);
@@ -1087,12 +1067,6 @@ $(function() {
 				$('.show-second').css('display', 'none');
 				$('.show-third').css('display', 'none');
 				$('.show-fourth').css('display', 'none');
-			} else if (!/^([\u4e00-\u9fa5A-Za-z0-9,.?!;,。?!、;])*$/.test(valInput)) {
-				return false;
-				$('.show-first').css('display', 'block');
-				$('.show-second').css('display', 'none');
-				$('.show-third').css('display', 'none');
-				$('.show-fourth').css('display', 'none');
 			} else {
 				$('.show-first').css('display', 'none');
 				$('.show-second').css('display', 'block');
@@ -1156,8 +1130,6 @@ $(function() {
 	$(document).on('click', '.change-but>input', function() {
 		map.clearOverlays();
 		const inpVal = $(this).val();
-		$(this).addClass("xz-active").siblings("input").removeClass("xz-active");
-		$(this).parents(".title-first").siblings("ul").find(".change-but").children("input").removeClass("xz-active");
 		var routePolicy = [
 			// BMAP_TRANSIT_POLICY_RECOMMEND,//推荐
 			// BMAP_TRANSIT_POLICY_LEAST_TRANSFER,//少换成
@@ -1361,6 +1333,12 @@ $(function() {
 		$(this).siblings('.hide2').find('.inp-text2').css('left', '220px');
 		$(this).siblings('.hide2').find('.change-buts2').css('left', '185px');
 		$(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");
+		var hideBlue1 = $(this).siblings('.hide1').css('display');
+		if (hideBlue1 == 'none') {
+			$(this).removeClass("xz-active");
+		}
 	});
 
 	$(document).on('click', '.but-car', function() {
@@ -1376,18 +1354,18 @@ $(function() {
 		$(this).siblings('.hide2').find('.inp-text2').css('left', '220px');
 		$(this).siblings('.hide2').find('.change-buts2').css('left', '185px');
 		$(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");
+		var hideBlue2 = $(this).siblings('.hide2').css('display');
+		if (hideBlue2 == 'none') {
+			$(this).removeClass("xz-active");
+		}
 	});
 
+	// 点击搜索的图标,显示
 	$('.inp-icon1').click(function() {
 		map.clearOverlays();
 		var searchInp = $('.inp').val();
-		if (!/^([\u4e00-\u9fa5A-Za-z0-9,.?!;,。?!、;])*$/.test(searchInp)) {
-			return false;
-			$('.show-first').css('display', 'block');
-			$('.show-second').css('display', 'none');
-			$('.show-third').css('display', 'none');
-			$('.show-fourth').css('display', 'none');
-		}
 		if (searchInp === "") {
 			$('.show-first').css('display', 'block');
 			$('.show-second').css('display', 'none');
@@ -1399,7 +1377,6 @@ $(function() {
 			$('.show-second').css('display', 'none');
 			$('.show-fourth').css('display', 'block');
 		}
-		// const tempInp = searchInp;
 		var options = {
 			renderOptions: {
 				map: map,
@@ -1407,40 +1384,29 @@ $(function() {
 			},
 			onSearchComplete: function(results) {
 				console.log(results);
-				// 	var html4 ="";
-				// 	for(var i = 0; i<results.Kr.length; i++){
-				// 		html4+= "<ul class='title-first'>" +
-				// 			"<li>" +
-				// 			"<span>" + (i+1) + "." + "</span>" + results.Kr[i].title +
-				// 			"</li>" +
-				// 			"<li>" +
-				// 			"<div class='differentdz'>" + "地址:" + "<p  class='jzdz'>" + results.Kr[i].address + "</p>" + "</div>" +
-				// 			"</li>" +
-				// 			"<li class='change-but'>" +
-				// 			"<input type='button' name='' id='' value='公交' class='but-bus' />" +
-				// 			"<input type='button' name='' id='' value='自驾' class='but-car' />" +
-				// 			"<div class='hide1'>" +
-				// 			"<input type='text' name='' value='' placeholder='请输入地址' class='inps' />" +
-				// 			"<div class='inp-text'>此位置</div>" +
-				// 			"<div class='change-buts'></div>" +
-				// 			"<img src='img/ss2.png' class='imgSearch'>" +
-				// 			"</div>" +
-				// 			"<div class='hide2'>" +
-				// 			"<input type='text' name='' value='' placeholder='请输入地址' class='inpst' />" +
-				// 			"<img src='img/ss2.png' class='imgSearch2'>" +
-				// 			"<div class='inp-text2'>此位置</div>" +
-				// 			"<div class='change-buts2'></div>" +
-				// 			"</div>" +
-				// 			"</li>" +
-				// 			"</ul>"
-				// 	}
-				// $("#search-result").empty().append(html4);
-
 			}
 		}
 		var local = new BMap.LocalSearch(map, options);
 		local.search(searchInp);
 	});
 
-
+	// 当屏幕等于375px,将左上角的图片替换成小尺寸
+	$(window).resize(function(e) {
+		if (e.target.innerWidth < '750') {
+			$('.logo-img').attr('src', 'img/map-logo2.png');
+			$('.logo-img').css("width", "257px");
+		} 
+		if (e.target.innerWidth > '750') {
+			$('.logo-img').attr('src', 'img/map-logo2.png');
+			$('.logo-img').css("width", "257px");
+		}
+		if (e.target.innerWidth < '1366') {
+			$('.logo-img').attr('src', 'img/map-logo2.png');
+			$('.logo-img').css("width", "257px");
+		}
+		if (e.target.innerWidth > '1366') {
+			$('.logo-img').attr('src', 'img/map-logo.png');
+			$('.logo-img').css("width", "446px");
+		}
+	});
 })

+ 17 - 9
nngkxxdp/src/main/resources/static/mxt/css/index.css

@@ -115,25 +115,25 @@ li::before {
 	color: #000000;
 }
 
-.block-contanier>div:first-child .top{
-	background: url(../img/rmzf.png) no-repeat;
+.block-contanier>div .top{
+	background: url(../img/najkws.png) no-repeat;
 	background-size: 100% 100%;
 }
 
-.block-contanier>div:nth-child(2) .top{
+/* .block-contanier>div:nth-child(2) .top{
 	background: url(../img/najkws.png) no-repeat;
 	background-size: 100% 100%;
-}
+} */
 .block-contanier>div:nth-child(3){
 	margin-right: 0px;
 }
 .block-contanier>div:nth-child(6){
 	margin-right: 0px;
 }
-.block-contanier>div:nth-child(3) .top{
+/* .block-contanier>div:nth-child(3) .top{
 	background: url(../img/narlsb.png) no-repeat;
 	background-size: 100% 100%;
-}
+} */
 
 /* 鍏紬鍙峰尯鍩熸牱寮� */
 .gzh-contanier {
@@ -141,12 +141,20 @@ li::before {
 	display: flex;
 	justify-content: space-between;
 }
-.gzh-contanier>div{
+/* .gzh-contanier>div{
 	flex: 1;
-}
+} */
 .gzh-contanier .left{
 	margin-right: 20px;
+	width: 450px;
 }
+.gzh-contanier .right {
+	width: 710px;
+}
+.gzh-item {
+	width: 450px;
+}
+
 .gzh {
 	width: 100%;
 	height: 77px;
@@ -348,7 +356,7 @@ li::before {
 }
 .blogpic>div{
 	width: 24%;
-	height: 342px;
+	height: 379px;
 	border: 1px solid #DDDDDD;
 	transition: all 0.5s;
 	cursor: pointer;

+ 6 - 5
nngkxxdp/src/main/resources/static/mxt/mxt.html

@@ -87,20 +87,21 @@
 			</div>
 		</div>
 		<!-- 新浪微博 -->
-		<!-- <div class="blog-contanier">
+		<!--  <div class="blog-contanier">
 			<div class="topic">
 				<span class="left">新浪微博</span>
 			</div>
 			<div class="line"></div>
 			<div class="blogpic">
 				<div class="blog-item" >
-
+					<iframe width="100%" height="400" class="share_self"  frameborder="0" scrolling="no" src="http://widget.weibo.com/weiboshow/index.php?language=&width=0&height=400&fansRow=2&ptype=1&speed=0&skin=1&isTitle=1&noborder=1&isWeibo=1&isFans=1&uid=6491017602&verifier=a36dd8e5&dpc=1"></iframe>
 				</div>
 				<div class="blog-item"></div>
 				<div class="blog-item"></div>
 				<div class="blog-item"></div>
 			</div>
-		</div> -->
+		</div>  -->
+		
 		<!-- 今日头条 -->
 		<div class="jrtt-contanier">
 			<div class="topic">
@@ -119,8 +120,8 @@
 		<!-- 3大板块 -->
 		<div class="three-model">
 			<div class="bottom-item" onclick="openUrl('http://data.cqna.gov.cn/zdjc/decision.html')">决策预公开</div>
-			<div class="bottom-item" onclick="openUrl('http://data.cqna.gov.cn/zdjc/sywj.html')">政策文件库</div>
-			<div class="bottom-item" onclick="openUrl('http://data.cqna.gov.cn/')">数据中心</div>
+			<div class="bottom-item" onclick="openUrl('http://data.cqna.gov.cn/zdjc/sy.html')">政策问答库</div>
+			<div class="bottom-item" onclick="openUrl('http://www.cqna.gov.cn/sjzx/')">数据中心</div>
 		</div>
 		
 		<script src="js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>

+ 19 - 0
nngkxxdp/src/main/resources/static/zdjc/details.html

@@ -52,6 +52,10 @@
                 <i class="layui-icon layui-icon-email" style="font-size: 18px;"></i>
                 我要发表观点
             </li>
+            <li>
+                <i class="layui-icon layui-icon-email" style="font-size: 18px;"></i>
+                征集情况反馈
+            </li>
              <li>
                 <i class="layui-icon layui-icon-file" style="font-size: 18px;"></i>
                 决策文件
@@ -112,6 +116,19 @@
             </div>
             <div class="layui-tab-item"></div>
             <div class="layui-tab-item">
+            	<div class="txt">
+
+                    <div id="pdfDiv"></div>
+                </div>
+				<div class="center"></div>
+				<div class="right">
+                    <div class="title">关联文件</div>
+                    <div>
+                        <ul class="column"></ul>
+                    </div>
+                </div>
+            </div>
+            <div class="layui-tab-item">
                 <div class="txt">
 
                     <div id="pdFile"></div>
@@ -181,9 +198,11 @@
 <div class="foot"></div>
 <script src="./js/jquery-3.5.1.min.js"></script>
 <script src="./layui/layui.js"></script>
+<script src="./pdfjs/build/pdf.js"></script>
 <script src="js/constans.js"></script>
 <script src="../nan/js/yjfk/yjfk_fk.js"></script>
  <script src="./js/details.js"></script>
 <script src="./js/tanchuang.js"></script>
+
 </body>
 </html>

+ 40 - 0
nngkxxdp/src/main/resources/static/zdjc/js/details.js

@@ -118,6 +118,10 @@ function selectPostById() {
             if (result.data){
                 //console.log(result);
                 var postManagement = result.data.postManagement;
+                if (postManagement.pdfContent) {
+                	// 加载pdf
+                	initPdf(postManagement.pdfContent);
+                }
                 var column = result.data.columns;
                 $('#postTitle').empty().append(postManagement.postTitle);
                 $('#draftDecision').empty().append(escape2Html(postManagement.draftInterpretation));
@@ -439,3 +443,39 @@ function openMsg() {
 	  }
 	});
 }
+
+function initPdf(url) {
+	pdfjsLib.GlobalWorkerOptions.workerSrc =
+	    './pdfjs/build/pdf.worker.js';
+	var loadingTask = pdfjsLib.getDocument(url);
+	var pdfDiv = document.getElementById('pdfDiv');
+	loadingTask.promise.then(function(pdf) {
+		for (var i = 1; i<= pdf.numPages; i++) {
+			pdf.getPage(i).then(function(page) {
+				var scale = 1.5;
+				var viewport = page.getViewport({ scale: scale, });
+				// Support HiDPI-screens.
+				var outputScale = window.devicePixelRatio || 1;
+		
+				var canvas = document.createElement('canvas');
+				var context = canvas.getContext('2d');
+				pdfDiv.appendChild(canvas);
+				canvas.width = Math.floor(viewport.width * outputScale);
+				canvas.height = Math.floor(viewport.height * outputScale);
+				canvas.style.width = Math.floor(viewport.width) + "px";
+				canvas.style.height =  Math.floor(viewport.height) + "px";
+		
+				var transform = outputScale !== 1
+				  ? [outputScale, 0, 0, outputScale, 0, 0]
+				  : null;
+		
+				var renderContext = {
+				  canvasContext: context,
+				  transform: transform,
+				  viewport: viewport
+				};
+				page.render(renderContext);
+			});
+		}
+	});
+}