diff --git a/public/uploadNew/forge.zip b/public/upload/forge.zip
similarity index 100%
rename from public/uploadNew/forge.zip
rename to public/upload/forge.zip
diff --git a/public/upload/forge/0.pf b/public/upload/forge/0.pf
index 3bb206f..7d35595 100644
Binary files a/public/upload/forge/0.pf and b/public/upload/forge/0.pf differ
diff --git a/public/upload/forge/0.svf b/public/upload/forge/0.svf
index 4ec2bf6..5e32284 100644
Binary files a/public/upload/forge/0.svf and b/public/upload/forge/0.svf differ
diff --git a/public/upload/forge/1.pf b/public/upload/forge/1.pf
index 6c91c08..b5ec320 100644
Binary files a/public/upload/forge/1.pf and b/public/upload/forge/1.pf differ
diff --git a/public/uploadNew/forge/1/Furnishings.Fabrics.Linen.Beige.png b/public/upload/forge/1/Furnishings.Fabrics.Linen.Beige.png
similarity index 100%
rename from public/uploadNew/forge/1/Furnishings.Fabrics.Linen.Beige.png
rename to public/upload/forge/1/Furnishings.Fabrics.Linen.Beige.png
diff --git a/public/uploadNew/forge/1/Furnishings.Fabrics.Linen.bump.png b/public/upload/forge/1/Furnishings.Fabrics.Linen.bump.png
similarity index 100%
rename from public/uploadNew/forge/1/Furnishings.Fabrics.Linen.bump.png
rename to public/upload/forge/1/Furnishings.Fabrics.Linen.bump.png
diff --git a/public/uploadNew/forge/1/Woods & Plastics.Finish Carpentry.Wood.Cherry.png b/public/upload/forge/1/Woods & Plastics.Finish Carpentry.Wood.Cherry.png
similarity index 100%
rename from public/uploadNew/forge/1/Woods & Plastics.Finish Carpentry.Wood.Cherry.png
rename to public/upload/forge/1/Woods & Plastics.Finish Carpentry.Wood.Cherry.png
diff --git a/public/uploadNew/forge/1/beechwood_mysticBrown.png b/public/upload/forge/1/beechwood_mysticBrown.png
similarity index 100%
rename from public/uploadNew/forge/1/beechwood_mysticBrown.png
rename to public/upload/forge/1/beechwood_mysticBrown.png
diff --git a/public/uploadNew/forge/1/polished_concrete_bump.jpg b/public/upload/forge/1/polished_concrete_bump.jpg
similarity index 100%
rename from public/uploadNew/forge/1/polished_concrete_bump.jpg
rename to public/upload/forge/1/polished_concrete_bump.jpg
diff --git a/public/uploadNew/forge/1/polished_concrete_color.jpg b/public/upload/forge/1/polished_concrete_color.jpg
similarity index 100%
rename from public/uploadNew/forge/1/polished_concrete_color.jpg
rename to public/upload/forge/1/polished_concrete_color.jpg
diff --git a/public/uploadNew/forge/1/polished_concrete_refl.jpg b/public/upload/forge/1/polished_concrete_refl.jpg
similarity index 100%
rename from public/uploadNew/forge/1/polished_concrete_refl.jpg
rename to public/upload/forge/1/polished_concrete_refl.jpg
diff --git a/public/uploadNew/forge/1/polished_concrete_rough.jpg b/public/upload/forge/1/polished_concrete_rough.jpg
similarity index 100%
rename from public/uploadNew/forge/1/polished_concrete_rough.jpg
rename to public/upload/forge/1/polished_concrete_rough.jpg
diff --git a/public/uploadNew/forge/1/sand_beach_large_color.jpg b/public/upload/forge/1/sand_beach_large_color.jpg
similarity index 100%
rename from public/uploadNew/forge/1/sand_beach_large_color.jpg
rename to public/upload/forge/1/sand_beach_large_color.jpg
diff --git a/public/uploadNew/forge/1/sand_beach_large_norm.jpg b/public/upload/forge/1/sand_beach_large_norm.jpg
similarity index 100%
rename from public/uploadNew/forge/1/sand_beach_large_norm.jpg
rename to public/upload/forge/1/sand_beach_large_norm.jpg
diff --git a/public/uploadNew/forge/1/sand_beach_large_refl.jpg b/public/upload/forge/1/sand_beach_large_refl.jpg
similarity index 100%
rename from public/uploadNew/forge/1/sand_beach_large_refl.jpg
rename to public/upload/forge/1/sand_beach_large_refl.jpg
diff --git a/public/uploadNew/forge/1/wood_walnut_bump.jpg b/public/upload/forge/1/wood_walnut_bump.jpg
similarity index 100%
rename from public/uploadNew/forge/1/wood_walnut_bump.jpg
rename to public/upload/forge/1/wood_walnut_bump.jpg
diff --git a/public/uploadNew/forge/1/wood_walnut_color.jpg b/public/upload/forge/1/wood_walnut_color.jpg
similarity index 100%
rename from public/uploadNew/forge/1/wood_walnut_color.jpg
rename to public/upload/forge/1/wood_walnut_color.jpg
diff --git a/public/uploadNew/forge/1/wood_walnut_rough.jpg b/public/upload/forge/1/wood_walnut_rough.jpg
similarity index 100%
rename from public/uploadNew/forge/1/wood_walnut_rough.jpg
rename to public/upload/forge/1/wood_walnut_rough.jpg
diff --git a/public/upload/forge/2.pf b/public/upload/forge/2.pf
index 927f0c5..804395c 100644
Binary files a/public/upload/forge/2.pf and b/public/upload/forge/2.pf differ
diff --git a/public/upload/forge/3.pf b/public/upload/forge/3.pf
index 4ce9257..1b50402 100644
Binary files a/public/upload/forge/3.pf and b/public/upload/forge/3.pf differ
diff --git a/public/upload/forge/4.pf b/public/upload/forge/4.pf
index 5390a30..89fdd92 100644
Binary files a/public/upload/forge/4.pf and b/public/upload/forge/4.pf differ
diff --git a/public/upload/forge/5.pf b/public/upload/forge/5.pf
index e5f32bc..0fa7617 100644
Binary files a/public/upload/forge/5.pf and b/public/upload/forge/5.pf differ
diff --git a/public/upload/forge/6.pf b/public/upload/forge/6.pf
index 127a12d..34e1285 100644
Binary files a/public/upload/forge/6.pf and b/public/upload/forge/6.pf differ
diff --git a/public/uploadNew/device_icon/9d8e1dd3-8187-46e3-8a6a-ae116210ecff.png b/public/upload/forge/9d8e1dd3-8187-46e3-8a6a-ae116210ecff.png
similarity index 100%
rename from public/uploadNew/device_icon/9d8e1dd3-8187-46e3-8a6a-ae116210ecff.png
rename to public/upload/forge/9d8e1dd3-8187-46e3-8a6a-ae116210ecff.png
diff --git a/public/upload/forge/CameraDefinitions.bin b/public/upload/forge/CameraDefinitions.bin
index 71d4171..ec35734 100644
Binary files a/public/upload/forge/CameraDefinitions.bin and b/public/upload/forge/CameraDefinitions.bin differ
diff --git a/public/upload/forge/FragmentList.pack b/public/upload/forge/FragmentList.pack
index 40ca55e..7773d00 100644
Binary files a/public/upload/forge/FragmentList.pack and b/public/upload/forge/FragmentList.pack differ
diff --git a/public/upload/forge/GeometryMetadata.pf b/public/upload/forge/GeometryMetadata.pf
index 0019450..7cf90cd 100644
Binary files a/public/upload/forge/GeometryMetadata.pf and b/public/upload/forge/GeometryMetadata.pf differ
diff --git a/public/upload/forge/InstanceTree.bin b/public/upload/forge/InstanceTree.bin
index bc492aa..ce6ded5 100644
Binary files a/public/upload/forge/InstanceTree.bin and b/public/upload/forge/InstanceTree.bin differ
diff --git a/public/upload/forge/Materials.json.gz b/public/upload/forge/Materials.json.gz
index 2746037..26c12e5 100644
Binary files a/public/upload/forge/Materials.json.gz and b/public/upload/forge/Materials.json.gz differ
diff --git a/public/uploadNew/forge/OverrideSets.bin b/public/upload/forge/OverrideSets.bin
similarity index 100%
rename from public/uploadNew/forge/OverrideSets.bin
rename to public/upload/forge/OverrideSets.bin
diff --git a/public/upload/forge/ProteinMaterials.json.gz b/public/upload/forge/ProteinMaterials.json.gz
index bf3cfe3..664b1aa 100644
Binary files a/public/upload/forge/ProteinMaterials.json.gz and b/public/upload/forge/ProteinMaterials.json.gz differ
diff --git a/public/upload/forge/ViewpointTree.bin b/public/upload/forge/ViewpointTree.bin
index 7f6d4e5..b303d88 100644
Binary files a/public/upload/forge/ViewpointTree.bin and b/public/upload/forge/ViewpointTree.bin differ
diff --git a/public/uploadNew/forge/Viewpoints.bin b/public/upload/forge/Viewpoints.bin
similarity index 100%
rename from public/uploadNew/forge/Viewpoints.bin
rename to public/upload/forge/Viewpoints.bin
diff --git a/public/upload/forge/objects_attrs.json.gz b/public/upload/forge/objects_attrs.json.gz
index fda2785..caf85e7 100644
Binary files a/public/upload/forge/objects_attrs.json.gz and b/public/upload/forge/objects_attrs.json.gz differ
diff --git a/public/upload/forge/objects_avs.json.gz b/public/upload/forge/objects_avs.json.gz
index 5ca584e..53160cf 100644
Binary files a/public/upload/forge/objects_avs.json.gz and b/public/upload/forge/objects_avs.json.gz differ
diff --git a/public/upload/forge/objects_ids.json.gz b/public/upload/forge/objects_ids.json.gz
index 2e890fa..788fa97 100644
Binary files a/public/upload/forge/objects_ids.json.gz and b/public/upload/forge/objects_ids.json.gz differ
diff --git a/public/upload/forge/objects_offs.json.gz b/public/upload/forge/objects_offs.json.gz
index e0f2870..2d2a718 100644
Binary files a/public/upload/forge/objects_offs.json.gz and b/public/upload/forge/objects_offs.json.gz differ
diff --git a/public/upload/forge/objects_vals.json.gz b/public/upload/forge/objects_vals.json.gz
index 1ea982d..938164c 100644
Binary files a/public/upload/forge/objects_vals.json.gz and b/public/upload/forge/objects_vals.json.gz differ
diff --git a/public/upload/forge/objects_viewables.json.gz b/public/upload/forge/objects_viewables.json.gz
index 98f8f2d..a573584 100644
Binary files a/public/upload/forge/objects_viewables.json.gz and b/public/upload/forge/objects_viewables.json.gz differ
diff --git a/public/uploadNew/forge/0.pf b/public/uploadNew/forge/0.pf
deleted file mode 100644
index 7d35595..0000000
Binary files a/public/uploadNew/forge/0.pf and /dev/null differ
diff --git a/public/uploadNew/forge/0.svf b/public/uploadNew/forge/0.svf
deleted file mode 100644
index 5e32284..0000000
Binary files a/public/uploadNew/forge/0.svf and /dev/null differ
diff --git a/public/uploadNew/forge/1.pf b/public/uploadNew/forge/1.pf
deleted file mode 100644
index b5ec320..0000000
Binary files a/public/uploadNew/forge/1.pf and /dev/null differ
diff --git a/public/uploadNew/forge/2.pf b/public/uploadNew/forge/2.pf
deleted file mode 100644
index 804395c..0000000
Binary files a/public/uploadNew/forge/2.pf and /dev/null differ
diff --git a/public/uploadNew/forge/3.pf b/public/uploadNew/forge/3.pf
deleted file mode 100644
index 1b50402..0000000
Binary files a/public/uploadNew/forge/3.pf and /dev/null differ
diff --git a/public/uploadNew/forge/4.pf b/public/uploadNew/forge/4.pf
deleted file mode 100644
index 89fdd92..0000000
Binary files a/public/uploadNew/forge/4.pf and /dev/null differ
diff --git a/public/uploadNew/forge/5.pf b/public/uploadNew/forge/5.pf
deleted file mode 100644
index 0fa7617..0000000
Binary files a/public/uploadNew/forge/5.pf and /dev/null differ
diff --git a/public/uploadNew/forge/6.pf b/public/uploadNew/forge/6.pf
deleted file mode 100644
index 34e1285..0000000
Binary files a/public/uploadNew/forge/6.pf and /dev/null differ
diff --git a/public/uploadNew/forge/CameraDefinitions.bin b/public/uploadNew/forge/CameraDefinitions.bin
deleted file mode 100644
index ec35734..0000000
Binary files a/public/uploadNew/forge/CameraDefinitions.bin and /dev/null differ
diff --git a/public/uploadNew/forge/FragmentList.pack b/public/uploadNew/forge/FragmentList.pack
deleted file mode 100644
index 7773d00..0000000
Binary files a/public/uploadNew/forge/FragmentList.pack and /dev/null differ
diff --git a/public/uploadNew/forge/GeometryMetadata.pf b/public/uploadNew/forge/GeometryMetadata.pf
deleted file mode 100644
index 7cf90cd..0000000
Binary files a/public/uploadNew/forge/GeometryMetadata.pf and /dev/null differ
diff --git a/public/uploadNew/forge/InstanceTree.bin b/public/uploadNew/forge/InstanceTree.bin
deleted file mode 100644
index ce6ded5..0000000
Binary files a/public/uploadNew/forge/InstanceTree.bin and /dev/null differ
diff --git a/public/uploadNew/forge/Materials.json.gz b/public/uploadNew/forge/Materials.json.gz
deleted file mode 100644
index 26c12e5..0000000
Binary files a/public/uploadNew/forge/Materials.json.gz and /dev/null differ
diff --git a/public/uploadNew/forge/ProteinMaterials.json.gz b/public/uploadNew/forge/ProteinMaterials.json.gz
deleted file mode 100644
index 664b1aa..0000000
Binary files a/public/uploadNew/forge/ProteinMaterials.json.gz and /dev/null differ
diff --git a/public/uploadNew/forge/ViewpointTree.bin b/public/uploadNew/forge/ViewpointTree.bin
deleted file mode 100644
index b303d88..0000000
Binary files a/public/uploadNew/forge/ViewpointTree.bin and /dev/null differ
diff --git a/public/uploadNew/forge/objects_attrs.json.gz b/public/uploadNew/forge/objects_attrs.json.gz
deleted file mode 100644
index caf85e7..0000000
Binary files a/public/uploadNew/forge/objects_attrs.json.gz and /dev/null differ
diff --git a/public/uploadNew/forge/objects_avs.json.gz b/public/uploadNew/forge/objects_avs.json.gz
deleted file mode 100644
index 53160cf..0000000
Binary files a/public/uploadNew/forge/objects_avs.json.gz and /dev/null differ
diff --git a/public/uploadNew/forge/objects_ids.json.gz b/public/uploadNew/forge/objects_ids.json.gz
deleted file mode 100644
index 788fa97..0000000
Binary files a/public/uploadNew/forge/objects_ids.json.gz and /dev/null differ
diff --git a/public/uploadNew/forge/objects_offs.json.gz b/public/uploadNew/forge/objects_offs.json.gz
deleted file mode 100644
index 2d2a718..0000000
Binary files a/public/uploadNew/forge/objects_offs.json.gz and /dev/null differ
diff --git a/public/uploadNew/forge/objects_vals.json.gz b/public/uploadNew/forge/objects_vals.json.gz
deleted file mode 100644
index 938164c..0000000
Binary files a/public/uploadNew/forge/objects_vals.json.gz and /dev/null differ
diff --git a/public/uploadNew/forge/objects_viewables.json.gz b/public/uploadNew/forge/objects_viewables.json.gz
deleted file mode 100644
index a573584..0000000
Binary files a/public/uploadNew/forge/objects_viewables.json.gz and /dev/null differ
diff --git a/public/uploadNew/device_icon/3454f5e0-3afa-4ace-ae54-a68bf7183e7d.png b/public/uploadOld/device_icon/3454f5e0-3afa-4ace-ae54-a68bf7183e7d.png
similarity index 100%
rename from public/uploadNew/device_icon/3454f5e0-3afa-4ace-ae54-a68bf7183e7d.png
rename to public/uploadOld/device_icon/3454f5e0-3afa-4ace-ae54-a68bf7183e7d.png
diff --git a/public/uploadNew/device_icon/3748fbec-136d-4042-b2c7-5e466341afb2.png b/public/uploadOld/device_icon/3748fbec-136d-4042-b2c7-5e466341afb2.png
similarity index 100%
rename from public/uploadNew/device_icon/3748fbec-136d-4042-b2c7-5e466341afb2.png
rename to public/uploadOld/device_icon/3748fbec-136d-4042-b2c7-5e466341afb2.png
diff --git a/public/uploadNew/device_icon/38a134e4-51d0-4b68-b3ad-5a8eddd069b5.png b/public/uploadOld/device_icon/38a134e4-51d0-4b68-b3ad-5a8eddd069b5.png
similarity index 100%
rename from public/uploadNew/device_icon/38a134e4-51d0-4b68-b3ad-5a8eddd069b5.png
rename to public/uploadOld/device_icon/38a134e4-51d0-4b68-b3ad-5a8eddd069b5.png
diff --git a/public/uploadNew/device_icon/83deea51-a97e-4757-ba15-5cd94cb25929.png b/public/uploadOld/device_icon/83deea51-a97e-4757-ba15-5cd94cb25929.png
similarity index 100%
rename from public/uploadNew/device_icon/83deea51-a97e-4757-ba15-5cd94cb25929.png
rename to public/uploadOld/device_icon/83deea51-a97e-4757-ba15-5cd94cb25929.png
diff --git a/public/uploadNew/device_icon/9052922b-deff-4ecf-bcf5-b4782f0bdf8a.png b/public/uploadOld/device_icon/9052922b-deff-4ecf-bcf5-b4782f0bdf8a.png
similarity index 100%
rename from public/uploadNew/device_icon/9052922b-deff-4ecf-bcf5-b4782f0bdf8a.png
rename to public/uploadOld/device_icon/9052922b-deff-4ecf-bcf5-b4782f0bdf8a.png
diff --git a/public/uploadNew/device_icon/991f185f-31f2-4ef5-8453-4f2ac3800d52.png b/public/uploadOld/device_icon/991f185f-31f2-4ef5-8453-4f2ac3800d52.png
similarity index 100%
rename from public/uploadNew/device_icon/991f185f-31f2-4ef5-8453-4f2ac3800d52.png
rename to public/uploadOld/device_icon/991f185f-31f2-4ef5-8453-4f2ac3800d52.png
diff --git a/public/uploadNew/forge/9d8e1dd3-8187-46e3-8a6a-ae116210ecff.png b/public/uploadOld/device_icon/9d8e1dd3-8187-46e3-8a6a-ae116210ecff.png
similarity index 100%
rename from public/uploadNew/forge/9d8e1dd3-8187-46e3-8a6a-ae116210ecff.png
rename to public/uploadOld/device_icon/9d8e1dd3-8187-46e3-8a6a-ae116210ecff.png
diff --git a/public/uploadNew/device_icon/fc6ae617-8342-4d20-884f-b80f89260b78.png b/public/uploadOld/device_icon/fc6ae617-8342-4d20-884f-b80f89260b78.png
similarity index 100%
rename from public/uploadNew/device_icon/fc6ae617-8342-4d20-884f-b80f89260b78.png
rename to public/uploadOld/device_icon/fc6ae617-8342-4d20-884f-b80f89260b78.png
diff --git a/public/uploadNew/device_icon/fe425dbc-0e8a-4247-a8cd-9c3474522f1c.png b/public/uploadOld/device_icon/fe425dbc-0e8a-4247-a8cd-9c3474522f1c.png
similarity index 100%
rename from public/uploadNew/device_icon/fe425dbc-0e8a-4247-a8cd-9c3474522f1c.png
rename to public/uploadOld/device_icon/fe425dbc-0e8a-4247-a8cd-9c3474522f1c.png
diff --git a/public/uploadNew/floor_map/044e6229-722c-4aa2-85aa-f9138cb0da7d.svg b/public/uploadOld/floor_map/044e6229-722c-4aa2-85aa-f9138cb0da7d.svg
similarity index 100%
rename from public/uploadNew/floor_map/044e6229-722c-4aa2-85aa-f9138cb0da7d.svg
rename to public/uploadOld/floor_map/044e6229-722c-4aa2-85aa-f9138cb0da7d.svg
diff --git a/public/uploadNew/floor_map/0dd016a7-9a18-4ac3-8fbf-d32180f3533e.svg b/public/uploadOld/floor_map/0dd016a7-9a18-4ac3-8fbf-d32180f3533e.svg
similarity index 100%
rename from public/uploadNew/floor_map/0dd016a7-9a18-4ac3-8fbf-d32180f3533e.svg
rename to public/uploadOld/floor_map/0dd016a7-9a18-4ac3-8fbf-d32180f3533e.svg
diff --git a/public/uploadNew/floor_map/27638680-6540-431b-867f-4069a1ab5760.svg b/public/uploadOld/floor_map/27638680-6540-431b-867f-4069a1ab5760.svg
similarity index 100%
rename from public/uploadNew/floor_map/27638680-6540-431b-867f-4069a1ab5760.svg
rename to public/uploadOld/floor_map/27638680-6540-431b-867f-4069a1ab5760.svg
diff --git a/public/uploadNew/floor_map/2dc07cc9-4003-49b5-9489-d01483daccb3.svg b/public/uploadOld/floor_map/2dc07cc9-4003-49b5-9489-d01483daccb3.svg
similarity index 100%
rename from public/uploadNew/floor_map/2dc07cc9-4003-49b5-9489-d01483daccb3.svg
rename to public/uploadOld/floor_map/2dc07cc9-4003-49b5-9489-d01483daccb3.svg
diff --git a/public/uploadNew/floor_map/36f4a351-13fe-49f9-bfa5-a35dab00941f.svg b/public/uploadOld/floor_map/36f4a351-13fe-49f9-bfa5-a35dab00941f.svg
similarity index 100%
rename from public/uploadNew/floor_map/36f4a351-13fe-49f9-bfa5-a35dab00941f.svg
rename to public/uploadOld/floor_map/36f4a351-13fe-49f9-bfa5-a35dab00941f.svg
diff --git a/public/uploadNew/floor_map/388aa454-20af-42d4-b40f-476eea0699ff.svg b/public/uploadOld/floor_map/388aa454-20af-42d4-b40f-476eea0699ff.svg
similarity index 100%
rename from public/uploadNew/floor_map/388aa454-20af-42d4-b40f-476eea0699ff.svg
rename to public/uploadOld/floor_map/388aa454-20af-42d4-b40f-476eea0699ff.svg
diff --git a/public/uploadNew/floor_map/39fa08dc-718d-4d99-a13a-a153c5dd64fb.svg b/public/uploadOld/floor_map/39fa08dc-718d-4d99-a13a-a153c5dd64fb.svg
similarity index 100%
rename from public/uploadNew/floor_map/39fa08dc-718d-4d99-a13a-a153c5dd64fb.svg
rename to public/uploadOld/floor_map/39fa08dc-718d-4d99-a13a-a153c5dd64fb.svg
diff --git a/public/uploadNew/floor_map/5440fb9e-2f17-40ab-a715-f8a3cd5beace.svg b/public/uploadOld/floor_map/5440fb9e-2f17-40ab-a715-f8a3cd5beace.svg
similarity index 100%
rename from public/uploadNew/floor_map/5440fb9e-2f17-40ab-a715-f8a3cd5beace.svg
rename to public/uploadOld/floor_map/5440fb9e-2f17-40ab-a715-f8a3cd5beace.svg
diff --git a/public/uploadNew/floor_map/5537d7bf-aab7-4d39-b31f-6cd5650aacf3.svg b/public/uploadOld/floor_map/5537d7bf-aab7-4d39-b31f-6cd5650aacf3.svg
similarity index 100%
rename from public/uploadNew/floor_map/5537d7bf-aab7-4d39-b31f-6cd5650aacf3.svg
rename to public/uploadOld/floor_map/5537d7bf-aab7-4d39-b31f-6cd5650aacf3.svg
diff --git a/public/uploadNew/floor_map/583fcb32-34be-4474-916f-15015b0834a8.svg b/public/uploadOld/floor_map/583fcb32-34be-4474-916f-15015b0834a8.svg
similarity index 100%
rename from public/uploadNew/floor_map/583fcb32-34be-4474-916f-15015b0834a8.svg
rename to public/uploadOld/floor_map/583fcb32-34be-4474-916f-15015b0834a8.svg
diff --git a/public/uploadNew/floor_map/584f4b35-f59f-4684-8edf-9d40f787d125.svg b/public/uploadOld/floor_map/584f4b35-f59f-4684-8edf-9d40f787d125.svg
similarity index 100%
rename from public/uploadNew/floor_map/584f4b35-f59f-4684-8edf-9d40f787d125.svg
rename to public/uploadOld/floor_map/584f4b35-f59f-4684-8edf-9d40f787d125.svg
diff --git a/public/uploadNew/floor_map/5cf3c8da-a5b4-42da-8b1a-14d5a44a0456.svg b/public/uploadOld/floor_map/5cf3c8da-a5b4-42da-8b1a-14d5a44a0456.svg
similarity index 100%
rename from public/uploadNew/floor_map/5cf3c8da-a5b4-42da-8b1a-14d5a44a0456.svg
rename to public/uploadOld/floor_map/5cf3c8da-a5b4-42da-8b1a-14d5a44a0456.svg
diff --git a/public/uploadNew/floor_map/73326592-3fe4-4d26-b245-110b5c52ed4c.svg b/public/uploadOld/floor_map/73326592-3fe4-4d26-b245-110b5c52ed4c.svg
similarity index 100%
rename from public/uploadNew/floor_map/73326592-3fe4-4d26-b245-110b5c52ed4c.svg
rename to public/uploadOld/floor_map/73326592-3fe4-4d26-b245-110b5c52ed4c.svg
diff --git a/public/uploadNew/floor_map/7ca8a3c8-4873-4882-a880-d0c73e5ec31f.svg b/public/uploadOld/floor_map/7ca8a3c8-4873-4882-a880-d0c73e5ec31f.svg
similarity index 100%
rename from public/uploadNew/floor_map/7ca8a3c8-4873-4882-a880-d0c73e5ec31f.svg
rename to public/uploadOld/floor_map/7ca8a3c8-4873-4882-a880-d0c73e5ec31f.svg
diff --git a/public/uploadNew/floor_map/7cdaaecd-23a4-47b5-ae78-d51f4da55eb0.pdf b/public/uploadOld/floor_map/7cdaaecd-23a4-47b5-ae78-d51f4da55eb0.pdf
similarity index 100%
rename from public/uploadNew/floor_map/7cdaaecd-23a4-47b5-ae78-d51f4da55eb0.pdf
rename to public/uploadOld/floor_map/7cdaaecd-23a4-47b5-ae78-d51f4da55eb0.pdf
diff --git a/public/uploadNew/floor_map/85e7d4b3-9570-4149-95d4-3739c00cee6a.svg b/public/uploadOld/floor_map/85e7d4b3-9570-4149-95d4-3739c00cee6a.svg
similarity index 100%
rename from public/uploadNew/floor_map/85e7d4b3-9570-4149-95d4-3739c00cee6a.svg
rename to public/uploadOld/floor_map/85e7d4b3-9570-4149-95d4-3739c00cee6a.svg
diff --git a/public/uploadNew/floor_map/996b9efa-9d88-4616-a290-2f8871403c0d.svg b/public/uploadOld/floor_map/996b9efa-9d88-4616-a290-2f8871403c0d.svg
similarity index 100%
rename from public/uploadNew/floor_map/996b9efa-9d88-4616-a290-2f8871403c0d.svg
rename to public/uploadOld/floor_map/996b9efa-9d88-4616-a290-2f8871403c0d.svg
diff --git a/public/uploadNew/floor_map/99adc40c-bb48-4b84-8ee9-fd52e66d0151.svg b/public/uploadOld/floor_map/99adc40c-bb48-4b84-8ee9-fd52e66d0151.svg
similarity index 100%
rename from public/uploadNew/floor_map/99adc40c-bb48-4b84-8ee9-fd52e66d0151.svg
rename to public/uploadOld/floor_map/99adc40c-bb48-4b84-8ee9-fd52e66d0151.svg
diff --git a/public/uploadNew/floor_map/9fb73b60-4f46-4398-884e-ba0573a3b55c.svg b/public/uploadOld/floor_map/9fb73b60-4f46-4398-884e-ba0573a3b55c.svg
similarity index 100%
rename from public/uploadNew/floor_map/9fb73b60-4f46-4398-884e-ba0573a3b55c.svg
rename to public/uploadOld/floor_map/9fb73b60-4f46-4398-884e-ba0573a3b55c.svg
diff --git a/public/uploadNew/floor_map/ae0e0958-4a91-4d9c-bf38-999563be5776.svg b/public/uploadOld/floor_map/ae0e0958-4a91-4d9c-bf38-999563be5776.svg
similarity index 100%
rename from public/uploadNew/floor_map/ae0e0958-4a91-4d9c-bf38-999563be5776.svg
rename to public/uploadOld/floor_map/ae0e0958-4a91-4d9c-bf38-999563be5776.svg
diff --git a/public/uploadNew/floor_map/b1db4956-ba78-4c03-a493-0627cae21c36.svg b/public/uploadOld/floor_map/b1db4956-ba78-4c03-a493-0627cae21c36.svg
similarity index 100%
rename from public/uploadNew/floor_map/b1db4956-ba78-4c03-a493-0627cae21c36.svg
rename to public/uploadOld/floor_map/b1db4956-ba78-4c03-a493-0627cae21c36.svg
diff --git a/public/uploadNew/floor_map/c68242bd-61a6-4751-a9a1-e915e2d7113d.svg b/public/uploadOld/floor_map/c68242bd-61a6-4751-a9a1-e915e2d7113d.svg
similarity index 100%
rename from public/uploadNew/floor_map/c68242bd-61a6-4751-a9a1-e915e2d7113d.svg
rename to public/uploadOld/floor_map/c68242bd-61a6-4751-a9a1-e915e2d7113d.svg
diff --git a/public/uploadNew/floor_map/cfd24e30-a216-4032-b27e-03d936cfe715.svg b/public/uploadOld/floor_map/cfd24e30-a216-4032-b27e-03d936cfe715.svg
similarity index 100%
rename from public/uploadNew/floor_map/cfd24e30-a216-4032-b27e-03d936cfe715.svg
rename to public/uploadOld/floor_map/cfd24e30-a216-4032-b27e-03d936cfe715.svg
diff --git a/public/uploadNew/floor_map/d5414550-e598-46db-856d-811580ea75ef.svg b/public/uploadOld/floor_map/d5414550-e598-46db-856d-811580ea75ef.svg
similarity index 100%
rename from public/uploadNew/floor_map/d5414550-e598-46db-856d-811580ea75ef.svg
rename to public/uploadOld/floor_map/d5414550-e598-46db-856d-811580ea75ef.svg
diff --git a/public/uploadNew/floor_map/d564e6ae-2752-4723-b020-d9aa1bd53bba.svg b/public/uploadOld/floor_map/d564e6ae-2752-4723-b020-d9aa1bd53bba.svg
similarity index 100%
rename from public/uploadNew/floor_map/d564e6ae-2752-4723-b020-d9aa1bd53bba.svg
rename to public/uploadOld/floor_map/d564e6ae-2752-4723-b020-d9aa1bd53bba.svg
diff --git a/public/uploadNew/floor_map/df0e59cf-e7e5-4744-b2aa-2e2745cffbcc.svg b/public/uploadOld/floor_map/df0e59cf-e7e5-4744-b2aa-2e2745cffbcc.svg
similarity index 100%
rename from public/uploadNew/floor_map/df0e59cf-e7e5-4744-b2aa-2e2745cffbcc.svg
rename to public/uploadOld/floor_map/df0e59cf-e7e5-4744-b2aa-2e2745cffbcc.svg
diff --git a/public/uploadNew/floor_map/df788c40-db50-40d3-838c-14817db2e715.svg b/public/uploadOld/floor_map/df788c40-db50-40d3-838c-14817db2e715.svg
similarity index 100%
rename from public/uploadNew/floor_map/df788c40-db50-40d3-838c-14817db2e715.svg
rename to public/uploadOld/floor_map/df788c40-db50-40d3-838c-14817db2e715.svg
diff --git a/public/uploadNew/floor_map/f0558a72-1701-46dd-9937-ea3368a85557.svg b/public/uploadOld/floor_map/f0558a72-1701-46dd-9937-ea3368a85557.svg
similarity index 100%
rename from public/uploadNew/floor_map/f0558a72-1701-46dd-9937-ea3368a85557.svg
rename to public/uploadOld/floor_map/f0558a72-1701-46dd-9937-ea3368a85557.svg
diff --git a/public/uploadNew/floor_map/f5e5215b-d689-4d25-9c95-421964040bf8.svg b/public/uploadOld/floor_map/f5e5215b-d689-4d25-9c95-421964040bf8.svg
similarity index 100%
rename from public/uploadNew/floor_map/f5e5215b-d689-4d25-9c95-421964040bf8.svg
rename to public/uploadOld/floor_map/f5e5215b-d689-4d25-9c95-421964040bf8.svg
diff --git a/public/uploadNew/floor_map/f857c6a3-47db-45b1-972e-35d9c2b30601.svg b/public/uploadOld/floor_map/f857c6a3-47db-45b1-972e-35d9c2b30601.svg
similarity index 100%
rename from public/uploadNew/floor_map/f857c6a3-47db-45b1-972e-35d9c2b30601.svg
rename to public/uploadOld/floor_map/f857c6a3-47db-45b1-972e-35d9c2b30601.svg
diff --git a/public/uploadNew/floor_map/ffbcd71c-1c3e-4c19-9b18-d0f961457f1f.svg b/public/uploadOld/floor_map/ffbcd71c-1c3e-4c19-9b18-d0f961457f1f.svg
similarity index 100%
rename from public/uploadNew/floor_map/ffbcd71c-1c3e-4c19-9b18-d0f961457f1f.svg
rename to public/uploadOld/floor_map/ffbcd71c-1c3e-4c19-9b18-d0f961457f1f.svg
diff --git a/public/uploadOld/forge/0.pf b/public/uploadOld/forge/0.pf
new file mode 100644
index 0000000..3bb206f
Binary files /dev/null and b/public/uploadOld/forge/0.pf differ
diff --git a/public/uploadOld/forge/0.svf b/public/uploadOld/forge/0.svf
new file mode 100644
index 0000000..4ec2bf6
Binary files /dev/null and b/public/uploadOld/forge/0.svf differ
diff --git a/public/uploadOld/forge/1.pf b/public/uploadOld/forge/1.pf
new file mode 100644
index 0000000..6c91c08
Binary files /dev/null and b/public/uploadOld/forge/1.pf differ
diff --git a/public/uploadNew/forge/1/asphalt_uniform_color_dark.jpg b/public/uploadOld/forge/1/asphalt_uniform_color_dark.jpg
similarity index 100%
rename from public/uploadNew/forge/1/asphalt_uniform_color_dark.jpg
rename to public/uploadOld/forge/1/asphalt_uniform_color_dark.jpg
diff --git a/public/uploadNew/forge/1/asphalt_uniform_color_light.jpg b/public/uploadOld/forge/1/asphalt_uniform_color_light.jpg
similarity index 100%
rename from public/uploadNew/forge/1/asphalt_uniform_color_light.jpg
rename to public/uploadOld/forge/1/asphalt_uniform_color_light.jpg
diff --git a/public/uploadNew/forge/1/asphalt_uniform_rough.jpg b/public/uploadOld/forge/1/asphalt_uniform_rough.jpg
similarity index 100%
rename from public/uploadNew/forge/1/asphalt_uniform_rough.jpg
rename to public/uploadOld/forge/1/asphalt_uniform_rough.jpg
diff --git a/public/uploadNew/forge/1/concrete_walkway_bump.jpg b/public/uploadOld/forge/1/concrete_walkway_bump.jpg
similarity index 100%
rename from public/uploadNew/forge/1/concrete_walkway_bump.jpg
rename to public/uploadOld/forge/1/concrete_walkway_bump.jpg
diff --git a/public/uploadNew/forge/1/concrete_walkway_color.jpg b/public/uploadOld/forge/1/concrete_walkway_color.jpg
similarity index 100%
rename from public/uploadNew/forge/1/concrete_walkway_color.jpg
rename to public/uploadOld/forge/1/concrete_walkway_color.jpg
diff --git a/public/uploadNew/forge/1/concrete_walkway_refl.jpg b/public/uploadOld/forge/1/concrete_walkway_refl.jpg
similarity index 100%
rename from public/uploadNew/forge/1/concrete_walkway_refl.jpg
rename to public/uploadOld/forge/1/concrete_walkway_refl.jpg
diff --git a/public/uploadNew/forge/1/concrete_walkway_rough.jpg b/public/uploadOld/forge/1/concrete_walkway_rough.jpg
similarity index 100%
rename from public/uploadNew/forge/1/concrete_walkway_rough.jpg
rename to public/uploadOld/forge/1/concrete_walkway_rough.jpg
diff --git a/public/uploadNew/forge/1/granite_base_bump.jpg b/public/uploadOld/forge/1/granite_base_bump.jpg
similarity index 100%
rename from public/uploadNew/forge/1/granite_base_bump.jpg
rename to public/uploadOld/forge/1/granite_base_bump.jpg
diff --git a/public/uploadNew/forge/1/granite_base_color.jpg b/public/uploadOld/forge/1/granite_base_color.jpg
similarity index 100%
rename from public/uploadNew/forge/1/granite_base_color.jpg
rename to public/uploadOld/forge/1/granite_base_color.jpg
diff --git a/public/uploadNew/forge/1/granite_base_refl.jpg b/public/uploadOld/forge/1/granite_base_refl.jpg
similarity index 100%
rename from public/uploadNew/forge/1/granite_base_refl.jpg
rename to public/uploadOld/forge/1/granite_base_refl.jpg
diff --git a/public/uploadNew/forge/1/granite_base_specks_mask.jpg b/public/uploadOld/forge/1/granite_base_specks_mask.jpg
similarity index 100%
rename from public/uploadNew/forge/1/granite_base_specks_mask.jpg
rename to public/uploadOld/forge/1/granite_base_specks_mask.jpg
diff --git a/public/uploadNew/forge/1/granite_base_specks_norm.jpg b/public/uploadOld/forge/1/granite_base_specks_norm.jpg
similarity index 100%
rename from public/uploadNew/forge/1/granite_base_specks_norm.jpg
rename to public/uploadOld/forge/1/granite_base_specks_norm.jpg
diff --git a/public/uploadNew/forge/1/granite_blue_pearl_color.jpg b/public/uploadOld/forge/1/granite_blue_pearl_color.jpg
similarity index 100%
rename from public/uploadNew/forge/1/granite_blue_pearl_color.jpg
rename to public/uploadOld/forge/1/granite_blue_pearl_color.jpg
diff --git a/public/uploadNew/forge/1/granite_blue_pearl_refl.jpg b/public/uploadOld/forge/1/granite_blue_pearl_refl.jpg
similarity index 100%
rename from public/uploadNew/forge/1/granite_blue_pearl_refl.jpg
rename to public/uploadOld/forge/1/granite_blue_pearl_refl.jpg
diff --git a/public/uploadNew/forge/1/granite_blue_pearl_rough.jpg b/public/uploadOld/forge/1/granite_blue_pearl_rough.jpg
similarity index 100%
rename from public/uploadNew/forge/1/granite_blue_pearl_rough.jpg
rename to public/uploadOld/forge/1/granite_blue_pearl_rough.jpg
diff --git a/public/uploadNew/forge/1/granite_blue_pearl_specks_mask.jpg b/public/uploadOld/forge/1/granite_blue_pearl_specks_mask.jpg
similarity index 100%
rename from public/uploadNew/forge/1/granite_blue_pearl_specks_mask.jpg
rename to public/uploadOld/forge/1/granite_blue_pearl_specks_mask.jpg
diff --git a/public/uploadNew/forge/1/granite_red_color.jpg b/public/uploadOld/forge/1/granite_red_color.jpg
similarity index 100%
rename from public/uploadNew/forge/1/granite_red_color.jpg
rename to public/uploadOld/forge/1/granite_red_color.jpg
diff --git a/public/uploadNew/forge/1/granite_red_refl.jpg b/public/uploadOld/forge/1/granite_red_refl.jpg
similarity index 100%
rename from public/uploadNew/forge/1/granite_red_refl.jpg
rename to public/uploadOld/forge/1/granite_red_refl.jpg
diff --git a/public/uploadNew/forge/1/granite_red_rough.jpg b/public/uploadOld/forge/1/granite_red_rough.jpg
similarity index 100%
rename from public/uploadNew/forge/1/granite_red_rough.jpg
rename to public/uploadOld/forge/1/granite_red_rough.jpg
diff --git a/public/uploadNew/forge/1/granite_red_specks_mask.jpg b/public/uploadOld/forge/1/granite_red_specks_mask.jpg
similarity index 100%
rename from public/uploadNew/forge/1/granite_red_specks_mask.jpg
rename to public/uploadOld/forge/1/granite_red_specks_mask.jpg
diff --git a/public/uploadNew/forge/1/granite_specks_bump.jpg b/public/uploadOld/forge/1/granite_specks_bump.jpg
similarity index 100%
rename from public/uploadNew/forge/1/granite_specks_bump.jpg
rename to public/uploadOld/forge/1/granite_specks_bump.jpg
diff --git a/public/uploadNew/forge/1/grass_high_quality_color.jpg b/public/uploadOld/forge/1/grass_high_quality_color.jpg
similarity index 100%
rename from public/uploadNew/forge/1/grass_high_quality_color.jpg
rename to public/uploadOld/forge/1/grass_high_quality_color.jpg
diff --git a/public/uploadNew/forge/1/grass_high_quality_refl.jpg b/public/uploadOld/forge/1/grass_high_quality_refl.jpg
similarity index 100%
rename from public/uploadNew/forge/1/grass_high_quality_refl.jpg
rename to public/uploadOld/forge/1/grass_high_quality_refl.jpg
diff --git a/public/uploadNew/forge/1/quartz_rust_brown_color.jpg b/public/uploadOld/forge/1/quartz_rust_brown_color.jpg
similarity index 100%
rename from public/uploadNew/forge/1/quartz_rust_brown_color.jpg
rename to public/uploadOld/forge/1/quartz_rust_brown_color.jpg
diff --git a/public/uploadNew/forge/1/quartz_rust_brown_refl.jpg b/public/uploadOld/forge/1/quartz_rust_brown_refl.jpg
similarity index 100%
rename from public/uploadNew/forge/1/quartz_rust_brown_refl.jpg
rename to public/uploadOld/forge/1/quartz_rust_brown_refl.jpg
diff --git a/public/uploadNew/forge/1/quartz_rust_brown_rough.jpg b/public/uploadOld/forge/1/quartz_rust_brown_rough.jpg
similarity index 100%
rename from public/uploadNew/forge/1/quartz_rust_brown_rough.jpg
rename to public/uploadOld/forge/1/quartz_rust_brown_rough.jpg
diff --git a/public/uploadNew/forge/1/solid_desert_sand_color.jpg b/public/uploadOld/forge/1/solid_desert_sand_color.jpg
similarity index 100%
rename from public/uploadNew/forge/1/solid_desert_sand_color.jpg
rename to public/uploadOld/forge/1/solid_desert_sand_color.jpg
diff --git a/public/uploadNew/forge/1/solid_desert_sand_refl.jpg b/public/uploadOld/forge/1/solid_desert_sand_refl.jpg
similarity index 100%
rename from public/uploadNew/forge/1/solid_desert_sand_refl.jpg
rename to public/uploadOld/forge/1/solid_desert_sand_refl.jpg
diff --git a/public/uploadNew/forge/1/solid_desert_sand_rough.jpg b/public/uploadOld/forge/1/solid_desert_sand_rough.jpg
similarity index 100%
rename from public/uploadNew/forge/1/solid_desert_sand_rough.jpg
rename to public/uploadOld/forge/1/solid_desert_sand_rough.jpg
diff --git a/public/uploadNew/forge/1/texture_orangepeel_height.png b/public/uploadOld/forge/1/texture_orangepeel_height.png
similarity index 100%
rename from public/uploadNew/forge/1/texture_orangepeel_height.png
rename to public/uploadOld/forge/1/texture_orangepeel_height.png
diff --git a/public/uploadNew/forge/1/texture_rough_height.png b/public/uploadOld/forge/1/texture_rough_height.png
similarity index 100%
rename from public/uploadNew/forge/1/texture_rough_height.png
rename to public/uploadOld/forge/1/texture_rough_height.png
diff --git a/public/uploadNew/forge/1/texture_rough_rough.png b/public/uploadOld/forge/1/texture_rough_rough.png
similarity index 100%
rename from public/uploadNew/forge/1/texture_rough_rough.png
rename to public/uploadOld/forge/1/texture_rough_rough.png
diff --git a/public/uploadNew/forge/1/texture_rough_smooth_rough.png b/public/uploadOld/forge/1/texture_rough_smooth_rough.png
similarity index 100%
rename from public/uploadNew/forge/1/texture_rough_smooth_rough.png
rename to public/uploadOld/forge/1/texture_rough_smooth_rough.png
diff --git a/public/uploadOld/forge/2.pf b/public/uploadOld/forge/2.pf
new file mode 100644
index 0000000..927f0c5
Binary files /dev/null and b/public/uploadOld/forge/2.pf differ
diff --git a/public/uploadNew/forge/2/Simple_Metal_Mtl_Break_pattern.jpg b/public/uploadOld/forge/2/Simple_Metal_Mtl_Break_pattern.jpg
similarity index 100%
rename from public/uploadNew/forge/2/Simple_Metal_Mtl_Break_pattern.jpg
rename to public/uploadOld/forge/2/Simple_Metal_Mtl_Break_pattern.jpg
diff --git a/public/uploadNew/forge/2/Simple_Metal_Mtl_Brush_pattern.jpg b/public/uploadOld/forge/2/Simple_Metal_Mtl_Brush_pattern.jpg
similarity index 100%
rename from public/uploadNew/forge/2/Simple_Metal_Mtl_Brush_pattern.jpg
rename to public/uploadOld/forge/2/Simple_Metal_Mtl_Brush_pattern.jpg
diff --git a/public/uploadNew/forge/2/Simple_Metal_Mtl_CheckerPlate_pattern.jpg b/public/uploadOld/forge/2/Simple_Metal_Mtl_CheckerPlate_pattern.jpg
similarity index 100%
rename from public/uploadNew/forge/2/Simple_Metal_Mtl_CheckerPlate_pattern.jpg
rename to public/uploadOld/forge/2/Simple_Metal_Mtl_CheckerPlate_pattern.jpg
diff --git a/public/uploadNew/forge/2/Simple_Metal_Mtl_DiamondPlate_pattern.jpg b/public/uploadOld/forge/2/Simple_Metal_Mtl_DiamondPlate_pattern.jpg
similarity index 100%
rename from public/uploadNew/forge/2/Simple_Metal_Mtl_DiamondPlate_pattern.jpg
rename to public/uploadOld/forge/2/Simple_Metal_Mtl_DiamondPlate_pattern.jpg
diff --git a/public/uploadOld/forge/3.pf b/public/uploadOld/forge/3.pf
new file mode 100644
index 0000000..4ce9257
Binary files /dev/null and b/public/uploadOld/forge/3.pf differ
diff --git a/public/uploadOld/forge/4.pf b/public/uploadOld/forge/4.pf
new file mode 100644
index 0000000..5390a30
Binary files /dev/null and b/public/uploadOld/forge/4.pf differ
diff --git a/public/uploadOld/forge/5.pf b/public/uploadOld/forge/5.pf
new file mode 100644
index 0000000..e5f32bc
Binary files /dev/null and b/public/uploadOld/forge/5.pf differ
diff --git a/public/uploadOld/forge/6.pf b/public/uploadOld/forge/6.pf
new file mode 100644
index 0000000..127a12d
Binary files /dev/null and b/public/uploadOld/forge/6.pf differ
diff --git a/public/uploadOld/forge/CameraDefinitions.bin b/public/uploadOld/forge/CameraDefinitions.bin
new file mode 100644
index 0000000..71d4171
Binary files /dev/null and b/public/uploadOld/forge/CameraDefinitions.bin differ
diff --git a/public/uploadNew/forge/CameraList.bin b/public/uploadOld/forge/CameraList.bin
similarity index 100%
rename from public/uploadNew/forge/CameraList.bin
rename to public/uploadOld/forge/CameraList.bin
diff --git a/public/uploadOld/forge/FragmentList.pack b/public/uploadOld/forge/FragmentList.pack
new file mode 100644
index 0000000..40ca55e
Binary files /dev/null and b/public/uploadOld/forge/FragmentList.pack differ
diff --git a/public/uploadOld/forge/GeometryMetadata.pf b/public/uploadOld/forge/GeometryMetadata.pf
new file mode 100644
index 0000000..0019450
Binary files /dev/null and b/public/uploadOld/forge/GeometryMetadata.pf differ
diff --git a/public/uploadOld/forge/InstanceTree.bin b/public/uploadOld/forge/InstanceTree.bin
new file mode 100644
index 0000000..bc492aa
Binary files /dev/null and b/public/uploadOld/forge/InstanceTree.bin differ
diff --git a/public/uploadNew/forge/LightDefinitions.bin b/public/uploadOld/forge/LightDefinitions.bin
similarity index 100%
rename from public/uploadNew/forge/LightDefinitions.bin
rename to public/uploadOld/forge/LightDefinitions.bin
diff --git a/public/uploadNew/forge/LightList.bin b/public/uploadOld/forge/LightList.bin
similarity index 100%
rename from public/uploadNew/forge/LightList.bin
rename to public/uploadOld/forge/LightList.bin
diff --git a/public/uploadOld/forge/Materials.json.gz b/public/uploadOld/forge/Materials.json.gz
new file mode 100644
index 0000000..2746037
Binary files /dev/null and b/public/uploadOld/forge/Materials.json.gz differ
diff --git a/public/uploadOld/forge/ProteinMaterials.json.gz b/public/uploadOld/forge/ProteinMaterials.json.gz
new file mode 100644
index 0000000..bf3cfe3
Binary files /dev/null and b/public/uploadOld/forge/ProteinMaterials.json.gz differ
diff --git a/public/uploadNew/forge/Set.bin b/public/uploadOld/forge/Set.bin
similarity index 100%
rename from public/uploadNew/forge/Set.bin
rename to public/uploadOld/forge/Set.bin
diff --git a/public/uploadOld/forge/ViewpointTree.bin b/public/uploadOld/forge/ViewpointTree.bin
new file mode 100644
index 0000000..7f6d4e5
Binary files /dev/null and b/public/uploadOld/forge/ViewpointTree.bin differ
diff --git a/public/uploadOld/forge/objects_attrs.json.gz b/public/uploadOld/forge/objects_attrs.json.gz
new file mode 100644
index 0000000..fda2785
Binary files /dev/null and b/public/uploadOld/forge/objects_attrs.json.gz differ
diff --git a/public/uploadOld/forge/objects_avs.json.gz b/public/uploadOld/forge/objects_avs.json.gz
new file mode 100644
index 0000000..5ca584e
Binary files /dev/null and b/public/uploadOld/forge/objects_avs.json.gz differ
diff --git a/public/uploadOld/forge/objects_ids.json.gz b/public/uploadOld/forge/objects_ids.json.gz
new file mode 100644
index 0000000..2e890fa
Binary files /dev/null and b/public/uploadOld/forge/objects_ids.json.gz differ
diff --git a/public/uploadOld/forge/objects_offs.json.gz b/public/uploadOld/forge/objects_offs.json.gz
new file mode 100644
index 0000000..e0f2870
Binary files /dev/null and b/public/uploadOld/forge/objects_offs.json.gz differ
diff --git a/public/uploadOld/forge/objects_vals.json.gz b/public/uploadOld/forge/objects_vals.json.gz
new file mode 100644
index 0000000..1ea982d
Binary files /dev/null and b/public/uploadOld/forge/objects_vals.json.gz differ
diff --git a/public/uploadOld/forge/objects_viewables.json.gz b/public/uploadOld/forge/objects_viewables.json.gz
new file mode 100644
index 0000000..98f8f2d
Binary files /dev/null and b/public/uploadOld/forge/objects_viewables.json.gz differ
diff --git a/public/uploadNew/setting/previewImage/68ffdc7f-85e4-4f51-8c68-9decfd63df13.png b/public/uploadOld/setting/previewImage/68ffdc7f-85e4-4f51-8c68-9decfd63df13.png
similarity index 100%
rename from public/uploadNew/setting/previewImage/68ffdc7f-85e4-4f51-8c68-9decfd63df13.png
rename to public/uploadOld/setting/previewImage/68ffdc7f-85e4-4f51-8c68-9decfd63df13.png
diff --git a/public/uploadNew/setting/previewImage/bae10c40-b47b-4de1-9d79-2912548449d7.png b/public/uploadOld/setting/previewImage/bae10c40-b47b-4de1-9d79-2912548449d7.png
similarity index 100%
rename from public/uploadNew/setting/previewImage/bae10c40-b47b-4de1-9d79-2912548449d7.png
rename to public/uploadOld/setting/previewImage/bae10c40-b47b-4de1-9d79-2912548449d7.png
diff --git a/src/App.vue b/src/App.vue
index 2681afa..731a17f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,7 +10,7 @@ import { useRoute } from "vue-router";
 // 懶載入各 Layout
 const layouts = {
   headquarter: defineAsyncComponent(() => import("@/layouts/HeadquarterLayout.vue")),
-  map: defineAsyncComponent(() => import("@/layouts/MapLayout.vue")),
+  map: defineAsyncComponent(() => import("@/layouts/ForgeLayout.vue")),
 };
 
 const route = useRoute();
