From 84abfa8ab65d0360eea85f872bd8714c43d164ab Mon Sep 17 00:00:00 2001 From: xuhuihui <3548508071@qq.com> Date: Mon, 27 Jun 2022 10:46:36 +0800 Subject: [PATCH 1/2] xhh commit --- .../Frontend/src/components/DecisionSupport.vue | 1 - 04.系统编码/Frontend/src/components/RamanLidar.vue | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/04.系统编码/Frontend/src/components/DecisionSupport.vue b/04.系统编码/Frontend/src/components/DecisionSupport.vue index 0ffe303..3bf41b3 100644 --- a/04.系统编码/Frontend/src/components/DecisionSupport.vue +++ b/04.系统编码/Frontend/src/components/DecisionSupport.vue @@ -336,7 +336,6 @@ export default { return newArray; } - const initTimeLineDay = () => { options.times = []; options.currentTime = moment(options.date).format('YYYY-MM-DD'); diff --git a/04.系统编码/Frontend/src/components/RamanLidar.vue b/04.系统编码/Frontend/src/components/RamanLidar.vue index 1bac871..7cb74a6 100644 --- a/04.系统编码/Frontend/src/components/RamanLidar.vue +++ b/04.系统编码/Frontend/src/components/RamanLidar.vue @@ -432,7 +432,7 @@ export default { creates.LidarRatio = new HighChartCreate('LidarRatio'); creates.LidarRatio.setChart(false, 'line', 1500, 600); creates.LidarRatio.setSpecialXAxis('激光雷达比(单位立体角)', 120, 0, 20); - creates.LidarRatio.setSpecialYAxis('高度(m)', 3000, 0); + creates.LidarRatio.setSpecialYAxis('高度(m)'); creates.LidarRatio.setLegend(); creates.LidarRatio.setTooltip('高度: {point.y}'); creates.LidarRatio.setSeries('激光雷达比', 0, null, null, '#3636FF') @@ -841,7 +841,7 @@ export default { } const drawLidarRatioCharts = (result: CustomeArray) => { - if (result.length <= 0) return; + if (result.length == 0) return; const data = LidarRatioPrepareChartData(result); creates.LidarRatio.updateSeries(0, data); options.loadingLidarRatioStatus = false @@ -913,7 +913,7 @@ export default { if (result[0].data == null) return; result[0].data.forEach((item) => { item.forEach((item, index) => { - if (item == null) item = NaN + // if (item == null) item = NaN prepareData.push([item, index * 15]) }) }) @@ -1523,7 +1523,6 @@ export default { locate: options.currentRegion } } - return { date: time, var: variableName, From e1c5c907434b118479c87c3164f9d1eeab5a127c Mon Sep 17 00:00:00 2001 From: xuhuihui <3548508071@qq.com> Date: Tue, 19 Jul 2022 16:45:22 +0800 Subject: [PATCH 2/2] commit --- .../backend/service/ImageService.java | 7 +- .../src/main/resources/application.yml | 12 +- .../Frontend/public/images/empty.png | Bin 0 -> 60625 bytes .../Frontend/src/components/RamanLidar.vue | 2 +- .../src/components/SynergyEvaluation.vue | 1141 ++++++++++------- 04.系统编码/Frontend/src/router/index.ts | 3 +- 04.系统编码/Frontend/src/uilts/Config.ts | 5 +- 04.系统编码/Frontend/src/uilts/storage.ts | 1 - 8 files changed, 722 insertions(+), 449 deletions(-) create mode 100644 04.系统编码/Frontend/public/images/empty.png diff --git a/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/ImageService.java b/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/ImageService.java index b4e7feb..58241f8 100644 --- a/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/ImageService.java +++ b/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/ImageService.java @@ -41,8 +41,11 @@ public class ImageService { public String convert(String url) throws IOException { String filepath = url.replace(imageUrl, imagePath); File sourceFile = new File(filepath); - Assert.isTrue(sourceFile.exists(), "文件不存在"); - Assert.isTrue(filepath.toLowerCase(Locale.ROOT).endsWith(TIF_FILE_SUFFIX), "文件格式不正确"); +// Assert.isTrue(sourceFile.exists(), "文件不存在"); +// Assert.isTrue(filepath.toLowerCase(Locale.ROOT).endsWith(TIF_FILE_SUFFIX), "文件格式不正确"); + if(!sourceFile.exists() || !filepath.toLowerCase(Locale.ROOT).endsWith(TIF_FILE_SUFFIX)){ + return "/images/empty.png"; + } String targetFilePath = filepath.replace(TIF_FILE_SUFFIX, PNG_FILE_SUFFIX); File targetFile = new File(targetFilePath); if (!targetFile.exists()){ diff --git a/04.系统编码/Backend/src/main/resources/application.yml b/04.系统编码/Backend/src/main/resources/application.yml index 197a887..eee433a 100644 --- a/04.系统编码/Backend/src/main/resources/application.yml +++ b/04.系统编码/Backend/src/main/resources/application.yml @@ -20,11 +20,11 @@ custom: image: url: ${custom.parent-url}:${server.port}/product gifPath: ${custom.image.path}/gif -# path: D:/Deployments/LamanRadar/product -# parent-url: http://localhost -# quality-path: E:/Memorandum/VPN配置/南京/多曼雷达项目/AllData - path: /home/project/NJEnvironmentPlatform/html/product - parent-url: http://10.124.102.10 - quality-path: /share/win + path: D:\下载\可视化平台\product + parent-url: http://localhost + quality-path: E:/Memorandum/VPN配置/南京/多曼雷达项目/AllData +# path: /home/project/NJEnvironmentPlatform/html/product +# parent-url: http://10.124.102.10 +# quality-path: /share/win # path: /home/develop/product # parent-url: http://rdp.nagr.com.cn diff --git a/04.系统编码/Frontend/public/images/empty.png b/04.系统编码/Frontend/public/images/empty.png new file mode 100644 index 0000000000000000000000000000000000000000..6e8f87bbee8727e96b102d8bf09a3365b6b9c6cd GIT binary patch literal 60625 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 AH~;_u literal 0 HcmV?d00001 diff --git a/04.系统编码/Frontend/src/components/RamanLidar.vue b/04.系统编码/Frontend/src/components/RamanLidar.vue index 7cb74a6..8f8ab9e 100644 --- a/04.系统编码/Frontend/src/components/RamanLidar.vue +++ b/04.系统编码/Frontend/src/components/RamanLidar.vue @@ -989,7 +989,7 @@ export default { const prepareWatervaporColors = () => { return new ColorChart(['#990000', '#CC0000', '#FF0000', '#FF3300', '#FF6600', '#FF9900', '#FFCC00', '#FFFF00', '#CCFF33', '#99FF66', '#66FF99', '#33FFCC', '#00FFFF', '#00CCFF', '#0099FF', '#0066FF', '#0033FF', '#0000FF', '#0000CC', '#000099'], - [20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0], true, true + [30, 28, 26, 24, 22, 20, 18, 16, 14, 12, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0], true, true ); } diff --git a/04.系统编码/Frontend/src/components/SynergyEvaluation.vue b/04.系统编码/Frontend/src/components/SynergyEvaluation.vue index 6545a5c..d5a2a9b 100644 --- a/04.系统编码/Frontend/src/components/SynergyEvaluation.vue +++ b/04.系统编码/Frontend/src/components/SynergyEvaluation.vue @@ -1,468 +1,739 @@ diff --git a/04.系统编码/Frontend/src/router/index.ts b/04.系统编码/Frontend/src/router/index.ts index 3157156..da43b12 100644 --- a/04.系统编码/Frontend/src/router/index.ts +++ b/04.系统编码/Frontend/src/router/index.ts @@ -31,7 +31,6 @@ router.beforeEach((to,form,next)=>{ next('/Login') } } - }) -export default router; \ No newline at end of file +export default router; diff --git a/04.系统编码/Frontend/src/uilts/Config.ts b/04.系统编码/Frontend/src/uilts/Config.ts index 6662a4e..a34879d 100644 --- a/04.系统编码/Frontend/src/uilts/Config.ts +++ b/04.系统编码/Frontend/src/uilts/Config.ts @@ -5,7 +5,8 @@ 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 parentUrl: string = "http://112.124.40.88:8999/product/picture"; + public static parentUrl: string = "http://localhost:8002/product/picture"; // public static parentUrl: string = "http://rdp.nagr.com.cn:8082/product/picture"; } @@ -36,4 +37,4 @@ export class DecisionSupportConfig { public static getUrl(productName: string, imgName: string): string { return format('{2}/decision-support/{0}/{1}.tif', productName, imgName, this.url); } -} \ No newline at end of file +} diff --git a/04.系统编码/Frontend/src/uilts/storage.ts b/04.系统编码/Frontend/src/uilts/storage.ts index 76d53f7..a2a9f37 100644 --- a/04.系统编码/Frontend/src/uilts/storage.ts +++ b/04.系统编码/Frontend/src/uilts/storage.ts @@ -1,5 +1,4 @@ - export function setStaff(key: any, staff: any) { localStorage.setItem(key, JSON.stringify(staff)); }