潘钊 / bsth_control · Commits

Commit 77217ea7fd1a095c29a99146e2e769d908232f4e

Authored by liujun001
2 parents 59dcfaa9 f7f6dfda

Merge remote-tracking branch 'origin/pudong_jdk8_wvp' into pudong_jdk8_wvp

Inline Side-by-side
Showing 21 changed files with 967 additions and 315 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 21 of 24 files are displayed.

src/main/resources/static/pages/scheduleApp/language/en.js
  View file @77217ea
... ... @@ -2,10 +2,52 @@
2 2 // 英文资源
3 3  
4 4 var ScheduleApp_en_language = {
  5 + // main.js
  6 + "main_js_line_82_txt-3966" : "Operation",
  7 + "main_js_line_83_txt-3958" : "Lack of vehicles",
  8 + "main_js_line_84_txt-3960" : "Climate",
  9 + "main_js_line_85_txt-3837" : "Accident",
  10 + "main_js_line_86_txt-3838" : "Dispute",
  11 + "main_js_line_87_txt-3876" : "Reduction",
  12 + "main_js_line_88_txt-4026" : "Vehicle allocation",
  13 + "main_js_line_89_txt-3840" : "Fault",
  14 + "main_js_line_90_txt-3961" : "Road obstruction",
  15 + "main_js_line_91_txt-3962" : "Few passengers",
  16 + "main_js_line_92_txt-3963" : "Slow hanging",
  17 + "main_js_line_93_txt-4197" : "Other",
  18 + "main_js_line_94_txt-4102" : "Maintenance",
  19 + "main_js_line_95_txt-3957" : "Lack of manpower",
  20 + "main_js_line_96_txt-3956" : "Foreign aid",
  21 + "main_js_line_99_txt-2790" : "Current version",
  22 + "main_js_line_100_txt-168" : "All Versions (To be Updated, Current, Historical)",
  23 + "main_js_line_301_txt-1805" : "Please Log in Again!",
  24 + "main_js_line_304_txt-2284" : "Status Code:",
  25 + "main_js_line_305_txt-2285" : "Access Path:",
  26 + "main_js_line_306_txt-2286" : "Error Message:",
  27 + "main_js_line_307_txt-1807" : "Server Error:",
  28 + "main_js_line_325_txt-695" : "It seems that the server cannot connect",
  29 + "main_js_line_327_txt-2284" : "Status Code:",
  30 + "main_js_line_330_txt-2325" : "Error Content:",
  31 + "main_js_line_332_txt-2325" : "Error Content:",
  32 + "main_js_line_336_txt-1807" : "Server Error:",
  33 + "main_js_line_338_txt-1838" : "Please Log in Again:",
  34 + "main_js_line_340_txt-2333" : "Other Errors:",
  35 + "main_js_line_383_txt-1149" : "Subpages Loaded:",
  36 +
  37 + //------------ 自定义指令 --------------//
  38 + // 指令位置：../module/common/dts2/queryOption
  39 + // 页面：saOrderOptionTemplate.html
  40 + "queryOption_saOrderOptionTemplate_line93_txt-4157" : "Ascending order",
  41 + "queryOption_saOrderOptionTemplate_line94_txt-4156" : "Descending order",
  42 +
  43 + // 指令位置：../module/common/dts1/select
  44 + // js：saSelect5.js
  45 + "saSelect5_js_line375_txt-1275" : "Dictionary data is not available=",
  46 +
5 47 //------------ 车辆信息管理模块 -----------//
6 48 // 模块位置：../module/basicInfo/busInfoManage
7   - // 页面；index.html
8 49  
  50 + // 页面；index.html
9 51 // line3
10 52 "busInfoManage_index_page-title" : "vehicle information management",
11 53 // line9
... ... @@ -57,11 +99,11 @@ var ScheduleApp_en_language = {
57 99 "busInfoManage_list_page_line142_txt-4257" : "Yes",
58 100 "busInfoManage_list_page_line142_txt-3817" : "Cancel",
59 101 "busInfoManage_list_page_line144_txt-3868" : "Delete",
60   - "busInfoManage_list_page_line153_txt-3053" : "Showing {{from}} to {{to}} of {{total}}entries.10 entries per page",
61   - "busInfoManage_list_page_line163_txt-4430" : "First",
62   - "busInfoManage_list_page_line164_txt-3613" : "Previous",
63   - "busInfoManage_list_page_line165_txt-3614" : "Next",
64   - "busInfoManage_list_page_line166_txt-4068" : "Last",
  102 + "busInfoManage_list_page_line156_txt-3053" : "Showing {{from}} to {{to}} of {{total}}entries.10 entries per page",
  103 + "busInfoManage_list_page_line169_txt-4430" : "First",
  104 + "busInfoManage_list_page_line170_txt-3613" : "Previous",
  105 + "busInfoManage_list_page_line171_txt-3614" : "Next",
  106 + "busInfoManage_list_page_line172_txt-4068" : "Last",
65 107  
66 108 // 页面：detail.html
67 109 "busInfoManage_detail_page_line3_txt-1656" : "vehicle details",
... ... @@ -287,8 +329,273 @@ var ScheduleApp_en_language = {
287 329 "busInfoManage_module_js_line434_txt-4009" : "Vehicles",
288 330 "busInfoManage_module_js_line434_txt-3066" : "Details",
289 331  
  332 + //------------ 人员信息管理模块 -----------//
  333 + // 模块位置：../module/basicInfo/employeeInfoManage
  334 + // 页面；index.html
  335 + "employeeInfoManage_index_page_line3_txt-1658" : "Personnel information management",
  336 + "employeeInfoManage_index_page_line9_txt-3807" : "Home page",
  337 + "employeeInfoManage_index_page_line13_txt-2398" : "Basic information",
  338 + "employeeInfoManage_index_page_line17_txt-1658" : "Personnel information management",
  339 + "employeeInfoManage_index_page_line36_txt-2234" : "Personnel information table",
  340 + "employeeInfoManage_index_page_line41_txt-1648" : "Add personnel information",
  341 + "employeeInfoManage_index_page_line47_txt-3339" : "Data tool",
  342 + "employeeInfoManage_index_page_line54_txt-4493" : "Export to excel",
  343 +
  344 + // 页面：orderOptionOpen.html
  345 + "employeeInfoManage_orderOptionOpen_page_line5_txt-1682" : "Sort field selection",
  346 + "employeeInfoManage_orderOptionOpen_page_line17_txt-4018" : "Yes",
  347 +
  348 + // 页面：list.html
  349 + "employeeInfoManage_list_page_line7_txt-3934" : "Serial number",
  350 + "employeeInfoManage_list_page_line8_txt-3949" : "Name",
  351 + "employeeInfoManage_list_page_line9_txt-3955" : "No.",
  352 + "employeeInfoManage_list_page_line10_txt-3940" : "Employee number",
  353 + "employeeInfoManage_list_page_line11_txt-3095" : "Kingdee employee number",
  354 + "employeeInfoManage_list_page_line12_txt-4086" : "Gender",
  355 + "employeeInfoManage_list_page_line13_txt-3096" : "Company",
  356 + "employeeInfoManage_list_page_line14_txt-3777" : "Branch company",
  357 + "employeeInfoManage_list_page_line15_txt-4093" : "Occupation type",
  358 + "employeeInfoManage_list_page_line16_txt-4085" : "Deactivate",
  359 + "employeeInfoManage_list_page_line17_txt-3942" : "Operation",
  360 + "employeeInfoManage_list_page_line23_txt-3231" : "Enter name",
  361 + "employeeInfoManage_list_page_line26_txt-3233" : "Enter number",
  362 + "employeeInfoManage_list_page_line29_txt-3232" : "Enter employee number",
  363 + "employeeInfoManage_list_page_line32_txt-3232" : "Enter employee number",
  364 + "employeeInfoManage_list_page_line45_txt-3364" : "Please enter pinyin",
  365 + "employeeInfoManage_list_page_line60_txt-3364" : "Please enter pinyin",
  366 + "employeeInfoManage_list_page_line75_txt-3364" : "Please enter pinyin",
  367 + "employeeInfoManage_list_page_line82_txt-4085" : "Deactivate",
  368 + "employeeInfoManage_list_page_line89_txt-4001" : "Search",
  369 + "employeeInfoManage_list_page_line99_txt-3385" : "Sorting options",
  370 + "employeeInfoManage_list_page_line107_txt-4000" : "Reset",
  371 + "employeeInfoManage_list_page_line120_txt-4426" : "Name/Job-code:",
  372 + "employeeInfoManage_list_page_line142_txt-4058" : "Unknown",
  373 + "employeeInfoManage_list_page_line163_txt-4058" : "Unknown",
  374 + "employeeInfoManage_list_page_line171_txt-3866" : "Details",
  375 + "employeeInfoManage_list_page_line172_txt-4028" : "Modify",
  376 + "employeeInfoManage_list_page_line174_txt-675" : "Do you want to delete personnel information?",
  377 + "employeeInfoManage_list_page_line175_txt-3719" : "Name:",
  378 + "employeeInfoManage_list_page_line175_txt-3761" : "Employee number:",
  379 + "employeeInfoManage_list_page_line175_txt-40" : "If there is personnel configuration information associated, an error will be reported. It is recommended not to delete it casually!",
  380 + "employeeInfoManage_list_page_line177_txt-4257" : "Yes",
  381 + "employeeInfoManage_list_page_line178_txt-3817" : "Cancel",
  382 + "employeeInfoManage_list_page_line180_txt-3868" : "Delete",
  383 + "employeeInfoManage_list_page_line189_txt-3053" : "Showing {{from}} to {{to}} of {{total}}entries.10 entries per page",
  384 + "employeeInfoManage_list_page_line202_txt-4430" : "First",
  385 + "employeeInfoManage_list_page_line203_txt-3613" : "Previous",
  386 + "employeeInfoManage_list_page_line204_txt-3614" : "Next",
  387 + "employeeInfoManage_list_page_line205_txt-4068" : "Last",
  388 +
  389 + // 页面：detail.html
  390 + "employeeInfoManage_detail_page_line3_txt-1650" : "Personnel details",
  391 + "employeeInfoManage_detail_page_line9_txt-3807" : "Home page",
  392 + "employeeInfoManage_detail_page_line13_txt-2398" : "Basic information",
  393 + "employeeInfoManage_detail_page_line17_txt-1658" : "Personnel information management",
  394 + "employeeInfoManage_detail_page_line21_txt-1650" : "Personnel details",
  395 + "employeeInfoManage_detail_page_line38_txt-2686" : "Company",
  396 + "employeeInfoManage_detail_page_line45_txt-1765" : "Affiliated branch:",
  397 + "employeeInfoManage_detail_page_line52_txt-3955" : "No.",
  398 + "employeeInfoManage_detail_page_line59_txt-3949" : "Name",
  399 + "employeeInfoManage_detail_page_line66_txt-902" : "Operation service certificate number:",
  400 + "employeeInfoManage_detail_page_line73_txt-903" : "One-card work card number:",
  401 + "employeeInfoManage_detail_page_line80_txt-3698" : "Gender:",
  402 + "employeeInfoManage_detail_page_line86_txt-3703" : "Occupation type:",
  403 + "employeeInfoManage_detail_page_line89_txt-4058" : "Unknown",
  404 +
  405 + // 页面：edit.html
  406 + "employeeInfoManage_edit_page_line3_txt-1643" : "Modify personnel information",
  407 + "employeeInfoManage_edit_page_line9_txt-3807" : "Home page",
  408 + "employeeInfoManage_edit_page_line13_txt-2398" : "Basic information",
  409 + "employeeInfoManage_edit_page_line17_txt-1658" : "Personnel information management",
  410 + "employeeInfoManage_edit_page_line21_txt-1643" : "Modify personnel information",
  411 + "employeeInfoManage_edit_page_line29_txt-3849" : "Form",
  412 + "employeeInfoManage_edit_page_line37_txt-2686" : "Company",
  413 + "employeeInfoManage_edit_page_line47_txt-973" : "Please select the company",
  414 + "employeeInfoManage_edit_page_line55_txt-1792" : "Company must be selected",
  415 + "employeeInfoManage_edit_page_line60_txt-3777" : "Branch company",
  416 + "employeeInfoManage_edit_page_line70_txt-973" : "Please select the branch",
  417 + "employeeInfoManage_edit_page_line79_txt-923" : "Branch must also be selected",
  418 + "employeeInfoManage_edit_page_line84_txt-3940" : "Employee number",
  419 + "employeeInfoManage_edit_page_line88_txt-2346" : "Please enter employee number",
  420 + "employeeInfoManage_edit_page_line95_txt-1793" : "Employee number must be filled in",
  421 + "employeeInfoManage_edit_page_line103_txt-3949" : "Name",
  422 + "employeeInfoManage_edit_page_line107_txt-2345" : "Please enter name",
  423 + "employeeInfoManage_edit_page_line111_txt-1787" : "Name must be filled in",
  424 + "employeeInfoManage_edit_page_line116_txt-902" : "Operation service certificate number:",
  425 + "employeeInfoManage_edit_page_line119_txt-516" : "Please enter the operation service certificate number",
  426 + "employeeInfoManage_edit_page_line124_txt-2244" : "One-card number:",
  427 + "employeeInfoManage_edit_page_line127_txt-517" : "Please enter your work card number",
  428 + "employeeInfoManage_edit_page_line132_txt-3698" : "Gender:",
  429 + "employeeInfoManage_edit_page_line139_txt-3703" : "Occupation type:",
  430 + "employeeInfoManage_edit_page_line149_txt-3364" : "Please enter pinyin",
  431 + "employeeInfoManage_edit_page_line157_txt-3449" : "Remarks:",
  432 + "employeeInfoManage_edit_page_line174_txt-4173" : "Submit",
  433 + "employeeInfoManage_edit_page_line175_txt-3817" : "Cancel",
  434 +
  435 + // 页面：form.html
  436 + "employeeInfoManage_form_page_line3_txt-1648" : "Add personnel information",
  437 + "employeeInfoManage_form_page_line9_txt-3807" : "Home page",
  438 + "employeeInfoManage_form_page_line13_txt-2398" : "Basic information",
  439 + "employeeInfoManage_form_page_line17_txt-1658" : "Personnel information management",
  440 + "employeeInfoManage_form_page_line21_txt-1648" : "Add personnel information",
  441 + "employeeInfoManage_form_page_line29_txt-3849" : "Form",
  442 + "employeeInfoManage_form_page_line37_txt-2686" : "Company",
  443 + "employeeInfoManage_form_page_line47_txt-973" : "Please select the company",
  444 + "employeeInfoManage_form_page_line55_txt-1792" : "Company must be selected",
  445 + "employeeInfoManage_form_page_line60_txt-3777" : "Branch company",
  446 + "employeeInfoManage_form_page_line70_txt-973" : "Please select the branch",
  447 + "employeeInfoManage_form_page_line79_txt-923" : "Branch must also be selected",
  448 + "employeeInfoManage_form_page_line84_txt-3940" : "Employee number",
  449 + "employeeInfoManage_form_page_line88_txt-2346" : "Please enter employee number",
  450 + "employeeInfoManage_form_page_line95_txt-1793" : "Employee number must be filled in",
  451 + "employeeInfoManage_form_page_line103_txt-3949" : "Name",
  452 + "employeeInfoManage_form_page_line107_txt-2345" : "Please enter name",
  453 + "employeeInfoManage_form_page_line111_txt-1787" : "Name must be filled in",
  454 + "employeeInfoManage_form_page_line116_txt-902" : "Operation service certificate number:",
  455 + "employeeInfoManage_form_page_line119_txt-516" : "Please enter the operation service certificate number",
  456 + "employeeInfoManage_form_page_line124_txt-2244" : "One-card number:",
  457 + "employeeInfoManage_form_page_line127_txt-517" : "Please enter your work card number",
  458 + "employeeInfoManage_form_page_line132_txt-3698" : "Gender:",
  459 + "employeeInfoManage_form_page_line139_txt-3703" : "Occupation type:",
  460 + "employeeInfoManage_form_page_line149_txt-3364" : "Please enter pinyin",
  461 + "employeeInfoManage_form_page_line157_txt-3449" : "Remarks:",
  462 + "employeeInfoManage_form_page_line174_txt-4173" : "Submit",
  463 + "employeeInfoManage_form_page_line175_txt-3817" : "Cancel",
  464 +
  465 + // module.js
  466 + "employeeInfoManage_module_js_line33_txt-3949" : "Name",
  467 + "employeeInfoManage_module_js_line34_txt-3940" : "Worker number",
  468 + "employeeInfoManage_module_js_line35_txt-4086" : "Gender",
  469 + "employeeInfoManage_module_js_line36_txt-3096" : "Company",
  470 + "employeeInfoManage_module_js_line37_txt-3777" : "Branch company",
  471 + "employeeInfoManage_module_js_line38_txt-4093" : "Occupation type",
  472 + "employeeInfoManage_module_js_line182_txt-1614" : "Basic information of personnel",
  473 + "employeeInfoManage_module_js_line286_txt-3729" : "Failed:",
  474 + "employeeInfoManage_module_js_line411_txt-4081" : "Employee",
  475 + "employeeInfoManage_module_js_line413_txt-3066" : "Details",
  476 +
  477 + //------------ 车辆设备信息管理模块 -----------//
  478 + // 模块位置：../module/basicInfo/deviceInfoManage
  479 + // 页面；index.html
  480 + "deviceInfoManage_index_page_line3_txt-848" : "Vehicle equipment information management",
  481 + "deviceInfoManage_index_page_line9_txt-3807" : "Home page",
  482 + "deviceInfoManage_index_page_line13_txt-2398" : "Basic information",
  483 + "deviceInfoManage_index_page_line17_txt-848" : "Vehicle equipment information management",
  484 + "deviceInfoManage_index_page_line27_txt-2233" : "Equipment information table",
  485 + "deviceInfoManage_index_page_line32_txt-1791" : "Add equipment information",
  486 +
  487 + // 页面：orderOptionOpen.html
  488 + "deviceInfoManage_orderOptionOpen_page_line5_txt-1682" : "Sort field selection",
  489 + "deviceInfoManage_orderOptionOpen_page_line17_txt-4018" : "Yes",
  490 +
  491 + // 页面：list.html
  492 + "deviceInfoManage_list_page_line17_txt-3934" : "Serial number",
  493 + "deviceInfoManage_list_page_line18_txt-3347" : "Route name",
  494 + "deviceInfoManage_list_page_line19_txt-2597" : "Internal number",
  495 + "deviceInfoManage_list_page_line20_txt-3211" : "Activation date",
  496 + "deviceInfoManage_list_page_line21_txt-2185" : "Old equipment number",
  497 + "deviceInfoManage_list_page_line22_txt-2184" : "New equipment number",
  498 + "deviceInfoManage_list_page_line23_txt-4389" : "Operator/Operation time",
  499 + "deviceInfoManage_list_page_line24_txt-3874" : "Status",
  500 + "deviceInfoManage_list_page_line25_txt-3942" : "Operation",
  501 + "deviceInfoManage_list_page_line38_txt-3364" : "Please enter pinyin",
  502 + "deviceInfoManage_list_page_line44_txt-1773" : "Enter internal number",
  503 + "deviceInfoManage_list_page_line52_txt-4162" : "Scrapped",
  504 + "deviceInfoManage_list_page_line59_txt-4001" : "Search",
  505 + "deviceInfoManage_list_page_line69_txt-3385" : "Sorting options",
  506 + "deviceInfoManage_list_page_line77_txt-4000" : "Reset",
  507 + "deviceInfoManage_list_page_line122_txt-4058" : "Unknown",
  508 + "deviceInfoManage_list_page_line127_txt-3866" : "Details",
  509 + "deviceInfoManage_list_page_line144_txt-3053" : "Showing {{from}} to {{to}} of {{total}}entries.10 entries per page",
  510 + "deviceInfoManage_list_page_line157_txt-4430" : "First",
  511 + "deviceInfoManage_list_page_line158_txt-3613" : "Previous",
  512 + "deviceInfoManage_list_page_line159_txt-3614" : "Next",
  513 + "deviceInfoManage_list_page_line160_txt-4068" : "Last",
  514 +
  515 + // 页面：detail.html
  516 + "deviceInfoManage_detail_page_line3_txt-847" : "Vehicle equipment details",
  517 + "deviceInfoManage_detail_page_line9_txt-3807" : "Home page",
  518 + "deviceInfoManage_detail_page_line13_txt-2398" : "Basic information",
  519 + "deviceInfoManage_detail_page_line17_txt-848" : "Vehicle equipment information management",
  520 + "deviceInfoManage_detail_page_line21_txt-847" : "Vehicle equipment details",
  521 + "deviceInfoManage_detail_page_line38_txt-1476" : "Vehicle internal number",
  522 + "deviceInfoManage_detail_page_line45_txt-3347" : "Route name",
  523 + "deviceInfoManage_detail_page_line52_txt-3216" : "Old terminal number",
  524 + "deviceInfoManage_detail_page_line59_txt-3201" : "New terminal number",
  525 + "deviceInfoManage_detail_page_line67_txt-4422" : "Old SIM card number:",
  526 + "deviceInfoManage_detail_page_line74_txt-3701" : "New SIM card number:",
  527 + "deviceInfoManage_detail_page_line82_txt-2258" : "Fault description:",
  528 + "deviceInfoManage_detail_page_line90_txt-4403" : "Description:",
  529 + "deviceInfoManage_detail_page_line98_txt-3211" : "Activation date",
  530 +
  531 + // 页面：edit.html
  532 + "deviceInfoManage_edit_page_line3_txt-836" : "Modify vehicle equipment information",
  533 + "deviceInfoManage_edit_page_line9_txt-3807" : "Home page",
  534 + "deviceInfoManage_edit_page_line13_txt-2398" : "Basic information",
  535 + "deviceInfoManage_edit_page_line17_txt-848" : "Vehicle equipment information management",
  536 + "deviceInfoManage_edit_page_line21_txt-836" : "Modify vehicle equipment information",
  537 + "deviceInfoManage_edit_page_line29_txt-3849" : "Form",
  538 + "deviceInfoManage_edit_page_line38_txt-3347" : "Route name",
  539 + "deviceInfoManage_edit_page_line48_txt-3364" : "Please enter pinyin",
  540 + "deviceInfoManage_edit_page_line55_txt-1788" : "Line must be selected",
  541 + "deviceInfoManage_edit_page_line60_txt-3469" : "Vehicle:",
  542 + "deviceInfoManage_edit_page_line71_txt-3364" : "Please enter pinyin",
  543 + "deviceInfoManage_edit_page_line78_txt-1794" : "Vehicle must be selected",
  544 + "deviceInfoManage_edit_page_line83_txt-3216" : "Old terminal number",
  545 + "deviceInfoManage_edit_page_line91_txt-3201" : "New terminal number",
  546 + "deviceInfoManage_edit_page_line98_txt-1264" : "Please enter the new terminal number",
  547 + "deviceInfoManage_edit_page_line102_txt-910" : "The new terminal number must be filled in",
  548 + "deviceInfoManage_edit_page_line110_txt-4422" : "Old SIM card number:",
  549 + "deviceInfoManage_edit_page_line113_txt-3357" : "Please enter your old SIM card number",
  550 + "deviceInfoManage_edit_page_line118_txt-3701" : "New SIM card number:",
  551 + "deviceInfoManage_edit_page_line121_txt-3356" : "Please enter the new SIM card number",
  552 + "deviceInfoManage_edit_page_line126_txt-2258" : "Fault description:",
  553 + "deviceInfoManage_edit_page_line134_txt-4403" : "Description:",
  554 + "deviceInfoManage_edit_page_line170_txt-2252" : "Activation date:",
  555 + "deviceInfoManage_edit_page_line183_txt-146" : "Activation date must be selected, accurate to the specific time",
  556 + "deviceInfoManage_edit_page_line197_txt-4173" : "Submit",
  557 + "deviceInfoManage_edit_page_line198_txt-3817" : "Cancel",
  558 +
  559 + // 页面：form.html
  560 + "deviceInfoManage_form_page_line3_txt-845" : "Add vehicle equipment information",
  561 + "deviceInfoManage_form_page_line9_txt-3807" : "Home page",
  562 + "deviceInfoManage_form_page_line13_txt-2398" : "Basic information",
  563 + "deviceInfoManage_form_page_line17_txt-848" : "Vehicle equipment information management",
  564 + "deviceInfoManage_form_page_line21_txt-845" : "Add vehicle equipment information",
  565 + "deviceInfoManage_form_page_line29_txt-3849" : "Form",
  566 + "deviceInfoManage_form_page_line38_txt-3347" : "Route name",
  567 + "deviceInfoManage_form_page_line48_txt-3364" : "Please enter pinyin",
  568 + "deviceInfoManage_form_page_line55_txt-1788" : "Line must be selected",
  569 + "deviceInfoManage_form_page_line60_txt-3469" : "Vehicle:",
  570 + "deviceInfoManage_form_page_line71_txt-3364" : "Please enter pinyin",
  571 + "deviceInfoManage_form_page_line78_txt-1794" : "Vehicle must be selected",
  572 + "deviceInfoManage_form_page_line83_txt-3216" : "Old terminal number",
  573 + "deviceInfoManage_form_page_line91_txt-3201" : "New terminal number",
  574 + "deviceInfoManage_form_page_line98_txt-1264" : "Please enter the new terminal number",
  575 + "deviceInfoManage_form_page_line102_txt-910" : "The new terminal number must be filled in",
  576 + "deviceInfoManage_form_page_line110_txt-4422" : "Old SIM card number:",
  577 + "deviceInfoManage_form_page_line113_txt-3357" : "Please enter your old SIM card number",
  578 + "deviceInfoManage_form_page_line118_txt-3701" : "New SIM card number:",
  579 + "deviceInfoManage_form_page_line121_txt-3356" : "Please enter the new SIM card number",
  580 + "deviceInfoManage_form_page_line126_txt-2258" : "Fault description:",
  581 + "deviceInfoManage_form_page_line134_txt-4403" : "Description:",
  582 + "deviceInfoManage_form_page_line197_txt-4173" : "Submit",
  583 + "deviceInfoManage_form_page_line198_txt-3817" : "Cancel",
  584 +
  585 + // module.js
  586 + "deviceInfoManage_module_js_line26_txt-3347" : "Route name",
  587 + "deviceInfoManage_module_js_line27_txt-1476" : "Vehicle internal number",
  588 + "deviceInfoManage_module_js_line28_txt-3211" : "Activation date",
  589 + "deviceInfoManage_module_js_line29_txt-2185" : "Old equipment number",
  590 + "deviceInfoManage_module_js_line30_txt-3201" : "New terminal number",
  591 + "deviceInfoManage_module_js_line148_txt-3729" : "Failed:",
  592 + "deviceInfoManage_module_js_line269_txt-3243" : "{{clZbh}} Equipment information",
290 593  
291 594  
  595 + // TODO；
  596 +
292 597 };
293 598  
294   -// TODO；
  599 +
  600 +
  601 +
... ...
src/main/resources/static/pages/scheduleApp/language/zh.js
  View file @77217ea
... ... @@ -2,10 +2,53 @@
2 2 // 中文资源
3 3  
4 4 var ScheduleApp_zh_language = {
  5 + // main.js
  6 + "main_js_line_82_txt-3966" : "营运",
  7 + "main_js_line_83_txt-3958" : "缺车",
  8 + "main_js_line_84_txt-3960" : "气候",
  9 + "main_js_line_85_txt-3837" : "肇事",
  10 + "main_js_line_86_txt-3838" : "纠纷",
  11 + "main_js_line_87_txt-3876" : "抽减",
  12 + "main_js_line_88_txt-4026" : "配车",
  13 + "main_js_line_89_txt-3840" : "故障",
  14 + "main_js_line_90_txt-3961" : "路阻",
  15 + "main_js_line_91_txt-3962" : "客稀",
  16 + "main_js_line_92_txt-3963" : "吊慢",
  17 + "main_js_line_93_txt-4197" : "其他",
  18 + "main_js_line_94_txt-4102" : "保养",
  19 + "main_js_line_95_txt-3957" : "缺人",
  20 + "main_js_line_96_txt-3956" : "援外",
  21 + "main_js_line_99_txt-2790" : "当前版本",
  22 + "main_js_line_100_txt-168" : "所有版本（待更新，当前，历史）",
  23 + "main_js_line_301_txt-1805" : "请重新登录！",
  24 + "main_js_line_304_txt-2284" : "状态编码：",
  25 + "main_js_line_305_txt-2285" : "访问路径：",
  26 + "main_js_line_306_txt-2286" : "错误消息：",
  27 + "main_js_line_307_txt-1807" : "服务端错误：",
  28 + "main_js_line_325_txt-695" : "貌似服务端连接不上",
  29 + "main_js_line_327_txt-2284" : "状态编码：",
  30 + "main_js_line_330_txt-2325" : "错误内容：",
  31 + "main_js_line_332_txt-2325" : "错误内容：",
  32 + "main_js_line_336_txt-1807" : "服务端错误：",
  33 + "main_js_line_338_txt-1838" : "请重新登录：",
  34 + "main_js_line_340_txt-2333" : "其他错误：",
  35 + "main_js_line_383_txt-1149" : "子页面已载入：",
  36 +
  37 + //------------ 自定义指令 --------------//
  38 + // 指令位置：../module/common/dts2/queryOption
  39 + // 页面：saOrderOptionTemplate.html
  40 + "queryOption_saOrderOptionTemplate_line93_txt-4157" : "升序",
  41 + "queryOption_saOrderOptionTemplate_line94_txt-4156" : "降序",
  42 +
  43 + // 指令位置：../module/common/dts1/select
  44 + // js：saSelect5.js
  45 + "saSelect5_js_line375_txt-1275" : "字典数据不存在=",
  46 +
  47 +
5 48 //------------ 车辆信息管理模块 -----------//
6 49 // 模块位置：../module/basicInfo/busInfoManage
7   - // 页面；index.html
8 50  
  51 + // 页面；index.html
9 52 // line3
10 53 "busInfoManage_index_page-title" : "车辆信息管理",
11 54 // line9
... ... @@ -57,11 +100,11 @@ var ScheduleApp_zh_language = {
57 100 "busInfoManage_list_page_line142_txt-4257" : "是",
58 101 "busInfoManage_list_page_line142_txt-3817" : "取消",
59 102 "busInfoManage_list_page_line144_txt-3868" : "删除",
60   - "busInfoManage_list_page_line153_txt-3053" : "显示从{{from}}到{{to}} 共{{total}}条 每页显示10条",
61   - "busInfoManage_list_page_line163_txt-4430" : "首页",
62   - "busInfoManage_list_page_line164_txt-3613" : "上一页",
63   - "busInfoManage_list_page_line165_txt-3614" : "下一页",
64   - "busInfoManage_list_page_line166_txt-4068" : "尾页",
  103 + "busInfoManage_list_page_line156_txt-3053" : "显示从{{from}}到{{to}} 共{{total}}条 每页显示10条",
  104 + "busInfoManage_list_page_line169_txt-4430" : "首页",
  105 + "busInfoManage_list_page_line170_txt-3613" : "上一页",
  106 + "busInfoManage_list_page_line171_txt-3614" : "下一页",
  107 + "busInfoManage_list_page_line172_txt-4068" : "尾页",
65 108  
66 109 // 页面：detail.html
67 110 "busInfoManage_detail_page_line3_txt-1656" : "车辆详细信息",
... ... @@ -287,6 +330,267 @@ var ScheduleApp_zh_language = {
287 330 "busInfoManage_module_js_line434_txt-4009" : "车辆",
288 331 "busInfoManage_module_js_line434_txt-3066" : "详细信息",
289 332  
  333 + //------------ 人员信息管理模块 -----------//
  334 + // 模块位置：../module/basicInfo/employeeInfoManage
  335 + // 页面；index.html
  336 + "employeeInfoManage_index_page_line3_txt-1658" : "人员信息管理",
  337 + "employeeInfoManage_index_page_line9_txt-3807" : "首页",
  338 + "employeeInfoManage_index_page_line13_txt-2398" : "基础信息",
  339 + "employeeInfoManage_index_page_line17_txt-1658" : "人员信息管理",
  340 + "employeeInfoManage_index_page_line36_txt-2234" : "人员信息表",
  341 + "employeeInfoManage_index_page_line41_txt-1648" : "添加人员信息",
  342 + "employeeInfoManage_index_page_line47_txt-3339" : "数据工具",
  343 + "employeeInfoManage_index_page_line54_txt-4493" : "导出Excel",
  344 +
  345 + // 页面：orderOptionOpen.html
  346 + "employeeInfoManage_orderOptionOpen_page_line5_txt-1682" : "排序字段选择",
  347 + "employeeInfoManage_orderOptionOpen_page_line17_txt-4018" : "确定",
  348 +
  349 + // 页面：list.html
  350 + "employeeInfoManage_list_page_line7_txt-3934" : "序号",
  351 + "employeeInfoManage_list_page_line8_txt-3949" : "姓名",
  352 + "employeeInfoManage_list_page_line9_txt-3955" : "编号",
  353 + "employeeInfoManage_list_page_line10_txt-3940" : "工号",
  354 + "employeeInfoManage_list_page_line11_txt-3095" : "金蝶工号",
  355 + "employeeInfoManage_list_page_line12_txt-4086" : "性别",
  356 + "employeeInfoManage_list_page_line13_txt-3096" : "所在公司",
  357 + "employeeInfoManage_list_page_line14_txt-3777" : "分公司",
  358 + "employeeInfoManage_list_page_line15_txt-4093" : "工种",
  359 + "employeeInfoManage_list_page_line16_txt-4085" : "停用",
  360 + "employeeInfoManage_list_page_line17_txt-3942" : "操作",
  361 + "employeeInfoManage_list_page_line23_txt-3231" : "输入姓名",
  362 + "employeeInfoManage_list_page_line26_txt-3233" : "输入编号",
  363 + "employeeInfoManage_list_page_line29_txt-3232" : "输入工号",
  364 + "employeeInfoManage_list_page_line32_txt-3232" : "输入工号",
  365 + "employeeInfoManage_list_page_line45_txt-3364" : "请输拼音",
  366 + "employeeInfoManage_list_page_line60_txt-3364" : "请输拼音",
  367 + "employeeInfoManage_list_page_line75_txt-3364" : "请输拼音",
  368 + "employeeInfoManage_list_page_line82_txt-4085" : "停用",
  369 + "employeeInfoManage_list_page_line89_txt-4001" : "搜索",
  370 + "employeeInfoManage_list_page_line99_txt-3385" : "排序选项",
  371 + "employeeInfoManage_list_page_line107_txt-4000" : "重置",
  372 + "employeeInfoManage_list_page_line120_txt-4426" : "姓名/工号：",
  373 + "employeeInfoManage_list_page_line142_txt-4058" : "未知",
  374 + "employeeInfoManage_list_page_line163_txt-4058" : "未知",
  375 + "employeeInfoManage_list_page_line171_txt-3866" : "详细",
  376 + "employeeInfoManage_list_page_line172_txt-4028" : "修改",
  377 + "employeeInfoManage_list_page_line174_txt-675" : "是否删除人员信息？",
  378 + "employeeInfoManage_list_page_line175_txt-3719" : "姓名：",
  379 + "employeeInfoManage_list_page_line175_txt-3761" : "工号：",
  380 + "employeeInfoManage_list_page_line175_txt-40" : "如果有人员配置信息关联，会报错，建议不要随便删除！",
  381 + "employeeInfoManage_list_page_line177_txt-4257" : "是",
  382 + "employeeInfoManage_list_page_line178_txt-3817" : "取消",
  383 + "employeeInfoManage_list_page_line180_txt-3868" : "删除",
  384 + "employeeInfoManage_list_page_line189_txt-3053" : "显示从{{from}}到{{to}} 共{{total}}条 每页显示10条",
  385 + "employeeInfoManage_list_page_line202_txt-4430" : "首页",
  386 + "employeeInfoManage_list_page_line203_txt-3613" : "上一页",
  387 + "employeeInfoManage_list_page_line204_txt-3614" : "下一页",
  388 + "employeeInfoManage_list_page_line205_txt-4068" : "尾页",
  389 +
  390 + // 页面：detail.html
  391 + "employeeInfoManage_detail_page_line3_txt-1650" : "人员详细信息",
  392 + "employeeInfoManage_detail_page_line9_txt-3807" : "首页",
  393 + "employeeInfoManage_detail_page_line13_txt-2398" : "基础信息",
  394 + "employeeInfoManage_detail_page_line17_txt-1658" : "人员信息管理",
  395 + "employeeInfoManage_detail_page_line21_txt-1650" : "人员详细信息",
  396 + "employeeInfoManage_detail_page_line38_txt-2686" : "所属公司",
  397 + "employeeInfoManage_detail_page_line45_txt-1765" : "所属分公司：",
  398 + "employeeInfoManage_detail_page_line52_txt-3955" : "编号",
  399 + "employeeInfoManage_detail_page_line59_txt-3949" : "姓名",
  400 + "employeeInfoManage_detail_page_line66_txt-902" : "运营服务证书号：",
  401 + "employeeInfoManage_detail_page_line73_txt-903" : "一卡通工作卡号：",
  402 + "employeeInfoManage_detail_page_line80_txt-3698" : "性别：",
  403 + "employeeInfoManage_detail_page_line86_txt-3703" : "工种：",
  404 + "employeeInfoManage_detail_page_line89_txt-4058" : "未知",
  405 +
  406 + // 页面：edit.html
  407 + "employeeInfoManage_edit_page_line3_txt-1643" : "修改人员信息",
  408 + "employeeInfoManage_edit_page_line9_txt-3807" : "首页",
  409 + "employeeInfoManage_edit_page_line13_txt-2398" : "基础信息",
  410 + "employeeInfoManage_edit_page_line17_txt-1658" : "人员信息管理",
  411 + "employeeInfoManage_edit_page_line21_txt-1643" : "修改人员信息",
  412 + "employeeInfoManage_edit_page_line29_txt-3849" : "表单",
  413 + "employeeInfoManage_edit_page_line37_txt-2686" : "所属公司",
  414 + "employeeInfoManage_edit_page_line47_txt-973" : "请选择所属公司",
  415 + "employeeInfoManage_edit_page_line55_txt-1792" : "公司必须选择",
  416 + "employeeInfoManage_edit_page_line60_txt-3777" : "分公司",
  417 + "employeeInfoManage_edit_page_line70_txt-973" : "请选择所属分公司",
  418 + "employeeInfoManage_edit_page_line79_txt-923" : "分公司也必须选择",
  419 + "employeeInfoManage_edit_page_line84_txt-3940" : "工号",
  420 + "employeeInfoManage_edit_page_line88_txt-2346" : "请输入工号",
  421 + "employeeInfoManage_edit_page_line95_txt-1793" : "工号必须填写",
  422 + "employeeInfoManage_edit_page_line103_txt-3949" : "姓名",
  423 + "employeeInfoManage_edit_page_line107_txt-2345" : "请输入姓名",
  424 + "employeeInfoManage_edit_page_line111_txt-1787" : "姓名必须填写",
  425 + "employeeInfoManage_edit_page_line116_txt-902" : "运营服务证书号：",
  426 + "employeeInfoManage_edit_page_line119_txt-516" : "请输入运营服务证书号",
  427 + "employeeInfoManage_edit_page_line124_txt-2244" : "一卡通号：",
  428 + "employeeInfoManage_edit_page_line127_txt-517" : "请输入一卡通工作卡号",
  429 + "employeeInfoManage_edit_page_line132_txt-3698" : "性别：",
  430 + "employeeInfoManage_edit_page_line139_txt-3703" : "工种：",
  431 + "employeeInfoManage_edit_page_line149_txt-3364" : "请输拼音",
  432 + "employeeInfoManage_edit_page_line157_txt-3449" : "备注：",
  433 + "employeeInfoManage_edit_page_line174_txt-4173" : "提交",
  434 + "employeeInfoManage_edit_page_line175_txt-3817" : "取消",
  435 +
  436 + // 页面：form.html
  437 + "employeeInfoManage_form_page_line3_txt-1648" : "添加人员信息",
  438 + "employeeInfoManage_form_page_line9_txt-3807" : "首页",
  439 + "employeeInfoManage_form_page_line13_txt-2398" : "基础信息",
  440 + "employeeInfoManage_form_page_line17_txt-1658" : "人员信息管理",
  441 + "employeeInfoManage_form_page_line21_txt-1648" : "添加人员信息",
  442 + "employeeInfoManage_form_page_line29_txt-3849" : "表单",
  443 + "employeeInfoManage_form_page_line37_txt-2686" : "所属公司",
  444 + "employeeInfoManage_form_page_line47_txt-973" : "请选择所属公司",
  445 + "employeeInfoManage_form_page_line55_txt-1792" : "公司必须选择",
  446 + "employeeInfoManage_form_page_line60_txt-3777" : "分公司",
  447 + "employeeInfoManage_form_page_line70_txt-973" : "请选择所属分公司",
  448 + "employeeInfoManage_form_page_line79_txt-923" : "分公司也必须选择",
  449 + "employeeInfoManage_form_page_line84_txt-3940" : "工号",
  450 + "employeeInfoManage_form_page_line88_txt-2346" : "请输入工号",
  451 + "employeeInfoManage_form_page_line95_txt-1793" : "工号必须填写",
  452 + "employeeInfoManage_form_page_line103_txt-3949" : "姓名",
  453 + "employeeInfoManage_form_page_line107_txt-2345" : "请输入姓名",
  454 + "employeeInfoManage_form_page_line111_txt-1787" : "姓名必须填写",
  455 + "employeeInfoManage_form_page_line116_txt-902" : "运营服务证书号：",
  456 + "employeeInfoManage_form_page_line119_txt-516" : "请输入运营服务证书号",
  457 + "employeeInfoManage_form_page_line124_txt-2244" : "一卡通号：",
  458 + "employeeInfoManage_form_page_line127_txt-517" : "请输入一卡通工作卡号",
  459 + "employeeInfoManage_form_page_line132_txt-3698" : "性别：",
  460 + "employeeInfoManage_form_page_line139_txt-3703" : "工种：",
  461 + "employeeInfoManage_form_page_line149_txt-3364" : "请输拼音",
  462 + "employeeInfoManage_form_page_line157_txt-3449" : "备注：",
  463 + "employeeInfoManage_form_page_line174_txt-4173" : "提交",
  464 + "employeeInfoManage_form_page_line175_txt-3817" : "取消",
  465 +
  466 + // module.js
  467 + "employeeInfoManage_module_js_line33_txt-3949" : "姓名",
  468 + "employeeInfoManage_module_js_line34_txt-3940" : "工号",
  469 + "employeeInfoManage_module_js_line35_txt-4086" : "性别",
  470 + "employeeInfoManage_module_js_line36_txt-3096" : "所在公司",
  471 + "employeeInfoManage_module_js_line37_txt-3777" : "分公司",
  472 + "employeeInfoManage_module_js_line38_txt-4093" : "工种",
  473 + "employeeInfoManage_module_js_line182_txt-1614" : "人员基础信息",
  474 + "employeeInfoManage_module_js_line286_txt-3729" : "失败：",
  475 + "employeeInfoManage_module_js_line411_txt-4081" : "员工",
  476 + "employeeInfoManage_module_js_line413_txt-3066" : "详细信息",
  477 +
  478 + //------------ 车辆设备信息管理模块 -----------//
  479 + // 模块位置：../module/basicInfo/deviceInfoManage
  480 + // 页面；index.html
  481 + "deviceInfoManage_index_page_line3_txt-848" : "车辆设备信息管理",
  482 + "deviceInfoManage_index_page_line9_txt-3807" : "首页",
  483 + "deviceInfoManage_index_page_line13_txt-2398" : "基础信息",
  484 + "deviceInfoManage_index_page_line17_txt-848" : "车辆设备信息管理",
  485 + "deviceInfoManage_index_page_line27_txt-2233" : "设备信息表",
  486 + "deviceInfoManage_index_page_line32_txt-1791" : "添加设备信息",
  487 +
  488 + // 页面：orderOptionOpen.html
  489 + "deviceInfoManage_orderOptionOpen_page_line5_txt-1682" : "排序字段选择",
  490 + "deviceInfoManage_orderOptionOpen_page_line17_txt-4018" : "确定",
  491 +
  492 + // 页面：list.html
  493 + "deviceInfoManage_list_page_line17_txt-3934" : "序号",
  494 + "deviceInfoManage_list_page_line18_txt-3347" : "线路名称",
  495 + "deviceInfoManage_list_page_line19_txt-2597" : "内部编号",
  496 + "deviceInfoManage_list_page_line20_txt-3211" : "启用日期",
  497 + "deviceInfoManage_list_page_line21_txt-2185" : "旧设备编号",
  498 + "deviceInfoManage_list_page_line22_txt-2184" : "新设备编号",
  499 + "deviceInfoManage_list_page_line23_txt-4389" : "操作人/操作时间",
  500 + "deviceInfoManage_list_page_line24_txt-3874" : "状态",
  501 + "deviceInfoManage_list_page_line25_txt-3942" : "操作",
  502 + "deviceInfoManage_list_page_line38_txt-3364" : "请输拼音",
  503 + "deviceInfoManage_list_page_line44_txt-1773" : "输入内部编号",
  504 + "deviceInfoManage_list_page_line52_txt-4162" : "报废",
  505 + "deviceInfoManage_list_page_line59_txt-4001" : "搜索",
  506 + "deviceInfoManage_list_page_line69_txt-3385" : "排序选项",
  507 + "deviceInfoManage_list_page_line77_txt-4000" : "重置",
  508 + "deviceInfoManage_list_page_line122_txt-4058" : "未知",
  509 + "deviceInfoManage_list_page_line127_txt-3866" : "详细",
  510 + "deviceInfoManage_list_page_line144_txt-3053" : "显示从{{from}}到{{to}} 共{{total}}条 每页显示10条",
  511 + "deviceInfoManage_list_page_line157_txt-4430" : "首页",
  512 + "deviceInfoManage_list_page_line158_txt-3613" : "上一页",
  513 + "deviceInfoManage_list_page_line159_txt-3614" : "下一页",
  514 + "deviceInfoManage_list_page_line160_txt-4068" : "尾页",
  515 +
  516 + // 页面：detail.html
  517 + "deviceInfoManage_detail_page_line3_txt-847" : "车辆设备详细信息",
  518 + "deviceInfoManage_detail_page_line9_txt-3807" : "首页",
  519 + "deviceInfoManage_detail_page_line13_txt-2398" : "基础信息",
  520 + "deviceInfoManage_detail_page_line17_txt-848" : "车辆设备信息管理",
  521 + "deviceInfoManage_detail_page_line21_txt-847" : "车辆设备详细信息",
  522 + "deviceInfoManage_detail_page_line38_txt-1476" : "车辆内部编号",
  523 + "deviceInfoManage_detail_page_line45_txt-3347" : "线路名称",
  524 + "deviceInfoManage_detail_page_line52_txt-3216" : "旧终端号",
  525 + "deviceInfoManage_detail_page_line59_txt-3201" : "新终端号",
  526 + "deviceInfoManage_detail_page_line67_txt-4422" : "旧SIM卡号：",
  527 + "deviceInfoManage_detail_page_line74_txt-3701" : "新SIM卡号：",
  528 + "deviceInfoManage_detail_page_line82_txt-2258" : "故障描述：",
  529 + "deviceInfoManage_detail_page_line90_txt-4403" : "保修描述：",
  530 + "deviceInfoManage_detail_page_line98_txt-3211" : "启用日期",
  531 +
  532 + // 页面：edit.html
  533 + "deviceInfoManage_edit_page_line3_txt-836" : "修改车辆设备信息",
  534 + "deviceInfoManage_edit_page_line9_txt-3807" : "首页",
  535 + "deviceInfoManage_edit_page_line13_txt-2398" : "基础信息",
  536 + "deviceInfoManage_edit_page_line17_txt-848" : "车辆设备信息管理",
  537 + "deviceInfoManage_edit_page_line21_txt-836" : "修改车辆设备信息",
  538 + "deviceInfoManage_edit_page_line29_txt-3849" : "表单",
  539 + "deviceInfoManage_edit_page_line38_txt-3347" : "线路名称",
  540 + "deviceInfoManage_edit_page_line48_txt-3364" : "请输拼音",
  541 + "deviceInfoManage_edit_page_line55_txt-1788" : "线路必须选择",
  542 + "deviceInfoManage_edit_page_line60_txt-3469" : "车辆：",
  543 + "deviceInfoManage_edit_page_line71_txt-3364" : "请输拼音",
  544 + "deviceInfoManage_edit_page_line78_txt-1794" : "车辆必须选择",
  545 + "deviceInfoManage_edit_page_line83_txt-3216" : "旧终端号",
  546 + "deviceInfoManage_edit_page_line91_txt-3201" : "新终端号",
  547 + "deviceInfoManage_edit_page_line98_txt-1264" : "请输入新终端号",
  548 + "deviceInfoManage_edit_page_line102_txt-910" : "新终端号必须填写",
  549 + "deviceInfoManage_edit_page_line110_txt-4422" : "旧SIM卡号：",
  550 + "deviceInfoManage_edit_page_line113_txt-3357" : "请输入旧SIM卡号",
  551 + "deviceInfoManage_edit_page_line118_txt-3701" : "新SIM卡号：",
  552 + "deviceInfoManage_edit_page_line121_txt-3356" : "请输入新SIM卡号",
  553 + "deviceInfoManage_edit_page_line126_txt-2258" : "故障描述：",
  554 + "deviceInfoManage_edit_page_line134_txt-4403" : "保修描述：",
  555 + "deviceInfoManage_edit_page_line170_txt-2252" : "启用日期：",
  556 + "deviceInfoManage_edit_page_line183_txt-146" : "启用日期必须选择，精确到具体时间",
  557 + "deviceInfoManage_edit_page_line197_txt-4173" : "提交",
  558 + "deviceInfoManage_edit_page_line198_txt-3817" : "取消",
  559 +
  560 + // 页面：form.html
  561 + "deviceInfoManage_form_page_line3_txt-845" : "添加车辆设备信息",
  562 + "deviceInfoManage_form_page_line9_txt-3807" : "首页",
  563 + "deviceInfoManage_form_page_line13_txt-2398" : "基础信息",
  564 + "deviceInfoManage_form_page_line17_txt-848" : "车辆设备信息管理",
  565 + "deviceInfoManage_form_page_line21_txt-845" : "添加车辆设备信息",
  566 + "deviceInfoManage_form_page_line29_txt-3849" : "表单",
  567 + "deviceInfoManage_form_page_line38_txt-3347" : "线路名称",
  568 + "deviceInfoManage_form_page_line48_txt-3364" : "请输拼音",
  569 + "deviceInfoManage_form_page_line55_txt-1788" : "线路必须选择",
  570 + "deviceInfoManage_form_page_line60_txt-3469" : "车辆：",
  571 + "deviceInfoManage_form_page_line71_txt-3364" : "请输拼音",
  572 + "deviceInfoManage_form_page_line78_txt-1794" : "车辆必须选择",
  573 + "deviceInfoManage_form_page_line83_txt-3216" : "旧终端号",
  574 + "deviceInfoManage_form_page_line91_txt-3201" : "新终端号",
  575 + "deviceInfoManage_form_page_line98_txt-1264" : "请输入新终端号",
  576 + "deviceInfoManage_form_page_line102_txt-910" : "新终端号必须填写",
  577 + "deviceInfoManage_form_page_line110_txt-4422" : "旧SIM卡号：",
  578 + "deviceInfoManage_form_page_line113_txt-3357" : "请输入旧SIM卡号",
  579 + "deviceInfoManage_form_page_line118_txt-3701" : "新SIM卡号：",
  580 + "deviceInfoManage_form_page_line121_txt-3356" : "请输入新SIM卡号",
  581 + "deviceInfoManage_form_page_line126_txt-2258" : "故障描述：",
  582 + "deviceInfoManage_form_page_line134_txt-4403" : "保修描述：",
  583 + "deviceInfoManage_form_page_line197_txt-4173" : "提交",
  584 + "deviceInfoManage_form_page_line198_txt-3817" : "取消",
  585 +
  586 + // module.js
  587 + "deviceInfoManage_module_js_line26_txt-3347" : "线路名称",
  588 + "deviceInfoManage_module_js_line27_txt-1476" : "车辆内部编号",
  589 + "deviceInfoManage_module_js_line28_txt-3211" : "启用日期",
  590 + "deviceInfoManage_module_js_line29_txt-2185" : "旧设备编号",
  591 + "deviceInfoManage_module_js_line30_txt-3201" : "新终端号",
  592 + "deviceInfoManage_module_js_line148_txt-3729" : "失败：",
  593 + "deviceInfoManage_module_js_line269_txt-3243" : "车辆 {{clZbh}} 设备信息",
290 594  
291 595  
292 596 // TODO：
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/list.html
  View file @77217ea
... ... @@ -5,15 +5,15 @@
5 5 <thead>
6 6 <tr role="row" class="heading">
7 7 <th style="width: 70px; max-width: 70px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line7_txt-3934" | translate}}</th>
8   - <th style="width: 110px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line8_txt-2479" | translate}}</th>
9   - <th style="width: 110px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line9_txt-2597" | translate}}</th>
10   - <th style="width: 110px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line10_txt-3094" | translate}}</th>
11   - <th style="width: 110px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line11_txt-3704" | translate}}</th>
12   - <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line12_txt-3096" | translate}}</th>
13   - <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line13_txt-2188" | translate}}</th>
14   - <th style="width: 60px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line14_txt-4087" | translate}}</th>
15   - <th style="width: 80px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;" >{{"busInfoManage_list_page_line15_txt-3874" | translate}}</th>
16   - <th style="width: 230px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line16_txt-3942" | translate}}</th>
  8 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line8_txt-2479" | translate}}</th>
  9 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line9_txt-2597" | translate}}</th>
  10 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line10_txt-3094" | translate}}</th>
  11 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line11_txt-3704" | translate}}</th>
  12 + <th style="width: 130px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line12_txt-3096" | translate}}</th>
  13 + <th style="width: 130px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line13_txt-2188" | translate}}</th>
  14 + <th style="width: 60px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line14_txt-4087" | translate}}</th>
  15 + <th style="width: 80px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;" >{{"busInfoManage_list_page_line15_txt-3874" | translate}}</th>
  16 + <th style="width: 230px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"busInfoManage_list_page_line16_txt-3942" | translate}}</th>
