apk类型修改。

app-backend-web/src/main/webapp/WEB-INF/template/admin/apkInfo/add.ftl

@@ -54,12 +54,14 @@
                 <span class="requiredField">*</span>型号
             </th>
             <td>
-                <input type="radio" name="model" value="301ch" checked/>MG301国内
-                <input type="radio" name="model" value="301en" />MG301国外
-                <input type="radio" name="model" value="320ch"/>MG320国内
-                <input type="radio" name="model" value="320en"/>MG320国外
-                <input type="radio" name="model" value="280ch"/>MG280国内
-                <input type="radio" name="model" value="280en"/>MG280国外
+                <input type="radio" name="model" value="A" checked/>A
+                <input type="radio" name="model" value="B" />B
+                [#--<input type="radio" name="model" value="301ch" checked/>MG301国内--]
+                [#--<input type="radio" name="model" value="301en" />MG301国外--]
+                [#--<input type="radio" name="model" value="320ch"/>MG320国内--]
+                [#--<input type="radio" name="model" value="320en"/>MG320国外--]
+                [#--<input type="radio" name="model" value="280ch"/>MG280国内--]
+                [#--<input type="radio" name="model" value="280en"/>MG280国外--]
             </td>
         </tr>
         <tr>

app-backend-web/src/main/webapp/WEB-INF/template/admin/apkInfo/edit.ftl

@@ -57,12 +57,14 @@
                 <span class="requiredField">*</span>型号
             </th>
             <td>
-                <input type="radio" name="model" value="301ch" [#if apkInfo.model=="301ch"]checked[/#if]/>MG301国内
-                <input type="radio" name="model" value="301en" [#if apkInfo.model=="301en"]checked[/#if]/>MG301国外
-                <input type="radio" name="model" value="320ch" [#if apkInfo.model=="320ch"]checked[/#if]/>MG320国内
-                <input type="radio" name="model" value="320en" [#if apkInfo.model=="320en"]checked[/#if]/>MG320国外
-                <input type="radio" name="model" value="280ch" [#if apkInfo.model=="280ch"]checked[/#if]/>MG280国内
-                <input type="radio" name="model" value="280en" [#if apkInfo.model=="280en"]checked[/#if]/>MG280国外
+                <input type="radio" name="model" value="A" [#if apkInfo.model=="A"]checked[/#if]/>A
+                <input type="radio" name="model" value="B" [#if apkInfo.model=="B"]checked[/#if]/>B
+                [#--<input type="radio" name="model" value="301ch" [#if apkInfo.model=="301ch"]checked[/#if]/>MG301国内--]
+                [#--<input type="radio" name="model" value="301en" [#if apkInfo.model=="301en"]checked[/#if]/>MG301国外--]
+                [#--<input type="radio" name="model" value="320ch" [#if apkInfo.model=="320ch"]checked[/#if]/>MG320国内--]
+                [#--<input type="radio" name="model" value="320en" [#if apkInfo.model=="320en"]checked[/#if]/>MG320国外--]
+                [#--<input type="radio" name="model" value="280ch" [#if apkInfo.model=="280ch"]checked[/#if]/>MG280国内--]
+                [#--<input type="radio" name="model" value="280en" [#if apkInfo.model=="280en"]checked[/#if]/>MG280国外--]
             </td>
         </tr>
         <tr>

app-backend-web/src/main/webapp/resources/index/js/scanboard.js

@@ -782,7 +782,7 @@ $(function(){
     };
 	//循环变化机器参数
     function changeA() {
-        console.log("changeA()=="+funA);
+        // console.log("changeA()=="+funA);
         var val= 0;
         var shuxing = document.getElementById("shuxing");
         var odorConcentration = window.document.getElementById("odorConcentration");
@@ -790,14 +790,14 @@ $(function(){
         var cabinetHd = window.document.getElementById("cabinetHd");
         mytimer = setInterval(function(){test();}, 5000);  //利用setInterval实现间隔两秒执行一次test()函数
         function test() {
-            console.log("mytimer1=="+mytimer);
+            // console.log("mytimer1=="+mytimer);
             for (var i = 0; i < equipmentLists.length; i++) {
                 // var option = document.createElement("option");
                 // option.innerHTML = equipmentLists[i].name;
                 // option.value = equipmentLists[i].name;
                 // option.selected = true;
                 // shuxing.appendChild(option);
-                console.log(i);
+                // console.log(i);
                 var c = val;
                 if(val==i){
                     for (var j = 0; j < shuxing.options.length; j++){
@@ -818,24 +818,24 @@ $(function(){
                 // funA = setInterval(changeA,equipmentLists.length*5000);
                 funA = setInterval(changeA,5000);
                 clearInterval(mytimer);
-                console.log("mytimer");
+                // console.log("mytimer");
             }
         }
         if(1==1){
             clearInterval(funA);
-            console.log("close changeA");
+            // console.log("close changeA");
         }
 
     };
     function changeB() {
-        console.log("changeB()=="+funB);
+        // console.log("changeB()=="+funB);
         var val= 0;
         var wuliao = document.getElementById("wuliao");
         var resource=window.document .getElementById ("resource");
         mytimerB = setInterval(function(){testB();}, 5000);  //利用setInterval实现间隔两秒执行一次test()函数
         function testB() {
             for (var i = 0; i < equipmentLists.length; i++) {
-                console.log("0"+i);
+                // console.log("0"+i);
                 var c = val;
                 if(val==i){
                     for (var j = 0; j < wuliao.options.length; j++){
@@ -866,19 +866,19 @@ $(function(){
                 // funB = setInterval(changeB,equipmentLists.length*5000);
                 funB = setInterval(changeB,5000);
                 clearInterval(mytimerB);
-                console.log("mytimerB1");
+                // console.log("mytimerB1");
             }
         }
         if(1==1){
             clearInterval(funB);
-            console.log("close changeB");
+            // console.log("close changeB");
         }
     };
 
 });
 function getEquipmentWuliao(name){
     clearInterval(funB);
-    console.log("changeB()=="+funB);
+    // console.log("changeB()=="+funB);
     clearInterval(mytimerB);
     var equipmentList =null;
     $.ajax({
@@ -960,9 +960,9 @@ var equipmentLis = null;
 //机器的状态，温度，湿度，清洗剂的剩余用量  onchange()
 function getEquipmentShuxing(name){
     clearInterval(funA);
-    console.log("changeA()=="+funA);
+    // console.log("changeA()=="+funA);
     clearInterval(mytimer);
-    console.log("mytimerA=="+mytimer);
+    // console.log("mytimerA=="+mytimer);
     var equipmentList =null;
     $.ajax({
         url:"/asl-admin/index/equipmentStatus.htm",
@@ -988,7 +988,7 @@ function getEquipmentShuxing(name){
     });
 };
 function changeA() {
-    console.log("changeA2()=="+funA);
+    // console.log("changeA2()=="+funA);
     var val= 0;
     var shuxing = document.getElementById("shuxing");
     var odorConcentration = window.document.getElementById("odorConcentration");
@@ -1002,7 +1002,7 @@ function changeA() {
             // option.value = equipmentLists[i].name;
             // option.selected = true;
             // shuxing.appendChild(option);
-            console.log(i);
+            // console.log(i);
             var c = val;
             if(val==i){
                 for (var j = 0; j < shuxing.options.length; j++){
@@ -1023,23 +1023,23 @@ function changeA() {
             // funA = setInterval(changeA,equipmentLis.length*5000);
             funA = setInterval(changeA,5000);
             clearInterval(mytimer);
-            console.log("mytimer2");
+            // console.log("mytimer2");
         }
     }
     if(1==1){
         clearInterval(funA);
-        console.log("close changeA2");
+        // console.log("close changeA2");
     }
 };
 function changeB() {
-    console.log("changeB2()=="+funB);
+    // console.log("changeB2()=="+funB);
     var val= 0;
     var wuliao = document.getElementById("wuliao");
     var resource=window.document .getElementById ("resource");
     mytimerB = setInterval(function(){testB();}, 5000);  //利用setInterval实现间隔两秒执行一次test()函数
     function testB() {
         for (var i = 0; i < equipmentLis.length; i++) {
-            console.log("00"+i);
+            // console.log("00"+i);
             var c = val;
             if(val==i){
                 for (var j = 0; j < wuliao.options.length; j++){
@@ -1070,11 +1070,11 @@ function changeB() {
             // funB = setInterval(changeB,equipmentLis.length*5000);
             funB = setInterval(changeB,5000);
             clearInterval(mytimerB);
-            console.log("mytimerB2");
+            // console.log("mytimerB2");
         }
     }
     if(1==1){
         clearInterval(funB);
-        console.log("close changeB2");
+        // console.log("close changeB2");
     }
 };