Commit bb203f71 authored by 徐乐's avatar 徐乐

feat: 修改设备实时数据弹框组件

parent c1290bb8
...@@ -53,7 +53,7 @@ const RealTimeInfo = (props) => { ...@@ -53,7 +53,7 @@ const RealTimeInfo = (props) => {
const { getPrefixCls } = useContext(ConfigProvider.ConfigContext); const { getPrefixCls } = useContext(ConfigProvider.ConfigContext);
const prefixCls = getPrefixCls('realtime-info'); const prefixCls = getPrefixCls('realtime-info');
const { deviceParams, user, placeholder, defaultTargetValue, modalTitle, buttonText } = props; const { deviceParams, infoData, user, placeholder, defaultTargetValue, modalTitle, buttonText } = props;
const [isModalVisible, setIsModalVisible] = useState(false); const [isModalVisible, setIsModalVisible] = useState(false);
const [targetValue, setTargetValue] = useState(defaultTargetValue); // 重点/全部 const [targetValue, setTargetValue] = useState(defaultTargetValue); // 重点/全部
...@@ -110,15 +110,22 @@ const RealTimeInfo = (props) => { ...@@ -110,15 +110,22 @@ const RealTimeInfo = (props) => {
}; };
const getData = () => { const getData = () => {
const deviceType = // const deviceType =
deviceParams.length > 0 // deviceParams.length > 0
? Array.from(new Set(deviceParams.map((item) => item.deviceType))).join(',') // ? Array.from(new Set(deviceParams.map((item) => item.deviceType))).join(',')
: '二供泵房,二供机组'; // : '二供泵房,二供机组';
const deviceType = [infoData.aName];
infoData.child?.forEach(function (val) {
let k = deviceType.find(function (a) { return a == val.aName });
if (!k) {
deviceType.push(val.aName);
}
})
const configReq = getMonitorConfig({ const configReq = getMonitorConfig({
params: { params: {
user, user,
showAll: true, showAll: true,
deviceType, deviceType: deviceType.join(','),
}, },
}); });
const sensorReq = getSensorType(); const sensorReq = getSensorType();
...@@ -325,10 +332,10 @@ RealTimeInfo.defaultProps = { ...@@ -325,10 +332,10 @@ RealTimeInfo.defaultProps = {
user: null, user: null,
deviceParams: [], deviceParams: [],
deviceRealInfoParams: {}, deviceRealInfoParams: {},
deviceConfService: () => {}, deviceConfService: () => { },
pointAddressEntryService: () => {}, pointAddressEntryService: () => { },
sensorTypeService: () => {}, sensorTypeService: () => { },
deviceRealInfoService: () => {}, deviceRealInfoService: () => { },
}; };
RealTimeInfo.propTypes = { RealTimeInfo.propTypes = {
......
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