17 17 </tr>
18 18 <tr role="row" class="filter">
19 19 <td></td>
... ... @@ -40,6 +40,7 @@
40 40 iterobjexp="item.businessName"
41 41 searchph="{{'busInfoManage_list_page_line41_txt-3364' | translate}}"
42 42 searchexp="this.businessName"
  43 + width="100"
43 44 required
44 45 >
45 46 </sa-Select5>
... ... @@ -55,6 +56,7 @@
55 56 iterobjexp="item.businessName"
56 57 searchph="{{'busInfoManage_list_page_line56_txt-3364' | translate}}"
57 58 searchexp="this.businessName"
  59 + width="100"
58 60 required
59 61 >
60 62 </sa-Select5>
... ... @@ -153,7 +155,7 @@
153 155  
154 156 <div class="pageBar">
155 157 <div class="pageBarLeft"
156   - translate="busInfoManage_list_page_line153_txt-3053"
  158 + translate="busInfoManage_list_page_line156_txt-3053"
157 159 translate-value-from="{{ ctrl.page()['uiFromRecord'] }}"
158 160 translate-value-to="{{ ctrl.page()['uiToRecord'] }}"
159 161 translate-value-total="{{ ctrl.page()['totalElements'] }}">
... ... @@ -166,10 +168,10 @@
166 168 rotate="false"
167 169 max-size="10"
168 170 boundary-links="true"
169   - first-text="{{'busInfoManage_list_page_line163_txt-4430' | translate}}"
170   - previous-text="{{'busInfoManage_list_page_line164_txt-3613' | translate}}"
171   - next-text="{{'busInfoManage_list_page_line165_txt-3614' | translate}}"
172   - last-text="{{'busInfoManage_list_page_line166_txt-4068' | translate}}">
  171 + first-text="{{'busInfoManage_list_page_line169_txt-4430' | translate}}"
  172 + previous-text="{{'busInfoManage_list_page_line170_txt-3613' | translate}}"
  173 + next-text="{{'busInfoManage_list_page_line171_txt-3614' | translate}}"
  174 + last-text="{{'busInfoManage_list_page_line172_txt-4068' | translate}}">
