@@ -244,109 +244,273 @@ const swich1p2pAttrList = [
];
const swich3p4pAttrList = [
- {
- id: 1,
- name: '电网频率',
- startValue: 50004,
- lengthValue: 1,
- value: '', // 应该是实际读取的数值
- dataType: 'uint32_t',
- unit: 'Hz',
- accuracy: 0.01
- },
- {
- id: 2,
- name: '漏电流',
- startValue: 50005,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: 'mA',
- accuracy: 1
- },
- {
- id: 3,
- name: 'N相进线温度',
- startValue: 50006,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: '°C',
- accuracy: 0.1
- },
- {
- id: 4,
- name: 'N相出线温度',
- startValue: 50007,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: '°C',
- accuracy: 0.1
- },
- {
- id: 5,
- name: 'L/A相电压',
- startValue: 50008,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: 'V',
- accuracy: 0.01
- },
- {
- id: 6,
- name: 'L/A相电流',
- startValue: 50009,
- lengthValue: 1,
- value: '',
- dataType: 'int32_t',
- unit: 'A',
- accuracy: 0.001
- },
- {
- id: 7,
- name: 'L/A相有功功率',
- startValue: 50010,
- lengthValue: 1,
- value: '',
- dataType: 'int32_t',
- unit: 'W',
- accuracy: 0.001
- },
- {
- id: 8,
- name: 'L/A相无功功率',
- startValue: 50011,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: 'var',
- accuracy: 0.001
- },
- {
- id: 9,
- name: 'L/A相视在功率',
- startValue: 50012,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: 'va',
- accuracy: 0.001
- },
- {
- id: 10,
- name: 'L/A相功率因数',
- startValue: 50013,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: '',
- accuracy: 0.001
- },
+ {
+ id: 5,
+ name: 'A相电压',
+ startValue: 50008,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: 'V',
+ accuracy: 0.01
+ },
+ {
+ id: 6,
+ name: 'A相电流',
+ startValue: 50009,
+ lengthValue: 1,
+ value: '',
+ dataType: 'int32_t',
+ unit: 'A',
+ accuracy: 0.001
+ },
+ {
+ id: 7,
+ name: 'A相有功功率',
+ startValue: 50010,
+ lengthValue: 1,
+ value: '',
+ dataType: 'int32_t',
+ unit: 'W',
+ accuracy: 0.001
+ },
+ {
+ id: 8,
+ name: 'A相无功功率',
+ startValue: 50011,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: 'var',
+ accuracy: 0.001
+ },
+ {
+ id: 9,
+ name: 'A相视在功率',
+ startValue: 50012,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: 'va',
+ accuracy: 0.001
+ },
+ {
+ id: 10,
+ name: 'A相功率因数',
+ startValue: 50013,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: '',
+ accuracy: 0.001
+ },
+
+ {
+ id: 17,
+ name: 'B相电压',
+ startValue: 50020,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: 'V',
+ accuracy: 0.01
+ },
+ {
+ id: 18,
+ name: 'B相电流',
+ startValue: 50021,
+ lengthValue: 1,
+ value: '',
+ dataType: 'int32_t',
+ unit: 'A',
+ accuracy: 0.001
+ },
+ {
+ id: 19,
+ name: 'B相有功功率',
+ startValue: 50022,
+ lengthValue: 1,
+ value: '',
+ dataType: 'int32_t',
+ unit: 'W',
+ accuracy: 0.001
+ },
+ {
+ id: 20,
+ name: 'B相无功功率',
+ startValue: 50023,
+ lengthValue: 1,
+ value: '',
+ dataType: 'int32_t',
+ unit: 'var',
+ accuracy: 0.001
+ },
+ {
+ id: 21,
+ name: 'B相视在功率',
+ startValue: 50024,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: 'va',
+ accuracy: 0.001
+ },
+ {
+ id: 22,
+ name: 'B相功率因数',
+ startValue: 50025,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: '',
+ accuracy: 0.001
+ },
+ {
+ id: 29,
+ name: 'C相电压',
+ startValue: 50032,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: 'V',
+ accuracy: 0.01
+ },
+ {
+ id: 30,
+ name: 'C相电流',
+ startValue: 50033,
+ lengthValue: 1,
+ value: '',
+ dataType: 'int32_t',
+ unit: 'A',
+ accuracy: 0.001
+ },
+ {
+ id: 31,
+ name: 'C相有功功率',
+ startValue: 50034,
+ lengthValue: 1,
+ value: '',
+ dataType: 'int32_t',
+ unit: 'W',
+ accuracy: 0.001
+ },
+ {
+ id: 32,
+ name: 'C相无功功率',
+ startValue: 50035,
+ lengthValue: 1,
+ value: '',
+ dataType: 'int32_t',
+ unit: 'var',
+ accuracy: 0.001
+ },
+ {
+ id: 33,
+ name: 'C相视在功率',
+ startValue: 50036,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: 'va',
+ accuracy: 0.001
+ },
+ {
+ id: 34,
+ name: 'C相功率因数',
+ startValue: 50037,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: '',
+ accuracy: 0.001
+ },
+ {
+ id: 41,
+ name: '合相电压',
+ startValue: 50044,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: 'V',
+ accuracy: 0.01
+ },
+ {
+ id: 42,
+ name: '合相电流',
+ startValue: 50045,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: 'A',
+ accuracy: 0.001
+ },
+ {
+ id: 43,
+ name: '合相有功功率',
+ startValue: 50046,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: 'W',
+ accuracy: 0.001
+ },
+ {
+ id: 44,
+ name: '合相无功功率',
+ startValue: 50047,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: 'var',
+ accuracy: 0.001
+ },
+ {
+ id: 45,
+ name: '合相视在功率',
+ startValue: 50048,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: 'va',
+ accuracy: 0.001
+ },
+ {
+ id: 46,
+ name: '合相功率因数',
+ startValue: 50049,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: '',
+ accuracy: 0.001
+ },
+ {
+ id: 2,
+ name: '漏电流',
+ startValue: 50005,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: 'mA',
+ accuracy: 1
+ },
+ {
+ id: 1,
+ name: '电网频率',
+ startValue: 50004,
+ lengthValue: 1,
+ value: '', // 应该是实际读取的数值
+ dataType: 'uint32_t',
+ unit: 'Hz',
+ accuracy: 0.01
+ },
+
+
+
{
id: 15,
- name: 'L/A相进线温度',
+ name: 'A相进线温度',
startValue: 50018,
lengthValue: 1,
value: '',
@@ -356,7 +520,7 @@ const swich3p4pAttrList = [
},
{
id: 16,
- name: 'L/A相出线温度',
+ name: 'A相出线温度',
startValue: 50019,
lengthValue: 1,
value: '',
@@ -364,66 +528,7 @@ const swich3p4pAttrList = [
unit: '°C',
accuracy: 0.1
},
- {
- id: 17,
- name: 'B相电压',
- startValue: 50020,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: 'V',
- accuracy: 0.01
- },
- {
- id: 18,
- name: 'B相电流',
- startValue: 50021,
- lengthValue: 1,
- value: '',
- dataType: 'int32_t',
- unit: 'A',
- accuracy: 0.001
- },
- {
- id: 19,
- name: 'B相有功功率',
- startValue: 50022,
- lengthValue: 1,
- value: '',
- dataType: 'int32_t',
- unit: 'W',
- accuracy: 0.001
- },
- {
- id: 20,
- name: 'B相无功功率',
- startValue: 50023,
- lengthValue: 1,
- value: '',
- dataType: 'int32_t',
- unit: 'var',
- accuracy: 0.001
- },
- {
- id: 21,
- name: 'B相视在功率',
- startValue: 50024,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: 'va',
- accuracy: 0.001
- },
- {
- id: 22,
- name: 'B相功率因数',
- startValue: 50025,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: '',
- accuracy: 0.001
- },
+
{
id: 27,
name: 'B相进线温度',
@@ -444,66 +549,7 @@ const swich3p4pAttrList = [
unit: '°C',
accuracy: 0.1
},
- {
- id: 29,
- name: 'C相电压',
- startValue: 50032,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: 'V',
- accuracy: 0.01
- },
- {
- id: 30,
- name: 'C相电流',
- startValue: 50033,
- lengthValue: 1,
- value: '',
- dataType: 'int32_t',
- unit: 'A',
- accuracy: 0.001
- },
- {
- id: 31,
- name: 'C相有功功率',
- startValue: 50034,
- lengthValue: 1,
- value: '',
- dataType: 'int32_t',
- unit: 'W',
- accuracy: 0.001
- },
- {
- id: 32,
- name: 'C相无功功率',
- startValue: 50035,
- lengthValue: 1,
- value: '',
- dataType: 'int32_t',
- unit: 'var',
- accuracy: 0.001
- },
- {
- id: 33,
- name: 'C相视在功率',
- startValue: 50036,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: 'va',
- accuracy: 0.001
- },
- {
- id: 34,
- name: 'C相功率因数',
- startValue: 50037,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: '',
- accuracy: 0.001
- },
+
{
id: 39,
name: 'C相进线温度',
@@ -524,66 +570,26 @@ const swich3p4pAttrList = [
unit: '°C',
accuracy: 0.1
},
- {
- id: 41,
- name: '合相电压',
- startValue: 50044,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: 'V',
- accuracy: 0.01
- },
- {
- id: 42,
- name: '剩余电流',
- startValue: 50045,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: 'A',
- accuracy: 0.001
- },
- {
- id: 43,
- name: '合相有功功率',
- startValue: 50046,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: 'W',
- accuracy: 0.001
- },
- {
- id: 44,
- name: '合相无功功率',
- startValue: 50047,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: 'var',
- accuracy: 0.001
- },
- {
- id: 45,
- name: 'RMS合相视在功率',
- startValue: 50048,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: 'va',
- accuracy: 0.001
- },
- {
- id: 46,
- name: 'RMS合相功率因数',
- startValue: 50049,
- lengthValue: 1,
- value: '',
- dataType: 'uint32_t',
- unit: '',
- accuracy: 0.001
- }
+ {
+ id: 3,
+ name: 'N相进线温度',
+ startValue: 50006,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: '°C',
+ accuracy: 0.1
+ },
+ {
+ id: 4,
+ name: 'N相出线温度',
+ startValue: 50007,
+ lengthValue: 1,
+ value: '',
+ dataType: 'uint32_t',
+ unit: '°C',
+ accuracy: 0.1
+ },
];
const electricalParametersList = ref([]);
@@ -1082,6 +1088,11 @@ onUnmounted(() => {});
}
}
}
+ &.switch34{
+ .electrical-parameters-item{
+ width: calc(16% - 20px);
+ }
+ }
}
.electrical-parameters-calibrate-list {
.electrical-parameters-item {
diff --git a/yarn.lock b/yarn.lock
index b97d491..9217327 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -923,6 +923,11 @@ acorn@^8.9.0:
resolved "https://registry.npmmirror.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
+adler-32@~1.3.0:
+ version "1.3.1"
+ resolved "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz#1dbf0b36dda0012189a32b3679061932df1821e2"
+ integrity sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==
+
agent-base@6:
version "6.0.2"
resolved "https://registry.npmmirror.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -1224,6 +1229,14 @@ caniuse-lite@^1.0.30001629:
resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001640.tgz#32c467d4bf1f1a0faa63fc793c2ba81169e7652f"
integrity sha512-lA4VMpW0PSUrFnkmVuEKBUovSWKhj7puyCg8StBChgu298N1AtuF1sKWEvfDuimSEDbhlb/KqPKC3fs1HbuQUA==
+cfb@~1.2.1:
+ version "1.2.2"
+ resolved "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz#94e687628c700e5155436dac05f74e08df23bc44"
+ integrity sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==
+ dependencies:
+ adler-32 "~1.3.0"
+ crc-32 "~1.2.0"
+
chalk@^2.4.2:
version "2.4.2"
resolved "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -1295,6 +1308,11 @@ clone-response@^1.0.2:
dependencies:
mimic-response "^1.0.0"
+codepage@~1.15.0:
+ version "1.15.0"
+ resolved "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz#2e00519024b39424ec66eeb3ec07227e692618ab"
+ integrity sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==
+
color-convert@^1.9.0:
version "1.9.3"
resolved "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -1366,6 +1384,11 @@ core-util-is@1.0.2:
resolved "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
+crc-32@~1.2.0, crc-32@~1.2.1:
+ version "1.2.2"
+ resolved "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff"
+ integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==
+
crc@^3.8.0:
version "3.8.0"
resolved "https://registry.npmmirror.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
@@ -1889,6 +1912,11 @@ file-entry-cache@^6.0.1:
dependencies:
flat-cache "^3.0.4"
+file-saver@^2.0.5:
+ version "2.0.5"
+ resolved "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
+ integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==
+
filelist@^1.0.4:
version "1.0.4"
resolved "https://registry.npmmirror.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
@@ -1947,6 +1975,11 @@ form-data@^4.0.0:
combined-stream "^1.0.8"
mime-types "^2.1.12"
+frac@~1.1.2:
+ version "1.1.2"
+ resolved "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b"
+ integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==
+
fs-extra@^10.0.0, fs-extra@^10.1.0:
version "10.1.0"
resolved "https://registry.npmmirror.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
@@ -3083,6 +3116,13 @@ sprintf-js@^1.1.2:
resolved "https://registry.npmmirror.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
+ssf@~0.11.2:
+ version "0.11.2"
+ resolved "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz#0b99698b237548d088fc43cdf2b70c1a7512c06c"
+ integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==
+ dependencies:
+ frac "~1.1.2"
+
stat-mode@^1.0.0:
version "1.0.0"
resolved "https://registry.npmmirror.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465"
@@ -3361,11 +3401,21 @@ which@^2.0.1:
dependencies:
isexe "^2.0.0"
+wmf@~1.0.1:
+ version "1.0.2"
+ resolved "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz#7d19d621071a08c2bdc6b7e688a9c435298cc2da"
+ integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==
+
word-wrap@^1.2.5:
version "1.2.5"
resolved "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
+word@~0.3.0:
+ version "0.3.0"
+ resolved "https://registry.npmmirror.com/word/-/word-0.3.0.tgz#8542157e4f8e849f4a363a288992d47612db9961"
+ integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==
+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
version "7.0.0"
resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -3398,6 +3448,19 @@ wrappy@1:
resolved "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+xlsx@^0.18.5:
+ version "0.18.5"
+ resolved "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz#16711b9113c848076b8a177022799ad356eba7d0"
+ integrity sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==
+ dependencies:
+ adler-32 "~1.3.0"
+ cfb "~1.2.1"
+ codepage "~1.15.0"
+ crc-32 "~1.2.1"
+ ssf "~0.11.2"
+ wmf "~1.0.1"
+ word "~0.3.0"
+
xml-name-validator@^4.0.0:
version "4.0.0"
resolved "https://registry.npmmirror.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"