1、国际化改造；路牌管理前端页面改造

徐烜
1 parent 3b669a5d
Showing 10 changed files with 373 additions and 117 deletions
src/main/resources/static/pages/scheduleApp/language/en.js
src/main/resources/static/pages/scheduleApp/language/zh.js
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/dataImport.html
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/detail.html
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/edit.html
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/form.html
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/index.html
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/orderOptionOpen.html
@@ -921,6 +921,129 @@ var ScheduleApp_en_language = {
     "employeeConfig_module_js_line267_txt-3729" : "Failed:",
     "employeeConfig_module_js_line409_txt-1781" : "Staff {{jsyName}} details",
  
+    //------------ 路牌管理模块 -----------//
+    // 模块位置：../module/core/guideboardManage
+    // 页面；index.html
+    "guideboardManage_index_page_line3_txt-2971" : "Road sign management",
+    "guideboardManage_index_page_line9_txt-3807" : "Home page",
+    "guideboardManage_index_page_line13_txt-1303" : "Operation plan management",
+    "guideboardManage_index_page_line17_txt-2971" : "Road sign management",
+    "guideboardManage_index_page_line36_txt-3689" : "Road sign table",
+    "guideboardManage_index_page_line41_txt-2551" : "Add road sign",
+    "guideboardManage_index_page_line47_txt-3339" : "Data tool",
+    "guideboardManage_index_page_line54_txt-4449" : "Import from excel",
+    "guideboardManage_index_page_line60_txt-4493" : "Export to excel",
+
+    // 页面：orderOptionOpen.html
+    "guideboardManage_orderOptionOpen_page_line5_txt-1682" : "Sort field selection",
+    "guideboardManage_orderOptionOpen_page_line17_txt-4018" : "Yes",
+
+    // 页面：list.html
+    "guideboardManage_list_page_line7_txt-3934" : "Serial number",
+    "guideboardManage_list_page_line8_txt-3347" : "Route name",
+    "guideboardManage_list_page_line9_txt-3215" : "Road sign number",
+    "guideboardManage_list_page_line10_txt-2840" : "Road sign name",
+    "guideboardManage_list_page_line11_txt-3213" : "Road sign type",
+    "guideboardManage_list_page_line12_txt-3874" : "Status",
+    "guideboardManage_list_page_line13_txt-3942" : "Operation",
+    "guideboardManage_list_page_line27_txt-3364" : "Please enter pinyin",
+    "guideboardManage_list_page_line35_txt-1274" : "Please enter the road sign name",
+    "guideboardManage_list_page_line40_txt-3746" : "Voided",
+    "guideboardManage_list_page_line47_txt-4001" : "Search",
+    "guideboardManage_list_page_line57_txt-3385" : "Sorting options",
+    "guideboardManage_list_page_line65_txt-4000" : "Reset",
+    "guideboardManage_list_page_line98_txt-3866" : "Details",
+    "guideboardManage_list_page_line99_txt-4028" : "Modify",
+    "guideboardManage_list_page_line101_txt-674" : "Do you want to invalidate the road sign information?",
+    "guideboardManage_list_page_line102_txt-3429" : "Line:",
+    "guideboardManage_list_page_line102_txt-39" : "If the scheduling rule is associated with this road sign, an error will be reported. It is recommended to modify the road sign information!",
+    "guideboardManage_list_page_line104_txt-4257" : "Yes",
+    "guideboardManage_list_page_line105_txt-3817" : "Cancel",
+    "guideboardManage_list_page_line108_txt-4143" : "Voided",
+    "guideboardManage_list_page_line110_txt-4211" : "Cancel",
+    "guideboardManage_list_page_line119_txt-3053" : "Showing {{from}} to {{to}} of {{total}}entries.10 entries per page",
+    "guideboardManage_list_page_line132_txt-4430" : "First",
+    "guideboardManage_list_page_line133_txt-3613" : "Previous",
+    "guideboardManage_list_page_line134_txt-3614" : "Next",
+    "guideboardManage_list_page_line135_txt-4068" : "Last",
+
+    // 页面：detail.html
+    "guideboardManage_detail_page_line3_txt-2971" : "Road sign management",
+    "guideboardManage_detail_page_line9_txt-3807" : "Home page",
+    "guideboardManage_detail_page_line13_txt-1303" : "Operation plan management",
+    "guideboardManage_detail_page_line17_txt-2971" : "Road sign management",
+    "guideboardManage_detail_page_line21_txt-1637" : "Road sign details",
+    "guideboardManage_detail_page_line45_txt-3347" : "Route name",
+    "guideboardManage_detail_page_line52_txt-3215" : "Road sign number",
+    "guideboardManage_detail_page_line60_txt-2840" : "Road sign name",
+    "guideboardManage_detail_page_line68_txt-3213" : "Road sign type",
+
+    // 页面：edit.html
+    "guideboardManage_edit_page_line3_txt-2971" : "Road sign management",
+    "guideboardManage_edit_page_line9_txt-3807" : "Home page",
+    "guideboardManage_edit_page_line13_txt-1303" : "Operation plan management",
+    "guideboardManage_edit_page_line17_txt-2971" : "Road sign management",
+    "guideboardManage_edit_page_line21_txt-3389" : "Modify road signs",
+    "guideboardManage_edit_page_line29_txt-3849" : "Form",
+    "guideboardManage_edit_page_line38_txt-3347" : "Route name",
+    "guideboardManage_edit_page_line48_txt-3364" : "Please enter pinyin",
+    "guideboardManage_edit_page_line55_txt-1788" : "Line must be selected",
+    "guideboardManage_edit_page_line60_txt-2253" : "Road sign number:",
+    "guideboardManage_edit_page_line63_txt-1273" : "Please enter the road sign number",
+    "guideboardManage_edit_page_line71_txt-919" : "Road sign number must be filled in",
+    "guideboardManage_edit_page_line74_txt-1796" : "Must enter a number",
+    "guideboardManage_edit_page_line82_txt-2840" : "Road sign name",
+    "guideboardManage_edit_page_line85_txt-1274" : "Please enter the road sign name",
+    "guideboardManage_edit_page_line95_txt-918" : "Road sign name must be filled in",
+    "guideboardManage_edit_page_line111_txt-4173" : "Submit",
+    "guideboardManage_edit_page_line114_txt-3817" : "Cancel",
+
+    // 页面：form.html
+    "guideboardManage_form_page_line3_txt-2971" : "Road sign management",
+    "guideboardManage_form_page_line9_txt-3807" : "Home page",
+    "guideboardManage_form_page_line13_txt-1303" : "Operation plan management",
+    "guideboardManage_form_page_line17_txt-2971" : "Road sign management",
+    "guideboardManage_form_page_line21_txt-2551" : "Add road sign",
+    "guideboardManage_form_page_line29_txt-3849" : "Form",
+    "guideboardManage_form_page_line38_txt-3347" : "Route name",
+    "guideboardManage_form_page_line48_txt-3364" : "Please enter pinyin",
+    "guideboardManage_form_page_line55_txt-1788" : "Line must be selected",
+    "guideboardManage_form_page_line60_txt-2253" : "Road sign number:",
+    "guideboardManage_form_page_line63_txt-1273" : "Please enter the road sign number",
+    "guideboardManage_form_page_line71_txt-919" : "Road sign number must be filled in",
+    "guideboardManage_form_page_line74_txt-1796" : "Must enter a number",
+    "guideboardManage_form_page_line82_txt-2840" : "Road sign name",
+    "guideboardManage_form_page_line85_txt-1274" : "Please enter the road sign name",
+    "guideboardManage_form_page_line95_txt-918" : "Road sign name must be filled in",
+    "guideboardManage_form_page_line111_txt-4173" : "Submit",
+    "guideboardManage_form_page_line114_txt-3817" : "Cancel",
+
+    // 页面：dataImport.html
+    "guideboardManage_dataImport_page_line2_txt-4383" : "Road sign import from excel",
+    "guideboardManage_dataImport_page_line7_txt-2684" : "Select file",
+    "guideboardManage_dataImport_page_line20_txt-3658" : "file name",
+    "guideboardManage_dataImport_page_line21_txt-4092" : "Size(MB)",
+    "guideboardManage_dataImport_page_line22_txt-4091" : "progress",
+    "guideboardManage_dataImport_page_line23_txt-3874" : "Status",
+    "guideboardManage_dataImport_page_line24_txt-3942" : "Operation",
+    "guideboardManage_dataImport_page_line53_txt-4154" : "upload",
+    "guideboardManage_dataImport_page_line57_txt-3817" : "Cancel",
+    "guideboardManage_dataImport_page_line60_txt-3868" : "Delete",
+    "guideboardManage_dataImport_page_line71_txt-4015" : "Close",
+
+    // module.js
+    "guideboardManage_module_js_line26_txt-3347" : "Route name",
+    "guideboardManage_module_js_line27_txt-3215" : "Road sign number",
+    "guideboardManage_module_js_line28_txt-2840" : "Road sign name",
+    "guideboardManage_module_js_line29_txt-3213" : "Road sign type",
+    "guideboardManage_module_js_line30_txt-3127" : "Void or not",
+    "guideboardManage_module_js_line31_txt-1806" : "Please select the route!",
+    "guideboardManage_module_js_line177_txt-2943" : "Road sign information",
+    "guideboardManage_module_js_line258_txt-3729" : "Failed:",
+    "guideboardManage_module_js_line347_txt-2626" : "Ordinary road signs",
+    "guideboardManage_module_js_line394_txt-4022" : "Road sign",
+    "guideboardManage_module_js_line394_txt-3066" : "Details",
+
  
     // TODO；
  
@@ -922,6 +922,128 @@ var ScheduleApp_zh_language = {
     "employeeConfig_module_js_line267_txt-3729" : "失败：",
     "employeeConfig_module_js_line409_txt-1781" : "驾驶员 {{jsyName}} 配置详细信息",
  
+    //------------ 路牌管理模块 -----------//
+    // 模块位置：../module/core/guideboardManage
+    // 页面；index.html
+    "guideboardManage_index_page_line3_txt-2971" : "路牌管理",
+    "guideboardManage_index_page_line9_txt-3807" : "首页",
+    "guideboardManage_index_page_line13_txt-1303" : "运营计划管理",
+    "guideboardManage_index_page_line17_txt-2971" : "路牌管理",
+    "guideboardManage_index_page_line36_txt-3689" : "路牌表",
+    "guideboardManage_index_page_line41_txt-2551" : "添加路牌",
+    "guideboardManage_index_page_line47_txt-3339" : "数据工具",
+    "guideboardManage_index_page_line54_txt-4449" : "导入Excel",
+    "guideboardManage_index_page_line60_txt-4493" : "导出Excel",
+
+    // 页面：orderOptionOpen.html
+    "guideboardManage_orderOptionOpen_page_line5_txt-1682" : "排序字段选择",
+    "guideboardManage_orderOptionOpen_page_line17_txt-4018" : "确定",
+
+    // 页面：list.html
+    "guideboardManage_list_page_line7_txt-3934" : "序号",
+    "guideboardManage_list_page_line8_txt-3347" : "线路名称",
+    "guideboardManage_list_page_line9_txt-3215" : "路牌编号",
+    "guideboardManage_list_page_line10_txt-2840" : "路牌名称",
+    "guideboardManage_list_page_line11_txt-3213" : "路牌类型",
+    "guideboardManage_list_page_line12_txt-3874" : "状态",
+    "guideboardManage_list_page_line13_txt-3942" : "操作",
+    "guideboardManage_list_page_line27_txt-3364" : "请输拼音",
+    "guideboardManage_list_page_line35_txt-1274" : "请输入路牌名字",
+    "guideboardManage_list_page_line40_txt-3746" : "已作废",
+    "guideboardManage_list_page_line47_txt-4001" : "搜索",
+    "guideboardManage_list_page_line57_txt-3385" : "排序选项",
+    "guideboardManage_list_page_line65_txt-4000" : "重置",
+    "guideboardManage_list_page_line98_txt-3866" : "详细",
+    "guideboardManage_list_page_line99_txt-4028" : "修改",
+    "guideboardManage_list_page_line101_txt-674" : "是否作废路牌信息？",
+    "guideboardManage_list_page_line102_txt-3429" : "线路：",
+    "guideboardManage_list_page_line102_txt-39" : "如果排班规则关联此路牌，会报错，建议修改路牌信息！",
+    "guideboardManage_list_page_line104_txt-4257" : "是",
+    "guideboardManage_list_page_line105_txt-3817" : "取消",
+    "guideboardManage_list_page_line108_txt-4143" : "作废",
+    "guideboardManage_list_page_line110_txt-4211" : "撤销",
+    "guideboardManage_list_page_line119_txt-3053" : "显示从{{from}}到{{to}} 共{{total}}条 每页显示10条",
+    "guideboardManage_list_page_line132_txt-4430" : "首页",
+    "guideboardManage_list_page_line133_txt-3613" : "上一页",
+    "guideboardManage_list_page_line134_txt-3614" : "下一页",
+    "guideboardManage_list_page_line135_txt-4068" : "尾页",
+
+    // 页面：detail.html
+    "guideboardManage_detail_page_line3_txt-2971" : "路牌管理",
+    "guideboardManage_detail_page_line9_txt-3807" : "首页",
+    "guideboardManage_detail_page_line13_txt-1303" : "运营计划管理",
+    "guideboardManage_detail_page_line17_txt-2971" : "路牌管理",
+    "guideboardManage_detail_page_line21_txt-1637" : "路牌详细信息",
+    "guideboardManage_detail_page_line45_txt-3347" : "线路名称",
+    "guideboardManage_detail_page_line52_txt-3215" : "路牌编号",
+    "guideboardManage_detail_page_line60_txt-2840" : "路牌名称",
+    "guideboardManage_detail_page_line68_txt-3213" : "路牌类型",
+
+    // 页面：edit.html
+    "guideboardManage_edit_page_line3_txt-2971" : "路牌管理",
+    "guideboardManage_edit_page_line9_txt-3807" : "首页",
+    "guideboardManage_edit_page_line13_txt-1303" : "运营计划管理",
+    "guideboardManage_edit_page_line17_txt-2971" : "路牌管理",
+    "guideboardManage_edit_page_line21_txt-3389" : "修改路牌",
+    "guideboardManage_edit_page_line29_txt-3849" : "表单",
+    "guideboardManage_edit_page_line38_txt-3347" : "线路名称",
+    "guideboardManage_edit_page_line48_txt-3364" : "请输拼音",
+    "guideboardManage_edit_page_line55_txt-1788" : "线路必须选择",
+    "guideboardManage_edit_page_line60_txt-2253" : "路牌编号：",
+    "guideboardManage_edit_page_line63_txt-1273" : "请输入路牌编号",
+    "guideboardManage_edit_page_line71_txt-919" : "路牌编号必须填写",
+    "guideboardManage_edit_page_line74_txt-1796" : "必须输入数字",
+    "guideboardManage_edit_page_line82_txt-2840" : "路牌名称",
+    "guideboardManage_edit_page_line85_txt-1274" : "请输入路牌名字",
+    "guideboardManage_edit_page_line95_txt-918" : "路牌名称必须填写",
+    "guideboardManage_edit_page_line111_txt-4173" : "提交",
+    "guideboardManage_edit_page_line114_txt-3817" : "取消",
+
+    // 页面：form.html
+    "guideboardManage_form_page_line3_txt-2971" : "路牌管理",
+    "guideboardManage_form_page_line9_txt-3807" : "首页",
+    "guideboardManage_form_page_line13_txt-1303" : "运营计划管理",
+    "guideboardManage_form_page_line17_txt-2971" : "路牌管理",
+    "guideboardManage_form_page_line21_txt-2551" : "添加路牌",
+    "guideboardManage_form_page_line29_txt-3849" : "表单",
+    "guideboardManage_form_page_line38_txt-3347" : "线路名称",
+    "guideboardManage_form_page_line48_txt-3364" : "请输拼音",
+    "guideboardManage_form_page_line55_txt-1788" : "线路必须选择",
+    "guideboardManage_form_page_line60_txt-2253" : "路牌编号：",
+    "guideboardManage_form_page_line63_txt-1273" : "请输入路牌编号",
+    "guideboardManage_form_page_line71_txt-919" : "路牌编号必须填写",
+    "guideboardManage_form_page_line74_txt-1796" : "必须输入数字",
+    "guideboardManage_form_page_line82_txt-2840" : "路牌名称",
+    "guideboardManage_form_page_line85_txt-1274" : "请输入路牌名字",
+    "guideboardManage_form_page_line95_txt-918" : "路牌名称必须填写",
+    "guideboardManage_form_page_line111_txt-4173" : "提交",
+    "guideboardManage_form_page_line114_txt-3817" : "取消",
+
+    // 页面：dataImport.html
+    "guideboardManage_dataImport_page_line2_txt-4383" : "路牌信息excel数据导入",
+    "guideboardManage_dataImport_page_line7_txt-2684" : "选择文件",
+    "guideboardManage_dataImport_page_line20_txt-3658" : "文件名",
+    "guideboardManage_dataImport_page_line21_txt-4092" : "大小(M)",
+    "guideboardManage_dataImport_page_line22_txt-4091" : "进度",
+    "guideboardManage_dataImport_page_line23_txt-3874" : "状态",
+    "guideboardManage_dataImport_page_line24_txt-3942" : "操作",
+    "guideboardManage_dataImport_page_line53_txt-4154" : "上传",
+    "guideboardManage_dataImport_page_line57_txt-3817" : "取消",
+    "guideboardManage_dataImport_page_line60_txt-3868" : "删除",
+    "guideboardManage_dataImport_page_line71_txt-4015" : "关闭",
+
+    // module.js
+    "guideboardManage_module_js_line26_txt-3347" : "线路名称",
+    "guideboardManage_module_js_line27_txt-3215" : "路牌编号",
+    "guideboardManage_module_js_line28_txt-2840" : "路牌名称",
+    "guideboardManage_module_js_line29_txt-3213" : "路牌类型",
+    "guideboardManage_module_js_line30_txt-3127" : "是否作废",
+    "guideboardManage_module_js_line31_txt-1806" : "请选择线路！",
+    "guideboardManage_module_js_line177_txt-2943" : "路牌信息",
+    "guideboardManage_module_js_line258_txt-3729" : "失败：",
+    "guideboardManage_module_js_line347_txt-2626" : "普通路牌",
+    "guideboardManage_module_js_line394_txt-4022" : "路牌",
+    "guideboardManage_module_js_line394_txt-3066" : "详细信息",
  
  
  
 <div class="modal-header">
-    <h3 class="modal-title">$$$$$${txt-4383}</h3>
+    <h3 class="modal-title">{{"guideboardManage_dataImport_page_line2_txt-4383" | translate}}</h3>
 </div>
 <div class="modal-body">
     <div class="col-md-6">
         <div class="input-group">
-            <input type="file" class="form-control" nv-file-select="" uploader="ctrl.uploader"/>
-        <span class="input-group-btn">
+            <label class="btn btn-info" for="xFile">{{"guideboardManage_dataImport_page_line7_txt-2684" | translate}}</label>
+            <input id="xFile" type="file" style="position: absolute;clip: rect(0 0 0 0);" class="form-control" nv-file-select="" uploader="ctrl.uploader"/>
             <button type="button" ng-click="ctrl.clearInputFile()" class="btn btn-default">
                 <span class="glyphicon glyphicon-trash"></span>
             </button>
-        </span>
         </div>
     </div>
  
     <div class="table-scrollable table-scrollable-borderless">
+
         <table class="table table-hover table-light">
             <thead>
             <tr class="uppercase">
-                <th width="50%">$$$$$${txt-3658}</th>
-                <th ng-show="ctrl.uploader.isHTML5">$$$$$${txt-4092}</th>
-                <th ng-show="ctrl.uploader.isHTML5">$$$$$${txt-4091}</th>
-                <th>$$$$$${txt-3874}</th>
-                <th>$$$$$${txt-3942}</th>
+                <th width="50%">{{"guideboardManage_dataImport_page_line20_txt-3658" | translate}}</th>
+                <th ng-show="ctrl.uploader.isHTML5">{{"guideboardManage_dataImport_page_line21_txt-4092" | translate}}</th>
+                <th ng-show="ctrl.uploader.isHTML5">{{"guideboardManage_dataImport_page_line22_txt-4091" | translate}}</th>
+                <th>{{"guideboardManage_dataImport_page_line23_txt-3874" | translate}}</th>
+                <th>{{"guideboardManage_dataImport_page_line24_txt-3942" | translate}}</th>
             </tr>
             </thead>
             <tbody>
@@ -50,14 +50,14 @@
                 <td nowrap>
                     <button type="button" class="btn btn-success btn-xs" ng-click="item.upload()"
                             ng-disabled="item.isReady || item.isUploading || item.isSuccess">
-                        <span class="glyphicon glyphicon-upload"></span> $$$$$${txt-4154}
+                        <span class="glyphicon glyphicon-upload"></span> {{"guideboardManage_dataImport_page_line53_txt-4154" | translate}}
                     </button>
                     <button type="button" class="btn btn-warning btn-xs" ng-click="item.cancel()"
                             ng-disabled="!item.isUploading">
-                        <span class="glyphicon glyphicon-ban-circle"></span> $$$$$${txt-3817}
+                        <span class="glyphicon glyphicon-ban-circle"></span> {{"guideboardManage_dataImport_page_line57_txt-3817" | translate}}
                     </button>
                     <button type="button" class="btn btn-danger btn-xs" ng-click="item.remove()">
-                        <span class="glyphicon glyphicon-trash"></span> $$$$$${txt-3868}
+                        <span class="glyphicon glyphicon-trash"></span> {{"guideboardManage_dataImport_page_line60_txt-3868" | translate}}
                     </button>
                 </td>
             </tr>
@@ -68,5 +68,5 @@
 </div>
  
 <div class="modal-footer">
-    <button class="btn btn-primary" ng-click="ctrl.close()">$$$$$${txt-4015}</button>
-</div>
 \ No newline at end of file
+    <button class="btn btn-primary" ng-click="ctrl.close()">{{"guideboardManage_dataImport_page_line71_txt-4015" | translate}}</button>
+</div>
 <div class="page-head">
     <div class="page-title">
-        <h1>$$$$$${txt-2971}</h1>
+        <h1>{{"guideboardManage_detail_page_line3_txt-2971" | translate}}</h1>
     </div>
 </div>
  
 <ul class="page-breadcrumb breadcrumb">
     <li>
-        <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
+        <a href="/pages/home.html" data-pjax>{{"guideboardManage_detail_page_line9_txt-3807" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-1303}</span>
+        <span class="active">{{"guideboardManage_detail_page_line13_txt-1303" | translate}}</span>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <a ui-sref="guideboardManage">$$$$$${txt-2971}</a>
+        <a ui-sref="guideboardManage">{{"guideboardManage_detail_page_line17_txt-2971" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-1637}</span>
+        <span class="active">{{"guideboardManage_detail_page_line21_txt-1637" | translate}}</span>
     </li>
 </ul>
  
@@ -42,14 +42,14 @@
             <!-- 其他信息放置在这里 -->
             <div class="form-body">
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3815}*：</label>
+                    <label class="col-md-2 control-label">{{"guideboardManage_detail_page_line45_txt-3347" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control"
                                name="xl" ng-model="ctrl.guideboardForDetail.xl.name" readonly/>
                     </div>
                 </div>
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3215}*：</label>
+                    <label class="col-md-2 control-label">{{"guideboardManage_detail_page_line52_txt-3215" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control"
                                name="lpNo" ng-model="ctrl.guideboardForDetail.lpNo" readonly/>
@@ -57,7 +57,7 @@
                 </div>
  
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-2840}*：</label>
+                    <label class="col-md-2 control-label">{{"guideboardManage_detail_page_line60_txt-2840" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control" name="lpName"
                                ng-model="ctrl.guideboardForDetail.lpName" readonly/>
@@ -65,7 +65,7 @@
                 </div>
  
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3213}*：</label>
+                    <label class="col-md-2 control-label">{{"guideboardManage_detail_page_line68_txt-3213" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control" name="lpType"
                                ng-model="ctrl.guideboardForDetail.lpType" readonly/>
@@ -79,4 +79,4 @@
         </form>
  
     </div>
-</div>
 \ No newline at end of file
+</div>
 <div class="page-head">
     <div class="page-title">
-        <h1>$$$$$${txt-2971}</h1>
+        <h1>{{"guideboardManage_edit_page_line3_txt-2971" | translate}}</h1>
     </div>
 </div>
  
 <ul class="page-breadcrumb breadcrumb">
     <li>
-        <a href="/pages/home.html" data-pjax="">$$$$$${txt-3807}</a>
+        <a href="/pages/home.html" data-pjax="">{{"guideboardManage_edit_page_line9_txt-3807" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-1303}</span>
+        <span class="active">{{"guideboardManage_edit_page_line13_txt-1303" | translate}}</span>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <a ui-sref="guideboardManage">$$$$$${txt-2971}</a>
+        <a ui-sref="guideboardManage">{{"guideboardManage_edit_page_line17_txt-2971" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-3389}</span>
+        <span class="active">{{"guideboardManage_edit_page_line21_txt-3389" | translate}}</span>
     </li>
 </ul>
  
@@ -26,7 +26,7 @@
     <div class="portlet-title">
         <div class="caption">
             <i class="icon-equalizer font-red-sunglo"></i> <span
-                class="caption-subject font-red-sunglo bold uppercase">$$$$$${txt-3849}</span>
+                class="caption-subject font-red-sunglo bold uppercase">{{"guideboardManage_edit_page_line29_txt-3849" | translate}}</span>
         </div>
     </div>
  
@@ -35,7 +35,7 @@
  
             <div class="form-body">
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3815}*：</label>
+                    <label class="col-md-2 control-label">{{"guideboardManage_edit_page_line38_txt-3347" | translate}}*：</label>
                     <div class="col-md-3">
                         <sa-Select5 name="xl"
                                     model="ctrl.guideboardManageForForm"
@@ -45,22 +45,22 @@
                                     dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
                                     iterobjname="item"
                                     iterobjexp="item.name"
-                                    searchph="$$$$$${txt-3364}"
+                                    searchph="{{'guideboardManage_edit_page_line48_txt-3364' | translate}}"
                                     searchexp="this.name"
                                     required >
                         </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
-                        $$$$$${txt-1788}
+                        {{"guideboardManage_edit_page_line55_txt-1788" | translate}}
                     </div>
                 </div>
  
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-2253}</label>
+                    <label class="col-md-2 control-label">{{"guideboardManage_edit_page_line60_txt-2253" | translate}}</label>
                     <div class="col-md-3">
                         <input type="number" class="form-control" ng-model="ctrl.guideboardManageForForm.lpNo"
-                               name="lpNo" placeholder="$$$$$${txt-1273}" min="1" required
+                               name="lpNo" placeholder="{{'guideboardManage_edit_page_line63_txt-1273' | translate}}" min="1" required
                                remote-Validation
                                remotevtype="gbv1"
                                remotevparam="{{ {'id_eq': ctrl.guideboardManageForForm.id, 'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpNo_eq': ctrl.guideboardManageForForm.lpNo} | json}}"
@@ -68,10 +68,10 @@
                                 />
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.lpNo.$error.required">
-                        $$$$$${txt-919}
+                        {{"guideboardManage_edit_page_line71_txt-919" | translate}}
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.lpNo.$error.number">
-                        $$$$$${txt-1796}
+                        {{"guideboardManage_edit_page_line74_txt-1796" | translate}}
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.lpNo.$error.remote">
                         {{$remote_msg}}
@@ -79,10 +79,10 @@
                 </div>
  
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-2840}*：</label>
+                    <label class="col-md-2 control-label">{{"guideboardManage_edit_page_line82_txt-2840" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control" ng-model="ctrl.guideboardManageForForm.lpName"
-                               name="lpName" placeholder="$$$$$${txt-1274}" required
+                               name="lpName" placeholder="{{'guideboardManage_edit_page_line85_txt-1274' | translate}}" required
                                remote-Validation
                                remotevtype="gbv2"
                                remotevparam="{{ {'id_eq': ctrl.guideboardManageForForm.id, 'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpName_eq': ctrl.guideboardManageForForm.lpName} | json}}"
@@ -92,7 +92,7 @@
  
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.lpName.$error.required">
-                        $$$$$${txt-918}
+                        {{"guideboardManage_edit_page_line95_txt-918" | translate}}
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.lpName.$error.remote">
                         {{$remote_msg}}
@@ -108,10 +108,10 @@
                 <div class="row">
                     <div class="col-md-offset-3 col-md-4">
                         <button type="submit" class="btn green" ng-disabled="!myForm.$valid">
-                            <i class="fa fa-check">$$$$$${txt-4173}</i>
+                            <i class="fa fa-check">{{"guideboardManage_edit_page_line111_txt-4173" | translate}}</i>
                         </button>
                         <a type="button" class="btn default" ui-sref="guideboardManage">
-                            <i class="fa fa-times">$$$$$${txt-3817}</i>
+                            <i class="fa fa-times">{{"guideboardManage_edit_page_line114_txt-3817" | translate}}</i>
                         </a>
                     </div>
                 </div>
 <div class="page-head">
     <div class="page-title">
-        <h1>$$$$$${txt-2971}</h1>
+        <h1>{{"guideboardManage_form_page_line3_txt-2971" | translate}}</h1>
     </div>
 </div>
  
 <ul class="page-breadcrumb breadcrumb">
     <li>
-        <a href="/pages/home.html" data-pjax="">$$$$$${txt-3807}</a>
+        <a href="/pages/home.html" data-pjax="">{{"guideboardManage_form_page_line9_txt-3807" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-1303}</span>
+        <span class="active">{{"guideboardManage_form_page_line13_txt-1303" | translate}}</span>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <a ui-sref="guideboardManage">$$$$$${txt-2971}</a>
+        <a ui-sref="guideboardManage">{{"guideboardManage_form_page_line17_txt-2971" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-2551}</span>
+        <span class="active">{{"guideboardManage_form_page_line21_txt-2551" | translate}}</span>
     </li>
 </ul>
  
@@ -26,7 +26,7 @@
     <div class="portlet-title">
         <div class="caption">
             <i class="icon-equalizer font-red-sunglo"></i> <span
-                class="caption-subject font-red-sunglo bold uppercase">$$$$$${txt-3849}</span>
+                class="caption-subject font-red-sunglo bold uppercase">{{"guideboardManage_form_page_line29_txt-3849" | translate}}</span>
         </div>
     </div>
  
@@ -35,7 +35,7 @@
  
             <div class="form-body">
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-3815}*：</label>
+                    <label class="col-md-2 control-label">{{"guideboardManage_form_page_line38_txt-3347" | translate}}*：</label>
                     <div class="col-md-3">
                         <sa-Select5 name="xl"
                                     model="ctrl.guideboardManageForForm"
@@ -45,22 +45,22 @@
                                     dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
                                     iterobjname="item"
                                     iterobjexp="item.name"
-                                    searchph="$$$$$${txt-3364}"
+                                    searchph="{{'guideboardManage_form_page_line48_txt-3364' | translate}}"
                                     searchexp="this.name"
                                     required >
                         </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
-                        $$$$$${txt-1788}
+                        {{"guideboardManage_form_page_line55_txt-1788" | translate}}
                     </div>
                 </div>
  
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-2253}</label>
+                    <label class="col-md-2 control-label">{{"guideboardManage_form_page_line60_txt-2253" | translate}}</label>
                     <div class="col-md-3">
                         <input type="number" class="form-control" ng-model="ctrl.guideboardManageForForm.lpNo"
-                               name="lpNo" placeholder="$$$$$${txt-1273}" min="1" required
+                               name="lpNo" placeholder="{{'guideboardManage_form_page_line63_txt-1273' | translate}}" min="1" required
                                remote-Validation
                                remotevtype="gbv1"
                                remotevparam="{{ {'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpNo_eq': ctrl.guideboardManageForForm.lpNo} | json}}"
@@ -68,10 +68,10 @@
                                 />
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.lpNo.$error.required">
-                        $$$$$${txt-919}
+                        {{"guideboardManage_form_page_line71_txt-919" | translate}}
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.lpNo.$error.number">
-                        $$$$$${txt-1796}
+                        {{"guideboardManage_form_page_line74_txt-1796" | translate}}
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.lpNo.$error.remote">
                         {{$remote_msg}}
@@ -79,10 +79,10 @@
                 </div>
  
                 <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">$$$$$${txt-2840}*：</label>
+                    <label class="col-md-2 control-label">{{"guideboardManage_form_page_line82_txt-2840" | translate}}*：</label>
                     <div class="col-md-3">
                         <input type="text" class="form-control" ng-model="ctrl.guideboardManageForForm.lpName"
-                               name="lpName" placeholder="$$$$$${txt-1274}" required
+                               name="lpName" placeholder="{{'guideboardManage_form_page_line85_txt-1274' | translate}}" required
                                remote-Validation
                                remotevtype="gbv2"
                                remotevparam="{{ {'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpName_eq': ctrl.guideboardManageForForm.lpName} | json}}"
@@ -92,7 +92,7 @@
  
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.lpName.$error.required">
-                        $$$$$${txt-918}
+                        {{"guideboardManage_form_page_line95_txt-918" | translate}}
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.lpName.$error.remote">
                         {{$remote_msg}}
@@ -107,13 +107,11 @@
             <div class="form-actions">
                 <div class="row">
                     <div class="col-md-offset-3 col-md-4">
-                        <button type="submit" class="btn green"
-                                ng-disabled="!myForm.$valid"
-                                >
-                            <i class="fa fa-check">$$$$$${txt-4173}</i>
+                        <button type="submit" class="btn green" ng-disabled="!myForm.$valid">
+                            <i class="fa fa-check">{{"guideboardManage_form_page_line111_txt-4173" | translate}}</i>
                         </button>
                         <a type="button" class="btn default" ui-sref="guideboardManage">
-                            <i class="fa fa-times">$$$$$${txt-3817}</i>
+                            <i class="fa fa-times">{{"guideboardManage_form_page_line114_txt-3817" | translate}}</i>
                         </a>
                     </div>
                 </div>
 <div class="page-head">
     <div class="page-title">
-        <h1>$$$$$${txt-2971}</h1>
+        <h1>{{"guideboardManage_index_page_line3_txt-2971" | translate}}</h1>
     </div>
 </div>
  
 <ul class="page-breadcrumb breadcrumb">
     <li>
-        <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
+        <a href="/pages/home.html" data-pjax>{{"guideboardManage_index_page_line9_txt-3807" | translate}}</a>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-1303}</span>
+        <span class="active">{{"guideboardManage_index_page_line13_txt-1303" | translate}}</span>
         <i class="fa fa-circle"></i>
     </li>
     <li>
-        <span class="active">$$$$$${txt-2971}</span>
+        <span class="active">{{"guideboardManage_index_page_line17_txt-2971" | translate}}</span>
     </li>
 </ul>
  
@@ -33,31 +33,31 @@
             <div class="portlet-title">
                 <div class="caption font-dark">
                     <i class="fa fa-database font-dark"></i>
-                    <span class="caption-subject bold uppercase">$$$$$${txt-3689}</span>
+                    <span class="caption-subject bold uppercase">{{"guideboardManage_index_page_line36_txt-3689" | translate}}</span>
                 </div>
                 <div class="actions">
                     <a ui-sref="guideboardManage_form" class="btn blue">
                         <i class="fa fa-plus"></i>
-                        $$$$$${txt-2551}
+                        {{"guideboardManage_index_page_line41_txt-2551" | translate}}
                     </a>
  
                     <div class="btn-group">
                         <a href="javascript:" class="btn red btn-outline" data-toggle="dropdown">
                             <i class="fa fa-share"></i>
-                            <span>$$$$$${txt-3339}</span>
+                            <span>{{"guideboardManage_index_page_line47_txt-3339" | translate}}</span>
                             <i class="fa fa-angle-down"></i>
                         </a>
                         <ul class="dropdown-menu pull-right">
                             <li>
                                 <a href="javascript:" class="tool-action" ng-click="ctrl.importData()">
                                     <i class="fa fa-file-excel-o"></i>
-                                    $$$$$${txt-4449}
+                                    {{"guideboardManage_index_page_line54_txt-4449" | translate}}
                                 </a>
                             </li>
                             <li>
                                 <a href="javascript:" class="tool-action" ng-click="ctrl.exportData()">
                                     <i class="fa fa-file-excel-o"></i>
-                                    $$$$$${txt-4493}
+                                    {{"guideboardManage_index_page_line60_txt-4493" | translate}}
                                 </a>
                             </li>
                             <!--<li class="divider"></li>-->
@@ -77,4 +77,4 @@
             </div>
         </div>
     </div>
-</div>
 \ No newline at end of file
+</div>
@@ -4,13 +4,13 @@
         <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
             <thead>
             <tr role="row" class="heading">
-                <th style="width: 70px">$$$$$${txt-3934}</th>
-                <th style="width: 150px;">$$$$$${txt-3815}</th>
-                <th style="width: 100px;">$$$$$${txt-3215}</th>
-                <th >$$$$$${txt-2840}</th>
-                <th style="width: 100px;">$$$$$${txt-3213}</th>
-                <th style="width: 80px;">$$$$$${txt-3874}</th>
-                <th style="width: 20%">$$$$$${txt-3942}</th>
+                <th style="width: 70px; max-width: 70px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"guideboardManage_list_page_line7_txt-3934" | translate}}</th>
+                <th style="width: 150px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"guideboardManage_list_page_line8_txt-3347" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"guideboardManage_list_page_line9_txt-3215" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"guideboardManage_list_page_line10_txt-2840" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"guideboardManage_list_page_line11_txt-3213" | translate}}</th>
+                <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"guideboardManage_list_page_line12_txt-3874" | translate}}</th>
+                <th style="width: 230px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"guideboardManage_list_page_line13_txt-3942" | translate}}</th>
             </tr>
             <tr role="row" class="filter">
                 <td></td>
@@ -24,27 +24,28 @@
                                     dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
                                     iterobjname="item"
                                     iterobjexp="item.name"
-                                    searchph="$$$$$${txt-3364}"
+                                    searchph="{{'guideboardManage_list_page_line27_txt-3364' | translate}}"
                                     searchexp="this.name"
+                                    width="120"
                                     required >
                         </sa-Select5>
                     </div>
                 </td>
                 <td></td>
                 <td>
-                    <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['lpName_like']" placeholder="$$$$$${txt-1274}"/>
+                    <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['lpName_like']" placeholder="{{'guideboardManage_list_page_line35_txt-1274' | translate}}"/>
                 </td>
                 <td></td>
                 <td>
                     <label class="checkbox-inline">
-                        <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']"/>$$$$$${txt-3746}
+                        <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']"/>{{"guideboardManage_list_page_line40_txt-3746" | translate}}
                     </label>
                 </td>
                 <td>
                     <div class="btn-group">
                         <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;"
                                 ng-click="ctrl.doPage()">
-                            <i class="fa fa-search"></i> $$$$$${txt-4001}</button>
+                            <i class="fa fa-search"></i> {{"guideboardManage_list_page_line47_txt-4001" | translate}}</button>
                         <button class="btn btn-sm green btn-outline filter-submit margin-bottom dropdown-toggle"
                                 data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <span class="caret"></span>
@@ -54,7 +55,7 @@
                             <li>
                                 <a href="javascript:" class="tool-action" ng-click="ctrl.customOrder()">
                                     <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
-                                    $$$$$${txt-3385}
+                                    {{"guideboardManage_list_page_line57_txt-3385" | translate}}
                                 </a>
                             </li>
                         </ul>
@@ -62,7 +63,7 @@
  
                     <button class="btn btn-sm red btn-outline filter-cancel"
                             ng-click="ctrl.reset()">
-                        <i class="fa fa-times"></i> $$$$$${txt-4000}</button>
+                        <i class="fa fa-times"></i> {{"guideboardManage_list_page_line65_txt-4000" | translate}}</button>
                 </td>
             </tr>
             </thead>
@@ -95,15 +96,19 @@
                 <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
-                    <a ui-sref="guideboardManage_detail({id : info.id})" class="btn btn-info btn-sm"> $$$$$${txt-3866} </a>
-                    <a ui-sref="guideboardManage_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> $$$$$${txt-4028} </a>
+                    <a ui-sref="guideboardManage_detail({id : info.id})" class="btn btn-info btn-sm"> {{"guideboardManage_list_page_line98_txt-3866" | translate}} </a>
+                    <a ui-sref="guideboardManage_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> {{"guideboardManage_list_page_line99_txt-4028" | translate}} </a>
                     <a sweetalert
-                       sweet-options="{title: '$$$$$${txt-674}',text: '$$$$$${txt-3429}' + info.xl.name + '</br>$$$$$${txt-39}', html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '$$$$$${txt-4257}',cancelButtonText: '$$$$$${txt-3817}'}"
+                       sweet-options="{title: ('guideboardManage_list_page_line101_txt-674' | translate),
+                                       text: ('guideboardManage_list_page_line102_txt-3429' | translate) + info.xl.name + '</br>' + ('guideboardManage_list_page_line102_txt-39' | translate),
+                                       html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',
+                                       confirmButtonText: ('guideboardManage_list_page_line104_txt-4257' | translate),
+                                       cancelButtonText: ('guideboardManage_list_page_line105_txt-3817' | translate)}"
                        sweet-on-confirm="ctrl.toggleGuideboard(info.id)"
                        class="btn btn-danger btn-sm"
-                       ng-if="info.isCancel == '0'">$$$$$${txt-4143}</a>
+                       ng-if="info.isCancel == '0'">{{"guideboardManage_list_page_line108_txt-4143" | translate}}</a>
  
-                    <a ng-click="ctrl.toggleGuideboard(info.id)" class="btn btn-success btn-sm" ng-if="info.isCancel == '1'"> $$$$$${txt-4211} </a>
+                    <a ng-click="ctrl.toggleGuideboard(info.id)" class="btn btn-success btn-sm" ng-if="info.isCancel == '1'"> {{"guideboardManage_list_page_line110_txt-4211" | translate}} </a>
                 </td>
             </tr>
             </tbody>
@@ -111,8 +116,11 @@
     </div>
  
     <div class="pageBar">
-        <div class="pageBarLeft">
-            $$$$$${txt-3053}
+        <div class="pageBarLeft"
+             translate="guideboardManage_list_page_line119_txt-3053"
+             translate-value-from="{{ ctrl.page()['uiFromRecord'] }}"
+             translate-value-to="{{ ctrl.page()['uiToRecord'] }}"
+             translate-value-total="{{ ctrl.page()['totalElements'] }}">
         </div>
  
         <div class="pageBarRight">
@@ -122,12 +130,12 @@
                             rotate="false"
                             max-size="10"
                             boundary-links="true"
-                            first-text="$$$$$${txt-4430}"
-                            previous-text="$$$$$${txt-3613}"
-                            next-text="$$$$$${txt-3614}"
-                            last-text="$$$$$${txt-4068}">
+                            first-text="{{'guideboardManage_list_page_line132_txt-4430' | translate}}"
+                            previous-text="{{'guideboardManage_list_page_line133_txt-3613' | translate}}"
+                            next-text="{{'guideboardManage_list_page_line134_txt-3614' | translate}}"
+                            last-text="{{'guideboardManage_list_page_line135_txt-4068' | translate}}">
             </uib-pagination>
         </div>
     </div>
  
-</div>
 \ No newline at end of file
+</div>
@@ -5,7 +5,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
     [
         'GuideboardManageService_g',
         'UserPrincipal',
-        function(service, UserPrincipal) {
+        '$translate',
+        function(service, UserPrincipal, translate) {
  
             /** 当前的查询条件信息 */
             var currentSearchCondition = {page: 0, 'isCancel_eq': false};
@@ -22,11 +23,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
  
             // 字段描述
             var columns = [
-                {name: "xl.name", desc: i18n('txt-3347')},
-                {name: "lpNo", desc: i18n('txt-3215')},
-                {name: "lpName", desc: i18n('txt-2840')},
-                {name: "lpType", desc: i18n('txt-3213')},
-                {name: "isCancel", desc: i18n('txt-3127')}
+                {name: "xl.name", desc: translate.instant("guideboardManage_module_js_line26_txt-3347")},
+                {name: "lpNo", desc: translate.instant("guideboardManage_module_js_line27_txt-3215")},
+                {name: "lpName", desc: translate.instant("guideboardManage_module_js_line28_txt-2840")},
+                {name: "lpType", desc: translate.instant("guideboardManage_module_js_line29_txt-3213")},
+                {name: "isCancel", desc: translate.instant("guideboardManage_module_js_line30_txt-3127")}
             ];
             // 排序字段
             var orderColumns = {
@@ -110,7 +111,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                             {xlid: currentSearchCondition['xl.id_eq']}
                         ).$promise;
                     } else {
-                        alert(i18n('txt-1806'));
+                        alert(translate.instant("guideboardManage_module_js_line31_txt-1806"));
                         return null;
                     }
                 },
@@ -131,7 +132,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
         '$state',
         '$uibModal',
         'FileDownload_g',
-        function(service, $state, $uibModal, fileDownload) {
+        '$translate',
+        function(service, $state, $uibModal, fileDownload, translate) {
             var self = this;
  
             // 切换到form状态
@@ -172,7 +174,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 if (p) {
                     p.then(
                         function(result) {
-                            fileDownload.downloadFile(result.data, "application/octet-stream", "' + i18n('txt-2943') + '.xls");
+                            fileDownload.downloadFile(result.data, "application/octet-stream", translate.instant("guideboardManage_module_js_line177_txt-2943") + ".xls");
                         },
                         function(result) {
                             console.log("exportData failed：" + result);
@@ -225,7 +227,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
     [
         'GuideboardManageService',
         '$uibModal',
-        function(service, $uibModal) {
+        '$translate',
+        function(service, $uibModal, translate) {
             var self = this;
             var Gb = service.getGbQueryClass();
  
@@ -252,7 +255,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.toggleGuideboard = function(id) {
                 Gb.delete({id: id}, function(result) {
                     if (result.status == "ERROR") { // 暂时这样做，之后全局拦截
-                        alert(i18n('txt-3729') + result.msg);
+                        alert(translate.instant("guideboardManage_module_js_line258_txt-3729") + result.msg);
                     } else {
                         self.doPage();
                     }
@@ -317,7 +320,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
         '$stateParams',
         '$state',
         '$scope',
-        function(service, $stateParams, $state, $scope) {
+        '$translate',
+        function(service, $stateParams, $state, $scope, translate) {
             var self = this;
             var Gb = service.getGbQueryClass();
  
@@ -340,7 +344,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 console.log($scope);
                 console.log(self.guideboardManageForForm);
  
-                self.guideboardManageForForm.lpType = i18n('txt-2626');
+                self.guideboardManageForForm.lpType = translate.instant("guideboardManage_module_js_line347_txt-2626");
                 self.guideboardManageForForm.$save(function() {
                     $state.go("guideboardManage");
                 });
@@ -375,7 +379,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
     [
         'GuideboardManageService',
         '$stateParams',
-        function(service, $stateParams) {
+        '$translate',
+        function(service, $stateParams, translate) {
             var self = this;
             var Gb = service.getGbQueryClass();
             var id = $stateParams.id;
@@ -385,8 +390,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
  
             // 当转向到此页面时，就获取明细信息并绑定
             Gb.get({id: id}, function(result) {
-                self.guideboardForDetail = result.data;
-                self.title = "' + i18n('txt-4022') + ' " + self.guideboardForDetail.lpName + " ' + i18n('txt-3066') + '";
+                self.guideboardForDetail = result;
+                self.title = translate.instant("guideboardManage_module_js_line394_txt-4022") + " " + self.guideboardForDetail.lpName + " " + translate.instant("guideboardManage_module_js_line394_txt-3066");
             });
         }
     ]
@@ -2,7 +2,7 @@
     <div class="modal-title">
         <h3>
             <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
-            <span class="caption-subject bold uppercase">$$$$$${txt-1682}</span>
+            <span class="caption-subject bold uppercase">{{"guideboardManage_orderOptionOpen_page_line5_txt-1682" | translate}}</span>
         </h3>
     </div>
 </div>
@@ -14,5 +14,5 @@
     </sa-Orderoption>
 </div>
 <div class="modal-footer">
-    <button class="btn btn-primary" ng-click="$ctrl.confirm($ctrl.orderColumns)">$$$$$${txt-4018}</button>
-</div>
 \ No newline at end of file
+    <button class="btn btn-primary" ng-click="$ctrl.confirm($ctrl.orderColumns)">{{"guideboardManage_orderOptionOpen_page_line17_txt-4018" | translate}}</button>
+</div>