@@ -157,7 +157,7 @@ router.beforeEach((to, from, next) => { | |||||
}else if (to.path.indexOf('/homestead/') !== -1) { | }else if (to.path.indexOf('/homestead/') !== -1) { | ||||
next(`/homestead/login`) | next(`/homestead/login`) | ||||
} else { | } else { | ||||
next(`/homesteadLogin`) | |||||
next(`/yinnongLogin`) | |||||
//next({ path: '/' }) | //next({ path: '/' }) | ||||
} | } | ||||
}) | }) | ||||
@@ -94,7 +94,7 @@ service.interceptors.response.use(res => { | |||||
} else if (window.location.href.indexOf('/homestead/') != -1) { | } else if (window.location.href.indexOf('/homestead/') != -1) { | ||||
window.location.href = '/homestead/login'; | window.location.href = '/homestead/login'; | ||||
} else { | } else { | ||||
window.location.href = '/homesteadLogin'; | |||||
window.location.href = '/yinnongLogin'; | |||||
//window.location.href = '/zjdLogin'; | //window.location.href = '/zjdLogin'; | ||||
/*window.location.href = '/index';*/ | /*window.location.href = '/index';*/ | ||||
@@ -326,7 +326,7 @@ | |||||
bizPath: "transfer", | bizPath: "transfer", | ||||
fileType: "3", | fileType: "3", | ||||
} | } | ||||
attachmentList(oData1).then(res => { | |||||
attachmentList(oData3).then(res => { | |||||
res.rows.map(r => { | res.rows.map(r => { | ||||
let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL | let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL | ||||
this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName}) | this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName}) | ||||
@@ -314,7 +314,7 @@ | |||||
bizPath: "yinnong", | bizPath: "yinnong", | ||||
fileType: "3", | fileType: "3", | ||||
} | } | ||||
attachmentList(oData1).then(res => { | |||||
attachmentList(oData3).then(res => { | |||||
res.rows.map(r => { | res.rows.map(r => { | ||||
let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL | let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL | ||||
this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName}) | this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName}) | ||||
@@ -336,7 +336,7 @@ | |||||
bizPath: "yinnong", | bizPath: "yinnong", | ||||
fileType: "3", | fileType: "3", | ||||
} | } | ||||
attachmentList(oData1).then(res => { | |||||
attachmentList(oData3).then(res => { | |||||
res.rows.map(r => { | res.rows.map(r => { | ||||
let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL | let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL | ||||
this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName}) | this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName}) | ||||
@@ -400,7 +400,7 @@ | |||||
bizPath: "yinnong", | bizPath: "yinnong", | ||||
fileType: "3", | fileType: "3", | ||||
} | } | ||||
attachmentList(oData1).then(res => { | |||||
attachmentList(oData3).then(res => { | |||||
res.rows.map(r => { | res.rows.map(r => { | ||||
let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL | let baseUrl = location.protocol+"//"+location.host+request.defaults.baseURL | ||||
this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName}) | this.fileList3.push({"url":baseUrl + r.fileUrl,"file":new File([],r.fileName,{}),"id":r.id,"fileName":r.fileName}) | ||||