Commit Graph

890 Commits

Author SHA1 Message Date
2f8124e753 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-05-23 18:20:50 +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
de52fc27b9 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-05-23 09:04:26 +08:00
2488d2a22f [backend] wsp 模型上傳 2023-05-23 09:04: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
47f29cdddf [後端] 修改前台登入時流程 2023-05-18 16:05:59 +08:00
af7d66e5ee 合併衝突 2023-05-18 12:49:04 +08:00
faa2ddca2f 後台 [歷史資料] api 程序調整 2023-05-18 12:45:35 +08:00
3350dbc6f0 [後端] 修改get device api 2023-05-18 12:44:43 +08:00
e7e26ef5f5 [後端] 修改後台同步問題 2023-05-17 15:42:21 +08:00
d03bf8bdb9 [後端] 修改同步問題 2023-05-17 14:25:24 +08:00
48dfbe134c [後端] 完成hinet程序, 修改historyData loadtable 程序 2023-05-17 11:42:27 +08:00
8840d501ed [後端] 修改判斷table存在問題 2023-05-17 10:41:47 +08:00
da9b6f678d 更新 2023-05-17 09:29:51 +08:00
d2624226ac [前台] History HistoryRawData Start_timestamp 調整 2023-05-16 18:37:01 +08:00
7c7dc74c41 合併調整 2023-05-16 18:35:47 +08:00
5d193a8b1e [前台api][後端] PostHistoryRawDataFilter Model 調整 | API 調整 2023-05-16 18:33:34 +08:00
fc1e8b0241 [後端] 修改歷史資料api, 修改hinet架構 2023-05-16 18:29:28 +08:00
104260b662 [後端] 修改api錯誤 2023-05-16 15:18:10 +08:00
d8ec06a859 [後端] 修改historyapi 2023-05-16 14:43:47 +08:00
81dc79f31c Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-05-16 14:12:44 +08:00
4fff1630c9 [後端] 修改同步niagara_item full_name 問題, 修改即使歷史資料api輸出架構, 修改get floor問題 2023-05-16 14:12:39 +08:00
7c90015daf Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-05-16 12:15:45 +08:00
68ef0a1685 [圖資管理] 資料結構調整 | API 調整 | [歷史資料] API GetDevice 調整 2023-05-16 12:15:38 +08:00
d312a3c293 [後端] 修改同步分割串問題, 專案名稱 2023-05-16 10:52:15 +08:00
1abd1f3c5b [後端] 修改排程儲存資料格式問題 2023-05-15 17:44:14 +08:00
7271af8b0e [後端] 修改同步取tag_quantity問題 2023-05-15 17:43:00 +08:00
8c0738addf [後端] 修改年份結束日期 2023-05-15 17:15:24 +08:00
a8e836451a Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-05-15 17:10:24 +08:00