上傳檔案到 'app/templates'

app/templates/board_loader-1.html

@@ -1339,10 +1339,13 @@
                                          'burner_mac':prog_burner_mac}
                         $("#programmer_Value").text("準備燒錄...");
                         $.get('/board_programmer', prog_data, function (res) {
-                            $("#programmer_Value").text(res);
-                            // alert(res);
-                            // var prog_tank_data = $('#prog_tank').find(':selected').val();
-                            eval('var prog_result_interval = setInterval("board_programmer_result(\'' + prog_tank_data + '\')", 5000);')
+                            // $("#programmer_Value").text(res);
+                            prog_result_interval = setInterval("board_programmer_result(\'" + prog_tank_data + "\')", 5000);
+                            // if (res === 'no reply') {
+                            //     alert("控制板燒錄 Code_upload : no reply");
+                            // } else {
+                            //     eval('var prog_result_interval = setInterval("board_programmer_result(\'' + prog_tank_data + '\')", 5000);');
+                            // }
                         }, 'text');
                     }
                 }
@@ -1360,13 +1363,14 @@
                         type:"GET",
                         url:"/board_programmer_result_" + tid,
                         dataType:"text",
+                        async:false,
                         success:function(response){
                             console.log("board_programmer_result: " + response);
                             console.log(response != '0')
                             if (response != '0') {
+                                $("#programmer_Value").text(response);
+                                alert("燒錄結果: " + response);
                                 clearInterval(prog_result_interval);
-                                $("#programmer_Value").text(prog_result_interval);
-                                alert("燒錄結果: " + prog_result_interval);
                             }
                             board_programmer_process = 0;
                         },

app/templates/tank_relation.html

@@ -319,10 +319,17 @@
                     </td>
                     <td>
                         <select id="{{ i.tank_id }}_type" onchange="" class="select-input">
-                            <option value="tank">桶槽</option>
-                            <option value="import">入料儲豆槽</option>
-                            <option value="export">出料儲豆槽</option>
-                            <option value="mix">混合槽</option>
+                            <option value="mix" selected>混合槽</option>
+                            <option value="clean_tank">清洗桶槽</option>
+                            <option value="reclaimedwater_tank">中水桶</option>
+                            <option value="colorselect_tank">色選機</option>
+                            <option value="peel_tank">脫皮機</option>
+                            <option value="ferment_in">發酵入料</option>
+                            <option value="ferment_tank">發酵桶槽</option>
+                            <option value="ferment_out">發酵出料</option>
+                            <option value="dry_in">乾燥入料</option>
+                            <option value="dry_tank">乾燥桶槽</option>
+                            <option value="dry_out">乾燥出料</option>
                         </select>
                     </td>
                     <script>
@@ -379,9 +386,17 @@
                     </td>
                     <td>
                         <select id="new_type" onchange="" class="select-input">
-                            <option value="tank">桶槽</option>
-                            <option value="import">入料儲豆槽</option>
-                            <option value="export">出料儲豆槽</option>
+                            <option value="mix" selected>混合槽</option>
+                            <option value="clean_tank">清洗桶槽</option>
+                            <option value="reclaimedwater_tank">中水桶</option>
+                            <option value="colorselect_tank">色選機</option>
+                            <option value="peel_tank">脫皮機</option>
+                            <option value="ferment_in">發酵入料</option>
+                            <option value="ferment_tank">發酵桶槽</option>
+                            <option value="ferment_out">發酵出料</option>
+                            <option value="dry_in">乾燥入料</option>
+                            <option value="dry_tank">乾燥桶槽</option>
+                            <option value="dry_out">乾燥出料</option>
                         </select>
                     </td>
                     <td>