Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MyEMS
MyEMS能源管理系统
提交
f7d03d17
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 搜索 >>
提交
f7d03d17
编写于
2月 19, 2024
作者:
nengyuangzhang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop'
上级
b9eb079c
0ec59510
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
11 addition
and
11 deletion
+11
-11
CHANGELOG.md
CHANGELOG.md
+1
-1
myems-web/src/components/MyEMS/common/AMap.js
myems-web/src/components/MyEMS/common/AMap.js
+1
-1
myems-web/src/components/MyEMS/common/BarChart.js
myems-web/src/components/MyEMS/common/BarChart.js
+1
-1
myems-web/src/components/MyEMS/common/ChartSpacesStackBar.js
myems-web/src/components/MyEMS/common/ChartSpacesStackBar.js
+1
-1
myems-web/src/components/MyEMS/common/CustomizeMapBox.js
myems-web/src/components/MyEMS/common/CustomizeMapBox.js
+2
-2
myems-web/src/components/MyEMS/common/LineChart.js
myems-web/src/components/MyEMS/common/LineChart.js
+1
-1
myems-web/src/components/MyEMS/common/MixedLineChart.js
myems-web/src/components/MyEMS/common/MixedLineChart.js
+1
-1
myems-web/src/components/MyEMS/common/MultiTrendChart.js
myems-web/src/components/MyEMS/common/MultiTrendChart.js
+1
-1
myems-web/src/components/MyEMS/common/MultipleLineChart.js
myems-web/src/components/MyEMS/common/MultipleLineChart.js
+2
-2
未找到文件。
CHANGELOG.md
浏览文件 @
f7d03d17
...
...
@@ -10,7 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-
updated space export, import and clone functions in myems-api
### Fixed
-
None
-
fixed chart issues in myems-web
### Removed
-
None
...
...
myems-web/src/components/MyEMS/common/AMap.js
浏览文件 @
f7d03d17
...
...
@@ -50,7 +50,7 @@ const CustomizeMap = ({Latitude, Longitude, Zoom,t}) => {
.
catch
(
e
=>
{
console
.
log
(
e
);
});
},
[]);
},
[
t
,
Latitude
,
Longitude
,
zoom
]);
return
(
// Initialize map container, use div tag as the map container, and assign an id attribute to the div
...
...
myems-web/src/components/MyEMS/common/BarChart.js
浏览文件 @
f7d03d17
...
...
@@ -84,7 +84,7 @@ const BarChart = ({
datasets
:
datasets
});
}
},
[]);
},
[
data
,
compareData
]);
const
config
=
{
options
:
{
...
...
myems-web/src/components/MyEMS/common/ChartSpacesStackBar.js
浏览文件 @
f7d03d17
...
...
@@ -76,7 +76,7 @@ const ChartSpacesStackBar = ({ labels, inputData, costData, title, childSpaces,
datasets
:
dataArray
})
}
},
[])
},
[
labels
,
inputData
,
costData
,
option
])
const
options
=
{
scales
:
{
x
:
{
...
...
myems-web/src/components/MyEMS/common/CustomizeMapBox.js
浏览文件 @
f7d03d17
...
...
@@ -50,7 +50,7 @@ const CustomizeMapBox = ({Latitude, Longitude, Zoom, Geojson, t}) => {
map
.
current
.
addControl
(
mapboxLanguage
);
},
[]);
},
[
t
,
Latitude
,
Longitude
,
Zoom
]);
useEffect
(()
=>
{
var
lang
=
language
;
...
...
@@ -192,7 +192,7 @@ const CustomizeMapBox = ({Latitude, Longitude, Zoom, Geojson, t}) => {
});
});
}
},
[])
},
[
language
,
Geojson
])
return
(
<
div
id
=
"
container
"
className
=
"
map
"
style
=
{{
width
:
'
100%
'
,
height
:
'
100%
'
}}
ref
=
{
mapContainer
}
/
>
...
...
myems-web/src/components/MyEMS/common/LineChart.js
浏览文件 @
f7d03d17
...
...
@@ -58,7 +58,7 @@ const LineChart = ({
};
setLineData
(
chartData
);
}
},
[]);
},
[
data
,
option
,
labels
]);
const
config
=
{
options
:
{
...
...
myems-web/src/components/MyEMS/common/MixedLineChart.js
浏览文件 @
f7d03d17
...
...
@@ -93,7 +93,7 @@ const MixedLineChart = ({
};
setLineData
(
chartData
);
}
},
[]);
},
[
data
,
option
,
labels
,
options
]);
const
config
=
{
options
:
{
...
...
myems-web/src/components/MyEMS/common/MultiTrendChart.js
浏览文件 @
f7d03d17
...
...
@@ -111,7 +111,7 @@ const MultiTrendChart = ({
};
setLineData
(
chartData
);
}
},
[]);
},
[
baseData
,
reportingData
,
option
,
baseLabels
,
reportingLabels
,
rates
]);
const
config
=
{
plugins
:
[
ChartDataLabels
],
...
...
myems-web/src/components/MyEMS/common/MultipleLineChart.js
浏览文件 @
f7d03d17
...
...
@@ -134,7 +134,7 @@ const MultipleLineChart = ({
setLinaLabels
(
labels
[
values
[
0
]]);
setValues
([
'
a0
'
]);
setOldValues
([
'
a0
'
])
},
[]);
},
[
data
,
labels
,
options
]);
useEffect
(()
=>
{
let
tempNodes
=
[...
nodes
];
...
...
@@ -195,7 +195,7 @@ const MultipleLineChart = ({
}
setNodes
(
tempNodes
);
setLinaLabels
(
labels
[
values
[
0
]]);
},
[]);
},
[
lastMoment
]);
let
getOption
=
()
=>
{
return
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录