From 9b4d2e220a846ade316f076bd1dba98e6cf331c4 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 26 七月 2023 18:03:58 +0800
Subject: [PATCH] 管理后台的语言去除
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/small_edit.html | 2
cloud-server-management/src/main/webapp/static/modular/system/menu/menu.js | 94 --
cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html | 6
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html | 75 --
cloud-server-management/src/main/webapp/WEB-INF/view/system/tFeedback/userFeedback.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept_add.html | 72 --
cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriverVerify_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRuleDetail.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html | 2
cloud-server-management/src/main/webapp/static/modular/system/menu/menu_info.js | 44 -
cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role.html | 55 -
cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponRecord.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/home.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html | 6
cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementLaw.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail1.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/immediately.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu_add.html | 62 --
cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept.html | 65 --
cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementOrder.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivityHistory/driverActivityHistory.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPriceCheck.html | 2
cloud-server-management/src/main/webapp/static/modular/system/dept/dept_info.js | 69 --
cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu.html | 59 --
cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompanyAudit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_immediately.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html | 154 +----
cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html | 239 +------
cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html | 4
cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord.html | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java | 15
cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_immediately_back.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tUser/tUser.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/tUser.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementMe.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_immediately.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule_immediately.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriverVerify.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPriceService_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/index.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html | 153 +---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tWithout/tWithout.html | 2
cloud-server-management/src/main/webapp/static/modular/system/role/role.js | 68 -
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_all.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tGuidePage/tbGuidePage.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit1.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tProblem/tProblem.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driver.html | 2
cloud-server-management/src/main/webapp/static/modular/system/role/role_info.js | 64 -
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord1.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_update.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserExit/tbUserExit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/userCouponRecord/userCouponRecord.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_edit.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementRecharge.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tGuidePage/tbGuidePage_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tStartPage/tbStartPage_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html | 8
cloud-server-management/src/main/webapp/WEB-INF/view/system/tMotorModel/tMotorModel.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tbBanner/tbBanner.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_view.html | 61 +-
cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementSmallPieceLogistics.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu_edit.html | 69 --
cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule.html | 2
cloud-server-management/src/main/webapp/static/modular/system/dept/dept.js | 54 -
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tbBanner/tbBanner_add.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/immediately.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tVoice/tbVoice.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tStartPage/tbStartPage.html | 2
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompanyAudit_immediately.html | 2
141 files changed, 366 insertions(+), 1,368 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java
index e3da6d0..05c1a31 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/MenuController.java
@@ -132,21 +132,6 @@
public Object list(@RequestParam(required = false) String menuName, @RequestParam(required = false) String level) {
Integer language = UserExt.getLanguage();
List<Map<String, Object>> menus = this.menuService.selectMenus(menuName, level);
- if(language==1 || language==null){
-
- }else if(language==2){
- for (Map<String, Object> menu : menus) {
- menu.put("name",menu.get("ename"));
- }
- }else if(language==3){
- for (Map<String, Object> menu : menus) {
- menu.put("name",menu.get("bname"));
- }
- }
- for (Map<String, Object> menu : menus) {
- menu.put("id",menu.get("id").toString());
- }
-
return super.warpObject(new MenuWarpper(menus));
}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/home.html b/cloud-server-management/src/main/webapp/WEB-INF/view/home.html
index c8627f4..e70ab14 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/home.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/home.html
@@ -16,7 +16,7 @@
</style>
<div class="container-fluid" style="padding: 0 !important;">
<div class="row">
- <input hidden id="language" value="${language}">
+
<div class="col-sm-12">
<div class="row" style="border-style: none none solid; border-color: #e7eaec; border-width: 1px 0px;">
<ul class="breadcrumb" style="height: 45px; line-height: 45px; padding-left: 20px;">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/index.html b/cloud-server-management/src/main/webapp/WEB-INF/view/index.html
index 6c33010..02319fa 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/index.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/index.html
@@ -12,7 +12,7 @@
</head>
<body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">
- <input hidden id="language" value="${language}">
+
<div id="wrapper">
<!--左侧导航开始-->
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept.html
index 8574f2d..196a50a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept.html
@@ -2,8 +2,6 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
- @if(language==1){
<div class="ibox-title">
<h5>部门管理</h5>
</div>
@@ -33,69 +31,6 @@
</div>
</div>
</div>
- @}
- @if(language==2){
- <div class="ibox-title">
- <h5>Divisional management</h5>
- </div>
- <div class="ibox-content">
- <div class="row row-lg">
- <div class="col-sm-12">
- <div class="row">
- <div class="col-sm-3">
- <#NameCon id="condition" name="Name" />
- </div>
- <div class="col-sm-3">
- <#button name="Search" icon="fa-search" clickFun="Dept.search()"/>
- </div>
- </div>
- <div class="hidden-xs" id="DeptTableToolbar" role="group">
- @if(shiro.hasPermission("/dept/add")){
- <#button name="Add" icon="fa-plus" clickFun="Dept.openAddDept()"/>
- @}
- @if(shiro.hasPermission("/dept/update")){
- <#button name="Update" icon="fa-plus" clickFun="Dept.openDeptDetail()" space="true"/>
- @}
- @if(shiro.hasPermission("/dept/delete")){
- <#button name="Delete" icon="fa-plus" clickFun="Dept.delete()" space="true"/>
- @}
- </div>
- <#table id="DeptTable"/>
- </div>
- </div>
- </div>
- @}
- @if(language==3){
- <div class="ibox-title">
- <h5>Manajemen Divisi</h5>
- </div>
- <div class="ibox-content">
- <div class="row row-lg">
- <div class="col-sm-12">
- <div class="row">
- <div class="col-sm-3">
- <#NameCon id="condition" name="Nama" />
- </div>
- <div class="col-sm-3">
- <#button name="Pencarian" icon="fa-search" clickFun="Dept.search()"/>
- </div>
- </div>
- <div class="hidden-xs" id="DeptTableToolbar" role="group">
- @if(shiro.hasPermission("/dept/add")){
- <#button name="Tambah" icon="fa-plus" clickFun="Dept.openAddDept()"/>
- @}
- @if(shiro.hasPermission("/dept/update")){
- <#button name="Edit" icon="fa-plus" clickFun="Dept.openDeptDetail()" space="true"/>
- @}
- @if(shiro.hasPermission("/dept/delete")){
- <#button name="Hapus" icon="fa-plus" clickFun="Dept.delete()" space="true"/>
- @}
- </div>
- <#table id="DeptTable"/>
- </div>
- </div>
- </div>
- @}
</div>
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept_add.html
index a60d472..f19f8e6 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept_add.html
@@ -2,9 +2,9 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="deptInfoForm">
- <input hidden id="language" value="${language}">
+
<input type="hidden" id="id" value="">
- @if(language==1){
+
<div class="row">
<div class="col-sm-6 b-r">
<#input id="simplename" name="部门名称" underline="true"/>
@@ -29,78 +29,14 @@
</div>
<div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
+ <div class="col-sm-10">
<#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.addSubmit()"/>
<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
</div>
</div>
- @}
- @if(language==2){
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="simplename" name="Name of a department" underline="true"/>
-
- <#input id="fullname" name="Full name of department" underline="true"/>
-
- <#input id="tips" name="Remarks" underline="true"/>
- </div>
- <div class="col-sm-6">
- <#input id="num" name="Sort" underline="true"/>
-
- <#input id="pName" name="Superior department" readonly="readonly" hidden="pid"
- clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
- style="background-color: #ffffff !important;"/>
- </div>
- </div>
-
- <!-- 父级部门的选择框 -->
- <div id="parentDeptMenu" class="menuContent"
- style="display: none; position: absolute; z-index: 200;">
- <ul id="parentDeptMenuTree" class="ztree tree-box" style="width: 245px !important;"></ul>
- </div>
-
- <div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
- <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.addSubmit()"/>
- <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
- </div>
- </div>
- @}
- @if(language==3){
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="simplename" name="Nama departemen" underline="true"/>
-
- <#input id="fullname" name="Full name of department" underline="true"/>
-
- <#input id="tips" name="Catatan" underline="true"/>
- </div>
- <div class="col-sm-6">
- <#input id="num" name="Urutkan" underline="true"/>
-
- <#input id="pName" name="Departemen Tinggi" readonly="readonly" hidden="pid"
- clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
- style="background-color: #ffffff !important;"/>
- </div>
- </div>
-
- <!-- 父级部门的选择框 -->
- <div id="parentDeptMenu" class="menuContent"
- style="display: none; position: absolute; z-index: 200;">
- <ul id="parentDeptMenuTree" class="ztree tree-box" style="width: 245px !important;"></ul>
- </div>
-
- <div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
- <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.addSubmit()"/>
- <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
- </div>
- </div>
- @}
-
</div>
</div>
</div>
-<script src="${ctxPath}/modular/system/dept/dept_info.js"></script>
+<script src="${ctxPath}/static/modular/system/dept/dept_info.js"></script>
@}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html
index 7576cc5..76375ed 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html
@@ -2,10 +2,9 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="deptInfoForm">
- <input hidden id="language" value="${language}">
+
<input type="hidden" id="id" value="${dept.id}">
- <input type="hidden" id="pid" value="${dept.pid}">
- @if(language==1){
+
<div class="row">
<div class="col-sm-6 b-r">
<#input id="simplename" name="部门名称" underline="true" value="${dept.simplename}"/>
@@ -31,80 +30,14 @@
</div>
<div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
+ <div class="col-sm-10">
<#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.editSubmit()"/>
<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
</div>
</div>
- @}
- @if(language==2){
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="simplename" name="Name of a department" underline="true" value="${dept.simplename}"/>
-
- <#input id="fullname" name="Full name of department" underline="true" value="${dept.fullname}"/>
-
- <#input id="tips" name="Remarks" underline="true" value="${dept.tips}"/>
- </div>
- <div class="col-sm-6">
- <#input id="num" name="Sort" underline="true" value="${dept.num}"/>
-
- <#input id="pName" name="Superior department" readonly="readonly" hidden="pid"
- hiddenValue="${dept.pid}" value="${pName}"
- clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
- style="background-color: #ffffff !important;"/>
- </div>
- </div>
-
- <!-- 父级部门的选择框 -->
- <div id="parentDeptMenu" class="menuContent"
- style="display: none; position: absolute; z-index: 200;">
- <ul id="parentDeptMenuTree" class="ztree tree-box" style="width: 245px !important;"></ul>
- </div>
-
- <div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
- <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
- </div>
- </div>
- @}
- @if(language==3){
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="simplename" name="Nama departemen" underline="true" value="${dept.simplename}"/>
-
- <#input id="fullname" name="Full name of department" underline="true" value="${dept.fullname}"/>
-
- <#input id="tips" name="Catatan" underline="true" value="${dept.tips}"/>
- </div>
- <div class="col-sm-6">
- <#input id="num" name="Urutkan" underline="true" value="${dept.num}"/>
-
- <#input id="pName" name="Departemen Tinggi" readonly="readonly" hidden="pid"
- hiddenValue="${dept.pid}" value="${pName}"
- clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
- style="background-color: #ffffff !important;"/>
- </div>
- </div>
-
- <!-- 父级部门的选择框 -->
- <div id="parentDeptMenu" class="menuContent"
- style="display: none; position: absolute; z-index: 200;">
- <ul id="parentDeptMenuTree" class="ztree tree-box" style="width: 245px !important;"></ul>
- </div>
-
- <div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
- <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
- </div>
- </div>
- @}
-
</div>
</div>
</div>
-<script src="${ctxPath}/modular/system/dept/dept_info.js"></script>
+<script src="${ctxPath}/static/modular/system/dept/dept_info.js"></script>
@}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driver.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driver.html
index 464629f..dda638d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driver.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driver.html
@@ -3,7 +3,7 @@
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<h5>司机列表管理</h5>
@}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html
index 54a6196..7be6ea8 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html
index dfd1564..00fed4e 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html
@@ -7,7 +7,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal">
- <input hidden id="language" value="${language}">
+
<div class="row">
<div class="col-sm-11">
<div class="form-group">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_immediately.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_immediately.html
index f836d1e..a6774b5 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_immediately.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_immediately.html
@@ -3,7 +3,7 @@
<div class="ibox-content">
<div class="form-horizontal" id="sysCouponActivityInfoForm">
<input type="hidden" id="id" name="id" value="${id}">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-10">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html
index a4cc68a..4583f15 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html
@@ -80,12 +80,12 @@
font-size: 14px;
}
</style>
-<input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row" style="margin-left: 2%;">
<div class="col-sm-3">
<input id="activityId" value="${activityId}" type="hidden">
- <input hidden id="language" value="${language}">
+
<div class="ibox float-e-margins">
<div class="ibox-title">
<h3>活动时间：<input type="text" id="startTime" name="zc7" class="form-control" style="max-width:250px !important;display: initial !important;" onchange="receiveRecordDetail()"/></h3>
@@ -167,7 +167,7 @@
<div class="row" style="margin-left: 2%;">
<div class="col-sm-3">
<input id="activityId" value="${activityId}" type="hidden">
- <input hidden id="language" value="${language}">
+
<div class="ibox float-e-margins">
<div class="ibox-title">
<h3>Activity time：<input type="text" id="startTime" name="zc7" class="form-control" style="max-width:250px !important;display: initial !important;" onchange="receiveRecordDetail()"/></h3>
@@ -249,7 +249,7 @@
<div class="row" style="margin-left: 2%;">
<div class="col-sm-3">
<input id="activityId" value="${activityId}" type="hidden">
- <input hidden id="language" value="${language}">
+
<div class="ibox float-e-margins">
<div class="ibox-title">
<h3>Waktu aktivitas：<input type="text" id="startTime" name="zc7" class="form-control" style="max-width:250px !important;display: initial !important;" onchange="receiveRecordDetail()"/></h3>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivityHistory/driverActivityHistory.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivityHistory/driverActivityHistory.html
index 89c33b0..426e052 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivityHistory/driverActivityHistory.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/driverActivityHistory/driverActivityHistory.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<input hidden id="time" value="${time}">
<div class="ibox-title">
@if(language==1){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu.html
index 9426e48..f118b04 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu.html
@@ -2,8 +2,6 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
- @if(language==1){
<div class="ibox-title">
<h5>菜单管理</h5>
</div>
@@ -30,63 +28,6 @@
</div>
</div>
</div>
- @}
- @if(language==2){
- <div class="ibox-title">
- <h5>Menu management</h5>
- </div>
- <div class="ibox-content">
- <div class="row row-lg">
- <div class="col-sm-12">
- <div class="row">
- <div class="col-sm-3">
- <#NameCon id="menuName" name="Menu name" />
- </div>
- <div class="col-sm-3">
- <#NameCon id="level" name="Levels and ranks" />
- </div>
- <div class="col-sm-3">
- <#button name="Search" icon="fa-search" clickFun="Menu.search()"/>
- </div>
- </div>
- <div class="hidden-xs" id="menuTableToolbar" role="group">
- <#button name="Add" icon="fa-plus" clickFun="Menu.openAddMenu()"/>
- <#button name="Update" icon="fa-edit" clickFun="Menu.openChangeMenu()" space="true"/>
- <#button name="Delete" icon="fa-remove" clickFun="Menu.delMenu()" space="true"/>
- </div>
- <#table id="menuTable"/>
- </div>
- </div>
- </div>
- @}
- @if(language==3){
- <div class="ibox-title">
- <h5>Manajemen Menu</h5>
- </div>
- <div class="ibox-content">
- <div class="row row-lg">
- <div class="col-sm-12">
- <div class="row">
- <div class="col-sm-3">
- <#NameCon id="menuName" name="Nama menu" />
- </div>
- <div class="col-sm-3">
- <#NameCon id="level" name="Level dan peringkat" />
- </div>
- <div class="col-sm-3">
- <#button name="Pencarian" icon="fa-search" clickFun="Menu.search()"/>
- </div>
- </div>
- <div class="hidden-xs" id="menuTableToolbar" role="group">
- <#button name="Tambah" icon="fa-plus" clickFun="Menu.openAddMenu()"/>
- <#button name="Sunting" icon="fa-edit" clickFun="Menu.openChangeMenu()" space="true"/>
- <#button name="Hapus" icon="fa-remove" clickFun="Menu.delMenu()" space="true"/>
- </div>
- <#table id="menuTable"/>
- </div>
- </div>
- </div>
- @}
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu_add.html
index 0542684..228dcf2 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu_add.html
@@ -2,9 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="menuInfoForm">
- <input hidden id="language" value="${language}">
<input type="hidden" id="id" value="">
- @if(language==1){
<div class="row">
<div class="col-sm-6 b-r">
<#input id="name" name="名称" underline="true" />
@@ -32,66 +30,6 @@
<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="MenuInfoDlg.close()"/>
</div>
</div>
- @}
- @if(language==2){
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="name" name="Name" underline="true" />
- <#input id="code" name="Menu number" underline="true" />
- <#input id="pcodeName" name="Parent number" underline="true"
- hidden="pcode" readonly="readonly"
- clickFun="MenuInfoDlg.showMenuSelectTree(); return false;"
- style="background-color: #ffffff !important;"
- selectFlag="true" selectId="pcodeTreeDiv" selectTreeId="pcodeTree" selectStyle="width:244px !important;"/>
- <#select id="ismenu" name="Is it a menu">
- <option value="1">Yes</option>
- <option value="0">No</option>
- </#select>
- </div>
- <div class="col-sm-6">
- <#input id="url" name="Request address" underline="true" />
- <#input id="num" name="Sort" underline="true" />
- <#input id="icon" name="Icon " underline="false" value="fa-bars" />
- </div>
- </div>
-
- <div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
- <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="MenuInfoDlg.addSubmit()"/>
- <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="MenuInfoDlg.close()"/>
- </div>
- </div>
- @}
- @if(language==3){
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="name" name="Nama" underline="true" />
- <#input id="code" name="Nomor menu" underline="true" />
- <#input id="pcodeName" name="Nomor induk" underline="true"
- hidden="pcode" readonly="readonly"
- clickFun="MenuInfoDlg.showMenuSelectTree(); return false;"
- style="background-color: #ffffff !important;"
- selectFlag="true" selectId="pcodeTreeDiv" selectTreeId="pcodeTree" selectStyle="width:244px !important;"/>
- <#select id="ismenu" name="Apakah itu menu">
- <option value="1">Ya</option>
- <option value="0">Tidak</option>
- </#select>
- </div>
- <div class="col-sm-6">
- <#input id="url" name="Alamat Permintaan" underline="true" />
- <#input id="num" name="Urutkan" underline="true" />
- <#input id="icon" name="Ikon" underline="false" value="fa-bars" />
- </div>
-</div>
-
-<div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
- <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="MenuInfoDlg.addSubmit()"/>
- <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="MenuInfoDlg.close()"/>
- </div>
-</div>
- @}
-
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu_edit.html
index 46ab439..be64dd1 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/menu/menu_edit.html
@@ -5,8 +5,7 @@
<input type="hidden" id="id" value="${menu.id}">
<input type="hidden" id="ismenuValue" value="${menu.ismenu}">
- <input hidden id="language" value="${language}">
- @if(language==1){
+
<div class="row">
<div class="col-sm-6 b-r">
<#input id="name" name="名称" value="${menu.name}" underline="true" />
@@ -30,76 +29,14 @@
</div>
<div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
+ <div class="col-sm-10">
<#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="MenuInfoDlg.editSubmit()"/>
<#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="MenuInfoDlg.close()"/>
</div>
</div>
- @}
- @if(language==2){
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="name" name="Name" value="${menu.name}" underline="true" />
- <#input id="code" name="Menu number" value="${menu.code}" underline="true" />
- <#input id="pcodeName" name="Parent number" value="${menu.pcodeName}" underline="true"
- hidden="pcode" readonly="readonly" hiddenValue="${menu.pcode}"
- clickFun="MenuInfoDlg.showMenuSelectTree(); return false;"
- style="background-color: #ffffff !important;"
- selectFlag="true" selectId="pcodeTreeDiv" selectTreeId="pcodeTree" selectStyle="width:244px !important;"/>
- <#select id="ismenu" name="Is it a menu">
- <option value="1">Yes</option>
- <option value="0">No</option>
- </#select>
-
- </div>
- <div class="col-sm-6">
- <#input id="url" name="Request address" value="${menu.url}" underline="true" />
- <#input id="num" name="Sort" value="${menu.num}" underline="true" />
- <#input id="icon" name="Icon" underline="false" value="${menu.icon}"/>
- </div>
</div>
- <div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
- <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="MenuInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="MenuInfoDlg.close()"/>
- </div>
- </div>
- @}
- @if(language==3){
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="name" name="Nama" value="${menu.name}" underline="true" />
- <#input id="code" name="Nomor menu" value="${menu.code}" underline="true" />
- <#input id="pcodeName" name="Nomor induk" value="${menu.pcodeName}" underline="true"
- hidden="pcode" readonly="readonly" hiddenValue="${menu.pcode}"
- clickFun="MenuInfoDlg.showMenuSelectTree(); return false;"
- style="background-color: #ffffff !important;"
- selectFlag="true" selectId="pcodeTreeDiv" selectTreeId="pcodeTree" selectStyle="width:244px !important;"/>
- <#select id="ismenu" name="Apakah itu menu">
- <option value="1">Ya</option>
- <option value="0">Tidak</option>
- </#select>
-
- </div>
- <div class="col-sm-6">
- <#input id="url" name="Alamat Permintaan" value="${menu.url}" underline="true" />
- <#input id="num" name="Urutkan" value="${menu.num}" underline="true" />
- <#input id="icon" name="Ikon" underline="false" value="${menu.icon}"/>
- </div>
</div>
-
-<div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
- <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="MenuInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="MenuInfoDlg.close()"/>
- </div>
</div>
- @}
-
- </div>
-
- </div>
-</div>
-<script src="${ctxPath}/modular/system/menu/menu_info.js"></script>
+<script src="${ctxPath}/static/modular/system/menu/menu_info.js"></script>
@}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role.html
index 43db305..143d75b 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role.html
@@ -2,8 +2,6 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
- @if(language==1){
<div class="ibox-title">
<h5>角色管理</h5>
</div>
@@ -28,59 +26,6 @@
</div>
</div>
</div>
- @}
- @if(language==2){
- <div class="ibox-title">
- <h5>Role management</h5>
- </div>
- <div class="ibox-content">
- <div class="row row-lg">
- <div class="col-sm-12">
- <div class="row">
- <div class="col-sm-3">
- <#NameCon id="roleName" name="Role name" />
- </div>
- <div class="col-sm-3">
- <#button name="Search" icon="fa-search" clickFun="Role.search()"/>
- </div>
- </div>
- <div class="hidden-xs" id="roleTableToolbar" role="group">
- <#button name="Add" icon="fa-plus" clickFun="Role.openAddRole()" />
- <#button name="Update" icon="fa-edit" clickFun="Role.openChangeRole()" space="true"/>
- <#button name="Delete" icon="fa-remove" clickFun="Role.delRole()" space="true"/>
- <#button name="Permission configuration" icon="fa-user-secret" clickFun="Role.assign()" space="true"/>
- </div>
- <#table id="roleTable"/>
- </div>
- </div>
- </div>
- @}
- @if(language==3){
- <div class="ibox-title">
- <h5>Manajemen peran</h5>
- </div>
- <div class="ibox-content">
- <div class="row row-lg">
- <div class="col-sm-12">
- <div class="row">
- <div class="col-sm-3">
- <#NameCon id="roleName" name="Peran" />
- </div>
- <div class="col-sm-3">
- <#button name="Pencarian" icon="fa-search" clickFun="Role.search()"/>
- </div>
- </div>
- <div class="hidden-xs" id="roleTableToolbar" role="group">
- <#button name="Tambah" icon="fa-plus" clickFun="Role.openAddRole()" />
- <#button name="Sunting" icon="fa-edit" clickFun="Role.openChangeRole()" space="true"/>
- <#button name="Hapus" icon="fa-remove" clickFun="Role.delRole()" space="true"/>
- <#button name="Konfigurasi izin" icon="fa-user-secret" clickFun="Role.assign()" space="true"/>
- </div>
- <#table id="roleTable"/>
- </div>
- </div>
- </div>
- @}
</div>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role_add.html
index 69d8c8a..d5ea84d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role_add.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="roleInfoForm">
- <input hidden id="language" value="${language}">
+
<input type="hidden" id="id" value="">
@if(language==1){
<div class="row">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role_edit.html
index 9f1ff76..fab8083 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/role/role_edit.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="roleInfoForm">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<input type="hidden" id="id" value="${role.id}">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html
index 5d7affc..c4b1052 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html
@@ -13,7 +13,7 @@
<h5>Manajemen Kegiatan Hadiah</h5>
@}
</div>
- <input hidden id="language" value="${language}">
+
<input hidden id="companyId" value="${companyId}">
<div class="ibox-content">
<div class="row row-lg">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponRecord.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponRecord.html
index 10306f8..85776e8 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponRecord.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponRecord.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="ibox-title">
<h5>优惠券管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/tUser.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/tUser.html
index f2d298b..47523f8 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/tUser.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponActivity/tUser.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>用户管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/immediately.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/immediately.html
index f670ad2..a93575f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/immediately.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/immediately.html
@@ -3,7 +3,7 @@
<div class="ibox-content">
<div class="form-horizontal" id="sysCouponActivityInfoForm">
<input type="hidden" id="id" name="id" value="${id}">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-10">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html
index 88429c1..7b0a7e4 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html
@@ -14,7 +14,7 @@
<h5>Manajemen kupon</h5>
@}
</div>
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="ibox-content">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html
index 0b0d452..6ca1d16 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html
@@ -4,7 +4,7 @@
@if(language==1){
<div class="form-horizontal"id="sysCouponRecordInfoForm">
- <input hidden id="language" value="${language}">
+
<div class="row">
<div class="col-sm-6">
<#input id="name" name="名称" underline="true" placeholder="最多20个字"/>
@@ -56,7 +56,7 @@
@}
@if(language==2){
<div class="form-horizontal"id="sysCouponRecordInfoForm">
- <input hidden id="language" value="${language}">
+
<div class="row">
<div class="col-sm-6">
<#input id="name" name="Name" underline="true" placeholder="Up to 20 characters"/>
@@ -106,7 +106,7 @@
@}
@if(language==3){
<div class="form-horizontal"id="sysCouponRecordInfoForm">
- <input hidden id="language" value="${language}">
+
<div class="row">
<div class="col-sm-6">
<#input id="name" name="Nama" underline="true" placeholder="Sehingga 20 karakter"/>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement.html
index 003f5f8..e9e4353 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>广告设置管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_add.html
index e88b7cc..10d5df8 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_add.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="advertisementInfoForm">
- <input hidden id="language" value="${language}">
+
<div class="row">
<div class="col-sm-10">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit.html
index d8f636c..65351ee 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="advertisementInfoForm">
- <input hidden id="language" value="${language}">
+
<input type="hidden" id="id" name="id" value="${item.id}">
<div class="row">
<div class="col-sm-10">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit1.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit1.html
index d9f7bbb..b5cf42e 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit1.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit1.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="advertisementInfoForm">
- <input hidden id="language" value="${language}">
+
<input type="hidden" id="id" name="id" value="${item.id}">
<div class="row">
<div class="col-sm-10">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html
index 3133b3f..2e7f20d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html
@@ -9,7 +9,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="row row-lg">
- <input hidden id="language" value="${language}">
+
<div class="col-sm-12">
<div class="tabs-container">
<ul class="nav nav-tabs">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementLaw.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementLaw.html
index dd2b55b..ccb02fd 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementLaw.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementLaw.html
@@ -11,7 +11,7 @@
<div class="row row-lg">
<div class="col-sm-12">
<div class="tabs-container">
- <input hidden id="language" value="${language}">
+
<ul class="nav nav-tabs">
@if(language==1){
<li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">法律法规设置</a></li>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementMe.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementMe.html
index 3eb4669..4cb0cb2 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementMe.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementMe.html
@@ -10,7 +10,7 @@
<div class="ibox-content">
<div class="row row-lg">
<div class="col-sm-12">
- <input hidden id="language" value="${language}">
+
<div class="tabs-container">
<ul class="nav nav-tabs">
@if(language==1){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementOrder.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementOrder.html
index 6277a6a..27bfd25 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementOrder.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementOrder.html
@@ -10,7 +10,7 @@
<div class="ibox-content">
<div class="row row-lg">
<div class="col-sm-12">
- <input hidden id="language" value="${language}">
+
<div class="tabs-container">
<ul class="nav nav-tabs">
@if(language==1){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementRecharge.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementRecharge.html
index 75f6b7a..11150dd 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementRecharge.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementRecharge.html
@@ -10,7 +10,7 @@
<div class="ibox-content">
<div class="row row-lg">
<div class="col-sm-12">
- <input hidden id="language" value="${language}">
+
<div class="tabs-container">
<ul class="nav nav-tabs">
@if(language==1){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementSmallPieceLogistics.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementSmallPieceLogistics.html
index def1b13..7ab17fc 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementSmallPieceLogistics.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementSmallPieceLogistics.html
@@ -10,7 +10,7 @@
<div class="ibox-content">
<div class="row row-lg">
<div class="col-sm-12">
- <input hidden id="language" value="${language}">
+
<div class="tabs-container">
<ul class="nav nav-tabs">
@if(language==1){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html
index 0679181..16c7a41 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html
@@ -10,7 +10,7 @@
<div class="ibox-content">
<div class="row row-lg">
<div class="col-sm-12">
- <input hidden id="language" value="${language}">
+
<div class="tabs-container">
<ul class="nav nav-tabs">
@if(language==1){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar.html
index 5fac430..ae3d545 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar.html
@@ -1,7 +1,7 @@
@layout("/common/_container.html"){
<div class="row">
<div class="col-sm-12">
- <input hidden id="language" value="${language}">
+
<div class="ibox float-e-margins">
<div class="ibox-title">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
index 9f9e6a9..842a9b7 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
@@ -3,7 +3,7 @@
<div class="ibox-content">
<div class="form-horizontal" id="carInfoForm">
<input type="hidden" id="roleType" name="roleType" value="${roleType}">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-11">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
index 16f5070..cd9d62f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
@@ -3,7 +3,7 @@
<div class="ibox-content">
<div class="form-horizontal" id="carInfoForm">
<input type="hidden" id="id" name="id" value="${item.id}">
- <input hidden id="language" value="${language}">
+
<input type="hidden" id="roleType" name="roleType" value="${roleType}">
@if(language==1){
<div class="row">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand.html
index d11c818..bc29397 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>车辆品牌管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_add.html
index 1391055..e2f174c 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_add.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="carBrandInfoForm">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-11">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_edit.html
index 14643c5..38f4b51 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_edit.html
@@ -4,7 +4,7 @@
<div class="form-horizontal" id="carBrandInfoForm">
<input type="hidden" id="id" name="id" value="${item.id}">
<input type="hidden" id="s1_" name="id" value="${item.language}">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-11">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel.html
index 4d19a74..58ef896 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>车辆类型管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_add.html
index d9fd9e8..15a1ae1 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_add.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="carModelInfoForm">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-11">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_edit.html
index 9a8c81a..6c26745 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_edit.html
@@ -4,7 +4,7 @@
<div class="form-horizontal" id="carModelInfoForm">
<input type="hidden" id="id" name="id" value="${item.id}">
<input type="hidden" id="s1_" name="id" value="${item.language}">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-11">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage.html
index 6efb093..f255d70 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>聊天信息预设设置</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage_add.html
index 817a149..6531deb 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage_add.html
@@ -6,7 +6,7 @@
</style>
<div class="ibox float-e-margins" xmlns="http://www.w3.org/1999/html">
<div class="ibox-content">
- <input hidden id="language" value="${language}">
+
<div class="form-horizontal">
<br class="row">
<br class="col-sm-6">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage_edit.html
index 7301401..0833b22 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tChatSetPage/tbChatSetPage_edit.html
@@ -1,7 +1,7 @@
@layout("/common/_container.html"){
<div class="ibox float-e-margins">
<div class="ibox-content">
- <input hidden id="language" value="${language}">
+
<div class="form-horizontal">
<div hidden> <#input id="id" name="" value="${item.id}" underline="true"/>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_edit.html
index 16f5070..cd9d62f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_edit.html
@@ -3,7 +3,7 @@
<div class="ibox-content">
<div class="form-horizontal" id="carInfoForm">
<input type="hidden" id="id" name="id" value="${item.id}">
- <input hidden id="language" value="${language}">
+
<input type="hidden" id="roleType" name="roleType" value="${roleType}">
@if(language==1){
<div class="row">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html
index b382e99..f52ffc9 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>加盟商管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html
index f4ecda4..650a701 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="companyInfoForm">
- <input hidden id="language" value="${language}">
+
<input type="hidden" id="id" name="id" value="${item.id}">
<input type="hidden" id="userId" name="userId" value="${user.id}">
<input hidden id="tOpenCity" value='${tOpenCity}'>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html
index 7f62cd1..ce41be0 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>分公司管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompanyAudit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompanyAudit.html
index 7bcaf08..53c3770 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompanyAudit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompanyAudit.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>企业审核管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompanyAudit_immediately.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompanyAudit_immediately.html
index a801716..cf94cea 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompanyAudit_immediately.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompanyAudit_immediately.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="companyInfoForm">
- <input hidden id="language" value="${language}">
+
<input type="hidden" id="id" name="id" value="${item.id}">
<input type="hidden" id="userId" name="userId" value="${user.id}">
<input hidden id="tOpenCity" value='${tOpenCity}'>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
index a930f93..1d64349 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="companyInfoForm">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-6 b-r">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
index abc36c1..30e3d81 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="franchiseeInfoForm">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-10">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
index 2371a29..9211b0c 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="companyInfoForm">
- <input hidden id="language" value="${language}">
+
<input type="hidden" id="id" name="id" value="${item.id}">
<input type="hidden" id="userId" name="userId" value="${user.id}">
<input hidden id="tOpenCity" value='${tOpenCity}'>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
index d28b0f4..fa102fb 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
@@ -4,7 +4,7 @@
<div class="form-horizontal" id="companyInfoForm">
<input type="hidden" id="id" name="id" value="${item.id}">
<input type="hidden" id="userId" name="userId" value="${user.id}">
- <input hidden id="language" value="${language}">
+
<input hidden id="tOpenCity" value='${tOpenCity}'>
@if(language==1){
<div class="row">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
index 57c4102..1a10ac8 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="franchiseeInfoForm">
- <input hidden id="language" value="${language}">
+
<input type="hidden" id="id" name="id" value="${item.id}">
<input type="hidden" id="userId" name="userId" value="${user.id}">
<input hidden id="tOpenCity" value='${tOpenCity}'>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html
index 16f5070..cd9d62f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html
@@ -3,7 +3,7 @@
<div class="ibox-content">
<div class="form-horizontal" id="carInfoForm">
<input type="hidden" id="id" name="id" value="${item.id}">
- <input hidden id="language" value="${language}">
+
<input type="hidden" id="roleType" name="roleType" value="${roleType}">
@if(language==1){
<div class="row">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html
index 108413a..241074d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>投诉列表管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
index 1bc3fb3..c6b837e 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>司机审核列表管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriverVerify.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriverVerify.html
index cb4f606..3462e9c 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriverVerify.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriverVerify.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriverVerify_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriverVerify_edit.html
index 05f126a..9fc4dc3 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriverVerify_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriverVerify_edit.html
@@ -9,7 +9,7 @@
<div class="ibox-content">
<div class="form-horizontal" id="yesDriverInfoForm">
<input type="hidden" id="id" name="id" value="${item.id}">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="col-sm-4">
<label class="col-sm-3 control-label">司机姓名:</label>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
index bc0d2d3..72baec5 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -3,7 +3,7 @@
<div class="ibox-content">
<div class="form-horizontal" id="yesDriverInfoForm">
<input type="hidden" id="roleType" name="roleType" value="${roleType}">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-10">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html
index e345185..7f747dd 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html
@@ -3,7 +3,7 @@
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-content">
- <input hidden id="language" value="${language}">
+
<input type="hidden" id="tDriverId" name="tDriverId" value="${tDriverId}">
@if(language==1){
<div class="row row-lg">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
index 3a8f41b..9585585 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -4,7 +4,7 @@
<div class="form-horizontal" id="yesDriverInfoForm">
<input type="hidden" id="id" name="id" value="${item.id}">
<input type="hidden" id="roleType" name="roleType" value="${roleType}">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-11">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html
index 7e77e06..9b8f7bc 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html
@@ -3,7 +3,7 @@
<div class="ibox-content">
<div class="form-horizontal">
<input type="hidden" id="id" name="id" value="${item.id}">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-6 b-r">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html
index 37cc90a..51294c5 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html
@@ -3,7 +3,7 @@
<div class="ibox-content">
<div class="form-horizontal">
<input type="hidden" id="id" name="id" value="${item.id}">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-6 b-r">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
index 4806e3f..fbc757a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<input hidden id="money" value="${money}">
<div class="ibox-title">
@if(language==1){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule.html
index 4f45389..2c40e78 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule.html
@@ -17,7 +17,7 @@
<div class="row row-lg">
<div class="col-sm-12">
<div class="row">
- <input hidden id="language" value="${language}">
+
<div class="col-sm-3">
@if(language==1){
<#TimeCon id="createTime" name="添加时间" />
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRuleDetail.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRuleDetail.html
index b709f51..5b51f2e 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRuleDetail.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRuleDetail.html
@@ -17,7 +17,7 @@
@}
</div>
<div class="row col-sm-12" id="ensureIncomeRuleForm">
- <input hidden id="language" value="${language}">
+
<input hidden id="tEnsureIncomeRuleId" value="${tEnsureIncomeRuleId}">
<div class="col-sm-12">
<div class="col-sm-5">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule_add.html
index bde3971..4814da7 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule_add.html
@@ -38,7 +38,7 @@
@}
</div>
<div class="row col-sm-12" id="ensureIncomeRuleForm">
- <input hidden id="language" value="${language}">
+
<div class="col-sm-12">
<div class="col-sm-5">
@if(language==1){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule_immediately.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule_immediately.html
index d82f176..3829edf 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule_immediately.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tEnsureIncomeRule/tEnsureIncomeRule_immediately.html
@@ -3,7 +3,7 @@
<div class="ibox-content">
<div class="form-horizontal">
<input type="hidden" id="id" name="id" value="${id}">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-10">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback.html
index 780c966..335168f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>司机反馈管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tFeedback/userFeedback.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tFeedback/userFeedback.html
index d7ac87f..3842526 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tFeedback/userFeedback.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tFeedback/userFeedback.html
@@ -3,7 +3,7 @@
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<h5>用户反馈管理</h5>
@}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGuidePage/tbGuidePage.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGuidePage/tbGuidePage.html
index f97eb82..d737cf4 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGuidePage/tbGuidePage.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGuidePage/tbGuidePage.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>引导页设置</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGuidePage/tbGuidePage_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGuidePage/tbGuidePage_add.html
index c6ecf65..9cf8441 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGuidePage/tbGuidePage_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tGuidePage/tbGuidePage_add.html
@@ -6,7 +6,7 @@
</style>
<div class="ibox float-e-margins" xmlns="http://www.w3.org/1999/html">
<div class="ibox-content">
- <input hidden id="language" value="${language}">
+
<div class="form-horizontal" id="GuidePageForm">
<br class="row">
<br class="col-sm-6">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress.html
index 3db7a0d..d2df2ba 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>城市搜索地址设置</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress_add.html
index 689233b..63b5386 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress_add.html
@@ -11,7 +11,7 @@
<div class="ibox-content">
<div class="form-horizontal">
- <input hidden id="language" value="${language}">
+
<br class="row">
<br class="col-sm-6">
<div class="form-group">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress_edit.html
index 0ce88e9..1b30052 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHotAddress/tbHotAddress_edit.html
@@ -9,7 +9,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<input hidden id="id" value="${item.id}">
- <input hidden id="language" value="${language}">
+
<div class="form-horizontal">
<br class="row">
<br class="col-sm-6">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tMotorModel/tMotorModel.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tMotorModel/tMotorModel.html
index c754c77..d3e44cf 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tMotorModel/tMotorModel.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tMotorModel/tMotorModel.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>摩托车车型设置</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system.html
index 44dc767..238e937 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system.html
@@ -13,7 +13,7 @@
<h5>Manajemen Pengaturan Pengumuman Sistem</h5>
@}
</div>
- <input hidden id="language" value="${language}">
+
<div class="ibox-content">
<div class="row row-lg">
<div class="col-sm-12">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html
index 1eaabfb..9ff0a19 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="systemInfoForm">
- <input hidden id="language" value="${language}">
+
<div class="row">
<div class="col-sm-11">
<div class="form-group">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_update.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_update.html
index da8fda8..c741821 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_update.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/system_update.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="systemInfoForm">
- <input hidden id="language" value="${language}">
+
<input type="hidden" id="id" name="id" value="${item.id}">
<input type="hidden" id="s1_" name="id" value="${item.language}">
<div class="row">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html
index 914454d..3ac7277 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html
@@ -14,7 +14,7 @@
<h5>Manajemen Pengaturan Pesan Bergulir</h5>
@}
</div>
- <input hidden id="language" value="${language}">
+
<div class="ibox-content">
<div class="row row-lg">
<div class="col-sm-12">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_add.html
index 0b105ec..a60908d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_add.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="noticeInfoForm">
- <input hidden id="language" value="${language}">
+
<div class="row">
<div class="col-sm-11">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_edit.html
index 8cc7682..961bc8b 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_edit.html
@@ -4,7 +4,7 @@
<div class="form-horizontal" id="noticeInfoForm">
<input type="hidden" id="id" name="id" value="${item.id}">
<input type="hidden" id="s1_" name="id" value="${item.language}">
- <input hidden id="language" value="${language}">
+
<div class="row">
<div class="col-sm-11">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html
index f627795..2585ae7 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html
index 4d2b796..13f57bb 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="openCityForm">
- <input hidden id="language" value="${language}">
+
<div class="row">
<div class="col-sm-10">
@if(language==1){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html
index 8e57050..5edccea 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="openCityForm">
- <input hidden id="language" value="${language}">
+
<input type="hidden" id="id" name="id" value="${item.id}">
<input type="hidden" id="content" name="content" value='${item.content}'>
<div class="row">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_immediately.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_immediately.html
index 89a308d..12440e9 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_immediately.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_immediately.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="openCityForm">
- <input hidden id="language" value="${language}">
+
<input type="hidden" id="id" name="id" value="${item.id}">
<input type="hidden" id="content" name="content" value='${item.content}'>
<div class="row">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_immediately_back.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_immediately_back.html
index a87bf2b..190a680 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_immediately_back.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_immediately_back.html
@@ -3,7 +3,7 @@
<div class="ibox-content">
<div class="form-horizontal">
<input type="hidden" id="id" name="id" value="${id}">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-10">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html
index e4ab988..7d39c4b 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>评价列表管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html
index cb3833a..5e1531d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>同城快送订单管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html
index 001fb2f..09f2083 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html
@@ -3,7 +3,7 @@
<div class="ibox-content">
<div class="form-horizontal">
<div class="row" style="margin-top: 30px;">
- <input hidden id="language" value="${language}">
+
<div class="col-sm-4">
@if(language==1){
<h2 class="h3Class" style="font-weight: 700;">订单详情</h2>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html
index f65dc2c..4bb77ab 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>摩托车订单管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
index 9b192f5..889130f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
@@ -16,7 +16,7 @@
</style>
<div class="ibox float-e-margins">
<div class="ibox-content">
- <input hidden id="language" value="${language}">
+
<div class="form-horizontal">
<input type="hidden" id="id" name="id" value="${item.id}">
<div class="row" style="margin-top: 30px;">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tProblem/tProblem.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tProblem/tProblem.html
index da39651..2ca059a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tProblem/tProblem.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tProblem/tProblem.html
@@ -3,7 +3,7 @@
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<h5>用户留言管理</h5>
@}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html
index 11f4b36..f61e872 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html
@@ -15,7 +15,7 @@
</div>
<div class="ibox-content">
<div class="row row-lg">
- <input hidden id="language" value="${language}">
+
<div class="col-sm-12">
<div class="row">
<div class="col-sm-3">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStartPage/tbStartPage.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStartPage/tbStartPage.html
index ec3ca3f..7005824 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStartPage/tbStartPage.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStartPage/tbStartPage.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>启动页管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStartPage/tbStartPage_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStartPage/tbStartPage_add.html
index 4fdb20f..1358eb8 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStartPage/tbStartPage_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStartPage/tbStartPage_add.html
@@ -5,7 +5,7 @@
}
</style>
<div class="ibox float-e-margins" xmlns="http://www.w3.org/1999/html">
- <input hidden id="language" value="${language}">
+
<div class="ibox-content">
<div class="form-horizontal">
<br class="row">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
index e8266a1..042f144 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
@@ -7,7 +7,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-11">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords.html
index 5ff9819..b1ec4cb 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>敏感词管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html
index 9b3d3ca..a2bfe72 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html
@@ -24,7 +24,7 @@
</style>
<div class="ibox float-e-margins">
<div class="ibox-content">
- <input hidden id="language" value="${language}">
+
<div class="form-horizontal" >
<div class="row">
<div class="col-sm-11">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/small_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/small_edit.html
index a109b40..449402d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/small_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/small_edit.html
@@ -11,7 +11,7 @@
</style>
<div class="ibox float-e-margins">
<div class="ibox-content">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="form-horizontal">
<input hidden id="code" value="${code}">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html
index 22bb05e..a968743 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html
@@ -1,7 +1,7 @@
@layout("/common/_container.html"){
<div class="row">
<div class="col-sm-12">
- <input hidden id="language" value="${language}">
+
<div class="ibox float-e-margins">
<div class="ibox-title">
@if(language==1){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPriceCheck.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPriceCheck.html
index ea09753..bb7b190 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPriceCheck.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPriceCheck.html
@@ -1,7 +1,7 @@
@layout("/common/_container.html"){
<div class="row">
<div class="col-sm-12">
- <input hidden id="language" value="${language}">
+
<div class="ibox float-e-margins">
<div class="ibox-title">
@if(language==1){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPriceService_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPriceService_edit.html
index efcd3bf..60c7571 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPriceService_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPriceService_edit.html
@@ -6,7 +6,7 @@
</style>
<div class="ibox float-e-margins">
<div class="ibox-content">
- <input hidden id="language" value="${language}">
+
<div class="form-horizontal" id="specialPriceInfoForm">
<input hidden id="code" value="${code}">
<div class="row">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html
index 74d7a16..1920d3d 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html
@@ -20,7 +20,7 @@
}
</style>
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-content">
@if(language==1){
<div class="form-horizontal" id="specialPriceInfoForm">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html
index e8755da..e35760e 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html
@@ -20,7 +20,7 @@
</style>
<div class="ibox float-e-margins">
<div class="ibox-content">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="form-horizontal" id="specialPriceInfoForm">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUser/tUser.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUser/tUser.html
index 0c00d80..78ab9ef 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUser/tUser.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUser/tUser.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>用户管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserExit/tbUserExit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserExit/tbUserExit.html
index f9fe073..3c9db77 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserExit/tbUserExit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserExit/tbUserExit.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>账号注销管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/immediately.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/immediately.html
index 2df7dbe..bffdb75 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/immediately.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/immediately.html
@@ -3,7 +3,7 @@
<div class="ibox-content">
<div class="form-horizontal" id="sysCouponActivityInfoForm">
<input type="hidden" id="id" name="id" value="${id}">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-10">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon.html
index 73f9590..a0bdf1f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>大额优惠券活动管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_add.html
index d84a9bb..bae850b 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_add.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="userlagerForm">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="row">
<div class="col-sm-11">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_all.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_all.html
index e754053..ff58250 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_all.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_all.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="carModelInfoForm">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<label style="font-size: 22px">参与统计</label>
<div class="row">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_edit.html
index 6746ce1..7e4c5e2 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserLargeCoupon/tUserLargeCoupon_edit.html
@@ -2,7 +2,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="carModelInfoForm">
- <input hidden id="language" value="${language}">
+
<input hidden id="type_" value="${item.type}">
@if(language==1){
<div class="row">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord.html
index 6d8ffe6..aa88119 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord.html
@@ -1,7 +1,7 @@
@layout("/common/_container.html"){
<div class="row">
<div class="col-sm-12">
- <input hidden id="language" value="${language}">
+
<div class="ibox float-e-margins">
<div class="ibox-title">
@if(language==1){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement.html
index f8c5da7..baf8c83 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement.html
@@ -14,7 +14,7 @@
<h5>Manajemen Versi</h5>
@}
</div>
- <input hidden id="language" value="${language}">
+
<input style="position: fixed;left: -50000%;top: 0;" id="input" name="input">
<div class="ibox-content">
<div class="row row-lg">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tVoice/tbVoice.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tVoice/tbVoice.html
index 8266104..d2991d2 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tVoice/tbVoice.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tVoice/tbVoice.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>语音播报管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tWithout/tWithout.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tWithout/tWithout.html
index 996e49c..4b533f8 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tWithout/tWithout.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tWithout/tWithout.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>代扣款金额明细</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tbBanner/tbBanner.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tbBanner/tbBanner.html
index caf764e..1fb1654 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tbBanner/tbBanner.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tbBanner/tbBanner.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<div class="ibox-title">
@if(language==1){
<h5>icon管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tbBanner/tbBanner_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tbBanner/tbBanner_add.html
index 1a42f9c..7966420 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tbBanner/tbBanner_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tbBanner/tbBanner_add.html
@@ -4,7 +4,7 @@
<div class="ibox float-e-margins" xmlns="http://www.w3.org/1999/html">
<div class="ibox-content">
<div class="form-horizontal">
- <input hidden id="language" value="${language}">
+
<br class="row">
<br class="col-sm-6">
<div class="form-group">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html
index afde83b..53eee27 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user.html
@@ -1,9 +1,8 @@
@layout("/common/_container.html"){
+<link rel="stylesheet" href="${ctxPath}/static/js/layui/css/layui.css" media="all">
<div class="row">
<div class="col-sm-12">
- <input hidden id="language" value="${language}">
<div class="ibox float-e-margins">
- @if(language==1){
<div class="ibox-title">
<h5>用户管理</h5>
</div>
@@ -11,209 +10,63 @@
<div class="row row-lg">
<div class="col-sm-12">
<div class="row">
- <div class="col-lg-2 col-sm-3">
- <div class="panel panel-default">
- <div class="panel-heading">组织机构</div>
- <div class="panel-body dept-tree">
- <ul id="deptTree" class="ztree"></ul>
- </div>
- </div>
- </div>
<div class="col-lg-10 col-sm-9">
<div class="row">
- <div class="col-lg-10 col-sm-9">
- <div class="row">
- <div class="col-lg-4 col-sm-6">
- <#TimeCon id="createTime" name="创建时间" isTime="false"/>
- </div>
- <div class="col-lg-4 col-sm-12">
- <#NameCon id="name" name="用户名称" placeholder="帐号/姓名/手机号"/>
- </div>
- </div>
- </div>
- <div class="col-lg-2 col-sm-3">
- <div class="row">
- <div class="col-lg-12 col-sm-12">
- <#button name="搜索" icon="fa-search" clickFun="MgrUser.search()"/>
- <#button name="重置" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
- </div>
- </div>
+ <div class="col-lg-4 col-sm-12">
+ <#NameCon id="name" name="搜索" placeholder="帐号/姓名/手机号"/>
</div>
</div>
- <div class="hidden-xs" id="managerTableToolbar" role="group">
- @if(shiro.hasPermission("/mgr/add")){
- <#button name="添加" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
- @}
- @if(shiro.hasPermission("/mgr/edit")){
- <#button name="修改" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/delete")){
- <#button name="删除" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/reset")){
- <#button name="重置密码" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/freeze")){
- <#button name="冻结" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/unfreeze")){
- <#button name="解除冻结" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/setRole")){
- <#button name="角色分配" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
- @}
+ </div>
+ <div class="col-lg-2 col-sm-3">
+ <div class="row">
+ <div class="col-lg-12 col-sm-12">
+ <#button name="搜索" icon="fa-search" clickFun="MgrUser.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
+ </div>
</div>
- <#table id="managerTable"/>
</div>
</div>
+ <div class="hidden-xs" id="managerTableToolbar" role="group">
+ @if(shiro.hasPermission("/mgr/add")){
+ <#button name="添加" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
+ @}
+ @if(shiro.hasPermission("/mgr/edit")){
+ <#button name="修改" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/reset")){
+ <#button name="重置密码" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/freeze")){
+ <#button name="冻结" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/unfreeze")){
+ <#button name="解冻" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/setRole")){
+ <#button name="角色分配" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/kanbanPermissions")){
+ <#button name="看板权限设置" icon="fa-user-secret" clickFun="MgrUser.kanbanPermissions()" space="true"/>
+ @}
+ </div>
+ <#table id="managerTable"/>
</div>
</div>
</div>
- @}
- @if(language==2){
- <div class="ibox-title">
- <h5>User management</h5>
- </div>
- <div class="ibox-content">
- <div class="row row-lg">
- <div class="col-sm-12">
- <div class="row">
- <div class="col-lg-2 col-sm-3">
- <div class="panel panel-default">
- <div class="panel-heading">Institutional framework</div>
- <div class="panel-body dept-tree">
- <ul id="deptTree" class="ztree"></ul>
- </div>
- </div>
- </div>
- <div class="col-lg-10 col-sm-9">
- <div class="row">
- <div class="col-lg-10 col-sm-9">
- <div class="row">
- <div class="col-lg-4 col-sm-6">
- <#TimeCon id="createTime" name="Creation time" isTime="false"/>
- </div>
- <div class="col-lg-4 col-sm-12">
- <#NameCon id="name" name="Name of user" placeholder="Account/name/mobile number"/>
- </div>
- </div>
- </div>
- <div class="col-lg-2 col-sm-3">
- <div class="row">
- <div class="col-lg-12 col-sm-12">
- <#button name="Search" icon="fa-search" clickFun="MgrUser.search()"/>
- <#button name="Reset" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
- </div>
- </div>
- </div>
- </div>
- <div class="hidden-xs" id="managerTableToolbar" role="group">
- @if(shiro.hasPermission("/mgr/add")){
- <#button name="Add" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
- @}
- @if(shiro.hasPermission("/mgr/edit")){
- <#button name="Update" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/delete")){
- <#button name="Delete" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/reset")){
- <#button name="Reset password" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/freeze")){
- <#button name="Freeze" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/unfreeze")){
- <#button name="Unfreeze" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/setRole")){
- <#button name="Role assignment" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
- @}
- </div>
- <#table id="managerTable"/>
- </div>
- </div>
- </div>
- </div>
- </div>
- @}
- @if(language==3){
- <div class="ibox-title">
- <h5>Manajemen pengguna</h5>
- </div>
- <div class="ibox-content">
- <div class="row row-lg">
- <div class="col-sm-12">
- <div class="row">
- <div class="col-lg-2 col-sm-3">
- <div class="panel panel-default">
- <div class="panel-heading">Organisasi</div>
- <div class="panel-body dept-tree">
- <ul id="deptTree" class="ztree"></ul>
- </div>
- </div>
- </div>
- <div class="col-lg-10 col-sm-9">
- <div class="row">
- <div class="col-lg-10 col-sm-9">
- <div class="row">
- <div class="col-lg-4 col-sm-6">
- <#TimeCon id="createTime" name="Waktu penciptaan" isTime="false"/>
- </div>
- <div class="col-lg-4 col-sm-12">
- <#NameCon id="name" name="Nama pengguna" placeholder="Akaun/nama/nomor ponsel"/>
- </div>
- </div>
- </div>
- <div class="col-lg-2 col-sm-3">
- <div class="row">
- <div class="col-lg-12 col-sm-12">
- <#button name="Pencarian" icon="fa-search" clickFun="MgrUser.search()"/>
- <#button name="Mengatur ulang" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
- </div>
- </div>
- </div>
- </div>
- <div class="hidden-xs" id="managerTableToolbar" role="group">
- @if(shiro.hasPermission("/mgr/add")){
- <#button name="Tambah" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
- @}
- @if(shiro.hasPermission("/mgr/edit")){
- <#button name="Edit" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/delete")){
- <#button name="Hapus" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/reset")){
- <#button name="Setel ulang kata sandi" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/freeze")){
- <#button name="Membekukan" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/unfreeze")){
- <#button name="Batalkan pembekuan Akun" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
- @}
- @if(shiro.hasPermission("/mgr/setRole")){
- <#button name="Penugasan peran" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
- @}
- </div>
- <#table id="managerTable"/>
- </div>
- </div>
- </div>
- </div>
- </div>
- @}
-
</div>
</div>
</div>
-<script src="${ctxPath}/modular/system/user/user.js"></script>
-<script type="text/javascript">
- laydate.render({
- elem: '#createTime'
- ,range: true
- ,lang:"en"
- });
+<script src="${ctxPath}/static/modular/system/user/user.js"></script>
+<script src="${ctxPath}/static/js/layui/layui.js" charset="utf-8"></script>
+<script>
+ laydate.render({
+ elem: '#beginTime'
+ });
+ laydate.render({
+ elem: '#endTime'
+ });
</script>
@}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html
index 494e054..b0ff5b8 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_add.html
@@ -2,155 +2,65 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="userInfoForm">
- <input hidden id="language" value="${language}">
<input type="hidden" id="id" value="">
- @if(language==1){
<div class="row">
<div class="col-sm-6 b-r">
<#input id="account" name="账户" underline="true"/>
-
- <#select id="sex" name="性别：" underline="true">
+ <#select id="sex" name="性别" underline="true">
<option value="1">男</option>
<option value="2">女</option>
</#select>
-
<#input id="password" name="密码" underline="true" type="password"/>
- <#input id="rePassword" name="确认密码" type="password"/>
-
- <#input id="email" name="邮箱" type="email"/>
- <!--<#input id="roleid" name="角色" underline="true" type="hidden" disabled="disabled"/>-->
- </div>
- <div class="col-sm-6">
- <div id="driverInfoContent">
- <#input id="name" name="姓名" underline="true"/>
-
- <#input id="birthday" name="出生日期" underline="true" type="text"/>
-
- <#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid"
- clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
- style="background-color: #ffffff !important;"/>
-
- <#input id="phone" name="电话"/>
-
-
+ <!-- <#input id="roleid" name="角色" underline="true" disabled="disabled"/>-->
+ <#input id="email" name="邮箱" type="email" underline="true"/>
+ <div class="form-group" ${companyId!=1? "hidden" :" "} >
+ <label class="col-sm-3 control-label">所属公司</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="companyId" name="companyId">
+ @if(companyIds!=null){
+ @for(item in companyIds){
+ @if(companyId!=1&&item.id==companyId){
+ <option value="${item.id}">${item.name}</option>
+ @}else if(companyId==1){
+ <option value="${item.id}">${item.name}</option>
+ @}
+ @}
+ @}
+ </select>
</div>
</div>
- </div>
-
- <!-- 这是部门选择的下拉框 -->
- <div id="menuContent" class="menuContent"
- style="display: none; position: absolute; z-index: 200;">
- <ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
- </div>
-
- <div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-4">
- <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.addSubmit()"/>
- <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
- </div>
- </div>
- @}
- @if(language==2){
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="account" name="Account" underline="true"/>
-
- <#select id="sex" name="Gender：" underline="true">
- <option value="1">Man</option>
- <option value="2">Woman</option>
- </#select>
-
- <#input id="password" name="Password" underline="true" type="password"/>
- <#input id="rePassword" name="Confirm the password" type="password"/>
-
- <#input id="email" name="Email" type="email"/>
- <!--<#input id="roleid" name="角色" underline="true" type="hidden" disabled="disabled"/>-->
- </div>
- <div class="col-sm-6">
- <div id="driverInfoContent">
- <#input id="name" name="Name" underline="true"/>
-
- <#input id="birthday" name="Date of birth" underline="true" type="text"/>
-
- <#input id="citySel" name="Department " underline="true" readonly="readonly" hidden="deptid"
- clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
- style="background-color: #ffffff !important;"/>
-
- <#input id="phone" name="Telephone"/>
-
-
- </div>
- </div>
- </div>
-
- <!-- 这是部门选择的下拉框 -->
- <div id="menuContent" class="menuContent"
- style="display: none; position: absolute; z-index: 200;">
- <ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
- </div>
-
- <div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-4">
- <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="UserInfoDlg.addSubmit()"/>
- <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
- </div>
- </div>
- @}
- @if(language==3){
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="account" name="Akun" underline="true"/>
- <#select id="sex" name="Jenis kelamin：" underline="true">
- <option value="1">laki-laki</option>
- <option value="2">wanita</option>
- </#select>
-
- <#input id="password" name="Kata sandi" underline="true" type="password"/>
- <#input id="rePassword" name="Konfirmasikan kata sandi" type="password"/>
-
- <#input id="email" name="Email" type="email"/>
- <!--<#input id="roleid" name="角色" underline="true" type="hidden" disabled="disabled"/>-->
+ <div class="hr-line-dashed" ${companyId!=1? "hidden" :" "} ></div>
</div>
<div class="col-sm-6">
<div id="driverInfoContent">
- <#input id="name" name="Nama Lengkap" underline="true"/>
-
- <#input id="birthday" name="Tanggal lahir" underline="true" type="text"/>
-
- <#input id="citySel" name="Departemen" underline="true" readonly="readonly" hidden="deptid"
+ <#input id="name" name="姓名" underline="true"/>
+ <#input id="birthday" name="出生日期" underline="true" type="text"/>
+ <#input id="rePassword" name="确认密码" type="password" underline="true"/>
+ <#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid"
clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
style="background-color: #ffffff !important;"/>
-
- <#input id="phone" name="Telepon"/>
-
-
+ <#input id="phone" name="电话" underline="true"/>
</div>
</div>
</div>
-
<!-- 这是部门选择的下拉框 -->
<div id="menuContent" class="menuContent"
style="display: none; position: absolute; z-index: 200;">
<ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
</div>
-
<div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-4">
- <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="UserInfoDlg.addSubmit()"/>
- <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
</div>
</div>
- @}
-
-
- </div>
-
- </div>
</div>
-<script src="${ctxPath}/modular/system/user/user_info.js"></script>
+</div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
<script>
- laydate.render({
- elem: '#birthday'
- });
+ laydate.render({
+ elem: '#birthday'
+ });
</script>
@}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html
index 0b5c5f9..a376cc2 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html
@@ -18,7 +18,7 @@
</div>
</div>
<div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
+ <div class="col-sm-10">
<#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.chPwd()"/>
</div>
</div>
@@ -30,5 +30,5 @@
</div>
</div>
</div>
-<script src="${ctxPath}/modular/system/user/user_info.js"></script>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
@}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html
index 2995f5c..6f68f95 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html
@@ -2,122 +2,49 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal" id="userInfoForm">
- <input hidden id="language" value="${language}">
- @if(language==1){
+
<input type="hidden" id="id" value="${user.id}">
<input type="hidden" id="sexValue" value="${user.sex}">
<div class="row">
<div class="col-sm-6 b-r">
<#input id="account" name="账户" underline="true" value="${user.account}"/>
-
- <#select id="sex" name="性别：" underline="true">
+ <#select id="sex" name="性别" underline="true">
<option value="1">男</option>
<option value="2">女</option>
</#select>
-
- <#input id="citySel" name="部门" underline="false" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}" clickFun="UserInfoDlg.showDeptSelectTree(); return false;" style="background-color: #ffffff !important;"/>
-
- <!--<#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>-->
- <#input id="email" name="邮箱" type="email" value="${user.email}"/>
- </div>
- <div class="col-sm-6">
- <div id="driverInfoContent">
- <#input id="name" name="姓名" underline="true" value="${user.name}"/>
-
- <#input id="birthday" name="出生日期" underline="true" type="text"
- value="${user.birthday}"/>
-
- <#input id="phone" name="电话" value="${user.phone}"/>
-
+ <#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>
+ <#input id="email" name="邮箱" type="email" underline="true" value="${user.email}"/>
+ <div class="form-group" ${userCompanyId!=1? "hidden" :" "} >
+ <label class="col-sm-3 control-label">所属公司</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="companyId" name="companyId">
+ @if(companyIds!=null && companyId!=null){
+ @for(item in companyIds){
+ @if(item.id==companyId){
+ <option value="${item.id}">${item.name}</option>
+ @}
+ @}
+ @for(item in companyIds){
+ @if(item.id!=companyId){
+ <option value="${item.id}">${item.name}</option>
+ @}
+ @}
+ @}
+ </select>
</div>
</div>
- </div>
-
- <!-- 这是部门选择的下拉框 -->
- <div id="menuContent" class="menuContent"
- style="display: none; position: absolute; z-index: 200;">
- <ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
- </div>
-
- <div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-4">
- <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
- </div>
- </div>
- @}
- @if(language==2){
- <input type="hidden" id="id" value="${user.id}">
- <input type="hidden" id="sexValue" value="${user.sex}">
-
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="account" name="Account" underline="true" value="${user.account}"/>
-
- <#select id="sex" name="Gender：" underline="true">
- <option value="1">Man</option>
- <option value="2">Woman</option>
- </#select>
-
- <#input id="citySel" name="Department " underline="false" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}" clickFun="UserInfoDlg.showDeptSelectTree(); return false;" style="background-color: #ffffff !important;"/>
-
- <!--<#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>-->
- <#input id="email" name="Email" type="email" value="${user.email}"/>
- </div>
- <div class="col-sm-6">
- <div id="driverInfoContent">
- <#input id="name" name="Name" underline="true" value="${user.name}"/>
-
- <#input id="birthday" name="Date of birth" underline="true" type="text"
- value="${user.birthday}"/>
-
- <#input id="phone" name="Telephone" value="${user.phone}"/>
-
- </div>
- </div>
- </div>
-
- <!-- 这是部门选择的下拉框 -->
- <div id="menuContent" class="menuContent"
- style="display: none; position: absolute; z-index: 200;">
- <ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
- </div>
-
- <div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-4">
- <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
- </div>
- </div>
- @}
- @if(language==3){
- <input type="hidden" id="id" value="${user.id}">
- <input type="hidden" id="sexValue" value="${user.sex}">
-
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="account" name="Akun" underline="true" value="${user.account}"/>
-
- <#select id="sex" name="Jenis kelamin：" underline="true">
- <option value="1">laki-laki</option>
- <option value="2">wanita</option>
- </#select>
-
- <#input id="citySel" name="Departemen" underline="false" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}" clickFun="UserInfoDlg.showDeptSelectTree(); return false;" style="background-color: #ffffff !important;"/>
-
- <!--<#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>-->
- <#input id="email" name="Email" type="email" value="${user.email}"/>
+ <div class="hr-line-dashed" ${companyId!=1? "hidden" :" "} ></div>
</div>
<div class="col-sm-6">
<div id="driverInfoContent">
- <#input id="name" name="Nama" underline="true" value="${user.name}"/>
-
- <#input id="birthday" name="Tanggal lahir" underline="true" type="text"
+ <#input id="name" name="姓名" underline="true" value="${user.name}"/>
+ <#input id="birthday" name="出生日期" underline="true" type="text"
value="${user.birthday}"/>
-
- <#input id="phone" name="Telepon" value="${user.phone}"/>
-
+ <#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}"
+ clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
+ style="background-color: #ffffff !important;"/>
+ <#input id="phone" name="电话" underline="true" value="${user.phone}"/>
</div>
</div>
</div>
@@ -129,23 +56,19 @@
</div>
<div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-4">
- <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="Kirim" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
</div>
</div>
- @}
-
-
- </div>
-
- </div>
</div>
-<script src="${ctxPath}/modular/system/user/user_info.js"></script>
+
+</div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
<script>
- laydate.render({
- elem: '#birthday'
- ,lang:"en"
- });
+ laydate.render({
+ elem: '#birthday'
+ });
</script>
@}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_view.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_view.html
index abb28ea..df6193c 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_view.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_view.html
@@ -21,42 +21,41 @@
<#input id="account" name="账户" underline="true" value="${user.account}" disabled="disabled" />
<#select id="sex" name="性别" underline="true" value="${user.sex}">
- <option value="1">男</option>
- <option value="2">女</option>
- </#select>
+ <option value="1">男</option>
+ <option value="2">女</option>
+ </#select>
- <#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>
+ <#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>
- <#input id="email" name="邮箱" type="email" value="${user.email}"/>
- </div>
-
- <div class="col-sm-6">
- <div id="driverInfoContent">
- <#input id="name" name="姓名" underline="true" value="${user.name}"/>
-
- <#input id="birthday" name="出生日期" underline="true" type="text"
- value="${user.birthday}"/>
-
- <#input id="citySel" name="部门" underline="true" readonly="readonly" value="${deptName}"
- hidden="deptid" hiddenValue="${user.deptid}"
- clickFun="UserInfoDlg.showInfoDeptSelectTree(); return false;"
- style="background-color: #ffffff !important;"
- selectFlag="true" selectId="menuContent" selectTreeId="treeDemo" selectStyle="width:250px !important;"/>
-
- <#input id="phone" name="电话" value="${user.phone}"/>
- </div>
- </div>
+ <#input id="email" name="邮箱" type="email" value="${user.email}"/>
</div>
- <div class="progress progress-striped" id="progressTipArea" style="margin-top: 20px;">
- <div id="progressBar" style="width: 0%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="0" role="progressbar" class="progress-bar progress-bar-info">
+ <div class="col-sm-6">
+ <div id="driverInfoContent">
+ <#input id="name" name="姓名" underline="true" value="${user.name}"/>
+
+ <#input id="birthday" name="出生日期" underline="true" type="text"
+ value="${user.birthday}"/>
+
+ <#input id="citySel" name="部门" underline="true" readonly="readonly" value="${deptName}"
+ hidden="deptid" hiddenValue="${user.deptid}"
+ clickFun="UserInfoDlg.showInfoDeptSelectTree(); return false;"
+ style="background-color: #ffffff !important;"
+ selectFlag="true" selectId="menuContent" selectTreeId="treeDemo" selectStyle="width:250px !important;"/>
+
+ <#input id="phone" name="电话" value="${user.phone}"/>
</div>
</div>
+ </div>
- <div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
- <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
- </div>
+ <div class="progress progress-striped" id="progressTipArea" style="margin-top: 20px;">
+ <div id="progressBar" style="width: 0%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="0" role="progressbar" class="progress-bar progress-bar-info">
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
</div>
</div>
</div>
@@ -66,11 +65,11 @@
</div>
</div>
</div>
-<script src="${ctxPath}/modular/system/user/user_info.js"></script>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
<script>
laydate.render({
elem: '#birthday'
- ,lang:"en"
});
</script>
@}
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html
index 14a4b06..aa2acd3 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html
@@ -83,7 +83,7 @@
@if(language==1){
<div class="row" style="margin-left: 2%;">
- <input hidden id="language" value="${language}">
+
<div class="col-sm-3">
<input id="activityId" value="${activityId}" type="hidden">
<div class="ibox float-e-margins">
@@ -157,7 +157,7 @@
@}
@if(language==2){
<div class="row" style="margin-left: 2%;">
- <input hidden id="language" value="${language}">
+
<div class="col-sm-3">
<input id="activityId" value="${activityId}" type="hidden">
<div class="ibox float-e-margins">
@@ -231,7 +231,7 @@
@}
@if(language==3){
<div class="row" style="margin-left: 2%;">
- <input hidden id="language" value="${language}">
+
<div class="col-sm-3">
<input id="activityId" value="${activityId}" type="hidden">
<div class="ibox float-e-margins">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord.html
index 9b8d186..2ae9570 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="ibox-title">
<h5>优惠券管理</h5>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord1.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord1.html
index 57c3c89..4213586 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord1.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord1.html
@@ -1,7 +1,7 @@
@layout("/common/_container.html"){
<div class="row">
<div class="col-sm-12">
- <input hidden id="language" value="${language}">
+
@if(language==1){
<div class="ibox float-e-margins">
<div class="ibox-title">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html
index 4cfbffa..fba9272 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html
@@ -2,7 +2,7 @@
<div class="row">
<div class="col-sm-12">
<div class="ibox float-e-margins">
- <input hidden id="language" value="${language}">
+
<input hidden id="id" value="${id}">
<div class="ibox-title">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html
index 486a53c..0daab1f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html
@@ -19,7 +19,7 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal">
- <input hidden id="language" value="${language}">
+
<div class="row">
<div class="col-sm-10">
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail1.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail1.html
index 02d9ed1..ebcbcae 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail1.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail1.html
@@ -21,7 +21,7 @@
<div class="form-horizontal">
<div class="row">
<input type="hidden" id="id" id="${item.id}">
- <input hidden id="language" value="${language}">
+
<div class="col-sm-10">
@if(language==1){
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/userCouponRecord/userCouponRecord.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/userCouponRecord/userCouponRecord.html
index 7fe6aa7..f414954 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/userCouponRecord/userCouponRecord.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/userCouponRecord/userCouponRecord.html
@@ -1,7 +1,7 @@
@layout("/common/_container.html"){
<div class="row">
<div class="col-sm-12">
- <input hidden id="language" value="${language}">
+
<div class="ibox float-e-margins">
<div class="ibox-title">
@if(language==1){
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/dept/dept.js b/cloud-server-management/src/main/webapp/static/modular/system/dept/dept.js
index b758fb1..ce863cd 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/dept/dept.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/dept/dept.js
@@ -7,7 +7,7 @@
table: null,
layerIndex: -1
};
-var language =$("#language").val()
+
/**
* 初始化表格的列
*/
@@ -15,10 +15,10 @@
return [
{field: 'selectItem', radio: true},
{title: 'id', field: 'id', align: 'center', valign: 'middle',width:'50px'},
- {title: language==1?'部门简称':(language==2?'Abbreviation of department':'Persingkatan departemen'), field: 'simplename', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'部门全称':(language==2?'Full Name of Department':'Nama Penuh Departemen'), field: 'fullname', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'排序':(language==2?'Sort':'Urutkan'), field: 'num', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'备注':(language==2?'Remarks':'Catatan'), field: 'tips', align: 'center', valign: 'middle', sortable: true}];
+ {title: '部门简称', field: 'simplename', align: 'center', valign: 'middle', sortable: true},
+ {title: '部门全称', field: 'fullname', align: 'center', valign: 'middle', sortable: true},
+ {title: '排序', field: 'num', align: 'center', valign: 'middle', sortable: true},
+ {title: '备注', field: 'tips', align: 'center', valign: 'middle', sortable: true}];
};
/**
@@ -27,14 +27,7 @@
Dept.check = function () {
var selected = $('#' + this.id).bootstrapTreeTable('getSelections');
if(selected.length == 0){
- if(language==1){
- Feng.info("请先选中表格中的某一记录！");
- }else if(language==2){
- Feng.info("Please select a record in the table first！");
- }else {
- Feng.info("Pilih catatan di tabel terlebih dahulu！");
- }
-
+ Feng.info("请先选中表格中的某一记录！");
return false;
}else{
Dept.seItem = selected[0];
@@ -48,7 +41,7 @@
Dept.openAddDept = function () {
var index = layer.open({
type: 2,
- title: language==1?'添加':(language==2?'Add':'Tambahkan'),
+ title: '添加部门',
area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
@@ -64,7 +57,7 @@
if (this.check()) {
var index = layer.open({
type: 2,
- title: language==1?'详情':(language==2?'details':'details'),
+ title: '部门详情',
area: ['800px', '420px'], //宽高
fix: false, //不固定
maxmin: true,
@@ -82,35 +75,16 @@
var operation = function(){
var ajax = new $ax(Feng.ctxPath + "/dept/delete", function () {
- if(language==1){
- Feng.success("删除成功!");
- }else if(language==2){
- Feng.success("Delete succeeded!");
- }else {
- Feng.success("Hapus berhasil!");
- }
+ Feng.success("删除成功!");
Dept.table.refresh();
}, function (data) {
- if(language==1){
- Feng.error("删除失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Delete failed!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
- }
+ Feng.error("删除失败!" + data.responseJSON.message + "!");
});
ajax.set("deptId",Dept.seItem.id);
ajax.start();
};
- if(language==1){
- Feng.confirm("是否刪除该部门?", operation);
- }else if(language==2){
- Feng.confirm("Whether to delete the department?", operation);
- }else {
- Feng.confirm("Apakah untuk menghapus departemen?", operation);
- }
-
+ Feng.confirm("是否刪除该部门?", operation);
}
};
@@ -123,6 +97,12 @@
Dept.table.refresh({query: queryData});
};
+Dept.resetSearch = function(){
+ $("#condition").val('');
+ Dept.search();
+}
+
+
$(function () {
var defaultColunms = Dept.initColumn();
var table = new BSTreeTable(Dept.id, "/dept/list", defaultColunms);
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/dept/dept_info.js b/cloud-server-management/src/main/webapp/static/modular/system/dept/dept_info.js
index 921ed23..b5554fe 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/dept/dept_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/dept/dept_info.js
@@ -1,7 +1,6 @@
/**
* 初始化部门详情对话框
*/
-var language =$("#language").val()
var DeptInfoDlg = {
deptInfoData : {},
zTreeInstance : null,
@@ -9,24 +8,24 @@
simplename: {
validators: {
notEmpty: {
- message: language==1?'部门名称不能为空':(language==2?'The department name cannot be empty':'Nama departemen tidak dapat kosong')
+ message: '部门名称不能为空'
}
}
},
fullname: {
validators: {
notEmpty: {
- message:language==1?'部门全称不能为空':(language==2?'The full name of the department cannot be empty':'Nama penuh departemen tidak dapat kosong')
+ message: '部门全称不能为空'
}
}
},
- /*pName: {
+ pName: {
validators: {
notEmpty: {
message: '上级名称不能为空'
}
}
- }*/
+ }
}
};
@@ -129,38 +128,14 @@
if (!this.validate()) {
return;
}
- var pName = $("#pName").val();
- if ("" == pName){
- if(language==1){
- Feng.info("上级部门不能为空");
- }else if(language==2){
- Feng.info("The upper department cannot be empty");
- }else {
- Feng.info("Departemen atas tidak bisa kosong");
- }
-
- return;
- }
//提交信息
var ajax = new $ax(Feng.ctxPath + "/dept/add", function(data){
- if(language==1){
- Feng.success("添加成功!");
- }else if(language==2){
- Feng.success("Successfully added!");
- }else {
- Feng.success("Sangat berhasil ditambah!");
- }
+ Feng.success("添加成功!");
window.parent.Dept.table.refresh();
DeptInfoDlg.close();
},function(data){
- if(language==1){
- Feng.error("添加失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Fail to add!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
- }
+ Feng.error("添加失败!" + data.responseJSON.message + "!");
});
ajax.set(this.deptInfoData);
ajax.start();
@@ -177,40 +152,14 @@
if (!this.validate()) {
return;
}
- var pName = $("#pName").val();
- var pid = $("#pid").val();
- if (0 != pid){
- if ("" == pName){
- if(language==1){
- Feng.info("上级部门不能为空");
- }else if(language==2){
- Feng.info("The upper department cannot be empty");
- }else {
- Feng.info("Departemen atas tidak bisa kosong");
- }
- return;
- }
- }
//提交信息
var ajax = new $ax(Feng.ctxPath + "/dept/update", function(data){
- if(language==1){
- Feng.success("修改成功!");
- }else if(language==2){
- Feng.success("Modify successfully!");
- }else {
- Feng.success("Mengubah dengan sukses!");
- }
+ Feng.success("修改成功!");
window.parent.Dept.table.refresh();
DeptInfoDlg.close();
},function(data){
- if(language==1){
- Feng.error("修改失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Fail to modify!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
- }
+ Feng.error("修改失败!" + data.responseJSON.message + "!");
});
ajax.set(this.deptInfoData);
ajax.start();
@@ -218,7 +167,7 @@
function onBodyDown(event) {
if (!(event.target.id == "menuBtn" || event.target.id == "parentDeptMenu" || $(
- event.target).parents("#parentDeptMenu").length > 0)) {
+ event.target).parents("#parentDeptMenu").length > 0)) {
DeptInfoDlg.hideDeptSelectTree();
}
}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/menu/menu.js b/cloud-server-management/src/main/webapp/static/modular/system/menu/menu.js
index 84ae822..79e65a1 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/menu/menu.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/menu/menu.js
@@ -7,7 +7,7 @@
table: null,
layerIndex: -1
};
-var language =$("#language").val()
+
/**
* 初始化表格的列
*/
@@ -15,55 +15,14 @@
var columns = [
{field: 'selectItem', radio: true},
{title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
- {title: language==1?'菜单名称':(language==2?'Menu Name':'Nama Menu'), field: 'name', align: 'center', valign: 'middle', sortable: true},
- {title:language==1?'菜单编号':(language==2?'Menu Number':'Nomor Menu') , field: 'code', align: 'center', valign: 'middle', sortable: true},
- {title:language==1?'菜单父编号':(language==2?'Menu parent Number':'Nomor induk menu') , field: 'pcode', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'请求地址':(language==2?'Address of request':'Alamat permintaan'), field: 'url', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'排序':(language==2?'Sort':'Urutkan'), field: 'num', align: 'center', valign: 'middle', sortable: true},
- {title:language==1? '层级':(language==2?'hierarchy':'hierarki'), field: 'levels', align: 'center', valign: 'middle', sortable: true},
- {title: language==1? '是否是菜单':(language==2?'Menu or not':'Menu atau tidak'), field: 'isMenuName', align: 'center', valign: 'middle', sortable: true,
- formatter:function (data) {
- if(data=="是"){
- if(language==1){
- return "是"
- }else if(language==2){
- return "Yes"
- } else {
- return "Ya"
- }
- }else if(data=="否"){
- if(language==1){
- return "否"
- }else if(language==2){
- return "No"
- } else {
- return "Tidak"
- }
- }
- }
- },
- {title: language==1?'状态':(language==2?'State':'Status'), field: 'statusName', align: 'center', valign: 'middle', sortable: true,
- formatter:function (data) {
- if(data=="启用"){
- if(language==1){
- return "启用"
- }else if(language==2){
- return "Enable"
- } else {
- return "Aktifkan"
- }
- }else if(data=="禁用"){
- if(language==1){
- return "禁用"
- }else if(language==2){
- return "Disabled"
- } else {
- return "Dilumpuhkan"
- }
- }
- }
-
- }]
+ {title: '菜单名称', field: 'name', align: 'center', valign: 'middle', sortable: true},
+ {title: '菜单编号', field: 'code', align: 'center', valign: 'middle', sortable: true},
+ {title: '菜单父编号', field: 'pcode', align: 'center', valign: 'middle', sortable: true},
+ {title: '请求地址', field: 'url', align: 'center', valign: 'middle', sortable: true},
+ {title: '排序', field: 'num', align: 'center', valign: 'middle', sortable: true},
+ {title: '层级', field: 'levels', align: 'center', valign: 'middle', sortable: true},
+ {title: '是否是菜单', field: 'isMenuName', align: 'center', valign: 'middle', sortable: true},
+ {title: '状态', field: 'statusName', align: 'center', valign: 'middle', sortable: true}]
return columns;
};
@@ -74,14 +33,7 @@
Menu.check = function () {
var selected = $('#' + this.id).bootstrapTreeTable('getSelections');
if (selected.length == 0) {
- if(language==1){
- Feng.info("请先选中表格中的某一记录！");
- }else if(language==2){
- Feng.info("Please select a record in the table first！");
- }else {
- Feng.info("Pilih catatan di tabel terlebih dahulu！");
- }
-
+ Feng.info("请先选中表格中的某一记录！");
return false;
} else {
Menu.seItem = selected[0];
@@ -95,7 +47,7 @@
Menu.openAddMenu = function () {
var index = layer.open({
type: 2,
- title: language==1?'添加':(language==2?'Add':'Tambahkan'),
+ title: '添加菜单',
area: ['830px', '450px'], //宽高
fix: false, //不固定
maxmin: true,
@@ -129,34 +81,16 @@
var operation = function () {
var ajax = new $ax(Feng.ctxPath + "/menu/remove", function (data) {
- if(language==1){
- Feng.success("删除成功!");
- }else if(language==2){
- Feng.success("Delete succeeded!");
- }else {
- Feng.success("Hapus berhasil!");
- }
+ Feng.success("删除成功!");
Menu.table.refresh();
}, function (data) {
- if(language==1){
- Feng.error("删除失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Delete failed!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
- }
+ Feng.error("删除失败!" + data.responseJSON.message + "!");
});
ajax.set("menuId", Menu.seItem.id);
ajax.start();
};
- if(language==1){
- Feng.confirm("是否刪除该菜单?", operation);
- }else if(language==2){
- Feng.confirm("Whether to delete the menu?", operation);
- }else {
- Feng.confirm("Apakah untuk menghapus menu?", operation);
- }
+ Feng.confirm("是否刪除该菜单?", operation);
}
};
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/menu/menu_info.js b/cloud-server-management/src/main/webapp/static/modular/system/menu/menu_info.js
index 98e5187..8fca601 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/menu/menu_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/menu/menu_info.js
@@ -1,8 +1,6 @@
/**
* 菜单详情对话框
*/
-var language =$("#language").val()
-
var MenuInfoDlg = {
menuInfoData: {},
ztreeInstance: null,
@@ -10,35 +8,35 @@
name: {
validators: {
notEmpty: {
- message: language==1?'菜单名称不能为空':(language==2?'The menu name cannot be empty':'Nama menu tidak dapat kosong')
+ message: '菜单名称不能为空'
}
}
},
code: {
validators: {
notEmpty: {
- message: language==1?'菜单编号不能为空':(language==2?'The menu number cannot be empty':'Nomor menu tidak dapat kosong')
+ message: '菜单编号不能为空'
}
}
},
pcodeName: {
validators: {
notEmpty: {
- message: language==1?'父菜单不能为空':(language==2?'The parent menu cannot be empty':'Menu induk tidak dapat kosong')
+ message: '父菜单不能为空'
}
}
},
url: {
validators: {
notEmpty: {
- message: language==1?'请求地址不能为空':(language==2?'The request address cannot be empty':'Alamat permintaan tidak dapat kosong')
+ message: '请求地址不能为空'
}
}
},
num: {
validators: {
notEmpty: {
- message: language==1?'序号不能为空':(language==2?'The serial number cannot be empty':'Nomor seri tidak dapat kosong')
+ message: '序号不能为空'
}
}
}
@@ -110,23 +108,11 @@
//提交信息
var ajax = new $ax(Feng.ctxPath + "/menu/add", function (data) {
- if(language==1){
- Feng.success("添加成功!");
- }else if(language==2){
- Feng.success("Successfully added!");
- }else {
- Feng.success("Sangat berhasil ditambah!");
- }
+ Feng.success("添加成功!");
window.parent.Menu.table.refresh();
MenuInfoDlg.close();
}, function (data) {
- if(language==1){
- Feng.error("添加失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Fail to add!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
- }
+ Feng.error("添加失败!" + data.responseJSON.message + "!");
});
ajax.set(this.menuInfoData);
ajax.start();
@@ -146,23 +132,11 @@
//提交信息
var ajax = new $ax(Feng.ctxPath + "/menu/edit", function (data) {
- if(language==1){
- Feng.success("修改成功!");
- }else if(language==2){
- Feng.success("Modify successfully!");
- }else {
- Feng.success("Mengubah dengan sukses!");
- }
+ Feng.success("修改成功!");
window.parent.Menu.table.refresh();
MenuInfoDlg.close();
}, function (data) {
- if(language==1){
- Feng.error("修改失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Fail to modify!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
- }
+ Feng.error("修改失败!" + data.responseJSON.message + "!");
});
ajax.set(this.menuInfoData);
ajax.start();
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/role/role.js b/cloud-server-management/src/main/webapp/static/modular/system/role/role.js
index 1676d4c..d269433 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/role/role.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/role/role.js
@@ -7,27 +7,19 @@
table: null,
layerIndex: -1
};
-var language =$("#language").val()
+
/**
* 初始化表格的列
*/
Role.initColumn = function () {
var columns = [
- {field: 'selectItem', radio: true,
- /*formatter: function (value, row) {
- if (row.id == 1)
- return {
- disabled : true,//设置是否可用
- };
- return "";
- }*/
- },
+ {field: 'selectItem', radio: true},
{title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
- {title: language==1?'名称':(language==2?'Name':'Nama'), field: 'name', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'上级角色':(language==2?'Superior role':'Peran orang tua'), field: 'pName', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'所在部门':(language==2?'Department':'Departemen'), field: 'deptName', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'包含账户数':(language==2?'Number of included accounts':'Jumlah rekening termasuk'), field: 'userCount', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'别名':(language==2?'alias':'alias'), field: 'tips', align: 'center', valign: 'middle', sortable: true}]
+ {title: '添加时间', field: 'createTime', align: 'center', valign: 'middle'},
+ {title: '角色名称', field: 'name', align: 'center', valign: 'middle', sortable: true},
+ {title: '上级角色', field: 'pName', align: 'center', valign: 'middle', sortable: true},
+ {title: '所在部门', field: 'deptName', align: 'center', valign: 'middle', sortable: true},
+ {title: '别名', field: 'tips', align: 'center', valign: 'middle', sortable: true}]
return columns;
};
@@ -38,14 +30,7 @@
Role.check = function () {
var selected = $('#' + this.id).bootstrapTable('getSelections');
if (selected.length == 0) {
- if(language==1){
- Feng.info("请先选中表格中的某一记录！");
- }else if(language==2){
- Feng.info("Please select a record in the table first！");
- }else {
- Feng.info("Pilih catatan di tabel terlebih dahulu！");
- }
-
+ Feng.info("请先选中表格中的某一记录！");
return false;
} else {
Role.seItem = selected[0];
@@ -59,7 +44,7 @@
Role.openAddRole = function () {
var index = layer.open({
type: 2,
- title: language==1?'添加':(language==2?'Add':'Tambahkan'),
+ title: '添加角色',
area: ['800px', '450px'], //宽高
fix: false, //不固定
maxmin: true,
@@ -75,7 +60,7 @@
if (this.check()) {
var index = layer.open({
type: 2,
- title: language==1?'修改角色':(language==2?'modify role':'mengubah peran'),
+ title: '修改角色',
area: ['800px', '450px'], //宽高
fix: false, //不固定
maxmin: true,
@@ -93,34 +78,16 @@
var operation = function(){
var ajax = new $ax(Feng.ctxPath + "/role/remove", function () {
- if(language==1){
- Feng.success("删除成功!");
- }else if(language==2){
- Feng.success("Delete succeeded!");
- }else {
- Feng.success("Hapus berhasil!");
- }
+ Feng.success("删除成功!");
Role.table.refresh();
}, function (data) {
- if(language==1){
- Feng.error("删除失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Delete failed!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
- }
+ Feng.error("删除失败!" + data.responseJSON.message + "!");
});
ajax.set("roleId", Role.seItem.id);
ajax.start();
};
- if(language==1){
- Feng.confirm("是否删除角色 " + Role.seItem.name + "?",operation);
- }else if(language==2){
- Feng.confirm("Whether to delete a Role " + Role.seItem.name + "?",operation);
- }else {
- Feng.confirm("Apakah menghapus peran " + Role.seItem.name + "?",operation);
- }
+ Feng.confirm("是否删除角色 " + Role.seItem.name + "?",operation);
}
};
@@ -131,8 +98,8 @@
if (this.check()) {
var index = layer.open({
type: 2,
- title: language==1?'权限配置':(language==2?'Permission Configuration':'Konfigurasi Keizinan'),
- area: ['30%', '80%'], //宽高
+ title: '权限配置',
+ area: ['300px', '450px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/role/role_assign/' + this.seItem.id
@@ -150,6 +117,11 @@
Role.table.refresh({query: queryData});
}
+Role.resetSearch = function(){
+ $("#roleName").val('');
+ Role.search();
+}
+
$(function () {
var defaultColunms = Role.initColumn();
var table = new BSTable(Role.id, "/role/list", defaultColunms);
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/role/role_info.js b/cloud-server-management/src/main/webapp/static/modular/system/role/role_info.js
index fe0d4f3..7041b3f 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/role/role_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/role/role_info.js
@@ -1,7 +1,6 @@
/**
* 角色详情对话框（可用于添加和修改对话框）
*/
-var language =$("#language").val()
var RolInfoDlg = {
roleInfoData: {},
deptZtree: null,
@@ -10,24 +9,24 @@
name: {
validators: {
notEmpty: {
- message: language==1?'用户名不能为空':(language==2?"The user name cannot be empty":"Nama pengguna tidak dapat kosong")
+ message: '用户名不能为空'
}
}
},
tips: {
validators: {
notEmpty: {
- message: language==1?'别名不能为空':(language==2?"The alias cannot be empty":"Alias tidak dapat kosong")
+ message: '别名不能为空'
}
}
- }/*,
+ },
pName: {
validators: {
notEmpty: {
message: '父级名称不能为空'
}
}
- }*/
+ }
}
};
@@ -142,37 +141,14 @@
if (!this.validate()) {
return;
}
- var pName = $("#pName").val();
- if ("" == pName){
- if(language==1){
- Feng.info("上级名称不能为空");
- }else if(language==2){
- Feng.info("The parent name cannot be empty");
- }else {
- Feng.info("Nama orang tua tidak dapat kosong");
- }
- return;
- }
//提交信息
var ajax = new $ax(Feng.ctxPath + "/role/add", function (data) {
- if(language==1){
- Feng.success("添加成功!");
- }else if(language==2){
- Feng.success("Successfully added!");
- }else {
- Feng.success("Sangat berhasil ditambah!");
- }
+ Feng.success("添加成功!");
window.parent.Role.table.refresh();
RolInfoDlg.close();
}, function (data) {
- if(language==1){
- Feng.error("添加失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Fail to add!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
- }
+ Feng.error("添加失败!" + data.responseJSON.message + "!");
});
ajax.set(this.roleInfoData);
ajax.start();
@@ -189,36 +165,14 @@
if (!this.validate()) {
return;
}
- var pName = $("#pName").val();
- if ("" == pName){
- if(language==1){
- Feng.info("上级名称不能为空");
- }else if(language==2){
- Feng.info("The parent name cannot be empty");
- }else {
- Feng.info("Nama orang tua tidak dapat kosong");
- }
- return;
- }
+
//提交信息
var ajax = new $ax(Feng.ctxPath + "/role/edit", function (data) {
- if(language==1){
- Feng.success("修改成功!");
- }else if(language==2){
- Feng.success("Modify successfully!");
- }else {
- Feng.success("Mengubah dengan sukses!");
- }
+ Feng.success("修改成功!");
window.parent.Role.table.refresh();
RolInfoDlg.close();
}, function (data) {
- if(language==1){
- Feng.error("修改失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Fail to modify!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
- }
+ Feng.error("修改失败!" + data.responseJSON.message + "!");
});
ajax.set(this.roleInfoData);
ajax.start();
--
Gitblit v1.7.1