Commit f7f6dfdac5549a445d82348790d89173ecc98969

Authored by 徐烜
1 parent 8d299a79

1、国际化改造:设备信息管理前端页面

src/main/resources/static/pages/scheduleApp/language/en.js
@@ -474,7 +474,128 @@ var ScheduleApp_en_language = { @@ -474,7 +474,128 @@ var ScheduleApp_en_language = {
474 "employeeInfoManage_module_js_line411_txt-4081" : "Employee", 474 "employeeInfoManage_module_js_line411_txt-4081" : "Employee",
475 "employeeInfoManage_module_js_line413_txt-3066" : "Details", 475 "employeeInfoManage_module_js_line413_txt-3066" : "Details",
476 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",
  593 +
  594 +
  595 + // TODO;
477 596
478 }; 597 };
479 598
480 -// TODO; 599 +
  600 +
  601 +
src/main/resources/static/pages/scheduleApp/language/zh.js
@@ -475,6 +475,123 @@ var ScheduleApp_zh_language = { @@ -475,6 +475,123 @@ var ScheduleApp_zh_language = {
475 "employeeInfoManage_module_js_line411_txt-4081" : "员工", 475 "employeeInfoManage_module_js_line411_txt-4081" : "员工",
476 "employeeInfoManage_module_js_line413_txt-3066" : "详细信息", 476 "employeeInfoManage_module_js_line413_txt-3066" : "详细信息",
477 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}} 设备信息",
  594 +
478 595
479 // TODO: 596 // TODO:
480 }; 597 };
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/detail.html
1 <div class="page-head"> 1 <div class="page-head">
2 <div class="page-title"> 2 <div class="page-title">
3 - <h1>$$$$$${txt-847}</h1> 3 + <h1>{{"deviceInfoManage_detail_page_line3_txt-847" | translate}}</h1>
4 </div> 4 </div>
5 </div> 5 </div>
6 6
7 <ul class="page-breadcrumb breadcrumb"> 7 <ul class="page-breadcrumb breadcrumb">
8 <li> 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 <i class="fa fa-circle"></i> 10 <i class="fa fa-circle"></i>
11 </li> 11 </li>
12 <li> 12 <li>
13 - <span class="active">$$$$$${txt-2398}</span> 13 + <span class="active">{{"deviceInfoManage_detail_page_line13_txt-2398" | translate}}</span>
14 <i class="fa fa-circle"></i> 14 <i class="fa fa-circle"></i>
15 </li> 15 </li>
16 <li> 16 <li>
17 - <a ui-sref="deviceInfoManage">$$$$$${txt-848}</a> 17 + <a ui-sref="deviceInfoManage">{{"deviceInfoManage_detail_page_line17_txt-848" | translate}}</a>
18 <i class="fa fa-circle"></i> 18 <i class="fa fa-circle"></i>
19 </li> 19 </li>
20 <li> 20 <li>
21 - <span class="active">$$$$$${txt-847}</span> 21 + <span class="active">{{"deviceInfoManage_detail_page_line21_txt-847" | translate}}</span>
22 </li> 22 </li>
23 </ul> 23 </ul>
24 24
@@ -35,28 +35,28 @@ @@ -35,28 +35,28 @@
35 <form class="form-horizontal" novalidate name="myForm"> 35 <form class="form-horizontal" novalidate name="myForm">
36 <div class="form-body"> 36 <div class="form-body">
37 <div class="form-group has-success has-feedback"> 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 <div class="col-md-3"> 39 <div class="col-md-3">
40 <input type="text" class="form-control" name="clZbh" 40 <input type="text" class="form-control" name="clZbh"
41 ng-model="ctrl.deviceInfoForDetail.clZbh" readonly/> 41 ng-model="ctrl.deviceInfoForDetail.clZbh" readonly/>
42 </div> 42 </div>
43 </div> 43 </div>
44 <div class="form-group has-success has-feedback"> 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 <div class="col-md-3"> 46 <div class="col-md-3">
47 <input type="text" class="form-control" name="xlName" 47 <input type="text" class="form-control" name="xlName"
48 ng-model="ctrl.deviceInfoForDetail.xlName" readonly/> 48 ng-model="ctrl.deviceInfoForDetail.xlName" readonly/>
49 </div> 49 </div>
50 </div> 50 </div>
51 <div class="form-group has-success has-feedback"> 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 <div class="col-md-3"> 53 <div class="col-md-3">
54 <input type="text" class="form-control" name="oldDeviceNo" 54 <input type="text" class="form-control" name="oldDeviceNo"
55 ng-model="ctrl.deviceInfoForDetail.oldDeviceNo" readonly/> 55 ng-model="ctrl.deviceInfoForDetail.oldDeviceNo" readonly/>
56 </div> 56 </div>
57 </div> 57 </div>
58 <div class="form-group has-success has-feedback"> 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 <div class="col-md-3"> 60 <div class="col-md-3">
61 <input type="text" class="form-control" name="newDeviceNo" 61 <input type="text" class="form-control" name="newDeviceNo"
62 ng-model="ctrl.deviceInfoForDetail.newDeviceNo" readonly/> 62 ng-model="ctrl.deviceInfoForDetail.newDeviceNo" readonly/>
@@ -64,14 +64,14 @@ @@ -64,14 +64,14 @@
64 </div> 64 </div>
65 65
66 <div class="form-group"> 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 <div class="col-md-4"> 68 <div class="col-md-4">
69 <input type="text" class="form-control" name="oldSimNo" 69 <input type="text" class="form-control" name="oldSimNo"
70 ng-model="ctrl.deviceInfoForDetail.oldSimNo" readonly/> 70 ng-model="ctrl.deviceInfoForDetail.oldSimNo" readonly/>
71 </div> 71 </div>
72 </div> 72 </div>
73 <div class="form-group"> 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 <div class="col-md-4"> 75 <div class="col-md-4">
76 <input type="text" class="form-control" name="newSimNo" 76 <input type="text" class="form-control" name="newSimNo"
77 ng-model="ctrl.deviceInfoForDetail.newSimNo" readonly/> 77 ng-model="ctrl.deviceInfoForDetail.newSimNo" readonly/>
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 </div> 79 </div>
80 80
81 <div class="form-group"> 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 <div class="col-md-10"> 83 <div class="col-md-10">
84 <textarea rows="3" class="form-control" name="troubleDesc" 84 <textarea rows="3" class="form-control" name="troubleDesc"
85 ng-model="ctrl.deviceInfoForDetail.troubleDesc" readonly></textarea> 85 ng-model="ctrl.deviceInfoForDetail.troubleDesc" readonly></textarea>
@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
87 </div> 87 </div>
88 88
89 <div class="form-group"> 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 <div class="col-md-10"> 91 <div class="col-md-10">
92 <textarea rows="3" class="form-control" name="guaranteeDesc" 92 <textarea rows="3" class="form-control" name="guaranteeDesc"
93 ng-model="ctrl.deviceInfoForDetail.guaranteeDesc" readonly></textarea> 93 ng-model="ctrl.deviceInfoForDetail.guaranteeDesc" readonly></textarea>
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
95 </div> 95 </div>
96 96
97 <div class="form-group has-success has-feedback"> 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 <div class="col-md-3"> 99 <div class="col-md-3">
100 <input type="text" class="form-control" 100 <input type="text" class="form-control"
101 name="qyrq" uib-datepicker-popup="yyyy年MM月dd日 HH:mm" 101 name="qyrq" uib-datepicker-popup="yyyy年MM月dd日 HH:mm"
@@ -109,4 +109,4 @@ @@ -109,4 +109,4 @@
109 </form> 109 </form>
110 </div> 110 </div>
111 111
112 -</div>  
113 \ No newline at end of file 112 \ No newline at end of file
  113 +</div>
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/edit.html
1 <div class="page-head"> 1 <div class="page-head">
2 <div class="page-title"> 2 <div class="page-title">
3 - <h1>$$$$$${txt-845}</h1> 3 + <h1>{{"deviceInfoManage_edit_page_line3_txt-845" | translate}}</h1>
4 </div> 4 </div>
5 </div> 5 </div>
6 6
7 <ul class="page-breadcrumb breadcrumb"> 7 <ul class="page-breadcrumb breadcrumb">
8 <li> 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 <i class="fa fa-circle"></i> 10 <i class="fa fa-circle"></i>
11 </li> 11 </li>
12 <li> 12 <li>
13 - <span class="active">$$$$$${txt-2398}</span> 13 + <span class="active">{{"deviceInfoManage_edit_page_line13_txt-2398" | translate}}</span>
14 <i class="fa fa-circle"></i> 14 <i class="fa fa-circle"></i>
15 </li> 15 </li>
16 <li> 16 <li>
17 - <a ui-sref="deviceInfoManage">$$$$$${txt-848}</a> 17 + <a ui-sref="deviceInfoManage">{{"deviceInfoManage_edit_page_line17_txt-848" | translate}}</a>
18 <i class="fa fa-circle"></i> 18 <i class="fa fa-circle"></i>
19 </li> 19 </li>
20 <li> 20 <li>
21 - <span class="active">$$$$$${txt-836}</span> 21 + <span class="active">{{"deviceInfoManage_edit_page_line21_txt-836" | translate}}</span>
22 </li> 22 </li>
23 </ul> 23 </ul>
24 24
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <div class="portlet-title"> 26 <div class="portlet-title">
27 <div class="caption"> 27 <div class="caption">
28 <i class="icon-equalizer font-red-sunglo"></i> <span 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 </div> 30 </div>
31 </div> 31 </div>
32 32
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <div class="form-body"> 35 <div class="form-body">
36 36
37 <div class="form-group has-success has-feedback"> 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 <div class="col-md-3"> 39 <div class="col-md-3">
40 <sa-Select5 name="xl" 40 <sa-Select5 name="xl"
41 model="ctrl.deviceInfoForSave" 41 model="ctrl.deviceInfoForSave"
@@ -45,19 +45,19 @@ @@ -45,19 +45,19 @@
45 dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}" 45 dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
46 iterobjname="item" 46 iterobjname="item"
47 iterobjexp="item.name" 47 iterobjexp="item.name"
48 - searchph="$$$$$${txt-3364}" 48 + searchph="{{'deviceInfoManage_edit_page_line48_txt-3364' | translate}}"
49 searchexp="this.name" 49 searchexp="this.name"
50 required > 50 required >
51 </sa-Select5> 51 </sa-Select5>
52 </div> 52 </div>
53 <!-- 隐藏块,显示验证信息 --> 53 <!-- 隐藏块,显示验证信息 -->
54 <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required"> 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 </div> 56 </div>
57 </div> 57 </div>
58 58
59 <div class="form-group has-success has-feedback"> 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 <div class="col-md-3"> 61 <div class="col-md-3">
62 <sa-Select5 name="cl" 62 <sa-Select5 name="cl"
63 model="ctrl.deviceInfoForSave" 63 model="ctrl.deviceInfoForSave"
@@ -68,19 +68,19 @@ @@ -68,19 +68,19 @@
68 dsparamsextra="{'type':'all', 'isCancel_eq': false}" 68 dsparamsextra="{'type':'all', 'isCancel_eq': false}"
69 iterobjname="item" 69 iterobjname="item"
70 iterobjexp="item.cl.insideCode + '<' + item.xl.name + '>'" 70 iterobjexp="item.cl.insideCode + '<' + item.xl.name + '>'"
71 - searchph="$$$$$${txt-3364}" 71 + searchph="{{'deviceInfoManage_edit_page_line71_txt-3364' | translate}}"
72 searchexp="this.cl.insideCode + '<' + this.xl.name + '>'" 72 searchexp="this.cl.insideCode + '<' + this.xl.name + '>'"
73 required > 73 required >
74 </sa-Select5> 74 </sa-Select5>
75 </div> 75 </div>
76 <!-- 隐藏块,显示验证信息 --> 76 <!-- 隐藏块,显示验证信息 -->
77 <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required"> 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 </div> 79 </div>
80 </div> 80 </div>
81 81
82 <div class="form-group has-success has-feedback"> 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 <div class="col-md-3"> 84 <div class="col-md-3">
85 <input type="text" class="form-control" name="oldDeviceNo" 85 <input type="text" class="form-control" name="oldDeviceNo"
86 ng-model="ctrl.deviceInfoForSave.oldDeviceNo" readonly/> 86 ng-model="ctrl.deviceInfoForSave.oldDeviceNo" readonly/>
@@ -88,18 +88,18 @@ @@ -88,18 +88,18 @@
88 </div> 88 </div>
89 89
90 <div class="form-group has-success has-feedback"> 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 <div class="col-md-3"> 92 <div class="col-md-3">
93 <input type="text" class="form-control" 93 <input type="text" class="form-control"
94 name="newDeviceNo" ng-model="ctrl.deviceInfoForSave.newDeviceNo" 94 name="newDeviceNo" ng-model="ctrl.deviceInfoForSave.newDeviceNo"
95 remote-Validation 95 remote-Validation
96 remotevtype="cars_sbbh" 96 remotevtype="cars_sbbh"
97 remotevparam="{{ {'id_eq': null, 'equipmentCode_eq': ctrl.deviceInfoForSave.newDeviceNo} | json}}" 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 </div> 99 </div>
100 <!-- 隐藏块,显示验证信息 --> 100 <!-- 隐藏块,显示验证信息 -->
101 <div class="alert alert-danger well-sm" ng-show="myForm.newDeviceNo.$error.required"> 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 </div> 103 </div>
104 <div class="alert alert-danger well-sm" ng-show="myForm.newDeviceNo.$error.remote"> 104 <div class="alert alert-danger well-sm" ng-show="myForm.newDeviceNo.$error.remote">
105 {{$remote_msg}} 105 {{$remote_msg}}
@@ -107,23 +107,23 @@ @@ -107,23 +107,23 @@
107 </div> 107 </div>
108 108
109 <div class="form-group"> 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 <div class="col-md-4"> 111 <div class="col-md-4">
112 <input type="text" class="form-control" ng-model="ctrl.deviceInfoForSave.oldSimNo" 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 </div> 114 </div>
115 </div> 115 </div>
116 116
117 <div class="form-group"> 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 <div class="col-md-4"> 119 <div class="col-md-4">
120 <input type="text" class="form-control" ng-model="ctrl.deviceInfoForSave.newSimNo" 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 </div> 122 </div>
123 </div> 123 </div>
124 124
125 <div class="form-group"> 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 <div class="col-md-10"> 127 <div class="col-md-10">
128 <textarea rows="3" class="form-control" name="descriptions" 128 <textarea rows="3" class="form-control" name="descriptions"
129 ng-model="ctrl.deviceInfoForSave.troubleDesc"></textarea> 129 ng-model="ctrl.deviceInfoForSave.troubleDesc"></textarea>
@@ -131,7 +131,7 @@ @@ -131,7 +131,7 @@
131 </div> 131 </div>
132 132
133 <div class="form-group"> 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 <div class="col-md-10"> 135 <div class="col-md-10">
136 <textarea rows="3" class="form-control" name="descriptions" 136 <textarea rows="3" class="form-control" name="descriptions"
137 ng-model="ctrl.deviceInfoForSave.guaranteeDesc"></textarea> 137 ng-model="ctrl.deviceInfoForSave.guaranteeDesc"></textarea>
@@ -167,7 +167,7 @@ @@ -167,7 +167,7 @@
167 <!--</div>--> 167 <!--</div>-->
168 168
169 <div class="form-group has-success has-feedback"> 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 <div class="col-md-3"> 171 <div class="col-md-3">
172 <div class="input-group"> 172 <div class="input-group">
173 <input type="datetime-local" class="form-control" name="qyrq" 173 <input type="datetime-local" class="form-control" name="qyrq"
@@ -180,7 +180,7 @@ @@ -180,7 +180,7 @@
180 </div> 180 </div>
181 <!-- 隐藏块,显示验证信息 --> 181 <!-- 隐藏块,显示验证信息 -->
182 <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required"> 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 </div> 184 </div>
185 <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote"> 185 <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">
186 {{$remote_msg}} 186 {{$remote_msg}}
@@ -194,12 +194,12 @@ @@ -194,12 +194,12 @@
194 <div class="form-actions"> 194 <div class="form-actions">
195 <div class="row"> 195 <div class="row">
196 <div class="col-md-offset-3 col-md-4"> 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 </div> 199 </div>
200 </div> 200 </div>
201 </div> 201 </div>
202 </form> 202 </form>
203 </div> 203 </div>
204 204
205 -</div>  
206 \ No newline at end of file 205 \ No newline at end of file
  206 +</div>
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html
1 <div class="page-head"> 1 <div class="page-head">
2 <div class="page-title"> 2 <div class="page-title">
3 - <h1>$$$$$${txt-845}</h1> 3 + <h1>{{"deviceInfoManage_form_page_line3_txt-845" | translate}}</h1>
4 </div> 4 </div>
5 </div> 5 </div>
6 6
7 <ul class="page-breadcrumb breadcrumb"> 7 <ul class="page-breadcrumb breadcrumb">
8 <li> 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 <i class="fa fa-circle"></i> 10 <i class="fa fa-circle"></i>
11 </li> 11 </li>
12 <li> 12 <li>
13 - <span class="active">$$$$$${txt-2398}</span> 13 + <span class="active">{{"deviceInfoManage_form_page_line13_txt-2398" | translate}}</span>
14 <i class="fa fa-circle"></i> 14 <i class="fa fa-circle"></i>
15 </li> 15 </li>
16 <li> 16 <li>
17 - <a ui-sref="deviceInfoManage">$$$$$${txt-848}</a> 17 + <a ui-sref="deviceInfoManage">{{"deviceInfoManage_form_page_line17_txt-848" | translate}}</a>
18 <i class="fa fa-circle"></i> 18 <i class="fa fa-circle"></i>
19 </li> 19 </li>
20 <li> 20 <li>
21 - <span class="active">$$$$$${txt-845}</span> 21 + <span class="active">{{"deviceInfoManage_form_page_line21_txt-845" | translate}}</span>
22 </li> 22 </li>
23 </ul> 23 </ul>
24 24
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <div class="portlet-title"> 26 <div class="portlet-title">
27 <div class="caption"> 27 <div class="caption">
28 <i class="icon-equalizer font-red-sunglo"></i> <span 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 </div> 30 </div>
31 </div> 31 </div>
32 32
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <div class="form-body"> 35 <div class="form-body">
36 36
37 <div class="form-group has-success has-feedback"> 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 <div class="col-md-3"> 39 <div class="col-md-3">
40 <sa-Select5 name="xl" 40 <sa-Select5 name="xl"
41 model="ctrl.deviceInfoForSave" 41 model="ctrl.deviceInfoForSave"
@@ -45,19 +45,19 @@ @@ -45,19 +45,19 @@
45 dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}" 45 dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
46 iterobjname="item" 46 iterobjname="item"
47 iterobjexp="item.name" 47 iterobjexp="item.name"
48 - searchph="$$$$$${txt-3364}" 48 + searchph="{{'deviceInfoManage_form_page_line48_txt-3364' | translate}}"
49 searchexp="this.name" 49 searchexp="this.name"
50 required > 50 required >
51 </sa-Select5> 51 </sa-Select5>
52 </div> 52 </div>
53 <!-- 隐藏块,显示验证信息 --> 53 <!-- 隐藏块,显示验证信息 -->
54 <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required"> 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 </div> 56 </div>
57 </div> 57 </div>
58 58
59 <div class="form-group has-success has-feedback"> 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 <div class="col-md-3"> 61 <div class="col-md-3">
62 <sa-Select5 name="cl" 62 <sa-Select5 name="cl"
63 model="ctrl.deviceInfoForSave" 63 model="ctrl.deviceInfoForSave"
@@ -68,19 +68,19 @@ @@ -68,19 +68,19 @@
68 dsparamsextra="{'type':'all', 'isCancel_eq': false}" 68 dsparamsextra="{'type':'all', 'isCancel_eq': false}"
69 iterobjname="item" 69 iterobjname="item"
70 iterobjexp="item.cl.insideCode + '<' + item.xl.name + '>'" 70 iterobjexp="item.cl.insideCode + '<' + item.xl.name + '>'"
71 - searchph="$$$$$${txt-3364}" 71 + searchph="{{'deviceInfoManage_form_page_line71_txt-3364' | translate}}"
72 searchexp="this.cl.insideCode + '<' + this.xl.name + '>'" 72 searchexp="this.cl.insideCode + '<' + this.xl.name + '>'"
73 required > 73 required >
74 </sa-Select5> 74 </sa-Select5>
75 </div> 75 </div>
76 <!-- 隐藏块,显示验证信息 --> 76 <!-- 隐藏块,显示验证信息 -->
77 <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required"> 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 </div> 79 </div>
80 </div> 80 </div>
81 81
82 <div class="form-group has-success has-feedback"> 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 <div class="col-md-3"> 84 <div class="col-md-3">
85 <input type="text" class="form-control" name="oldDeviceNo" 85 <input type="text" class="form-control" name="oldDeviceNo"
86 ng-model="ctrl.deviceInfoForSave.oldDeviceNo" readonly/> 86 ng-model="ctrl.deviceInfoForSave.oldDeviceNo" readonly/>
@@ -88,18 +88,18 @@ @@ -88,18 +88,18 @@
88 </div> 88 </div>
89 89
90 <div class="form-group has-success has-feedback"> 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 <div class="col-md-3"> 92 <div class="col-md-3">
93 <input type="text" class="form-control" 93 <input type="text" class="form-control"
94 name="newDeviceNo" ng-model="ctrl.deviceInfoForSave.newDeviceNo" 94 name="newDeviceNo" ng-model="ctrl.deviceInfoForSave.newDeviceNo"
95 remote-Validation 95 remote-Validation
96 remotevtype="cars_sbbh" 96 remotevtype="cars_sbbh"
97 remotevparam="{{ {'id_eq': null, 'equipmentCode_eq': ctrl.deviceInfoForSave.newDeviceNo} | json}}" 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 </div> 99 </div>
100 <!-- 隐藏块,显示验证信息 --> 100 <!-- 隐藏块,显示验证信息 -->
101 <div class="alert alert-danger well-sm" ng-show="myForm.newDeviceNo.$error.required"> 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 </div> 103 </div>
104 <div class="alert alert-danger well-sm" ng-show="myForm.newDeviceNo.$error.remote"> 104 <div class="alert alert-danger well-sm" ng-show="myForm.newDeviceNo.$error.remote">
105 {{$remote_msg}} 105 {{$remote_msg}}
@@ -107,23 +107,23 @@ @@ -107,23 +107,23 @@
107 </div> 107 </div>
108 108
109 <div class="form-group"> 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 <div class="col-md-4"> 111 <div class="col-md-4">
112 <input type="text" class="form-control" ng-model="ctrl.deviceInfoForSave.oldSimNo" 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 </div> 114 </div>
115 </div> 115 </div>
116 116
117 <div class="form-group"> 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 <div class="col-md-4"> 119 <div class="col-md-4">
120 <input type="text" class="form-control" ng-model="ctrl.deviceInfoForSave.newSimNo" 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 </div> 122 </div>
123 </div> 123 </div>
124 124
125 <div class="form-group"> 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 <div class="col-md-10"> 127 <div class="col-md-10">
128 <textarea rows="3" class="form-control" name="descriptions" 128 <textarea rows="3" class="form-control" name="descriptions"
129 ng-model="ctrl.deviceInfoForSave.troubleDesc"></textarea> 129 ng-model="ctrl.deviceInfoForSave.troubleDesc"></textarea>
@@ -131,7 +131,7 @@ @@ -131,7 +131,7 @@
131 </div> 131 </div>
132 132
133 <div class="form-group"> 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 <div class="col-md-10"> 135 <div class="col-md-10">
136 <textarea rows="3" class="form-control" name="descriptions" 136 <textarea rows="3" class="form-control" name="descriptions"
137 ng-model="ctrl.deviceInfoForSave.guaranteeDesc"></textarea> 137 ng-model="ctrl.deviceInfoForSave.guaranteeDesc"></textarea>
@@ -194,12 +194,12 @@ @@ -194,12 +194,12 @@
194 <div class="form-actions"> 194 <div class="form-actions">
195 <div class="row"> 195 <div class="row">
196 <div class="col-md-offset-3 col-md-4"> 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 </div> 199 </div>
200 </div> 200 </div>
201 </div> 201 </div>
202 </form> 202 </form>
203 </div> 203 </div>
204 204
205 -</div>  
206 \ No newline at end of file 205 \ No newline at end of file
  206 +</div>
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/index.html
1 <div class="page-head"> 1 <div class="page-head">
2 <div class="page-title"> 2 <div class="page-title">
3 - <h1>$$$$$${txt-848}</h1> 3 + <h1>{{"deviceInfoManage_index_page_line3_txt-848" | translate}}</h1>
4 </div> 4 </div>
5 </div> 5 </div>
6 6
7 <ul class="page-breadcrumb breadcrumb"> 7 <ul class="page-breadcrumb breadcrumb">
8 <li> 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 <i class="fa fa-circle"></i> 10 <i class="fa fa-circle"></i>
11 </li> 11 </li>
12 <li> 12 <li>
13 - <span class="active">$$$$$${txt-2398}</span> 13 + <span class="active">{{"deviceInfoManage_index_page_line13_txt-2398" | translate}}</span>
14 <i class="fa fa-circle"></i> 14 <i class="fa fa-circle"></i>
15 </li> 15 </li>
16 <li> 16 <li>
17 - <span class="active">$$$$$${txt-848}</span> 17 + <span class="active">{{"deviceInfoManage_index_page_line17_txt-848" | translate}}</span>
18 </li> 18 </li>
19 </ul> 19 </ul>
20 20
@@ -24,12 +24,12 @@ @@ -24,12 +24,12 @@
24 <div class="portlet-title"> 24 <div class="portlet-title">
25 <div class="caption font-dark"> 25 <div class="caption font-dark">
26 <i class="fa fa-database font-dark"></i> 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 </div> 28 </div>
29 <div class="actions"> 29 <div class="actions">
30 <a href="javascript:" class="btn blue" ng-click="ctrl.goForm()"> 30 <a href="javascript:" class="btn blue" ng-click="ctrl.goForm()">
31 <i class="fa fa-plus"></i> 31 <i class="fa fa-plus"></i>
32 - $$$$$${txt-1791} 32 + {{"deviceInfoManage_index_page_line32_txt-1791" | translate}}
33 </a> 33 </a>
34 34
35 <!--<div class="btn-group">--> 35 <!--<div class="btn-group">-->
@@ -55,4 +55,4 @@ @@ -55,4 +55,4 @@
55 </div> 55 </div>
56 </div> 56 </div>
57 </div> 57 </div>
58 -</div>  
59 \ No newline at end of file 58 \ No newline at end of file
  59 +</div>
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/list.html
@@ -10,19 +10,19 @@ @@ -10,19 +10,19 @@
10 </style> 10 </style>
11 11
12 12
13 - <div style="width: 100%; height: 100%; overflow: auto"> 13 + <div class="fixDiv">
14 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column"> 14 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
15 <thead> 15 <thead>
16 <tr role="row" class="heading"> 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 </tr> 26 </tr>
27 <tr role="row" class="filter"> 27 <tr role="row" class="filter">
28 <td></td> 28 <td></td>
@@ -35,13 +35,14 @@ @@ -35,13 +35,14 @@
35 dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'xl' } | json }}" 35 dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'xl' } | json }}"
36 iterobjname="item" 36 iterobjname="item"
37 iterobjexp="item.name" 37 iterobjexp="item.name"
38 - searchph="$$$$$${txt-3364}" 38 + searchph="{{'deviceInfoManage_list_page_line38_txt-3364' | translate}}"
39 searchexp="this.name" 39 searchexp="this.name"
  40 + width="140"
40 required > 41 required >
41 </sa-Select5> 42 </sa-Select5>
42 </td> 43 </td>
43 <td> 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 </td> 46 </td>
46 <td></td> 47 <td></td>
47 <td></td> 48 <td></td>
@@ -49,14 +50,14 @@ @@ -49,14 +50,14 @@
49 <td></td> 50 <td></td>
50 <td> 51 <td>
51 <label class="checkbox-inline input"> 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 </label> 54 </label>
54 </td> 55 </td>
55 <td> 56 <td>
56 <div class="btn-group"> 57 <div class="btn-group">
57 <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;" 58 <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;"
58 ng-click="ctrl.doPage()"> 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 <button class="btn btn-sm green btn-outline filter-submit margin-bottom dropdown-toggle" 61 <button class="btn btn-sm green btn-outline filter-submit margin-bottom dropdown-toggle"
61 data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 62 data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
62 <span class="caret"></span> 63 <span class="caret"></span>
@@ -66,7 +67,7 @@ @@ -66,7 +67,7 @@
66 <li> 67 <li>
67 <a href="javascript:" class="tool-action" ng-click="ctrl.customOrder()"> 68 <a href="javascript:" class="tool-action" ng-click="ctrl.customOrder()">
68 <i class="fa fa-sort-amount-asc" aria-hidden="true"></i> 69 <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
69 - $$$$$${txt-3385} 70 + {{"deviceInfoManage_list_page_line69_txt-3385" | translate}}
70 </a> 71 </a>
71 </li> 72 </li>
72 </ul> 73 </ul>
@@ -74,7 +75,7 @@ @@ -74,7 +75,7 @@
74 75
75 <button class="btn btn-sm red btn-outline filter-cancel" 76 <button class="btn btn-sm red btn-outline filter-cancel"
76 ng-click="ctrl.reset()"> 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 </td> 79 </td>
79 80
80 </tr> 81 </tr>
@@ -119,12 +120,12 @@ @@ -119,12 +120,12 @@
119 120
120 </td> 121 </td>
121 <td> 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 </td> 124 </td>
124 <td> 125 <td>
125 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>--> 126 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
126 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>--> 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 <!--<a ui-sref="deviceInfoManage_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 修改 </a>--> 129 <!--<a ui-sref="deviceInfoManage_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 修改 </a>-->
129 <!--<a sweetalert--> 130 <!--<a sweetalert-->
130 <!--sweet-options="{title: '是否作废车辆设备历史信息?',text: '内部编号:' + info.clZbh, html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"--> 131 <!--sweet-options="{title: '是否作废车辆设备历史信息?',text: '内部编号:' + info.clZbh, html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"-->
@@ -140,8 +141,11 @@ @@ -140,8 +141,11 @@
140 </div> 141 </div>
141 142
142 <div class="pageBar"> 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 </div> 149 </div>
146 150
147 <div class="pageBarRight"> 151 <div class="pageBarRight">
@@ -151,10 +155,10 @@ @@ -151,10 +155,10 @@
151 rotate="false" 155 rotate="false"
152 max-size="10" 156 max-size="10"
153 boundary-links="true" 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 </uib-pagination> 162 </uib-pagination>
159 </div> 163 </div>
160 </div> 164 </div>
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js
@@ -5,7 +5,8 @@ angular.module(&#39;ScheduleApp&#39;).factory( @@ -5,7 +5,8 @@ angular.module(&#39;ScheduleApp&#39;).factory(
5 [ 5 [
6 'DeviceInfoManageService_g', 6 'DeviceInfoManageService_g',
7 'UserPrincipal', 7 'UserPrincipal',
8 - function(service, UserPrincipal) { 8 + '$translate',
  9 + function(service, UserPrincipal, translate) {
9 /** 当前的查询条件信息 */ 10 /** 当前的查询条件信息 */
10 var currentSearchCondition = {'isCancel_eq': false}; 11 var currentSearchCondition = {'isCancel_eq': false};
11 12
@@ -22,11 +23,11 @@ angular.module(&#39;ScheduleApp&#39;).factory( @@ -22,11 +23,11 @@ angular.module(&#39;ScheduleApp&#39;).factory(
22 23
23 // 字段描述 24 // 字段描述
24 var columns = [ 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 var orderColumns = { 33 var orderColumns = {
@@ -117,7 +118,8 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -117,7 +118,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
117 [ 118 [
118 'DeviceInfoManageService', 119 'DeviceInfoManageService',
119 '$uibModal', 120 '$uibModal',
120 - function(service, $uibModal) { 121 + '$translate',
  122 + function(service, $uibModal, translate) {
121 var self = this; 123 var self = this;
122 var CarDevice = service.getQueryClass(); 124 var CarDevice = service.getQueryClass();
123 125
@@ -143,7 +145,7 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -143,7 +145,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
143 self.toggleCarDevice = function(id) { 145 self.toggleCarDevice = function(id) {
144 CarDevice.delete({id: id}, function(result) { 146 CarDevice.delete({id: id}, function(result) {
145 if (result.msg) { // 暂时这样做,之后全局拦截 147 if (result.msg) { // 暂时这样做,之后全局拦截
146 - alert(i18n('txt-3729') + result.msg); 148 + alert(translate.instant("deviceInfoManage_module_js_line148_txt-3729") + result.msg);
147 } else { 149 } else {
148 self.doPage(); 150 self.doPage();
149 } 151 }
@@ -252,7 +254,8 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -252,7 +254,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
252 [ 254 [
253 'DeviceInfoManageService', 255 'DeviceInfoManageService',
254 '$stateParams', 256 '$stateParams',
255 - function(service, $stateParams) { 257 + '$translate',
  258 + function(service, $stateParams, translate) {
256 var self = this; 259 var self = this;
257 var CarDevice = service.getQueryClass(); 260 var CarDevice = service.getQueryClass();
258 var id = $stateParams.id; 261 var id = $stateParams.id;
@@ -263,9 +266,9 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -263,9 +266,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
263 // 当转向到此页面时,就获取明细信息并绑定 266 // 当转向到此页面时,就获取明细信息并绑定
264 CarDevice.get({id: id}, function(value) { 267 CarDevice.get({id: id}, function(value) {
265 self.deviceInfoForDetail = value; 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 \ No newline at end of file 274 \ No newline at end of file
  275 +);
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/orderOptionOpen.html
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="modal-title"> 2 <div class="modal-title">
3 <h3> 3 <h3>
4 <i class="fa fa-sort-amount-asc" aria-hidden="true"></i> 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 </h3> 6 </h3>
7 </div> 7 </div>
8 </div> 8 </div>
@@ -14,5 +14,5 @@ @@ -14,5 +14,5 @@
14 </sa-Orderoption> 14 </sa-Orderoption>
15 </div> 15 </div>
16 <div class="modal-footer"> 16 <div class="modal-footer">
17 - <button class="btn btn-primary" ng-click="$ctrl.confirm($ctrl.orderColumns)">$$$$$${txt-4018}</button>  
18 -</div>  
19 \ No newline at end of file 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>