diff --git a/web/client/src/sections/data/containers/dataComponent.jsx b/web/client/src/sections/data/containers/dataComponent.jsx
index 0e97599..d469122 100644
--- a/web/client/src/sections/data/containers/dataComponent.jsx
+++ b/web/client/src/sections/data/containers/dataComponent.jsx
@@ -16,7 +16,6 @@ const createForm = Form.create;
const DataComponent =(props)=>{
const {isRequesting,dataList}=props
const {items,sensors}=dataList
-
const renderChart = () => {
// const { dataAcquisitionPointList, dataAcquisitionList, isRequesting, dataType, aggregationData } =props;
@@ -25,12 +24,11 @@ const DataComponent =(props)=>{
type="info"
description="查询数据中,请稍候..."/>
}
- if (JSON.stringify(dataList) == "{}") {
+ if (JSON.stringify(dataList) == "[]") {
return
}
let chartContent = [];
- let deviceItems ={pitstate: {name: "坑位状态", unit: null}}
- let deviceSensors =[{id: "8d59eeef-147f-40e4-9516-768f8270b3fd", name: "女坑1",data:[{values: {pitstate: "1"}, time: "2023-11-06 03:03:58"},{values: {pitstate: "1"}, time: "2022-11-05 03:03:58"}]}];
+ let deviceItems =items
for (let deviceItem in items) {
let chartDataD = [];
let startD = "";
@@ -111,7 +109,8 @@ const mapStateToProps = (state) => {
dataContinuityType: dataContinuityType.data || [],
dataContinuity: dataContinuity.data || [],
pepProjectId:global.pepProjectId,
- isRequesting:SensorsData.isRequesting
+ isRequesting:SensorsData.isRequesting,
+ dataList:SensorsData.data||{}
};
}
export default connect(mapStateToProps)(DataComponent);
diff --git a/web/client/src/sections/install/containers/cacl.jsx b/web/client/src/sections/install/containers/cacl.jsx
index 3936eed..c348d99 100644
--- a/web/client/src/sections/install/containers/cacl.jsx
+++ b/web/client/src/sections/install/containers/cacl.jsx
@@ -431,7 +431,7 @@ const Calc = (props) => {
+ optionList={sensorList} placeholder="请选择测点" style={{ textAlign: 'left', width: 274 }} >