Merge branch 'master' of http://120.78.165.83:8123/git/nazw

nngkxxdp/src/main/java/com/example/nngkxxdp/dao/TjDao.java

@@ -259,4 +259,8 @@ public interface TjDao {
     Integer clearDeptChnlid();
 
     List<Map<String, Object>> getDeptChnlid();
+
+    void deleteRecord(Date firstDay, Date lastDay);
+
+    void deleteDeptRecord(String thisMonth);
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/util/WzkpRecordUtil.java

@@ -83,6 +83,9 @@ public class WzkpRecordUtil {
             cl4.add(Calendar.MONTH, -1);
             String thisMonth = DateUtil.format(cl4.getTime(), "yyyy-MM");
             logger.info("开始生成" + thisMonth + "网站考评的数据");
+            //清空本月的数据
+            tjDao.deleteRecord(firstDay, lastDay);
+            tjDao.deleteDeptRecord(thisMonth);
             // 查询是否已初始化
             Integer count = tjDao.getCountWebsiteRating(null, thisMonth);
             // 部门基础分值配置
@@ -141,7 +144,7 @@ public class WzkpRecordUtil {
                     gzqkkfCh.add("动态要闻");
                     StringJoiner gzqkkfZd = new StringJoiner(",");
                     if (hlwDataList.size() > 0) {
-                        for (int j = 0; j < hlwDataList.size(); j++) {
+                        for (int j = 0; j <= hlwDataList.size(); j++) {
                             if (j == 0) {
                                 Date time1 = sdf.parse(hlwDataList.get(j).get("docreltime").toString());
                                 if (exchangeTime(time1) - exchangeTime(firstDay) >= 14) {
@@ -149,12 +152,12 @@ public class WzkpRecordUtil {
                                     gzqkkfCh.add(hlwDataList.get(j).get("channelname").toString());
                                     gzqkkfZd.add(hlwDataList.get(j).get("chnlid").toString());
                                 }
-                            } else if (j == hlwDataList.size() - 1) {
-                                Date time1 = sdf.parse(hlwDataList.get(j).get("docreltime").toString());
+                            } else if (j == hlwDataList.size()) {
+                                Date time1 = sdf.parse(hlwDataList.get(j - 1).get("docreltime").toString());
                                 if (exchangeTime(lastDay) - exchangeTime(time1) >= 14) {
                                     gzqksum = gzqksum + 1;
-                                    gzqkkfCh.add(hlwDataList.get(j).get("channelname").toString());
-                                    gzqkkfZd.add(hlwDataList.get(j).get("chnlid").toString());
+                                    gzqkkfCh.add(hlwDataList.get(j - 1).get("channelname").toString());
+                                    gzqkkfZd.add(hlwDataList.get(j - 1).get("chnlid").toString());
                                 }
                             } else {
                                 Date time1 = sdf.parse(hlwDataList.get(j - 1).get("docreltime").toString());
@@ -304,7 +307,7 @@ public class WzkpRecordUtil {
             }
             tjDao.saveNewRecord(tRecordList);
             logger.info("生成加扣分详情成功!");
-            logger.info(thisMonth+"网站考评分数生成成功!");
+            logger.info(thisMonth + "网站考评分数生成成功!");
         } catch (Exception e) {
             e.printStackTrace();
         }

nngkxxdp/src/main/resources/application.yml

@@ -36,4 +36,3 @@ huaweiAddress:
   responseUrl: https://cbs-ext.cn-north-4.myhuaweicloud.com/v1/0e787d77ed8091292f83c002f3a16d7b/qabots/b5b458e8-7a94-4163-9119-321304a83bf5/chat
 
 
-

nngkxxdp/src/main/resources/mapper/TjDao.xml

@@ -469,4 +469,21 @@
         ORDER BY a.deptid;
     </select>
 
+    <delete id="deleteRecord">
+        DELETE
+        FROM
+            t_record
+        WHERE
+            create_time BETWEEN #{firstDay}
+                AND #{lastDay};
+    </delete>
+
+    <delete id="deleteDeptRecord">
+        DELETE
+        FROM
+            t_dept_record
+        WHERE
+            month_time = #{thisMonth};
+    </delete>
+
 </mapper>

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

@@ -581,9 +581,6 @@ body {
 	margin-top: 8px;
 	flex-wrap: wrap;
 }
-.first_erw{
-	margin-right: 14px;
-}
 
 .three_tag {
 	height: 26px;
@@ -1146,19 +1143,31 @@ body {
 	display: flex;
 	align-items: center;
 }
+.first_erw{
+	margin-right: 14px;
+}
+.second_erw{
+	margin-right: 14px;
+}
+.back_sy{
+	color: #FFFFFF;
+}
+.back_sy:hover{
+	color: #fff;
+}
 
 @media screen and (max-width: 1366px) {
 	.left-logo {
-		width: 446px;
+		width: 316px;
 		margin-left: 20px;
 		margin-top: 17px;
 	}
 	.logo-img{
-		height: 60px;
+		height: 47px;
 	}
 	.right-search{
 		width: 40%;
-		margin: 8px 0 20px 45px;
+		margin: 8px 0 20px 36px;
 	}
 	.input-icon{
 		width:400px;
@@ -1200,7 +1209,20 @@ body {
 	}
 }
 
-@media screen and (min-width: 1441px) and (max-width: 1680px) {
+@media screen and (min-width: 1367px) and (max-width: 1400px) {
+	.left-logo{
+		width: 325px;
+	}
+	.logo-img{
+		height: 49px;
+	}
+	.right-search {
+		width: 39%;
+		margin: 8px 0 20px 46px;
+	}
+	.input-icon{
+		width: 393px;
+	}
 	.erw{
 		margin-right: 10px;
 	}
@@ -1210,11 +1232,11 @@ body {
 		overflow: hidden;
 		white-space: nowrap;
 		box-sizing: border-box;
-		width: 23.79% !important;
+		width: 25.79% !important;
 	}
 	
 	.flex_text {
-		width: 138%;
+		width: 150%;
 		font-size: 14px;
 	}
 	
@@ -1223,7 +1245,7 @@ body {
 	}
 
 	.flex_box li:nth-child(1) .img_tab .flex_text {
-		width: 138%;
+		width: 153%;
 	}
 
 	.mapnav {
@@ -1236,6 +1258,19 @@ body {
 }
 
 @media screen and (min-width: 1401px) and (max-width: 1440px) {
+	.left-logo{
+		width: 325px;
+	}
+	.logo-img{
+		height: 49px;
+	}
+	.right-search {
+		width: 39%;
+		margin: 8px 0 20px 46px;
+	}
+	.input-icon{
+		width: 393px;
+	}
 	.erw{
 		margin-right: 10px;
 	}
@@ -1270,7 +1305,19 @@ body {
 	}
 }
 
-@media screen and (min-width: 1367px) and (max-width: 1400px) {
+@media screen and (min-width: 1441px) and (max-width: 1680px) {
+	.left-logo{
+		width: 372px;
+	}
+	.logo-img{
+		height: 56px;
+	}
+	.right-search{
+		width: 42%;
+	}
+	.input-icon{
+		width: 450px;
+	}
 	.erw{
 		margin-right: 10px;
 	}
@@ -1280,11 +1327,11 @@ body {
 		overflow: hidden;
 		white-space: nowrap;
 		box-sizing: border-box;
-		width: 25.79% !important;
+		width: 23.79% !important;
 	}
 	
 	.flex_text {
-		width: 150%;
+		width: 138%;
 		font-size: 14px;
 	}
 	
@@ -1293,7 +1340,7 @@ body {
 	}
 
 	.flex_box li:nth-child(1) .img_tab .flex_text {
-		width: 153%;
+		width: 138%;
 	}
 
 	.mapnav {

nngkxxdp/src/main/resources/static/district/js/map.json

@@ -549,6 +549,18 @@
 			"tel": "023-62511159"
 		},
 		{
+			"dep": "重庆市第十一中",
+			"address": "重庆市南岸区弹子石一村159号重庆市第十一中",
+			"type": "中学",
+			"specialtype": "中学",
+			"tag": "第一批全国学校体育工作示范学校",
+			"tag2": "国家级、市级传统项目学校（田径）",
+			"tag3": "市级学生艺术团学校合唱艺术分团",
+			"content": "重庆市第十一中学校于1912年建校，1982年成为四川省首批重点中学，1997年成为重庆市直辖后首批重点中学，2017年授牌为“重庆市海军青少年航空学校”，2018年授牌为“中国科学院大学重庆学院附属科技中学”并设立了张景中院士数学教育工作站，现已发展为具有区域示范引领作用的高品质教育集团。在百余年的办学历程中，为国家民族的振兴培养了以革命家（红四军军长王良）、外交家（新中国第一位女大使丁雪松）、科学家（中科院院士、色谱学奠基人卢佩章）、经济学家（吴敬琏）、亚洲飞人（陈家全）、教育家（裴娣娜）等为代表的一大批优秀人才，学校先后荣获全国德育先进集体、全国体育先进集体、全国艺术教育先进集体、全国五四红旗团委、全国国防教育示范学校、重庆市最佳文明单位、重庆市文明校园等多项荣誉称号。",
+			"img": "/image/dsyz.jpg",
+			"tel": "023-62511889"
+		},
+		{
 			"dep": "重庆市第三十九中学校",
 			"address": "重庆市第三十九中学校",
 			"type": "中学",

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

@@ -440,37 +440,37 @@ $(function() {
 		} else if (tabtext == '产业园') {
 			xxGEO(cyy);
 			xrxx(cyy);
-			$('.flex_box').css('padding-top',$('.wrap_fwdt').outerHeight());
+			$('.flex_box').css('padding-top',$('.wrap_fwdt').outerHeight()+10);
 			$('.title-first1:nth-child(2)').css('padding-top',60);
 			$('.left-map').scrollTop(0);
 		} else if (tabtext == '停车') {
 			xxGEO(tc);
 			xrxx(tc);
-			$('.flex_box').css('padding-top',$('.wrap_fwdt').outerHeight());
+			$('.flex_box').css('padding-top',$('.wrap_fwdt').outerHeight()+10);
 			$('.title-first1:nth-child(2)').css('padding-top',60);
 			$('.left-map').scrollTop(0);
 		} else if (tabtext == '不动产登记') {
 			xxGEO(bdcdjzxbsdt);
 			xrxx(bdcdjzxbsdt);
-			$('.flex_box').css('padding-top',$('.wrap_fwdt').outerHeight());
+			$('.flex_box').css('padding-top',$('.wrap_fwdt').outerHeight()+10);
 			$('.title-first1:nth-child(2)').css('padding-top',60);
 			$('.left-map').scrollTop(0);
 		}else if(tabtext == "公厕"){
 			xxGEO(gc);
 			xrxx(gc);
-			$('.flex_box').css('padding-top',$('.wrap_fwdt').outerHeight());
+			$('.flex_box').css('padding-top',$('.wrap_fwdt').outerHeight()+10);
 			$('.title-first1:nth-child(2)').css('padding-top',60);
 			$('.left-map').scrollTop(0);
 		}else if(tabtext == "公租房"){
 			xxGEO(fwglzx);
 			xrxx(fwglzx);
-			$('.flex_box').css('padding-top',$('.wrap_fwdt').outerHeight());
+			$('.flex_box').css('padding-top',$('.wrap_fwdt').outerHeight()+10);
 			$('.title-first1:nth-child(2)').css('padding-top',60);
 			$('.left-map').scrollTop(0);
 		}else if(tabtext == "公积金"){
 			xxGEO(gjj);
 			xrxx(gjj);
-			$('.flex_box').css('padding-top',$('.wrap_fwdt').outerHeight());
+			$('.flex_box').css('padding-top',$('.wrap_fwdt').outerHeight()+10);
 			$('.title-first1:nth-child(2)').css('padding-top',60);
 			$('.left-map').scrollTop(0);
 		}
@@ -1044,14 +1044,15 @@ $(function() {
 		var fdisplay = $(this).parents('.text-second').siblings('.flex_box').children('.flex_li').css('display');
 		$(".title-first1").fadeIn(600);
 		$('.flex_box').removeAttr('style');
-		if (TFdisplay == 'flex' && fdisplay == 'none') {
-			$(this).text('返回');
-			$(".title-first1").fadeOut(0);
-			$(".flex_li").fadeIn(600);
-			$('.text-second').empty();
-			$('.flex_li').find('.flex_text').removeAttr('style').parent('.img_tab').siblings('.pop').find('.mapnav').removeClass('choice');
-			window.location.reload();
-		}
+		$(this).text('返回');
+		$(".title-first1").fadeOut(0);
+		$(".flex_li").fadeIn(600);
+		$('.text-second').empty();
+		$('.flex_li').find('.flex_text').removeAttr('style').parent('.img_tab').siblings('.pop').find('.mapnav').removeClass('choice');
+		window.location.reload();
+		// if (TFdisplay == 'flex' && fdisplay == 'none') {
+			
+		// }
 		// else if(TFdisplay == 'none' && fdisplay == 'list-item'){
 		// 	// console.log(1111)
 		// 	// $('.text-second').empty();
@@ -1219,19 +1220,13 @@ $(function() {
 		map.addOverlay(marker);
 		if (getIndex) {
 			marker.openInfoWindow(infoWindow);
-			$(".one_bus").click(async function() {
+			$(".one_bus").click(function() {
 				var _this = this;
-				await new Promise(function (resolve, reject) {
-					busClickEvent(_this);
-					resolve();
-				});
+				busClickEvent(_this);
 			});
-			$(".two_car").click(async function() {
+			$(".two_car").click(function() {
 				var _this = this;
-				await new Promise(function (resolve, reject)  {
-					drivingClickEvent(_this);
-					resolve();
-				});
+				drivingClickEvent(_this);
 			});
 			$('.correct_html').click(function(){
 				var address_text = $(this).parent(".address_box").find("p:nth-child(1)").text();
@@ -1249,19 +1244,13 @@ $(function() {
 			map.openInfoWindow(infoWindow, point); //开启信息窗口
 		});
 		infoWindow.addEventListener("open", function () {
-			$(".one_bus").click(async function () {
+			$(".one_bus").click(function () {
 				var that = this;
-				await new Promise(function (resolve, reject) {
-					busClickEvent(that);
-					resolve();
-				});
+				busClickEvent(that);
 			});
-			$(".two_car").click(async function () {
+			$(".two_car").click(function () {
 				var that = this;
-				await new Promise(function (resolve, reject)  {
-					drivingClickEvent(that);
-					resolve();
-				});
+				drivingClickEvent(that);
 			});
 			$('.correct_html').click(function(){
 				var address_text = $(this).parent(".address_box").find("p:nth-child(1)").text();

nngkxxdp/src/main/resources/static/district/sy.html

@@ -58,6 +58,7 @@
 			<div class="erw">
 				<img src="./img/first-ewm-2.png" alt="" class="first_erw">
 				<img src="./img/second-erm.png" alt="" class="second_erw">
+				<a href="https://www.cqna.gov.cn/" class="back_sy">返回网站首页</a>
 			</div>
 		</div>
 		<div class="main">
@@ -749,16 +750,12 @@
 		</div>
 		<div class="htm"></div>
 		<!-- <script type="text/javascript" src="../page/js/constans.js"></script> -->
-		<script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/7.10.4/polyfill.min.js"></script>
 		<script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=4L6UzXBVZxG1jWopGBxRdq5kdW3L36Du"></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 type="text/javascript" src="./layui/layui.js"></script>
 		<script type="text/javascript" src="./js/jquery-3.5.1.min.js"></script>
-		<!-- <script src="./js/babel-polyfill/dist/polyfill.min.js"></script> -->
-		<!-- <script src="./js/babel-polyfill/browser.js"></script> -->
-		<!-- <script src="./js/district.js"></script> -->
 		<script src="./js/sy.js" type="text/javascript" charset="utf-8"></script>
 	</body>
 </html>