173 175 </uib-pagination>
174 176 </div>
175 177 </div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/detail.html
  View file @77217ea
1 1 <div class="page-head">
2 2 <div class="page-title">
3   - <h1>$$$$$${txt-847}</h1>
  3 + <h1>{{"deviceInfoManage_detail_page_line3_txt-847" | translate}}</h1>
4 4 </div>
5 5 </div>
6 6  
7 7 <ul class="page-breadcrumb breadcrumb">
8 8 <li>
9   - <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
  9 + <a href="/pages/home.html" data-pjax>{{"deviceInfoManage_detail_page_line9_txt-3807" | translate}}</a>
10 10 <i class="fa fa-circle"></i>
11 11 </li>
12 12 <li>
13   - <span class="active">$$$$$${txt-2398}</span>
  13 + <span class="active">{{"deviceInfoManage_detail_page_line13_txt-2398" | translate}}</span>
14 14 <i class="fa fa-circle"></i>
15 15 </li>
16 16 <li>
17   - <a ui-sref="deviceInfoManage">$$$$$${txt-848}</a>
  17 + <a ui-sref="deviceInfoManage">{{"deviceInfoManage_detail_page_line17_txt-848" | translate}}</a>
18 18 <i class="fa fa-circle"></i>
19 19 </li>
20 20 <li>
21   - <span class="active">$$$$$${txt-847}</span>
  21 + <span class="active">{{"deviceInfoManage_detail_page_line21_txt-847" | translate}}</span>
22 22 </li>
23 23 </ul>
24 24  
... ... @@ -35,28 +35,28 @@
35 35 <form class="form-horizontal" novalidate name="myForm">
36 36 <div class="form-body">
37 37 <div class="form-group has-success has-feedback">
38   - <label class="col-md-2 control-label">$$$$$${txt-1476}*：</label>
  38 + <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line38_txt-1476" | translate}}*：</label>
39 39 <div class="col-md-3">
40 40 <input type="text" class="form-control" name="clZbh"
41 41 ng-model="ctrl.deviceInfoForDetail.clZbh" readonly/>
42 42 </div>
43 43 </div>
44 44 <div class="form-group has-success has-feedback">
45   - <label class="col-md-2 control-label">$$$$$${txt-3815}*：</label>
  45 + <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line45_txt-3347" | translate}}*：</label>
46 46 <div class="col-md-3">
47 47 <input type="text" class="form-control" name="xlName"
48 48 ng-model="ctrl.deviceInfoForDetail.xlName" readonly/>
49 49 </div>
50 50 </div>
51 51 <div class="form-group has-success has-feedback">
52   - <label class="col-md-2 control-label">$$$$$${txt-3216}*：</label>
  52 + <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line52_txt-3216" | translate}}*：</label>
53 53 <div class="col-md-3">
54 54 <input type="text" class="form-control" name="oldDeviceNo"
55 55 ng-model="ctrl.deviceInfoForDetail.oldDeviceNo" readonly/>
56 56 </div>
57 57 </div>
58 58 <div class="form-group has-success has-feedback">
59   - <label class="col-md-2 control-label">$$$$$${txt-3201}*：</label>
  59 + <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line59_txt-3201" | translate}}*：</label>
60 60 <div class="col-md-3">
61 61 <input type="text" class="form-control" name="newDeviceNo"
62 62 ng-model="ctrl.deviceInfoForDetail.newDeviceNo" readonly/>
... ... @@ -64,14 +64,14 @@
64 64 </div>
65 65  
66 66 <div class="form-group">
67   - <label class="col-md-2 control-label">$$$$$${txt-4422}</label>
  67 + <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line67_txt-4422" | translate}}</label>
68 68 <div class="col-md-4">
69 69 <input type="text" class="form-control" name="oldSimNo"
70 70 ng-model="ctrl.deviceInfoForDetail.oldSimNo" readonly/>
71 71 </div>
72 72 </div>
73 73 <div class="form-group">
74   - <label class="col-md-2 control-label">$$$$$${txt-3701}</label>
  74 + <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line74_txt-3701" | translate}}</label>
75 75 <div class="col-md-4">
76 76 <input type="text" class="form-control" name="newSimNo"
77 77 ng-model="ctrl.deviceInfoForDetail.newSimNo" readonly/>
... ... @@ -79,7 +79,7 @@
79 79 </div>
80 80  
81 81 <div class="form-group">
82   - <label class="col-md-2 control-label">$$$$$${txt-2258}</label>
  82 + <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line82_txt-2258" | translate}}</label>
83 83 <div class="col-md-10">
84 84 <textarea rows="3" class="form-control" name="troubleDesc"
85 85 ng-model="ctrl.deviceInfoForDetail.troubleDesc" readonly></textarea>
... ... @@ -87,7 +87,7 @@
87 87 </div>
88 88  
89 89 <div class="form-group">
90   - <label class="col-md-2 control-label">$$$$$${txt-4403}</label>
  90 + <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line90_txt-4403" | translate}}</label>
91 91 <div class="col-md-10">
92 92 <textarea rows="3" class="form-control" name="guaranteeDesc"
93 93 ng-model="ctrl.deviceInfoForDetail.guaranteeDesc" readonly></textarea>
... ... @@ -95,7 +95,7 @@
95 95 </div>
96 96  
97 97 <div class="form-group has-success has-feedback">
98   - <label class="col-md-2 control-label">$$$$$${txt-3211}*：</label>
  98 + <label class="col-md-2 control-label">{{"deviceInfoManage_detail_page_line98_txt-3211" | translate}}*：</label>
99 99 <div class="col-md-3">
100 100 <input type="text" class="form-control"
101 101 name="qyrq" uib-datepicker-popup="yyyy年MM月dd日 HH:mm"
... ... @@ -109,4 +109,4 @@
109 109 </form>
110 110 </div>
111 111  
112   -</div>
113 112 \ No newline at end of file
  113 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/edit.html
  View file @77217ea
1 1 <div class="page-head">
2 2 <div class="page-title">
3   - <h1>$$$$$${txt-845}</h1>
  3 + <h1>{{"deviceInfoManage_edit_page_line3_txt-845" | translate}}</h1>
4 4 </div>
5 5 </div>
6 6  
7 7 <ul class="page-breadcrumb breadcrumb">
8 8 <li>
9   - <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
  9 + <a href="/pages/home.html" data-pjax>{{"deviceInfoManage_edit_page_line9_txt-3807" | translate}}</a>
10 10 <i class="fa fa-circle"></i>
11 11 </li>
12 12 <li>
13   - <span class="active">$$$$$${txt-2398}</span>
  13 + <span class="active">{{"deviceInfoManage_edit_page_line13_txt-2398" | translate}}</span>
14 14 <i class="fa fa-circle"></i>
15 15 </li>
16 16 <li>
17   - <a ui-sref="deviceInfoManage">$$$$$${txt-848}</a>
  17 + <a ui-sref="deviceInfoManage">{{"deviceInfoManage_edit_page_line17_txt-848" | translate}}</a>
18 18 <i class="fa fa-circle"></i>
19 19 </li>
20 20 <li>
21   - <span class="active">$$$$$${txt-836}</span>
  21 + <span class="active">{{"deviceInfoManage_edit_page_line21_txt-836" | translate}}</span>
22 22 </li>
23 23 </ul>
24 24  
... ... @@ -26,7 +26,7 @@
26 26 <div class="portlet-title">
27 27 <div class="caption">
28 28 <i class="icon-equalizer font-red-sunglo"></i> <span
29   - class="caption-subject font-red-sunglo bold uppercase">$$$$$${txt-3849}</span>
  29 + class="caption-subject font-red-sunglo bold uppercase">{{"deviceInfoManage_edit_page_line29_txt-3849" | translate}}</span>
30 30 </div>
31 31 </div>
32 32  
... ... @@ -35,7 +35,7 @@
35 35 <div class="form-body">
36 36  
37 37 <div class="form-group has-success has-feedback">
38   - <label class="col-md-2 control-label">$$$$$${txt-3815}*：</label>
  38 + <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line38_txt-3347" | translate}}*：</label>
39 39 <div class="col-md-3">
40 40 <sa-Select5 name="xl"
41 41 model="ctrl.deviceInfoForSave"
... ... @@ -45,19 +45,19 @@
45 45 dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
46 46 iterobjname="item"
47 47 iterobjexp="item.name"
48   - searchph="$$$$$${txt-3364}"
  48 + searchph="{{'deviceInfoManage_edit_page_line48_txt-3364' | translate}}"
49 49 searchexp="this.name"
50 50 required >
51 51 </sa-Select5>
52 52 </div>
53 53 <!-- 隐藏块，显示验证信息 -->
54 54 <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
55   - $$$$$${txt-1788}
  55 + {{"deviceInfoManage_edit_page_line55_txt-1788" | translate}}
56 56 </div>
57 57 </div>
58 58  
59 59 <div class="form-group has-success has-feedback">
60   - <label class="col-md-2 control-label">$$$$$${txt-3469}</label>
  60 + <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line60_txt-3469" | translate}}</label>
61 61 <div class="col-md-3">
62 62 <sa-Select5 name="cl"
63 63 model="ctrl.deviceInfoForSave"
... ... @@ -68,19 +68,19 @@
68 68 dsparamsextra="{'type':'all', 'isCancel_eq': false}"
69 69 iterobjname="item"
70 70 iterobjexp="item.cl.insideCode + '<' + item.xl.name + '>'"
71   - searchph="$$$$$${txt-3364}"
  71 + searchph="{{'deviceInfoManage_edit_page_line71_txt-3364' | translate}}"
72 72 searchexp="this.cl.insideCode + '<' + this.xl.name + '>'"
73 73 required >
74 74 </sa-Select5>
75 75 </div>
76 76 <!-- 隐藏块，显示验证信息 -->
77 77 <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required">
78   - $$$$$${txt-1794}
  78 + {{"deviceInfoManage_edit_page_line78_txt-1794" | translate}}
79 79 </div>
80 80 </div>
81 81  
82 82 <div class="form-group has-success has-feedback">
83   - <label class="col-md-2 control-label">$$$$$${txt-3216}*：</label>
  83 + <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line83_txt-3216" | translate}}*：</label>
84 84 <div class="col-md-3">
85 85 <input type="text" class="form-control" name="oldDeviceNo"
86 86 ng-model="ctrl.deviceInfoForSave.oldDeviceNo" readonly/>
... ... @@ -88,18 +88,18 @@
88 88 </div>
89 89  
90 90 <div class="form-group has-success has-feedback">
91   - <label class="col-md-2 control-label">$$$$$${txt-3201}*：</label>
  91 + <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line91_txt-3201" | translate}}*：</label>
92 92 <div class="col-md-3">
93 93 <input type="text" class="form-control"
94 94 name="newDeviceNo" ng-model="ctrl.deviceInfoForSave.newDeviceNo"
95 95 remote-Validation
96 96 remotevtype="cars_sbbh"
97 97 remotevparam="{{ {'id_eq': null, 'equipmentCode_eq': ctrl.deviceInfoForSave.newDeviceNo} | json}}"
98   - required placeholder="$$$$$${txt-1264}"/>
  98 + required placeholder="{{'deviceInfoManage_edit_page_line98_txt-1264' | translate}}"/>
99 99 </div>
100 100 <!-- 隐藏块，显示验证信息 -->
101 101 <div class="alert alert-danger well-sm" ng-show="myForm.newDeviceNo.$error.required">
102   - $$$$$${txt-910}
  102 + {{"deviceInfoManage_edit_page_line102_txt-910" | translate}}
103 103 </div>
104 104 <div class="alert alert-danger well-sm" ng-show="myForm.newDeviceNo.$error.remote">
105 105 {{$remote_msg}}
... ... @@ -107,23 +107,23 @@
107 107 </div>
108 108  
109 109 <div class="form-group">
110   - <label class="col-md-2 control-label">$$$$$${txt-4422}</label>
  110 + <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line110_txt-4422" | translate}}</label>
111 111 <div class="col-md-4">
112 112 <input type="text" class="form-control" ng-model="ctrl.deviceInfoForSave.oldSimNo"
113   - placeholder="$$$$$${txt-3357}"/>
  113 + placeholder="{{'deviceInfoManage_edit_page_line113_txt-3357' | translate}}"/>
114 114 </div>
115 115 </div>
116 116  
117 117 <div class="form-group">
118   - <label class="col-md-2 control-label">$$$$$${txt-3701}</label>
  118 + <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line118_txt-3701" | translate}}</label>
119 119 <div class="col-md-4">
120 120 <input type="text" class="form-control" ng-model="ctrl.deviceInfoForSave.newSimNo"
121   - placeholder="$$$$$${txt-3356}"/>
  121 + placeholder="{{'deviceInfoManage_edit_page_line121_txt-3356' | translate}}"/>
122 122 </div>
123 123 </div>
124 124  
125 125 <div class="form-group">
126   - <label class="col-md-2 control-label">$$$$$${txt-2258}</label>
  126 + <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line126_txt-2258" | translate}}</label>
127 127 <div class="col-md-10">
128 128 <textarea rows="3" class="form-control" name="descriptions"
129 129 ng-model="ctrl.deviceInfoForSave.troubleDesc"></textarea>
... ... @@ -131,7 +131,7 @@
131 131 </div>
132 132  
133 133 <div class="form-group">
134   - <label class="col-md-2 control-label">$$$$$${txt-4403}</label>
  134 + <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line134_txt-4403" | translate}}</label>
135 135 <div class="col-md-10">
136 136 <textarea rows="3" class="form-control" name="descriptions"
137 137 ng-model="ctrl.deviceInfoForSave.guaranteeDesc"></textarea>
... ... @@ -167,7 +167,7 @@
167 167 <!--</div>-->
168 168  
169 169 <div class="form-group has-success has-feedback">
170   - <label class="col-md-2 control-label">$$$$$${txt-2252}</label>
  170 + <label class="col-md-2 control-label">{{"deviceInfoManage_edit_page_line170_txt-2252" | translate}}</label>
171 171 <div class="col-md-3">
172 172 <div class="input-group">
173 173 <input type="datetime-local" class="form-control" name="qyrq"
... ... @@ -180,7 +180,7 @@
180 180 </div>
181 181 <!-- 隐藏块，显示验证信息 -->
182 182 <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">
183   - $$$$$${txt-146}
  183 + {{"deviceInfoManage_edit_page_line183_txt-146" | translate}}
184 184 </div>
185 185 <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">
186 186 {{$remote_msg}}
... ... @@ -194,12 +194,12 @@
194 194 <div class="form-actions">
195 195 <div class="row">
196 196 <div class="col-md-offset-3 col-md-4">
197   - <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
198   - <a type="button" class="btn default" ui-sref="deviceInfoManage" ><i class="fa fa-times"></i> $$$$$${txt-3817}</a>
  197 + <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> {{"deviceInfoManage_edit_page_line197_txt-4173" | translate}}</button>
  198 + <a type="button" class="btn default" ui-sref="deviceInfoManage" ><i class="fa fa-times"></i> {{"deviceInfoManage_edit_page_line198_txt-3817" | translate}}</a>
199 199 </div>
200 200 </div>
201 201 </div>
202 202 </form>
203 203 </div>
204 204  
205   -</div>
206 205 \ No newline at end of file
  206 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html
  View file @77217ea
1 1 <div class="page-head">
2 2 <div class="page-title">
3   - <h1>$$$$$${txt-845}</h1>
  3 + <h1>{{"deviceInfoManage_form_page_line3_txt-845" | translate}}</h1>
4 4 </div>
5 5 </div>
6 6  
7 7 <ul class="page-breadcrumb breadcrumb">
8 8 <li>
9   - <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
  9 + <a href="/pages/home.html" data-pjax>{{"deviceInfoManage_form_page_line9_txt-3807" | translate}}</a>
10 10 <i class="fa fa-circle"></i>
11 11 </li>
12 12 <li>
13   - <span class="active">$$$$$${txt-2398}</span>
  13 + <span class="active">{{"deviceInfoManage_form_page_line13_txt-2398" | translate}}</span>
14 14 <i class="fa fa-circle"></i>
15 15 </li>
16 16 <li>
17   - <a ui-sref="deviceInfoManage">$$$$$${txt-848}</a>
  17 + <a ui-sref="deviceInfoManage">{{"deviceInfoManage_form_page_line17_txt-848" | translate}}</a>
18 18 <i class="fa fa-circle"></i>
19 19 </li>
20 20 <li>
21   - <span class="active">$$$$$${txt-845}</span>
  21 + <span class="active">{{"deviceInfoManage_form_page_line21_txt-845" | translate}}</span>
22 22 </li>
23 23 </ul>
24 24  
... ... @@ -26,7 +26,7 @@
26 26 <div class="portlet-title">
27 27 <div class="caption">
28 28 <i class="icon-equalizer font-red-sunglo"></i> <span
29   - class="caption-subject font-red-sunglo bold uppercase">$$$$$${txt-3849}</span>
  29 + class="caption-subject font-red-sunglo bold uppercase">{{"deviceInfoManage_form_page_line29_txt-3849" | translate}}</span>
30 30 </div>
31 31 </div>
32 32  
... ... @@ -35,7 +35,7 @@
35 35 <div class="form-body">
36 36  
37 37 <div class="form-group has-success has-feedback">
38   - <label class="col-md-2 control-label">$$$$$${txt-3815}*：</label>
  38 + <label class="col-md-2 control-label">{{"deviceInfoManage_form_page_line38_txt-3347" | translate}}*：</label>
39 39 <div class="col-md-3">
40 40 <sa-Select5 name="xl"
41 41 model="ctrl.deviceInfoForSave"
... ... @@ -45,19 +45,19 @@
45 45 dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
46 46 iterobjname="item"
47 47 iterobjexp="item.name"
48   - searchph="$$$$$${txt-3364}"
  48 + searchph="{{'deviceInfoManage_form_page_line48_txt-3364' | translate}}"
49 49 searchexp="this.name"
50 50 required >
51 51 </sa-Select5>
52 52 </div>
53 53 <!-- 隐藏块，显示验证信息 -->
54 54 <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
55   - $$$$$${txt-1788}
  55 + {{"deviceInfoManage_form_page_line55_txt-1788" | translate}}
56 56 </div>
57 57 </div>
58 58  
59 59 <div class="form-group has-success has-feedback">
60   - <label class="col-md-2 control-label">$$$$$${txt-3469}</label>
  60 + <label class="col-md-2 control-label">{{"deviceInfoManage_form_page_line60_txt-3469" | translate}}</label>
