idcjp/dbms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dbms_init...1

Browse Source
This commit is contained in:
최준흠 2025-05-23 18:57:08 +09:00
parent 3f63a5e636
commit ab87b46381
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/Admin/Equipment/ServerController.php
View File

@ -65,7 +65,7 @@ class ServerController extends EquipmentController
protected function index_process(): array protected function index_process(): array
{ {
$fields = [ $fields = [
'fields' => ['code', 'type', 'model', 'CPU', 'RAM', 'DISK', 'status'], 'fields' => ['code', 'type', 'model', 'CPU', 'RAM', 'DISK', "raid", 'status'],
]; ];
$this->init('index', $fields); $this->init('index', $fields);
// $this->modal_type = 'modal_fetch_v2'; //기본은 modal_iframe임 // $this->modal_type = 'modal_fetch_v2'; //기본은 modal_iframe임

12
app/Database/erp2.vuerd.json
View File

@ -4,9 +4,9 @@
"settings": { "settings": {
"width": 4000, "width": 4000,
"height": 4000, "height": 4000,
"scrollTop": -1560.1004, "scrollTop": -1710.2928,
"scrollLeft": -1690.2815, "scrollLeft": -1510.0458,
"zoomLevel": 1, "zoomLevel": 0.31,
"show": 511, "show": 511,
"database": 4, "database": 4,
"databaseName": "", "databaseName": "",
@ -7462,8 +7462,8 @@
"name": "raid", "name": "raid",
"comment": "", "comment": "",
"dataType": "VARCHAR(10)", "dataType": "VARCHAR(10)",
"default": "", "default": "'default'",
"options": 0, "options": 8,
"ui": { "ui": {
"keys": 0, "keys": 0,
"widthName": 60, "widthName": 60,
@ -7472,7 +7472,7 @@
"widthDefault": 60 "widthDefault": 60
}, },
"meta": { "meta": {
"updateAt": 1747993559888, "updateAt": 1747993949848,
"createAt": 1747993531109 "createAt": 1747993531109
} }
} }

8
app/Language/en/Equipment/Server.php
View File

@ -6,6 +6,7 @@ return [
'type' => "종류", 'type' => "종류",
'model' => "모델", 'model' => "모델",
'price' => "금액", 'price' => "금액",
'raid' => "RAID",
'description' => "설명", 'description' => "설명",
'status' => "상태", 'status' => "상태",
'updated_at' => "수정일", 'updated_at' => "수정일",
@ -35,6 +36,13 @@ return [
"12,13,14세대 PC" => "12,13,14세대 PC", "12,13,14세대 PC" => "12,13,14세대 PC",
"12,13,14세대 MiniPC" => "12,13,14세대 MiniPC", "12,13,14세대 MiniPC" => "12,13,14세대 MiniPC",
], ],
"RAID" => [
'default' => "없음",
"RAID0" => "RAID0",
"RAID1" => "RAID1",
"RAID5" => "RAID5",
"RAID6" => "RAID6",
],
"STATUS" => [ "STATUS" => [
'default' => "사용가능", 'default' => "사용가능",
"pause" => "일시정지", "pause" => "일시정지",

2
app/Models/Equipment/ServerModel.php
View File

@ -16,6 +16,7 @@ class ServerModel extends EquipmentModel
"code", "code",
"type", "type",
"model", "model",
"raid",
"description", "description",
"status", "status",
"updated_at" "updated_at"
@ -33,6 +34,7 @@ class ServerModel extends EquipmentModel
case "code": case "code":
case "model": case "model":
case "type": case "type":
case "raid":
$rule = "required|trim|string"; $rule = "required|trim|string";
break; break;
default: default:

5
app/Services/Equipment/ServerService.php
View File

@ -29,17 +29,18 @@ class ServerService extends EquipmentService
"code", "code",
"type", "type",
"model", "model",
"raid",
"status", "status",
"description", "description",
]; ];
} }
public function getFilterFields(): array public function getFilterFields(): array
{ {
return ["type", 'model', 'status']; return ["type", 'model', "raid", 'status'];
} }
public function getBatchJobFields(): array public function getBatchJobFields(): array
{ {
return ["type", 'model', 'status']; return ["type", 'model', "raid", 'status'];
} }
//서비스에서 사용중인 서버를 occupied로 변경 //서비스에서 사용중인 서버를 occupied로 변경
public function setOccupied(ServerEntity $entity): ServerEntity public function setOccupied(ServerEntity $entity): ServerEntity