优化了新车机地理位置消息界面

templates/messageTools/message/heartBeat_msg_page.html

@@ -37,7 +37,7 @@
         <li role="presentation"><a id="terminalVersionInfoUpload_msg" {% if arg.path[2]=="terminalVersionInfoUpload_msg_page" %} class="link-tab" {% endif %} onclick="messageManTab(this)">终端版本信息主动上报</b></a></li>
         <li role="presentation"><a id="dataUpstreamTransport_msg" {% if arg.path[2]=="dataUpstreamTransport_msg_page" or arg.path[2]=="dataUpstreamTransport_msg_f2_page" or arg.path[2]=="dataUpstreamTransport_msg_f3_page" or arg.path[2]=="dataUpstreamTransport_msg_f4_page" %} class="link-tab" {% endif %} onclick="messageManTab(this)">数据上行透传</b></a></li>
         <li role="presentation"><a id="location_msg" {% if arg.path[2]=="location_msg_page" %} class="link-tab" {% endif %} onclick="messageManTab(this)">位置信息汇报</b></a></li>
-        <li role="presentation"><a id="style_index2" {% if arg.path[2]=="2" %} class="link-tab" {% endif %} onclick="messageManTab(this)">其他报文</b></a></li>
+<!--        <li role="presentation"><a id="style_index2" {% if arg.path[2]=="2" %} class="link-tab" {% endif %} onclick="messageManTab(this)">其他报文</b></a></li>-->
     </ul>
     {% endblock %}
     {% block content_1 %}

templates/protocolTools/report/M_carSimulater_page.html

@@ -47,19 +47,26 @@
         <div style="width:100%;padding-bottom:10px;border-bottom: 1px solid #eee;">
             <h4>点击登录按钮发送报文：</h4>
             <div style="display: block; width: 100%; border-width: 1px; border-style: solid; border-color: darkgray; border-radius: 10px; padding: 2px; margin-top: 5px;">
-                <h5><b>登录报文数据：</b></h5>
-                <ul class="protocol_content" style="padding:0px;">
-                    <li style="width:320px;"><label>CPU-ID：</label><input style="width:220px;" id="cpuId" type="text" class="form-control" value="CPU-ID001122334455667788"></li>
-                    <li><label style="word-break:break-all;font-size:12px;">SIM卡IMSI号：</label><input id="imsi" type="text" class="form-control" value="IMSI13145678902"></li>
-                    <li style="width:300px;"><label style="word-break:break-all;font-size:12px;">SIM卡CCID号：</label><input style="width:200px;" id="ccid" type="text" class="form-control" value="CCID1122334455667788"></li>
-                    <li><label style="word-break:break-all;font-size:10px;">GSM模块IMEI码：</label><input id="imei" type="text" class="form-control" value="IMEI12233445566"></li>
-                </ul>
+                <h5><b>登录报文数据：</b>
+                    <span style="border-width:1px;border-style:solid;border-color:darkgray;border-radius:10px;padding:1px 10px;">
+                        <label><input name="login" type="radio" value="0" checked="checked" onclick="isShowLoginArea(this)"/>隐藏</label>
+                        <label style="margin-left:10px;"><input name="login" type="radio" value="1" onclick="isShowLoginArea(this)"/>显示</label>
+                    </span>
+                </h5>
+                <div id="login_area" style="display:none;">
+                    <ul class="protocol_content" style="padding:0px;">
+                        <li style="width:320px;"><label>CPU-ID：</label><input style="width:220px;" id="cpuId" type="text" class="form-control" value="CPU-ID001122334455667788"></li>
+                        <li><label style="word-break:break-all;font-size:12px;">SIM卡IMSI号：</label><input id="imsi" type="text" class="form-control" value="IMSI13145678902"></li>
+                        <li style="width:300px;"><label style="word-break:break-all;font-size:12px;">SIM卡CCID号：</label><input style="width:200px;" id="ccid" type="text" class="form-control" value="CCID1122334455667788"></li>
+                        <li><label style="word-break:break-all;font-size:10px;">GSM模块IMEI码：</label><input id="imei" type="text" class="form-control" value="IMEI12233445566"></li>
+                    </ul>
 
-                <ul class="protocol_content" style="padding:0px;">
-                    <li style="width:320px;"><label style="word-break:break-all;font-size:12px;">车机版本信息：</label><input style="width:220px;" id="verInfo" type="text" class="form-control" value="M100AB01010.0000"></li>
-                    <li><label>编译日期：</label><input id="compileDate" type="text" class="form-control" value="2020-03-23"></li>
-                    <li style="width:300px;"><label style="word-break:break-all;font-size:12px;">GSM模块型号：</label><input style="width:200px;" id="GSM" type="text" class="form-control" value="GSM_123456"></li>
-                </ul>
+                    <ul class="protocol_content" style="padding:0px;">
+                        <li style="width:320px;"><label style="word-break:break-all;font-size:12px;">车机版本信息：</label><input style="width:220px;" id="verInfo" type="text" class="form-control" value="M100AB01010.0000"></li>
+                        <li><label>编译日期：</label><input id="compileDate" type="text" class="form-control" value="2020-03-23"></li>
+                        <li style="width:300px;"><label style="word-break:break-all;font-size:12px;">GSM模块型号：</label><input style="width:200px;" id="GSM" type="text" class="form-control" value="GSM_123456"></li>
+                    </ul>
+                </div>
             </div>
         </div>
         <div style="display: block; width: 100%; border-width: 1px; border-style: solid; border-color: darkgray; border-radius: 10px; padding: 2px; margin-top: 5px;">
@@ -279,6 +286,16 @@ function sendjson(data,url){
         }
     });
 }
+
+//控制登录数据区域的显示与隐藏
+function isShowLoginArea(e){
+    var value = $(e).val()
+    if(value == "0"){
+        $("#login_area").css("display","none")
+    }else{
+        $("#login_area").css("display","block")
+    }
+}
 ///////////////////////////////// websocket 代码开始 /////////////////////////////////
 client = "0"
 ws = null;