温红权 8 лет назад
Родитель
Сommit
ddcac340ec

+ 6 - 2
VisualInspection/js/statistics/road_manage_statistics.js

@@ -232,12 +232,16 @@ $(function() {
         if (parseInt((mon + '').substr(5)) == 1) {
             prev_mth = ((parseInt((mon + '').substr(0, 4))) - 1) + "/12";
         } else {
+            var m = (parseInt((mon + '').substr(5)) - 1);
             if ((parseInt((mon + '').substr(5)) + '').length == 1) {
-                prev_mth = (mon + '').substr(0, 4) + '/0' + (parseInt((mon + '').substr(5)) - 1);
+                prev_mth = (mon + '').substr(0, 4) + '/' + (m > 9 ? m : "0" + m);
             } else {
-                prev_mth = (mon + '').substr(0, 4) + '/' + (parseInt((mon + '').substr(5)) - 1);
+                prev_mth = (mon + '').substr(0, 4) + '/' + (m > 9 ? m : "0" + m);
             }
         }
+
+        console.log(prev_mth);
+
         var param = {
             "mth": mon,
             "prev_mth": prev_mth,

+ 3 - 2
VisualInspection/js/statistics/toll_station_statistics.js

@@ -211,10 +211,11 @@
      	        if (parseInt((mon + '').substr(5)) == 1) {
      	            prev_mth = ((parseInt((mon + '').substr(0, 4))) - 1) + "/12";
      	        } else {
+     	            var m = (parseInt((mon + '').substr(5)) - 1);
      	            if ((parseInt((mon + '').substr(5)) + '').length == 1) {
-     	                prev_mth = (mon + '').substr(0, 4) + '/0' + (parseInt((mon + '').substr(5)) - 1);
+     	                prev_mth = (mon + '').substr(0, 4) + '/' + (m > 9 ? m : "0" + m);
      	            } else {
-     	                prev_mth = (mon + '').substr(0, 4) + '/' + (parseInt((mon + '').substr(5)) - 1);
+     	                prev_mth = (mon + '').substr(0, 4) + '/' + (m > 9 ? m : "0" + m);
      	            }
      	        }
      	        var param = {

+ 4 - 2
VisualInspection/js/statistics/total_company_statistics.js

@@ -174,11 +174,13 @@ $(function() {
         if (parseInt((mon + '').substr(5)) == 1) {
             prev_mth = ((parseInt((mon + '').substr(0, 4))) - 1) + "/12";
         } else {
+            var m = (parseInt((mon + '').substr(5)) - 1);
             if ((parseInt((mon + '').substr(5)) + '').length == 1) {
-                prev_mth = (mon + '').substr(0, 4) + '/0' + (parseInt((mon + '').substr(5)) - 1);
+                prev_mth = (mon + '').substr(0, 4) + '/' + (m > 9 ? m : "0" + m);
             } else {
-                prev_mth = (mon + '').substr(0, 4) + '/' + (parseInt((mon + '').substr(5)) - 1);
+                prev_mth = (mon + '').substr(0, 4) + '/' + (m > 9 ? m : "0" + m);
             }
+
         }
         var param = {
             "mth": mon,

+ 6 - 6
VisualInspection_server/src/main/resources/application.properties

@@ -3,8 +3,8 @@ spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
 #master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
-#master.datasource.url = jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
@@ -13,8 +13,8 @@ master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.x
 
 ## \u7528\u6237\u6570\u636E\u6E90\u914D\u7F6E
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf8
-#cluster.datasource.url=jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf8
-cluster.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
+cluster.datasource.url=jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
@@ -62,8 +62,8 @@ spring.redis.host=git.topm.win
 #spring.redis.port=6379
 
 #spring.redis.port=7003
-#spring.redis.port=6401
-spring.redis.port=6380
+spring.redis.port=6401
+#spring.redis.port=6380
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
 spring.redis.password=xintong
 # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09