CCC

denglu.html

@@ -97,6 +97,8 @@
         </div>
     </nav>
     <div class="container-fluid" style="margin-top: 10em">
+        <div class="alert alert-warning" id="mpAlert" style="display:none">
+        </div>
         <div class="card">
             <h5 class="card-header">
                 生产线 :

js/basic.js

@@ -183,6 +183,7 @@ function send_alert(a, b){
     if(Queue.shouldStop) return;
     $("#mpAlert").html(a);
     $("#mpAlert").show();
+    return;
 
     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");
@@ -205,7 +206,7 @@ function getUserName(uid){
     var uname = null;
     Users.list.forEach(function(val, aid, arr){
        if(val.worker.userId == uid){
-           uname = worker.userName;
+           uname = val.worker.userName;
        }
     });
     if(uname == null) {
@@ -222,7 +223,7 @@ function on_username_retn(obj, sta) {
     var out = first_parse(this, obj);
     if(out.list.length > 0){
         Users.list.push({
-            uid : ruid, worker: out
+            uid : ruid, worker: out.list[0]
         });
     }
 }

js/entrance.js

@@ -40,7 +40,7 @@ function first_success(obj, sta) {
         }
     }
     if (k === output.list.length) {
-        alert("请注意：您并不是任何生产线的负责人\n因此，您不得开始任何班次，只能进入已经存在的班次\n 提示：测试模式不受此限制！");
+        send_alert("请注意：您并不是任何生产线的负责人\n因此，您不得开始任何班次，只能进入已经存在的班次\n 提示：测试模式不受此限制！");
     }
 }
 

js/lazhang-data.js

@@ -128,7 +128,7 @@ function get_stop_scheudle() {
 }
 
 function stopSuccess(obj, sta) {
-    alert("下班操作成功！");
+    send_alert("下班操作成功！ <a href='denglu.html'> 点击这里返回控制主页 </a>");
 }
 
 function history_success(obj, sta) {