From 2e3d6e55728b5eb65871838651936591df6429a9 Mon Sep 17 00:00:00 2001 From: sky121113 Date: Thu, 21 May 2026 13:25:28 +0800 Subject: [PATCH] =?UTF-8?q?[STYLE]=20=E5=84=AA=E5=8C=96=E6=A9=9F=E5=8F=B0?= =?UTF-8?q?=E5=9E=8B=E8=99=9F=E8=88=87=E9=80=9A=E7=9F=A5=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E4=BB=8B=E9=9D=A2=E4=B8=A6=E8=AA=BF=E6=95=B4=E6=BA=AB=E5=BA=A6?= =?UTF-8?q?=E7=82=BA=E6=95=B4=E6=95=B8=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 調整 Discord 通知設定介面的間距與對齊，使其與基本設定中的機台設定保持一致。 2. 重構機台型號設定 Modal，將溫度上下限的輸入框改為「極簡奢華風」的加減按鈕元件。 3. 更新機台型號溫度相關的設定與顯示，強制限制與轉換為整數 (移除小數點)。 4. 將機台型號的溫度限制相關介面文字更新為「告警」相關字眼 (預設溫度告警上限、預設溫度告警下限等)。 5. 於中、英、日語系檔案中新增溫度告警相關之翻譯鍵值。 --- .../DiscordNotificationController.php | 2 +- .../BasicSettings/MachineModelController.php | 16 +- lang/en.json | 3 + lang/ja.json | 3 + lang/zh_TW.json | 3 + .../discord-notifications/index.blade.php | 537 +++++++++++------- .../basic-settings/machines/index.blade.php | 99 +++- .../machines/partials/tab-models.blade.php | 12 +- 8 files changed, 444 insertions(+), 231 deletions(-) diff --git a/app/Http/Controllers/Admin/BasicSettings/DiscordNotificationController.php b/app/Http/Controllers/Admin/BasicSettings/DiscordNotificationController.php index 36a1805..7441543 100644 --- a/app/Http/Controllers/Admin/BasicSettings/DiscordNotificationController.php +++ b/app/Http/Controllers/Admin/BasicSettings/DiscordNotificationController.php @@ -37,7 +37,7 @@ class DiscordNotificationController extends AdminController // ── Tab 2: 機台個別設定 ── $machineQuery = \App\Models\Machine\Machine::query()->with(['company', 'machineModel']); if ($user->isSystemAdmin()) { - if ($filterCompanyId = $request->input('filter_company_id')) { + if ($filterCompanyId = trim($request->input('filter_company_id', ''))) { $machineQuery->where('company_id', $filterCompanyId); } if ($searchMachine = $request->input('search_machine')) { diff --git a/app/Http/Controllers/Admin/BasicSettings/MachineModelController.php b/app/Http/Controllers/Admin/BasicSettings/MachineModelController.php index 712127e..2b46771 100644 --- a/app/Http/Controllers/Admin/BasicSettings/MachineModelController.php +++ b/app/Http/Controllers/Admin/BasicSettings/MachineModelController.php @@ -22,13 +22,13 @@ class MachineModelController extends AdminController { $validated = $request->validate([ 'name' => 'required|string|max:255', - 'temp_upper_limit' => 'nullable|numeric|min:-50|max:100', - 'temp_lower_limit' => 'nullable|numeric|min:-50|max:100', + 'temp_upper_limit' => 'nullable|integer|min:-50|max:100', + 'temp_lower_limit' => 'nullable|integer|min:-50|max:100', ]); $settings = [ - 'temp_upper_limit' => $request->filled('temp_upper_limit') ? (float)$request->temp_upper_limit : null, - 'temp_lower_limit' => $request->filled('temp_lower_limit') ? (float)$request->temp_lower_limit : null, + 'temp_upper_limit' => $request->filled('temp_upper_limit') ? (int)$request->temp_upper_limit : null, + 'temp_lower_limit' => $request->filled('temp_lower_limit') ? (int)$request->temp_lower_limit : null, ]; MachineModel::create([ @@ -56,13 +56,13 @@ class MachineModelController extends AdminController { $validated = $request->validate([ 'name' => 'required|string|max:255', - 'temp_upper_limit' => 'nullable|numeric|min:-50|max:100', - 'temp_lower_limit' => 'nullable|numeric|min:-50|max:100', + 'temp_upper_limit' => 'nullable|integer|min:-50|max:100', + 'temp_lower_limit' => 'nullable|integer|min:-50|max:100', ]); $settings = [ - 'temp_upper_limit' => $request->filled('temp_upper_limit') ? (float)$request->temp_upper_limit : null, - 'temp_lower_limit' => $request->filled('temp_lower_limit') ? (float)$request->temp_lower_limit : null, + 'temp_upper_limit' => $request->filled('temp_upper_limit') ? (int)$request->temp_upper_limit : null, + 'temp_lower_limit' => $request->filled('temp_lower_limit') ? (int)$request->temp_lower_limit : null, ]; $machine_model->update([ diff --git a/lang/en.json b/lang/en.json index 17e055e..7b3c227 100644 --- a/lang/en.json +++ b/lang/en.json @@ -2128,5 +2128,8 @@ "Default Temp Upper Limit (°C)": "Default Temp Upper Limit (°C)", "Default Temp Lower Limit (°C)": "Default Temp Lower Limit (°C)", "Default Temp Limits": "Default Temp Limits", + "Default Temp Alert Upper Limit (°C)": "Default Temp Alert Upper Limit (°C)", + "Default Temp Alert Lower Limit (°C)": "Default Temp Alert Lower Limit (°C)", + "Default Temp Alert Limits": "Default Temp Alert Limits", "Machine model saved successfully.": "Machine model saved successfully." } \ No newline at end of file diff --git a/lang/ja.json b/lang/ja.json index d943433..b8f87c1 100644 --- a/lang/ja.json +++ b/lang/ja.json @@ -2131,5 +2131,8 @@ "Default Temp Upper Limit (°C)": "デフォルト温度上限 (°C)", "Default Temp Lower Limit (°C)": "デフォルト温度下限 (°C)", "Default Temp Limits": "デフォルト温度制御範囲", + "Default Temp Alert Upper Limit (°C)": "デフォルト温度アラート上限 (°C)", + "Default Temp Alert Lower Limit (°C)": "デフォルト温度アラート下限 (°C)", + "Default Temp Alert Limits": "デフォルト温度アラート範囲", "Machine model saved successfully.": "機器モデルが正常に追加されました。" } \ No newline at end of file diff --git a/lang/zh_TW.json b/lang/zh_TW.json index 363b43e..5d9639b 100644 --- a/lang/zh_TW.json +++ b/lang/zh_TW.json @@ -2187,5 +2187,8 @@ "Default Temp Upper Limit (°C)": "預設溫度上限 (°C)", "Default Temp Lower Limit (°C)": "預設溫度下限 (°C)", "Default Temp Limits": "預設溫控範圍", + "Default Temp Alert Upper Limit (°C)": "預設溫度告警上限 (°C)", + "Default Temp Alert Lower Limit (°C)": "預設溫度告警下限 (°C)", + "Default Temp Alert Limits": "預設溫度告警範圍", "Machine model saved successfully.": "機台型號已成功新增。" } \ No newline at end of file diff --git a/resources/views/admin/basic-settings/discord-notifications/index.blade.php b/resources/views/admin/basic-settings/discord-notifications/index.blade.php index 1e07a93..2c02d00 100644 --- a/resources/views/admin/basic-settings/discord-notifications/index.blade.php +++ b/resources/views/admin/basic-settings/discord-notifications/index.blade.php @@ -1,126 +1,7 @@ @extends('layouts.admin') @section('content') -
+
-
- - - - -
+ + + + -
+
$type }; @endphp - + {{ $label }} @endforeach @@ -298,7 +177,7 @@ default => $type }; @endphp - + {{ $label }} @endforeach @@ -352,12 +231,11 @@ @if(auth()->user()->isSystemAdmin())
- +
@endif @@ -466,17 +344,17 @@ @elseif($mTempAlert === 'disabled') @else - + {{ __('Inherit') }} @endif
@if($mTempAlert !== 'disabled')
- - {{ number_format($finalLower, 1) }}°C ~ {{ number_format($finalUpper, 1) }}°C + + {{ number_format($finalLower, 0) }}°C ~ {{ number_format($finalUpper, 0) }}°C - + ({{ $tempSource }})
@@ -549,7 +427,7 @@ @elseif($mTempAlert === 'disabled') @else - + {{ __('Inherit') }} @endif @@ -582,10 +460,10 @@

{{ __('Temp Alert Range') }}

- - {{ number_format($finalLower, 1) }}°C ~ {{ number_format($finalUpper, 1) }}°C + + {{ number_format($finalLower, 0) }}°C ~ {{ number_format($finalUpper, 0) }}°C - + ({{ $tempSource }})
@@ -696,13 +574,13 @@
- +
- - + + - +