Merge branch 'xufei-01' into 'master'

webpage gonghui

See merge request !3

beansprouts-web/src/main/webapp/WEB-INF/page/sys/app_post.html

@@ -66,6 +66,10 @@
                         <input type="radio" name="type" value="5"
                                v-model="appPost.postType"/>民主管理
                     </label>
+                    <label class="radio-inline">
+                        <input type="radio" name="type" value="6"
+                               v-model="appPost.postType"/>劳权预警
+                    </label>
                 </div>
             </div>
 

beansprouts-web/src/main/webapp/WEB-INF/wap/GQZD.html

@@ -187,6 +187,7 @@
 								<option value="3">法律宣传</option>
 								<option value="4">经济技术</option>
 								<option value="5">民主管理</option>
+								<option value="6">劳权预警</option>
 							</select>
 						</a>
 					</div>

beansprouts-web/src/main/webapp/WEB-INF/wap/ZTBSInfo.html

@@ -117,8 +117,10 @@
                                 obj.postType = "法律宣传";
                             }else if(r.appPost.postType == 4){
                                 obj.postType = "经济技术";
-                            }else {
+                            }else if(r.appPost.postType == 5){
                                 obj.postType = "民主管理";
+                            }else{
+                                obj.postType = "劳权预警";
                             }
                             obj.unionId = r.appPost.unionId;
                             if(r.appPost.updateTime){

beansprouts-web/src/main/webapp/WEB-INF/wap/ZTBSList.html

@@ -129,8 +129,10 @@
                             obj.postType = "法律宣传";
                         }else if(item.postType == 4){
                             obj.postType = "经济技术";
-                        }else {
+                        }else if(item.postType == 5){
                             obj.postType = "民主管理";
+                        }else{
+                            obj.postType = "劳权预警";
                         }
                         listData.push(obj);
                     });

beansprouts-web/src/main/webapp/index.html

@@ -29,6 +29,8 @@
 	<!--第一块-->
 	<div class="main-container">
 		<!--轮播图开始-->
+		<div class="" style="float:left;width: 912px;">
+		<div class="zgh-clear" style="overflow:hidden;float:left;">
 			<div class="carousel-wrapper">
 				<div id="carousel-focus">
 					<ul>
@@ -60,28 +62,10 @@
 					</li>
 				</ul>
 			</div>
-		<div class="announcement">
-			<ul>
-				<li>
-					<i class="iconfont icon-gonggao"></i>
-					<a style="color: #d81e06">通知公告</a>
-					<a href="./qt/secondaryList.html?menuId=30201" class="zgh-more">更多>></a>
-				</li>
-				<li class="news-content" v-for="(n,index) in announcements">
-					<a :href="'./qt/third-level.html?id='+n.id+'&sortId='+n.menuId" :title="n.title" class="" target="_blank">{{n.title}}</a>
-					<!--<span>{{n.time}}</span>-->
-				</li>
-			</ul>
-			<div class="announcementImg">
-				<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>
-			</div>
 		</div>
-	</div>
-	<!--第二块-->
 		<div class="zgh-block-module zgh-second-module">
 			<div class="zgh-module-left">
-			<div class="zgh-module-title">
+				<div class="zgh-module-title" style="margin-top: 20px;">
 					<span>服务中心</span>
 					<div class="zgh-flor">
 						<a href="./qt/secondaryList.html?menuId=20101" class="zgh-more">更多&gt;&gt;</a>
@@ -174,22 +158,41 @@
 					<div id="service_Index"></div>
 				</ul>
 			</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">
+		<div class="announcement main-news">
+			<ul>
+				<li>
+					<i class="iconfont icon-gonggao"></i>
+					<a style="color: #d81e06">通知公告</a>
+					<a href="./qt/secondaryList.html?menuId=30201" class="zgh-more">更多>></a>
+				</li>
+				<li class="news-content" v-for="(n,index) in announcements">
+					<a :href="'./qt/third-level.html?id='+n.id+'&sortId='+n.menuId" :title="n.title" class="" target="_blank">{{n.title}}</a>
+					<!--<span>{{n.time}}</span>-->
+				</li>
+			</ul>
+			<div class="announcementImg">
+				<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>
+			</div>
+			<div style="height: 70px;text-align: center; float: right; margin-right: 2px;" class="service-platform">
 				<a href="http://jingshen.87188718.com/EconomicReview/Login.aspx" target="_blank" title="工会经审综合服务平台">
 					<img src="./qt/img/servicePlatformxin.png" />
 				</a>
+				<a href="http://www.all-powerful.com/" target="_blank" title="财务管理平台">
+					<img src="./qt/img/cwglpt.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-module-left">

beansprouts-web/src/main/webapp/js/caiyun/post.js

@@ -21,6 +21,9 @@ $(function () {
                     else  if(value === 5) {
                         return '<span class="label label-warning">民主管理</span>';
                     }
+                    else  if(value === 6) {
+                        return '<span class="label label-warning">劳权预警</span>';
+                    }
                     else{
                         return '未知';
                     }

beansprouts-web/src/main/webapp/qt/css/index.css

@@ -2,7 +2,7 @@
 
 .main .main-container {
 	width: 1180px;
-	height: 355px;
+	/*height: 355px;*/
 	margin: 0 5px 20px 5px;
 	overflow: hidden;
 }
@@ -75,7 +75,7 @@
 
 .main .announcement ul {
 	width: 254px;
-	height: 216px;
+	height: 355px;
 	border: 1px solid #CCCCCC;
 	box-sizing: border-box;
 	overflow: hidden;
@@ -258,9 +258,9 @@
 /* 轮播图效果CSS结束 */
 
 
-.zgh-block-module{width: 1180px;margin: 0 auto 20px auto;overflow: hidden;}
+.zgh-block-module{width: 1180px;margin: 0 auto;overflow: hidden;}
 /* 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-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;}
@@ -291,7 +291,7 @@
 	width: 254px;
 	height: 60px;
 	transform: translateX(2px);
-	margin-top: 13px;
+	margin-top: 7px;
 }
 
 
@@ -360,7 +360,7 @@
 }
 
 /*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 .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;}

beansprouts-web/src/main/webapp/qt/js/zgh.js

@@ -174,7 +174,7 @@ Vue.component('head-content-index',{
     '                <a href="javascript:alert(\'22\');">网上办公</a>' +
     '            </li>' +
     '            <li>' +
-    '                <a href="javascript:alert(\'33\');">5·1云中心</a>' +
+    '                <a href="http://www.5190.cc/login.html">5·1云中心</a>' +
     '            </li>' +
     '        </ul>' +
     '    </div>' +