diff --git a/config/DeviceSettings.ini b/config/DeviceSettings.ini index d1a7792..96af790 100644 --- a/config/DeviceSettings.ini +++ b/config/DeviceSettings.ini @@ -1,31 +1,27 @@ [DEVICE INFO] -TotalSpectrometer=2 +TotalSpectrometer=1 +[FS2] +Model=ISIF +Port=/dev/ttyS1 +UID=QEP02975 [FS1] Model=OSIFAlpha Port=-1 -UID=FLMS15815 -AEMax=0.85 -AEMin=0.75 -Depth=65535 -[FS2] -Model=OSIFBeta -Port=-1 UID=QEP02975 AEMax=0.85 -AEMin=0.75 -Depth=230000 +AEMin=0.80 +Depth=200000 [FS3] Model=Null [LINEAR SHUTTER] -Port=COM8 +Port=/dev/ttyUSB1 Type=1 DCID=1 -TotalPosition=6 -Position0=2000 -Position1=110000 -Position2=220000 -Position3=330000 -Position4=440000 -Position5=550000 +TotalPosition=5 +Position0=10000 +Position1=91947 +Position2=219299 +Position3=347535 +Position4=474904 [HUMITURE] -Port=COM11 +Port=/dev/ttyUSB3 \ No newline at end of file diff --git a/html/config.html b/html/config.html index 1c848c6..f0db299 100644 --- a/html/config.html +++ b/html/config.html @@ -6,12 +6,15 @@ +
+

Sif And Spectral

+
- - - + + +
程序运行状态程序运行状态
@@ -19,9 +22,7 @@
-
-

Sif And Spectral

-
+
diff --git a/html/index.html b/html/index.html new file mode 100644 index 0000000..f0db299 --- /dev/null +++ b/html/index.html @@ -0,0 +1,98 @@ + + + + +Title + + + +
+

Sif And Spectral

+
+
+
+ + + + + + +
程序运行状态
+ +
+ +
+ +
+ + + + +

控制设置

+
+ + + + + + + + +
开始时间       + 时间间隔     + 停止时间     +
+
+

+

+
+

描述信息

+
+
+ + + + + + + + + + + + + +
设备序列号    地点        北半球
GPS经度 GPS经度 GPS高程
+

+ + + + + + + + + + + + + + + +
安装时间     ISIF定标时间   IS1定标时间
设备维护人员 维护人员电话
远程资源用户ID 定标文件下载路径
+
+
+ +
+ +
+

+ +
+
+
+ + + + + \ No newline at end of file diff --git a/html/javascript/config.js b/html/javascript/config.js index 9c05c06..c8fe160 100644 --- a/html/javascript/config.js +++ b/html/javascript/config.js @@ -23,7 +23,10 @@ function getDevinfoRetrun(retrun) div.innerHTML=retrun; init() } - +function getstataRetrun(retrun){ + var div=document.getElementById('statid'); + div.innerHTML=retrun; +} var datad; @@ -36,10 +39,23 @@ function init() function getinit() { httpget("/php/GetIniFile.php",datad,getDevinfoRetrun) + httpget("/php/GetSata.php",datad,getstataRetrun) } function rebootclicked() { - alert("reboot") + + httpget("/php/reboot.php",datad,getrebootRentrun) + var div=document.getElementById('statid'); + div.innerHTML=""; + +} +function getrebootRentrun(ret) +{ + alert(ret) + + setTimeout(() => { + location.reload() +}, 100); } window.onload=getinit; diff --git a/html/php/GetConfig.php b/html/php/GetConfig.php index d2090bb..fddfba2 100644 --- a/html/php/GetConfig.php +++ b/html/php/GetConfig.php @@ -1,4 +1,4 @@ 设备信息'; echo '设备数量 '.$numberofsensor.''; echo ''; diff --git a/html/php/GetSata.php b/html/php/GetSata.php index 8118710..350b33a 100644 --- a/html/php/GetSata.php +++ b/html/php/GetSata.php @@ -4,7 +4,7 @@ exec("ps -ef | grep TowerOptoSifAndSpectral | grep -v grep",$output,$return); //var_dump( $output); if ( count($output)>0) { - echo '
'; + echo '
'; }else{ - echo '
'; + echo '
'; } \ No newline at end of file diff --git a/html/php/config.json b/html/php/config.json index 5a8ace3..bb20f36 100644 --- a/html/php/config.json +++ b/html/php/config.json @@ -1 +1 @@ -{"BeginTime":"17:49","IntervalTime":"24","EndTime":"18:50","Dev_SN":"1000000","Location":"dasdf","GPS_North":"on","GPS_Longtitude":"123","GPS_Latitude":"123","GPS_Atitude":"50","InstallTime":"2021-12-16","ISIFCalibrationTime":"2021-12-16","IS1CalibrationTime":"2021-12-23","NameOfMaintenance":"123","PhoneOfMaintenance":"123123123","DownloadUserID":"123123","DownlaodAddress":"http:\/\/www.iris-rs.cn","OSIFAlpha_CaliFileMainName":"osifalpha","OSIFBeta_CaliFileMainName":"osifbeta"} \ No newline at end of file +{"BeginTime":"","IntervalTime":"","EndTime":"","Dev_SN":"1000000","Location":"","GPS_Longtitude":"","GPS_Latitude":"","GPS_Atitude":"","InstallTime":"","ISIFCalibrationTime":"","IS1CalibrationTime":"","NameOfMaintenance":"","PhoneOfMaintenance":"","DownloadUserID":"","DownlaodAddress":""} \ No newline at end of file diff --git a/html/php/config.php b/html/php/config.php index a544249..4bc1f18 100644 --- a/html/php/config.php +++ b/html/php/config.php @@ -1,5 +1,7 @@ >log.txt & +