hank.chen/FIC_Solar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
441 Commits 1 Branch 0 Tags 33 MiB
52fb2cb3b6
Commit Graph

232 Commits

Author SHA1 Message Date
b110212000
54250e64bb 未有詳細資料 2021-08-17 12:02:47 +08:00
b110212000
d04644310b 逆變器監控(僅4個) 2021-08-16 18:44:49 +08:00
b110212000
7ab0656a1e 異常email 寄信 2021-08-13 16:54:03 +08:00
Kai
b4909cbba2 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-12 18:47:21 +08:00
Kai
98ccc88ecb 1. bug fix 2021-08-12 18:46:53 +08:00
b110212000
9c337fb0ee 發票微調 2021-08-12 17:45:12 +08:00
b110212000
dc60934c99 設備頁面微調修復 2021-08-12 15:41:49 +08:00
b110212000
05e9a1b09e Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-12 10:34:54 +08:00
b110212000
ce97d88bca 發票含圖片(完成) 2021-08-12 10:34:39 +08:00
Kai
f39b7460ba 1. bug fix 2021-08-11 18:27:43 +08:00
Kai
d26c9cc810 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-11 16:13:58 +08:00
b110212000
04ecabd6a5 發票一半 (修改bug) 2021-08-11 15:49:26 +08:00
Kai
74998e73c2 1. bug fix 2021-08-11 15:47:18 +08:00
b110212000
2808c039e6 發送報告(完成) 2021-08-10 16:26:32 +08:00
b110212000
09d355ae98 合併衝突 2021-08-09 18:35:23 +08:00
b110212000
2562ca3a17 修正無逆變器於 日報表中bug 2021-08-09 18:32:39 +08:00
Kai
f42e943d7c 1. 計算每日/月 電錶 歸檔 2021-08-09 18:09:01 +08:00
Kai
50998ccafd Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-09 15:57:17 +08:00
Kai
6a5cf5a332 1. 加入 電錶每小時歸檔 
2. 交叉分析bug fix
 2021-08-09 15:57:02 +08:00
b110212000
3b1fbe6f33 Merge branch 'Willy' 2021-08-09 15:12:43 +08:00
b110212000
671535e692 綜合報表(Excel) 2021-08-09 15:11:32 +08:00
b110212000
fcc38fa127 合併衝突 2021-08-06 19:26:28 +08:00
b110212000
a31611b625 金額顯示 2021-08-06 19:24:48 +08:00
Kai
2ac29120cd 1. bug fix 2021-08-06 11:38:13 +08:00
Kai
f2e1ea235d Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-05 17:13:48 +08:00
Kai
6ad6054bba 1. 即時資訊 and 合併電站圖表：增加模組溫度 
2.Sensor 如有多個需修正為多個平均
3.合併電站：選擇電站改為跟交叉分析中的左側選單相同
4. bug fix
 2021-08-05 17:12:38 +08:00
b110212000
2e36250db2 Merge branch 'Willy' 2021-08-05 15:46:44 +08:00
b110212000
31598b95f5 綜合報表(不含匯出)完成 2021-08-05 15:46:03 +08:00
b110212000
69de707137 站 2021-08-04 18:39:14 +08:00
Kai
e5dd87a6cb Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-04 16:03:09 +08:00
b110212000
ffd4e47981 Merge branch 'Willy' 2021-08-04 16:02:34 +08:00
Kai
35a4402937 1. 修改地圖總覽天氣 
2. bug fix
 2021-08-04 16:01:03 +08:00
b110212000
ca631fc115 台電售電紀錄 2021-08-04 14:05:32 +08:00
b110212000
196b00595a .. 2021-08-04 10:29:11 +08:00
Kai
d206d8c38a 衝突合併 2021-08-03 12:07:00 +08:00
b110212000
d2b386cc18 台電售入 2021-08-03 12:01:00 +08:00
Kai
daed2b450d 1. 回填資料 
2. bug fix
 2021-08-03 12:00:58 +08:00
b110212000
bfc4b2ca30 背景送Email 2021-08-02 16:25:25 +08:00
b110212000
d0073e159b 衝突合併 2021-08-02 14:01:02 +08:00
b110212000
ace768d6ad 下載EXCEL 2021-08-02 13:54:05 +08:00
Kai
69007218b5 1. bug fix 
2. 加入寄信背景服務
 2021-08-02 13:47:15 +08:00
Kai
8c51ec5e04 衝突合併 2021-07-30 20:12:40 +08:00
Kai
4efe001136 1. bug fix 
2. 電站交叉分析完成
 2021-07-30 20:11:40 +08:00