61 61 <div class="col-md-3">
62 62 <sa-Select5 name="cl"
63 63 model="ctrl.deviceInfoForSave"
... ... @@ -68,19 +68,19 @@
68 68 dsparamsextra="{'type':'all', 'isCancel_eq': false}"
69 69 iterobjname="item"
70 70 iterobjexp="item.cl.insideCode + '<' + item.xl.name + '>'"
71   - searchph="$$$$$${txt-3364}"
  71 + searchph="{{'deviceInfoManage_form_page_line71_txt-3364' | translate}}"
72 72 searchexp="this.cl.insideCode + '<' + this.xl.name + '>'"
73 73 required >
74 74 </sa-Select5>
75 75 </div>
76 76 <!-- 隐藏块，显示验证信息 -->
77 77 <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required">
78   - $$$$$${txt-1794}
  78 + {{"deviceInfoManage_form_page_line78_txt-1794" | translate}}
79 79 </div>
80 80 </div>
81 81  
82 82 <div class="form-group has-success has-feedback">
83   - <label class="col-md-2 control-label">$$$$$${txt-3216}*：</label>
  83 + <label class="col-md-2 control-label">{{"deviceInfoManage_form_page_line83_txt-3216" | translate}}*：</label>
84 84 <div class="col-md-3">
85 85 <input type="text" class="form-control" name="oldDeviceNo"
86 86 ng-model="ctrl.deviceInfoForSave.oldDeviceNo" readonly/>
... ... @@ -88,18 +88,18 @@
88 88 </div>
89 89  
90 90 <div class="form-group has-success has-feedback">
91   - <label class="col-md-2 control-label">$$$$$${txt-3201}*：</label>
  91 + <label class="col-md-2 control-label">{{"deviceInfoManage_form_page_line91_txt-3201" | translate}}*：</label>
92 92 <div class="col-md-3">
93 93 <input type="text" class="form-control"
94 94 name="newDeviceNo" ng-model="ctrl.deviceInfoForSave.newDeviceNo"
95 95 remote-Validation
96 96 remotevtype="cars_sbbh"
97 97 remotevparam="{{ {'id_eq': null, 'equipmentCode_eq': ctrl.deviceInfoForSave.newDeviceNo} | json}}"
98   - required placeholder="$$$$$${txt-1264}"/>
  98 + required placeholder="{{'deviceInfoManage_form_page_line98_txt-1264' | translate}}"/>
99 99 </div>
100 100 <!-- 隐藏块，显示验证信息 -->
101 101 <div class="alert alert-danger well-sm" ng-show="myForm.newDeviceNo.$error.required">
102   - $$$$$${txt-910}
  102 + {{"deviceInfoManage_form_page_line102_txt-910" | translate}}
103 103 </div>
104 104 <div class="alert alert-danger well-sm" ng-show="myForm.newDeviceNo.$error.remote">
105 105 {{$remote_msg}}
... ... @@ -107,23 +107,23 @@
107 107 </div>
108 108  
109 109 <div class="form-group">
110   - <label class="col-md-2 control-label">$$$$$${txt-4422}</label>
  110 + <label class="col-md-2 control-label">{{"deviceInfoManage_form_page_line110_txt-4422" | translate}}</label>
111 111 <div class="col-md-4">
112 112 <input type="text" class="form-control" ng-model="ctrl.deviceInfoForSave.oldSimNo"
113   - placeholder="$$$$$${txt-3357}"/>
  113 + placeholder="{{'deviceInfoManage_form_page_line113_txt-3357' | translate}}"/>
114 114 </div>
115 115 </div>
116 116  
117 117 <div class="form-group">
118   - <label class="col-md-2 control-label">$$$$$${txt-3701}</label>
  118 + <label class="col-md-2 control-label">{{"deviceInfoManage_form_page_line118_txt-3701" | translate}}</label>
119 119 <div class="col-md-4">
120 120 <input type="text" class="form-control" ng-model="ctrl.deviceInfoForSave.newSimNo"
121   - placeholder="$$$$$${txt-3356}"/>
  121 + placeholder="{{'deviceInfoManage_form_page_line121_txt-3356' | translate}}"/>
122 122 </div>
123 123 </div>
124 124  
125 125 <div class="form-group">
126   - <label class="col-md-2 control-label">$$$$$${txt-2258}</label>
  126 + <label class="col-md-2 control-label">{{"deviceInfoManage_form_page_line126_txt-2258" | translate}}</label>
127 127 <div class="col-md-10">
128 128 <textarea rows="3" class="form-control" name="descriptions"
129 129 ng-model="ctrl.deviceInfoForSave.troubleDesc"></textarea>
... ... @@ -131,7 +131,7 @@
131 131 </div>
132 132  
133 133 <div class="form-group">
134   - <label class="col-md-2 control-label">$$$$$${txt-4403}</label>
  134 + <label class="col-md-2 control-label">{{"deviceInfoManage_form_page_line134_txt-4403" | translate}}</label>
135 135 <div class="col-md-10">
136 136 <textarea rows="3" class="form-control" name="descriptions"
137 137 ng-model="ctrl.deviceInfoForSave.guaranteeDesc"></textarea>
... ... @@ -194,12 +194,12 @@
194 194 <div class="form-actions">
195 195 <div class="row">
196 196 <div class="col-md-offset-3 col-md-4">
197   - <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
198   - <a type="button" class="btn default" ui-sref="deviceInfoManage" ><i class="fa fa-times"></i> $$$$$${txt-3817}</a>
  197 + <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> {{"deviceInfoManage_form_page_line197_txt-4173" | translate}}</button>
  198 + <a type="button" class="btn default" ui-sref="deviceInfoManage" ><i class="fa fa-times"></i> {{"deviceInfoManage_form_page_line198_txt-3817" | translate}}</a>
199 199 </div>
200 200 </div>
201 201 </div>
202 202 </form>
203 203 </div>
204 204  
205   -</div>
206 205 \ No newline at end of file
  206 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/index.html
  View file @77217ea
1 1 <div class="page-head">
2 2 <div class="page-title">
3   - <h1>$$$$$${txt-848}</h1>
  3 + <h1>{{"deviceInfoManage_index_page_line3_txt-848" | translate}}</h1>
4 4 </div>
5 5 </div>
6 6  
7 7 <ul class="page-breadcrumb breadcrumb">
8 8 <li>
9   - <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
  9 + <a href="/pages/home.html" data-pjax>{{"deviceInfoManage_index_page_line9_txt-3807" | translate}}</a>
10 10 <i class="fa fa-circle"></i>
11 11 </li>
12 12 <li>
13   - <span class="active">$$$$$${txt-2398}</span>
  13 + <span class="active">{{"deviceInfoManage_index_page_line13_txt-2398" | translate}}</span>
14 14 <i class="fa fa-circle"></i>
15 15 </li>
16 16 <li>
17   - <span class="active">$$$$$${txt-848}</span>
  17 + <span class="active">{{"deviceInfoManage_index_page_line17_txt-848" | translate}}</span>
18 18 </li>
19 19 </ul>
20 20  
... ... @@ -24,12 +24,12 @@
24 24 <div class="portlet-title">
25 25 <div class="caption font-dark">
26 26 <i class="fa fa-database font-dark"></i>
27   - <span class="caption-subject bold uppercase">$$$$$${txt-2233}</span>
  27 + <span class="caption-subject bold uppercase">{{"deviceInfoManage_index_page_line27_txt-2233" | translate}}</span>
28 28 </div>
29 29 <div class="actions">
30 30 <a href="javascript:" class="btn blue" ng-click="ctrl.goForm()">
31 31 <i class="fa fa-plus"></i>
32   - $$$$$${txt-1791}
  32 + {{"deviceInfoManage_index_page_line32_txt-1791" | translate}}
33 33 </a>
34 34  
35 35 <!--<div class="btn-group">-->
... ... @@ -55,4 +55,4 @@
55 55 </div>
56 56 </div>
57 57 </div>
58   -</div>
59 58 \ No newline at end of file
  59 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/list.html
  View file @77217ea
... ... @@ -10,19 +10,19 @@
10 10 </style>
11 11  
12 12  
13   - <div style="width: 100%; height: 100%; overflow: auto">
  13 + <div class="fixDiv">
14 14 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
15 15 <thead>
16 16 <tr role="row" class="heading">
17   - <th style="width: 70px;">$$$$$${txt-3934}</th>
18   - <th style="width: 15%;">$$$$$${txt-3347}</th>
19   - <th style="width: 10%;">$$$$$${txt-2597}</th>
20   - <th style="width: 160px;">$$$$$${txt-3211}</th>
21   - <th>$$$$$${txt-2185}</th>
22   - <th>$$$$$${txt-2184}</th>
23   - <th style="width: 180px;">$$$$$${txt-4389}</th>
24   - <th style="width: 80px;" >$$$$$${txt-3874}</th>
25   - <th style="width: 150pt;">$$$$$${txt-3942}</th>
  17 + <th style="width: 70px; max-width: 70px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line17_txt-3934" | translate}}</th>
  18 + <th style="width: 170px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line18_txt-3347" | translate}}</th>
  19 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line19_txt-2597" | translate}}</th>
  20 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line20_txt-3211" | translate}}</th>
  21 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line21_txt-2185" | translate}}</th>
  22 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line22_txt-2184" | translate}}</th>
  23 + <th style="width: 160px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line23_txt-4389" | translate}}</th>
  24 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line24_txt-3874" | translate}}</th>
  25 + <th style="width: 200px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"deviceInfoManage_list_page_line25_txt-3942" | translate}}</th>
26 26 </tr>
27 27 <tr role="row" class="filter">
28 28 <td></td>
... ... @@ -35,13 +35,14 @@
35 35 dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'xl' } | json }}"
36 36 iterobjname="item"
37 37 iterobjexp="item.name"
38   - searchph="$$$$$${txt-3364}"
  38 + searchph="{{'deviceInfoManage_list_page_line38_txt-3364' | translate}}"
39 39 searchexp="this.name"
  40 + width="140"
40 41 required >
41 42 </sa-Select5>
42 43 </td>
43 44 <td>
44   - <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['clZbh_like']" placeholder="$$$$$${txt-1773}"/>
  45 + <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['clZbh_like']" placeholder="{{'deviceInfoManage_list_page_line44_txt-1773' | translate}}"/>
45 46 </td>
46 47 <td></td>
47 48 <td></td>
... ... @@ -49,14 +50,14 @@
49 50 <td></td>
50 51 <td>
51 52 <label class="checkbox-inline input">
52   - <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']" />$$$$$${txt-4162}
  53 + <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']" />{{"deviceInfoManage_list_page_line52_txt-4162" | translate}}
53 54 </label>
54 55 </td>
55 56 <td>
56 57 <div class="btn-group">
57 58 <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;"
58 59 ng-click="ctrl.doPage()">
59   - <i class="fa fa-search"></i> $$$$$${txt-4001}</button>
  60 + <i class="fa fa-search"></i> {{"deviceInfoManage_list_page_line59_txt-4001" | translate}}</button>
60 61 <button class="btn btn-sm green btn-outline filter-submit margin-bottom dropdown-toggle"
61 62 data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
62 63 <span class="caret"></span>
... ... @@ -66,7 +67,7 @@
66 67 <li>
67 68 <a href="javascript:" class="tool-action" ng-click="ctrl.customOrder()">
68 69 <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
69   - $$$$$${txt-3385}
  70 + {{"deviceInfoManage_list_page_line69_txt-3385" | translate}}
70 71 </a>
71 72 </li>
72 73 </ul>
... ... @@ -74,7 +75,7 @@
74 75  
75 76 <button class="btn btn-sm red btn-outline filter-cancel"
76 77 ng-click="ctrl.reset()">
77   - <i class="fa fa-times"></i> $$$$$${txt-4000}</button>
  78 + <i class="fa fa-times"></i> {{"deviceInfoManage_list_page_line77_txt-4000" | translate}}</button>
78 79 </td>
79 80  
80 81 </tr>
... ... @@ -119,12 +120,12 @@
119 120  
120 121 </td>
121 122 <td>
122   - <span ng-bind="info.isCancel | dict:'truefalseType':'$$$$$${txt-4058}' "></span>
  123 + <span ng-bind="info.isCancel | dict:'truefalseType':('deviceInfoManage_list_page_line122_txt-4058' | translate) "></span>
123 124 </td>
124 125 <td>
125 126 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
126 127 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
127   - <a ui-sref="deviceInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> $$$$$${txt-3866} </a>
  128 + <a ui-sref="deviceInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> {{"deviceInfoManage_list_page_line127_txt-3866" | translate}} </a>
128 129 <!--<a ui-sref="deviceInfoManage_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 修改 </a>-->
129 130 <!--<a sweetalert-->
130 131 <!--sweet-options="{title: '是否作废车辆设备历史信息？',text: '内部编号：' + info.clZbh, html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"-->
... ... @@ -140,8 +141,11 @@
140 141 </div>
141 142  
142 143 <div class="pageBar">
143   - <div class="pageBarLeft">
144   - $$$$$${txt-3053}
  144 + <div class="pageBarLeft"
  145 + translate="employeeInfoManage_list_page_line189_txt-3053"
  146 + translate-value-from="{{ ctrl.page()['uiFromRecord'] }}"
  147 + translate-value-to="{{ ctrl.page()['uiToRecord'] }}"
  148 + translate-value-total="{{ ctrl.page()['totalElements'] }}">
145 149 </div>
146 150  
147 151 <div class="pageBarRight">
... ... @@ -151,10 +155,10 @@
151 155 rotate="false"
152 156 max-size="10"
153 157 boundary-links="true"
154   - first-text="$$$$$${txt-4430}"
155   - previous-text="$$$$$${txt-3613}"
156   - next-text="$$$$$${txt-3614}"
157   - last-text="$$$$$${txt-4068}">
  158 + first-text="{{'deviceInfoManage_list_page_line157_txt-4430' | translate}}"
  159 + previous-text="{{'deviceInfoManage_list_page_line158_txt-3613' | translate}}"
  160 + next-text="{{'deviceInfoManage_list_page_line159_txt-3614' | translate}}"
  161 + last-text="{{'deviceInfoManage_list_page_line160_txt-4068' | translate}}">
158 162 </uib-pagination>
159 163 </div>
160 164 </div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js
  View file @77217ea
... ... @@ -5,7 +5,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
5 5 [
6 6 'DeviceInfoManageService_g',
7 7 'UserPrincipal',
8   - function(service, UserPrincipal) {
  8 + '$translate',
  9 + function(service, UserPrincipal, translate) {
9 10 /** 当前的查询条件信息 */
10 11 var currentSearchCondition = {'isCancel_eq': false};
11 12  
... ... @@ -22,11 +23,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
22 23  
23 24 // 字段描述
24 25 var columns = [
25   - {name: "xl", desc: i18n('txt-3347')},
26   - {name: "clZbh", desc: i18n('txt-1476')},
27   - {name: "qyrq", desc: i18n('txt-3211')},
28   - {name: "oldDeviceNo", desc: i18n('txt-2185')},
29   - {name: "newDeviceNo", desc: i18n('txt-3201')}
  26 + {name: "xl", desc: translate.instant("deviceInfoManage_module_js_line26_txt-3347")},
  27 + {name: "clZbh", desc: translate.instant("deviceInfoManage_module_js_line27_txt-1476")},
  28 + {name: "qyrq", desc: translate.instant("deviceInfoManage_module_js_line28_txt-3211")},
  29 + {name: "oldDeviceNo", desc: translate.instant("deviceInfoManage_module_js_line29_txt-2185")},
  30 + {name: "newDeviceNo", desc: translate.instant("deviceInfoManage_module_js_line30_txt-3201")}
30 31 ];
31 32 // 排序字段
32 33 var orderColumns = {
... ... @@ -117,7 +118,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
117 118 [
118 119 'DeviceInfoManageService',
119 120 '$uibModal',
120   - function(service, $uibModal) {
  121 + '$translate',
  122 + function(service, $uibModal, translate) {
121 123 var self = this;
122 124 var CarDevice = service.getQueryClass();
123 125  
... ... @@ -143,7 +145,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
143 145 self.toggleCarDevice = function(id) {
144 146 CarDevice.delete({id: id}, function(result) {
145 147 if (result.msg) { // 暂时这样做，之后全局拦截
146   - alert(i18n('txt-3729') + result.msg);
  148 + alert(translate.instant("deviceInfoManage_module_js_line148_txt-3729") + result.msg);
147 149 } else {
148 150 self.doPage();
149 151 }
... ... @@ -252,7 +254,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
252 254 [
253 255 'DeviceInfoManageService',
254 256 '$stateParams',
255   - function(service, $stateParams) {
  257 + '$translate',
  258 + function(service, $stateParams, translate) {
256 259 var self = this;
257 260 var CarDevice = service.getQueryClass();
258 261 var id = $stateParams.id;
... ... @@ -263,9 +266,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
263 266 // 当转向到此页面时，就获取明细信息并绑定
264 267 CarDevice.get({id: id}, function(value) {
265 268 self.deviceInfoForDetail = value;
266   - self.title = i18n('txt-3243',[self.deviceInfoForDetail.clZbh]);
  269 + self.title = translate.instant("deviceInfoManage_module_js_line269_txt-3243", {clZbh: self.deviceInfoForDetail.clZbh});
267 270 });
268 271  
269 272 }
270 273 ]
271   -);
272 274 \ No newline at end of file
  275 +);
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/orderOptionOpen.html
  View file @77217ea
... ... @@ -2,7 +2,7 @@
2 2 <div class="modal-title">
3 3 <h3>
4 4 <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
5   - <span class="caption-subject bold uppercase">$$$$$${txt-1682}</span>
  5 + <span class="caption-subject bold uppercase">{{"deviceInfoManage_orderOptionOpen_page_line5_txt-1682" | translate}}</span>
6 6 </h3>
7 7 </div>
8 8 </div>
... ... @@ -14,5 +14,5 @@
14 14 </sa-Orderoption>
15 15 </div>
16 16 <div class="modal-footer">
17   - <button class="btn btn-primary" ng-click="$ctrl.confirm($ctrl.orderColumns)">$$$$$${txt-4018}</button>
18   -</div>
19 17 \ No newline at end of file
  18 + <button class="btn btn-primary" ng-click="$ctrl.confirm($ctrl.orderColumns)">{{"deviceInfoManage_orderOptionOpen_page_line17_txt-4018" | translate}}</button>
  19 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/detail.html
  View file @77217ea
1 1 <div class="page-head">
2 2 <div class="page-title">
3   - <h1>$$$$$${txt-1650}</h1>
  3 + <h1>{{"employeeInfoManage_detail_page_line3_txt-1650" | translate}}</h1>
4 4 </div>
5 5 </div>
6 6  
7 7 <ul class="page-breadcrumb breadcrumb">
8 8 <li>
9   - <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
  9 + <a href="/pages/home.html" data-pjax>{{"employeeInfoManage_detail_page_line9_txt-3807" | translate}}</a>
10 10 <i class="fa fa-circle"></i>
11 11 </li>
12 12 <li>
13   - <span class="active">$$$$$${txt-2398}</span>
  13 + <span class="active">{{"employeeInfoManage_detail_page_line13_txt-2398" | translate}}</span>
14 14 <i class="fa fa-circle"></i>
15 15 </li>
16 16 <li>
17   - <a ui-sref="employeeInfoManage">$$$$$${txt-1658}</a>
  17 + <a ui-sref="employeeInfoManage">{{"employeeInfoManage_detail_page_line17_txt-1658" | translate}}</a>
18 18 <i class="fa fa-circle"></i>
19 19 </li>
20 20 <li>
21   - <span class="active">$$$$$${txt-1650}</span>
  21 + <span class="active">{{"employeeInfoManage_detail_page_line21_txt-1650" | translate}}</span>
22 22 </li>
23 23 </ul>
24 24  
... ... @@ -35,58 +35,58 @@
35 35 <form class="form-horizontal" novalidate name="myForm">
36 36 <div class="form-body">
37 37 <div class="form-group has-success has-feedback">
38   - <label class="col-md-2 control-label">$$$$$${txt-2686}*：</label>
  38 + <label class="col-md-2 control-label">{{"employeeInfoManage_detail_page_line38_txt-2686" | translate}}*：</label>
39 39 <div class="col-md-3">
40 40 <input type="text" class="form-control" name="company"
41 41 ng-model="ctrl.employeeInfoForDetail.company" readonly/>
42 42 </div>
43 43 </div>
44 44 <div class="form-group">
45   - <label class="col-md-2 control-label">$$$$$${txt-1765}</label>
  45 + <label class="col-md-2 control-label">{{"employeeInfoManage_detail_page_line45_txt-1765" | translate}}</label>
46 46 <div class="col-md-3">
47 47 <input type="text" class="form-control" name="brancheCompany"
48 48 ng-model="ctrl.employeeInfoForDetail.brancheCompany" readonly/>
49 49 </div>
50 50 </div>
51 51 <div class="form-group has-success has-feedback">
52   - <label class="col-md-2 control-label">$$$$$${txt-3955}*：</label>
  52 + <label class="col-md-2 control-label">{{"employeeInfoManage_detail_page_line52_txt-3955" | translate}}*：</label>
53 53 <div class="col-md-3">
54 54 <input type="text" class="form-control" name="jobCode"
55 55 ng-model="ctrl.employeeInfoForDetail.jobCode" readonly/>
56 56 </div>
57 57 </div>
58 58 <div class="form-group has-success has-feedback">
59   - <label class="col-md-2 control-label">$$$$$${txt-3949}*：</label>
  59 + <label class="col-md-2 control-label">{{"employeeInfoManage_detail_page_line59_txt-3949" | translate}}*：</label>
60 60 <div class="col-md-3">
61 61 <input type="text" class="form-control" name="personnelName"
62 62 ng-model="ctrl.employeeInfoForDetail.personnelName" readonly/>
63 63 </div>
64 64 </div>
65 65 <div class="form-group">
66   - <label class="col-md-2 control-label">$$$$$${txt-902}</label>
  66 + <label class="col-md-2 control-label">{{"employeeInfoManage_detail_page_line66_txt-902" | translate}}</label>
67 67 <div class="col-md-4">
68 68 <input type="text" class="form-control" name="papersCode"
69 69 ng-model="ctrl.employeeInfoForDetail.papersCode" readonly/>
70 70 </div>
71 71 </div>
72 72 <div class="form-group">
73   - <label class="col-md-2 control-label">$$$$$${txt-903}</label>
  73 + <label class="col-md-2 control-label">{{"employeeInfoManage_detail_page_line73_txt-903" | translate}}</label>
74 74 <div class="col-md-4">
75 75 <input type="text" class="form-control" name="icCardCode"
76 76 ng-model="ctrl.employeeInfoForDetail.icCardCode" readonly/>
77 77 </div>
78 78 </div>
79 79 <div class="form-group">
80   - <label class="col-md-2 control-label">$$$$$${txt-3698}</label>
  80 + <label class="col-md-2 control-label">{{"employeeInfoManage_detail_page_line80_txt-3698" | translate}}</label>
81 81 <div class="col-md-4">
82 82 <sa-Radiogroup model="ctrl.employeeInfoForDetail.personnelType" disabled="true" dicgroup="sexType" name="personnelType"></sa-Radiogroup>
83 83 </div>
84 84 </div>
85 85 <div class="form-group">
86   - <label class="col-md-2 control-label">$$$$$${txt-3703}</label>
  86 + <label class="col-md-2 control-label">{{"employeeInfoManage_detail_page_line86_txt-3703" | translate}}</label>
87 87 <div class="col-md-4">
88 88 <input type="text" class="form-control" name="posts"
89   - ng-value="ctrl.employeeInfoForDetail.posts | dict:'gzType':'$$$$$${txt-4058}'" readonly/>
  89 + ng-value="ctrl.employeeInfoForDetail.posts | dict:'gzType':('employeeInfoManage_detail_page_line89_txt-4058' | translate)" readonly/>
90 90 </div>
91 91 </div>
92 92  
... ... @@ -96,4 +96,4 @@
96 96 </form>
97 97 </div>
98 98  
99   -</div>
100 99 \ No newline at end of file
  100 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/edit.html
  View file @77217ea
1 1 <div class="page-head">
2 2 <div class="page-title">
3   - <h1>$$$$$${txt-1643}</h1>
  3 + <h1>{{"employeeInfoManage_edit_page_line3_txt-1643" | translate}}</h1>
4 4 </div>
5 5 </div>
6 6  
7 7 <ul class="page-breadcrumb breadcrumb">
8 8 <li>
9   - <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
  9 + <a href="/pages/home.html" data-pjax>{{"employeeInfoManage_edit_page_line9_txt-3807" | translate}}</a>
10 10 <i class="fa fa-circle"></i>
11 11 </li>
12 12 <li>
13   - <span class="active">$$$$$${txt-2398}</span>
  13 + <span class="active">{{"employeeInfoManage_edit_page_line13_txt-2398" | translate}}</span>
14 14 <i class="fa fa-circle"></i>
15 15 </li>
16 16 <li>
17   - <a ui-sref="employeeInfoManage">$$$$$${txt-1658}</a>
  17 + <a ui-sref="employeeInfoManage">{{"employeeInfoManage_edit_page_line17_txt-1658" | translate}}</a>
18 18 <i class="fa fa-circle"></i>
19 19 </li>
20 20 <li>
21   - <span class="active">$$$$$${txt-1643}</span>
  21 + <span class="active">{{"employeeInfoManage_edit_page_line21_txt-1643" | translate}}</span>
22 22 </li>
23 23 </ul>
24 24  
... ... @@ -26,7 +26,7 @@
26 26 <div class="portlet-title">
27 27 <div class="caption">
28 28 <i class="icon-equalizer font-red-sunglo"></i> <span
29   - class="caption-subject font-red-sunglo bold uppercase">$$$$$${txt-3849}</span>
  29 + class="caption-subject font-red-sunglo bold uppercase">{{"employeeInfoManage_edit_page_line29_txt-3849" | translate}}</span>
30 30 </div>
31 31 </div>
32 32  
... ... @@ -34,7 +34,7 @@
34 34 <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
35 35 <div class="form-body">
36 36 <div class="form-group has-success has-feedback">
37   - <label class="col-md-2 control-label">$$$$$${txt-2686}*：</label>
  37 + <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line37_txt-2686" | translate}}*：</label>
38 38 <div class="col-md-3">
39 39 <sa-Select5 name="gs"
40 40 model="ctrl.employeeInfoForSave"
... ... @@ -44,7 +44,7 @@
44 44 dsparams="{{ {type: 'ajax', param:{'upCode_eq': '88' }, atype:'gs' } | json }}"
45 45 iterobjname="item"
46 46 iterobjexp="item.businessName"
47   - searchph="$$$$$${txt-973}"
  47 + searchph="{{'employeeInfoManage_edit_page_line47_txt-973' | translate}}"
48 48 searchexp="this.businessName"
49 49 required
50 50 >
... ... @@ -52,12 +52,12 @@
52 52 </div>
53 53 <!-- 隐藏块，显示验证信息 -->
54 54 <div class="alert alert-danger well-sm" ng-show="myForm.gs.$error.required">
55   - $$$$$${txt-1792}
  55 + {{"employeeInfoManage_edit_page_line55_txt-1792" | translate}}
56 56 </div>
57 57 </div>
58 58  
59 59 <div class="form-group has-success has-feedback">
60   - <label class="col-md-2 control-label">$$$$$${txt-3777}*：</label>
  60 + <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line60_txt-3777" | translate}}*：</label>
61 61 <div class="col-md-3">
62 62 <sa-Select5 name="fgs"
63 63 model="ctrl.employeeInfoForSave"
... ... @@ -67,33 +67,32 @@
67 67 dsparams="{{ {type: 'ajax', param:{'upCode_eq': ctrl.employeeInfoForSave.companyCode }, atype:'gs' } | json }}"
68 68 iterobjname="item"
69 69 iterobjexp="item.businessName"
70   - searchph="$$$$$${txt-973}"
  70 + searchph="{{'employeeInfoManage_edit_page_line70_txt-973' | translate}}"
71 71 searchexp="this.businessName"
72 72 required
73 73 >
74 74 </sa-Select5>
75 75  
76 76 </div>
77   -
78 77 <!-- 隐藏块，显示验证信息 -->
79 78 <div class="alert alert-danger well-sm" ng-show="myForm.fgs.$error.required">
80   - $$$$$${txt-923}
  79 + {{"employeeInfoManage_edit_page_line79_txt-923" | translate}}
81 80 </div>
82 81 </div>
83 82  
84 83 <div class="form-group has-success has-feedback">
85   - <label class="col-md-2 control-label">$$$$$${txt-3940}*：</label>
  84 + <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line84_txt-3940" | translate}}*：</label>
86 85 <div class="col-md-3">
87 86 <input type="text" class="form-control"
88 87 name="jobCode" ng-model="ctrl.employeeInfoForSave.jobCodeori"
89   - required placeholder="$$$$$${txt-2346}"
  88 + required placeholder="{{'employeeInfoManage_edit_page_line88_txt-2346' | translate}}"
90 89 remote-Validation
91 90 remotevtype="ee_gh"
92 91 remotevparam="{{ {'id_eq': ctrl.employeeInfoForSave.id, 'companyCode_eq' : ctrl.employeeInfoForSave.companyCode, 'jobCode_eq': ctrl.employeeInfoForSave.jobCode} | json}}"/>
93 92 </div>
94 93 <!-- 隐藏块，显示验证信息 -->
95 94 <div class="alert alert-danger well-sm" ng-show="myForm.jobCode.$error.required">
96   - $$$$$${txt-1793}
  95 + {{"employeeInfoManage_edit_page_line95_txt-1793" | translate}}
97 96 </div>
98 97 <div class="alert alert-danger well-sm" ng-show="myForm.jobCode.$error.remote">
99 98 {{$remote_msg}}
... ... @@ -101,43 +100,43 @@
101 100 </div>
102 101  
103 102 <div class="form-group has-success has-feedback">
104   - <label class="col-md-2 control-label">$$$$$${txt-3949}*：</label>
  103 + <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line103_txt-3949" | translate}}*：</label>
105 104 <div class="col-md-3">
106 105 <input type="text" class="form-control"
107 106 name="personnelName" ng-model="ctrl.employeeInfoForSave.personnelName"
108   - required placeholder="$$$$$${txt-2345}"/>
  107 + required placeholder="{{'employeeInfoManage_edit_page_line107_txt-2345' | translate}}"/>
109 108 </div>
110 109 <!-- 隐藏块，显示验证信息 -->
111 110 <div class="alert alert-danger well-sm" ng-show="myForm.personnelName.$error.required">
112   - $$$$$${txt-1787}
  111 + {{"employeeInfoManage_edit_page_line111_txt-1787" | translate}}
113 112 </div>
114 113 </div>
115 114  
116 115 <div class="form-group">
117   - <label class="col-md-2 control-label">$$$$$${txt-902}</label>
  116 + <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line116_txt-902" | translate}}</label>
118 117 <div class="col-md-4">
119 118 <input type="text" class="form-control" ng-model="ctrl.employeeInfoForSave.papersCode"
120   - placeholder="$$$$$${txt-516}"/>
  119 + placeholder="{{'employeeInfoManage_edit_page_line119_txt-516' | translate}}"/>
121 120 </div>
122 121 </div>
123 122  
124 123 <div class="form-group">
125   - <label class="col-md-2 control-label">$$$$$${txt-2244}</label>
  124 + <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line124_txt-2244" | translate}}</label>
126 125 <div class="col-md-4">
127 126 <input type="text" class="form-control" ng-model="ctrl.employeeInfoForSave.icCardCode"
128   - placeholder="$$$$$${txt-517}"/>
  127 + placeholder="{{'employeeInfoManage_edit_page_line127_txt-517' | translate}}"/>
129 128 </div>
130 129 </div>
131 130  
132 131 <div class="form-group">
133   - <label class="col-md-2 control-label">$$$$$${txt-3698}</label>
  132 + <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line132_txt-3698" | translate}}</label>
134 133 <div class="col-md-4">
135 134 <sa-Radiogroup model="ctrl.employeeInfoForSave.personnelType" dicgroup="sexType" name="personnelType"></sa-Radiogroup>
136 135 </div>
137 136 </div>
138 137  
139 138 <div class="form-group">
140   - <label class="col-md-2 control-label">$$$$$${txt-3703}</label>
  139 + <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line139_txt-3703" | translate}}</label>
141 140 <div class="col-md-4">
142 141 <sa-Select5 name="posts"
143 142 model="ctrl.employeeInfoForSave"
... ... @@ -147,7 +146,7 @@
147 146 dsparams="{{ {type: 'dic', param: 'gzType' } | json }}"
148 147 iterobjname="item"
149 148 iterobjexp="item.name"
150   - searchph="$$$$$${txt-3364}"
  149 + searchph="{{'employeeInfoManage_edit_page_line149_txt-3364' | translate}}"
151 150 searchexp="this.name"
152 151 >
153 152 </sa-Select5>
... ... @@ -155,7 +154,7 @@
155 154 </div>
156 155  
157 156 <div class="form-group">
158   - <label class="col-md-2 control-label">$$$$$${txt-3449}</label>
  157 + <label class="col-md-2 control-label">{{"employeeInfoManage_edit_page_line157_txt-3449" | translate}}</label>
159 158 <div class="col-md-3">
160 159 <textarea class="form-control"
161 160 ng-model="ctrl.employeeInfoForSave.remark"
... ... @@ -172,8 +171,8 @@
172 171 <div class="form-actions">
173 172 <div class="row">
174 173 <div class="col-md-offset-3 col-md-4">
175   - <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
176   - <a type="button" class="btn default" ui-sref="employeeInfoManage" ><i class="fa fa-times"></i> $$$$$${txt-3817}</a>
  174 + <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> {{"employeeInfoManage_edit_page_line174_txt-4173" | translate}}</button>
  175 + <a type="button" class="btn default" ui-sref="employeeInfoManage" ><i class="fa fa-times"></i> {{"employeeInfoManage_edit_page_line175_txt-3817" | translate}}</a>
177 176 </div>
178 177 </div>
179 178 </div>
... ... @@ -181,4 +180,4 @@
181 180 </form>
182 181 </div>
183 182  
184   -</div>
185 183 \ No newline at end of file
  184 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/form.html
  View file @77217ea
1 1 <div class="page-head">
2 2 <div class="page-title">
3   - <h1>$$$$$${txt-1648}</h1>
  3 + <h1>{{"employeeInfoManage_form_page_line3_txt-1648" | translate}}</h1>
4 4 </div>
5 5 </div>
6 6  
7 7 <ul class="page-breadcrumb breadcrumb">
8 8 <li>
9   - <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
  9 + <a href="/pages/home.html" data-pjax>{{"employeeInfoManage_form_page_line9_txt-3807" | translate}}</a>
10 10 <i class="fa fa-circle"></i>
11 11 </li>
12 12 <li>
13   - <span class="active">$$$$$${txt-2398}</span>
  13 + <span class="active">{{"employeeInfoManage_form_page_line13_txt-2398" | translate}}</span>
14 14 <i class="fa fa-circle"></i>
15 15 </li>
16 16 <li>
17   - <a ui-sref="employeeInfoManage">$$$$$${txt-1658}</a>
  17 + <a ui-sref="employeeInfoManage">{{"employeeInfoManage_form_page_line17_txt-1658" | translate}}</a>
18 18 <i class="fa fa-circle"></i>
19 19 </li>
20 20 <li>
21   - <span class="active">$$$$$${txt-1648}</span>
  21 + <span class="active">{{"employeeInfoManage_form_page_line21_txt-1648" | translate}}</span>
22 22 </li>
23 23 </ul>
24 24  
... ... @@ -26,7 +26,7 @@
26 26 <div class="portlet-title">
27 27 <div class="caption">
28 28 <i class="icon-equalizer font-red-sunglo"></i> <span
29   - class="caption-subject font-red-sunglo bold uppercase">$$$$$${txt-3849}</span>
  29 + class="caption-subject font-red-sunglo bold uppercase">{{"employeeInfoManage_form_page_line29_txt-3849" | translate}}</span>
30 30 </div>
31 31 </div>
32 32  
... ... @@ -34,7 +34,7 @@
34 34 <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
35 35 <div class="form-body">
36 36 <div class="form-group has-success has-feedback">
37   - <label class="col-md-2 control-label">$$$$$${txt-2686}*：</label>
  37 + <label class="col-md-2 control-label">{{"employeeInfoManage_form_page_line37_txt-2686" | translate}}*：</label>
38 38 <div class="col-md-3">
39 39 <sa-Select5 name="gs"
40 40 model="ctrl.employeeInfoForSave"
... ... @@ -44,7 +44,7 @@
44 44 dsparams="{{ {type: 'ajax', param:{'upCode_eq': '88' }, atype:'gs' } | json }}"
45 45 iterobjname="item"
46 46 iterobjexp="item.businessName"
47   - searchph="$$$$$${txt-973}"
  47 + searchph="{{'employeeInfoManage_form_page_line47_txt-973' | translate}}"
48 48 searchexp="this.businessName"
49 49 required
50 50 >
... ... @@ -52,12 +52,12 @@
52 52 </div>
53 53 <!-- 隐藏块，显示验证信息 -->
54 54 <div class="alert alert-danger well-sm" ng-show="myForm.gs.$error.required">
55   - $$$$$${txt-1792}
  55 + {{"employeeInfoManage_form_page_line55_txt-1792" | translate}}
56 56 </div>
57 57 </div>
58 58  
59 59 <div class="form-group has-success has-feedback">
60   - <label class="col-md-2 control-label">$$$$$${txt-3777}*：</label>
  60 + <label class="col-md-2 control-label">{{"employeeInfoManage_form_page_line60_txt-3777" | translate}}*：</label>
61 61 <div class="col-md-3">
62 62 <sa-Select5 name="fgs"
63 63 model="ctrl.employeeInfoForSave"
... ... @@ -67,7 +67,7 @@
67 67 dsparams="{{ {type: 'ajax', param:{'upCode_eq': ctrl.employeeInfoForSave.companyCode }, atype:'gs' } | json }}"
68 68 iterobjname="item"
69 69 iterobjexp="item.businessName"
70   - searchph="$$$$$${txt-973}"
  70 + searchph="{{'employeeInfoManage_form_page_line70_txt-973' | translate}}"
71 71 searchexp="this.businessName"
72 72 required
73 73 >
... ... @@ -76,23 +76,23 @@
76 76 </div>
77 77 <!-- 隐藏块，显示验证信息 -->
78 78 <div class="alert alert-danger well-sm" ng-show="myForm.fgs.$error.required">
79   - $$$$$${txt-923}
  79 + {{"employeeInfoManage_form_page_line79_txt-923" | translate}}
80 80 </div>
81 81 </div>
82 82  
83 83 <div class="form-group has-success has-feedback">
84   - <label class="col-md-2 control-label">$$$$$${txt-3940}*：</label>
  84 + <label class="col-md-2 control-label">{{"employeeInfoManage_form_page_line84_txt-3940" | translate}}*：</label>
85 85 <div class="col-md-3">
86 86 <input type="text" class="form-control"
87 87 name="jobCode" ng-model="ctrl.employeeInfoForSave.jobCodeori"
88   - required placeholder="$$$$$${txt-2346}"
  88 + required placeholder="{{'employeeInfoManage_form_page_line88_txt-2346' | translate}}"
89 89 remote-Validation
90 90 remotevtype="ee_gh"
91 91 remotevparam="{{ {'companyCode_eq' : ctrl.employeeInfoForSave.companyCode, 'jobCode_eq': ctrl.employeeInfoForSave.jobCode} | json}}"/>
92 92 </div>
93 93 <!-- 隐藏块，显示验证信息 -->
94 94 <div class="alert alert-danger well-sm" ng-show="myForm.jobCode.$error.required">
95   - $$$$$${txt-1793}
  95 + {{"employeeInfoManage_form_page_line95_txt-1793" | translate}}
96 96 </div>
97 97 <div class="alert alert-danger well-sm" ng-show="myForm.jobCode.$error.remote">
98 98 {{$remote_msg}}
... ... @@ -100,43 +100,43 @@
100 100 </div>
101 101  
102 102 <div class="form-group has-success has-feedback">
103   - <label class="col-md-2 control-label">$$$$$${txt-3949}*：</label>
  103 + <label class="col-md-2 control-label">{{"employeeInfoManage_form_page_line103_txt-3949" | translate}}*：</label>
104 104 <div class="col-md-3">
105 105 <input type="text" class="form-control"
106 106 name="personnelName" ng-model="ctrl.employeeInfoForSave.personnelName"
107   - required placeholder="$$$$$${txt-2345}"/>
  107 + required placeholder="{{'employeeInfoManage_form_page_line107_txt-2345' | translate}}"/>
108 108 </div>
109 109 <!-- 隐藏块，显示验证信息 -->
110 110 <div class="alert alert-danger well-sm" ng-show="myForm.personnelName.$error.required">
111   - $$$$$${txt-1787}
  111 + {{"employeeInfoManage_form_page_line111_txt-1787" | translate}}
112 112 </div>
113 113 </div>
114 114  
115 115 <div class="form-group">
116   - <label class="col-md-2 control-label">$$$$$${txt-902}</label>
  116 + <label class="col-md-2 control-label">{{"employeeInfoManage_form_page_line116_txt-902" | translate}}</label>
117 117 <div class="col-md-4">
118 118 <input type="text" class="form-control" ng-model="ctrl.employeeInfoForSave.papersCode"
119   - placeholder="$$$$$${txt-516}"/>
  119 + placeholder="{{'employeeInfoManage_form_page_line119_txt-516' | translate}}"/>
120 120 </div>
121 121 </div>
122 122  
123 123 <div class="form-group">
124   - <label class="col-md-2 control-label">$$$$$${txt-2244}</label>
  124 + <label class="col-md-2 control-label">{{"employeeInfoManage_form_page_line124_txt-2244" | translate}}</label>
125 125 <div class="col-md-4">
126 126 <input type="text" class="form-control" ng-model="ctrl.employeeInfoForSave.icCardCode"
127   - placeholder="$$$$$${txt-517}"/>
  127 + placeholder="{{'employeeInfoManage_form_page_line127_txt-517' | translate}}"/>
128 128 </div>
129 129 </div>
130 130  
131 131 <div class="form-group">
132   - <label class="col-md-2 control-label">$$$$$${txt-3698}</label>
  132 + <label class="col-md-2 control-label">{{"employeeInfoManage_form_page_line132_txt-3698" | translate}}</label>
133 133 <div class="col-md-4">
134 134 <sa-Radiogroup model="ctrl.employeeInfoForSave.personnelType" dicgroup="sexType" name="personnelType"></sa-Radiogroup>
135 135 </div>
136 136 </div>
137 137  
138 138 <div class="form-group">
139   - <label class="col-md-2 control-label">$$$$$${txt-3703}</label>
  139 + <label class="col-md-2 control-label">{{"employeeInfoManage_form_page_line139_txt-3703" | translate}}</label>
140 140 <div class="col-md-4">
141 141 <sa-Select5 name="posts"
142 142 model="ctrl.employeeInfoForSave"
... ... @@ -146,7 +146,7 @@
146 146 dsparams="{{ {type: 'dic', param: 'gzType' } | json }}"
147 147 iterobjname="item"
148 148 iterobjexp="item.name"
149   - searchph="$$$$$${txt-3364}"
  149 + searchph="{{'employeeInfoManage_form_page_line149_txt-3364' | translate}}"
150 150 searchexp="this.name"
151 151 >
152 152 </sa-Select5>
... ... @@ -154,7 +154,7 @@
154 154 </div>
155 155  
156 156 <div class="form-group">
157   - <label class="col-md-2 control-label">$$$$$${txt-3449}</label>
  157 + <label class="col-md-2 control-label">{{'employeeInfoManage_form_page_line157_txt-3449' | translate}}</label>
158 158 <div class="col-md-3">
159 159 <textarea class="form-control"
160 160 ng-model="ctrl.employeeInfoForSave.remark"
... ... @@ -171,8 +171,8 @@
171 171 <div class="form-actions">
172 172 <div class="row">
173 173 <div class="col-md-offset-3 col-md-4">
174   - <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
175   - <a type="button" class="btn default" ui-sref="employeeInfoManage" ><i class="fa fa-times"></i> $$$$$${txt-3817}</a>
  174 + <button type="submit" class="btn green" ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> {{"employeeInfoManage_form_page_line174_txt-4173" | translate}}</button>
  175 + <a type="button" class="btn default" ui-sref="employeeInfoManage" ><i class="fa fa-times"></i> {{"employeeInfoManage_form_page_line175_txt-3817" | translate}}</a>
176 176 </div>
177 177 </div>
178 178 </div>
... ... @@ -180,4 +180,4 @@
180 180 </form>
181 181 </div>
182 182  
183   -</div>
184 183 \ No newline at end of file
  184 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/index.html
  View file @77217ea
1 1 <div class="page-head">
2 2 <div class="page-title">
3   - <h1>$$$$$${txt-1658}</h1>
  3 + <h1>{{"employeeInfoManage_index_page_line3_txt-1658" | translate}}</h1>
4 4 </div>
5 5 </div>
6 6  
7 7 <ul class="page-breadcrumb breadcrumb">
8 8 <li>
9   - <a href="/pages/home.html" data-pjax>$$$$$${txt-3807}</a>
  9 + <a href="/pages/home.html" data-pjax>{{"employeeInfoManage_index_page_line9_txt-3807" | translate}}</a>
10 10 <i class="fa fa-circle"></i>
11 11 </li>
12 12 <li>
13   - <span class="active">$$$$$${txt-2398}</span>
  13 + <span class="active">{{"employeeInfoManage_index_page_line13_txt-2398" | translate}}</span>
14 14 <i class="fa fa-circle"></i>
15 15 </li>
16 16 <li>
17   - <span class="active">$$$$$${txt-1658}</span>
  17 + <span class="active">{{"employeeInfoManage_index_page_line17_txt-1658" | translate}}</span>
18 18 </li>
19 19 </ul>
20 20  
... ... @@ -33,25 +33,25 @@
33 33 <div class="portlet-title">
34 34 <div class="caption font-dark">
35 35 <i class="fa fa-database font-dark"></i>
36   - <span class="caption-subject bold uppercase">$$$$$${txt-2234}</span>
  36 + <span class="caption-subject bold uppercase">{{"employeeInfoManage_index_page_line36_txt-2234" | translate}}</span>
37 37 </div>
38 38 <div class="actions">
39 39 <a href="javascript:" class="btn blue" ng-click="ctrl.goForm()" ng-if="ctrl.userInfo.getRole().indexOf('_ADMIN') > -1">
40 40 <i class="fa fa-plus"></i>
41   - $$$$$${txt-1648}{{}}
  41 + {{"employeeInfoManage_index_page_line41_txt-1648" | translate}}
42 42 </a>
43 43  
44 44 <div class="btn-group">
45 45 <a href="javascript:" class="btn red btn-outline" data-toggle="dropdown">
46 46 <i class="fa fa-share"></i>
47   - <span>$$$$$${txt-3339}</span>
  47 + <span>{{"employeeInfoManage_index_page_line47_txt-3339" | translate}}</span>
48 48 <i class="fa fa-angle-down"></i>
49 49 </a>
50 50 <ul class="dropdown-menu pull-right">
51 51 <li>
52 52 <a href="javascript:" class="tool-action" ng-click="ctrl.exportData()">
53 53 <i class="fa fa-file-excel-o"></i>
54   - $$$$$${txt-4493}
  54 + {{"employeeInfoManage_index_page_line54_txt-4493" | translate}}
55 55 </a>
56 56 </li>
57 57 <!--<li class="divider"></li>-->
... ... @@ -71,4 +71,4 @@
71 71 </div>
72 72 </div>
73 73 </div>
74   -</div>
75 74 \ No newline at end of file
  75 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
  View file @77217ea
... ... @@ -4,32 +4,32 @@
4 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 5 <thead>
6 6 <tr role="row" class="heading">
7   - <th style="width:70px;">$$$$$${txt-3934}</th>
8   - <th style="width: 100px;">$$$$$${txt-3949}</th>
9   - <th style="width: 100px;">$$$$$${txt-3955}</th>
10   - <th style="width: 100px;">$$$$$${txt-3940}</th>
11   - <th style="width: 100px;">$$$$$${txt-3095}</th>
12   - <th style="width: 60px;">$$$$$${txt-4086}</th>
13   - <th style="width: 150px;">$$$$$${txt-3096}</th>
14   - <th >$$$$$${txt-3777}</th>
15   - <th >$$$$$${txt-4093}</th>
16   - <th style="width: 80px;">$$$$$${txt-4085}</th>
17   - <th >$$$$$${txt-3942}</th>
  7 + <th style="width: 70px; max-width: 70px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line7_txt-3934" | translate}}</th>
  8 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line8_txt-3949" | translate}}</th>
  9 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line9_txt-3955" | translate}}</th>
  10 + <th style="width: 100px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line10_txt-3940" | translate}}</th>
  11 + <th style="width: 100px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line11_txt-3095" | translate}}</th>
  12 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line12_txt-4086" | translate}}</th>
  13 + <th style="width: 130px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line13_txt-3096" | translate}}</th>
  14 + <th style="width: 130px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line14_txt-3777" | translate}}</th>
  15 + <th style="width: 130px; white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line15_txt-4093" | translate}}</th>
  16 + <th style="white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line16_txt-4085" | translate}}</th>
  17 + <th style="width: 230px;white-space: pre-wrap;word-wrap: break-word;text-align: center;vertical-align: middle;">{{"employeeInfoManage_list_page_line17_txt-3942" | translate}}</th>
