Merge branch 'master' of http://112.124.40.88:5510/root/NanJingLamanRadarProject

# Conflicts:
#	04.系统编码/Frontend/src/uilts/Config.ts

04.系统编码/Backend/src/main/resources/application.yml

@@ -6,12 +6,12 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
   datasource:
-    url: jdbc:mysql://112.124.40.88:33306/user_information?useUnicode=true&characteEncoding=utf-8
+#    url: jdbc:mysql://112.124.40.88:33306/user_information?useUnicode=true&characteEncoding=utf-8
-    username: root
-    password: 3cqscbr@only1
-#    url: jdbc:mysql://10.124.102.10:3306/user_information?useUnicode=true&characteEncoding=utf-8
 #    username: root
-#    password: Njsqxj_sthj@2021
+#    password: 3cqscbr@only1
+    url: jdbc:mysql://10.124.102.10:3306/user_information?useUnicode=true&characteEncoding=utf-8
+    username: root
+    password: Njsqxj_sthj@2021
 #    url: jdbc:mysql://192.168.6.6:3306/njsthj?useUnicode=true&characteEncoding=utf-8
 #    username: njsthj
 #    password: Njsqxj_sthj@2021
@@ -20,11 +20,11 @@ custom:
   image:
     url: ${custom.parent-url}:${server.port}/product
     gifPath: ${custom.image.path}/gif
-    path: D:\下载\可视化平台\product
+#    path: D:\下载\可视化平台\product
-  parent-url: http://localhost
+#  parent-url: http://localhost
-  quality-path: E:/Memorandum/VPN配置/南京/多曼雷达项目/AllData
+#  quality-path: E:/Memorandum/VPN配置/南京/多曼雷达项目/AllData
-#    path: /home/project/NJEnvironmentPlatform/html/product
+    path: /home/project/NJEnvironmentPlatform/html/product
-#  parent-url: http://10.124.102.10
+  parent-url: http://10.124.102.10
-#  quality-path: /share/win
+  quality-path: /share/win
 #    path: /home/develop/product
 #  parent-url: http://rdp.nagr.com.cn

04.系统编码/Frontend/src/model/constant.ts

@@ -1,7 +1,7 @@
 export class Constant{
-    public static readonly baseUrl: string = 'http://rdp.nagr.com.cn:18080';
+    public static readonly baseUrl: string = 'http://10.124.102.10:18080';
 }
 export class ConstantRamanLidar{
-    public static readonly baseUrl: string = 'http://112.124.40.88:5511';
+    // public static readonly baseUrl: string = 'http://112.124.40.88:5511';
-    // public static readonly baseUrl: string = 'http://10.124.102.10:9998';
+    public static readonly baseUrl: string = 'http://10.124.102.10:9998';
 }  

04.系统编码/Frontend/src/model/heat-map-drawer.ts

@@ -134,7 +134,7 @@ export class HeatMapDrawer{
         for(let dataIndex = 0, len = this.values.length, lastDataLen = len - 1; dataIndex < len; dataIndex++){
             let value = this.values[dataIndex];
             for(let lastInfoLen = value.length - 1, infoIndex = lastInfoLen; infoIndex >= 0; infoIndex--){
-                // if (value[infoIndex] == null) continue;
+                if (value[infoIndex] == null) continue;
                 
                 let x = startX + dataIndex * this.verticalScaleIntervalLength;
                 let y = startY + (this.borderHeight - infoIndex * this.horizontalScaleIntervalLength);

04.系统编码/Frontend/src/uilts/Config.ts

@@ -2,11 +2,11 @@ import { Moment } from "moment";
 import { format } from "./String";
 
 export class Config {
-    // public static url: string = "";
+    public static url: string = "";
-    // public static parentUrl: string = "http://10.124.102.10:8002/product/picture";
+    public static parentUrl: string = "http://10.124.102.10:8002/product/picture";
-    public static url: string = "http://localhost:8002";
+    // public static url: string = "http://localhost:8002";
     // public static parentUrl: string = "http://112.124.40.88:8999/product/picture";
-    public static parentUrl: string = "http://localhost:8002/product/picture";
+    // public static parentUrl: string = "http://localhost:8002/product/picture";
     // public static parentUrl: string = "http://rdp.nagr.com.cn:8082/product/picture";
 }