Home Explore Help
Register Sign In
zhangyi
/
ceshi
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

1111

蔡德晨 5 years ago
parent
22b6d611e9
commit
63b2fa7610
5 changed files with 37 additions and 36 deletions
Unified View Show Diff Stats
  1. 2 1
      src/main/java/com/jeeplus/modules/sg/web/JkxlController.java
  2. 1 1
      src/main/resources/properties/jeeplus.properties
  3. 4 4
      src/main/webapp/webpage/modules/sg/free/wbslist.jsp
  4. 4 4
      src/main/webapp/webpage/modules/sys/login/sysIndex-jp.jsp
  5. 26 26
      src/main/webapp/webpage/modules/sys/login/sysLogin.jsp

+ 2 - 1
src/main/java/com/jeeplus/modules/sg/web/JkxlController.java
View File 

@@ -479,7 +479,7 @@ public class JkxlController extends BaseController {
 
     }
 
     }
 
     for(int i=0;i<6;i++){
 
     for(int i=0;i<6;i++){
 
       JkxlData jkxlData = new JkxlData();
 
       JkxlData jkxlData = new JkxlData();
 
-      double originalTotalCost = importExcel.getDouble(row[i],12); //原合计
 
+      double originalTotalCost = gzhz.getDouble(zjgcFee[i],2); //原合计
 
       double otherRate = originalTotalCost/totalFee;   //其他费用分摊比例
 
       double otherRate = originalTotalCost/totalFee;   //其他费用分摊比例
 
       double orRate = new BigDecimal(otherRate).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue(); //四舍五入
 
       double orRate = new BigDecimal(otherRate).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue(); //四舍五入
 
       double btc = wsbFees[0]*orRate;       //补调差额
 
       double btc = wsbFees[0]*orRate;       //补调差额
 
@@ -709,6 +709,7 @@ public class JkxlController extends BaseController {
 
   }
 
   }
 
 
 
 
 
+
 
   public double[] getTzFee(MultipartFile file) throws IOException, InvalidFormatException {
 
   public double[] getTzFee(MultipartFile file) throws IOException, InvalidFormatException {
 
     ImportExcel total = new ImportExcel(file,1,BashInfo.SHEET_HZB );
 
     ImportExcel total = new ImportExcel(file,1,BashInfo.SHEET_HZB );
 
     double[] wsb = getFees(total);
 
     double[] wsb = getFees(total);

+ 1 - 1
src/main/resources/properties/jeeplus.properties
View File 

@@ -40,7 +40,7 @@ jdbc.pool.maxActive=20
 
 #============================#
 
 #============================#
 
 
 
 #\u4EA7\u54C1\u4FE1\u606F\u8BBE\u7F6E
 
 #\u4EA7\u54C1\u4FE1\u606F\u8BBE\u7F6E
 
-productName=JeePlus \u5FEB\u901F\u5F00\u53D1\u5E73\u53F0
 
+productName=\u7ED3\u7B97\u8D39\u7528\u667A\u80FD\u8C03\u6574\u7CFB\u7D71
 
 copyrightYear=2017
 
 copyrightYear=2017
 
 version=V3.0
 
 version=V3.0

+ 4 - 4
src/main/webapp/webpage/modules/sg/free/wbslist.jsp
View File 

@@ -101,8 +101,8 @@
 
                     {field: 'wbsys', title: 'WBS要素',width:200, rowspan:'2'},
 
                     {field: 'wbsys', title: 'WBS要素',width:200, rowspan:'2'},
 
 
 
                     {field:'wbssbm',width:100, align:'center',rowspan:'2',title:"wbs识别码",rowspan:'2'},
 
                     {field:'wbssbm',width:100, align:'center',rowspan:'2',title:"wbs识别码",rowspan:'2'},
 
-                    {field:'fbfxysj', align:'center', title: '分布分项(原数据)',colspan:'6'},
 
-                    {field:'fbfxtch',align:'center',title:'分布分项(调差后)',colspan:'4'},
 
+                    {field:'fbfxysj', align:'center', title: '分部分项(原数据)',colspan:'6'},
 
+                    {field:'fbfxtch',align:'center',title:'分部分项(调差后)',colspan:'4'},
 
                     {field:'fbfxtch',align:'center',title:'共性分摊费用',colspan:'10'},
 
                     {field:'fbfxtch',align:'center',title:'共性分摊费用',colspan:'10'},
 
                     {field:'hj',align:'center',width:120,title:'合计',rowspan:'2',totalRow: true}
 
                     {field:'hj',align:'center',width:120,title:'合计',rowspan:'2',totalRow: true}
 
 //                  {templet: '#oper-col', title: 'oper'}
 
 //                  {templet: '#oper-col', title: 'oper'}
 
@@ -289,7 +289,7 @@
 
             layer.open({
 
             layer.open({
 
                 type: 2,
 
                 type: 2,
 
                 title: '单独调整',
 
                 title: '单独调整',
 
-                area: ['700px', '400px'],
 
+                area: ['70%', '90%'],
 
                 shade: 0.8,
 
                 shade: 0.8,
 
 //		  closeBtn: 0,
 
 //		  closeBtn: 0,
 
 //      fixed: true, //不固定
 
 //      fixed: true, //不固定
 
@@ -322,7 +322,7 @@
 
            layer.open({
 
            layer.open({
 
                 type: 2,
 
                 type: 2,
 
                 title: xmmc,
 
                 title: xmmc,
 
-                area: ['400px', '400px'],
 
+                area: ['40%', '90%'],
 
                 shade: 0.8,
 
                 shade: 0.8,
 
                 shadeClose: true,
 
                 shadeClose: true,
 
                 content: '${ctxp}/webpage/modules/sg/free/avgpage.jsp'
 
                 content: '${ctxp}/webpage/modules/sg/free/avgpage.jsp'

+ 4 - 4
src/main/webapp/webpage/modules/sys/login/sysIndex-jp.jsp
View File 

@@ -40,7 +40,7 @@
 
 				<span class="icon-bar"></span>
 
 				<span class="icon-bar"></span>
 
 			</button>
 
 			</button>
 
 
 
-			<a class="navbar-brand J_menuItem" href="${ctx}/home" data-index="0">JeePlus快速开发框架</a>
 
+			<a class="navbar-brand J_menuItem" href="${ctx}/home" data-index="0">结算费用智能调整系統</a>
 
 		</div>
 
 		</div>
 
 	</div>
 
 	</div>
 
 	<div class="navbar-container container-fluid">
 
 	<div class="navbar-container container-fluid">
 
@@ -342,9 +342,9 @@
 
 		</div>
 
 		</div>
 
 	</div>
 
 	</div>
 
 
 
-	<div class="footer">
 
-		<div class="pull-left"><a href="http://www.jeeplus.org">http://www.jeeplus.org</a> &copy; 2015-2025</div>
 
-	</div>
 
+	<%--<div class="footer">--%>
 
+		<%--<div class="pull-left"><a href="http://www.jeeplus.org">http://www.jeeplus.org</a> &copy; 2015-2025</div>--%>
 
+	<%--</div>--%>
 
 
 
 </section>
 
 </section>

+ 26 - 26
src/main/webapp/webpage/modules/sys/login/sysLogin.jsp
View File 

@@ -40,11 +40,10 @@
 
 	<body>
 
 	<body>
 
 		
 		
 
 
-		<div class="login-page">
 
-		<div class="row">
 
+		<div class="login-page" style="background-color: #105f3f">
 
+		<div class="row" style="background-color: #105f3f">
 
 			<div class="col-md-4 col-lg-4 col-md-offset-4 col-lg-offset-4">
 
 			<div class="col-md-4 col-lg-4 col-md-offset-4 col-lg-offset-4">
 
-				<img  class="img-circle" src="${ctxStatic}/common/images/flat-avatar.png" class="user-avatar" />
 
-				<h1>Jeeplus</h1>
 
+				<img  src="${ctxStatic}/common/images/home.png"  />
 
 				<sys:message content="${message}" showType="1"/>
 
 				<sys:message content="${message}" showType="1"/>
 
 				<form id="loginForm" role="form" action="${ctx}/login" method="post">
 
 				<form id="loginForm" role="form" action="${ctx}/login" method="post">
 
 					<div class="form-content">
 
 					<div class="form-content">
 
@@ -139,30 +138,31 @@ function changeTheme(theme) {
 
 	//$.get('api/change-theme?theme='+theme);
 
 	//$.get('api/change-theme?theme='+theme);
 
 	 $.get('${pageContext.request.contextPath}/theme/'+theme+'?url='+window.top.location.href,function(result){  });
 
 	 $.get('${pageContext.request.contextPath}/theme/'+theme+'?url='+window.top.location.href,function(result){  });
 
 }
 
 }
 
+$(".pull-right").attr("style","display:none");
 
 </script>
 
 </script>
 
 <style>
 
 <style>
 
-li.color-picker i {
 
-    font-size: 24px;
 
-    line-height: 30px;
 
-}
 
-.red-base {
 
-    color: #D24D57;
 
-}
 
-.blue-base {
 
-    color: #3CA2E0;
 
-}
 
-.green-base {
 
-    color: #27ae60;
 
-}
 
-.purple-base {
 
-    color: #957BBD;
 
-}
 
-.midnight-blue-base {
 
-    color: #2c3e50;
 
-}
 
-.lynch-base {
 
-    color: #6C7A89;
 
-}
 
+/*li.color-picker i {*/
 
+    /*font-size: 24px;*/
 
+    /*line-height: 30px;*/
 
+/*}*/
 
+/*.red-base {*/
 
+    /*color: #D24D57;*/
 
+/*}*/
 
+/*.blue-base {*/
 
+    /*color: #105f3f;*/
 
+/*}*/
 
+/*.green-base {*/
 
+    /*color: #27ae60;*/
 
+/*}*/
 
+/*.purple-base {*/
 
+    /*color: #957BBD;*/
 
+/*}*/
 
+/*.midnight-blue-base {*/
 
+    /*color: #2c3e50;*/
 
+/*}*/
 
+/*.lynch-base {*/
 
+    /*color: #6C7A89;*/
 
+/*}*/
 
 </style>
 
 </style>
 
 </body>
 
 </body>
 
 </html>
 
 </html>