From 62fff0da7baeb59575a9c7740817a0877d242b1f Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 11 Sep 2024 20:21:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysLoginController.java | 19 ++ .../resources/static/portal/css/index.css | 11 +- .../templates/news/news/editGly.html | 244 +++++++++--------- .../resources/templates/portal/details.html | 6 +- .../main/resources/templates/portal/list.html | 5 +- 5 files changed, 159 insertions(+), 126 deletions(-) diff --git a/blxc-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/blxc-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index ee551f1..957a057 100644 --- a/blxc-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/blxc-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -123,6 +123,25 @@ public class SysLoginController extends BaseController ndNew.setNewType("13"); List yqljList = ndNewService.selectNdNewList(ndNew); mmap.put("yqljList", yqljList); + + + if(StringUtils.equals("14",newType) || StringUtils.equals("17",newType) || StringUtils.equals("37",newType) || StringUtils.equals("42",newType) ){ + ndNew.setNewType(newType); + List list222 = ndNewService.selectNdNewList(ndNew); + if(list222!=null && list222.size()>0){ + NdNew ndNew22 = list222.get(0); + mmap.put("info", ndNew22); + ndNew22.setClickRate(ndNew22.getClickRate()+1); + ndNewService.updateNdNew(ndNew22); + }else{ + NdNew ndNew22 = new NdNew(); + ndNew22.setTitle("暂无数据"); + mmap.put("info", ndNew22); + } + return "portal/details"; + } + + return "portal/list"; } diff --git a/blxc-admin/src/main/resources/static/portal/css/index.css b/blxc-admin/src/main/resources/static/portal/css/index.css index e31d1e9..17e17ef 100644 --- a/blxc-admin/src/main/resources/static/portal/css/index.css +++ b/blxc-admin/src/main/resources/static/portal/css/index.css @@ -402,7 +402,7 @@ html { text-align: center; color: #ccc; line-height: 1.2rem; - font-size: .56rem; + font-size: .86rem; border-bottom: 0; } @@ -4484,7 +4484,6 @@ li.A_li9:hover p { } .portal_list li{ - padding: 1.6rem 0; border-bottom: .04rem dashed rgba(0,0,0,0.2); } @@ -4499,15 +4498,15 @@ li.A_li9:hover p { } .ta{ - padding-bottom: .8rem; - margin-bottom: .8rem; - border-bottom: .04rem solid #113a85; + margin-top: 5px; + margin-bottom: 5px; color: #113a85; font-family: "time"; } .title{ - margin: .6rem 0 1.4rem; + margin-top: 5px; + margin-bottom: 5px; } .fnt_22 { diff --git a/blxc-admin/src/main/resources/templates/news/news/editGly.html b/blxc-admin/src/main/resources/templates/news/news/editGly.html index d55640d..1222353 100644 --- a/blxc-admin/src/main/resources/templates/news/news/editGly.html +++ b/blxc-admin/src/main/resources/templates/news/news/editGly.html @@ -5,37 +5,24 @@ -
- - - - - - - - -
- +
- -
-
-
+
@@ -78,7 +65,7 @@
-
+
@@ -96,24 +83,6 @@
- - - - - - - - - - - - - - - - - -
@@ -123,9 +92,12 @@ - + + \ No newline at end of file diff --git a/blxc-admin/src/main/resources/templates/portal/details.html b/blxc-admin/src/main/resources/templates/portal/details.html index cefa2f2..0ca37f2 100644 --- a/blxc-admin/src/main/resources/templates/portal/details.html +++ b/blxc-admin/src/main/resources/templates/portal/details.html @@ -40,14 +40,14 @@
-

[[${info.title}]]

-
    +

    [[${info.title}]]

    +
    • 日期：[[${#dates.format(info.publishTime, 'YYYY-MM-dd')}]]
    • 编辑：[[${info.sourceAuthor}]]
    • 点击率：[[${info.clickRate}]]
-
+
diff --git a/blxc-admin/src/main/resources/templates/portal/list.html b/blxc-admin/src/main/resources/templates/portal/list.html index 8277b2b..afdc151 100644 --- a/blxc-admin/src/main/resources/templates/portal/list.html +++ b/blxc-admin/src/main/resources/templates/portal/list.html @@ -104,7 +104,8 @@
${item.title}
` if(item.abstracts){ - prve +=`
${item.abstracts}
` +// prve +=`
${item.abstracts}
` + prve +=`
` }else{ prve +=`
` } @@ -112,7 +113,7 @@ prve +=`
${item.publishTime}
-
发布时间
+