Commit 8eca492e authored by 陈龙's avatar 陈龙

feat: 优化历史曲线的数据请求流程;报表变更字段

parent a7da9f06
...@@ -124,7 +124,7 @@ const ReportEditForm = ({ reportDetails, reportData, onCancel, reportName, modal ...@@ -124,7 +124,7 @@ const ReportEditForm = ({ reportDetails, reportData, onCancel, reportName, modal
fieldValue: _value === null ? _value : String(_value), fieldValue: _value === null ? _value : String(_value),
}; };
if (modalType === '编辑') { if (modalType === '编辑') {
_finalData.key = reportData.Key; _finalData.key = reportData.key;
} }
final.push(_finalData); final.push(_finalData);
} }
......
...@@ -461,7 +461,7 @@ const ReportsManage = (props) => { ...@@ -461,7 +461,7 @@ const ReportsManage = (props) => {
if (!!waterMarkCustom && !waterMarkContent) if (!!waterMarkCustom && !waterMarkContent)
return message.warning('请输入水印内容!'); return message.warning('请输入水印内容!');
setExportLoading(true); setExportLoading(true);
let keyItems = selectedRows.map((item) => item.Key); let keyItems = selectedRows.map((item) => item.key);
let _data = addFilterAndSearchParams({ let _data = addFilterAndSearchParams({
reportName, reportName,
pageIndex: 0, pageIndex: 0,
...@@ -1058,7 +1058,7 @@ const ReportsManage = (props) => { ...@@ -1058,7 +1058,7 @@ const ReportsManage = (props) => {
.delReportData({ .delReportData({
reportName: reportName, reportName: reportName,
userId: USER_ID, userId: USER_ID,
key: record.Key, key: record.key,
}) })
.then((res) => { .then((res) => {
if (res.code === 0) { if (res.code === 0) {
...@@ -1114,7 +1114,7 @@ const ReportsManage = (props) => { ...@@ -1114,7 +1114,7 @@ const ReportsManage = (props) => {
permission.includes('rowSelect') permission.includes('rowSelect')
? { ? {
type: 'checkbox', type: 'checkbox',
selectedRowKeys: selectedRows.map((item) => item.Key), selectedRowKeys: selectedRows.map((item) => item.key),
onChange: (selectedRowKeys, selectedRows) => { onChange: (selectedRowKeys, selectedRows) => {
setSelectedRows(selectedRows); setSelectedRows(selectedRows);
}, },
...@@ -1384,7 +1384,7 @@ const ReportsManage = (props) => { ...@@ -1384,7 +1384,7 @@ const ReportsManage = (props) => {
.setReportAllow({ .setReportAllow({
userId: USER_ID, userId: USER_ID,
reportName: reportName, reportName: reportName,
reportKey: record.Key, reportKey: record.key,
}) })
.then((res) => { .then((res) => {
if (res.code === 0) { if (res.code === 0) {
......
...@@ -22,22 +22,22 @@ path: / ...@@ -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/mobile.js"></code>'
## 多图表 ## 多图表
<!-- <code src="./demos/GridDemo.js"></code> --> [//]: # (<code src="./demos/GridDemo.js"></code>)
## API ## API
......
...@@ -32,11 +32,17 @@ const deviceParams = [ ...@@ -32,11 +32,17 @@ const deviceParams = [
},*/ },*/
/* { /* {
deviceCode: 'EGJZ00000197', deviceCode: 'EGJZ00000197',
// sensors: '进水压力,出水压力,出水瞬时流量,出水累计流量', sensors: '进水压力,出水压力,出水瞬时流量,出水累计流量',
sensors: '1#变频器运行频率', // sensors: '1#变频器运行频率',
deviceType: '二供机组', deviceType: '二供机组',
// pointAddressID: 208, // pointAddressID: 208,
}, */ },*/
{
"deviceCode": "SC00000001",
// "sensors": "出厂瞬时流量1,1#清水池液位,2#清水池液位,今日供水量,出水压力1",
"sensors": "出厂瞬时流量1",
"deviceType": "水厂"
}
/* { /* {
deviceCode: 'EGJZ00000198', deviceCode: 'EGJZ00000198',
// sensors: '进水压力,出水压力,出水瞬时流量,出水累计流量', // sensors: '进水压力,出水压力,出水瞬时流量,出水累计流量',
...@@ -149,11 +155,11 @@ const deviceParams = [ ...@@ -149,11 +155,11 @@ const deviceParams = [
sensors: '站点在线状态', sensors: '站点在线状态',
deviceType: '水源井', deviceType: '水源井',
}, */ }, */
{ /* {
"deviceCode": "SSB00000005", "deviceCode": "SSB00000005",
"sensors": "频率,站点在线状态", "sensors": "频率,站点在线状态",
"deviceType": "送水泵" "deviceType": "送水泵"
} }*/
]; ];
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment