Skip to content

Commit

Permalink
Merge pull request #125 from brainysoon/dev_brainy
Browse files Browse the repository at this point in the history 
Dev brainy
  • Loading branch information
@brainysoon
brainysoon authored Jun 29, 2017
2 parents fcd5e3d + e29caf6 commit fb4e262
Show file tree
Hide file tree
Showing 46 changed files with 70,522 additions and 10,266 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ target/

# Package Files #
*.jar
*.war
/EntTax/*.war
*.ear
*.iml

Expand Down
Binary file added DOC/企业增值税文档 .docx
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion EntTax/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.lcyanxi</groupId>
<artifactId>EntTax</artifactId>
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>
<version>1.0.1-alpha</version>
<name>EntTax Maven Webapp</name>
<url>http://maven.apache.org</url>
<properties>
Expand Down
10 changes: 5 additions & 5 deletions EntTax/src/main/java/com/enttax/util/constant/ConstantStr.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public interface ConstantStr {
/**
* 图片上传的域名前缀
*/
String IMAGE_UPLOAD_DOMAIN = "http://192.168.0.104/";
String IMAGE_UPLOAD_DOMAIN = "http://www.coolbhu.cn:8081/";

/**
* 图片上传路径地址
Expand Down Expand Up @@ -66,7 +66,7 @@ public interface ConstantStr {
/**
* 保存进销项数据集合
*/
String DATALIST="datalist";
String DATALIST = "datalist";
/**
* 状态
*/
Expand Down Expand Up @@ -128,17 +128,17 @@ public interface ConstantStr {
/**
*
*/
String INPUTDATA="进项数据";
String INPUTDATA = "进项数据";

/**
*
*/
String OUTPUTDATA="销项数据";
String OUTPUTDATA = "销项数据";

/**
* 系统消息
*/
String LOGMESSAGE="logmessage";
String LOGMESSAGE = "logmessage";


}
2 changes: 1 addition & 1 deletion EntTax/src/main/resources/properties/jdbc.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
jdbc.driverClassName=com.mysql.jdbc.Driver
jdbc.url=jdbc:mysql://localhost:3306/enttax?characterEncoding=UTF8
jdbc.url=jdbc:mysql://coolbhu.cn:3306/enttax?characterEncoding=UTF8
jdbc.username=dbworker
jdbc.password=dbroom1411DB-
75 changes: 7 additions & 68 deletions EntTax/src/main/webapp/WEB-INF/templates/aboutsystem.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,76 +232,15 @@ <h4 class="modal-title">

<!--主要内容部分开始-->
<div class="panel-content-system">
<div class="system-card card">
<div class="front-facing front">
<h1 class="technique">数据管理</h1>
<p class="title">技术</p>
<span class="number">1</span>
</div>

<div class="back-facing back">
<div class="system-card" >
<h1 style="text-align: center">发票数据分析系统</h1>

<p>Copper is a chemical element with symbol Cu (from Latin: cuprum) and atomic number
29. It is a soft,
malleable, and ductile metal with very high thermal and electrical conductivity.</p>
<p> More info</p>
</div>
</div>

<div class="system-card card1">
<div class="front-facing front1">
<h1 class="technique">Cu</h1>
<p class="title">Gopper</p>
<span class="number">29</span>
</div>
<div class="back-facing back1">
<p>Copper is a chemical element with symbol Cu (from Latin: cuprum) and atomic number
29. It is a soft,
malleable, and ductile metal with very high thermal and electrical conductivity.</p>
<p> More info</p>
</div>
</div>

<div class="system-card card2">
<div class="front-facing front2">
<h1 class="technique">Cu</h1>
<p class="title">Gopper</p>
<span class="number">29</span>
</div>
<div class="back-facing back2">
<p>Copper is a chemical element with symbol Cu (from Latin: cuprum) and atomic number
29. It is a soft,
malleable, and ductile metal with very high thermal and electrical conductivity.</p>
<p> More info</p>
</div>
</div>

<div class="system-card card3">
<div class="front-facing front3">
<h1 class="technique">Cu</h1>
<p class="title">Gopper</p>
<span class="number">29</span>
</div>
<div class="back-facing back3">
<p>Copper is a chemical element with symbol Cu (from Latin: cuprum) and atomic number
29. It is a soft,
malleable, and ductile metal with very high thermal and electrical conductivity.</p>
<p> More info</p>
</div>
</div>

