miacheng913 пре 3 година
родитељ
комит
ec609360fc
1 измењених фајлова са 16 додато и 15 уклоњено
  1. 16 15
      static/home.js

+ 16 - 15
static/home.js

@@ -109,16 +109,16 @@ function factory_show(company){
     var factory_arr = new Array();
     for(var i=0;i<obj[1].length;i++){
         if(factory_arr.indexOf(obj[1][i].factory)==-1 && obj[1][i].company==company){
-            inner+="<button type='button' class='btn text-white m-1' id='factory " +obj[1][i].factory+ "' onclick=\"department_show(\'"+obj[1][i].company+"\',\'"+obj[1][i].factory+"\');\"";
-            inner += ">廠區"+obj[1][i].factory+"</button>";
+            inner+="<button type='button' class='btn text-white m-1' id='factory " +obj[1][i].factory+ "' onclick=\"change_map(\'"+obj[1][i].company+"\',\'"+obj[1][i].factory+"\');\"";
+            inner += ">廠區"+obj[1][i].factory+"</button><button onclick=\"department_show(\'"+obj[1][i].company+"\',\'"+obj[1][i].factory+"\');\"> 查看</button>";
             factory_arr.push(obj[1][i].factory);
         }
     }
     //測試用
-    inner+="<button type='button' class='btn btn btn-outline-success m-1' id='factory B' onclick=\"department_show(\'"+obj[1][0].company+"\',\'B\');\"";
-    inner += ">廠區B</button>";
-    inner+="<button type='button' class='btn btn btn-outline-success m-1' id='factory C' onclick=\"department_show(\'"+obj[1][0].company+"\',\'C\');\"";
-    inner += ">廠區C</button>";
+    inner+="<button type='button' class='btn btn btn-outline-success m-1' id='factory B' onclick=\"change_map(\'"+obj[1][0].company+"\',\'B\');\"";
+    inner += ">廠區B</button> <button onclick=\"department_show(\'"+obj[1][0].company+"\',\'B\');\">查看 </button>";
+    inner+="<button type='button' class='btn btn btn-outline-success m-1' id='factory C' onclick=\"change_map(\'"+obj[1][0].company+"\',\'C\');\"";
+    inner += ">廠區C</button><button onclick=\"department_show(\'"+obj[1][0].company+"\',\'C\');\"> 查看</button>";
     document.getElementById('company').innerHTML="";
     document.getElementById('company_text').innerHTML=company;
     document.getElementById('company_name').innerHTML="<button type='button' class='btn btn-primary m-1' onclick=\"company_show();\">返回</button> 公司"+ company + "";
@@ -155,6 +155,13 @@ function department_show(company,factory){
     document.getElementById('factory_text').innerHTML=factory;
     document.getElementById('department_list').innerHTML=inner;
     console.log("click");
+    clear();
+    document.getElementById('company_name').innerHTML="<button type='button' class='btn btn-primary m-1' onclick=\"factory_show('"+company+"');\">返回</button> 目前位置: 公司 " + company+ " 廠區"+ factory + "";
+    document.getElementById("department_list").style.display="";
+    department_change();
+}
+
+function change_map(company,factory){
     if(factory==='A'){
         newLocation(25.0339031,121.5623212);
     }
@@ -164,15 +171,9 @@ function department_show(company,factory){
     else if(factory==='C'){
         newLocation(24.12,121.42);
     }
-    clear();
-    if(check ===0) {
-        factory_show(company);
-    }
-    document.getElementById('company_name').innerHTML="<button type='button' class='btn btn-primary m-1' onclick=\"factory_show('"+company+"');\">返回</button> 廠區"+ factory + "";
-    document.getElementById("department_list").style.display="";
-    department_change();
 }
 
+
 function department_change(){
     console.log("change");
     check = 0 ;
@@ -180,7 +181,7 @@ function department_change(){
     var tower_group_arr = new Array();
     for(var i=0;i<obj[1].length;i++){
         if(tower_group_arr.indexOf(obj[1][i].group)==-1 && obj[1][i].company==document.getElementById('company_text').innerHTML/*&& obj[1][i].factory==document.getElementById('factory_text').innerHTML&& obj[1][i].department==document.getElementById("department_list").value*/){
-            inner+='<tr><td>' + obj[1][i].group + '</td><td>健康</td><td><button class="btn btn-primary m-1" onclick=\"towerGroup_show();\">查看</button></td></tr><tr><td>2</td><td>健康</td><td><button class="btn btn-primary m-1" onclick=\"towerGroup_show();\">查看</button></td></tr><tr><td>3</td><td>健康</td><td><button class="btn btn-primary m-1" onclick=\"towerGroup_show();\">查看</button></td></tr>' ;
+            inner+='<tr><td>' + obj[1][i].group + '</td><td>健康</td><td><button class="btn btn-primary m-1" onclick=\"towerGroup_show();\">查看</button></td></tr>' ;
             tower_group_arr.push(obj[1][i].group);
             console.log(inner);
         }
@@ -204,7 +205,7 @@ function towerGroup_show(){
     clear();
     company = document.getElementById('company_text').innerHTML
     factory= document.getElementById('factory_text').innerHTML
-    document.getElementById('company_name').innerHTML="<button type='button' class='btn btn-primary m-1' onclick=\"department_show('"+company+"','" + factory+"');\">返回</button> 課"+ document.getElementById("department_list").value + "";
+    document.getElementById('company_name').innerHTML="<button type='button' class='btn btn-primary m-1' onclick=\"department_show('"+company+"','" + factory+"');\">返回</button>目前位置: 公司 " + company+ " 廠區 " + factory+ " 課"+ document.getElementById("department_list").value + "";
     document.getElementById('towergroup').innerHTML=inner;
 }