Kaynağa Gözat

四季采摘接口增加参数

yf_ymm 5 yıl önce
ebeveyn
işleme
279fc11604

+ 5 - 3
apps/Equipment/urls.py

@@ -4,7 +4,7 @@ from django.views.static import serve
 from apps.Equipment.views import (
     Back_Manage, CKArticle_View, Contrast_View, CropCount, Cropdata,Farm_Check,Farm_Check_List,
     Dorm_Check, Dorm_Check_List, Dorm_Detail, Dorm_Img, Dorm_List, Dorm_Photo,Farm_list,Sightsee_Check,Sightsee_Check_List,
-    Dorm_Pub, Equip_Check, Equip_Check_List, Equip_Photo, Equip_Pub,Sightsee_Pub,
+    Dorm_Pub, Equip_Check, Equip_Check_List, Equip_Photo, Equip_Pub,Sightsee_Pub,My_Pub,My_Pub_List,
     Equip_Show_Detail, Equip_Show_List, Equip_Test, Farm_Choice, Farm_List,
     Farm_Mark, Garden_Check, Garden_Check_List, Garden_Detail,Garden_Intro, Garden_List,Tourist,Tourist_List,
     Garden_Manage_New, Garden_Manage_View, Garden_Pub, 
@@ -144,8 +144,10 @@ urlpatterns = [
     url(r'^news_pub$', News_Pub.as_view(), name='news_pub'),
 
     url(r'^sightsee_pub$', Sightsee_Pub.as_view(), name='sightsee_pub'),
-    
-    url(r'^sightsee_photo$', Sightsee_Photo.as_view(), name='sightsee_photo'),
+
+    #  我的发布
+    url(r'^my_pub$', My_Pub.as_view(), name='my_pub'),
+    url(r'^my_pub_list$', My_Pub_List.as_view(), name='my_pub_list'),
 
     
     url(r'^video_check$', Video_Check.as_view(), name='video_check'),#视频审核

+ 15 - 0
apps/Equipment/views.py

@@ -1352,6 +1352,21 @@ class Sightsee_Pub(ListView):
         return HttpResponse(data)
 
 
+
+#我的发布
+class My_Pub(ListView):
+    def get(self,request):
+        return render(request, 'backstageNet/infoList/myPub.html', context={})
+    def post(self,request):
+        pass
+#我的发布列表
+class My_Pub_List(ListView):
+    def get(self,request):
+        return render(request, 'backstageNet/infoList/myPubList.html', context={})
+    def post(self,request):
+        pass
+
+
 # 视频审核
 class Video_Check(ListView):
     def get(self,request):

+ 22 - 8
templates/backstageNet/info/gardenPub.html

@@ -186,11 +186,11 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">种植规模</label>
                             <div class="layui-input-inline plantScaleWidth">
-                                <input type="number" name="crop_count" required lay-verify="required"
+                                <input type="number" name="scale" required lay-verify="required"
                                     placeholder="请输入种植规模" autocomplete="off" class="layui-input">
                             </div>
                             <div class="layui-input-inline plantScaleWidth">
-                                <select name="city" lay-verify="required">
+                                <select name="unit" lay-verify="required">
                                     <option value="株">株</option>
                                     <option value="棵">棵</option>
                                     <option value="亩">亩</option>
@@ -205,21 +205,24 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">成熟日期:</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="time" required lay-verify="required" class="layui-input"
+                                <input type="text" name="time1" required lay-verify="required" class="layui-input"
                                     id="matureTime" autocomplete="off" placeholder="请选择成熟日期">
+                                    <input type="hidden" name="ripe" value="" id="ripe">
                             </div>
                         </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label">采摘时间:</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="time" required lay-verify="required" class="layui-input"
+                                <input type="text" name="time2" required lay-verify="required" class="layui-input"
                                     id="pickTime" autocomplete="off" placeholder="请选择采摘时间">
+                                    <input type="hidden" name="start" id="pluckStTime" value="">
+                                    <input type="hidden" name="end" id="pluckEdTime" value="">
                             </div>
                         </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label">详细地址:</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="company" required lay-verify="required" placeholder="请输入详细地址"
+                                <input type="text" name="addr" required lay-verify="required" placeholder="请输入详细地址"
                                     autocomplete="off" class="layui-input">
                             </div>
                         </div>
@@ -284,6 +287,7 @@
                 , format: 'M月' //可任意组合
                 , done: function (value, date) {
                     //    alert(2)
+                    $('#ripe').val(date.month)
                 }
             });
 
@@ -293,8 +297,11 @@
                 , type: 'month'
                 , range: true
                 , format: 'M月' //可任意组合
-                , done: function (value, date) {
+                , done: function (value, date, endDate) {
                     //    alert(2)
+                    console.log(date)
+                    $('#pluckStTime').val(date.month)
+                    $('#pluckEdTime').val(endDate.month)
                 }
             });
 
@@ -384,6 +391,7 @@
                 }
                 field = Object.assign(data.field, { content: content });
                 console.log(field)
+                data.field.scale = data.field.scale+data.field.unit;
                 $.ajax({
                     url: 'garden_pub',
                     type: 'post',
@@ -470,13 +478,19 @@
             }
         }
 
-
         function clearForm() {
             form.val('newsForm', {
                 "farm": "",
                 "name": "",
+                "scale":"",
+                "unit":"株",
+                "ripe":"",
+                "start":"",
+                "end":"",
                 "time": "",
-                "company": "",
+                "time1":"",
+                "time2":"",
+                "addr":"",
                 "img_url": "",
                 "crop_count":""
             });

+ 476 - 0
templates/backstageNet/infoList/myPub.html

@@ -0,0 +1,476 @@
+{% load staticfiles %}
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>我的发布</title>
+    <link rel="stylesheet" href="{% static '/lib/layui/css/layui.css' %}">
+    <link rel="stylesheet" href="{% static '/lib/css/reset.css' %}">
+    <style>
+        .breadcrumbs {
+            padding: 12px 0 12px 30px;
+            border-bottom: 1px solid #dbdbdb;
+        }
+
+        .layui-breadcrumb>* {
+            font-size: 16px;
+        }
+
+        .fixedDiv {
+            position: fixed;
+            width: 100%;
+            z-index: 999;
+            box-shadow: 0px 3px 5px 0px #ececec;
+            background: #fff;
+        }
+
+        /* 详情 */
+
+        .uploadContent {
+            padding: 25px;
+        }
+
+        /* 管理员审核权限 */
+
+        .permission {
+            text-align: right;
+            margin-bottom: 20px;
+        }
+
+        .layui-btn.active {
+            background-color: #23a3ee;
+            color: #fff;
+        }
+
+        .layui-btn.active:hover {
+            background-color: #23a3ee;
+            color: #fff;
+        }
+
+        .layui-btn-blue {
+            border: 1px solid #23a3ee;
+            background-color: #ffffff;
+            color: #23a3ee;
+        }
+
+        .layui-btn-blue:hover {
+            color: #0c6ea8;
+            border: 1px solid #0c6ea8;
+        }
+
+        /* 操作按钮 */
+
+        .operateBtn {
+            cursor: pointer;
+        }
+
+        .editBtn,
+        .editBtn:hover {
+            color: #23a3ee;
+        }
+
+        .passBtn,
+        .passBtn:hover {
+            color: #3ab851;
+        }
+
+        .delBtn,
+        .delBtn:hover {
+            color: #c12525;
+        }
+
+        .lokBtn,
+        .lokBtn:hover {
+            color: #c3ce28;
+        }
+        /* 编辑框 */
+
+        .openDiv>div {
+            padding: 30px;
+            width: 70%;
+        }
+
+        .layui-upload-img {
+            width: 92px;
+            height: 92px;
+            margin: 0 10px 10px 0;
+        }
+
+        #lianx {
+            display: none;
+        }
+        .div_one {
+            margin: 10px 0 0 150px;
+        }
+        .one {
+            border: 1px solid #000;
+            width: 100px;
+            height: 20px;
+            display: inline-block;
+        }
+        .layui-table{
+            table-layout: fixed;
+        }
+        .layui-table td{
+            white-space:nowrap;
+            overflow:hidden;
+            text-overflow: ellipsis;
+        }
+        .searchBox{
+            float: left;
+            text-align: left;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="content">
+        <div class="floatNav">
+            <!-- 导航 -->
+            <div class="breadcrumbs">
+                <span class="layui-breadcrumb">
+                    <a target="BoardRight">首页</a>
+                    <a>
+                        <cite>我的发布</cite>
+                    </a>
+                </span>
+            </div>
+        </div>
+
+        <!-- 内容 -->
+        <div>
+            <!-- 新系列表 -->
+            <div class="uploadContent" id="uploadContent">
+
+                <!-- 审核 -->
+                <div class="permission">
+                    <div class="searchBox">
+                        <div class="layui-form">
+                            <label class="layui-form-label">发布类型:</label>
+                            <div class="layui-input-inline">
+                                <select name="type" id="selectType" lay-verify="required" lay-filter="type">
+                                    <option value="">全部</option>
+                                    <option value="">新闻资讯</option>
+                                    <option value="">视频资讯</option>
+                                    <option value="">产品展厅</option>
+                                    <option value="">四季采摘</option>
+                                    <option value="">民宿导览</option>
+                                    <option value="">旅游景点</option>
+                                </select> 
+                            </div>
+                            
+                        </div>
+                    </div>
+                    <button type="button" data-type="0" class="layui-btn layui-btn-sm layui-btn-blue active">待审核</button>
+                    <button type="button" data-type="1" class="layui-btn layui-btn-sm layui-btn-blue">已通过</button>
+                </div>
+                <!-- 列表 -->
+                <div>
+                    <table class="layui-table" id="dataTable">
+                        <thead>
+                            <tr>
+                                <th>文章标题</th>
+                                <th>文章简介</th>
+                                <!-- <th>内容</th> -->
+                                <th>作者</th>
+                                <th>发布日期</th>
+                                <th>操作</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+
+                        </tbody>
+                    </table>
+                </div>
+                <div class="fenpei-bottom">
+                    <div id="page"></div>
+                </div>
+            </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>
+        var table, layer, form, laypage, element;
+        layui.use(['table', 'layer', 'form', 'laypage', 'element'], function () {
+            element = layui.element;
+            table = layui.table;
+            layer = layui.layer;
+            form = layui.form;
+            $ = layui.jquery;
+            laypage = layui.laypage;
+
+            //一些事件监听
+            element.on('tab(demo)', function (data) {
+                console.log(data);
+            });
+
+            //第一个实例
+            getData('news_check_list', 1, 0) //url,page,信息类型
+
+            form.on('select(type)', function(data){
+                var hidden = $('.permission button.active').data('type');
+                getData('news_check_list', 1, hidden) //url,page,信息类型
+
+            }); 
+            //监听提交
+            form.on('submit(formDemo)', function (data) {
+                console.log(data)
+                layer.msg(JSON.stringify(data.field));
+                return false;
+            });
+
+        });
+
+        function getData(url, page, hidden) {
+            $.ajax({
+                url: 'news_check_list',
+                type: 'get',
+                data: {
+                    page: page,
+                    hidden: hidden
+                },
+                dataType: 'html',
+                success: function (data) {
+                    $('#dataTable').children('tbody').html(data);
+                    laypage.render({
+                        elem: 'page' //注意,这里的 test1 是 ID,不用加 # 号
+                        // , count: 30
+                        , count: $('#totalPage').val()
+                        , theme: '#2ca9f9'
+                        , layout: ['prev', 'page', 'next', 'skip']
+                        , jump: function (obj, first) {
+                            if (!first) {
+                                $.ajax({
+                                    url: 'news_check_list',
+                                    type: 'get',
+                                    data: { page: obj.curr ,hidden: hidden},
+                                    dataType: 'html',
+                                    success: function (data) {
+                                        console.log(data);
+                                        $('#dataTable').children('tbody').html(data);
+                                        console.log($('#totalPage').val());
+                                    },
+                                    error: function (type) {
+                                        console.log(type)
+                                    }
+                                })
+                            }
+                        }
+                    });
+                },
+                error: function (type) {
+                    console.log(type)
+                }
+            })
+        }
+
+        // 编辑
+        function editFun(id) {
+            $.ajax({
+                url: 'news_check_list',
+                type: 'post',
+                data: {
+                    id: id,
+                    req: 'edit'
+                },
+                dataType: 'json',
+                success: function (data) {
+                    window.data = data[0]
+                },
+                error: function (type) {
+                    console.log(type)
+                }
+            })
+
+            var index = layer.open({
+                title: '新闻资讯编辑',
+                type: 2,
+                area: ['850px', '560px'],
+                content: 'news_pub',
+                success: function (layero, index) {
+                    // alert(2)
+                    var body = layer.getChildFrame('body', index);
+                    var iframeWin = window[layero.find('iframe')[0]['name']]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+                    body.find('input[name= "id"]').val(window.data.id) //id
+                    body.find('input[name= "title"]').val(window.data.title) //标题
+                    body.find('input[name= "writer"]').val(window.data.writer) //发布人
+                    body.find('input[name= "intro"]').val(window.data.intro) //文章简介
+                    body.find('textarea[name= "intro"]').val(window.data.intro) //文章简介
+                    body.find('textarea[id= "editor1"]').val(window.data.content) //文章正文
+                }
+            });
+        }
+
+        // 通过
+        function passFun(id) {
+            layer.confirm('是否通过此信息',{title:'通过'}, function (index) {
+                $.ajax({
+                    url: 'news_check_list',
+                    type: 'post',
+                    data: {
+                        req: 'check',
+                        id: id
+                    },
+                    dataType: 'json',
+                    success: function (data) {
+                        if (data) {
+                            // obj.del(); //删除对应行(tr)的DOM结构,并更新缓存
+                            // $(".layui-laypage-btn")[0].click();//点击分页刷新当前页
+                            layer.close(index);
+                            // parent.layer.msg("操作成功!", {time: 1000}, function () {
+                            //重新加载父页面
+                            location.reload();
+                        }
+                    }
+                })
+                layer.close(index);
+
+            });
+        }
+
+        // 删除
+        function delFun(id) {
+            layer.confirm('真的删除行么',{title:'删除'}, function (index) {
+                $.ajax({
+                    url: 'news_check',
+                    type: 'post',
+                    data: {
+                        id: id,
+                    },
+                    dataType: 'json',
+                    success: function (data) {
+                        if (data) {
+                            // obj.del(); //删除对应行(tr)的DOM结构,并更新缓存
+                            // $(".layui-laypage-btn")[0].click();//点击分页刷新当前页
+                            layer.close(index);
+                            // parent.layer.msg("操作成功!", {time: 1000}, function () {
+                            //重新加载父页面
+                            location.reload();
+                        }
+                    }
+                })
+                layer.close(index);
+
+            });
+        }
+
+
+        //查看
+        function lokFun(id) {
+            layer.open({
+                type: 0,
+                id: 'Layer',
+                title: '新闻资讯查看',
+                area: ['740px', '500px'],
+                shade: 0,
+                anim: -1,
+                content: '<div class="table"></div>',
+                success: function(layero, index) {
+                    var colsList = [
+                        [
+                            { field: 'title', title: '文章标题' },
+                            { field: 'intro', title: '文章简介' },
+                            { field: 'content', title: '内容' },
+                            { field: 'writer', title: '作者' },
+                            { field: 'time', title: '发布日期' }
+                        ]
+                    ];
+                    $.ajax({
+                        url: 'news_check',
+                        type: 'post',
+                        async: false,
+                        data: {
+                            ids: id,
+                        },
+                        dataType: 'json',
+                        success: function (data) {
+                            window.data = data[0]
+                        }
+                    })
+                    var Datas = [];
+                    console.log(layero.find('.table').html(window.data.content))
+                    Datas.push({
+                        title: window.data.title,
+                        intro: window.data.intro,
+                        content: window.data.content ,
+                        writer: window.data.writer ,
+                        time: window.data.time ,
+                    });
+                    // table.render({
+                    //     elem: layero.find('.table'),
+                    //     id: 'Message',
+                    //     data: Datas,
+                    //     cols: colsList,
+                    //     limit: 8,
+                    // });
+                }
+            });
+        }
+
+        // 审核权限
+        $('.permission').on('click', 'button', function () {
+            if (!$(this).hasClass('active')) {
+                var type = $(this).data('type'); //0待审核  1已通过
+                $('.permission button').removeClass('active');
+                $(this).addClass('active');
+                $('#selectType').val('');
+                form.render('select');
+                getData('news_check_list', 1, type)
+            }
+        })
+
+
+        // windowAddMouseWheel();
+        function windowAddMouseWheel() {
+            var scrollFunc = function (e) {
+                e = e || window.event;
+                var top = $(window).scrollTop();
+                if (e.wheelDelta) {  //判断浏览器IE,谷歌滑轮事件
+                    if (e.wheelDelta > 0) { //当滑轮向上滚动时
+                        if (top < 60) {
+                            if ($(".floatNav").hasClass("fixedDiv")) {
+                                $(".floatNav").removeClass("fixedDiv");
+                                $(window).scrollTop(0)
+                            }
+                        }
+                    }
+                    if (e.wheelDelta < 0) { //当滑轮向下滚动时
+                        if (top >= 60) {
+                            $(".floatNav").addClass("fixedDiv");
+                        }
+                    }
+                } else if (e.detail) {  //Firefox滑轮事件
+                    if (e.detail > 0) { //当滑轮向上滚动时
+                        if (top < 60) {
+                            if ($(".floatNav").hasClass("fixedDiv")) {
+                                $(".floatNav").removeClass("fixedDiv");
+                                $(window).scrollTop(0)
+                            }
+                        }
+                    }
+                    if (e.detail < 0) { //当滑轮向下滚动时
+                        if (top >= 60) {
+                            $(".floatNav").addClass("fixedDiv");
+                        }
+                    }
+                }
+            };
+            //给页面绑定滑轮滚动事件
+            if (document.addEventListener) {
+                document.addEventListener('DOMMouseScroll', scrollFunc, false);
+            }
+            //滚动滑轮触发scrollFunc方法
+            window.onmousewheel = document.onmousewheel = scrollFunc;
+        }
+
+    </script>
+</body>
+
+</html>

+ 25 - 0
templates/backstageNet/infoList/myPubList.html

@@ -0,0 +1,25 @@
+{% if art|length %} {% for msg in art %}
+<tr>
+    <td>{{ msg.title }}</td>
+    <td>{{ msg.intro }}</td>
+    <!-- <td>{{ msg.content|safe }}</td> -->
+    <td>{{ msg.writer }}</td>
+    <td>{{ msg.upl_time }}</td>
+    <td>
+        {% if msg.hidden == 0%}
+        <a href="JavaScript:;" class="editBtn" onclick="editFun('{{msg.id}}')">编辑</a>
+        |
+        <a href="JavaScript:;" class="passBtn"  onclick="passFun('{{msg.id}}')">通过</a>
+        |
+        {% endif %} 
+        <a href="JavaScript:;" class="delBtn" onclick="delFun('{{msg.id}}')">删除</a>
+        |
+        <a href="JavaScript:;" class="lokBtn" onclick="lokFun('{{msg.id}}')">查看</a>
+    </td>
+</tr>
+{% endfor %} {% else %}
+<tr>
+    <td colspan="5" style="text-align:center;">暂无数据</td>
+</tr>
+{% endif %}
+<input type="hidden" value="{{nums}}" id="totalPage">

+ 32 - 23
templates/backstageNet/limit/limit.html

@@ -215,118 +215,126 @@
             },
             {
                 "id": 4,
+                "title": "我的发布",
+                "icon": "&#xe609;",
+                "url": "my_pub",
+                "disabled": "true",
+                "children": []
+            },
+            {
+                "id": 5,
                 "title": "视频监控",
                 "icon": "&#xe610;",
                 "url": "jkview",
                 "children": []
             },
             {
-                "id": 5,
+                "id": 6,
                 "title": "传感及控制",
                 "icon": "&#xe654;",
                 "url": "",
                 "children": [
                     {
-                        "id": 5.1,
+                        "id": 6.1,
                         "title": "控制模块",
                         "url": "qxzcontrol",
                     },
                     {
-                        "id": 5.2,
+                        "id": 6.2,
                         "title": "趋势分析",
                         "url": "qxzchart",
                     },
                     {
-                        "id": 5.3,
+                        "id": 6.3,
                         "title": "数据统计",
                         "url": "qxz_status",
                     }
                 ]
             },
             {
-                "id": 6,
+                "id": 7,
                 "title": "预警中心",
                 "icon": "&#xe634;",
                 "url": "",
                 "children": [
                     {
-                        "id": 6.1,
+                        "id": 7.1,
                         "title": "阈值设置",
                         "url": "qxz_warning_view",
                     },
                     {
-                        "id": 6.2,
+                        "id": 7.2,
                         "title": "生产方式设置",
                         "url": "productionset",
                     },
                     {
-                        "id": 6.3,
+                        "id": 7.3,
                         "title": "预警记录",
                         "url": "qxz_warning_list",
                     },
                 ]
             },
             {
-                "id": 7,
+                "id": 8,
                 "title": "开心农场",
                 "icon": "&#xe603;",
                 "url": "",
                 "children": [
                     {
-                        "id": 7.1,
+                        "id": 8.1,
                         "title": "我的农场",
                         "url": "person_farm_edit",
                     },
                     {
-                        "id": 7.2,
+                        "id": 8.2,
                         "title": "农场管理",
                         "url": "garden_manage_view",
                     },
                     {
-                        "id": 7.3,
+                        "id": 8.3,
                         "title": "人员管理",
                         "url": "garden_user_view",
                     },
                     {
-                        "id": 7.1,
+                        "id": 8.4,
                         "title": "库存管理",
                         "url": "repertory_view",  //物料管理    
                     },
                     {
-                        "id": 7.5,
+                        "id": 8.5,
                         "title": "种植管理",
                         "url": "cropcount",
                     },
                     {
-                        "id": 7.6,
+                        "id": 8.6,
                         "title": "入库管理",
                         "url": "pick",
                     },
                     {
-                        "id": 7.7,
+                        "id": 8.7,
                         "title": "销售管理",
                         "url": "sell_view",
                     }
                 ]
             },
             {
-                "id": 8,
+                "id": 9,
                 "title": "数据中心",
                 "icon": "&#xe603;",
                 "url": "",
                 "children": [
                     {
-                        "id": 8.1,
+                        "id": 9.1,
                         "title": "产业数据",
                         "url": "industrydata",
                     },
                     {
-                        "id": 8.2,
+                        "id": 9.2,
                         "title": "类型分析",
                         "url": "type",
                     },
                     {
-                        "id": 8.3,
+                        "id": 9.3,
                         "title": "对比分析",
                         "url": "contrast",
                     },
@@ -435,20 +443,20 @@
                 ]
             },
 			{
-                "id": 13,
+                "id": 14,
                 "title": "专家诊断",
                 "icon": "&#xe765;",
                 "url": "",
                 "disabled": "true",
                 "children": [
                     {
-                        "id": 13.1,
+                        "id": 14.1,
                         "title": "在线专家",
                         "url": "expert",
                         "disabled": "true",
                     },
                     {
-                        "id": 13.2,
+                        "id": 14.2,
                         "title": "知识库",
                         "url": "learning_depot",
                         "disabled": "true",
@@ -456,6 +464,7 @@
                 ]
             },
         ]
+
         $.ajax({
             url: 'limit',
             type: 'post',

+ 31 - 23
templates/backstageNet/limit/limit_user_list.html

@@ -55,118 +55,126 @@
             },
             {
                 "id": 4,
+                "title": "我的发布",
+                "icon": "&#xe609;",
+                "url": "my_pub",
+                "disabled": "true",
+                "children": []
+            },
+            {
+                "id": 5,
                 "title": "视频监控",
                 "icon": "&#xe610;",
                 "url": "jkview",
                 "children": []
             },
             {
-                "id": 5,
+                "id": 6,
                 "title": "传感及控制",
                 "icon": "&#xe654;",
                 "url": "",
                 "children": [
                     {
-                        "id": 5.1,
+                        "id": 6.1,
                         "title": "控制模块",
                         "url": "qxzcontrol",
                     },
                     {
-                        "id": 5.2,
+                        "id": 6.2,
                         "title": "趋势分析",
                         "url": "qxzchart",
                     },
                     {
-                        "id": 5.3,
+                        "id": 6.3,
                         "title": "数据统计",
                         "url": "qxz_status",
                     }
                 ]
             },
             {
-                "id": 6,
+                "id": 7,
                 "title": "预警中心",
                 "icon": "&#xe634;",
                 "url": "",
                 "children": [
                     {
-                        "id": 6.1,
+                        "id": 7.1,
                         "title": "阈值设置",
                         "url": "qxz_warning_view",
                     },
                     {
-                        "id": 6.2,
+                        "id": 7.2,
                         "title": "生产方式设置",
                         "url": "productionset",
                     },
                     {
-                        "id": 6.3,
+                        "id": 7.3,
                         "title": "预警记录",
                         "url": "qxz_warning_list",
                     },
                 ]
             },
             {
-                "id": 7,
+                "id": 8,
                 "title": "开心农场",
                 "icon": "&#xe603;",
                 "url": "",
                 "children": [
                     {
-                        "id": 7.1,
+                        "id": 8.1,
                         "title": "我的农场",
                         "url": "person_farm_edit",
                     },
                     {
-                        "id": 7.2,
+                        "id": 8.2,
                         "title": "农场管理",
                         "url": "garden_manage_view",
                     },
                     {
-                        "id": 7.3,
+                        "id": 8.3,
                         "title": "人员管理",
                         "url": "garden_user_view",
                     },
                     {
-                        "id": 7.1,
+                        "id": 8.4,
                         "title": "库存管理",
                         "url": "repertory_view",  //物料管理    
                     },
                     {
-                        "id": 7.5,
+                        "id": 8.5,
                         "title": "种植管理",
                         "url": "cropcount",
                     },
                     {
-                        "id": 7.6,
+                        "id": 8.6,
                         "title": "入库管理",
                         "url": "pick",
                     },
                     {
-                        "id": 7.7,
+                        "id": 8.7,
                         "title": "销售管理",
                         "url": "sell_view",
                     }
                 ]
             },
             {
-                "id": 8,
+                "id": 9,
                 "title": "数据中心",
                 "icon": "&#xe603;",
                 "url": "",
                 "children": [
                     {
-                        "id": 8.1,
+                        "id": 9.1,
                         "title": "产业数据",
                         "url": "industrydata",
                     },
                     {
-                        "id": 8.2,
+                        "id": 9.2,
                         "title": "类型分析",
                         "url": "type",
                     },
                     {
-                        "id": 8.3,
+                        "id": 9.3,
                         "title": "对比分析",
                         "url": "contrast",
                     },
@@ -275,20 +283,20 @@
                 ]
             },
 			{
-                "id": 13,
+                "id": 14,
                 "title": "专家诊断",
                 "icon": "&#xe765;",
                 "url": "",
                 "disabled": "true",
                 "children": [
                     {
-                        "id": 13.1,
+                        "id": 14.1,
                         "title": "在线专家",
                         "url": "expert",
                         "disabled": "true",
                     },
                     {
-                        "id": 13.2,
+                        "id": 14.2,
                         "title": "知识库",
                         "url": "learning_depot",
                         "disabled": "true",