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

nngkxxdp/src/main/resources/static/zdjc/css/wj.css

@@ -119,7 +119,10 @@ a {
     margin-bottom: 17px;
     cursor: pointer;
     text-align: left;
-	height:170px;
+	height: 20px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+	text-wrap: nowrap;
 }
 
 .data-contanier a {

nngkxxdp/src/main/resources/static/zdjc/pc_sy.html

@@ -459,9 +459,9 @@
                             obj_tem.innerHTML = content;
                             var text_content = obj_tem.textContent;
                             var tcontent = escape2Html(text_content);
-                            if (tcontent.length > 300) {
-                                tcontent = tcontent.substring(0, 300) + "...";
-                            }
+                            // if (tcontent.length > 50) {
+                            //     tcontent = tcontent.substring(0, 50) + "...";
+                            // }
                              
                             var  id=data[i]._source.id
                             var url=data[i]._source.policy_original_url
@@ -469,15 +469,13 @@
                             var height
 
                             if(tcontent===''){
-                                tcontent='暂无数据'
-                                height='height:20px'
+                                height='<p style="height:20px">'
                             }else{
-                                height='height:170px'
+                                height='<p >'
                             }
-                            
                             html += '<div class="text_one" onclick="openWindow(\'' + id +'\',\''+ url+ '\')">'
                                 + '<p>' + title + '<span style="margin-left:30px;font-size: 14px;color: #1abdbd; border: 1px solid #1abdbd;display: inline-block;">' + tag + '</span>' + '</p>'
-                                + '<p style="'+height+'">'
+                                + height
                                 + tcontent
                                 + '</p>'
                                 + '<div class="data-contanier">'

nngkxxdp/src/main/resources/static/zdjc/pc_xq.html

@@ -83,7 +83,7 @@
             text-align: center;
             background: #0C67B0;
             margin-right: 10px;
-            width: 61px;
+            width: 100px;
         }
 
         .link>.link-box>.line-right {
@@ -92,6 +92,8 @@
             background: #F2F2F2;
             width: 95%;
             cursor: pointer;
+            overflow: hidden;
+            text-overflow: ellipsis;
         }
 
         .link-box {
@@ -152,7 +154,7 @@
 
                         <div class="link layui-hide">
                             <div class="link-box">
-                                <div class="line-left">原文链接</div>
+                                <div class="line-left">政策原文链接</div>
                                 <div class="line-right"></div>
                             </div>
                         </div>
@@ -732,14 +734,18 @@
         }
 
         function getUrl() {
-            let url = sessionStorage.getItem('ELK_URL')
-            if (url != 'null') {
+            let url = JSON.parse(sessionStorage.getItem('ELK_URL'))
+            console.log(url)
+            if (url != "null") {
+                console.log(1)
                 $('.link').removeClass('layui-hide')
                 $('.link').addClass('layui-show')
-                $('.line-right').html(JSON.parse(url))
+                $('.line-right').html(url)
+               
             } else {
                 $('.link').removeClass('layui-show')
                 $('.link').addClass('layui-hide')
+                
             }
         }
         getUrl()