首页 发现 帮助
注册 登录
CQ_JD
/
nazw
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Merge remote-tracking branch 'origin/master'

gt 2 年之前
父节点
1b7a473eeb 53458c6ae0
当前提交
11c7ab8a60
共有 4 个文件被更改，包括 68 次插入 和 28 次删除
分列视图 显示文件统计
  1. 38 11
      nngkxxdp/src/main/resources/static/intelligence/css/mobile_intelligence.css
  2. 3 2
      nngkxxdp/src/main/resources/static/intelligence/mobile_intelligence.html
  3. 25 13
      nngkxxdp/src/main/resources/static/wzkp/css/wzkp.css
  4. 2 2
      nngkxxdp/src/main/resources/static/wzkp/wzkp.html

+ 38 - 11
nngkxxdp/src/main/resources/static/intelligence/css/mobile_intelligence.css
查看文件 

@@ -16,36 +16,52 @@ main {
 
 	height: 13vw;
 
 }
 
 
+.head_tab a {
 
+	display: flex;
 
+	align-items: center;
 
+}
 
+
 
 .head_tab a:first-child {
 
-	margin-left: 28px;
 
+	margin-left: 4vw;
 
 }
 
 
 .head_tab a:last-child {
 
-	margin-right: 28px;
 
+	margin-right: 4vw;
 
 }
 
 
 .head_tab p {
 
 	font-size: 4.26666vw;
 
 }
 
 
+.head_tab a:nth-child(1) img {
 
+	display: inline-block;
 
+	width: 2.53333vw;
 
+	height: 4.53333vw;
 
+}
 
+
 
+.head_tab a:nth-child(3) img {
 
+	display: inline-block;
 
+	width: 4.13333vw;
 
+}
 
+
 
 .wrap_hot_QA {
 
 	height: 26.53333vw;
 
 	background: url(../img/hot_QA_mob.png) no-repeat center;
 
-	margin: 0 28px;
 
+	margin: 0 3.73333vw;
 
 	background-size: cover;
 
 }
 
 
 .hot_QA {
 
 	display: flex;
 
 	flex-wrap: wrap;
 
-	padding: 3vw 0 3vw 1.06666vw;
 
+	padding: 3vw 0 0.5vw 1.06666vw;
 
 	box-sizing: border-box;
 
 	align-items: center;
 
 }
 
 
 .hot_QA img {
 
-	width: 3.2vw;
 
-	height: 2.5vh;
 
+	width: 3.6vw;
 
+	height: 2vh;
 
 	margin-right: 1.46666vw;
 
 }
 
 
@@ -57,7 +73,7 @@ main {
 
 }
 
 
 .hot_text {
 
-	padding: 0 34px 0 41px;
 
+	padding: 0 4.53333vw;
 
 	box-sizing: border-box;
 
 }
 
 
