Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS

Backend/Views/BuildInfo/Index.cshtml

@@ -280,7 +280,7 @@
                 formData.append("Ip_address", $('#ip_address_modal').val());
                 formData.append("Ip_port", $('#ip_port_modal').val());
 
-                maps = $('#file_3d_modal')[0].files;
+                maps = $('#build_file_3d_modal')[0].files;
                 if (maps.length > 0) {
                     var file_names = maps[0].name.split(".");
 
@@ -332,7 +332,7 @@
                 formData.append("Ip_address", $('#ip_address_modal').val());
                 formData.append("Ip_port", $('#ip_port_modal').val());
 
-                maps = $('#file_3d_modal')[0].files;
+                maps = $('#build_file_3d_modal')[0].files;
                 if (maps.length > 0) {
                     var file_names = maps[0].name.split(".");
 
@@ -647,8 +647,8 @@
                 var url = "/BuildInfo/SaveBuildFloor";
                 var formData = new FormData();
 
-                maps = $('#map_file_modal')[0].files
-                maps3D = $('#file_3d_modal')[0].files
+                maps = $('#floor_map_file_modal')[0].files;
+                //maps3D = $('#floor_file_3d_modal')[0].files;
 
                 formData.append("Floor_guid", selected_floor_guid);
                 formData.append("building_tag", selected_build_guid_top);
@@ -661,12 +661,12 @@
                     formData.append("InitMapName", maps[0].name.replace("." + file_names[file_names.length - 1], ""));
                 }
 
-                if(maps3D.length > 0) {
-                    var file_names = maps3D[0].name.split(".")
+                //if(maps3D.length > 0) {
+                //    var file_names = maps3D[0].name.split(".")
 
-                    formData.append("orgName_3D", maps3D[0].name.replace("." + file_names[file_names.length - 1], ""));
-                    formData.append("extName_3D", maps3D[1].name.replace("." + file_names[file_names.length - 1], ""));
-                }
+                //    formData.append("orgName_3D", file_names[0]);
+                //    formData.append("extName_3D", file_names[1]);
+                //}
 
                 $.ajax({
                     type: "POST",

Backend/Views/BuildInfo/_BuildFloor.cshtml

@@ -53,12 +53,12 @@
                             <input type="text" id="floor_name_modal" class="form-control" name="floor_name_modal">
                         </div>
                         <div class="form-group col-12">
-                            <label class="form-label" for="map_file_modal">平面圖檔(限制SVG格式)</label>
-                            <input type="file" id="map_file_modal" class="form-control" name="map_file_modal" onchange="changeImage(this)" accept="image/svg+xml">
+                            <label class="form-label" for="floor_map_file_modal">平面圖檔(限制SVG格式)</label>
+                            <input type="file" id="floor_map_file_modal" class="form-control" name="floor_map_file_modal" onchange="changeImage(this)" accept="image/svg+xml">
                         </div>
                         @*<div class="form-group col-12">
-                            <label class="form-label" for="map_file_modal">3D檔(限制SVG格式)</label>
-                            <input type="file" id="map_file_modal" class="form-control" name="map_file_modal" onchange="changeImage(this)" accept="image/svg+xml">
+                            <label class="form-label" for="floor_map_file_modal">3D檔(限制SVG格式)</label>
+                            <input type="file" id="floor_map_file_modal" class="form-control" name="floor_map_file_modal" onchange="changeImage(this)" accept="image/svg+xml">
                         </div>*@
                     </div>
                 </form>

Backend/Views/BuildInfo/_BuildInfo.cshtml

@@ -57,8 +57,8 @@
                             <input type="text" id="ip_port_modal" class="form-control" name="ip_port_modal">
                         </div>
                         <div class="form-group col-12">
-                            <label class="form-label" for="file_3d_modal">3D檔(限制SVG格式)</label>
-                            <input type="file" id="file_3d_modal" class="form-control" name="file_3d_modal" onchange="changeImage(this)" accept="image/svg+xml">
+                            <label class="form-label" for="build_file_3d_modal">3D檔(限制SVG格式)</label>
+                            <input type="file" id="build_file_3d_modal" class="form-control" name="build_file_3d_modal" onchange="changeImage(this)" accept="image/svg+xml">
                         </div>
                     </div>
                 </form>

Backend/Views/BuildMenu/Index.cshtml

@@ -767,7 +767,6 @@
             changebuild_menu_drawing_modal();
 
             GetSubList($('#build_menu_main_modal').val());
-            GetFloorInSubSystem();
             GetBuildingHas3D();
             $('#planimetric_click').attr("disabled", false);
             $('#build-menu-modal').modal();