Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MyEMS
MyEMS能源管理系统
提交
5b0de16e
M
MyEMS能源管理系统
项目概览
MyEMS
/
MyEMS能源管理系统
通知
46
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
MyEMS能源管理系统
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
5b0de16e
编写于
12月 08, 2023
作者:
nengyuangzhang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop'
上级
ba0a90d7
b0458ae4
变更
13
展开全部
隐藏空白更改
内联
并排
Showing
13 changed file
with
699 addition
and
654 deletion
+699
-654
CHANGELOG.md
CHANGELOG.md
+9
-1
database/install/myems_system_db.sql
database/install/myems_system_db.sql
+1
-1
database/upgrade/upgrade3.12.0.sql
database/upgrade/upgrade3.12.0.sql
+1
-1
myems-admin/views/common/footer-login.html
myems-admin/views/common/footer-login.html
+1
-1
myems-admin/views/common/footer.html
myems-admin/views/common/footer.html
+1
-1
myems-aggregation/version.txt
myems-aggregation/version.txt
+1
-1
myems-api/core/version.py
myems-api/core/version.py
+2
-2
myems-cleaning/version.txt
myems-cleaning/version.txt
+1
-1
myems-modbus-tcp/version.txt
myems-modbus-tcp/version.txt
+1
-1
myems-normalization/version.txt
myems-normalization/version.txt
+1
-1
myems-web/package-lock.json
myems-web/package-lock.json
+678
-641
myems-web/package.json
myems-web/package.json
+1
-1
myems-web/src/config.js
myems-web/src/config.js
+1
-1
未找到文件。
CHANGELOG.md
浏览文件 @
5b0de16e
...
...
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
The format is based on
[
Keep a Changelog
](
https://keepachangelog.com/en/1.0.0/
)
.
## [Unreleased]
### Added
### Changed
### Fixed
### Removed
## [v3.12.0] - 2023-12-08
### Added
-
added charge time and discharge time settings to power conversion system of microgrid
-
added nominal voltage to microgrid battery in database, myems-api and myems-admin
...
...
@@ -1506,7 +1513,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Removed
-
None.
[
Unreleased
]:
https://github.com/MyEMS/myems/compare/v3.11.0...HEAD
[
Unreleased
]:
https://github.com/MyEMS/myems/compare/v3.12.0...HEAD
[
3.12.0
]:
https://github.com/MyEMS/myems/compare/v3.12.0...v3.11.0
[
3.11.0
]:
https://github.com/MyEMS/myems/compare/v3.11.0...v3.10.0
[
3.10.0
]:
https://github.com/MyEMS/myems/compare/v3.10.0...v3.9.0
[
3.9.0
]:
https://github.com/MyEMS/myems/compare/v3.9.0...v3.8.0
...
...
database/install/myems_system_db.sql
浏览文件 @
5b0de16e
...
...
@@ -1733,7 +1733,7 @@ USE `myems_system_db`;
INSERT
INTO
`myems_system_db`
.
`tbl_versions`
(
`id`
,
`version`
,
`release_date`
)
VALUES
(
1
,
'3.12.0
RC'
,
'2023-12-01
'
);
(
1
,
'3.12.0
'
,
'2023-12-08
'
);
COMMIT
;
...
...
database/upgrade/upgrade3.12.0
RC
.sql
→
database/upgrade/upgrade3.12.0.sql
浏览文件 @
5b0de16e
...
...
@@ -51,6 +51,6 @@ VALUES
(
1302
,
'Microgrid Reporting'
,
'/microgrid/reporting'
,
1300
,
1
);
-- UPDATE VERSION NUMBER
UPDATE
`myems_system_db`
.
`tbl_versions`
SET
version
=
'3.12.0
RC'
,
release_date
=
'2023-12-01
'
WHERE
id
=
1
;
UPDATE
`myems_system_db`
.
`tbl_versions`
SET
version
=
'3.12.0
'
,
release_date
=
'2023-12-08
'
WHERE
id
=
1
;
COMMIT
;
myems-admin/views/common/footer-login.html
浏览文件 @
5b0de16e
<div
class=
"footer-login"
>
<div>
<strong>
{{'MY_EMS_NAME' | translate}} v3.1
1
.0
<a
href=
"https://myems.io"
>
https://myems.io
</a>
</strong>
<strong>
{{'MY_EMS_NAME' | translate}} v3.1
2
.0
<a
href=
"https://myems.io"
>
https://myems.io
</a>
</strong>
</div>
</div>
myems-admin/views/common/footer.html
浏览文件 @
5b0de16e
...
...
@@ -3,6 +3,6 @@
<strong><a
href=
"https://myems.io"
>
https://myems.io
</a></strong>
</div>
<div>
<strong>
{{'MY_EMS_NAME' | translate}} v3.1
1
.0
</strong>
<strong>
{{'MY_EMS_NAME' | translate}} v3.1
2
.0
</strong>
</div>
</div>
myems-aggregation/version.txt
浏览文件 @
5b0de16e
3.11.0
\ No newline at end of file
3.12.0
\ No newline at end of file
myems-api/core/version.py
浏览文件 @
5b0de16e
...
...
@@ -14,8 +14,8 @@ class VersionItem:
@
staticmethod
def
on_get
(
req
,
resp
):
result
=
{
"version"
:
'MyEMS v3.1
1
.0'
,
"release-date"
:
'2023-1
1-03
'
,
result
=
{
"version"
:
'MyEMS v3.1
2
.0'
,
"release-date"
:
'2023-1
2-08
'
,
"licensed-to"
:
'COMMUNITY'
,
"website"
:
"https://myems.io"
}
resp
.
text
=
json
.
dumps
(
result
)
...
...
myems-cleaning/version.txt
浏览文件 @
5b0de16e
3.11.0
\ No newline at end of file
3.12.0
\ No newline at end of file
myems-modbus-tcp/version.txt
浏览文件 @
5b0de16e
3.11.0
\ No newline at end of file
3.12.0
\ No newline at end of file
myems-normalization/version.txt
浏览文件 @
5b0de16e
3.11.0
\ No newline at end of file
3.12.0
\ No newline at end of file
myems-web/package-lock.json
浏览文件 @
5b0de16e
此差异已折叠。
点击以展开。
myems-web/package.json
浏览文件 @
5b0de16e
{
"name"
:
"myems"
,
"version"
:
"3.1
1
.0"
,
"version"
:
"3.1
2
.0"
,
"private"
:
true
,
"dependencies"
:
{
"@amap/amap-jsapi-loader"
:
"^1.0.1"
,
...
...
myems-web/src/config.js
浏览文件 @
5b0de16e
export
const
version
=
'
3.1
1
.0
'
;
export
const
version
=
'
3.1
2
.0
'
;
export
const
navbarBreakPoint
=
'
xl
'
;
// Vertical navbar breakpoint
export
const
topNavbarBreakpoint
=
'
lg
'
;
//export const APIBaseURL = 'http://127.0.0.1:8000';
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录