| 
						
					 | 
					
						
						
						
						
							
						
						
							120642b5c7
							
						
					 | 
					
						
						
							
							[前端] 修改時間格式, 時間問題
						
						
						
						
						
					 | 
					
						2023-07-26 13:41:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							df95bf5827
							
						
					 | 
					
						
						
							
							[後端] 修改匯出條件, 調整join問題
						
						
						
						
						
						
						
						[前端] 修改時間問題 
						
					 | 
					
						2023-07-26 09:54:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6a4ad3abf5
							
						
					 | 
					
						
						
							
							Merge branch 'MCUT' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS into MCUT
						
						
						
						
						
					 | 
					
						2023-07-25 17:49:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fd79ba4df2
							
						
					 | 
					
						
						
							
							[後端] 修改更新角色權限頁面權限api
						
						
						
						
						
					 | 
					
						2023-07-25 17:49:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a79a896641
							
						
					 | 
					
						
						
							
							Merge branch 'MCUT' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS into MCUT
						
						
						
						
						
					 | 
					
						2023-07-25 12:19:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d56334f867
							
						
					 | 
					
						
						
							
							[後台] 角色權限管理 列表欄位調整
						
						
						
						
						
					 | 
					
						2023-07-25 12:18:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keke
							
						 
					 | 
					
						
						
						
						
							
						
						
							ee6efe657b
							
						
					 | 
					
						
						
							
							增加 BG service 判斷
						
						
						
						
						
						
						
						判斷 history 是否有該 device (日周月 歸檔) 
						
					 | 
					
						2023-07-24 15:43:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							61c8e79e9c
							
						
					 | 
					
						
						
							
							[後端] 修改獲取device_item getway
						
						
						
						
						
					 | 
					
						2023-07-24 12:45:11 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							16ea38418c
							
						
					 | 
					
						
						
							
							新增獲取 niagara history insert to import_niagara_item_history
						
						
						
						
						
					 | 
					
						2023-07-24 02:02:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7cc15613bb
							
						
					 | 
					
						
						
							
							前端API:History 匯出 Excel 各分頁資料
						
						
						
						
						
					 | 
					
						2023-07-21 10:56:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b2a9df8922
							
						
					 | 
					
						
						
							
							[前端] 修改post value
						
						
						
						
						
						
						
						[後端] 修改匯出流程 
						
					 | 
					
						2023-07-20 18:29:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							81996a1ada
							
						
					 | 
					
						
						
							
							[後端] 處理字串
						
						
						
						
						
					 | 
					
						2023-07-20 10:47:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							65230a579c
							
						
					 | 
					
						
						
							
							[後端] 修改niagara同步 json 轉換問題, 更改資料顯示
						
						
						
						
						
					 | 
					
						2023-07-20 10:08:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							db97f5d1c8
							
						
					 | 
					
						
						
							
							[後端] 修改log記錄
						
						
						
						
						
					 | 
					
						2023-07-17 14:18:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2cf387f8f2
							
						
					 | 
					
						
						
							
							[後端] 新增errlog device_number
						
						
						
						
						
					 | 
					
						2023-07-14 12:25:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							79b1692bb7
							
						
					 | 
					
						
						
							
							Merge branch 'MCUT' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS into MCUT
						
						
						
						
						
					 | 
					
						2023-07-13 13:08:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							14c74748dc
							
						
					 | 
					
						
						
							
							解決預設頁面讀取 baja iframe 回其他葉面沒辦法正常讀取 baja module 問題
						
						
						
						
						
					 | 
					
						2023-07-13 13:08:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5a1b86ef28
							
						
					 | 
					
						
						
							
							修改table 排序
						
						
						
						
						
					 | 
					
						2023-07-13 13:01:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							90782a4c8a
							
						
					 | 
					
						
						
							
							[儀錶板] dashboard 昨日與今日順序調整
						
						
						
						
						
					 | 
					
						2023-07-13 11:16:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1bc6a04d65
							
						
					 | 
					
						
						
							
							Merge branch 'MCUT' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS into MCUT
						
						
						
						
						
					 | 
					
						2023-07-13 09:26:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							de4136c301
							
						
					 | 
					
						
						
							
							[儀錶板] 取得契約容量 API 調整 前端串接API調整
						
						
						
						
						
					 | 
					
						2023-07-13 09:26:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1aaf6ce792
							
						
					 | 
					
						
						
							
							Merge branch 'MCUT' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS into MCUT
						
						
						
						
						
					 | 
					
						2023-07-12 11:28:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9e9a06f907
							
						
					 | 
					
						
						
							
							[後端] 修改同步niagara樓層更新
						
						
						
						
						
						
						
						[前端] 修改history.html tag with "$3" problem 
						
					 | 
					
						2023-07-12 11:28:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							500c2badfe
							
						
					 | 
					
						
						
							
							將 含有/的deviceNumber 判斷buildingtag是否有數字開頭,補上$3
						
						
						
						
						
					 | 
					
						2023-07-12 09:46:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5c3f2b62f8
							
						
					 | 
					
						
						
							
							[系統監控] device card 燈號及列表去除 $3
						
						
						
						
						
					 | 
					
						2023-07-11 18:31:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							93c03ae844
							
						
					 | 
					
						
						
							
							[前台][系統監控] 點擊 device 卡片 data-number 適應 building_tag 開頭為數字轉換
						
						
						
						
						
					 | 
					
						2023-07-10 18:23:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7e07ac738b
							
						
					 | 
					
						
						
							
							building_tag 開頭若為數字則需要補上 $3 | Jquery selector 無法含有$,因應調整$3拿掉程序上需要時再補上
						
						
						
						
						
					 | 
					
						2023-07-07 18:15:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f1b138ce7b
							
						
					 | 
					
						
						
							
							Merge branch 'MCUT' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS into MCUT
						
						
						
						
						
					 | 
					
						2023-07-06 15:42:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							28943e74b6
							
						
					 | 
					
						
						
							
							[後端] 調整device_item更新全更新相同點位
						
						
						
						
						
					 | 
					
						2023-07-06 15:42:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d2f6005fcc
							
						
					 | 
					
						
						
							
							Merge branch 'MCUT' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS into MCUT
						
						
						
						
						
					 | 
					
						2023-07-06 15:33:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0298d6f7c9
							
						
					 | 
					
						
						
							
							若沒有 forge 則不執行相關程序 | 樓層平面圖只有左半邊則自動切換全版呈現
						
						
						
						
						
					 | 
					
						2023-07-06 15:33:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							17b9f2485b
							
						
					 | 
					
						
						
							
							[後台] 修改樓層顯示圖檔問題, 修改切換棟別問題, 關閉點位新增,
						
						
						
						
						
					 | 
					
						2023-07-06 11:42:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a620eae1a8
							
						
					 | 
					
						
						
							
							[前端] 修改checkbox顔色
						
						
						
						
						
					 | 
					
						2023-07-05 10:11:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							54e295628f
							
						
					 | 
					
						
						
							
							[後端] 修改歷史資料下載方式, 修改報表匯出錯誤
						
						
						
						
						
						
						
						[前端] 修改歷史資料時間發送問題 
						
					 | 
					
						2023-07-04 16:45:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6ca824e00c
							
						
					 | 
					
						
						
							
							[前端] 修改資料顯示
						
						
						
						
						
					 | 
					
						2023-07-03 16:44:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d13f5930a6
							
						
					 | 
					
						
						
							
							[後端] 修改欄位值
						
						
						
						
						
					 | 
					
						2023-07-03 12:29:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dd2eea50d1
							
						
					 | 
					
						
						
							
							[前端] 修改按鈕問題
						
						
						
						
						
					 | 
					
						2023-07-03 11:07:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9b0ad0fbd6
							
						
					 | 
					
						
						
							
							Merge branch 'MCUT' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS into MCUT
						
						
						
						
						
					 | 
					
						2023-06-29 11:21:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							803d74d645
							
						
					 | 
					
						
						
							
							[後端] 修改歷史資料匯出, 後台同步station更換
						
						
						
						
						
						
						
						[前端] 增加loading界面, 修改送出niagara building_tag 
						
					 | 
					
						2023-06-29 11:21:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							779a0b7927
							
						
					 | 
					
						
						
							
							Merge branch 'MCUT' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS into MCUT
						
						
						
						
						
					 | 
					
						2023-06-28 18:37:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6343816b47
							
						
					 | 
					
						
						
							
							[前端] 系統監控選單加寬 | 箭頭樣式更換 | 子階層明顯突出 | 一次只打開一個子層 | 選項內容增加靜態系統小類 | 首頁選單隱藏儀表板選項
						
						
						
						
						
					 | 
					
						2023-06-28 18:37:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8d03f7994e
							
						
					 | 
					
						
						
							
							Merge branch 'MCUT' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS into MCUT
						
						
						
						
						
					 | 
					
						2023-06-28 16:19:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b3af8cb461
							
						
					 | 
					
						
						
							
							[後端] 修改全域棟別api
						
						
						
						
						
					 | 
					
						2023-06-28 16:19:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							74f25324d9
							
						
					 | 
					
						
						
							
							show3DModel 判斷 launchViewerNoTools 是否存在
						
						
						
						
						
					 | 
					
						2023-06-28 12:56:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ac2b16d127
							
						
					 | 
					
						
						
							
							Merge branch 'MCUT' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS into MCUT
						
						
						
						
						
					 | 
					
						2023-06-27 14:55:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a4544780ea
							
						
					 | 
					
						
						
							
							左方選單展開程序調整 | 儀錶板單線圖 zoom in 調整 | dashboard 與 系統監控上方增加棟別文字
						
						
						
						
						
					 | 
					
						2023-06-27 14:55:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							32c2113380
							
						
					 | 
					
						
						
							
							[後端] 修改監控系統api錯誤
						
						
						
						
						
					 | 
					
						2023-06-27 13:45:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							518a97e461
							
						
					 | 
					
						
						
							
							[後端] 修改獨立棟別以sheet區分
						
						
						
						
						
					 | 
					
						2023-06-27 10:53:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							008e10c439
							
						
					 | 
					
						
						
							
							[前端] 更新修改部分
						
						
						
						
						
					 | 
					
						2023-06-27 10:38:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8dbfa4938a
							
						
					 | 
					
						
						
							
							[後端] 修改匯出程序, 更具需求更改成所有棟別資料, 修改監控系統列表排序
						
						
						
						
						
					 | 
					
						2023-06-27 10:34:38 +08:00 | 
					
					
						
						
							
							
							
						
					 |