diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 811f3ae..2333a83 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -1,7 +1,7 @@ -spring.datasource.url=jdbc:mysql://localhost:3306/fourcal?\ -characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true +spring.datasource.url=jdbc:mysql://192.168.0.100:3306/fourcal?\ +characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&useSSL=false spring.datasource.username=root -spring.datasource.password=123456 +spring.datasource.password=Qwer123!@#$ spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect #spring.jpa.properties.hibernate.hbm2ddl.auto=update @@ -9,5 +9,5 @@ spring.jpa.show-sql=true admin.domain=https://dzgtest.palmte.cn -upload.path=/mnt/dzg/image +upload.path=/home/data/dzg/fourcal upload.prefix=https://dzgtest.palmte.cn/fourcal/upload \ No newline at end of file diff --git a/src/main/resources/application-sit.properties b/src/main/resources/application-sit.properties index 2333a83..d7e5e26 100644 --- a/src/main/resources/application-sit.properties +++ b/src/main/resources/application-sit.properties @@ -1,4 +1,4 @@ -spring.datasource.url=jdbc:mysql://192.168.0.100:3306/fourcal?\ +spring.datasource.url=jdbc:mysql://localhost:3306/fourcal?\ characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&useSSL=false spring.datasource.username=root spring.datasource.password=Qwer123!@#$ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e07c092..61ec43c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,7 +3,7 @@ server.port=8282 server.session.timeout=-1 server.context-path=/fourcal app.version=0.0.1 -spring.profiles.active=dev +spring.profiles.active=local spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 5a778be..71f6553 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -1261,6 +1261,12 @@ + + <#-- --> @@ -1271,16 +1277,16 @@ - + - - - - + + + + - - + + @@ -1294,19 +1300,19 @@ - - - - @@ -1314,11 +1320,11 @@ class="am-modal-prompt-input input-total-total-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.totalCost)}" readonly/> - - @@ -1350,19 +1356,19 @@ - - - - @@ -1370,11 +1376,11 @@ class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetail.totalCost)}" readonly> - - @@ -3322,4 +3328,14 @@ } }); }; + + var closeDetail = function () { + $('.am-modal-prompt-input-budget-plan-income').css('display', 'none'); + $('.am-modal-prompt-input-budget-plan-cost').css('display', 'none'); + }; + + var openDetail = function () { + $('.am-modal-prompt-input-budget-plan-income').css('display', 'block'); + $('.am-modal-prompt-input-budget-plan-cost').css('display', 'block'); + }; \ No newline at end of file