解决冲突

Browse Source

...

This commit is contained in:

Hcat1314

2023-12-13 00:17:36 +08:00

parent 454ebd3d72 d919252bc3

commit 45ac8aadf2

42 changed files with 1383 additions and 404 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

public/images/airInfo/bg.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 8.4 KiB

BIN

public/images/airInfo/dust-icon.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.3 KiB

BIN

public/images/airInfo/fan-v-icon.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 932 B

BIN

public/images/airInfo/o2-icon.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.6 KiB

BIN

public/images/airInfo/tempture-icon.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.3 KiB

BIN

public/images/airInfo/water-icon.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.3 KiB

BIN

public/images/badGasInfo/bg.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 17 KiB

BIN

public/images/fanInfo/bg.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 13 KiB

BIN

public/images/fanInfo/blue-state-icon.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.1 KiB

BIN

public/images/fanInfo/red-state-icon.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.0 KiB