diff --git a/src/main/resources/static/assets/web/css/style.css b/src/main/resources/static/assets/web/css/style.css index 3a164d2..e375bd8 100644 --- a/src/main/resources/static/assets/web/css/style.css +++ b/src/main/resources/static/assets/web/css/style.css @@ -38,13 +38,13 @@ .news .news-box .box-title span{font-size:18px} .news .news-box .box-title a{font-size:16px;float:right;color:#fff} .news .news-box .news-list{padding:0 10px} -.news .news-box .news-list ul{height:304px} +.news .news-box .news-list ul{height:243px} .news .news-box .news-list ul li{border-bottom:1px dashed #dcdcdc;height:60px;line-height:60px;font-size:16px;color:#333;background: #fff} .news .news-box .news-list ul li:last-child{border:none} .news .news-box .news-list ul li:hover,.news .news-box .news-list ul li:hover a{color:#064ec0} -.news .news-box .news-list ul li a{color:#333;display:inline-block;max-width:60%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis} +.news .news-box .news-list ul li a{color:#333;display:inline-block;max-width:100%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis} .news .news-box .news-list ul li span{float:right} -.slide-news{position: relative;z-index: 100;width:1200px;margin:0 auto 30px;overflow:hidden} +.slide-news{position: relative;z-index: 100;width:1200px;margin:30px auto;} .slide-news .slide{width:66%;height:420px;float:left} .slide .bd a{display:block;position:relative} .dynamic-news,.slide{position:relative} @@ -53,7 +53,7 @@ .dynamic-news>a.prev:hover,.slide>a.prev:hover{background:url(../images/prev-on.png) no-repeat center} .dynamic-news>a.next,.slide>a.next{right:10px;background:url(../images/next.png) no-repeat center;background-size:100% 100%} .dynamic-news>a.next:hover,.slide>a.next:hover{background:url(../images/next-on.png) no-repeat center} -.slide .bd a img{width:100%;height:380px} +.slide .bd a img{width:100%;height:420px} .slide-text{position:absolute;left:0;bottom:0;background:rgba(0,0,0,.6);color:#fff;font-size:14px;width:100%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;height:40px;line-height:40px;padding:0 10px;box-sizing:border-box} .slide-news .exposure-news{width:32%;float:right} .exposure-box{float:left;width:96px} @@ -163,6 +163,12 @@ .news-container .news-list ul li a{display: inline-block;max-width: 65%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;font-size: 18px;color: #333;} .news-container .news-list ul li a:hover{color: #064ec0} .news-container .news-list ul li span{float: right;font-size: 18px;color: #333} +.street{width: 32%;background: #fff;padding: 15px;box-sizing: border-box;box-shadow: 0 0 10px #eee;float:right;overflow:hidden;height: 420px;} +.street-box{width: 100%;height: 100%;} +.street a{display: block;padding: 0 5px;box-sizing:border-box;white-space:nowrap;overflow: hidden;text-overflow: ellipsis;float:left;margin-bottom: 10px;width:49%;background: #064ec0;color: #fff;text-align: center;line-height: 35px;border-radius: 5px;} +.street a:hover{background: rgba(6,78,192,0.8)} +.street a:nth-child(even){float:right} +.street a img{display: block;margin: 5px auto 0;} @media (min-width: 1420px){ .banner{ height: 450px @@ -183,3 +189,217 @@ min-width: 1200px; } } +.street-container{ + width: 1200px; + margin: 20px auto; + overflow: hidden; +} +.street-type{ + float: left; + width: 350px; + min-height: 550px; + background: #fff; +} +.type-title{ + padding: 0 20px; + height: 40px; + line-height: 40px; + background: #064ec0; + color: #fff; +} +.street-type ul{ + padding: 15px; + font-size: 14px; +} +.street-type ul li{ + margin-bottom: 12px; + padding-left: 28px; + background: url("../images/type-icon.png") no-repeat left center; +} +.street-type ul li a{ + display: block; + font-size: 14px; + color: #333; +} +.org-detail{ + float: left; + width: 500px; + margin: 0 20px 0; + background: #fff; +} +.detail-box{ + padding: 10px 15px; + min-height: 510px; + box-sizing: border-box; +} +.street-notice{ + float: left; + width: 310px; +} +.street-notice-box{ + background: #fff; + margin-bottom: 20px; +} +.notice-title{ + overflow: hidden; + border-bottom: 1px solid #064ec0; +} +.notice-title .type-title{ + display: inline-block; + padding: 0 15px; +} +.notice-title a{ + float: right; + line-height: 40px; + margin-right: 10px; +} +.street-notice ul{ + padding: 0 15px; +} +.street-notice ul li{ + height: 50px; + line-height: 50px; + border-bottom: 1px dashed #ddd; +} +.street-notice ul li:last-child{ + border: none; +} +.street-notice ul li a{ + display: inline-block; + max-width: 65%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + font-size: 14px; + color: #333; +} +.street-notice ul li span{ + font-size: 14px; + color: #333; + float: right; +} +.street-leader{ + background: #fff; +} +.leader-box{ + padding: 37px 15px; + overflow: hidden; +} +.leader-avatar{ + float: left; + width: 100px; + height: 120px; +} +.leader-avatar img{ + width: 100%; + height: 100%; +} +.leader-info{ + width: 170px; + float:right; +} +.leader-info h3{ + font-size: 18px; + color: #000; + font-weight: normal; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.leader-info p{ + font-size: 14px; + color: #333; +} +.leader{ + width: 1200px; + margin: 20px auto; + background: #fff; +} +.leader-title{ + border-bottom: 1px solid #064ec0; +} +.leader-list{ + min-height: 550px; +} +.leader-title span{ + display: inline-block; + padding: 0 15px; + background: #064ec0; + color: #fff; + line-height: 40px; +} +.leader-list ul{ + padding-bottom: 18px; +} +.leader-list ul li{ + float:left; + width: 140px; + margin: 18px 49px 0 49px; +} +.leader-list ul li:nth-child(5n){ + margin-right: 0; +} +.leader-list ul li a{ + display: block; + text-align: center; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.avatar-leader{ + width: 100%; + height: 180px; + overflow: hidden; + position: relative; +} +.avatar-leader img.avatar{ + width: 100%; + height: 100%; + transition: all .5s; +} +.avatar-leader img.default-avatar{ + width: auto; + height: auto; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} +.leader-list ul li:hover img.avatar{ + transform: scale(1.05); +} +.leader-list ul li a span{ + color: #00a1f4; + font-size: 16px; + line-height: 30px; +} +.leader-list ul li a p{ + color: #888; + font-size: 16px; +} +.leader-content{ + width: 1200px; + margin: 20px auto 40px; + background: #fff; +} +.leader-info-top{ + text-align: center; + padding: 50px 0; +} +.leader-info-top img{ + width: 180px; + height: 228px; + margin-bottom: 20px; +} +.leader-info-top p{ + font-size: 16px; + margin-bottom: 5px; +} +.info-bottom-title{ + padding: 0 35px; + background: #e6ecf3; + line-height: 50px; +} +.leader-intro{ + padding: 20px 35px; +} \ No newline at end of file diff --git a/src/main/resources/static/assets/web/images/default-avatar.png b/src/main/resources/static/assets/web/images/default-avatar.png new file mode 100644 index 0000000..2f187cc Binary files /dev/null and b/src/main/resources/static/assets/web/images/default-avatar.png differ diff --git a/src/main/resources/static/assets/web/images/street-icon.png b/src/main/resources/static/assets/web/images/street-icon.png new file mode 100644 index 0000000..3838bda Binary files /dev/null and b/src/main/resources/static/assets/web/images/street-icon.png differ diff --git a/src/main/resources/static/assets/web/images/type-icon.png b/src/main/resources/static/assets/web/images/type-icon.png new file mode 100644 index 0000000..7c1e538 Binary files /dev/null and b/src/main/resources/static/assets/web/images/type-icon.png differ diff --git a/src/main/resources/static/route/web/index.html b/src/main/resources/static/route/web/index.html index a533c65..9937be9 100644 --- a/src/main/resources/static/route/web/index.html +++ b/src/main/resources/static/route/web/index.html @@ -83,23 +83,23 @@ -
- -
- - - - - - - - - - - - -
-
+ + + + + + + + + + + + + + + + +
diff --git a/src/main/resources/static/route/web/leader-detail.html b/src/main/resources/static/route/web/leader-detail.html new file mode 100644 index 0000000..9f8860c --- /dev/null +++ b/src/main/resources/static/route/web/leader-detail.html @@ -0,0 +1,142 @@ + + + + + + 乡镇街道综合办公平台 + + + + +
+
+ +
+ +
+
+ +
+
+ + +

{{leaderInfo.userName}}

+

{{leaderInfo.positionNames}}

+
+
+
领导简介
+
+ {{leaderInfo.userExpand}} +
+
+
+ +
+ +
+
+ + + + + + + + + diff --git a/src/main/resources/static/route/web/leader.html b/src/main/resources/static/route/web/leader.html new file mode 100644 index 0000000..bfebd7c --- /dev/null +++ b/src/main/resources/static/route/web/leader.html @@ -0,0 +1,148 @@ + + + + + + 乡镇街道综合办公平台 + + + + + + + + + + + + + + diff --git a/src/main/resources/static/route/web/public.html b/src/main/resources/static/route/web/public.html index 2b23423..0d77661 100644 --- a/src/main/resources/static/route/web/public.html +++ b/src/main/resources/static/route/web/public.html @@ -280,7 +280,9 @@ loadLayerIndex: '', pageId: '', bottomNavList: [], - countInfo: {} + countInfo: {}, + initLeft: '', + curContentId: '' }, methods: { // 饼图 @@ -334,12 +336,19 @@ var self = this; top.restAjax.get(top.restAjax.path('api/indexlib/listztreeweb/{indexLibParentId}', [self.curId]), {}, null, function(code, data) { self.navList = data - if (data.length > 0) { + if (self.initLeft != '') { self.$nextTick(function () { - self.getDefault(data[0]) + $('#item' + self.curContentId).addClass('active') }) + self.getMainList(self.curContentId) } else { - self.getMainList(self.curId) + if (data.length > 0) { + self.$nextTick(function () { + self.getDefault(data[0]) + }) + } else { + self.getMainList(self.curId) + } } }, function(code, data) { layer.msg(data.msg); @@ -394,7 +403,6 @@ self.getMainList(id) } } else { - node.toggleClass('active') node.parent().siblings().find('.tab-title').removeClass('active') node.parent().siblings().find('.tab-title').removeClass('bordered') @@ -409,6 +417,7 @@ getMainList: function (id) { var self = this; self.mainList = [] + console.log(id) // 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++) { @@ -495,9 +504,15 @@ } }, mounted: function () { - this.curId = restAjax.params(window.location.href).id - this.pageId = restAjax.params(window.location.href).id - + var id = restAjax.params(window.location.href).id + this.curId = id + this.pageId = id + if (restAjax.params(window.location.href).idx != undefined) { + this.initLeft = restAjax.params(window.location.href).idx + this.curContentId = restAjax.params(window.location.href).contentId + } else { + this.initLeft = '' + } this.getNav() // this.getTopNav() this.getGateNav() diff --git a/src/main/resources/static/route/web/street.html b/src/main/resources/static/route/web/street.html new file mode 100644 index 0000000..1d73f9a --- /dev/null +++ b/src/main/resources/static/route/web/street.html @@ -0,0 +1,210 @@ + + + + + + 乡镇街道综合办公平台 + + + + +
+
+ +
+ +
+
+ +
+
+
信息类目
+ +
+
+
机构概况
+
+

{{streetInfo.departmentSummary}}

+
+
+
+
+
+
通知公告
+ MORE+ +
+ +
+
+
+
领导班子
+ MORE+ +
+
+
+ +
+
+

{{leaderInfo.userName}}

+

{{leaderInfo.positionNames}}

+
+
+
+
+
+ +
+ +
+
+ + + + + + + + + + diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 2168985..32874e6 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -94,100 +94,90 @@
-
- -
- - - - - - - - - - - - + + + + + + + + + + + + + + + + + +
+
+
+ +
+ + +
+
+
+ + + {{ item.departmentName }} + +
+
-
- 最新动态 + 四个清单 + 更多>
- 党纪法规 + 五项流程 + 更多>
- 通知公告 + 六本台账 + 更多>
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
门户导航
@@ -204,6 +194,7 @@ +