新增 修改 判斷式

script/php/get_abnormal.php

@@ -46,7 +46,7 @@ switch ($type) {
         $sql = "SELECT [EquipmentID] FROM [SP_Data]
         WHERE [SP_Data].[Date] = (SELECT TOP 1 [SP_Data].[Date] FROM [SP_Data] GROUP BY [Date]  ORDER BY [Date] desc)
         AND (convert(float,[WaterPressure]) > (SELECT TOP 1 [HighWarningValue] FROM [SP_Warning]) OR convert(float,[WaterPressure]) < (SELECT TOP 1 [LowWarningValue] FROM [SP_Warning]) )
-        AND [WaterPressure] <> '---' GROUP BY [EquipmentID];";
+        AND [WaterPressure] NOT like '%--%' GROUP BY [EquipmentID];";
         break;
 }
 

script/php/read_excel.php

@@ -7,8 +7,7 @@ require '../../assets/vendor/autoload.php';
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
-session_start();
-if (isset($_POST["excel"])) {
+if (isset($_FILES["excel"])) {
     if (0 < $_FILES['excel']['error']) {
         echo 'Error: ' . $_FILES['excel']['error'] . '<br>';
     } else {
@@ -59,7 +58,14 @@ if (isset($_POST["excel"])) {
                 $col_count = 0;
                 array_push($row, $date);
                 if (str_contains($sheetName, "SIS") || str_contains($sheetName, "SID")) {   //若為SIS取出儀器名稱
-                    $equipment_name = explode("區", $sheetName)[1];
+                    if(str_contains($sheetName,"區")){
+                        $equipment_name = explode("區", $sheetName)[1];
+                    }
+                    if(str_contains($sheetName,"(")){
+                        $temp = explode("(", $sheetName);
+                        $equipment_name = $temp[0].$temp[1];
+                    }
+                    
                     $equipment_name = str_replace(" ", "", $equipment_name);
                     $col_count++;
                     array_push($row, $equipment_name);

upload.php

@@ -148,7 +148,11 @@ include($_SERVER['DOCUMENT_ROOT'] . "/Authorization/script/php/permission/check_
 			if (status == 'success') {
 				alert("匯入成功!");
 				window.location.href = "./Upload.php"
+			}else if (status == 'failed') {
+				alert("匯入失敗!");
+				window.location.href = "./Upload.php"
 			}
+
 			getSites();
 			$("#projectName").on("change", function() {
 				let id = $(this).val();