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/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>' +