Merge branch 'master' of http://47.92.195.73:8081/project_boditech_vidas_a8000_v3/a8k_app

1 year ago · c118cb7423
5 changed files with 10 additions and 1 deletions
--- a/src/main/java/a8k/service/devicectrl/ctrl/SamplesPreProcesCtrl.java
+++ b/src/main/java/a8k/service/devicectrl/ctrl/SamplesPreProcesCtrl.java
@ -243,6 +243,7 @@ public class SamplesPreProcesCtrl {
 	public void setAeroslFanPower(Boolean enable) throws Exception {
 		if (enable) {
 			canBus.fanControlerSetSpeed(MId.WbTubeFanMod, 99);
+			throw new Exception("xxxx");
 		} else {
 			canBus.fanControlerSetSpeed(MId.WbTubeFanMod, 0);
 		}
--- a/src/main/resources/static/test/css/app.581810e1.css
+++ b/src/main/resources/static/test/css/app.581810e1.css
--- a/src/main/resources/static/test/index.html
+++ b/src/main/resources/static/test/index.html
@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>a8k_webui</title><script defer="defer" src="js/chunk-vendors.c0ff1f2e.js"></script><script defer="defer" src="js/app.63b8b225.js"></script><link href="css/app.cacd0c7b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but a8k_webui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>a8k_webui</title><script defer="defer" src="js/chunk-vendors.ce3623b2.js"></script><script defer="defer" src="js/app.76cf6823.js"></script><link href="css/app.581810e1.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but a8k_webui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
--- a/src/main/resources/static/test/js/app.76cf6823.js
+++ b/src/main/resources/static/test/js/app.76cf6823.js
--- a/src/main/resources/static/test/js/app.76cf6823.js.map
+++ b/src/main/resources/static/test/js/app.76cf6823.js.map