页面布局调整

tianti-modules/tianti-module-gateway/src/main/webapp/static/js/jquery.liMarquee.js

@@ -14,8 +14,8 @@
 				direction: 'left', //Указывает направление движения содержимого контейнера (left | right | up | down)
 				loop: -1, //Задает, сколько раз будет прокручиваться содержимое. "-1" для бесконечного воспроизведения движения
 				scrolldelay: 0, //Величина задержки в миллисекундах между движениями
-				scrollamount: 50, //Скорость движения контента (px/sec)
-				circular: true, //Если "true" - строка непрерывная 
+				scrollamount: 10, //Скорость движения контента (px/sec)
+				circular: true, //Если "true" - строка непрерывная
 				drag: true, //Если "true" - включено перетаскивание строки
 				runshort: true, //Если "true" - короткая строка тоже "бегает", "false" - стоит на месте
 				hoverstop: true, //true - строка останавливается при наведении курсора мыши, false - строка не останавливается
@@ -31,24 +31,24 @@
 				var leaveEvent = 'mouseleave';
 				if(p.inverthover){
 					enterEvent = 'mouseleave';
-					leaveEvent = 'mouseenter';	
+					leaveEvent = 'mouseenter';
 				}
-				
-								
+
+
 				var
 					loop = p.loop,
 					strWrap = $(this).addClass('str_wrap').data({scrollamount:p.scrollamount}),
 					fMove = false;
-					
-				
-				
-				var strWrapStyle = strWrap.attr('style'); 
-				
+
+
+
+				var strWrapStyle = strWrap.attr('style');
+
 				if(strWrapStyle){
 					var wrapStyleArr = strWrapStyle.split(';');
 					var startHeight = false;
 					for(var i=0; i < wrapStyleArr.length; i++){
-						var str = $.trim(wrapStyleArr[i]);					
+						var str = $.trim(wrapStyleArr[i]);
 						var tested =  str.search(/^height/g);
 						if(tested != -1){
 							startHeight = parseFloat(strWrap.css('height'));
@@ -57,18 +57,18 @@
 				}
 
 				var code = function () {
-					
+
 					strWrap.off('mouseleave');
 					strWrap.off('mouseenter');
 					strWrap.off('mousemove');
 					strWrap.off('mousedown');
 					strWrap.off('mouseup');
 
-					
+
 					if(!$('.str_move',strWrap).length){
 						strWrap.wrapInner($('<div>').addClass('str_move'));
 					}
-					
+
 					var
 					strMove = $('.str_move', strWrap).addClass('str_origin'),
 					strMoveClone = strMove.clone().removeClass('str_origin').addClass('str_move_clone'),
@@ -81,7 +81,7 @@
 					var circCloneHor = function(){
 						strMoveClone.clone().css({
 							left:'100%',
-							right:'auto',							
+							right:'auto',
 							width: strMove.width()
 						}).appendTo(strMove);
 						strMoveClone.css({
@@ -90,7 +90,7 @@
 							width: strMove.width()
 						}).appendTo(strMove);
 					}
-					
+
 					var circCloneVert = function(){
 						strMoveClone.clone().css({
 							top: '100%',
@@ -103,16 +103,16 @@
 							height:strMove.height()
 						}).appendTo(strMove);
 					}
-					
-					
-					
+
+
+
 					if (p.direction == 'left') {
 						strWrap.height(strMove.outerHeight())
 						if (strMove.width() > strWrap.width()) {
 							var leftPos = -strMove.width();
-							
+
 							if (p.circular) {
-								
+
 								if (!p.xml) {
 									circCloneHor()
 									leftPos = -(strMove.width() + (strMove.width() - strWrap.width()));
@@ -120,7 +120,7 @@
 							}
 							if (p.xml) {
 								strMove.css({
-									left:strWrap.width()	
+									left:strWrap.width()
 								})
 							}
 							var
@@ -161,7 +161,7 @@
 								if(!p.inverthover){
 									moveFunc1();
 								}
-							
+
 							if (p.hoverstop) {
 								strWrap.on(enterEvent, function () {
 									$(this).addClass('str_active');
@@ -184,15 +184,15 @@
 										var newX;
 										var oldX = e.clientX;
 										//drag
-										
+
 										strMoveLeft = strMove.position().left;
 										k1 = strMoveLeft - (e.clientX - strWrap.offset().left);
-										
-										
-										
+
+
+
 										$(this).on('mousemove', function (e) {
 											fMove = true;
-											
+
 											//drag
 											newX = e.clientX;
 											if(newX > oldX){
@@ -200,9 +200,9 @@
 											}else{
 												dir = -1
 											}
-											oldX = newX	
+											oldX = newX
 											dragLeft = k1 + (e.clientX - strWrap.offset().left);
-											
+
 											if (!p.circular) {
 												if(dragLeft < -strMove.width() && dir < 0){
 													dragLeft = strWrap.width();
@@ -225,26 +225,26 @@
 													strMoveLeft = strMove.position().left;
 													k1 = strMoveLeft - (e.clientX - strWrap.offset().left);
 												}
-	
+
 											}
-											
-											
+
+
 											strMove.stop(true).css({
 												left: dragLeft
 											});
 											//drag
-											
-										
-											
+
+
+
 										}).on('mouseup', function () {
 											$(this).off('mousemove');
 											if(p.inverthover){
 												strMove.trigger('mouseenter')
 											}
-											setTimeout(function () {                             
+											setTimeout(function () {
 												fMove = false
 											}, 50)
-											
+
 										});
 										return false;
 									})
@@ -306,20 +306,20 @@
 											if(p.inverthover){
 												strMove.stop(true);
 											}
-											
+
 											//drag
 											var dragLeft;
 											var dir = 1;
 											var newX;
 											var oldX = e.clientX;
 											//drag
-											
+
 											strMoveLeft = strMove.position().left;
 											k1 = strMoveLeft - (e.clientX - strWrap.offset().left);
 											$(this).on('mousemove', function (e) {
 												fMove = true;
-												
-												
+
+
 												//drag
 												newX = e.clientX;
 												if(newX > oldX){
@@ -327,9 +327,9 @@
 												}else{
 													dir = -1
 												}
-												oldX = newX	
+												oldX = newX
 												dragLeft = k1 + (e.clientX - strWrap.offset().left);
-												
+
 												if(dragLeft < -strMove.width() && dir < 0){
 													dragLeft = strWrap.width();
 													strMoveLeft = strMove.position().left;
@@ -340,20 +340,20 @@
 													strMoveLeft = strMove.position().left;
 													k1 = strMoveLeft - (e.clientX - strWrap.offset().left);
 												}
-												
-												
+
+
 												strMove.stop(true).css({
 													left: dragLeft
 												});
-												
-												
-												
+
+
+
 											}).on('mouseup', function () {
 												if(p.inverthover){
 													strMove.trigger('mouseenter')
 												}
 												$(this).off('mousemove');
-												setTimeout(function () {                             
+												setTimeout(function () {
 													fMove = false
 												}, 50)
 											});
@@ -380,7 +380,7 @@
 							left: -strMove.width(),
 							right: 'auto'
 						})
-						
+
 						if (strMove.width() > strWrap.width()) {
 							var leftPos = strWrap.width();
 							strMove.css({
@@ -393,7 +393,7 @@
 									leftPos = strMove.width();
 								}
 							}
-							
+
 							var
 							k2 = 0;
 							timeFunc = function () {
@@ -427,7 +427,7 @@
 							strWrap.data({
 								moveF : moveFunc
 							})
-					
+
 							if(!p.inverthover){
 								moveFunc();
 							}
@@ -442,26 +442,26 @@
 								});
 
 								if (p.drag) {
-									
+
 									strWrap.on('mousedown', function (e) {
 										if(p.inverthover){
 											strMove.stop(true);
 										}
-										
-										
+
+
 										//drag
 										var dragLeft;
 										var dir = 1;
 										var newX;
 										var oldX = e.clientX;
 										//drag
-										
+
 										strMoveLeft = strMove.position().left;
 										k2 = strMoveLeft - (e.clientX - strWrap.offset().left);
 										$(this).on('mousemove', function (e) {
-											
+
 											fMove = true;
-											
+
 											//drag
 											newX = e.clientX;
 											if(newX > oldX){
@@ -469,7 +469,7 @@
 											}else{
 												dir = -1
 											}
-											oldX = newX	
+											oldX = newX
 											dragLeft = k2 + (e.clientX - strWrap.offset().left);
 
 
@@ -496,20 +496,20 @@
 													strMoveLeft = strMove.position().left;
 													k2 = strMoveLeft - (e.clientX - strWrap.offset().left);
 												}
-	
+
 											}
-											
+
 											strMove.stop(true).css({
 												left: dragLeft
 											});
-											
+
 
 										}).on('mouseup', function () {
 											if(p.inverthover){
 												strMove.trigger('mouseenter')
 											}
 											$(this).off('mousemove');
-											setTimeout(function () {                             
+											setTimeout(function () {
 												fMove = false
 											}, 50)
 										});
@@ -525,9 +525,9 @@
 								};
 							}
 						} else {
-														
+
 							if (p.runshort) {
-								
+
 								var k2 = 0;
 								var timeFunc = function () {
 									time = (strWrap.width() - strMove.position().left) / strWrap.data('scrollamount') * 1000;
@@ -572,21 +572,21 @@
 											if(p.inverthover){
 												strMove.stop(true);
 											}
-											
+
 											//drag
 											var dragLeft;
 											var dir = 1;
 											var newX;
 											var oldX = e.clientX;
 											//drag
-											
+
 											strMoveLeft = strMove.position().left;
 											k2 = strMoveLeft - (e.clientX - strWrap.offset().left);
 											$(this).on('mousemove', function (e) {
 												fMove = true;
-												
-												
-												
+
+
+
 												//drag
 												newX = e.clientX;
 												if(newX > oldX){
@@ -594,9 +594,9 @@
 												}else{
 													dir = -1
 												}
-												oldX = newX	
+												oldX = newX
 												dragLeft = k2 + (e.clientX - strWrap.offset().left);
-												
+
 												if(dragLeft < -strMove.width() && dir < 0){
 													dragLeft = strWrap.width();
 													strMoveLeft = strMove.position().left;
@@ -611,13 +611,13 @@
 												strMove.stop(true).css({
 													left:dragLeft
 												});
-												
+
 											}).on('mouseup', function () {
 												if(p.inverthover){
 													strMove.trigger('mouseenter')
 												}
 												$(this).off('mousemove');
-												setTimeout(function () {                             
+												setTimeout(function () {
 													fMove = false
 												}, 50)
 											});
@@ -639,18 +639,18 @@
 					};
 					if (p.direction == 'up') {
 						strWrap.addClass('str_vertical');
-						
+
 						if (strMove.height() > strWrap.height()) {
 							var topPos = -strMove.height();
 							if (p.circular) {
 								if (!p.xml) {
-									circCloneVert();									
+									circCloneVert();
 									topPos = -(strMove.height() + (strMove.height() - strWrap.height()));
 								}
 							}
 							if (p.xml) {
 								strMove.css({
-									top:strWrap.height()	
+									top:strWrap.height()
 								})
 							}
 							var
@@ -663,7 +663,7 @@
 									fullS = (fullS + strWrap.height());
 									time = (fullS - (strWrap.height() - parseFloat(strMove.css('top')))) / strWrap.data('scrollamount') * 1000;
 								}
-								
+
 								return time;
 							};
 							var moveFunc = function () {
@@ -683,11 +683,11 @@
 									});
 								};
 							};
-							
+
 							strWrap.data({
 								moveF : moveFunc
 							})
-							
+
 							if(!p.inverthover){
 								moveFunc();
 							}
@@ -706,19 +706,19 @@
 										if(p.inverthover){
 											strMove.stop(true);
 										}
-										
+
 										//drag
 										var dragTop;
 										var dir = 1;
 										var newY;
 										var oldY = e.clientY;
 										//drag
-										
-										
+
+
 										strMoveTop = strMove.position().top;
 										k2 = strMoveTop - (e.clientY - strWrap.offset().top);
 										$(this).on('mousemove', function (e) {
-											
+
 											fMove = true;
 
 											//drag
@@ -730,7 +730,7 @@
 													dir = -1
 												}
 											}
-											oldY = newY	
+											oldY = newY
 											dragTop = k2 + e.clientY - strWrap.offset().top;
 
 
@@ -744,7 +744,7 @@
 													dragTop = -strMove.height();
 													strMoveTop = strMove.position().top;
 													k2 = strMoveTop - (e.clientY - strWrap.offset().top);
-												}	
+												}
 											}else{
 												if(dragTop < -strMove.height() && dir < 0){
 													dragTop = 0;
@@ -763,24 +763,24 @@
 												top: dragTop
 											});
 											//drag
-											
-											
-											
-											
-											
-											
-											
-											
-											
-											
-											
-											
+
+
+
+
+
+
+
+
+
+
+
+
 										}).on('mouseup', function () {
 											if(p.inverthover){
 												strMove.trigger('mouseenter')
 											}
 											$(this).off('mousemove');
-											setTimeout(function () {                             
+											setTimeout(function () {
 												fMove = false
 											}, 50)
 										});
@@ -802,9 +802,9 @@
 								});
 								var k2 = 0;
 								var timeFunc = function () {
-									
+
 									time = (strMove.height() + strMove.position().top) / strWrap.data('scrollamount') * 1000;
-									
+
 									return time;
 								};
 								var moveFunc = function () {
@@ -844,19 +844,19 @@
 											if(p.inverthover){
 												strMove.stop(true);
 											}
-											
+
 											//drag
 											var dragTop;
 											var dir = 1;
 											var newY;
 											var oldY = e.clientY;
 											//drag
-											
+
 											strMoveTop = strMove.position().top;
 											k2 = strMoveTop - (e.clientY - strWrap.offset().top);
 											$(this).on('mousemove', function (e) {
-												
-												
+
+
 												fMove = true;
 
 												//drag
@@ -868,9 +868,9 @@
 														dir = -1
 													}
 												}
-												oldY = newY	
+												oldY = newY
 												dragTop = k2 + e.clientY - strWrap.offset().top;
-												
+
 												if(dragTop < -strMove.height() && dir < 0){
 													dragTop = strWrap.height();
 													strMoveTop = strMove.position().top;
@@ -880,20 +880,20 @@
 													dragTop = -strMove.height();
 													strMoveTop = strMove.position().top;
 													k2 = strMoveTop - (e.clientY - strWrap.offset().top);
-												}	
+												}
 												//*drag
-												
+
 												strMove.stop(true).css({
 													top: dragTop
 												});
-												
-												
+
+
 											}).on('mouseup', function () {
 												if(p.inverthover){
 													strMove.trigger('mouseenter')
 												}
 												$(this).off('mousemove');
-												setTimeout(function () {                             
+												setTimeout(function () {
 													fMove = false
 												}, 50)
 											});
@@ -924,7 +924,7 @@
 							var topPos = strWrap.height();
 							if (p.circular) {
 								if (!p.xml) {
-									circCloneVert();									
+									circCloneVert();
 									topPos = strMove.height();
 								}
 							}
@@ -986,21 +986,21 @@
 										if(p.inverthover){
 											strMove.stop(true);
 										}
-										
+
 										//drag
 										var dragTop;
 										var dir = 1;
 										var newY;
 										var oldY = e.clientY;
 										//drag
-										
-										
+
+
 										strMoveTop = strMove.position().top;
 										k2 = strMoveTop - (e.clientY - strWrap.offset().top);
 										$(this).on('mousemove', function (e) {
-											
+
 											fMove = true;
-											
+
 											//drag
 											newY = e.clientY;
 											if(newY > oldY){
@@ -1010,7 +1010,7 @@
 													dir = -1
 												}
 											}
-											oldY = newY	
+											oldY = newY
 											dragTop = k2 + e.clientY - strWrap.offset().top;
 
 
@@ -1024,7 +1024,7 @@
 													dragTop = -strMove.height();
 													strMoveTop = strMove.position().top;
 													k2 = strMoveTop - (e.clientY - strWrap.offset().top);
-												}	
+												}
 											}else{
 												if(dragTop < -strMove.height() && dir < 0){
 													dragTop = 0;
@@ -1051,7 +1051,7 @@
 												strMove.trigger('mouseenter')
 											}
 											$(this).off('mousemove');
-											setTimeout(function () {                             
+											setTimeout(function () {
 												fMove = false
 											}, 50)
 										});
@@ -1110,14 +1110,14 @@
 											if(p.inverthover){
 												strMove.stop(true);
 											}
-											
+
 											//drag
 											var dragTop;
 											var dir = 1;
 											var newY;
 											var oldY = e.clientY;
 											//drag
-											
+
 											strMoveTop = strMove.position().top;
 											k2 = strMoveTop - (e.clientY - strWrap.offset().top);
 											$(this).on('mousemove', function (e) {
@@ -1132,10 +1132,10 @@
 														dir = -1
 													}
 												}
-												oldY = newY	
+												oldY = newY
 												dragTop = k2 + e.clientY - strWrap.offset().top;
-	
-	
+
+
 												if(dragTop < -strMove.height() && dir < 0){
 													dragTop = strWrap.height();
 													strMoveTop = strMove.position().top;
@@ -1145,26 +1145,26 @@
 													dragTop = -strMove.height();
 													strMoveTop = strMove.position().top;
 													k2 = strMoveTop - (e.clientY - strWrap.offset().top);
-												}	
+												}
 												//*drag
-												
+
 												strMove.stop(true).css({
 													top: dragTop
 												});
-												
-												
-												
-												
-												
-												
-												
-												
+
+
+
+
+
+
+
+
 											}).on('mouseup', function () {
 												if(p.inverthover){
 													strMove.trigger('mouseenter')
 												}
 												$(this).off('mousemove');
-												setTimeout(function () {                             
+												setTimeout(function () {
 													fMove = false
 												}, 50)
 											})
@@ -1184,10 +1184,10 @@
 							}
 						};
 					};
-					
-					
-					
-					
+
+
+
+
 				}
 				if (p.xml) {
 					$.ajax({
@@ -1200,20 +1200,20 @@
 								var xmlElActive = xmlTextEl.eq(i);
 								var xmlElContent = xmlElActive.text();
 								var xmlItemEl = $('<span>').text(xmlElContent).appendTo(strWrap);
-								
+
 								if(p.direction == 'left' || p.direction == 'right'){
-									xmlItemEl.css({display:'inline-block',textAlign:'right'});	
+									xmlItemEl.css({display:'inline-block',textAlign:'right'});
 									if(i > 0){
-										xmlItemEl.css({width:strWrap.width()+xmlItemEl.width()});	
+										xmlItemEl.css({width:strWrap.width()+xmlItemEl.width()});
 									}
 								}
 								if(p.direction == 'down' || p.direction == 'up'){
-									xmlItemEl.css({display:'block',textAlign:'left'});	
+									xmlItemEl.css({display:'block',textAlign:'left'});
 										if(i > 0){
 											xmlItemEl.css({paddingTop:strWrap.height()});
 										}
 								}
-								
+
 							}
 							code();
 						}
@@ -1223,12 +1223,12 @@
 				}
 				strWrap.data({
 					ini:code,
-					startheight: startHeight	
+					startheight: startHeight
 				})
-				
-				
-				
-				
+
+
+
+
 			});
 		},
 		update: function () {
@@ -1240,11 +1240,11 @@
 			el.data('ini')();
 		},
 		destroy: function () {
-			
+
 			var el = $(this);
 			var elMove = $('.str_move',el);
 			var startHeight = el.data('startheight');
-			
+
 			$('.str_move_clone',el).remove();
 			el.off('mouseenter');
 			el.off('mousedown');
@@ -1252,28 +1252,28 @@
 			el.off('mouseleave');
 			el.off('mousemove');
 			el.removeClass('noStop').removeClass('str_vertical').removeClass('str_active').removeClass('no_drag').removeClass('str_static').removeClass('str_right').removeClass('str_down');
-			
-			var elStyle = el.attr('style'); 
+
+			var elStyle = el.attr('style');
 			if(elStyle){
 				var styleArr = elStyle.split(';');
 				for(var i=0; i < styleArr.length; i++){
 					var str = $.trim(styleArr[i]);
 					var tested =  str.search(/^height/g);
 					if(tested != -1){
-						styleArr[i] = '';	
+						styleArr[i] = '';
 					}
 				}
 				var newArr = styleArr.join(';');
 				var newStyle =  newArr.replace(/;+/g,';')
-			
+
 				if(newStyle == ';'){
-					el.removeAttr('style');	
+					el.removeAttr('style');
 				}else{
-					el.attr('style',newStyle);	
+					el.attr('style',newStyle);
 				}
-				
+
 				if(startHeight){
-					el.css({height:startHeight})	
+					el.css({height:startHeight})
 				}
 			}
 			elMove.stop(true);
@@ -1283,19 +1283,19 @@
 				elMove.remove();
 				el.html(context);
 			}
