1

2025-05-13 13:36:08 +08:00 · 2025-05-13 13:36:08 +08:00 · 5c21042073
parent a8abd8e55f
commit 5c21042073
23 changed files with 872 additions and 150 deletions
--- a/blxc-admin/src/main/java/com/ruoyi/portal/back/mapper/NdNewMapper.java
+++ b/blxc-admin/src/main/java/com/ruoyi/portal/back/mapper/NdNewMapper.java
@ -63,4 +63,6 @@ public interface NdNewMapper


    public List<CxSelect> getNewsTypes(Long parentId);
+
+    List<NdNew> selectTplbList(NdNew tplb);
 }
--- a/blxc-admin/src/main/java/com/ruoyi/portal/back/service/INdNewService.java
+++ b/blxc-admin/src/main/java/com/ruoyi/portal/back/service/INdNewService.java
@ -62,4 +62,6 @@ public interface INdNewService
    public int deleteNdNewById(Long id);

    public List<CxSelect> getNewsTypes(Long parentId);
+
+    List<NdNew> selectTplbList(NdNew tplb);
 }
--- a/blxc-admin/src/main/java/com/ruoyi/portal/back/service/impl/NdNewServiceImpl.java
+++ b/blxc-admin/src/main/java/com/ruoyi/portal/back/service/impl/NdNewServiceImpl.java
@ -104,5 +104,10 @@ public class NdNewServiceImpl implements INdNewService
        return ndNewMapper.getNewsTypes(parentId);
    }

+    @Override
+    public List<NdNew> selectTplbList(NdNew tplb) {
+        return ndNewMapper.selectTplbList(tplb);
+    }
+

 }
