Commit Graph

376 Commits

Author SHA1 Message Date
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
3e49ef1943 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-22 14:34:26 +08:00
99e510287a [前台] bajatest 訂閱程序 areaTag 動態程序調整 | [電錶頁面] 左方卡片 flex 改為 grid | sessionstorage 紀錄正在選擇的棟別 | [儀錶板] 原取第一筆電錶資料改為抓資料庫total 2022-12-22 14:27:17 +08:00
wanli
dfa71098db [App] 載入N4資料: 改成 載入wsp的資料 2022-12-22 10:15:06 +08:00
wanli
0e0858d4bd [App] 讀取xml檔改成 讀取線上的N4資料 2022-12-22 10:13:53 +08:00
wanli
f9e803ef88 [Backend] 加入wsp的同步N4 2022-12-22 10:11:31 +08:00
d68beacee5 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-21 17:13:28 +08:00
0d95d17d76 appsettings DBConfig added WSP DB Name String。 2022-12-21 11:43:14 +08:00
5b80602903 add user acc 2022-12-19 11:13:56 +08:00
b94e765770 fix problem 2022-12-19 10:24:32 +08:00
8911525b5a 修改賬號管理群組權限 2022-12-15 14:26:20 +08:00
f134b849cb Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-14 18:28:01 +08:00
4ba52a8a18 [Frontend][圖資管理] 增加 size 欄位程序調整 | 下載程序調整 2022-12-14 18:27:51 +08:00
wanli
a8ef4358ac [Frontend] forge 加入熱點、點燈、聚光燈,燈的開關,點擊熱點開起小視窗;測試wsp模型(取token) 2022-12-14 17:39:44 +08:00
e4a3cc9597 [Frontend][圖資管理] 下載dwg檔程序調整 2022-12-14 17:34:13 +08:00
7802738fa4 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-14 15:58:14 +08:00
d9d1a4d736 [Frontend][圖資管理] 圖資 CURD 程序建置 | 列表下載DWG檔程序建置 | dropzone 上傳文件程序調整 2022-12-14 15:57:49 +08:00
d43e0e9c5f [Frontend][全域功能] vendors.bundle.js 重複 function 註解 2022-12-14 15:50:57 +08:00
3bb318e5f1 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-14 11:57:45 +08:00
8373e3df95 修改回報錯誤js驗證 2022-12-14 11:57:40 +08:00
53afc09906 [Frontend] 因 require 引入 verdor.bundle.js bootstrap $.fn程序覆蓋,而二次導入 bootstrap 程序建置 2022-12-14 10:53:28 +08:00
909f528e11 [Frontend][圖資管理] jsTree新增 node 程序調整 2022-12-14 09:54:29 +08:00
ff31936174 [Frontend][圖資管理] jstree 圖資類別 程序建置 | 最多三層限制程序建置 | 圖資類別 CRUD 程序建置 | 圖資 Create 程序建置 | dropzone 上傳程序建置 | variable 增加 layer_id 程序建置 | 後端 api variable 不依據 main_system_tag 和 sub_system_tag 程序調整 2022-12-13 18:41:32 +08:00
0ea1d81f25 [Frontend] JsTree 樹狀架構套件引入 | 開發機 login 調整 2022-12-13 09:40:10 +08:00
9d02c456ba fix problem 2022-12-12 16:15:04 +08:00
ed5afdb0e1 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-12 16:11:08 +08:00
1e0fbdfb3b 編輯圖資crud 2022-12-12 16:11:04 +08:00
2107ec9a09 新增modal 2022-12-12 16:10:02 +08:00
9637fcee9f 新增圖資類別crud 2022-12-12 16:09:44 +08:00
7f3931d104 [Frontend][儀錶板] 即時功率佔比設置 | 即時功率訂閱串接 | 計時器移至 index.html | topbar上方即時告警閃爍程序建置 2022-12-12 15:06:35 +08:00
d5b35002d0 [Frontend][全域功能] Datatable Ajax 改 cookie JWT 2022-12-12 11:39:25 +08:00
4a82696ad1 [Frontend][全域功能] JWT 紀錄 原程序 localstorage 改成 cookie 存放 2022-12-12 10:53:31 +08:00
e69dd715d7 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-12 09:42:59 +08:00
0359a474ca [Frontend] Jquery Validate 客製限制補上 2022-12-12 09:42:51 +08:00
a039591924 Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS 2022-12-10 16:23:11 +08:00
e663813217 修改新增程序 2022-12-10 16:23:02 +08:00