Skip to content

Z
zhgh
Commit 9e387f4f authored by lings's avatar lings
Browse files
Options

Merge branch 'xufei-01' into 'master' 

webpage gonghui

See merge request !3
parents 8bf3a00e 9f9137cc
Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 146 deletions
beansprouts-web/src/main/webapp/WEB-INF/page/sys/app_post.html
View file @ 9e387f4f
...@@ -66,6 +66,10 @@ ...@@ -66,6 +66,10 @@
<input type="radio" name="type" value="5" <input type="radio" name="type" value="5"
v-model="appPost.postType"/>民主管理 v-model="appPost.postType"/>民主管理
</label> </label>
<label class="radio-inline">
<input type="radio" name="type" value="6"
v-model="appPost.postType"/>劳权预警
</label>
</div> </div>
</div> </div>
......
beansprouts-web/src/main/webapp/WEB-INF/wap/GQZD.html
View file @ 9e387f4f
...@@ -187,6 +187,7 @@ ...@@ -187,6 +187,7 @@
<option value="3">法律宣传</option> <option value="3">法律宣传</option>
<option value="4">经济技术</option> <option value="4">经济技术</option>
<option value="5">民主管理</option> <option value="5">民主管理</option>
<option value="6">劳权预警</option>
</select> </select>
</a> </a>
</div> </div>
......
beansprouts-web/src/main/webapp/WEB-INF/wap/ZTBSInfo.html
View file @ 9e387f4f
...@@ -117,8 +117,10 @@ ...@@ -117,8 +117,10 @@
obj.postType = "法律宣传"; obj.postType = "法律宣传";
}else if(r.appPost.postType == 4){ }else if(r.appPost.postType == 4){
obj.postType = "经济技术"; obj.postType = "经济技术";
}else { }else if(r.appPost.postType == 5){
obj.postType = "民主管理"; obj.postType = "民主管理";
}else{
obj.postType = "劳权预警";
} }
obj.unionId = r.appPost.unionId; obj.unionId = r.appPost.unionId;
if(r.appPost.updateTime){ if(r.appPost.updateTime){
......
beansprouts-web/src/main/webapp/WEB-INF/wap/ZTBSList.html
View file @ 9e387f4f
...@@ -129,8 +129,10 @@ ...@@ -129,8 +129,10 @@
obj.postType = "法律宣传"; obj.postType = "法律宣传";
}else if(item.postType == 4){ }else if(item.postType == 4){
obj.postType = "经济技术"; obj.postType = "经济技术";
}else { }else if(item.postType == 5){
obj.postType = "民主管理"; obj.postType = "民主管理";
}else{
obj.postType = "劳权预警";
} }
listData.push(obj); listData.push(obj);
}); });
......
beansprouts-web/src/main/webapp/index.html
View file @ 9e387f4f
...@@ -29,38 +29,138 @@ ...@@ -29,38 +29,138 @@
<!--第一块--> <!--第一块-->
<div class="main-container"> <div class="main-container">
<!--轮播图开始--> <!--轮播图开始-->
<div class="carousel-wrapper"> <div class="" style="float:left;width: 912px;">
<div id="carousel-focus"> <div class="zgh-clear" style="overflow:hidden;float:left;">
<div class="carousel-wrapper">
<div id="carousel-focus">
<ul>
<li v-for="pic in carouselPics">
<a :href="'./qt/third-level.html?id='+pic.id+'&sortId='+pic.menuId" target="_blank" :title="pic.title">
<img :src="'./doc/'+pic.atta" :alt="''+pic.atta" />
<p class="zgh-ellipsis" :title="pic.title" v-text="pic.title"></p>
</a>
</li>
</ul>
</div>
</div>
<!--轮播图结束-->
<div class="main-news">
<ul> <ul>
<li v-for="pic in carouselPics"> <li>
<a :href="'./qt/third-level.html?id='+pic.id+'&sortId='+pic.menuId" target="_blank" :title="pic.title"> <i class="iconfont icon-yaowen"></i>
<img :src="'./doc/'+pic.atta" :alt="''+pic.atta" /> <span class="news-span" @mouseover="changeTab(1)" :class="{'currentTab':tabIndex == 1}">雄镇工事</span>|
<p class="zgh-ellipsis" :title="pic.title" v-text="pic.title"></p> <span class="news-span" @mouseover="changeTab(2)" :class="{'currentTab':tabIndex == 2}">工会要闻</span>
</a> <a href="./qt/secondaryList.html?menuId=10202" class="zgh-more">更多>></a>
</li>
<li v-if="tabIndex == 1" class="news-content" v-for="(n,index) in xiongZhenWorks">
<a :href="'./qt/third-level.html?id='+n.id+'&sortId='+n.menuId" :title="n.title" target="_blank" class="zgh-ellipsis">{{n.title}}</a>
<span class="zgh-time">{{n.time}}</span>
</li>
<li v-if="tabIndex == 2" class="news-content" v-for="(n,index) in unionNews">
<a :href="'./qt/third-level.html?id='+n.id+'&sortId='+n.menuId" :title="n.title" target="_blank" class="zgh-ellipsis">{{n.title}}</a>
<span class="zgh-time">{{n.time}}</span>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
<!--轮播图结束--> <div class="zgh-block-module zgh-second-module">
<div class="main-news"> <div class="zgh-module-left">
<ul> <div class="zgh-module-title" style="margin-top: 20px;">
<li> <span>服务中心</span>
<i class="iconfont icon-yaowen"></i> <div class="zgh-flor">
<span class="news-span" @mouseover="changeTab(1)" :class="{'currentTab':tabIndex == 1}">雄镇工事</span>| <a href="./qt/secondaryList.html?menuId=20101" class="zgh-more">更多&gt;&gt;</a>
<span class="news-span" @mouseover="changeTab(2)" :class="{'currentTab':tabIndex == 2}">工会要闻</span> </div>
<a href="./qt/secondaryList.html?menuId=10202" class="zgh-more">更多>></a> </div>
</li> <ul class="ul-box">
<li v-if="tabIndex == 1" class="news-content" v-for="(n,index) in xiongZhenWorks"> <table border="0">
<a :href="'./qt/third-level.html?id='+n.id+'&sortId='+n.menuId" :title="n.title" target="_blank" class="zgh-ellipsis">{{n.title}}</a> <tr>
<span class="zgh-time">{{n.time}}</span> <th><div class="pointer-left" id="service_arrLeft" border="0"></div></th>
</li> <td>
<li v-if="tabIndex == 2" class="news-content" v-for="(n,index) in unionNews"> <div id="service_scrollbox">
<a :href="'./qt/third-level.html?id='+n.id+'&sortId='+n.menuId" :title="n.title" target="_blank" class="zgh-ellipsis">{{n.title}}</a> <ul>
<span class="zgh-time">{{n.time}}</span> <li>
</li> <a href="./qt/secondaryList.html?menuId=20101" title="蓝领贷申办"><img src="./qt/img/daikuan.png" />
</ul> <!--<p class="zgh-ellipsis">蓝领贷申办蓝领贷申办蓝领贷申办</p>-->
<p class="zgh-ellipsis">蓝领贷申办</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20102" title="困难职工救助、申请" ><img src="./qt/img/difficulty.png" border="0">
<p>困难职工救助、申请</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20103" title="工会组建、注销"><img src="./qt/img/zujiantuandui.png" border="0">
<p>工会组建、注销</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20104" title="入会转会申请"><img src="./qt/img/shenqing.png" border="0">
<p>入会转会申请</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20105" title="5·1卡申领"><img src="./qt/img/zhuangbeishenling.png" border="0">
<p>5·1卡申领</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20106" title="工会法人登记"><img src="./qt/img/dengji.png" border="0">
<p>工会法人登记</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20107" title="工会经费税务代收申报流程"><img src="./qt/img/daishou.png" border="0">
<p>工会经费税务代收申报流程</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20108" title="就业服务"><img src="./qt/img/jiuyefuwu.png" border="0">
<p>就业服务</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20109" title="劳模服务"><img src="./qt/img/fuwu.png" border="0">
<p>劳模服务</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20110" title="法律援助申请"><img src="./qt/img/yuanzhu.png" border="0">
<p>法律援助申请</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20111" title="劳动争议调解"><img src="./qt/img/tiaojie.png" border="0">
<p>劳动争议调解</p>
</a>
</li>
<!--<li>-->
<!--<a href="./qt/secondaryList.html?id=20112"><img src="./qt/img/pingtai.png" border="0">-->
<!--<p>工会经审综合服务平台</p>-->
<!--</a>-->
<!--</li>-->
<li>
<a href="./qt/secondaryList.html?menuId=20113" title="就业推荐"><img src="./qt/img/jiuye.png" border="0">
<p>就业推荐</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20114" title="医疗互助"><img src="./qt/img/jiuzhu.png" border="0">
<p>医疗互助</p>
</a>
</li>
</ul>
</div>
</td>
<th style="width: 25px;vertical-align: middle;"><div class="pointer-right" id="service_arrRight" border="0"></div></th>
</tr>
</table>
<div id="service_Index"></div>
</ul>
</div>
</div>
</div> </div>
<div class="announcement"> <div class="announcement main-news">
<ul> <ul>
<li> <li>
<i class="iconfont icon-gonggao"></i> <i class="iconfont icon-gonggao"></i>
...@@ -76,120 +176,23 @@ ...@@ -76,120 +176,23 @@
<a href="./qt/secondaryList.html?menuId=30601"><img src="./qt/img/yangguanggonghuixin.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/zuzhigaikuangxin.png" title="组织概况" /></a> <a href="./qt/secondaryList.html?menuId=30301"><img src="./qt/img/zuzhigaikuangxin.png" title="组织概况" /></a>
</div> </div>
</div> <div style="height: 70px;text-align: center; float: right; margin-right: 2px;" class="service-platform">
</div> <a href="http://jingshen.87188718.com/EconomicReview/Login.aspx" target="_blank" title="工会经审综合服务平台">
<!--第二块--> <img src="./qt/img/servicePlatformxin.png" />
<div class="zgh-block-module zgh-second-module"> </a>
<div class="zgh-module-left"> <a href="http://www.all-powerful.com/" target="_blank" title="财务管理平台">
<div class="zgh-module-title"> <img src="./qt/img/cwglpt.png" />
<span>服务中心</span> </a>
<div class="zgh-flor">
<a href="./qt/secondaryList.html?menuId=20101" class="zgh-more">更多&gt;&gt;</a>
</div>
</div> </div>
<ul class="ul-box">
<table border="0">
<tr>
<th><div class="pointer-left" id="service_arrLeft" border="0"></div></th>
<td>
<div id="service_scrollbox">
<ul>
<li>
<a href="./qt/secondaryList.html?menuId=20101" title="蓝领贷申办"><img src="./qt/img/daikuan.png" />
<!--<p class="zgh-ellipsis">蓝领贷申办蓝领贷申办蓝领贷申办</p>-->
<p class="zgh-ellipsis">蓝领贷申办</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20102" title="困难职工救助、申请" ><img src="./qt/img/difficulty.png" border="0">
<p>困难职工救助、申请</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20103" title="工会组建、注销"><img src="./qt/img/zujiantuandui.png" border="0">
<p>工会组建、注销</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20104" title="入会转会申请"><img src="./qt/img/shenqing.png" border="0">
<p>入会转会申请</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20105" title="5·1卡申领"><img src="./qt/img/zhuangbeishenling.png" border="0">
<p>5·1卡申领</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20106" title="工会法人登记"><img src="./qt/img/dengji.png" border="0">
<p>工会法人登记</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20107" title="工会经费税务代收申报流程"><img src="./qt/img/daishou.png" border="0">
<p>工会经费税务代收申报流程</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20108" title="就业服务"><img src="./qt/img/jiuyefuwu.png" border="0">
<p>就业服务</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20109" title="劳模服务"><img src="./qt/img/fuwu.png" border="0">
<p>劳模服务</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20110" title="法律援助申请"><img src="./qt/img/yuanzhu.png" border="0">
<p>法律援助申请</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20111" title="劳动争议调解"><img src="./qt/img/tiaojie.png" border="0">
<p>劳动争议调解</p>
</a>
</li>
<!--<li>-->
<!--<a href="./qt/secondaryList.html?id=20112"><img src="./qt/img/pingtai.png" border="0">-->
<!--<p>工会经审综合服务平台</p>-->
<!--</a>-->
<!--</li>-->
<li>
<a href="./qt/secondaryList.html?menuId=20113" title="就业推荐"><img src="./qt/img/jiuye.png" border="0">
<p>就业推荐</p>
</a>
</li>
<li>
<a href="./qt/secondaryList.html?menuId=20114" title="医疗互助"><img src="./qt/img/jiuzhu.png" border="0">
<p>医疗互助</p>
</a>
</li>
</ul>
</div>
</td>
<th style="width: 25px;vertical-align: middle;"><div class="pointer-right" id="service_arrRight" border="0"></div></th>
</tr>
</table>
<div id="service_Index"></div>
</ul>
</div> </div>
<div class="zgh-module-right">
<div>
<i class="iconfont icon-zhuantizhuanlan"></i>
<a href="./qt/secondaryList.html?menuId=30501" style="color: #FFFFFF;">专题专栏</a>
</div>
<a target="_blank" :href="'./qt/third-level.html?id='+s.id+ '&sortId=30501'" v-for="s in specialColumns" :title="s.title"><img :src="'./doc/'+s.atta" :alt="''+s.title" /></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>-->
</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>
<!--&lt;!&ndash;第二块&ndash;&gt;-->
<!--<div class="zgh-block-module zgh-second-module">-->
<!--</div>-->
<!--第三块--> <!--第三块-->
<div class="zgh-block-module zgh-third-module"> <div class="zgh-block-module zgh-third-module">
<div class="zgh-module-left"> <div class="zgh-module-left">
......
beansprouts-web/src/main/webapp/js/caiyun/post.js
View file @ 9e387f4f
...@@ -21,6 +21,9 @@ $(function () { ...@@ -21,6 +21,9 @@ $(function () {
else if(value === 5) { else if(value === 5) {
return '<span class="label label-warning">民主管理</span>'; return '<span class="label label-warning">民主管理</span>';
} }
else if(value === 6) {
return '<span class="label label-warning">劳权预警</span>';
}
else{ else{
return '未知'; return '未知';
} }
......
beansprouts-web/src/main/webapp/qt/css/index.css
View file @ 9e387f4f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.main .main-container { .main .main-container {
width: 1180px; width: 1180px;
height: 355px; /*height: 355px;*/
margin: 0 5px 20px 5px; margin: 0 5px 20px 5px;
overflow: hidden; overflow: hidden;
} }
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
.main .announcement ul { .main .announcement ul {
width: 254px; width: 254px;
height: 216px; height: 355px;
border: 1px solid #CCCCCC; border: 1px solid #CCCCCC;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden; overflow: hidden;
...@@ -258,9 +258,9 @@ ...@@ -258,9 +258,9 @@
/* 轮播图效果CSS结束 */ /* 轮播图效果CSS结束 */
.zgh-block-module{width: 1180px;margin: 0 auto 20px auto;overflow: hidden;} .zgh-block-module{width: 1180px;margin: 0 auto;overflow: hidden;}
/* second */ /* second */
.zgh-second-module{height: 270px;} .zgh-second-module{height: 290px;}
.zgh-second-module .zgh-module-left{width: 902px;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: 902px;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;}
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
width: 254px; width: 254px;
height: 60px; height: 60px;
transform: translateX(2px); transform: translateX(2px);
margin-top: 13px; margin-top: 7px;
} }
...@@ -360,7 +360,7 @@ ...@@ -360,7 +360,7 @@
} }
/*fourth*/ /*fourth*/
.zgh-fourth-module{height: 254px;} .zgh-fourth-module{height: 254px;margin-top: 20px;}
.zgh-fourth-module .zgh-module-left{width: 902px;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: 509px;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: 509px;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;}
......
beansprouts-web/src/main/webapp/qt/js/zgh.js
View file @ 9e387f4f
...@@ -174,7 +174,7 @@ Vue.component('head-content-index',{ ...@@ -174,7 +174,7 @@ Vue.component('head-content-index',{
' <a href="javascript:alert(\'22\');">网上办公</a>' + ' <a href="javascript:alert(\'22\');">网上办公</a>' +
' </li>' + ' </li>' +
' <li>' + ' <li>' +
' <a href="javascript:alert(\'33\');">5·1云中心</a>' + ' <a href="http://www.5190.cc/login.html">5·1云中心</a>' +
' </li>' + ' </li>' +
' </ul>' + ' </ul>' +
' </div>' + ' </div>' +
......
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