diff --git a/ecs/jskult-webapp/src/static/css/loading.css b/ecs/jskult-webapp/src/static/css/loading.css index b4ea2df0..8f081d29 100644 --- a/ecs/jskult-webapp/src/static/css/loading.css +++ b/ecs/jskult-webapp/src/static/css/loading.css @@ -1,4 +1,4 @@ -#_loading { +._loading { z-index: 10000; position: fixed; top: 0; @@ -14,7 +14,7 @@ opacity: 0.7; } -#_loading_content { +._loading_content { position: absolute; top: 50%; left: 50%; diff --git a/ecs/jskult-webapp/src/static/function/businessLogicScript.js b/ecs/jskult-webapp/src/static/function/businessLogicScript.js index 32d1a489..a77bb2e9 100644 --- a/ecs/jskult-webapp/src/static/function/businessLogicScript.js +++ b/ecs/jskult-webapp/src/static/function/businessLogicScript.js @@ -291,10 +291,10 @@ function checkNumberOnlyForm($this) // メニューへボタンの関数 // 機能概要:マスターメンテメニュー画面に遷移する -function backToMainteMenu(){ +function backToMainteMenu(loadingElemId = '_loading'){ sessionStorage.clear(); // ローディング表示 - showLoading(); + showLoading(loadingElemId); location.href = "/masterMainte/masterMainteMenu"; } diff --git a/ecs/jskult-webapp/src/templates/_loading.html b/ecs/jskult-webapp/src/templates/_loading.html index 9e4cc87f..437c7e50 100644 --- a/ecs/jskult-webapp/src/templates/_loading.html +++ b/ecs/jskult-webapp/src/templates/_loading.html @@ -1,5 +1,5 @@ -
-
+
+
{{progress_message}}
diff --git a/ecs/jskult-webapp/src/templates/instEmpCsvDL.html b/ecs/jskult-webapp/src/templates/instEmpCsvDL.html index c51aed07..93ecf332 100644 --- a/ecs/jskult-webapp/src/templates/instEmpCsvDL.html +++ b/ecs/jskult-webapp/src/templates/instEmpCsvDL.html @@ -45,7 +45,7 @@ - +

施設担当者データCSVダウンロード

@@ -180,8 +180,13 @@ {% endif %} {% endif %}

+ {% with progress_message = '処理中...しばらくお待ち下さい。'%} {% include '_loading.html' %} {% endwith %} + + {% with progress_message = '', id = '_loading_for_back' %} + {% include '_loading.html' %} + {% endwith %} diff --git a/ecs/jskult-webapp/src/templates/instEmpCsvUL.html b/ecs/jskult-webapp/src/templates/instEmpCsvUL.html index 981e97b8..bf1bf845 100644 --- a/ecs/jskult-webapp/src/templates/instEmpCsvUL.html +++ b/ecs/jskult-webapp/src/templates/instEmpCsvUL.html @@ -66,7 +66,7 @@ {% if mainte_csv_up.is_verified and mainte_csv_up.is_error_message_list_empty() %} {% else %} - + {% endif %} @@ -200,8 +200,14 @@
{% endif %}

+ + {% with progress_message = '処理中...しばらくお待ち下さい。'%} {% include '_loading.html' %} {% endwith %} + + {% with progress_message = '', id = '_loading_for_back' %} + {% include '_loading.html' %} + {% endwith %} diff --git a/ecs/jskult-webapp/src/templates/tableOverride.html b/ecs/jskult-webapp/src/templates/tableOverride.html index 02e43784..b5fe6a58 100644 --- a/ecs/jskult-webapp/src/templates/tableOverride.html +++ b/ecs/jskult-webapp/src/templates/tableOverride.html @@ -25,7 +25,7 @@ - +

テーブル上書きコピー

@@ -53,8 +53,13 @@
ダミー従業員担当施設マスタのデータを本番従業員担当施設マスタのデータで上書きしました

{% endif %} + {% with progress_message = 'データ上書き中...しばらくお待ち下さい。'%} {% include '_loading.html' %} {% endwith %} + + {% with progress_message = '', id = '_loading_for_back' %} + {% include '_loading.html' %} + {% endwith %}