--- a/blxc-admin/src/main/java/com/ruoyi/portal/system/controller/NdLbtController.java
+++ b/blxc-admin/src/main/java/com/ruoyi/portal/system/controller/NdLbtController.java
@ -0,0 +1,120 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.NdLbt;
+import com.ruoyi.system.service.INdLbtService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 轮播图Controller
+ * 
+ * @author ruoyi
+ * @date 2024-09-20
+ */
+@Controller
+@RequestMapping("/system/lbt")
+public class NdLbtController extends BaseController
+{
+    private String prefix = "lbt";
+
+    @Autowired
+    private INdLbtService ndLbtService;
+
+    @GetMapping()
+    public String lbt()
+    {
+        return prefix + "/lbt";
+    }
+
+    /**
+     * 查询轮播图列表
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(NdLbt ndLbt)
+    {
+        startPage();
+        List<NdLbt> list = ndLbtService.selectNdLbtList(ndLbt);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出轮播图列表
+     */
+    @Log(title = "轮播图", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(NdLbt ndLbt)
+    {
+        List<NdLbt> list = ndLbtService.selectNdLbtList(ndLbt);
+        ExcelUtil<NdLbt> util = new ExcelUtil<NdLbt>(NdLbt.class);
+        return util.exportExcel(list, "轮播图数据");
+    }
+
+    /**
+     * 新增轮播图
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存轮播图
+     */
+    @Log(title = "轮播图", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(NdLbt ndLbt)
+    {
+        return toAjax(ndLbtService.insertNdLbt(ndLbt));
+    }
+
+    /**
+     * 修改轮播图
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        NdLbt ndLbt = ndLbtService.selectNdLbtById(id);
+        mmap.put("ndLbt", ndLbt);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存轮播图
+     */
+    @Log(title = "轮播图", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(NdLbt ndLbt)
+    {
+        return toAjax(ndLbtService.updateNdLbt(ndLbt));
+    }
+
+    /**
+     * 删除轮播图
+     */
+    @Log(title = "轮播图", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(ndLbtService.deleteNdLbtByIds(ids));
+    }
+}
--- a/blxc-admin/src/main/java/com/ruoyi/portal/system/domain/NdLbt.java
+++ b/blxc-admin/src/main/java/com/ruoyi/portal/system/domain/NdLbt.java
@ -0,0 +1,61 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 轮播图对象 nd_lbt
+ * 
+ * @author ruoyi
+ * @date 2024-09-20
+ */
+public class NdLbt extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**  */
+    private Long id;
+
+    /** 轮播图 */
+    @Excel(name = "轮播图")
+    private String filePath;
+    private String sort;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setFilePath(String filePath) 
+    {
+        this.filePath = filePath;
+    }
+
+    public String getFilePath() 
+    {
+        return filePath;
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("filePath", getFilePath())
+            .append("sort", getSort())
+            .toString();
+    }
+}
--- a/blxc-admin/src/main/java/com/ruoyi/portal/system/mapper/NdLbtMapper.java
+++ b/blxc-admin/src/main/java/com/ruoyi/portal/system/mapper/NdLbtMapper.java
@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.NdLbt;
+
+/**
+ * 轮播图Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-09-20
+ */
+public interface NdLbtMapper 
+{
+    /**
+     * 查询轮播图
+     * 
+     * @param id 轮播图主键
+     * @return 轮播图
+     */
+    public NdLbt selectNdLbtById(Long id);
+
+    /**
+     * 查询轮播图列表
+     * 
+     * @param ndLbt 轮播图
+     * @return 轮播图集合
+     */
+    public List<NdLbt> selectNdLbtList(NdLbt ndLbt);
+
+    /**
+     * 新增轮播图
+     * 
+     * @param ndLbt 轮播图
+     * @return 结果
+     */
+    public int insertNdLbt(NdLbt ndLbt);
+
+    /**
+     * 修改轮播图
+     * 
+     * @param ndLbt 轮播图
+     * @return 结果
+     */
+    public int updateNdLbt(NdLbt ndLbt);
+
+    /**
+     * 删除轮播图
+     * 
+     * @param id 轮播图主键
+     * @return 结果
+     */
+    public int deleteNdLbtById(Long id);
+
+    /**
+     * 批量删除轮播图
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteNdLbtByIds(String[] ids);
+}
--- a/blxc-admin/src/main/java/com/ruoyi/portal/system/service/INdLbtService.java
+++ b/blxc-admin/src/main/java/com/ruoyi/portal/system/service/INdLbtService.java
@ -0,0 +1,61 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.NdLbt;
+
+/**
+ * 轮播图Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-09-20
+ */
+public interface INdLbtService 
+{
+    /**
+     * 查询轮播图
+     * 
+     * @param id 轮播图主键
+     * @return 轮播图
+     */
+    public NdLbt selectNdLbtById(Long id);
+
+    /**
+     * 查询轮播图列表
+     * 
+     * @param ndLbt 轮播图
+     * @return 轮播图集合
+     */
+    public List<NdLbt> selectNdLbtList(NdLbt ndLbt);
+
+    /**
+     * 新增轮播图
+     * 
+     * @param ndLbt 轮播图
+     * @return 结果
+     */
+    public int insertNdLbt(NdLbt ndLbt);
+
+    /**
+     * 修改轮播图
+     * 
+     * @param ndLbt 轮播图
+     * @return 结果
+     */
+    public int updateNdLbt(NdLbt ndLbt);
+
+    /**
+     * 批量删除轮播图
+     * 
+     * @param ids 需要删除的轮播图主键集合
+     * @return 结果
+     */
+    public int deleteNdLbtByIds(String ids);
+
+    /**
+     * 删除轮播图信息
+     * 
+     * @param id 轮播图主键
+     * @return 结果
+     */
+    public int deleteNdLbtById(Long id);
+}
--- a/blxc-admin/src/main/java/com/ruoyi/portal/system/service/impl/NdLbtServiceImpl.java
+++ b/blxc-admin/src/main/java/com/ruoyi/portal/system/service/impl/NdLbtServiceImpl.java
@ -0,0 +1,94 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.NdLbtMapper;
+import com.ruoyi.system.domain.NdLbt;
+import com.ruoyi.system.service.INdLbtService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 轮播图Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-09-20
+ */
+@Service
+public class NdLbtServiceImpl implements INdLbtService 
+{
+    @Autowired
+    private NdLbtMapper ndLbtMapper;
+
+    /**
+     * 查询轮播图
+     * 
+     * @param id 轮播图主键
+     * @return 轮播图
+     */
+    @Override
+    public NdLbt selectNdLbtById(Long id)
+    {
+        return ndLbtMapper.selectNdLbtById(id);
+    }
+
+    /**
+     * 查询轮播图列表
+     * 
+     * @param ndLbt 轮播图
+     * @return 轮播图
+     */
+    @Override
+    public List<NdLbt> selectNdLbtList(NdLbt ndLbt)
+    {
+        return ndLbtMapper.selectNdLbtList(ndLbt);
+    }
+
+    /**
+     * 新增轮播图
+     * 
+     * @param ndLbt 轮播图
+     * @return 结果
+     */
+    @Override
+    public int insertNdLbt(NdLbt ndLbt)
+    {
+        return ndLbtMapper.insertNdLbt(ndLbt);
+    }
+
+    /**
+     * 修改轮播图
+     * 
+     * @param ndLbt 轮播图
+     * @return 结果
+     */
+    @Override
+    public int updateNdLbt(NdLbt ndLbt)
+    {
+        return ndLbtMapper.updateNdLbt(ndLbt);
+    }
+
+    /**
+     * 批量删除轮播图
+     * 
+     * @param ids 需要删除的轮播图主键
+     * @return 结果
+     */
+    @Override
+    public int deleteNdLbtByIds(String ids)
+    {
+        return ndLbtMapper.deleteNdLbtByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除轮播图信息
+     * 
+     * @param id 轮播图主键
+     * @return 结果
+     */
+    @Override
+    public int deleteNdLbtById(Long id)
+    {
+        return ndLbtMapper.deleteNdLbtById(id);
+    }
+}
--- a/blxc-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/blxc-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@ -83,7 +83,8 @@ public class CommonController
            String filePath = RuoYiConfig.getUploadPath();
            // 上传并返回新文件名称
            String fileName = FileUploadUtils.upload(filePath, file);
-            String url = serverConfig.getUrl() + fileName;
+//            String url = serverConfig.getUrl() + fileName;
+            String url = "https://iceae.jlau.edu.cn" + fileName;
            AjaxResult ajax = AjaxResult.success();
            ajax.put("url", url);
            ajax.put("fileName", fileName);
--- 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
@ -8,6 +8,8 @@ import com.ruoyi.portal.back.domain.NdNew;
 import com.ruoyi.portal.back.domain.NdNewType;
 import com.ruoyi.portal.back.service.INdNewService;
 import com.ruoyi.portal.back.service.INdNewTypeService;
+import com.ruoyi.system.domain.NdLbt;
+import com.ruoyi.system.service.INdLbtService;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.UsernamePasswordToken;
@ -52,6 +54,8 @@ public class SysLoginController extends BaseController

    @Autowired
    private INdNewTypeService ndNewTypeService;
+    @Autowired
+    private INdLbtService ndLbtService;

    @GetMapping("/")
    public String index(HttpServletRequest request, HttpServletResponse response, ModelMap mmap)
@ -77,11 +81,22 @@ public class SysLoginController extends BaseController
        ndNew = new NdNew();
        ndNew.setNewType("13");
        List<NdNew> yqljList = ndNewService.selectNdNewList(ndNew);
-        mmap.put("yqljList", yqljList);

+
+        NdNew tplb = new NdNew();
+        tplb.setNewType("10");
+        tplb.setParamLimitno("5");
+        List<NdNew> tplbList = ndNewService.selectTplbList(tplb);
+
+        NdLbt ndLbt = new NdLbt();
+        List<NdLbt> lbtList = ndLbtService.selectNdLbtList(ndLbt);
+
+        mmap.put("yqljList", yqljList);
        mmap.put("xwdtList", xwdtList);
        mmap.put("tztgList", tztgList);
        mmap.put("hdygList", hdygList);
+        mmap.put("tplbList", tplbList);
+        mmap.put("lbtList", lbtList);

        return "portal/index";
    }
@ -194,26 +209,31 @@ public class SysLoginController extends BaseController
        ndNew.setClickRate(ndNew.getClickRate()+1);
        ndNewService.updateNdNew(ndNew);

-        String newType = ndNew.getNewType();
+        String newType =request.getParameter("newType");

-        NdNewType oneType = ndNewTypeService.selectNdNewTypeById(Long.parseLong(newType));
+        if(StringUtils.isNotEmpty(newType)){
+            NdNewType oneType = ndNewTypeService.selectNdNewTypeById(Long.parseLong(newType));

-        NdNewType twoType = ndNewTypeService.selectNdNewTypeById(oneType.getParentId());
+            NdNewType twoType = ndNewTypeService.selectNdNewTypeById(oneType.getParentId());

-        String twoCode = twoType.getId()+"";
-        String twoName = twoType.getName();
-        String threeCode = oneType.getId()+"";
-        String threeName = oneType.getName();
+            String twoCode = twoType.getId()+"";
+            String twoName = twoType.getName();
+            String threeCode = oneType.getId()+"";
+            String threeName = oneType.getName();

-        if(!StringUtils.equals("1",twoCode)){
-            mmap.put("twoName",twoName);
-            mmap.put("twoCode",twoCode);
-        }else{
-            mmap.put("twoName","-1");
-            mmap.put("twoCode","-1");
+            if(!StringUtils.equals("1",twoCode)){
+                mmap.put("twoName",twoName);
+                mmap.put("twoCode",twoCode);
+            }else{
+                mmap.put("twoName","-1");
+                mmap.put("twoCode","-1");
+            }
+            mmap.put("threeName",threeName);
+            mmap.put("threeCode",threeCode);
        }
-        mmap.put("threeName",threeName);
-        mmap.put("threeCode",threeCode);
+
+
+
        mmap.put("info", ndNew);

        //友情链接
--- a/blxc-admin/src/main/resources/application.yml
+++ b/blxc-admin/src/main/resources/application.yml
@ -64,9 +64,9 @@ spring:
  servlet:
    multipart:
      # 单个文件大小
-      max-file-size: 10MB
+      max-file-size: 300MB
      # 设置总上传的文件大小
-      max-request-size: 20MB
+      max-request-size: 500MB
  # 服务模块
  devtools:
    restart:
--- a/blxc-admin/src/main/resources/static/portal/css/index.css
+++ b/blxc-admin/src/main/resources/static/portal/css/index.css
@ -188,8 +188,8 @@ html {
 	background-position: 0 100%;
 	background-size: 0 .04rem;
 	background-repeat: no-repeat;
-	transition: background-size .3s
-}
+	transition: background-size .3s;
+	}

 .titlin_w:hover .titline_w {
 	background-size: 100% .04rem
@ -207,7 +207,7 @@ html {
 	background-repeat: no-repeat;
 	transition: background-size .3s;
 	font-size: .86rem;
-}
+	}

 .titlin_b:hover .titline_b {
 	background-size: 100% .04rem
@ -386,7 +386,7 @@ html {
 	letter-spacing: .0192rem;
 	text-align: center;
 	border: none;
-	font-size:1.1rem;
+	font-size:1.2rem;
 }

 .details_title ul {
@ -740,11 +740,12 @@ html {
 .main-wrapper {
 	position: relative;
 	width: 100%;
-	height: 100%;
+	height:100%;
 	z-index: 1;
 	display: flex;
 	transition-property: transform;
 	box-sizing: content-box;
+/*    height: calc((100vh - (24px + 76px + 24px)*var(--scale-num)) / var(--scale-num));*/
 }

 .leftFix {
@ -1023,22 +1024,23 @@ html {
 	
 }
 .homec .cleft {
-    width: 55%;
+    width: 58%;
 	position:relative;
 }
 .homec .cleft img{
 	position:absolute;
-	-webkit-transition: all .4s;-o-transition: all .4s;transition: all .4s;
+/*	-webkit-transition: all .4s;-o-transition: all .4s;transition: all .4s;*/
 	z-index:999;
 }
 .homec .cleft:hover img{
-	-webkit-transform: scale(1.05);-ms-transform: scale(1.05);transform: scale(1.05);
+/*	-webkit-transform: scale(1.05);-ms-transform: scale(1.05);transform: scale(1.05);*/
 }
 .homec .cright {
-    width: 45%;
+    width: 42%;
    background: url("../images/yrbg.png") no-repeat center;
    background-size: cover;
 	position: relative;
+	height: 27.7rem;
 }

 .homec .cright .item1 {
@ -2636,7 +2638,7 @@ html {
 }
 .syst{
 	align-items: center;
-}
+   }

 /* 第一屏 */
 .oneping {
@ -3039,7 +3041,7 @@ li.A_li9:hover p {

 .index-flash .list li {
 	position: relative;
-	height: 31.1rem;
+	height: 32.3rem;
 }

 .index-flash .list li .img {
@ -3057,8 +3059,10 @@ li.A_li9:hover p {
    transition: all .4s;
 	
 }
+
 /*.bg-mask .pic .a{background-repeat: no-repeat;background-position: center;background-size: cover;height: 100%;display: block;-webkit-transition: all .4s;-o-transition: all .4s;transition: all .4s;}
-*/.index-flash .list li .img a:hover{-webkit-transform: scale(1.05);-ms-transform: scale(1.05);transform: scale(1.05);}
+*/
+.index-flash .list li .img a:hover{-webkit-transform: scale(1.05);-ms-transform: scale(1.05);transform: scale(1.05);}

 .index-flash .list li .img a:before {
 	content: "";
@ -3210,6 +3214,71 @@ li.A_li9:hover p {
 	color: #fff;
 }

+.fdimg:hover {
+	-webkit-transform: scale(1.05);-ms-transform: scale(1.05);transform: scale(1.05);
+}
+
+/* 第四屏 */
+/*index*/
+.index-flash33 {
+	width: 100%;
+}
+
+
+.index-flash33 .wal2 {
+	width: 100%;
+/*	padding-top: .48rem;*/
+}
+.index-flash33 .lsds{
+	width: 58%;
+}
+
+.index-flash33 .list {
+	width: 100%;
+	overflow: hidden;
+	position: relative;
+}
+
+.index-flash33 .list li {
+	position: relative;
+}
+
+.index-flash33 .list li .img {
+	height: 27.7rem;
+	min-height: 13.75rem;
+}
+
+.index-flash33 .list li .img a {
+	position: relative;
+	display: block;
+	height: 100%;
+}
+
+.index-flash33 .list li .img a:before {
+	content: "";
+	display: block;
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	right: 0;
+	top: 0;
+	/* background: url("../images/bg20_2.png") center bottom repeat-x; */
+	background-size: auto 4.28rem;
+}
+
+.index-flash33 .list li img {
+	height: 100%;
+	position:absolute;*/
+	-webkit-transition: all .4s;-o-transition: all .4s;transition: all .4s;*/
+	z-index:999;*/
+}
+.index-flash33 .list li:hover img{
+-webkit-transform: scale(1.05);-ms-transform: scale(1.05);transform: scale(1.05);*/
+}
+
+
+
+
 /* 第4屏 */
 .buju {
 	display: flex;
@ -3509,17 +3578,17 @@ li.A_li9:hover p {
 	}

 	.homec .aleft {
-		width: 35.8%;
+		width: 37.8%;
 		padding-right: 4%
 	}

 	.homed .aleft {
-		width: 35.8%;
+		width: 37.8%;
 		padding-right: 4%
 	}

 	.homee .aleft {
-		width: 35.8%;
+		width: 37.8%;
 		padding-right: 4%
 	}

@ -3984,7 +4053,8 @@ li.A_li9:hover p {
 	}

 	.homef .home-footer .fright {
-		/* width: 100%;
+
+		width: 100%;
    background: #062c7b */
 	}

@ -4433,7 +4503,7 @@ li.A_li9:hover p {
    height:3rem;
    padding:0.3rem 1rem;
 	position:absolute;
-	bottom:2.4rem;
+	bottom:3.8rem;
 	overflow: hidden;
 	}
 .static-name h3{
@ -4482,7 +4552,6 @@ li.A_li9:hover p {
 .clearfix{
 	zoom:1;
 }
-
 .portal_list li{
 	border-bottom: .04rem dashed rgba(0,0,0,0.2);
 }
--- a/blxc-admin/src/main/resources/static/portal/css/sys.css
+++ b/blxc-admin/src/main/resources/static/portal/css/sys.css
--- a/blxc-admin/src/main/resources/static/portal/picture/777910.png
+++ b/blxc-admin/src/main/resources/static/portal/picture/777910.png
--- a/blxc-admin/src/main/resources/templates/lbt/add.html
+++ b/blxc-admin/src/main/resources/templates/lbt/add.html
@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增轮播图')" />
+    <th:block th:include="include :: bootstrap-fileinput-css"/>
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-lbt-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">轮播图：</label>
+                <div class="col-sm-8">
+                    <input type="hidden" name="filePath">
+                    <div class="file-loading">
+                        <input class="form-control file-upload" id="filePath" name="file" type="file">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">排序：</label>
+                <div class="col-sm-8">
+                    <input type="number" class="form-control" name="sort" >
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: bootstrap-fileinput-js"/>
+    <script th:inline="javascript">
+        var prefix = ctx + "system/lbt"
+        $("#form-lbt-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-lbt-add').serialize());
+            }
+        }
+
+        $(".file-upload").fileinput({
+            uploadUrl: ctx + 'common/upload',
+            maxFileCount: 1,
+            autoReplace: true
+        }).on('fileuploaded', function (event, data, previewId, index) {
+            $("input[name='" + event.currentTarget.id + "']").val(data.response.url)
+        }).on('fileremoved', function (event, id, index) {
+            $("input[name='" + event.currentTarget.id + "']").val('')
+        })
+    </script>
+</body>
+</html>
--- a/blxc-admin/src/main/resources/templates/lbt/edit.html
+++ b/blxc-admin/src/main/resources/templates/lbt/edit.html
@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改轮播图')" />
+    <th:block th:include="include :: bootstrap-fileinput-css"/>
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-lbt-edit" th:object="${ndLbt}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">轮播图：</label>
+                <div class="col-sm-8">
+                    <input type="hidden" name="filePath" th:field="*{filePath}">
+                    <div class="file-loading">
+                        <input class="form-control file-upload" id="filePath" name="file" type="file">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">排序：</label>
+                <div class="col-sm-8">
+                    <input type="number" name="sort"class="form-control" th:field="*{sort}">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: bootstrap-fileinput-js"/>
+    <script th:inline="javascript">
+        var prefix = ctx + "system/lbt";
+        $("#form-lbt-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-lbt-edit').serialize());
+            }
+        }
+
+        $(".file-upload").each(function (i) {
+            var val = $("input[name='" + this.id + "']").val()
+            $(this).fileinput({
+                'uploadUrl': ctx + 'common/upload',
+                initialPreviewAsData: true,
+                initialPreview: [val],
+                maxFileCount: 1,
+                autoReplace: true
+            }).on('fileuploaded', function (event, data, previewId, index) {
+                $("input[name='" + event.currentTarget.id + "']").val(data.response.url)
+            }).on('fileremoved', function (event, id, index) {
+                $("input[name='" + event.currentTarget.id + "']").val('')
+            })
+            $(this).fileinput('_initFileActions');
+        });
+    </script>
+</body>
+</html>
--- a/blxc-admin/src/main/resources/templates/lbt/lbt.html
+++ b/blxc-admin/src/main/resources/templates/lbt/lbt.html
@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('轮播图列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+<!--            <div class="col-sm-12 search-collapse">-->
+<!--                <form id="formId">-->
+<!--                    <div class="select-list">-->
+<!--                        <ul>-->
+<!--                            <li>-->
+<!--                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>-->
+<!--                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>-->
+<!--                            </li>-->
+<!--                        </ul>-->
+<!--                    </div>-->
+<!--                </form>-->
+<!--            </div>-->
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:lbt:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:lbt:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:lbt:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:lbt:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:lbt:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:lbt:remove')}]];
+        var prefix = ctx + "system/lbt";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "轮播图",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: '',
+                    visible: false
+                },
+                {
+                    field: 'filePath',
+                    title: '轮播图',
+                    formatter: function(value, row, index) {
+                    return '<img src="' + value + '" height="100" />';
+                    }
+                },
+                {
+                field: 'sort',
+                title: '排序',
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
--- a/blxc-admin/src/main/resources/templates/portal/details.html
+++ b/blxc-admin/src/main/resources/templates/portal/details.html
@ -35,7 +35,7 @@
                <div class="crumbs">
                    <img src="../../static/portal/images/shouye.png" th:src="@{/portal/images/shouye.png}" alt="" />
                    <a href="/">首页 > </a>
-                    <a th:href="'/portal/list?newType='+${twoCode}" th:if="${twoName!='-1'}">[[${twoName}]] > </a>
+                    <a th:href="'/portal/list?newType='+${twoCode}" th:if="${twoName!='-1' && twoName!=null}">[[${twoName}]] > </a>
                    <a th:href="'/portal/list?newType='+${threeCode}">[[${threeName}]]</a>
                </div>

@ -43,7 +43,8 @@
                    <h2 >[[${info.title}]]</h2>
                    <ul>
                        <li>日期：[[${#dates.format(info.publishTime, 'YYYY-MM-dd')}]]</li>
-                        <li>编辑：[[${info.sourceAuthor}]]</li>
+<!--                        <li>编辑：[[${info.sourceAuthor}]]</li>-->
+                        <li>&nbsp;</li>
                        <li>点击率：[[${info.clickRate}]]</li>
                    </ul>
                </div>
--- a/blxc-admin/src/main/resources/templates/portal/headerAndFooter.html
+++ b/blxc-admin/src/main/resources/templates/portal/headerAndFooter.html
@ -14,7 +14,7 @@
 				<a href="https://www.jlau.edu.cn/" title="吉林省新农科长白山创新学院">
 					<img class="logo-d" src="../../static/portal/images/logo2.png" th:src="@{/portal/images/logo2.png}"/>
 				</a>
-				<a href="/login" class="zhongying" title="吉林省新农科长白山创新学院"><span>吉林省新农科长白山创新学院</span>
+				<a href="http://10.50.0.106/login" class="zhongying" title="吉林省新农科长白山创新学院"><span>吉林省新农科长白山创新学院</span>
 					<!-- <span>Changbai Mountain Innovation College of Emerging Agricultural Education, jilin Province</span> -->
 				</a>
 			</div>
@ -37,17 +37,17 @@

 			<ul class="homea-nav homea-nav-flex">
 				<li class="navsitem navi1">
-					<a th:href="'/portal/list?newType=14'" target="_blank" title="学院概况">学院概况</a></a>
+					<a th:href="'/portal/list?newType=14'" title="学院概况">学院概况</a></a>
 					<div class="subnavs flex-v-center">
 						<ul class="flex-left">
 							<li>
-								<a th:href="'/portal/list?newType=14'" target="_blank" title="学院简介">学院简介</a>
+								<a th:href="'/portal/list?newType=14'" title="学院简介">学院简介</a>
 							</li>
 							<li>
-								<a th:href="'/portal/list?newType=15'" target="_blank" title="机构设置">机构设置</a>
+								<a th:href="'/portal/list?newType=15'" title="机构设置">机构设置</a>
 							</li>
 							<li>
-								<a th:href="'/portal/list?newType=16'" target="_blank" title="管理制度">管理制度</a>
+								<a th:href="'/portal/list?newType=16'" title="管理制度">管理制度</a>
 							</li>
 						</ul>
 					</div>
@ -57,112 +57,109 @@
 					<div class="subnavs flex-v-center">
 						<ul class="flex-left">
 							<li>
-								<a th:href="'/portal/list?newType=17'" target="_blank" title="师资概况">师资概况</a>
+								<a th:href="'/portal/list?newType=17'" title="师资概况">师资概况</a>
 							</li>
 							<li>
-								<a th:href="'/portal/list?newType=18'" target="_blank" title="创新人才培养教师">创新人才培养教师</a>
+								<a th:href="'/portal/list?newType=18'" title="创新人才培养教师">创新人才培养教师</a>
 							</li>
 							<li>
-								<a th:href="'/portal/list?newType=19'" target="_blank" title="学育导师">学育导师</a>
+								<a th:href="'/portal/list?newType=19'" title="学育导师">学育导师</a>
 							</li>
 							<li>
-								<a th:href="'/portal/list?newType=20'" target="_blank" title="驻院学者">驻院学者</a>
+								<a th:href="'/portal/list?newType=20'" title="驻院学者">驻院学者</a>
 							</li>
-							<li><a th:href="'/portal/list?newType=21'" target="_blank" title="班主任">班主任</a></li>
-							<li><a th:href="'/portal/list?newType=22'" target="_blank" title="督导队伍">督导队伍</a></li>
+							<li><a th:href="'/portal/list?newType=21'" title="班主任">班主任</a></li>
+							<li><a th:href="'/portal/list?newType=22'" title="督导队伍">督导队伍</a></li>
 						</ul>
 					</div>
 				</li>
 				<li class="navsitem navi3">
-					<a th:href="'/portal/list?newType=23'" target="_blank" title="本科生教育">本科生教育</a>
+					<a th:href="'/portal/list?newType=23'" title="本科生教育">本科生教育</a>
 					<div class="subnavs flex-v-center">
 						<ul class="flex-left">
 							<li>
-								<a th:href="'/portal/list?newType=23'" target="_blank" title="卓越农林人才培养">卓越农林人才培养</a>
+								<a th:href="'/portal/list?newType=23'" title="卓越农林人才培养">卓越农林人才培养</a>
 							</li>
 							<li>
-								<a th:href="'/portal/list?newType=24'" target="_blank" title="订单式农科生培养">订单式农科生培养</a>
+								<a th:href="'/portal/list?newType=24'" title="乡村振兴“订单生”培养">乡村振兴“订单生”培养</a>
 							</li>
 						</ul>
 					</div>
 				</li>
 				<li class="navsitem navi4">
-					<a th:href="'/portal/list?newType=25'" target="_blank" title="研究生教育">研究生教育</a>
+					<a th:href="'/portal/list?newType=25'" title="研究生教育">研究生教育</a>
 					<div class="subnavs flex-v-center">
 						<ul class="flex-left">
 							<li>
-								<a th:href="'/portal/list?newType=25'" target="_blank" title="学位点简介">学位点简介</a>
+								<a th:href="'/portal/list?newType=25'" title="学位点简介">学位点简介</a>
 							</li>
 							<li>
-								<a th:href="'/portal/list?newType=26'" target="_blank" title="培养方案">培养方案</a>
+								<a th:href="'/portal/list?newType=26'" title="培养方案">培养方案</a>
 							</li>
+							<li><a th:href="'/portal/list?newType=29'" title="学科建设委员会">学科建设委员会</a></li>
 							<li>
-								<a th:href="'/portal/list?newType=27'" target="_blank" title="就业创业">就业创业</a>
+								<a th:href="'/portal/list?newType=28'" title="导师队伍">导师队伍</a>
 							</li>
-							<li>
-								<a th:href="'/portal/list?newType=28'" target="_blank" title="导师队伍">导师队伍</a>
-							</li>
-							<li><a th:href="'/portal/list?newType=29'" target="_blank" title="学术委员会">学术委员会</a></li>
 						</ul>
 					</div>
 				</li>
 				<li class="navsitem navi5">
-					<a th:href="'/portal/list?newType=30'" target="_blank" title="学生竞赛">学生竞赛</a>
+					<a th:href="'/portal/list?newType=30'" title="学生竞赛">学生竞赛</a>
 					<div class="subnavs flex-v-center">
 						<ul class="flex-left">
 							<li>
-								<a th:href="'/portal/list?newType=30'" target="_blank" title="竞赛简介">竞赛简介</a>
+								<a th:href="'/portal/list?newType=30'" title="竞赛简介">竞赛简介</a>
 							</li>
 							<li>
-								<a th:href="'/portal/list?newType=31'" target="_blank" title="指导教师">指导教师</a>
+								<a th:href="'/portal/list?newType=31'" title="指导教师">指导教师</a>
 							</li>
-							<li><a th:href="'/portal/list?newType=32'" target="_blank" title="成果展示">成果展示</a></li>
+							<li><a th:href="'/portal/list?newType=32'" title="成果展示">成果展示</a></li>
 						</ul>
 					</div>
 				</li>
 				<li class="navsitem navi6">
-					<a th:href="'/portal/list?newType=33'" target="_blank" title="国际交流">国际交流</a>
+					<a th:href="'/portal/list?newType=33'" title="国际交流">国际交流</a>
 					<div class="subnavs flex-v-center">
 						<ul class="flex-left">
 							<li>
-								<a th:href="'/portal/list?newType=33'" target="_blank" title="研学项目">研学项目</a>
+								<a th:href="'/portal/list?newType=33'" title="研学项目">研学项目</a>
 							</li>
-							<li><a th:href="'/portal/list?newType=34'" target="_blank" title="国际课程">国际课程</a></li>
+							<li><a th:href="'/portal/list?newType=34'" title="国际课程">国际课程</a></li>
 							<li>
-								<a th:href="'/portal/list?newType=35'" target="_blank" title="合作交流">合作交流</a>
+								<a th:href="'/portal/list?newType=35'" title="合作交流">合作交流</a>
 							</li>
 							<li>
-								<a th:href="'/portal/list?newType=36'" target="_blank" title="国际会议">国际会议</a>
+								<a th:href="'/portal/list?newType=36'" title="国际会议">国际会议</a>
 							</li>
 						</ul>
 					</div>
 				</li>
 				<li class="navsitem navi7">
-					<a th:href="'/portal/list?newType=37'" target="_blank" title="书院">书院</a>
+					<a th:href="'/portal/list?newType=37'" title="书院">书院</a>
 					<div class="subnavs flex-v-center">
 						<ul class="flex-left">
-							<li><a th:href="'/portal/list?newType=37'" target="_blank" title="书院简介">书院简介</a></li>
-							<li><a th:href="'/portal/list?newType=38'" target="_blank" title="书院架构">书院架构</a></li>
-							<li><a th:href="'/portal/list?newType=39'" target="_blank" title="学术沙龙">学术沙龙</a></li>
-							<li><a th:href="'/portal/list?newType=40'" target="_blank" title="学生组织">学生组织</a></li>
-							<li><a th:href="'/portal/list?newType=41'" target="_blank" title="学生活动">学生活动</a></li>
+							<li><a th:href="'/portal/list?newType=37'" title="书院简介">书院简介</a></li>
+							<li><a th:href="'/portal/list?newType=38'" title="书院架构">书院架构</a></li>
+							<li><a th:href="'/portal/list?newType=39'" title="学术沙龙">学术沙龙</a></li>
+							<li><a th:href="'/portal/list?newType=40'" title="学生组织">学生组织</a></li>
+							<li><a th:href="'/portal/list?newType=41'" title="学生活动">学生活动</a></li>
 						</ul>
 					</div>
 				</li>
 				<li class="navsitem navi8">
-					<a th:href="'/portal/list?newType=42'" target="_blank" title="通识教育中心">通识教育中心</a>
+					<a th:href="'/portal/list?newType=42'" title="通识教育中心">通识教育中心</a>
 					<div class="subnavs flex-v-center">
 						<ul class="flex-left">
-							<li><a th:href="'/portal/list?newType=42'" target="_blank" title="中心简介">中心简介</a></li>
-							<li><a th:href="'/portal/list?newType=43'" target="_blank" title="组织架构">组织架构</a></li>
-							<li><a th:href="'/portal/list?newType=44'" target="_blank" title="学科基础课程">学科基础课程</a></li>
-							<li><a th:href="'/portal/list?newType=45'" target="_blank" title="通识课程">通识课程</a></li>
-							<li><a th:href="'/portal/list?newType=46'" target="_blank" title="教师风采">教师风采</a></li>
+							<li><a th:href="'/portal/list?newType=42'" title="中心简介">中心简介</a></li>
+							<li><a th:href="'/portal/list?newType=43'" title="组织架构">组织架构</a></li>
+							<li><a th:href="'/portal/list?newType=44'" title="学科基础课程">学科基础课程</a></li>
+							<li><a th:href="'/portal/list?newType=45'" title="通识课程">通识课程</a></li>
+							<li><a th:href="'/portal/list?newType=46'" title="教师风采">教师风采</a></li>
 						</ul>
 					</div>
 				</li>
 				<li class="navsitem navi8">
-					<a th:href="'/portal/downLoad'" target="_blank" title="下载专栏">下载专栏</a>
+					<a th:href="'/portal/downLoad'" title="下载专栏">下载专栏</a>
 				</li>
 			</ul>
 		</div>
@ -193,9 +190,9 @@
 				<div class="copyright">
 					<!-- 版权内容请在本组件"内容配置-版权"处填写 -->
 					<p>
-						<span>学吉ICP备10001377号-1</span><span><a
+						<span>吉ICP备10001377号-1</span><span><a
 							href="list.html">吉公网安备22017202000217号</a></span><span><a>版权所有 @
-										吉林省新农科长白山创新学院</a></span>
+										吉林农业大学</a></span>
 					</p>
 				</div>
 			</div>
@ -205,9 +202,9 @@
 						<img class="goutong" src="../../static/portal/images/Communication.png" th:src="@{/portal/images/Communication.png}" alt="">
 					</div>
 					<div class="aleft flex-v-center left">
-						<p>
-							<span>电话：</span><span>17790028444</span>
-						</p>
+<!--						<p>-->
+<!--							<span>电话：</span><span>17790028444</span>-->
+<!--						</p>-->
 						<p>
 							<span>邮箱：</span><span>ICEAE@jlau.edu.cn</span>
 						</p>
@ -234,27 +231,6 @@
 						<div class="rr">
 							<a th:href="'/portal/list?newType=13'">友情链接：</a>
 							<a th:each="item:${yqljList}" th:href="${item.linkUrl}" target="_blank"><span class="titline_w">[[${item.title}]]</span></a>
-<!--							<a href="list.html" title="吉林农业大学"-->
-<!--							   onclick="_addDynClicks('&#34;wbimage&#34;', 1729783378, 79045)" target="_blank"-->
-<!--							   class="titlin_w"><span class="titline_w">吉林农业大学</span></a>-->
-<!--							<a href="list.html" title="国际交流"-->
-<!--							   onclick="_addDynClicks('&#34;wbimage&#34;', 1729783378, 62511)" target="_blank"-->
-<!--							   class="titlin_w"><span class="titline_w">国际交流</span></a>-->
-<!--							<a href="list.html" title="信息公开"-->
-<!--							   onclick="_addDynClicks('&#34;wbimage&#34;', 1729783378, 62512)" target="_blank"-->
-<!--							   class="titlin_w"><span class="titline_w">信息公开</span></a>-->
-<!--							<a href="list.html" title="招生信息"-->
-<!--							   onclick="_addDynClicks('&#34;wbimage&#34;', 1729783378, 62513)" target="_blank"-->
-<!--							   class="titlin_w"><span class="titline_w">招生信息</span></a>-->
-<!--							<a href="list.html" title="校园网络"-->
-<!--							   onclick="_addDynClicks('&#34;wbimage&#34;', 1729783378, 62514)" target="_blank"-->
-<!--							   class="titlin_w"><span class="titline_w">校园网络</span></a>-->
-<!--							<a href="list.html" title="图书馆"-->
-<!--							   onclick="_addDynClicks('&#34;wbimage&#34;', 1729783378, 62514)" target="_blank"-->
-<!--							   class="titlin_w"><span class="titline_w">图书馆</span></a>-->
-<!--							<a href="list.html" title="采购招标"-->
-<!--							   onclick="_addDynClicks('&#34;wbimage&#34;', 1729783378, 62514)" target="_blank"-->
-<!--							   class="titlin_w"><span class="titline_w">采购招标</span></a>-->
 						</div>
 					</div>
 				</div>
--- a/blxc-admin/src/main/resources/templates/portal/index.html
+++ b/blxc-admin/src/main/resources/templates/portal/index.html
@ -68,7 +68,7 @@
                                </div>
                                <ul style="margin-top: .65rem;">
                                    <li class="titlin_b" th:each="item : ${xwdtList}" >
-                                        <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="ellipsis-multiline">
+                                        <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}+'&newType=10'" target="_blank" th:title="${item.title}" class="ellipsis-multiline">
                                            <h4 class="titline_b">[[${item.title}]]</h4>
                                            <p class="titline_line2" >
                                                [[${item.abstracts}]]
@ -84,14 +84,14 @@
                            </div>
                            <div class="swiper-container slidenews" aos="fade-up" aos-delay="100">
                                <div class="swiper-wrapper">
-                                    <div class="swiper-slide slide bg-mask"  th:each="item : ${xwdtList}" >
+                                    <div class="swiper-slide slide bg-mask"  th:each="item : ${tplbList}" >
                                        <div class="pic">
-                                            <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="mark">
+                                            <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}+'&newType=10'" target="_blank" th:title="${item.title}" class="mark">
                                                <img  th:src="${item.imagePath}" th:alt="${item.title}" />
                                            </a>
                                        </div>
                                        <p>
-                                            <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="texto">
+                                            <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}+'&newType=10'" target="_blank" th:title="${item.title}" class="texto">
                                                [[${item.title}]]
                                            </a>
                                            <span>发布时间：[[${#dates.format(item.publishTime, 'YYYY-MM-dd')}]]</span>
@ -134,12 +134,11 @@
            </div>
        </div>

-
        <div class="swiper-slide page homeb" data-hash="pageb">
            <div class="wp flex">
                <div class="aleft" aos="fade-up">
                    <div class="ctit ctit1 flex">
-                        <span class="syst flex"><i>通知</i><i>公告</i></span>
+                        <span class="syst flex" style="font-family: SourceHanSerifCN-Bold !important"><i>通知</i><i>公告</i></span>
                        <div class="flex-v-center">
                            <a th:href="'/portal/list?newType=11'" target="_blank" class="syst pore"><em>More</em></a>
                        </div>
@ -151,7 +150,7 @@
                            </div>
                            <div class="info flex-v-center">
                                <h4>
-                                    <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="texto">
+                                    <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}+'&newType=11'" target="_blank" th:title="${item.title}" class="texto">
                                    <span class="titline_w">[[${item.title}]]</span></a>
                                </h4>
                                <p class="line2">
@ -175,11 +174,11 @@
                                    <ul>
                                        <li th:each="item : ${hdygList}">
                                            <div class="img">
-                                                <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}"  class="jtfylist jtfyl1">
+                                                <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}+'&newType=12'" target="_blank" th:title="${item.title}"  class="jtfylist jtfyl1">
                                                    <img th:src="${item.imagePath}" th:alt="${item.title}" style="width: 100%" />
                                                </a>
                                            </div>
-                                            <div class="static-name">
+                                            <div class="static-name" style="margin-top:-30px;">
                                                <h3>[[${item.title}]]</h3>
                                                <div class="static-speaker flex"><span>主讲人：[[${item.sourceAuthor}]]</span><span>[[${#dates.format(item.publishTime, 'YYYY-MM-dd')}]]</span></div>
                                            </div>
@ -221,8 +220,54 @@
                </div>
            </div>
        </div>
+
+        <!--            <div class="cleft" aos="fade-up"><img src="../../static/portal/picture/777910.png" th:src="@{/portal/picture/777910.png}" alt="" style="height: 100%;"/></div>-->
        <div class="swiper-slide page homec" data-hash="pagec">
-            <div class="cleft" aos="fade-up"><img src="../../static/portal/picture/777910.png" th:src="@{/portal/picture/777910.png}" alt="" style="height: 100%;"/></div>
+
+            <div class="cleft" aos="fade-up">
+                <div class="index-flash33">
+                        <div class="list">
+                            <ul>
+                                <li th:each="item : ${lbtList}">
+                                    <div class="img">
+                                       <img th:src="${item.filePath}" style="height: 100%;width: 100%;" />
+                                    </div>
+                                </li>
+                            </ul>
+                        </div>
+
+                </div>
+                <script>
+                    $(function () {
+                        var dom = $(".index-flash33"),
+                        side = dom.find(".side li");
+                        var swiper = new swiperFun({
+                            dom: dom.find(".list"),
+                            roundLengths: true,
+                        });
+                        swiper.change = function (i) {
+                            change(i);
+                        };
+
+                        side.each(function (i) {
+                            $(this).hover(
+                                function () {
+                                    swiper.mySwiper.slideTo(i + 1);
+                                },
+                                function () { }
+                            );
+                        });
+                        change(0);
+
+                        function change(i) {
+                            side.removeClass("on");
+                            side.eq(i).addClass("on");
+                        }
+                    });
+                </script>
+            </div>
+
+
            <div class="cright flex">

                <div class="item item1 " aos="fade-up">
--- a/blxc-admin/src/main/resources/templates/portal/list.html
+++ b/blxc-admin/src/main/resources/templates/portal/list.html
@ -43,7 +43,7 @@
                    <div class="crumbs">
                        <img src="../../static/portal/images/shouye.png" th:src="@{/portal/images/shouye.png}" alt="" />
                        <a href="/">首页 > </a>
-                        <a>[[${twoName}]] > </a>
+                        <a th:if="${twoName}!='首页'">[[${twoName}]] > </a>
                        <a>[[${threeName}]]</a>
                    </div>

@ -97,25 +97,18 @@
    if(item.type=='2'){
    url = item.linkUrl;
    }else{
-    url= '/portal/details?id='+item.id
+    url= '/portal/details?id='+item.id+'&newType='+newType;
    }
    prve += `
                <li class="clearfix">
                    <a  href="${url}" target="_blank" title="${item.title}" class="clearfix" style="padding:10px 0">
-                        <img class="left newimg" src="${newImg}"/>
+                        <img class="left newimg" src="${newImg}" style="width:20px;height:20px;"/>
                        <div class="left txt">
-                            <div class="fnt_22 title">${item.title}</div>`
-    if(item.abstracts){
-//        prve +=`<div class="des">${item.abstracts}</div>`
-    prve +=`<div class="des"></div>`
-    }else{
-        prve +=`<div class="des"> </div>`
-    }
-
-    prve +=`</div>
+                            <div class="fnt_22 title">${item.title}</div>
+                             <div class="des"></div>
+                         </div>
                        <div class="right time">
                            <div class="ta">${item.publishTime}</div>
-
                        </div>
                    </a>
                </li>
@ -138,25 +131,31 @@

    async function mainListChange(page) {
    var url = "/portal/dataList";
+
    var div = document.getElementById("dataSource");
    var dataParam = {newType:newType,pageNum: page, pageSize: 10}
    $.post(url, dataParam, function(result) {

    let str = result.rows.reduce(function (prve, item) {
+
+    if(item.type=='2'){
+    url = item.linkUrl;
+    }else{
+    url= '/portal/details?id='+item.id+'&newType='+newType;
+    }
    prve += `
                        <li class="clearfix">
-                            <a href="/portal/details?id=${item.id}" target="_blank"  class="clearfix" style="padding:10px 0">
-                                <img class="left" src="${newImg}" style="width:20px; height:20px;margin-top:8px;margin-right:8px;"/>
-                                <div class="left txt">
-                                    <div class="fnt_22 title">${item.title}</div>
-//                                    <div class="des">${item.abstracts}</div>
-                                </div>
-                                <div class="right time">
-                                    <div class="ta">${item.publishTime}</div>
-//                                    <div>发布时间</div>
-                                </div>
-                            </a>
-                        </li>
+                    <a  href="${url}" target="_blank" title="${item.title}" class="clearfix" style="padding:10px 0">
+                        <img class="left newimg" src="${newImg}" style="width:20px;height:20px;"/>
+                        <div class="left txt">
+                            <div class="fnt_22 title">${item.title}</div>
+                             <div class="des"></div>
+                         </div>
+                        <div class="right time">
+                            <div class="ta">${item.publishTime}</div>
+                        </div>
+                    </a>
+                </li>
                    `
    return prve
    }, '')
--- a/blxc-admin/src/main/resources/templates/portal/searchList.html
+++ b/blxc-admin/src/main/resources/templates/portal/searchList.html
@ -36,17 +36,16 @@
                    <div class="con">
                        <script src="../../static/portal/js/centercutimg.js" th:src="@{/portal/js/centercutimg.js}"></script>
                        <script src="../../static/portal/js/ajax.js" th:src="@{/portal/js/ajax.js}"></script>
-
+                        <div style="margin-top:30px;">&nbsp;</div>
                        <ul class="dataSource" style="min-height:600px">
                            <li class="clearfix" th:each="item : ${list}">
-                                <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}" target="_blank" th:title="${item.title}" class="clearfix">
+                                <a th:href="${item.type=='2'}?${item.linkUrl}:'/portal/details?id='+${item.id}+'&newType='" style="padding:10px 0" target="_blank" th:title="${item.title}" class="clearfix">
                                    <div class="left txt">
-                                        <div class="fnt_22 title">[[${item.title}]]</div>
-                                        <div class="des">[[${item.abstracts}]]</div>
+                                        <img class="left newimg" src="../../static/portal/images/newst.png" th:src="@{/portal/images/newst.png}" style="width:20px;height:20px;margin-top:10px;"/>
+                                        <div class="left fnt_22 title txt">[[${item.title}]]</div>
                                    </div>
                                    <div class="right time">
                                        <div class="ta">[[${#dates.format(item.publishTime, 'YYYY-MM-dd')}]]</div>
-                                        <div>发布时间</div>
                                    </div>
                                </a>
                            </li>
--- a/blxc-admin/src/main/resources/web.xml
+++ b/blxc-admin/src/main/resources/web.xml
@ -0,0 +1,4 @@
+<mime-mapping>
+    <extension>woff</extension>
+    <mime-type>application/font-woff</mime-type>
+</mime-mapping>