Commit 662fc4f0 authored by zhanzhenfeng's avatar zhanzhenfeng

2019-03-25'

parent 7bf678e9
...@@ -6,7 +6,7 @@ jdbc.password=Hmit@2018 ...@@ -6,7 +6,7 @@ jdbc.password=Hmit@2018
#本地的 #本地的
#jdbc.username=root #jdbc.username=root
#jdbc.password=12345678 #jdbc.password=123456
jdbc.url=jdbc:mysql://127.0.0.1:3306/zhgh_portalsite?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true jdbc.url=jdbc:mysql://127.0.0.1:3306/zhgh_portalsite?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<link rel="stylesheet" type="text/css" href="./qt/css/index.css" /> <link rel="stylesheet" type="text/css" href="./qt/css/index.css" />
</head> </head>
<body> <body style="overflow-x: hidden">
<div id="head-components"> <div id="head-components">
<head-content-index></head-content-index> <head-content-index></head-content-index>
</div> </div>
...@@ -72,9 +72,9 @@ ...@@ -72,9 +72,9 @@
<!--<span>{{n.time}}</span>--> <!--<span>{{n.time}}</span>-->
</li> </li>
</ul> </ul>
<div> <div class="announcementImg">
<a href="./qt/secondaryList.html?menuId=30601"><img src="./qt/img/yangguanggonghui.png" title="阳光工会" /></a> <a href="./qt/secondaryList.html?menuId=30601"><img src="./qt/img/yangguanggonghuixin.png" title="阳光工会" /></a>
<a href="./qt/secondaryList.html?menuId=30301"><img src="./qt/img/zuzhigaikuang.png" title="组织概况" /></a> <a href="./qt/secondaryList.html?menuId=30301"><img src="./qt/img/zuzhigaikuangxin.png" title="组织概况" /></a>
</div> </div>
</div> </div>
</div> </div>
...@@ -183,7 +183,11 @@ ...@@ -183,7 +183,11 @@
<!--<a href="./qt/secondaryList.html?menuId=30501"><img src="./qt/img/m_li.jpg" /></a>--> <!--<a href="./qt/secondaryList.html?menuId=30501"><img src="./qt/img/m_li.jpg" /></a>-->
<!--<a href="javascript:alert('工会经审综合服务平台');"><img src="img/servicePlatform.jpg" /></a>--> <!--<a href="javascript:alert('工会经审综合服务平台');"><img src="img/servicePlatform.jpg" /></a>-->
</div> </div>
<div style="height: 70px;text-align: center;"><a href="http://jingshen.87188718.com/EconomicReview/Login.aspx" target="_blank" title="工会经审综合服务平台"><img style="margin-top: 10px;width: 200px;" src="./qt/img/servicePlatform.png" /></a></div> <div style="height: 70px;text-align: center;" class="service-platform">
<a href="http://jingshen.87188718.com/EconomicReview/Login.aspx" target="_blank" title="工会经审综合服务平台">
<img src="./qt/img/servicePlatformxin.png" />
</a>
</div>
</div> </div>
<!--第三块--> <!--第三块-->
...@@ -248,7 +252,7 @@ ...@@ -248,7 +252,7 @@
<a href="./qt/secondaryList.html?menuId=10503" class="zgh-more">更多&gt;&gt;</a> <a href="./qt/secondaryList.html?menuId=10503" class="zgh-more">更多&gt;&gt;</a>
</div> </div>
</div> </div>
<ul class="ul-box"> <ul class="ul-box service-center">
<table border="0"> <table border="0">
<tr> <tr>
<th><div class="pointer-left" id="lamor_arrLeft" border="0"></div></th> <th><div class="pointer-left" id="lamor_arrLeft" border="0"></div></th>
...@@ -257,7 +261,7 @@ ...@@ -257,7 +261,7 @@
<ul> <ul>
<li v-for="l in lamorParks"> <li v-for="l in lamorParks">
<a target="_blank" :href="'./qt/third-level.html?id='+l.id+'&sortId=10503'" :title="l.remark"> <a target="_blank" :href="'./qt/third-level.html?id='+l.id+'&sortId=10503'" :title="l.remark">
<img v-if="l.atta == null || l.atta == ''" src="./qt/img/laomodefault.jpg" alt="劳模" /> <img v-if="l.atta === null || l.atta === ''" src="./qt/img/laomodefault.jpg" alt="劳模" />
<img v-else :src="'./doc/'+l.atta" :alt="''+l.remark" /> <img v-else :src="'./doc/'+l.atta" :alt="''+l.remark" />
<p v-if="l.remark == null || l.remark == ''" class="zgh-ellipsis">劳模</p> <p v-if="l.remark == null || l.remark == ''" class="zgh-ellipsis">劳模</p>
<p v-else class="zgh-ellipsis">{{l.remark}}</p> <p v-else class="zgh-ellipsis">{{l.remark}}</p>
...@@ -282,7 +286,7 @@ ...@@ -282,7 +286,7 @@
<ul class="ul-box"> <ul class="ul-box">
<table border="0"> <table border="0">
<tr> <tr>
<th><div class="pointer-left" id="publication_arrLeft" border="0"></div></th> <th style="position: relative;"><div class="pointer-left" id="publication_arrLeft" border="0"></div></th>
<td> <td>
<div id="publication_scrollbox"> <div id="publication_scrollbox">
<ul> <ul>
...@@ -297,7 +301,9 @@ ...@@ -297,7 +301,9 @@
</ul> </ul>
</div> </div>
</td> </td>
<th><div class="pointer-right" id="publication_arrRight" border="0"></div></th> <th style="position: relative;">
<div style="right: 0;" class="pointer-right" id="publication_arrRight" border="0"></div>
</th>
</tr> </tr>
</table> </table>
</ul> </ul>
......
...@@ -2,21 +2,21 @@ ...@@ -2,21 +2,21 @@
.main .main-container { .main .main-container {
width: 1180px; width: 1180px;
height: 390px; height: 355px;
margin: 0 5px 20px 5px; margin: 0 5px 20px 5px;
overflow: hidden; overflow: hidden;
} }
.main .main-news { .main .main-news {
width: 440px; width: 421px;
height: 390px; height: 355px;
float: left; float: left;
margin: 0 5px; margin: 0 5px;
} }
.main .main-news ul { .main .main-news ul {
width: 430px; width: 421px;
height: 390px; height: 355px;
border: 1px solid #CCCCCC; border: 1px solid #CCCCCC;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
...@@ -38,6 +38,14 @@ ...@@ -38,6 +38,14 @@
/*.main .main-news ul li:first-child{background-color: #F1F1F1;}*/ /*.main .main-news ul li:first-child{background-color: #F1F1F1;}*/
.main .main-news .icon-yaowen{font-size: 24px;color: #d81e06;vertical-align: middle;} .main .main-news .icon-yaowen{font-size: 24px;color: #d81e06;vertical-align: middle;}
.zgh-third-module .main-news{
width: 440px;
}
.zgh-third-module .main-news ul{
width: 440px;
}
.news-content { .news-content {
height: 34px; height: 34px;
line-height: 34px; line-height: 34px;
...@@ -59,19 +67,19 @@ ...@@ -59,19 +67,19 @@
} }
.main .announcement { .main .announcement {
width: 190px; width: 254px;
height: 390px; height: 355px;
float: right; float: right;
margin: 0 5px; margin: 0 5px;
} }
.main .announcement ul { .main .announcement ul {
width: 185px; width: 254px;
height: 215px; height: 215px;
border: 1px solid #CCCCCC; border: 1px solid #CCCCCC;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
margin: 0 5px 10px 0; margin: 0 5px 12px 0;
} }
.main .announcement ul li { .main .announcement ul li {
...@@ -91,23 +99,32 @@ ...@@ -91,23 +99,32 @@
font-weight: bold; font-weight: bold;
background-color: #F1F1F1; background-color: #F1F1F1;
} }
.main .announcement .news-content a{width: 180px;} .main .announcement .news-content a{width: 244px;}
.main .announcement .icon-gonggao{font-size: 24px;color: #d81e06;vertical-align: middle;} .main .announcement .icon-gonggao{font-size: 24px;color: #d81e06;vertical-align: middle;}
.main .announcement div{width: 185px;margin-right: 5px;height: 165px;} .main .announcement div{width: 254px;}
.main .announcement img{width: 185px;height: 80px;} .main .announcement img{
width: 254px;
height: 60px;
display: block;
}
.announcementImg a{
display: block;
text-align: center;
margin-top: 9px;
}
/* 轮播图效果CSS开始 */ /* 轮播图效果CSS开始 */
.carousel-wrapper { .carousel-wrapper {
width: 520px; width: 473px;
float: left; float: left;
margin: 0 5px; margin: 0 3px 0 5px;
} }
#carousel-focus { #carousel-focus {
width: 520px; width: 473px;
height: 390px; height: 355px;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
...@@ -119,19 +136,26 @@ ...@@ -119,19 +136,26 @@
#carousel-focus ul li { #carousel-focus ul li {
float: left; float: left;
width: 520px; width: 473px;
height: 390px; height: 355px;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
background: #000; background: #000;
} }
#carousel-focus ul li img { #carousel-focus ul li img {
width: 520px; width: 473px;
height: 390px; height: 355px;
} }
#carousel-focus ul li a p{ #carousel-focus ul li a p{
position: absolute;left: 0;bottom: 0;width: 380px;line-height: 28px;z-index: 1;color: #ffffff;text-indent: 10px; position: absolute;
left: 0;
bottom: 0;
width: 340px;
line-height: 28px;
z-index: 1;
color: #ffffff;
text-indent: 10px;
} }
#carousel-focus ul li div { #carousel-focus ul li div {
...@@ -141,7 +165,7 @@ ...@@ -141,7 +165,7 @@
#carousel-focus .btnBg { #carousel-focus .btnBg {
position: absolute; position: absolute;
width: 520px; width: 473px;
height: 28px; height: 28px;
left: 0; left: 0;
bottom: 0; bottom: 0;
...@@ -228,18 +252,39 @@ ...@@ -228,18 +252,39 @@
.zgh-block-module{width: 1180px;margin: 0 auto 20px auto;overflow: hidden;} .zgh-block-module{width: 1180px;margin: 0 auto 20px auto;overflow: hidden;}
/* second */ /* second */
.zgh-second-module{height: 270px;} .zgh-second-module{height: 270px;}
.zgh-second-module .zgh-module-left{width: 960px;margin: 0 5px;overflow: hidden;float: left;} .zgh-second-module .zgh-module-left{width: 902px;margin: 0 5px;overflow: hidden;float: left;}
.zgh-second-module .zgh-module-title{width: 960px;height: 34px;line-height: 34px;border-bottom: 2px solid #CCCCCC;box-sizing: border-box;} .zgh-second-module .zgh-module-title{width: 902px;height: 34px;line-height: 34px;border-bottom: 2px solid #CCCCCC;box-sizing: border-box;}
.zgh-second-module .zgh-module-title span{height: 34px;line-height: 34px;font-size: 18px;font-weight:bold;color: #d81e06;border-bottom: 2px solid #d81e06;box-sizing: border-box;display: inline-block;} .zgh-second-module .zgh-module-title span{height: 34px;line-height: 34px;font-size: 18px;font-weight:bold;color: #d81e06;border-bottom: 2px solid #d81e06;box-sizing: border-box;display: inline-block;}
.zgh-second-module ul.ul-box{width: 960px;height: 220px;} .zgh-second-module ul.ul-box{width: 902px;height: 220px;}
.zgh-second-module ul.ul-box table{width: 960px;height: 220px;} .zgh-second-module ul.ul-box table{width: 902px;height: 220px;}
.zgh-second-module ul.ul-box table th{width: 25px;vertical-align: middle;} .zgh-second-module ul.ul-box table th{width: 25px;vertical-align: middle; position: relative;}
.zgh-second-module ul.ul-box table td{width: 910px;vertical-align: middle;} .zgh-second-module ul.ul-box table td{width: 882px;vertical-align: middle;}
.zgh-second-module ul table td{margin: 0 auto;overflow: hidden;} .zgh-second-module ul table td{margin: 0 auto;overflow: hidden;}
.zgh-second-module .zgh-module-right{width: 210px;height: 184px;float: right;border: 1px solid #CCCCCC;box-sizing: border-box;color: #FFFFFF;} .zgh-second-module .zgh-module-right{
width: 254px;
height: 184px;
float: right;
border: 1px solid #CCCCCC;
box-sizing: border-box;
color: #FFFFFF;
margin-right: 5px;
}
/*.zgh-second-module .zgh-module-right{width: 210px;height: 254px;float: right;border: 1px solid #CCCCCC;box-sizing: border-box;color: #FFFFFF;}*/ /*.zgh-second-module .zgh-module-right{width: 210px;height: 254px;float: right;border: 1px solid #CCCCCC;box-sizing: border-box;color: #FFFFFF;}*/
.zgh-second-module .zgh-module-right div{height: 34px;line-height: 34px;text-indent: 14px;overflow: hidden;background-color: #D81E06;border-bottom: 1px solid #CCCCCC;box-sizing: border-box;} .zgh-second-module .zgh-module-right div{height: 34px;line-height: 34px;text-indent: 14px;overflow: hidden;background-color: #D81E06;border-bottom: 1px solid #CCCCCC;box-sizing: border-box;}
.zgh-second-module .zgh-module-right a img{width: 180px;height: 60px;margin: 10px 14px 0 14px;display: block;} .zgh-second-module .zgh-module-right a img{
width: 180px;
height: 60px;
margin: 10px auto 0;
display: block;
}
.service-platform img{
width: 254px;
height: 60px;
transform: translateX(1px);
margin-top: 13px;
}
/*third*/ /*third*/
.zgh-third-module{height: 250px;} .zgh-third-module{height: 250px;}
...@@ -281,15 +326,26 @@ ...@@ -281,15 +326,26 @@
-webkit-text-overflow: ellipsis; -webkit-text-overflow: ellipsis;
} }
.service-center th{
position: relative;
}
#service_arrRight{
right: -7px;
}
#service_arrLeft{
left: -6px;
}
/*fourth*/ /*fourth*/
.zgh-fourth-module{height: 254px;} .zgh-fourth-module{height: 254px;}
.zgh-fourth-module .zgh-module-left{width: 960px;margin: 0 5px;overflow: hidden;float: left;height: 254px;} .zgh-fourth-module .zgh-module-left{width: 902px;margin: 0 5px;overflow: hidden;float: left;height: 254px;}
.zgh-fourth-module .zgh-module-left .zgh-lamor{width: 571px;height: 254px;float: left;} .zgh-fourth-module .zgh-module-left .zgh-lamor{width: 509px;height: 254px;float: left;}
.zgh-fourth-module .zgh-lamor .zgh-module-title{width: 571px;height: 34px;line-height: 34px;border-bottom: 2px solid #CCCCCC;box-sizing: border-box;} .zgh-fourth-module .zgh-lamor .zgh-module-title{width: 509px;height: 34px;line-height: 34px;border-bottom: 2px solid #CCCCCC;box-sizing: border-box;}
.zgh-fourth-module .zgh-lamor .zgh-module-title span{height: 34px;line-height: 34px;font-size: 18px;font-weight:bold;color: #d81e06;border-bottom: 2px solid #d81e06;box-sizing: border-box;display: inline-block;} .zgh-fourth-module .zgh-lamor .zgh-module-title span{height: 34px;line-height: 34px;font-size: 18px;font-weight:bold;color: #d81e06;border-bottom: 2px solid #d81e06;box-sizing: border-box;display: inline-block;}
.zgh-fourth-module .zgh-lamor ul.ul-box{width: 571px;height: 220px;margin-right: 5px;} .zgh-fourth-module .zgh-lamor ul.ul-box{width: 509px;height: 220px;margin-right: 5px;}
.zgh-fourth-module .zgh-lamor ul.ul-box table{width: 571px;height: 220px;} .zgh-fourth-module .zgh-lamor ul.ul-box table{width: 509px;height: 220px;}
.zgh-fourth-module .zgh-lamor ul.ul-box table th{width: 25px;vertical-align: middle;} .zgh-fourth-module .zgh-lamor ul.ul-box table th{width: 25px;vertical-align: middle; position: relative;}
.zgh-fourth-module .zgh-lamor ul.ul-box table td{width:513px;margin: 0 auto;overflow: hidden;vertical-align: middle;} .zgh-fourth-module .zgh-lamor ul.ul-box table td{width:513px;margin: 0 auto;overflow: hidden;vertical-align: middle;}
.zgh-fourth-module .zgh-module-left .zgh-publication{width: 379px;height: 254px;margin-left: 5px;float: right;} .zgh-fourth-module .zgh-module-left .zgh-publication{width: 379px;height: 254px;margin-left: 5px;float: right;}
.zgh-fourth-module .zgh-publication .zgh-module-title{width: 379px;height: 34px;line-height: 34px;border-bottom: 2px solid #CCCCCC;box-sizing: border-box;} .zgh-fourth-module .zgh-publication .zgh-module-title{width: 379px;height: 34px;line-height: 34px;border-bottom: 2px solid #CCCCCC;box-sizing: border-box;}
...@@ -298,14 +354,31 @@ ...@@ -298,14 +354,31 @@
.zgh-fourth-module .zgh-publication ul.ul-box table{width: 379px;height: 220px;} .zgh-fourth-module .zgh-publication ul.ul-box table{width: 379px;height: 220px;}
.zgh-fourth-module .zgh-publication ul.ul-box table th{width: 25px;vertical-align: middle;} .zgh-fourth-module .zgh-publication ul.ul-box table th{width: 25px;vertical-align: middle;}
.zgh-fourth-module .zgh-publication ul.ul-box table td{margin: 0 auto;overflow: hidden;vertical-align: middle;width: 329px;} .zgh-fourth-module .zgh-publication ul.ul-box table td{margin: 0 auto;overflow: hidden;vertical-align: middle;width: 329px;}
.zgh-fourth-module .zgh-module-right{width: 210px;height: 254px;float: right;border: 1px solid #CCCCCC;box-sizing: border-box;} .zgh-fourth-module .zgh-module-right{
width: 254px;
height: 254px;
float: right;
border: 1px solid #CCCCCC;
box-sizing: border-box;
margin-right: 5px;
}
#lamor_arrLeft{
left: -5px;
}
#lamor_arrRight{
right: -5px;
}
.zgh-fourth-module .zgh-module-right .zgh-module-title{height: 34px;line-height: 34px;color: #FFFFFF;text-indent: 14px;overflow: hidden;background-color: #D81E06;border-bottom: 1px solid #CCCCCC;box-sizing: border-box;} .zgh-fourth-module .zgh-module-right .zgh-module-title{height: 34px;line-height: 34px;color: #FFFFFF;text-indent: 14px;overflow: hidden;background-color: #D81E06;border-bottom: 1px solid #CCCCCC;box-sizing: border-box;}
.zgh-fourth-module .zgh-module-right .zgh-module-box{width: 200px;height: 210px;margin: 5px;} .zgh-fourth-module .zgh-module-right .zgh-module-box{
width: 200px;
height: 210px;
margin: 5px auto;
}
.zgh-fourth-module .zgh-module-right .zgh-module-box ul li{width: 90px;height: 95px;margin: 5px;float: left;text-align: center;} .zgh-fourth-module .zgh-module-right .zgh-module-box ul li{width: 90px;height: 95px;margin: 5px;float: left;text-align: center;}
.zgh-fourth-module .zgh-module-right .zgh-module-box ul li a{display: inline-block;width: 90px;height: 95px;} .zgh-fourth-module .zgh-module-right .zgh-module-box ul li a{display: inline-block;width: 90px;height: 95px;}
.zgh-fourth-module .zgh-module-right .zgh-module-box ul li a img{width: 60px;height: 60px;margin: 0 10px;} .zgh-fourth-module .zgh-module-right .zgh-module-box ul li a img{width: 60px;height: 60px;margin: 0 10px;}
#service_scrollbox ul { #service_scrollbox ul {
overflow: hidden; overflow: hidden;
} }
...@@ -320,7 +393,7 @@ ...@@ -320,7 +393,7 @@
line-height: 18px; line-height: 18px;
min-height: 18px; min-height: 18px;
text-align: center; text-align: center;
padding: 10px; padding: 10px 8px;
overflow: hidden; overflow: hidden;
} }
...@@ -332,6 +405,10 @@ ...@@ -332,6 +405,10 @@
border: 0; border: 0;
} }
#lamor_scrollbox{
margin: 0 auto;
}
#lamor_scrollbox ul { #lamor_scrollbox ul {
overflow: hidden; overflow: hidden;
} }
...@@ -347,7 +424,7 @@ ...@@ -347,7 +424,7 @@
line-height: 18px; line-height: 18px;
min-height: 18px; min-height: 18px;
text-align: center; text-align: center;
padding: 10px; padding: 10px 5px;
overflow: hidden; overflow: hidden;
} }
...@@ -388,7 +465,8 @@ ...@@ -388,7 +465,8 @@
/*悬浮窗*/ /*悬浮窗*/
.float-window{ .float-window{
width: 150px;height: 240px; width: 150px;
height: 240px;
background: url('/img/float_window.jpg') no-repeat; background: url('/img/float_window.jpg') no-repeat;
position: fixed; position: fixed;
right: 20px; right: 20px;
......
...@@ -129,8 +129,8 @@ var vm = new Vue({ ...@@ -129,8 +129,8 @@ var vm = new Vue({
lamorStyle.scrollContId = "lamor_scrollbox"; //内容容器ID lamorStyle.scrollContId = "lamor_scrollbox"; //内容容器ID
lamorStyle.arrLeftId = "lamor_arrLeft"; //左箭头ID lamorStyle.arrLeftId = "lamor_arrLeft"; //左箭头ID
lamorStyle.arrRightId = "lamor_arrRight"; //右箭头ID lamorStyle.arrRightId = "lamor_arrRight"; //右箭头ID
lamorStyle.frameWidth = 516; //显示框宽度 lamorStyle.frameWidth = 495; //显示框宽度
lamorStyle.pageWidth = 516; //翻页宽度 lamorStyle.pageWidth = 495; //翻页宽度
lamorStyle.speed = 8; //移动速度(单位毫秒,越小越快) lamorStyle.speed = 8; //移动速度(单位毫秒,越小越快)
lamorStyle.space = 8; //每次移动像素(单位px,越大越快) lamorStyle.space = 8; //每次移动像素(单位px,越大越快)
lamorStyle.autoPlay = false; //自动播放 lamorStyle.autoPlay = false; //自动播放
...@@ -325,6 +325,7 @@ var vm = new Vue({ ...@@ -325,6 +325,7 @@ var vm = new Vue({
vm.onlineReceptionRooms.push(obj); vm.onlineReceptionRooms.push(obj);
}) })
} }
console.log(r)
}, },
error: function () { error: function () {
} }
...@@ -432,8 +433,8 @@ timesStyle.arrRightId = "service_arrRight"; //右箭头ID ...@@ -432,8 +433,8 @@ timesStyle.arrRightId = "service_arrRight"; //右箭头ID
timesStyle.dotListId = "service_Index"; //下标 timesStyle.dotListId = "service_Index"; //下标
timesStyle.dotClassName = "IndexDot"; timesStyle.dotClassName = "IndexDot";
timesStyle.dotOnClassName = "OnIndexDot"; timesStyle.dotOnClassName = "OnIndexDot";
timesStyle.frameWidth = 910; //显示框宽度 timesStyle.frameWidth = 882; //显示框宽度
timesStyle.pageWidth = 910; //翻页宽度 timesStyle.pageWidth = 882; //翻页宽度
timesStyle.speed = 8; //移动速度(单位毫秒,越小越快) timesStyle.speed = 8; //移动速度(单位毫秒,越小越快)
timesStyle.space = 8; //每次移动像素(单位px,越大越快) timesStyle.space = 8; //每次移动像素(单位px,越大越快)
timesStyle.autoPlay = true; //自动播放 timesStyle.autoPlay = true; //自动播放
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment