test

application/admin/view/basestation/base_region.html

@@ -17,7 +17,7 @@
                           <form class="layui-form" >
                             <div class="layui-input-inline layui-show-xs-block"  style="width:130px;">
                               <select name="search_type" id="search_type">
-                                <option value="1" {if $search_type eq 1 } selected {/if}>站名</option>
+                                <option value="1" {if $search_type eq 1 } selected {/if}>123213站名</option>
                                 <option value="2" {if $search_type eq 2 } selected {/if}>站号</option>
                                 <option value="3" {if $search_type eq 3 } selected {/if}>项目编号</option>
           
@@ -97,19 +97,19 @@
 
 
 <script type="text/javascript">
-          var map = new BMap.Map("allmap", {enableMapClick: false}); // 创建Map实例
+        var map = new BMap.Map("allmap", {enableMapClick: false}); // 创建Map实例
         map.centerAndZoom(new BMap.Point(116.404, 39.915), 14); // 初始化地图,设置中心点坐标和地图级别
 
         //添加地图类型控件
         map.addControl(new BMap.MapTypeControl({
             mapTypes: [
-                BMAP_NORMAL_MAP,
-                BMAP_HYBRID_MAP
+            BMAP_NORMAL_MAP,
+            BMAP_HYBRID_MAP
             ]
-        }));
+            }));
         map.setCurrentCity("北京"); // 设置地图显示的城市 此项是必须设置的
         map.enableScrollWheelZoom(true); //开启鼠标滚轮缩放
-  layui.use(['form', 'layer', 'laydate', 'upload'],
+        layui.use(['form', 'layer', 'laydate', 'upload'],
         function () {
             $ = layui.jquery;
             var form = layui.form,
@@ -162,7 +162,7 @@
                             if (time <= 3) {
                                 var point = new BMap.Point(res[0].longitude, res[0].latitude);
                                 var content =
-                                    "<p style= 'width: 200px;overflow: hidden;display: inline-block;text-overflow: ellipsis;white-space: nowrap;'>基站名称：" + res[0].station_name + "<br/>项目编号：" + res[0].proj_number + "<br/><a onclick=xadmin.add_tab('地图显示','/base_detai?id="+res[0].station_id+"',true,true)>查看详情</a></p>";
+                                    "<p style= 'width: 200px;overflow: hidden;display: inline-block;text-overflow: ellipsis;white-space: nowrap;'>基站名称12：" + res[0].station_name + "<br/>项目编号：" + res[0].proj_number + "<br/><a onclick=xadmin.add_tab('地图显示','/base_detai?id="+res[0].station_id+"',true,true)>查看详情</a></p>";
 
                                 bm.addControl(new BMap.MapTypeControl({
                                     mapTypes: [
@@ -242,7 +242,7 @@
                             for (var i in res) {
                                 var point = new BMap.Point(res[i].longitude, res[i].latitude)
                                 var content =
-                                    "<p style= 'width: 200px;overflow: hidden;display: inline-block;text-overflow: ellipsis;white-space: nowrap;'>基站名称：" + res[i].station_name + "<br/>项目编号：" + res[i].proj_number + "<br/><a onclick=xadmin.add_tab('地图显示','/base_detai?id="+res[i].station_id+"',true,true)>查看详情</a></p>";
+                                    "<p style= 'width: 200px;overflow: hidden;display: inline-block;text-overflow: ellipsis;white-space: nowrap;'>基站名称34：" + res[i].station_name + "<br/>项目编号：" + res[i].proj_number + "<br/><a onclick=xadmin.add_tab('地图显示','/base_detai?id="+res[i].station_id+"',true,true)>查看详情</a></p>";
                                 addMarker(point, content);
                             }
 
@@ -302,18 +302,6 @@
                                     }
                                 }
                             }
-
-
-
-
-
-
-
-
-
-
-
-
                                
                             },
                             error : function (XMLHttpRequest, textStatus, errorThrow ) {

application/admin/view/staff/role.html

@@ -60,7 +60,7 @@
       <script src="dist/js/md5.js"></script>
       <script src="dist/js/sha1.js"></script>
       <script src="dist/js/util.js"></script>
-      <script src="dist/js/getUserToken.js"></script>
+      <!-- <script src="dist/js/getUserToken.js"></script> -->
     <script>
       layui.use(['laydate','form','upload'], function(){
         upload  = layui.upload;