汉思

src/main/java/com/yc/education/model/Product.java

@@ -66,6 +66,16 @@ public class Product {
 
     private String times;
 
+    private String timess;
+
+    public String getTimess() {
+        return timess;
+    }
+
+    public void setTimess(String timess) {
+        this.timess = timess;
+    }
+
     public String getTimes() {
         return times;
     }

src/main/java/com/yc/education/model/Producten.java

@@ -66,6 +66,16 @@ public class Producten {
 
     private String times;
 
+    private String timess;
+
+    public String getTimess() {
+        return timess;
+    }
+
+    public void setTimess(String timess) {
+        this.timess = timess;
+    }
+
     public String getTimes() {
         return times;
     }

src/main/resources/mapper/ProductMapper.xml

@@ -19,6 +19,7 @@
     <result column="progress" property="progress" jdbcType="VARCHAR" />
     <result column="heighs" property="heighs" jdbcType="VARCHAR" />
     <result column="times" property="times" jdbcType="VARCHAR" />
+    <result column="timess" property="timess" jdbcType="VARCHAR" />
   </resultMap>
 
   <select id="findProductByPid" parameterType="integer" resultMap="BaseResultMap">

src/main/resources/mapper/ProductenMapper.xml

@@ -19,6 +19,7 @@
     <result column="detail" property="detail" jdbcType="LONGVARCHAR" />
     <result column="heighs" property="heighs" jdbcType="VARCHAR" />
     <result column="times" property="times" jdbcType="VARCHAR" />
+    <result column="timess" property="timess" jdbcType="VARCHAR" />
   </resultMap>
 
 

src/main/webapp/WEB-INF/jsp/admin/add_product.jsp

@@ -116,6 +116,13 @@
                 </div>
             </div>
 
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>竣工日期：</label>
+                <div class="formControls col-xs-8 col-sm-4">
+                    <input id="test3" class="input-text" name="timess" style="width:160px;">
+                </div>
+            </div>
+
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">建筑高度：</label>
                 <div class="formControls col-xs-8 col-sm-4">
@@ -231,10 +238,7 @@
         ,type: 'datetime'
     });
 
-    laydate.render({
-        elem: '#test2'
-        ,type: 'date'
-    });
+
 
     $("#test1").val(today());
 
@@ -255,15 +259,10 @@
     }
 
     $("#test2").val(today_s());
-
     function today_s(){
         var today=new Date();
         var h=today.getFullYear();
-        var m=today.getMonth()+1;
-        var d=today.getDate();
-        m= m<10?"0"+m:m;
-        d= d<10?"0"+d:d;
-        return h+"-"+m+"-"+d;
+        return h;
     }
 
     function changeCategory() {

src/main/webapp/WEB-INF/jsp/admin/update_product.jsp

@@ -122,6 +122,14 @@
                 </div>
             </div>
 
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>竣工日期：</label>
+                <div class="formControls col-xs-8 col-sm-4">
+                    <input id="test3" class="input-text" name="timess" style="width:160px;" value="${product.timess}">
+                </div>
+            </div>
+
+
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">建筑高度：</label>
                 <div class="formControls col-xs-8 col-sm-4">
@@ -241,11 +249,6 @@
         ,type: 'datetime'
     });
 
-    laydate.render({
-        elem: '#test2'
-        ,type: 'date'
-    });
-
 
     function changeCategory() {
         var cid =$("#first_s").val();

src/main/webapp/WEB-INF/jsp/adminEn/add_product.jsp

@@ -116,6 +116,13 @@
                 </div>
             </div>
 
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>竣工日期：</label>
+                <div class="formControls col-xs-8 col-sm-4">
+                    <input id="test3" class="input-text" name="timess" style="width:160px;">
+                </div>
+            </div>
+
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">建筑高度：</label>
                 <div class="formControls col-xs-8 col-sm-4">
@@ -230,10 +237,6 @@
         ,type: 'datetime'
     });
 
-    laydate.render({
-        elem: '#test2'
-        ,type: 'date'
-    });
 
     $("#test1").val(today());
 
@@ -258,11 +261,7 @@
     function today_s(){
         var today=new Date();
         var h=today.getFullYear();
-        var m=today.getMonth()+1;
-        var d=today.getDate();
-        m= m<10?"0"+m:m;
-        d= d<10?"0"+d:d;
-        return h+"-"+m+"-"+d;
+        return h;
     }
 
     function changeCategory() {

src/main/webapp/WEB-INF/jsp/adminEn/update_product.jsp

@@ -122,6 +122,13 @@
                 </div>
             </div>
 
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2"><span class="c-red">*</span>竣工日期：</label>
+                <div class="formControls col-xs-8 col-sm-4">
+                    <input id="test3" class="input-text" name="timess" style="width:160px;" value="${product.timess}">
+                </div>
+            </div>
+
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">建筑高度：</label>
                 <div class="formControls col-xs-8 col-sm-4">
@@ -241,10 +248,6 @@
         ,type: 'datetime'
     });
 
-    laydate.render({
-        elem: '#test2'
-        ,type: 'date'
-    });
 
 
     function changeCategory() {

src/main/webapp/WEB-INF/jsp/hsa/designs.jsp

@@ -36,9 +36,11 @@
     </div>
 
     <div class="maright">
-        <div class="design">
-            <div>${designs.rights}</div>
-        </div>
+		<div class="marightscroll">
+			<div class="design">
+				<div>${designs.rights}</div>
+			</div>
+		</div>
     </div>
 </div>
 

src/main/webapp/WEB-INF/jsp/hsa/footer.jsp

@@ -3,13 +3,15 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <div class="foot">
     <div class="left">Copyright&nbsp;&copy;&nbsp;2014&nbsp;HSa<span class="footsple"><a href="precautions.html" target="_blank" class="blo">使用HSa前必读</a></span><span class="footsple">沪ICP备12020083号</span></div>
+	<!--
     <div class="right"><p class="lang">
         <span id="language">
            <%-- <a style="display: none;line-height:16px;" id="zh_num01" href="index.html"><input value="zh_Hans_CN" type="hidden">中文</a>--%>
             <a style="line-height:16px;" id="en_num01" href="index_en.html">English</a>
         </span>
 
-    </p><a href="http://www.HSbim.com" target="_blank" class="hsbim" ><img src="${pageContext.request.contextPath}/static/hsa/images/hsbim.jpg" width="67" height="16" onmouseover="this.src='images/hsbim-1.jpg'" onmouseout="this.src='images/hsbim.jpg'" /></a></div>
+    </p><a href="http://www.HSbim.com" target="_blank" class="hsbim" ><img src="${pageContext.request.contextPath}/static/hsa/images/hsbim.jpg" width="55" height="16" onmouseover="this.src='images/hsbim-1.jpg'" onmouseout="this.src='images/hsbim.jpg'" /></a></div>
+	-->
 </div>
 
 <input type="hidden" value="${system_language}" id="affirm_s">

src/main/webapp/WEB-INF/jsp/hsa/index.jsp

@@ -67,9 +67,11 @@
         </div>        
     </div>
 
-<!--------------END-------main----------END----------------> </div>
+
+</div>
+<%@ include file="../hsa/footer.jsp" %>
 <!--手机端访问调转 start-->
-    <script type="text/javascript">
+<script type="text/javascript">
     function mobile_device_detect(){
         var url = location.protocol + '//m.yimudi.cc' + location.pathname+location.search;
         var thisOS=navigator.platform + navigator.userAgent;

src/main/webapp/WEB-INF/jsp/hsa/new.jsp

@@ -28,6 +28,7 @@
     
     
   <div class="maright">
+	<div class="marightscroll">
     	<div class="projects">
         	<h3>${newsById.title}</h3>
             <div class="proalls">
@@ -40,6 +41,7 @@
                 <a onclick="last_add()"><img src="${pageContext.request.contextPath}/static/hsa/images/liht.png" alt="下一页"/></a>
             </span>
         </div>
+	</div>
   </div>
 </div>
 

src/main/webapp/WEB-INF/jsp/hsa/news.jsp

@@ -20,11 +20,14 @@
 
 <div class="mainall">
     <div class="maleft">
+		<div class="pro_edit">
         ${newst.details}
+		</div>
     </div>
     
     
   <div class="maright">
+	<div class="marightscroll">
     	<div class="news">
             <c:forEach items="${news}" var="p" varStatus="b">
                 <c:if test="${b.index == 0}">
@@ -40,6 +43,7 @@
                 </ul>
             </c:forEach>
         </div>
+	</div>
   </div>
 </div>
 

src/main/webapp/WEB-INF/jsp/hsawap/project_list_wap.jsp

@@ -85,13 +85,29 @@
                             <div class="Left"> <img src="${p.img}"  width="100%" height="100%"/></div>
                             <div class="right">
                                 <p>${p.name}</p>
-                                <p>项目地点：${p.sites}</p>
-                                <p>项目规模：${p.areas}</p>
-                                <p>项目进展：${p.progress}</p>
-                                <c:if test="${p.heighs != null}">
+                                <c:if test="${p.sites != null and p.sites != ''}">
+                                    <p>项目地点：${p.sites}</p>
+                                </c:if>
+
+                                <c:if test="${p.areas != null and p.areas != ''}">
+                                    <p>项目规模：${p.areas}</p>
+                                </c:if>
+
+                                <c:if test="${p.progress != null and p.progress != ''}">
+                                    <p>项目进展：${p.progress}</p>
+                                </c:if>
+
+                                <c:if test="${p.heighs != null and p.heighs != '' }">
                                     <p>建筑高度：${p.heighs}</p>
                                 </c:if>
-                                <p>设计日期：${p.times}</p>
+
+                                <c:if test="${p.times != null and p.times != ''}">
+                                    <p>设计日期：${p.times}</p>
+                                </c:if>
+
+                                <c:if test="${p.timess != null and p.timess != ''}">
+                                    <p>竣工日期：${p.timess}</p>
+                                </c:if>
                             </div>
                         </a>
                     </div>

src/main/webapp/static/hsa/css/inside.css

@@ -55,6 +55,8 @@ a.red{ color:#f00;}
 .banner li.as.asonl .ase{ color:#57585a;}
 .banner li.as.asonl{ float:left; background:none; z-index:60; position:absolute; top:-2px; width:96px; margin-left:-45px; margin-top:-32px;}
 .banner li.as.asonl a{color:#57585a;}
+.banner li.as.asonl:hover a span{color:#c00;}
+.banner li.as.asonl:hover .asm{ height:6px; background:url(../images/han_bgthover.png) no-repeat center center;}
 /*.banner li.as a{ display:none;}*/
 /*.banner li.as.asonl a{ display:block;}*/
 
@@ -73,13 +75,13 @@ a.red{ color:#f00;}
 .foot{ padding:0 100px 40px; position:relative; bottom:0;}
 .footsple{ margin-left:10px;}
 .foot .left{ font-size:10px;}
-.lang{ float:left; margin-right:5px; font-size:10px;}
+.lang{ float:left; margin-right:10px; font-size:10px;}
 .preca{ width:800px; padding:20px; margin:30px auto; background:#fff; border:1px solid #ccc;border-radius:10px;box-shadow:0 1px 2px 0 #666;}
 .preca h3{ text-align:center; font-size:18px; line-height:32px; height:32px; border-bottom:1px solid #ccc; margin-bottom:10px;}
 .precaall{ font-size:12px; line-height:24px; }
 .blo{ text-decoration : underline ;}
 .blo:hover{ text-decoration : underline ;}
-.hsbim{display:inline-block; vertical-align:middle;}
+.hsbim{display:inline-block; vertical-align:middle; border-left:1px solid #aaa;}
 .hsbim img{ vertical-align:middle; display:inline-block; margin:0; padding:0;}
 
 
@@ -94,28 +96,32 @@ a.red{ color:#f00;}
 .pro_edit{width:100%;}
 .pro_edit p{margin:2px 0;}
 .maleft img{ width:100%; }
-.maright{ float:right; height:100%; overflow-y: auto;overflow-x: hidden; position:relative;}
-.maright::-webkit-scrollbar {/*滚动条整体样式*/
-        width: 6px;     /*高宽分别对应横竖滚动条的尺寸*/
+.maright{ float:right; height:100%; overflow: hidden;  position:relative;}
+.marightscroll{overflow-y: auto; height:100%; overflow-x: hidden;margin-right:-20px;}
+
+/*
+.maright::-webkit-scrollbar {
+        width: 6px;    
         height: 1px;
         border-radius:20px;
     }
-.maright::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+.maright::-webkit-scrollbar-thumb {
         border-radius: 20px;
         background: #818283;
     }
-.maright::-webkit-scrollbar-track {/*滚动条里面轨道*/
+.maright::-webkit-scrollbar-track {
 		width:1px;
         border-radius: 20px;
         background:rgba(0,0,0,0.1);
     }
+*/
 /*
 .maright::-webkit-scrollbar {
         display: none;
     } 
 */
 
-.mainalltil ul{ position:absolute;left:0;top:12px; padding-top:5px; display:none; }
+.mainalltil ul{ position:absolute;left:0;top:12px; padding-top:5px; display:none;z-index:4; }
 .mainalltil ul li,.mainalltil ul li a{display:block; width:68px;height:30px; line-height:30px; text-align:center;}
 .mainalltil ul li{ border-bottom:1px solid #ddd;}
 .mainalltil ul li a{ background:rgba(255,255,255,0.9); }
@@ -158,7 +164,7 @@ a.red{ color:#f00;}
 .mainlist h3 a{ display:inline-block;}
 .mainlist h3 span a.sroton{ color:#c00;}
 .mainlist>div{ float:left; margin-right:20px; text-align:center; padding-bottom:20px;}
-.mainlist>div p{ padding:10px 0;}
+.mainlist>div p{height:40px;line-height:40px; overflow:hidden;}
 .mainlist>div img{width:100%;}
 
 

src/main/webapp/static/hsa/css/jquery.mCustomScrollbar.css

@@ -1103,12 +1103,12 @@ yx-axis
 	
 	/* theme "dark-3" */
 	
-	.mCS-dark-3.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ background-color:#57585a; }
+	.mCS-dark-3.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{ background-color:#999; }
 
-	.mCS-dark-3.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{background-color:#57585a;}
+	.mCS-dark-3.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{background-color:#999;}
 
 	.mCS-dark-3.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
-	.mCS-dark-3.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{ background-color:#57585a;}
+	.mCS-dark-3.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{ background-color:#999;}
 	
 	.mCS-dark-3.mCSB_scrollTools .mCSB_draggerRail{background-color: rgba(0,0,0,0.1); }