Merge branch 'pudong_jdk8_wvp' of http://192.168.168.245:8888/panzhaov5/bsth_con…

…trol into pudong_jdk8_wvp

Merge branch 'pudong_jdk8_wvp' of http://192.168.168.245:8888/panzhaov5/bsth_con…
…trol into pudong_jdk8_wvp
徐烜
2 parents 3d521c54 2d62a374
Showing 15 changed files with 319 additions and 300 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/resources/fatso/start.js
src/main/resources/message_en_US.properties
src/main/resources/message_zh_CN.properties
src/main/resources/static/pages/base/section/js/add-vmap-world.js
src/main/resources/static/pages/home.html
src/main/resources/static/pages/permission/authorize_all/user_auth.html
src/main/resources/static/real_control_v2/fragments/home/tooltip.html
src/main/resources/static/real_control_v2/fragments/north/nav/all_devices.html
src/main/resources/static/real_control_v2/fragments/north/nav/kl_config.html
src/main/resources/static/real_control_v2/js/data/data_toolbar.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/mapmonitor/fragments/map_infowindow.html
@@ -259,7 +259,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(basicDataLoader, 1, 1, TimeUnit.HOURS);//基础数据更新
         sexec.scheduleWithFixedDelay(whiteIpDataLoader, 0, 1, TimeUnit.MINUTES);//IP白名单数据更新
         sexec.scheduleWithFixedDelay(autoExecScanThread, 180, 50, TimeUnit.SECONDS);//班次自动执行
-        //DirectivePushQueue.start();//消息队列 -指令，系统下发的
+        DirectivePushQueue.start();//消息队列 -指令，系统下发的
         WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
         /** 线调为其他程序提供的数据 --写入数据库 */
@@ -155,7 +155,8 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
                 userName = RSAUtils.decryptBase64(userName);
                 password = RSAUtils.decryptBase64(password);
             } catch (RuntimeException e) {
-                return put(rs, "msg", "decrypt RSA fail！可能页面已过期，尝试刷新页面。");
+                //return put(rs, "msg", "decrypt RSA fail！可能页面已过期，尝试刷新页面。");
+                return put(rs, "msg", "page is expired, refresh it and try again");
             }
             SysUser user = sysUserService.findByUserName(userName);
@@ -168,12 +169,14 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
             // 校验用户状态
             if (!user.isEnabled()) {
-                return put(rs, "msg", "该用户已被锁定，请联系管理员");
+                //return put(rs, "msg", "该用户已被锁定，请联系管理员");
+                return put(rs, "msg", "your account is locked, please contact administrator");
             }
             // 校验临时状态
             if (USER_LOCKTIME.get(userName) != null && USER_LOCKTIME.get(userName) >= System.currentTimeMillis()) {
-                return put(rs, "msg", "您的账户因密码错误次数过多，处于锁定状态中");
+                //return put(rs, "msg", "您的账户因密码错误次数过多，处于锁定状态中");
+                return put(rs, "msg", "your account is locked");
             }
             // 校验验证码
@@ -183,7 +186,8 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
                     return put(rs, "msg", I18n.getInstance().getMessage("txt-2321"));
                 }
                 if (!verCode.equals(captcha)) {
-                    return put(rs, "msg", "验证码有误，请刷新后重新输入");
+                    //return put(rs, "msg", "验证码有误，请刷新后重新输入");
+                    return put(rs, "msg", I18n.getInstance().getMessage("captcha is error,please refresh and enter again"));
                 }
             }
@@ -217,7 +221,8 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
             logger.error("用户:" + user.getUserName() + "登录");
         } catch (Exception e) {
             logger.error("", e);
-            rs.put("msg", "服务器出现异常，请联系管理员");
+            //rs.put("msg", "服务器出现异常，请联系管理员");
+            rs.put("msg", "server is abnormal, please contact administrator");
         }
         return rs;
     }
@@ -208,7 +208,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     public int send60Operation(String nbbm, int state, int upDown, String sender) {
         logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
-        String text = "切换为 " + (upDown == 0 ? I18n.getInstance().getMessage("txt-3858") : I18n.getInstance().getMessage("txt-3857")) + (state == 0 ? I18n.getInstance().getMessage("txt-3966") : I18n.getInstance().getMessage("txt-4457"));
+        String text = I18n.getInstance().getMessage("txt-4531") + (upDown == 0 ? I18n.getInstance().getMessage("txt-3858") : I18n.getInstance().getMessage("txt-3857")) + "/" + (state == 0 ? I18n.getInstance().getMessage("txt-3966") : I18n.getInstance().getMessage("txt-4457"));
         D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state, null);
         if (null == d60)
-/**
- * @author PanZhao
- * @date 2016年3月17日 下午12:44:06
- */
-var fs = require('fs')
-    , colors = require('colors')
-    , child_process = require('child_process')
-    , EventProxy = require('eventproxy')
-    , parse = require('./parse')
-    , minifier = require('./minifier')
-    , crypto = require("crypto")
-    , handle_real_ctl = require('./handle_real_ctl');
-
-
-var platform = process.platform;
-var iswin = platform == 'win32';
-var sp = platform == 'win32' ? '\\' : '/';
-//不参与的目录
-var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel', 'base' + sp + 'stationroute']
-    , ep = new EventProxy()
-    , pName = 'bsth_control'
-    , path = process.cwd()
-    //根目录
-    , root = path.substr(0, path.indexOf(sp + 'src' + sp + 'main'))
-    , workspace = root.substr(0, root.lastIndexOf(sp + pName))
-    //临时目录
-    , dest = (workspace + sp + pName + '@fatso_copy')
-    , _static = sp + 'src' + sp + 'main' + sp + 'resources' + sp + 'static'
-    , _pages = dest + _static + sp + 'pages';
-
-
-//创建临时目录
-fs.mkdir(dest, function (e) {
-    if (e)
-        logError('创建临时目录出错，请检查目录 ' + dest + '是否存在');
-
-    setTimeout(function () {
-        ep.emit('mvn-clean');
-    }, 500);
-});
-//子进程
-var cProcess;
-
-ep.tail('mvn-clean', function () {
-    //ep.emit('copy-project');
-    //清理target
-    logInfo('mvn clean...');
-    cProcess = child_process.exec("mvn clean", {cwd: workspace + sp + pName}, function (error) {
-        if (error)
-            logError(error);
-
-        logSuccess('mvn clean success');
-
-        ep.emit('copy-project');
-    });
-    output(cProcess);
-});
-
-//复制项目副本
-ep.tail('copy-project', function () {
-    logInfo('copy project...');
-    var xcopyCom;
-    if (iswin)
-        xcopyCom = 'XCOPY ' + root.replace(/\//g, '\\') + ' ' + dest + ' /e /exclude:' + path + '\\exclude.txt';
-    else
-        xcopyCom = 'cp -a ' + root + '/. ' + dest;
-
-    cProcess = child_process.exec(xcopyCom, {cwd: workspace, maxBuffer: 5000 * 1024}, function (error) {
-        if (error)
-            logError(error);
-
-        logSuccess('copy project success');
-
-        ep.emit('check-js');
-    });
-    //output(cProcess);
-});
-
-//检查JS
-ep.tail('check-js', function () {
-    ep.emit('minifier-js');
-});
-
-//合并压缩JS
-ep.tail('minifier-js', function () {
-    logInfo('handle index.html...');
-
-    //再处理首页
-    ep.emit('handle-index', function () {
-        //递归处理片段
-        walk(dest + _static + sp + 'pages', function (item) {
-                ep.emit('handle-fragment', item);
-            },
-            function () {
-                //处理线调首页
-                handle_real_ctl.handleMain(function () {
-                    //处理线调地图
-                    handle_real_ctl.handleMap(function () {
-                        //处理单屏地图页面
-                        handle_real_ctl.handleAlonePage(function () {
-                            //处理单屏主页
-                            handle_real_ctl.handleAloneHomePage(function () {
-                                ep.emit('package-jar');
-                            });
-                        });
-                    });
-                });
-            });
-    });
-});
-
-//打包
-ep.tail('package-jar', function (file) {
-    var packageCom = 'mvn clean package -DskipTests';
-    cProcess = child_process.exec(packageCom, {maxBuffer: 5000 * 1024, cwd: dest}, function (error) {
-        if (error)
-            logError(error);
-
-        logSuccess('mvn package success');
-
-        console.log(('成功打包在 ' + dest + sp + 'target 目录下').cyan);
-    });
-
-    output(cProcess);
-});
-
-//处理片段
-ep.tail('handle-fragment', function (file) {
-    //要排除的文件
-    for (var i = 0, ex; ex = excludes[i++];) {
-        if (file.indexOf(_pages + sp + ex) != -1)
-            return false;
-    }
-    handleJavascript(file, function (mini, $) {
-        var jsMini;
-        if (mini.inside)
-            jsMini = '(function(){' + mini.inside + '\n' + mini.outside + '})();';
-        else
-            jsMini = '(function(){' + mini.outside + '})();';
-
-        write(file, $.html() + '<script>' + jsMini + '</script>');
-    });
-
-});
-
-//处理首页
-ep.tail('handle-index', function (cb) {
-    var index = dest + _static + sp + 'index.html';
-    handleJavascript(index, function (mini, $) {
-        var jsMiniText = mini.inside + mini.outside;
-
-        var code = md5(jsMiniText);
-        fs.open(dest + _static + sp + 'assets' + sp + 'js' + sp + code + '.js', 'a', function (err, fd) {
-            if (err)
-                logError(err);
-
-            fs.write(fd, jsMiniText, function () {
-                var ss = $('script');
-
-                $(ss[ss.length - 1]).before('<script src="/assets/js/' + code + '.js"></script>\n');
-                for (var i = 0, s; s = ss[i++];) {
-                    $(s).removeAttr('data-exclude')
-                        .removeAttr('flag')
-                        .removeAttr('data-autocephaly');
-                }
-                write(index, $.html());
-
-                cb && cb();
-            });
-        });
-    });
-});
-
-
-function handleJavascript(item, cb) {
-    //解析页面
-    var htmlResult = parse.html(item, dest + _static)
-        , jsArray = htmlResult.jsArray
-        , $ = htmlResult.$
-        , scrStr = htmlResult.scriptString;
-
-    //合并压缩
-    var mini = minifier.mergeAndMini(jsArray, scrStr, dest + _static, item);
-
-    cb && cb(mini, $);
-}
-
-function removeJsLink(s, e) {
-    var newArray = [], flag;
-
-    for (var i = 0, si; si = s[i++];) {
-        flag = 0;
-        for (var j = 0, ei; ei = e[j++];) {
-            if (si.indexOf(ei) != -1) {
-                flag = -1;
-                break;
-            }
-        }
-
-        if (flag == 0) {
-            newArray.push(si);
-        }
-    }
-    return newArray;
-}
-
-function write(file, text) {
-    fs.writeFile(file, text, function (err) {
-        if (err) {
-            console.log(err.toString().red);
-            process.exit();
-        }
-        //console.log(file.green);
-    });
-}
-
-function md5(text) {
-    return crypto.createHash("md5").update(text).digest("hex");
-}
-
-
-function walk(path, handleFile, over) {
-    fs.readdir(path, function (err, files) {
-        if (err) {
-            console.log('read dir error'.red);
-        } else {
-            files.forEach(function (item) {
-                var tmpPath = path + sp + item;
-                fs.stat(tmpPath, function (err1, stats) {
-                    if (err1) {
-                        console.log('stat error');
-                    } else {
-                        if (stats.isDirectory()) {
-                            walk(tmpPath, handleFile);
-                        } else if (item.indexOf('.html') != -1) {
-                            handleFile(tmpPath);
-                        }
-                    }
-                })
-            });
-
-            over && over();
-        }
-    });
-}
-
-function logInfo(t) {
-    console.log(t);
-}
-
-function logSuccess(t) {
-    console.log(t.green);
-}
-
-function logError(e) {
-    console.log(e.toString().red);
-    process.exit();
-}
-
-function output(cProcess) {
-    //标准输出
-    cProcess.stdout.on('data', function (s) {
-        console.log(s);
-    });
+/**
+ * @author PanZhao
+ * @date 2016年3月17日 下午12:44:06
+ */
+var fs = require('fs')
+    , colors = require('colors')
+    , child_process = require('child_process')
+    , EventProxy = require('eventproxy')
+    , parse = require('./parse')
+    , minifier = require('./minifier')
+    , crypto = require("crypto")
+    , handle_real_ctl = require('./handle_real_ctl');
+
+
+var platform = process.platform;
+var iswin = platform == 'win32';
+var sp = platform == 'win32' ? '\\' : '/';
+//不参与的目录
+var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel', 'base' + sp + 'stationroute', 'kl', 'dsm']
+    , ep = new EventProxy()
+    , pName = 'bsth_control'
+    , path = process.cwd()
+    //根目录
+    , root = path.substr(0, path.indexOf(sp + 'src' + sp + 'main'))
+    , workspace = root.substr(0, root.lastIndexOf(sp + pName))
+    //临时目录
+    , dest = (workspace + sp + pName + '@fatso_copy')
+    , _static = sp + 'src' + sp + 'main' + sp + 'resources' + sp + 'static'
+    , _pages = dest + _static + sp + 'pages';
+
+
+//创建临时目录
+fs.mkdir(dest, function (e) {
+    if (e)
+        logError('创建临时目录出错，请检查目录 ' + dest + '是否存在');
+
+    setTimeout(function () {
+        ep.emit('mvn-clean');
+    }, 500);
+});
+//子进程
+var cProcess;
+
+ep.tail('mvn-clean', function () {
+    //ep.emit('copy-project');
+    //清理target
+    logInfo('mvn clean...');
+    cProcess = child_process.exec("mvn clean", {cwd: workspace + sp + pName}, function (error) {
+        if (error)
+            logError(error);
+
+        logSuccess('mvn clean success');
+
+        ep.emit('copy-project');
+    });
+    output(cProcess);
+});
+
+//复制项目副本
+ep.tail('copy-project', function () {
+    logInfo('copy project...');
+    var xcopyCom;
+    if (iswin)
+        xcopyCom = 'XCOPY ' + root.replace(/\//g, '\\') + ' ' + dest + ' /e /exclude:' + path + '\\exclude.txt';
+    else
+        xcopyCom = 'cp -a ' + root + '/. ' + dest;
+
+    cProcess = child_process.exec(xcopyCom, {cwd: workspace, maxBuffer: 5000 * 1024}, function (error) {
+        if (error)
+            logError(error);
+
+        logSuccess('copy project success');
+
+        ep.emit('check-js');
+    });
+    //output(cProcess);
+});
+
+//检查JS
+ep.tail('check-js', function () {
+    ep.emit('minifier-js');
+});
+
+//合并压缩JS
+ep.tail('minifier-js', function () {
+    logInfo('handle index.html...');
+
+    //再处理首页
+    ep.emit('handle-index', function () {
+        //递归处理片段
+        walk(dest + _static + sp + 'pages', function (item) {
+                ep.emit('handle-fragment', item);
+            },
+            function () {
+                //处理线调首页
+                handle_real_ctl.handleMain(function () {
+                    //处理线调地图
+                    handle_real_ctl.handleMap(function () {
+                        //处理单屏地图页面
+                        handle_real_ctl.handleAlonePage(function () {
+                            //处理单屏主页
+                            handle_real_ctl.handleAloneHomePage(function () {
+                                ep.emit('package-jar');
+                            });
+                        });
+                    });
+                });
+            });
+    });
+});
+
+//打包
+ep.tail('package-jar', function (file) {
+    var packageCom = 'mvn clean package -DskipTests';
+    cProcess = child_process.exec(packageCom, {maxBuffer: 5000 * 1024, cwd: dest}, function (error) {
+        if (error)
+            logError(error);
+
+        logSuccess('mvn package success');
+
+        console.log(('成功打包在 ' + dest + sp + 'target 目录下').cyan);
+    });
+
+    output(cProcess);
+});
+
+//处理片段
+ep.tail('handle-fragment', function (file) {
+    //要排除的文件
+    for (var i = 0, ex; ex = excludes[i++];) {
+        if (file.indexOf(_pages + sp + ex) != -1)
+            return false;
+    }
+    handleJavascript(file, function (mini, $) {
+        var jsMini;
+        if (mini.inside)
+            jsMini = '(function(){' + mini.inside + '\n' + mini.outside + '})();';
+        else
+            jsMini = '(function(){' + mini.outside + '})();';
+
+        write(file, $.html() + '<script>' + jsMini + '</script>');
+    });
+
+});
+
+//处理首页
+ep.tail('handle-index', function (cb) {
+    var index = dest + _static + sp + 'index.html';
+    handleJavascript(index, function (mini, $) {
+        var jsMiniText = mini.inside + mini.outside;
+
+        var code = md5(jsMiniText);
+        fs.open(dest + _static + sp + 'assets' + sp + 'js' + sp + code + '.js', 'a', function (err, fd) {
+            if (err)
+                logError(err);
+
+            fs.write(fd, jsMiniText, function () {
+                var ss = $('script');
+
+                $(ss[ss.length - 1]).before('<script src="/assets/js/' + code + '.js"></script>\n');
+                for (var i = 0, s; s = ss[i++];) {
+                    $(s).removeAttr('data-exclude')
+                        .removeAttr('flag')
+                        .removeAttr('data-autocephaly');
+                }
+                write(index, $.html());
+
+                cb && cb();
+            });
+        });
+    });
+});
+
+
+function handleJavascript(item, cb) {
+    //解析页面
+    var htmlResult = parse.html(item, dest + _static)
+        , jsArray = htmlResult.jsArray
+        , $ = htmlResult.$
+        , scrStr = htmlResult.scriptString;
+
+    //合并压缩
+    var mini = minifier.mergeAndMini(jsArray, scrStr, dest + _static, item);
+
+    cb && cb(mini, $);
+}
+
+function removeJsLink(s, e) {
+    var newArray = [], flag;
+
+    for (var i = 0, si; si = s[i++];) {
+        flag = 0;
+        for (var j = 0, ei; ei = e[j++];) {
+            if (si.indexOf(ei) != -1) {
+                flag = -1;
+                break;
+            }
+        }
+
+        if (flag == 0) {
+            newArray.push(si);
+        }
+    }
+    return newArray;
+}
+
+function write(file, text) {
+    fs.writeFile(file, text, function (err) {
+        if (err) {
+            console.log(err.toString().red);
+            process.exit();
+        }
+        //console.log(file.green);
+    });
+}
+
+function md5(text) {
+    return crypto.createHash("md5").update(text).digest("hex");
+}
+
+
+function walk(path, handleFile, over) {
+    fs.readdir(path, function (err, files) {
+        if (err) {
+            console.log('read dir error'.red);
+        } else {
+            files.forEach(function (item) {
+                var tmpPath = path + sp + item;
+                fs.stat(tmpPath, function (err1, stats) {
+                    if (err1) {
+                        console.log('stat error');
+                    } else {
+                        if (stats.isDirectory()) {
+                            walk(tmpPath, handleFile);
+                        } else if (item.indexOf('.html') != -1) {
+                            handleFile(tmpPath);
+                        }
+                    }
+                })
+            });
+
+            over && over();
+        }
+    });
+}
+
+function logInfo(t) {
+    console.log(t);
+}
+
+function logSuccess(t) {
+    console.log(t.green);
+}
+
+function logError(e) {
+    console.log(e.toString().red);
+    process.exit();
+}
+
+function output(cProcess) {
+    //标准输出
+    cProcess.stdout.on('data', function (s) {
+        console.log(s);
+    });
 }
 \ No newline at end of file
@@ -2930,7 +2930,7 @@ txt-2929=Station shift
 txt-2930=Comparison time
 txt-2931=
 txt-2932=
-txt-2933=Route scheduling
+txt-2933=Line scheduling
 txt-2934=Map monitoring
 txt-2935=Shift management
 txt-2936=Hydrogen use management
@@ -3176,7 +3176,7 @@ txt-3175=Based on shift
 txt-3176=Command type
 txt-3177=Abnormal type
 txt-3178=Modify type
-txt-3179=Program version
+txt-3179=Version
 txt-3180=License number:
 txt-3181=Run information
 txt-3182=Shift plan
@@ -4517,15 +4517,22 @@ txt-4517=Playback
 txt-4518=Select date
 txt-4519=Channel list
 txt-4520=Split screen
-txt-4521=Number of passenger
+txt-4521=Number
 txt-4522=Passenger flow inquiry
 txt-4523=Abnormal type
 txt-4524=Safe driving inquiry
 txt-4525=Format: 00:00
 txt-4526=Live
 txt-4527=Historical data
+txt-4528=Passenger flow showing setting
+txt-4529=Passenger flow
+txt-4530=There is a problem with the association between shifts and stations
+txt-4531=Switch: 
 txt-5000=Operation successfully
 txt-5001=Operation failed
+txt-5002=Comfortable
+txt-5003=Normal
+txt-5004=Crowded
 dataToolsServiceImpl-line132=not .xls .xlsx type file.
 dataToolsServiceImpl-line143=table content is empty.
@@ -4525,8 +4525,15 @@ txt-4524=安全驾驶查询
 txt-4525=格式: 00:00
 txt-4526=直播
 txt-4527=历史数据
+txt-4528=客流显示设置
+txt-4529=客流信息
+txt-4530=o(*￣▽￣*)o 班次和站点关联有点问题！！
+txt-4531=切换为 
 txt-5000=操作成功
 txt-5001=操作失败
+txt-5002=舒适
+txt-5003=一般
+txt-5004=拥挤
 dataToolsServiceImpl-line132=非.xls .xlsx 格式文件！
 dataToolsServiceImpl-line143=表格内容为空！
@@ -80,14 +80,14 @@ var SectionVmapWorlds = function() {
 		},
 		// 根据名称获取坐标.
 		sectionsNameToPoints : function(sectionNames, callback) {
-			var arguments = new Array();
+			var args = new Array();
 			for (var i = 0;i < sectionNames.length;i++) {
-				arguments.push('searchComplete' + i);
+				args.push('searchComplete' + i);
 			}
-			arguments.push(function(... args) {
-				callback(args);
+			args.push(function() {
+				callback(arguments);
 			})
-			var proxy = EventProxy.create(arguments);
+			var proxy = EventProxy.create(args);
 			sectionNames.forEach(function(item, idx) {
 				var localSearch = new BMap.LocalSearch(mapB);
 				localSearch.setSearchCompleteCallback(function (searchResult) {
@@ -32,7 +32,7 @@
     }
     .system_change_log .label{
-        width: 55px;
+        width: 75px;
         display: inline-block;
         padding: 0 10px;
         line-height: 1.5;
@@ -59,11 +59,11 @@
     }
 </style>
 <div class="system_change_log">
-    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2023-09-16 更新说明 Changelog</h2>
+    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2024-06-16 System Changelog</h2>
     <br><br>
     <ul>
-        <li class="sub_title"><h6>线调、油电管理</h6></li>
-        <li><span class="label s_c_change">$$$$$${txt-4028}</span></li>
+        <li class="sub_title"><h6>Global</h6></li>
+        <li><span class="label s_c_change">$$$$$${txt-4028}</span>1.System Internationalization</li>
     </ul>
 </div>
@@ -76,7 +76,7 @@
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="fbzdzx_config"> $$$$$${txt-1181}</label></li>
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="tts_config"> TTS</label></li>
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="signal_state"> $$$$$${txt-3116}</label></li>
-                <li><label><input class="uk-checkbox" type="checkbox" data-event="kl_config"> 客流信息</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="kl_config"> $$$$$${txt-4529}</label></li>
             </ul>
         </div>
         <div>
@@ -61,13 +61,13 @@
                 <div><span class="field">$$$$$${txt-4521}：</span>{{kl.num}}</div>
                 {{/if}}
                 {{if kl !=null && kl.num <= 5}}
-                <div><span class="field">状态：</span><a href="javascript:;" style="color:green" onclick="javascript:gb_map_play_back.showPhoto('{{kl.photo}}');">舒适</a></div>
+                <div><span class="field">$$$$$${txt-3621}</span><a href="javascript:;" style="color:green" onclick="javascript:gb_map_play_back.showPhoto('{{kl.photo}}');">$$$$$${txt-5002}</a></div>
                 {{/if}}
                 {{if kl !=null && kl.num > 5 && kl.num <= 10}}
-                <div><span class="field">状态：</span><a href="javascript:;" style="color:chocolate" onclick="javascript:gb_map_play_back.showPhoto('{{kl.photo}}');">一般</a></div>
+                <div><span class="field">$$$$$${txt-3621}</span><a href="javascript:;" style="color:chocolate" onclick="javascript:gb_map_play_back.showPhoto('{{kl.photo}}');">$$$$$${txt-5003}</a></div>
                 {{/if}}
                 {{if kl !=null && kl.num > 10}}
-                <div><span class="field">状态：</span><a href="javascript:;" style="color:red" onclick="javascript:gb_map_play_back.showPhoto('{{kl.photo}}');">拥挤</a></div>
+                <div><span class="field">$$$$$${txt-3621}</span><a href="javascript:;" style="color:red" onclick="javascript:gb_map_play_back.showPhoto('{{kl.photo}}');">$$$$$${txt-5004}</a></div>
                 {{/if}}
             </div>
@@ -353,7 +353,7 @@
                     });
                 },
                 delete: function(device){
-                    alt_confirm(i18n('txt-73'), function(){
+                    alt_confirm(i18n('txt-73', [device]), function(){
                         gb_common.$post('/gps/removeRealGps', {device: device}, function(){
                             notify_succ(i18n('txt-2329'));
                             query();
@@ -2,22 +2,22 @@
     <div class="uk-modal-dialog" style="width: 530px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-            <h2>客流显示设置</h2></div>
+            <h2>$$$$$${txt-4528}</h2></div>
         <p style="border-bottom: 1px solid #efefef;color: grey;padding-bottom: 9px;">
             <small>
                 <i class="uk-icon-question-circle"> </i>
-                设置项将会保存在本地客户端，清理缓存和更换电脑会重置.</small>
+                $$$$$${txt-30}</small>
         </p>
         <form class="uk-form uk-form-horizontal">
             <div class="uk-grid">
                 <div class="uk-width-2-3 uk-container-center">
                     <div class="uk-form-row">
-                        <label class="uk-form-label">是否启用</label>
+                        <label class="uk-form-label">$$$$$${txt-3199}</label>
                         <div class="uk-form-controls">
                             <select name="enable">
-                                <option value="1">启用</option>
-                                <option value="0">禁用</option>
+                                <option value="1">$$$$$${txt-3861}</option>
+                                <option value="0">$$$$$${txt-4160}</option>
                             </select>
                         </div>
                     </div>
@@ -25,8 +25,8 @@
             </div>
             <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
-                <button type="button" class="uk-button uk-modal-close">取消</button>
-                <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
+                <button type="button" class="uk-button uk-modal-close">$$$$$${txt-3817}</button>
+                <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;$$$$$${txt-3864}</button>
             </div>
         </form>
     </div>
@@ -188,7 +188,7 @@ var gb_data_menu = [
             },
             {
                 "id": 4.5,
-                "text": "客流信息",
+                "text": i18n('txt-4529'),
                 "event": "kl_config"
             }
@@ -875,7 +875,7 @@ var gb_schedule_table = (function () {
                 continue;
             $(".schedule-wrap span.warn_multi_station[data-updown="+(k.split('_')[1])+"]", wrap)
-                .html('o(*￣▽￣*)o 班次和站点关联有点问题！！').show();
+                .html(i18n('txt-4530')).show();
         }
         errorCodeData = data;
@@ -36,13 +36,13 @@
             <p>$$$$$${txt-4521}：{{kl.num}}</p>
             {{/if}}
             {{if kl !=null && kl.num <= 5}}
-            <p>$$$$$${txt-3621}<a href="javascript:;" style="color:green" onclick="javascript:gb_map_play_back.showPhoto('{{photo}}');">舒适</a></p>
+            <p>$$$$$${txt-3621}<a href="javascript:;" style="color:green" onclick="javascript:gb_map_play_back.showPhoto('{{photo}}');">$$$$$${txt-5002}</a></p>
             {{/if}}
             {{if kl !=null && kl.num > 5 && kl.num <= 10}}
-            <p>$$$$$${txt-3621}<a href="javascript:;" style="color:chocolate" onclick="javascript:gb_map_play_back.showPhoto('{{photo}}');">一般</a></p>
+            <p>$$$$$${txt-3621}<a href="javascript:;" style="color:chocolate" onclick="javascript:gb_map_play_back.showPhoto('{{photo}}');">$$$$$${txt-5003}</a></p>
             {{/if}}
             {{if kl !=null && kl.num > 10}}
-            <p>$$$$$${txt-3621}<a href="javascript:;" style="color:red" onclick="javascript:gb_map_play_back.showPhoto('{{photo}}');">拥挤</a></p>
+            <p>$$$$$${txt-3621}<a href="javascript:;" style="color:red" onclick="javascript:gb_map_play_back.showPhoto('{{photo}}');">$$$$$${txt-5004}</a></p>
             {{/if}}
             {{if energy == 0}}
             <div><span class="field">$$$$$${txt-4435}</span><span style="color: red;">{{energy}}%&nbsp;($$$$$${txt-3832})</span></div>