Commit Graph

896 Commits

Author SHA1 Message Date
ad0449eb52 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-06-06 10:58:35 +08:00
fd12f921a1 [前台] 及時告警閃爍錯誤 | alarmbaja 語法修改 2023-06-06 10:35:17 +08:00
a8293c6798 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-06-06 10:34:05 +08:00
dd244589c5 [前端] 修改即時告警 新增維修單錯誤 2023-06-06 09:07:18 +08:00
49bff5f78b 即時告警文字修改 2023-06-05 13:36:59 +08:00
01b4db1b92 [前台] 圖資管理前端程序更新 2023-06-05 10:26:40 +08:00
e5b20132ad Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-06-02 18:02:20 +08:00
6458a10215 [后台] 修改niagara 同步device_item 同步is_link, is_history 值 2023-06-02 18:02:11 +08:00
31aa51985f [前台] 系統監控卡片原點無法正常轉換 | 全局警告卡片 bql 語法修正 2023-06-02 15:25:45 +08:00
73ca14abe9 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-06-02 11:58:33 +08:00
981d9af74d 1.前後台 api 增加 hello
2.三菱模型 ID
2023-06-02 11:58:24 +08:00
099945f533 [前台]系統監控熱點殘留首頁 bug 2023-06-02 11:37:18 +08:00
371e80eb89 [后台] 修改api_weather fix problem api of rain, and typhoon with model 2023-06-01 16:43:39 +08:00
0c6b9e465f [后端] 修改app json logger path 2023-06-01 16:07:37 +08:00
6511e0850c Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-06-01 13:56:42 +08:00
1fe0f2c9a1 [後台] 修改排程流程放置 在後台專案 2023-06-01 13:56:34 +08:00
26706ad4c1 [前台] _alert 異常類別文字修改 2023-06-01 13:27:15 +08:00
27a2838695 [前台] 異常類別文字修改 2023-06-01 13:23:04 +08:00
ed02fcdec8 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-05-31 18:12:20 +08:00
1ca9f9c2ff [後台] 修改後端排程流程 2023-05-31 18:12:14 +08:00
ebe52df15f Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-05-31 15:59:22 +08:00
4c271743ac [燈控排程] 紀錄 Operation_log 資料程序調整 | 後端匯出操作紀錄 api 程序建置 | [操作紀錄] 列表顯示程序調整 2023-05-31 15:59:07 +08:00
92682051a4 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-05-31 13:24:11 +08:00
fb453a90c9 [前台] 修改即時告警 2023-05-31 13:24:05 +08:00
bfa2e59b87 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-05-30 18:30:03 +08:00
ecda03cb98 [操作紀錄] 頁面建置 | API GetList 後端程序建置 | 分頁結構建置 | 存取 OperationLog 程序調整 2023-05-30 18:29:51 +08:00
d541e72dd6 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-05-30 17:17:36 +08:00
2441d84354 [前台] 後端修改針對兩個小類資料處理 緊急扣壓和閃光喇叭 2023-05-30 17:17:30 +08:00
720008bdee [系統監控]刪除多餘代碼 2023-05-30 16:11:46 +08:00
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