Commit 11717c3b authored by sgjj's avatar sgjj

添加资源文件

parent 49c90cc0
......@@ -55,6 +55,11 @@
<artifactId>ms-mpeople</artifactId>
<version>1.0.10</version>
</dependency>
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-upgrader</artifactId>
<version>1.0.11</version>
</dependency>
</dependencies>
<build>
<resources>
......
......@@ -28,7 +28,7 @@
axios.interceptors.response.use(
function(response) {
//登录失效
if (response.data.bizCode == "401") {
if (response.data.bizCode == "401" && ms.isLoginRedirect) {
window.parent.location.href = ms.base + "/" + ms.login + "?backurl=" + encodeURIComponent(window.parent.location.href);
return;
}
......@@ -170,4 +170,5 @@
window.ms = {};
}
window.ms.http = http;
window.ms.isLoginRedirect = true;
}());
\ No newline at end of file
......@@ -20,6 +20,15 @@
log(e.message);
}
}
//树形数据组织
function treeData (source, id, parentId, children) {
let cloneData = JSON.parse(JSON.stringify(source))
return cloneData.filter(father => {
let branchArr = cloneData.filter(child => father[id] == child[parentId]);
branchArr.length > 0 ? father[children] = branchArr : ''
return father[parentId] == 0 // 如果第一层不是parentId=0,请自行修改
})
}
//日期处理
var date = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment