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

wxdks/src/main/resources/static/zlhbw/jgzs/jgzs.html

@@ -86,7 +86,7 @@
                     中国质量认证中心一贯积极响应政府倡导和政策指引，始终密切关注质量提升和行业发展趋势，为各项政策落实提供定制化解决方案。秉承“守正创新 用心服务”的客户服务理念，传递信任，共同促进诚信社会建设；服务发展，与您携手，共同创新美好质量生活。 -->
                 </p>
                 <!--                <div class="gwlj" id="jggw" onclick="javascript:window.open('https://www.baidu.com','_block')">机构官网：www.baidu.com</div>-->
-                <div class="gwlj" id="jggw">机构官网：www.baidu.com</div>
+                <div class="gwlj" id="jggw"></div>
             </div>
             <!-- 第二部分内容 -->
             <div class="zzzs">

wxdks/src/main/resources/static/zlhbw/js/search.js

@@ -18,7 +18,7 @@ layui.config({
  * 初始点击事件
  */
 function initPageClick() {
-    $('.search-btn').unbind("click").on("click", function (e) {
+    $('.search-btn').unbind("click").on("click", function(e) {
         initPageList();
     })
 
@@ -29,8 +29,8 @@ function initPageClick() {
  */
 function initPageList() {
     if (sessionStorage.getItem('search-val')) {
-    	$('#search').val(sessionStorage.getItem('search-val'));
-    	sessionStorage.setItem('search-val', '');
+        $('#search').val(sessionStorage.getItem('search-val'));
+        sessionStorage.setItem('search-val', '');
     }
     var keyword = $('#search').val();
     $.ajax({
@@ -43,45 +43,46 @@ function initPageList() {
             'limit': paging.limit
         },
         success: function(json) {
-        $('.main').empty();
+            $('.main').empty();
             if (json.data) {
                 const data = json.data;
                 var html = '';
                 for (var i = 0; i < data.length; i++) {
-                	var newName = data[i].name;
-                	if (data[i].stype == 2) {
-                		switch(parseInt(data[i].name)) {
-                			case 1:
+                    var newName = data[i].name;
+                    if (data[i].stype == 2) {
+                        switch (parseInt(data[i].name)) {
+                            case 1:
                                 newName = '政府部门用户';
                                 break;
-                			case 2:
+                            case 2:
                                 newName = '企事业单位用户';
                                 break;
-                			case 3:
+                            case 3:
                                 newName = '社会组织用户';
                                 break;
-                			case 4:
+                            case 4:
                                 newName = '消费者用户';
                                 break;
-                			default:
-                			    break;
-                		}
-                	}
-                	console.log(newName)
-                	console.log(data[i])
-                    html += '<div class="quesList" onclick="clickDetail(\''+ data[i].id +'\',\''+ data[i].stype +'\',\'' + data[i].columnId +'\',\''+ data[i].name + '\')">'
-                            + '<div class="article-title">'
-                            + '<div class="sort '+ (data[i].stype == 2? 'jg':'') +'" >' + newName + '</div>'
-                            + '<div class="btname '+ (data[i].stype == 2? 'jgname':'') +'">' + (keyword ? data[i].title.replaceAll(keyword, '<span class="gjz">' + keyword + '</span>'): data[i].title) + '</div>'
-                            + '</div>'
-                            + '<div class="article-content">'
-                            + (keyword && data[i].summary ? data[i].summary.replaceAll(keyword, '<span class="gjz">' + keyword + '</span>') : data[i].summary)
-                            + '</div>'
-                            + '<div class="article-end">'
-                            + '<span class="source '+ (data[i].stype == 2? 'jgname':'') +'">' + (data[i].editor ? data[i].editor : (data[i].stype == 1 ? '暂无来源' : "暂无联系地址")) + '</span>'
-                            + '<span class="time">' + data[i].releaseDate.split(' ')[0] + '</span>'
-                            + '</div>'
-                            + '</div>'
+                            default:
+                                break;
+                        }
+                    }
+                    console.log(newName)
+                    console.log(data[i])
+                    newName = newName.indexOf("t") !== -1 ? "机构" : newName
+                    html += '<div class="quesList" onclick="clickDetail(\'' + data[i].id + '\',\'' + data[i].stype + '\',\'' + data[i].columnId + '\',\'' + data[i].title + '\')">' +
+                        '<div class="article-title">' +
+                        '<div class="sort ' + (data[i].stype == 2 ? 'jg' : '') + '" >' + newName + '</div>' +
+                        '<div class="btname ' + (data[i].stype == 2 ? 'jgname' : '') + '">' + (keyword ? data[i].title.replaceAll(keyword, '<span class="gjz">' + keyword + '</span>') : data[i].title) + '</div>' +
+                        '</div>' +
+                        '<div class="article-content">' +
+                        (keyword && data[i].summary ? data[i].summary.replaceAll(keyword, '<span class="gjz">' + keyword + '</span>') : data[i].summary) +
+                        '</div>' +
+                        '<div class="article-end">' +
+                        '<span class="source ' + (data[i].stype == 2 ? 'jgname' : '') + '">' + (data[i].editor ? data[i].editor : (data[i].stype == 1 ? '暂无来源' : "暂无联系地址")) + '</span>' +
+                        '<span class="time">' + data[i].releaseDate.split(' ')[0] + '</span>' +
+                        '</div>' +
+                        '</div>'
                 }
                 // console.log(html.replaceAll(keyword, '<span class="gjz">' + keyword + '</span>'))
                 $('.main').append(html);
@@ -95,8 +96,8 @@ function initPageList() {
                     limit: paging.limit,
                     limits: [10, 20, 30, 40, 50, 60, 70],
                     layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
-                    jump: function (obj, first) {
-                        if (paging.curr !== obj.curr || paging.limit !== obj.limit){
+                    jump: function(obj, first) {
+                        if (paging.curr !== obj.curr || paging.limit !== obj.limit) {
                             paging.limit = obj.limit;
                             paging.curr = obj.curr;
                             initPageList();
@@ -111,27 +112,27 @@ function initPageList() {
 }
 
 function clickDetail(id, type, columnId, columnName) {
-	if (type == 1) {
-		sessionStorage.setItem('jgjj-id', id);
-		sessionStorage.setItem('column-id', columnId);
-		sessionStorage.setItem('column-name', columnName);
-		window.open('jgjj/jgjj.html');
-	} else {
-	    sessionStorage.setItem('company-id', id);
-	    sessionStorage.setItem('column-name', '搜索');
+    if (type == 1) {
+        sessionStorage.setItem('jgjj-id', id);
+        sessionStorage.setItem('column-id', columnId);
+        // sessionStorage.setItem('column-name', columnName);
+        window.open('jgjj/jgjj.html');
+    } else {
+        sessionStorage.setItem('company-id', id);
+        sessionStorage.setItem('column-name', columnName);
         window.open('jgzs/jgzs.html');
-	}
+    }
 }
 var swiper = new Swiper(".topSwiper", {
-	spaceBetween: 30,
-	centeredSlides: true,
-	autoplay: {
-		delay: 2500,
-		disableOnInteraction: false,
-	},
-	pagination: {
-		el: ".swiper-pagination",
-		clickable: true,
-	},
+    spaceBetween: 30,
+    centeredSlides: true,
+    autoplay: {
+        delay: 2500,
+        disableOnInteraction: false,
+    },
+    pagination: {
+        el: ".swiper-pagination",
+        clickable: true,
+    },
 
-});
+});