Commit 9d1c48624405d01cf6a65abf68d861185fc5e4c1

Authored by 周铨
1 parent 002cf9b2

处理卡片数据展示

1 1 // pages/monitor/monitor.ts
2   -import Toast from './../../miniprogram_npm/@vant/weapp/toast/toast';
  2 +import Toast from '@vant/weapp/toast/toast';
3 3 import { API_CONST } from "./../../api/smartElectric";
4 4 import { getUnitEvent, getCardEvent } from './../../utils/util'
5 5 import { HTTPService as HTTP } from "./../../services/HTTPService";
... ... @@ -443,7 +443,7 @@ Page({
443 443 let PV = data.data.PV // 光伏
444 444 let BMS = data.data.BMS//储能
445 445 let EM = data.data.EM // 电能表
446   - const deviceDataList = [
  446 + const deviceDataListNew = [
447 447 {
448 448 type: '光伏',
449 449 imgUrl: "./../../img/device_photovoltaic.png",
... ... @@ -504,7 +504,7 @@ Page({
504 504
505 505 this.setData({
506 506 allData: data.data,
507   - deviceDataList: deviceDataList,
  507 + deviceDataList: deviceDataListNew,
508 508 })
509 509 const app = getApp();
510 510 app.globalData.allData = data.data;
... ...
... ... @@ -32,7 +32,7 @@
32 32 </view>
33 33 <view class="deviceStatistics">
34 34 <topTitle topTitleName="设备统计"></topTitle>
35   - <circularDiagram wx:if="{{allData.deviceInfo}}" deviceInfo="{{allData.deviceInfo}}"></circularDiagram>
  35 + <circularDiagram deviceInfo="{{allData.deviceInfo}}"></circularDiagram>
36 36 <deviceData deviceDataList="{{deviceDataList}}"></deviceData>
37 37 </view>
38 38 <view class="overallOperationStatus">
... ...
... ... @@ -139,7 +139,7 @@ export const getUnitEvent = (n: number, Obj: any) => {
139 139 res = [// 仪表盘list数据
140 140 {
141 141 dataList: [{
142   - value: formatDataEvent(Obj.CP01) ,
  142 + value: formatDataEvent(Obj.CP01),
143 143 name: "额定功率",
144 144 unit: "kW"
145 145 }],
... ... @@ -157,7 +157,7 @@ export const getUnitEvent = (n: number, Obj: any) => {
157 157 },
158 158 {
159 159 dataList: [{
160   - value: formatDataEvent(Obj.CP03) ,
  160 + value: formatDataEvent(Obj.CP03),
161 161 name: "A枪温度",
162 162 unit: "℃"
163 163 }],
... ... @@ -175,7 +175,7 @@ export const getUnitEvent = (n: number, Obj: any) => {
175 175 },
176 176 {
177 177 dataList: [{
178   - value:formatDataEvent(Obj.CP05),
  178 + value: formatDataEvent(Obj.CP05),
179 179 name: "B枪SOC",
180 180 unit: "%"
181 181 }],
... ... @@ -230,7 +230,7 @@ export const getUnitEvent = (n: number, Obj: any) => {
230 230 numColor: "#14C9C9",
231 231 unit: "%"
232 232 },
233   -
  233 +
234 234 {
235 235 dataList: [{
236 236 value: formatDataEvent(Obj.PV22),
... ... @@ -288,7 +288,7 @@ export const getUnitEvent = (n: number, Obj: any) => {
288 288 numColor: "#14C9C9",
289 289 unit: "A"
290 290 },
291   -
  291 +
292 292 {
293 293 dataList: [{
294 294 value: Obj.EM05,
... ... @@ -313,665 +313,673 @@ export const getUnitEvent = (n: number, Obj: any) => {
313 313 }
314 314
315 315
316   -const formatDataEvent = (val:(String|Number)) =>{
317   - if(val && val !== 'null'){
  316 +const formatDataEvent = (val: (String | Number)) => {
  317 + if (val && val !== 'null') {
318 318 return val
319   - }else if(val === 'null' || !val){
  319 + } else if (val === 'null' || !val) {
320 320 return 0
321   - }else {
  321 + } else {
322 322 return 0
323 323 }
324 324 }
325   -
  325 +const formatUnitEvent = (val: (String | Number)) => {
  326 + if (val && val !== 'null') {
  327 + return val
  328 + } else if (val === 'null' || !val) {
  329 + return "NA"
  330 + } else {
  331 + return "nA"
  332 + }
  333 +}
326 334 // 卡片数据统一处理
327 335 export const getCardEvent = (n: number, Obj: any) => {
328   - let res:any = []
329   - if(n === 1){// BMS
  336 + let res: any = []
  337 + if (n === 1) {// BMS
330 338 res = [
331 339 {
332 340 type: "最大允许放电功率",
333   - num: Obj.BMS07,
  341 + num: formatUnitEvent(Obj.BMS07),
334 342 unit: "KW"
335 343 },
336 344 {
337 345 type: "电源电阻R-",
338   - num: Obj.BMS08,
  346 + num: formatUnitEvent(Obj.BMS08),
339 347 unit: "KQ"
340 348 },
341 349 {
342 350 type: "绝缘电阻R+",
343   - num: Obj.BMS09,
  351 + num: formatUnitEvent(Obj.BMS09),
344 352 unit: "KQ"
345 353 },
346 354 {
347 355 type: "供电电压",
348   - num: Obj.BMS10,
  356 + num: formatUnitEvent(Obj.BMS10),
349 357 unit: "V"
350 358 },
351 359 {
352 360 type: "最大允许充电电压",
353   - num: Obj.BMS11,
  361 + num: formatUnitEvent(Obj.BMS11),
354 362 unit: "V"
355 363 },
356 364 {
357 365 type: "单体最高电压",
358   - num: Obj.BMS12,
  366 + num: formatUnitEvent(Obj.BMS12),
359 367 unit: "V"
360 368 },
361 369 {
362 370 type: "单体平均压差",
363   - num: Obj.BMS13,
  371 + num: formatUnitEvent(Obj.BMS13),
364 372 unit: "mV"
365 373 },
366 374 {
367 375 type: "单体压差",
368   - num: Obj.BMS14,
  376 + num: formatUnitEvent(Obj.BMS14),
369 377 unit: "mV"
370 378 },
371 379 {
372 380 type: "单体最高温度",
373   - num: Obj.BMS15,
  381 + num: formatUnitEvent(Obj.BMS15),
374 382 unit: "°C"
375 383 },
376 384 {
377 385 type: "单体最低温度",
378   - num: Obj.BMS16,
  386 + num: formatUnitEvent(Obj.BMS16),
379 387 unit: "°C"
380 388 },
381 389 {
382 390 type: "单体平均温度",
383   - num: Obj.BMS17,
  391 + num: formatUnitEvent(Obj.BMS17),
384 392 unit: "°C"
385 393 },
386 394 {
387 395 type: "单体温度",
388   - num: Obj.BMS18,
  396 + num: formatUnitEvent(Obj.BMS18),
389 397 unit: "°C"
390 398 },
391 399 {
392 400 type: "极柱最低温度",
393   - num: Obj.BMS19,
  401 + num: formatUnitEvent(Obj.BMS19),
394 402 unit: "°C"
395 403 },
396 404 {
397 405 type: "极柱平均温度",
398   - num: Obj.BMS20,
  406 + num: formatUnitEvent(Obj.BMS20),
399 407 unit: "°C"
400 408 },
401 409 {
402 410 type: "极柱温差",
403   - num: Obj.BMS21,
  411 + num: formatUnitEvent(Obj.BMS21),
404 412 unit: "°C"
405 413 },
406 414 {
407 415 type: "最高电压序号",
408   - num: Obj.BMS22,
  416 + num: formatUnitEvent(Obj.BMS22),
409 417 unit: ""
410 418 },
411 419 {
412 420 type: "最低电压序号",
413   - num: Obj.BMS23,
  421 + num: formatUnitEvent(Obj.BMS23),
414 422 unit: ""
415 423 },
416 424 {
417 425 type: "最高温度序号",
418   - num: Obj.BMS24,
  426 + num: formatUnitEvent(Obj.BMS24),
419 427 unit: ""
420 428 },
421 429 {
422 430 type: "极柱最高温度序号",
423   - num: Obj.BMS25,
  431 + num: formatUnitEvent(Obj.BMS25),
424 432 unit: ""
425 433 },
426 434 {
427 435 type: "极柱最低温度序号",
428   - num: Obj.BMS26,
  436 + num: formatUnitEvent(Obj.BMS26),
429 437 unit: ""
430 438 },
431 439 {
432 440 type: "极柱最高温度模块",
433   - num: Obj.BMS27,
  441 + num: formatUnitEvent(Obj.BMS27),
434 442 unit: ""
435 443 },
436 444
437 445 {
438 446 type: "极柱最低温度模块",
439   - num: Obj.BMS28,
  447 + num: formatUnitEvent(Obj.BMS28),
440 448 unit: ""
441 449 },
442 450 {
443 451 type: "最高电压模块",
444   - num: Obj.BMS29,
  452 + num: formatUnitEvent(Obj.BMS29),
445 453 unit: ""
446 454 },
447 455 {
448 456 type: "最低电压模块",
449   - num: Obj.BMS30,
  457 + num: formatUnitEvent(Obj.BMS30),
450 458 unit: ""
451 459 },
452 460 {
453 461 type: "最低温度模块",
454   - num: Obj.BMS31,
  462 + num: formatUnitEvent(Obj.BMS31),
455 463 unit: ""
456 464 },
457 465 {
458 466 type: "单次充电电量",
459   - num: Obj.BMS32,
  467 + num: formatUnitEvent(Obj.BMS32),
460 468 unit: "kWh"
461 469 },
462 470 {
463 471 type: "单词放电电量",
464   - num: Obj.BMS33,
  472 + num: formatUnitEvent(Obj.BMS33),
465 473 unit: "kWh"
466 474 },
467 475 {
468 476 type: "当日充电电量",
469   - num: Obj.BMS34,
  477 + num: formatUnitEvent(Obj.BMS34),
470 478 unit: "kWh"
471 479 },
472 480 {
473 481 type: "当日放电电量",
474   - num: Obj.BMS35,
  482 + num: formatUnitEvent(Obj.BMS35),
475 483 unit: "kWh"
476 484 },
477 485 {
478 486 type: "总电池结数",
479   - num: Obj.BMS36,
  487 + num: formatUnitEvent(Obj.BMS36),
480 488 unit: ""
481 489 },
482 490 ]
483   - } else if (n === 2) {//PCS监控
  491 + } else if (n === 2) {//PCS监控
484 492 res = [
485 493 {
486 494 type: "模块温度",
487   - num: Obj.PCS07,
  495 + num: formatUnitEvent(Obj.PCS07),
488 496 unit: "℃"
489 497 },
490 498 {
491 499 type: "环境温度",
492   - num: Obj.PCS08,
  500 + num: formatUnitEvent(Obj.PCS08),
493 501 unit: "℃"
494 502 },
495 503 {
496 504 type: "机柜温度",
497   - num: Obj.PCS09,
  505 + num: formatUnitEvent(Obj.PCS09),
498 506 unit: "℃"
499 507 },
500 508 {
501 509 type: "交流AB线电压",
502   - num: Obj.PCS10,
  510 + num: formatUnitEvent(Obj.PCS10),
503 511 unit: "V"
504 512 },
505 513 {
506 514 type: "交流BC线电压",
507   - num: Obj.PCS11,
  515 + num: formatUnitEvent(Obj.PCS11),
508 516 unit: "V"
509 517 },
510 518 {
511 519 type: "交流CA线电压",
512   - num: Obj.PCS12,
  520 + num: formatUnitEvent(Obj.PCS12),
513 521 unit: "V"
514 522 },
515 523 {
516 524 type: "交流总无功率",
517   - num: Obj.PCS13,
  525 + num: formatUnitEvent(Obj.PCS13),
518 526 unit: "kW"
519 527 },
520 528 {
521 529 type: "交流总有功功率",
522   - num: Obj.PCS14,
  530 + num: formatUnitEvent(Obj.PCS14),
523 531 unit: "kW"
524 532 },
525 533 {
526 534 type: "交流A相有功功率",
527   - num: Obj.PCS15,
  535 + num: formatUnitEvent(Obj.PCS15),
528 536 unit: "kW"
529 537 },
530 538 {
531 539 type: "交流B相有功功率",
532   - num: Obj.PCS16,
  540 + num: formatUnitEvent(Obj.PCS16),
533 541 unit: "kW"
534 542 },
535 543 {
536 544 type: "交流C相有功功率",
537   - num: Obj.PCS17,
  545 + num: formatUnitEvent(Obj.PCS17),
538 546 unit: "kW"
539 547 },
540 548 {
541 549 type: "交流A相无功功率",
542   - num: Obj.PCS18,
  550 + num: formatUnitEvent(Obj.PCS18),
543 551 unit: "kVar"
544 552 },
545 553 {
546 554 type: "交流B相无功功率",
547   - num: Obj.PCS19,
  555 + num: formatUnitEvent(Obj.PCS19),
548 556 unit: "kVar"
549 557 },
550 558 {
551 559 type: "交流C相无功功率",
552   - num: Obj.PCS20,
  560 + num: formatUnitEvent(Obj.PCS20),
553 561 unit: "kVar"
554 562 },
555 563 {
556 564 type: "交流A相电流",
557   - num: Obj.PCS21,
  565 + num: formatUnitEvent(Obj.PCS21),
558 566 unit: "A"
559 567 },
560 568 {
561 569 type: "交流B相电流",
562   - num: Obj.PCS22,
  570 + num: formatUnitEvent(Obj.PCS22),
563 571 unit: "A"
564 572 },
565 573 {
566 574 type: "交流C相电流",
567   - num: Obj.PCS23,
  575 + num: formatUnitEvent(Obj.PCS23),
568 576 unit: "A"
569 577 },
570 578 {
571 579 type: "交流频率",
572   - num: Obj.PCS24,
  580 + num: formatUnitEvent(Obj.PCS24),
573 581 unit: "Hz"
574 582 },
575 583 {
576 584 type: "最大充电电流",
577   - num: Obj.PCS25,
  585 + num: formatUnitEvent(Obj.PCS25),
578 586 unit: "A"
579 587 },
580 588 {
581 589 type: "最大放电电流",
582   - num: Obj.PCS26,
  590 + num: formatUnitEvent(Obj.PCS26),
583 591 unit: "A"
584 592 },
585 593 {
586 594 type: "累计交流放电电量",
587   - num: Obj.PCS27,
  595 + num: formatUnitEvent(Obj.PCS27),
588 596 unit: "kWh"
589 597 },
590 598
591 599 {
592 600 type: "累计交流充电电量",
593   - num: Obj.PCS28,
  601 + num: formatUnitEvent(Obj.PCS28),
594 602 unit: "kWh"
595 603 },
596 604 {
597 605 type: "累计交流无功电量",
598   - num: Obj.PCS29,
  606 + num: formatUnitEvent(Obj.PCS29),
599 607 unit: "kVarh"
600 608 },
601 609 ]
602   - } else if (n === 3) {//充电桩
  610 + } else if (n === 3) {//充电桩
603 611 res = [
604 612 {
605 613 type: "A枪编号",
606   - num: Obj.CP07,
  614 + num: formatUnitEvent(formatUnitEvent(Obj.CP07)),
607 615 unit: ""
608 616 },
609 617 {
610 618 type: "A枪额定功率",
611   - num: Obj.CP08,
  619 + num: formatUnitEvent(Obj.CP08),
612 620 unit: "kW"
613 621 },
614 622 {
615 623 type: "A枪类型",
616   - num: Obj.CP09,
  624 + num: formatUnitEvent(Obj.CP09),
617 625 unit: ""
618 626 },
619 627 {
620 628 type: "A枪SOC",
621   - num: Obj.CP10,
  629 + num: formatUnitEvent(Obj.CP10),
622 630 unit: "%"
623 631 },
624 632 {
625 633 type: "A枪插枪状态",
626   - num: Obj.CP11,
  634 + num: formatUnitEvent(Obj.CP11),
627 635 unit: ""
628 636 },
629 637 {
630 638 type: "A枪充电状态",
631   - num: Obj.CP12,
  639 + num: formatUnitEvent(Obj.CP12),
632 640 unit: ""
633 641 },
634 642 {
635 643 type: "A枪输出电压",
636   - num: Obj.CP13,
  644 + num: formatUnitEvent(Obj.CP13),
637 645 unit: "V"
638 646 },
639 647 {
640 648 type: "A枪输出电流",
641   - num: Obj.CP14,
  649 + num: formatUnitEvent(Obj.CP14),
642 650 unit: "A"
643 651 },
644 652 {
645 653 type: "A枪需求功率",
646   - num: Obj.CP15,
  654 + num: formatUnitEvent(Obj.CP15),
647 655 unit: "kW"
648 656 },
649 657 {
650 658 type: "A枪需求电流",
651   - num: Obj.CP16,
  659 + num: formatUnitEvent(Obj.CP16),
652 660 unit: "A"
653 661 },
654 662 {
655 663 type: "A枪最小输出功率",
656   - num: Obj.CP17,
  664 + num: formatUnitEvent(Obj.CP17),
657 665 unit: "kW"
658 666 },
659 667 {
660 668 type: "A枪当前限定功率",
661   - num: Obj.CP18,
  669 + num: formatUnitEvent(Obj.CP18),
662 670 unit: "kW"
663 671 },
664 672 {
665 673 type: "B枪编号",
666   - num: Obj.CP19,
  674 + num: formatUnitEvent(Obj.CP19),
667 675 unit: ""
668 676 },
669 677 {
670 678 type: "B枪额定功率",
671   - num: Obj.CP20,
  679 + num: formatUnitEvent(Obj.CP20),
672 680 unit: "kW"
673 681 },
674 682 {
675 683 type: "B枪类型",
676   - num: Obj.CP21,
  684 + num: formatUnitEvent(Obj.CP21),
677 685 unit: ""
678 686 },
679 687 {
680 688 type: "B枪soc",
681   - num: Obj.CP22,
  689 + num: formatUnitEvent(Obj.CP22),
682 690 unit: "%"
683 691 },
684 692 {
685 693 type: "B枪插枪状态",
686   - num: Obj.CP23,
  694 + num: formatUnitEvent(Obj.CP23),
687 695 unit: ""
688 696 },
689 697 {
690 698 type: "B枪充电状态",
691   - num: Obj.CP24,
  699 + num: formatUnitEvent(Obj.CP24),
692 700 unit: ""
693 701 },
694 702 {
695 703 type: "B枪输出电压",
696   - num: Obj.CP25,
  704 + num: formatUnitEvent(Obj.CP25),
697 705 unit: "V"
698 706 },
699 707 {
700 708 type: "B枪输出电流",
701   - num: Obj.CP26,
  709 + num: formatUnitEvent(Obj.CP26),
702 710 unit: "A"
703 711 },
704 712 {
705 713 type: "B枪需求功率",
706   - num: Obj.CP27,
  714 + num: formatUnitEvent(Obj.CP27),
707 715 unit: "kW"
708 716 },
709 717 {
710 718 type: "B枪需求电流",
711   - num: Obj.CP28,
  719 + num: formatUnitEvent(Obj.CP28),
712 720 unit: "A"
713 721 },
714 722 {
715 723 type: "B枪最小输出功率",
716   - num: Obj.CP29,
  724 + num: formatUnitEvent(Obj.CP29),
717 725 unit: "kW"
718 726 },
719 727 {
720 728 type: "B枪当前限定功率",
721   - num: Obj.CP30,
  729 + num: formatUnitEvent(Obj.CP30),
722 730 unit: "kW"
723 731 }
724 732 ]
725   - } else if (n === 4) {//光伏
  733 + } else if (n === 4) {//光伏
726 734
727 735 res = [
728 736 {
729 737 type: "AB线电压/A相电压",
730   - num: Obj.PV07,
  738 + num: formatUnitEvent(Obj.PV07),
731 739 unit: "V"
732 740 },
733 741 {
734 742 type: "BC线电压/B相电压",
735   - num: Obj.PV08,
  743 + num: formatUnitEvent(Obj.PV08),
736 744 unit: "V"
737 745 },
738 746 {
739 747 type: "CA线电压/C相电压",
740   - num: Obj.PV09,
  748 + num: formatUnitEvent(Obj.PV09),
741 749 unit: "V"
742 750 },
743 751 {
744 752 type: "A相电流",
745   - num: Obj.PV10,
  753 + num: formatUnitEvent(Obj.PV10),
746 754 unit: "A"
747 755 },
748 756 {
749 757 type: "B相电流",
750   - num: Obj.PV11,
  758 + num: formatUnitEvent(Obj.PV11),
751 759 unit: "A"
752 760 },
753 761 {
754 762 type: "C相电流",
755   - num: Obj.PV12,
  763 + num: formatUnitEvent(Obj.PV12),
756 764 unit: "A"
757 765 },
758 766 {
759 767 type: "电网频率",
760   - num: Obj.PV13,
  768 + num: formatUnitEvent(Obj.PV13),
761 769 unit: "Hz"
762 770 },
763 771 {
764 772 type: "逆变器效率",
765   - num: Obj.PV14,
  773 + num: formatUnitEvent(Obj.PV14),
766 774 unit: "%"
767 775 },
768 776 {
769 777 type: "额定无功功率",
770   - num: Obj.PV15,
  778 + num: formatUnitEvent(Obj.PV15),
771 779 unit: "kVar"
772 780 },
773 781 {
774 782 type: "方阵绝缘阻抗",
775   - num: Obj.PV16,
  783 + num: formatUnitEvent(Obj.PV16),
776 784 unit: "kΩ"
777 785 },
778 786 {
779 787 type: "电表功率",
780   - num: Obj.PV17,
  788 + num: formatUnitEvent(Obj.PV17),
781 789 unit: "W"
782 790 },
783 791 {
784 792 type: "工作状态",
785   - num: Obj.PV18,
  793 + num: formatUnitEvent(Obj.PV18),
786 794 unit: ""
787 795 },
788 796 {
789 797 type: "电表A相功率",
790   - num: Obj.PV19,
  798 + num: formatUnitEvent(Obj.PV19),
791 799 unit: "W"
792 800 },
793 801 {
794 802 type: "电表B相功率",
795   - num: Obj.PV20,
  803 + num: formatUnitEvent(Obj.PV20),
796 804 unit: "W"
797 805 },
798 806 {
799 807 type: "电表C相功率",
800   - num: Obj.PV21,
  808 + num: formatUnitEvent(Obj.PV21),
801 809 unit: "W"
802 810 },
803 811 {
804 812 type: "负载功率",
805   - num: Obj.PV22,
  813 + num: formatUnitEvent(Obj.PV22),
806 814 unit: "W"
807 815 },
808 816 {
809 817 type: "日电网取电电量",
810   - num: Obj.PV23,
  818 + num: formatUnitEvent(Obj.PV23),
811 819 unit: "kWh"
812 820 },
813 821 {
814 822 type: "总电网取电电量",
815   - num: Obj.PV24,
  823 + num: formatUnitEvent(Obj.PV24),
816 824 unit: "kWh"
817 825 },
818 826 {
819 827 type: "日直接消耗电量",
820   - num: Obj.PV25,
  828 + num: formatUnitEvent(Obj.PV25),
821 829 unit: "kWh"
822 830 },
823 831 {
824 832 type: "总直接消耗电量",
825   - num: Obj.PV26,
  833 + num: formatUnitEvent(Obj.PV26),
826 834 unit: "kWh"
827 835 },
828 836 {
829 837 type: "逆变器状态",
830   - num: Obj.PV27,
  838 + num: formatUnitEvent(Obj.PV27),
831 839 unit: ""
832 840 },
833 841 {
834 842 type: "总发电量",
835   - num: Obj.PV28,
  843 + num: formatUnitEvent(Obj.PV28),
836 844 unit: "kWh"
837 845 },
838 846 {
839 847 type: "母线电压",
840   - num: Obj.PV29,
  848 + num: formatUnitEvent(Obj.PV29),
841 849 unit: "V"
842 850 },
843 851 {
844 852 type: "电网频率",
845   - num: Obj.PV30,
  853 + num: formatUnitEvent(Obj.PV30),
846 854 unit: "Hz"
847 855 }
848 856 ]
849   - } else if (n === 5) {// 电能表监视
  857 + } else if (n === 5) {// 电能表监视
850 858 res = [
851 859 {
852 860 type: "A相有功功率",
853   - num: Obj.EM07,
  861 + num: formatUnitEvent(Obj.EM07),
854 862 unit: "kW"
855 863 },
856 864 {
857 865 type: "B相有功功率",
858   - num: Obj.EM08,
  866 + num: formatUnitEvent(Obj.EM08),
859 867 unit: "kW"
860 868 },
861 869 {
862 870 type: "C相有功功率",
863   - num: Obj.EM09,
  871 + num: formatUnitEvent(Obj.EM09),
864 872 unit: "kW"
865 873 },
866 874 {
867 875 type: "A相无功功率",
868   - num: Obj.EM10,
  876 + num: formatUnitEvent(Obj.EM10),
869 877 unit: "%"
870 878 },
871 879 {
872 880 type: "B相无功功率",
873   - num: Obj.EM11,
  881 + num: formatUnitEvent(Obj.EM11),
874 882 unit: "kVar"
875 883 },
876 884 {
877 885 type: "C相无功功率",
878   - num: Obj.EM12,
  886 + num: formatUnitEvent(Obj.EM12),
879 887 unit: "kVar"
880 888 },
881 889 {
882 890 type: "A相视在功率",
883   - num: Obj.EM13,
  891 + num: formatUnitEvent(Obj.EM13),
884 892 unit: "kVA"
885 893 },
886 894 {
887 895 type: "B相视在功率",
888   - num: Obj.EM14,
  896 + num: formatUnitEvent(Obj.EM14),
889 897 unit: "kVA"
890 898 },
891 899 {
892 900 type: "C相视在功率",
893   - num: Obj.EM15,
  901 + num: formatUnitEvent(Obj.EM15),
894 902 unit: "kVA"
895 903 },
896 904 {
897 905 type: "A相功率因数",
898   - num: Obj.EM16,
  906 + num: formatUnitEvent(Obj.EM16),
899 907 unit: ""
900 908 },
901 909 {
902 910 type: "B相功率因数",
903   - num: Obj.EM17,
  911 + num: formatUnitEvent(Obj.EM17),
904 912 unit: ""
905 913 },
906 914 {
907 915 type: "C相功率因数",
908   - num: Obj.EM18,
  916 + num: formatUnitEvent(Obj.EM18),
909 917 unit: ""
910 918 },
911 919 {
912 920 type: "总有功功率",
913   - num: Obj.EM19,
  921 + num: formatUnitEvent(Obj.EM19),
914 922 unit: "kW"
915 923 },
916 924 {
917 925 type: "总视在功率",
918   - num: Obj.EM20,
  926 + num: formatUnitEvent(Obj.EM20),
919 927 unit: "kVA"
920 928 },
921 929 {
922 930 type: "总功率因数",
923   - num: Obj.EM21,
  931 + num: formatUnitEvent(Obj.EM21),
924 932 unit: ""
925 933 },
926 934 {
927 935 type: "正向有功总电能",
928   - num: Obj.EM22,
  936 + num: formatUnitEvent(Obj.EM22),
929 937 unit: "kWh"
930 938 },
931 939 {
932 940 type: "反向有功总电能",
933   - num: Obj.EM23,
  941 + num: formatUnitEvent(Obj.EM23),
934 942 unit: "kWh"
935 943 },
936 944 {
937 945 type: "正向无功总电能",
938   - num: Obj.EM24,
  946 + num: formatUnitEvent(Obj.EM24),
939 947 unit: "kVarh"
940 948 },
941 949 {
942 950 type: "反向无功总电能",
943   - num: Obj.EM25,
  951 + num: formatUnitEvent(Obj.EM25),
944 952 unit: "kVarh"
945 953 },
946 954 {
947 955 type: "当日正向有功最大需量",
948   - num: Obj.EM26,
  956 + num: formatUnitEvent(Obj.EM26),
949 957 unit: "kWh"
950 958 },
951 959 {
952 960 type: "发生时间",
953   - num: Obj.EM27,
  961 + num: formatUnitEvent(Obj.EM27),
954 962 unit: "kW"
955 963 },
956   -
  964 +
957 965 {
958 966 type: "当日反向有功最大需量",
959   - num: Obj.EM28,
  967 + num: formatUnitEvent(Obj.EM28),
960 968 unit: "kWh"
961 969 },
962 970 {
963 971 type: "电压变比",
964   - num: Obj.EM28,
  972 + num: formatUnitEvent(Obj.EM28),
965 973 unit: ""
966 974 },
967 975 {
968 976 type: "电流变比",
969   - num: Obj.EM30,
  977 + num: formatUnitEvent(Obj.EM30),
970 978 unit: ""
971 979 }
972 980 ]
973   - }
  981 + }
974 982
975   - return res
  983 + return res
976 984 }
977 985
... ...