diff --git a/Frontend/js/n4js/alarmbaja.js b/Frontend/js/n4js/alarmbaja.js
index d67a3f1..b78f869 100644
--- a/Frontend/js/n4js/alarmbaja.js
+++ b/Frontend/js/n4js/alarmbaja.js
@@ -226,3 +226,40 @@ function getOneSystemAlarmStateByBaja(systemPath, callback) {
             });
     });
 }
+
+/**
+ * 在單一系統下，取得各個系統的狀態 異常與否
+ * @param {any} systemPath
+ * @param {any} callback
+ */
+function getOneSystemStateByBaja(systemPath, callback) {
+    var _result = "";
+    var _ss = "";
+    var _index = 0;
+
+    require(['baja!'], function (baja) {
+        baja.Ord.make("local:|foxs:|alarm:|bql:select top 1 alarmData, alarmData.sourceName, sourceState where alarmData.sourceName like '%" + systemPath + "%' order by timestamp desc").get()
+            .then(function (table) {
+                return table.cursor({
+                    each: function (record) {
+                        //if (_index == 0)
+                        //    _ss += '{"sourceState":"' + record.get('sourceState') + '"}';
+                        //else
+                        //    _ss += '{"sourceState":"' + record.get('sourceState') + '"}';
+                        _ss += '{"sourceState":"' + record.get('sourceState') + '"}';
+                        _index++;
+                    },
+                    after: function () {
+                        _result += '{' + '"count": ' + _index + ', "data":[';
+                        _result += _ss;
+                        _result += ']}';
+                        if (typeof callback === 'function') {
+                            callback(_result);
+                        }
+                    },
+                    limit: -1,
+                    offset: 0
+                });
+            });
+    });
+}
diff --git a/Frontend/js/n4js/electricmeterbaja.js b/Frontend/js/n4js/electricmeterbaja.js
index 1e87e1c..92529a6 100644
--- a/Frontend/js/n4js/electricmeterbaja.js
+++ b/Frontend/js/n4js/electricmeterbaja.js
@@ -34,4 +34,157 @@ function getElectricMeterTotalByBaja(devicePath, timeType, callback) {
                 });
             });
     });
+}
+
+/**
+ * 取得電表即時資料 by baja
+ * @param {any} devicePath 
+ * @param {any} callback
+ */
+function getElectricMeterNoweDataByBaja(devicePath, callback) {
+    var _result = "";
+    var _ss = "";
+    var _index = 0;
+
+    require(['baja!'], function (baja) {//TPE/B1/EE/E4/R2F/NA/WHT/N1
+        console.log('local:|foxs:|station:|slot:/' + devicePath + '|bql:select name, out, out.value from control:ControlPoint');
+        baja.Ord.make('local:|foxs:|station:|slot:/' + devicePath + '|bql:select name, out, out.value from control:ControlPoint').get()
+            .then(function (table) {
+                return table.cursor({
+                    each: function (record) {
+                        if (_index == 0)
+                            _ss += '{"name":"' + record.get('name') + '", "value":' + record.get('out').get('value') + '"}';
+                        else
+                            _ss += ',{"name":"' + record.get('name') + '", "value":' + record.get('out').get('value') + '"}';
+                        _index++;
+                    },
+                    after: function () {
+                        _result += '{' + '"count": ' + _index + ', "data":[';
+                        _result += _ss;
+                        _result += ']}';
+                        if (typeof callback === 'function') {
+                            callback(_result);
+                        }
+                    },
+                    limit: -1,
+                    offset: 0
+                });
+            });
+    });
+}
+
+/**
+ * 取得電表每小時資料 by baja
+ * @param {any} devicePath 
+ * @param {any} startDate_millisecond
+ * @param {any} endDate_millisecond 
+ * @param {any} callback
+ */
+function getElectricMeterHourDataByBaja(devicePath, startDate_millisecond, endDate_millisecond, callback) {
+    var _result = "";
+    var _ss = "";
+    var _index = 0;
+
+    require(['baja!'], function (baja) {//TPE/B1/EE/E4/R2F/NA/WHT/N1
+        console.log('transform:slot:/' + devicePath + '/History/TR_Daily|bql: select * where timestamp.millis > ' + startDate_millisecond + ' and timestamp.millis < ' + endDate_millisecond);
+        baja.Ord.make('transform:slot:/' + devicePath + '/History/TR_Daily|bql: select * where timestamp.millis > ' + startDate_millisecond + ' and timestamp.millis < ' + endDate_millisecond).get()
+            .then(function (table) {
+                return table.cursor({
+                    each: function (record) {
+                        if (_index == 0)
+                            _ss += '{"timestamp":' + record.get('timestamp') + ', "value":"' + record.get('kwh1') + '"}';
+                        else
+                            _ss += ',{"timestamp":' + record.get('timestamp') + ', "value":"' + record.get('kwh1') + '"}';
+                        _index++;
+                    },
+                    after: function () {
+                        _result += '{' + '"count": ' + _index + ', "data":[';
+                        _result += _ss;
+                        _result += ']}';
+                        if (typeof callback === 'function') {
+                            callback(_result);
+                        }
+                    },
+                    limit: -1,
+                    offset: 0
+                });
+            });
+    });
+}
+
+/**
+ * 取得電表 單日kwh by baja
+ * @param {any} devicePath 
+ * @param {any} date_millisecond
+ * @param {any} callback
+ */
+function getElectricMeterOneDayKwhByBaja(devicePath, date_millisecond, callback) {
+    var _result = "";
+    var _ss = "";
+    var _index = 0;
+
+    require(['baja!'], function (baja) {//TPE/B1/EE/E4/R2F/NA/WHT/N1
+        console.log('transform:slot:/' + devicePath + '/History/TR_Month|bql: select * where timestamp.millis = ' + date_millisecond);
+        baja.Ord.make('transform:slot:/' + devicePath + '/History/TR_Month|bql: select * where timestamp.millis = ' + date_millisecond).get()
+            .then(function (table) {
+                return table.cursor({
+                    each: function (record) {
+                        if (_index == 0)
+                            _ss += '{"timestamp":"' + record.get('timestamp') + '", "value":' + record.get('kwh1') + '"}';
+                        else
+                            _ss += ',{"timestamp":"' + record.get('timestamp') + '", "value":' + record.get('kwh1') + '"}';
+                        _index++;
+                    },
+                    after: function () {
+                        _result += '{' + '"count": ' + _index + ', "data":[';
+                        _result += _ss;
+                        _result += ']}';
+                        if (typeof callback === 'function') {
+                            callback(_result);
+                        }
+                    },
+                    limit: -1,
+                    offset: 0
+                });
+            });
+    });
+}
+
+/**
+ * 取得電表每周資料 by baja
+ * @param {any} devicePath 
+ * @param {any} startDate_millisecond
+ * @param {any} endDate_millisecond 
+ * @param {any} callback
+ */
+function getElectricMeterWeekDataByBaja(devicePath, startDate_millisecond, endDate_millisecond, callback) {
+    var _result = "";
+    var _ss = "";
+    var _index = 0;
+
+    require(['baja!'], function (baja) {//TPE/B1/EE/E4/R2F/NA/WHT/N1
+        console.log('transform:slot:/' + devicePath + '/History/TR_Daily|bql: select * where timestamp.millis >= ' + startDate_millisecond + ' and timestamp.millis <= ' + endDate_millisecond);
+        baja.Ord.make('transform:slot:/' + devicePath + '/History/TR_Month|bql: select * where timestamp.millis >= ' + startDate_millisecond + ' and timestamp.millis <= ' + endDate_millisecond).get()
+            .then(function (table) {
+                return table.cursor({
+                    each: function (record) {
+                        if (_index == 0)
+                            _ss += '{"timestamp":' + record.get('timestamp') + ', "value":"' + record.get('kwh1') + '"}';
+                        else
+                            _ss += ',{"timestamp":' + record.get('timestamp') + ', "value":"' + record.get('kwh1') + '"}';
+                        _index++;
+                    },
+                    after: function () {
+                        _result += '{' + '"count": ' + _index + ', "data":[';
+                        _result += _ss;
+                        _result += ']}';
+                        if (typeof callback === 'function') {
+                            callback(_result);
+                        }
+                    },
+                    limit: -1,
+                    offset: 0
+                });
+            });
+    });
 }
\ No newline at end of file