Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wisdom-components
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
wisdom-components
Commits
8eca492e
Commit
8eca492e
authored
Nov 13, 2023
by
陈龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 优化历史曲线的数据请求流程;报表变更字段
parent
a7da9f06
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
14 deletions
+20
-14
ReportEditForm.js
...omponents/BasicReport/src/ReportsManage/ReportEditForm.js
+1
-1
ReportsManage.js
...components/BasicReport/src/ReportsManage/ReportsManage.js
+4
-4
EC_HistoryView.md
...es/extend-components/EC_HistoryView/src/EC_HistoryView.md
+4
-4
index.js
packages/extend-components/EC_HistoryView/src/demos/index.js
+11
-5
index.js
packages/extend-components/EC_HistoryView/src/index.js
+0
-0
No files found.
packages/base-components/BasicReport/src/ReportsManage/ReportEditForm.js
View file @
8eca492e
...
...
@@ -124,7 +124,7 @@ const ReportEditForm = ({ reportDetails, reportData, onCancel, reportName, modal
fieldValue
:
_value
===
null
?
_value
:
String
(
_value
),
};
if
(
modalType
===
'编辑'
)
{
_finalData
.
key
=
reportData
.
K
ey
;
_finalData
.
key
=
reportData
.
k
ey
;
}
final
.
push
(
_finalData
);
}
...
...
packages/base-components/BasicReport/src/ReportsManage/ReportsManage.js
View file @
8eca492e
...
...
@@ -461,7 +461,7 @@ const ReportsManage = (props) => {
if
(
!!
waterMarkCustom
&&
!
waterMarkContent
)
return
message
.
warning
(
'请输入水印内容!'
);
setExportLoading
(
true
);
let
keyItems
=
selectedRows
.
map
((
item
)
=>
item
.
K
ey
);
let
keyItems
=
selectedRows
.
map
((
item
)
=>
item
.
k
ey
);
let
_data
=
addFilterAndSearchParams
({
reportName
,
pageIndex
:
0
,
...
...
@@ -1058,7 +1058,7 @@ const ReportsManage = (props) => {
.delReportData({
reportName: reportName,
userId: USER_ID,
key: record.
K
ey,
key: record.
k
ey,
})
.then((res) => {
if (res.code === 0) {
...
...
@@ -1114,7 +1114,7 @@ const ReportsManage = (props) => {
permission.includes('
rowSelect
')
? {
type: '
checkbox
',
selectedRowKeys: selectedRows.map((item) => item.
K
ey),
selectedRowKeys: selectedRows.map((item) => item.
k
ey),
onChange: (selectedRowKeys, selectedRows) => {
setSelectedRows(selectedRows);
},
...
...
@@ -1384,7 +1384,7 @@ const ReportsManage = (props) => {
.setReportAllow({
userId: USER_ID,
reportName: reportName,
reportKey: record.
K
ey,
reportKey: record.
k
ey,
})
.then((res) => {
if (res.code === 0) {
...
...
packages/extend-components/EC_HistoryView/src/EC_HistoryView.md
View file @
8eca492e
...
...
@@ -22,22 +22,22 @@ path: /
## 单图表
<
!-- <code src="./demos/index.js"></code>
--
>
<
code
src=
"./demos/index.js"
></code
>
## 单图表-状态
<!-- <code src="./demos/indexForStatus.js"></code>
-->
[
//
]:
#
(<code src="./demos/indexForStatus.js"></code>)
## 单图表-频率
<code src="./demos/indexForFrequency.js"></code>
[
//
]:
#
(<code src="./demos/indexForFrequency.js"></code>)
[
//
]:
#
'## 移动端'
[
//
]:
#
'<code src="./demos/mobile.js"></code>'
## 多图表
<!-- <code src="./demos/GridDemo.js"></code>
-->
[
//
]:
#
(<code src="./demos/GridDemo.js"></code>)
## API
...
...
packages/extend-components/EC_HistoryView/src/demos/index.js
View file @
8eca492e
...
...
@@ -32,11 +32,17 @@ const deviceParams = [
},*/
/* {
deviceCode: 'EGJZ00000197',
//
sensors: '进水压力,出水压力,出水瞬时流量,出水累计流量',
sensors: '1#变频器运行频率',
sensors: '进水压力,出水压力,出水瞬时流量,出水累计流量',
//
sensors: '1#变频器运行频率',
deviceType: '二供机组',
// pointAddressID: 208,
}, */
},*/
{
"deviceCode"
:
"SC00000001"
,
// "sensors": "出厂瞬时流量1,1#清水池液位,2#清水池液位,今日供水量,出水压力1",
"sensors"
:
"出厂瞬时流量1"
,
"deviceType"
:
"水厂"
}
/* {
deviceCode: 'EGJZ00000198',
// sensors: '进水压力,出水压力,出水瞬时流量,出水累计流量',
...
...
@@ -149,11 +155,11 @@ const deviceParams = [
sensors: '站点在线状态',
deviceType: '水源井',
}, */
{
/*
{
"deviceCode": "SSB00000005",
"sensors": "频率,站点在线状态",
"deviceType": "送水泵"
}
}
*/
];
...
...
packages/extend-components/EC_HistoryView/src/index.js
View file @
8eca492e
This source diff could not be displayed because it is too large. You can
view the blob
instead.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment