diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
index 8c1292a..181a758 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
@@ -1352,4 +1352,31 @@ public class ProjectController extends BaseController {
exportExcelUtils.end(outputStream);
}
+
+ @RequestMapping("/budgetList")
+ public String budgetList(@RequestParam(value = "keywords", required = false) String keywords,
+ @RequestParam(value = PAGE_NUMBER, defaultValue = DEFAULT_PAGE_NUMBER) int pageNumber,
+ @RequestParam(value = PAGE_SIZE, defaultValue = DEFAULT_PAGE_SIZE) int pageSize,
+ Map<String, Object> model) {
+
+ return "admin/project_budget_list";
+ }
+
+ @RequestMapping("/settleList")
+ public String settleList(@RequestParam(value = "keywords", required = false) String keywords,
+ @RequestParam(value = PAGE_NUMBER, defaultValue = DEFAULT_PAGE_NUMBER) int pageNumber,
+ @RequestParam(value = PAGE_SIZE, defaultValue = DEFAULT_PAGE_SIZE) int pageSize,
+ Map<String, Object> model) {
+
+ return "admin/project_settle_list";
+ }
+
+ @RequestMapping("/finalList")
+ public String finalList(@RequestParam(value = "keywords", required = false) String keywords,
+ @RequestParam(value = PAGE_NUMBER, defaultValue = DEFAULT_PAGE_NUMBER) int pageNumber,
+ @RequestParam(value = PAGE_SIZE, defaultValue = DEFAULT_PAGE_SIZE) int pageSize,
+ Map<String, Object> model) {
+
+ return "admin/project_final_list";
+ }
}
diff --git a/src/main/resources/templates/admin/account_list.ftl b/src/main/resources/templates/admin/account_list.ftl
index 2085dbd..415d45f 100644
--- a/src/main/resources/templates/admin/account_list.ftl
+++ b/src/main/resources/templates/admin/account_list.ftl
@@ -318,11 +318,11 @@
},
error: function (data, status, e) {
console.log("--------error---------" + data)
- alert("-----------------" + data);
+ layer.alert("-----------------" + data);
// if ($('#modal')) {
// $('#modal').modal('close');
// }
- alert(e);
+ layer.alert(e);
$("#" + id).val("");
}
});
@@ -376,10 +376,10 @@
},
success: function (data) {
if (data.status == 0) {
- alert("重置成功");
+ layer.alert("重置成功");
window.location.href = window.location.href;
} else if (data.status == 1) {
- alert("重置失败");
+ layer.alert("重置失败");
}
}
});
@@ -413,10 +413,10 @@
},
success: function (data) {
if (data.status == 0) {
- alert("删除成功");
+ layer.alert("删除成功");
window.location.href = window.location.href;
} else if (data.status == 1) {
- alert("删除失败");
+ layer.alert("删除失败");
}
}
});
diff --git a/src/main/resources/templates/admin/account_password.ftl b/src/main/resources/templates/admin/account_password.ftl
index a4c5d1f..2ed3f02 100644
--- a/src/main/resources/templates/admin/account_password.ftl
+++ b/src/main/resources/templates/admin/account_password.ftl
@@ -97,7 +97,7 @@
if (pwd == newPwd) {
- alert("新密码跟旧密码不能一样");
+ layer.alert("新密码跟旧密码不能一样");
return false;
}
diff --git a/src/main/resources/templates/admin/act_his_task_list.ftl b/src/main/resources/templates/admin/act_his_task_list.ftl
index 005019b..cfefd4c 100644
--- a/src/main/resources/templates/admin/act_his_task_list.ftl
+++ b/src/main/resources/templates/admin/act_his_task_list.ftl
@@ -196,7 +196,7 @@
type: 'post',
async: false,
success: function (data) {
- alert(data.msg);
+ layer.alert(data.msg);
location.reload();
}
});
diff --git a/src/main/resources/templates/admin/act_model_list.ftl b/src/main/resources/templates/admin/act_model_list.ftl
index 0bfb13e..94f834f 100644
--- a/src/main/resources/templates/admin/act_model_list.ftl
+++ b/src/main/resources/templates/admin/act_model_list.ftl
@@ -176,10 +176,10 @@
success: function (data) {
$deleteButton.prop("disabled", false)
if (data.status == 0) {
- alert(data.msg);
+ layer.alert(data.msg);
window.location.href = window.location.href;
} else if (data.status == 1) {
- alert(data.msg);
+ layer.alert(data.msg);
}
}
});
diff --git a/src/main/resources/templates/admin/act_proc_def_list.ftl b/src/main/resources/templates/admin/act_proc_def_list.ftl
index f1b29c5..32acb7d 100644
--- a/src/main/resources/templates/admin/act_proc_def_list.ftl
+++ b/src/main/resources/templates/admin/act_proc_def_list.ftl
@@ -200,10 +200,10 @@
success: function (data) {
$deleteButton.prop("disabled", false)
if (data.status == 0) {
- alert(data.msg);
+ layer.alert(data.msg);
window.location.href = window.location.href;
} else if (data.status == 1) {
- alert(data.msg);
+ layer.alert(data.msg);
}
}
});
diff --git a/src/main/resources/templates/admin/act_proc_ins_list.ftl b/src/main/resources/templates/admin/act_proc_ins_list.ftl
index 867449d..829046b 100644
--- a/src/main/resources/templates/admin/act_proc_ins_list.ftl
+++ b/src/main/resources/templates/admin/act_proc_ins_list.ftl
@@ -143,10 +143,10 @@
success: function (data) {
$deleteButton.prop("disabled", false)
if (data.status == 0) {
- alert(data.msg);
+ layer.alert(data.msg);
window.location.href = window.location.href;
} else if (data.status == 1) {
- alert(data.msg);
+ layer.alert(data.msg);
}
}
});
@@ -197,7 +197,7 @@
dataType: "json",
async: false,
success: function (data) {
- alert(data.msg);
+ layer.alert(data.msg);
location.reload();
}
});
diff --git a/src/main/resources/templates/admin/human_cost_list.ftl b/src/main/resources/templates/admin/human_cost_list.ftl
index 72cbdca..4cbe052 100644
--- a/src/main/resources/templates/admin/human_cost_list.ftl
+++ b/src/main/resources/templates/admin/human_cost_list.ftl
@@ -266,8 +266,8 @@
},
error: function (data, status, e) {
console.log("--------error---------" + data)
- alert("-----------------" + data);
- alert(e);
+ layer.alert("-----------------" + data);
+ layer.alert(e);
$("#" + id).val("");
}
});
diff --git a/src/main/resources/templates/admin/manager_list.ftl b/src/main/resources/templates/admin/manager_list.ftl
index 5349b5e..dcd77df 100644
--- a/src/main/resources/templates/admin/manager_list.ftl
+++ b/src/main/resources/templates/admin/manager_list.ftl
@@ -264,10 +264,10 @@
success: function (data) {
$deleteButton.prop("disabled", false)
if (data.status == 0) {
- alert(data.msg);
+ layer.alert(data.msg);
window.location.href = window.location.href;
} else if (data.status == 1) {
- alert(data.msg);
+ layer.alert(data.msg);
}
}
});
@@ -287,10 +287,10 @@
},
success: function (data) {
if (data.status == 0) {
- alert("重置成功");
+ layer.alert("重置成功");
window.location.href = window.location.href;
} else if (data.status == 1) {
- alert("重置失败");
+ layer.alert("重置失败");
}
}
});
diff --git a/src/main/resources/templates/admin/monthly_settle_list.ftl b/src/main/resources/templates/admin/monthly_settle_list.ftl
index c692ae6..72366fa 100644
--- a/src/main/resources/templates/admin/monthly_settle_list.ftl
+++ b/src/main/resources/templates/admin/monthly_settle_list.ftl
@@ -329,8 +329,8 @@
},
error: function (data, status, e) {
console.log("--------error---------" + data)
- alert("-----------------" + data);
- alert(e);
+ layer.alert("-----------------" + data);
+ layer.alert(e);
$("#" + id).val("");
}
});
diff --git a/src/main/resources/templates/admin/procurement_type_list.ftl b/src/main/resources/templates/admin/procurement_type_list.ftl
index 621aee7..6342275 100644
--- a/src/main/resources/templates/admin/procurement_type_list.ftl
+++ b/src/main/resources/templates/admin/procurement_type_list.ftl
@@ -296,10 +296,10 @@
success: function (data) {
$deleteButton.prop("disabled", false)
if (data.status == 0) {
- alert("删除成功");
+ layer.alert("删除成功");
window.location.href = window.location.href;
} else if (data.status == 1) {
- alert("删除失败");
+ layer.alert("删除失败");
}
}
});
diff --git a/src/main/resources/templates/admin/profit_marfin_config_input.ftl b/src/main/resources/templates/admin/profit_marfin_config_input.ftl
index 36660f7..dfd5147 100644
--- a/src/main/resources/templates/admin/profit_marfin_config_input.ftl
+++ b/src/main/resources/templates/admin/profit_marfin_config_input.ftl
@@ -90,10 +90,10 @@
async: false,
success: function (data) {
if (data.status == 0) {
- alert("配置成功");
+ layer.alert("配置成功");
window.location.href = window.location.href;
} else if (data.status == 1) {
- alert(data.msg);
+ layer.alert(data.msg);
}
}
});
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 27c914a..2ee12b7 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -3005,7 +3005,7 @@
}
} catch(e) {
console.log(e);
- alert("浏览器不支持打印功能，请切换支持该功能的浏览器");
+ layer.alert("浏览器不支持打印功能，请切换支持该功能的浏览器");
}
@@ -3046,7 +3046,7 @@
var message = $("#doc-vld-ta-2").val();
var approvetype = $("#type").val();
if (message == '') {
- alert("请填写审核意见");
+ layer.alert("请填写审核意见");
return;
}
@@ -3064,7 +3064,7 @@
async: false,
success: function (data) {
if (data.status == 0) {
- alert(data.msg);
+ layer.alert(data.msg);
refreshMyApproveMsg();
var urlType = data.data;
if(urlType == 1){
@@ -3074,7 +3074,7 @@
}
} else if (data.status == 1) {
- alert(data.msg);
+ layer.alert(data.msg);
}
}
});
@@ -3172,10 +3172,10 @@
async: false,
success: function (data) {
if (data.status == 0) {
- alert(data.msg);
+ layer.alert(data.msg);
window.location.href = window.location.href;
} else if (data.status == 1) {
- alert(data.msg);
+ layer.alert(data.msg);
}
}
});
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index dde1a5d..e77414d 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -1416,11 +1416,11 @@
},
error: function (data, status, e) {
console.log("--------error---------" + data)
- alert("-----------------" + data);
+ layer.alert("-----------------" + data);
// if ($('#modal')) {
// $('#modal').modal('close');
// }
- alert(e);
+ layer.alert(e);
$("#" + id).val("");
}
});
@@ -1462,11 +1462,11 @@
},
error: function (data, status, e) {
console.log("--------error---------" + data)
- alert("-----------------" + data);
+ layer.alert("-----------------" + data);
// if ($('#modal')) {
// $('#modal').modal('close');
// }
- alert(e);
+ layer.alert(e);
$("#" + id).val("");
}
});
diff --git a/src/main/resources/templates/admin/project_budget_list.ftl b/src/main/resources/templates/admin/project_budget_list.ftl
new file mode 100644
index 0000000..c2bbc46
--- /dev/null
+++ b/src/main/resources/templates/admin/project_budget_list.ftl
@@ -0,0 +1,76 @@
+ <style>
+body {
+ background-color: #ECECEC;
+ font-family: 'Open Sans', sans-serif;
+ font-size: 14px;
+ color: #3c3c3c;
+}
+
+.demo p:first-child {
+ text-align: center;
+ font-family: cursive;
+ font-size: 40px;
+ font-weight: bold;
+ line-height: 100px;
+ letter-spacing: 5px;
+ color: #fff;
+ padding-top:160px
+}
+
+.demo p:first-child span {
+ cursor: pointer;
+ text-shadow: 0px 0px 2px #686868,
+ 0px 1px 1px #ddd,
+ 0px 2px 1px #d6d6d6,
+ 0px 3px 1px #ccc,
+ 0px 4px 1px #c5c5c5,
+ 0px 5px 1px #c1c1c1,
+ 0px 6px 1px #bbb,
+ 0px 7px 1px #777,
+ 0px 8px 3px rgba(100, 100, 100, 0.4),
+ 0px 9px 5px rgba(100, 100, 100, 0.1),
+ 0px 10px 7px rgba(100, 100, 100, 0.15),
+ 0px 11px 9px rgba(100, 100, 100, 0.2),
+ 0px 12px 11px rgba(100, 100, 100, 0.25),
+ 0px 13px 15px rgba(100, 100, 100, 0.3);
+ -webkit-transition: all .1s linear;
+ transition: all .1s linear;
+}
+
+.demo p:first-child span:hover {
+ text-shadow: 0px 0px 2px #686868,
+ 0px 1px 1px #fff,
+ 0px 2px 1px #fff,
+ 0px 3px 1px #fff,
+ 0px 4px 1px #fff,
+ 0px 5px 1px #fff,
+ 0px 6px 1px #fff,
+ 0px 7px 1px #777,
+ 0px 8px 3px #fff,
+ 0px 9px 5px #fff,
+ 0px 10px 7px #fff,
+ 0px 11px 9px #fff,
+ 0px 12px 11px #fff,
+ 0px 13px 15px #fff;
+ -webkit-transition: all .1s linear;
+ transition: all .1s linear;
+}
+
+.demo p:not(:first-child) {
+ text-align: center;
+ color: #666;
+ font-family: cursive;
+ font-size: 20px;
+ text-shadow: 0 1px 0 #fff;
+ letter-spacing: 1px;
+ line-height: 2em;
+ margin-top: -50px;
+}
+</style>
+ <div class="demo">
+ <p><span>建设中，敬请期待</span></p>
+<#-- <button type="button" class="am-btn am-btn-warning am-btn-xs"-->
+<#-- onclick="javascript:history.go(-1);">返回上一级-->
+<#-- </button>-->
+ </div>
+
diff --git a/src/main/resources/templates/admin/project_final_list.ftl b/src/main/resources/templates/admin/project_final_list.ftl
new file mode 100644
index 0000000..c2bbc46
--- /dev/null
+++ b/src/main/resources/templates/admin/project_final_list.ftl
@@ -0,0 +1,76 @@
+ <style>
+body {
+ background-color: #ECECEC;
+ font-family: 'Open Sans', sans-serif;
+ font-size: 14px;
+ color: #3c3c3c;
+}
+
+.demo p:first-child {
+ text-align: center;
+ font-family: cursive;
+ font-size: 40px;
+ font-weight: bold;
+ line-height: 100px;
+ letter-spacing: 5px;
+ color: #fff;
+ padding-top:160px
+}
+
+.demo p:first-child span {
+ cursor: pointer;
+ text-shadow: 0px 0px 2px #686868,
+ 0px 1px 1px #ddd,
+ 0px 2px 1px #d6d6d6,
+ 0px 3px 1px #ccc,
+ 0px 4px 1px #c5c5c5,
+ 0px 5px 1px #c1c1c1,
+ 0px 6px 1px #bbb,
+ 0px 7px 1px #777,
+ 0px 8px 3px rgba(100, 100, 100, 0.4),
+ 0px 9px 5px rgba(100, 100, 100, 0.1),
+ 0px 10px 7px rgba(100, 100, 100, 0.15),
+ 0px 11px 9px rgba(100, 100, 100, 0.2),
+ 0px 12px 11px rgba(100, 100, 100, 0.25),
+ 0px 13px 15px rgba(100, 100, 100, 0.3);
+ -webkit-transition: all .1s linear;
+ transition: all .1s linear;
+}
+
+.demo p:first-child span:hover {
+ text-shadow: 0px 0px 2px #686868,
+ 0px 1px 1px #fff,
+ 0px 2px 1px #fff,
+ 0px 3px 1px #fff,
+ 0px 4px 1px #fff,
+ 0px 5px 1px #fff,
+ 0px 6px 1px #fff,
+ 0px 7px 1px #777,
+ 0px 8px 3px #fff,
+ 0px 9px 5px #fff,
+ 0px 10px 7px #fff,
+ 0px 11px 9px #fff,
+ 0px 12px 11px #fff,
+ 0px 13px 15px #fff;
+ -webkit-transition: all .1s linear;
+ transition: all .1s linear;
+}
+
+.demo p:not(:first-child) {
+ text-align: center;
+ color: #666;
+ font-family: cursive;
+ font-size: 20px;
+ text-shadow: 0 1px 0 #fff;
+ letter-spacing: 1px;
+ line-height: 2em;
+ margin-top: -50px;
+}
+</style>
+ <div class="demo">
+ <p><span>建设中，敬请期待</span></p>
+<#-- <button type="button" class="am-btn am-btn-warning am-btn-xs"-->
+<#-- onclick="javascript:history.go(-1);">返回上一级-->
+<#-- </button>-->
+ </div>
+
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index f81124f..7b6b48d 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -383,7 +383,7 @@
<input type="checkbox" id="allCheck"></th>
<th class="table-title" width="60px">序号</th>
<th class="table-title" width="120px">项目编号<i class="am-icon-caret-down" <#if orderTypeStr == "projectNoDown">style="color: red"</#if> onclick="sub_function('projectNoDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectNoUp">style="color: red"</#if> onclick="sub_function('projectNoUp')"></i></th>
- <th class="table-title" width="240px">项目名称<i class="am-icon-caret-down" <#if orderTypeStr == "projectNameDown">style="color: red"</#if> onclick="sub_function('projectNameDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectNameUp">style="color: red"</#if> onclick="sub_function('projectNameUp')"></i></th>
+ <th class="table-title" width="480px">项目名称<i class="am-icon-caret-down" <#if orderTypeStr == "projectNameDown">style="color: red"</#if> onclick="sub_function('projectNameDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectNameUp">style="color: red"</#if> onclick="sub_function('projectNameUp')"></i></th>
<th class="table-title">项目类型<i class="am-icon-caret-down" <#if orderTypeStr == "projectTypeDown">style="color: red"</#if> onclick="sub_function('projectTypeDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "projectTypeUp">style="color: red"</#if> onclick="sub_function('projectTypeUp')"></i></th>
<th class="table-title">垫资模式<i class="am-icon-caret-down" <#if orderTypeStr == "underModeDown">style="color: red"</#if> onclick="sub_function('underModeDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "underModeUp">style="color: red"</#if> onclick="sub_function('underModeUp')"></i></th>
<th class="table-title">垫资利息<i class="am-icon-caret-down" <#if orderTypeStr == "underIntDown">style="color: red"</#if> onclick="sub_function('underIntDown')"></i><i class="am-icon-caret-up" <#if orderTypeStr == "underIntUp">style="color: red"</#if> onclick="sub_function('underIntUp')"></i></th>
@@ -423,7 +423,7 @@
<input type="checkbox" name="ids" value="${list.id!}" /></td>
<td width="60px">${list.tempId!}</td>
<td class="huanhang" width="120px">${list.projectNo!}</td>
- <td class="huanhang" width="240px"><a style="cursor: pointer;text-decoration:none" onclick="approve(${list.id})">${list.name!}</a></td>
+ <td class="huanhang" width="480px"><a style="cursor: pointer;text-decoration:none" onclick="approve(${list.id})">${list.name!}</a></td>
<td>${list.typeDesc!}</td>
<td>${list.underwrittenModeStr!}</td>
<td>${Utils.format(list.advanceInterestAmount, "0.00")}</td>
@@ -778,10 +778,10 @@
<#-- async: false,-->
<#-- success: function (data) {-->
<#-- if (data.status == 0) {-->
- <#-- alert(data.msg);-->
+ <#-- layer.alert(data.msg);-->
<#-- window.location.href = window.location.href;-->
<#-- } else if (data.status == 1) {-->
- <#-- alert(data.msg);-->
+ <#-- layer.alert(data.msg);-->
<#-- location.href = '${base}/project/toEditAllStatus?id=' + id;-->
<#-- }-->
<#-- }-->
@@ -1009,12 +1009,12 @@
var projectId = $("#hqProjectId").val();
var fileUrl = $("#icon").val();
if (fileUrl == '') {
- alert("请上传会签单");
+ layer.alert("请上传会签单");
return;
}
var message = $("#doc-vld-ta-2").val();
if (message == '') {
- alert("请填写会签意见");
+ layer.alert("请填写会签意见");
return;
}
@@ -1031,10 +1031,10 @@
async: false,
success: function (data) {
if (data.status == 0) {
- alert(data.msg);
+ layer.alert(data.msg);
window.location.href=window.location.href;
} else if (data.status == 1) {
- alert(data.msg);
+ layer.alert(data.msg);
}
}
});
@@ -1047,7 +1047,7 @@
var batchUpdateApprove = function () {
var adminId = $("#approveAdminSelect option:selected").val();
if (adminId == '') {
- alert("请选择承接账号");
+ layer.alert("请选择承接账号");
return;
}
@@ -1063,10 +1063,10 @@
async: false,
success: function (data) {
if (data.status == 0) {
- alert(data.msg);
+ layer.alert(data.msg);
window.location.href=window.location.href;
} else if (data.status == 1) {
- alert(data.msg);
+ layer.alert(data.msg);
}
}
});
@@ -1147,10 +1147,10 @@
async: false,
success: function (data) {
if (data.status == 0) {
- alert(data.msg);
+ layer.alert(data.msg);
window.location.href = window.location.href;
} else if (data.status == 1) {
- alert(data.msg);
+ layer.alert(data.msg);
}
}
});
@@ -1212,7 +1212,7 @@
dataType: "json",
async: false,
success: function (data) {
- alert(data.msg);
+ layer.alert(data.msg);
window.location.href=window.location.href;
}
});
diff --git a/src/main/resources/templates/admin/project_settle_list.ftl b/src/main/resources/templates/admin/project_settle_list.ftl
new file mode 100644
index 0000000..c2bbc46
--- /dev/null
+++ b/src/main/resources/templates/admin/project_settle_list.ftl
@@ -0,0 +1,76 @@
+ <style>
+body {
+ background-color: #ECECEC;
+ font-family: 'Open Sans', sans-serif;
+ font-size: 14px;
+ color: #3c3c3c;
+}
+
+.demo p:first-child {
+ text-align: center;
+ font-family: cursive;
+ font-size: 40px;
+ font-weight: bold;
+ line-height: 100px;
+ letter-spacing: 5px;
+ color: #fff;
+ padding-top:160px
+}
+
+.demo p:first-child span {
+ cursor: pointer;
+ text-shadow: 0px 0px 2px #686868,
+ 0px 1px 1px #ddd,
+ 0px 2px 1px #d6d6d6,
+ 0px 3px 1px #ccc,
+ 0px 4px 1px #c5c5c5,
+ 0px 5px 1px #c1c1c1,
+ 0px 6px 1px #bbb,
+ 0px 7px 1px #777,
+ 0px 8px 3px rgba(100, 100, 100, 0.4),
+ 0px 9px 5px rgba(100, 100, 100, 0.1),
+ 0px 10px 7px rgba(100, 100, 100, 0.15),
+ 0px 11px 9px rgba(100, 100, 100, 0.2),
+ 0px 12px 11px rgba(100, 100, 100, 0.25),
+ 0px 13px 15px rgba(100, 100, 100, 0.3);
+ -webkit-transition: all .1s linear;
+ transition: all .1s linear;
+}
+
+.demo p:first-child span:hover {
+ text-shadow: 0px 0px 2px #686868,
+ 0px 1px 1px #fff,
+ 0px 2px 1px #fff,
+ 0px 3px 1px #fff,
+ 0px 4px 1px #fff,
+ 0px 5px 1px #fff,
+ 0px 6px 1px #fff,
+ 0px 7px 1px #777,
+ 0px 8px 3px #fff,
+ 0px 9px 5px #fff,
+ 0px 10px 7px #fff,
+ 0px 11px 9px #fff,
+ 0px 12px 11px #fff,
+ 0px 13px 15px #fff;
+ -webkit-transition: all .1s linear;
+ transition: all .1s linear;
+}
+
+.demo p:not(:first-child) {
+ text-align: center;
+ color: #666;
+ font-family: cursive;
+ font-size: 20px;
+ text-shadow: 0 1px 0 #fff;
+ letter-spacing: 1px;
+ line-height: 2em;
+ margin-top: -50px;
+}
+</style>
+ <div class="demo">
+ <p><span>建设中，敬请期待</span></p>
+<#-- <button type="button" class="am-btn am-btn-warning am-btn-xs"-->
+<#-- onclick="javascript:history.go(-1);">返回上一级-->
+<#-- </button>-->
+ </div>
+
diff --git a/src/main/resources/templates/admin/role_list.ftl b/src/main/resources/templates/admin/role_list.ftl
index 3cf68ef..639f34a 100644
--- a/src/main/resources/templates/admin/role_list.ftl
+++ b/src/main/resources/templates/admin/role_list.ftl
@@ -198,10 +198,10 @@
success: function (data) {
$deleteButton.prop("disabled", false)
if (data.status == 0) {
- alert(data.msg);
+ layer.alert(data.msg);
window.location.href = window.location.href;
} else if (data.status == 1) {
- alert(data.msg);
+ layer.alert(data.msg);
}
}
});
diff --git a/src/main/resources/templates/admin/sys_permission_list.ftl b/src/main/resources/templates/admin/sys_permission_list.ftl
index 4fd3085..f5e3b40 100644
--- a/src/main/resources/templates/admin/sys_permission_list.ftl
+++ b/src/main/resources/templates/admin/sys_permission_list.ftl
@@ -294,10 +294,10 @@
success: function (data) {
$deleteButton.prop("disabled", false)
if (data.status == 0) {
- alert("删除成功");
+ layer.alert("删除成功");
window.location.href = window.location.href;
} else if (data.status == 1) {
- alert("删除失败");
+ layer.alert("删除失败");
}
}
});