#IQRV #comment [cfg] 添加设备型号和设备序列号的录入

addin/res/ManagerDesktop/guide.html

@@ -211,9 +211,8 @@
                                         oncontextmenu="return false;" maxlength="16" value="">
                                 </div>
                             </div>
-                            <div id="guide_init_param_ip_check" class="pull-left margin-left-10"
-                                style="display:block;margin-top: 5px;">
-                                <button id="ip_connect_check" style="color: #F37253;">连通性测试</button>
+                            <div id="guide_init_param_ip_check" class="pull-left margin-left-10" style="display:block;">
+                                <button id="ip_connect_check" style="color: #F37253; border: 1px solid #d3d3d3;border-radius: 5px;padding: 6px 12px;margin-left: 8px;">连通性测试</button>
                             </div>
                             <div id="guide_init_param_ip_tips" class="clearboth">
                                 <div class="pull-left" style="width:330px;">&nbsp;</div>
@@ -226,7 +225,7 @@
                                     <div class="text-right guide_input_label">终端机型</div>
                                 </div>
                                 <div class="controls text-left">
-                                    <div id="gui_init_param_machine_type" class="select_on_normal btn_disabled"
+                                    <div id="gui_init_param_machine_type" class="select_on_normal machine_type_seleceed_save_btn"
                                         onclick="SelectItem(this)" value="RVC.Stand2S">柜式双屏大机</div>
                                     <div id="gui_init_param_machine_type_list" class="select_list hide">
                                         <div id="gui_init_param_machine_type_list_item_0" option="RVC.Stand2S" class="select_medium">
@@ -243,19 +242,24 @@
                                     <div id="gui_init_param_vendor" class="select_on_normal vendor_seleceed_save_btn"
                                         onclick="SelectItem(this)" value=""></div>
                                     <div id="gui_init_param_vendor_list" class="select_list hide">
-                                        <div id="gui_init_param_vendor_list_item_0" option="CW" class="select_medium">
+                                        <div id="gui_init_param_vendor_list_item_0" option="CW" class="select_medium"
+                                        onclick="VendorSelectChangedAtInit('CW')">
                                             恒银金融
                                         </div>
-                                        <div id="gui_init_param_vendor_list_item_1" option="KEBA" class="select_medium">
+                                        <div id="gui_init_param_vendor_list_item_1" option="KEBA" class="select_medium"
+                                        onclick="VendorSelectChangedAtInit('KEBA')">
                                             中钞科堡
                                         </div>
-                                        <div id="gui_init_param_vendor_list_item_2" option="GRG" class="select_medium">
+                                        <div id="gui_init_param_vendor_list_item_2" option="GRG" class="select_medium"
+                                        onclick="VendorSelectChangedAtInit('GRG')">
                                             广电运通
                                         </div>
-                                        <div id="gui_init_param_vendor_list_item_3" option="NANTIAN" class="select_medium">
+                                        <div id="gui_init_param_vendor_list_item_3" option="NANTIAN" class="select_medium"
+                                        onclick="VendorSelectChangedAtInit('NANTIAN')">
                                             云南南天
                                         </div>
-                                        <div id="gui_init_param_vendor_list_item_4" option="GWI" class="select_medium">
+                                        <div id="gui_init_param_vendor_list_item_4" option="GWI" class="select_medium"
+                                        onclick="VendorSelectChangedAtInit('GWI')">
                                             长城信息
                                         </div>
                                     </div>
@@ -265,10 +269,46 @@
                                 <div class="pull-left" style="width:330px;">&nbsp;</div>
                                 <div class="pull-left">
                                     <div class="text-left guide_input_descript" id="text_guide_init_param_vendor_tips">
-                                        目前各家厂商仅一款国产设备，所以仅需选择设备厂商</div>
+                                        &nbsp;</div>
                                 </div>
                             </div>