18 18 </tr>
19 19 <tr role="row" class="filter">
20 20 <td>
21 21 </td>
22 22 <td>
23   - <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().personnelName_like" placeholder="$$$$$${txt-3231}"/>
  23 + <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().personnelName_like" placeholder="{{'employeeInfoManage_list_page_line23_txt-3231' | translate}}"/>
24 24 </td>
25 25 <td>
26   - <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jobCode_like" placeholder="$$$$$${txt-3233}"/>
  26 + <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jobCode_like" placeholder="{{'employeeInfoManage_list_page_line26_txt-3233' | translate}}"/>
27 27 </td>
28 28 <td>
29   - <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jobCodeori_like" placeholder="$$$$$${txt-3232}"/>
  29 + <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jobCodeori_like" placeholder="{{'employeeInfoManage_list_page_line29_txt-3232' | translate}}"/>
30 30 </td>
31 31 <td>
32   - <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jdCodeori_like" placeholder="$$$$$${txt-3232}"/>
  32 + <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jdCodeori_like" placeholder="{{'employeeInfoManage_list_page_line32_txt-3232' | translate}}"/>
33 33 </td>
34 34 <td>
35 35 </td>
... ... @@ -42,8 +42,9 @@
42 42 dsparams="{{ {type: 'ajax', param:{'upCode_eq': '88' }, atype:'gs' } | json }}"
43 43 iterobjname="item"
44 44 iterobjexp="item.businessName"
45   - searchph="$$$$$${txt-3364}"
  45 + searchph="{{'employeeInfoManage_list_page_line45_txt-3364' | translate}}"
46 46 searchexp="this.businessName"
  47 + width="100"
47 48 required
48 49 >
49 50 </sa-Select5>
... ... @@ -57,8 +58,9 @@
57 58 dsparams="{{ {type: 'ajax', param:{'upCode_eq': ctrl.searchCondition().companyCode_eq }, atype:'gs' } | json }}"
58 59 iterobjname="item"
59 60 iterobjexp="item.businessName"
60   - searchph="$$$$$${txt-3364}"
  61 + searchph="{{'employeeInfoManage_list_page_line60_txt-3364' | translate}}"
61 62 searchexp="this.businessName"
  63 + width="100"
62 64 required
63 65 >
64 66 </sa-Select5>
... ... @@ -72,21 +74,22 @@
72 74 dsparams="{{ {type: 'dic', param: 'gzType' } | json }}"
73 75 iterobjname="item"
74 76 iterobjexp="item.name"
75   - searchph="$$$$$${txt-3364}"
  77 + searchph="{{'employeeInfoManage_list_page_line75_txt-3364' | translate}}"
  78 + width="100"
76 79 searchexp="this.name"
77 80 >
78 81 </sa-Select5>
79 82 </td>
80 83 <td>
81 84 <label class="checkbox-inline">
82   - <input type="checkbox" ng-true-value="1" ng-model="ctrl.searchCondition()['destroy_eq']"/>$$$$$${txt-4085}
  85 + <input type="checkbox" ng-true-value="1" ng-model="ctrl.searchCondition()['destroy_eq']"/>{{"employeeInfoManage_list_page_line82_txt-4085" | translate}}
83 86 </label>
84 87 </td>
85 88 <td>
86 89 <div class="btn-group">
87 90 <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;"
88 91 ng-click="ctrl.doPage()">
89   - <i class="fa fa-search"></i> $$$$$${txt-4001}</button>
  92 + <i class="fa fa-search"></i> {{"employeeInfoManage_list_page_line89_txt-4001" | translate}}</button>
90 93 <button class="btn btn-sm green btn-outline filter-submit margin-bottom dropdown-toggle"
91 94 data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
92 95 <span class="caret"></span>
... ... @@ -96,7 +99,7 @@
96 99 <li>
97 100 <a href="javascript:" class="tool-action" ng-click="ctrl.customOrder()">
98 101 <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
99   - $$$$$${txt-3385}
  102 + {{"employeeInfoManage_list_page_line99_txt-3385" | translate}}
100 103 </a>
101 104 </li>
102 105 </ul>
... ... @@ -104,7 +107,7 @@
104 107  
105 108 <button class="btn btn-sm red btn-outline filter-cancel"
106 109 ng-click="ctrl.reset()">
107   - <i class="fa fa-times"></i> $$$$$${txt-4000}</button>
  110 + <i class="fa fa-times"></i> {{"employeeInfoManage_list_page_line107_txt-4000" | translate}}</button>
108 111  
109 112 </td>
110 113  
... ... @@ -117,7 +120,7 @@
117 120 <a href="#"
118 121 tooltip-animation="false"
119 122 tooltip-placement="top"
120   - uib-tooltip="{{'$$$$$${txt-4426}' + info.personnelName + '/' + info.jobCodeori}}"
  123 + uib-tooltip="{{('employeeInfoManage_list_page_line120_txt-4426' | translate) + info.personnelName + '/' + info.jobCodeori}}"
121 124 tooltip-class="headClass">
122 125  
123 126 <i class="fa fa-list-ol" aria-hidden="true"></i>
... ... @@ -139,7 +142,7 @@
139 142 <span ng-bind="info.jdCodeori"></span>
140 143 </td>
141 144 <td>
142   - <span ng-bind="info.personnelType | dict:'sexType':'$$$$$${txt-4058}'"></span>
  145 + <span ng-bind="info.personnelType | dict:'sexType':('employeeInfoManage_list_page_line142_txt-4058' | translate)"></span>
143 146  
144 147 <!--<div ng-if="info.personnelType == '1'">-->
145 148 <!--<a href="#">-->
... ... @@ -160,7 +163,7 @@
160 163 <span ng-bind="info.brancheCompany"></span>
161 164 </td>
162 165 <td>
163   - <span ng-bind="info.posts | dict:'gzType':'$$$$$${txt-4058}'"></span>
  166 + <span ng-bind="info.posts | dict:'gzType':('employeeInfoManage_list_page_line163_txt-4058' | translate)"></span>
164 167 </td>
165 168 <td>
166 169 <span class="glyphicon glyphicon-ok" ng-if="info.destroy != '1'"></span>
... ... @@ -168,12 +171,16 @@
168 171 </td>
169 172 <td>
170 173 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
171   - <a ui-sref="employeeInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> $$$$$${txt-3866} </a>
172   - <a ui-sref="employeeInfoManage_edit({id: info.id})" class="btn btn-info btn-sm"> $$$$$${txt-4028} </a>
  174 + <a ui-sref="employeeInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> {{"employeeInfoManage_list_page_line171_txt-3866" | translate}} </a>
  175 + <a ui-sref="employeeInfoManage_edit({id: info.id})" class="btn btn-info btn-sm"> {{"employeeInfoManage_list_page_line172_txt-4028" | translate}} </a>
