Merge branch 'master' of https://matrix.niimei.com/szustar/szugift-fe

sourcecode/h5app/vue/src/connector/basic-service.js

@@ -12,455 +12,435 @@
  *  @ jason.lu
  * */
 
+import 'whatwg-fetch';
+
+var BasicFunction = new (function () {
+
+    this.Queue = {
+        THRESHOLD: 1000,
+        IS_LOADED: false,
+        nowuse: 0, SVR_URL: "/server/",
+        groupsCount: 0, groups: [],
+        shouldStop: false,
+        backup: ["/server/",
+            "http://127.0.0.1:8866/server/",
+            "http://south.niimei.com:8866/server/",
+            "https://4.niimei.com/server/"],
+        list: [], temporary: 0, errorCount: 0
+    };
+
+    this.Users = {list: []};
+    this.Sectors = {list: []};
+    this.AlertClosingTimeout = 0;
+
+    this.loglog = function (a) {
+        console.log(a);
+    };
+
+    this.logwarn = function (obj) {
+        console.warn(obj);
+    };
+
+    this.logerror = function (obj) {
+        console.warn(obj);
+    };
+
+    this.logtrace = function () {
+        console.trace();
+    };
 
-function utils_get_param(name){
-    var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
-    var r = window.location.search.substr(1).match(reg);
-    if(r!=null)return  unescape(r[2]); return null;
-}
-
-function reloadPage(){
-    location.reload()
-}
-
-let Queue = {THRESHOLD: 1000,
-    IS_LOADED : false,
-    nowuse : 0, SVR_URL:"http://localhost:8803/server/",
-    groupsCount : 0, groups:[],
-    shouldStop : false,
-    backup:["http://localhost:8803/server/",
-        "/server/",
-        "http://172.30.84.3:8803/server/","https://1.niimei.com/server/"] ,
-    list:[], temporary:0, errorCount:0};
-
-let Users = {list : []};
-let Sectors = {list : []};
-
-function get_server_url() {
-    let output = $.ajax({url: Queue.SVR_URL + "/fcFlow/list", timeout:1000 }).fail(on_check_fail).done(function(){
-        Queue.IS_LOADED = true;
-        console.warn("Using SERVER : ");
-        console.warn(Queue.SVR_URL);
-        setTimeout(parse_queue, 50);
-    });
-}
-
-function on_check_fail(){
-    if(Queue.nowuse === Queue.backup.length - 1){
-        console.warn("Backup Failed : " + Queue.backup[Queue.nowuse]);
-        console.warn(this);
-        var out = "";
-        Queue.backup.forEach(function(val,index,arr){
-            out += val + "\n";
-        });
-        send_alert("抱歉， 服务器连接失败! \n 请确认 " + out + "其中之一可用");
-    }else{
-        Queue.nowuse ++;
-        Queue.SVR_URL = Queue.backup[Queue.nowuse];
-        $.ajax({url: Queue.SVR_URL + "/fcFlow/list", timeout:1000 }).fail(on_check_fail).done(function(){
-            Queue.IS_LOADED = true;
-            console.warn("Using SERVER : ");
-            console.warn(Queue.SVR_URL);
-            setTimeout(parse_queue, 50);
+    this.logverbose = function () {
+        // Not Echoing
+    };
+
+    this.asserThat = function(cond, why) {
+        console.assert(cond, why);
+    };
+
+
+    this.goajax = function (jqObject) {
+        return fetch(jqObject.url, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                //'x-doiby-authenticate' : 'CISICMIEINAOQPMDPWIDNENU'
+            },
+            body: jqObject.data
         });
-    }
-}
+    };
+
+    this.utils_get_param = function (name) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+        var r = window.location.search.substr(1).match(reg);
+        if (r != null) return unescape(r[2]);
+        return null;
+    };
+
+    this.reloadPage = function () {
+        location.reload()
+    };
+
+    this.get_server_url = function () {
+        // AJAX
+        this.output = this.goajax({url: this.Queue.SVR_URL + "fcFlow/list", timeout: 1000})
+            .then(this.checkStatus)
+            .then(this.parseJson)
+            .then(this.onReachServer)
+            .catch(this.onCheckFail);
+        // .then(BasicFunction.onCheckFail);
+    };
+
+    this.onReachServer = function (checkResponse) {
+        BasicFunction.Queue.IS_LOADED = true;
+        BasicFunction.logwarn("Using SERVER : ");
+        BasicFunction.logwarn(BasicFunction.Queue.SVR_URL);
+        setTimeout(BasicFunction.parse_queue, 50, BasicFunction);
+    };
+
+    this.onCheckFail = function (errmsg) {
+        if (BasicFunction.Queue.nowuse === BasicFunction.Queue.backup.length - 1) {
+            BasicFunction.logwarn("Backup Failed : " + BasicFunction.Queue.backup[BasicFunction.Queue.nowuse]);
+            BasicFunction.logwarn(this);
+            var out = "";
+            BasicFunction.Queue.backup.forEach(function (val, index, arr) {
+                out += index + ":[" +val +"] \n";
+            });
+            BasicFunction.logerror("抱歉， 服务器连接失败! \n 请确认 "+ out +" 其中之一可用");
+        } else {
+            BasicFunction.loglog(errmsg);
+            BasicFunction.Queue.nowuse++;
+            BasicFunction.Queue.SVR_URL = BasicFunction.Queue.backup[BasicFunction.Queue.nowuse];
+            // AJAX
+            BasicFunction.goajax({url: BasicFunction.Queue.SVR_URL + "fcFlow/list", timeout: 1000})
+                .then(BasicFunction.checkStatus)
+                .then(BasicFunction.parseJson)
+                .then(BasicFunction.onReachServer)
+                .catch(BasicFunction.onCheckFail);
+            //.fail(BasicFunction.onCheckFail).done(BasicFunction.onReachServer);
+        }
+    };
 
-function get_data(url, callback, scope) {
-    Queue.list.push({url:url, callback:callback, gid:-1, scope:scope});
-}
+    this.get_data = function (url, callback, scope) {
+        BasicFunction.Queue.list.push({url: url, callback: callback, gid: -1, scope: scope});
+    };
 
-function new_data_group(groupName, callback){
-    var gid = -1;
-    Queue.groups.forEach(function(val,index,arr){
-        if(val.groupName === groupName){
-            gid = val.gid;
+    this.new_data_group = function (groupName, callback) {
+        var gid = -1;
+        BasicFunction.Queue.groups.forEach(function (val) {
+            if (val.groupName === groupName) {
+                gid = val.gid;
+            }
+        });
+        if (gid === -1) {
+            gid = BasicFunction.Queue.groupsCount;
+            BasicFunction.Queue.groupsCount++;
+            BasicFunction.Queue.groups.push({
+                gid: gid, groupName: groupName, callme: callback, counter: 0
+            });
         }
-    });
-    if(gid === -1) {
-        gid = Queue.groupsCount;
-        Queue.groupsCount++;
-        Queue.groups.push({
-            gid: gid, groupName:groupName, callme: callback, counter:0
+        return gid;
+    };
+
+    this.group_get_data = function (groupName, url, callback) {
+        var gid = -1;
+        BasicFunction.Queue.groups.forEach(function (val) {
+            if (val.groupName === groupName) {
+                gid = val.gid;
+            }
         });
-    }
-    return gid;
-}
-
-function group_get_data(groupName, url, callback){
-    var gid = -1;
-    Queue.groups.forEach(function(val,index,arr){
-        if(val.groupName === groupName){
-            gid = val.gid;
+        if (gid === -1) {
+            BasicFunction.send_alert("Group 方法使用错误！！！")
         }
-    });
-    if(gid === -1) {
-        send_alert("Group 方法使用错误！！！")
-    }
-    Queue.list.push({url:url, callback:callback, gid:gid});
-}
+        BasicFunction.Queue.list.push({url: url, callback: callback, gid: gid});
+    };
 
-function parse_queue(){
-    console.log("Queue Length : " + Queue.list.length);
+    this.parse_queue = function () {
+        BasicFunction.logverbose("Queue Length : " + BasicFunction.Queue.list.length);
 
-    if(Queue.temporary > new Date().getTime()){
-        for(i = 0; i < Queue.list.length; i++) {
-            Queue.list.pop();
+        if (BasicFunction.Queue.temporary > new Date().getTime()) {
+            for (let i = 0; i < BasicFunction.Queue.list.length; i++) {
+                BasicFunction.Queue.list.pop();
+            }
         }
-    }
 
-    Queue.temporary = 0;
+        BasicFunction.Queue.temporary = 0;
 
-    if(Queue.list.length > 0){
-        let one = Queue.list.pop();
-        if(one.gid === -1) {
-            request_data(one.url, one.callback, one.scope);
-        }else{
-            g_request_data(one.url, one.callback, one.gid, one.scope);
-        }
-    }
-    if(Queue.shouldStop == false) {
-        setTimeout(parse_queue, 50);
-    }
-}
-
-function request_data(url, callback, scope){
-    $.ajax({
-        url: Queue.SVR_URL + url,
-        apiName: url,
-        sendTime: new Date(),
-        callme: callback,
-        callerThis: scope
-    }).done(on_dat_success).fail(on_fail);
-}
-
-function g_request_data(url, callback, gid){
-    $.ajax({
-        url: Queue.SVR_URL + url,
-        apiName: url,
-        sendTime: new Date(),
-        gid: gid,
-        callme: callback
-    }).done(on_gp_success).fail(on_fail);
-}
-
-function on_gp_success(a,b) {
-    var gid = this.gid;
-    if(check_if_success(a,b)) {
-        this.callme(a,b);
-        Queue.groups.forEach(function(v,i,a){
-            if(v.gid === gid){
-                v.counter ++;
-                v.callme(v);
+        if (BasicFunction.Queue.list.length > 0) {
+            let one = BasicFunction.Queue.list.pop();
+            if (one.gid === -1) {
+                request_data(one.url, one.callback, one.scope);
+            } else {
+                g_request_data(one.url, one.callback, one.gid, one.scope);
             }
-        });
-    }
-}
+        }
+        if (BasicFunction.Queue.shouldStop === false) {
+            setTimeout(BasicFunction.parse_queue, 50);
+        }
+    };
 
-function on_dat_success(a,b){
-    if(check_if_authfail(a,b)){
-        setCookieWithTimeout("doibyUser","",-10);
-        location.href = "sign-in1.html?from=entrance-5&msg=server-redirect-detected";
-        return;
-    }
-    if(check_if_success(a,b)) {
-        this.callme(a,b);
-    }
-}
+    this.parseJSON = function(response) {
+        return response.json();
+    };
 
-function check_if_authfail(a){
-    if(a == null || typeof a !== "string") {
-        return false;
-    }else{
-        if(a.indexOf("login?from=") > 0 || a.startsWith("<!DOCTYPE html>") || a.indexOf("<!-- SME::LOGINPAGE -->") > 0){
-            return true;
+    this.checkStatus = function(response) {
+        if (response.status >= 200 && response.status < 300) {
+            return response;
         }
-    }
-    return false;
-}
 
-function check_if_success(a,b){
-    if(typeof a === "string"){
-        try {
-            a = JSON.parse(a);
-        }catch (e) {
-            console.warn("=----------   异常   -----------=");
-            console.warn(a);
-            console.warn("=----------------------------=");
-            send_alert("信息失败 : "+e);
+        const error = new Error(response.statusText);
+        error.response = response;
+        throw error;
+    };
+
+    function request_data(url, callback, scope) {
+        BasicFunction.goajax({
+            url: BasicFunction.Queue.SVR_URL + url,
+            apiName: url,
+            sendTime: new Date()
+        }).then(BasicFunction.checkStatus)
+          .then(BasicFunction.parseJson)
+          .then(BasicFunction.on_dat_success)
+          .catch(BasicFunction.on_fail);
+    }
+
+    function g_request_data(url, callback, gid) {
+        BasicFunction.goajax({
+            url: BasicFunction.Queue.SVR_URL + url,
+            apiName: url,
+            sendTime: new Date(),
+            gid: gid,
+            callme: callback
+        }).then(res => {
+            return res.json()
+        })
+            .then(BasicFunction.on_gp_success)
+        .then(callback)
+        .catch(BasicFunction.on_fail);
+    }
+
+    this.on_gp_success = function(response) {
+        var obj = response.json();
+        var b = respose.status;
+        var gid = obj.gid;
+        if (BasicFunction.check_if_success(obj, b)) {
+            obj.callme(obj, b);
+            BasicFunction.Queue.groups.forEach(function (v) {
+                if (v.gid === gid) {
+                    v.counter++;
+                    return v;
+                }
+            });
+        }
+        return null;
+    };
+
+    this.on_dat_success = function(responseJson) {
+        var a = responseJson;
+        // if (BasicFunction.check_if_authfail(a, {})) {
+        //     BasicFunction.setCookieWithTimeout("doibyUser", "", -10);
+        //     location.href = "sign-in1.html?from=entrance-5&msg=server-redirect-detected";
+        //     return;
+        // }
+        //BasicFunction.check_if_success(a, {})) {
+        return a;
+        //}
+    };
+
+    this.check_if_authfail = function (errormsg) {
+        BasicFunction.logerror(errormsg);
+        var a = errormsg;
+        if (a == null || typeof a !== "string") {
+            return false;
+        } else {
+            if (a.indexOf("login?from=") > 0 || a.startsWith("<!DOCTYPE html>") || a.indexOf("<!-- SME::LOGINPAGE -->") > 0) {
+                return true;
+            }
+        }
+        return false;
+    };
+
+    this.check_if_success = function (response) {
+        // this == BasicFunction
+        BasicFunction.loglog("---------------Check-If-Success----------------");
+        var a = response.json();
+        var b = response.status;
+        if (typeof a === "string") {
+            try {
+                a = JSON.parse(a);
+            } catch (e) {
+                BasicFunction.logwarn("=----------   异常   -----------=");
+                BasicFunction.logwarn(a);
+                BasicFunction.logwarn("=----------------------------=");
+                BasicFunction.send_alert("信息失败 : 1 : " + e);
+                return;
+            }
+        } else if (typeof a === "undefined") {
+            BasicFunction.logwarn("=----------   异常   -----------=");
+            BasicFunction.logwarn(a);
+            BasicFunction.logwarn("=------------------------------=");
+            BasicFunction.logwarn(b);
+            BasicFunction.logwarn("=------------------------------=");
+            BasicFunction.send_alert("信息失败 - 2 " );
             return;
         }
-    }else if(typeof a === "undefined"){
-        console.warn("=----------   异常   -----------=");
-        console.warn(a);
-        console.warn("=------------------------------=");
-        send_alert("信息失败 : "+e);
-        return;
-    }
-    if(a.ret === "10000") {
-        return true;
-    }else{
-        console.trace();
-        console.error(b);
-        console.error(JSON.stringify(a));
-        send_alert("查询失败 : 请参阅控制台输出! ");
-    }
-
-    return false;
-}
-
-function on_fail(msg, sta) {
-    Queue.errorCount += 1;
-    if(Queue.errorCount >= 10){
-        Queue.errorCount = 0;
-        Queue.temporary = new Date().getTime() + 30*1000;
-        Queue.shouldStop = true;
-        console.warn("-----  Too many failure, temporary stop HTTP ------");
-        send_alert("很抱歉，网络错误数量过多，暂时终止HTTP功能30s");
-    }
-    let vurl = "";
-    try {
-        vurl = " : "+this.url.substring(7, 12);
-    }catch (e) {
-        vurl = "";
-    }
-    send_alert("很抱歉，网络错误，请查看 Console" + vurl);
-    console.warn("-----   网络请求失败 ---------");
-    try {
-        console.warn(JSON.stringify(this));
-    }catch (e) {
-        console.warn(JSON.stringify(this.url));
-        console.warn(JSON.stringify(this.responseText));
-    }
-    console.warn("-----------msg-------------");
-    console.warn(JSON.stringify(msg));
-    console.warn("-----------sta--------------");
-    console.warn(JSON.stringify(sta));
-    console.warn("----------------------------");
-}
-
-function first_parse(ajax, obj) {
-    if (typeof obj === "string") {
-        obj = JSON.parse(obj);
-    }
-
-    if (typeof obj !== "object") {
-        console.warn(ajax);
-        throw "Error ! Parsing JSON failed ." + JSON.stringify(obj);
-    }
-
-    if (obj.ret === "10000") {
-        return obj.model;
-    } else {
-        console.warn(ajax);
-        throw "Error ! Server returned error." + JSON.stringify(obj);
-    }
-}
+        if (a.ret === "10000") {
+            return true;
+        } else {
+            BasicFunction.logtrace();
+            BasicFunction.logerror(b);
+            BasicFunction.logerror(JSON.stringify(a));
+            BasicFunction.send_alert("查询失败 : 请参阅控制台输出! ");
+        }
 
+        return false;
+    };
+
+    this.on_fail = function (msg, sta, obj) {
+        BasicFunction.Queue.errorCount += 1;
+        if (BasicFunction.Queue.errorCount >= 10) {
+            BasicFunction.Queue.errorCount = 0;
+            BasicFunction.Queue.temporary = new Date().getTime() + 30 * 1000;
+            BasicFunction.Queue.shouldStop = true;
+            BasicFunction.logwarn("-----  Too many failure, temporary stop HTTP ------");
+            BasicFunction.send_alert("很抱歉，网络错误数量过多，暂时终止HTTP功能30s");
+        }
+        BasicFunction.send_alert("很抱歉，网络错误，请查看 Console");
+        BasicFunction.logwarn("-----   网络请求失败 ---------");
+        BasicFunction.logwarn("-----------msg-------------");
+        BasicFunction.logwarn(JSON.stringify(msg));
+        BasicFunction.logwarn("----------------------------");
+    };
+
+    this.first_parse = function (ajax, obj) {
+        if (typeof obj === "string") {
+            obj = JSON.parse(obj);
+        }
 
-function on_document_load() {
-    if(typeof (page_document_load) !== "undefined"){
-        page_document_load();
-    }
-    if(typeof (resizeAll) !== "undefined"){
-        resizeAll();
-    }
-}
+        if (typeof obj !== "object") {
+            BasicFunction.logwarn(ajax);
+            throw "Error ! Parsing JSON failed ." + JSON.stringify(obj);
+        }
 
-var AlertClosingTimeout = 0;
+        if (obj.ret === "10000") {
+            return obj.model;
+        } else {
+            BasicFunction.logwarn(ajax);
+            throw "Error ! Server returned error." + JSON.stringify(obj);
+        }
+    };
 
-function send_alert(a, b){
+    this.send_alert = function (a, b) {
 
-    if(Queue.shouldStop) return;
-    $("#mpAlert").html(a);
-    $("#mpAlert").show();
 
-    if(AlertClosingTimeout > 0) {
-        clearTimeout(AlertClosingTimeout);
-    }
+        if (BasicFunction.Queue.shouldStop) return;
 
-    AlertClosingTimeout = setTimeout(function(){
-        if ($("#mpAlert").html().indexOf("<") >= 0) {
-            return;
+        if (BasicFunction.AlertClosingTimeout > 0) {
+            clearTimeout(BasicFunction.AlertClosingTimeout);
         }
-        $("#mpAlert").hide();
-    }, 10000);
 
-    return;
+        BasicFunction.logwarn(a);
+        BasicFunction.logwarn(b);
 
-    var q = "<!-- Modal 部分开始 -->\n<div class=\"modal fade\" id=\"alertModal\" tabindex=\"-1\" role=\"dialog\" aria-hidden=\"true\">\n    <div class=\"modal-dialog\" role=\"document\">\n        <div class=\"modal-content\">\n            <div class=\"modal-header\">\n                <h5 class=\"modal-title\" id=\"alertModalLabel\">New message</h5>\n                <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\">\n                    <span aria-hidden=\"true\">&times;</span>\n                </button>\n            </div>\n            <div class=\"modal-body\">\n                <form>\n                    <div class=\"form-group\">\n                        <label for=\"recipient-name\" class=\"col-form-label\">Recipient:</label>\n                        <input type=\"text\" class=\"form-control\" id=\"recipient-name\">\n                    </div>\n                    <div class=\"form-group\">\n                        <label for=\"message-text\" class=\"col-form-label\">Message:</label>\n                        <textarea class=\"form-control\" id=\"message-text\"></textarea>\n                    </div>\n                </form>\n            </div>\n            <div class=\"modal-footer\">\n                <button type=\"button\" class=\"btn btn-secondary\" data-dismiss=\"modal\">Close</button>\n                <button type=\"button\" class=\"btn btn-primary\">Send message</button>\n            </div>\n        </div>\n    </div>\n</div>";
-    //var model = document.createElement("div");
-    if($("#modalContainer").length <= 0){
-        alert(a);
-        return ;
-    }
-    $("#modalContainer").html(q);
-    var modalO = $("alertModal");
-    if(modalO.length === 0){
-        alert(a);
-    }else{
-        $("#alertModelLabel").text(b);
-        $("#message-text").text(b);
-        modalO.modal('show');
-    }
+        // alert(a +"\n"+ b);
 
-}
+        BasicFunction.AlertClosingTimeout = setTimeout(function () {
+            //$("#mpAlert").hide();
+        }, 10000);
 
-function getUserName(uid){
-    var uname = null;
-    Users.list.forEach(function(val, aid, arr){
-        if(val.worker.staffId === uid){
-            uname = val.worker.staffName;
-        }
-    });
-    if(uname == null) {
-        if(uid != 0) {
-            get_data("oaStaff/list?staffId=" + uid, on_username_retn);
-            return "[用户:"+uid+"]";
-        } else return "[用户:"+uid+"]";
-    }else{
-        return uname;
-    }
-}
-
-function on_username_retn(obj, sta) {
-    var uid = this.url.substring(this.url.indexOf("staffId=") + 8);
-    let ruid = parseInt(uid);
-    var out = first_parse(this, obj);
-    if(out.list.length > 0){
-        Users.list.push({
-            uid : ruid, worker: out.list[0]
-        });
-    }
-}
+    };
 
-function getSectorName(sectorId){
-    var secName = null;
-    Sectors.list.forEach(function(val, aid, arr){
-        if(val.sector.sectorId === sectorId){
-            secName = val.sector.sectorName;
-        }
-    });
-    if(secName == null) {
-        get_data("fcSector/list?sectorId=" + sectorId, on_secname_retn);
-        return "[工位:"+sectorId+"]";
-    }else{
-        return secName;
-    }
-}
-
-function on_secname_retn(obj, sta) {
-    var secid = this.url.substring(this.url.indexOf("sectorId=") + 9);
-    let rsecid = parseInt(secid);
-    var out = first_parse(this, obj);
-    if(out.list.length > 0){
-        Sectors.list.push({
-            secid : rsecid, sector: out.list[0]
+    this.getUserName = function (uid) {
+        var uname = null;
+        BasicFunction.Users.list.forEach(function (val, aid) {
+            BasicFunction.loglog(aid);
+            if (val.worker.staffId === uid) {
+                uname = val.worker.staffName;
+            }
         });
-    }
-}
-
-function getSectorId(spotId){
-    var secId = null;
-    Sectors.list.forEach(function(val, aid, arr){
-        if(val.sector.spotId === spotId){
-            secId = val.sector.sectorId;
+        if (uname == null) {
+            if (uid !== 0) {
+                BasicFunction.get_data("oaStaff/list?staffId=" + uid, BasicFunction.on_username_retn);
+                return "[用户:" + uid + "]";
+            } else return "[用户:" + uid + "]";
+        } else {
+            return uname;
         }
-    });
-    if(secId == null) {
-        get_data("fcSectorSpot/list?spotId=" + spotId, on_secid_retn);
-        return -1;
-    }else{
-        return secId;
-    }
-}
-
-function on_secid_retn(obj, sta) {
-    var spotId = this.url.substring(this.url.indexOf("spotId=") + 7);
-    let rsecid = parseInt(spotId);
-    var out = first_parse(this, obj);
-    if(out.list.length > 0){
-        Sectors.list.push({
-            secid : rsecid, sector: out.list[0]
-        });
-    }
-}
-
-/**
- *  Calc b/a+b * 100(precision = 2), when b is zero, return zero
- * @param a (pass)
- * @param b (fail)
- */
-function get_factor(a,b){
-    if(a+b === 0){
-        return 0;
-    }else{
-        return Math.floor(10000* b / (a+b) ) / 100;
-    }
-}
+    };
+
+    this.on_username_retn = function (obj) {
+        var uid = this.url.substring(this.url.indexOf("staffId=") + 8);
+        let ruid = parseInt(uid);
+        var out = BasicFunction.first_parse(this, obj);
+        if (out.list.length > 0) {
+            BasicFunction.Users.list.push({
+                uid: ruid, worker: out.list[0]
+            });
+        }
+    };
 
-function setCookieWithTimeout(name, value, liveMinutes) {
-    if (liveMinutes == undefined || liveMinutes == null) {
-        liveMinutes = 60 * 2;
-    }
-    if (typeof (liveMinutes) != 'number') {
-        liveMinutes = 60 * 2;//默认120分钟
-    }
-    var minutes = liveMinutes * 60 * 1000;
-    var exp = new Date();
-    exp.setTime(exp.getTime() + minutes + 8 * 3600 * 1000);
-    //path=/表示全站有效，而不是当前页
-    document.cookie = name + "=" + value + ";path=/;expires=" + exp.toUTCString();
-}
-
-function setCookie(c_name,value,expiredays)
-{
-    var exdate=new Date()
-    exdate.setDate(exdate.getDate()+expiredays)
-    document.cookie=c_name+ "=" +escape(value)+
-        ((expiredays==null) ? "" : ";expires="+exdate.toGMTString())
-}
-
-function getCookie(c_name)
-{
-    if (document.cookie.length>0)
-    {
-        c_start=document.cookie.indexOf(c_name + "=")
-        if (c_start!=-1)
-        {
-            c_start=c_start + c_name.length+1
-            c_end=document.cookie.indexOf(";",c_start)
-            if (c_end==-1) c_end=document.cookie.length
-            return unescape(document.cookie.substring(c_start,c_end))
+    this.setCookieWithTimeout = function (name, value, liveMinutes) {
+        if (liveMinutes === undefined || liveMinutes == null) {
+            liveMinutes = 60 * 2;
         }
-    }
-    return "";
-}
+        if (typeof (liveMinutes) !== 'number') {
+            liveMinutes = 60 * 2;//默认120分钟
+        }
+        var minutes = liveMinutes * 60 * 1000;
+        var exp = new Date();
+        exp.setTime(exp.getTime() + minutes + 8 * 3600 * 1000);
+        //path=/表示全站有效，而不是当前页
+        document.cookie = name + "=" + value + ";path=/;expires=" + exp.toUTCString();
+    };
+
+    this.setCookie = function (c_name, value, expiredays) {
+        var exdate = new Date();
+        exdate.setDate(exdate.getDate() + expiredays);
+        document.cookie = c_name + "=" + escape(value) +
+            ((expiredays == null) ? "" : ";expires=" + exdate.toGMTString())
+    };
+
+    this.getCookie = function (c_name) {
+        if (document.cookie.length > 0) {
+            var c_start = document.cookie.indexOf(c_name + "=");
+            if (c_start !== -1) {
+                c_start = c_start + c_name.length + 1;
+                var c_end = document.cookie.indexOf(";", c_start);
+                if (c_end === -1) c_end = document.cookie.length;
+                return unescape(document.cookie.substring(c_start, c_end))
+            }
+        }
+        return "";
+    };
 
-var userId = utils_get_param("userId");
+    /*this.userId = utils_get_param("userId");
 
-function getUserId() {
-    console.log("Original  USERID : " + userId);
-    var use = getCookie("doibyUser");
-    if (use == null || use === undefined || use.length <= 0) {
-        location.href = "sign-in1.html?from=entrance-1&msg=nologin-mustauth";
-        return;
-    }
-    console.log("Got UID From COOKIE : " + use);
-    try{
-        var mm = parseInt(use);
-        if(mm <= 0){
-        }else{
-            userId = mm;
+    this.getUserId = function() {
+         BasicFunction.loglog("Original  USERID : " + userId);
+        var use = getCookie("doibyUser");
+        if (use == null || use === undefined || use.length <= 0) {
+            location.href = "sign-in1.html?from=entrance-1&msg=nologin-mustauth";
+            return;
         }
-    }catch (e) {
-        location.href = "sign-in1.html?from=entrance-1&msg=cookie-wrong-format";
-        return;
-    }
+         BasicFunction.loglog("Got UID From COOKIE : " + use);
+        try {
+            var mm = parseInt(use);
+            if (mm > 0) {
+                BasicFunction.userId = mm;
+            }
+        } catch (e) {
+            location.href = "sign-in1.html?from=entrance-1&msg=cookie-wrong-format";
+            return;
+        }
+
+         BasicFunction.loglog("Got UserId Eventually : " + userId);
+    };*/
 
-    console.log("Got UserId Eventually : " + userId);
-}
+    this.get_server_url();
+    //this.on_document_load();
+})();
 
+window.BasicFunction = BasicFunction;
 
-$(document).ready(on_document_load);
-get_server_url();
+export {
+    BasicFunction
+};

sourcecode/h5app/vue/src/connector/data-object.js

@@ -241,3 +241,12 @@ var Module = function(chartContainerSelector, dataCtlName){
         // do drawData
     };
 };
+
+
+export {
+    DataObjectService,
+    DataObjectList,
+    DataObject,
+    Module,
+    SinglePage
+}

sourcecode/h5app/vue/src/views/login.vue

@@ -43,6 +43,7 @@
 
 <script>
     import 'whatwg-fetch';
+    import { BasicFunction } from '../connector/basic-service';
     import {
         Field,
         CellGroup,
@@ -95,6 +96,12 @@
                 //     this.phoneError = true;
                 //     this.passError = true;
                 // }
+                // 检查手机号有无验证
+                BasicFunction.get_data("smartUsers/list", function(response){
+                    console.log("------ Data Rcvd in Login --------");
+                    console.log(response);
+                });
+                // this.$router.push('index');
                 this.$router.push('index');
             },
             Register() {