ucservice 2.1.0 → 2.1.2

package/dist/ucservice.common.js

@@ -31436,6 +31436,7 @@ const loadJson = function (url, param, backSuccfn, async, method, headers, conte
     'type': method,
     'url': url,
     'data': param,
+    'timeout': 20000,
     'async': async
   };
   if (headers) Object.assign(ajaxContent, headers);
@@ -31451,6 +31452,7 @@ const loadJson = function (url, param, backSuccfn, async, method, headers, conte
 
   $.ajax(ajaxContent).fail(function (jqXHR, sts) {
     console.error('加载数据失败：' + sts + ", " + url);
+    if (backSuccfn) backSuccfn(null);
     throw new Error('请求失败！');
   }).done(function (ret) {
     if (!ret || ret.code != 0) {
@@ -32427,19 +32429,17 @@ const deptRyOp = sip => {
     listIds: function (param) {
       let net = dept_ry_url.listOrgMemberByIdsNet;
       return new Promise((resolve, reject) => {
-        try {
-          loadJson(server_ + net.url, { ...param
-          }, function (ret) {
+        loadJson(server_ + net.url, { ...param
+        }, function (ret) {
+          if (!ret) reject('网络连接问题');else {
             if (ret.code == 0) {
               resolve(ret);
             } else {
               console.log("多id查询成员列表失败", ret.code);
               reject(ret.code);
             }
-          }, '', net.method);
-        } catch (e) {
-          throw e;
-        }
+          }
+        }, '', net.method);
       });
     }
   };
@@ -32508,19 +32508,17 @@ const locationOp = sip => {
     locateDeviceByType: function (param) {
       let net = location_url.listTypeLocationNet;
       return new Promise((resolve, reject) => {
-        try {
-          loadJson(server_ + net.url, { ...param
-          }, function (ret) {
+        loadJson(server_ + net.url, { ...param
+        }, function (ret) {
+          if (!ret) reject('网络连接问题');else {
             if (ret.code == 0) {
               resolve(ret);
             } else {
               console.log("获取设备信息失败", ret.code);
               reject(ret.code);
             }
-          }, '', net.method);
-        } catch (e) {
-          throw e;
-        }
+          }
+        }, '', net.method);
       });
     }
   };