Commit Graph

861 Commits

Author SHA1 Message Date
811a1fd465 fix problem of use result 2022-12-31 17:03:17 +08:00
wanli
125696a5d3 [Backend] N4同步: device_kind重複問題修正 2022-12-31 16:59:19 +08:00
wanli
4d29bb220c [App] N4同步,device_kind加上group by 2022-12-31 16:51:31 +08:00
c6714a980b Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-31 16:49:54 +08:00
4d38c0d73d 修改後台同步設備 2022-12-31 16:49:47 +08:00
d059763692 [FrontendWebApi] DeviceManage GetDeviceList 取得設備清單增加 device_coordinate_3d欄位 2022-12-31 15:44:48 +08:00
56a5196796 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-31 15:33:25 +08:00
edba8b60ea [FrontendWebApi] DeviceManage GetDeviceList 取得設備清單增加 room_dbid欄位 2022-12-31 15:33:19 +08:00
wanli
1eb730b15d [Frontend] 熱圖input 加入房間dbid,熱圖打點: 使用該層系統設備的座標 2022-12-31 15:24:02 +08:00
a3a0a0c963 [FrontendWebApi] GetNextFloor 取得 目標樓層之下一樓層 API 建置 | GetFloor 丟出 Floor_guid 程序調整 | forge 動態抓取 node id forge_node_name_system_type 改為 forge_check_tag_id 2022-12-31 11:13:35 +08:00
e48240b6eb [FrontendWebApi] forge_node_name_system_type 補上 2022-12-30 20:14:23 +08:00
7db899884b [Frontend][系統監控] 平面圖 baja 衝突問題解決 | 平面圖剖面框程序串接 | 熱點程序串接 | [全域功能] 熱圖溫度物件化程序調整 | 取得 node Id by tag id 程序優化 | [FrontendWebApi] GetForgeNodeName 取得資料庫 variable 設定 forge 依據字串程序建置 2022-12-30 19:03:31 +08:00
fae9317bb0 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-30 18:27:07 +08:00
79ebe87142 [Frontend][forge] 熱圖程序調整 2022-12-30 18:27:02 +08:00
wanli
7ac664683b [Frontend] 剖面框 加上 input 2022-12-30 18:24:19 +08:00
b4c150a1d4 修改device_item is_show_history 2022-12-30 16:29:42 +08:00
wanli
3a3efd388d [Frontend] 更改總攬熱圖打點位置 2022-12-29 19:10:00 +08:00
6cb209ead5 [Frontend] 熱圖 forgemodel.js 調整 2022-12-29 18:55:50 +08:00
747b82fcc8 [Frontend] 熱點衝突合併 2022-12-29 18:53:20 +08:00
16d97320b0 [Frontend][儀錶板] 文字調整 | [系統監控] 熱圖程序串接 | 熱圖物件化調整 2022-12-29 18:44:09 +08:00
wanli
aa6ebf3497 [Frontend] 測試剖面框 2022-12-29 18:20:16 +08:00
wanli
f662d22a4f [Frontend][系統監控] 樓層 加入剖面框 2022-12-29 18:19:22 +08:00
95e2780568 [Frontend][系統監控] 總覽 顯示熱點即顯示popover 及 focus 顏色程序調整 2022-12-29 16:03:58 +08:00
2819434390 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-29 11:30:44 +08:00
9844d6732d [Frontend][系統監控] 3D Popover 程序調整 2022-12-29 11:30:37 +08:00
wanli
e9a82aa5aa [Frontend] forge 熱圖測試 2022-12-29 00:06:28 +08:00
wanli
551af0ebde [Frontend] [監控系統] 總攬和樓層 3d模型 加入熱圖 2022-12-29 00:05:44 +08:00
02969cecbf [Frontend][系統監控] 熱點顯示 popover 程序建置及資料串接 | 熱點變色程序建置 2022-12-28 18:47:09 +08:00
0499c2c439 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-28 13:12:13 +08:00
3f9aca1e4e [Frontend] [系統監控] 熱點顯示 popover | [全域功能] YT-Tooltip 根據絕對座標顯示 popover 程序建置 | [儀表板] demo用系統小類Card程序建置 2022-12-28 13:12:08 +08:00
c4fe0abde6 修改賬號管理, 修改topbar頁簽 2022-12-28 13:00:17 +08:00
wanli
71c2240e68 [Frontend] 測試熱圖在房間 2022-12-27 22:10:42 +08:00
34f6022b10 [Frontend][系統監控] 熱點放入 forge3D 程序建置 | 串資料庫拿取設備座標放入 3d 圖建置 | [FrontendWebApi] 後端撈取設備座標API 調整 | [系統監控] 電梯判斷node程序調整 2022-12-27 18:44:22 +08:00
64e9b8e3f0 [Frontend] forge 熱點共用化調整 | 2022-12-27 15:17:52 +08:00
3e149a2cd9 修改api需求 2022-12-27 10:10:55 +08:00
799d3ddd6c [Frontend][系統監控] 合併衝突 2022-12-26 18:34:09 +08:00
8d3adf809c [系統監控][燈控排程] 增加燈控排程按鈕 | 燈控排程 Modal 及 Table 程序建置 | [儀錶板] Supplier 放入全域變數,根據供應商全域變數取得 baja 資料 2022-12-26 18:32:21 +08:00
wanli
6da73ceec6 [Frontend] 測試熱點、熱圖 2022-12-26 18:21:08 +08:00
wanli
00c9d700cb [Frontend][監控系統][電錶系統] 模型中加入熱點 2022-12-26 18:20:32 +08:00
6fdeb7096b [Backend] 修復 SaveDeviceKind 上傳圖片問題 2022-12-26 14:36:24 +08:00
47dad15e3e [Frontend][電梯管理] 2D 3D 切換紐拿掉 | [能源管理] 水資源及天然氣資源 內容清空 2022-12-23 17:27:16 +08:00
e7ad2e2261 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-23 16:17:28 +08:00
356eea459f [Frontend][系統監控] 左右邊區塊動態呈現程序建置 2022-12-23 16:17:22 +08:00
e5cb42dc7d Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-23 14:11:59 +08:00
8d9d0c98cf 新增api 2022-12-23 14:11:54 +08:00
2b20e6641c Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-23 13:22:57 +08:00
f0b228c0b6 [Frontend] Cookie 調整 12 小時有效期限 2022-12-23 13:22:50 +08:00
a671bc2a55 修改authcode全域變數 2022-12-22 18:01:17 +08:00
21e3890686 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-22 17:18:34 +08:00
d6d8f91378 修改使用者權限 2022-12-22 17:18:29 +08:00