| 
						
					 | 
					
						
						
						
						
							
						
						
							57ea689560
							
						
					 | 
					
						
						
							
							[通用]N4特殊字串轉換方法
						
						
						
						
						
					 | 
					
						2024-12-24 15:27:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d41217adbd
							
						
					 | 
					
						
						
							
							[BGService]因網路斷線資料回補問題,月歸檔拉長一個月
						
						
						
						
						
					 | 
					
						2024-11-07 10:17:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							08f6c3f125
							
						
					 | 
					
						
						
							
							[BGService]因網路斷線資料回補問題,歸檔拉長重做天數
						
						
						
						
						
					 | 
					
						2024-11-06 11:51:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9aae67472f
							
						
					 | 
					
						
						
							
							[BGService]新增log & 註解部分覺得奇怪的程式碼
						
						
						
						
						
					 | 
					
						2024-11-05 18:37:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f5d08d9fa9
							
						
					 | 
					
						
						
							
							[Backend]改善同步timeout、是否顯示歷史資料問題
						
						
						
						
						
					 | 
					
						2024-10-04 18:14:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5766931a1f
							
						
					 | 
					
						
						
							
							[BGService]月歸檔加入跨月補檔機制
						
						
						
						
						
					 | 
					
						2024-09-10 14:50:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							635a940d25
							
						
					 | 
					
						
						
							
							Merge branch 'MCUT' of https://gitea.mjm-staging.developers-homelab.net/mjm-group/ibms into MCUT
						
						
						
						
						
					 | 
					
						2024-09-10 10:01:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9eb49eb2ae
							
						
					 | 
					
						
						
							
							[BGService]明志沒有水錶先註解
						
						
						
						
						
					 | 
					
						2024-09-10 10:01:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							17410161f3
							
						
					 | 
					
						
						
							
							移除電表單線圖的zoom
						
						
						
						
						
					 | 
					
						2024-09-09 14:29:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c66ac43c14
							
						
					 | 
					
						
						
							
							Merge branch 'feature/solarEnergy' into MCUT
						
						
						
						
						
					 | 
					
						2024-09-05 09:59:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							296aace728
							
						
					 | 
					
						
						
							
							刪除舊資料
						
						
						
						
						
					 | 
					
						2024-09-05 09:44:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0225ca81b7
							
						
					 | 
					
						
						
							
							太陽能react框架
						
						
						
						
						
					 | 
					
						2024-09-05 09:40:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5ffa32a2fe
							
						
					 | 
					
						
						
							
							修改UI
						
						
						
						
						
					 | 
					
						2024-08-23 09:45:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6aac7bfc6d
							
						
					 | 
					
						
						
							
							引用px檔
						
						
						
						
						
					 | 
					
						2024-08-08 17:59:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ddccee9644
							
						
					 | 
					
						
						
							
							[Webapi]修正架站找不到相關套件問題
						
						
						
						
						
					 | 
					
						2024-08-07 17:12:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c438cb0fc4
							
						
					 | 
					
						
						
							
							太陽能管理初始化頁面
						
						
						
						
						
					 | 
					
						2024-07-29 15:24:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d9895d3573
							
						
					 | 
					
						
						
							
							Merge branch 'MCUT_test' into MCUT
						
						
						
						
						
					 | 
					
						2024-07-29 10:33:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b652aa1533
							
						
					 | 
					
						
						
							
							[WebApi]歷史資料匯出改成一頁式,並修正排序問題
						
						
						
						
						
					 | 
					
						2024-06-05 17:31:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							84fd45c601
							
						
					 | 
					
						
						
							
							[WebaApi]因應Naigara資料會有誤差,多抓5秒
						
						
						
						
						
					 | 
					
						2024-05-27 20:44:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							378da31ebb
							
						
					 | 
					
						
						
							
							debug - 歷史資料過濾增加 points 條件
						
						
						
						
						
					 | 
					
						2024-05-26 22:22:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							db6dc0b3bd
							
						
					 | 
					
						
						
							
							Merge branch 'MCUT' of https://gitea.mjm-staging.developers-homelab.net/mjm-group/ibms into MCUT
						
						
						
						
						
					 | 
					
						2024-05-16 11:07:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5c2ccb1304
							
						
					 | 
					
						
						
							
							[Webapi]歷史資料常用組合檔重複名稱
						
						
						
						
						
					 | 
					
						2024-05-16 11:07:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1389533087
							
						
					 | 
					
						
						
							
							增加常用名稱驗證|取消 jquery popper 引用 會導致require出錯
						
						
						
						
						
					 | 
					
						2024-05-13 09:49:51 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a5334662cf
							
						
					 | 
					
						
						
							
							bug 修正 |搜尋功能
						
						
						
						
						
					 | 
					
						2024-05-09 12:51:28 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8edb8225ba
							
						
					 | 
					
						
						
							
							點擊常用清單錯誤
						
						
						
						
						
					 | 
					
						2024-05-08 09:02:49 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							daaaac8dcc
							
						
					 | 
					
						
						
							
							Merge pull request '匯出參數修正' (#1) from hotfix/history2 into MCUT
						
						
						
						
						
						
						
						Reviewed-on: mjm-group/ibms#1 
						
					 | 
					
						2024-05-07 22:09:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							10f66b3a22
							
						
					 | 
					
						
						
							
							匯出參數修正
						
						
						
						
						
					 | 
					
						2024-05-07 10:02:34 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f49d2a749f
							
						
					 | 
					
						
						
							
							[WebApi]修改Niagara撈的資料有科學記號問題,並抓到小數點第2位
						
						
						
						
						
					 | 
					
						2024-05-07 18:07:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7c3e699a79
							
						
					 | 
					
						
						
							
							Merge branch 'MCUT' of https://gitea.mjm-staging.developers-homelab.net/mjm-group/ibms into MCUT
						
						
						
						
						
					 | 
					
						2024-05-06 10:58:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8dd6c4c4c3
							
						
					 | 
					
						
						
							
							[WebApi]歷史資料更版
						
						
						
						
						
					 | 
					
						2024-05-06 10:58:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0ad9093d5b
							
						
					 | 
					
						
						
							
							修改切換頁面錯誤
						
						
						
						
						
					 | 
					
						2024-05-05 22:48:15 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							55efb1ffc0
							
						
					 | 
					
						
						
							
							勾心歷史資料
						
						
						
						
						
					 | 
					
						2024-05-03 18:02:50 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7c9866d54e
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/MCUT' into MCUT
						
						
						
						
						
						
						
						# Conflicts:
#	FrontendWebApi/appsettings.Development.json 
						
					 | 
					
						2024-03-09 15:06:22 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							631128c79a
							
						
					 | 
					
						
						
							
							修正首頁圖表為定時更新
						
						
						
						
						
					 | 
					
						2024-03-09 15:03:37 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7f7996a681
							
						
					 | 
					
						
						
							
							[WebApi]修正民國年不會自動判斷為閏年,導致標題在閏年2月份少一天的問題V2
						
						
						
						
						
					 | 
					
						2024-03-07 14:22:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b11299762d
							
						
					 | 
					
						
						
							
							[WebApi]修正民國年不會自動判斷為閏年,導致標題在閏年2月份少一天的問題
						
						
						
						
						
					 | 
					
						2024-03-07 11:39:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6905d1f342
							
						
					 | 
					
						
						
							
							[BackendWorkerService]修改水錶寫進DB的邏輯
						
						
						
						
						
					 | 
					
						2024-02-05 09:14:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0929c6f21a
							
						
					 | 
					
						
						
							
							[BackendWorkerService]修改水電月歸檔最後一天沒紀錄的問題
						
						
						
						
						
					 | 
					
						2024-02-05 07:20:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6c50bdb071
							
						
					 | 
					
						
						
							
							修改連線資訊
						
						
						
						
						
					 | 
					
						2024-01-10 12:57:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							99fabe689e
							
						
					 | 
					
						
						
							
							[前端] 修改年月份顯示
						
						
						
						
						
						
						
						[後端] 修改搜尋變數錯誤 
						
					 | 
					
						2024-01-02 14:17:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							35118e8115
							
						
					 | 
					
						
						
							
							明志 - 月歸檔 debug
						
						
						
						
						
					 | 
					
						2023-12-12 14:15:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2ef31fc7ea
							
						
					 | 
					
						
						
							
							debug: 跨月計算問題
						
						
						
						
						
					 | 
					
						2023-11-28 23:48:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9e991688f7
							
						
					 | 
					
						
						
							
							debug - 日報表每月最後一天 沒有總計到
						
						
						
						
						
					 | 
					
						2023-11-03 14:46:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f5687166e5
							
						
					 | 
					
						
						
							
							mcut
						
						
						
						
						
					 | 
					
						2023-10-19 15:24:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fa91256a80
							
						
					 | 
					
						
						
							
							UPDATE
						
						
						
						
						
					 | 
					
						2023-10-17 11:27:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a33b148c4b
							
						
					 | 
					
						
						
							
							update
						
						
						
						
						
					 | 
					
						2023-10-17 11:17:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7e5a8a7426
							
						
					 | 
					
						
						
							
							[後端] 修改更新使用者設備api
						
						
						
						
						
					 | 
					
						2023-10-17 11:17:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7c86b10f66
							
						
					 | 
					
						
						
							
							Merge branch 'MCUT' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS into MCUT
						
						
						
						
						
					 | 
					
						2023-10-17 09:47:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							90011e6d7d
							
						
					 | 
					
						
						
							
							[後端] fix problem only for mcut only commended
						
						
						
						
						
					 | 
					
						2023-10-17 09:47:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bdb439a0ec
							
						
					 | 
					
						
						
							
							[Frontend] 修改側邊卡片欄異常消失後正常消失
						
						
						
						
						
					 | 
					
						2023-10-16 11:01:36 +08:00 | 
					
					
						
						
							
							
							
						
					 |