Commit 0c13c788 authored by 李纪文's avatar 李纪文

feat: 修改password名称问题

parent 35a6e993
......@@ -996,7 +996,7 @@ const ConfigurationView = (props) => {
mqttView = devicesCode.length
? new MqttView({
userName: globalConfig?.mqtt_account || '',
password: globalConfig?.mqtt_password || '',
password: globalConfig?.mqtt_cyphers || '',
mqttIP: globalConfig.mqtt_iotIP,
mqttPath: globalConfig.mqtt_path,
mqttSsl: globalConfig.mqtt_IsSSL,
......
......@@ -1000,7 +1000,7 @@ const ConfigurationView = (props) => {
mqttView = devicesCode.length
? new MqttView({
userName: globalConfig?.mqtt_account || '',
password: globalConfig?.mqtt_password || '',
password: globalConfig?.mqtt_cyphers || '',
mqttIP: globalConfig.mqtt_iotIP,
mqttPath: globalConfig.mqtt_path,
mqttSsl: globalConfig.mqtt_IsSSL,
......@@ -1011,7 +1011,6 @@ const ConfigurationView = (props) => {
controlback: controlData,
})
: null;
const diagramJson = typeof fromJson === 'string' ? fromJson : JSON.stringify(fromJson);
diagramRender(diagramJson, list);
setNoInitial(false);
......
......@@ -3,7 +3,7 @@
* 非influxdb版本的接口,使用isDilute=false实现;
* 建议:不抽稀的时候,传isDilute=false&zoom=''&unit=''
* */
import React, {useContext, useEffect, useMemo, useState, useCallback, useRef} from 'react';
imporimport React, {useContext, useEffect, useMemo, useState, useCallback, useRef} from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import {
......@@ -620,7 +620,7 @@ const HistoryView = (props) => {
当前时间: () => {
return [
dates?.[0] || moment(moment().format('YYYY-MM-DD 00:00:00')),
moment(moment())
moment(moment()),
];
},
}
......@@ -1668,6 +1668,3 @@ HistoryView.defaultProps = {
needMarkLine: true,
defaultDate: 'day',
BIMode: false
};
export default HistoryView;
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