From dcde513fc7d9b605e75439e66b7e5b0b7da71c9f Mon Sep 17 00:00:00 2001 From: xiaowuler Date: Mon, 20 Jun 2022 15:52:55 +0800 Subject: [PATCH] modify some codes --- .../Backend/src/main/resources/application.yml | 10 +++++----- 04.系统编码/Frontend/src/model/constant.ts | 4 ++-- 04.系统编码/Frontend/src/model/heat-map-drawer.ts | 4 ++-- 04.系统编码/Frontend/src/uilts/Config.ts | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/04.系统编码/Backend/src/main/resources/application.yml b/04.系统编码/Backend/src/main/resources/application.yml index 197a887..f3213b7 100644 --- a/04.系统编码/Backend/src/main/resources/application.yml +++ b/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 - username: root - password: 3cqscbr@only1 -# url: jdbc:mysql://10.124.102.10:3306/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: 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 diff --git a/04.系统编码/Frontend/src/model/constant.ts b/04.系统编码/Frontend/src/model/constant.ts index 3f9b68c..90184dd 100644 --- a/04.系统编码/Frontend/src/model/constant.ts +++ b/04.系统编码/Frontend/src/model/constant.ts @@ -2,6 +2,6 @@ export class Constant{ public static readonly baseUrl: string = 'http://rdp.nagr.com.cn:18080'; } export class ConstantRamanLidar{ - 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://112.124.40.88:5511'; + public static readonly baseUrl: string = 'http://10.124.102.10:9998'; } \ No newline at end of file diff --git a/04.系统编码/Frontend/src/model/heat-map-drawer.ts b/04.系统编码/Frontend/src/model/heat-map-drawer.ts index d04ecc3..fb05d02 100644 --- a/04.系统编码/Frontend/src/model/heat-map-drawer.ts +++ b/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); @@ -156,7 +156,7 @@ export class HeatMapDrawer{ } let targetValue = value[infoIndex].value; - let color = this.colorChart.getColor(targetValue, this.id); + let color = this.colorChart.getColor(targetValue); value[infoIndex].updateBorderInfo(x, y, width, height); if (color == null) continue; this.canvasContext.fillStyle = color; diff --git a/04.系统编码/Frontend/src/uilts/Config.ts b/04.系统编码/Frontend/src/uilts/Config.ts index 6662a4e..115f322 100644 --- a/04.系统编码/Frontend/src/uilts/Config.ts +++ b/04.系统编码/Frontend/src/uilts/Config.ts @@ -2,10 +2,10 @@ import { Moment } from "moment"; import { format } from "./String"; export class Config { - // public static url: string = ""; - // public static parentUrl: string = "http://10.124.102.10:8002/product/picture"; - public static url: string = "http://localhost:8002"; - public static parentUrl: string = "http://112.124.40.88:8999/product/picture"; + public static url: string = ""; + public static parentUrl: string = "http://10.124.102.10:8002/product/picture"; + // public static url: string = "http://localhost:8002"; + // public static parentUrl: string = "http://112.124.40.88:8999/product/picture"; // public static parentUrl: string = "http://rdp.nagr.com.cn:8082/product/picture"; }