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

579 Commits

Author SHA1 Message Date
b110212000
75b72e4e2a Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-11 19:53:04 +08:00
b110212000
8ff0a3f6c7 金額整數 2021-09-11 19:52:55 +08:00
Kai
f7adf60a47 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-11 19:47:01 +08:00
Kai
8ffc46e79e 1. bug fix 2021-09-11 19:46:46 +08:00
b110212000
33737b7919 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-11 19:43:01 +08:00
b110212000
4b6b90e412 年報表 2021-09-11 19:42:53 +08:00
Kai
4f7b5b9722 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-11 18:04:15 +08:00
Kai
14f3333408 1. 電站異常直bug fix 2021-09-11 18:03:23 +08:00
b110212000
b5eaa782e3 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-11 17:16:54 +08:00
b110212000
883d3d21eb 年報表SQL 2021-09-11 17:16:44 +08:00
Kai
784f09b46a 1. 修改日期顯示 
2. 電站報表 加入Loading
 2021-09-11 17:15:58 +08:00
Kai
09f1634f75 1. bug fix 2021-09-11 15:09:43 +08:00
b110212000
23104dc3a9 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-11 10:52:55 +08:00
b110212000
52fb2cb3b6 歸屬月份 2021-09-11 10:52:38 +08:00
Kai
0ad9ad658b Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-11 10:52:13 +08:00
Kai
716c8d222b 1. 單線圖修改多張上傳 
2. 個人專屬logo
 2021-09-11 10:50:59 +08:00
b110212000
80e966507e Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-10 18:26:01 +08:00
b110212000
e5cbb86d8e 更改日月報預設 2021-09-10 18:25:49 +08:00
Kai
a1a406777b Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-10 18:14:53 +08:00
Kai
eb496360c6 1. bug fix 
2. 角色權限拿掉搜尋
 2021-09-10 18:14:40 +08:00
b110212000
0a0634a57a Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-10 18:07:55 +08:00
b110212000
2d8494456c 電站停用 2021-09-10 18:07:46 +08:00
Kai
10f5ae4ad6 1. bug fix 2021-09-10 16:53:50 +08:00
Kai
64835c3ebe 1. 修改電站總覽 異常、運維記錄匯出 2021-09-10 15:22:09 +08:00
Kai
8d9687a8d2 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-10 14:16:23 +08:00
Kai
4b59d59b7c 1. 修改地圖總覽 - 裝置容量小數點第三位 
2. 畫面調整
3. 運維廠商加入統編、備註
 2021-09-10 14:15:55 +08:00
b110212000
cafbb586e8 修復bug 綜合報表 改 租金為浮點數計算 2021-09-09 09:16:23 +08:00
b110212000
e5e2f7880a Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-08 18:56:43 +08:00
b110212000
c7ade647e7 修復報表不能發送問題 2021-09-08 18:56:29 +08:00
Kai
d654170415 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-08 18:36:54 +08:00
Kai
72c247e2c8 1. 修改登入圖片路徑 2021-09-08 18:36:32 +08:00
b110212000
f64badab88 子資料庫 狀態停用 2021-09-08 18:23:51 +08:00
b110212000
1cb05ab374 修復列表 2021-09-07 18:38:14 +08:00
Kai
495100c5d3 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-07 18:03:29 +08:00
Kai
43ce6a7469 1. 修改 電站管理 未啟用 也顯示 2021-09-07 18:03:13 +08:00
b110212000
1aae73973c Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-07 18:00:11 +08:00
b110212000
e1326493b8 檢查項目 2021-09-07 17:59:59 +08:00
Kai
6bba5317c1 1. 修改只抓 啟用的電站 2021-09-07 12:00:08 +08:00
Kai
068977a5c8 1. 修改選單logo 預設圖 2021-09-07 09:47:04 +08:00
Kai
5d39b5fa73 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-06 18:03:17 +08:00
Kai
97938fca68 1. 修改背景執行 2021-09-06 18:03:05 +08:00
b110212000
ee5e10dace Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-06 18:00:48 +08:00
b110212000
3df4d16c4e LOGO 前昨天 2021-09-06 18:00:39 +08:00
Kai
e09c908071 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-03 18:46:20 +08:00
Kai
d8ea8ceff1 1. 加入補償機制 2021-09-03 18:46:00 +08:00
b110212000
3ab680ab2e 刪除電站- 2021-09-03 18:44:45 +08:00
b110212000
11e20f30b9 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-03 17:45:12 +08:00
b110212000
a474d6b212 合併電站bug 2021-09-03 17:45:00 +08:00
Kai
7fb6211db0 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-03 16:35:13 +08:00
Kai
c3e649fff1 1. 修改背景執行 2021-09-03 16:34:57 +08:00
b110212000
fc0c1d188c 衝突合併 2021-09-03 16:32:22 +08:00
b110212000
c415a24d7a 電站縮排 2021-09-03 16:30:08 +08:00
Kai
833ba0f672 1. bug fix 
2. 電站刪除 only 平台管理員
3. 背景執行加入inner exception
 2021-09-03 15:09:57 +08:00
b110212000
fc1483d580 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-03 11:51:04 +08:00
b110212000
3bef3ada9d 記住我(不要記住我) 2021-09-03 11:50:51 +08:00
Kai
3ae2416a57 1. 背景執行 bug fix 2021-09-03 11:33:15 +08:00
Kai
da9730325a 1. bug fix 
2. 畫面調整
 2021-09-02 17:14:41 +08:00
Kai
f114901a2c 1. bug fix 
2. css 調整
 2021-09-02 16:23:04 +08:00
Kai
2f76d6d180 1. bug fix 2021-09-02 16:05:12 +08:00
Kai
ad87214345 衝突合併 2021-09-02 14:38:47 +08:00
Kai
7fa16df8fe 1. 修改電站抓取方式 part4 2021-09-02 14:30:46 +08:00
b110212000
1f1851ac5e Merge branch 'Willy' 2021-09-02 10:58:36 +08:00
b110212000
d2ab2b11ec 刪除電站 2021-09-02 10:52:03 +08:00
Kai
e958ebf918 修改電站抓取方式 part4 2021-09-01 17:19:20 +08:00
b110212000
ba40bdf4e3 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-01 17:16:29 +08:00
b110212000
363ac02106 修改電站 2021-09-01 17:16:13 +08:00
Kai
985ff36854 Merge branch 'master' into kai_整合電站取得方式 2021-09-01 16:30:04 +08:00
b110212000
4f96b2ef92 刪除電站 2021-09-01 16:29:36 +08:00
Kai
ec046e2700 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-01 16:27:44 +08:00
Kai
4a04e22ce2 1. 修改排序 
2. 拿掉電站 icon
 2021-09-01 16:27:20 +08:00
Kai
bb3bd49bc2 修改電站抓取方式 part3 2021-09-01 16:02:31 +08:00
b110212000
9dc7eca7fd 新增備註 2021-09-01 13:34:28 +08:00
b110212000
73fb4da5fa 60天刪除 2021-09-01 11:41:45 +08:00
Kai
b6df06db6c Merge branch 'master' into kai_整合電站取得方式 2021-09-01 11:04:31 +08:00
Kai
d939a0ebfd 1. 修改電站排序 2021-09-01 11:04:07 +08:00
Kai
e84c23b616 修改電站抓取方式 part2 2021-09-01 10:41:16 +08:00
b110212000
488fad1250 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-31 18:40:30 +08:00
b110212000
499c0040b5 缺少刪除時間 2021-08-31 18:40:20 +08:00
Kai
7c741e8bc6 Merge branch 'master' into kai_整合電站取得方式 2021-08-31 13:38:18 +08:00
Kai
b4f685c4ae 1.拿掉 逆變器分析 與 電站交叉分析 icon 2021-08-31 13:37:37 +08:00
Kai
1a92dc7cc5 1. 修改卡片呈現 
2. 逆變器分析 查詢加入loading
 2021-08-31 11:55:44 +08:00
Kai
b5fec530b5 修改電站抓取方式 step1 2021-08-31 10:21:06 +08:00
b110212000
06d7772dfd 全選 2021-08-31 10:15:12 +08:00
b110212000
19ef696ee1 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-30 18:42:37 +08:00
b110212000
6ac1a2c6b9 更新 2021-08-30 18:42:27 +08:00
Kai
562e8cc28c 1. 權限功能補齊 2021-08-30 17:06:02 +08:00
Kai
71936b6d2b 1. 逆變器分析 左側選單 css 調整 
2. 電站總覽bug fix
 2021-08-30 16:01:14 +08:00
Kai
bc72f947c7 1. 修改db schema 2021-08-30 15:53:05 +08:00
Kai
4d7e31953a Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-30 15:51:03 +08:00
Kai
821599ce31 1. bug fix 
2. 修改權限
3. 電站交叉分析 不預設
 2021-08-30 15:50:43 +08:00
b110212000
54dcb237d2 合併衝突 2021-08-30 15:04:51 +08:00
b110212000
b0fc8f1a69 先行修改 寄送email 2021-08-30 15:01:32 +08:00
Kai
3060aa64ce 1. bug fix 
2. 運維作業紀錄 預設改為未完成
3. company 加入 v_company_inv
 2021-08-27 11:05:52 +08:00
Kai
f2daab258d 1. 新增運維作業紀錄 負責人員資料表 DBschema 2021-08-27 09:55:22 +08:00
Kai
ee0c004ea9 1. bug fix 2021-08-27 09:54:00 +08:00
Kai
7b1bb0d3e0 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-27 09:31:10 +08:00
Kai
32df22a687 1. 每小時 檢查DB 是否存在 2021-08-27 09:26:00 +08:00
b110212000
55ea37a1f5 修改 建立電站異常設定 2021-08-27 09:16:05 +08:00
b110212000
1be7aebc1e Merge branch 'Willy' 2021-08-26 16:46:09 +08:00
b110212000
50b9433fc2 異常 連接資料庫 活的現殺 2021-08-26 16:45:30 +08:00
Kai
2298a2d3e9 1. 電站交叉分析 bug fix 2021-08-26 15:49:26 +08:00
Kai
49d748a891 Merge branch 'master' into kai 2021-08-26 15:14:39 +08:00
Kai
72e2daebeb 1. 維修單 負責人員多選 
2. 維修單 新增廠商欄位
 2021-08-26 15:13:58 +08:00
Kai
c8f605168c 1. 暫時簽入2 2021-08-25 18:25:06 +08:00
b110212000
f9c79b7a8e Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-25 18:01:09 +08:00
b110212000
c53afa294e api寫死的 2021-08-25 18:00:59 +08:00
Kai
0567483eba 1. bug fix 2021-08-25 17:00:05 +08:00
Kai
c2c9df6f36 1. 暫時遷入 2021-08-25 16:52:03 +08:00
Kai
c7a3fc3302 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-25 14:59:54 +08:00
Kai
d426b77361 1. 修改左邊選單 2021-08-25 14:58:37 +08:00
b110212000
ab51a21512 git金額 2021-08-25 14:53:10 +08:00
b110212000
6688649c8b 新增創建時間 2021-08-25 13:55:26 +08:00
b110212000
79cacfe612 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-25 11:39:54 +08:00
b110212000
0119387496 新增查詢表單號 2021-08-25 11:39:41 +08:00
Kai
a94346d77d 1. 修改左邊選單字體大小 
2. 電站總覽 基本資料
 2021-08-25 11:31:38 +08:00
Kai
0a4ce4bf42 衝突合併 2021-08-25 10:23:35 +08:00
Kai
90fc895f63 1. bug fix 
2. 電站管理 基本資料畫面修改
 2021-08-25 10:21:52 +08:00
b110212000
0cceff37f6 蚵仔麵線8/24翔哥(改折線圖) 2021-08-24 18:09:52 +08:00
b110212000
92fffab4c6 逆變器及設備修復bug 2021-08-24 17:28:29 +08:00
Kai
ebc1a02bec Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-23 18:36:00 +08:00
Kai
2cd66ccbc3 1. 畫面調整 
2. bug fix
 2021-08-23 18:33:55 +08:00
