|
|
d3f1edd94a
|
[後端] 修改Json轉換問題
|
2023-07-20 10:23:32 +08:00 |
|
|
|
b4e4321453
|
[後端] 優化存取程序, 修改getmenu增加判斷
[前端] 修改spinner問題
|
2023-07-19 11:42:55 +08:00 |
|
|
|
2206f5a3fe
|
[後端] 修改niagara同步預設值, 修改水電表列表問題, 修改排序程序
|
2023-07-18 15:02:18 +08:00 |
|
|
|
100a5bdc07
|
[前端] 修改歷史資料前端程序, 增加下載function
[後端] 修改歷史資料下載流程
|
2023-07-17 17:41:58 +08:00 |
|
|
|
3e8daf7759
|
[後端] 排程修改錯誤log部分, 修改歷史資料匯出
[前端] 修改baja.js, 修改歷史資料程序
|
2023-07-17 15:23:13 +08:00 |
|
|
|
ac1fb43892
|
[後端] 修改人流計算問題
|
2023-07-13 14:41:09 +08:00 |
|
|
|
ecf97b5a23
|
merge
|
2023-07-04 17:21:55 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
f03491e9f6
|
[儀錶板] 取得各棟總電表 api 建置
|
2023-06-09 10:49:44 +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 |
|
|
|
0bd2d0483d
|
[後台][緊急應變] 可多選棟別前端程序及api調整串接
|
2023-06-07 17:28:35 +08:00 |
|
|
|
c969c24469
|
[后台] 修改排程, 資料對比錯誤, json增加mcut資料庫連綫
[前台] 後端修改emergencydevice api, emergencydevice model, json增加mcut資料庫連綫
|
2023-06-07 16:45:00 +08:00 |
|
|
|
8605cf4a01
|
[前台] 修改alert 新增維修改api, 修改alert 讀取維修單
|
2023-06-07 09:41:23 +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 |
|
|
|
4c271743ac
|
[燈控排程] 紀錄 Operation_log 資料程序調整 | 後端匯出操作紀錄 api 程序建置 | [操作紀錄] 列表顯示程序調整
|
2023-05-31 15:59:07 +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 |
|
|
|
2441d84354
|
[前台] 後端修改針對兩個小類資料處理 緊急扣壓和閃光喇叭
|
2023-05-30 17:17:30 +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 |
|
|
|
8cb550bff6
|
[前台] 修改水電表列出api
|
2023-05-29 16:33:47 +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 |
|
|
|
f113d6f0b5
|
Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
|
2023-05-24 17:31:10 +08:00 |
|
|
|
2b39377565
|
[前台] 後端 部分 API 調整 GUID -> TAG
|
2023-05-24 17:31:02 +08:00 |
|
|
|
8b9efdf89e
|
[後端] 修改匯出問題
|
2023-05-24 16:50:03 +08:00 |
|
|
|
f094af892a
|
[後端] 修改 下載檔案問題
[前端] 修改前台修改需求問題
|
2023-05-24 12:58:27 +08:00 |
|
|
|
27d3edaa0f
|
[後端] 水電報表 修改年度報表group by 問題
|
2023-05-22 18:12:40 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
68ef0a1685
|
[圖資管理] 資料結構調整 | API 調整 | [歷史資料] API GetDevice 調整
|
2023-05-16 12:15:38 +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 |
|
|
|
4e0b457bbe
|
[後台][後端] 水電報表 Export 匯出報表 api 部分程序調整
|
2023-05-15 17:10:17 +08:00 |
|
|
|
012bc49651
|
Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
|
2023-05-15 16:26:45 +08:00 |
|
|
|
0117bc8016
|
[後台]修改 Forge 帳號 | [前台]樓層燈號顯示
|
2023-05-15 16:26:36 +08:00 |
|
|
|
5e45a6cca4
|
Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
|
2023-05-15 15:18:51 +08:00 |
|
|
|
0adecac5d8
|
[後台]後端 buildController getallfloor order by 程序補上 | 取得水電列表 api 調整
|
2023-05-15 15:18:43 +08:00 |
|
|
|
93fb080c01
|
[後端] 修改水電表列表年份問題
|
2023-05-15 13:27:13 +08:00 |
|
|
|
c3b09e6452
|
Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
|
2023-05-15 12:59:06 +08:00 |
|
|
|
a4756fffca
|
[後端] 新增歷史即使趨勢點位圖api
|
2023-05-15 12:59:01 +08:00 |
|
|
|
a55aa592c7
|
Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
|
2023-05-15 12:49:22 +08:00 |
|
|
|
67943d276b
|
[後台][水電報表] 後端部分判斷微調
|
2023-05-15 12:49:15 +08:00 |
|
|
|
f99a583fea
|
[後端] 完成水電表匯出
|
2023-05-15 12:04:42 +08:00 |
|
|
|
61c0f90979
|
[後端] 修改水電表sql語法, 新增水電表費用api, 新增會出excel水電表, 修改hinet賬密
|
2023-05-12 18:42:22 +08:00 |
|
|
|
b4f79d4a0f
|
[後端] 修改waterList param問題
|
2023-05-12 15:00:57 +08:00 |
|
|
|
40a3cf68e6
|
[前台] MeterList 後端程序調整
|
2023-05-12 14:55:43 +08:00 |
|
|
|
7dc2e0b5ae
|
[後端] 修改後去水電表列表問題
|
2023-05-12 13:02:24 +08:00 |
|
|
|
188dc425a6
|
[後端] 修改水電表參數輸入, 修改查詢sql
|
2023-05-12 11:06:55 +08:00 |
|
|
|
e8d553a292
|
Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
|
2023-05-12 10:55:32 +08:00 |
|
|
|
0811ba816b
|
/History/GetDevice、 /History/LookRealTime、 /History/GetMainSub 即時趨勢 API SQL調整
|
2023-05-12 10:55:23 +08:00 |
|
|
|
c3652ff48f
|
[後端] hinet增加關閉連綫
|
2023-05-12 10:18:50 +08:00 |
|
|
|
8c8030cb03
|
[後端] 新增HiNet api
|
2023-05-12 09:48:06 +08:00 |
|
|
|
eb1f84d82b
|
[後端] 水電表 增加判斷jwt
|
2023-05-12 09:39:44 +08:00 |
|
|
|
5c2bbe0eb6
|
[後端] 修改水電表列表錯誤
|
2023-05-11 20:05:44 +08:00 |
|
|
|
f95d7109c6
|
[前台] 修正 GetAllFlooor API 部分程序 | 修正 MeterList 部分程序
|
2023-05-11 18:40:23 +08:00 |
|
|
|
913aa9cbaf
|
[後端] 修改水電表 判斷日期格式
|
2023-05-11 18:25:44 +08:00 |
|
|
|
1c88b3182e
|
[後端] 修改水電表列表 新增欄位
|
2023-05-11 17:57:45 +08:00 |
|