diff --git a/src/components/forge/Forge.vue b/src/components/forge/Forge.vue
index e6f20c3..c258d13 100644
--- a/src/components/forge/Forge.vue
+++ b/src/components/forge/Forge.vue
@@ -91,13 +91,13 @@
             </li>
 
             <!-- 第三行：入住日期 -->
-            <li>
+            <!-- <li>
               {{
                 isVacantWithoutSpecial(L)
                   ? "-"
                   : `入住日期：${L.data.startTime}`
               }}
-            </li>
+            </li> -->
           </ul>
         </div>
       </div>
@@ -136,7 +136,9 @@
         <button
           class="flex items-center gap-2 px-4 py-2 rounded-md hover:bg-gray-100"
           :class="
-            selectedInfo === 'none' ? 'bg-brand-green-light bg-opacity-50' : ''
+            selectedInfo === 'none'
+              ? 'bg-brand-green-light bg-opacity-50 hover:bg-brand-green-light hover:bg-opacity-50'
+              : 'bg-white'
           "
           @click="selectInfo({ label: '無顯示', value: 'none' })"
           :aria-pressed="selectedInfo === 'none'"
@@ -149,8 +151,8 @@
           class="flex items-center gap-2 px-4 py-2 rounded-md hover:bg-gray-100"
           :class="
             selectedInfo === 'occupied'
