Browse Source

commit

master
xuhuihui 3 years ago
parent
commit
e1c5c90743
  1. 7
      04.系统编码/Backend/src/main/java/com/userinformation/backend/service/ImageService.java
  2. 12
      04.系统编码/Backend/src/main/resources/application.yml
  3. BIN
      04.系统编码/Frontend/public/images/empty.png
  4. 2
      04.系统编码/Frontend/src/components/RamanLidar.vue
  5. 1141
      04.系统编码/Frontend/src/components/SynergyEvaluation.vue
  6. 3
      04.系统编码/Frontend/src/router/index.ts
  7. 5
      04.系统编码/Frontend/src/uilts/Config.ts
  8. 1
      04.系统编码/Frontend/src/uilts/storage.ts

7
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 { public String convert(String url) throws IOException {
String filepath = url.replace(imageUrl, imagePath); String filepath = url.replace(imageUrl, imagePath);
File sourceFile = new File(filepath); File sourceFile = new File(filepath);
Assert.isTrue(sourceFile.exists(), "文件不存在"); // Assert.isTrue(sourceFile.exists(), "文件不存在");
Assert.isTrue(filepath.toLowerCase(Locale.ROOT).endsWith(TIF_FILE_SUFFIX), "文件格式不正确"); // 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); String targetFilePath = filepath.replace(TIF_FILE_SUFFIX, PNG_FILE_SUFFIX);
File targetFile = new File(targetFilePath); File targetFile = new File(targetFilePath);
if (!targetFile.exists()){ if (!targetFile.exists()){

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

@ -20,11 +20,11 @@ custom:
image: image:
url: ${custom.parent-url}:${server.port}/product url: ${custom.parent-url}:${server.port}/product
gifPath: ${custom.image.path}/gif gifPath: ${custom.image.path}/gif
# path: D:/Deployments/LamanRadar/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 # path: /home/develop/product
# parent-url: http://rdp.nagr.com.cn # parent-url: http://rdp.nagr.com.cn

BIN
04.系统编码/Frontend/public/images/empty.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

2
04.系统编码/Frontend/src/components/RamanLidar.vue

@ -989,7 +989,7 @@ export default {
const prepareWatervaporColors = () => { const prepareWatervaporColors = () => {
return new ColorChart(['#990000', '#CC0000', '#FF0000', '#FF3300', '#FF6600', '#FF9900', '#FFCC00', '#FFFF00', '#CCFF33', '#99FF66', return new ColorChart(['#990000', '#CC0000', '#FF0000', '#FF3300', '#FF6600', '#FF9900', '#FFCC00', '#FFFF00', '#CCFF33', '#99FF66',
'#66FF99', '#33FFCC', '#00FFFF', '#00CCFF', '#0099FF', '#0066FF', '#0033FF', '#0000FF', '#0000CC', '#000099'], '#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
); );
} }

1141
04.系统编码/Frontend/src/components/SynergyEvaluation.vue

File diff suppressed because it is too large

3
04.系统编码/Frontend/src/router/index.ts

@ -31,7 +31,6 @@ router.beforeEach((to,form,next)=>{
next('/Login') next('/Login')
} }
} }
}) })
export default router; export default router;

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

@ -5,7 +5,8 @@ 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://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"; // 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 { public static getUrl(productName: string, imgName: string): string {
return format('{2}/decision-support/{0}/{1}.tif', productName, imgName, this.url); return format('{2}/decision-support/{0}/{1}.tif', productName, imgName, this.url);
} }
} }

1
04.系统编码/Frontend/src/uilts/storage.ts

@ -1,5 +1,4 @@
export function setStaff(key: any, staff: any) { export function setStaff(key: any, staff: any) {
localStorage.setItem(key, JSON.stringify(staff)); localStorage.setItem(key, JSON.stringify(staff));
} }

Loading…
Cancel
Save