Authored by 鲁尚清

Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-lushangqing
... ... @@ -224,7 +224,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
},
data: busTypeList,
on: function (data) {
if (data.isAdd) {
if (data.arr && data.arr.length > 0) {
busId = data.arr[0].busId;
} else {
busId = '';
... ... @@ -284,7 +284,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
height: '170px',
data: resTypeList,
on: function (data) {
if (data.isAdd) {
if (data.arr && data.arr.length > 0) {
resType = data.arr[0].resTypeCode;
} else {
resType = '';
... ...
... ... @@ -121,11 +121,12 @@ layui.define(['laytpl', 'layer'], function (exports) {
}
//其它异常
else {
var error = [
'<cite>Error:</cite> ' + (res[response.msgName] || '返回状态码异常')
, debug()
].join('');
view.error(error);
// var error = [
// '<cite>Error:</cite> ' + (res[response.msgName] || '返回状态码异常')
// , debug()
// ].join('');
// view.error(error);
console.log(error)
}
//只要 http 状态码正常,无论 response 的 code 是否正常都执行 success
... ...