b110212000
3310f827aa Merge branch 'Willy' 2021-08-20 18:41:55 +08:00
b110212000
8b5e5574db EXCEL 2021-08-20 18:41:14 +08:00
Kai
6207c31826 1. 交叉分析 上下箭頭 留間隙 
2. 電站總覽 電站名稱 留間隙
3. 修改密碼
 2021-08-20 14:37:52 +08:00
Kai
8f76245a13 1. google map 修改 
2. 寄信人 修改
 2021-08-19 18:53:21 +08:00
Kai
e60a82eaeb Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-19 12:08:13 +08:00
Kai
c6a9d9653b 1. 密碼 bug fix 
2. 固定地圖總覽
 2021-08-19 12:07:57 +08:00
b110212000
b99ce00ca6 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-19 10:50:59 +08:00
b110212000
5dee2454f4 無圖表版本(電廠效能統計) 2021-08-19 10:50:46 +08:00
Kai
3bfb4ba11b Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-18 11:50:03 +08:00
Kai
29b482ad5f 1.使用者權限bug fix 2021-08-18 11:49:46 +08:00
b110212000
94bb78fb0a Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-18 11:11:32 +08:00
b110212000
93e780b7dd 1.新增資料到back_fill_schedule 
2.修改異常寄Email
3.逆變器監控bug修復
 2021-08-18 11:11:22 +08:00
Kai
8d9de54c4b Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-17 18:37:51 +08:00
Kai
716a6a2294 1. 修改交叉分析選單 2021-08-17 18:37:25 +08:00
b110212000
5fa5b58d79 bug修復 2021-08-17 18:27:53 +08:00
b110212000
0b9e5b1a72 Merge branch 'Willy' 2021-08-17 17:10:10 +08:00
b110212000
288556160e 逆變器監控(完成) 2021-08-17 17:09:30 +08:00
Kai
6ee70304ca Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-17 12:04:19 +08:00
Kai
2ef57ba44d 1. bug fix 2021-08-17 12:03:51 +08:00
b110212000
54250e64bb 未有詳細資料 2021-08-17 12:02:47 +08:00
b110212000
5abdc961a1 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-16 18:46:25 +08:00
b110212000
d04644310b 逆變器監控(僅4個) 2021-08-16 18:44:49 +08:00
Kai
ab0aa1ee1d 1. 天氣 加入try catch 2021-08-16 16:46:13 +08:00
b110212000
7ab0656a1e 異常email 寄信 2021-08-13 16:54:03 +08:00
b110212000
c2a84e7059 Merge branch 'Willy' 2021-08-13 10:51:01 +08:00
b110212000
e5822a2e52 紀錄 2021-08-13 10:50:17 +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
498c101152 Merge branch 'Willy' 2021-08-12 18:38:20 +08:00
b110212000
79d758af06 30天預選 2021-08-12 18:37:54 +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
866b47cd43 1.背景執行 bug fix 2021-08-11 18:39:01 +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
4506833a49 Merge branch 'Willy' 2021-08-11 15:50:11 +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
Kai
b93714490c Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-10 18:34:28 +08:00
Kai
5873750d59 1. bug fix 2021-08-10 18:34:00 +08:00
b110212000
e81b7e2a2e 修正日月報問題 2021-08-10 16:45:54 +08:00
b110212000
2808c039e6 發送報告(完成) 2021-08-10 16:26:32 +08:00
b110212000
d04ce71a37 修正報表錯誤 2021-08-10 10:03:37 +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
78af08320a 微調excel 2021-08-09 15:35:39 +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
Kai
c92142d4e2 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-08-09 10:46:52 +08:00
Kai
e34fd07cf3 1. bug fix 2021-08-09 10:46:31 +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
b110212000
7332e8d9d8 站存 2021-08-04 16:02:15 +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
5a363cb54e 修正email 2021-08-02 16:26:03 +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