b110212000
cf48a1da16 Merge branch 'master' into Willy 2021-07-30 19:38:45 +08:00
b110212000
27f5559c4e 日月報含金額權限 2021-07-30 19:37:42 +08:00
b110212000
9e1b6c7a2a 暫時git 2021-07-30 15:22:53 +08:00
Kai
64df5ae9d6 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-07-29 19:12:59 +08:00
Kai
e108b3ab1b 1. 電站交叉分析 2021-07-29 19:12:36 +08:00
b110212000
9357117770 Merge branch 'master' into Willy 2021-07-29 18:05:42 +08:00
b110212000
75753f21e7 excel 日月報完成 2021-07-29 18:04:55 +08:00
Kai
65498cd3a3 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-07-28 19:24:30 +08:00
Kai
829b8ba9c4 電站分析 2021-07-28 19:24:01 +08:00
b110212000
2a48cc71c7 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-07-28 19:23:23 +08:00
b110212000
9bb9b6502d 日區間 2021-07-28 19:23:12 +08:00
Kai
ebb8db668a 衝突合併 2021-07-27 20:13:12 +08:00
Kai
3a716639a0 1. 逆變器交叉分析 2021-07-27 20:11:56 +08:00
b110212000
4a3775f1b6 報表查詢(日月報不含租用及日區間) 2021-07-27 19:05:29 +08:00
Kai
201610b3f1 衝突合併 2021-07-22 19:29:55 +08:00
Kai
e42fbc7f76 1. 逆變器選單列表 
2. 修改 逆變器 抓KWH 計算方式
 2021-07-22 19:28:43 +08:00
b110212000
3389fd1029 新增Email提醒-運維紀錄 2021-07-22 17:24:33 +08:00
b110212000
56ed259983 異常記錄查詢(完成) 2021-07-22 11:06:45 +08:00
Kai
bdd92e27c0 1. 每月sensor avg bug fix 2021-07-21 15:27:47 +08:00
Kai
933db5000b 1. 加入runtime 
2. 背景執行加入sensoravg
 2021-07-21 14:41:53 +08:00
b110212000
2966e27550 Merge branch 'master' into Willy 2021-07-21 14:27:27 +08:00
b110212000
16ff57d5ed 合併電站 2021-07-21 14:26:29 +08:00
Kai
a9c2afd257 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-07-20 20:33:40 +08:00
Kai
0d552ad69b 1. 修改背景執行 
2. bug fix
 2021-07-20 20:33:32 +08:00
b110212000
6bed833e3e Merge branch 'Willy' 2021-07-20 20:07:15 +08:00
b110212000
4179ace4b4 新增圖片輪播 2021-07-20 20:06:40 +08:00
Kai
6bcdb90104 1. 修改欄位名稱錯誤 2021-07-20 12:01:32 +08:00
b110212000
873ddc32c2 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-07-20 11:42:19 +08:00
b110212000
521c744e10 修改bug 2021-07-20 11:42:06 +08:00
Kai
c5caf227b4 1. bug fix 2021-07-20 11:20:50 +08:00
Kai
e84437412d 1. 修改選單 
2. 名稱錯誤修改
 2021-07-20 10:44:08 +08:00
b110212000
858e00e1f9 Merge branch 'Willy' 2021-07-20 10:12:19 +08:00
b110212000
3080ba8ede 修改bug 2021-07-20 10:11:18 +08:00
Kai
eb06f971be 衝突合併 2021-07-20 10:06:16 +08:00
Kai
8664bda0d5 1. bug fix 
2. 畫面調整
3.選單調整
 2021-07-20 10:02:59 +08:00
b110212000
cad4cbe7f0 Merge branch 'Willy' 2021-07-19 17:43:49 +08:00
b110212000
86e5a162b8 新增累計金額及減碳量(全) 2021-07-19 17:42:59 +08:00
Kai
8a07c6ed56 1. 修改 逆變器計算 2021-07-19 13:44:40 +08:00
Kai
c6999d750a Merge branch 'master' into kai 2021-07-19 11:11:08 +08:00
Kai
ec0e07970c 1. 修改inverter 歷史記錄 DBschema 
2. 加入inverter 每小時記錄
 2021-07-19 11:10:19 +08:00
b110212000
7d28bca925 我這邊應該不用動(異常新增恢復時間) 2021-07-19 10:58:17 +08:00
b110212000
b2ea9469f7 Merge branch 'master' into Willy 2021-07-16 16:32:03 +08:00
Kai
1fadeb3022 1. 運維bug fix 2021-07-16 16:30:54 +08:00
b110212000
14686ca5d9 合併衝突 2021-07-16 16:24:11 +08:00
b110212000
ede6d3e1b0 先暫時上傳 2021-07-16 16:12:55 +08:00
Kai
2490884c8a 1. 電站總覽 單一電站內容加入左邊選單 
2. 背景執行加入 log說明
3. bug fix
 2021-07-16 14:04:57 +08:00
Kai
4997a7c941 1. 加入15min job 2021-07-15 14:30:01 +08:00
Kai
73b3802123 1公司使用者 角色 bug fix 
2. 運維作業記錄 加入 刪除功能
 2021-07-15 10:11:19 +08:00
b110212000
069869efac 定時任務(修改) 2021-07-14 18:25:06 +08:00
b110212000
20570be356 Merge branch 'master' into Willy 2021-07-14 14:21:37 +08:00
b110212000
ae7a5f7230 天氣API 2021-07-14 14:20:34 +08:00
Kai
830937f967 1. bug fix 
2. 背景執行 時間設定 拉出至config
 2021-07-14 11:53:37 +08:00
b110212000
eb6d6165c4 sensor_history 更改資料庫名稱 2021-07-12 16:21:47 +08:00
b110212000
68d7d98e52 Merge branch 'master' into Willy 2021-07-12 16:06:10 +08:00
b110212000
c320e282b1 溫度 2021-07-12 16:05:11 +08:00
Kai
2d90989f28 1. 地圖總覽 
2. 人員管理 新增管理電站
 2021-07-12 16:03:27 +08:00
b110212000
4049f788f9 衝突合併 2021-07-10 19:53:35 +08:00