<div class="system-card card4">
<div class="front-facing front4">
<h1 class="technique">Cu</h1>
<p class="title">Gopper</p>
<span class="number">29</span>
</div>
<div class="back-facing back4">
<p>Copper is a chemical element with symbol Cu (from Latin: cuprum) and atomic number
29. It is a soft,
malleable, and ductile metal with very high thermal and electrical conductivity.</p>
<p> More info</p>
</div>
<section class="panel-body" style="font-size: 20px">
<p><span>当前系统版本：</span> <strong>1.0.1-alpha</strong></p>
<p><span>反馈邮箱：</span><strong>[email protected]</strong></p>
<p><span>备用邮箱：</span><strong>[email protected]</strong></p>
</section>
</div>

</div>
Expand Down
1 change: 1 addition & 0 deletions EntTax/src/main/webapp/WEB-INF/templates/ai/linear.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ <h4 class="modal-title">
<script th:src="@{/js/highcharts/highcharts.js}" src="../../js/highcharts/highcharts.js"></script>
<script th:src="@{/js/highcharts/exporting.js}" src="../../js/highcharts/exporting.js"></script>
<script th:src="@{/js/highcharts/dark-unica.js}" src="../../js/highcharts/dark-unica.js"></script>
<script th:src="@{/js/highcharts/highcharts-zh_CN.js}" src="../../js/highcharts/highcharts-zh_CN.js"></script>

<!--custom JS-->
<script th:src="@{/js/ai/customlinear.js}" src="../../js/ai/customlinear.js"></script>
Expand Down
28 changes: 20 additions & 8 deletions EntTax/src/main/webapp/WEB-INF/templates/staff/editprofile.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
<!-- Custom styles for this template -->
<link th:href="@{/css/style.css}" href="../../../css/style.css" rel="stylesheet">
<link th:href="@{/css/style-responsive.css}" href="../../../css/style-responsive.css" rel="stylesheet"/>
<link rel="stylesheet" href="../../../css/extra.css">


<!-- HTML5 shim and Respond.js IE8 support of HTML5 tooltipss and media queries -->
<!--[if lt IE 9]>
Expand Down Expand Up @@ -269,9 +271,11 @@ <h1>修改基本信息</h1>
<div class="form-group">
<label class="col-lg-2 control-label">姓名</label>
<div class="col-lg-6 has-success">
<input type="text" class="form-control" name="sName" id="sname"
th:value="${staff.sName}" placeholder="姓名">
<p class="help-block"></p>
<div class="col-xs-8">
<input type="text" class="form-control" name="sName" id="sname"
th:value="${staff.sName}" placeholder="姓名">
<p class="help-block"></p>
</div>
</div>
</div>
<div class="form-group">
Expand Down Expand Up @@ -299,28 +303,34 @@ <h1>修改基本信息</h1>
</div>
</div>
</div>
<div class="form-group">


<div class="form-group birth">
<label class="col-lg-2 control-label">出生日期</label>

<div class="col-lg-6" th:if="${staff.sBirthday==null}">
<input type="date" name="sBirthday" class="dataTables_info"
th:value="${null}" value="1994-01-15">
th:value="${null}" value="1994-01-15">
</div>
<div class="col-lg-6" th:if="${staff.sBirthday!=null}">
<input type="date" name="sBirthday" class="dataTables_info"
th:value="${#dates.format(staff.sBirthday, 'yyyy-MM-dd')}"
value="1994-01-15">
th:value="${#dates.format(staff.sBirthday, 'yyyy-MM-dd')}"
value="1994-01-15">

</div>
</div>
<div class="form-group">
<div class="form-group city">
<label class="col-lg-2 control-label">详细地址</label>

<div class="col-lg-6 has-success">
<input type="text" class="form-control" name="sAddress"
th:value="${staff.sAddress}"
placeholder="请输入你的详细地址">
<p class="help-block"></p>
</div>
</div>


<div class="form-group">
<div class="col-lg-offset-2 col-lg-10">
<button type="submit" class="btn btn-success">保存修改</button>
Expand Down Expand Up @@ -420,6 +430,8 @@ <h4 class="modal-title">剪切头像</h4>
<script th:src="@{/js/sparkline-chart.js}" src="../../../js/sparkline-chart.js"></script>
<script th:src="@{/js/easy-pie-chart.js}" src="../../../js/easy-pie-chart.js"></script>

<!--出生日期-->
<script th:src="@{/js/DateSelect.js}" src="../../../js/DateSelect.js"></script>
<script>

//upload download excel tooltip
Expand Down
84 changes: 0 additions & 84 deletions EntTax/src/main/webapp/assets/jquery-file-upload/css/jquery.fileupload-ui.css
View file

This file was deleted.

Binary file removed EntTax/src/main/webapp/assets/jquery-file-upload/img/loading.gif
View file
Binary file not shown.
Binary file removed EntTax/src/main/webapp/assets/jquery-file-upload/img/progressbar.gif
View file
Binary file not shown.
Loading

0 comments on commit fb4e262

Please sign in to comment.