diff --git a/Backend/App_Data/BIMS_Mitsubishi_v01.ndm2 b/Backend/App_Data/BIMS_Mitsubishi_v03.ndm2
similarity index 99%
rename from Backend/App_Data/BIMS_Mitsubishi_v01.ndm2
rename to Backend/App_Data/BIMS_Mitsubishi_v03.ndm2
index 6934d81..9b9b9f7 100644
--- a/Backend/App_Data/BIMS_Mitsubishi_v01.ndm2
+++ b/Backend/App_Data/BIMS_Mitsubishi_v03.ndm2
@@ -4606,260 +4606,6 @@
             "triggers": [],
             "tablePartitions": []
           },
-          {
-            "objectType": "Table_MYSQL",
-            "name": "device_group",
-            "comment": "設備類別 - UI 過濾用",
-            "engine": "InnoDB",
-            "characterSet": "utf8mb4",
-            "collation": "utf8mb4_unicode_ci",
-            "autoIncrement": 0,
-            "tablespace": "",
-            "storage": "",
-            "insertMethod": "",
-            "connection": "",
-            "checksum": false,
-            "rowFormat": "Dynamic",
-            "avgRowLength": 0,
-            "maxRows": 0,
-            "minRows": 0,
-            "keyBlockSize": 0,
-            "packKeys": "",
-            "delayKeyWrite": false,
-            "dataDirectory": "",
-            "indexDirectory": "",
-            "statsAutoRecalc": "",
-            "statsPersistent": "",
-            "statsSamplePages": 0,
-            "union": "",
-            "pageCheckSum": false,
-            "transactional": false,
-            "compression": "",
-            "oldName": "device_group",
-            "encryption": false,
-            "createOptions": "",
-            "createTime": "2022-10-20 12:14:31",
-            "checkTime": "",
-            "dataFree": 0,
-            "dataLength": 147456,
-            "indexLength": 0,
-            "maxDataLength": 0,
-            "rows": 1040,
-            "updateTime": "",
-            "DDL": "CREATE TABLE `device_group` (\n  `id` int(11) NOT NULL COMMENT 'id',\n  `device_disaster` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '災類',\n  `device_building_guid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '設備東別guid',\n  `device_floor_guid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '設備樓層guid',\n  `device_system_category_layer2` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,\n  `device_system_category_layer3` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,\n  `device_amount` int(11) NOT NULL DEFAULT '0' COMMENT '設備總計',\n  PRIMARY KEY (`id`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='設備類別 - UI 過濾用'",
-            "partitionBy": "",
-            "partitionByExpr": "",
-            "partitions": 0,
-            "partitionKeyAlgorithm": "",
-            "subPartitionBy": "",
-            "subPartitionByExpr": "",
-            "subPartitions": 0,
-            "subPartitionKeyAlgorithm": "",
-            "fields": [
-              {
-                "objectType": "TableField_MYSQL",
-                "name": "id",
-                "type": "int",
-                "length": 11,
-                "decimals": 0,
-                "isUnsigned": false,
-                "isZeroFill": false,
-                "setEnumValues": "",
-                "isBinary": false,
-                "charset": "",
-                "collation": "",
-                "isNullable": false,
-                "defaultType": "Others",
-                "defaultValue": "",
-                "isOnUpdateCurrentTimestamp": false,
-                "isAutoInc": false,
-                "comment": "id",
-                "columnFormat": "",
-                "storage": "",
-                "isVirtual": false,
-                "isGeneratedAlways": false,
-                "virtualExpr": "",
-                "virtualType": "",
-                "oldName": "id"
-              },
-              {
-                "objectType": "TableField_MYSQL",
-                "name": "device_disaster",
-                "type": "varchar",
-                "length": 50,
-                "decimals": 0,
-                "isUnsigned": false,
-                "isZeroFill": false,
-                "setEnumValues": "",
-                "isBinary": false,
-                "charset": "utf8mb4",
-                "collation": "utf8mb4_unicode_ci",
-                "isNullable": true,
-                "defaultType": "Null",
-                "defaultValue": "",
-                "isOnUpdateCurrentTimestamp": false,
-                "isAutoInc": false,
-                "comment": "災類",
-                "columnFormat": "",
-                "storage": "",
-                "isVirtual": false,
-                "isGeneratedAlways": false,
-                "virtualExpr": "",
-                "virtualType": "",
-                "oldName": "device_disaster"
-              },
-              {
-                "objectType": "TableField_MYSQL",
-                "name": "device_building_guid",
-                "type": "varchar",
-                "length": 36,
-                "decimals": 0,
-                "isUnsigned": false,
-                "isZeroFill": false,
-                "setEnumValues": "",
-                "isBinary": false,
-                "charset": "utf8mb4",
-                "collation": "utf8mb4_unicode_ci",
-                "isNullable": true,
-                "defaultType": "Null",
-                "defaultValue": "",
-                "isOnUpdateCurrentTimestamp": false,
-                "isAutoInc": false,
-                "comment": "設備東別guid",
-                "columnFormat": "",
-                "storage": "",
-                "isVirtual": false,
-                "isGeneratedAlways": false,
-                "virtualExpr": "",
-                "virtualType": "",
-                "oldName": "device_building_guid"
-              },
-              {
-                "objectType": "TableField_MYSQL",
-                "name": "device_floor_guid",
-                "type": "varchar",
-                "length": 36,
-                "decimals": 0,
-                "isUnsigned": false,
-                "isZeroFill": false,
-                "setEnumValues": "",
-                "isBinary": false,
-                "charset": "utf8mb4",
-                "collation": "utf8mb4_unicode_ci",
-                "isNullable": true,
-                "defaultType": "Null",
-                "defaultValue": "",
-                "isOnUpdateCurrentTimestamp": false,
-                "isAutoInc": false,
-                "comment": "設備樓層guid",
-                "columnFormat": "",
-                "storage": "",
-                "isVirtual": false,
-                "isGeneratedAlways": false,
-                "virtualExpr": "",
-                "virtualType": "",
-                "oldName": "device_floor_guid"
-              },
-              {
-                "objectType": "TableField_MYSQL",
-                "name": "device_system_category_layer2",
-                "type": "varchar",
-                "length": 50,
-                "decimals": 0,
-                "isUnsigned": false,
-                "isZeroFill": false,
-                "setEnumValues": "",
-                "isBinary": false,
-                "charset": "utf8mb4",
-                "collation": "utf8mb4_unicode_ci",
-                "isNullable": true,
-                "defaultType": "Null",
-                "defaultValue": "",
-                "isOnUpdateCurrentTimestamp": false,
-                "isAutoInc": false,
-                "comment": "",
-                "columnFormat": "",
-                "storage": "",
-                "isVirtual": false,
-                "isGeneratedAlways": false,
-                "virtualExpr": "",
-                "virtualType": "",
-                "oldName": "device_system_category_layer2"
-              },
-              {
-                "objectType": "TableField_MYSQL",
-                "name": "device_system_category_layer3",
-                "type": "varchar",
-                "length": 50,
-                "decimals": 0,
-                "isUnsigned": false,
-                "isZeroFill": false,
-                "setEnumValues": "",
-                "isBinary": false,
-                "charset": "utf8mb4",
-                "collation": "utf8mb4_unicode_ci",
-                "isNullable": true,
-                "defaultType": "Null",
-                "defaultValue": "",
-                "isOnUpdateCurrentTimestamp": false,
-                "isAutoInc": false,
-                "comment": "",
-                "columnFormat": "",
-                "storage": "",
-                "isVirtual": false,
-                "isGeneratedAlways": false,
-                "virtualExpr": "",
-                "virtualType": "",
-                "oldName": "device_system_category_layer3"
-              },
-              {
-                "objectType": "TableField_MYSQL",
-                "name": "device_amount",
-                "type": "int",
-                "length": 11,
-                "decimals": 0,
-                "isUnsigned": false,
-                "isZeroFill": false,
-                "setEnumValues": "",
-                "isBinary": false,
-                "charset": "",
-                "collation": "",
-                "isNullable": false,
-                "defaultType": "Others",
-                "defaultValue": "0",
-                "isOnUpdateCurrentTimestamp": false,
-                "isAutoInc": false,
-                "comment": "設備總計",
-                "columnFormat": "",
-                "storage": "",
-                "isVirtual": false,
-                "isGeneratedAlways": false,
-                "virtualExpr": "",
-                "virtualType": "",
-                "oldName": "device_amount"
-              }
-            ],
-            "indexes": [],
-            "primaryKey": {
-              "objectType": "PrimaryKey_MYSQL",
-              "name": "",
-              "fields": [
-                {
-                  "objectType": "IndexField_MYSQL",
-                  "name": "id",
-                  "keyLength": 0,
-                  "order": "",
-                  "oldName": "id"
-                }
-              ],
-              "oldName": "",
-              "indexMethod": "BTREE",
-              "comment": ""
-            },
-            "foreignKeys": [],
-            "triggers": [],
-            "tablePartitions": []
-          },
           {
             "objectType": "Table_MYSQL",
             "name": "device_item",
@@ -9036,32 +8782,6 @@
                 "virtualType": "",
                 "oldName": "floor_guid"
               },
