Commit 3a919553 authored by 高东东's avatar 高东东

修改网络请求

parent 453955af
...@@ -50,7 +50,7 @@ import DifferentiateView from './../view/bizview/intelligentDifferentiate/Differ ...@@ -50,7 +50,7 @@ import DifferentiateView from './../view/bizview/intelligentDifferentiate/Differ
import AlarmVideoMonitor from './../view/bizview/alarmVideoMonitor'; import AlarmVideoMonitor from './../view/bizview/alarmVideoMonitor';
import alarmTestView from './../view/bizview/alarm'; import alarmTestView from './../view/bizview/alarm';
import CusVizLib from './../view/planMgmt/cusVizLib'; import CusVizLib from './../view/planMgmt/cusVizLib';
// import RealTimeMonitor from './../view/morphic';组态监控屏功能,组态升级暂时有问题。 import RealTimeMonitor from './../view/morphic'; // 组态监控屏功能,组态升级暂时有问题。
import PublishView from './../view/planMgmt/view'; import PublishView from './../view/planMgmt/view';
import PanoramicMonitor from './../view/panoramicMonitor'; import PanoramicMonitor from './../view/panoramicMonitor';
import LeaderStruct from './../view/planMgmt/view/leaderStruct'; import LeaderStruct from './../view/planMgmt/view/leaderStruct';
...@@ -79,7 +79,7 @@ const Routes = { ...@@ -79,7 +79,7 @@ const Routes = {
checkdetail: CheckDetail, checkdetail: CheckDetail,
checklist: CheckList, checklist: CheckList,
task: TaskView, task: TaskView,
// morphic: RealTimeMonitor, 组态监控屏功能,组态升级暂时有问题。 morphic: RealTimeMonitor, // 组态监控屏功能,组态升级暂时有问题。
//设备台账 //设备台账
assessment: RiskAssessment, assessment: RiskAssessment,
......
import { message } from 'amos-framework';
export default function(data, delRequest){ export default function(data, delRequest){
window.setLoading && window.setLoading(false); window.setLoading && window.setLoading(false);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
...@@ -7,12 +9,16 @@ export default function(data, delRequest){ ...@@ -7,12 +9,16 @@ export default function(data, delRequest){
} else { } else {
resolve(data); resolve(data);
} }
} else if (data && data.result === 'FAILURE') {
message.danger(data.message);
} else if (data && data.status === 200){ } else if (data && data.status === 200){
if (data.result || data.result !== ''){ if (data.result || data.result !== ''){
resolve(data.result); resolve(data.result);
} else { } else {
resolve(data); resolve(data);
} }
} else if (data && data.status === 401){
message.danger(data.message);
} else { } else {
if (data) { if (data) {
reject(data.message); reject(data.message);
......
...@@ -75,7 +75,7 @@ export function commonGet(url) { ...@@ -75,7 +75,7 @@ export function commonGet(url) {
reject(error){ reject(error){
window.setLoading && window.setLoading(false); window.setLoading && window.setLoading(false);
delRequest(url, 'GET'); delRequest(url, 'GET');
//message.danger(error.message || '请求失败,服务器错误!'); // message.danger(error.message || '请求失败,服务器错误!');
} }
}).then(data => payload(data)); }).then(data => payload(data));
} }
...@@ -90,7 +90,7 @@ export function commonPost(url, data, params) { ...@@ -90,7 +90,7 @@ export function commonPost(url, data, params) {
reject(error){ reject(error){
delRequest(url, 'POST'); delRequest(url, 'POST');
window.setLoading && window.setLoading(false); window.setLoading && window.setLoading(false);
//message.danger(error.message || '请求失败,服务器错误!'); // message.danger(error.message || '请求失败,服务器错误!');
} }
}).then(data => payload(data)); }).then(data => payload(data));
} }
...@@ -105,7 +105,7 @@ export function commonPut(url, data, params) { ...@@ -105,7 +105,7 @@ export function commonPut(url, data, params) {
reject(error){ reject(error){
delRequest(url, 'PUT'); delRequest(url, 'PUT');
window.setLoading && window.setLoading(false); window.setLoading && window.setLoading(false);
//message.danger(error.message || '请求失败,服务器错误!'); // message.danger(error.message || '请求失败,服务器错误!');
} }
}).then(data => payload(data)); }).then(data => payload(data));
} }
...@@ -119,7 +119,7 @@ export function commonDelete(url, data, params) { ...@@ -119,7 +119,7 @@ export function commonDelete(url, data, params) {
body: data, body: data,
reject(error){ reject(error){
window.setLoading && window.setLoading(false); window.setLoading && window.setLoading(false);
//message.danger(error.message || '请求失败,服务器错误!'); // message.danger(error.message || '请求失败,服务器错误!');
} }
}).then(data => payload(data)); }).then(data => payload(data));
} }
......
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