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 f3213b7..060c77b 100644 --- a/04.系统编码/Backend/src/main/resources/application.yml +++ b/04.系统编码/Backend/src/main/resources/application.yml @@ -20,7 +20,7 @@ custom: image: url: ${custom.parent-url}:${server.port}/product gifPath: ${custom.image.path}/gif -# path: D:/Deployments/LamanRadar/product +# path: D:\下载\可视化平台\product # parent-url: http://localhost # quality-path: E:/Memorandum/VPN配置/南京/多曼雷达项目/AllData path: /home/project/NJEnvironmentPlatform/html/product diff --git a/04.系统编码/Frontend/public/images/empty.png b/04.系统编码/Frontend/public/images/empty.png new file mode 100644 index 0000000..6e8f87b Binary files /dev/null and b/04.系统编码/Frontend/public/images/empty.png differ 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..8f8ab9e 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]) }) }) @@ -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 ); } @@ -1523,7 +1523,6 @@ export default { locate: options.currentRegion } } - return { date: time, var: variableName, 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/model/constant.ts b/04.系统编码/Frontend/src/model/constant.ts index 90184dd..feab2e0 100644 --- a/04.系统编码/Frontend/src/model/constant.ts +++ b/04.系统编码/Frontend/src/model/constant.ts @@ -1,5 +1,5 @@ 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'; 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 115f322..a5b6d4e 100644 --- a/04.系统编码/Frontend/src/uilts/Config.ts +++ b/04.系统编码/Frontend/src/uilts/Config.ts @@ -6,6 +6,7 @@ export class Config { 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://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)); }