-                            <div class="clearboth" style="padding-top:30px;" id="guide_init_param_terminal_no">
+                            <div id="gui_init_param_device_model_div" class="clearboth" style="padding-top:6px;">
+                                <div class="pull-left" style="width:330px;">
+                                    <div class="text-right guide_input_label">设备型号</div>
+                                </div>
+                                <div class="controls text-left">
+                                    <div id="gui_init_param_device_model" class="select_on_normal device_model_seleceed_save_btn"
+                                        onclick="SelectItem(this)" value=""></div>
+                                    <div id="gui_init_param_device_model_list" class="select_list hide">
+                                    </div>
+                                </div>
+                            </div>
+                            <div id="guide_init_param_device_model_tips" class="clearboth">
+                                <div class="pull-left" style="width:330px;">&nbsp;</div>
+                                <div class="pull-left">
+                                    <div class="text-left guide_input_descript" id="text_guide_init_param_device_model_tips">
+                                        &nbsp;</div>
+                                </div>
+                            </div>
+                            <div class="clearboth" style="padding-top:6px;" id="guide_init_param_device_sn">
+                                <div class="pull-left" style="width:330px;">
+                                    <div class="text-right guide_input_label">设备序列号
+                                    </div>
+                                </div>
+                                <div class="pull-left input_normal text-left">
+                                    <input id="guide_init_param_device_sn" type="text" autocomplete="off"
+                                     placeholder="（见设备机身铭牌或咨询厂商）"
+                                        onfocus="showInputBorder(this)" onblur="hideInputBorder(this)"
+                                        oncontextmenu="return false;" maxlength="10" value="">
+                                </div>
+                            </div>
+                            <div id="guide_init_param_device_sn_tips" class="clearboth">
+                                <div class="pull-left" style="width:330px;">&nbsp;</div>
+                                <div class="pull-left">
+                                    <div class="text-left guide_error hide" id="text_guide_init_param_device_sn_tips"></div>
+                                </div>
+                            </div>
+                            <div class="clearboth" style="padding-top:14px;" id="guide_init_param_terminal_no">
                                 <div class="pull-left" style="width:330px;">
                                     <div class="text-right guide_input_label">终端号
                                     </div>
@@ -286,10 +326,10 @@
                                     <div class="text-left guide_error hide" id="text_guide_init_param_terminalno_tips"></div>
                                 </div>
                             </div>
-                            <div class="clearboth" style="height:45px;"></div>
+                            <div class="clearboth"></div>
                             <div id="captive_init_param_btns">
                                 <div id="guide_init_param_btns" class="clearboth" align="center"
-                                    style="margin-top:50px;margin-bottom:50px;">
+                                    style="margin-top:30px;margin-bottom:20px;">
                                     <div id="guide_init_param_next"
                                         style="position: relative;" class="btn_normal_long">
                                         确定</div>

addin/res/ManagerDesktop/js/guide.js

@@ -38,6 +38,9 @@ var MEDIA_DETAIL_TYPE = {
 
 var VENDOR = ['KEBA','CW','GRG','NANTIAN','GWI','*'];
 var VENDOR_ZHCN = ['中钞科堡','恒银金融','广电运通','云南南天','长城信息','全部'];
+var VENDOR_MACHINE_TYPE = [
+    ['E1080-L'],['CASH35AG-JR10(G)'],['DT-7000I64A'],['VTM-6200B17FQ'],['VTM700-A02']
+];
 
 function DisplayVendorFriendName(abbr)
 {
@@ -217,6 +220,48 @@ function FulfillAdapterCurrentSelect(value, configed)
     }
 }
 
+function generateDeviceTypeSelect(devices, select_id) {
+    var deviceLength = 0;
+    if ((devices) instanceof Array) {
+        deviceLength = devices.length;
+    } else {
+        deviceLength = 1
+    }
+    var devicesHtml = '';
+    var selectid = select_id;
+    $('#' + selectid).empty();
+    for (var loop = 0; loop < deviceLength; loop++) {
+        var cur = devices[loop];
+        var deviceTemplateData = {
+            loop: loop,
+            deviceName : cur,
+            type: selectid
+        };
+        var pushHtml = '';
+        pushHtml = '<div id="{{type}}_item_{{loop}}" option="{{deviceName}}" class="select_medium hide_with_ellipsis">'
+        pushHtml += '{{deviceName}}</div>'
+        $('#' +  selectid).secureAppend(pushHtml, deviceTemplateData);
+    }
+}
+
+function VendorSelectChangedAtInit(name)
+{
+    var vendorName = name.toLowerCase();
+    $('#gui_init_param_device_model').empty();
+    $('#gui_init_param_device_model').attr("value", '');
+
+    for(var n=0; n < VENDOR.length; ++n) {
+        if(name === VENDOR[n]) {
+            var deviceTypes = VENDOR_MACHINE_TYPE[n];
+            generateDeviceTypeSelect(deviceTypes, 'gui_init_param_device_model_list');
+            if(deviceTypes.length > 0) {
+                $('#gui_init_param_device_model').text(deviceTypes[0]);
+                $('#gui_init_param_device_model').attr("value", deviceTypes[0]);
+            }
+        }
+    }
+}
+
 //正式环境该参数不可选
 function VendorSelectChanged(name)
 {