-              ? 'bg-brand-green-light bg-opacity-50'
-              : ''
+              ? 'bg-brand-green-light bg-opacity-50 hover:bg-brand-green-light hover:bg-opacity-50'
+              : 'bg-white'
           "
           @click="selectInfo({ label: '有住民', value: 'occupied' })"
           :aria-pressed="selectedInfo === 'occupied'"
@@ -164,8 +166,8 @@
           class="flex items-center gap-2 px-4 py-2 rounded-md hover:bg-gray-100"
           :class="
             selectedInfo === 'vacant'
-              ? 'bg-brand-green-light bg-opacity-50'
-              : ''
+              ? 'bg-brand-green-light bg-opacity-50 hover:bg-brand-green-light hover:bg-opacity-50'
+              : 'bg-white'
           "
           @click="selectInfo({ label: '空床', value: 'vacant' })"
           :aria-pressed="selectedInfo === 'vacant'"
@@ -179,8 +181,8 @@
           class="flex items-center gap-2 px-4 py-2 rounded-md hover:bg-gray-100"
           :class="
             selectedInfo === 'hospitalized'
-              ? 'bg-brand-green-light bg-opacity-50'
-              : ''
+              ? 'bg-brand-green-light bg-opacity-50 hover:bg-brand-green-light hover:bg-opacity-50'
+              : 'bg-white'
           "
           @click="selectInfo({ label: '住院中', value: 'hospitalized' })"
           :aria-pressed="selectedInfo === 'hospitalized'"
@@ -237,10 +239,10 @@
       <button
         v-for="zone in zones"
         :key="zone"
-        class="px-4 py-2 rounded-md hover:bg-gray-100"
+        class="px-4 py-2 rounded-md hover:bg-brand-gray-lighter ho"
         :class="
           isZoneSelected(zone)
-            ? 'bg-brand-green-light bg-opacity-50'
+            ? 'bg-brand-green-light bg-opacity-50 hover:bg-brand-green-light hover:bg-opacity-50'
             : 'bg-white'
         "
         @click="toggleZone(zone)"
@@ -312,6 +314,30 @@ import { ref, computed, onMounted, onUnmounted, watch } from "vue";
 import { useRoute } from "vue-router";
 import useForgeSprite from "@/hooks/forge/useForgeSprite";
 
+// 只取某個節點的「直屬子節點」清單
+function getDirectChildren(model, parentId) {
+  const tree = model.getInstanceTree?.();
+  if (!tree) return [];
+  const out = [];
+  tree.enumNodeChildren(parentId, (id) => out.push(id));
+  return out;
+}
+
+// 判斷節點是否含有任何 fragment（葉子幾何）
+function nodeHasFragments(model, dbId) {
+  const tree = model.getInstanceTree?.();
+  if (!tree) return false;
+  let has = false;
+  tree.enumNodeFragments(
+    dbId,
+    () => {
+      has = true;
+    },
+    true
+  );
+  return has;
+}
+
 // ====== 基本變數 / 注入 ======
 const route = useRoute();
 const forgeDom = ref(null);
@@ -332,10 +358,13 @@ const {
 } = useForgeSprite();
 
 // ====== 常數（樓層 / 顏色 / 模型路徑） ======
-const FLOOR_DBIDS = { "1F": 2, "2F": 3938 };
+const FLOOR_DBIDS = { "1F": null, "2F": null };
 const BRAND_RED = "#FF8678";
 const BRAND_GREEN = "#34D5C8";
-const MODEL_SVF_PATH = `/uploadNew/forge/0.svf`;
+const MODEL_SVF_PATH = `/upload/forge/0.svf`;
+// ====== Theming 顏色（RGBA 0~1）======
+const THEME_PURPLE = { r: 124 / 255, g: 58 / 255, b: 237 / 255, a: 0.9 }; 
+const THEME_YELLOW = { r: 250 / 255, g: 204 / 255, b: 21 / 255, a: 0.9 };
 
 // ====== THREE 入口（避免版本衝突） ======
 function getThree() {
@@ -405,8 +434,10 @@ function initViewer(container) {
       window.v = viewer;
       getThree();
       viewer.setGroundShadow(true);
-      viewer.impl.renderer().setClearAlpha(0);
-      viewer.impl.glrenderer().setClearColor(0xffffff, 0);
+      // 透明背景：跨版本保險寫法（部分版本沒有 glrenderer）
+      const r = viewer.impl?.renderer?.();
+      if (r?.setClearColor) r.setClearColor(0x000000, 0);
+      if (r?.setClearAlpha) r.setClearAlpha(0);
       viewer.impl.invalidate(true);
       resolve();
     });
@@ -444,6 +475,74 @@ function waitObjectTree(model) {
   });
 }
 
+// ====== 依名稱解析樓層 dbId（請在 waitObjectTree 後、applyFloor 前呼叫） ======
+function resolveFloorDbIdsFromTree(model) {
+  // 你模型左側樹的節點名稱，如： "1F(360)"、"2F(360)"
+  // 若你的實際名稱不同，直接改這兩個字串即可。
+  const id1 =
+    findDbIdByNameExact(model, "1F(360)") ||
+    findDbIdByNameLike(model, "1F(360)");
+  const id2 =
+    findDbIdByNameExact(model, "2F(360)") ||
+    findDbIdByNameLike(model, "2F(360)");
+
+  if (id1 != null) FLOOR_DBIDS["1F"] = id1;
+  if (id2 != null) FLOOR_DBIDS["2F"] = id2;
+
+  console.log("[Forge] 解析樓層：", FLOOR_DBIDS);
+}
+
+// 只在 rootDbId 這棵子樹裡找名字包含 keyword 的節點
+function collectDbIdsByNameUnder(model, rootDbId, keyword) {
+  const tree = model.getInstanceTree?.();
+  if (!tree) return [];
+  const out = [];
+  const walk = (id) => {
+    const name = tree.getNodeName ? tree.getNodeName(id) : "";
+    if (typeof name === "string" && name.includes(keyword)) out.push(id);
+    tree.enumNodeChildren(id, walk);
+  };
+  walk(rootDbId);
+  return out;
+}
+
+// ====== 依名稱尋找 dbId（完全比對 / 含模糊比對） ======
+function findDbIdByNameExact(model, targetName) {
+  const tree = model.getInstanceTree?.();
+  if (!tree) return null;
+  const root = tree.getRootId();
+  let hit = null;
+  const walk = (id) => {
+    if (hit != null) return;
+    const name = tree.getNodeName ? tree.getNodeName(id) : null;
+    if (name === targetName) {
+      hit = id;
+      return;
+    }
+    tree.enumNodeChildren(id, walk);
+  };
+  walk(root);
+  return hit;
+}
+
+function findDbIdByNameLike(model, keyword) {
+  const tree = model.getInstanceTree?.();
+  if (!tree) return null;
+  const root = tree.getRootId();
+  let hit = null;
+  const walk = (id) => {
+    if (hit != null) return;
+    const name = tree.getNodeName ? tree.getNodeName(id) : "";
+    if (typeof name === "string" && name.includes(keyword)) {
+      hit = id;
+      return;
+    }
+    tree.enumNodeChildren(id, walk);
+  };
+  walk(root);
+  return hit;
+}
+
 // ====== 幾何工具 ======
 function getNodeWorldBounds(model, dbId) {
   const THREE = getThree();
@@ -491,6 +590,138 @@ const LAYOUT_RATIOS = {
   ],
 };
 
