Commit Graph

502 Commits

Author SHA1 Message Date
b110212000
777eb0d51b Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-16 11:18:14 +08:00
b110212000
1b6d6d6546 1.廠商-型號去除空白
2.停用電站顯示提醒
3.異常 時間 修正
2021-09-16 11:17:59 +08:00
Kai
81e91d9d9e 1. 加入 meter 補償機制 2021-09-15 11:20:33 +08:00
b110212000
d749b72952 衝突合併 2021-09-14 18:25:31 +08:00
b110212000
5ae8274804 更改逆變器監控條件及查詢 2021-09-14 18:23:31 +08:00
Kai
c2533ddd95 逆變器監控 Pr值 改大寫;圖片拿掉小手手 2021-09-14 17:48:39 +08:00
Kai
5d20df9848 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-14 17:34:36 +08:00
Kai
450fd69b88 1. 修改 即時告警 bug fix 2021-09-14 17:33:57 +08:00
b110212000
f1df409123 報表 sql更新 2021-09-14 15:10:20 +08:00
b110212000
108ad45b35 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-14 13:47:53 +08:00
b110212000
af181b5c86 git 更 2021-09-14 13:47:44 +08:00
Kai
48f33067a0 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-14 13:09:21 +08:00
Kai
ccd68d6bf4 1. 加入 company viewer Modal
2. 修改電站總覽 紅黃燈名詞
3. 檢測逆變器狀態
2021-09-14 13:09:00 +08:00
b110212000
03ba1886bd sql 異常(更 2021-09-14 11:48:58 +08:00
b110212000
923f325064 異常sql 2021-09-14 11:43:39 +08:00
Kai
e19ac35e78 1. bug fix 2021-09-13 19:15:02 +08:00
1e995d8874 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-13 18:26:41 +08:00
90bc390cd7 歸檔 debug , 刪除參數修正 2021-09-13 18:22:32 +08:00
Kai
18038d4b60 1. 修改 查詢報表sql字串限制 part2 2021-09-13 16:42:13 +08:00
Kai
3f00ebf4a5 1. 修改 查詢報表sql字串限制 2021-09-13 14:34:40 +08:00
Kai
03c2bc0a46 Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower 2021-09-13 11:36:47 +08:00
Kai
fc61d70b69 1. 背景執行 bug fix 2021-09-13 11:36:09 +08:00
a9a9649e8e 日報表 SQL 語法優化 2021-09-13 11:35:24 +08:00
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