diff --git a/blxc-admin/src/main/java/com/ruoyi/portal/back/controller/NdNewController.java b/blxc-admin/src/main/java/com/ruoyi/portal/back/controller/NdNewController.java index a0d281f..e571066 100644 --- a/blxc-admin/src/main/java/com/ruoyi/portal/back/controller/NdNewController.java +++ b/blxc-admin/src/main/java/com/ruoyi/portal/back/controller/NdNewController.java @@ -47,15 +47,8 @@ public class NdNewController extends BaseController @GetMapping() public String news(ModelMap mmap) { - List cxList = new ArrayList(); List firstItems = ndNewService.getNewsTypes(0L); - for(int i=0;i< firstItems.size();i++){ - CxSelect child = firstItems.get(i); - List secondItems = ndNewService.getNewsTypes(Long.valueOf(child.getV())); - child.setS(secondItems); - cxList.add(child); - } - mmap.put("data", JSON.toJSON(cxList)); + mmap.put("data", firstItems); return prefix + "/list"; } @@ -71,6 +64,13 @@ public class NdNewController extends BaseController List list = ndNewService.selectNdNewList(ndNew); return getDataTable(list); } + @PostMapping("/getNewType") + @ResponseBody + public TableDataInfo getNewType(NdNew ndNew) + { + List firstItems = ndNewService.getNewsTypes(ndNew.getId()); + return getDataTable(firstItems); + } /** * 导出新闻列表 @@ -92,15 +92,18 @@ public class NdNewController extends BaseController @GetMapping("/add") public String add(ModelMap mmap) { - List cxList = new ArrayList(); +// List cxList = new ArrayList(); +// List firstItems = ndNewService.getNewsTypes(0L); +// for(int i=0;i< firstItems.size();i++){ +// CxSelect child = firstItems.get(i); +// List secondItems = ndNewService.getNewsTypes(Long.valueOf(child.getV())); +// child.setS(secondItems); +// cxList.add(child); +// } +// mmap.put("data", JSON.toJSON(cxList)); + List firstItems = ndNewService.getNewsTypes(0L); - for(int i=0;i< firstItems.size();i++){ - CxSelect child = firstItems.get(i); - List secondItems = ndNewService.getNewsTypes(Long.valueOf(child.getV())); - child.setS(secondItems); - cxList.add(child); - } - mmap.put("data", JSON.toJSON(cxList)); + mmap.put("data", firstItems); return prefix + "/add"; } @@ -134,6 +137,7 @@ public class NdNewController extends BaseController String htmlRegex = "<[^>]*>"; // 使用正则表达式去除HTML标签 String output = input.replaceAll(htmlRegex, ""); + output = output.replaceAll(" ", ""); return output; } @@ -144,15 +148,21 @@ public class NdNewController extends BaseController @GetMapping("/edit/{id}") public String edit(@PathVariable("id") Long id, ModelMap mmap) { - List cxList = new ArrayList(); +// List cxList = new ArrayList(); +// List firstItems = ndNewService.getNewsTypes(0L); +// for(int i=0;i< firstItems.size();i++){ +// CxSelect child = firstItems.get(i); +// List secondItems = ndNewService.getNewsTypes(Long.valueOf(child.getV())); +// child.setS(secondItems); +// cxList.add(child); +// } +// mmap.put("data", JSON.toJSON(cxList)); + + List firstItems = ndNewService.getNewsTypes(0L); - for(int i=0;i< firstItems.size();i++){ - CxSelect child = firstItems.get(i); - List secondItems = ndNewService.getNewsTypes(Long.valueOf(child.getV())); - child.setS(secondItems); - cxList.add(child); - } - mmap.put("data", JSON.toJSON(cxList)); + mmap.put("data", firstItems); + + NdNew ndNew = ndNewService.selectNdNewById(id); mmap.put("ndNew", ndNew); return prefix + "/edit"; diff --git a/blxc-admin/src/main/resources/static/Log_img.png b/blxc-admin/src/main/resources/static/Log_img.png new file mode 100644 index 0000000..a70ebae Binary files /dev/null and b/blxc-admin/src/main/resources/static/Log_img.png differ diff --git a/blxc-admin/src/main/resources/static/css/login.css b/blxc-admin/src/main/resources/static/css/login.css index a1f7672..3ec0cf3 100644 --- a/blxc-admin/src/main/resources/static/css/login.css +++ b/blxc-admin/src/main/resources/static/css/login.css @@ -3,14 +3,14 @@ html { } body.signin { height:auto; - background:url(../img/login-background.jpg) no-repeat center fixed; + background:url(../img/login-background.png) no-repeat center fixed; -webkit-background-size:cover; -moz-background-size:cover; -o-background-size:cover; background-size:cover } .signinpanel { - width:750px; + width:900px; margin:10% auto 0; color:rgba(255,255,255,.95) } diff --git a/blxc-admin/src/main/resources/static/css/login.min.css b/blxc-admin/src/main/resources/static/css/login.min.css index 484ee2c..0e4cc9c 100644 --- a/blxc-admin/src/main/resources/static/css/login.min.css +++ b/blxc-admin/src/main/resources/static/css/login.min.css @@ -1 +1 @@ -html{height:100%}body.signin{height:auto;background:url(../img/login-background.jpg) no-repeat center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover}.signinpanel{width:750px;margin:10% auto 0;color:rgba(255,255,255,.95)}.signinpanel .logopanel{float:none;width:auto;padding:0;background:0}.signinpanel .signin-info ul{list-style:none;padding:0;margin:20px 0}.signinpanel .form-control{display:block;margin-top:15px}.signinpanel .uname{background:#fff url(../img/user.png) no-repeat 95% center;color:#333}.signinpanel .pword{background:#fff url(../img/locked.png) no-repeat 95% center;color:#333}.signinpanel .code{background:#fff no-repeat 95% center;color:#333;margin:0 0 15px 0}.signinpanel .btn{margin-top:15px}.signinpanel form{background:rgba(255,255,255,.2);border:1px solid rgba(255,255,255,.3);-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);box-shadow:0 3px 0 rgba(12,12,12,.03);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:30px}.signup-footer{border-top:solid 1px rgba(255,255,255,.3);margin:20px 0;padding-top:15px}@media screen and (max-width:768px){.signinpanel,.signuppanel{margin:0 auto;width:380px!important;padding:20px}.signinpanel form{margin-top:20px}.signup-footer,.signuppanel .form-control{margin-bottom:10px}.signup-footer .pull-left,.signup-footer .pull-right{float:none!important;text-align:center}.signinpanel .signin-info ul{display:none}}@media screen and (max-width:320px){.signinpanel,.signuppanel{margin:0 20px;width:auto}}.checkbox-custom{position:relative;padding:0 15px 0 25px;margin-bottom:7px;display:inline-block}.checkbox-custom input[type="checkbox"]{opacity:0;position:absolute;cursor:pointer;z-index:2;margin:-6px 0 0 0;top:50%;left:3px}.checkbox-custom label:before{content:'';position:absolute;top:50%;left:0;margin-top:-9px;width:18px;height:17px;display:inline-block;border-radius:2px;border:1px solid #bbb;background:#fff}.checkbox-custom input[type="checkbox"]:checked+label:after{position:absolute;display:inline-block;font-family:'Glyphicons Halflings';content:"\e013";top:42%;left:3px;margin-top:-5px;font-size:11px;line-height:1;width:16px;height:16px;color:#333}.checkbox-custom label{cursor:pointer;line-height:1.2;font-weight:normal;margin-bottom:0;text-align:left}.form-control,.form-control:focus,.has-error .form-control:focus,.has-success .form-control:focus,.has-warning .form-control:focus,.navbar-collapse,.navbar-form,.navbar-form-custom .form-control:focus,.navbar-form-custom .form-control:hover,.open .btn.dropdown-toggle,.panel,.popover,.progress,.progress-bar{box-shadow:none}.form-control{border-radius:1px!important;padding:6px 12px!important;height:34px!important}.form-control:focus{border-color:#1ab394!important}body .layer-ext-moon-msg[type="dialog"]{min-width:100px!important}body .layer-ext-moon-msg{background-color:rgba(0,0,0,0.6);color:#fff;border:0}body .layer-ext-moon-msg .layui-layer-content{padding:12px 25px;text-align:center} \ No newline at end of file +html{height:100%}body.signin{height:auto;background:url(../img/login-background.png) no-repeat center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover}.signinpanel{width:900px;margin:10% auto 0;color:rgba(255,255,255,.95)}.signinpanel .logopanel{float:none;width:auto;padding:0;background:0}.signinpanel .signin-info ul{list-style:none;padding:0;margin:20px 0}.signinpanel .form-control{display:block;margin-top:15px}.signinpanel .uname{background:#fff url(../img/user.png) no-repeat 95% center;color:#333}.signinpanel .pword{background:#fff url(../img/locked.png) no-repeat 95% center;color:#333}.signinpanel .code{background:#fff no-repeat 95% center;color:#333;margin:0 0 15px 0}.signinpanel .btn{margin-top:15px}.signinpanel form{background:rgba(255,255,255,.2);border:1px solid rgba(255,255,255,.3);-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);box-shadow:0 3px 0 rgba(12,12,12,.03);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:30px}.signup-footer{border-top:solid 1px rgba(255,255,255,.3);margin:20px 0;padding-top:15px}@media screen and (max-width:768px){.signinpanel,.signuppanel{margin:0 auto;width:380px!important;padding:20px}.signinpanel form{margin-top:20px}.signup-footer,.signuppanel .form-control{margin-bottom:10px}.signup-footer .pull-left,.signup-footer .pull-right{float:none!important;text-align:center}.signinpanel .signin-info ul{display:none}}@media screen and (max-width:320px){.signinpanel,.signuppanel{margin:0 20px;width:auto}}.checkbox-custom{position:relative;padding:0 15px 0 25px;margin-bottom:7px;display:inline-block}.checkbox-custom input[type="checkbox"]{opacity:0;position:absolute;cursor:pointer;z-index:2;margin:-6px 0 0 0;top:50%;left:3px}.checkbox-custom label:before{content:'';position:absolute;top:50%;left:0;margin-top:-9px;width:18px;height:17px;display:inline-block;border-radius:2px;border:1px solid #bbb;background:#fff}.checkbox-custom input[type="checkbox"]:checked+label:after{position:absolute;display:inline-block;font-family:'Glyphicons Halflings';content:"\e013";top:42%;left:3px;margin-top:-5px;font-size:11px;line-height:1;width:16px;height:16px;color:#333}.checkbox-custom label{cursor:pointer;line-height:1.2;font-weight:normal;margin-bottom:0;text-align:left}.form-control,.form-control:focus,.has-error .form-control:focus,.has-success .form-control:focus,.has-warning .form-control:focus,.navbar-collapse,.navbar-form,.navbar-form-custom .form-control:focus,.navbar-form-custom .form-control:hover,.open .btn.dropdown-toggle,.panel,.popover,.progress,.progress-bar{box-shadow:none}.form-control{border-radius:1px!important;padding:6px 12px!important;height:34px!important}.form-control:focus{border-color:#1ab394!important}body .layer-ext-moon-msg[type="dialog"]{min-width:100px!important}body .layer-ext-moon-msg{background-color:rgba(0,0,0,0.6);color:#fff;border:0}body .layer-ext-moon-msg .layui-layer-content{padding:12px 25px;text-align:center} \ No newline at end of file diff --git a/blxc-admin/src/main/resources/static/img/login-background.png b/blxc-admin/src/main/resources/static/img/login-background.png new file mode 100644 index 0000000..2c471a0 Binary files /dev/null and b/blxc-admin/src/main/resources/static/img/login-background.png differ 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 fb4d6ea..e31d1e9 100644 --- a/blxc-admin/src/main/resources/static/portal/css/index.css +++ b/blxc-admin/src/main/resources/static/portal/css/index.css @@ -2491,19 +2491,21 @@ html { width: 33%; } + .homeb .aleft .tzgg { background-size: 100% 100%; - padding: 1rem 1.875rem; + padding: 1rem 1.875rem 0.1rem 1.875rem; background-color: #13439b; } .homeb .aleft .tzgg li { - margin-bottom: 1rem; + margin-bottom: 0.95rem; display: flex; justify-content: space-between; flex-wrap: wrap; color: #fff; } + .jtfylist{ max-height: 31.25rem; } @@ -4432,6 +4434,7 @@ li.A_li9:hover p { padding:0.3rem 1rem; position:absolute; bottom:2.4rem; + overflow: hidden; } .static-name h3{ font-family: "SourceHanSerifCN-Bold" !important; diff --git a/blxc-admin/src/main/resources/static/portal/js/page.js b/blxc-admin/src/main/resources/static/portal/js/page.js index 53f3289..356ff1e 100644 --- a/blxc-admin/src/main/resources/static/portal/js/page.js +++ b/blxc-admin/src/main/resources/static/portal/js/page.js @@ -9,7 +9,7 @@ function generPage(total, dom_page_class) { let domStr = ` -
+
共${total}条 首页 ` diff --git a/blxc-admin/src/main/resources/static/ruoyi.png b/blxc-admin/src/main/resources/static/ruoyi.png index 806cb11..85bf823 100644 Binary files a/blxc-admin/src/main/resources/static/ruoyi.png and b/blxc-admin/src/main/resources/static/ruoyi.png differ diff --git a/blxc-admin/src/main/resources/templates/index-topnav.html b/blxc-admin/src/main/resources/templates/index-topnav.html index c3c674c..61c9947 100644 --- a/blxc-admin/src/main/resources/templates/index-topnav.html +++ b/blxc-admin/src/main/resources/templates/index-topnav.html @@ -4,7 +4,7 @@ - 若依系统首页 + 吉林省新农科长白山创新学院 diff --git a/blxc-admin/src/main/resources/templates/index.html b/blxc-admin/src/main/resources/templates/index.html index 06b8608..462640a 100644 --- a/blxc-admin/src/main/resources/templates/index.html +++ b/blxc-admin/src/main/resources/templates/index.html @@ -4,7 +4,7 @@ - 若依系统首页 + 吉林省新农科长白山创新学院 diff --git a/blxc-admin/src/main/resources/templates/login.html b/blxc-admin/src/main/resources/templates/login.html index 65d96ff..d359462 100644 --- a/blxc-admin/src/main/resources/templates/login.html +++ b/blxc-admin/src/main/resources/templates/login.html @@ -21,15 +21,16 @@ -
+
[ 吉林省新农科长白山创新学院 ]
+
diff --git a/blxc-admin/src/main/resources/templates/news/news/add.html b/blxc-admin/src/main/resources/templates/news/news/add.html index 76a208b..181a26f 100644 --- a/blxc-admin/src/main/resources/templates/news/news/add.html +++ b/blxc-admin/src/main/resources/templates/news/news/add.html @@ -12,13 +12,21 @@
- + +
- +
@@ -101,56 +109,68 @@ - + + + + \ No newline at end of file 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 7662671..d55640d 100644 --- a/blxc-admin/src/main/resources/templates/news/news/editGly.html +++ b/blxc-admin/src/main/resources/templates/news/news/editGly.html @@ -5,213 +5,250 @@ + -
-
- - - - - - - - - - -
- -
- -
- - -
- +
+ + + + + + + + + + + +
+ +
+ +
+ + +
+ +
+
+
+ +
+
+ +
-
- -
-
- - +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
-
- -
- +
+
+ +
+ +
+
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
- -
- -
- -
-
-
- -
- - - - - - + function handleRadioChange() { + var radios = document.getElementsByName("type"); + for (var i = 0; i < radios.length; i++) { + if (radios[i].checked) { + if(radios[i].value == 1){ + $("#contentDiv").show(); + $("#linkUrlDiv").hide(); + } + if(radios[i].value == 2){ + $("#contentDiv").hide(); + $("#linkUrlDiv").show(); + } + break; + } + } + } + + handleRadioChange(); + + \ No newline at end of file diff --git a/blxc-admin/src/main/resources/templates/news/news/list.html b/blxc-admin/src/main/resources/templates/news/news/list.html index b2a170b..a6b7500 100644 --- a/blxc-admin/src/main/resources/templates/news/news/list.html +++ b/blxc-admin/src/main/resources/templates/news/news/list.html @@ -12,15 +12,14 @@
  • - - +
  • - -
@@ -81,7 +80,9 @@
- + + +