update

.gitignore

@@ -1 +1,3 @@
 node_modules
+public/js/admin_bundle.js
+public/js/index_bundle.js

VERSION

@@ -1 +0,0 @@
-webio-v0.0.2

app.js

@@ -7,6 +7,9 @@ const logger = require('morgan');
 const path = require('path');
 const config = require('./config');
 const so = require('./includes/storeObject');
+const exec = require('child_process').exec;
+const fs = require('fs');
+const archiver = require('archiver');
 
 const app = express();
 
@@ -53,7 +56,83 @@ app.get(['/admin', '/admin/*'], (req, res) => {
     res.sendFile(path.resolve(__dirname, 'views', 'admin.html'));
 });
 
+app.get('/camevent', (req, res) => {
+    let ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
+    ip = ip.split(':').pop();
+    let cmd = `camcam ${ip} ${Math.floor(Date.now() / 1000)}`;
+    exec(cmd, (err, sout, serr) => {
+        res.send({ ip });
+    });
+})
+app.get(['/viewcamimg/:dir/:file', '/dlcamvideo/:dir/:file'], async(req, res) => {
+    let dir = req.params.dir;
+    let file = req.params.file;
+    if (!dir || !file) return res.sendStatus(404);
+    try {
+        let stat = await new Promise((resolve, reject) => {
+            fs.stat(path.resolve(config.cmdpath.ipcamsave, dir, file), (err, stats) => {
+                if (err) return reject(err);
+                return resolve(stats);
+            })
+        })
+        if (!stat.isFile()) return res.sendStatus(404);
+    } catch (e) {
+        return res.sendStatus(404);
+    }
+    res.sendfile(path.resolve(config.cmdpath.ipcamsave, dir, file))
+})
+app.get('/dlevent/:dir', async(req, res) => {
+    let dir = req.params.dir;
+    if (!dir) return res.sendStatus(404);
+    let list = [];
+    try {
+        let stat = await new Promise((resolve, reject) => {
+            fs.stat(path.resolve(config.cmdpath.ipcamsave, dir), (err, stats) => {
+                if (err) return reject(err);
+                return resolve(stats);
+            })
+        });
+        if (!stat.isDirectory()) return res.sendStatus(404);
+        list = await new Promise((resolve, reject) => {
+            fs.readdir(path.resolve(config.cmdpath.ipcamsave, dir), (err, fis) => {
+                if (err) return reject(err);
+                return resolve(fis);
+            })
+        })
+    } catch (e) {
+        return res.sendStatus(404);
+    }
+    res.writeHead(200, {
+        'Content-Type': 'application/zip',
+        'Content-disposition': 'attachment; filename=cam_event.zip'
+    });
+    let zip = archiver('zip', { store: true });
+    zip.pipe(res);
+    for (let i of list) {
+        zip.file(path.resolve(config.cmdpath.ipcamsave, dir, i), { name: i })
+    }
+    zip.finalize();
+})
+
 app.get('/servcmd', (req, res) => {
-    res.send({ status: `exit time ${Date.now()}` });
+    res.send({ status: `exit time ${(new Date()).toString()}` });
     setTimeout(() => { process.exit(1) }, 2000);
+});
+
+app.get('/fixmysql', (req, res) => {
+    exec('systemctl stop mysqld', (err, sout, serr) => {
+        let cmd = 'rm /home/www/mydb/aria*';
+        let json = {
+            rm: '',
+            restart: ''
+        };
+        exec(cmd, (err, stdout, stderr) => {
+            let cmd = 'systemctl start mysqld';
+            json.rm = stdout;
+            exec(cmd, (err, sout, serr) => {
+                json.restart = sout;
+                res.send(json);
+            })
+        })
+    })
 });

config.json

@@ -4,7 +4,8 @@
     },
     "uni_token": "webiounitoken",
     "perpage": 10,
-    "leone_limie": 40,
+    "leone_limit": 40,
+    "ipcam_limit": 4,
     "db": {
         "user": "root",
         "pass": "16055536",
@@ -20,7 +21,8 @@
         "db8": "jciocln",
         "db9": "jcbtwristband",
         "db10": "jcmblog",
-        "db11": "jciocserver"
+        "db11": "jciocserver",
+        "db12": "jcioccam"
     },
     "permission": {
         "dio": true,
@@ -45,6 +47,7 @@
         "iocmd": "/home/www/cmd/cmdio",
         "leonert": "/home/www/tmp/rtles",
         "htsrt": "/home/www/tmp/rthts",
-        "version": "/factory/webioa_version"
+        "version": "/factory/webioa_version",
+        "ipcamsave": "/home/www/cam"
     }
-}
+}

includes/language/zh.json

@@ -65,6 +65,14 @@
     "ERR0063": "機器序號已存在",
     "ERR0064": "MAC Addr 輸入錯誤",
     "ERR0065": "版本輸入錯誤",
+    "ERR0066": "SNMP Level輸入錯誤",
+    "ERR0067": "型號輸入錯誤",
+    "ERR0068": "事件數量輸入錯誤",
+    "ERR0069": "圖片數量輸入錯誤",
+    "ERR0070": "IPCam 裝置已達上限",
+    "ERR0071": "無此裝置資料",
+    "ERR0072": "目錄資訊取得失敗",
+    "ERR0073": "目錄輸入錯誤",
 
     "ERR7000": "命令執行失敗",
 

package.json

@@ -12,6 +12,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
+    "archiver": "^1.3.0",
     "body-parser": "^1.16.1",
     "cookie-parser": "^1.4.3",
     "cors": "^2.8.1",

route/api/index.js

@@ -8,19 +8,19 @@ router
     .get('/', (req, res) => {
         res.send({ name: 'WebIO API System' });
     })