@@ -68,8 +84,8 @@ main {
 
 }
 
 
 .hot_text li div {
 
-	width: 8px;
 
-	height: 8px;
 
+	width: 1.06666vw;
 
+	height: 1.06666vw;
 
 	background: #666666;
 
 	border-radius: 4px;
 
 	margin-right: 1.46666vw;
 
@@ -136,11 +152,21 @@ main {
 
 }
 
 
 .btn_send div:first-child {
 
-	margin: 0 28px;
 
+	margin: 0 3.73333vw;
 
+}
 
+
 
+.btn_send div:first-child img {
 
+	width: 6.4vw;
 
+	height: 6.4vw;
 
 }
 
 
 .btn_send div:last-child {
 
-	margin: 0 28px;
 
+	margin: 0 3.73333vw;
 
+}
 
+
 
+.btn_send div:last-child img {
 
+	width: 6.4vw;
 
+	height: 6.4vw;
 
 }
 
 
 .btn_send input {
 
@@ -150,4 +176,5 @@ main {
 
 	outline: none;
 
 	text-indent: 1vw;
 
 	border-radius: 1vw;
 
+	font-size: 3vw;
 
 }

+ 3 - 2
nngkxxdp/src/main/resources/static/intelligence/mobile_intelligence.html
查看文件 

@@ -2,6 +2,7 @@
 
 <html>
 
 <head>
 
     <meta charset="utf-8">
 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <title>重庆市南岸区人民政府网--智能问答</title>
 
     <link rel="stylesheet" href="css/mobile_intelligence.css">
 
 </head>
 
@@ -44,8 +45,8 @@
 
 
     // 聊天消息固定在底部
 
     var otherHeight = $('.head_tab').outerHeight() + $('.wrap_hot_QA').outerHeight() + $('.btn_send').outerHeight()
 
-    var listHeight = window.outerHeight - otherHeight - 18
 
-    $('.chat_box').css({'height': listHeight + 'vw'})
 
+    var listHeight = window.outerHeight - otherHeight 
+    $('.chat_box').css({'height': listHeight })
 
 
     $(function () {
 
         //加载热点问题

+ 25 - 13
nngkxxdp/src/main/resources/static/wzkp/css/wzkp.css
查看文件 

@@ -9,7 +9,8 @@ body {
 
 }
 
 
 .top_head {
 
-    width: 600px;
 
+    width: 600px !important;
 
+    height: 60px !important;
 
     display: flex;
 
     justify-content: center;
 
     box-shadow: 0px 4px 19px 2px rgba(0, 0, 0, 0.13);
 
@@ -18,21 +19,25 @@ body {
 
 }
 
 
 .top_head li {
 
-    width: 50%;
 
-    height: 60px;
 
-    background: #F7F9FC;
 
-    line-height: 60px;
 
-    font-size: 20px;
 
+    width: 50% !important;
 
+    height: 60px !important;
 
+    background: #F7F9FC !important;
 
+    line-height: 60px !important;
 
+    font-size: 20px !important;
 
     font-family: PingFang SC;
 
-    font-weight: bold;
 
-    color: #333333;
 
-    text-align: center;
 
-    cursor: pointer;
 
+    font-weight: bold !important;
 
+    color: #333333 !important;
 
+    text-align: center !important;
 
+    cursor: pointer !important;
 
 }
 
 
-.top_head li.title_active {
 
-    background: linear-gradient(90deg, #4381DC 0%, #1A60B6 100%);
 
-    color: #FFFFFF;
 
+.top_head .layui-this {
 
+    background: linear-gradient(90deg, #4381DC 0%, #1A60B6 100%) !important;
 
+    color: #FFFFFF !important;
 
+}
 
+
 
+.top_head .layui-this:after {
 
+    border: 0 !important;
 
 }
 
 
 .top_head li:first-child {
 
@@ -688,6 +693,13 @@ body {
 
     border-radius: 0 0 15px 0 !important;
 
 }
 
 
+/* 加扣分详情 */
 
+.add_detailed .rank_title {
 
+    display: flex;
 
+    padding: 50px 0 20px 0;
 
+    align-items: center;
 
+}
 
+
 
 .content_hide thead tr th {
 
     padding: 16px 0 !important;
 
     font-size: 18px !important;

+ 2 - 2
nngkxxdp/src/main/resources/static/wzkp/wzkp.html
查看文件 

@@ -8,7 +8,7 @@
 
 </head>
 
 <body>
 
 <div class="layui-tab layui-tab-brief" lay-filter="newMediaTabBrief">
 
-    <ul class="top_head layui-tab-title branch_street" style="border: none">
 
+    <ul class="top_head layui-tab-title" style="border: none">
 
         <!--        <li class="title_active">网站考评</li>-->
 
         <!--        <li>政务新媒体</li>-->
 
         <li class="layui-this">网站考评</li>
 
@@ -269,7 +269,7 @@
 
                                         </form>
 
                                     </div>
 
                                     <div class="add_detailed">
 
-                                        <div class="rank_title"><span></span>&nbsp;&nbsp;<p>详细数据</p></div>
 
+                                        <div class="rank_title"><span></span>&nbsp;&nbsp;<p>加扣分详情</p></div>
 
                                         <table class="layui-table table_css_two" lay-even lay-skin="line">
 
                                             <colgroup>
 
                                                 <col>