-              {
-                "objectType": "TableField_MYSQL",
-                "name": "building_guid",
-                "type": "varchar",
-                "length": 36,
-                "decimals": 0,
-                "isUnsigned": false,
-                "isZeroFill": false,
-                "setEnumValues": "",
-                "isBinary": false,
-                "charset": "utf8mb4",
-                "collation": "utf8mb4_unicode_ci",
-                "isNullable": false,
-                "defaultType": "Empty",
-                "defaultValue": "",
-                "isOnUpdateCurrentTimestamp": false,
-                "isAutoInc": false,
-                "comment": "區域guid",
-                "columnFormat": "",
-                "storage": "",
-                "isVirtual": false,
-                "isGeneratedAlways": false,
-                "virtualExpr": "",
-                "virtualType": "",
-                "oldName": "building_guid"
-              },
               {
                 "objectType": "TableField_MYSQL",
                 "name": "building_tag",
@@ -17489,6 +17209,286 @@
             "foreignKeys": [],
             "triggers": [],
             "tablePartitions": []
+          },
+          {
+            "objectType": "Table_MYSQL",
+            "name": "device_group",
+            "comment": "設備類別 - UI 過濾用",
+            "engine": "InnoDB",
+            "characterSet": "utf8mb4",
+            "collation": "utf8mb4_unicode_ci",
+            "autoIncrement": 0,
+            "tablespace": "",
+            "storage": "",
+            "insertMethod": "",
+            "connection": "",
+            "checksum": false,
+            "rowFormat": "Dynamic",
+            "avgRowLength": 0,
+            "maxRows": 0,
+            "minRows": 0,
+            "keyBlockSize": 0,
+            "packKeys": "",
+            "delayKeyWrite": false,
+            "dataDirectory": "",
+            "indexDirectory": "",
+            "statsAutoRecalc": "",
+            "statsPersistent": "",
+            "statsSamplePages": 0,
+            "union": "",
+            "pageCheckSum": false,
+            "transactional": false,
+            "compression": "",
+            "oldName": "device_group",
+            "encryption": false,
+            "createOptions": "",
+            "createTime": "2022-10-20 12:14:31",
+            "checkTime": "",
+            "dataFree": 0,
+            "dataLength": 147456,
+            "indexLength": 0,
+            "maxDataLength": 0,
+            "rows": 1040,
+            "updateTime": "",
+            "DDL": "CREATE TABLE `device_group` (\n  `id` int(11) NOT NULL COMMENT 'id',\n  `device_disaster` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '災類',\n  `device_building_guid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '設備東別guid',\n  `device_floor_guid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '設備樓層guid',\n  `device_system_category_layer2` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,\n  `device_system_category_layer3` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,\n  `device_amount` int(11) NOT NULL DEFAULT '0' COMMENT '設備總計',\n  PRIMARY KEY (`id`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='設備類別 - UI 過濾用'",
+            "partitionBy": "",
+            "partitionByExpr": "",
+            "partitions": 0,
+            "partitionKeyAlgorithm": "",
+            "subPartitionBy": "",
+            "subPartitionByExpr": "",
+            "subPartitions": 0,
+            "subPartitionKeyAlgorithm": "",
+            "fields": [
+              {
+                "objectType": "TableField_MYSQL",
+                "name": "id",
+                "type": "int",
+                "length": 11,
+                "decimals": 0,
+                "isUnsigned": false,
+                "isZeroFill": false,
+                "setEnumValues": "",
+                "isBinary": false,
+                "charset": "",
+                "collation": "",
+                "isNullable": false,
+                "defaultType": "Others",
+                "defaultValue": "",
+                "isOnUpdateCurrentTimestamp": false,
+                "isAutoInc": false,
+                "comment": "id",
+                "columnFormat": "",
+                "storage": "",
+                "isVirtual": false,
+                "isGeneratedAlways": false,
+                "virtualExpr": "",
+                "virtualType": "",
+                "oldName": "id"
+              },
+              {
+                "objectType": "TableField_MYSQL",
+                "name": "device_disaster",
+                "type": "varchar",
+                "length": 50,
+                "decimals": 0,
+                "isUnsigned": false,
+                "isZeroFill": false,
+                "setEnumValues": "",
+                "isBinary": false,
+                "charset": "utf8mb4",
+                "collation": "utf8mb4_unicode_ci",
+                "isNullable": true,
+                "defaultType": "Null",
+                "defaultValue": "",
+                "isOnUpdateCurrentTimestamp": false,
+                "isAutoInc": false,
+                "comment": "災類",
+                "columnFormat": "",
+                "storage": "",
+                "isVirtual": false,
+                "isGeneratedAlways": false,
+                "virtualExpr": "",
+                "virtualType": "",
+                "oldName": "device_disaster"
+              },
+              {
+                "objectType": "TableField_MYSQL",
+                "name": "device_area_tag",
+                "type": "varchar",
+                "length": 36,
+                "decimals": -2147483648,
+                "isUnsigned": false,
+                "isZeroFill": false,
+                "setEnumValues": "",
+                "isBinary": false,
+                "charset": "",
+                "collation": "",
+                "isNullable": true,
+                "defaultType": "Others",
+                "defaultValue": "",
+                "isOnUpdateCurrentTimestamp": false,
+                "isAutoInc": false,
+                "comment": "設備區域tag",
+                "columnFormat": "",
+                "storage": "",
+                "isVirtual": false,
+                "isGeneratedAlways": false,
+                "virtualExpr": "",
+                "virtualType": "",
+                "oldName": "device_area_tag"
+              },
+              {
+                "objectType": "TableField_MYSQL",
+                "name": "device_building_tag",
+                "type": "varchar",
+                "length": 36,
+                "decimals": 0,
+                "isUnsigned": false,
+                "isZeroFill": false,
+                "setEnumValues": "",
+                "isBinary": false,
+                "charset": "utf8mb4",
+                "collation": "utf8mb4_unicode_ci",
+                "isNullable": true,
+                "defaultType": "Null",
+                "defaultValue": "",
+                "isOnUpdateCurrentTimestamp": false,
+                "isAutoInc": false,
+                "comment": "設備東別tag",
+                "columnFormat": "",
+                "storage": "",
+                "isVirtual": false,
+                "isGeneratedAlways": false,
+                "virtualExpr": "",
+                "virtualType": "",
+                "oldName": "device_building_tag"
+              },
+              {
+                "objectType": "TableField_MYSQL",
+                "name": "device_floor_guid",
+                "type": "varchar",
+                "length": 36,
+                "decimals": 0,
+                "isUnsigned": false,
+                "isZeroFill": false,
+                "setEnumValues": "",
+                "isBinary": false,
+                "charset": "utf8mb4",
+                "collation": "utf8mb4_unicode_ci",
+                "isNullable": true,
+                "defaultType": "Null",
+                "defaultValue": "",
+                "isOnUpdateCurrentTimestamp": false,
+                "isAutoInc": false,
+                "comment": "設備樓層guid",
+                "columnFormat": "",
+                "storage": "",
+                "isVirtual": false,
+                "isGeneratedAlways": false,
+                "virtualExpr": "",
+                "virtualType": "",
+                "oldName": "device_floor_guid"
+              },
+              {
+                "objectType": "TableField_MYSQL",
+                "name": "device_system_category_layer2",
+                "type": "varchar",
+                "length": 50,
+                "decimals": 0,
+                "isUnsigned": false,
+                "isZeroFill": false,
+                "setEnumValues": "",
+                "isBinary": false,
+                "charset": "utf8mb4",
+                "collation": "utf8mb4_unicode_ci",
+                "isNullable": true,
+                "defaultType": "Null",
+                "defaultValue": "",
+                "isOnUpdateCurrentTimestamp": false,
+                "isAutoInc": false,
+                "comment": "",
+                "columnFormat": "",
+                "storage": "",
+                "isVirtual": false,
+                "isGeneratedAlways": false,
+                "virtualExpr": "",
+                "virtualType": "",
+                "oldName": "device_system_category_layer2"
+              },
+              {
+                "objectType": "TableField_MYSQL",
+                "name": "device_system_category_layer3",
+                "type": "varchar",
+                "length": 50,
+                "decimals": 0,
+                "isUnsigned": false,
+                "isZeroFill": false,
+                "setEnumValues": "",
+                "isBinary": false,
+                "charset": "utf8mb4",
+                "collation": "utf8mb4_unicode_ci",
+                "isNullable": true,
+                "defaultType": "Null",
+                "defaultValue": "",
+                "isOnUpdateCurrentTimestamp": false,
+                "isAutoInc": false,
+                "comment": "",
+                "columnFormat": "",
+                "storage": "",
+                "isVirtual": false,
+                "isGeneratedAlways": false,
+                "virtualExpr": "",
+                "virtualType": "",
+                "oldName": "device_system_category_layer3"
+              },
+              {
+                "objectType": "TableField_MYSQL",
+                "name": "device_amount",
+                "type": "int",
+                "length": 11,
+                "decimals": 0,
+                "isUnsigned": false,
+                "isZeroFill": false,
+                "setEnumValues": "",
+                "isBinary": false,
+                "charset": "",
+                "collation": "",
+                "isNullable": false,
+                "defaultType": "Others",
+                "defaultValue": "0",
+                "isOnUpdateCurrentTimestamp": false,
+                "isAutoInc": false,
+                "comment": "設備總計",
+                "columnFormat": "",
+                "storage": "",
+                "isVirtual": false,
+                "isGeneratedAlways": false,
+                "virtualExpr": "",
+                "virtualType": "",
+                "oldName": "device_amount"
+              }
+            ],
+            "indexes": [],
+            "primaryKey": {
+              "objectType": "PrimaryKey_MYSQL",
+              "name": "",
+              "fields": [
+                {
+                  "objectType": "IndexField_MYSQL",
+                  "name": "id",
+                  "keyLength": 0,
+                  "order": "",
+                  "oldName": "id"
+                }
+              ],
+              "oldName": "",
+              "indexMethod": "BTREE",
+              "comment": ""
+            },
+            "foreignKeys": [],
+            "triggers": [],
+            "tablePartitions": []
           }
         ],
         "views": []
