diff --git a/ecs/jskult-webapp/src/controller/master_mainte.py b/ecs/jskult-webapp/src/controller/master_mainte.py
index 638f4595..71b9d18f 100644
--- a/ecs/jskult-webapp/src/controller/master_mainte.py
+++ b/ecs/jskult-webapp/src/controller/master_mainte.py
@@ -1,11 +1,14 @@
+from io import BytesIO, TextIOWrapper
from datetime import datetime
from typing import Optional
+
+import pandas as pd
from fastapi import APIRouter, Depends, HTTPException, Request
from fastapi.responses import HTMLResponse
from starlette import status
from src.error.exceptions import DBException
-import pandas as pd
+
from src.depends.services import get_service
from src.logging.get_logger import get_logger
from src.model.internal.session import UserSession
@@ -24,7 +27,7 @@ from src.system_var import constants
from src.templates import templates
from src.model.request.master_mainte_csvup import MasterMainteCsvUpModel
from src.model.request.master_mainte_csvdl import MasterMainteCsvDlModel
-from io import TextIOWrapper, BytesIO
+
logger = get_logger('マスターメンテ')
diff --git a/ecs/jskult-webapp/src/static/css/masterMainte.css b/ecs/jskult-webapp/src/static/css/masterMainte.css
index 0b8b8a8e..95cdc6e5 100644
--- a/ecs/jskult-webapp/src/static/css/masterMainte.css
+++ b/ecs/jskult-webapp/src/static/css/masterMainte.css
@@ -1,3 +1,9 @@
+/* Bootstrap 5.10以降、box-sizingのデフォルト値によってテーブルがずれるため、このページ限定的にリセット */
+/* @see https://bootstrap-guide.com/content/reboot#page-defaults */
+table {
+ box-sizing: initial;
+}
+
body{
background-color: LightCyan;
font-family : "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", Meiryo, Osaka, "ＭＳ Ｐゴシック", "MS PGothic", sans-serif;
@@ -5,6 +11,7 @@ body{
h1{
margin-left : 1%;
+ font-weight: 700;
}
@@ -23,8 +30,12 @@ h1{
width: 20%;
}
-.csvup_buttonSize{
- width: 85px;
+.header_buttonSize{
+ width: 7rem;
+ font-size: initial;
+}
+.buttonSize{
+ width: 85px;
}
/*////////////////////////*/
@@ -97,6 +108,7 @@ h1{
padding-bottom: 1%;
border-bottom: solid 1px gray;
width: 94%;
+ border-collapse: initial;
}
.inputLabelTd{
diff --git a/ecs/jskult-webapp/src/templates/instEmpCsvUL.html b/ecs/jskult-webapp/src/templates/instEmpCsvUL.html
index 50a1b2bd..9968a6f4 100644
--- a/ecs/jskult-webapp/src/templates/instEmpCsvUL.html
+++ b/ecs/jskult-webapp/src/templates/instEmpCsvUL.html
@@ -12,9 +12,9 @@
document.getElementById("loading").style.display = "block";
document.getElementById("ulMsg").style.display = "none";
}
-
+
function Form_Submit_Disp_Dialog(){
- var msg = '{{ mainte_csv_up.select_function_message() }}';
+ var msg = '{{ mainte_csv_up.select_function_message() }}';
if (confirmDialog(msg)) {
document.getElementById("loading").style.display = "block";
document.getElementById("ulMsg").style.display = "none";
@@ -31,7 +31,7 @@
formInsertBtDisabled();
};
- {% endif %}
+ {% endif %}
@@ -41,9 +41,9 @@
@@ -54,7 +54,7 @@
method="POST" enctype="multipart/form-data"
{% if mainte_csv_up.is_verified and mainte_csv_up.is_error_message_list_empty() %}
onsubmit="return Form_Submit_Disp_Dialog();"
- {% else %}
+ {% else %}
onsubmit="Form_Submit();"
{% endif %}
>
@@ -65,8 +65,8 @@
| 機能： |
- |
|
@@ -89,7 +89,7 @@
登録テーブル： |
|