Commit Graph

896 Commits

Author SHA1 Message Date
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
4eeaa48e46 [後台] 增加niagara同步device_disaster程序 2023-06-08 15:41:40 +08:00
afc2604353 [後端] 修改水電報表設備tag 2023-06-08 11:56:50 +08:00
9bd6ca4a31 [後端] 修改水電表現是欄位 2023-06-08 11:49:21 +08:00
9d36817c52 [後端] 修改水報表同步 2023-06-08 11:40:00 +08:00
330b1964f2 [後端] 修改水電表api 2023-06-08 11:39:17 +08:00
8e727303d4 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-06-08 09:55:50 +08:00
cacab7f20e [後台] 修改排程問題 2023-06-08 09:55:44 +08:00
0bd2d0483d [後台][緊急應變] 可多選棟別前端程序及api調整串接 2023-06-07 17:28:35 +08:00
08738f1e8f Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-06-07 17:12:35 +08:00
f1f366aae8 [後台][緊急應變] 硬體清單選單增加 | 增加硬體清單權限 | 硬體清單前端程序及介面調整 | 事件清單前端程序及介面調整 | 左邊選單順序程序調整 2023-06-07 17:12:22 +08:00
b110151c8e [後台] 修改buildinfo api 2023-06-07 16:54:16 +08:00
c969c24469 [后台] 修改排程, 資料對比錯誤, json增加mcut資料庫連綫
[前台] 後端修改emergencydevice api, emergencydevice model, json增加mcut資料庫連綫
2023-06-07 16:45:00 +08:00
56e18cc5a1 [前台] notice 告警卡片程序調整 2023-06-07 14:02:38 +08:00
447f1c6d69 Revert "Revert "[前台] 修改即時告警table render 問題""
This reverts commit 7f010ddb97.
2023-06-07 12:18:46 +08:00
7f010ddb97 Revert "[前台] 修改即時告警table render 問題"
This reverts commit 40ba482d70.
2023-06-07 12:17:09 +08:00
40ba482d70 [前台] 修改即時告警table render 問題 2023-06-07 12:16:44 +08:00
2599432c33 [前台] 修改維修單讀取, 修改api.json 2023-06-07 11:38:43 +08:00
8605cf4a01 [前台] 修改alert 新增維修改api, 修改alert 讀取維修單 2023-06-07 09:41:23 +08:00
e9649bd7f1 [後台] 修改排程開啓weather api 排程 2023-06-06 16:50:18 +08:00
85747ad5cb [後端] 修改using quarzt 錯誤 2023-06-06 16:48:05 +08:00
b49177cd5f Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2023-06-06 16:43:54 +08:00
0571ebd7ac [後端] 修改排程部分更改回原先專案, 使用windows service執行
[前端] 修改alert.html 建立維修單錯誤
2023-06-06 16:43:46 +08:00