Skip to content

Z
zhgh
Commit 3fe269ab authored by xiujunlian's avatar xiujunlian
Browse files
Options

Merge branch 'xufei' into 'master' 

2019-03-25'

See merge request !1
parents 3cf72537 662fc4f0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 218 additions and 133 deletions
beansprouts-common/src/main/resources/db.properties
View file @ 3fe269ab
...@@ -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
......
beansprouts-web/src/main/webapp/index.html
View file @ 3fe269ab
...@@ -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>
......
beansprouts-web/src/main/webapp/qt/js/index.js
View file @ 3fe269ab
...@@ -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