-    .all('*', (req,res,n)=>{
+    .all('*', (req, res, n) => {
-        if('x-auth-token' in req.headers) {
+        if ('x-auth-token' in req.headers) {
             let token = req.headers['x-auth-token'];
-            if(so.chkKey(token)){
+            if (so.chkKey(token)) {
                 let obj = so.get(token);
-                if(obj != null) {
+                if (obj != null) {
                     so.set(token, obj);
                 }
             }
         }
         n();
     })
-    .get('/showallso', (req,res)=>{
+    .get('/showallso', (req, res) => {
         res.send(so.show());
     })
     .use('/system', require('./system.js'))
@@ -33,11 +33,12 @@ router
     .use('/link', require('./link.js'))
     .use('/modbus', require('./modbus.js'))
     .use('/ipcam', require('./ipcam.js'))
+    .use('/server', require('./server.js'))
     .use('/wristband', require('./wristband.js'));
 
 // api error handler
 router.use((err, req, res, n) => {
-	if ('db' in res && typeof res.db == 'object' && 'close' in res.db && typeof res.db.close == 'function') res.db.close();
+    if ('db' in res && typeof res.db == 'object' && 'close' in res.db && typeof res.db.close == 'function') res.db.close();
     if ('db' in res && typeof res.db == 'object' && 'release' in res.db && typeof res.db.release == 'function') res.db.release();
 
     let lngs = req.headers['accept-language'] || '';
@@ -52,7 +53,7 @@ router.use((err, req, res, n) => {
         status: 0
     };
 
-    if('sys_err' in res && process.env.NODE_ENV != 'production') json.sys_err = res.sys_err;
+    if ('sys_err' in res && process.env.NODE_ENV != 'production') json.sys_err = res.sys_err;
 
     res.send(json);
 })

route/api/ipcam.js

@@ -8,27 +8,28 @@ const tool = require('../../includes/apiTool');
 const exec = require('child_process').exec;
 const so = require('../../includes/storeObject');
 const crypt = require('../../libs/crypto');
+const path = require('path');
 
 router
     .get('/', (req, res, n) => {
         res.send({ name: 'WebIO IPCam API' });
     })
-    .post('*', async(req,res,n) => {
+    .post('*', async(req, res, n) => {
-        try{
+        try {
             res.db = await mysql.getConn();
-        }catch(e){
+        } catch (e) {
             console.log(`Get DB Connection ERROR ${e}`);
             return n('ERR8100');
         }
         n();
     })
-    .post('/getipcamlist', (req,res,n) => {
+    .post('/getipcamlist', (req, res, n) => {
-        if(!config.permission.ipcam) return n('ERR9000');
+        if (!config.permission.ipcam) return n('ERR9000');
 
-        let query = "select * from ??.??";
+        let query = "select * from ??.?? where `delete` = 0 order by `ctime`";
-        let param = [config.db.db1, 'ipcam'];
+        let param = [config.db.db1, 'jcioccamset'];
         res.db.query(query, param, (err, row) => {
-            if(err) return rt.err(res,err,n,'ERR8000');
+            if (err) return rt.err(res, err, n, 'ERR8000');
 
             res.api_res = {
                 record: tool.checkArray(row)
@@ -37,68 +38,285 @@ router
             n();
         });
     })
-    .post('/addipcam', (req,res,n) => {
+    .post('/addipcam', (req, res, n) => {
-        if(!config.permission.ipcam) return n('ERR9000');
+        if (!config.permission.ipcam) return n('ERR9000');
-        if(!tool.checkPermission(req)) return n('ERR9000');
+        if (!tool.checkPermission(req)) return n('ERR9000');
         let arr = req.body;
-        if(!arr.data) return n('ERR0000');
+        if (!arr.data) return n('ERR0000');
-        if(!arr.data.ip) return n('ERR0010');
+        if (!arr.data.ip) return n("ERR0010");
-        if(!arr.data.name) return n('ERR0026');
+        if (!arr.data.name) return n('ERR0026');
-        
+        if (!arr.data.model) return n('ERR0067');
-        if(!/^\d{1,3}\.\d{1,3}.\d{1,3}.\d{1,3}$/.test(arr.data.ip)) return n('ERR0025');
+        if (!arr.data.maxevents) return n('ERR0068');
+        if (!arr.data.maximg) return n('ERR0069');
+        if (!/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(arr.data.ip)) return n('ERR0025');
 
-        let query = "select count(*) as c from ??.?? where `ip` = ?";
+        let u = '';
-        let param = [config.db.db1, 'ipcam', arr.data.ip];
+        let obj = so.get(req.headers['x-auth-token'] || '');
-        res.db.query(query, param, (err, row) => {
+        if (obj != null && 'user' in obj && 'account' in obj.user) u = obj.user.account;
-            if(err || row.length == 0) return rt.err(res,err,n,'ERR8000');
-            if(row[0]['c'] > 0) return n('ERR0027');
 
-            let query = "insert into ??.?? (`name`, `ip`) values (?,?)";
+        let active = arr.data.active == 1 ? 1 : 0;
-            let param = [config.db.db1, 'ipcam', arr.data.name, arr.data.ip];
+
-            res.db.query(query, param, (err, row) => {
+        !async function runSync() {
-                if(err) return rt.err(res,err,n,'ERR8001');
+            // data flag 0 is insert, 1 is update
-                res.api_res = {
+            let flag = 0;
-                    record: []
+            let idx = 1;
-                };
+            // query db data 
-                n();
+            try {
-            });
+                let query = "select `uid` from ??.?? order by `uid` desc limit 1";
-        });
+                let param = [config.db.db1, 'jcioccamset'];
-    })
+                let id = await tool.promiseQuery(res, query, param);
-    .post('/delipcam', (req,res,n) => {
+
-        if(!config.permission.ipcam) return n('ERR9000');
+                if (id.data.length > 0 && id.data[0].uid) idx = id.data[0].uid + 1;
-        if(!tool.checkPermission(req)) return n('ERR9000');
+                if (idx > config.ipcam_limit) {
-        let arr = req.body;
+                    query = "select `uid` from ??.?? where `delete` = 1 limit 1";
-        if(!arr.data) return n('ERR0000');
+                    flag = 1;
-        if(!arr.data.id) return n('ERR0028');
+                    let id = await tool.promiseQuery(res, query, param);
+                    if (id.data.length > 0 && id.data[0].uid) idx = id.data[0].uid;
+                    else return n('ERR0070');
+                }
+
+                query = "select count(*) as c from ??.?? where `ip` = ?";
+                param = [config.db.db1, 'jcioccamset', arr.data.ip];
+                let count = await tool.promiseQuery(res, query, param);
+                if (count.data.length == 0) return n('ERR8000');
+                if (count.data[0].c >= 1) return n('ERR0027');
+            } catch (e) {
+                return rt.err(res, e, n, 'ERR8000');
+            }
+            if (flag == 1) {
+                try {
+                    let query = "update ??.?? set \
+                        `ip` = ?, \
+                        `name` = ?, \
+                        `model` = ?, \
+                        `maxevents` = ?, \
+                        `maximg` = ?, \
+                        `active` = ?, \
+                        `delete` = 0, \
+                        `cuser` = ?, \
+                        `ctime` = unix_timestamp(), \
+                        `muser` = ?, \
+                        `mtime` = unix_timestamp() \
+                        where \
+                        `uid` = ?";
+                    let param = [config.db.db1, 'jcioccamset', arr.data.ip, arr.data.name, arr.data.model, arr.data.maxevents, arr.data.maximg, active, u, u, idx];
+                    await tool.promiseQuery(res, query, param);
+                } catch (e) {
+                    return rt.err(res, e, n, 'ERR8002');
+                }
+            } else {
+                try {
+                    let query = "insert into ??.?? (`uid`, `ip`, `name`, `model`, `maxevents`, `maximg`, `active`, `cuser`, `muser`, `ctime`, `mtime` ) \
+                        values (?, ?, ?, ?, ?, ?, ?, ?, ?, unix_timestamp(), unix_timestamp())";
+                    let param = [config.db.db1, 'jcioccamset', idx, arr.data.ip, arr.data.name, arr.data.model, arr.data.maxevents, arr.data.maximg, active, u, u];
+                    await tool.promiseQuery(res, query, param);
+                } catch (e) {
+                    return rt.err(res, e, n, 'ERR8001');
+                }
+            }
 
-        let query = "delete from ??.?? where `uid` = ?";
-        let param = [config.db.db1, 'ipcam', arr.data.id];
-        res.db.query(query, param, (err, row) => {
-            if(err) return rt.err(res,err,n,'ERR8003');
             res.api_res = {
                 record: []
-            };
+            }
-            n();
+            return n();
-        })
+        }()
-    })
+
-    .post('/editipcam', (req,res,n) => {
+    })
-        if(!config.permission.ipcam) return n('ERR9000');
+    .post('/editipcam', (req, res, n) => {
-        if(!tool.checkPermission(req)) return n('ERR9000');
+        if (!config.permission.ipcam) return n('ERR9000');
-        let arr = req.body;
+        if (!tool.checkPermission(req)) return n('ERR9000');
-        if(!arr.data) return n('ERR0000');
+        let arr = req.body;
-        if(!arr.data.id) return n('ERR0028');
+        if (!arr.data) return n('ERR0000');
-        if(!arr.data.name) return n('ERR0026');
+        if (!arr.data.id) return n('ERR0028');
+        if (!arr.data.ip) return n("ERR0010");
+        if (!arr.data.name) return n('ERR0026');
+        if (!arr.data.model) return n('ERR0067');
+        if (!arr.data.maxevents) return n('ERR0068');
+        if (!arr.data.maximg) return n('ERR0069');
+        if (!/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/.test(arr.data.ip)) return n('ERR0025');
+
+        let u = '';
+        let obj = so.get(req.headers['x-auth-token'] || '');
+        if (obj != null && 'user' in obj && 'account' in obj.user) u = obj.user.account;
+
+        let active = arr.data.active == 1 ? 1 : 0;
+
+        let query = "select count(*) as c from ??.?? where `ip` = ? and `uid` != ?";
+        let param = [config.db.db1, 'jcioccamset', arr.data.ip, arr.data.id];
+
+        res.db.query(query, param, (err, row) => {
+            if (err || row.length == 0) return rt.err(res, err, n, 'ERR8000');
+
+            if (row[0].c >= 1) return n('ERR0027');
+
+            let query = "update ??.?? set \
+                `ip` = ?, \
+                `name` = ?, \
+                `model` = ?, \
+                `maxevents` = ?, \
+                `maximg` = ?, \
+                `active` = ?, \
+                `muser` = ?, \
+                `mtime` = unix_timestamp() \
+                where \
+                `uid` = ?";
+            let param = [config.db.db1, 'jcioccamset', arr.data.ip, arr.data.name, arr.data.model, arr.data.maxevents, arr.data.maximg, active, u, arr.data.id];
+            res.db.query(query, param, (err, row) => {
+                if (err) return rt.err(res, err, n, 'ERR8002');
+
+                res.api_res = {
+                    record: []
+                }
+                n();
+            })
+        });
+    })
+    .post('/delipcam', (req, res, n) => {
+        if (!config.permission.ipcam) return n('ERR9000');
+        if (!tool.checkPermission(req)) return n('ERR9000');
+        let arr = req.body;
+        if (!arr.data) return n('ERR0000');
+        if (!arr.data.id) return n('ERR0028');
+
+        let u = '';
+        let obj = so.get(req.headers['x-auth-token'] || '');
+        if (obj != null && 'user' in obj && 'account' in obj.user) u = obj.user.account;
+
+        res.db.query(`use ${config.db.db1}`);
+        let query = "update ??.?? set \
+            `delete` = 1, \
+            `muser` = ?, \
+            `mtime` = unix_timestamp() \
+            where `uid` = ?";
+        let param = [config.db.db1, 'jcioccamset', u, arr.data.id];
+
+        res.db.query(query, param, (err, row) => {
+            if (err) return rt.err(res, err, n, 'ERR8003');
 
-        let query = "update ??.?? set `name` = ? where `uid` = ?";
-        let param = [config.db.db1, 'ipcam', arr.data.name, arr.data.id];
-        res.db.query(query, param, (err,row) => {
-            if(err) return rt.err(res,err,n,'ERR8002');
             res.api_res = {
                 record: []
             }
             n();
         })
     })
+    .post('/swipcamactive', (req, res, n) => {
+        if (!config.permission.ipcam) return n('ERR9000');
+        if (!tool.checkPermission(req)) return n('ERR9000');
+        let arr = req.body;
+        if (!arr.data) return n('ERR0000');
+        if (!arr.data.id) return n('ERR0028');
+
+        let query = "update ??.?? set \
+            `active` = case when `active` = 1 then 0 else 1 end \
+            where \
+            `uid` = ?";
+        let param = [config.db.db1, 'jcioccamset', arr.data.id];
+
+        res.db.query(query, param, (err, row) => {
+            if (err) return rt.err(res, err, n, 'ERR8002');
+
+            res.api_res = {
+                record: []
+            }
+            n();
+        })
+    })
+    .post('/getevents', async(req, res, n) => {
+        if (!config.permission.ipcam) return n('ERR9000');
+        if (!tool.checkPermission(req)) return n('ERR9000');
+        let arr = req.body;
+        if (!arr.data) return n('ERR0000');
+        if (!arr.data.id) return n('ERR0028');
+
+        try {
+            let query = "select * from ??.?? where `uid` = ? and `delete` = 0";
+            let param = [config.db.db1, 'jcioccamset', arr.data.id];
+            let cam = await tool.promiseQuery(res, query, param);
+            if (cam.length == 0) return n('ERR0071');
+        } catch (e) {
+            return rt.err(res, e, n, 'ERR8000');
+        }
+        let rp = config.cmdpath.ipcamsave;
+        let dirs = [];
+
+        try {
+            let dirls = await new Promise((resolve, reject) => {
+                fs.readdir(rp, (err, list) => {
+                    if (err) return reject(err);
+                    return resolve(list);
+                })
+            })
+            for (let i of dirls) {
+                let tmp = i.split('-');
+                if (tmp.length != 2) continue;
+                if (tmp[0] == arr.data.id) dirs.push({
+                    name: i,
+                    files: {
+                        img: [],
+                        video: []
+                    }
+                });
+            }
+
+            for (let i in dirs) {
+                let p = path.resolve(rp, dirs[i].name);
+                let idx = i;
+                let files = await new Promise((resolve, reject) => {
+                    fs.readdir(p, (err, list) => {
+                        if (err) return reject(err);
+                        return resolve(list);
+                    })
+                })
+                for (let j of files) {
+                    if (/^img/.test(j)) {
+                        dirs[idx].files.img.push(j);
+                    } else if (/^vid/.test(j)) {
+                        dirs[idx].files.video.push(j);
+                    }
+                }
+            }
+
+        } catch (e) {
+            return rt.err(res, e, n, 'ERR0072');
+        }
+
+        res.api_res = {
+            record: tool.checkArray(dirs)
+        }
+        return n();
+    })
+    .post('/delevent', async(req, res, n) => {
+        if (!config.permission.ipcam) return n('ERR9000');
+        if (!tool.checkPermission(req)) return n('ERR9000');
+        let arr = req.body;
+        if (!arr.data) return n('ERR0000');
+        if (!arr.data.dir) return n('ERR0073');
+
+        let rp = config.cmdpath.ipcamsave;
+        let dp = path.resolve(rp, arr.data.dir);
+        try {
+            let stat = await new Promise((resolve, reject) => {
+                fs.stat(dp, (err, stats) => {
+                    if (err) return reject(err);
+                    return resolve(stats);
+                });
+            });
+            if (dp.split(' ')[0] == '/') return n('ERR0073');
+            await new Promise((resolve, reject) => {
+                exec(`rm -rf ${dp}`, (err, sout, serr) => {
+                    if (err) return reject(err);
+                    return resolve(null);
+                })
+            })
+        } catch (e) {
+            return rt.err(res, e, n, 'ERR0072');
+        }
+
+        res.api_res = {
+            record: []
+        }
+        return n();
+    })
     .all('*', rt.send);
 
 module.exports = router;

route/api/modbus.js

@@ -543,6 +543,7 @@ router
         if (!('func' in arr.data) || arr.data.func.length == 0) return n('ERR0055');
         if (!('addr' in arr.data) || arr.data.addr.length == 0) return n('ERR0048');
         if (!('value' in arr.data) || arr.data.value.length == 0) return n('ERR0049');
+        if (arr.data.value > 65535) return n('ERR0049');
 
         let cmd = `mbtcpm ${arr.data.ip} ${arr.data.node} ${arr.data.func} ${arr.data.addr} ${arr.data.value}`;
         res.api_res = {
@@ -590,6 +591,98 @@ router
             n();
         })
     })
+    .post('/getmodbustype', (req, res, n) => {
+        if (!config.permission.modbus) return n('ERR9000');
+        let arr = req.body;
+        if (!arr.data) return n('ERR0000');
+        if (!arr.data.id) return n('ERR0028');
+
+        let query = "select io.`type` \
+            from ??.?? io \
+            left join ??.?? dev \
+            on dev.`uid` = io.`devuid` \
+            where \
+            dev.`uid` = ? \
+            group by io.`type` \
+            order by io.`type` ";
+        let param = [config.db.db5, 'iolist', config.db.db5, 'device', arr.data.id];
+
+        res.db.query(query, param, (err, row) => {
+            if (err) return rt.err(res, err, n, 'ERR8000');
+
+            res.api_res = {
+                record: tool.checkArray(row)
+            }
+
+            n();
+        })
+    })
+    .post('/getmodbusport', (req, res, n) => {
+        if (!config.permission.modbus) return n('ERR9000')
+        let arr = req.body;
+        if (!arr.data) return n('ERR0000');
+        if (!arr.data.id) return n('ERR0028');
+        if (!arr.data.type) return n('ERR0009');
+
+        let type = arr.data.type;
+        if (type == 5) type = 1;
+        if (type == 6) type = 3;
+
+        if (type == 3 || type == 4) {
+            let query = "select a.`name`, a.`portnum` \
+                from ??.?? a \
+                left join ??.?? io \
+                on io.`uid` = a.`iouid` \
+                left join ??.?? dev \
+                on dev.`uid` = io.`devuid` \
+                where \
+                io.`type` = ? \
+                and dev.`uid` = ? ";
+            let param = [config.db.db5, 'aioset', config.db.db5, 'iolist', config.db.db5, 'device', type, arr.data.id];
+
+            res.db.query(query, param, (err, row) => {
+                if (err) return rt.err(res, err, n, 'ERR8000');
+
+                res.api_res = {
+                    record: tool.checkArray(row)
+                }
+
+                n();
+            });
+            return;
+        }
+
+        if (type == 1 || type == 2) {
+            let query = "select * \
+                from ??.?? io \
+                left join ??.?? dev \
+                on dev.`uid` = io.`devuid` \
+                where \
+                dev.`uid` = ? \
+                and io.`type` = ?";
+            let param = [config.db.db5, 'iolist', config.db.db5, 'device', arr.data.id, type];
+
+            res.db.query(query, param, (err, row) => {
+                if (err) return rt.err(res, err, n, 'ERR8000');
+                let arr = [];
+                let num = 0;
+                for (let i in row) {
+                    num += parseInt(row[i].num);
+                }
+                for (let i = 0; i < num; i++) {
+                    arr.push({ portnum: (i + 1), name: '' })
+                }
+
+                res.api_res = {
+                    record: arr
+                }
+                n();
+            })
+            return;
+        }
+
+        return n('ERR0009');
+    })
     .all('*', rt.send);
 
 module.exports = router;

route/api/server.js

@@ -22,11 +22,11 @@ router
         }
         n();
     })
-    .post('/getserverlist', (req, res, n) => {
+    .post('/getdevicelist', (req, res, n) => {
         if (!config.permission.server) return n('ERR9000');
 
         let query = "select * from ??.??";
-        let param = [config.db.db11, 'jciocservert'];
+        let param = [config.db.db11, 'dev'];
 
         res.db.query(query, param, (err, row) => {
             if (err) return rt.err(res, err, n, 'ERR8000');
@@ -36,24 +36,326 @@ router
             n();
         })
     })
-    .post('/addserver', (req, res, n) => {
+    .post('/getdevice', async(req, res, n) => {
+        if (!config.permission.server) return n('ERR9000');
+        let arr = req.body;
+        if (!arr.data) return n('ERR0000');
+        if (!arr.data.id) return n('ERR0028');
+
+        let query = "select * from ??.?? where `devuid` = ?";
+        let param = [config.db.db11, 'dev', arr.data.id];
+        try {
+            let dev = await tool.promiseQuery(res, query, param);
+            if (dev.data.length == 0) return n('ERR8000');
+
+            let ipmi_param = [config.db.db11, 'ipmi', arr.data.id];
+            let ipmi = await tool.promiseQuery(res, query, ipmi_param);
+
+            let snmp_param = [config.db.db11, 'snmp', arr.data.id];
+            let snmp = await tool.promiseQuery(res, query, snmp_param);
+
+            res.api_res = {
+                record: tool.checkArray(dev.data),
+                rt: {
+                    ipmi: tool.checkArray(ipmi.data),
+                    snmp: tool.checkArray(snmp.data)
+                }
+            }
+
+        } catch (e) {
+            return rt.err(res, e, n, 'ERR8000');
+        }
+
+        n();
+    })
+    .post('/adddevice', async(req, res, n) => {
         if (!config.permission.server) return n('ERR9000');
         if (!tool.checkPermission(req)) return n('ERR9000');
         let arr = req.body;
         if (!arr.data) return n('ERR0000');
         if (!arr.data.name) return n('ERR0026');
-        if (arr.data.iip) {
+
-            if (!arr.data.iaccount) return n('ERR0016');
+        let u = '';
-            if (!arr.data.ipassword) return n('ERR0017');
+        let obj = so.get(req.headers['x-auth-token'] || '');
-            if (!arr.data.imac) return n('ERR0064');
+        if (obj != null && 'user' in obj && 'account' in obj.user) u = obj.user.account;
-            if (!arr.data.itype) return n('ERR0009');
+
+        try {
+            let query = "insert into ??.?? (`name`, `ctime`, `cuser`, `mtime`, `muser`) values \
+                (?, unix_timestamp(), ?, unix_timestamp(), ?)";
+            let param = [config.db.db11, 'dev', arr.data.name, u, u];
+
+            await tool.promiseQuery(res, query, param);
+        } catch (e) {
+            return rt.err(res, e, n, 'ERR8001');
         }
-        if (arr.data.sip) {
+
-            if (!arr.data.smac) return n('ERR0064');
+        res.api_res = {
-            if (!arr.data.stype) return n('ERR0009');
+            record: []
-            if (!arr.data.sname) return n('ERR0026');
+        };
-            if (!arr.data.sver) return n('ERR0065');
+        n();
+    })
+    .post('/editdevice', async(req, res, n) => {
+        if (!config.permission.server) return n('ERR9000');
+        if (!tool.checkPermission(req)) return n('ERR9000');
+        let arr = req.body;
+        if (!arr.data) return n('ERR0000');
+        if (!arr.data.id) return n('ERR0028');
+        if (!arr.data.name) return n('ERR0026');
+
+        let u = '';
+        let obj = so.get(req.headers['x-auth-token'] || '');
+        if (obj != null && 'user' in obj && 'account' in obj.user) u = obj.user.account;
+
+        try {
+            let query = "update ??.?? set \
+                `name` = ?, \
+                `muser` = ?, \
+                `mtime` = unix_timestamp() \
+                where \
+                `devuid` = ?";
+            let param = [config.db.db11, 'dev', arr.data.name, u, arr.data.id];
+            await tool.promiseQuery(res, query, param);
+        } catch (e) {
+            return rt.err(res, e, n, 'ERR8002');
         }
+
+        res.api_res = {
+            record: []
+        };
+        n();
+    })
+    .post('/deldevice', async(req, res, n) => {
+        if (!config.permission.server) return n('ERR9000');
+        if (!tool.checkPermission(req)) return n('ERR9000');
+        let arr = req.body;
+        if (!arr.data) return n('ERR0000');
+        if (!arr.data.id) return n('ERR0028');
+
+        try {
+            let query = "delete from ??.?? where `devuid` = ?";
+            let param = [config.db.db11, 'dev', arr.data.id];
+            await tool.promiseQuery(res, query, param);
+        } catch (err) {
+            return rt.err(res, err, n, 'ERR8003');
+        }
+
+        res.api_res = {
+            record: []
+        }
+        return n();
+    })
+    .post('/addipmi', async(req, res, n) => {
+        if (!config.permission.server) return n('ERR9000');
+        if (!tool.checkPermission(req)) return n('ERR9000');
+        let arr = req.body;
+        if (!arr.data) return n('ERR0000');
+        if (!arr.data.devuid) return n('ERR0028');
+        if (!arr.data.account) return n('ERR0016');
+        if (!arr.data.password) return n('ERR0017');
+        if (!arr.data.ip) return n('ERR0010');
+
+        try {
+            let query = "select count(*) as c from ??.?? where `ip` = ?";
+            let param = [config.db.db11, 'ipmi', arr.data.ip];
+            let c = await tool.promiseQuery(res, query, param);
+            if (c.data.length > 0 && c.data.c > 0) return n('ERR0027');
+        } catch (err) {
+            return rt.err(res, err, n, 'ERR8000');
+        }
+
+        let u = '';
+        let obj = so.get(req.headers['x-auth-token'] || '');
+        if (obj != null && 'user' in obj && 'account' in obj.user) u = obj.user.account;
+
+        try {
+            let query = "insert into ??.?? (`devuid`, `ip`, `account`, `password`, `cuser`, `ctime`, `muser`, `mtime`) values \
+                (?, ?, ?, ?, ?, unix_timestamp(), ?, unix_timestamp())";
+            let param = [config.db.db11, 'ipmi', arr.data.devuid, arr.data.ip, arr.data.account, arr.data.password, u, u];
+            await tool.promiseQuery(res, query, param);
+        } catch (err) {
+            return rt.err(res, err, n, 'ERR8001');
+        }
+
+        res.api_res = {
+            record: []
+        };
+        return n();
+    })
+    .post('/editipmi', async(req, res, n) => {
+        if (!config.permission.server) return n('ERR9000');
+        if (!tool.checkPermission(req)) return n('ERR9000');
+        let arr = req.body;
+        if (!arr.data) return n('ERR0000');
+        if (!arr.data.id) return n('ERR0028');
+        if (!arr.data.account) return n('ERR0016');
+        if (!arr.data.password) return n('ERR0017');
+        if (!arr.data.ip) return n('ERR0010');
+
+        try {
+            let query = "select count(*) as c from ??.?? where `ipmuid` != ? and `ip` = ?";
+            let param = [config.db.db11, 'ipmi', arr.data.id, arr.data.ip];
+            let c = await tool.promiseQuery(res, query, param);
+            if (c.data.length > 0 && c.data.c > 0) return n('ERR0027');
+        } catch (err) {
+            return rt.err(res, err, n, 'ERR8000');
+        }
+
+        let u = '';
+        let obj = so.get(req.headers['x-auth-token'] || '');
+        if (obj != null && 'user' in obj && 'account' in obj.user) u = obj.user.account;
+
+        try {
+            let query = "update ??.?? set \
+                `account` = ?, \
+                `password` = ?, \
+                `ip` = ?, \
+                `muser` = ?, \
+                `mtime` = unix_timestamp() \
+                where \
+                `ipmuid` = ?";
+            let param = [config.db.db11, 'ipmi', arr.data.account, arr.data.password, arr.data.ip, u, arr.data.id];
+            await tool.promiseQuery(res, query, param);
+        } catch (err) {
+            return rt.err(res, err, n, 'ERR8002');
+        }
+
+        res.api_res = {
+            record: []
+        };
+        return n();
+    })
+    .post('/delipmi', async(req, res, n) => {
+        if (!config.permission.server) return n('ERR9000');
+        if (!tool.checkPermission(req)) return n('ERR9000');
+        let arr = req.body;
+        if (!arr.data) return n('ERR0000');
+        if (!arr.data.id) return n('ERR0028');
+
+        try {
+            let query = "delete from ??.?? where `ipmuid` = ?";
+            let param = [config.db.db11, 'ipmi', arr.data.id];
+
+            await tool.promiseQuery(res, query, param);
+        } catch (err) {
+            return rt.err(res, err, n, 'ERR8003');
+        }
+
+        res.api_res = {
+            record: []
+        };
+        return n();
+    })
+    .post('/getipmiinfo', async(req, res, n) => {
+        if (!config.permission.server) return n('ERR9000');
+        let arr = req.body;
+        if (!arr.data) return n('ERR0000');
+        if (!arr.data.id) return n('ERR0028');
+
+        res.api_res = {
+            record: [],
+            rt: {
+                log: [],
+                sensor: [],
+                bmcgroup: [],
+                bmcdata: []
+            }
+        };
+
+        try {
+            let query = "select * from ??.?? where `ipmuid` = ?";
+            let param = [config.db.db11, 'ipmi', arr.data.id];
+            let ipmi = await tool.promiseQuery(res, query, param);
+            if (ipmi.data.length == 0) return n('ERR8000');
+            delete ipmi.data[0].password;
+            res.api_res.record = tool.checkArray(ipmi.data);
+
+            query = "select * from ??.?? order by `guid`";
+            param = [config.db.db11, 'bmg'];
+            let bmg = await tool.promiseQuery(res, query, param);
+            res.api_res.rt.bmcgroup = tool.checkArray(bmg.data);
+
+            query = "select * from ??.?? where `ipmuid` = ?";
+            param = [config.db.db11, 'bmrt', arr.data.id];
+            let bmrt = await tool.promiseQuery(res, query, param);
+            res.api_res.rt.bmcdata = tool.checkArray(bmrt.data);
+
+            query = "select * from ??.?? where `ipmuid` = ?";
+            param = [config.db.db11, 'ipmilogrt', arr.data.id];
+            let log = await tool.promiseQuery(res, query, param);
+            res.api_res.rt.log = tool.checkArray(log.data);
+
+            query = "select * from ??.?? where `ipmuid` = ?";
+            param = [config.db.db11, 'ipmisenrt', arr.data.id];
+            let sensor = await tool.promiseQuery(res, query, param);
+            res.api_res.rt.sensor = tool.checkArray(sensor.data);
+
+        } catch (err) {
+            return rt.err(res, err, n, 'ERR8000');
+        }
+
+        return n();
+    })
+    .post('/getbmctl', async(req, res, n) => {
+        if (!config.permission.server) return n('ERR9000');
+
+        try {
+            let query = "select `uid`,`name` from ??.??";
+            let param = [config.db.db11, 'bmctl'];
+
+            let ctls = await tool.promiseQuery(res, query, param);
+
+            res.api_res = {
+                record: tool.checkArray(ctls.data)
+            }
+        } catch (err) {
+            return rt.err(res, err, n, 'ERR8000');
+        }
+
+        return n();
+    })
+    .post('/runbmctl', async(req, res, n) => {
+        if (!config.permission.server) return n('ERR9000');
+        if (!tool.checkPermission(req)) return n('ERR9000');
+        let arr = req.body;
+        if (!arr.data) return n('ERR0000');
+        if (!arr.data.ctlid || !arr.data.ipmuid) return n('ERR0028');
+
+        res.api_res = {
+            record: []
+        };
+
+        try {
+            let query = "select * from ??.?? where `uid` = ?";
+            let param = [config.db.db11, 'bmctl', arr.data.ctlid];
+            let ctl = await tool.promiseQuery(res, query, param);
+            if (ctl.data.length == 0) return n('ERR8000');
+
+            query = "select * from ??.?? where `ipmuid` = ?";
+            param = [config.db.db11, 'ipmi', arr.data.ipmuid];
+            let ipmi = await tool.promiseQuery(res, query, param);
+            if (ipmi.data.length == 0) return n('ERR8000');
+
+            let cmd = ctl.data[0].cmd;
+            cmd = cmd.trim();
+            if (!cmd) return n('ERR7000');
+
+            cmd = cmd.replace(/\@ipmuid/i, ipmi.data[0].ipmuid);
+            let result = await new Promise((resolve, reject) => {
+                exec(cmd, (err, stderr, stdout) => {
+                    if (err) return reject(err);
+                    return resolve(stdout || stderr);
+                });
+            })
+
+            result = result.split(/\n/).filter(e => e).join('');
+
+            if (result == 0) return n('ERR7000');
+
+        } catch (err) {
+            return rt.err(res, err, n, 'ERR8000');
+        }
+
+        return n();
     })
     .all('*', rt.send);
 

route/api/wristband.js

@@ -131,8 +131,9 @@ router
         let query = "select w.`name`, w.`mac` as wristband, \
             coalesce(l.`name`, l2.`name`) as locname, \
             coalesce(case when tmp2.`wlocrtloc` = 'NG' then null else tmp2.`wlocrtloc` end, ll.`devid`) as locid, \
-            ll.*\
+            case when tmp2.`wlocrtloc` = 'NG' then 1 else 0 end as loss, \
-            from ??.?? w\
+            ll.* \
+            from ??.?? w \
             left join ??.?? tmp2 \
             on tmp2.`wlocrtmac` = w.`mac` \
             left join ??.?? ll \
@@ -354,6 +355,50 @@ router
             .catch(err => rt.err(res, err, n, 'ERR8000'));
 
     })
+    .post('/getwristbandhealthinfo', (req, res, n) => {
+        if (!config.permission.wristband) return n('ERR9000');
+        let arr = req.body;
+        if (!arr.data) return n('ERR0000');
+        if (!arr.data.mac) return n('ERR0060');
+        if (!arr.data.stime || !arr.data.etime) return n('ERR0015');
+
+        let pros = [];
+        let query = "select log.* \
+            from ??.?? log \
+            where \
+            log.`wphylogmac` = ? \
+            and log.`wphylogtst` >= ? \
+            and log.`wphylogtst` <= ? \
+            order by log.`wphylogtst` desc";
+        let param = [config.db.db9, 'wphylog', arr.data.mac, arr.data.stime, arr.data.etime];
+        pros.push(tool.promiseQuery(res, query, param, 'record'));
+
+        let rtq = "select * from ??.?? where `mac` = ?";
+        let rtp = [config.db.db9, 'wristband', arr.data.mac];
+        pros.push(tool.promiseQuery(res, rtq, rtp, 'rt'));
+
+        res.api_res = {
+            record: [],
+            rt: {
+                wristband: []
+            }
+        }
+
+        Promise.all(pros)
+            .then(d => {
+                for (let i in d) {
+                    let tmp = d[i];
+                    if (tmp.key == 'rt') {
+                        res.api_res.rt.wristband = tool.checkArray(tmp.data);
+                    }
+                    if (tmp.key == 'record') {
+                        res.api_res.record = tool.checkArray(tmp.data);
+                    }
+                }
+                return n();
+            })
+            .catch(err => rt.err(res, err, n, 'ERR8000'));
+    })
     .post('/getlocationlist', (req, res, n) => {
         if (!config.permission.wristband) return n('ERR9000');
 

src/components/AdminPage/ActionLinkAdd/ActionSelect.js

@@ -1,127 +0,0 @@
-import React from 'react';
-import {Form, Button, Input, Segment} from 'semantic-ui-react';
-
-class ActionSelect extends React.Component{
-    state = {
-        showTemp: false,
-        temp: '0'
-    }
-
-    checkShowTemp = (cmd = '') => {
-        let c = cmd;
-        let cs = c.split(' ');
-        let showTemp = false;
-        if(cs[0] == 2) {
-            showTemp = true;
-        }
-
-        this.setState({
-            showTemp
-        });
-    }
-
-    updateTemp = (temp) => {
-        this.setState({
-            temp
-        })
-    }
-
-    render(){
-        let {i18n,list, unit, getList, addAction} = this.props;
-        let actlist = i18n&&i18n.getResource&&i18n.language ? i18n.getResource(i18n.language + '.translation.action_list') : [];
-        return (
-            <Form.Field>
-                <label>加入動作</label>
-                <Segment color="green" className="clearfix">
-                    <Form.Group inline>
-                        <Form.Field>
-                            <label>選擇裝置</label>
-                            <select ref="devType" onChange={e=>{
-                                    getList(unit, e.target.value);
-                                }}>
-                                <option value="">選擇裝置類型</option>
-                                <option value="do">DigitOutput</option>
-                                <option value="leone">LeOne</option>
-                                <option value="iogroup">IOGroup</option>
-                            </select>
-                        </Form.Field>
-                        <Form.Field>
-                            <select ref="devName">
-                                <option value="">選擇裝置</option>
-                                {
-                                    list.map((t,idx)=>(<option key={idx} value={t.id}>{t.name}</option>))
-                                }
-                            </select>
-                        </Form.Field>
-                    </Form.Group>
-                    <Form.Group inline>
-                        <Form.Field>
-                            <label>選擇動作</label>
-                            <select ref="act" onChange={e=>{
-                                    this.checkShowTemp(e.target.value);
-                                }}>
-                                <option value="">選擇動作</option>
-                                {
-                                    actlist.map((t,idx) => (
-                                        <option key={idx} value={t.cmd}>{t.name}</option>
-                                    ))
-                                }
-                            </select>
-                        </Form.Field>
-                        {
-                            this.state.showTemp ? 
-                            (
-                                <Form.Field>
-                                    <Input size="mini" placeholder="請輸入溫度" value={this.state.temp} onChange={(e,d) => {
-                                        this.updateTemp(d.value);
-                                    }} />
-                                </Form.Field>
-                            ) : null
-                        }
-                    </Form.Group>
-                    <Button floated="right" content="加入動作" size="tiny" basic color="orange" onClick={()=>{
-                            let type = this.refs.devType.value;
-                            let dev = this.refs.devName.value;
-                            let devName = this.refs.devName.options[this.refs.devName.selectedIndex].innerHTML;
-                            let act = this.refs.act.value;
-                            let actName = this.refs.act.options[this.refs.act.selectedIndex].innerHTML;
-                            let temp = this.state.temp;
-                            let prefix = '';
-
-                            switch(type){
-                                case 'do':
-                                    prefix = 'do';
-                                    break;
-                                case 'leone':
-                                    prefix = 'le';
-                                    break;
-                                case 'iogroup': 
-                                    prefix = 'iogroup';
-                                    break;
-                                default: 
-                                    return addAction(null);
-                            }
-
-                            if(!act) return addAction(null);
-                            if(act == 2) {
-                                act = `${act} ${temp}`;
-                                actName += ` ${temp}`;
-                            }
-
-                            let data = {
-                                id: `${prefix}${dev}`,
-                                act,
-                                actName,
-                                devName
-                            };
-
-                            return addAction(data);
-
-                        }} />
-                </Segment>
-            </Form.Field>
-        )
-    }
-}
-
-export default ActionSelect;

src/components/AdminPage/ActionLinkAdd/UnitItem.js

@@ -1,279 +0,0 @@
-import React from 'react';
-import {Grid, Form, Segment, Input} from 'semantic-ui-react';
-
-const ops = [
-    {
-        "code": "0",
-        "name": "等於"
-    }, {
-        "code": "1",
-        "name": "大於"
-    }, {
-        "code": "2",
-        "name": "小於"
-    }, {
-        "code": "3",
-        "name": "大於等於"
-    }, {
-        "code": "4",
-        "name": "小於等於"
-    }, {
-        "code": "5",
-        "name": "不等於"
-    }, {
-        "code": "8",
-        "name": "AND"
-    }, {
-        "code": "9",
-        "name": "OR"
-    }
-]
-
-const stype = {
-    di: {
-        prefix: 'di',
-        dev: '',
-        op: '',
-        value: '',
-        mode: 'di_status'
-    },
-    leone: {
-        prefix: 'le',
-        dev: '',
-        op: '',
-        value: '',
-        mode: ''
-    },
-    unit: {
-        dev: ''
-    },
-    time: {
-        op: '',
-        dev: 'dt0',
-        mode: 'mode0',
-        year: '-',
-        week: '-',
-        month: '-',
-        day: '-',
-        hour: '-',
-        min: '-'
-    }
-}
-
-class UnitItem extends React.Component {
-
-    state = {
-        st: '',
-        data:{}
-    }
-
-    handleDataChange = (tag, value) => {
-        let {data} = this.state;
-        let {updateData} = this.props;
-        if(tag in data) {
-            data[tag] = value;
-        }
-
-        this.setState({
-            data
-        }, () => {
-            let {data} = this.state
-            let d = {...this.props.data.data}
-            let {st} = this.props.data;
-            
-            if(st == 'di' || st == 'leone'){
-                d.id = `${data.prefix}${data.dev},${data.mode}`;
-                d.op = data.op;
-                d.value = data.value;
-            }
-            if(st == 'unit') {
-                d.dev = data.dev;
-            }
-            if(st == 'time') {
-                d.id = `${data.dev},${data.mode}`;
-                d.op = data.op;
-                d.value = `${data.min}|${data.hour}|${data.day}|${data.month}|${data.week}|${data.year}`;
-            }
-
-            updateData(this.props.unit, d);
-        });
-    }
-
-    componentWillReceiveProps(np) {
-        let data = {...this.state.data};
-        
-        if(np.data.st != this.state.st){
-            
-            if(np.data.st in stype) {
-                data = {...stype[np.data.st]};
-            }else {
-                data = {}
-            }
-            
-        }
-        
-        this.setState({
-            data,
-            st: np.data.st
-        })
-    }
-    
-    render() {
-        let {unit, data, getList} = this.props;
-        
-        return (
-            <Grid.Column>
-                <Segment>
-                    <Form.Field>
-                        <label>選擇元件</label>
-                        <select
-                            value={data.st}
-                            onChange={e => {
-                            getList(unit, e.target.value);
-                        }}>
-                            <option value="">請選擇元件</option>
-                            <option value="leone">LeOne</option>
-                            <option value="di">DigitInput</option>
-                            <option value="time">時間</option>
-                            <option value="unit">已建立群組</option>
-                        </select>
-                    </Form.Field>
-                    {  
-                        !data.st
-                        ? null
-                        : (<UnitPanel data={data} state={this.state.data} dataChange={this.handleDataChange}/>)
-                    }
-                </Segment>
-            </Grid.Column>
-        )
-    }
-}
-
-const UnitPanel = ({data, state, dataChange}) => {
-    if (data.st == 'di') {
-        return (
-            <div>
-                <select value={state.dev} onChange={(e) => {
-                        dataChange('dev', e.target.value);
-                    }}>
-                    <option value="">選擇裝置</option>
-                    {
-                        data.list.map((t, idx) => (
-                            <option key={idx} value={t.id}>{t.name}</option>
-                        ))
-                    }
-                </select>
-                <select value={state.op} onChange={e => {
-                        dataChange('op', e.target.value);
-                    }}>
-                    <option value="">選擇條件</option>
-                    {
-                        ops.map((t,idx) => {
-                            if(t.code == 8 || t.code == 9) return ;
-                            return (<option key={idx} value={t.code}>{t.name}</option>)
-                        })
-                    }
-                </select>
-                <select value={state.value} onChange={e => {
-                        dataChange('value', e.target.value);
-                    }}>
-                    <option value="">選擇狀態</option>
-                    <option value="0">0</option>
-                    <option value="1">1</option>
-                </select>
-            </div>
-        )
-    }
-    if(data.st == 'leone') {
-        return (
-            <div>
-                <select value={state.dev} onChange={e => {
-                        dataChange('dev', e.target.value);
-                    }}>
-                    <option value="">選擇裝置</option>
-                    {
-                        data.list.map((t, idx) => (
-                            <option key={idx} value={t.id}>{t.name}</option>
-                        ))
-                    }
-                </select>
-                <select value={state.mode} onChange={e => {
-                        dataChange('mode', e.target.value);
-                    }}>
-                    <option value="">選擇感測器</option>
-                    <option value="leone_ttrigger1">溫度</option>
-                    <option value="leone_htrigger1">濕度</option>
-                </select>
-                <select value={state.op} onChange={e => {
-                        dataChange('op', e.target.value);
-                    }}>
-                    <option value="">選擇條件</option>
-                    {
-                        ops.map((t,idx) => {
-                            if(t.code == 8 || t.code == 9) return ;
-                            return (<option key={idx} value={t.code}>{t.name}</option>)
-                        })
-                    }
-                </select>
-                <Input size="mini" placeholder="請輸入數值" value={state.value} onChange={(e,d) => {
-                        dataChange('value', d.value);
-                    }} />
-            </div>
-        )
-    }
-    if(data.st == 'unit') {
-        return (
-            <div>
-                <select value={state.dev} onChange={e => {
-                        dataChange('dev', e.target.value);
-                    }}>
-                    <option value="">選擇群組</option>
-                    {
-                        data.list.map((t,idx) => (
-                            <option key={idx} value={t.id}>{t.name}</option>
-                        ))
-                    }
-                </select>
-            </div>
-        )
-    }
-    if(data.st == 'time') {
-        return (
-            <div>
-                <select value={state.op} onChange={e => {
-                        dataChange('op', e.target.value);
-                    }}>
-                    <option value="">選擇條件</option>
-                    {
-                        ops.map((t,idx) => {
-                            if(t.code == 8 || t.code == 9) return ;
-                            return (<option key={idx} value={t.code}>{t.name}</option>)
-                        })
-                    }
-                </select>
-                <Input size="mini" placeholder="年(不指定請留空)" value={state.year == '-' ? '' : state.year} onChange={(e,d) => {
-                        dataChange('year', d.value.length == 0 ? '-' : d.value);
-                    }} />
-                <Input size="mini" placeholder="週(不指定請留空)" value={state.week == '-' ? '' : state.week} onChange={(e,d) => {
-                        dataChange('week', d.value.length == 0 ? '-' : d.value);
-                    }} />
-                <Input size="mini" placeholder="月(不指定請留空)" value={state.month == '-' ? '' : state.month} onChange={(e,d) => {
-                        dataChange('month', d.value.length == 0 ? '-' : d.value);
-                    }} />
-                <Input size="mini" placeholder="日(不指定請留空)" value={state.day == '-' ? '' : state.day} onChange={(e,d) => {
-                        dataChange('day', d.value.length == 0 ? '-' : d.value);
-                    }} />
-                <Input size="mini" placeholder="時(不指定請留空)" value={state.hour == '-' ? '' : state.hour} onChange={(e,d) => {
-                        dataChange('hour', d.value.length == 0 ? '-' : d.value);
-                    }} />
-                <Input size="mini" placeholder="分(不指定請留空)" value={state.min == '-' ? '' : state.min} onChange={(e,d) => {
-                        dataChange('min', d.value.length == 0 ? '-' : d.value);
-                    }} />
-            </div>
-        )
-    }
-
-    return null;
-}
-
-export default UnitItem;

src/components/AdminPage/ActionLinkAdd/ViewTreeModal.js

@@ -1,41 +0,0 @@
-import React from 'react';
-import {Modal, Form, Button} from 'semantic-ui-react';
-
-const ViewTree = ({i18n, open, data, closeView, removeNode}) => {
-    let seNode = null;
-    let nodeKey = Object.keys(data);
-    return (
-        <Modal open={open} onClose={()=>{closeView()}} >
-            <Modal.Header content="連動群組資料" />
-            <Modal.Content>
-                <Form as="div">
-                    <Form.Group inline>
-                        <Form.Field>
-                            <label>刪除節點</label>
-                            <select ref={node=>seNode=node}>
-                                {
-                                    nodeKey.map((t,idx)=>(
-                                        <option key={idx} value={t}>{data[t].name}</option>
-                                    ))
-                                }
-                            </select>
-                        </Form.Field>
-                        <Form.Field>
-                            <Button type="button" basic size="tiny" content="刪除節點" onClick={()=>{
-                                    if(!seNode) return ;
-                                    removeNode(seNode.value);
-                                }} />
-                        </Form.Field>
-                    </Form.Group>
-                </Form>
-                <pre>
-                    {
-                        JSON.stringify(data, null, 4)
-                    }
-                </pre>
-            </Modal.Content>
-        </Modal>
-    )
-}
-
-export default ViewTree;

src/components/AdminPage/ActionLinkAdd/index.js

@@ -1,353 +0,0 @@
-import React from 'react';
-import {
-    Container,
-    Segment,
-    Form,
-    Input,
-    Button,
-    Checkbox,
-    Grid,
-    Menu,
-    List
-} from 'semantic-ui-react';
-import {getRequest} from '../../../actions';
-import UnitItem from './UnitItem';
-import ActionSelect from './ActionSelect';
-import ActionItem from './ActionItem';
-import ViewTree from './ViewTreeModal';
-
-const defState = () => ({
-    gidx: 0,
-    groups: {},
-    active: false,
-    edit: {
-        name: '',
-        type: 'ln',
-        op: '',
-        id1: {
-            st: '',
-            list: [],
-            data: {}
-        },
-        id2: {
-            st: '',
-            list: [],
-            data: {}
-        }
-    },
-    actDevlist: [],
-    items: [],
-    showTree: false
-})
-const gtype = {
-    lc: {
-        type: 'lc',
-        id: '',
-        op: '',
-        value: ''
-    },
-    ln: {
-        type: 'ln',
-        dev: ''
-    }
-}
-
-class ActionLinkAdd extends React.Component {
-    state = {
-        ...defState()
-    }
-
-    getSelectList = (unit, type = '') => {
-        if (!unit) {
-            return;
-        }
-        if(unit != 'act'){
-            let edit = {
-                ...this.state.edit
-            };
-            if (!(unit in edit)) {
-                return;
-            }
-            edit[unit].st = type;
-            edit[unit].data = {
-                ...gtype.lc
-            }
-            if (type != 'di' && type != 'leone' && type != 'unit') {
-                return this.setState({edit});
-            }
-
-            if (type == 'di' || type == 'leone') {
-                this.props.toggleLoading(1);
-                let json = {
-                    type
-                };
-                fetch('/api/system/getselectlist', getRequest(json))
-                    .then(response => response.json())
-                    .then(json => {
-                        if (json.status != 1) 
-                            return this.props.showDialog(json.message);
-                        edit[unit].list = json.data.record || [];
-                        this.setState({edit}, () => {
-                            this.props.toggleLoading(0);
-                        });
-                    });
-            }
-            if(type == 'unit') {
-                let list = [];
-                for(let i in this.state.groups){
-                    list.push({id: i, name: this.state.groups[i].name});
-                }
-                edit[unit].list = list;
-                edit[unit].data = {
-                    ...gtype.ln
-                }
-                this.setState({edit})
-            }
-        }else{
-            let actDevlist = [];
-            if(!type) {
-                this.setState({
-                    actDevlist
-                });
-                return ;
-            }
-            this.props.toggleLoading(1);
-            fetch('/api/system/getselectlist', getRequest({type}))
-                .then(response => response.json())
-                .then(json => {
-                    if (json.status != 1) 
-                        return this.props.showDialog(json.message);
-                    actDevlist = json.data.record || []
-                    this.setState({
-                        actDevlist
-                    }, ()=>{
-                        this.props.toggleLoading(0);
-                    })
-                })
-        }
-    }
-
-    updateData = (unit, data) => {
-        let {edit} = this.state;
-        if(!(unit in edit)) return ;
-        edit[unit].data = data;
-
-        this.setState({
-            edit
-        })
-    }
-
-    updateEditData = (tag, value) => {
-        let {edit} = this.state;
-        if(tag in edit){
-            edit[tag] = value;
-        }
-
-        this.setState({
-            edit
-        })
-    }
-
-    updateActive = (active = false) => {
-        this.setState({
-            active: active ? 1 : 0
-        })
-    }
-
-    joinUnit = () => {
-        let {edit} = this.state;
-        let {i18n} = this.props;
-        if(!edit.name || edit.op.length == 0 || Object.keys(edit.id1.data).length == 0 || Object.keys(edit.id2.data).length == 0) return this.props.showDialog(i18n&&i18n.t ? i18n.t('tip.input_empty') : '');
-        if(edit.id1.data.type == 'lc' && (edit.id1.data.id.length == 0 || edit.id1.data.op.length == 0 || edit.id1.data.value.length == 0)) return this.props.showDialog(i18n&&i18n.t ? i18n.t('tip.input_empty') : '');
-        if(edit.id2.data.type == 'lc' && (edit.id2.data.id.length == 0 || edit.id2.data.op.length == 0 || edit.id2.data.value.length == 0)) return this.props.showDialog(i18n&&i18n.t ? i18n.t('tip.input_empty') : '');
-        if(edit.id1.data.type == 'ln' && edit.id1.data.dev.length == 0) return this.props.showDialog(i18n&&i18n.t ? i18n.t('tip.input_empty') : '');
-        if(edit.id2.data.type == 'ln' && edit.id2.data.dev.length == 0) return this.props.showDialog(i18n&&i18n.t ? i18n.t('tip.input_empty') : '');
-
-        let unitKey = [];
-        if(edit.id1.data.type == 'lc'){
-            edit.id1 = {
-                ...edit.id1.data
-            }
-        }else if(edit.id1.data.type == 'ln'){
-            unitKey.push(edit.id1.data.dev)
-            edit.id1 = {
-                ...this.state.groups[edit.id1.data.dev]
-            }
-        }
-        if(edit.id2.data.type == 'lc'){
-            edit.id2 = {
-                ...edit.id2.data
-            }
-        }else if(edit.id2.data.type == 'ln'){
-            unitKey.push(edit.id2.data.dev)
-            edit.id2 = {
-                ...this.state.groups[edit.id2.data.dev]
-            }
-        }
-        let groups = {...this.state.groups};
-        for(let i in unitKey){
-            if(unitKey[i] in groups) delete groups[unitKey[i]];
-        }
-
-        groups[`unit${this.state.gidx}`] = {
-            ...edit
-        }
-
-        this.setState({
-            gidx: this.state.gidx+1,
-            groups: {...groups}
-        }, ()=>{
-            this.resetEdit()
-        })
-    }
-
-    resetEdit = () => {
-        this.setState({
-            edit:{
-                ...defState().edit
-            }
-        })
-    }
-
-    addAction = (item) => {
-        if(!item) return this.props.showDialog('動作請選擇完整');
-        let cmds = item.act.split(' ');
-        if(cmds.length != 2) return this.props.showDialog('動作選擇錯誤');
-        if(cmds[0] == 2 && (cmds[1] < 16 || cmds[1] > 30)) return this.props.showDialog('溫度範圍錯誤(16-30)');
-
-        this.setState({
-            items: [...this.state.items, item]
-        })
-    }
-
-    removeAction = (idx) => {
-        let items = [...this.state.items];
-        items.splice(idx, 1);
-        this.setState({
-            items
-        })
-    }
-
-    toggleView = (sw = false) => {
-        this.setState({
-            showTree: sw ? true : false
-        })
-    }
-
-    removeNode = (node) => {
-        if(!node) return ;
-        let groups = {...this.state.groups};
-        if(node in groups){
-            delete groups[node];
-            this.setState({
-                groups: {...groups}
-            })
-        }
-    }
-
-    saveLink = () => {
-        if(Object.keys(this.state.groups).length == 0) return this.props.showDialog('請先建立群組');
-        if(Object.keys(this.state.groups).length > 1) return this.props.showDialog('根節點數量大於一');
-        if(this.state.items.length == 0) return this.props.showDialog('請選擇動作');
-        let json = {
-            active: this.state.active,
-            link: this.state.groups[Object.keys(this.state.groups)[0]],
-            action: ''
-        }
-
-        let acts = this.state.items.map(t => {
-            return `${t.id},${t.act.replace(' ', ',')},0`
-        })
-
-        json.action = acts.join('|')
-
-        this.props.toggleLoading(1);
-        fetch('/api/link/addlink', getRequest(json))
-            .then(response => response.json())
-            .then(json => {
-                this.props.toggleLoading(0);
-                if(json.status != 1) return this.props.showDialog(json.message);
-                this.resetAll();
-            })
-    }
-
-    resetAll = () => {
-        this.setState({
-            ...defState()
-        })
-    }
-
-    render() {
-        let {i18n} = this.props;
-        return (
-            <Container>
-                <Menu >
-                    <Menu.Menu position="right">
-                        <Menu.Item content="ShowTree" onClick={()=>{
-                                this.toggleView(1)
-                            }}/>
-                        <Menu.Item content="Save" onClick={()=>{
-                                this.saveLink();
-                            }}/>
-                    </Menu.Menu>
-                </Menu>
-                <Form as={Segment}>
-                    <Form.Field>
-                        <Checkbox label="啟用連動" checked={this.state.active == 1} onChange={(e,d) =>{
-                                this.updateActive(d.checked ? 1 : 0);
-                            }}/>
-                    </Form.Field>
-                    <Form.Field>
-                        <label>建立條件群組</label>
-                        <Segment color="red">
-                            <Form.Field>
-                                <Input label="節點名稱" value={this.state.edit.name} onChange={(e,d) => {
-                                    this.updateEditData('name', d.value);
-                                }}/>
-                            </Form.Field>
-                            <Form.Field>
-                                <label>觸發條件</label>
-                                <select value={this.state.edit.op} onChange={(e) => {
-                                        this.updateEditData('op', e.target.value);
-                                    }}>
-                                    <option value="">請選擇觸發條件</option>
-                                    <option value="8">AND</option>
-                                    <option value="9">OR</option>
-                                </select>
-                            </Form.Field>
-                            <Grid columns={2} padded>
-                                <UnitItem unit="id1" data={this.state.edit.id1} getList={this.getSelectList} updateData={this.updateData}/>
-                                <UnitItem unit="id2" data={this.state.edit.id2} getList={this.getSelectList} updateData={this.updateData}/>
-                            </Grid>
-                            <div
-                                style={{
-                                textAlign: 'right'
-                            }}>
-                                <Button type="button" basic size="tiny" color="blue" content="加入" onClick={()=>{
-                                        this.joinUnit();
-                                    }}/>
-                                <Button type="button" basic size="tiny" color="green" content="清除" onClick={()=>{this.resetEdit()}}/>
-                            </div>
-                        </Segment>
-                    </Form.Field>
-                    <ActionSelect i18n={i18n} unit="act" list={this.state.actDevlist} getList={this.getSelectList} addAction={this.addAction} />
-                    <Form.Field>
-                        <label>裝置動作列表</label>
-                        <Segment color="blue">
-                            <List>
-                                {
-                                    this.state.items.map((t,idx) => (
-                                        <ActionItem key={idx} i18n={i18n} data={t} idx={idx} removeAction={this.removeAction}/>
-                                    ))
-                                }
-                            </List>
-                        </Segment>
-                    </Form.Field>
-                </Form>
-                <ViewTree i18n={i18n} data={this.state.groups} open={this.state.showTree} closeView={this.toggleView} removeNode={this.removeNode} />
-            </Container>
-        )
-    }
-}
-
-export default ActionLinkAdd;

src/components/AdminPage/ActionLinkAddN/ActionList/ListItem.js

@@ -1,17 +1,17 @@
 import React from 'react';
 import {List, Label, Button} from 'semantic-ui-react';
 
-const ActionItem = ({i18n, data, idx, removeAction}) => {
+const ListItem = ({ i18n, data, idx, removeAction }) => {
 
     return (
         <List.Item>
             <Label basic content={`裝置名稱`} /><span>{data.devName}</span>
             <Label basic content={`動作`} /><span>{data.actName}</span>
             <Button floated="right" color="red" basic size="tiny" content="Delete" type="button" onClick={()=>{
-                    removeAction(idx);
+                    removeAction(idx)
                 }}/>
         </List.Item>
     )
 }
 
-export default ActionItem;
+export default ListItem;

src/components/AdminPage/ActionLinkAddN/ActionList/index.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import {Segment, List} from 'semantic-ui-react';
+import ListItem from './ListItem';
+
+const ActionList = ({ i18n, list, removeAction }) => {
+
+    return (
+        <Segment color="blue">
+            <List divided>
+                {
+                    list.map((t,idx) => (
+                        <ListItem key={idx} i18n={i18n} data={t} idx={idx} removeAction={removeAction} />
+                    ))
+                }
+            </List>
+        </Segment>
+    )
+}
+
+export default ActionList;

src/components/AdminPage/ActionLinkAddN/ActionSelect/CalModal.js

@@ -0,0 +1,74 @@
+import React from 'react';
+import {Modal, Input, Button, Form, Grid} from 'semantic-ui-react';
+
+const CalModal = ({ i18n, onClose, onSubmit }) => {
+
+    return (
+        <Modal open={true}>
+            <Modal.Header content="數值換算" />
+            <Modal.Content>
+                <Form onSubmit={(e,d) => {
+                        e.preventDefault();
+                        onSubmit(d.formData);
+                    }} serializer={e=>{
+                        let json = {
+                            r1: '',
+                            r2: '',
+                            s1: '',
+                            s2: '',
+                            val: ''
+                        }
+
+                        let r1 = e.querySelector('input[name="r1"]');
+                        if(r1 && 'value' in r1) json.r1 = r1.value;
+                        let r2 = e.querySelector('input[name="r2"]');
+                        if(r2 && 'value' in r2) json.r2 = r2.value;
+                        let s1 = e.querySelector('input[name="s1"]');
+                        if(s1 && 'value' in s1) json.s1 = s1.value;
+                        let s2 = e.querySelector('input[name="s2"]');
+                        if(s2 && 'value' in s2) json.s2 = s2.value;
+                        let val = e.querySelector('input[name="val"]');
+                        if(val && 'value' in val) json.val = val.value;
+
+                        return json;
+                    }}>
+                    <Form.Field>
+                        <label>Range</label>
+                        <Grid columns={2}>
+                            <Grid.Column>
+                                <Input label="RangeMin" name="r1" />
+                            </Grid.Column>
+                            <Grid.Column>
+                                <Input label="RangeMax" name="r2" />
+                            </Grid.Column>
+                        </Grid>
+                    </Form.Field>
+                    <Form.Field>
+                        <label>Scale</label>
+                        <Grid columns={2}>
+                            <Grid.Column>
+                                <Input label="ScaleMin" name="s1" />
+                            </Grid.Column>
+                            <Grid.Column>
+                                <Input label="ScaleMax" name="s2" />
+                            </Grid.Column>
+                        </Grid>
+                    </Form.Field>
+                    <Form.Field>
+                        <Input label="輸入數值" name="val" />
+                    </Form.Field>
+                    <Grid columns={2}>
+                        <Grid.Column>
+                            <Button fluid content="送出" basic />
+                        </Grid.Column>
+                        <Grid.Column>
+                            <Button fluid type="button" content="取消" basic onClick={()=>{onClose()}} />
+                        </Grid.Column>
+                    </Grid>
+                </Form>
+            </Modal.Content>
+        </Modal>
+    )
+}
+
+export default CalModal;

src/components/AdminPage/ActionLinkAddN/ActionSelect/StdAction.js

@@ -0,0 +1,84 @@
+import React from 'react';
+import {Form, Input} from 'semantic-ui-react';
+
+class StdAction extends React.Component{
+    state = {
+        name: '',
+        act: '',
+        temp: ''
+    }
+
+    changeState = (tag, value) => {
+        let data = {...this.state};
+        if(tag == 'act'){
+            data.name = value.name || '';
+            data.act = value.act || '';
+        }
+        if(tag == 'temp'){
+            data.temp = value;
+        }
+
+        this.setState({
+            ...data
+        }, () => {
+            this.updateAct();
+        })
+    }
+
+    showTemp = () => {
+        if(this.state.act == '2'){
+            return (
+                <Form.Field>
+                    <Input label="請輸入溫度" 
+                        placeholder="溫度請介於16-30間" 
+                        value={this.state.temp} 
+                        onChange={(e,d) => {this.changeState('temp', d.value)}} />
+                </Form.Field>
+            )
+        }
+
+        return null;
+    }
+
+    updateAct = ()=>{
+        let {updateAct} = this.props;
+        let act = this.state.act;
+        let temp = this.state.temp;
+
+        if(act == '2') act = `${act},${temp}`;
+        updateAct(act, this.state.name)
+    }
+
+    render(){
+        let {i18n} = this.props;
+        let actlist = i18n&&i18n.getResource&&i18n.language ? i18n.getResource(i18n.language + '.translation.action_list') : [];
+        return (
+            <div>
+                <Form.Field>
+                    <label>選擇動作</label>
+                    <select value={this.state.act} onChange={e=>{
+                            let el = e.target;
+                            let json = {
+                                name: '',
+                                act: ''
+                            }
+                            json.act = el.value;
+                            json.name = el.options[el.selectedIndex].innerHTML;
+
+                            this.changeState('act', json);
+                        }}>
+                        <option value="">選擇動作</option>
+                        {
+                            actlist.map((t,idx) => (
+                                <option key={idx} value={t.cmd.replace(' ', ',')}>{t.name}</option>
+                            ))
+                        }
+                    </select>
+                </Form.Field>
+                {this.showTemp()}
+            </div>
+        )
+    }
+}
+
+export default StdAction;

src/components/AdminPage/ActionLinkAddN/ActionSelect/UnitDigitalOutput.js

@@ -0,0 +1,98 @@
+import React from 'react';
+import {Form, Input} from 'semantic-ui-react';
+import { getRequest } from '../../../../actions';
+import StdAction from './StdAction';
+
+class UnitLeone extends React.Component {
+    state = {
+        list: [],
+        data: {
+            dev: '',
+            devName: '',
+            act: '',
+            actName: ''
+        }
+    }
+
+    componentDidMount() {
+        let { showDialog } = this.props;
+        fetch('/api/system/getselectlist', getRequest({ type: 'do' }))
+            .then(response => response.json())
+            .then(json => {
+                if (json.status != 1) return showDialog(json.message);
+                this.setState({
+                    list: json.data.record || []
+                })
+            })
+    }
+
+    changeState = (tag, value) =>{
+        let data = {...this.state.data};
+
+        if(tag == 'act') {
+            data.actName = value.name;
+            data.act = value.act;
+        }
+        if(tag == 'dev'){
+            data.dev = value.dev == '' ? '' : `do${value.dev}`;
+            data.devName = value.name;
+        }
+
+        this.setState({
+            data:{
+                ...data
+            }
+        }, ()=>{
+            this.updateData()
+        })
+    }
+
+    updateData = () => {
+        let data = {...this.state.data};
+        data.type = 'do';
+
+        this.props.updateData(data);
+    }
+
+    updateAct = (act, name) => {
+        this.changeState('act', {act, name});
+    }
+
+    render() {
+        let {i18n} = this.props;
+        let dev = '';
+        let m = this.state.data.dev.match(/(\d+)/);
+        if(m!=null && m.length > 1){
+            dev = m[1];
+        }
+        return (
+            <div>
+                <Form.Field>
+                    <label>選擇裝置</label>
+                    <select value={dev} onChange={e=>{
+                            let el = e.target;
+                            let json = {
+                                dev: '',
+                                name: ''
+                            };
+
+                            json.dev = el.value;
+                            json.name = el.options[el.selectedIndex].innerHTML;
+
+                            this.changeState('dev', json);
+                        }}>
+                        <option value="">選擇裝置</option>
+                        {
+                            this.state.list.map((t,idx) => (
+                                <option key={idx} value={t.id}>{t.name}</option>
+                            ))
+                        }
+                    </select>
+                </Form.Field>
+                <StdAction i18n={i18n} updateAct={this.updateAct} />
+            </div>
+        )
+    }
+}
+
+export default UnitLeone;

src/components/AdminPage/ActionLinkAddN/ActionSelect/UnitIOGroup.js

@@ -0,0 +1,98 @@
+import React from 'react';
+import {Form, Input} from 'semantic-ui-react';
+import { getRequest } from '../../../../actions';
+import StdAction from './StdAction';
+
+class UnitLeone extends React.Component {
+    state = {
+        list: [],
+        data: {
+            dev: '',
+            devName: '',
+            act: '',
+            actName: ''
+        }
+    }
+
+    componentDidMount() {
+        let { showDialog } = this.props;
+        fetch('/api/system/getselectlist', getRequest({ type: 'iogroup' }))
+            .then(response => response.json())
+            .then(json => {
+                if (json.status != 1) return showDialog(json.message);
+                this.setState({
+                    list: json.data.record || []
+                })
+            })
+    }
+
+    changeState = (tag, value) =>{
+        let data = {...this.state.data};
+
+        if(tag == 'act') {
+            data.actName = value.name;
+            data.act = value.act;
+        }
+        if(tag == 'dev'){
+            data.dev = value.dev == '' ? '' : `iogroup${value.dev}`;
+            data.devName = value.name;
+        }
+
+        this.setState({
+            data:{
+                ...data
+            }
+        }, ()=>{
+            this.updateData()
+        })
+    }
+
+    updateData = () => {
+        let data = {...this.state.data};
+        data.type = 'iogroup';
+
+        this.props.updateData(data);
+    }
+
+    updateAct = (act, name) => {
+        this.changeState('act', {act, name});
+    }
+
+    render() {
+        let {i18n} = this.props;
+        let dev = '';
+        let m = this.state.data.dev.match(/(\d+)/);
+        if(m!=null && m.length > 1){
+            dev = m[1];
+        }
+        return (
+            <div>
+                <Form.Field>
+                    <label>選擇裝置</label>
+                    <select value={dev} onChange={e=>{
+                            let el = e.target;
+                            let json = {
+                                dev: '',
+                                name: ''
+                            };
+
+                            json.dev = el.value;
+                            json.name = el.options[el.selectedIndex].innerHTML;
+
+                            this.changeState('dev', json);
+                        }}>
+                        <option value="">選擇裝置</option>
+                        {
+                            this.state.list.map((t,idx) => (
+                                <option key={idx} value={t.id}>{t.name}</option>
+                            ))
+                        }
+                    </select>
+                </Form.Field>
+                <StdAction i18n={i18n} updateAct={this.updateAct} />
+            </div>
+        )
+    }
+}
+
+export default UnitLeone;

src/components/AdminPage/ActionLinkAddN/ActionSelect/UnitLeone.js

@@ -0,0 +1,98 @@
+import React from 'react';
+import {Form, Input} from 'semantic-ui-react';
+import { getRequest } from '../../../../actions';
+import StdAction from './StdAction';
+
+class UnitLeone extends React.Component {
+    state = {
+        list: [],
+        data: {
+            dev: '',
+            devName: '',
+            act: '',
+            actName: ''
+        }
+    }
+
+    componentDidMount() {
+        let { showDialog } = this.props;
+        fetch('/api/system/getselectlist', getRequest({ type: 'leone' }))
+            .then(response => response.json())
+            .then(json => {
+                if (json.status != 1) return showDialog(json.message);
+                this.setState({
+                    list: json.data.record || []
+                })
+            })
+    }
+
+    changeState = (tag, value) =>{
+        let data = {...this.state.data};
+
+        if(tag == 'act') {
+            data.actName = value.name;
+            data.act = value.act;
+        }
+        if(tag == 'dev'){
+            data.dev = value.dev == '' ? '' : `le${value.dev}`;
+            data.devName = value.name;
+        }
+
+        this.setState({
+            data:{
+                ...data
+            }
+        }, ()=>{
+            this.updateData()
+        })
+    }
+
+    updateData = () => {
+        let data = {...this.state.data};
+        data.type = 'leone';
+
+        this.props.updateData(data);
+    }
+
+    updateAct = (act, name) => {
+        this.changeState('act', {act, name});
+    }
+
+    render() {
+        let {i18n} = this.props;
+        let dev = '';
+        let m = this.state.data.dev.match(/(\d+)/);
+        if(m!=null && m.length > 1){
+            dev = m[1];
+        }
+        return (
+            <div>
+                <Form.Field>
+                    <label>選擇裝置</label>
+                    <select value={dev} onChange={e=>{
+                            let el = e.target;
+                            let json = {
+                                dev: '',
+                                name: ''
+                            };
+
+                            json.dev = el.value;
+                            json.name = el.options[el.selectedIndex].innerHTML;
+
+                            this.changeState('dev', json);
+                        }}>
+                        <option value="">選擇裝置</option>
+                        {
+                            this.state.list.map((t,idx) => (
+                                <option key={idx} value={t.id}>{t.name}</option>
+                            ))
+                        }
+                    </select>
+                </Form.Field>
+                <StdAction i18n={i18n} updateAct={this.updateAct} />
+            </div>
+        )
+    }
+}
+
+export default UnitLeone;

src/components/AdminPage/ActionLinkAddN/ActionSelect/UnitModbus.js

@@ -0,0 +1,185 @@
+import React from 'react';
+import {Form, Input} from 'semantic-ui-react';
+import { getRequest } from '../../../../actions';
+import CalModal  from './CalModal';
+
+class UnitLeone extends React.Component {
+    state = {
+        list: [],
+        data: {
+            dev: '',
+            devName: '',
+            func: '',
+            funcName: '',
+            addr: '',
+            value: ''
+        },
+        modal: false
+    }
+
+    componentDidMount() {
+        let { showDialog } = this.props;
+        fetch('/api/system/getselectlist', getRequest({ type: 'modbus' }))
+            .then(response => response.json())
+            .then(json => {
+                if (json.status != 1) return showDialog(json.message);
+                this.setState({
+                    list: json.data.record || []
+                })
+            })
+    }
+
+    renderModal = () => {
+        let {i18n} = this.props;
+        return (
+            this.state.modal ? 
+            (
+                <CalModal i18n={i18n} onClose={this.closeModal} onSubmit={this.submitModal} />
+            ): null
+        )
+    }
+
+    closeModal = () => {
+        this.setState({
+            modal: false
+        })
+    }
+
+    submitModal = (data) => {
+        if(!data) return ;
+        let {showDialog} = this.props;
+        let {r1, r2, s1, s2, val} = data;
+        if(!isFinite(r1) || !isFinite(r2) || !isFinite(s1) || !isFinite(s2) || !isFinite(val)) return showDialog('請勿輸入數字以外的內容');
+
+        let value = Math.round(((val - r1) * (s2 - s1)) / (r2 - r1));
+
+        this.setState({
+            data:{
+                ...this.state.data,
+                value
+            }
+        }, ()=>{this.closeModal()})
+    }
+
+    changeState = (tag, value) =>{
+        let data = {...this.state.data};
+
+        if(tag == 'func') {
+            data.funcName = value.name;
+            data.func = value.func;
+        }
+        if(tag == 'dev'){
+            data.dev = value.dev == '' ? '' : `mb${value.dev}`;
+            data.devName = value.name;
+        }
+        if(tag == 'addr'){
+            data.addr = value;
+        }
+        if(tag == 'value'){
+            data.value = value;
+        }
+
+        this.setState({
+            data:{
+                ...data
+            }
+        }, ()=>{
+            this.updateData()
+        })
+    }
+
+    updateData = () => {
+        let data = {...this.state.data};
+        data.type = 'modbus';
+
+        data.act = `${data.func},${data.addr},${data.value}`;
+        data.actName = `${data.funcName} Addr:${data.addr} Value:${data.value}`;
+
+        delete data.func;
+        delete data.funcName;
+        delete data.addr;
+        delete data.value;
+
+        this.props.updateData(data);
+    }
+
+    updateAct = (act, name) => {
+        this.changeState('act', {act, name});
+    }
+
+    render() {
+        let {i18n} = this.props;
+        let dev = '';
+        let m = this.state.data.dev.match(/(\d+)/);
+        
+        if(m!=null && m.length > 1){
+            dev = m[1];
+        }
+        return (
+            <div>
+                <Form.Field>
+                    <label>選擇裝置</label>
+                    <select value={dev} onChange={e=>{
+                            let el = e.target;
+                            let json = {
+                                dev: '',
+                                name: ''
+                            };
+
+                            json.dev = el.value;
+                            json.name = el.options[el.selectedIndex].innerHTML;
+
+                            this.changeState('dev', json);
+                        }}>
+                        <option value="">選擇裝置</option>
+                        {
+                            this.state.list.map((t,idx) => (
+                                <option key={idx} value={t.id}>{t.name}</option>
+                            ))
+                        }
+                    </select>
+                </Form.Field>
+                <Form.Field>
+                    <label>選擇輸出類型</label>
+                    <select value={this.state.data.func} onChange={e=>{
+                            let el = e.target;
+                            let json = {
+                                func: '',
+                                name: ''
+                            };
+
+                            json.func = el.value;
+                            json.name = el.options[el.selectedIndex].innerHTML;
+
+                            this.changeState('func', json);
+                        }}>
+                        <option value="">輸出類型</option>
+                        <option value="5">DigitalOutput</option>
+                        <option value="6">AnalogOutput</option>
+                    </select>
+                </Form.Field>
+                <Form.Field>
+                    <Input label="輸入位址" value={this.state.data.addr} onChange={(e,d) => {this.changeState('addr', d.value)}} />
+                </Form.Field>
+                <Form.Field>
+                    <Input label="輸入數值" 
+                        value={this.state.data.value} 
+                        onChange={(e,d) => {this.changeState('value', d.value)}}
+                        action={{
+                            content:"數值換算",
+                            basic: true,
+                            onClick: ()=>{
+                                this.setState({
+                                    modal: true
+                                })
+                            },
+                            type: 'button'
+                        }} />
+                </Form.Field>
+                {this.renderModal()}
+            </div>
+        )
+    }
+}
+
+export default UnitLeone;

src/components/AdminPage/ActionLinkAddN/ActionSelect/index.js

@@ -0,0 +1,135 @@
+import React from 'react';
+import {Segment, Button, Form, Input} from 'semantic-ui-react';
+import UnitLeone from './UnitLeone';
+import UnitDigitalOutput from './UnitDigitalOutput';
+import UnitIOGroup from './UnitIOGroup';
+import UnitModbus from './UnitModbus';
+
+const stateDefault = () => ({
+    unit: '',
+    act: {
+        type: '',
+        dev: '',
+        devName: '',
+        act: '',
+        actName: ''
+    }
+})
+
+class ActionSelect extends React.Component {
+
+    state = {
+        ...stateDefault()
+    }
+
+    changeUnit = (unit) => {
+        this.setState({
+            unit
+        })
+    }
+
+    getUnitComponent = () => {
+        let {unit} = this.state;
+        let {i18n, showDialog, toggleLoading} = this.props;
+
+        switch(unit){
+            case 'leone':
+                return (
+                    <UnitLeone i18n={i18n}
+                        data={this.state.act}
+                        showDialog={showDialog}
+                        toggleLoading={toggleLoading}
+                        updateData={this.updateData} />
+                )
+            case 'do':
+                return (
+                    <UnitDigitalOutput i18n={i18n}
+                        data={this.state.act}
+                        showDialog={showDialog}
+                        toggleLoading={toggleLoading}
+                        updateData={this.updateData} />
+                )
+            case 'iogroup':
+                return (
+                    <UnitIOGroup i18n={i18n}
+                        data={this.state.act}
+                        showDialog={showDialog}
+                        toggleLoading={toggleLoading}
+                        updateData={this.updateData} />
+                )
+            case 'modbus':
+                return (
+                    <UnitModbus i18n={i18n}
+                        data={this.state.act}
+                        showDialog={showDialog}
+                        toggleLoading={toggleLoading}
+                        updateData={this.updateData} />
+                )
+            default: 
+                return null;
+        }
+    }
+
+    updateData = (data) => {
+        let {act} = this.state;
+        for(let i in act){
+            act[i] = data[i] || ''
+        }
+        this.setState({
+            act
+        })
+    }
+
+    addAction = () => {
+        let {dev, devName, act, actName, type} = this.state.act;
+        let {showDialog} = this.props;
+        if(!dev || !act) return showDialog('請選擇動作資料');
+        if(type != 'modbus'){
+            let acts = act.split(',');
+            if(acts.length != 2 ) return showDialog('請選擇正確的動作');
+            if(acts[0] == '2'){
+                if(acts[1] < 16 || acts[1] > 30) return showDialog('冷氣溫度請介於16-30間');
+            }
+        }
+        if(type == 'modbus'){
+            let acts = act.split(',');
+            if(acts.length != 3) return showDialog('請把動作資料填寫完成');
+            if(acts[0] == '' || acts[1] == '' || acts[2] == '') return showDialog('請把動作資料填寫完成');
+        }
+
+        this.props.addNewAction({
+            dev,devName,act,actName,type
+        }, this.clearField);
+    }
+
+    clearField = () => {
+        this.setState({
+            ...stateDefault()
+        })
+    }
+
+    render() {
+
+        return (
+            <Segment color="green">
+                <Form.Field>
+                    <label>選擇裝置類型</label>
+                    <select value={this.state.unit} onChange={e=>{this.changeUnit(e.target.value)}}>
+                        <option value="">裝置類型</option>
+                        <option value="leone">LeOne</option>
+                        <option value="do">DigitalOutput</option>
+                        <option value="iogroup">IOGroup</option>
+                        <option value="modbus">Modbus</option>
+                    </select>
+                </Form.Field>
+                {this.getUnitComponent()}
+                <div style={{textAlign:'right', marginTop: '20px'}}>
+                    <Button content="加入" basic size="mini" color="blue" onClick={()=>{ this.addAction() }} />
+                    <Button content="清除" basic size="mini" color="red" onClick={()=>{this.clearField()}} />
+                </div>
+            </Segment>
+        )
+    }
+}
+
+export default ActionSelect;

src/components/AdminPage/ActionLinkAddN/Condition/Unit/UnitDigitalInput.js

@@ -0,0 +1,105 @@
+import React from 'react';
+import {Input} from 'semantic-ui-react';
+import {getRequest} from '../../../../../actions';
+
+class UnitDigitalInput extends React.Component {
+    state = {
+        list: [],
+        data: {
+            id: '',
+            op: '',
+            value: ''
+        }
+    }
+
+    componentDidMount(){
+        let {showDialog, toggleLoading} = this.props;
+
+        toggleLoading(1);
+        fetch('/api/system/getselectlist', getRequest({type: 'di'}))
+            .then(response=>response.json())
+            .then(json=>{
+                toggleLoading(0);
+                if(json.status != 1) return showDialog(json.message);
+                this.setState({
+                    list: json.data.record || []
+                })
+            })
+    }
+
+    componentWillReceiveProps(np) {
+        let data = {...this.state.data};
+        if(np.data.id != data.id) data.id = np.data.id;
+        if(np.data.op != data.op) data.op = np.data.op;
+        if(np.data.value != data.value) data.value = np.data.op;
+
+        this.setState({
+            data: {...data}
+        })
+    }
+
+    changeState = (key, value) => {
+        let data = {
+            ...this.state.data
+        }
+        if(key == 'dev') {
+            data.id = value == '' ? '' : `di${value},di_status`;
+        }
+        if(key == 'op'){
+            data.op = value;
+        }
+        if(key == 'value') {
+            data.value = value;
+        }
+
+        this.setState({
+            data: {...data}
+        }, ()=>{ this.sendUpdate() });
+    }
+
+    sendUpdate = () => {
+        this.props.updateData({...this.props.data, ...this.state.data});
+    }
+
+    render() {
+        let {ops} = this.props;
+        let id = '';
+        if(this.state.data.id != '') {
+            let m = this.state.data.id.match(/(\d+)/);
+            if(m != null && m.length > 1){
+                id = m[1];
+            }
+        }
+        return (
+            <div>
+                <select value={id} onChange={e => {this.changeState('dev', e.target.value)}}>
+                    <option value="">選擇裝置</option>
+                    {
+                        this.state.list.map((t,idx) => (
+                            <option key={idx} value={t.id}>{t.name}</option>
+                        ))
+                    }
+                </select>
+                <select value={this.state.data.op} onChange={e => {this.changeState('op', e.target.value)}}>
+                    <option value="">選擇條件</option>
+                    {
+                        ops.map((t,idx) => {
+                            if(t.code != 8 && t.code != 9) {
+                                return (
+                                    <option value={t.code} key={idx}>{t.name}</option>
+                                )
+                            }
+                        })
+                    }
+                </select>
+                <select value={this.state.data.value} onChange={e => {this.changeState('value', e.target.value)}}>
+                    <option value="">選擇狀態</option>
+                    <option value="0">0</option>
+                    <option value="1">1</option>
+                </select>
+            </div>
+        )
+    }
+}
+
+export default UnitDigitalInput;

src/components/AdminPage/ActionLinkAddN/Condition/Unit/UnitGroups.js

@@ -0,0 +1,26 @@
+import React from 'react';
+import {Input} from 'semantic-ui-react';
+import {getRequest} from '../../../../../actions';
+
+class UnitGroups extends React.Component {
+
+    render() {
+        let {groups, data, updateData } = this.props;
+        return (
+            <div>
+                <select value={data.dev} onChange={e => {
+                        updateData({...data, dev: e.target.value});
+                    }}>
+                    <option value="">選擇群組</option>
+                    {
+                        Object.keys(groups).map((t,idx) => (
+                            <option key={idx} value={t}>{groups[t].name}</option>
+                        ))
+                    }
+                </select>
+            </div>
+        )
+    }
+}
+
+export default UnitGroups;

src/components/AdminPage/ActionLinkAddN/Condition/Unit/UnitLeone.js

@@ -0,0 +1,117 @@
+import React from 'react';
+import {Input} from 'semantic-ui-react';
+import {getRequest} from '../../../../../actions';
+
+class UnitLeone extends React.Component {
+    state = {
+        list: [],
+        data: {
+            id: '',
+            op: '',
+            mode: '',
+            value: ''
+        }
+    }
+
+    componentDidMount(){
+        let {showDialog, toggleLoading} = this.props;
+
+        toggleLoading(1);
+        fetch('/api/system/getselectlist', getRequest({type: 'leone'}))
+            .then(response=>response.json())
+            .then(json=>{
+                toggleLoading(0);
+                if(json.status != 1) return showDialog(json.message);
+                this.setState({
+                    list: json.data.record || []
+                })
+            })
+    }
+
+    componentWillReceiveProps(np) {
+        let data = {...this.state.data};
+        if(np.data.op != data.op) data.op = np.data.op;
+        if(np.data.value != data.value) data.value = np.data.op;
+
+        let id = np.data.id.split(',')[0];
+        let mode = np.data.id.split(',')[1];
+        if(id != data.id) data.id = id;
+        if(mode != data.mode) data.mode = mode;
+
+        this.setState({
+            data: {...data}
+        })
+    }
+
+    changeState = (key, value) => {
+        let data = {
+            ...this.state.data
+        }
+        if(key == 'dev') {
+            data.id = value == '' ? '' : `le${value}`;
+        }
+        if(key == 'mode'){
+            data.mode = value;
+        }
+        if(key == 'op'){
+            data.op = value;
+        }
+        if(key == 'value') {
+            data.value = value;
+        }
+
+        this.setState({
+            data: {...data}
+        }, ()=>{ this.sendUpdate() });
+    }
+
+    sendUpdate = () => {
+        let data = {...this.state.data};
+        data.id = `${data.id},${data.mode}`;
+        delete data.mode;
+        this.props.updateData({...this.props.data, ...data});
+    }
+
+    render() {
+        let {ops} = this.props;
+        let id = '';
+        if(this.state.data.id != '') {
+            let m = this.state.data.id.match(/(\d+)/);
+            if(m != null && m.length > 1){
+                id = m[1];
+            }
+        }
+        return (
+            <div>
+                <select value={id} onChange={e => {this.changeState('dev', e.target.value)}}>
+                    <option value="">選擇裝置</option>
+                    {
+                        this.state.list.map((t,idx) => (
+                            <option key={idx} value={t.id}>{t.name}</option>
+                        ))
+                    }
+                </select>
+                <select value={this.state.data.mode} onChange={e=>{this.changeState('mode', e.target.value)}}>
+                    <option value="">選擇感測器</option>
+                    <option value="leone_ttrigger1">溫度</option>
+                    <option value="leone_htrigger1">濕度</option>
+                </select>
+                <select value={this.state.data.op} onChange={e=>{this.changeState('op', e.target.value)}}>
+                    <option value="">選擇條件</option>
+                    {
+                        ops.map((t,idx) => {
+                            if(t.code != 8 && t.code != 9) {
+                                return (
+                                    <option value={t.code} key={idx}>{t.name}</option>
+                                )
+                            }
+                        })
+                    }
+                </select>
+                <Input placeholder="請輸入數值" value={this.state.data.value} onChange={(e, d)=>{this.changeState('value', d.value)}} />
+            </div>
+        )
+    }
+}
+
+export default UnitLeone;

src/components/AdminPage/ActionLinkAddN/Condition/Unit/UnitModbus.js

@@ -0,0 +1,200 @@
+import React from 'react';
+import {Input} from 'semantic-ui-react';
+import {getRequest} from '../../../../../actions';
+
+class UnitDigitalInput extends React.Component {
+    state = {
+        list: [],
+        typelist: [],
+        portlist: [],
+        data: {
+            id: '',
+            op: '',
+            type: '',
+            port: '',
+            value: ''
+        }
+    }
+
+    componentDidMount(){
+        let {showDialog, toggleLoading} = this.props;
+
+        toggleLoading(1);
+        fetch('/api/system/getselectlist', getRequest({type: 'modbus'}))
+            .then(response=>response.json())
+            .then(json=>{
+                toggleLoading(0);
+                if(json.status != 1) return showDialog(json.message);
+                this.setState({
+                    list: json.data.record || []
+                })
+            })
+    }
+
+    componentWillReceiveProps(np) {
+        let data = {...this.state.data};
+        // if(np.data.id != data.id) data.id = np.data.id;
+        if(np.data.op != data.op) data.op = np.data.op;
+        if(np.data.value != data.value) data.value = np.data.op;
+
+        let id = (np.data.id || '').split(',')[0];
+        let type = ((np.data.id || '').split(',')[1] || '').split('|')[0] || '';
+        let port = ((np.data.id || '').split(',')[1] || '').split('|')[1] || '';
+
+        if(data.id != id ) data.id = id;
+        if(data.type != type ) data.type = type;
+        if(data.port != port ) data.port = port;
+
+        this.setState({
+            data: {...data}
+        })
+    }
+
+    getDevTypes = (id) => {
+        if(!id) return ;
+        let {i18n, showDialog} = this.props;
+        let typelist = i18n&&i18n.getResource&&i18n.language ? i18n.getResource(i18n.language + '.translation.porttype') : [];
+        fetch('/api/modbus/getmodbustype', getRequest({id}))
+            .then(response=>response.json())
+            .then(json => {
+                if(json.status != 1) return showDialog(json.message);
+                let arr = json.data.record || [];
+                for(let i in arr){
+                    for(let j in typelist) {
+                        if(arr[i].type == typelist[j].code){
+                            arr[i].name = typelist[j].name;
+                        }
+                    }
+                }
+
+                this.setState({
+                    typelist: arr, 
+                    portlist: [],
+                    data: {
+                        ...this.state.data,
+                        type: '',
+                        port: ''
+                    }
+                })
+            })
+    }
+
+    getDevPorts = (id, type) => {
+        if(!id || !type) return ;
+        let {i18n, showDialog} = this.props;
+        let mid = '';
+        let m = id.match(/(\d+)/);
+        if(m != null && m.length>1) mid = m[1];
+        fetch('/api/modbus/getmodbusport', getRequest({id: mid, type}))
+            .then(response=>response.json())
+            .then(json => {
+                if(json.status != 1) return showDialog(json.message);
+                let arr = json.data.record || [];
+
+                this.setState({
+                    portlist: arr,
+                    data: {
+                        ...this.state.data,
+                        port: ''
+                    }
+                })
+            })
+    }
+
+    changeState = (key, value) => {
+        let data = {
+            ...this.state.data
+        }
+        if(key == 'dev') {
+            data.id = value == '' ? '' : `mb${value}`;
+        }
+        if(key == 'op'){
+            data.op = value;
+        }
+        if(key == 'type') {
+            data.type = value
+        }
+        if(key == 'port') {
+            data.port = value
+        }
+        if(key == 'value') {
+            data.value = value;
+        }
+
+        this.setState({
+            data: {...data}
+        }, ()=>{ 
+            if(key == 'dev'){
+                this.getDevTypes(value);
+            }
+            if(key == 'type'){
+                this.getDevPorts(this.state.data.id, this.state.data.type)
+            }
+            this.sendUpdate()
+        });
+    }
+
+    sendUpdate = () => {
+        let data = {...this.state.data};
+        data.id = `${data.id},${data.type}|${data.port}`;
+        delete data.type;
+        delete data.port;
+        delete data.dev;
+        this.props.updateData({...this.props.data, ...data});
+    }
+
+    render() {
+        let {ops, i18n} = this.props;
+        let id = '';
+        if(this.state.data.id != '') {
+            let m = this.state.data.id.match(/(\d+)/);
+            if(m != null && m.length > 1){
+                id = m[1];
+            }
+        }
+        
+        return (
+            <div>
+                <select value={id} onChange={e => {this.changeState('dev', e.target.value)}}>
+                    <option value="">選擇裝置</option>
+                    {
+                        this.state.list.map((t,idx) => (
+                            <option key={idx} value={t.id}>{t.name}</option>
+                        ))
+                    }
+                </select>
+                <select value={this.state.data.type} onChange={e => {this.changeState('type', e.target.value)}}>
+                    <option value="">接口類型</option>
+                    {
+                        this.state.typelist.map((t,idx) => (
+                            <option key={idx} value={t.type}>{t.name}</option>
+                        ))
+                    }
+                </select>
+                <select value={this.state.data.port} onChange={e => {this.changeState('port', e.target.value)}}>
+                    <option value="">接口</option>
+                    {
+                        this.state.portlist.map((t,idx) => (
+                            <option key={idx} value={t.portnum}>{`Port ${t.portnum} ${t.name ? ` - ${t.name}` : '' }`}</option>
+                        ))
+                    }
+                </select>
+                <select value={this.state.data.op} onChange={e => {this.changeState('op', e.target.value)}}>
+                    <option value="">選擇條件</option>
+                    {
+                        ops.map((t,idx) => {
+                            if(t.code != 8 && t.code != 9) {
+                                return (
+                                    <option value={t.code} key={idx}>{t.name}</option>
+                                )
+                            }
+                        })
+                    }
+                </select>
+                <Input label="請輸入數值" value={this.state.data.value} onChange={(e,d)=>{this.changeState('value', d.value)}} />
+            </div>
+        )
+    }
+}
+
+export default UnitDigitalInput;

src/components/AdminPage/ActionLinkAddN/Condition/Unit/UnitTime.js

@@ -0,0 +1,119 @@
+import React from 'react';
+import {Input} from 'semantic-ui-react';
+import {getRequest} from '../../../../../actions';
+
+class UnitTime extends React.Component {
+    state = {
+        list: [],
+        data: {
+            op: '',
+            id: 'dt0,mode0',
+            year: '-',
+            week: '-',
+            month: '-',
+            day: '-',
+            hour: '-',
+            min: '-'
+        }
+    }
+
+    componentWillReceiveProps(np) {
+        let data = {...this.state.data};
+        if(np.data.op != data.op) data.op = np.data.op;
+    
+        let year = np.data.value.split('|')[5] || '-';
+        let week = np.data.value.split('|')[4] || '-';
+        let month = np.data.value.split('|')[3] || '-';
+        let day = np.data.value.split('|')[2] || '-';
+        let hour = np.data.value.split('|')[1] || '-';
+        let min = np.data.value.split('|')[0] || '-';
+
+        if(year != data.year) data.year = year;
+        if(week != data.week) data.week = week;
+        if(month != data.month) data.month = month;
+        if(day != data.day) data.day = day;
+        if(hour != data.hour) data.hour = hour;
+        if(min != data.min) data.min = min;
+
+        this.setState({
+            data: {...data}
+        })
+    }
+
+    changeState = (key, value) => {
+        let data = {
+            ...this.state.data
+        }
+        if(key == 'op'){
+            data.op = value;
+        }
+        if(key == 'year') {
+            data.year = value == '' ? '-' : value;
+        }
+        if(key == 'week') {
+            data.week = value == '' ? '-' : value;
+        }
+        if(key == 'month') {
+            data.month = value == '' ? '-' : value;
+        }
+        if(key == 'day') {
+            data.day = value == '' ? '-' : value;
+        }
+        if(key == 'hour') {
+            data.hour = value == '' ? '-' : value;
+        }
+        if(key == 'min') {
+            data.min = value == '' ? '-' : value;
+        }
+
+        this.setState({
+            data: {...data}
+        }, ()=>{ this.sendUpdate() });
+    }
+
+    sendUpdate = () => {
+        let data = {...this.state.data};
+        data.value = `${data.min}|${data.hour}|${data.day}|${data.month}|${data.week}|${data.year}`;
+        delete data.year;
+        delete data.week;
+        delete data.month;
+        delete data.day;
+        delete data.hour;
+        delete data.min;
+        this.props.updateData({...this.props.data, ...data});
+    }
+
+    render() {
+        let {ops} = this.props;
+        return (
+            <div>
+                <select value={this.state.data.op} onChange={e=>{this.changeState('op', e.target.value)}}>
+                    <option value="">選擇條件</option>
+                    {
+                        ops.map((t,idx) => {
+                            if(t.code != 8 && t.code != 9) {
+                                return (
+                                    <option value={t.code} key={idx}>{t.name}</option>
+                                )
+                            }
+                        })
+                    }
+                </select>
+                <Input size="mini" placeholder="年(不指定請留空)" value={this.state.data.year == '-' ? '' : this.state.data.year} 
+                    onChange={(e,d) => {this.changeState('year', d.value)}} />
+                <Input size="mini" placeholder="週(不指定請留空)" value={this.state.data.week == '-' ? '' : this.state.data.week} 
+                    onChange={(e,d) => {this.changeState('week', d.value)}} />
+                <Input size="mini" placeholder="月(不指定請留空)" value={this.state.data.month == '-' ? '' : this.state.data.month} 
+                    onChange={(e,d) => {this.changeState('month', d.value)}} />
+                <Input size="mini" placeholder="日(不指定請留空)" value={this.state.data.day == '-' ? '' : this.state.data.day} 
+                    onChange={(e,d) => {this.changeState('day', d.value)}} />
+                <Input size="mini" placeholder="時(不指定請留空)" value={this.state.data.hour == '-' ? '' : this.state.data.hour} 
+                    onChange={(e,d) => {this.changeState('hour', d.value)}} />
+                <Input size="mini" placeholder="分(不指定請留空)" value={this.state.data.min == '-' ? '' : this.state.data.min} 
+                    onChange={(e,d) => {this.changeState('min', d.value)}} />
+            </div>
+        )
+    }
+}
+
+export default UnitTime;

src/components/AdminPage/ActionLinkAddN/Condition/Unit/index.js

@@ -0,0 +1,63 @@
+import React from 'react';
+import {Segment, Input, Form} from 'semantic-ui-react';
+import UnitLeone from './UnitLeone';
+import UnitDigitalInput from './UnitDigitalInput';
+import UnitTime from './UnitTime';
+import UnitGroups from './UnitGroups';
+import UnitModbus from './UnitModbus';
+
+class Unit extends React.Component {
+
+    handleChangeUnit = (val) => {
+        this.props.changeUnitType(this.props.id, val);
+    }
+
+    getUnitComponent = () => {
+        
+        let {data, ops, i18n, showDialog, toggleLoading, groups} = this.props;
+
+        switch(data.unit){
+            case 'leone':
+                return <UnitLeone ops={ops} data={data.data} i18n={i18n} showDialog={showDialog} toggleLoading={toggleLoading} updateData={this.updateData} />
+            case 'di':
+                return <UnitDigitalInput ops={ops} data={data.data} i18n={i18n} showDialog={showDialog} toggleLoading={toggleLoading} updateData={this.updateData} />
+            case 'modbus':
+                return <UnitModbus ops={ops} data={data.data} i18n={i18n} showDialog={showDialog} toggleLoading={toggleLoading} updateData={this.updateData} />
+            case 'time':
+                return <UnitTime ops={ops} data={data.data} i18n={i18n} showDialog={showDialog} toggleLoading={toggleLoading} updateData={this.updateData} />
+            case 'unit':
+                return <UnitGroups i18n={i18n} data={data.data} groups={groups} updateData={this.updateData} />
+            default: 
+                return null;
+        }
+    }
+
+    updateData = (data) => {
+        console.log(data);
+        this.props.updateData(this.props.id, data);
+    }
+
+    render() {
+        let {ops, id} = this.props;
+        return (
+            <Segment>
+                <Form.Field>
+                    <label>選擇元件</label>
+                    <select value={this.props.data.unit} onChange={e => {
+                            this.handleChangeUnit(e.target.value);
+                        }}>
+                        <option value="">請選擇元件</option>
+                        <option value="leone">LeOne</option>
+                        <option value="di">DigitalInput</option>
+                        <option value="modbus">Modbus</option>
+                        <option value="time">時間</option>
+                        <option value="unit">已建立群組</option>
+                    </select>
+                </Form.Field>
+                {this.getUnitComponent()}
+            </Segment>
+        )
+    }
+}
+
+export default Unit;

src/components/AdminPage/ActionLinkAddN/Condition/index.js

@@ -0,0 +1,225 @@
+import React from 'react';
+import { Segment, Input, Button, Form, Grid } from 'semantic-ui-react';
+import Unit from './Unit';
+
+const ops = [
+    {
+        "code": "0",
+        "name": "等於"
+    }, {
+        "code": "1",
+        "name": "大於"
+    }, {
+        "code": "2",
+        "name": "小於"
+    }, {
+        "code": "3",
+        "name": "大於等於"
+    }, {
+        "code": "4",
+        "name": "小於等於"
+    }, {
+        "code": "5",
+        "name": "不等於"
+    }, {
+        "code": "8",
+        "name": "AND"
+    }, {
+        "code": "9",
+        "name": "OR"
+    }
+];
+
+const stateDefault = () => ({
+    id1: {
+        unit: '',
+        data: {}
+    },
+    id2: {
+        unit: '',
+        data: {}
+    },
+    name: '',
+    op: ''
+})
+
+const lcDef = () => ({
+    type: 'lc',
+    id: '',
+    op: '',
+    value: ''
+})
+
+const lnDef = () => ({
+    type: 'ln',
+    dev: ''
+})
+
+class ConditionField extends React.Component {
+    state = {
+        ...stateDefault()
+    }
+
+    changeUnitType = (id, type) => {
+        let st = this.state;
+        if(id in st){
+            st[id].unit = type;
+            if(type == ''){
+                st[id].data = {}
+            }else if(type == 'unit'){
+                st[id].data = {...lnDef()}
+            }else {
+                st[id].data = {...lcDef()}
+            }
+            this.setState({
+                ...st
+            })
+        }
+    }
+
+    updateData = (id, data) => {
+        let st = this.state;
+        if(id in st) {
+            st[id].data = data;
+            this.setState({
+                ...st
+            })
+        }
+    }
+
+    clearField = () => {
+        this.setState({
+            ...stateDefault()
+        })
+    }
+
+    joinGroup = () => {
+        let id1 = {...this.state.id1};
+        let id2 = {...this.state.id2};
+        let {showDialog, addNewGroup} = this.props;
+        if(!('type' in id1.data)){
+            showDialog('請選擇元件');
+        }else{
+            if(id1.data.type == 'lc') {
+                let chk = this.checkLC(id1.data);
+                if(chk.status != 1) return showDialog(chk.message); 
+            }else{
+                let chk = this.checkLN(id1.data);
+                if(chk.status != 1) return showDialog(chk.message); 
+            }
+        }
+
+        if(!('type' in id2.data)){
+            showDialog('請選擇元件');
+        }else{
+            if(id2.data.type == 'lc') {
+                let chk = this.checkLC(id2.data);
+                if(chk.status != 1) return showDialog(chk.message); 
+            }else{
+                let chk = this.checkLN(id2.data);
+                if(chk.status != 1) return showDialog(chk.message); 
+            }
+        }
+
+        if(!this.state.op) return showDialog('請選擇條件');
+        if(!this.state.name) return showDialog('請輸入名稱');
+
+        addNewGroup({
+            name: this.state.name,
+            op: this.state.op,
+            type: 'ln',
+            id1: id1.data,
+            id2: id2.data
+        }, this.clearField);
+    }
+
+    changeState = (tag, value) => {
+        if(!tag) return ;
+        if(tag == 'name'){
+            this.setState({
+                name: value
+            })
+        }
+        if(tag == 'op'){
+            this.setState({
+                op: value
+            })
+        }
+    }
+
+    checkLC = (data) => {
+        let json = {
+            status: 0,
+            message: ''
+        };
+        if(typeof data != 'object' || Object.keys(data).length == 0) return {...json, message: '請選擇元件'};
+        if(!data.id) return {...json, message: '請選擇裝置'};
+        if(!('op' in data) || data.op == '') return {...json, message: '請選擇條件'};
+        if(!('value' in data) || data.value == '') return {...json, message: '請輸入數值'};
+        return {...json, status: 1}
+    }
+
+    checkLN = (data) => {
+        let json = {
+            status: 0,
+            message: ''
+        };
+        if(typeof data != 'object' || Object.keys(data).length == 0) return {...json, message: '請選擇元件'};
+        if(!data.dev) return {...json, message: '請選擇群組'};
+        return {...json, status: 1};
+    }
+
+    render() {
+        let {i18n, showDialog, toggleLoading} = this.props;
+        return (
+            <Segment color="red">
+                <Form.Field>
+                    <Input label="節點名稱" value={this.state.name} onChange={(e,d)=>{ this.changeState('name', d.value) }} />
+                </Form.Field>
+                <Form.Field>
+                    <label>觸發條件</label>
+                    <select value={this.state.op} onChange={e=>{this.changeState('op', e.target.value)}}>
+                        <option value="">請選擇觸發條件</option>
+                        {
+                            ops.map((t,idx) => {
+                                if(t.code == 8 || t.code == 9) {
+                                    return (
+                                        <option key={idx} value={t.code}>{t.name}</option>
+                                    )
+                                }
+                            })
+                        }
+                    </select>
+                </Form.Field>
+                <Grid columns={2} padded>
+                    <Grid.Column>
+                        <Unit i18n={i18n} id="id1" 
+                            data={this.state.id1} 
+                            groups={this.props.groups} 
+                            ops={ops} 
+                            toggleLoading={toggleLoading} 
+                            showDialog={showDialog} 
+                            updateData={this.updateData}
+                            changeUnitType={this.changeUnitType}/>
+                    </Grid.Column>
+                    <Grid.Column>
+                        <Unit i18n={i18n} id="id2" 
+                            data={this.state.id2} 
+                            groups={this.props.groups} 
+                            ops={ops} 
+                            toggleLoading={toggleLoading} 
+                            showDialog={showDialog} 
+                            updateData={this.updateData}
+                            changeUnitType={this.changeUnitType}/>
+                    </Grid.Column>
+                </Grid>
+                <div style={{textAlign: 'right'}}>
+                    <Button content="加入" basic size="mini" color="blue" onClick={()=>{this.joinGroup()}} />
+                    <Button content="清除" basic size="mini" color="red" onClick={()=>{this.clearField()}} />
+                </div>
+            </Segment>
+        )
+    }
+}
+
+export default ConditionField;

src/components/AdminPage/ActionLinkAddN/ShowTree.js

@@ -0,0 +1,47 @@
+import React from 'react';
+import { Modal, Header, Button, Form } from 'semantic-ui-react';
+
+const ShowTree = ({ i18n, open, data, onClose, delItem }) => {
+
+    return (
+        <Modal open={open} onClose={()=>{onClose(0)}}>
+            <Modal.Header content="連動群組資料" />
+            <Modal.Content>
+                <Form onSubmit={(e,d)=>{
+                        e.preventDefault();
+                        delItem(d.formData.key);
+                    }} serializer={e=>{
+                        let json = {key:''};
+                        let key = e.querySelector('select[name="key"]');
+                        if(key && 'value' in key) json.key = key.value;
+
+                        return json;
+                    }}>
+                    <Form.Group inline>
+                        <Form.Field>
+                            <label>選擇要刪除的群組</label>
+                            <select name="key">
+                                <option value="">選擇群組</option>
+                                {
+                                    Object.keys(data).map((t,idx) => (
+                                        <option key={idx} value={t}>{data[t].name}</option>
+                                    ))
+                                }
+                            </select>
+                        </Form.Field>
+                        <Form.Field>
+                            <Button type="submit" basic size="mini" content="刪除群組" />
+                        </Form.Field>
+                    </Form.Group>
+                </Form>
+                <pre>
+                    {
+                        JSON.stringify(data, null, 4)
+                    }
+                </pre>
+            </Modal.Content>
+        </Modal>
+    )
+}
+
+export default ShowTree;

src/components/AdminPage/ActionLinkAddN/index.js

@@ -0,0 +1,175 @@
+import React from 'react';
+import {
+    Container,
+    Segment,
+    Form,
+    Input,
+    Button,
+    Checkbox,
+    Grid,
+    Menu,
+    List
+} from 'semantic-ui-react';
+import {getRequest} from '../../../actions';
+import ConditionField from './Condition';
+import ActionSelect from './ActionSelect';
+import ActionList from './ActionList';
+import ShowTree from './ShowTree';
+
+const stateDefault = ()=>({
+    groups: {},
+    idx: 0,
+    active: 0,
+    actions: [],
+    showTree: false
+})
+
+class ActionLinkAdd extends React.Component {
+    state = {
+        ...stateDefault()
+    }
+
+    changeState = (tag, value) => {
+        if(tag == 'active'){
+            this.setState({
+                active: value?1:0
+            })
+        }
+    }
+
+    addNewGroup = (data, cb = null) => {
+        let devs = [];
+        let {groups} = this.state
+        if(data.id1.type == 'ln') devs.push(data.id1.dev)
+        if(data.id2.type == 'ln') devs.push(data.id2.dev)
+        
+        data.id1 = {...data.id1, ...groups[data.id1.dev]}
+        data.id2 = {...data.id2, ...groups[data.id2.dev]}
+        delete data.id1.dev;
+        delete data.id2.dev;
+
+        for(let i in devs){
+            if(devs[i] in groups) delete groups[devs[i]];
+        }
+
+        let idx = this.state.idx + 1;
+        groups[`unit${idx}`] = data;
+
+        this.setState({
+            groups,
+            idx
+        }, ()=>{
+            if(cb && typeof cb == 'function') cb();
+        })
+    }
+
+    addNewAction = (data, cb=null) => {
+        this.setState({
+            actions: [...this.state.actions, data]
+        }, ()=>{
+            if(cb && typeof cb == 'function') cb();
+        })
+    }
+
+    removeAction = (idx) => {
+        let {actions} = this.state;
+        actions.splice(idx, 1);
+        this.setState({
+            actions
+        })
+    }
+
+    toggleShowTree = (flag) => {
+        this.setState({
+            showTree: flag ? true : false
+        })
+    }
+
+    delGroup = (key) => {
+        if(!key) return ;
+        let {groups} = this.state;
+        if(key in groups) delete groups[key];
+
+        this.setState({
+            groups
+        })
+    }
+
+    saveLink = () => {
+        let {showDialog, toggleLoading} = this.props;
+        if(this.state.actions.length == 0) return showDialog('請至少加入一個動作');
+        if(Object.keys(this.state.groups).length == 0) return showDialog('請建立群組');
+        if(Object.keys(this.state.groups).length > 1) return showDialog('根群組數量大於一，請合併或刪除');
+
+        let data = {
+            active: this.state.active,
+            action: '',
+            link: {}
+        }
+
+        let act = [];
+        for(let i in this.state.actions) {
+            let tmp = this.state.actions[i];
+            act.push(`${tmp.dev},${tmp.act},0`);
+        }
+
+        data.action = act.join('|');
+
+        data.link = this.state.groups[Object.keys(this.state.groups)[0]];
+
+        fetch('/api/link/addlink', getRequest(data))
+            .then(response=>response.json())
+            .then(json=>{
+                if(json.status != 1) return showDialog(json.message);
+                showDialog('新增完成');
+                this.resetData()
+            })
+    }
+
+    resetData = ()=>{
+        this.setState({
+            ...stateDefault()
+        })
+    }
+
+    render() {
+        let {i18n, showDialog, toggleLoading} = this.props;
+        return (
+            <Container>
+                <Menu>
+                    <Menu.Menu position="right">
+                        <Menu.Item content="ShowTree" onClick={()=>{ this.toggleShowTree(1) }}/>
+                        <Menu.Item content="Save" onClick={()=>{this.saveLink()}}/>
+                    </Menu.Menu>
+                </Menu>
+                <Form as={Segment}>
+                    <Form.Field>
+                        <Checkbox label="啟用連動" checked={this.state.active == 1} onChange={(e,d)=>{this.changeState('active', d.checked)}} />
+                    </Form.Field>
+                    <Form.Field>
+                        <label>建立條件群組</label>
+                        <ConditionField i18n={i18n} 
+                            showDialog={showDialog} 
+                            toggleLoading={toggleLoading} 
+                            groups={this.state.groups}
+                            addNewGroup={this.addNewGroup} />
+                    </Form.Field>
+                    <Form.Field>
+                        <label>加入動作</label>
+                        <ActionSelect i18n={i18n}
+                            showDialog={showDialog} 
+                            toggleLoading={toggleLoading}
+                            addNewAction={this.addNewAction}  />
+                    </Form.Field>
+                    <Form.Field>
+                        <label>已選擇動作</label>
+                        <ActionList i18n={i18n} list={this.state.actions} removeAction={this.removeAction} />
+                    </Form.Field>
+                </Form>
+                <ShowTree i18n={i18n} open={this.state.showTree} data={this.state.groups} onClose={this.toggleShowTree} delItem={this.delGroup} />
+            </Container>
+        )
+    }
+}
+
+export default ActionLinkAdd;

src/components/AdminPage/IPCam/EventModal.js

@@ -0,0 +1,82 @@
+import React from 'react';
+import { Modal, Grid, List, Menu, Icon, Message } from 'semantic-ui-react';
+import {convertTime} from '../../../tools';
+import ImgGrid from './EvtImgGrid';
+
+const EventModal = ({ i18n, open, name, list, sel, closeEventModal, changeSelectEvent,refreshEvt, delEvent }) => {
+
+    return (
+        <Modal open={open} onClose={()=>{closeEventModal()}} size="fullscreen">
+            <Modal.Header content={`IPCam: ${name}`} />
+            <Modal.Content>
+                <Grid>
+                    <Grid.Column width={4}>
+                        <Menu vertical>
+                            <Menu.Item>
+                                <Menu.Header>
+                                    事件列表
+                                    <Icon name="refresh" style={{
+                                        cursor: "pointer",
+                                        float: 'right'
+                                    }} onClick={()=>{refreshEvt(-1)}}/>
+                                </Menu.Header>
+                                <Menu.Menu>
+                                    {
+                                        list.map((t,idx) =>{
+                                            let n = t.name;
+                                            let time = n.split('-')[1];
+                                           return (
+                                            <Menu.Item key={idx} active={sel == idx} >
+                                                <span onClick={()=>{changeSelectEvent(idx)}} 
+                                                    style={{cursor: "pointer"}}>{convertTime(time, true)}</span>
+                                                <Icon name="download" title="下載事件" style={{
+                                                        cursor: "pointer",
+                                                        float: 'right'
+                                                    }} onClick={()=>{window.open(`/dlevent/${t.name}`, '_blank')}}/>
+                                                <Icon name="trash" title="刪除事件" style={{
+                                                        cursor: "pointer",
+                                                        float: 'right'
+                                                    }} onClick={()=>{delEvent(t.name)}}/>
+                                            </Menu.Item>
+                                        )})
+                                    }
+                                </Menu.Menu>
+                            </Menu.Item>
+                        </Menu>
+                    </Grid.Column>
+                    <Grid.Column width={12}>
+                        {
+                            sel != -1 && list[sel].files.video.length > 0 ? (
+                                <Message>
+                                    <Message.Header>影片下載</Message.Header>
+                                    <p>
+                                        {
+                                            list[sel].files.video.map((t, idx) => {
+
+                                                return (
+                                                    <div key={idx}>
+                                                    <a href={`/dlcamvideo/${list[sel].name}/${t}`} target="_blank">{t}</a>
+                                                    </div>
+                                                )
+                                            })
+                                        }
+                                    </p>
+                                </Message>
+                            ) :null
+                        }
+                        {
+                            sel != -1 ? 
+                            (
+                                <ImgGrid i18n={i18n}
+                                    dname={list[sel].name}
+                                    list={list[sel].files.img} />
+                            ) : null
+                        }
+                    </Grid.Column>
+                </Grid>
+            </Modal.Content>
+        </Modal>
+    )
+}
+
+export default EventModal;

src/components/AdminPage/IPCam/EvtImgGrid.js

@@ -0,0 +1,21 @@
+import React from 'react';
+import {Grid, Image} from 'semantic-ui-react';
+
+const EvtImgGrid = ({ i18n, dname, list }) => {
+
+    return (
+        <Grid columns={3}>
+            {
+                list.map((t,idx) => {
+                    return (
+                        <Grid.Column key={idx}>
+                            <Image fluid src={`/viewcamimg/${dname}/${t}`} href={`/viewcamimg/${dname}/${t}`} target="_blank"/>
+                        </Grid.Column>
+                    )
+                })
+            }
+        </Grid>
+    )
+}
+
+export default EvtImgGrid;

src/components/AdminPage/IPCam/IPCamModal.js

@@ -0,0 +1,68 @@
+import React from 'react';
+import { Modal, Form, Grid, Button, Input, Checkbox } from 'semantic-ui-react';
+
+const IPCamModal = ({ i18n, open, type, data, closeModal, submitModal }) => {
+
+    return (
+        <Modal open={open}>
+            <Modal.Header content={type == 1 ? '修改資料' : '新增資料'} />
+            <Modal.Content>
+                <Form onSubmit={(e,d) => {
+                        e.preventDefault();
+                        submitModal(type, d.formData);
+                    }} serializer={e=>{
+                        let json = {};
+                        
+                        let name = e.querySelector('input[name="name"]');
+                        if(name && 'value' in name) json.name = name.value;
+                        let ip = e.querySelector('input[name="ip"]');
+                        if(ip && 'value' in ip) json.ip = ip.value;
+                        let model = e.querySelector('select[name="model"]');
+                        if(model && 'value' in model) json.model = model.value;
+                        let maxevents = e.querySelector('input[name="maxevents"]');
+                        if(maxevents && 'value' in maxevents) json.maxevents = maxevents.value;
+                        let maximg = e.querySelector('input[name="maximg"]');
+                        if(maximg && 'value' in maximg) json.maximg = maximg.value;
+                        let active = e.querySelector('input[type="checkbox"]');
+                        if(active && 'checked' in active) json.active = active.checked;
+                        if(type == 1) json.id = data.uid;
+
+                        return json;
+                    }}>
+                    <Form.Field>
+                        <Checkbox label="啟用裝置" defaultChecked={data.active == 1} name="active" />
+                    </Form.Field>
+                    <Form.Field>
+                        <Input name="name" label="名稱" defaultValue={data.name} />
+                    </Form.Field>
+                    <Form.Field>
+                        <Input name="ip" label="IP" defaultValue={data.ip} />
+                    </Form.Field>
+                    <Form.Field>
+                        <select defaultValue={data.model} name="model">
+                            <option value="">請選擇型號</option>
+                            <option value="AXIS-M1124">AXIS-M1124</option>
+                            <option value="GRANDSTREAM-GXV3610_HD">GRANDSTREAM-GXV3610_HD</option>
+                        </select>
+                    </Form.Field>
+                    <Form.Field>
+                        <Input name="maxevents" label="最大儲存事件數量(1-10)" defaultValue={data.maxevents} />
+                    </Form.Field>
+                    <Form.Field>
+                        <Input name="maximg" label="最大儲存圖片數量(1-20)" defaultValue={data.maximg} />
+                    </Form.Field>
+                    <Grid columns={2}>
+                        <Grid.Column>
+                            <Button type="submit" fluid content="送出" />
+                        </Grid.Column>
+                        <Grid.Column>
+                            <Button type="button" fluid content="取消" onClick={()=>{closeModal()}} />
+                        </Grid.Column>
+                    </Grid>
+                </Form>
+            </Modal.Content>
+        </Modal>
+    )
+}
+
+export default IPCamModal;

src/components/AdminPage/IPCam/ListItem.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import {Table, Button} from 'semantic-ui-react';
+
+const ListItem = ({ i18n, data, swActive, openModal, delIPCam, getEvents }) => {
+
+    return (
+        <Table.Row>
+            <Table.Cell>
+                <Button basic content="修改" type="button" onClick={()=>openModal(1, data)} />
+                <Button basic content="刪除" type="button" onClick={()=>delIPCam(data.uid)}/>
+                <Button basic content={data.active == 1 ? '停用' : '啟用'} type="button" onClick={()=>swActive(data.uid)} />
+                <Button basic content="事件紀錄" type="button" onClick={()=>getEvents(data.uid, data.name)} />
+            </Table.Cell>
+            <Table.Cell>{data.name}</Table.Cell>
+            <Table.Cell>{data.ip}</Table.Cell>
+            <Table.Cell>{data.model}</Table.Cell>
+            <Table.Cell>{data.model == 'AXIS-M1124' ? `/${data.model}-${data.uid}` : '/'}</Table.Cell>
+            <Table.Cell>{data.active == 1? '啟用' : '停用'}</Table.Cell>
+        </Table.Row>
+    )
+}
+
+export default ListItem;

src/components/AdminPage/IPCam/index.js

@@ -1,12 +1,220 @@
 import React from 'react';
-import {} from 'semantic-ui-react';
+import { Container, Segment, Table, Button, Label, Message } from 'semantic-ui-react';
+import {getRequest} from '../../../actions';
+import ListItem from './ListItem';
+import IPCamModal from './IPCamModal';
+import EvtModal from './EventModal';
 
-class IPCamPage extends React.Component{
+const stateDefault = ()=>({
+    list: [],
+    modal: {
+        type: 0,
+        open: false,
+        data: {}
+    },
+    evt: {
+        open: false,
+        list: [],
+        name: '',
+        sel: -1,
+        id: -1
+    }
+})
 
-    render(){
+class IPCamPage extends React.Component {
+    state = {
+        ...stateDefault()
+    }
 
+    componentDidMount(){
+        this.getList();
+    }
+
+    getList = () => {
+        let {toggleLoading, showDialog} = this.props;
+        toggleLoading(1);
+        fetch('/api/ipcam/getipcamlist', getRequest())
+            .then(response => response.json())
+            .then(json => {
+                toggleLoading(0);
+                if(json.status != 1) return showDialog(json.message);
+                let list = json.data.record || [];
+                this.setState({
+                    list
+                })
+            })
+    }
+
+    swActive = (id) => {
+        if(!id) return ;
+        let {toggleLoading, showDialog} = this.props;
+        toggleLoading(1);
+        fetch('/api/ipcam/swipcamactive', getRequest({id}))
+            .then(response=>response.json())
+            .then(json => {
+                toggleLoading(0);
+                if(json.status != 1) return showDialog(json.message);
+                this.getList();
+            })
+    }
+
+    openModal = (type, data = {}) => {
+        this.setState({
+            modal: {
+                type,
+                data,
+                open: true
+            }
+        })
+    }
+    closeModal = () => {
+        this.setState({
+            modal: {
+                ...stateDefault().modal
+            }
+        })
+    }
+    submitModal = (type, data = {}) => {
+        let {toggleLoading,showDialog} = this.props;
+        if(type == 1 && !data.id) return showDialog('資料讀取錯誤');
+        if(!data.maxevents || data.maxevents < 1 || data.maxevents > 10) return showDialog('事件數量請介於1-5間');
+        if(!data.maximg || data.maximg < 1 || data.maximg > 20) return showDialog('圖片數量請介於1-5間');
+        if(!data.name) return showDialog('請輸入名稱');
+        if(!data.ip) return showDialog('請輸入IP');
+        if(!data.model) return showDialog('請選擇型號');
+
+        toggleLoading(1);
+        let url = type == 1 ? '/api/ipcam/editipcam' : '/api/ipcam/addipcam';
+        fetch(url, getRequest(data))
+            .then(response=>response.json())
+            .then(json => {
+                toggleLoading(0);
+                if(json.status != 1) return showDialog(json.message);
+                this.closeModal();
+                this.getList();
+            })
+    }
+
+    delIPCam = (id) => {
+        if(!id) return ;
+        let {callConfirm, toggleLoading, showDialog} = this.props;
+        callConfirm('確定要刪除此筆資料?', ()=>{
+            fetch('/api/ipcam/delipcam', getRequest({id}))
+                .then(response=>response.json())
+                .then(json => {
+                    if(json.status != 1) return showDialog(json.message);
+                    this.getList();
+                })
+        });
+    }
+
+    getEvents = (id, name = '') => {
+        if(!id) return ;
+        if(id==-1) id = this.state.evt.id;
+        let {callConfirm, toggleLoading, showDialog} = this.props;
+        toggleLoading(1);
+        fetch('/api/ipcam/getevents', getRequest({id}))
+            .then(response=>response.json())
+            .then(json => {
+                toggleLoading(0);
+                if(json.status != 1) return showDialog(json.message);
+                this.setState({
+                    evt: {
+                        open: true,
+                        list: json.data.record || [],
+                        name: name != '' ? name : this.state.evt.name,
+                        sel: -1,
+                        id
+                    }
+                })
+            })
+    }
+    closeEventModal = () => {
+        this.setState({
+            evt: {
+                ...stateDefault().evt
+            }
+        })
+    }
+    changeSelectEvent = (idx) => {
+        if(!isFinite(idx) || idx < 0) return ;
+        this.setState({
+            evt:{
+                ...this.state.evt,
+                sel: idx
+            }
+        })
+    }
+
+    delEvent = (dir) => {
+        if(!dir) return ;
+        let {callConfirm, toggleLoading, showDialog} = this.props;
+        callConfirm('確定刪除這筆事件?', ()=>{
+            toggleLoading(1);
+            fetch('/api/ipcam/delevent', getRequest({dir}))
+                .then(response=>response.json())
+                .then(json => {
+                    toggleLoading(0);
+                    if(json.status != 1) return showDialog(json.message);
+                    this.getEvents(-1);
+                })
+        })
+    }
+
+    render() {
+        let {i18n} = this.props;
         return (
-            null
+            <Container>
+                <Segment className="clearfix">
+                    <Message>
+                        <Message.Header>攝影機事件通知位址</Message.Header>
+                        <p>
+                            {`${location.protocol}//${location.host}/camevent`}
+                        </p>
+                    </Message>
+                    <Button basic content="新增" icon="plus" floated="right" type="button" style={{marginBottom: '15px'}} color="green" onClick={()=>{this.openModal(0)}} />
+                    <Table>
+                        <Table.Header>
+                            <Table.Row>
+                                <Table.HeaderCell>操作</Table.HeaderCell>
+                                <Table.HeaderCell>名稱</Table.HeaderCell>
+                                <Table.HeaderCell>IP</Table.HeaderCell>
+                                <Table.HeaderCell>型號</Table.HeaderCell>
+                                <Table.HeaderCell>FTP路徑</Table.HeaderCell>
+                                <Table.HeaderCell>啟用狀態</Table.HeaderCell>
+                            </Table.Row>
+                        </Table.Header>
+                        <Table.Body>
+                            {
+                                this.state.list.map((t,idx) => (
+                                    <ListItem key={idx} 
+                                        i18n={i18n} 
+                                        data={t}
+                                        swActive={this.swActive}
+                                        delIPCam={this.delIPCam}
+                                        openModal={this.openModal}
+                                        getEvents={this.getEvents} />
+                                ))
+                            }
+                        </Table.Body>
+                    </Table>
+                </Segment>
+                <IPCamModal i18n={i18n}
+                    open={this.state.modal.open}
+                    data={this.state.modal.data}
+                    type={this.state.modal.type}
+                    closeModal={this.closeModal}
+                    submitModal={this.submitModal} />
+                <EvtModal i18n={i18n}
+                    open={this.state.evt.open}
+                    list={this.state.evt.list}
+                    sel={this.state.evt.sel}
+                    name={this.state.evt.name}
+                    refreshEvt={this.getEvents}
+                    closeEventModal={this.closeEventModal}
+                    changeSelectEvent={this.changeSelectEvent}
+                    delEvent={this.delEvent} />
+            </Container>
         )
     }
 }

src/components/AdminPage/ModbusCmd/CalModal.js

@@ -0,0 +1,74 @@
+import React from 'react';
+import {Modal, Input, Button, Form, Grid} from 'semantic-ui-react';
+
+const CalModal = ({ i18n, onClose, onSubmit }) => {
+
+    return (
+        <Modal open={true}>
+            <Modal.Header content="數值換算" />
+            <Modal.Content>
+                <Form onSubmit={(e,d) => {
+                        e.preventDefault();
+                        onSubmit(d.formData);
+                    }} serializer={e=>{
+                        let json = {
+                            r1: '',
+                            r2: '',
+                            s1: '',
+                            s2: '',
+                            val: ''
+                        }
+
+                        let r1 = e.querySelector('input[name="r1"]');
+                        if(r1 && 'value' in r1) json.r1 = r1.value;
+                        let r2 = e.querySelector('input[name="r2"]');
+                        if(r2 && 'value' in r2) json.r2 = r2.value;
+                        let s1 = e.querySelector('input[name="s1"]');
+                        if(s1 && 'value' in s1) json.s1 = s1.value;
+                        let s2 = e.querySelector('input[name="s2"]');
+                        if(s2 && 'value' in s2) json.s2 = s2.value;
+                        let val = e.querySelector('input[name="val"]');
+                        if(val && 'value' in val) json.val = val.value;
+
+                        return json;
+                    }}>
+                    <Form.Field>
+                        <label>Range</label>
+                        <Grid columns={2}>
+                            <Grid.Column>
+                                <Input label="RangeMin" name="r1" />
+                            </Grid.Column>
+                            <Grid.Column>
+                                <Input label="RangeMax" name="r2" />
+                            </Grid.Column>
+                        </Grid>
+                    </Form.Field>
+                    <Form.Field>
+                        <label>Scale</label>
+                        <Grid columns={2}>
+                            <Grid.Column>
+                                <Input label="ScaleMin" name="s1" />
+                            </Grid.Column>
+                            <Grid.Column>
+                                <Input label="ScaleMax" name="s2" />
+                            </Grid.Column>
+                        </Grid>
+                    </Form.Field>
+                    <Form.Field>
+                        <Input label="輸入數值" name="val" />
+                    </Form.Field>
+                    <Grid columns={2}>
+                        <Grid.Column>
+                            <Button fluid content="送出" basic />
+                        </Grid.Column>
+                        <Grid.Column>
+                            <Button fluid type="button" content="取消" basic onClick={()=>{onClose()}} />
+                        </Grid.Column>
+                    </Grid>
+                </Form>
+            </Modal.Content>
+        </Modal>
+    )
+}
+
+export default CalModal;

src/components/AdminPage/ModbusCmd/index.js

@@ -1,11 +1,14 @@
 import React from 'react';
 import {Container, Segment, Input, Form, Button} from 'semantic-ui-react';
 import {getRequest} from '../../../actions';
+import CalModal from './CalModal';
 
 class ModbusCmdPage extends React.Component {
 
     state = {
-        res: ''
+        res: '',
+        value: '',
+        modal: false
     }
 
     handleSubmit = (data) => {
@@ -24,6 +27,35 @@ class ModbusCmdPage extends React.Component {
             });
     }
 
+    renderModal = () => {
+        let {i18n} = this.props;
+        return (
+            this.state.modal ? 
+            (
+                <CalModal i18n={i18n} onClose={this.closeModal} onSubmit={this.submitModal} />
+            ): null
+        )
+    }
+
+    closeModal = () => {
+        this.setState({
+            modal: false
+        })
+    }
+
+    submitModal = (data) => {
+        if(!data) return ;
+        let {showDialog} = this.props;
+        let {r1, r2, s1, s2, val} = data;
+        if(!isFinite(r1) || !isFinite(r2) || !isFinite(s1) || !isFinite(s2) || !isFinite(val)) return showDialog('請勿輸入數字以外的內容');
+
+        let value = Math.round(((val - r1) * (s2 - s1)) / (r2 - r1));
+
+        this.setState({
+            value
+        }, ()=>{this.closeModal()})
+    }
+
     render() {
         return (
             <Container>
@@ -66,7 +98,20 @@ class ModbusCmdPage extends React.Component {
                             <Input name="addr" label="請輸入位址" />
                         </Form.Field>
                         <Form.Field>
-                            <Input name="val" label="請輸入數值" />
+                            <Input name="val" 
+                                label="請輸入數值" 
+                                action={{
+                                    content: "數值換算",
+                                    basic: true,
+                                    type: 'button',
+                                    onClick: ()=>{
+                                        this.setState({
+                                            modal: true
+                                        })
+                                    }
+                                }} 
+                                value={this.state.value} 
+                                onChange={(e,d) => {this.setState({value: d.value})}}  />
                         </Form.Field>
                         <Button type="submit" content="送出" fluid />
                     </Form>
@@ -78,6 +123,7 @@ class ModbusCmdPage extends React.Component {
                         ))
                     }
                 </Segment>
+                {this.renderModal()}
             </Container>
         )
     }

src/components/AdminPage/Server/DevList.js

@@ -0,0 +1,40 @@
+import React from 'react';
+import { Menu, List, Icon } from 'semantic-ui-react';
+
+
+class DevList extends React.Component {
+
+
+    render() {
+        let {list, sel,selectDevice, openModal, delData} = this.props;
+        return (
+            <Menu vertical>
+                <Menu.Item>
+                    <Menu.Header className="clearfix">
+                        裝置列表
+                        <Icon name="plus" 
+                            style={{float: 'right',cursor:'pointer'}}
+                            onClick={()=>openModal('device')} />
+                    </Menu.Header>
+                    <Menu.Menu>
+                        {
+                            list.map((t,idx)=>(
+                                <Menu.Item key={idx} active={sel == t.devuid}>
+                                    <span style={{cursor:'pointer'}} onClick={()=>selectDevice(t.devuid)}>{t.name}</span>
+                                    <Icon name="trash"
+                                        style={{cursor:'pointer'}}
+                                        onClick={()=>delData('device', t.devuid)} />
+                                    <Icon name="edit"
+                                        style={{cursor:'pointer'}}
+                                        onClick={()=>openModal('device', 1, t)} />
+                                </Menu.Item>
+                            ))
+                        }
+                    </Menu.Menu>
+                </Menu.Item>
+            </Menu>
+        )
+    }
+}
+
+export default DevList;

src/components/AdminPage/Server/IPMIPage/SetListItem.js

@@ -0,0 +1,27 @@
+import React from 'react';
+import {Table, Button} from 'semantic-ui-react';
+
+const SetListItem = ({ i18n, data, openModal, delData, bmctl, runbmctl }) => {
+
+    return (
+        <Table.Row>
+            <Table.Cell>
+                <Button content="修改" basic onClick={()=>openModal('ipmi', 1, data)} />
+                <Button content="刪除" basic onClick={()=>delData('ipmi', data.ipmuid)} />
+                <Button content="ShowInfo" basic onClick={()=>openModal('ipmiinfo', 0, {id: data.ipmuid})} />
+            </Table.Cell>
+            <Table.Cell>
+                {
+                    bmctl.map((t,idx) => (
+                        <Button key={idx} content={t.name} type="button" onClick={()=>runbmctl(t.uid, data.ipmuid)} />
+                    ))
+                }
+            </Table.Cell>
+            <Table.Cell>{data.ip}</Table.Cell>
+            <Table.Cell>{data.account}</Table.Cell>
+            <Table.Cell>{data.mac}</Table.Cell>
+        </Table.Row>
+    )
+}
+
+export default SetListItem;

src/components/AdminPage/Server/IPMIPage/index.js

@@ -0,0 +1,47 @@
+import React from 'react';
+import {Container, Segment, Button, Table} from 'semantic-ui-react';
+import SelListItem from './SetListItem';
+
+const IPMIPage = ({i18n, list, openModal, delData, bmctl, runbmctl}) => {
+    return (
+        <Container>
+            <Segment className="clearfix">
+                <Button content="新增設定" 
+                    icon="plus" 
+                    floated="right" 
+                    basic 
+                    color="green" 
+                    style={{marginBottom: '15px'}}
+                    onClick={()=>openModal('ipmi')} />
+                <Table>
+                    <Table.Header>
+                        <Table.Row>
+                             <Table.HeaderCell>操作</Table.HeaderCell>
+                            <Table.HeaderCell>設備操作</Table.HeaderCell>
+                            <Table.HeaderCell>IP</Table.HeaderCell>
+                            <Table.HeaderCell>帳號</Table.HeaderCell>
+                            <Table.HeaderCell>MAC Address</Table.HeaderCell>
+                        </Table.Row>
+                    </Table.Header>
+                    <Table.Body>
+                        {
+                            list.map((t,idx) => {
+                                return (
+                                    <SelListItem key={idx} 
+                                        i18n={i18n} 
+                                        data={t}
+                                        openModal={openModal}
+                                        delData={delData}
+                                        bmctl={bmctl}
+                                        runbmctl={runbmctl} /> 
+                                )
+                            })
+                        }
+                    </Table.Body>
+                </Table>
+            </Segment>
+        </Container>
+    )
+}
+
+export default IPMIPage;

src/components/AdminPage/Server/Modals/DevModal.js

@@ -0,0 +1,40 @@
+import React from 'react';
+import {Modal, Form, Input, Button, Grid} from 'semantic-ui-react';
+
+const DevModel = ({ i18n, open, type, data, closeModal, submitModal }) => {
+
+    return (
+        <Modal open={open}>
+            <Modal.Header content={type == 1 ? '修改裝置' : '新增裝置'} />
+            <Modal.Content>
+                <Form onSubmit={(e,d) => {
+                        e.preventDefault();
+                        submitModal('device', type, d.formData);
+                    }} serializer={e=>{
+                        let json = {};
+                        let name = e.querySelector('input[name="name"]');
+                        if(name && 'value' in name) json.name = name.value;
+
+                        if(type == 1) json.id = data.devuid;
+
+                        return json;
+                    }}>
+                    <Form.Field>
+                        <Input label="裝置名稱" name="name" defaultValue={data.name} />
+                    </Form.Field>
+
+                    <Grid columns={2}>
+                        <Grid.Column>
+                            <Button type="submit" content="送出" basic fluid/>
+                        </Grid.Column>
+                        <Grid.Column>
+                            <Button type="button" fluid content="取消" basic onClick={()=>closeModal('device')} />
+                        </Grid.Column>
+                    </Grid>
+                </Form>
+            </Modal.Content>
+        </Modal>
+    )
+}
+
+export default DevModel;

src/components/AdminPage/Server/Modals/IPMIInfoModal.js

@@ -0,0 +1,150 @@
+import React from 'react';
+import {Modal, Segment, Menu, Label, Container, Header, List, Table} from 'semantic-ui-react';
+import {convertTime} from '../../../../tools';
+
+const stateDefault = () => ({
+    open: false,
+    tabIdx: 1
+})
+class IPMIInfoModal extends React.Component {
+    state = {...stateDefault()}
+    componentWillReceiveProps(nextProps){
+        if(nextProps.open != this.state.open){
+            if(nextProps.open == false){
+                this.setState({...stateDefault()})
+            }else{
+                this.setState({
+                    open: true
+                })
+            }
+        }
+    }
+
+    changeIdx = (idx) => {
+        this.setState({
+            tabIdx: idx
+        })
+    }
+
+    getInfoView = () => {
+        switch(this.state.tabIdx){
+            case 1:
+                return <BMCContent group={this.props.bmcgroup} data={this.props.bmcdata} />
+            case 2:
+                return <SensorContent sensor={this.props.sensor} />
+            case 3:
+                return <LogContent log={this.props.log} />
+            default:
+                return null;
+        }
+    }
+
+    render() {
+        let {closeModal} = this.props;
+        return (
+            <Modal size="fullscreen" open={this.state.open} onClose={()=>closeModal('ipmiinfo')}>
+                <Modal.Header content="IPMI Info" />
+                <Modal.Content>
+                    <Menu attached="top" tabular>
+                        <Menu.Item name="BMC Info" active={this.state.tabIdx == 1} onClick={()=>this.changeIdx(1)} />
+                        <Menu.Item name="Sensor" active={this.state.tabIdx == 2} onClick={()=>this.changeIdx(2)} />
+                        <Menu.Item name="Log" active={this.state.tabIdx == 3} onClick={()=>this.changeIdx(3)} />
+                    </Menu>
+                    <Segment attached="bottom">
+                        {this.getInfoView()}
+                    </Segment>
+                </Modal.Content>
+            </Modal>
+        )
+    }
+}
+
+const BMCContent = ({group, data}) => {
+    
+    return (
+        <Container fluid>
+            {
+                group.map((t,idx) => (
+                    <Segment key={idx}>
+                        <Header as="h3" color="blue">
+                            {t.name}
+                            <Header.Subheader>{t.value}</Header.Subheader>
+                        </Header>
+                        <List>
+                        {
+                            data.map((t2, idx) => {
+                                if(t2.guid != t.guid) return null;
+                                return (
+                                <List.Item key={idx}>
+                                    <Label content={t2.name} basic />
+                                    {t2.value}
+                                </List.Item>
+                            )})
+                        }
+                        </List>
+                    </Segment>
+                ))
+            }
+        </Container>
+    )
+}
+
+const LogContent = ({log}) => {
+
+    return (
+        <Container fluid>
+            <Table>
+                <Table.Header>
+                    <Table.Row>
+                        <Table.HeaderCell>行號</Table.HeaderCell>
+                        <Table.HeaderCell>時間</Table.HeaderCell>
+                        <Table.HeaderCell>內容</Table.HeaderCell>
+                    </Table.Row>
+                </Table.Header>
+                <Table.Body>
+                    {
+                        log.map((t,idx) => (
+                            <Table.Row>
+                                <Table.Cell>{t.line}</Table.Cell>
+                                <Table.Cell>{convertTime(t.time, true)}</Table.Cell>
+                                <Table.Cell>{t.content}</Table.Cell>
+                            </Table.Row>
+                        ))
+                    }
+                </Table.Body>
+            </Table>
+        </Container>
+    )
+}
+
+const SensorContent = ({sensor}) => {
+
+    return (
+        <Container fluid>
+            <Table>
+                <Table.Header>
+                    <Table.Row>
+                        <Table.HeaderCell>名稱</Table.HeaderCell>
+                        <Table.HeaderCell>數值</Table.HeaderCell>
+                        <Table.HeaderCell>單位</Table.HeaderCell>
+                        <Table.HeaderCell>狀態</Table.HeaderCell>
+                    </Table.Row>
+                </Table.Header>
+                <Table.Body>
+                    {
+                        sensor.map((t,idx) => (
+                            <Table.Row>
+                                <Table.Cell>{t.name}</Table.Cell>
+                                <Table.Cell>{t.value}</Table.Cell>
+                                <Table.Cell>{t.unit}</Table.Cell>
+                                <Table.Cell>{t.status}</Table.Cell>
+                            </Table.Row>
+                        ))
+                    }
+                </Table.Body>
+            </Table>
+        </Container>
+    )
+}
+
+export default IPMIInfoModal;

src/components/AdminPage/Server/Modals/IPMIModal.js

@@ -0,0 +1,50 @@
+import React from 'react';
+import {Modal, Form, Grid, Input, Button } from 'semantic-ui-react';
+
+const IPMIModal = ({ i18n, open, type, data, closeModal, submitModal }) => {
+
+    return (
+        <Modal open={open}>
+            <Modal.Header content={type == 1 ? '修改設定' : '新增設定'} />
+            <Modal.Content>
+                <Form onSubmit={(e,d) => {
+                        e.preventDefault();
+                        submitModal('ipmi', type, d.formData);
+                    }} serializer={e=>{
+                        let json  ={};
+
+                        let ip = e.querySelector('input[name="ip"]');
+                        if(ip && 'value' in ip) json.ip = ip.value;
+                        let account = e.querySelector('input[name="account"]');
+                        if(account && 'value' in account) json.account = account.value;
+                        let pass = e.querySelector('input[name="password"]');
+                        if(pass && 'value' in pass) json.password = pass.value;
+                        if(type == 1 ) json.id = data.ipmuid;
+
+                        return json;
+                    }}>
+                    <Form.Field>
+                        <Input label="IP" name="ip" defaultValue={data.ip} />
+                    </Form.Field>
+                    <Form.Field>
+                        <Input label="帳號" name="account" defaultValue={data.account} />
+                    </Form.Field>
+                    <Form.Field>
+                        <Input label="密碼" name="password" defaultValue={data.password} />
+                    </Form.Field>
+
+                    <Grid columns={2}>
+                        <Grid.Column>
+                            <Button type="submit" content="送出" basic fluid/>
+                        </Grid.Column>
+                        <Grid.Column>
+                            <Button type="button" fluid content="取消" basic onClick={()=>closeModal('ipmi')} />
+                        </Grid.Column>
+                    </Grid>
+                </Form>
+            </Modal.Content>
+        </Modal>
+    )
+}
+
+export default IPMIModal;

src/components/AdminPage/Server/SNMPPage/index.js

@@ -0,0 +1,18 @@
+import React from 'react';
+import {Container, Segment} from 'semantic-ui-react';
+
+class SNMPPage extends React.Component {
+
+    render() {
+
+        return (
+            <Container>
+                <Segment>
+                    
+                </Segment>
+            </Container>
+        )
+    }
+}
+
+export default SNMPPage;

src/components/AdminPage/Server/index.js

@@ -0,0 +1,333 @@
+import React from 'react';
+import { Container, Segment, Menu, List, Grid } from 'semantic-ui-react';
+import {getRequest} from '../../../actions';
+import DevList from './DevList';
+import IPMIPage from './IPMIPage';
+import DevModal from './Modals/DevModal';
+import IPMIModal from './Modals/IPMIModal';
+import IPMIInfoModal from './Modals/IPMIInfoModal';
+
+const stateDefault = ()=>({
+    list: [],
+    bmctl: [],
+    devSel: {
+        id: null,
+        type: null,
+        data: {
+            snmp: [],
+            ipmi: []
+        }
+    },
+    devModal: {
+        open: false,
+        type: 0,
+        data: {}
+    },
+    ipmiModal: {
+        open: false,
+        type: 0,
+        data: {}
+    },
+    ipmiInfo: {
+        open: false,
+        ipmi: [],
+        log: [],
+        sensor: [],
+        bmcdata: [],
+        bmcgroup: []
+    }
+})
+
+class ServerPage extends React.Component {
+    state = {...stateDefault()}
+
+    componentDidMount(){
+        this.getDevList();
+        this.getBMCtl();
+    }
+
+    getDevList = () => {
+        let {showDialog, toggleLoading} = this.props;
+        toggleLoading(1);
+        fetch('/api/server/getdevicelist', getRequest())
+            .then(response => response.json())
+            .then(json => {
+                toggleLoading(0);
+                if(json.status != 1) return showDialog(json.message);
+                this.setState({
+                    list: json.data.record || []
+                })
+            })
+    }
+
+    getBMCtl = () => {
+        fetch('/api/server/getbmctl', getRequest())
+            .then(response=>response.json())
+            .then(json => {
+                if(json.status == 1) {
+                    this.setState({
+                        bmctl: json.data.record || []
+                    })
+                }
+            })
+    }
+
+    selectDevice = (id, refresh = false) => {
+        if(!id) return ;
+        let {showDialog, toggleLoading} = this.props;
+        toggleLoading(1);
+        fetch('/api/server/getdevice', getRequest({id}))
+            .then(response=>response.json())
+            .then(json => {
+                toggleLoading(0);
+                if(json.status != 1) return showDialog(json.message);
+                let ipmi = json.data.rt.ipmi || [];
+                let snmp = json.data.rt.snmp || [];
+
+                let jdata = {
+                        ...stateDefault().devSel,
+                        id,
+                        data: {
+                            ipmi,
+                            snmp
+                        }
+                    };
+
+                if(refresh) jdata.type = this.state.devSel.type;
+
+                this.setState({
+                    devSel: jdata
+                })
+            })
+    }
+    selectDataType = (type) => {
+        this.setState({
+            devSel: {
+                ...this.state.devSel,
+                type: type
+            }
+        })
+    }
+
+    genSubPage = () => {
+        let {i18n, showDialog, toggleLoading, callConfirm} = this.props;
+        switch(this.state.devSel.type){
+            case 'ipmi':
+                return <IPMIPage i18n={i18n}
+                    showDialog={showDialog}
+                    toggleLoading={toggleLoading}
+                    callConfirm={callConfirm}
+                    list={this.state.devSel.data.ipmi}
+                    openModal={this.openModal}
+                    closeModal={this.closeModal}
+                    delData={this.delData}
+                    bmctl={this.state.bmctl}
+                    runbmctl={this.runbmctl} />
+
+            default:
+                return null;
+        }
+    }
+
+    openModal = (mtype, type = 0, data = {}) => {
+        switch(mtype){
+            case 'device':
+                this.setState({
+                    devModal: {
+                        open: true,
+                        type,
+                        data
+                    }
+                })
+                break;
+            case 'ipmi':
+                this.setState({
+                    ipmiModal:{
+                        open: true,
+                        type,
+                        data
+                    }
+                });
+                break;
+            case 'ipmiinfo':
+                this.getIPMIData(data.id);
+                break;
+            default: 
+                return null;
+        }
+    }
+
+    closeModal = (mtype, cb = null) => {
+        switch(mtype){
+            case 'device':
+                this.setState({devModal: {...stateDefault().devModal}});
+                break;
+            case 'ipmi':
+                this.setState({ipmiModal:{...stateDefault().ipmiModal}});
+                break;
+            case 'ipmiinfo':
+                this.setState({ipmiInfo: {...stateDefault().ipmiInfo}});
+                break;
+        }
+
+        if(cb && typeof cb == 'function') cb();
+    }
+
+    submitModal = (mtype, type = 0, data = {}) => {
+        if(!mtype) return ;
+        let {i18n, showDialog, toggleLoading, callConfirm} = this.props;
+        let url = '';
+        switch(mtype){
+            case 'device':
+                if(type == 1 && !data.id) return showDialog('資料讀取錯誤');
+                if(!data.name) return showDialog('請填寫設備名稱');
+                url = type == 1 ? '/api/server/editdevice' : '/api/server/adddevice';
+                fetch(url, getRequest(data))
+                    .then(response => response.json())
+                    .then(json => {
+                        if(json.status != 1) return showDialog(json.message);
+                        this.closeModal(mtype, ()=>{this.getDevList()});
+                    });
+                break;
+            case 'ipmi':
+                if(type == 1 && !data.id) return showDialog('資料讀取錯誤');
+                if(!data.ip) return showDialog('請填寫IP');
+                if(!data.account) return showDialog('請填寫帳號');
+                if(!data.password) return showDialog('請填寫密碼');
+                data.devuid = this.state.devSel.id;
+                url = type == 1 ? '/api/server/editipmi' : '/api/server/addipmi';
+                fetch(url, getRequest(data))
+                    .then(response=>response.json())
+                    .then(json => {
+                        if(json.status != 1) return showDialog(json.message);
+                        this.closeModal(mtype, ()=>{ this.selectDevice(this.state.devSel.id, true); })
+                    })
+            default :
+                return null;
+        }
+    }
+
+    delData = (mtype, id) => {
+        if(!mtype || !id) return ;
+        let {i18n, showDialog, toggleLoading, callConfirm} = this.props;
+        switch(mtype) {
+            case 'device':
+                callConfirm('確定刪除此裝置?', ()=>{
+                    fetch('/api/server/deldevice', getRequest({id}))
+                        .then(response=>response.json())
+                        .then(json => {
+                            if(json.status != 1) return showDialog(json.message);
+                            this.getDevList();
+                        })
+                });
+                break;
+            case 'ipmi':
+                callConfirm('確定刪除此筆設定?', ()=>{
+                    fetch('/api/server/delipmi', getRequest({id}))
+                        .then(response=>response.json())
+                        .then(json => {
+                            if(json.status != 1) return showDialog(json.message);
+                            this.selectDevice(this.state.devSel.id, true);
+                        });
+                });
+                break;
+        }
+    }
+
+    getIPMIData = (id) => {
+        if(!id) return ;
+        let {i18n, showDialog, toggleLoading, callConfirm} = this.props;
+        toggleLoading(1);
+        fetch('/api/server/getipmiinfo', getRequest({id}))
+            .then(response=>response.json())
+            .then(json => {
+                toggleLoading(0);
+                if(json.status != 1) return showDialog(json.message);
+                let ipmi = json.data.record || [];
+                let sensor = json.data.rt.sensor || [];
+                let log = json.data.rt.log || [];
+                let bmcgroup = json.data.rt.bmcgroup || [];
+                let bmcdata = json.data.rt.bmcdata || [];
+
+                this.setState({
+                    ipmiInfo: {
+                        open: true,
+                        log,
+                        sensor,
+                        ipmi,
+                        bmcdata,
+                        bmcgroup
+                    }
+                })
+            })
+    }
+
+    runbmctl = (ctlid, ipmuid) => {
+        if(!ctlid || !ipmuid) return ;
+        let {i18n, showDialog, toggleLoading, callConfirm} = this.props;
+        toggleLoading(1);
+        fetch('/api/server/runbmctl', getRequest({ctlid, ipmuid}))
+            .then(response=>response.json())
+            .then(json => {
+                toggleLoading(0);
+                if(json.status != 1) return showDialog(json.message);
+                return showDialog('命令執行完成');
+            })
+    }
+
+    render() {
+        let {i18n, showDialog, toggleLoading, callConfirm} = this.props;
+        return (
+            <Container fluid>
+                <Grid>
+                    <Grid.Column width={3}>
+                        <DevList i18n={i18n}
+                            toggleLoading={toggleLoading}
+                            showDialog={showDialog}
+                            callConfirm={callConfirm}
+                            sel={this.state.devSel.id}
+                            selectDevice={this.selectDevice}
+                            list={this.state.list}
+                            openModal={this.openModal}
+                            delData={this.delData} />
+                    </Grid.Column>
+                    <Grid.Column width={13}>
+                        {
+                            this.state.devSel.id != null ? 
+                            (
+                                <Container style={{marginBottom: '10px'}}>
+                                    <Menu fluid widths={2}>
+                                        <Menu.Item name="SNMP" 
+                                            active={this.state.devSel.type == 'snmp'} 
+                                            onClick={()=>this.selectDataType('snmp')}/>
+                                        <Menu.Item name="IPMI" 
+                                            active={this.state.devSel.type == 'ipmi'} 
+                                            onClick={()=>this.selectDataType('ipmi')}/>
+                                    </Menu>
+                                </Container>
+                            ) : null
+                        }
+                        {this.genSubPage()}
+                    </Grid.Column>
+                </Grid>
+                <DevModal i18n={i18n}
+                    open={this.state.devModal.open}
+                    type={this.state.devModal.type}
+                    data={this.state.devModal.data}
+                    closeModal={this.closeModal}
+                    submitModal={this.submitModal} />
+                <IPMIModal i18n={i18n}
+                    open={this.state.ipmiModal.open}
+                    type={this.state.ipmiModal.type}
+                    data={this.state.ipmiModal.data}
+                    closeModal={this.closeModal}
+                    submitModal={this.submitModal} />
+                <IPMIInfoModal i18n={i18n}
+                    {...this.state.ipmiInfo}
+                    closeModal={this.closeModal} />
+            </Container>
+        )
+    }
+}
+
+export default ServerPage;

src/components/AdminPage/Wristband/LocStatus/ListItem.js

@@ -5,7 +5,7 @@ import {convertTime, padding} from '../../../../tools';
 const ListItem = ({i18n, data}) => {
 
     return (
-        <Table.Row style={{color: padding(data.timestamp, 13, 1, '0') < (Date.now() - 60000) ? '#f00' : 'inherit'}}>
+        <Table.Row style={{color: data.loss != 0 ? '#f00' : 'inherit'}}>
             <Table.Cell>{data.wristband}</Table.Cell>
             <Table.Cell>{data.name}</Table.Cell>
             <Table.Cell>{data.locname}</Table.Cell>

src/components/AdminPage/Wristband/LocStatus/index.js

@@ -10,7 +10,7 @@ const sort_icon = {
 
 class LocStatus extends React.Component{
     state = {
-        autoRefresh: false,
+        autoRefresh: true,
         list: [],
         sort: {
             field: '',
@@ -21,6 +21,7 @@ class LocStatus extends React.Component{
 
     componentDidMount(){
         this.getList();
+        this.checkRefresh();
     }
 
     componentWillUnmount(){

src/components/AdminPage/Wristband/LocStatusWloc/index.js

@@ -94,7 +94,7 @@ class LocStatusWloc extends React.Component {
                                         {
                                             t.list ? 
                                             t.list.map((tt, idx) => {
-                                                let isExpire = padding(tt.timestamp, 13, 1, '0') < (Date.now() - 60000) ? true : false;
+                                                let isExpire = tt.loss == 1 ? true : false;
                                                 return (<List.Item key={idx}>
                                                     {
                                                         tt.name ? (

src/components/AdminPage/Wristband/Location/index.js

@@ -75,13 +75,15 @@ class Location extends React.Component {
 
     delLocation = (id) => {
         if(!id) return ;
-        let {showDialog} = this.props;
+        let {showDialog, callConfirm} = this.props;
-        fetch('/api/wristband/dellocation', getRequest({id}))
+        callConfirm('確定要刪除這筆定位點資料?', ()=>{
-            .then(response => response.json())
+            fetch('/api/wristband/dellocation', getRequest({id}))
-            .then(json => {
+                .then(response => response.json())
-                if(json.status != 1) return showDialog(json.message);
+                .then(json => {
-                this.getList();
+                    if(json.status != 1) return showDialog(json.message);
-            })
+                    this.getList();
+                })
+        })
     }
 
     render() {

src/components/AdminPage/Wristband/WristbandInfo/ListItem.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Table, Button } from 'semantic-ui-react';
 
-const ListItem = ({ i18n, data, delWristband, editWristband, showPathInfo }) => {
+const ListItem = ({ i18n, data, delWristband, editWristband, showPathInfo, showHealthInfo }) => {
 
     return (
         <Table.Row>
@@ -9,6 +9,7 @@ const ListItem = ({ i18n, data, delWristband, editWristband, showPathInfo }) =>
                 <Button content="Edit" basic onClick={()=>{editWristband(1, data)}} />
                 <Button content="Delete" basic onClick={()=>{delWristband(data.uid)}} />
                 <Button content="地點紀錄" basic onClick={()=>{showPathInfo(data.mac, data.name)}} />
+                <Button content="生理資訊紀錄" basic onClick={()=>{showHealthInfo(data.mac, data.name)}} />
             </Table.Cell>
             <Table.Cell>{data.mac}</Table.Cell>
             <Table.Cell>{data.name}</Table.Cell>

src/components/AdminPage/Wristband/WristbandInfo/WristbandHealthInfo.js

@@ -0,0 +1,150 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Modal, List, Menu, Button, Input, Label, Table } from 'semantic-ui-react';
+import Datetime from 'react-datetime';
+import {convertTime, padding} from '../../../../tools'
+
+const getDayTime = ()=>{
+    let d = new Date();
+    d.setHours(0, 0, 0, 0);
+    return d.getTime();
+}
+
+class WristbandPathInfo extends React.Component{
+    state = {
+        list: [],
+        page: 1,
+        maxPage: 1,
+        stime: (getDayTime()),
+        etime: (Date.now())
+    }
+
+    componentDidMount(){
+
+    }
+
+    closeView = () => {
+        this.setState({
+            list: [],
+            page: 1,
+            maxPage: 1,
+            stime: (getDayTime()),
+            etime: (Date.now())
+        }, ()=>{
+            this.props.closeModal();
+        })
+    }
+
+    getList = () => {
+        let {mac, showDialog, getRequest} = this.props;
+        fetch('/api/wristband/getwristbandhealthinfo', getRequest({
+            mac,
+            stime: Math.floor(this.state.stime / 1000),
+            etime: Math.floor(this.state.etime / 1000)
+            }))
+            .then(response=>response.json())
+            .then(json => {
+                if(json.status != 1) return showDialog(json.message);
+                let l = json.data.record || [];
+                this.setState({
+                    list: l,
+                    page: 1,
+                    maxPage: Math.ceil(l.length / 20)
+                })
+            })
+    }
+
+    nextPage = () => {
+        let {page, maxPage} = this.state;
+        this.setState({
+            page: page >= maxPage ? maxPage : page+1
+        })
+    }
+
+    prevPage = () => {
+        let {page} = this.state;
+        this.setState({
+            page: page <= 1 ? 1 : page-1
+        })
+    }
+
+    render() {
+        let {closeModal, open} = this.props;
+
+        let tmpList = this.state.list.slice((this.state.page - 1) * 20, ((this.state.page - 1) * 20 + 20))
+
+        return (
+            <Modal open={open} onClose={()=>{this.closeView()}}>
+                <Modal.Header>
+                    手環名稱: {this.props.wbname}
+                </Modal.Header>
+                <Modal.Content>
+                    <Menu>
+                        <Menu.Item>
+                            <Input label="起始時間" input={
+                            <Datetime dateFormat="YYYY-MM-DD" 
+                                timeFormat="HH:mm" 
+                                value={this.state.stime} 
+                                input={true}
+                                onChange={(e)=>{ this.setState({stime: (e.valueOf())}) }} />
+                            }/>
+                        </Menu.Item>
+                        <Menu.Item>
+                            <Input label="結束時間" input={
+                            <Datetime dateFormat="YYYY-MM-DD" 
+                                timeFormat="HH:mm" 
+                                value={this.state.etime} 
+                                input={true}
+                                onChange={(e)=>{ this.setState({etime: (e.valueOf())}) }} />
+                            }/>
+                        </Menu.Item>
+                        <Menu.Menu position="right">
+                            <Menu.Item>
+                                <Button type="button" content="搜尋" size="tiny" basic onClick={()=>{this.getList()}} />
+                            </Menu.Item>
+                        </Menu.Menu>
+                    </Menu>
+
+                    <div style={{textAlign: 'center'}}>
+                        <Button content="上一頁" size="small" labelPosition="left" basic={true} color="black" icon="arrow left" onClick={() => {this.prevPage()}} />
+                        <Label basic={true} color="blue" content={`${this.state.page || 1} / ${this.state.maxPage || 1}`} />
+                        <Button content="下一頁" size="small" labelPosition="right" basic={true} color="black" icon="arrow right" onClick={() => {this.nextPage()}} />
+                    </div>
+
+                    <Table>
+                        <Table.Header>
+                            <Table.Row>
+                                <Table.HeaderCell>HR</Table.HeaderCell>
+                                <Table.HeaderCell>步數</Table.HeaderCell>
+                                <Table.HeaderCell>SBP</Table.HeaderCell>
+                                <Table.HeaderCell>DBP</Table.HeaderCell>
+                                <Table.HeaderCell>卡路里</Table.HeaderCell>
+                                <Table.HeaderCell>SOS</Table.HeaderCell>
+                                <Table.HeaderCell>更新時間</Table.HeaderCell>
+                            </Table.Row>
+                        </Table.Header>
+                        <Table.Body>
+                            {
+                                tmpList.map((t,idx) => {
+                                    return (
+                                        <Table.Row key={idx}>
+                                            <Table.Cell>{parseInt(t.wphyloghr, 16)}</Table.Cell>
+                                            <Table.Cell>{parseInt(t.wphylogsteps, 16)}</Table.Cell>
+                                            <Table.Cell>{parseInt(t.wphylogsbp, 16)}</Table.Cell>
+                                            <Table.Cell>{parseInt(t.wphylogdbp, 16)}</Table.Cell>
+                                            <Table.Cell>{parseInt(t.wphylogcal, 16)}</Table.Cell>
+                                            <Table.Cell>{parseInt(t.wphylogsos, 16)}</Table.Cell>
+                                            <Table.Cell>{convertTime(t.wphylogtst, true)}</Table.Cell>
+                                        </Table.Row>
+                                    )
+                                })
+                            }
+                        </Table.Body>
+                    </Table>
+                </Modal.Content>
+            </Modal>
+        )
+    }
+}
+
+export default WristbandPathInfo;

src/components/AdminPage/Wristband/WristbandInfo/WristbandPathInfo.js

@@ -13,6 +13,8 @@ const getDayTime = ()=>{
 class WristbandPathInfo extends React.Component{
     state = {
         list: [],
+        page: 1,
+        maxPage: 1,
         stime: (getDayTime()),
         etime: (Date.now())
     }
@@ -24,6 +26,8 @@ class WristbandPathInfo extends React.Component{
     closeView = () => {
         this.setState({
             list: [],
+            page: 1,
+            maxPage: 1,
             stime: (getDayTime()),
             etime: (Date.now())
         }, ()=>{
@@ -41,14 +45,34 @@ class WristbandPathInfo extends React.Component{
             .then(response=>response.json())
             .then(json => {
                 if(json.status != 1) return showDialog(json.message);
+                let l = json.data.record || [];
                 this.setState({
-                    list: json.data.record || []
+                    list: l,
+                    page: 1,
+                    maxPage: Math.ceil(l.length / 20)
                 })
             })
     }
 
+    nextPage = () => {
+        let {page, maxPage} = this.state;
+        this.setState({
+            page: page >= maxPage ? maxPage : page+1
+        })
+    }
+
+    prevPage = () => {
+        let {page} = this.state;
+        this.setState({
+            page: page <= 1 ? 1 : page-1
+        })
+    }
+
     render() {
         let {closeModal, open} = this.props;
+
+        let tmpList = this.state.list.slice((this.state.page - 1) * 20, ((this.state.page - 1) * 20 + 20))
+
         return (
             <Modal open={open} onClose={()=>{this.closeView()}}>
                 <Modal.Header>
@@ -80,9 +104,16 @@ class WristbandPathInfo extends React.Component{
                             </Menu.Item>
                         </Menu.Menu>
                     </Menu>
+
+                    <div style={{textAlign: 'center'}}>
+                        <Button content="上一頁" size="small" labelPosition="left" basic={true} color="black" icon="arrow left" onClick={() => {this.prevPage()}} />
+                        <Label basic={true} color="blue" content={`${this.state.page || 1} / ${this.state.maxPage || 1}`} />
+                        <Button content="下一頁" size="small" labelPosition="right" basic={true} color="black" icon="arrow right" onClick={() => {this.nextPage()}} />
+                    </div>
+
                     <List divided>
                         {
-                            this.state.list.map((t,idx) => {
+                            tmpList.map((t,idx) => {
                                 return (
                                     <List.Item key={idx}>
                                         {

src/components/AdminPage/Wristband/WristbandInfo/index.js

@@ -4,6 +4,7 @@ import {getRequest} from '../../../../actions';
 import ListItem from './ListItem';
 import WristbandModal from './WristbandModal';
 import WristbandPathInfo from './WristbandPathInfo';
+import WristbandHealthInfo from './WristbandHealthInfo';
 
 const stateDefault = ()=>({
         list: [],
@@ -16,6 +17,11 @@ const stateDefault = ()=>({
             open: false,
             mac: '',
             name: ''
+        },
+        healthinfo: {
+            open: false,
+            mac: '',
+            name: ''
         }
     })
 
@@ -44,13 +50,16 @@ class WristbandInfo extends React.Component {
 
     delWristband = (id) => {
         if(!id) return ;
+        let {showDialog, callConfirm} = this.props;
 
-        fetch('/api/wristband/delwristband', getRequest({id}))
+        callConfirm('確定要刪除這筆手環資料?', ()=>{
-            .then(response=>response.json())
+            fetch('/api/wristband/delwristband', getRequest({id}))
-            .then(json=>{
+                .then(response=>response.json())
-                if(json.status!=1) return showDialog(json.message);
+                .then(json=>{
-                this.getList();
+                    if(json.status!=1) return showDialog(json.message);
-            })
+                    this.getList();
+                })
+        })
     }
 
     openModal = (type, data = {}) => {
@@ -108,6 +117,24 @@ class WristbandInfo extends React.Component {
         })
     }
 
+    showHealthInfo = (mac, name) => {
+        if(!mac) return ;
+        this.setState({
+            healthinfo:{
+                open: true,
+                mac,
+                name
+            }
+        })
+    }
+    closeHealthInfo = () => {
+        this.setState({
+            healthinfo: {
+                ...stateDefault().healthinfo
+            }
+        })
+    }
+
     render() {
         let { i18n } = this.props;
         return (
@@ -129,7 +156,12 @@ class WristbandInfo extends React.Component {
                         <Table.Body>
                             {
                                 this.state.list.map((t,idx) => (
-                                    <ListItem key={idx} data={t} i18n={i18n} delWristband={this.delWristband} editWristband={this.openModal} showPathInfo={this.showPathInfo}/>
+                                    <ListItem key={idx} data={t} 
+                                        i18n={i18n} 
+                                        delWristband={this.delWristband} 
+                                        editWristband={this.openModal} 
+                                        showPathInfo={this.showPathInfo}
+                                        showHealthInfo={this.showHealthInfo} />
                                 ))
                             }
                         </Table.Body>
@@ -148,6 +180,13 @@ class WristbandInfo extends React.Component {
                     closeModal={this.closePathInfo}
                     showDialog={this.props.showDialog}
                     getRequest={getRequest} />
+                <WristbandHealthInfo i18n={i18n}
+                    open={this.state.healthinfo.open} 
+                    mac={this.state.healthinfo.mac}
+                    wbname={this.state.healthinfo.name}
+                    closeModal={this.closeHealthInfo}
+                    showDialog={this.props.showDialog}
+                    getRequest={getRequest} />
             </Container>
         )
     }

src/components/ConfirmBox.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import {Modal, Button} from 'semantic-ui-react';
+
+const ConfirmBox = ({obj, getNext}) => (
+	<Modal open={obj && obj.msg != '' ? true : false} onClose={() => getNext()} style={{zIndex: "2001"}}>
+		<Modal.Content>{obj && obj.msg ? obj.msg : ''}</Modal.Content>
+		<Modal.Actions>
+			<Button onClick={() => getNext(true, obj.act)} content="Submit" />
+            <Button onClick={() => getNext()} content="Cancel" />
+		</Modal.Actions>
+	</Modal>
+);
+
+
+export default ConfirmBox;

src/components/Login/Form.js

@@ -15,7 +15,7 @@ const loginForm = ({i18n, page, onSubmit}) => {
 			  }}>
 			<Segment stacked={true} >
 				<Form.Field>
-					<Input icon="user" iconPosition="left" name="acc" placeholder={typeof i18n.t == 'function' ? i18n.t(`${page}.input.placeholder.account`) : ''} />
+					<Input icon="user" iconPosition="left" autoFocus={true} name="acc" placeholder={typeof i18n.t == 'function' ? i18n.t(`${page}.input.placeholder.account`) : ''} />
 				</Form.Field>
 				<Form.Field>
 					<Input icon="lock" iconPosition="left" name="pass" type="password" placeholder={typeof i18n.t == 'function' ? i18n.t(`${page}.input.placeholder.password`) : ''} />

src/components/MainMenu/index.js

@@ -22,6 +22,7 @@ const MainMenu = ({i18n, show, toggleMenu, children, permissions, showDashboard,
 				<MItem toLink="/admin/link" txt={i18n && 't' in i18n ? i18n.t('menu.item.link') : ''} permission={permissions.link} onClick={()=>toggleMenu()} />
 				<MItem toLink="/admin/ipcam" txt={i18n && 't' in i18n ? i18n.t('menu.item.ipcam') : ''} permission={permissions.ipcam} onClick={()=>toggleMenu()} />
 				<MItem toLink="/admin/wristband" txt={i18n && 't' in i18n ? i18n.t('menu.item.wristband') : ''} permission={permissions.wristband} onClick={()=>toggleMenu()} />
+				<MItem toLink="/admin/server" txt="伺服器(Server)" permission={permissions.server} onClick={()=>toggleMenu()} />
 				<MItem toLink="/admin" txt={i18n && 't' in i18n ? i18n.t('menu.item.logout') : ''} permission={true} onClick={()=>{
 					sessionStorage.clear();
 					location.replace('/');

src/containers/AdminPage/ActionLinkAdd.js

@@ -1,18 +1,18 @@
-import {connect} from 'react-redux';
+import { connect } from 'react-redux';
-import {add_dialog_msg, toggle_loading} from '../../actions';
+import { add_dialog_msg, toggle_loading } from '../../actions';
-import ActionLinkAdd from '../../components/AdminPage/ActionLinkAdd';
+import ActionLinkAdd from '../../components/AdminPage/ActionLinkAddN';
 
 const mapStateToProps = (state) => ({
-	i18n: state.i18n
+    i18n: state.i18n
 });
 
 const mapDispatchToProps = (dispatch, ownProps) => ({
-	showDialog: (msg) => {
+    showDialog: (msg) => {
-		dispatch(add_dialog_msg(msg));
+        dispatch(add_dialog_msg(msg));
-	},
+    },
-	toggleLoading: (active = false) => {
+    toggleLoading: (active = false) => {
-		dispatch(toggle_loading(active));
+        dispatch(toggle_loading(active));
-	}
+    }
 })
 
 export default connect(mapStateToProps, mapDispatchToProps)(ActionLinkAdd);

src/containers/AdminPage/IPCam.js

@@ -1,17 +1,20 @@
-import {connect} from 'react-redux';
+import { connect } from 'react-redux';
-import {add_dialog_msg, toggle_loading} from '../../actions';
+import { add_dialog_msg, toggle_loading, add_confirm } from '../../actions';
 import IPCamPage from '../../components/AdminPage/IPCam';
 
 const mapStateToProps = (state) => ({
-	i18n: state.i18n
+    i18n: state.i18n
 });
 
 const mapDispatchToProps = (dispatch, ownProps) => ({
-	showDialog: (msg) => {
+    showDialog: (msg) => {
-		dispatch(add_dialog_msg(msg));
+        dispatch(add_dialog_msg(msg));
-	},
+    },
     toggleLoading: (flag = false) => {
         dispatch(toggle_loading(flag));
+    },
+    callConfirm: (msg, act = null) => {
+        dispatch(add_confirm(msg, act));
     }
 })
 

src/containers/AdminPage/Server.js

@@ -0,0 +1,21 @@
+import { connect } from 'react-redux';
+import { add_dialog_msg, toggle_loading, add_confirm } from '../../actions';
+import ServerPage from '../../components/AdminPage/Server';
+
+const mapStateToProps = (state) => ({
+    i18n: state.i18n
+});
+
+const mapDispatchToProps = (dispatch, ownProps) => ({
+    showDialog: (msg) => {
+        dispatch(add_dialog_msg(msg));
+    },
+    toggleLoading: (flag = false) => {
+        dispatch(toggle_loading(flag));
+    },
+    callConfirm: (msg, act = null) => {
+        dispatch(add_confirm(msg, act));
+    }
+})
+
+export default connect(mapStateToProps, mapDispatchToProps)(ServerPage);

src/containers/AdminPage/Wristband/Location.js

@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { add_dialog_msg, toggle_loading } from '../../../actions';
+import { add_dialog_msg, toggle_loading, add_confirm } from '../../../actions';
 import LocationPage from '../../../components/AdminPage/Wristband/Location';
 
 
@@ -13,6 +13,9 @@ const mapDispatchToProps = (dispatch, ownProps) => ({
     },
     toggleLoading: (flag = false) => {
         dispatch(toggle_loading(flag));
+    },
+    callConfirm: (msg, act = null) => {
+        dispatch(add_confirm(msg, act))
     }
 })
 

src/containers/AdminPage/Wristband/WristbandInfo.js

@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { add_dialog_msg, toggle_loading } from '../../../actions';
+import { add_dialog_msg, toggle_loading, add_confirm } from '../../../actions';
 import WristbandInfo from '../../../components/AdminPage/Wristband/WristbandInfo';
 
 
@@ -13,6 +13,9 @@ const mapDispatchToProps = (dispatch, ownProps) => ({
     },
     toggleLoading: (flag = false) => {
         dispatch(toggle_loading(flag));
+    },
+    callConfirm: (msg, act = null) => {
+        dispatch(add_confirm(msg, act))
     }
 })
 

src/containers/AdminPage/Wristband/index.js

@@ -1,16 +1,16 @@
-import {connect} from 'react-redux';
+import { connect } from 'react-redux';
-import {add_dialog_msg, toggle_loading} from '../../../actions';
+import { add_dialog_msg, toggle_loading, add_confirm } from '../../../actions';
 import WristbandPage from '../../../components/AdminPage/Wristband';
 
 
 const mapStateToProps = (state) => ({
-	i18n: state.i18n
+    i18n: state.i18n
 });
 
 const mapDispatchToProps = (dispatch, ownProps) => ({
-	showDialog: (msg) => {
+    showDialog: (msg) => {
-		dispatch(add_dialog_msg(msg));
+        dispatch(add_dialog_msg(msg));
-	},
+    },
     toggleLoading: (flag = false) => {
         dispatch(toggle_loading(flag));
     }

src/containers/AdminPage/index.js

@@ -4,6 +4,7 @@ import Datetime from 'react-datetime';
 import MainMenu from '../../containers/MenuControl';
 import Loading from '../../containers/LoadingControl';
 import Dialog from '../DialogControl';
+import ConfirmBox from '../ConfirmControl';
 import Dashboard from '../../containers/DashBoard';
 import {toggle_dashboard} from '../../actions'
 
@@ -27,6 +28,7 @@ class AdmPage extends React.Component {
 			<div style={{height: '100%'}}>
 				<Loading />
 				<Dialog />
+				<ConfirmBox />
 				<MainMenu i18n={i18n} >
 					<Dashboard />
 					{children}

src/containers/ConfirmControl.js

@@ -0,0 +1,19 @@
+import { connect } from 'react-redux';
+import ConfirmBox from '../components/ConfirmBox';
+import { remove_confirm } from '../actions'
+
+const mapStateToProps = (state) => ({
+    obj: state.confirmbox[0] || null
+});
+
+const mapDispatchToProps = (dispatch, ownProps) => ({
+    getNext: (doit = false, act = null) => {
+        //get next dialog message
+        if (doit) {
+            if (typeof act == 'function') act();
+        }
+        dispatch(remove_confirm());
+    }
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(ConfirmBox);

src/reducers/confirmbox.js

@@ -0,0 +1,15 @@
+const confirmbox = (state = [], action) => {
+    switch (action.type) {
+        case 'confirm_addmsg':
+            return [...state, {
+                msg: action.msg,
+                act: action.act || null
+            }];
+        case 'confirm_remove':
+            return state.slice(1);
+        default:
+            return state;
+    }
+}
+
+export default confirmbox;

src/reducers/index.js

@@ -1,16 +1,18 @@
-import {combineReducers} from 'redux';
+import { combineReducers } from 'redux';
 import dialog from './dialog';
 import i18n from './i18n';
 import ui from './ui';
 import sysinfo from './sysinfo';
 import lists from './lists';
+import confirmbox from './confirmbox';
 
 const reducers = combineReducers({
-	dialog,
+    dialog,
-	i18n,
+    i18n,
-	ui,
+    ui,
-	sysinfo,
+    sysinfo,
-	lists
+    lists,
+    confirmbox
 });
 
 export default reducers;

src/routes.js

@@ -17,6 +17,7 @@ import ActionLinkAdd from './containers/AdminPage/ActionLinkAdd';
 import IPCam from './containers/AdminPage/IPCam';
 import Wristband from './containers/AdminPage/Wristband';
 import ModbusPreview from './containers/AdminPage/ModbusPreview';
+import ServerPage from './containers/AdminPage/Server';
 
 const Routes = (
 	<Route path="/admin" component={AdminPage}>
@@ -36,6 +37,7 @@ const Routes = (
 		<Route path="modbuslog" component={ModbusLog} />
 		<Route path="ipcam" component={IPCam} />
 		<Route path="wristband" component={Wristband} />
+		<Route path="server" component={ServerPage} />
 	</Route>
 );