From 7bb23e0679f8a19e7d7a7e73f1de845088a91132 Mon Sep 17 00:00:00 2001
From: wanli <wanli@DEV_V00005>
Date: Mon, 21 Nov 2022 14:46:25 +0800
Subject: [PATCH] =?UTF-8?q?[Frontend]=20baja=E8=BC=B8=E5=87=BA=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/js/n4js/alarmbaja.js   | 20 +++++++++++++-------
 Frontend/js/n4js/historybaja.js |  9 ++++++---
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Frontend/js/n4js/alarmbaja.js b/Frontend/js/n4js/alarmbaja.js
index 8244ff9..f277db9 100644
--- a/Frontend/js/n4js/alarmbaja.js
+++ b/Frontend/js/n4js/alarmbaja.js
@@ -30,13 +30,17 @@ function getAlarmByBaja(startDate_millisecond, endDate_millisecond, isRecover, i
                         _sourceTmp = (record.get('alarmData').get('sourceName')).toString().split('_');
                         _bfName = _sourceTmp[1] + "-" + _sourceTmp[4];
                         _sourceName = _sourceTmp[7] + "-" + _sourceTmp[8];
-                        _ss += ', "' + _index + '": {"buildingFloorName_zh":"' + _bfName + '", "uuid":"' + record.get('uuid') + '", "timestamp":"' + record.get('timestamp') + '", "alarmClass":"' + record.get('alarmClass') + '", "sourceName_zh":"' + _sourceName + '", "msgText":"' + record.get('alarmData').get('msgText') + '", "ackState":"' + record.get('ackState') + '", "normalTime":"' + record.get('normalTime') + '"}';
+
+                        if (_index == 0)
+                            _ss += '{"buildingFloorName_zh":"' + _bfName + '", "uuid":"' + record.get('uuid') + '", "timestamp":"' + record.get('timestamp') + '", "alarmClass":"' + record.get('alarmClass') + '", "sourceName_zh":"' + _sourceName + '", "msgText":"' + record.get('alarmData').get('msgText') + '", "ackState":"' + record.get('ackState') + '", "normalTime":"' + record.get('normalTime') + '"}';
+                        else
+                            _ss += ',{"buildingFloorName_zh":"' + _bfName + '", "uuid":"' + record.get('uuid') + '", "timestamp":"' + record.get('timestamp') + '", "alarmClass":"' + record.get('alarmClass') + '", "sourceName_zh":"' + _sourceName + '", "msgText":"' + record.get('alarmData').get('msgText') + '", "ackState":"' + record.get('ackState') + '", "normalTime":"' + record.get('normalTime') + '"}';
                         _index++;
                     },
                     after: function () {
-                        _result += '{' + '"count": ' + _index;
+                        _result += '{' + '"count": ' + _index + ', "data":[';
                         _result += _ss;
-                        _result += '}';
+                        _result += ']}';
                         if (typeof callback === 'function') {
                             callback(_result);
                         }
@@ -84,7 +88,6 @@ function getOneDeviceAlarmTop10ByBaja(devicePath, callback) {
                     },
                     after: function () {
                         _result += '{' + '"count": ' + _index + ', "data":[';
-
                         _result += _ss + ']';
                         _result += '}';
                         if (typeof callback === 'function') {
@@ -111,13 +114,16 @@ function getOneSystemAlarmStateByBaja(systemPath, callback) {
             .then(function (table) {
                 return table.cursor({
                     each: function (record) {
-                        _ss += ', "' + _index + '": {"uuid":"' + record.get('uuid') + '", "sourceName":"' + record.get('alarmData').get('sourceName') + '", "sourceState":"' + record.get('sourceState') + '"}';
+                        if (_index == 0)
+                            _ss += '{"uuid":"' + record.get('uuid') + '", "sourceName":"' + record.get('alarmData').get('sourceName') + '", "sourceState":"' + record.get('sourceState') + '"}';
+                        else
+                            _ss += ',{"uuid":"' + record.get('uuid') + '", "sourceName":"' + record.get('alarmData').get('sourceName') + '", "sourceState":"' + record.get('sourceState') + '"}';
                         _index++;
                     },
                     after: function () {
-                        _result += '{' + '"count": ' + _index;
+                        _result += '{' + '"count": ' + _index + ', "data":[';
                         _result += _ss;
-                        _result += '}';
+                        _result += ']}';
                         if (typeof callback === 'function') {
                             callback(_result);
                         }
diff --git a/Frontend/js/n4js/historybaja.js b/Frontend/js/n4js/historybaja.js
index 0464754..3c5bb22 100644
--- a/Frontend/js/n4js/historybaja.js
+++ b/Frontend/js/n4js/historybaja.js
@@ -18,13 +18,16 @@ function getHistoryDataByBaja(devicePath, startDate_millisecond, endDate_millise
             .then(function (table) {
                 return table.cursor({
                     each: function (record) {
-                        _ss += ', "' + _index + '": {"deviceName":"' + deviceName + '", "value":' + record.get('value') + ', "timestamp":"' + record.get('timestamp') + '"}';
+                        if (_index == 0)
+                            _ss += '{"deviceName":"' + deviceName + '", "value":' + record.get('value') + ', "timestamp":"' + record.get('timestamp') + '"}';
+                        else
+                            _ss += ',{"deviceName":"' + deviceName + '", "value":' + record.get('value') + ', "timestamp":"' + record.get('timestamp') + '"}';
                         _index++;
                     },
                     after: function () {
-                        _result += '{' + '"count": ' + _index;
+                        _result += '{' + '"count": ' + _index + ', "data":[';
                         _result += _ss;
-                        _result += '}';
+                        _result += ']}';
                         if (typeof callback === 'function') {
                             callback(_result);
                         }