| 
						
					 | 
					
						
						
						
						
							
						
						
							1f0b2402ef
							
						
					 | 
					
						
						
							
							解決衝突系統監控衝突
						
						
						
						
						
					 | 
					
						2023-05-30 16:10:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7169c33dc3
							
						
					 | 
					
						
						
							
							[前台] forge 突擊平面圖原點配合點位顏色
						
						
						
						
						
					 | 
					
						2023-05-30 16:01:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							59cb26ba3d
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-30 14:55:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4544a323a1
							
						
					 | 
					
						
						
							
							[後台] 修改排程執行時間
						
						
						
						
						
					 | 
					
						2023-05-30 14:54:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eb0f45ac83
							
						
					 | 
					
						
						
							
							[燈控排程] 新增/編輯 紀錄 Operation_log 後端程序調整
						
						
						
						
						
					 | 
					
						2023-05-30 14:36:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ed35146547
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-29 18:47:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ece045ab39
							
						
					 | 
					
						
						
							
							[燈控排程] operation_log 紀錄燈控排程運作及控制修改範圍記錄不同類型程序建置 | 燈控排程部分後端武斷改八段程序調整 | 部分 bug 修正
						
						
						
						
						
					 | 
					
						2023-05-29 18:47:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							75692b26da
							
						
					 | 
					
						
						
							
							[後台] 修改排程錯誤
						
						
						
						
						
					 | 
					
						2023-05-29 17:10:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8cb550bff6
							
						
					 | 
					
						
						
							
							[前台] 修改水電表列出api
						
						
						
						
						
					 | 
					
						2023-05-29 16:33:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							68c1781155
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-29 16:21:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8aebc49e40
							
						
					 | 
					
						
						
							
							[後台] 後端修改排程流程, 修改niagara 同步building_menu 問題
						
						
						
						
						
					 | 
					
						2023-05-29 16:21:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e9a8013767
							
						
					 | 
					
						
						
							
							Merge pull request '[前台] subDevice 結束 loading bug | dashbord 修正 chart 更新時機' (#1) from hotfix/system into master
						
						
						
						
						
						
						
						Reviewed-on: BIMS/BIMS#1 
						
					 | 
					
						2023-05-29 06:24:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c87668ee1d
							
						
					 | 
					
						
						
							
							[前台] subDevice 結束 loading bug | dashbord 修正 chart 更新時機
						
						
						
						
						
					 | 
					
						2023-05-29 14:22:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7a6b2068bd
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-29 10:08:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7417f09d7d
							
						
					 | 
					
						
						
							
							[後台] 後端修改building_menu 同步
						
						
						
						
						
						
						
						後台排程測試 
						
					 | 
					
						2023-05-29 10:08:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e986fa9305
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-25 18:41:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8f708105d9
							
						
					 | 
					
						
						
							
							[前台] 後端 更改設備名稱存入 LOG
						
						
						
						
						
					 | 
					
						2023-05-25 18:41:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f4e4e40cf3
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-25 18:28:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							66640d970f
							
						
					 | 
					
						
						
							
							[後台][後端] 修改deivce_item 獲取資料問題
						
						
						
						
						
						
						
						[前台][後端] 修改alert取法
[前端] 修改alert.html 
						
					 | 
					
						2023-05-25 18:28:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3712bbbc18
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-25 16:55:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f113d6f0b5
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-24 17:31:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2b39377565
							
						
					 | 
					
						
						
							
							[前台] 後端 部分 API 調整 GUID -> TAG
						
						
						
						
						
					 | 
					
						2023-05-24 17:31:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8b9efdf89e
							
						
					 | 
					
						
						
							
							[後端] 修改匯出問題
						
						
						
						
						
					 | 
					
						2023-05-24 16:50:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							19d3845a95
							
						
					 | 
					
						
						
							
							[後端] 修改Device SaveChangeName api
						
						
						
						
						
					 | 
					
						2023-05-24 14:07:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6f80966014
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-24 12:58:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f094af892a
							
						
					 | 
					
						
						
							
							[後端] 修改 下載檔案問題
						
						
						
						
						
						
						
						[前端] 修改前台修改需求問題 
						
					 | 
					
						2023-05-24 12:58:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2e3041d007
							
						
					 | 
					
						
						
							
							[後台] 前端帳號管理 角色權限加入可用功能 buidling_guid -> building_tag
						
						
						
						
						
					 | 
					
						2023-05-24 12:49:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5f979a36cb
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-23 11:54:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2aafffb001
							
						
					 | 
					
						
						
							
							[前台]30 平面圖原點顏色修正
						
						
						
						
						
					 | 
					
						2023-05-23 11:40:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							72b9c77fcd
							
						
					 | 
					
						
						
							
							三菱 Frontend 電梯速度增加1.5倍
						
						
						
						
						
					 | 
					
						2023-05-23 10:58:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bddb4f19f5
							
						
					 | 
					
						
						
							
							[緊急應變] 依據 api 調整欄位名稱前端同步更動
						
						
						
						
						
					 | 
					
						2023-05-22 18:24:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							54c2e9946e
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-22 18:12:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							27d3edaa0f
							
						
					 | 
					
						
						
							
							[後端] 水電報表 修改年度報表group by 問題
						
						
						
						
						
					 | 
					
						2023-05-22 18:12:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a5bcf2e8fb
							
						
					 | 
					
						
						
							
							[緊急應變] 設備總攬 Filter Panel 前端程序優化及調整 | 緊急應變初始頁面直接導進設備總覽
						
						
						
						
						
					 | 
					
						2023-05-22 16:29:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							86548b7fb6
							
						
					 | 
					
						
						
							
							[後端] 修改device getAlarm
						
						
						
						
						
					 | 
					
						2023-05-22 15:37:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9026166004
							
						
					 | 
					
						
						
							
							[後端] 修改getAlarmRecordFilterPanel api
						
						
						
						
						
					 | 
					
						2023-05-22 15:24:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							568a9e7e53
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-22 12:22:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9b639ae44d
							
						
					 | 
					
						
						
							
							[後端] 修改緊急應變api alarmRecord
						
						
						
						
						
					 | 
					
						2023-05-22 12:22:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							60d921b454
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-22 11:57:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c5ee9299ab
							
						
					 | 
					
						
						
							
							[前台][緊急應變] GetEmergencySetting, GetContentAndMakeItem, BuildInfoList API 程序調整 | [緊急應變][聯絡清單] 前端程序api串接調整  | [緊急應變][設備總覽] 前端程序api串接調整 | [緊急應變][紀錄查詢] 前端程序api串接調整 |  [緊急應變][AED裝置設定] 前端程序api串接調整、下載程序調整 |  [緊急應變][滅火器裝置設定] 前端程序api串接調整、下載程序調整 |
						
						
						
						
						
					 | 
					
						2023-05-22 11:57:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							aa61f21354
							
						
					 | 
					
						
						
							
							[後端] 修改table 另名錯誤
						
						
						
						
						
					 | 
					
						2023-05-22 10:19:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ccdc6e76c9
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-22 10:09:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ba6fc268f0
							
						
					 | 
					
						
						
							
							[後端] 修改table問題, db新增table
						
						
						
						
						
					 | 
					
						2023-05-22 10:09:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8a2ac8e393
							
						
					 | 
					
						
						
							
							[緊急應變] 簡訊發送程序建置
						
						
						
						
						
					 | 
					
						2023-05-19 18:47:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e77715fb0e
							
						
					 | 
					
						
						
							
							[前台][緊急應變] 前端五段改八段調整
						
						
						
						
						
					 | 
					
						2023-05-19 14:26:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c1a05f2207
							
						
					 | 
					
						
						
							
							[後端] 修改前台 class building_tag問題
						
						
						
						
						
					 | 
					
						2023-05-19 14:22:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							606826eb66
							
						
					 | 
					
						
						
							
							[後端] 修改緊急api問題, 新增office 的mysqldatabase
						
						
						
						
						
					 | 
					
						2023-05-19 14:06:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1ce1e8400b
							
						
					 | 
					
						
						
							
							[後端] 修改前台 緊急使用api
						
						
						
						
						
					 | 
					
						2023-05-19 11:18:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9e33f4c368
							
						
					 | 
					
						
						
							
							[後端] 修改niagara 同步問題
						
						
						
						
						
					 | 
					
						2023-05-19 10:06:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7b55ec92af
							
						
					 | 
					
						
						
							
							[後端] 修改後端controller router, 修改login index標題
						
						
						
						
						
					 | 
					
						2023-05-18 17:25:15 +08:00 | 
					
					
						
						
							
							
							
						
					 |