Merge remote-tracking branch 'origin/master'

leiSP-admin/src/main/resources/templates/login.html

@@ -18,13 +18,13 @@
     <form id="signupForm" autocomplete="off">
         <div class="name_div">
             <i><img src="../static/syslogin/lydl_4.png" th:src="@{/syslogin/lydl_4.png}"/></i>
-            <input name="username"  placeholder="请输入用户名" type="text" value="admin"/>
+            <input name="username"  placeholder="请输入用户名" type="text" />
             <!--<input name="username" value="admin" placeholder="请输入用户名" type="text"/>-->
             <!--<input name="username" value="shaoye062908" placeholder="请输入用户名" type="text"/>-->
         </div>
         <div class="password_div">
             <i><img src="../static/syslogin/lydl_5.png" th:src="@{/syslogin/lydl_5.png}"/></i>
-            <input name="password"  placeholder="请输入密码" type="password" value="sjkj123456"/>
+            <input name="password"  placeholder="请输入密码" type="password" />
         </div>
         <div class="yhm_div clearfix">
             <a class="fl">找回密码</a>

mybusiness/src/main/resources/static/visualization/js/sj.js

@@ -107,7 +107,7 @@ $(function(){
         $(this).children('div').addClass('on');
         $(this).siblings('.nav').children('div').removeClass('on');
         // if($(this).children('div').attr("url") == "getVisualizationFrame_WRJ"){
-        if($(this)[0].className == "nav wrj"){
+        if($(this)[0].className == "nav wrj" || $(this)[0].className == "nav cl" || $(this)[0].className == "nav clmj" ){
             $(".zhly_k").hide();
         }else{
             $(".zhly_k").show();

mybusiness/src/main/resources/templates/business/manager/forestdevicemanager/index.html

@@ -96,6 +96,9 @@
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:forestdevice:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
+                <a class="btn btn-warning" th:href="@{/util/model_forestdevice.xls}">
+                    <i class="fa fa-download"></i>导入模板
+                </a>
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>

mybusiness/src/main/resources/templates/business/visualization/evemt.html

@@ -491,7 +491,7 @@
 <!--	iframe嵌套 结束-->
 <!--<audio id="fireaudio" loop src="http://121.89.200.81:9090/hik/firelong.wav"  th:src="@{/audio/firelong.wav}" controls="controls" refs="audio" style="display: none;"/>-->
 <!--<audio id="fireaudio" loop src="http://121.89.200.81:9090/hik/firelong.wav"  controls="controls" refs="audio" style="display: none;"/>-->
-<audio id="fireaudio" loop src="http://121.89.200.81:9090/hik/firelong.wav" controls="controls" style="display: none;"/></audio>
+<audio id="fireaudio" loop src="http://218.27.1.157:9090/hik/firelong.wav" controls="controls" style="display: none;"/></audio>
 
 </body>
 <script>

mybusiness/src/main/resources/templates/business/visualization/event.html

@@ -93,7 +93,7 @@
                 //实现化WebSocket对象，指定要连接的服务器地址与端口  建立连接
                 //等同于socket = new WebSocket("ws://localhost:8888/xxxx/im/25");
                 //var socketUrl="${request.contextPath}/im/"+$("#userId").val();
-                var socketUrl="http://121.89.200.81:9090/business/app/websocket/"+loginName;
+                var socketUrl="http://218.27.1.157:9090/business/app/websocket/"+loginName;
                 // var socketUrl="http://127.0.0.1/business/app/websocket/"+loginName;
                 socketUrl=socketUrl.replace("https","ws").replace("http","ws");
                 console.log(socketUrl);
@@ -270,13 +270,13 @@
             <a class="a_txt">无人机轨迹</a>
         </div>
     </div>
-    <div class="nav lz">
+    <div class="nav wrj">
         <div class="n_div" onclick="window.open('getmeasure')">
             <a class="a_img"></a>
             <a class="a_txt">测量</a>
         </div>
     </div>
-    <div class="nav lz">
+    <div class="nav wrj">
         <div class="n_div" onclick="window.open('getmeasure_size')">
             <a class="a_img"></a>
             <a class="a_txt">测量面积</a>
@@ -304,11 +304,11 @@
         <li class="aa"><a name="xzt">行政图</a></li>
         <li class="aa"><a name="lwt">路网图</a></li>
     </ul>
-    <ul class="test-long">
-        <li><img  src="../images/cej.png"><span>测距</span></li>
-        <li><img  src="../images/cemj.png"><span>测面积</span></li>
-        <li><img  src="../images/gbcj.png"><span>退出测量</span></li>
-    </ul>
+    <!--<ul class="test-long">-->
+        <!--<li><img  src="../images/cej.png"><span>测距</span></li>-->
+        <!--<li><img  src="../images/cemj.png"><span>测面积</span></li>-->
+        <!--<li><img  src="../images/gbcj.png"><span>退出测量</span></li>-->
+    <!--</ul>-->
 </div>
 
 <!--二维三维 结束-->