+// 取得 node 是否含任一 fragment（遞迴）
+function nodeHasAnyFragmentDeep(model, dbId) {
+  const tree = model.getInstanceTree?.();
+  if (!tree) return false;
+  let has = false;
+  tree.enumNodeFragments(
+    dbId,
+    () => {
+      has = true;
+    },
+    /*recursive*/ true
+  );
+  return has;
+}
+
+// 取得：當層「房間」底下的每一間房 { id, name }
+// 會深度往下找，直到找到「真的掛有 fragment 的節點」為止
+function getRoomsUnderFloor(model, floorRootId) {
+  const tree = model.getInstanceTree?.();
+  if (!tree || floorRootId == null) return [];
+
+  const containers = collectDbIdsByNameUnder(model, floorRootId, "房間");
+  const result = [];
+  const seen = new Set();
+
+  // 深度抓取：在「房間」子樹裡，把「名稱像 101/102/103/105… 且子樹中有幾何」的節點都撈出來
+  const isRoomName = (name) => /\d{3,}/.test(String(name || ""));
+
+  const pushRoom = (id) => {
+    if (seen.has(id)) return;
+    const name = tree.getNodeName ? String(tree.getNodeName(id) || "") : "";
+    result.push({ id, name });
+    seen.add(id);
+  };
+
+  const walk = (id) => {
+    const name = tree.getNodeName ? tree.getNodeName(id) : "";
+    const hasGeom = nodeHasAnyFragmentDeep(model, id);
+
+    // 名稱像房號 & 子樹確實有幾何 → 收
+    if (isRoomName(name) && hasGeom) {
+      pushRoom(id);
+      return; // 已經是可上色的層級，這支線可以停
+    }
+
+    // 否則往下繼續找
+    tree.enumNodeChildren(id, walk);
+  };
+
+  containers.forEach((cid) => walk(cid));
+
+  // 萬一模型沒有「房間」容器，備用：直接掃整個樓層子樹
+  if (!result.length) {
+    const walkFloor = (id) => {
+      const name = tree.getNodeName ? tree.getNodeName(id) : "";
+      if (isRoomName(name) && nodeHasAnyFragmentDeep(model, id)) pushRoom(id);
+      tree.enumNodeChildren(id, walkFloor);
+    };
+    walkFloor(floorRootId);
+  }
+
+  return result;
+}
+
+const ZONE_BY_NAME = {
+  一般: ["101", "102"],
+  氧氣: ["103", "105"],
+};
+
+function judgeZoneByName(roomName) {
+  const digits = (roomName || "").match(/\d{3,}/g) || []; // 抓出所有連續3位以上的數字
+  for (const z of Object.keys(ZONE_BY_NAME)) {
+    if (ZONE_BY_NAME[z].some((key) => digits.includes(key))) return z;
+  }
+  return null;
+}
+
+let lastThemedIds = new Set(); // 我們上一輪上色過的房間 id
+
+function clearOurTheming(model) {
+  try {
+    viewer.clearThemingColors(model);
+  } catch (e) {
+    console.warn("[Forge] clearThemingColors 失敗", e);
+  }
+  lastThemedIds.clear();
+}
+
+function setRoomTheming(id, rgba) {
+  const THREE = getThree();
+  const c = new THREE.Vector4(rgba.r, rgba.g, rgba.b, rgba.a);
+  viewer.setThemingColor(id, c, viewer.model, true);
+  lastThemedIds.add(id);
+}
+
+function rebuildZoneThemingForCurrentFloor() {
+  if (!viewer || !viewer.model) return;
+
+  // 清掉我們上一輪塗色
+  clearOurTheming(viewer.model);
+
+  // 沒有勾任何分區 → 不上色
+  if (selectedZones.value.size === 0) {
+    viewer.impl.invalidate(true);
+    return;
+  }
+
+  const floorRootId = FLOOR_DBIDS[activeFloor.value];
+  if (floorRootId == null) return;
+
+  const rooms = getRoomsUnderFloor(viewer.model, floorRootId); // [{id,name}]
+  if (!rooms.length) return;
+
+  rooms.forEach(({ id, name }) => {
+    // 先決定這間房屬於哪個分區
+    // 你也可以改成「一間房可能屬多分區」→ 那就以優先權或疊色規則處理
+    let z = null;
+    // 方式 B 優先
+    // z = judgeZoneByDbId(id) ?? judgeZoneByName(name);
+    z = judgeZoneByName(name); // 你現在用名稱的話，先這樣
+
+    if (!z) return; // 沒有分區定義就略過
+    if (!selectedZones.value.has(z)) return; // 沒勾這個分區也略過
+
+    // 上色
+    if (z === "一般") setRoomTheming(id, THEME_PURPLE);
+    if (z === "氧氣") setRoomTheming(id, THEME_YELLOW);
+  });
+
+  viewer.impl.invalidate(true, true, true);
+}
+
 // ====== 床號序列（避開數字 4） ======
 function hasDigit4(n) {
   return n.toString().includes("4");
@@ -589,10 +820,12 @@ function allLeafIds(model) {
 async function showLevel(levelKey) {
   if (!viewer || !viewer.model) return;
 
+  if (!viewer || !viewer.model) return;
+
   const levelDbId = FLOOR_DBIDS[levelKey];
   if (levelDbId == null) {
-    console.warn(`[Forge] FLOOR_DBIDS['${levelKey}'] 不存在，顯示外觀`);
-    viewer.isolate([]);
+    console.warn(`[Forge] 找不到樓層 '${levelKey}' 對應的 dbId，改為顯示全景`);
+    viewer.showAll();
     viewer.fitToView();
     viewer.impl.invalidate(true);
     return;
@@ -647,53 +880,100 @@ async function showLevel(levelKey) {
 }
 
 async function rebuildSpritesForFloor(floorKey) {
-  const box = getNodeWorldBounds(viewer.model, FLOOR_DBIDS[floorKey]);
-  const is2F = floorKey === "2F";
+  const THREE = getThree();
+  const floorRootId = FLOOR_DBIDS[floorKey];
+  if (floorRootId == null) {
+    console.warn("[Forge] 此樓層沒有對應的 root dbId：", floorKey);
+    __staticDevices.length = 0;
+    await createSprites();
+    return;
+  }
 
-  const ratios = LAYOUT_RATIOS[floorKey] || [];
-  const poses = positionsFromRatios(box, ratios);
+  // 1) 只在【當層子樹】找「【崇恩護家】床位(20)」
+  const BED_GROUP_KEYWORD = "【崇恩護家】床位";
+  const bedGroupIds = collectDbIdsByNameUnder(
+    viewer.model,
+    floorRootId,
+    BED_GROUP_KEYWORD
+  );
+  if (!bedGroupIds.length) {
+    console.warn(`[Forge] ${floorKey} 找不到「${BED_GROUP_KEYWORD}」節點`);
+    __staticDevices.length = 0;
+    await createSprites();
+    return;
+  }
 
-  const bedNos =
-    BED_SERIES_BY_FLOOR[floorKey] || generateBedNumbers(poses.length, 1001);
+  // 2) 當層的 z 範圍（保險：過濾誤撈到其他樓層）
+  const floorBox = getNodeWorldBounds(viewer.model, floorRootId);
+
+  // 3) 以「床位群組的直屬子節點」作為「一張床」
+  //    若直屬子節點沒有幾何，再往下一層找一次。
+  let bedNodes = [];
+  bedGroupIds.forEach((groupId) => {
+    const children = getDirectChildren(viewer.model, groupId);
+    const directBeds = children.filter((id) =>
+      nodeHasFragments(viewer.model, id)
+    );
+    if (directBeds.length) {
+      bedNodes.push(...directBeds);
+    } else {
+      // 直屬沒有幾何 → 取孫節點中有幾何的
+      children.forEach((cId) => {
+        const grand = getDirectChildren(viewer.model, cId);
+        bedNodes.push(
+          ...grand.filter((id) => nodeHasFragments(viewer.model, id))
+        );
+      });
+    }
+  });
+
+  // 去重（保險）
+  bedNodes = Array.from(new Set(bedNodes));
 
   __staticDevices.length = 0;
-  const GREEN = BRAND_GREEN,
-    RED = BRAND_RED;
 
-  poses.forEach((p, i) => {
-    const bedNo = bedNos[i] ?? 1001 + i;
-    const spriteIdBase = is2F ? 90000 : 91000;
-    const spriteDbId = spriteIdBase + i + 1;
+  bedNodes.forEach((dbId, i) => {
+    const box = getNodeWorldBounds(viewer.model, dbId);
+    if (box.isEmpty()) return;
 
-    const area = pickAreaLetter(spriteDbId);
-    const isRed = is2F ? i >= poses.length - 2 : false;
+    // 中心點
+    const center = new THREE.Vector3();
+    box.getCenter(center);
+
+    // —— 只允許中心 z 落在「本樓層高度」內（上下 0.5 容差）——
+    const zOk =
+      center.z >= floorBox.min.z - 0.5 && center.z <= floorBox.max.z + 0.5;
+    if (!zOk) return;
+
+    // 稍微上抬，避免吃到幾何（依床自身高度給 20% 或至少 0.25）
+    const lift = Math.max(0.25, (box.max.z - box.min.z) * 0.2);
+    center.z = box.max.z + lift;
+
+    // 唯一 sprite id（依樓層分段）
+    const spriteDbId = (floorKey === "1F" ? 91000 : 92000) + i;
 
     __staticDevices.push({
-      name: `${area} 區 ${bedNo}`,
-      forge_dbid: FLOOR_DBIDS[floorKey],
+      name: `床位 ${i + 1}`,
+      forge_dbid: floorRootId, // 綁樓層即可（fitToView/隔離穩定）；若要 fit 到單床可另存 anchorDbId: dbId
       spriteDbId,
-      device_coordinate_3d: { x: p.x, y: p.y, z: p.z },
+      device_coordinate_3d: { x: center.x, y: center.y, z: center.z },
       device_normal_color: BRAND_GREEN,
       device_close_color: BRAND_RED,
-      state: isRed ? "offnormal" : "normal",
-      special: isRed && i === poses.length - 2, //  只挑第一個紅色 sprite 加入黃色標示
+      // 以下是假資料，你可以換成真實狀態
+      state: i % 3 === 0 ? "offnormal" : "normal",
+      special: false,
       residentsName: pick(NAME_POOL, spriteDbId),
       residentsSex: pick(SEX_POOL, spriteDbId + 1),
       residentsAge: ageFromSeed(spriteDbId + 2),
       startTime: startDateFromSeed(spriteDbId + 3),
-
-      avatarUrl: Math.random() > 0.4 ? pick(spriteDbId + 4) : null,
       healthStatus: pick(HEALTH_POOL, spriteDbId + 5),
       medicationStatus: pick(MEDICATION_POOL, spriteDbId + 6),
-      specialEvent:
-        isRed && i === poses.length - 2
-          ? "住院中"
-          : pick(SPECIAL_POOL, spriteDbId + 7),
-      note: pick(NOTE_POOL, spriteDbId + 8),
+      specialEvent: "-",
+      note: "-",
     });
   });
 
-  await createSprites(); // 清舊加新
+  await createSprites(); // 清舊加新 → 一床一顆
 }
 
 // ====== Popover（常駐在每顆 sprite 上方） ======
@@ -775,6 +1055,7 @@ const toggleZone = (zone) => {
   if (set.has(zone)) set.delete(zone);
   else set.add(zone);
   selectedZones.value = set;
+  rebuildZoneThemingForCurrentFloor();
 };
 const isZoneSelected = (zone) => selectedZones.value.has(zone);
 
@@ -868,6 +1149,7 @@ async function applyFloor(next) {
   await rebuildSpritesForFloor(next); // 只畫當前樓層的 sprites
   viewer.impl.invalidate(true); // 強制要求一個新幀
   rebuildLabelsAfterNextRender(); // 等下一次渲染完成再對齊 labels
+  rebuildZoneThemingForCurrentFloor();
 }
 
 async function onClickFloor(next) {
@@ -888,9 +1170,11 @@ onMounted(async () => {
   // 讓 DataVisualization 綁定這個 viewer
   await dvInit(viewer);
 
+  // ←← 新增：等樹完成後，用名稱抓出正確的 1F/2F 節點 dbId
+  resolveFloorDbIdsFromTree(model);
+
   // 綁定 sprite 點擊
   unbindSpriteClick = forgeClickListener(async ({ data }) => {
-    // 進入「單獨顯示」模式，只顯示被點到那顆 popover
     soloSpriteId.value =
       soloSpriteId.value === data.spriteDbId ? null : data.spriteDbId;
     bringToFrontById(data.spriteDbId);
@@ -903,8 +1187,9 @@ onMounted(async () => {
   });
   attachCameraEventsForLabels();
 
+  // 這裡才套用樓層（此時 FLOOR_DBIDS 已填好）
   await applyFloor("1F");
-  viewerReady.value = true; // 放在 applyFloor 之後較穩
+  viewerReady.value = true;
 });
 
 onMounted(() => {
@@ -925,6 +1210,9 @@ watch(
 );
 
 onUnmounted(() => {
+  try {
+    clearOurTheming(viewer.model);
+  } catch {}
   try {
     unbindSpriteClick?.();
     camEvtCleanup?.();
diff --git a/src/layouts/MapLayout.vue b/src/layouts/ForgeLayout.vue
similarity index 63%
rename from src/layouts/MapLayout.vue
rename to src/layouts/ForgeLayout.vue
index 3eaa368..bf009af 100644
--- a/src/layouts/MapLayout.vue
+++ b/src/layouts/ForgeLayout.vue
@@ -2,11 +2,17 @@
   <section id="app" class="flex flex-col min-h-screen">
     <NavBar class="fixed" />
 
-    <main class="w-full p-4 pt-[80px]">
+    <main
+      class="w-full p-4 pt-[80px] from-brand-green-light/20 via-white/40 to-white/10"
+    >
       <section class="grid grid-cols-7 gap-4 overflow-hidden">
         <!-- 左側：地圖 -->
-        <section class="col-span-3 bg-white/50 rounded-md  shadow p-3 h-full overflow-hidden">
-          <div class="w-full h-full flex items-center justify-center text-gray-500">
+        <section
+          class="col-span-3 bg-gradient-to-br rounded-md h-full overflow-hidden"
+        >
+          <div
+            class="w-full h-full flex items-center justify-center text-gray-500"
+          >
             <Forge />
           </div>
         </section>
@@ -26,5 +32,7 @@
 import NavBar from "@/layouts/NavBar.vue";
 // 延遲載入，避免首頁沒用到也被打包
 import { defineAsyncComponent } from "vue";
-const Forge = defineAsyncComponent(() => import("@/components/forge/Forge.vue"));
+const Forge = defineAsyncComponent(() =>
+  import("@/components/forge/Forge.vue")
+);
 </script>
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index 31cf2f4..599cdbf 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -365,7 +365,7 @@
         <div class="flex items-center justify-between">
           <h3 class="text-2xl font-bold">今日活動</h3>
           <button
-            class="btn btn-sm bg-brand-purple-dark text-brand-white hover:bg-brand-purple border-none shadow rounded px-3 py-2 tracking-wider"
+            class="btn btn-sm bg-brand-purple-dark text-white hover:bg-brand-purple border-none shadow rounded px-3 py-2 tracking-wider"
             type="button"
             @click="openCalendar()"
             aria-haspopup="dialog"
@@ -684,10 +684,10 @@ const FACILITY_DATA = {
   ALL: {
     desc: "ＯＯ長期照顧集團——在全台各地皆有眾多據點，整合醫護團隊與專業照護人員，提供高齡照護服務總部。",
     progress: {
-      residents: { current: 240, total: 360 },
-      vacancy: { current: 120, total: 360 },
+      residents: { current: 1216, total: 3600 },
+      vacancy: { current: 2384, total: 3600 },
       hospitalized: { current: 8, total: 50 },
-      movein: { current: 12, total: 50 },
+      movein: { current: 3, total: 50 },
       moveout: { current: 8, total: 50 },
     },
     charts: {
diff --git a/src/pages/nursing/index.vue b/src/pages/nursing/index.vue
index 4eaba95..51418f5 100644
--- a/src/pages/nursing/index.vue
+++ b/src/pages/nursing/index.vue
@@ -4,33 +4,49 @@
     <div class="flex-[2] grid grid-cols-3 gap-2 max-h-[150px]">
       <!-- 住民人數 Card -->
       <div
-        class="col-span-1 cursor-pointer text-white bg-brand-green hover:bg-brand-green hover:opacity-90 active:opacity-80 rounded-md shadow px-4 pt-3 flex flex-col justify-center items-start tracking-widest"
+        class="col-span-1 cursor-pointer text-white bg-brand-green hover:bg-brand-green hover:opacity-80 active:opacity-70 rounded-md shadow px-4 pt-3 flex flex-col justify-center items-start tracking-widest"
         @click="openPanel('residents')"
       >
         <div class="flex justify-center items-center gap-4">
           <p>現在住民／立案床數</p>
           <span>
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
-              <path fill="currentColor" d="M12 9a3 3 0 0 0-3 3a3 3 0 0 0 3 3a3 3 0 0 0 3-3a3 3 0 0 0-3-3m0 8a5 5 0 0 1-5-5a5 5 0 0 1 5-5a5 5 0 0 1 5 5a5 5 0 0 1-5 5m0-12.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5" />
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="16"
+              height="16"
+              viewBox="0 0 24 24"
+            >
+              <path
+                fill="currentColor"
+                d="M12 9a3 3 0 0 0-3 3a3 3 0 0 0 3 3a3 3 0 0 0 3-3a3 3 0 0 0-3-3m0 8a5 5 0 0 1-5-5a5 5 0 0 1 5-5a5 5 0 0 1 5 5a5 5 0 0 1-5 5m0-12.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5"
+              />
             </svg>
           </span>
         </div>
         <div class="flex justify-center items-baseline gap-1">
-          <p class="text-[40px] font-nats">36/49</p>
+          <p class="text-[40px] font-nats">36/48</p>
           <p class="text-[12px]">人</p>
         </div>
       </div>
 
       <!-- 住院人數 Card -->
       <div
-        class="col-span-1 cursor-pointer text-white bg-brand-green hover:bg-brand-green hover:opacity-90 active:opacity-80 rounded-md shadow px-4 pt-3 flex flex-col justify-center items-start tracking-widest"
+        class="col-span-1 cursor-pointer text-white bg-brand-green hover:bg-brand-green hover:opacity-80 active:opacity-70 rounded-md shadow px-4 pt-3 flex flex-col justify-center items-start tracking-widest"
         @click="openPanel('inpatients')"
       >
         <div class="flex justify-center items-center gap-4">
           <p>今日住院／當月累積住院</p>
           <span>
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
-              <path fill="currentColor" d="M12 9a3 3 0 0 0-3 3a3 3 0 0 0 3 3a3 3 0 0 0 3-3a3 3 0 0 0-3-3m0 8a5 5 0 0 1-5-5a5 5 0 0 1 5-5a5 5 0 0 1 5 5a5 5 0 0 1-5 5m0-12.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5" />
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="16"
+              height="16"
+              viewBox="0 0 24 24"
+            >
+              <path
+                fill="currentColor"
+                d="M12 9a3 3 0 0 0-3 3a3 3 0 0 0 3 3a3 3 0 0 0 3-3a3 3 0 0 0-3-3m0 8a5 5 0 0 1-5-5a5 5 0 0 1 5-5a5 5 0 0 1 5 5a5 5 0 0 1-5 5m0-12.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5"
+              />
             </svg>
           </span>
         </div>
@@ -42,24 +58,31 @@
 
       <!-- 今日離院 Card -->
       <div
-        class="col-span-1 cursor-pointer text-white bg-brand-green hover:bg-brand-green hover:opacity-90 active:opacity-80 rounded-md shadow px-4 pt-3 flex flex-col justify-center items-start tracking-widest"
+        class="col-span-1 cursor-pointer text-white bg-brand-green hover:bg-brand-green hover:opacity-80 active:opacity-70 rounded-md shadow px-4 pt-3 flex flex-col justify-center items-start tracking-widest"
         @click="openPanel('discharges')"
       >
         <div class="flex justify-center items-center gap-4">
           <p>今日離院／當月累積離院</p>
           <span>
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
-              <path fill="currentColor" d="M12 9a3 3 0 0 0-3 3a3 3 0 0 0 3 3a3 3 0 0 0 3-3a3 3 0 0 0-3-3m0 8a5 5 0 0 1-5-5a5 5 0 0 1 5-5a5 5 0 0 1 5 5a5 5 0 0 1-5 5m0-12.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5" />
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="16"
+              height="16"
+              viewBox="0 0 24 24"
+            >
+              <path
+                fill="currentColor"
+                d="M12 9a3 3 0 0 0-3 3a3 3 0 0 0 3 3a3 3 0 0 0 3-3a3 3 0 0 0-3-3m0 8a5 5 0 0 1-5-5a5 5 0 0 1 5-5a5 5 0 0 1 5 5a5 5 0 0 1-5 5m0-12.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5"
+              />
             </svg>
           </span>
         </div>
         <div class="flex justify-center items-baseline gap-1">
-          <p class="text-[40px] font-nats">0/49</p>
+          <p class="text-[40px] font-nats">0/48</p>
           <p class="text-[12px]">人</p>
         </div>
       </div>
     </div>
-
     <!-- ===== 內容區 ===== -->
     <div class="relative flex-[10] min-h-0">
       <Transition
@@ -72,12 +95,18 @@
       >
         <!-- A. 未完成的知會事項與代辦事項-->
         <div v-if="!showPanel" key="todos" class="absolute inset-0">
-          <section class="bg-white/70 rounded-md shadow p-6 flex flex-col min-h-0 gap-4 h-full">
+          <section
+            class="bg-white/50 rounded-md shadow p-6 flex flex-col min-h-0 gap-4 h-full"
+          >
             <h3 class="text-2xl font-bold">未完成的知會事項與代辦事項</h3>
             <div class="flex flex-col gap-4 mb-6 flex-1 min-h-0">
-              <div class="w-full flex-1 min-h-0 overflow-x-auto overflow-y-auto">
+              <div
+                class="w-full flex-1 min-h-0 overflow-x-auto overflow-y-auto"
+              >
                 <table class="table w-full whitespace-nowrap">
-                  <thead class="bg-brand-gray-lighter text-brand-black sticky top-0 z-[1]">
+                  <thead
+                    class="bg-brand-gray-lighter text-brand-black sticky top-0 z-[1]"
+                  >
                     <tr>
                       <th class="px-3 py-2 text-left">住民</th>
                       <th class="px-3 py-2 text-left">類型</th>
@@ -87,15 +116,23 @@
                     </tr>
                   </thead>
                   <tbody>
-                    <tr v-for="row in pagedRows" :key="row.id" class="transition-colors duration-150 hover:bg-brand-gray-lighter focus-visible:bg-gray-100/70">
+                    <tr
+                      v-for="row in pagedRows"
+                      :key="row.id"
+                      class="transition-colors duration-150 hover:bg-brand-gray-lighter focus-visible:bg-gray-100/70"
+                    >
                       <td class="truncate">{{ row.resident }}</td>
                       <td>{{ row.type }}</td>
                       <td class="truncate">{{ row.form }}</td>
                       <td>{{ formatDate(row.date) }}</td>
-                      <td class="text-brand-red">{{ row.overdueDays ?? 0 }} 天</td>
+                      <td class="text-brand-red">
+                        {{ row.overdueDays ?? 0 }} 天
+                      </td>
                     </tr>
                     <tr v-if="!pagedRows.length">
-                      <td class="py-6 text-center text-gray-500" colspan="5">目前沒有待辦，太棒了！</td>
+                      <td class="py-6 text-center text-gray-500" colspan="5">
+                        目前沒有待辦，太棒了！
+                      </td>
                     </tr>
                   </tbody>
                 </table>
@@ -103,11 +140,27 @@
             </div>
             <!-- 分頁（Todos） -->
             <div class="mt-3 flex items-center justify-between px-3">
-              <span class="text-sm text-gray-500">共 {{ total }} 筆，每頁 {{ pageSize }} 筆</span>
+              <span class="text-sm text-gray-500"
+                >共 {{ total }} 筆，每頁 {{ pageSize }} 筆</span
+              >
               <div class="inline-flex items-center gap-2">
-                <button class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed" :disabled="currentPage === 1" @click="currentPage--">上一頁</button>
-                <span class="px-2 text-sm tabular-nums text-brand-purple-dark">{{ currentPage }} / {{ totalPages }}</span>
-                <button class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed" :disabled="currentPage === totalPages" @click="currentPage++">下一頁</button>
+                <button
+                  class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed"
+                  :disabled="currentPage === 1"
+                  @click="currentPage--"
+                >
+                  上一頁
+                </button>
+                <span class="px-2 text-sm tabular-nums text-brand-purple-dark"
+                  >{{ currentPage }} / {{ totalPages }}</span
+                >
+                <button
+                  class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed"
+                  :disabled="currentPage === totalPages"
+                  @click="currentPage++"
+                >
+                  下一頁
+                </button>
               </div>
             </div>
           </section>
@@ -115,16 +168,41 @@
 
         <!-- B. Panel -->
         <div v-else key="panel" class="absolute inset-0">
-          <section class="relative w-full h-full bg-white/50 backdrop-blur-sm rounded-md shadow overflow-hidden p-0" role="region" :aria-labelledby="'panel-title'">
+          <section
+            class="relative w-full h-full bg-white/50 backdrop-blur-sm rounded-md shadow overflow-hidden p-0"
+            role="region"
+            :aria-labelledby="'panel-title'"
+          >
             <div class="h-full flex flex-col">
               <!-- Header -->
               <div class="shrink-0 flex items-center gap-4 px-6 py-6">
-                <button class="p-2 rounded-full text-brand-black bg-brand-green-light hover:text-white hover:bg-brand-green active:opacity-80" @click="closePanel" aria-label="回到上一頁">
-                  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
-                    <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m12 19-7-7 7-7m7 7H5" />
+                <button
+                  class="p-2 rounded-full text-brand-black bg-brand-green-light hover:text-white hover:bg-brand-green active:opacity-80"
+                  @click="closePanel"
+                  aria-label="回到上一頁"
+                >
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="16"
+                    height="16"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      fill="none"
+                      stroke="currentColor"
+                      stroke-linecap="round"
+                      stroke-linejoin="round"
+                      stroke-width="2"
+                      d="m12 19-7-7 7-7m7 7H5"
+                    />
                   </svg>
                 </button>
-                <h3 id="panel-title" class="text-2xl font-bold text-brand-black">{{ panelTitle }}</h3>
+                <h3
+                  id="panel-title"
+                  class="text-2xl font-bold text-brand-black"
+                >
+                  {{ panelTitle }}
+                </h3>
               </div>
 
               <!-- 內層：改為 column，底部放固定分頁 -->
@@ -135,10 +213,16 @@
                   <div v-if="panelType === 'residents'" class="space-y-8">
                     <!-- A 區 -->
                     <section>
-                      <h4 class="text-lg font-semibold text-gray-700 mb-3">A 區</h4>
+                      <h4 class="text-lg font-semibold text-gray-700 mb-3">
+                        A 區
+                      </h4>
                       <div class="overflow-x-auto">
-                        <table class="min-w-full table-fixed text-sm text-brand-black">
-                          <thead class="sticky top-0 z-[1] bg-brand-gray-lighter">
+                        <table
+                          class="min-w-full table-fixed text-sm text-brand-black"
+                        >
+                          <thead
+                            class="sticky top-0 z-[1] bg-brand-gray-lighter"
+                          >
                             <tr class="text-left">
                               <th class="px-3 py-2 w-20">床位</th>
                               <th class="px-3 py-2 w-24">姓名</th>
@@ -149,7 +233,11 @@
                             </tr>
                           </thead>
                           <tbody>
-                            <tr v-for="r in pagedResidentsA" :key="r.bed" class="border-b last:border-b-0 hover:bg-brand-gray-lighter">
+                            <tr
+                              v-for="r in pagedResidentsA"
+                              :key="r.bed"
+                              class="border-b last:border-b-0 hover:bg-brand-gray-lighter"
+                            >
                               <td class="px-3 py-2 font-mono">{{ r.bed }}</td>
                               <td class="px-3 py-2">{{ r.name }}</td>
                               <td class="px-3 py-2">{{ r.gender }}</td>
@@ -164,10 +252,16 @@
 
                     <!-- B 區 -->
                     <section>
-                      <h4 class="text-lg font-semibold text-gray-700 mb-3">B 區</h4>
+                      <h4 class="text-lg font-semibold text-gray-700 mb-3">
+                        B 區
+                      </h4>
                       <div class="overflow-x-auto">
-                        <table class="min-w-full table-fixed text-sm text-brand-black">
-                          <thead class="sticky top-0 z-[1] bg-brand-gray-lighter">
+                        <table
+                          class="min-w-full table-fixed text-sm text-brand-black"
+                        >
+                          <thead
+                            class="sticky top-0 z-[1] bg-brand-gray-lighter"
+                          >
                             <tr class="text-left">
                               <th class="px-3 py-2 w-20">床位</th>
                               <th class="px-3 py-2 w-24">姓名</th>
@@ -178,7 +272,11 @@
                             </tr>
                           </thead>
                           <tbody>
-                            <tr v-for="r in pagedResidentsB" :key="r.bed" class="border-b last:border-b-0 hover:bg-brand-gray-lighter">
+                            <tr
+                              v-for="r in pagedResidentsB"
+                              :key="r.bed"
+                              class="border-b last:border-b-0 hover:bg-brand-gray-lighter"
+                            >
                               <td class="px-3 py-2 font-mono">{{ r.bed }}</td>
                               <td class="px-3 py-2">{{ r.name }}</td>
                               <td class="px-3 py-2">{{ r.gender }}</td>
@@ -195,7 +293,9 @@
                   <!-- 內容：住院資訊（底部固定分頁；移出 scroll） -->
                   <div v-else-if="panelType === 'inpatients'" class="space-y-8">
                     <div class="overflow-x-auto">
-                      <table class="min-w-full table-fixed text-sm text-brand-black">
+                      <table
+                        class="min-w-full table-fixed text-sm text-brand-black"
+                      >
                         <thead class="sticky top-0 z-[1] bg-brand-gray-lighter">
                           <tr class="text-left">
                             <th class="px-3 py-2 w-20">床位</th>
@@ -206,11 +306,17 @@
                           </tr>
                         </thead>
                         <tbody>
-                          <tr v-for="p in pagedInpatients" :key="p.recordNo" class="border-b last:border-b-0 hover:bg-brand-gray-lighter">
+                          <tr
+                            v-for="p in pagedInpatients"
+                            :key="p.recordNo"
+                            class="border-b last:border-b-0 hover:bg-brand-gray-lighter"
+                          >
                             <td class="px-3 py-2 font-mono">{{ p.bed }}</td>
                             <td class="px-3 py-2">{{ p.name }}</td>
                             <td class="px-3 py-2">{{ p.hospitalDept }}</td>
-                            <td class="px-3 py-2 font-mono">{{ p.recordNo }}</td>
+                            <td class="px-3 py-2 font-mono">
+                              {{ p.recordNo }}
+                            </td>
                             <td class="px-3 py-2">{{ p.status }}</td>
                           </tr>
                         </tbody>
@@ -221,7 +327,9 @@
                   <!-- 內容：今日離院（底部固定分頁；移出 scroll） -->
                   <div v-else-if="panelType === 'discharges'" class="space-y-8">
                     <div class="overflow-x-auto">
-                      <table class="min-w-full table-fixed text-sm text-brand-black">
+                      <table
+                        class="min-w-full table-fixed text-sm text-brand-black"
+                      >
                         <thead class="sticky top-0 z-[1] bg-brand-gray-lighter">
                           <tr class="text-left">
                             <th class="px-3 py-2 w-20">床位</th>
@@ -231,7 +339,11 @@
                           </tr>
                         </thead>
                         <tbody>
-                          <tr v-for="d in pagedDischarges" :key="d.bed" class="border-b last:border-b-0 hover:bg-brand-gray-lighter">
+                          <tr
+                            v-for="d in pagedDischarges"
+                            :key="d.bed"
+                            class="border-b last:border-b-0 hover:bg-brand-gray-lighter"
+                          >
                             <td class="px-3 py-2 font-mono">{{ d.bed }}</td>
                             <td class="px-3 py-2">{{ d.name }}</td>
                             <td class="px-3 py-2">{{ d.reason }}</td>
@@ -246,35 +358,102 @@
                 <!-- ★ Residents 單一分頁（固定底部；不隨 scroll） -->
                 <div v-if="panelType === 'residents'" class="shrink-0 pt-3">
                   <div class="flex items-center justify-between px-3">
-                    <span class="text-sm text-gray-500">共 {{ totalResidents }} 筆，每頁 {{ pageSizeResidents }} 筆</span>
+                    <span class="text-sm text-gray-500"
+                      >共 {{ totalResidents }} 筆，每頁
+                      {{ pageSizeResidents }} 筆</span
+                    >
                     <div class="inline-flex items-center gap-2">
-                      <button class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed" :disabled="currentPageResidents === 1" @click="currentPageResidents--">上一頁</button>
-                      <span class="px-2 text-sm tabular-nums text-brand-purple-dark">{{ currentPageResidents }} / {{ totalPagesResidents }}</span>
-                      <button class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed" :disabled="currentPageResidents === totalPagesResidents" @click="currentPageResidents++">下一頁</button>
+                      <button
+                        class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed"
+                        :disabled="currentPageResidents === 1"
+                        @click="currentPageResidents--"
+                      >
+                        上一頁
+                      </button>
+                      <span
+                        class="px-2 text-sm tabular-nums text-brand-purple-dark"
+                        >{{ currentPageResidents }} /
+                        {{ totalPagesResidents }}</span
+                      >
+                      <button
+                        class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed"
+                        :disabled="currentPageResidents === totalPagesResidents"
+                        @click="currentPageResidents++"
+                      >
+                        下一頁
+                      </button>
                     </div>
                   </div>
                 </div>
 
                 <!-- ★ Inpatients 分頁（固定底部；不隨 scroll） -->
-                <div v-else-if="panelType === 'inpatients'" class="shrink-0 pt-3">
+                <div
+                  v-else-if="panelType === 'inpatients'"
+                  class="shrink-0 pt-3"
+                >
                   <div class="flex items-center justify-between px-3">
-                    <span class="text-sm text-gray-500">共 {{ totalInpatients }} 筆，每頁 {{ pageSizeInpatients }} 筆</span>
+                    <span class="text-sm text-gray-500"
+                      >共 {{ totalInpatients }} 筆，每頁
+                      {{ pageSizeInpatients }} 筆</span
+                    >
                     <div class="inline-flex items-center gap-2">
-                      <button class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed" :disabled="currentPageInpatients === 1" @click="currentPageInpatients--">上一頁</button>
-                      <span class="px-2 text-sm tabular-nums text-brand-purple-dark">{{ currentPageInpatients }} / {{ totalPagesInpatients }}</span>
-                      <button class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed" :disabled="currentPageInpatients === totalPagesInpatients" @click="currentPageInpatients++">下一頁</button>
+                      <button
+                        class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed"
+                        :disabled="currentPageInpatients === 1"
+                        @click="currentPageInpatients--"
+                      >
+                        上一頁
+                      </button>
+                      <span
+                        class="px-2 text-sm tabular-nums text-brand-purple-dark"
+                        >{{ currentPageInpatients }} /
+                        {{ totalPagesInpatients }}</span
+                      >
+                      <button
+                        class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed"
+                        :disabled="
+                          currentPageInpatients === totalPagesInpatients
+                        "
+                        @click="currentPageInpatients++"
+                      >
+                        下一頁
+                      </button>
                     </div>
                   </div>
                 </div>
 
                 <!-- ★ Discharges 分頁（固定底部；不隨 scroll） -->
-                <div v-else-if="panelType === 'discharges'" class="shrink-0 pt-3">
+                <div
+                  v-else-if="panelType === 'discharges'"
+                  class="shrink-0 pt-3"
+                >
                   <div class="flex items-center justify-between px-3">
-                    <span class="text-sm text-gray-500">共 {{ totalDischarges }} 筆，每頁 {{ pageSizeDischarges }} 筆</span>
+                    <span class="text-sm text-gray-500"
+                      >共 {{ totalDischarges }} 筆，每頁
+                      {{ pageSizeDischarges }} 筆</span
+                    >
                     <div class="inline-flex items-center gap-2">
-                      <button class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed" :disabled="currentPageDischarges === 1" @click="currentPageDischarges--">上一頁</button>
-                      <span class="px-2 text-sm tabular-nums text-brand-purple-dark">{{ currentPageDischarges }} / {{ totalPagesDischarges }}</span>
-                      <button class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed" :disabled="currentPageDischarges === totalPagesDischarges" @click="currentPageDischarges++">下一頁</button>
+                      <button
+                        class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed"
+                        :disabled="currentPageDischarges === 1"
+                        @click="currentPageDischarges--"
+                      >
+                        上一頁
+                      </button>
+                      <span
+                        class="px-2 text-sm tabular-nums text-brand-purple-dark"
+                        >{{ currentPageDischarges }} /
+                        {{ totalPagesDischarges }}</span
+                      >
+                      <button
+                        class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed"
+                        :disabled="
+                          currentPageDischarges === totalPagesDischarges
+                        "
+                        @click="currentPageDischarges++"
+                      >
+                        下一頁
+                      </button>
                     </div>
                   </div>
                 </div>
@@ -289,102 +468,302 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, onUnmounted } from 'vue'
+import { ref, computed, onMounted, onUnmounted } from "vue";
 
 // ---- DOM Ref ----
-const rootRef = ref(null)
+const rootRef = ref(null);
 
 // ====== Panel 狀態 ======
-const showPanel = ref(false)
-const panelType = ref(null)
-const panelTitle = computed(()=>{
-  if (panelType.value === 'residents') return '住民資訊'
-  if (panelType.value === 'inpatients') return '住院資訊'
-  if (panelType.value === 'discharges') return '今日離院'
-  return ''
-})
-function openPanel(type){ panelType.value = type; showPanel.value = true }
-function closePanel(){ showPanel.value = false; panelType.value = null }
+const showPanel = ref(false);
+const panelType = ref(null);
+const panelTitle = computed(() => {
+  if (panelType.value === "residents") return "住民資訊";
+  if (panelType.value === "inpatients") return "住院資訊";
+  if (panelType.value === "discharges") return "今日離院";
+  return "";
+});
+function openPanel(type) {
+  panelType.value = type;
+  showPanel.value = true;
+}
+function closePanel() {
+  showPanel.value = false;
+  panelType.value = null;
+}
 
 // ESC 返回
-function onKeydown(e){ if(e.key === 'Escape' && showPanel.value) closePanel() }
-onMounted(()=> window.addEventListener('keydown', onKeydown))
-onUnmounted(()=> window.removeEventListener('keydown', onKeydown))
+function onKeydown(e) {
+  if (e.key === "Escape" && showPanel.value) closePanel();
+}
+onMounted(() => window.addEventListener("keydown", onKeydown));
+onUnmounted(() => window.removeEventListener("keydown", onKeydown));
 
 // ====== 假資料 ======
-function generateBeds(count, start=1001){ const arr=[]; let n=start; while(arr.length<count){ if(!String(n).includes('4')) arr.push(n); n++ } return arr }
-const bedsResidents = generateBeds(12, 1001)
+function generateBeds(count, start = 1001) {
+  const arr = [];
+  let n = start;
+  while (arr.length < count) {
+    if (!String(n).includes("4")) arr.push(n);
+    n++;
+  }
+  return arr;
+}
+const bedsResidents = generateBeds(12, 1001);
 const residentsAll = [
-  { bed:bedsResidents[0],  name:'王小明', gender:'男', age:78, condition:'穩定',       note:'喜歡下棋',     area:'A' },
-  { bed:bedsResidents[1],  name:'陳美麗', gender:'女', age:82, condition:'需輕度協助', note:'糖尿病控制中', area:'A' },
-  { bed:bedsResidents[2],  name:'林大志', gender:'男', age:74, condition:'穩定',       note:'行動慢',       area:'A' },
-  { bed:bedsResidents[3],  name:'張翠華', gender:'女', age:80, condition:'復健中',     note:'膝關節置換術後', area:'A' },
-  { bed:bedsResidents[4],  name:'黃國榮', gender:'男', age:85, condition:'需中度協助', note:'夜間易醒',     area:'A' },
-  { bed:bedsResidents[5],  name:'李佩珊', gender:'女', age:76, condition:'穩定',       note:'對花粉過敏',   area:'A' },
-  { bed:bedsResidents[6],  name:'吳大同', gender:'男', age:79, condition:'穩定',       note:'喜歡園藝',     area:'B' },
-  { bed:bedsResidents[7],  name:'周怡君', gender:'女', age:81, condition:'需輕度協助', note:'高血壓',       area:'B' },
-  { bed:bedsResidents[8],  name:'曾文龍', gender:'男', age:77, condition:'復健中',     note:'髖關節手術後', area:'B' },
-  { bed:bedsResidents[9],  name:'蔡淑芬', gender:'女', age:83, condition:'穩定',       note:'喜歡編織',     area:'B' },
-  { bed:bedsResidents[10], name:'許建宏', gender:'男', age:75, condition:'需中度協助', note:'睡眠品質不佳', area:'B' },
-  { bed:bedsResidents[11], name:'簡婉婷', gender:'女', age:78, condition:'穩定',       note:'對海鮮過敏',   area:'B' },
-]
-const residentsA = computed(()=> residentsAll.filter(r=> r.area==='A'))
-const residentsB = computed(()=> residentsAll.filter(r=> r.area==='B'))
+  {
+    bed: bedsResidents[0],
+    name: "王小明",
+    gender: "男",
+    age: 78,
+    condition: "穩定",
+    note: "喜歡下棋",
+    area: "A",
+  },
+  {
+    bed: bedsResidents[1],
+    name: "陳美麗",
+    gender: "女",
+    age: 82,
+    condition: "需輕度協助",
+    note: "糖尿病控制中",
+    area: "A",
+  },
+  {
+    bed: bedsResidents[2],
+    name: "林大志",
+    gender: "男",
+    age: 74,
+    condition: "穩定",
+    note: "行動慢",
+    area: "A",
+  },
+  {
+    bed: bedsResidents[3],
+    name: "張翠華",
+    gender: "女",
+    age: 80,
+    condition: "復健中",
+    note: "膝關節置換術後",
+    area: "A",
+  },
+  {
+    bed: bedsResidents[4],
+    name: "黃國榮",
+    gender: "男",
+    age: 85,
+    condition: "需中度協助",
+    note: "夜間易醒",
+    area: "A",
+  },
+  {
+    bed: bedsResidents[5],
+    name: "李佩珊",
+    gender: "女",
+    age: 76,
+    condition: "穩定",
+    note: "對花粉過敏",
+    area: "A",
+  },
+  {
+    bed: bedsResidents[6],
+    name: "吳大同",
+    gender: "男",
+    age: 79,
+    condition: "穩定",
+    note: "喜歡園藝",
+    area: "B",
+  },
+  {
+    bed: bedsResidents[7],
+    name: "周怡君",
+    gender: "女",
+    age: 81,
+    condition: "需輕度協助",
+    note: "高血壓",
+    area: "B",
+  },
+  {
+    bed: bedsResidents[8],
+    name: "曾文龍",
+    gender: "男",
+    age: 77,
+    condition: "復健中",
+    note: "髖關節手術後",
+    area: "B",
+  },
+  {
+    bed: bedsResidents[9],
+    name: "蔡淑芬",
+    gender: "女",
+    age: 83,
+    condition: "穩定",
+    note: "喜歡編織",
+    area: "B",
+  },
+  {
+    bed: bedsResidents[10],
+    name: "許建宏",
+    gender: "男",
+    age: 75,
+    condition: "需中度協助",
+    note: "睡眠品質不佳",
+    area: "B",
+  },
+  {
+    bed: bedsResidents[11],
+    name: "簡婉婷",
+    gender: "女",
+    age: 78,
+    condition: "穩定",
+    note: "對海鮮過敏",
+    area: "B",
+  },
+];
+const residentsA = computed(() => residentsAll.filter((r) => r.area === "A"));
+const residentsB = computed(() => residentsAll.filter((r) => r.area === "B"));
 
-const bedsInpatient = generateBeds(4, 1020)
+const bedsInpatient = generateBeds(4, 1020);
 const inpatients = [
-  { bed:bedsInpatient[0], name:'劉書豪', hospitalDept:'台大醫院／心臟內科', recordNo:'A1023001', status:'加護中' },
-  { bed:bedsInpatient[1], name:'高雅筑', hospitalDept:'榮總／新陳代謝科', recordNo:'B1023007', status:'住院觀察' },
-  { bed:bedsInpatient[2], name:'方志明', hospitalDept:'長庚／骨科',     recordNo:'C1023011', status:'術後恢復' },
-  { bed:bedsInpatient[3], name:'鄭于庭', hospitalDept:'國泰／神經內科', recordNo:'D1023020', status:'檢查中' },
-]
+  {
+    bed: bedsInpatient[0],
+    name: "劉書豪",
+    hospitalDept: "台大醫院／心臟內科",
+    recordNo: "A1023001",
+    status: "加護中",
+  },
+  {
+    bed: bedsInpatient[1],
+    name: "高雅筑",
+    hospitalDept: "榮總／新陳代謝科",
+    recordNo: "B1023007",
+    status: "住院觀察",
+  },
+  {
+    bed: bedsInpatient[2],
+    name: "方志明",
+    hospitalDept: "長庚／骨科",
+    recordNo: "C1023011",
+    status: "術後恢復",
+  },
+  {
+    bed: bedsInpatient[3],
+    name: "鄭于庭",
+    hospitalDept: "國泰／神經內科",
+    recordNo: "D1023020",
+    status: "檢查中",
+  },
+];
 
-const bedsDischarge = generateBeds(3, 1101)
+const bedsDischarge = generateBeds(3, 1101);
 const discharges = [
-  { bed:bedsDischarge[0], name:'曾雅惠', reason:'返家照護', note:'家屬接回' },
-  { bed:bedsDischarge[1], name:'羅建明', reason:'轉院',     note:'轉長庚復健科' },
-  { bed:bedsDischarge[2], name:'陳子翔', reason:'康復出院', note:'定期回診' },
-]
+  {
+    bed: bedsDischarge[0],
+    name: "曾雅惠",
+    reason: "返家照護",
+    note: "家屬接回",
+  },
+  {
+    bed: bedsDischarge[1],
+    name: "羅建明",
+    reason: "轉院",
+    note: "轉長庚復健科",
+  },
+  {
+    bed: bedsDischarge[2],
+    name: "陳子翔",
+    reason: "康復出院",
+    note: "定期回診",
+  },
+];
 
 // ====== 待辦清單（沿用） ======
-const today = new Date()
-const todoRows = computed(()=>{
-  const fromInpatients = inpatients.map((p,i)=> ({ id:`in-${p.recordNo}`, resident:p.name, type:'知會事項', form:'住院通知', date:new Date(today.getFullYear(), today.getMonth(), today.getDate()-i), overdueDays:0 }))
-  const fromDischarges = discharges.map((d,i)=> ({ id:`dis-${d.bed}`, resident:d.name, type:'代辦事項', form:'出院追蹤', date:new Date(today.getFullYear(), today.getMonth(), today.getDate()-(i+1)), overdueDays:Math.min(3,i) }))
-  return [...fromInpatients, ...fromDischarges]
-})
+const today = new Date();
+const todoRows = computed(() => {
+  const fromInpatients = inpatients.map((p, i) => ({
+    id: `in-${p.recordNo}`,
+    resident: p.name,
+    type: "知會事項",
+    form: "住院通知",
+    date: new Date(today.getFullYear(), today.getMonth(), today.getDate() - i),
+    overdueDays: 0,
+  }));
+  const fromDischarges = discharges.map((d, i) => ({
+    id: `dis-${d.bed}`,
+    resident: d.name,
+    type: "代辦事項",
+    form: "出院追蹤",
+    date: new Date(
+      today.getFullYear(),
+      today.getMonth(),
+      today.getDate() - (i + 1)
+    ),
+    overdueDays: Math.min(3, i),
+  }));
+  return [...fromInpatients, ...fromDischarges];
+});
 
 // 分頁（Todos）
-const pageSize = ref(8)
-const currentPage = ref(1)
-const total = computed(()=> todoRows.value.length)
-const totalPages = computed(()=> Math.max(1, Math.ceil(total.value / pageSize.value)))
-const pagedRows = computed(()=>{ const start = (currentPage.value - 1) * pageSize.value; return todoRows.value.slice(start, start + pageSize.value) })
+const pageSize = ref(8);
+const currentPage = ref(1);
+const total = computed(() => todoRows.value.length);
+const totalPages = computed(() =>
+  Math.max(1, Math.ceil(total.value / pageSize.value))
+);
+const pagedRows = computed(() => {
+  const start = (currentPage.value - 1) * pageSize.value;
+  return todoRows.value.slice(start, start + pageSize.value);
+});
 
 // ====== Residents：單一分頁（A/B 共用；分頁不在 scroll 內） ======
-const pageSizeResidents = ref(10)
-const currentPageResidents = ref(1)
-const totalResidents = computed(()=> residentsAll.length)
-const totalPagesResidents = computed(()=> Math.max(1, Math.ceil(totalResidents.value / pageSizeResidents.value)))
-const pagedResidentsAll = computed(()=>{ const start = (currentPageResidents.value - 1) * pageSizeResidents.value; return residentsAll.slice(start, start + pageSizeResidents.value) })
-const pagedResidentsA = computed(()=> pagedResidentsAll.value.filter(r=> r.area==='A'))
-const pagedResidentsB = computed(()=> pagedResidentsAll.value.filter(r=> r.area==='B'))
+const pageSizeResidents = ref(10);
+const currentPageResidents = ref(1);
+const totalResidents = computed(() => residentsAll.length);
+const totalPagesResidents = computed(() =>
+  Math.max(1, Math.ceil(totalResidents.value / pageSizeResidents.value))
+);
+const pagedResidentsAll = computed(() => {
+  const start = (currentPageResidents.value - 1) * pageSizeResidents.value;
+  return residentsAll.slice(start, start + pageSizeResidents.value);
+});
+const pagedResidentsA = computed(() =>
+  pagedResidentsAll.value.filter((r) => r.area === "A")
+);
+const pagedResidentsB = computed(() =>
+  pagedResidentsAll.value.filter((r) => r.area === "B")
+);
 
 // ====== Inpatients：固定底部分頁 ======
-const pageSizeInpatients = ref(8)
-const currentPageInpatients = ref(1)
-const totalInpatients = computed(()=> inpatients.length)
-const totalPagesInpatients = computed(()=> Math.max(1, Math.ceil(totalInpatients.value / pageSizeInpatients.value)))
-const pagedInpatients = computed(()=>{ const start = (currentPageInpatients.value - 1) * pageSizeInpatients.value; return inpatients.slice(start, start + pageSizeInpatients.value) })
+const pageSizeInpatients = ref(8);
+const currentPageInpatients = ref(1);
+const totalInpatients = computed(() => inpatients.length);
+const totalPagesInpatients = computed(() =>
+  Math.max(1, Math.ceil(totalInpatients.value / pageSizeInpatients.value))
+);
+const pagedInpatients = computed(() => {
+  const start = (currentPageInpatients.value - 1) * pageSizeInpatients.value;
+  return inpatients.slice(start, start + pageSizeInpatients.value);
+});
 
 // ====== Discharges：固定底部分頁 ======
-const pageSizeDischarges = ref(8)
-const currentPageDischarges = ref(1)
-const totalDischarges = computed(()=> discharges.length)
-const totalPagesDischarges = computed(()=> Math.max(1, Math.ceil(totalDischarges.value / pageSizeDischarges.value)))
-const pagedDischarges = computed(()=>{ const start = (currentPageDischarges.value - 1) * pageSizeDischarges.value; return discharges.slice(start, start + pageSizeDischarges.value) })
+const pageSizeDischarges = ref(8);
+const currentPageDischarges = ref(1);
+const totalDischarges = computed(() => discharges.length);
+const totalPagesDischarges = computed(() =>
+  Math.max(1, Math.ceil(totalDischarges.value / pageSizeDischarges.value))
+);
+const pagedDischarges = computed(() => {
+  const start = (currentPageDischarges.value - 1) * pageSizeDischarges.value;
+  return discharges.slice(start, start + pageSizeDischarges.value);
+});
 
 // 工具：日期格式化
-function pad(n){ return n.toString().padStart(2,'0') }
-function formatDate(d){ const yy=d.getFullYear(); const mm=pad(d.getMonth()+1); const dd=pad(d.getDate()); return `${yy}-${mm}-${dd}` }
+function pad(n) {
+  return n.toString().padStart(2, "0");
+}
+function formatDate(d) {
+  const yy = d.getFullYear();
+  const mm = pad(d.getMonth() + 1);
+  const dd = pad(d.getDate());
+  return `${yy}-${mm}-${dd}`;
+}
 </script>
diff --git a/src/pages/operation/index.vue b/src/pages/operation/index.vue
index f8d9c65..5c63ecc 100644
--- a/src/pages/operation/index.vue
+++ b/src/pages/operation/index.vue
@@ -4,33 +4,49 @@
     <div class="flex-[2] grid grid-cols-3 gap-2 max-h-[150px]">
       <!-- 住民人數 Card -->
       <div
-        class="col-span-1 cursor-pointer text-white bg-brand-green hover:bg-brand-green hover:opacity-90 active:opacity-80 rounded-md shadow px-4 pt-3 flex flex-col justify-center items-start tracking-widest"
+        class="col-span-1 cursor-pointer text-white bg-brand-green hover:bg-brand-green hover:opacity-80 active:opacity-70 rounded-md shadow px-4 pt-3 flex flex-col justify-center items-start tracking-widest"
         @click="openPanel('residents')"
       >
         <div class="flex justify-center items-center gap-4">
           <p>現在住民／立案床數</p>
           <span>
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
-              <path fill="currentColor" d="M12 9a3 3 0 0 0-3 3a3 3 0 0 0 3 3a3 3 0 0 0 3-3a3 3 0 0 0-3-3m0 8a5 5 0 0 1-5-5a5 5 0 0 1 5-5a5 5 0 0 1 5 5a5 5 0 0 1-5 5m0-12.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5" />
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="16"
+              height="16"
+              viewBox="0 0 24 24"
+            >
+              <path
+                fill="currentColor"
+                d="M12 9a3 3 0 0 0-3 3a3 3 0 0 0 3 3a3 3 0 0 0 3-3a3 3 0 0 0-3-3m0 8a5 5 0 0 1-5-5a5 5 0 0 1 5-5a5 5 0 0 1 5 5a5 5 0 0 1-5 5m0-12.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5"
+              />
             </svg>
           </span>
         </div>
         <div class="flex justify-center items-baseline gap-1">
-          <p class="text-[40px] font-nats">36/49</p>
+          <p class="text-[40px] font-nats">36/48</p>
           <p class="text-[12px]">人</p>
         </div>
       </div>
 
       <!-- 住院人數 Card -->
       <div
-        class="col-span-1 cursor-pointer text-white bg-brand-green hover:bg-brand-green hover:opacity-90 active:opacity-80 rounded-md shadow px-4 pt-3 flex flex-col justify-center items-start tracking-widest"
+        class="col-span-1 cursor-pointer text-white bg-brand-green hover:bg-brand-green hover:opacity-80 active:opacity-70 rounded-md shadow px-4 pt-3 flex flex-col justify-center items-start tracking-widest"
         @click="openPanel('inpatients')"
       >
         <div class="flex justify-center items-center gap-4">
           <p>今日住院／當月累積住院</p>
           <span>
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
-              <path fill="currentColor" d="M12 9a3 3 0 0 0-3 3a3 3 0 0 0 3 3a3 3 0 0 0 3-3a3 3 0 0 0-3-3m0 8a5 5 0 0 1-5-5a5 5 0 0 1 5-5a5 5 0 0 1 5 5a5 5 0 0 1-5 5m0-12.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5" />
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="16"
+              height="16"
+              viewBox="0 0 24 24"
+            >
+              <path
+                fill="currentColor"
+                d="M12 9a3 3 0 0 0-3 3a3 3 0 0 0 3 3a3 3 0 0 0 3-3a3 3 0 0 0-3-3m0 8a5 5 0 0 1-5-5a5 5 0 0 1 5-5a5 5 0 0 1 5 5a5 5 0 0 1-5 5m0-12.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5"
+              />
             </svg>
           </span>
         </div>
@@ -42,19 +58,27 @@
 
       <!-- 今日離院 Card -->
       <div
-        class="col-span-1 cursor-pointer text-white bg-brand-green hover:bg-brand-green hover:opacity-90 active:opacity-80 rounded-md shadow px-4 pt-3 flex flex-col justify-center items-start tracking-widest"
+        class="col-span-1 cursor-pointer text-white bg-brand-green hover:bg-brand-green hover:opacity-80 active:opacity-70 rounded-md shadow px-4 pt-3 flex flex-col justify-center items-start tracking-widest"
         @click="openPanel('discharges')"
       >
         <div class="flex justify-center items-center gap-4">
           <p>今日離院／當月累積離院</p>
           <span>
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
-              <path fill="currentColor" d="M12 9a3 3 0 0 0-3 3a3 3 0 0 0 3 3a3 3 0 0 0 3-3a3 3 0 0 0-3-3m0 8a5 5 0 0 1-5-5a5 5 0 0 1 5-5a5 5 0 0 1 5 5a5 5 0 0 1-5 5m0-12.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5" />
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="16"
+              height="16"
+              viewBox="0 0 24 24"
+            >
+              <path
+                fill="currentColor"
+                d="M12 9a3 3 0 0 0-3 3a3 3 0 0 0 3 3a3 3 0 0 0 3-3a3 3 0 0 0-3-3m0 8a5 5 0 0 1-5-5a5 5 0 0 1 5-5a5 5 0 0 1 5 5a5 5 0 0 1-5 5m0-12.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5"
+              />
             </svg>
           </span>
         </div>
         <div class="flex justify-center items-baseline gap-1">
-          <p class="text-[40px] font-nats">0/49</p>
+          <p class="text-[40px] font-nats">0/48</p>
           <p class="text-[12px]">人</p>
         </div>
       </div>
@@ -74,14 +98,20 @@
         <div v-if="!showPanel" key="charts" class="absolute inset-0">
           <div class="flex flex-col gap-2 w-full h-full">
             <div class="flex-[5] grid grid-cols-2 gap-2 min-h-0">
-              <div class="col-span-1 bg-white bg-opacity-70 rounded-md shadow p-2 flex justify-center items-center">
+              <div
+                class="col-span-1 bg-white/50 rounded-md shadow p-2 flex justify-center items-center"
+              >
                 <div ref="chartARef" class="w-full h-[90%] min-h-[200px]"></div>
               </div>
-              <div class="col-span-1 bg-white bg-opacity-70 rounded-md shadow p-2 flex justify-center items-center">
+              <div
+                class="col-span-1 bg-white/50 rounded-md shadow p-2 flex justify-center items-center"
+              >
                 <div ref="chartBRef" class="w-full h-[90%] min-h-[200px]"></div>
               </div>
             </div>
-            <div class="bg-white bg-opacity-70 rounded-md shadow p-2 flex flex-col justify-center items-start flex-[5] min-h-0">
+            <div
+              class="bg-white/50 rounded-md shadow p-2 flex flex-col justify-center items-start flex-[5] min-h-0"
+            >
               <div ref="chartCRef" class="w-full h-[90%] min-h-[200px]"></div>
             </div>
           </div>
@@ -102,11 +132,28 @@
                   @click="closePanel"
                   aria-label="回到上一頁"
                 >
-                  <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24">
-                    <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m12 19-7-7 7-7m7 7H5" />
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="16"
+                    height="16"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      fill="none"
+                      stroke="currentColor"
+                      stroke-linecap="round"
+                      stroke-linejoin="round"
+                      stroke-width="2"
+                      d="m12 19-7-7 7-7m7 7H5"
+                    />
                   </svg>
                 </button>
-                <h3 id="panel-title" class="text-2xl font-bold text-brand-black">{{ panelTitle }}</h3>
+                <h3
+                  id="panel-title"
+                  class="text-2xl font-bold text-brand-black"
+                >
+                  {{ panelTitle }}
+                </h3>
               </div>
 
               <!-- 內層：上方可滾動；底部依 panel 顯示對應分頁（固定，不隨 scroll） -->
@@ -116,10 +163,16 @@
                   <!-- 內容：住民資訊（A / B 共用 Residents 分頁） -->
                   <div v-if="panelType === 'residents'" class="space-y-8">
                     <section>
-                      <h4 class="text-lg font-semibold text-gray-700 mb-3">A 區</h4>
+                      <h4 class="text-lg font-semibold text-gray-700 mb-3">
+                        A 區
+                      </h4>
                       <div class="overflow-x-auto">
-                        <table class="min-w-full text-sm text-brand-black table-fixed">
-                          <thead class="sticky top-0 z-[1] bg-brand-gray-lighter">
+                        <table
+                          class="min-w-full text-sm text-brand-black table-fixed"
+                        >
+                          <thead
+                            class="sticky top-0 z-[1] bg-brand-gray-lighter"
+                          >
                             <tr class="text-left">
                               <th class="px-3 py-2 w-20">床位</th>
                               <th class="px-3 py-2 w-24">姓名</th>
@@ -130,7 +183,11 @@
                             </tr>
                           </thead>
                           <tbody>
-                            <tr v-for="r in pagedResidentsA" :key="r.bed" class="border-b last:border-b-0 hover:bg-brand-gray-lighter">
+                            <tr
+                              v-for="r in pagedResidentsA"
+                              :key="r.bed"
+                              class="border-b last:border-b-0 hover:bg-brand-gray-lighter"
+                            >
                               <td class="px-3 py-2 font-mono">{{ r.bed }}</td>
                               <td class="px-3 py-2">{{ r.name }}</td>
                               <td class="px-3 py-2">{{ r.gender }}</td>
@@ -144,10 +201,16 @@
                     </section>
 
                     <section>
-                      <h4 class="text-lg font-semibold text-gray-700 mb-3">B 區</h4>
+                      <h4 class="text-lg font-semibold text-gray-700 mb-3">
+                        B 區
+                      </h4>
                       <div class="overflow-x-auto">
-                        <table class="min-w-full text-sm text-brand-black table-fixed">
-                          <thead class="sticky top-0 z-[1] bg-brand-gray-lighter">
+                        <table
+                          class="min-w-full text-sm text-brand-black table-fixed"
+                        >
+                          <thead
+                            class="sticky top-0 z-[1] bg-brand-gray-lighter"
+                          >
                             <tr class="text-left">
                               <th class="px-3 py-2 w-20">床位</th>
                               <th class="px-3 py-2 w-24">姓名</th>
@@ -158,7 +221,11 @@
                             </tr>
                           </thead>
                           <tbody>
-                            <tr v-for="r in pagedResidentsB" :key="r.bed" class="border-b last:border-b-0 hover:bg-brand-gray-lighter">
+                            <tr
+                              v-for="r in pagedResidentsB"
+                              :key="r.bed"
+                              class="border-b last:border-b-0 hover:bg-brand-gray-lighter"
+                            >
                               <td class="px-3 py-2 font-mono">{{ r.bed }}</td>
                               <td class="px-3 py-2">{{ r.name }}</td>
                               <td class="px-3 py-2">{{ r.gender }}</td>
@@ -175,7 +242,9 @@
                   <!-- 內容：住院資訊（表格用分頁資料） -->
                   <div v-else-if="panelType === 'inpatients'" class="space-y-8">
                     <div class="overflow-x-auto">
-                      <table class="min-w-full text-sm text-brand-black table-fixed">
+                      <table
+                        class="min-w-full text-sm text-brand-black table-fixed"
+                      >
                         <thead class="sticky top-0 z-[1] bg-brand-gray-lighter">
                           <tr class="text-left">
                             <th class="px-3 py-2 w-20">床位</th>
@@ -186,11 +255,17 @@
                           </tr>
                         </thead>
                         <tbody>
-                          <tr v-for="p in pagedInpatients" :key="p.recordNo" class="border-b last:border-b-0 hover:bg-brand-gray-lighter">
+                          <tr
+                            v-for="p in pagedInpatients"
+                            :key="p.recordNo"
+                            class="border-b last:border-b-0 hover:bg-brand-gray-lighter"
+                          >
                             <td class="px-3 py-2 font-mono">{{ p.bed }}</td>
                             <td class="px-3 py-2">{{ p.name }}</td>
                             <td class="px-3 py-2">{{ p.hospitalDept }}</td>
-                            <td class="px-3 py-2 font-mono">{{ p.recordNo }}</td>
+                            <td class="px-3 py-2 font-mono">
+                              {{ p.recordNo }}
+                            </td>
                             <td class="px-3 py-2">{{ p.status }}</td>
                           </tr>
                         </tbody>
@@ -201,7 +276,9 @@
                   <!-- 內容：今日離院（表格用分頁資料） -->
                   <div v-else-if="panelType === 'discharges'" class="space-y-8">
                     <div class="overflow-x-auto">
-                      <table class="min-w-full text-sm text-brand-black table-fixed">
+                      <table
+                        class="min-w-full text-sm text-brand-black table-fixed"
+                      >
                         <thead class="sticky top-0 z-[1] bg-brand-gray-lighter">
                           <tr class="text-left">
                             <th class="px-3 py-2 w-20">床位</th>
@@ -211,7 +288,11 @@
                           </tr>
                         </thead>
                         <tbody>
-                          <tr v-for="d in pagedDischarges" :key="d.bed" class="border-b last:border-b-0 hover:bg-brand-gray-lighter">
+                          <tr
+                            v-for="d in pagedDischarges"
+                            :key="d.bed"
+                            class="border-b last:border-b-0 hover:bg-brand-gray-lighter"
+                          >
                             <td class="px-3 py-2 font-mono">{{ d.bed }}</td>
                             <td class="px-3 py-2">{{ d.name }}</td>
                             <td class="px-3 py-2">{{ d.reason }}</td>
@@ -226,35 +307,102 @@
                 <!-- ★ Residents 單一分頁（固定底部） -->
                 <div v-if="panelType === 'residents'" class="shrink-0 pt-3">
                   <div class="flex items-center justify-between px-3">
-                    <span class="text-sm text-gray-500">共 {{ totalResidents }} 筆，每頁 {{ pageSizeResidents }} 筆</span>
+                    <span class="text-sm text-gray-500"
+                      >共 {{ totalResidents }} 筆，每頁
+                      {{ pageSizeResidents }} 筆</span
+                    >
                     <div class="inline-flex items-center gap-2">
-                      <button class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed" :disabled="currentPageResidents === 1" @click="currentPageResidents--">上一頁</button>
-                      <span class="px-2 text-sm tabular-nums text-brand-purple-dark">{{ currentPageResidents }} / {{ totalPagesResidents }}</span>
-                      <button class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed" :disabled="currentPageResidents === totalPagesResidents" @click="currentPageResidents++">下一頁</button>
+                      <button
+                        class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed"
+                        :disabled="currentPageResidents === 1"
+                        @click="currentPageResidents--"
+                      >
+                        上一頁
+                      </button>
+                      <span
+                        class="px-2 text-sm tabular-nums text-brand-purple-dark"
+                        >{{ currentPageResidents }} /
+                        {{ totalPagesResidents }}</span
+                      >
+                      <button
+                        class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed"
+                        :disabled="currentPageResidents === totalPagesResidents"
+                        @click="currentPageResidents++"
+                      >
+                        下一頁
+                      </button>
                     </div>
                   </div>
                 </div>
 
                 <!-- ★ Inpatients 分頁（固定底部） -->
-                <div v-else-if="panelType === 'inpatients'" class="shrink-0 pt-3">
+                <div
+                  v-else-if="panelType === 'inpatients'"
+                  class="shrink-0 pt-3"
+                >
                   <div class="flex items-center justify-between px-3">
-                    <span class="text-sm text-gray-500">共 {{ totalInpatients }} 筆，每頁 {{ pageSizeInpatients }} 筆</span>
+                    <span class="text-sm text-gray-500"
+                      >共 {{ totalInpatients }} 筆，每頁
+                      {{ pageSizeInpatients }} 筆</span
+                    >
                     <div class="inline-flex items-center gap-2">
-                      <button class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed" :disabled="currentPageInpatients === 1" @click="currentPageInpatients--">上一頁</button>
-                      <span class="px-2 text-sm tabular-nums text-brand-purple-dark">{{ currentPageInpatients }} / {{ totalPagesInpatients }}</span>
-                      <button class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed" :disabled="currentPageInpatients === totalPagesInpatients" @click="currentPageInpatients++">下一頁</button>
+                      <button
+                        class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed"
+                        :disabled="currentPageInpatients === 1"
+                        @click="currentPageInpatients--"
+                      >
+                        上一頁
+                      </button>
+                      <span
+                        class="px-2 text-sm tabular-nums text-brand-purple-dark"
+                        >{{ currentPageInpatients }} /
+                        {{ totalPagesInpatients }}</span
+                      >
+                      <button
+                        class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed"
+                        :disabled="
+                          currentPageInpatients === totalPagesInpatients
+                        "
+                        @click="currentPageInpatients++"
+                      >
+                        下一頁
+                      </button>
                     </div>
                   </div>
                 </div>
 
                 <!-- ★ Discharges 分頁（固定底部） -->
-                <div v-else-if="panelType === 'discharges'" class="shrink-0 pt-3">
+                <div
+                  v-else-if="panelType === 'discharges'"
+                  class="shrink-0 pt-3"
+                >
                   <div class="flex items-center justify-between px-3">
-                    <span class="text-sm text-gray-500">共 {{ totalDischarges }} 筆，每頁 {{ pageSizeDischarges }} 筆</span>
+                    <span class="text-sm text-gray-500"
+                      >共 {{ totalDischarges }} 筆，每頁
+                      {{ pageSizeDischarges }} 筆</span
+                    >
                     <div class="inline-flex items-center gap-2">
-                      <button class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed" :disabled="currentPageDischarges === 1" @click="currentPageDischarges--">上一頁</button>
-                      <span class="px-2 text-sm tabular-nums text-brand-purple-dark">{{ currentPageDischarges }} / {{ totalPagesDischarges }}</span>
-                      <button class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed" :disabled="currentPageDischarges === totalPagesDischarges" @click="currentPageDischarges++">下一頁</button>
+                      <button
+                        class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed"
+                        :disabled="currentPageDischarges === 1"
+                        @click="currentPageDischarges--"
+                      >
+                        上一頁
+                      </button>
+                      <span
+                        class="px-2 text-sm tabular-nums text-brand-purple-dark"
+                        >{{ currentPageDischarges }} /
+                        {{ totalPagesDischarges }}</span
+                      >
+                      <button
+                        class="btn btn-sm btn-outline border-brand-purple-dark text-brand-purple-dark hover:bg-brand-purple hover:text-white hover:border-brand-purple disabled:!opacity-100 disabled:!text-gray-300 disabled:!border-gray-300 disabled:cursor-not-allowed"
+                        :disabled="
+                          currentPageDischarges === totalPagesDischarges
+                        "
+                        @click="currentPageDischarges++"
+                      >
+                        下一頁
+                      </button>
                     </div>
                   </div>
                 </div>
@@ -269,179 +417,608 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, onUnmounted, nextTick } from 'vue'
-import * as echarts from 'echarts'
-import { brand } from '@/styles/palette'
+import { ref, computed, onMounted, onUnmounted, nextTick } from "vue";
+import * as echarts from "echarts";
+import { brand } from "@/styles/palette";
 
 // ---- DOM Refs ----
-const rootRef = ref(null)
-const chartARef = ref(null)
-const chartBRef = ref(null)
-const chartCRef = ref(null)
+const rootRef = ref(null);
+const chartARef = ref(null);
+const chartBRef = ref(null);
+const chartCRef = ref(null);
 
 // ---- Chart instances ----
-let chartA, chartB, chartC
+let chartA, chartB, chartC;
+
+let animTimers = []; // 動畫計時器收集，切畫面時要清掉
+
+function playBoxplotOpen(chart, buildOptionFn) {
+  const opt0 = buildOptionFn("median");
+  chart.setOption(opt0, true);
+
+  // 第二段：展到 Q1/Q3
+  animTimers.push(
+    setTimeout(() => {
+      chart.setOption(
+        { series: [{ data: opt0.__quartileBoxData }] },
+        { notMerge: false }
+      );
+    }, 120) // 可依喜好調整
+  );
+
+  // 第三段：展到 min/max
+  animTimers.push(
+    setTimeout(() => {
+      chart.setOption(
+        { series: [{ data: opt0.__realBoxData }] },
+        { notMerge: false }
+      );
+    }, 520) // 對應 animationDurationUpdate 的節奏
+  );
+}
 
 // ====== 假資料工具 ======
-function genRates(n, base = 82, variation = 10){
-  const clamp = (v)=> Math.max(0, Math.min(100, v))
-  const arr = []
-  for (let i=0;i<n;i++){ const noise = (Math.random()*2-1)*variation; arr.push(Number(clamp(base+noise).toFixed(1))) }
-  return arr
+function genRates(n, base = 82, variation = 10) {
+  const clamp = (v) => Math.max(0, Math.min(100, v));
+  const arr = [];
+  for (let i = 0; i < n; i++) {
+    const noise = (Math.random() * 2 - 1) * variation;
+    arr.push(Number(clamp(base + noise).toFixed(1)));
+  }
+  return arr;
 }
-function getLastNMonthLabels(n=6){
-  const now = new Date(); const labels = []
-  for(let i=n-1;i>=0;i--){ const d = new Date(now.getFullYear(), now.getMonth()-i, 1); labels.push(`${d.getMonth()+1}月`) }
-  return labels
+function getLastNMonthLabels(n = 6) {
+  const now = new Date();
+  const labels = [];
+  for (let i = n - 1; i >= 0; i--) {
+    const d = new Date(now.getFullYear(), now.getMonth() - i, 1);
+    labels.push(`${d.getMonth() + 1}月`);
+  }
+  return labels;
 }
-function quantile(sorted,q){ const pos=(sorted.length-1)*q; const base=Math.floor(pos); const rest=pos-base; return sorted[base+1]!==undefined? sorted[base]+rest*(sorted[base+1]-sorted[base]) : sorted[base] }
-function toBoxplot(groups){
-  const boxData=[], outliers=[]
-  groups.forEach((arr,idx)=>{
-    const s=[...arr].sort((a,b)=>a-b)
-    const q1=quantile(s,0.25), med=quantile(s,0.5), q3=quantile(s,0.75)
-    const iqr=q3-q1, lf=q1-1.5*iqr, uf=q3+1.5*iqr
-    const inside=s.filter(v=> v>=lf && v<=uf)
-    const min=inside.length? inside[0]: q1
-    const max=inside.length? inside[inside.length-1]: q3
-    s.forEach(v=>{ if(v<lf||v>uf) outliers.push([idx,v]) })
-    boxData.push([+min.toFixed(1), +q1.toFixed(1), +med.toFixed(1), +q3.toFixed(1), +max.toFixed(1)])
-  })
-  return { boxData, outliers }
+function quantile(sorted, q) {
+  const pos = (sorted.length - 1) * q;
+  const base = Math.floor(pos);
+  const rest = pos - base;
+  return sorted[base + 1] !== undefined
+    ? sorted[base] + rest * (sorted[base + 1] - sorted[base])
+    : sorted[base];
+}
+function toBoxplot(groups) {
+  const boxData = [],
+    outliers = [];
+  groups.forEach((arr, idx) => {
+    const s = [...arr].sort((a, b) => a - b);
+    const q1 = quantile(s, 0.25),
+      med = quantile(s, 0.5),
+      q3 = quantile(s, 0.75);
+    const iqr = q3 - q1,
+      lf = q1 - 1.5 * iqr,
+      uf = q3 + 1.5 * iqr;
+    const inside = s.filter((v) => v >= lf && v <= uf);
+    const min = inside.length ? inside[0] : q1;
+    const max = inside.length ? inside[inside.length - 1] : q3;
+    s.forEach((v) => {
+      if (v < lf || v > uf) outliers.push([idx, v]);
+    });
+    boxData.push([
+      +min.toFixed(1),
+      +q1.toFixed(1),
+      +med.toFixed(1),
+      +q3.toFixed(1),
+      +max.toFixed(1),
+    ]);
+  });
+  return { boxData, outliers };
 }
 
 // ====== Charts Options ======
-const commonGrid={ left:40, right:20, top:60, bottom:30, containLabel:true }
-function mkTitle(text, subtext=''){
+const commonGrid = {
+  left: 40,
+  right: 20,
+  top: 60,
+  bottom: 30,
+  containLabel: true,
+};
+function mkTitle(text, subtext = "") {
   return {
-    text: `{main|${text}} {sub|${subtext}}`, left:20, top:6,
-    textStyle:{ rich:{ main:{ color:brand.black, fontSize:24, fontWeight:600, fontFamily:'"Noto Sans TC"' }, sub:{ color:brand.gray, fontSize:16, fontWeight:400, fontFamily:'"Noto Sans TC"' } } },
-    subtext:''
-  }
+    text: `{main|${text}} {sub|${subtext}}`,
+    left: 20,
+    top: 6,
+    textStyle: {
+      rich: {
+        main: {
+          color: brand.black,
+          fontSize: 24,
+          fontWeight: 600,
+          fontFamily: '"Noto Sans TC"',
+        },
+        sub: {
+          color: brand.gray,
+          fontSize: 16,
+          fontWeight: 400,
+          fontFamily: '"Noto Sans TC"',
+        },
+      },
+    },
+    subtext: "",
+  };
 }
-function buildOptionA(){
-  const labels=getLastNMonthLabels(6)
-  const raw=labels.map((_,i)=> genRates(30, 88-i*1.5, 10).map(v=> Math.max(0, Math.min(100,v))))
-  const { boxData }=toBoxplot(raw)
-  const BOX=brand.purpleDark
-  return { title: mkTitle('佔床率','（近 6 個月）'), grid:commonGrid, xAxis:{type:'category', data:labels}, yAxis:{type:'value', min:0, max:100, axisLabel:{formatter:'{value}%'}, splitArea:{ show:true, areaStyle:{ color:[brand.white, brand.grayLighter] } }}, series:[{ name:'箱型圖', type:'boxplot', data:boxData, itemStyle:{ color:brand.greenLight, borderColor:BOX }, lineStyle:{ color:BOX } }] }
+
+// 以「中位數」收起： [min, q1, med, q3, max] → [med, med, med, med, med]
+function collapseToMedian(boxData) {
+  return boxData.map(([min, q1, med, q3, max]) => [med, med, med, med, med]);
 }
-function buildOptionB(){
-  const labels=getLastNMonthLabels(6)
-  const raw=labels.map((_,i)=> genRates(30, 8+i*1.2, 6).map(v=> Math.max(0, Math.min(40,v))))
-  const { boxData }=toBoxplot(raw)
-  const BOX=brand.purpleDark
-  return { title: mkTitle('住院率','（近 6 個月）'), grid:commonGrid, xAxis:{type:'category', data:labels}, yAxis:{type:'value', min:0, max:40, axisLabel:{formatter:'{value}%'} , splitArea:{ show:true, areaStyle:{ color:[brand.white, brand.grayLighter] } }}, series:[{ name:'箱型圖', type:'boxplot', data:boxData, itemStyle:{ color:brand.greenLight, borderColor:BOX }, lineStyle:{ color:BOX } }] }
+
+// 先展開到四分位： [min, q1, med, q3, max] → [q1, q1, med, q3, q3]
+function expandToQuartiles(boxData) {
+  return boxData.map(([min, q1, med, q3, max]) => [q1, q1, med, q3, q3]);
 }
-function buildOptionC(){
-  const days=Array.from({length:30},(_,i)=>`${i+1}日`)
-  const thisMonth=genRates(30,86,6).map((v,i)=> Number((v+Math.sin(i/4)*2).toFixed(1)))
-  const lastMonth=genRates(30,83,7).map((v,i)=> Number((v+Math.cos(i/5)*2).toFixed(1)))
-  const lastYearSameMonth=genRates(30,80,8).map((v,i)=> Number((v+Math.sin(i/3)*1.5).toFixed(1)))
-  return { title: mkTitle('每日佔床率比較','（近 30 天）'), legend:{ top:28, data:['機構 A','本機構','機構 B'] }, tooltip:{ trigger:'axis', valueFormatter:(v)=>`${v}%` }, grid:{ ...commonGrid, top:64 }, xAxis:{type:'category', data:days, boundaryGap:false}, yAxis:{ type:'value', min:0, max:100, axisLabel:{formatter:'{value}%'}, splitArea:{ show:true, areaStyle:{ color:[brand.white, brand.grayLighter] } } }, color:[brand.green, brand.purple, brand.yellow], series:[ {name:'機構 A', type:'line', data:thisMonth}, {name:'本機構', type:'line', data:lastMonth}, {name:'機構 B', type:'line', data:lastYearSameMonth} ] }
+
+// 共用動畫參數（含更新動畫）
+const baseAnim = {
+  animation: true,
+  animationDuration: 200, // 初次渲染（收成中線）
+  animationEasing: "cubicOut",
+  animationDurationUpdate: 200, // 每段展開的時長
+  animationEasingUpdate: "cubicOut",
+  animationDelayUpdate: (i) => i * 80, // 逐月份階梯展開
+};
+
+// === Boxplot 專用 Tooltip（只顯示最小/中位/最大；不顯示 Q1/Q3）===
+function boxTooltipTW(p) {
+  // boxplot 的資料是 [min, Q1, median, Q3, max]
+  const v = p.data || p.value || [];
+  const name = Array.isArray(p.name) ? p.name.join(" / ") : p.name ?? "";
+
+  // 你的 A/B 都是百分比量測，所以這裡加上 %；若有純數值可自行拿掉 %
+  const fmt = (n) => (n == null ? "—" : `${n}%`);
+
+  return [
+    `<div class="flex flex-col gap-1">`,
+    `  <div>${name}</div>`,
+    `  <div class="flex justify-between items-center gap-4">最小值<span class="font-semibold">${fmt(
+      v[0]
+    )}</span></div>`,
+    `  <div class="flex justify-between items-center gap-4">中位數<span class="font-semibold">${fmt(
+      v[2]
+    )}</span></div>`,
+    `  <div class="flex justify-between items-center gap-4">最大值<span class="font-semibold">${fmt(
+      v[4]
+    )}</span></div>`,
+
+    `</div>`,
+  ].join("");
+}
+
+function buildOptionA(collapsedStage = "median") {
+  const labels = getLastNMonthLabels(6);
+  const raw = labels.map((_, i) =>
+    genRates(30, 88 - i * 1.5, 10).map((v) => Math.max(0, Math.min(100, v)))
+  );
+  const { boxData } = toBoxplot(raw);
+  const BOX = brand.purpleDark;
+
+  let firstPaintData = boxData;
+  if (collapsedStage === "median") firstPaintData = collapseToMedian(boxData);
+  if (collapsedStage === "quartile")
+    firstPaintData = expandToQuartiles(boxData);
+
+  return {
+    ...baseAnim,
+    title: mkTitle("佔床率", "（近 6 個月）"),
+    tooltip: {
+      trigger: "item",
+      axisPointer: { type: "shadow" },
+      formatter: boxTooltipTW,
+    },
+    grid: commonGrid,
+    xAxis: { type: "category", data: labels },
+    yAxis: {
+      type: "value",
+      min: 0,
+      max: 100,
+      axisLabel: { formatter: "{value}%" },
+      splitArea: {
+        show: true,
+        areaStyle: { color: [brand.white, brand.grayLighter] },
+      },
+    },
+    series: [
+      {
+        name: "箱型圖",
+        type: "boxplot",
+        data: firstPaintData,
+        itemStyle: { color: brand.greenLight, borderColor: BOX },
+        lineStyle: { color: BOX },
+        animationDelay: (idx) => idx * 50,
+      },
+    ],
+    __realBoxData: boxData,
+    __quartileBoxData: expandToQuartiles(boxData),
+  };
+}
+
+function buildOptionB(collapsedStage = "median") {
+  const labels = getLastNMonthLabels(6);
+  const raw = labels.map((_, i) =>
+    genRates(30, 8 + i * 1.2, 6).map((v) => Math.max(0, Math.min(40, v)))
+  );
+  const { boxData } = toBoxplot(raw);
+  const BOX = brand.purpleDark;
+
+  let firstPaintData = boxData;
+  if (collapsedStage === "median") firstPaintData = collapseToMedian(boxData);
+  if (collapsedStage === "quartile")
+    firstPaintData = expandToQuartiles(boxData);
+
+  return {
+    ...baseAnim,
+    title: mkTitle("住院率", "（近 6 個月）"),
+    tooltip: {
+      trigger: "item",
+      axisPointer: { type: "shadow" },
+      formatter: boxTooltipTW,
+    },
+    grid: commonGrid,
+    xAxis: { type: "category", data: labels },
+    yAxis: {
+      type: "value",
+      min: 0,
+      max: 40,
+      axisLabel: { formatter: "{value}%" },
+      splitArea: {
+        show: true,
+        areaStyle: { color: [brand.white, brand.grayLighter] },
+      },
+    },
+    series: [
+      {
+        name: "箱型圖",
+        type: "boxplot",
+        data: firstPaintData,
+        itemStyle: { color: brand.greenLight, borderColor: BOX },
+        lineStyle: { color: BOX },
+        animationDelay: (idx) => idx * 50,
+      },
+    ],
+    __realBoxData: boxData,
+    __quartileBoxData: expandToQuartiles(boxData),
+  };
+}
+
+function buildOptionC() {
+  const days = Array.from({ length: 30 }, (_, i) => `${i + 1}日`);
+  const thisMonth = genRates(30, 86, 6).map((v, i) =>
+    Number((v + Math.sin(i / 4) * 2).toFixed(1))
+  );
+  const lastMonth = genRates(30, 83, 7).map((v, i) =>
+    Number((v + Math.cos(i / 5) * 2).toFixed(1))
+  );
+  const lastYearSameMonth = genRates(30, 80, 8).map((v, i) =>
+    Number((v + Math.sin(i / 3) * 1.5).toFixed(1))
+  );
+  return {
+    title: mkTitle("每日佔床率比較", "（近 30 天）"),
+    legend: { top: 28, data: ["機構 A", "本機構", "機構 B"] },
+    tooltip: { trigger: "axis", valueFormatter: (v) => `${v}%` },
+    grid: { ...commonGrid, top: 64 },
+    xAxis: { type: "category", data: days, boundaryGap: false },
+    yAxis: {
+      type: "value",
+      min: 0,
+      max: 100,
+      axisLabel: { formatter: "{value}%" },
+      splitArea: {
+        show: true,
+        areaStyle: { color: [brand.white, brand.grayLighter] },
+      },
+    },
+    color: [brand.green, brand.purple, brand.yellow],
+    series: [
+      { name: "機構 A", type: "line", data: thisMonth },
+      { name: "本機構", type: "line", data: lastMonth },
+      { name: "機構 B", type: "line", data: lastYearSameMonth },
+    ],
+  };
 }
 
 // ====== 初始化 / 銷毀 ======
-let resizeObserver; let onResize=null
-function initCharts(){
-  if (chartARef.value && !chartA){ chartA = echarts.init(chartARef.value); chartA.setOption(buildOptionA()) }
-  if (chartBRef.value && !chartB){ chartB = echarts.init(chartBRef.value); chartB.setOption(buildOptionB()) }
-  if (chartCRef.value && !chartC){ chartC = echarts.init(chartCRef.value); chartC.setOption(buildOptionC()) }
-  onResize = ()=>{ chartA && chartA.resize(); chartB && chartB.resize(); chartC && chartC.resize() }
-  window.addEventListener('resize', onResize)
-  if (rootRef.value){ resizeObserver = new ResizeObserver(onResize); resizeObserver.observe(rootRef.value) }
-}
-function disposeCharts(){
-  resizeObserver && resizeObserver.disconnect()
-  if (onResize) window.removeEventListener('resize', onResize)
-  chartA && chartA.dispose(); chartB && chartB.dispose(); chartC && chartC.dispose()
-  chartA = chartB = chartC = null; onResize = null
+let resizeObserver;
+let onResize = null;
+function initCharts() {
+  if (chartARef.value && !chartA) {
+    chartA = echarts.init(chartARef.value);
+    // 用分段展開
+    playBoxplotOpen(chartA, buildOptionA);
+  }
+  if (chartBRef.value && !chartB) {
+    chartB = echarts.init(chartBRef.value);
+    // 用分段展開
+    playBoxplotOpen(chartB, buildOptionB);
+  }
+  if (chartCRef.value && !chartC) {
+    chartC = echarts.init(chartCRef.value);
+    chartC.setOption(buildOptionC());
+  }
+
+  onResize = () => {
+    chartA && chartA.resize();
+    chartB && chartB.resize();
+    chartC && chartC.resize();
+  };
+
+  window.addEventListener("resize", onResize);
+  if (rootRef.value) {
+    resizeObserver = new ResizeObserver(onResize);
+    resizeObserver.observe(rootRef.value);
+  }
 }
 
-onMounted(async ()=>{ await nextTick(); if(!showPanel.value) initCharts() })
-onUnmounted(disposeCharts)
+function disposeCharts() {
+  // 先清動畫計時器，避免已 dispose 還在 setOption
+  animTimers.forEach(clearTimeout);
+  animTimers = [];
+
+  resizeObserver && resizeObserver.disconnect();
+  if (onResize) window.removeEventListener("resize", onResize);
+  chartA && chartA.dispose();
+  chartB && chartB.dispose();
+  chartC && chartC.dispose();
+  chartA = chartB = chartC = null;
+  onResize = null;
+}
+
+onMounted(async () => {
+  await nextTick();
+  if (!showPanel.value) initCharts();
+});
+onUnmounted(disposeCharts);
 
 // ====== Panel 狀態 ======
-const showPanel = ref(false)
-const panelType = ref(null)
-const panelTitle = computed(()=>{
-  if (panelType.value === 'residents') return '住民資訊'
-  if (panelType.value === 'inpatients') return '住院資訊'
-  if (panelType.value === 'discharges') return '今日離院'
-  return ''
-})
-function openPanel(type){ panelType.value = type; showPanel.value = true; disposeCharts() }
-function closePanel(){ showPanel.value = false; panelType.value = null; nextTick(()=> initCharts()) }
+const showPanel = ref(false);
+const panelType = ref(null);
+const panelTitle = computed(() => {
+  if (panelType.value === "residents") return "住民資訊";
+  if (panelType.value === "inpatients") return "住院資訊";
+  if (panelType.value === "discharges") return "今日離院";
+  return "";
+});
+function openPanel(type) {
+  panelType.value = type;
+  showPanel.value = true;
+  disposeCharts();
+}
+function closePanel() {
+  showPanel.value = false;
+  panelType.value = null;
+  nextTick(() => initCharts());
+}
 
 // ESC 返回
-function onKeydown(e){ if(e.key==='Escape' && showPanel.value) closePanel() }
-onMounted(()=> window.addEventListener('keydown', onKeydown))
-onUnmounted(()=> window.removeEventListener('keydown', onKeydown))
+function onKeydown(e) {
+  if (e.key === "Escape" && showPanel.value) closePanel();
+}
+onMounted(() => window.addEventListener("keydown", onKeydown));
+onUnmounted(() => window.removeEventListener("keydown", onKeydown));
 
 // ====== 假資料 ======
-function generateBeds(count, start=1001){ const arr=[]; let n=start; while(arr.length<count){ if(!String(n).includes('4')) arr.push(n); n++ } return arr }
-const bedsResidents = generateBeds(12, 1001)
+function generateBeds(count, start = 1001) {
+  const arr = [];
+  let n = start;
+  while (arr.length < count) {
+    if (!String(n).includes("4")) arr.push(n);
+    n++;
+  }
+  return arr;
+}
+const bedsResidents = generateBeds(12, 1001);
 const residentsAll = [
-  { bed:bedsResidents[0],  name:'王小明', gender:'男', age:78, condition:'穩定',       note:'喜歡下棋',     area:'A' },
-  { bed:bedsResidents[1],  name:'陳美麗', gender:'女', age:82, condition:'需輕度協助', note:'糖尿病控制中', area:'A' },
-  { bed:bedsResidents[2],  name:'林大志', gender:'男', age:74, condition:'穩定',       note:'行動慢',       area:'A' },
-  { bed:bedsResidents[3],  name:'張翠華', gender:'女', age:80, condition:'復健中',     note:'膝關節置換術後', area:'A' },
-  { bed:bedsResidents[4],  name:'黃國榮', gender:'男', age:85, condition:'需中度協助', note:'夜間易醒',     area:'A' },
-  { bed:bedsResidents[5],  name:'李佩珊', gender:'女', age:76, condition:'穩定',       note:'對花粉過敏',   area:'A' },
-  { bed:bedsResidents[6],  name:'吳大同', gender:'男', age:79, condition:'穩定',       note:'喜歡園藝',     area:'B' },
-  { bed:bedsResidents[7],  name:'周怡君', gender:'女', age:81, condition:'需輕度協助', note:'高血壓',       area:'B' },
-  { bed:bedsResidents[8],  name:'曾文龍', gender:'男', age:77, condition:'復健中',     note:'髖關節手術後', area:'B' },
-  { bed:bedsResidents[9],  name:'蔡淑芬', gender:'女', age:83, condition:'穩定',       note:'喜歡編織',     area:'B' },
-  { bed:bedsResidents[10], name:'許建宏', gender:'男', age:75, condition:'需中度協助', note:'睡眠品質不佳', area:'B' },
-  { bed:bedsResidents[11], name:'簡婉婷', gender:'女', age:78, condition:'穩定',       note:'對海鮮過敏',   area:'B' },
-]
-const residentsA = computed(()=> residentsAll.filter(r=> r.area==='A'))
-const residentsB = computed(()=> residentsAll.filter(r=> r.area==='B'))
+  {
+    bed: bedsResidents[0],
+    name: "王小明",
+    gender: "男",
+    age: 78,
+    condition: "穩定",
+    note: "喜歡下棋",
+    area: "A",
+  },
+  {
+    bed: bedsResidents[1],
+    name: "陳美麗",
+    gender: "女",
+    age: 82,
+    condition: "需輕度協助",
+    note: "糖尿病控制中",
+    area: "A",
+  },
+  {
+    bed: bedsResidents[2],
+    name: "林大志",
+    gender: "男",
+    age: 74,
+    condition: "穩定",
+    note: "行動慢",
+    area: "A",
+  },
+  {
+    bed: bedsResidents[3],
+    name: "張翠華",
+    gender: "女",
+    age: 80,
+    condition: "復健中",
+    note: "膝關節置換術後",
+    area: "A",
+  },
+  {
+    bed: bedsResidents[4],
+    name: "黃國榮",
+    gender: "男",
+    age: 85,
+    condition: "需中度協助",
+    note: "夜間易醒",
+    area: "A",
+  },
+  {
+    bed: bedsResidents[5],
+    name: "李佩珊",
+    gender: "女",
+    age: 76,
+    condition: "穩定",
+    note: "對花粉過敏",
+    area: "A",
+  },
+  {
+    bed: bedsResidents[6],
+    name: "吳大同",
+    gender: "男",
+    age: 79,
+    condition: "穩定",
+    note: "喜歡園藝",
+    area: "B",
+  },
+  {
+    bed: bedsResidents[7],
+    name: "周怡君",
+    gender: "女",
+    age: 81,
+    condition: "需輕度協助",
+    note: "高血壓",
+    area: "B",
+  },
+  {
+    bed: bedsResidents[8],
+    name: "曾文龍",
+    gender: "男",
+    age: 77,
+    condition: "復健中",
+    note: "髖關節手術後",
+    area: "B",
+  },
+  {
+    bed: bedsResidents[9],
+    name: "蔡淑芬",
+    gender: "女",
+    age: 83,
+    condition: "穩定",
+    note: "喜歡編織",
+    area: "B",
+  },
+  {
+    bed: bedsResidents[10],
+    name: "許建宏",
+    gender: "男",
+    age: 75,
+    condition: "需中度協助",
+    note: "睡眠品質不佳",
+    area: "B",
+  },
+  {
+    bed: bedsResidents[11],
+    name: "簡婉婷",
+    gender: "女",
+    age: 78,
+    condition: "穩定",
+    note: "對海鮮過敏",
+    area: "B",
+  },
+];
+const residentsA = computed(() => residentsAll.filter((r) => r.area === "A"));
+const residentsB = computed(() => residentsAll.filter((r) => r.area === "B"));
 
-const bedsInpatient = generateBeds(4, 1020)
+const bedsInpatient = generateBeds(4, 1020);
 const inpatients = [
-  { bed:bedsInpatient[0], name:'劉書豪', hospitalDept:'台大醫院／心臟內科', recordNo:'A1023001', status:'加護中' },
-  { bed:bedsInpatient[1], name:'高雅筑', hospitalDept:'榮總／新陳代謝科', recordNo:'B1023007', status:'住院觀察' },
-  { bed:bedsInpatient[2], name:'方志明', hospitalDept:'長庚／骨科',     recordNo:'C1023011', status:'術後恢復' },
-  { bed:bedsInpatient[3], name:'鄭于庭', hospitalDept:'國泰／神經內科', recordNo:'D1023020', status:'檢查中' },
-]
+  {
+    bed: bedsInpatient[0],
+    name: "劉書豪",
+    hospitalDept: "台大醫院／心臟內科",
+    recordNo: "A1023001",
+    status: "加護中",
+  },
+  {
+    bed: bedsInpatient[1],
+    name: "高雅筑",
+    hospitalDept: "榮總／新陳代謝科",
+    recordNo: "B1023007",
+    status: "住院觀察",
+  },
+  {
+    bed: bedsInpatient[2],
+    name: "方志明",
+    hospitalDept: "長庚／骨科",
+    recordNo: "C1023011",
+    status: "術後恢復",
+  },
+  {
+    bed: bedsInpatient[3],
+    name: "鄭于庭",
+    hospitalDept: "國泰／神經內科",
+    recordNo: "D1023020",
+    status: "檢查中",
+  },
+];
 
-const bedsDischarge = generateBeds(3, 1101)
+const bedsDischarge = generateBeds(3, 1101);
 const discharges = [
-  { bed:bedsDischarge[0], name:'曾雅惠', reason:'返家照護', note:'家屬接回' },
-  { bed:bedsDischarge[1], name:'羅建明', reason:'轉院',     note:'轉長庚復健科' },
-  { bed:bedsDischarge[2], name:'陳子翔', reason:'康復出院', note:'定期回診' },
-]
+  {
+    bed: bedsDischarge[0],
+    name: "曾雅惠",
+    reason: "返家照護",
+    note: "家屬接回",
+  },
+  {
+    bed: bedsDischarge[1],
+    name: "羅建明",
+    reason: "轉院",
+    note: "轉長庚復健科",
+  },
+  {
+    bed: bedsDischarge[2],
+    name: "陳子翔",
+    reason: "康復出院",
+    note: "定期回診",
+  },
+];
 
 // ====== Residents：單一分頁（A/B 共用；固定底部） ======
-const pageSizeResidents = ref(10)
-const currentPageResidents = ref(1)
-const totalResidents = computed(()=> residentsAll.length)
-const totalPagesResidents = computed(()=> Math.max(1, Math.ceil(totalResidents.value / pageSizeResidents.value)))
-const pagedResidentsAll = computed(()=>{
-  const start = (currentPageResidents.value - 1) * pageSizeResidents.value
-  return residentsAll.slice(start, start + pageSizeResidents.value)
-})
-const pagedResidentsA = computed(()=> pagedResidentsAll.value.filter(r=> r.area==='A'))
-const pagedResidentsB = computed(()=> pagedResidentsAll.value.filter(r=> r.area==='B'))
+const pageSizeResidents = ref(10);
+const currentPageResidents = ref(1);
+const totalResidents = computed(() => residentsAll.length);
+const totalPagesResidents = computed(() =>
+  Math.max(1, Math.ceil(totalResidents.value / pageSizeResidents.value))
+);
+const pagedResidentsAll = computed(() => {
+  const start = (currentPageResidents.value - 1) * pageSizeResidents.value;
+  return residentsAll.slice(start, start + pageSizeResidents.value);
+});
+const pagedResidentsA = computed(() =>
+  pagedResidentsAll.value.filter((r) => r.area === "A")
+);
+const pagedResidentsB = computed(() =>
+  pagedResidentsAll.value.filter((r) => r.area === "B")
+);
 
 // ====== Inpatients：固定底部分頁 ======
-const pageSizeInpatients = ref(8)
-const currentPageInpatients = ref(1)
-const totalInpatients = computed(()=> inpatients.length)
-const totalPagesInpatients = computed(()=> Math.max(1, Math.ceil(totalInpatients.value / pageSizeInpatients.value)))
-const pagedInpatients = computed(()=>{
-  const start = (currentPageInpatients.value - 1) * pageSizeInpatients.value
-  return inpatients.slice(start, start + pageSizeInpatients.value)
-})
+const pageSizeInpatients = ref(8);
+const currentPageInpatients = ref(1);
+const totalInpatients = computed(() => inpatients.length);
+const totalPagesInpatients = computed(() =>
+  Math.max(1, Math.ceil(totalInpatients.value / pageSizeInpatients.value))
+);
+const pagedInpatients = computed(() => {
+  const start = (currentPageInpatients.value - 1) * pageSizeInpatients.value;
+  return inpatients.slice(start, start + pageSizeInpatients.value);
+});
 
 // ====== Discharges：固定底部分頁 ======
-const pageSizeDischarges = ref(8)
-const currentPageDischarges = ref(1)
-const totalDischarges = computed(()=> discharges.length)
-const totalPagesDischarges = computed(()=> Math.max(1, Math.ceil(totalDischarges.value / pageSizeDischarges.value)))
-const pagedDischarges = computed(()=>{
-  const start = (currentPageDischarges.value - 1) * pageSizeDischarges.value
-  return discharges.slice(start, start + pageSizeDischarges.value)
-})
+const pageSizeDischarges = ref(8);
+const currentPageDischarges = ref(1);
+const totalDischarges = computed(() => discharges.length);
+const totalPagesDischarges = computed(() =>
+  Math.max(1, Math.ceil(totalDischarges.value / pageSizeDischarges.value))
+);
+const pagedDischarges = computed(() => {
+  const start = (currentPageDischarges.value - 1) * pageSizeDischarges.value;
+  return discharges.slice(start, start + pageSizeDischarges.value);
+});
 </script>
diff --git a/src/router/index.js b/src/router/index.js
index 91b0f70..60fb8bd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -18,7 +18,7 @@ const routes = [
     },
   },
 
-  // 其他頁 → 預設使用 MapLayout（有地圖）
+  // 其他頁 → 預設使用 ForgeLayout（有地圖）
   {
     path: "/operation",
     name: "Operation",