| 
						
					 | 
					
						
						
						
						
							
						
						
							19533f9c63
							
						
					 | 
					
						
						
							
							[webAPI] - 報表查詢改抓 kwh_result
						
						
						
						
						
					 | 
					
						2023-07-28 13:31:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							13abccd24e
							
						
					 | 
					
						
						
							
							[前端] 修改歷史資料, 運維管理程序
						
						
						
						
						
					 | 
					
						2023-07-26 17:04:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f82f1ec177
							
						
					 | 
					
						
						
							
							[後端] 修改同步問題
						
						
						
						
						
					 | 
					
						2023-07-26 16:16:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7ae883a1b6
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-07-26 15:36:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9ffe2520ff
							
						
					 | 
					
						
						
							
							[後端] 修改niagara 同步building_menu預設值
						
						
						
						
						
					 | 
					
						2023-07-26 15:35:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							77e2535f89
							
						
					 | 
					
						
						
							
							[緊急應變] 緊急聯絡匯出程序修正
						
						
						
						
						
					 | 
					
						2023-07-25 13:24:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							36f18506e2
							
						
					 | 
					
						
						
							
							[前台 API][水電報表] 匯出水表 API 還原
						
						
						
						
						
					 | 
					
						2023-07-25 12:48:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6e273809dd
							
						
					 | 
					
						
						
							
							[後台][區域選單管理] 選單樓層為空無法刪除問題修正
						
						
						
						
						
					 | 
					
						2023-07-25 12:41:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c95943af74
							
						
					 | 
					
						
						
							
							[後台] 角色權限管理 列表欄位調整
						
						
						
						
						
					 | 
					
						2023-07-25 12:22:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a62fb7eea9
							
						
					 | 
					
						
						
							
							[後端] 處理字串
						
						
						
						
						
					 | 
					
						2023-07-20 10:54:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d3f1edd94a
							
						
					 | 
					
						
						
							
							[後端] 修改Json轉換問題
						
						
						
						
						
					 | 
					
						2023-07-20 10:23:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f2d6f711f0
							
						
					 | 
					
						
						
							
							[後端] 優化sql語法
						
						
						
						
						
					 | 
					
						2023-07-19 13:26:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b4e4321453
							
						
					 | 
					
						
						
							
							[後端] 優化存取程序, 修改getmenu增加判斷
						
						
						
						
						
						
						
						[前端] 修改spinner問題 
						
					 | 
					
						2023-07-19 11:42:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2206f5a3fe
							
						
					 | 
					
						
						
							
							[後端] 修改niagara同步預設值, 修改水電表列表問題, 修改排序程序
						
						
						
						
						
					 | 
					
						2023-07-18 15:02:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5992b5cfd2
							
						
					 | 
					
						
						
							
							[後端] 修改同步時常, 修改使用function
						
						
						
						
						
					 | 
					
						2023-07-18 14:08:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c468efe0fc
							
						
					 | 
					
						
						
							
							[後端] 增加loading顯示, 排程try catch
						
						
						
						
						
					 | 
					
						2023-07-18 11:10:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							060dc97391
							
						
					 | 
					
						
						
							
							[後端] 修改niagara同步
						
						
						
						
						
					 | 
					
						2023-07-18 09:28:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							100a5bdc07
							
						
					 | 
					
						
						
							
							[前端] 修改歷史資料前端程序, 增加下載function
						
						
						
						
						
						
						
						[後端] 修改歷史資料下載流程 
						
					 | 
					
						2023-07-17 17:41:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3e8daf7759
							
						
					 | 
					
						
						
							
							[後端] 排程修改錯誤log部分, 修改歷史資料匯出
						
						
						
						
						
						
						
						[前端] 修改baja.js, 修改歷史資料程序 
						
					 | 
					
						2023-07-17 15:23:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							949b9407af
							
						
					 | 
					
						
						
							
							[後端] 增加errlog device_number
						
						
						
						
						
					 | 
					
						2023-07-14 12:22:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							299555fbc8
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-07-13 14:41:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ac1fb43892
							
						
					 | 
					
						
						
							
							[後端] 修改人流計算問題
						
						
						
						
						
					 | 
					
						2023-07-13 14:41:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1fecf37153
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-07-13 13:09:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ca304a1114
							
						
					 | 
					
						
						
							
							解決預設頁面讀取 baja iframe 回其他葉面沒辦法正常讀取 baja module 問題
						
						
						
						
						
					 | 
					
						2023-07-13 13:08:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							06ad469031
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-07-13 12:46:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							269f1f2acb
							
						
					 | 
					
						
						
							
							[前端] 修改歷史資料排序
						
						
						
						
						
					 | 
					
						2023-07-13 12:46:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							18647a53e7
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-07-13 11:17:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8372e3bb2c
							
						
					 | 
					
						
						
							
							[儀錶板] dashboard 昨日與今日順序調整
						
						
						
						
						
					 | 
					
						2023-07-13 11:17:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ecf97b5a23
							
						
					 | 
					
						
						
							
							merge
						
						
						
						
						
					 | 
					
						2023-07-04 17:21:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							592784126e
							
						
					 | 
					
						
						
							
							明志DB 連線
						
						
						
						
						
					 | 
					
						2023-07-04 17:19:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d448900156
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-06-20 10:32:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1c179983ab
							
						
					 | 
					
						
						
							
							[前端] 修改table排序問題
						
						
						
						
						
					 | 
					
						2023-06-20 10:32:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e7ac166ffe
							
						
					 | 
					
						
						
							
							前台 report 報表統計頁面建置
						
						
						
						
						
					 | 
					
						2023-06-19 15:58:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2c3a9a82e7
							
						
					 | 
					
						
						
							
							[後端] 新增需求欄位
						
						
						
						
						
					 | 
					
						2023-06-19 15:13:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							59ccf99d1e
							
						
					 | 
					
						
						
							
							[後端] 水電表增加設備名稱
						
						
						
						
						
					 | 
					
						2023-06-19 14:10:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							048bb80f9c
							
						
					 | 
					
						
						
							
							[後端] 修改水電表顯示問題
						
						
						
						
						
					 | 
					
						2023-06-19 13:51:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							10d2254b13
							
						
					 | 
					
						
						
							
							[後端] 修改歷史資料獲取subsystem device
						
						
						
						
						
					 | 
					
						2023-06-19 12:00:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							681e11de8a
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-06-17 11:43:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							99a6b41718
							
						
					 | 
					
						
						
							
							[前台] 儀錶板取資料庫能量須量換算即時功率占比
						
						
						
						
						
					 | 
					
						2023-06-16 18:26:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f012de5bd6
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-06-15 10:04:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							05d7f7ea0f
							
						
					 | 
					
						
						
							
							[後端] 修改getsubmain
						
						
						
						
						
					 | 
					
						2023-06-13 16:11:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							117b7bae3c
							
						
					 | 
					
						
						
							
							[後端] 開啓同步
						
						
						
						
						
					 | 
					
						2023-06-13 09:24:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3b2fd3d9fe
							
						
					 | 
					
						
						
							
							[後端] 修改device_item 與building_tag 鏈接
						
						
						
						
						
					 | 
					
						2023-06-12 19:23:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							89b1056356
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-06-12 16:03:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cca132a876
							
						
					 | 
					
						
						
							
							[前台][水電報表] 比較日期 api 程序建置
						
						
						
						
						
					 | 
					
						2023-06-12 16:02:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1164388253
							
						
					 | 
					
						
						
							
							[後台] 後端修改get menu 安全系統小類 人流計數類別的顯示輸出
						
						
						
						
						
						
						
						[前台] 前端修改歷史資料查詢問題 
						
					 | 
					
						2023-06-12 12:34:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4a4a96e13d
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-06-12 10:52:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8ce6316200
							
						
					 | 
					
						
						
							
							[後端] 修改niagara 同步 設備防災錯誤, 修改水電表判斷表格錯誤
						
						
						
						
						
					 | 
					
						2023-06-09 15:33:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							985aaed080
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-06-09 10:49:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f03491e9f6
							
						
					 | 
					
						
						
							
							[儀錶板] 取得各棟總電表 api 建置
						
						
						
						
						
					 | 
					
						2023-06-09 10:49:44 +08:00 | 
					
					
						
						
							
							
							
						
					 |