@@ -17513,8 +17513,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "auth_page",
-          "x": 20,
-          "y": 1440,
+          "x": 2080,
+          "y": 2270,
           "width": 270,
           "height": 250,
           "isBold": false,
@@ -17529,8 +17529,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "building_menu",
-          "x": 720,
-          "y": 1260,
+          "x": 1960,
+          "y": 420,
           "width": 510,
           "height": 430,
           "isBold": false,
@@ -17545,8 +17545,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "data_delivery_log",
-          "x": 1400,
-          "y": 2180,
+          "x": 490,
+          "y": 1730,
           "width": 181,
           "height": 170,
           "isBold": false,
@@ -17577,8 +17577,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "device_disaster",
-          "x": 1230,
-          "y": 1100,
+          "x": 140,
+          "y": 510,
           "width": 320,
           "height": 110,
           "isBold": false,
@@ -17593,10 +17593,10 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "device_group",
-          "x": 330,
-          "y": 1890,
+          "x": 1030,
+          "y": 80,
           "width": 320,
-          "height": 210,
+          "height": 220,
           "isBold": false,
           "titleColor": {
             "r": 55,
@@ -17609,10 +17609,10 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "device_item",
-          "x": 30,
-          "y": 300,
+          "x": 1040,
+          "y": 460,
           "width": 430,
-          "height": 340,
+          "height": 380,
           "isBold": false,
           "titleColor": {
             "r": 55,
@@ -17625,10 +17625,10 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "device_kind",
-          "x": 1100,
-          "y": 70,
+          "x": 0,
+          "y": 910,
           "width": 510,
-          "height": 750,
+          "height": 780,
           "isBold": false,
           "titleColor": {
             "r": 55,
@@ -17673,8 +17673,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "emergency_event",
-          "x": 590,
-          "y": 2400,
+          "x": 30,
+          "y": 3160,
           "width": 280,
           "height": 220,
           "isBold": false,
@@ -17689,8 +17689,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "emergency_item",
-          "x": 1410,
-          "y": 2380,
+          "x": 930,
+          "y": 3150,
           "width": 237,
           "height": 230,
           "isBold": false,
@@ -17705,8 +17705,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "emergency_member",
-          "x": 890,
-          "y": 2360,
+          "x": 330,
+          "y": 3120,
           "width": 260,
           "height": 260,
           "isBold": false,
@@ -17721,8 +17721,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "emergency_setting",
-          "x": 10,
-          "y": 1990,
+          "x": 620,
+          "y": 3070,
           "width": 290,
           "height": 310,
           "isBold": false,
@@ -17737,8 +17737,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "floor",
-          "x": 350,
-          "y": 1320,
+          "x": 1880,
+          "y": 30,
           "width": 320,
           "height": 310,
           "isBold": false,
@@ -17753,8 +17753,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "history_config",
-          "x": 370,
-          "y": 2120,
+          "x": 0,
+          "y": 1730,
           "width": 218,
           "height": 270,
           "isBold": false,
@@ -17785,8 +17785,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "light_schedule",
-          "x": 1260,
-          "y": 1620,
+          "x": 190,
+          "y": 0,
           "width": 330,
           "height": 290,
           "isBold": false,
@@ -17797,28 +17797,12 @@
             "a": 1
           }
         },
-        {
-          "type": "table",
-          "schemaName": "bims_mitsubishi",
-          "tableName": "main_system",
-          "x": 870,
-          "y": 2080,
-          "width": 260,
-          "height": 250,
-          "isBold": false,
-          "titleColor": {
-            "r": 55,
-            "g": 131,
-            "b": 192,
-            "a": 1
-          }
-        },
         {
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "ontime_alarm_device_rawdata",
-          "x": 2150,
-          "y": 30,
+          "x": 40,
+          "y": 2890,
           "width": 230,
           "height": 230,
           "isBold": false,
@@ -17833,8 +17817,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "ontime_device_subscription",
-          "x": 1610,
-          "y": 2150,
+          "x": 720,
+          "y": 1730,
           "width": 215,
           "height": 190,
           "isBold": false,
@@ -17849,8 +17833,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "operation_back_log",
-          "x": 1140,
-          "y": 2160,
+          "x": 250,
+          "y": 1730,
           "width": 204,
           "height": 190,
           "isBold": false,
@@ -17865,8 +17849,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "operation_log",
-          "x": 1170,
-          "y": 2390,
+          "x": 960,
+          "y": 1730,
           "width": 215,
           "height": 230,
           "isBold": false,
@@ -17881,8 +17865,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "orion_OrionAppVersion",
-          "x": 2450,
-          "y": 30,
+          "x": 330,
+          "y": 2900,
           "width": 205,
           "height": 110,
           "isBold": false,
@@ -17897,8 +17881,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "rescue_device",
-          "x": 10,
-          "y": 2320,
+          "x": 830,
+          "y": 1440,
           "width": 350,
           "height": 250,
           "isBold": false,
@@ -17913,10 +17897,10 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "role",
-          "x": 2230,
-          "y": 870,
+          "x": 1800,
+          "y": 1740,
           "width": 181,
-          "height": 230,
+          "height": 250,
           "isBold": false,
           "titleColor": {
             "r": 55,
@@ -17929,8 +17913,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "role_auth",
-          "x": 20,
-          "y": 1250,
+          "x": 2090,
+          "y": 2080,
           "width": 250,
           "height": 140,
           "isBold": false,
@@ -17945,8 +17929,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "schedule_device",
-          "x": 360,
-          "y": 2430,
+          "x": 230,
+          "y": 370,
           "width": 230,
           "height": 110,
           "isBold": false,
@@ -17957,46 +17941,14 @@
             "a": 1
           }
         },
-        {
-          "type": "table",
-          "schemaName": "bims_mitsubishi",
-          "tableName": "sub_system",
-          "x": 600,
-          "y": 2110,
-          "width": 270,
-          "height": 220,
-          "isBold": false,
-          "titleColor": {
-            "r": 55,
-            "g": 131,
-            "b": 192,
-            "a": 1
-          }
-        },
         {
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "sub_system_floor",
-          "x": 1880,
-          "y": 30,
+          "x": 1560,
+          "y": 50,
           "width": 208,
-          "height": 290,
-          "isBold": false,
-          "titleColor": {
-            "r": 55,
-            "g": 131,
-            "b": 192,
-            "a": 1
-          }
-        },
-        {
-          "type": "table",
-          "schemaName": "bims_mitsubishi",
-          "tableName": "sub_system_floor_bak",
-          "x": 1920,
-          "y": 870,
-          "width": 239,
-          "height": 270,
+          "height": 310,
           "isBold": false,
           "titleColor": {
             "r": 55,
@@ -18009,8 +17961,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "userinfo",
-          "x": 20,
-          "y": 870,
+          "x": 2100,
+          "y": 1700,
           "width": 240,
           "height": 330,
           "isBold": false,
@@ -18025,8 +17977,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "variable",
-          "x": 290,
-          "y": 880,
+          "x": 1590,
+          "y": 500,
           "width": 250,
           "height": 310,
           "isBold": false,
@@ -18041,8 +17993,8 @@
           "type": "table",
           "schemaName": "bims_mitsubishi",
           "tableName": "building",
-          "x": 1260,
-          "y": 1270,
+          "x": 2300,
+          "y": 30,
           "width": 289,
           "height": 310,
           "isBold": false,
@@ -18065,12 +18017,12 @@
           "endStyle": "normal",
           "vertices": [
             {
-              "x": 580,
-              "y": 490
+              "x": 1590,
+              "y": 660
             },
             {
-              "x": 460,
-              "y": 490
+              "x": 1470,
+              "y": 660
             }
           ]
         },
@@ -18149,12 +18101,12 @@
           "endStyle": "normal",
           "vertices": [
             {
-              "x": 140,
-              "y": 1200
+              "x": 2220,
+              "y": 2030
             },
             {
-              "x": 140,
-              "y": 1250
+              "x": 2220,
+              "y": 2080
             }
           ]
         },
@@ -18170,12 +18122,222 @@
           "endStyle": "normal",
           "vertices": [
             {
-              "x": 140,
-              "y": 1440
+              "x": 2220,
+              "y": 2270
             },
             {
-              "x": 140,
-              "y": 1390
+              "x": 2220,
+              "y": 2220
+            }
+          ]
+        },
+        {
+          "type": "arrow",
+          "name": "Arrow 1 Copy 1 Copy 1 Copy 3",
+          "opacity": 1.0,
+          "lineWidth": 3,
+          "dashStyle": "solid",
+          "capStyle": "flat",
+          "joinStyle": "miter",
+          "beginStyle": "none",
+          "endStyle": "normal",
+          "vertices": [
+            {
+              "x": 330,
+              "y": 840
+            },
+            {
+              "x": 330,
+              "y": 910
+            }
+          ]
+        },
+        {
+          "type": "arrow",
+          "name": "Arrow 1 Copy 2",
+          "opacity": 1.0,
+          "lineWidth": 3,
+          "dashStyle": "solid",
+          "capStyle": "flat",
+          "joinStyle": "miter",
+          "beginStyle": "none",
+          "endStyle": "normal",
+          "vertices": [
+            {
+              "x": 580,
+              "y": 440
+            },
+            {
+              "x": 460,
+              "y": 440
+            }
+          ]
+        },
+        {
+          "type": "arrow",
+          "name": "Arrow 1 Copy 1 Copy 1 Copy 3 Copy 1",
+          "opacity": 1.0,
+          "lineWidth": 3,
+          "dashStyle": "solid",
+          "capStyle": "flat",
+          "joinStyle": "miter",
+          "beginStyle": "none",
+          "endStyle": "normal",
+          "vertices": [
+            {
+              "x": 350,
+              "y": 290
+            },
+            {
+              "x": 350,
+              "y": 370
+            }
+          ]
+        },
+        {
+          "type": "arrow",
+          "name": "Arrow 1 Copy 2 Copy 1",
+          "opacity": 1.0,
+          "lineWidth": 3,
+          "dashStyle": "solid",
+          "capStyle": "flat",
+          "joinStyle": "miter",
+          "beginStyle": "none",
+          "endStyle": "normal",
+          "vertices": [
+            {
+              "x": 580,
+              "y": 570
+            },
+            {
+              "x": 460,
+              "y": 570
+            }
+          ]
+        },
+        {
+          "type": "arrow",
+          "name": "Arrow 1 Copy 1 Copy 1 Copy 3 Copy 1 Copy 1",
+          "opacity": 1.0,
+          "lineWidth": 3,
+          "dashStyle": "solid",
+          "capStyle": "flat",
+          "joinStyle": "miter",
+          "beginStyle": "none",
+          "endStyle": "normal",
+          "vertices": [
+            {
+              "x": 2430,
+              "y": 340
+            },
+            {
+              "x": 2430,
+              "y": 420
+            }
+          ]
+        },
+        {
+          "type": "arrow",
+          "name": "Arrow 1 Copy 3",
+          "opacity": 1.0,
+          "lineWidth": 3,
+          "dashStyle": "solid",
+          "capStyle": "flat",
+          "joinStyle": "miter",
+          "beginStyle": "none",
+          "endStyle": "normal",
+          "vertices": [
+            {
+              "x": 1960,
+              "y": 660
+            },
+            {
+              "x": 1840,
+              "y": 660
+            }
+          ]
+        },
+        {
+          "type": "arrow",
+          "name": "Arrow 1 Copy 2 Copy 1 Copy 1",
+          "opacity": 1.0,
+          "lineWidth": 3,
+          "dashStyle": "solid",
+          "capStyle": "flat",
+          "joinStyle": "miter",
+          "beginStyle": "none",
+          "endStyle": "normal",
+          "vertices": [
+            {
+              "x": 1880,
+              "y": 190
+            },
+            {
+              "x": 1770,
+              "y": 190
+            }
+          ]
+        },
+        {
+          "type": "arrow",
+          "name": "Arrow 1 Copy 1 Copy 1 Copy 1 Copy 1",
+          "opacity": 1.0,
+          "lineWidth": 3,
+          "dashStyle": "solid",
+          "capStyle": "flat",
+          "joinStyle": "miter",
+          "beginStyle": "none",
+          "endStyle": "normal",
+          "vertices": [
+            {
+              "x": 1980,
+              "y": 1860
+            },
+            {
+              "x": 2100,
+              "y": 1860
+            }
+          ]
+        },
+        {
+          "type": "arrow",
+          "name": "Arrow 1 Copy 2 Copy 1 Copy 1 Copy 1",
+          "opacity": 1.0,
+          "lineWidth": 3,
+          "dashStyle": "solid",
+          "capStyle": "flat",
+          "joinStyle": "miter",
+          "beginStyle": "none",
+          "endStyle": "normal",
+          "vertices": [
+            {
+              "x": 2300,
+              "y": 190
+            },
+            {
+              "x": 2200,
+              "y": 190
+            }
+          ]
+        },
+        {
+          "type": "arrow",
+          "name": "Arrow 1 Copy 1 Copy 1 Copy 2 Copy 1 Copy 1",
+          "opacity": 1.0,
+          "lineWidth": 3,
+          "dashStyle": "solid",
+          "capStyle": "flat",
+          "joinStyle": "miter",
+          "beginStyle": "none",
+          "endStyle": "normal",
+          "vertices": [
+            {
+              "x": 1660,
+              "y": 500
+            },
+            {
+              "x": 1660,
+              "y": 360
             }
           ]
         }