-	
+
 		},
-		pause: function(){	
+		pause: function(){
 			var el = $(this);
 			var elMove = $('.str_move',el);
 			elMove.stop(true);
-		}, 
+		},
 		play: function(){
 			var el = $(this);
 			$(this).off('mousemove');
-			el.data('moveF')();	
+			el.data('moveF')();
 		}
-		
+
 	};
 	$.fn.liMarquee = function (method) {
 		if (methods[method]) {
@@ -1306,4 +1306,4 @@
 			$.error('Метод ' + method + ' в jQuery.liMarquee не существует');
 		}
 	};
-})(jQuery);
+})(jQuery);

tianti-modules/tianti-module-gateway/src/main/webapp/static/js/uiExtend.js

@@ -171,39 +171,28 @@ jc.uiExtend("footer", {
         var html = '';
 
 
-        html += '<div class="hidden-print">';
+        // html += '<div class="hidden-print">';
         html += '<div class="container">';
-        html += '<div class="">';//html += '<div class="row">';替换为html += '<div class="">';
-        html += '<div class="col-md-5 col-sm-12">';
-        html += '<h4>关于 我们</h4>';
-        html += '<p class="mt20"><i class="icon"></i>地址：北京市朝阳区安贞西里三区浙江大厦9层</p>'
-        html += '<p><i class="icon"></i>邮箱：huaanyixin@163.com</p>'
-        html += '<p class="mt20"><i class="icon"></i>电话：8610-64439011</p>'
-        // html += '<p><i class="icon"></i>传真：xxxxxx</p>'
-        html += '</div>';
 
-        html += '<div class="col-md-3 col-sm-12">';
-        html += '<h4>网站链接</h4>';
-        html += '<ul class="list-unstyled list-inline">';
+        html += '<div class="col-md-2 col-sm-12">';
+        html += '<div class="mt20 text-center">';
+        html += '<img style="width:120px;" src="../../static/images/officialWeChat.jpg">';
+        html += '</div>';
 
+        html += '</div>';
+        html += '<div class="">';//html += '<div class="row">';替换为html += '<div class="">';
+        html += '<div class="col-md-8 col-sm-12">';
 
+        html += '<p class="mt20"><i class="icon"></i><span style="margin-right: 4%">地址：北京市朝阳区安贞西里三区浙江大厦9层</span><span style="margin-right: 4%">邮箱：huaanyixin@163.com</span><span style="margin-right: 4%">电话：8610-64439011</span></p>';
+        html += '<p class="mt20"><i class="icon"></i>';
+        html += '网站链接：';
         for (var i = 0, l = data.length; i < l; i++) {
             var curData = data[i];
             var curDataId = curData.id;
             var curDataName = curData.name;
-            html += '<li><a onclick="window.router(\'menuAndTextlist\',{rootColumnId:\'' + (curDataId) + '\'},true)"  href="javascript:;" target="_blank">' + curDataName + '</a></li>';
+            html += '<a onclick="window.router(\'menuAndTextlist\',{rootColumnId:\'' + (curDataId) + '\'},true)"  href="javascript:;" target="_blank">' + curDataName + '</a>' + '&nbsp&nbsp|&nbsp&nbsp';
         }
-
-
-
-        html += '</ul>';
-        html += '</div>';
-
-        html += '<div class="col-md-2 col-sm-12">';
-        html += '<div class="mt20 text-center">';
-        html += '<img style="width:120px;" src="../../static/images/officialWeChat.jpg">';
-        html += '<p>(微信联系)</p>';
-        html += '</div>';
+        html += '</p>';
         html += '</div>';
 
         html += '</div>';
@@ -213,7 +202,7 @@ jc.uiExtend("footer", {
         html += '版权所有：华安医信（北京）管理咨询服务有限公司 保留所有权利 未经授权禁止复制或镜像';
         // html += '<span>粤公网安备XXXXXX</span>';
         html += '</div>';
-        html += '</div>';
+        // html += '</div>';