seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'PR' into develop

pull/128/head
13621160019@163.com 2022-02-23 17:58:15 +08:00
parent 004bfeff68 12fc69cb24
commit b32061225d
12 changed files with 156 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/public/css/theme-dark-rtl.css
View File

File diff suppressed because one or more lines are too long

2
web/public/css/theme-dark-rtl.css.map
View File

File diff suppressed because one or more lines are too long

2
web/public/css/theme-dark.css
View File

File diff suppressed because one or more lines are too long

2
web/public/css/theme-dark.css.map
View File

File diff suppressed because one or more lines are too long

2
web/public/css/theme-rtl.css
View File

File diff suppressed because one or more lines are too long

2
web/public/css/theme-rtl.css.map
View File

File diff suppressed because one or more lines are too long

2
web/public/css/theme.css
View File

File diff suppressed because one or more lines are too long

2
web/public/css/theme.css.map
View File

File diff suppressed because one or more lines are too long

37
web/src/assets/scss/_user.scss
View File

@ -15,6 +15,7 @@
border-radius: 6px;
box-shadow: 0 0 4px rgba(0, 0, 0, 0.17);
white-space: nowrap;
z-index: 2000;
}
.rc-cascader-menus-hidden {
display: none;
@ -158,4 +159,38 @@
transform-origin: 0% 100%;
transform: scaleY(0.8);
}
}
}
.rs-picker-has-value,
.rs-btn,
.rs-picker-toggle-value,
.rs-picker-has-value,
.rs-picker-toggle,
.rs-picker-toggle-value{color:$gray-300 !important;}
.rs-picker-toggle-textbox {color: $gray-800;background-color: $white !important;}
.rs-picker-toggle-value{font-size: 1rem;line-height: 1.3;color: $gray-900!important;}
.rs-picker-has-value,
.rs-btn,
.rs-picker-toggle-value,
.rs-picker-has-value,
.rs-picker-toggle,
.rs-picker-toggle-value{color: $gray-900 !important;}
.rs-picker-default,
.rs-picker-toggle,
.rs-picker-input,
.rs-picker-input,
.rs-picker-toggle {--rs-input-bg:$white;background-color: $white;border: 1px solid $white !important;}
.rs-picker-default:not(.rs-picker-disabled),
.rs-btn-active,
.rs-picker-default:not(.rs-picker-disabled),
.rs-btn:focus, .rs-picker-default:not(.rs-picker-disabled),
.rs-btn:hover, .rs-picker-default:not(.rs-picker-disabled),
.rs-picker-toggle-active, .rs-picker-default:not(.rs-picker-disabled),
.rs-picker-toggle:focus, .rs-picker-default:not(.rs-picker-disabled),
.rs-picker-toggle:hover {border-color: $white !important;}

2
web/src/assets/scss/theme/plugins/_react-datetime.scss
View File

@ -22,4 +22,4 @@
background-color: $light;
}
}
}
}

123
web/src/components/MyEMS/Meter/MeterEnergy.js
View File

@ -67,8 +67,7 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
const [periodType, setPeriodType] = useState('daily');
const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month'));
const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months'));
const [basePeriodBeginsDatetimeDisabled, setBasePeriodBeginsDatetimeDisabled] = useState(true);
const [basePeriodEndsDatetimeDisabled, setBasePeriodEndsDatetimeDisabled] = useState(true);
const [basePeriodDatetimeDisabled, setBasePeriodDatetimeDisabled] = useState(true);
const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
const [cascaderOptions, setCascaderOptions] = useState(undefined);
@ -96,6 +95,25 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
const [detailedDataTableData, setDetailedDataTableData] = useState([]);
const [excelBytesBase64, setExcelBytesBase64] = useState(undefined);
const [values, setValues] = useState([reportingPeriodBeginsDatetime.toDate(), reportingPeriodEndsDatetime.toDate()]);
const [baseValues, setBaseValues] = useState([current_moment.clone().subtract(1, 'months').startOf('month').toDate(),
current_moment.clone().subtract(1, 'months').toDate()]);
const local = {
sunday: t('sunday'),
monday: t('monday'),
tuesday: t('tuesday'),
wednesday: t('wednesday'),
thursday: t('thursday'),
friday: t('friday'),
saturday: t('friday'),
ok: t('ok'),
today: t('today'),
yesterday: t('yesterday'),
hours: t('hours'),
minutes: t('minutes'),
seconds: t('seconds'),
last7Days: t('last7Days')
};
const styles = { display: 'block', zIndex: 10};
useEffect(() => {
let isResponseOK = false;
@ -218,23 +236,24 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
console.log(target.value);
setComparisonType(target.value);
if (target.value === 'year-over-year') {
setBasePeriodBeginsDatetimeDisabled(true);
setBasePeriodEndsDatetimeDisabled(true);
setBasePeriodDatetimeDisabled(true);
setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'years'));
setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'years'));
setBaseValues([moment(reportingPeriodBeginsDatetime).subtract(1, 'years').toDate(),
moment(reportingPeriodEndsDatetime).subtract(1, 'years').toDate()]);
} else if (target.value === 'month-on-month') {
setBasePeriodBeginsDatetimeDisabled(true);
setBasePeriodEndsDatetimeDisabled(true);
setBasePeriodDatetimeDisabled(true);
setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'months'));
setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'months'));
setBaseValues([moment(reportingPeriodBeginsDatetime).subtract(1, 'months').toDate(),
moment(reportingPeriodEndsDatetime).subtract(1, 'months').toDate()]);
} else if (target.value === 'free-comparison') {
setBasePeriodBeginsDatetimeDisabled(false);
setBasePeriodEndsDatetimeDisabled(false);
setBasePeriodDatetimeDisabled(false);
} else if (target.value === 'none-comparison') {
setBaseValues([]);
setBasePeriodBeginsDatetime(undefined);
setBasePeriodEndsDatetime(undefined);
setBasePeriodBeginsDatetimeDisabled(true);
setBasePeriodEndsDatetimeDisabled(true);
setBasePeriodDatetimeDisabled(true);
}
};
@ -255,29 +274,34 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
};
};
let onBasePeriodBeginsDatetimeChange = (newDateTime) => {
setBasePeriodBeginsDatetime(newDateTime);
};
let onBasePeriodEndsDatetimeChange = (newDateTime) => {
setBasePeriodEndsDatetime(newDateTime);
let onBasePeriodChange = (DateRange) => {
if(DateRange == null){
setBaseValues([]);
}
let startDate = moment(DateRange[0]);
let endDate = moment(DateRange[1]);
setBaseValues([DateRange[0], DateRange[1]]);
setBasePeriodBeginsDatetime(startDate);
setBasePeriodEndsDatetime(endDate);
};
let onChange = (DateRange) => {
if(DateRange == null){
setValues([]);
}
let startDate = moment(DateRange[0]);
let endDate = moment(DateRange[1]);
setValues([DateRange[0], DateRange[1]]);
setReportingPeriodBeginsDatetime(startDate);
if (comparisonType === 'year-over-year') {
setBasePeriodBeginsDatetime(startDate.clone().subtract(1, 'years'));
} else if (comparisonType === 'month-on-month') {
setBasePeriodBeginsDatetime(startDate.clone().subtract(1, 'months'));
}
setReportingPeriodEndsDatetime(endDate);
if (comparisonType === 'year-over-year') {
setBasePeriodBeginsDatetime(startDate.clone().subtract(1, 'years'));
setBasePeriodEndsDatetime(endDate.clone().subtract(1, 'years'));
setBaseValues([basePeriodBeginsDatetime.toDate(), basePeriodEndsDatetime.toDate()]);
} else if (comparisonType === 'month-on-month') {
setBasePeriodBeginsDatetime(startDate.clone().subtract(1, 'months'));
setBasePeriodEndsDatetime(endDate.clone().subtract(1, 'months'));
setBaseValues([basePeriodBeginsDatetime.toDate(), basePeriodEndsDatetime.toDate()]);
}
};
@ -285,20 +309,8 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
setValues([]);
};
var getValidBasePeriodBeginsDatetimes = function (currentDate) {
return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
};
var getValidBasePeriodEndsDatetimes = function (currentDate) {
return currentDate.isAfter(moment(basePeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
};
var getValidReportingPeriodBeginsDatetimes = function (currentDate) {
return currentDate.isBefore(moment(reportingPeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
};
var getValidReportingPeriodEndsDatetimes = function (currentDate) {
return currentDate.isAfter(moment(reportingPeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
let onBaseClean = event => {
setValues([]);
};
// Handler
@ -540,27 +552,20 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
<Col xs={6} sm={3}>
<FormGroup className="form-group">
<Label className={labelClasses} for="basePeriodBeginsDatetime">
{t('Base Period Begins')}{t('(Optional)')}
{t('Base Period')}{t('(Optional)')}
</Label>
<Datetime id='basePeriodBeginsDatetime'
value={basePeriodBeginsDatetime}
inputProps={{ disabled: basePeriodBeginsDatetimeDisabled }}
onChange={onBasePeriodBeginsDatetimeChange}
isValidDate={getValidBasePeriodBeginsDatetimes}
closeOnSelect={true} />
</FormGroup>
</Col>
<Col xs={6} sm={3}>
<FormGroup className="form-group">
<Label className={labelClasses} for="basePeriodEndsDatetime">
{t('Base Period Ends')}{t('(Optional)')}
</Label>
<Datetime id='basePeriodEndsDatetime'
value={basePeriodEndsDatetime}
inputProps={{ disabled: basePeriodEndsDatetimeDisabled }}
onChange={onBasePeriodEndsDatetimeChange}
isValidDate={getValidBasePeriodEndsDatetimes}
closeOnSelect={true} />
<DateRangePicker
readOnly={basePeriodDatetimeDisabled}
format="MM/dd/yyyy hh:mm aa"
value={baseValues}
onChange={onBasePeriodChange}
size="md"
style={styles}
onClean={onBaseClean}
locale={local}
showMeridian
placeholder={"~"}
/>
</FormGroup>
</Col>
<Col xs={6} sm={3}>
@ -570,17 +575,19 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
<DateRangePicker
format="MM/dd/yyyy hh:mm aa"
value={values}
size="sm"
size="md"
style={styles}
onChange={onChange}
showMeridian
placeholder="Select Date Range"
onClean={onClean}
locale={local}
/>
</FormGroup>
</Col>
<Col xs="auto">
<FormGroup>
<br></br>
<br/>
<ButtonGroup id="submit">
<Button color="success" disabled={submitButtonDisabled} >{t('Submit')}</Button>
</ButtonGroup>
@ -646,4 +653,4 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
);
};
export default withTranslation()(withRedirect(MeterEnergy));
export default withTranslation()(withRedirect(MeterEnergy));

48
web/src/i18n.js
View File

@ -786,7 +786,21 @@ const resources = {
'API.VIRTUAL_POINT_SHOULD_BE_ANALOG_VALUE': 'Virtual point should be analog value',
'API.WEB_MESSAGE_NOT_FOUND': 'Web message not found',
'API.WECHAT_MESSAGE_NOT_FOUND': 'Wechat message not found',
//DateRangePicker
'sunday': 'Su',
'monday': 'Mo',
'tuesday': 'Tu',
'wednesday': 'We',
'thursday': 'Th',
'friday': 'Fr',
'saturday': 'Sa',
'ok': 'OK',
'today': 'Today',
'yesterday': 'Yesterday',
'hours': 'Hours',
'minutes': 'Minutes',
'seconds': 'Seconds',
'last7Days': 'Last 7 Days'
}
},
de: {
@ -1582,6 +1596,21 @@ const resources = {
'API.VIRTUAL_POINT_SHOULD_BE_ANALOG_VALUE': 'Virtual point should be analog value',
'API.WEB_MESSAGE_NOT_FOUND': 'Web message not found',
'API.WECHAT_MESSAGE_NOT_FOUND': 'Wechat message not found',
//DateRangePicker
'sunday': 'So',
'monday': 'Mo',
'tuesday': 'Di',
'wednesday': 'Mi',
'thursday': 'Do',
'friday': 'Fr',
'saturday': 'Sa',
'ok': 'OKAY',
'today': 'Heute',
'yesterday': 'Gestern',
'hours': 'Stunden',
'minutes': 'Protokoll',
'seconds': 'Nachschlag',
'last7Days': 'Letzte 7 Tage'
}
},
zh_CN: {
@ -2349,7 +2378,22 @@ const resources = {
'API.VIRTUAL_METER_OF_VARIABLE_NOT_FOUND': 'Virtual meter of variable not found',
'API.VIRTUAL_POINT_SHOULD_BE_ANALOG_VALUE': 'Virtual point should be analog value',
'API.WEB_MESSAGE_NOT_FOUND': 'Web message not found',
'API.WECHAT_MESSAGE_NOT_FOUND': 'Wechat message not found'
'API.WECHAT_MESSAGE_NOT_FOUND': 'Wechat message not found',
//DateRangePicker
'sunday': '日',
'monday': '一',
'tuesday': '二',
'wednesday': '三',
'thursday': '四',
'friday': '五',
'saturday': '六',
'ok': '确定',
'today': '今天',
'yesterday': '昨天',
'hours': '时',
'minutes': '分',
'seconds': '秒',
'last7Days': '最近七天',
}
}
};