Merge branch 'master' of http://39.104.94.153:3000/yf_zd/second

templates/backstageNet/annunciate/policyListView.html

@@ -119,7 +119,7 @@
                                 <label class="layui-form-label" style="color:#029eef">类型选择：</label>
                                 <div class="layui-input-inline">
                                     <select name="type" lay-verify="required" lay-filter="type">
-                                        <option value=""></option>
+                                        <!-- <option value=""></option> -->
                                         <option value="0">新闻</option>
                                         <option value="1">政策</option>
                                         <option value="2">技术</option>
@@ -206,15 +206,15 @@
                 })
             });
 
-            getData('policy_list', { page: 1, type: '' });
+            getData('policy_list', 1, 0 );
         });
 
 
-        function getData(page, data) {
+        function getData(page, page,req) {
             $.ajax({
                 url: 'policy_list',
-                type: 'get',
-                data: data,
+                type: 'post',
+                data: { page: page, req: req },
                 dataType: 'html',
                 success: function (data) {
                     $('#dataTable').children('tbody').html(data);
@@ -229,7 +229,7 @@
                                 $.ajax({
                                     url: 'policy_list',
                                     type: 'get',
-                                    data: { page: obj.curr },
+                                    data: { page: obj.curr, req: req },
                                     dataType: 'html',
                                     success: function (data) {
                                         $('#dataTable').children('tbody').html(data);

templates/backstageNet/info/dormPub.html

@@ -247,7 +247,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">民宿名称：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="name" required lay-verify="required" placeholder="请输入名称"
+                                <input type="text" name="name" maxlength="20" required lay-verify="required" placeholder="请输入名称"
                                     autocomplete="off" class="layui-input">
                             </div>
                         </div>
@@ -563,6 +563,7 @@
             map.clearOverlays();
             $('.uploadImg').addClass('uploadImgIcon');
             $('#demo1').removeAttr('src'); //图片链接（base64）
+            $('#uploader-list').html('')
             fuzhi()
             if (window.id !== '') {
                 parent.getData('', parent.$('.layui-laypage-curr em').eq(1).html(), parent.$('.permission .active').data('type'))

templates/backstageNet/info/gardenPub.html

@@ -179,7 +179,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">采摘名称：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="name" required lay-verify="required" placeholder="请输入采摘名称"
+                                <input type="text" name="name" maxlength="20" required lay-verify="required" placeholder="请输入采摘名称"
                                     autocomplete="off" class="layui-input">
                             </div>
                         </div>

templates/backstageNet/info/newsPub.html

@@ -176,7 +176,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">文章标题：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="title" required lay-verify="required" placeholder="请输入标题"
+                                <input type="text" name="title" maxlength="20" required lay-verify="required" placeholder="请输入标题"
                                     autocomplete="off" class="layui-input">
                             </div>
                         </div>

templates/backstageNet/info/productPub.html

@@ -173,7 +173,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">产品名称：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="title" required lay-verify="required" placeholder="请输入产品名称" autocomplete="off" class="layui-input">
+                                <input type="text" name="title" maxlength="20" required lay-verify="required" placeholder="请输入产品名称" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-form-item layui-form-text">

templates/backstageNet/info/sightseePub.html

@@ -247,7 +247,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">景点名称：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="name" required lay-verify="required" placeholder="请输入名称"
+                                <input type="text" name="name" maxlength="20" required lay-verify="required" placeholder="请输入名称"
                                     autocomplete="off" class="layui-input">
                             </div>
                         </div>

templates/backstageNet/info/videoPub.html

@@ -176,7 +176,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">视频标题：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="title" required lay-verify="required" placeholder="请输入视频标题" autocomplete="off" class="layui-input">
+                                <input type="text" name="title" maxlength="20" required lay-verify="required" placeholder="请输入视频标题" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-form-item layui-form-text">

templates/backstageNet/infoManage/pickManageList.html

@@ -32,7 +32,7 @@
 </tr>
 {% endfor %} {% else %}
 <tr>
-    <td colspan="6" style="text-align:center;">暂无数据</td>
+    <td colspan="7" style="text-align:center;">暂无数据</td>
 </tr>
 {% endif %}
 <input type="hidden" value="{{nums}}" id="totalPage">

templates/backstageNet/infoManage/sightseeManageList.html

@@ -15,12 +15,6 @@
         <a href="JavaScript:;" class="passBtn"  onclick="passFun('{{msg.id}}')">通过</a>
         |
         {% else %}
-            {% if msg.hatType == 1 %}
-            <button type="button" onclick="hatPush('{{msg.id}}',1)" class="layui-btn layui-btn-xs layui-btn-danger hatPush"><i class="layui-icon layui-icon-fire"></i></button>
-            {% else %}
-            <button type="button" onclick="hatPush('{{msg.id}}',0)" class="layui-btn layui-btn-xs layui-btn-primary rejectBtn"><i class="layui-icon layui-icon-fire"></i></button>
-            {% endif %}
-            <span>|</span>
         {% endif %}
         <a href="JavaScript:;" class="delBtn" onclick="delFun('{{msg.id}}')">删除</a>
         |

templates/backstageNet/jk/equipmanage_jk.html

@@ -159,7 +159,10 @@
             margin-top: 10px;
         }
 
-
+        #divMain{
+            box-sizing: border-box;
+            width: 100%;
+        }
         #divMain .a4 {
             width: 50%;
             height: 50%;
@@ -342,6 +345,25 @@
             margin-left: 5px;
             cursor: pointer;
         }
+        .jkedit {
+            background-image: url(../static/imgs/jkedit.png);
+            background-repeat: no-repeat;
+            background-size: 100% 100%;
+            width: 120px;
+            height: 30px;
+            margin: auto;
+            margin-top: 15px;
+            /* margin-bottom: 15px; */
+        }
+
+        .jkedit span {
+            width: 54px;
+            height: 32px;
+            display: inline-block;
+            float: left;
+            margin-left: 5px;
+            cursor: pointer;
+        }
         /* 监控列表 */
         .gardenListBtn{
             margin-top: 10px;
@@ -361,6 +383,19 @@
         .gardenListBtn button.layui-btn-primary:hover{
             box-shadow: 0 0 2px 0px #039c6b;
         }
+        /* 气象站定位弹框 */
+		#addLocation{
+			display: none;
+			padding: 20px;
+			height: 450px;
+		}
+		.mapbox{
+			height: 100%;
+		}
+		#allmap{
+			width: 100%;
+			height: 100%;
+		}
     </style>
 </head>
 <script>
@@ -467,6 +502,10 @@
                                             <span onmousedown="configCamera(this,'move',8)" onmouseup="configCamera(this,'stop')"></span>
                                             <span onmousedown="configCamera(this,'move',9)" onmouseup="configCamera(this,'stop')"></span>
                                         </div>
+                                        <div class="jkedit">
+                                            <span onclick="addMapPosition()" ></span>
+                                            <span onclick="ChangeName()" ></span>
+                                        </div>
                                     </div>
                                 </td>
                             </tr>
@@ -480,12 +519,22 @@
             </div>
         </div>
     </div>
-    <input type="text" name="" id="currid" value="{{equip_id|default:''}}">
-
+    <input type="hidden" name="" id="currid" value="{{equip_id|default:''}}">
+    <div id="addLocation">
+        <div class="">
+            经度：<input type="text" name="title" lay-verify="title" id="lng" placeholder="" class="layui-input" style="width: 200px;display: inline-block;">
+            纬度：<input type="text" name="title" lay-verify="title" id="lat"  placeholder="" class="layui-input" style="width: 200px;display: inline-block;">
+            <button type="button" id="shaixuan" onclick="sub_getMarker()" class="layui-btn layui-btn-normal">定位</button>			
+        </div>
+        <div class="mapbox">
+            <div id="allmap"></div>
+        </div>
+    </div>
 
     <script src="{% static '/lib/js/jquery-2.1.4.min.js'%}"></script>
     <script src="{% static '/lib/layui/layui.js'%}"></script>
     <script src="{% static '/js/backstageNet/common.js'%}"></script>
+	<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=TcRPmrsiZUqdUBWoELrUArRkCRC36KMx"></script>
 
     <script>
         $.ajaxSetup({
@@ -538,7 +587,134 @@
 
             $("#span_V" + n).addClass("active");
         }
+        // 百度地图API功能
+        var map = new BMap.Map("allmap");
+        map.centerAndZoom(new BMap.Point(113.64964385, 34.75661006), 13);// 创建点坐标
+        map.enableScrollWheelZoom();   //启用滚轮放大缩小，默认禁用
+        map.enableContinuousZoom();    //启用地图惯性拖拽，默认禁用
+        map.addControl(new BMap.NavigationControl());               // 添加平移缩放控件
+        map.addControl(new BMap.ScaleControl());                    // 添加比例尺控件
+        map.addControl(new BMap.OverviewMapControl());              //添加缩略地图控件
+        map.enableScrollWheelZoom();                            //启用滚轮放大缩小
+        map.addControl(new BMap.MapTypeControl());
+        //单击获取点击的经纬度
+        map.addEventListener("click", function (e) {
+            map.clearOverlays();
+            $('#lng').val(e.point.lng);
+            $('#lat').val(e.point.lat);
+            var point = new BMap.Point(e.point.lng, e.point.lat);
+            var marker = new BMap.Marker(point);
+            map.addOverlay(marker);
+            // alert(e.point.lng + "," + e.point.lat);
+        });
 
+        function sub_getMarker() {
+            map.clearOverlays();
+            var points = []
+            var point = new BMap.Point($('#lng').val(), $('#lat').val());
+            var marker = new BMap.Marker(point);
+            map.addOverlay(marker);
+            points.push(point)
+            console.log(points)
+            map.setViewport(points);
+        }
+        // 添加地图定位
+        function addMapPosition(obj) {
+            id = $('#divMain a.aSelected').find('.equipname').html().trim();
+            layui.use('layer', function () { //独立版的layer无需执行这一句
+                var $ = layui.jquery, layer = layui.layer; //独立版的layer无需执行这一句
+                layer.open({
+                    title: '手动添加位置',
+                    type: 1,
+                    area: ['900px', '600px'],
+                    btn: ['确定', '取消'],
+                    yes: function (index, layero) {
+                        //按钮【按钮一】的回调
+                        if($('#lng').val() && $('#lat').val()){
+                            $.ajax({
+                                url:'equip_location',
+                                type:'post',
+                                data:{
+                                    e_id:id,
+                                    lng:$('#lng').val(),
+                                    lat:$('#lat').val(),
+                                },
+                                success:function(data){
+                                    console.log(data)
+                                    if(data == 0){
+                                        layer.closeAll();
+                                    }else{
+                                        layer.msg('添加失败', {icon: 2}); 
+                                    }
+                                },
+                                error:function(type){
+                                    console.log(type)
+                                }
+                            })
+                        }else{
+                            layer.msg('请先定位', {icon: 2}); 
+                        }
+                    
+                        return false;  
+                    }
+                    , btn2: function (index, layero) {
+                        //按钮【按钮二】的回调
+                        //return false 开启该代码可禁止点击该按钮关闭
+                    },
+                    content: $('#addLocation')
+                });
+            });
+        }
+
+        //点击修改名称，跳出弹框并显示所选设备的设备名称；
+        function ChangeName() {
+            id = $('#divMain a.aSelected').find('.equipname').html().trim();
+            layui.use('layer', function () { //独立版的layer无需执行这一句
+                var $ = layui.jquery, layer = layui.layer; //独立版的layer无需执行这一句
+                layer.prompt({ title: '修改名称', value: '', area: 400 }, function (val, index) {
+                    layer.close(index);
+                    ChangeNameSub(id, val);
+                });
+            });
+        }
+        function ChangeNameSub(deviceId, name, address) {
+                data = {
+                    ename: name,
+                    eid: deviceId
+                }
+            //校验重复校验重复
+            $.ajax({
+                type: "post",
+                url: "equip_location",
+                data: data,
+                dataType: "json",
+                success: function (data) {
+                    if (data == 1) {
+                        // layer.tips("设备名已存在！", '#ename');
+                        layui.use('layer', function () {
+                            var layer = layui.layer;
+                            layer.msg('设备名已存在！');
+                        })
+                        return false;
+                    }
+                    else if (data == 2) {
+                        layui.use('layer', function () {
+                            var layer = layui.layer;
+                            layer.msg('设备位置添加成功！');
+                            // window.location.href = window.location.href;
+                        })
+                    }
+
+                    else if (data == 0) {
+                        layui.use('layer', function () {
+                            var layer = layui.layer;
+                            layer.msg('设备名称修改成功！');
+                            // window.location.href = window.location.href;
+                        })
+                    } 
+                }
+            });
+        }
         function setMouseOut(idx) {
             if (curIndex != idx && $("#a_" + idx).length > 0)
                 $("#a_" + idx).removeClass("aSelected");
@@ -639,6 +815,7 @@
 
             var playHtml;
             var script;
+            var token = 'at.0izp4b188fna8vvk8j28o2l4a980qqex-1otrmuqf8l-1k26cbi-cletdiwkp'
              
 
             if (isIE) {
@@ -654,7 +831,7 @@
             }
             else {
 
-                playHtml = "<iframe   id='playFrame" + curIndex + "'  src='https://open.ys7.com/ezopen/h5/iframe_se?url=ezopen://open.ys7.com/" + deviceSerial + "/" + cameraNo + ".hd.live&autoplay=1&accessToken=at.d2trwvdod5bxxlr4dug8le6wb0ugbi2h-173pi8ymy3-1882umg-zrib7cj3f&templete=2'  width='100%' height='100%' allowfullscreen frameborder='0' allowtransparency=true></iframe>"
+                playHtml = "<iframe   id='playFrame" + curIndex + "'  src='https://open.ys7.com/ezopen/h5/iframe_se?url=ezopen://open.ys7.com/" + deviceSerial + "/" + cameraNo + ".hd.live&autoplay=1&accessToken="+token+"'  width='100%' height='100%' allowfullscreen frameborder='0' allowtransparency=true></iframe>"
 
                 script = document.createElement("script");
                 script.type = "text/javascript";

templates/backstageNet/limit/expertList.html

@@ -5,7 +5,7 @@
         <img src="{% static '/imgs/cornerIcon.png' %}" alt="">
         <div class="expertInner">
             <div class="expertImg">
-                <img src="http://192.168.1.9:8000{{msg.pic}}" alt="">
+                <img src="http://127.0.0.1:8000{{msg.pic}}" alt="">
             </div>
             <div class="expertTxt">
                 <h1>{{msg.name}}</h1>
@@ -23,6 +23,6 @@
     </div>
     {% endfor %}
 {% else %}
-    <div style="text-align:center;line-height: 200px;">暂无数据</div>
+    <div style="text-align:center;line-height: 200px;flex: 1;">暂无数据</div>
 {% endif %}
 <input type="hidden" value="{{nums}}" id="totalPage">

templates/backstageNet/map/map.html

@@ -21,6 +21,10 @@
             width: 100%;
             height: 100vh;
         }
+        .BMapLib_SearchInfoWindow .BMapLib_bubble_content p{
+            line-height: 24px;
+            font-size: 14px;
+        }
     </style>
 </head>
 
@@ -125,6 +129,7 @@
     $("#mapControl_type").html("卫星");
     map.centerAndZoom(new BMap.Point(map_center[0], map_center[1]), 15);
     map.enableScrollWheelZoom(true);
+    geoc = new BMap.Geocoder();
 
     //气象站标识
     var qxzIcon = new BMap.Icon("{% static 'imgs/qxz.png'%}", new BMap.Size(30, 40), { imageSize: new BMap.Size(30, 40),anchor: new BMap.Size(0, 0) });
@@ -137,12 +142,17 @@
     //摄像头标识——加密
     var sxtEncryptIcon = new BMap.Icon("{% static 'imgs/sxt-Encrypt.png'%}", new BMap.Size(30, 40), { imageSize: new BMap.Size(30, 40) });
     
-    function openInfo(title, content, e) {
+    function openInfo(title, id, e) {
         var p = e.target;
-        var point = new BMap.Point(p.getPosition().lng, p.getPosition().lat);
+        var point = new BMap.Point(p.getPosition().lng-.0004, p.getPosition().lat-.001);
+        geoc.getLocation(point, function (rs) {
+            var addComp = rs.addressComponents;
+            $('.area').html('位置：' + addComp.province + ", " + addComp.city + ", " + addComp.district)
+        });
         //var infoWindow = new BMap.InfoWindow(content);  // 创建信息窗口对象
         //map.openInfoWindow(infoWindow, point); //开启信息窗口
 
+        var content = '<p>IMEI：' + id + '</p><p class="area">位置：' + e.point.equip_location + '</p></br>';
         var searchInfoWindow = new BMapLib.SearchInfoWindow(map, content, {
             title: title, //标题 
             panel: "panel", //检索结果面板  
@@ -180,22 +190,27 @@
     var WeatherstationMarker = [];//气象站
     var CameraMarker = [];//摄像头
 
-    GetMonitorMark(1);
+    // GetMonitorMark(1);
+    getData()
     function getData(){
         $.ajax({
-            url:'',
+            url:'equip_addr',
             type:'post',
             data:'',
             dataType:'json',
             success:function(data){
-                
+                var dat = {
+                    "Status": true,
+                    "list":data
+                }
+                GetMonitorMark(dat)
             }
         })
     }
 
     //监测数据
-    function GetMonitorMark(ShowStatus) {
-        var data = {
+    function GetMonitorMark(data) {
+        var data1 = {
             "Status": true,
             "list": [{
                 "id": "D08652664",
@@ -239,8 +254,8 @@
                 for (var i = 0; i < jsonObj.list.length; i++) {
                     var markObj = jsonObj.list[i];
 
-                    var id = markObj.id;
-                    var markType = markObj.markType;
+                    var id = markObj.equip_id;
+                    var markType = markObj.equip_type;
                     var title = markObj.title;
                     var theName = markObj.EquipmentName;
                     var lng = markObj.lng;
@@ -256,9 +271,9 @@
                         var CameraNo = markObj.CameraNo;
                         marker = createCameraMarker(lng, lat, icon, title, id, CameraNo);
                     }
-                    else //气象站
-                        marker = createMarker(lng, lat, icon, title, content);
-
+                    else if (markType == "5") { //气象站
+                        marker = createMarker(lng, lat, icon, '气象站', id);
+                    }
                     map.addOverlay(marker);
 
                     switch (markType) {
@@ -287,31 +302,25 @@
             $("#" + objId).html("");
     }
     function GetMarkerIcon(markType, isRun) {
-        var icon = qxzIcon;
+        var icon = '';
 
         switch (markType) {
             case 5:
-                if (isRun)
-                    icon = qxzIcon;
-                else
-                    icon = qxzOffIcon;
+                icon = qxzIcon;
                 break;
             case 6:
-                if (isRun)
-                    icon = sxtIcon;
-                else
-                    icon = sxtOffIcon;
+                icon = sxtIcon;
                 break;
         }
 
         return icon;
     }
     //将创建marker的方法抽出来，否则的话总是打开最后一个InfoWindow
-    function createMarker(lng, lat, icon, title, content) {
+    function createMarker(lng, lat, icon, title, id) {
 
         var markerx = new BMap.Marker(new BMap.Point(lng, lat), { icon: icon });
         markerx.addEventListener("click", function (e) {
-            openInfo(title, content, e);
+            openInfo(title, id, e);
         });
         return markerx;
     }
@@ -358,6 +367,43 @@
         $("#mapControl_typeChange").hide();
 
     }
+    function toggleIcon(obj, markType) {
+        var IconShow = false;
+
+        if ($(obj).hasClass("IconHide")) {
+            IconShow = true;
+            $(obj).removeClass("IconHide");
+        }
+        else {
+            IconShow = false;
+            $(obj).addClass("IconHide");
+        }
+
+        var pointArray;
+
+        switch (markType) {
+            case 5:
+                pointArray = WeatherstationMarker;
+                break;
+            case 6:
+                pointArray = CameraMarker;
+                break;
+        }
+
+        for (var i = 0; i < pointArray.length; i++) {
+            var marker = pointArray[i];
+            if (IconShow) {
+                var marker = pointArray[i];
+                //map.addOverlay(marker); 
+                marker.show();
+            }
+            else {
+                var marker = pointArray[i];
+                // map.removeOverlay(marker); 
+                marker.hide();
+            }
+        }
+    }
     // 图例悬浮
     function SetAnimation(opFlag, markType) {
 

templates/backstageNet/production/gardenManage.html

@@ -514,6 +514,8 @@
                         $('input[name="curr_var"]').val(data[0].curr_var) //品种
                         $('textarea[name="content"]').val(data[0].farm_desc) //介绍
                         $('input[name="id"]').val(data[0].id) //id
+                        $('#img_url').val(data[0].farm_img)
+                        $('#demo1').attr('src',data[0].farm_img)
 
                     },
                     error: function (type) {
@@ -542,7 +544,7 @@
                             if (data) {
                                 layer.close(index);
                                 location.reload();
-                                parent.layer.msg("操作成功!", { time: 1000, icon: 1 })
+                                layer.msg("操作成功!", { time: 1000, icon: 1 })
                             }
                         }
                     })

templates/backstageNet/production/gardenNew.html

@@ -4,7 +4,7 @@
         <!-- <p class="username">{{ msg.art }}</p> -->
         <p class="username">{{ msg.name }}</p>
         <div class="userMsg">
-            <img :src='http://127.0.0.1:8000/{{ msg.farm_img }}' class="fl" alt="">
+            <img src='http://127.0.0.1:8000/{{ msg.farm_img }}' class="fl" alt="">
             <div class="userInfo">
                 <p>基地面积（亩）： {{ msg.area }}</p>
                 <p>管理者： {{ msg.manage_user.name }}</p>

templates/backstageNet/qxzctrl/qxzctrl.html

@@ -292,6 +292,19 @@
         .fr {
             float: right;
         }
+        /* 气象站定位弹框 */
+		#addLocation{
+			display: none;
+			padding: 20px;
+			height: 450px;
+		}
+		.mapbox{
+			height: 100%;
+		}
+		#allmap{
+			width: 100%;
+			height: 100%;
+		}
     </style>
 </head>
 
@@ -336,7 +349,11 @@
                 <div class="ctrlDiv">
                     <div class="title">
                         <div class="widget-title">
-                            <button type="button" class="layui-btn  layui-btn-normal layui-btn-sm fr" onclick="qxzDownCtrlFun()">刷新</button>
+                            <div class="fr">
+                                <button type="button" class="layui-btn  layui-btn-normal layui-btn-sm" onclick="addMapPosition()">定位</button>
+                                <button type="button" class="layui-btn  layui-btn-normal layui-btn-sm" onclick="ChangeName()">重命名</button>
+                                <button type="button" class="layui-btn  layui-btn-normal layui-btn-sm" onclick="qxzDownCtrlFun()">刷新</button>
+                            </div>
                             <h2>控制开关
                                 <span id="Uptime"></span>
                             </h2>
@@ -352,10 +369,20 @@
         </div>
     </div>
     <input type="hidden" id="qxzPhotoId">
-
+    <div id="addLocation">
+        <div class="">
+            经度：<input type="text" name="title" lay-verify="title" id="lng" placeholder="" class="layui-input" style="width: 200px;display: inline-block;">
+            纬度：<input type="text" name="title" lay-verify="title" id="lat"  placeholder="" class="layui-input" style="width: 200px;display: inline-block;">
+            <button type="button" id="shaixuan" onclick="sub_getMarker()" class="layui-btn layui-btn-normal">定位</button>			
+        </div>
+        <div class="mapbox">
+            <div id="allmap"></div>
+        </div>
+    </div>
     <script src="{% static '/lib/js/jquery-2.1.4.min.js'%}"></script>
     <script src="{% static '/lib/layui/layui.js'%}"></script>
     <script src="{% static '/js/backstageNet/common.js'%}"></script>
+	<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=TcRPmrsiZUqdUBWoELrUArRkCRC36KMx"></script>
     <script>
         var currpage = 1;
         var layer, element, form;
@@ -376,6 +403,134 @@
             })
 
         })
+         // 百度地图API功能
+         var map = new BMap.Map("allmap");
+        map.centerAndZoom(new BMap.Point(113.64964385, 34.75661006), 13);// 创建点坐标
+        map.enableScrollWheelZoom();   //启用滚轮放大缩小，默认禁用
+        map.enableContinuousZoom();    //启用地图惯性拖拽，默认禁用
+        map.addControl(new BMap.NavigationControl());               // 添加平移缩放控件
+        map.addControl(new BMap.ScaleControl());                    // 添加比例尺控件
+        map.addControl(new BMap.OverviewMapControl());              //添加缩略地图控件
+        map.enableScrollWheelZoom();                            //启用滚轮放大缩小
+        map.addControl(new BMap.MapTypeControl());
+        //单击获取点击的经纬度
+        map.addEventListener("click", function (e) {
+            map.clearOverlays();
+            $('#lng').val(e.point.lng);
+            $('#lat').val(e.point.lat);
+            var point = new BMap.Point(e.point.lng, e.point.lat);
+            var marker = new BMap.Marker(point);
+            map.addOverlay(marker);
+            // alert(e.point.lng + "," + e.point.lat);
+        });
+
+        function sub_getMarker() {
+            map.clearOverlays();
+            var points = []
+            var point = new BMap.Point($('#lng').val(), $('#lat').val());
+            var marker = new BMap.Marker(point);
+            map.addOverlay(marker);
+            points.push(point)
+            console.log(points)
+            map.setViewport(points);
+        }
+        // 添加地图定位
+        function addMapPosition(obj) {
+            id = $('.equipListUl li.active').attr('id');
+            layui.use('layer', function () { //独立版的layer无需执行这一句
+                var $ = layui.jquery, layer = layui.layer; //独立版的layer无需执行这一句
+                layer.open({
+                    title: '手动添加位置',
+                    type: 1,
+                    area: ['900px', '600px'],
+                    btn: ['确定', '取消'],
+                    yes: function (index, layero) {
+                        //按钮【按钮一】的回调
+                        if($('#lng').val() && $('#lat').val()){
+                            $.ajax({
+                                url:'equip_location',
+                                type:'post',
+                                data:{
+                                    e_id:id,
+                                    lng:$('#lng').val(),
+                                    lat:$('#lat').val(),
+                                },
+                                success:function(data){
+                                    console.log(data)
+                                    if(data == 0){
+                                        layer.closeAll();
+                                    }else{
+                                        layer.msg('添加失败', {icon: 2}); 
+                                    }
+                                },
+                                error:function(type){
+                                    console.log(type)
+                                }
+                            })
+                        }else{
+                            layer.msg('请先定位', {icon: 2}); 
+                        }
+                    
+                        return false;  
+                    }
+                    , btn2: function (index, layero) {
+                        //按钮【按钮二】的回调
+                        //return false 开启该代码可禁止点击该按钮关闭
+                    },
+                    content: $('#addLocation')
+                });
+            });
+        }
+
+        //点击修改名称，跳出弹框并显示所选设备的设备名称；
+        function ChangeName() {
+            id = $('.equipListUl li.active').attr('id');
+            layui.use('layer', function () { //独立版的layer无需执行这一句
+                var $ = layui.jquery, layer = layui.layer; //独立版的layer无需执行这一句
+                layer.prompt({ title: '修改名称', value: '', area: 400 }, function (val, index) {
+                    layer.close(index);
+                    ChangeNameSub(id, val);
+                });
+            });
+        }
+        function ChangeNameSub(deviceId, name, address) {
+                data = {
+                    ename: name,
+                    eid: deviceId
+                }
+            //校验重复校验重复
+            $.ajax({
+                type: "post",
+                url: "equip_location",
+                data: data,
+                dataType: "json",
+                success: function (data) {
+                    if (data == 1) {
+                        // layer.tips("设备名已存在！", '#ename');
+                        layui.use('layer', function () {
+                            var layer = layui.layer;
+                            layer.msg('设备名已存在！');
+                        })
+                        return false;
+                    }
+                    else if (data == 2) {
+                        layui.use('layer', function () {
+                            var layer = layui.layer;
+                            layer.msg('设备位置添加成功！');
+                            // window.location.href = window.location.href;
+                        })
+                    }
+
+                    else if (data == 0) {
+                        layui.use('layer', function () {
+                            var layer = layui.layer;
+                            layer.msg('设备名称修改成功！');
+                            // window.location.href = window.location.href;
+                        })
+                    } 
+                }
+            });
+        }
         // 首页
         function gotofirstpage() {
             currpage = 1;

templates/backstageNet/systemSet/mapManage.html

@@ -374,8 +374,8 @@
                 swneLatLng = [];
                 overlays.push(e.overlay);
 
-                swneLatLng.push(e.overlay.zo[1])
-                swneLatLng.push(e.overlay.zo[3])
+                swneLatLng.push(e.overlay.Ao[1])
+                swneLatLng.push(e.overlay.Ao[3])
 
                 e.overlay.enableEditing();
             };

templates/backstageNet/systemSet/user_list.html

@@ -15,7 +15,9 @@
 	<td>{{ user.date_joined }}</td>
 	<td>
 		<button class="layui-btn layui-btn-sm  btn-shaixuan" onclick="allotEquipPage('{{ user.username }}')">在线分地</button>
+		{% if user.username == 'admin' %}  {% else %}
 		<button class="layui-btn layui-btn-sm  layui-btn-warm" onclick="addUser('{{ user.id }}')">编辑</button>
+		{% endif %}
 		<button class="layui-btn layui-btn-sm layui-btn-normal btn-shaixuan" onclick="resetPwd('{{ user.username }}')">重置密码</button>
 		{% if user.username == 'admin' %}  {% else %}
 		<button class="layui-btn layui-btn-sm layui-btn-danger btn-shaixuan" onclick="deluser('{{ user.username }}')">删除</button>

templates/backstageNet/warn/productionset.html

@@ -250,7 +250,7 @@
                             {% else %} 当前暂无设备 {% endif %}
                         </div>
                         <div class="layui-row controlInfo" id="getthresholdDiv">
-                            <div class="layui-col-xs6 layui-col-md3">
+                            <!-- <div class="layui-col-xs6 layui-col-md3">
                                 <div class="grid-demo ctrlItem">
                                     <div class="ctrlUp">
                                         <input type="hidden" value="" class="currStutas">
@@ -279,7 +279,7 @@
                                         </form>
                                     </div>
                                 </div>
-                            </div>
+                            </div> -->
 
                         </div>
                     </div>

templates/backstageNet/warn/warnRecord.html

@@ -163,7 +163,7 @@
                 dataType:'json',
                 success:function(data){
                     console.log(data)
-                    if(data.dat){
+                    if(data.dat.length){
                         Fill_Table('datatable', data.dat, '');
                         $('.fenpei-bottom').show();
                         Fill_page(data.nums,curr);
@@ -190,9 +190,9 @@
         }
         function Fill_null_Table(table_id) {
             var html = "";
-            html += "<thead><tr><th>采集时间</th><th>风速</th><th>温度</th></tr></thead>";
-            html += "<tr><td colspan=3 style='line-height:100px'>暂无数据</td></tr>";
-            $(document.getElementById(table_id)).html(html);
+            // html += "<thead><tr><th>采集时间</th><th>风速</th><th>温度</th></tr></thead>";
+            html += "<tr><td colspan=4 style='line-height:100px'>暂无数据</td></tr>";
+            $(document.getElementById(table_id).children[1]).html(html);
             scrollBar()
         }
 

templates/backstageNet/warn/warnSet.html

@@ -291,11 +291,11 @@
                     renderHtml(data);
                 },
                 error: function (type) {
-                    var data = {
-                        alarm:'{"dat":{"e8":"1#5","e2":"0#7","e3":"0#3","e4":"0#2","e5":"1#56"},"tel":"","equip_id":"16057231"}',
-                        conf: {e8: "盐分", e2: "温度#°", e3: "雨量",e4: "气压#hpa",e5: ""}
-                    }
-                    renderHtml(data);
+                    // var data = {
+                    //     alarm:'{"dat":{"e8":"1#5","e2":"0#7","e3":"0#3","e4":"0#2","e5":"1#56"},"tel":"","equip_id":"16057231"}',
+                    //     conf: {e8: "盐分", e2: "温度#°", e3: "雨量",e4: "气压#hpa",e5: ""}
+                    // }
+                    // renderHtml(data);
                 }
             })
         }
@@ -303,7 +303,7 @@
             alarm:'{"dat":{"e6":"0#","e2":"0#","e3":"0#3","e4":"0#2","e5":"1#56"},"tel":"","equip_id":"16057231"}',
             conf: {e6: "ces", e2: "", e3: "",e4: "风向#°",e5: "数字气压#hpa"}
         }
-        renderHtml(data);
+        // renderHtml(data);
         function renderHtml(data){
             var dat = eval('('+data.alarm+')').dat;
             var conf = data.conf;

templates/outerNet/farmList.html

@@ -15,6 +15,10 @@
     <link rel="stylesheet" href="{% static '/css/module.css' %}">
     <!-- <link rel="stylesheet" href="{% static '/css/hotelList.css' %}"> -->
     <style>
+        .advImg{
+            background: url(../static/imgs/farmAdv.jpg) no-repeat center;
+            background-size: cover;
+        }
         /* 内容模块 */
         .hacienda .haciendaList{
             display: flex;

templates/outerNet/index2.html

@@ -150,7 +150,7 @@
             <div class="yet_loginCover">
                 <div class="person">
                     <div class="userHeadImg">
-                        <img src="http://192.168.1.9:8000/{{curr_user.user_picture}}" alt="">
+                        <img src="http://127.0.0.1:8000/{{curr_user.user_picture}}" alt="">
                     </div>
                     <div class="userCtrl">
                         <div class="userCtrlTop">
@@ -220,7 +220,7 @@
                                             {% for farmItem in garden %}
                                             <li class="farm-item">
                                                 <a target="_blank" href="person_farm?name={{farmItem.user}}">
-                                                  <img src="http://192.168.1.9:8000/{{farmItem.farm_img}}" alt="">
+                                                  <img src="http://127.0.0.1:8000/{{farmItem.farm_img}}" alt="">
                                                     <div class="news-item-txt">
                                                         <div class="title">
                                                             <h1>
@@ -251,7 +251,20 @@
                             <ul class="news-txt-list">
                                 {% for news in article %}
                                 <li class="news-txt-item">
+                                    {% if news.art_type == '5' %}
                                     <a href="news_view?id={{news.id}}" target="_blank">{{news.title}}</a>
+                                    {% elif news.art_type == '6' %}
+                                    <a href="video_detail?name={{news.title}}" target="_blank">{{news.title}}</a>
+                                    {% elif news.art_type == '7' %}
+                                    <a href="equip_show_detail?name={{news.title}}" target="_blank">{{news.title}}</a>
+                                    {% elif news.art_type == '8' %}
+                                    <a href="garden_intro?name={{news.title}}" target="_blank">{{news.title}}</a>
+                                    {% elif news.art_type == '9' %}
+                                    <a href="dorm_detail?name={{news.title}}" target="_blank">{{news.title}}</a>
+                                    {% elif news.art_type == '10' %}
+                                    <a href="tourist?name={{news.title}}" target="_blank">{{news.title}}</a>
+                                    {% else %}
+                                    {% endif %} 
                                 </li>
                                 {% endfor %}
                             </ul>
@@ -392,7 +405,7 @@
                                     <li class="travelItem">
                                         <a href="tourist?id={{sightseeItem.id}}" target="_blank">
                                             <div class="travelImg">
-                                                <img class="haciendaImg1" src="http://192.168.1.9:8000/{{sightseeItem.sightisee_img}}" alt="">
+                                                <img class="haciendaImg1" src="http://127.0.0.1:8000/{{sightseeItem.sightisee_img}}" alt="">
                                                 <img class="haciendaImg2" src="{% static 'imgs/22.png'%}" alt="">
                                             </div>
                                             <div class="travelTitle">
@@ -467,7 +480,7 @@
                                 {% for hotelItem in hotel2 %}
                                 <li class="hotHotelItem">
                                     <a href="dorm_detail?id={{hotelItem.id}}" target="_blank">
-                                        <img src="http://192.168.1.9:8000/{{hotelItem.hotel_img}}" width="96px" height="80px" alt="">
+                                        <img src="http://127.0.0.1:8000/{{hotelItem.hotel_img}}" width="96px" height="80px" alt="">
                                         <div class="desc">
                                             <h3>{{hotelItem.name}}</h3>
                                             <div>{{hotelItem.intro}}</div>
@@ -490,7 +503,7 @@
                                     <a href="dorm_detail?id={{hotelItem.id}}" target="_blank">
                                         <div style="height: 300px;">
                                             <div class="recommendHotelImg">
-                                                <img src="http://192.168.1.9:8000/{{hotelItem.hotel_img}}" alt="">
+                                                <img src="http://127.0.0.1:8000/{{hotelItem.hotel_img}}" alt="">
                                             </div>
                                             <h1>{{hotelItem.name}}</h1>
                                             <div class="area">{{hotelItem.intro}}</div>

templates/outerNet/tourist.html

@@ -68,7 +68,7 @@
                         <div class="sendTime title">{{sightsee.upl_time}}</div>
                         <div class="prodectIntro">
                             <div class="prodectImg">
-                                <img src="http://192.168.1.9:8000/{{sightsee.sightisee_img }}" alt="">
+                                <img src="http://127.0.0.1:8000/{{sightsee.sightisee_img }}" alt="">
                             </div>
                             <div class="descTxt">
                                 <div><span>景点名称：</span>{{sightsee.name}}</div>
@@ -84,7 +84,7 @@
                             <div>{{sightsee.content|safe}}</div>
                             <div class="descTitle">景区导览图</div>
                             <div>
-                                <img src="http://192.168.1.9:8000/{{sightsee.sightisee_img }}" width="100%" alt="">
+                                <img src="http://127.0.0.1:8000/{{sightsee.sightisee_img }}" width="100%" alt="">
                             </div>
                         </div>
                     </div>

templates/outerNet/touristList.html

@@ -13,6 +13,12 @@
     <link rel="stylesheet" href="{% static '/css/common.css' %}">
     <link rel="stylesheet" href="{% static '/css/module.css' %}">
     <link rel="stylesheet" href="{% static '/css/hotelList.css' %}">
+    <style>
+        .advImg{
+            background: url(../static/imgs/scenicAdv.jpg) no-repeat center;
+            background-size: cover;
+        }
+    </style>
 </head>
 
 <body>

templates/static/css/index2.css

@@ -450,6 +450,7 @@ span.swiper-pagination-bullet-active{
 .travelList .travelItem .travelTitle div{
     height: 40px;
     overflow: hidden;
+    font-size: 14px;
 }
 .travelCover .travelRight{
     width: 280px;
@@ -609,6 +610,9 @@ span.swiper-pagination-bullet-active{
     padding: 0 20px;
     font-size: 14px;
     font-weight: 700;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 .recommendHotelItem .area{
     line-height: 14px;

templates/static/css/videoList.css

@@ -26,6 +26,9 @@
     font-size: 16px;
     line-height: 34px;
     font-weight: 700;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 .videoMsg >div{
     width: 80%;

templates/static/js/index2.js

@@ -9,6 +9,9 @@ $(function () {
         },
     })
 
+    $('.searchBoxBj button').on('click',function(){
+        window.open('farm_list?page=1&condition='+$('.searchBoxBj input').val())
+    })
  
 
      // 轮播
@@ -155,7 +158,6 @@ $(function () {
 // 定位
 function city_change(obj){
     var txt = $(obj).html();
-    alert(txt)
     $('.currCity span').html(txt);
 }