Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@nengyuanzhang
nengyuanzhang committed Feb 20, 2024
2 parents d984e28 + 2c39555 commit 408b23a
Show file tree
Hide file tree
Showing 2 changed files with 114 additions and 21 deletions.
132 changes: 112 additions & 20 deletions myems-web/src/components/MyEMS/Monitoring/equipments.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {v4 as uuid} from 'uuid';
import { v4 as uuid } from 'uuid';

import product1 from './img/1.png';
import product2 from './img/2.png';
Expand All @@ -10,7 +10,7 @@ import product7 from './img/7.png';
import product5 from './img/5.png';
import product9 from './img/9.png';

export default [
const equipmentList = [
{
id: uuid(),
files: [
Expand All @@ -22,10 +22,20 @@ export default [
],
title: '高压制冷机CH-ZL-01',
category: '空调水系统/冷水机组',
features: ['Brand: York', 'Manufactured: 2011', 'Ton: 800 Ton', 'Model#: YKK8K3H9-CUG', 'Serial#: SNXM-143960', 'Type: Water-Cooled', 'Compressor Type: Centrifugal', 'Power: 460 Volts / 60 Hz / 3 Ph', 'Refrigerant: R-134a'],
features: [
'Brand: York',
'Manufactured: 2011',
'Ton: 800 Ton',
'Model#: YKK8K3H9-CUG',
'Serial#: SNXM-143960',
'Type: Water-Cooled',
'Compressor Type: Centrifugal',
'Power: 460 Volts / 60 Hz / 3 Ph',
'Refrigerant: R-134a'
],
parameter1: 5.6,
parameter2: 6.7,
parameter3: 26.20,
parameter3: 26.2,
parameter4: 0.86,
parameter5: 24.0,
parameter6: 5.0,
Expand All @@ -45,10 +55,20 @@ export default [
],
title: '高压制冷机CH-ZL-02',
category: '空调水系统/冷水机组',
features: ['Brand: York', 'Manufactured: 2011', 'Ton: 800 Ton', 'Model#: YKK8K3H9-CUG', 'Serial#: SNXM-143960', 'Type: Water-Cooled', 'Compressor Type: Centrifugal', 'Power: 460 Volts / 60 Hz / 3 Ph', 'Refrigerant: R-134a'],
features: [
'Brand: York',
'Manufactured: 2011',
'Ton: 800 Ton',
'Model#: YKK8K3H9-CUG',
'Serial#: SNXM-143960',
'Type: Water-Cooled',
'Compressor Type: Centrifugal',
'Power: 460 Volts / 60 Hz / 3 Ph',
'Refrigerant: R-134a'
],
parameter1: 5.6,
parameter2: 6.7,
parameter3: 26.20,
parameter3: 26.2,
parameter4: 0.86,
parameter5: 24.0,
parameter6: 5.0,
Expand All @@ -68,10 +88,20 @@ export default [
],
title: '高压制冷机CH-ZL-03',
category: '空调水系统/冷水机组',
features: ['Brand: York', 'Manufactured: 2011', 'Ton: 800 Ton', 'Model#: YKK8K3H9-CUG', 'Serial#: SNXM-143960', 'Type: Water-Cooled', 'Compressor Type: Centrifugal', 'Power: 460 Volts / 60 Hz / 3 Ph', 'Refrigerant: R-134a'],
features: [
'Brand: York',
'Manufactured: 2011',
'Ton: 800 Ton',
'Model#: YKK8K3H9-CUG',
'Serial#: SNXM-143960',
'Type: Water-Cooled',
'Compressor Type: Centrifugal',
'Power: 460 Volts / 60 Hz / 3 Ph',
'Refrigerant: R-134a'
],
parameter1: 5.6,
parameter2: 6.7,
parameter3: 26.20,
parameter3: 26.2,
parameter4: 0.86,
parameter5: 24.0,
parameter6: 5.0,
Expand All @@ -91,10 +121,20 @@ export default [
],
title: '高压制冷机CH-ZL-04',
category: '空调水系统/冷水机组',
features: ['Brand: York', 'Manufactured: 2011', 'Ton: 800 Ton', 'Model#: YKK8K3H9-CUG', 'Serial#: SNXM-143960', 'Type: Water-Cooled', 'Compressor Type: Centrifugal', 'Power: 460 Volts / 60 Hz / 3 Ph', 'Refrigerant: R-134a'],
features: [
'Brand: York',
'Manufactured: 2011',
'Ton: 800 Ton',
'Model#: YKK8K3H9-CUG',
'Serial#: SNXM-143960',
'Type: Water-Cooled',
'Compressor Type: Centrifugal',
'Power: 460 Volts / 60 Hz / 3 Ph',
'Refrigerant: R-134a'
],
parameter1: 5.6,
parameter2: 6.7,
parameter3: 26.20,
parameter3: 26.2,
parameter4: 0.86,
parameter5: 24.0,
parameter6: 5.0,
Expand All @@ -114,10 +154,20 @@ export default [
],
title: '高压制冷机CH-ZL-05',
category: '空调水系统/冷水机组',
features: ['Brand: York', 'Manufactured: 2011', 'Ton: 800 Ton', 'Model#: YKK8K3H9-CUG', 'Serial#: SNXM-143960', 'Type: Water-Cooled', 'Compressor Type: Centrifugal', 'Power: 460 Volts / 60 Hz / 3 Ph', 'Refrigerant: R-134a'],
features: [
'Brand: York',
'Manufactured: 2011',
'Ton: 800 Ton',
'Model#: YKK8K3H9-CUG',
'Serial#: SNXM-143960',
'Type: Water-Cooled',
'Compressor Type: Centrifugal',
'Power: 460 Volts / 60 Hz / 3 Ph',
'Refrigerant: R-134a'
],
parameter1: 5.6,
parameter2: 6.7,
parameter3: 26.20,
parameter3: 26.2,
parameter4: 0.86,
parameter5: 24.0,
parameter6: 5.0,
Expand All @@ -137,10 +187,20 @@ export default [
],
title: '高压制冷机CH-ZL-06',
category: '空调水系统/冷水机组',
features: ['Brand: York', 'Manufactured: 2011', 'Ton: 800 Ton', 'Model#: YKK8K3H9-CUG', 'Serial#: SNXM-143960', 'Type: Water-Cooled', 'Compressor Type: Centrifugal', 'Power: 460 Volts / 60 Hz / 3 Ph', 'Refrigerant: R-134a'],
features: [
'Brand: York',
'Manufactured: 2011',
'Ton: 800 Ton',
'Model#: YKK8K3H9-CUG',
'Serial#: SNXM-143960',
'Type: Water-Cooled',
'Compressor Type: Centrifugal',
'Power: 460 Volts / 60 Hz / 3 Ph',
'Refrigerant: R-134a'
],
parameter1: 5.6,
parameter2: 6.7,
parameter3: 26.20,
parameter3: 26.2,
parameter4: 0.86,
parameter5: 24.0,
parameter6: 5.0,
Expand All @@ -160,10 +220,20 @@ export default [
],
title: '高压制冷机CH-ZL-07',
category: '空调水系统/冷水机组',
features: ['Brand: York', 'Manufactured: 2011', 'Ton: 800 Ton', 'Model#: YKK8K3H9-CUG', 'Serial#: SNXM-143960', 'Type: Water-Cooled', 'Compressor Type: Centrifugal', 'Power: 460 Volts / 60 Hz / 3 Ph', 'Refrigerant: R-134a'],
features: [
'Brand: York',
'Manufactured: 2011',
'Ton: 800 Ton',
'Model#: YKK8K3H9-CUG',
'Serial#: SNXM-143960',
'Type: Water-Cooled',
'Compressor Type: Centrifugal',
'Power: 460 Volts / 60 Hz / 3 Ph',
'Refrigerant: R-134a'
],
parameter1: 5.6,
parameter2: 6.7,
parameter3: 26.20,
parameter3: 26.2,
parameter4: 0.86,
parameter5: 24.0,
parameter6: 5.0,
Expand All @@ -183,10 +253,20 @@ export default [
],
title: '高压制冷机CH-ZL-08',
category: '空调水系统/冷水机组',
features: ['Brand: York', 'Manufactured: 2011', 'Ton: 800 Ton', 'Model#: YKK8K3H9-CUG', 'Serial#: SNXM-143960', 'Type: Water-Cooled', 'Compressor Type: Centrifugal', 'Power: 460 Volts / 60 Hz / 3 Ph', 'Refrigerant: R-134a'],
features: [
'Brand: York',
'Manufactured: 2011',
'Ton: 800 Ton',
'Model#: YKK8K3H9-CUG',
'Serial#: SNXM-143960',
'Type: Water-Cooled',
'Compressor Type: Centrifugal',
'Power: 460 Volts / 60 Hz / 3 Ph',
'Refrigerant: R-134a'
],
parameter1: 5.6,
parameter2: 6.7,
parameter3: 26.20,
parameter3: 26.2,
parameter4: 0.86,
parameter5: 24.0,
parameter6: 5.0,
Expand All @@ -206,10 +286,20 @@ export default [
],
title: '高压制冷机CH-ZL-09',
category: '空调水系统/冷水机组',
features: ['Brand: York', 'Manufactured: 2011', 'Ton: 800 Ton', 'Model#: YKK8K3H9-CUG', 'Serial#: SNXM-143960', 'Type: Water-Cooled', 'Compressor Type: Centrifugal', 'Power: 460 Volts / 60 Hz / 3 Ph', 'Refrigerant: R-134a'],
features: [
'Brand: York',
'Manufactured: 2011',
'Ton: 800 Ton',
'Model#: YKK8K3H9-CUG',
'Serial#: SNXM-143960',
'Type: Water-Cooled',
'Compressor Type: Centrifugal',
'Power: 460 Volts / 60 Hz / 3 Ph',
'Refrigerant: R-134a'
],
parameter1: 5.6,
parameter2: 6.7,
parameter3: 26.20,
parameter3: 26.2,
parameter4: 0.86,
parameter5: 24.0,
parameter6: 5.0,
Expand All @@ -219,3 +309,5 @@ export default [
isRunning: true
}
];

export default equipmentList;
3 changes: 2 additions & 1 deletion myems-web/src/components/MyEMS/auth/ConfirmMailContent.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ const ConfirmMailContent = ({ email, layout, titleTag: TitleTag, t }) => (
<img className="d-block mx-auto mb-4" src={envelope} alt="sent" width={70} />
<TitleTag>{t('Please check your email!')}</TitleTag>
<p>
{t('An email has been sent to ')}<strong>{email}</strong>.
{t('An email has been sent to ')}
<strong>{email}</strong>.
</p>
<Button tag={Link} color="primary" size="sm" className="mt-3" to={`/authentication/${layout}/login`}>
<FontAwesomeIcon icon="chevron-left" transform="shrink-4 down-1" className="mr-1" />
Expand Down

0 comments on commit 408b23a

Please sign in to comment.