From 167bae215a9203b5cbcfa34398cf4b7051e4e78c Mon Sep 17 00:00:00 2001 From: dong_bo0602 <358256383@qq.com> Date: Fri, 16 Apr 2021 11:49:46 +0800 Subject: [PATCH] 0416 --- .../resources/static/assets/web/css/style.css | 8 ++- .../resources/static/route/web/notice.html | 36 ++++++++--- .../resources/static/route/web/public.html | 63 +++++++++++++------ src/main/resources/templates/index.html | 37 ++++++++--- 4 files changed, 106 insertions(+), 38 deletions(-) diff --git a/src/main/resources/static/assets/web/css/style.css b/src/main/resources/static/assets/web/css/style.css index 441fe70..9eaf2a1 100644 --- a/src/main/resources/static/assets/web/css/style.css +++ b/src/main/resources/static/assets/web/css/style.css @@ -5,11 +5,15 @@ .nav{width:1200px;margin:-50px auto 0;position:relative;padding:20px 0;background:#fff;-webkit-box-shadow:0 0 10px #eee;box-shadow:0 0 10px #eee;border-radius:5px} .nav ul li{width:200px;float:left;-webkit-box-sizing:border-box;box-sizing:border-box;border-right:1px solid #d2d2d2;cursor:pointer;overflow: hidden} .nav.child ul li{width: 240px;} +.nav ul li .left{width: 100px;} +.nav.child .left{width: 125px;} +.nav.child ul li.active .left{width: 150px;} +.nav ul li.active .left{text-align: center} .nav ul li.log-out{padding: 0 10px;} .nav ul li.log-out .left{width: 85px;text-align: center;} .nav ul li.log-out a{padding: 0;font-size:20px;color:#333;} .nav ul li.log-out a, .nav ul li.log-out .left span{line-height: 30px;margin: 0;font-size: 16px} -.nav ul li.log-out .left span{border-bottom: 1px solid #DDD;white-space: nowrap;overflow: hidden;text-overflow: ellipsis} +.nav ul li.log-out .left span{border-bottom: 1px solid #DDD;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;} .nav ul li.log-out .left span.not-admin{border: none;line-height: 60px} .nav ul li:last-child{border-right:none} .nav ul li a{display:block;overflow:hidden;padding:0 10px} @@ -17,7 +21,7 @@ .nav ul li .left p{font-size:12px;color:#999} .nav ul li .right a{display: block;line-height: 60px;font-size: 20px;width: 60px;height: 60px;background: url("../images/logout-bg.png") no-repeat center;background-size: 100% 100%;border-radius: 50%;text-align: center;color: #fff;font-weight: normal} .nav ul li .right img{width:60px;height:60px} -.nav ul li.active .left span{color:#3d41b7;font-weight:700;line-height:60px;margin-top:0;position:relative} +.nav ul li.active .left span{color:#3d41b7;font-weight:700;line-height:60px;margin-top:0;position:relative;display: inline-block} .nav ul li.active .left span:after{content:'';display:block;width:100%;height:2px;background:#3d41b7;position:absolute;left:0;bottom:10px} .nav ul li.active .left p{display:none} .mid-link{width:1200px;margin:20px auto;border-top:10px solid #ffd88b;-webkit-box-shadow:0 0 10px #eee;box-shadow:0 0 10px #eee;padding-bottom:30px} diff --git a/src/main/resources/static/route/web/notice.html b/src/main/resources/static/route/web/notice.html index a546735..66126ae 100644 --- a/src/main/resources/static/route/web/notice.html +++ b/src/main/resources/static/route/web/notice.html @@ -19,7 +19,7 @@
首页 -

众力监督平台

+

"四五六"众力监督平台

@@ -37,16 +37,36 @@
-
  • - +
  • +
    - {{nav.name}} - + 四个清单 +

    四个清单

    - - - + +
    +     +
    • +
  • + +
    + 五项流程 +

    五项流程

    +
    +
    + +
    +     +
    • +
  • + +
    + 六本台账 +

    六本台账

    +
    +
    +
    • diff --git a/src/main/resources/static/route/web/public.html b/src/main/resources/static/route/web/public.html index 74d4e73..6190f56 100644 --- a/src/main/resources/static/route/web/public.html +++ b/src/main/resources/static/route/web/public.html @@ -19,7 +19,7 @@
    首页 -

    众力监督平台

    +

    "四五六"众力监督平台

    @@ -37,30 +37,50 @@
    -
  • - +
  • +
    - {{nav.name}} - + 四个清单 +

    四个清单

    - - - +
    • - - - - - - - - - - - +
  • + +
    + 五项流程 +

    五项流程

    +
    +
    + +
    +     +
    • +
  • + +
    + 六本台账 +

    六本台账

    +
    +
    + +
    +     +
    • + + + + + + + + + + + @@ -360,6 +380,11 @@ self.mainList = [] // var loadLayerIndex; top.restAjax.get(top.restAjax.path('api/indexlib/listpageweb/{indexLibParentId}', [id]), self.page, null, function(code, data) { + for (let i = 0; i < data.rows.length; i++) { + if (!data.rows[i].indexLibRemark) { + data.rows[i].indexLibRemark = '暂无' + } + } self.mainList = data.rows self.page.page = data.page self.page.totalPage = Math.ceil(data.total / self.page.rows) diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 29dd253..d7d5e18 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -37,15 +37,36 @@ -
  • - +
  • +
    - {{nav.name}} + 四个清单 +

    四个清单

    - - - + +
    +     +
    • +
  • + +
    + 五项流程 +

    五项流程

    +
    +
    + +
    +     +
    • +
  • + +
    + 六本台账 +

    六本台账

    +
    +
    +
    • @@ -94,7 +115,6 @@
    一周新闻 - 更多+