Merge branch 'refs/heads/master' into sso

zhsq_qk-system/src/main/resources/mapper/system/QkZwyxHighFrequencyMattersMapper.xml

@@ -81,6 +81,6 @@
     <select id="visualizationList" parameterType="Long"
             resultMap="QkZwyxHighFrequencyMattersResult">
         <include refid="selectQkZwyxHighFrequencyMattersVo"/>
-        ORDER BY CAST(event_count AS SIGNED) DESC;
+        ORDER BY CAST(event_count AS SIGNED) DESC limit 5;
     </select>
 </mapper>

zhsq_qk-ui/src/assets/images/qkq_sprh.css

@@ -1270,13 +1270,14 @@ border-radius: 2px;
 .qkq_bjzs_con{
 	position: relative;
 	background: url(../images/qkq_top.png) no-repeat center;
-	width: 100%;
+	width: 40%;
 	height: 100%;
-	background-size: 40%;
+	background-size: 60%;
+	height: 200px;
 }
 .qkq_bjzs_bg{
 	background: url(../images/qkq_btm.png) no-repeat center;
-	background-size: 47%;
+	background-size: 67%;
 	 content: " ";
 	 width: 100%;
 	 height: 100%;
@@ -1293,13 +1294,13 @@ border-radius: 2px;
 	font-size: 30px;
 	color: #faea12;
 	font-weight: 900;
-	padding-top: 235px;
+	padding-top: 84px;
 }
 .qkq_bjzs_con p{
 	text-align: center;
 	font-size: 18px;
 	color: #fff;
-	padding-top: 50px;
+	padding-top: 28px;
 }
 @keyframes changDeg{
 			0%{
@@ -1311,14 +1312,12 @@ border-radius: 2px;
 		}
 
 .qkq_bjzs_txt{
-	position: absolute;
-	top:80px;
-	left: 2%;
-	width: 96%;
-	height: 100%;
+
+	/* width: 60%;
+	height: 100%; */
 }
 .qkq_bjzs_txt .bjzs_txt{
-	margin-bottom: 45px;
+	margin-bottom: 25px;
 }
 .qkq_bjzs_txt .bjzs_txt p{
 	height: 25px;
@@ -1333,6 +1332,11 @@ padding: 0px;
 padding: 0px;
 color: #00ffff;
 padding-right: 10px;
+}
+.qkq_bjzs_txt_fl{
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
 }
 .qkq_bjzs_txt_fr p{
 	text-align: right!important;
@@ -1343,28 +1347,60 @@ padding-right: 10px;
 	flex-direction: row;
 	justify-content: space-between;
 }
-.qkq_bjs_con .qkq_bjs{
+.qkq_bjs{
 	display: flex;
 	flex-direction: row;
 	justify-content: space-between;
-	margin-top: 50px;
 }
-.qkq_bjs_con .qkq_bjs p{
+.qkq_bjs p{
 	color: #fff;
-	line-height: 30px;
+	line-height: 30px;
+	height: 90px;
+	display: flex;
+	flex-direction: column;
+	padding-top: 10px;
+	margin: 12px auto;
+}
+.qkq_bjs p b i{
+	color: #fff;
+	font-size: 12px;
+	padding-left: 10px;
+}
+.qkq_bjs img{
+	height: 70px;
 }
-.qkq_bjs_con .qkq_bjs p b{
+.qkq_bjs p b{
 	color: #fff;
 	font-size: 24px;
-	padding-right: 10px;
-	color: #bceaf7;
-}
+	padding-top: 31px;
+	color: #fff;
+	display: flex;
+	flex-direction: row;
+	padding-bottom: 20px;
+}
+.qkq_bjss{
+	padding-top: 50px;
+	width: 200px;
+	margin: 0px 20px;
+	text-align: center;
+}
+.qkq_bjss:nth-child(1){
+	background: url(../images/qkq_icon25.png) no-repeat center;
+	background-size: 98%;
+	position: relative;
+}
+.qkq_bjs:nth-child(2){
+	background: url(../images/qkq_icon26.png) no-repeat center;
+background-size: 95%;
+position: relative;
+}
+
 #qkq_bj4{
 	width: 100%;
 	height: 200px;
 }
 #qkq_bj5{
-	width: 50%;
+	width: 100%;
 	height: 200px;
 }
 .qkq_hz2{
@@ -1372,7 +1408,7 @@ padding-right: 10px;
 }
 .qkq_sxtop{
 	height: 200px;
-	overflow-y: scroll;
+	overflow-y: hidden;
 	padding-left: 20px;
 }
 .qkq_sxtop::-webkit-scrollbar{
@@ -1380,8 +1416,8 @@ padding-right: 10px;
 	height: 0px;
 }
 .qkq_sxtop p{
-	height: 35px;
-	line-height: 35px;
+	height: 40px;
+	line-height: 40px;
 	display: flex;
 	flex-direction: row;
 	color: #fff;
@@ -1417,4 +1453,33 @@ display: block;
 }
 .qkq_sxtop p:nth-child(3) i{
 	background: #ffca5e;
-}
+}
+.qkq_gc_div{
+	float: left;
+	width: 50%;
+	height: 90px;
+	padding-top: 15px;
+	padding-left: 3%;
+}
+.qkq_gc_div p{
+	text-align: left;
+	color: #fff;
+	margin-bottom: 10px;
+	font-size: 14px;
+}
+.qkq_gc_div p b{
+	font-size: 26px;
+	color: #00ffff;
+	padding-right: 7px;
+}
+.qkq_gc_con{
+	background:#1b232f;
+}
+#qkq_bjs_01{
+	width: 200px;
+	height: 200px;
+}
+#qkq_bjs_02{
+	width: 100%;
+	height: 200px;
+}