173 176 <a sweetalert
174   - sweet-options="{title: '$$$$$${txt-675}',text: '$$$$$${txt-3719}' + info.personnelName + '</br>$$$$$${txt-3761}' + info.jobCode + '</br>$$$$$${txt-40}', html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '$$$$$${txt-4257}',cancelButtonText: '$$$$$${txt-3817}'}"
  177 + sweet-options="{title: ('employeeInfoManage_list_page_line174_txt-675' | translate),
  178 + text: ('employeeInfoManage_list_page_line175_txt-3719' | translate) + info.personnelName + '</br>' + ('employeeInfoManage_list_page_line175_txt-3761' | translate) + info.jobCode + '</br>' + ('employeeInfoManage_list_page_line175_txt-40' | translate),
  179 + html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',
  180 + confirmButtonText: ('employeeInfoManage_list_page_line177_txt-4257' | translate),
  181 + cancelButtonText: ('employeeInfoManage_list_page_line178_txt-3817' | translate)}"
175 182 sweet-on-confirm="ctrl.deleteEmp(info.id)"
176   - class="btn btn-danger btn-sm">$$$$$${txt-3868}</a>
  183 + class="btn btn-danger btn-sm">{{"employeeInfoManage_list_page_line180_txt-3868" | translate}}</a>
177 184 </td>
178 185 </tr>
179 186 </tbody>
... ... @@ -181,8 +188,11 @@
181 188 </div>
182 189  
183 190 <div class="pageBar">
184   - <div class="pageBarLeft">
185   - $$$$$${txt-3053}
  191 + <div class="pageBarLeft"
  192 + translate="employeeInfoManage_list_page_line189_txt-3053"
  193 + translate-value-from="{{ ctrl.page()['uiFromRecord'] }}"
  194 + translate-value-to="{{ ctrl.page()['uiToRecord'] }}"
  195 + translate-value-total="{{ ctrl.page()['totalElements'] }}">
186 196 </div>
187 197  
188 198 <div class="pageBarRight">
... ... @@ -192,11 +202,11 @@
192 202 rotate="false"
193 203 max-size="10"
194 204 boundary-links="true"
195   - first-text="$$$$$${txt-4430}"
196   - previous-text="$$$$$${txt-3613}"
197   - next-text="$$$$$${txt-3614}"
198   - last-text="$$$$$${txt-4068}">
  205 + first-text="{{'employeeInfoManage_list_page_line202_txt-4430' | translate}}"
  206 + previous-text="{{'employeeInfoManage_list_page_line203_txt-3613' | translate}}"
  207 + next-text="{{'employeeInfoManage_list_page_line204_txt-3614' | translate}}"
  208 + last-text="{{'employeeInfoManage_list_page_line205_txt-4068' | translate}}">
199 209 </uib-pagination>
200 210 </div>
201 211 </div>
202   -</div>
203 212 \ No newline at end of file
  213 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
  View file @77217ea
... ... @@ -5,7 +5,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
5 5 [
6 6 'EmployeeInfoManageService_g',
7 7 'UserPrincipal',
8   - function(service, UserPrincipal) {
  8 + '$translate',
  9 + function(service, UserPrincipal, translate) {
9 10  
10 11 /** 当前的查询条件信息 */
11 12 var currentSearchCondition = {
... ... @@ -29,12 +30,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
29 30  
30 31 // 字段描述
31 32 var columns = [
32   - {name: "personnelName", desc: i18n('txt-3949')},
33   - {name: "jobCodeori", desc: i18n('txt-3940')},
34   - {name: "personnelType", desc: i18n('txt-4086')},
35   - {name: "company", desc: i18n('txt-3096')},
36   - {name: "brancheCompany", desc: i18n('txt-3777')},
37   - {name: "posts", desc: i18n('txt-4093')}
  33 + {name: "personnelName", desc: translate.instant("employeeInfoManage_module_js_line33_txt-3949")},
  34 + {name: "jobCodeori", desc: translate.instant("employeeInfoManage_module_js_line34_txt-3940")},
  35 + {name: "personnelType", desc: translate.instant("employeeInfoManage_module_js_line35_txt-4086")},
  36 + {name: "company", desc: translate.instant("employeeInfoManage_module_js_line36_txt-3096")},
  37 + {name: "brancheCompany", desc: translate.instant("employeeInfoManage_module_js_line37_txt-3777")},
  38 + {name: "posts", desc: translate.instant("employeeInfoManage_module_js_line38_txt-4093")}
38 39 ];
39 40 // 排序字段
40 41 var orderColumns = {
... ... @@ -135,7 +136,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
135 136 '$uibModal',
136 137 'FileDownload_g',
137 138 'UserInfo',
138   - function(employeeInfoManageService, $state, $uibModal, fileDownload, userInfo) {
  139 + '$translate',
  140 + function(employeeInfoManageService, $state, $uibModal, fileDownload, userInfo, translate) {
139 141 var self = this;
140 142  
141 143 self.userInfo = userInfo;
... ... @@ -177,7 +179,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
177 179 if (p) {
178 180 p.then(
179 181 function(result) {
180   - fileDownload.downloadFile(result.data, "application/octet-stream", i18n('txt-1614') + ".xls");
  182 + fileDownload.downloadFile(result.data, "application/octet-stream", translate.instant("employeeInfoManage_module_js_line182_txt-1614") + ".xls");
181 183 },
182 184 function(result) {
183 185 console.log("exportData failed：" + result);
... ... @@ -248,7 +250,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
248 250 'EmployeeInfoManageService',
249 251 '$uibModal',
250 252 'UserInfo',
251   - function(service, $uibModal, userInfo) {
  253 + '$translate',
  254 + function(service, $uibModal, userInfo, translate) {
252 255 var self = this;
253 256 self.userInfo = userInfo;
254 257 var Employee = service.getQueryClass();
... ... @@ -280,7 +283,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
280 283 self.deleteEmp = function(id) {
281 284 Employee.delete({id: id}, function(result) {
282 285 if (result.msg) { // 暂时这样做，之后全局拦截
283   - alert(i18n('txt-3729') + result.msg);
  286 + alert(translate.instant("employeeInfoManage_module_js_line286_txt-3729") + result.msg);
284 287 } else {
285 288 self.doPage();
286 289 }
... ... @@ -394,7 +397,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
394 397 [
395 398 'EmployeeInfoManageService',
396 399 '$stateParams',
397   - function(service, $stateParams) {
  400 + '$translate',
  401 + function(service, $stateParams, translate) {
398 402 var self = this;
399 403 var Employee = service.getQueryClass();
400 404 var id = $stateParams.id;
... ... @@ -404,9 +408,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
404 408  
405 409 // 当转向到此页面时，就获取明细信息并绑定
406 410 self.employeeInfoForDetail = Employee.get({id: id}, function() {
407   - self.title = i18n('txt-4081') + " " +
  411 + self.title = translate.instant("employeeInfoManage_module_js_line411_txt-4081") + " " +
408 412 self.employeeInfoForDetail.personnelName +
409   - " " + i18n('txt-3066');
  413 + " " + translate.instant("employeeInfoManage_module_js_line413_txt-3066");
410 414 });
411 415  
412 416 }
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/orderOptionOpen.html
  View file @77217ea
... ... @@ -2,7 +2,7 @@
2 2 <div class="modal-title">
3 3 <h3>
4 4 <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
5   - <span class="caption-subject bold uppercase">$$$$$${txt-1682}</span>
  5 + <span class="caption-subject bold uppercase">{{"employeeInfoManage_orderOptionOpen_page_line5_txt-1682" | translate}}</span>
6 6 </h3>
7 7 </div>
8 8 </div>
... ... @@ -14,5 +14,5 @@
14 14 </sa-Orderoption>
15 15 </div>
16 16 <div class="modal-footer">
17   - <button class="btn btn-primary" ng-click="$ctrl.confirm($ctrl.orderColumns)">$$$$$${txt-4018}</button>
18   -</div>
19 17 \ No newline at end of file
  18 + <button class="btn btn-primary" ng-click="$ctrl.confirm($ctrl.orderColumns)">{{"employeeInfoManage_orderOptionOpen_page_line17_txt-4018" | translate}}</button>
  19 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/common/dts1/select/saSelect5.js
  View file @77217ea
... ... @@ -15,13 +15,16 @@
15 15 *
16 16 * required（可选）：是否需要form的required验证
17 17 *
  18 + * width(可选)：内部自动计算select框和删除按钮的宽度，并添加对应的style
  19 + *
18 20 */
19 21 angular.module('ScheduleApp').directive('saSelect5', [
20 22 '$timeout',
21 23 '$$SearchInfoService_g',
22 24 'UserPrincipal',
23 25 'DataStore',
24   - function($timeout, $$searchInfoService_g, UserPrincipal, DataStore) {
  26 + '$translate',
  27 + function($timeout, $$searchInfoService_g, UserPrincipal, DataStore, translate) {
25 28 return {
26 29 restrict: 'E',
27 30 templateUrl: '/pages/scheduleApp/module/common/dts1/select/saSelect5Template.html',
... ... @@ -65,6 +68,8 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
65 68  
66 69 var $required_attr = tAttrs["required"]; // 是否需要required验证
67 70  
  71 + var $width_attr = tAttrs["width"]; // 宽度
  72 +
68 73 if (!$name_attr) {
69 74 throw new Error("name属性必须填写");
70 75 }
... ... @@ -111,6 +116,17 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
111 116 // dom，span ng-bind属性设置，TODO：暂时无法用transclude设置，先用属性设置
112 117 tElem.find("ui-select-choices").html("{{" + $iterobjexp_attr + "}}");
113 118  
  119 + // 计算宽度
  120 + if ($width_attr) {
  121 + var $button_t_b = 6; // 按钮的padding top bottom
  122 + var $button_l_r = 6; // 按钮的padding left right
  123 + var $select_width = $width_attr - $button_l_r * 2; // select的width
  124 + tElem.find("ui-select").attr("style",
  125 + "width: " + $select_width + "px!important;" +
  126 + "white-space: nowrap; overflow: hidden;");
  127 + tElem.find("button").attr("style", "padding: " + $button_t_b + "px " + $button_l_r + "px;");
  128 + }
  129 +
114 130  
115 131 // 当前的数据模式，ajax,dic,local
116 132 var dataModelType = undefined;
... ... @@ -357,7 +373,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
357 373 */
358 374 scope[ctrlAs].$$internal_dic_data = function(dictype) {
359 375 if (!dictionaryUtils.getByGroup(dictype)) {
360   - throw new error(i18n('txt-1275', [dictype]));
  376 + throw new error(translate.instant("saSelect5_js_line375_txt-1275") + dictype);
361 377 }
362 378  
363 379 // 重新创建内部保存的数据
... ... @@ -510,4 +526,4 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saSelect5&#39;, [
510 526 }
511 527 };
512 528 }
513   -]);
514 529 \ No newline at end of file
  530 +]);
... ...
src/main/resources/static/pages/scheduleApp/module/common/dts1/select/saSelect5Template.html
  View file @77217ea
... ... @@ -16,4 +16,4 @@
16 16 <span class="glyphicon glyphicon-trash"></span>
17 17 </button>
18 18 </span>
19   -</div>
20 19 \ No newline at end of file
  20 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/common/dts2/queryOption/saOrderOptionTemplate.html
  View file @77217ea
... ... @@ -90,8 +90,8 @@
90 90 </div>
91 91 <div class="col-md-3 option_dir">
92 92 <select class="form-control aria-invalid="false" ng-model="$option.dir" ng-change="$saOrderOptionCtrl.$$select_dir_change()">
93   - <option value="ASC" ng-selected="$option.dir=='ASC'">$$$$$${txt-4157}</option>
94   - <option value="DESC" ng-selected="$option.dir=='DESC'">$$$$$${txt-4156}</option>
  93 + <option value="ASC" ng-selected="$option.dir=='ASC'">{{"queryOption_saOrderOptionTemplate_line93_txt-4157" | translate}}</option>
  94 + <option value="DESC" ng-selected="$option.dir=='DESC'">{{"queryOption_saOrderOptionTemplate_line94_txt-4156" | translate}}</option>
95 95 </select>
96 96 </div>
97 97 <div class="col-md-3 btn-group option_opt">
... ... @@ -107,4 +107,4 @@
107 107  
108 108 </div>
109 109  
110   -</div>
111 110 \ No newline at end of file
  111 +</div>
... ...
src/main/resources/static/pages/scheduleApp/module/common/main.js
  View file @77217ea
... ... @@ -72,31 +72,32 @@ ScheduleApp.factory(&#39;UserPrincipal&#39;, [
72 72 ScheduleApp.factory('DataStore', [
73 73 '$http',
74 74 '$q',
75   - function($http, $q) {
  75 + '$translate',
  76 + function($http, $q, translate) {
76 77 // 本地数据存储，如车辆数据，人员数据
77 78 var dataMap = {
78 79 "cl": [], // 车辆信息
79 80 "ry": [], // 人员信息
80 81 "ddreasons": [ // 调度原因（调度执勤日报里的）
81   - {code: "0", name: i18n('txt-3966')},
82   - {code: "1", name: i18n('txt-3958')},
83   - {code: "2", name: i18n('txt-3960')},
84   - {code: "3", name: i18n('txt-3837')},
85   - {code: "4", name: i18n('txt-3838')},
86   - {code: "5", name: i18n('txt-3876')},
87   - {code: "6", name: i18n('txt-4026')},
88   - {code: "7", name: i18n('txt-3840')},
89   - {code: "8", name: i18n('txt-3961')},
90   - {code: "9", name: i18n('txt-3962')},
91   - {code: "10", name: i18n('txt-3963')},
92   - {code: "11", name: i18n('txt-4197')},
93   - {code: "12", name: i18n('txt-4102')},
94   - {code: "13", name: i18n('txt-3957')},
95   - {code: "14", name: i18n('txt-3956')}
  82 + {code: "0", name: translate.instant("main_js_line_82_txt-3966")},
  83 + {code: "1", name: translate.instant("main_js_line_83_txt-3958")},
  84 + {code: "2", name: translate.instant("main_js_line_84_txt-3960")},
  85 + {code: "3", name: translate.instant("main_js_line_85_txt-3837")},
  86 + {code: "4", name: translate.instant("main_js_line_86_txt-3838")},
  87 + {code: "5", name: translate.instant("main_js_line_87_txt-3876")},
  88 + {code: "6", name: translate.instant("main_js_line_88_txt-4026")},
  89 + {code: "7", name: translate.instant("main_js_line_89_txt-3840")},
  90 + {code: "8", name: translate.instant("main_js_line_90_txt-3961")},
  91 + {code: "9", name: translate.instant("main_js_line_91_txt-3962")},
  92 + {code: "10", name: translate.instant("main_js_line_92_txt-3963")},
  93 + {code: "11", name: translate.instant("main_js_line_93_txt-4197")},
  94 + {code: "12", name: translate.instant("main_js_line_94_txt-4102")},
  95 + {code: "13", name: translate.instant("main_js_line_95_txt-3957")},
  96 + {code: "14", name: translate.instant("main_js_line_96_txt-3956")}
96 97 ],
97 98 "zdlytype" : [ // 站点路由类型
98   - {name: i18n('txt-2790'), value: 1},
99   - {name: i18n('txt-168'), value: 2}
  99 + {name: translate.instant("main_js_line_99_txt-2790"), value: 1},
  100 + {name: translate.instant("main_js_line_100_txt-168"), value: 2}
100 101 ]
101 102 };
102 103  
... ... @@ -280,7 +281,8 @@ ScheduleApp.factory(
280 281 [
281 282 'requestNotificationChannel',
282 283 '$q',
283   - function(requestNotificationChannel, $q) {
  284 + '$translate',
  285 + function(requestNotificationChannel, $q, translate) {
284 286 return {
285 287 request: function(config) {
286 288 requestNotificationChannel.requestStarted(config);
... ... @@ -296,13 +298,13 @@ ScheduleApp.factory(
296 298 var data = response.data;
297 299 var output = [];
298 300 if (data.status == '407') {
299   - alert(i18n('txt-1805'));
  301 + alert(translate.instant("main_js_line_301_txt-1805"));
300 302 return $q.reject(response);
301 303 } else if (data.status == '500') {
302   - output.push(i18n('txt-2284') + data.status);
303   - output.push(i18n('txt-2285') + data.path);
304   - output.push(i18n('txt-2286') + data.message);
305   - alert(i18n('txt-1807') + "\n" + output.join("\n"));
  304 + output.push(translate.instant("main_js_line_304_txt-2284") + data.status);
  305 + output.push(translate.instant("main_js_line_305_txt-2285") + data.path);
  306 + output.push(translate.instant("main_js_line_306_txt-2286") + data.message);
  307 + alert(translate.instant("main_js_line_307_txt-1807") + "\n" + output.join("\n"));
306 308 return $q.reject(response);
307 309 } else {
308 310 return response;
... ... @@ -320,22 +322,22 @@ ScheduleApp.factory(
320 322 } else if (rejection.status == -1) {
321 323 // 服务器断开了
322 324 // alert(i18n('txt-695'));
323   - console.log(i18n('txt-695'));
  325 + console.log(translate.instant("main_js_line_325_txt-695"));
324 326 } else {
325   - output.push(i18n('txt-2284') + rejection.status);
  327 + output.push(translate.instant("main_js_line_327_txt-2284") + rejection.status);
326 328 // output.push("错误内容：" + angular.toJson(rejection.data));
327 329 if (rejection.data) {
328   - output.push(i18n('txt-2325') + rejection.data.message);
  330 + output.push(translate.instant("main_js_line_330_txt-2325") + rejection.data.message);
329 331 } else {
330   - output.push(i18n('txt-2325') + rejection.message);
  332 + output.push(translate.instant("main_js_line_332_txt-2325") + rejection.message);
331 333 }
332 334  
333 335 if (rejection.status == 500) {
334   - alert(i18n('txt-1807') + "\n" + output.join("\n"));
  336 + alert(translate.instant("main_js_line_336_txt-1807") + "\n" + output.join("\n"));
335 337 } else if (rejection.status == 407) {
336   - alert(i18n('txt-1838') + "\n" + output.join("\n"));
  338 + alert(translate.instant("main_js_line_338_txt-1838") + "\n" + output.join("\n"));
337 339 } else {
338   - alert(i18n('txt-2333') + "\n" + output.join("\n"));
  340 + alert(translate.instant("main_js_line_340_txt-2333") + "\n" + output.join("\n"));
339 341 }
340 342 }
341 343  
... ... @@ -375,9 +377,10 @@ ScheduleApp.controller(&#39;ScheduleAppController&#39;, [
375 377 '$scope',
376 378 'UserPrincipal',
377 379 'DataStore',
378   - function($scope, UserPrincipal, DataStore) {
  380 + '$translate',
  381 + function($scope, UserPrincipal, DataStore, translate) {
379 382 $scope.$on('$viewContentLoaded', function(event) {
380   - console.log(i18n('txt-1149') + event);
  383 + console.log(translate.instant("main_js_line_383_txt-1149") + event);
381 384 });
382 385  
383 386 // 获取一次用户身份信息
... ...