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

templates/backstageNet/production/gardenManage.html

@@ -185,7 +185,10 @@
                         <div class="layui-form-item" style="margin-bottom: 0;">
                             <label class="layui-form-label" style="color:#029eef">选择园区：</label>
                             <div class="layui-input-inline">
-                                <select name="identity" id="farmSelect">
+                                <select name="city" lay-verify="" lay-search  id="farmSelect">
+                                    {% for item in garden %}
+                                    <option value="{{item.id}}">{{item.name}}</option>
+                                    {% endfor %}
                                 </select>
                             </div>
                         </div>

templates/backstageNet/production/workerManage.html

@@ -67,6 +67,7 @@
         .layui-col-xs6 {
             padding: 10px 10px 0 10px;
         }
+
         /*  */
 
         .userItem {
@@ -133,18 +134,36 @@
         <!-- 内容 -->
         <div class="mainContent">
             <div class="widget-title">
-                <button  type="button"  class="layui-btn  layui-btn-normal layui-btn-sm fr" onclick="selectModelFun()">新增</button>
+                <button type="button" class="layui-btn  layui-btn-normal layui-btn-sm fr"
+                    onclick="selectModelFun()">新增</button>
                 <h2>
-                    人员管理
+                    人员管理{% if garden|length %}
+                    <form class="layui-form" action="" style="display:inline-block;vertical-align: middle;">
+                        <div class="layui-form-item" style="margin-bottom: 0;">
+                            <label class="layui-form-label" style="color:#029eef">园区选择：</label>
+                            <div class="layui-input-inline">
+                                <select name="areaSelct" id="areaSelct" lay-verify="required" lay-filter="areaSelct">
+                                    {% for area in garden %}
+                                    <option value="{{area.id}}">{{area.name}}</option>
+                                    {% endfor %}
+                                </select>
+                            </div>
+                        </div>
+                    </form>
+                    {% else %} {% endif %} {% if farm|length %}
                     <form class="layui-form" action="" style="display:inline-block;vertical-align: middle;">
                         <div class="layui-form-item" style="margin-bottom: 0;">
-                            <label class="layui-form-label" style="color:#029eef">选择农场：</label>
-                            <div class="layui-input-inline" >
-                                <select name="city" id="farmSelect">
+                            <label class="layui-form-label" style="color:#029eef">农场选择：</label>
+                            <div class="layui-input-inline">
+                                <select name="farmSelct" id="farmSelct" lay-verify="required" lay-filter="farmSelct">
+                                    {% for farm in farm %}
+                                    <option value="{{farm.id}}">{{farm.name}}</option>
+                                    {% endfor %}
                                 </select>
                             </div>
                         </div>
                     </form>
+                    {% else %} {% endif %}
                 </h2>
             </div>
             <div class="">
@@ -154,7 +173,7 @@
                 </div>
                 <div class="fenpei-bottom">
                     <div id="page"></div>
-                    </div>
+                </div>
             </div>
         </div>
 
@@ -167,7 +186,8 @@
                 <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="请输入人员姓名" autocomplete="off" class="layui-input">
+                        <input type="text" name="name" required lay-verify="required" placeholder="请输入人员姓名"
+                            autocomplete="off" class="layui-input">
                     </div>
                 </div>
 
@@ -175,22 +195,37 @@
                     <label class="layui-form-label">性别</label>
                     <div class="layui-input-block">
                         <input type="radio" name="sex" value="男" title="男">
-                        <input type="radio" name="sex" value="女" title="女" >
+                        <input type="radio" name="sex" value="女" title="女">
                     </div>
                 </div>
 
                 <div class="layui-form-item">
                     <label class="layui-form-label">联系方式：</label>
                     <div class="layui-input-inline">
-                        <input type="text" name="mobile" required lay-verify="required" placeholder="请输入联系方式" autocomplete="off" class="layui-input">
+                        <input type="text" name="mobile" required lay-verify="required" placeholder="请输入联系方式"
+                            autocomplete="off" class="layui-input">
                     </div>
                 </div>
 
                 <div class="layui-form-item">
                     <label class="layui-form-label">管理农场</label>
-                    <div class="layui-input-block">
-                        <select name="city" id="farmSelect" lay-verify="required">
+                    <div class="layui-input-inline" style="width: 191px;">
+                        <select name="city" lay-verify="" lay-search id="gardenSelect">
+                            {% for item in garden %}
+                            <option value="{{item.id}}">{{item.name}}</option>
+                            {% endfor %}
+                        </select>
+                        <!-- <select name="city" id="farmSelect" lay-verify="required">
+                        </select> -->
+                    </div>
+                    <div class="layui-input-inline" style="width: 191px;">
+                        <select name="city" lay-verify="" lay-search id="gardenSelect">
+                            {% for item in garden %}
+                            <option value="{{item.id}}">{{item.name}}</option>
+                            {% endfor %}
                         </select>
+                        <!-- <select name="city" id="farmSelect" lay-verify="required">
+                        </select> -->
                     </div>
                 </div>
 
@@ -212,93 +247,44 @@
             laydate = layui.laydate;
             laypage = layui.laypage;
             form = layui.form;
-            //执行一个laydate实例
-            laydate.render({
-                elem: '#timSelectBox' //指定元素
-                , range: true
-                , done: function (value, date) {
-                    var dateArray = value.split(' - ')
-                    $('#tableBegin').val(dateArray[0])
-                    $('#tableEnd').val(dateArray[1])
-                }
-            });
 
-              //园区下拉列表数据渲染
-            gedataA('park_land')
-             function gedataA(url) {
+            // 获取农场选择
+            form.on('select(areaSelct)', function (data) {
                 $.ajax({
-                    url: 'park_land',
-                    type: 'get',
+                    url: 'contrast',
+                    type: 'post',
+                    dataType: 'json',
                     data: {
-                        
+                        id: data.value
                     },
-                    dataType: 'json',
                     success: function (data) {
-                        var d = data
-                        for (var i = 0; i < d.length; i++) {
-                            var name = data[i].name
-                            var id = data[i].id
-                            var opt = "<option value='" + id + "'>" + name + "</option>" 
-                            $('#farmSelect').append(opt);
-                            form.render('select'); //刷新select选择框渲染
+                        console.log(data)
+                        if (data.length) {
+                            renderSelect(data);
+                        } else {
+                            $('#farmSelct').html('');
+                            layui.use(['form'], function () {
+                                form.render('select'); //刷新select选择框渲染
+                            })
                         }
-                        
-                        
-                    //页面数据渲染
-                    gedata('garden_user_new', 1)
-                    function gedata(url, page) {
-                        sessionStorage.setItem('seelectID', $('#farmSelect option:eq(0)').val())
-                        $.ajax({
-                            url: 'garden_user_new',
-                            type: 'get',
-                            data: {
-                                page: page,
-                                ids: $('#farmSelect option:eq(0)').val(),
-                            },
-                            dataType: 'html',
-                            success: function (data) {
-                                $('#box').children('#chunk').html(data);
-                                laypage.render({
-                                    elem: 'page' //注意，这里的 test1 是 ID，不用加 # 号
-                                    , count: $('#totalPage').val()
-                                    , theme: '#2ca9f9'
-                                    , layout: ['prev', 'page', 'next', 'skip']
-                                    , jump: function (obj, first) {
-                                        if (!first) {
-                                            $.ajax({
-                                                url: 'garden_user_new',
-                                                type: 'get',
-                                                data: { page: obj.curr },
-                                                dataType: 'html',
-                                                success: function (data) {
-                                                    console.log(data);
-                                                    $('#box').children('#chunk').html(data);
-                                                    console.log($('#totalPage').val());
-                                                },
-                                                error: function (type) {
-                                                    console.log(type)
-                                                }
-                                            })
-                                        }
-                                    }
-                                });
-                            },
-                            error: function (type) {
-                                console.log(type)
-                            }
-                        })
-                    
-                }
+                        gedata('garden_user_new', 2)
                     },
                     error: function (type) {
                         console.log(type)
                     }
                 })
-            }
+            });
+
+
+
+
+
+
+
+
 
             //监听提交
             form.on('submit(formDemo)', function (data) {
-                var postData = $.param({ ids: sessionStorage.getItem('seelectID') }) + '&' + $("#formDiv").serialize();
                 $.ajax({
                     url: 'garden_user_view',
                     data: postData,
@@ -310,7 +296,6 @@
                         } else {
                             layer.msg("新增成功", { icon: 1 });
                         }
-                        sessionStorage.removeItem('seelectID')
                     },
                     error: function (type) {
                         if (data.field.id !== "") {
@@ -318,74 +303,122 @@
                         } else {
                             layer.msg("新增失败", { icon: 2 });
                         }
-                        sessionStorage.removeItem('seelectID')
                     }
                 })
                 return false;
 
             });
-            
+
 
             //选择农场的下拉框监听回调
-            form.on('select()', function(data){
-            sessionStorage.setItem('seelectID', data.value)
-            gedata('garden_user_new', 1 )
-            function gedata(url, page) {
-                $.ajax({
-                    url: 'garden_user_new',
-                    type: 'get',
-                    data: {
-                        page: page,
-                        ids: data.value,
-                    },
-                    dataType: 'html',
-                    success: function (data) {
-                        $('#box').children('#chunk').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: 'garden_user_new',
-                                        type: 'get',
-                                        data: { page: obj.curr },
-                                        dataType: 'html',
-                                        success: function (data) {
-                                            console.log(data);
-                                            $('#box').children('#chunk').html(data);
-                                            console.log($('#totalPage').val());
-                                        },
-                                        error: function (type) {
-                                            console.log(type)
-                                        }
-                                    })
-                                }
-                            }
-                        });
-                    },
-                    error: function (type) {
-                        console.log(type)
-                    }
-                })
-             }
-            });
-            
-            //监听用户是否刷新，刷新页面删除本地存储的ID
-            $(function() {  
-                $(window).on('beforeunload', function() {  
-                    sessionStorage.removeItem('seelectID')
-                });  
-            });  
+            // form.on('select()', function (data) {
+            //     sessionStorage.setItem('seelectID', data.value)
+            //     gedata('garden_user_new', 1)
+            //     function gedata(url, page) {
+            //         $.ajax({
+            //             url: 'garden_user_new',
+            //             type: 'get',
+            //             data: {
+            //                 page: page,
+            //                 ids: data.value,
+            //             },
+            //             dataType: 'html',
+            //             success: function (data) {
+            //                 $('#box').children('#chunk').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: 'garden_user_new',
+            //                                 type: 'get',
+            //                                 data: { page: obj.curr },
+            //                                 dataType: 'html',
+            //                                 success: function (data) {
+            //                                     console.log(data);
+            //                                     $('#box').children('#chunk').html(data);
+            //                                     console.log($('#totalPage').val());
+            //                                 },
+            //                                 error: function (type) {
+            //                                     console.log(type)
+            //                                 }
+            //                             })
+            //                         }
+            //                     }
+            //                 });
+            //             },
+            //             error: function (type) {
+            //                 console.log(type)
+            //             }
+            //         })
+            //     }
+            // });
         })
 
-
+        //页面数据渲染
+        // gedata('garden_user_new', 1)
+        function gedata(url, page) {
+            $.ajax({
+                url: 'garden_user_new',
+                type: 'get',
+                data: {
+                    page: page,
+                    id: $('#farmSelect').val(),
+                },
+                dataType: 'html',
+                success: function (data) {
+                    $('#box').children('#chunk').html(data);
+                    laypage.render({
+                        elem: 'page' //注意，这里的 test1 是 ID，不用加 # 号
+                        , count: $('#totalPage').val()
+                        , theme: '#2ca9f9'
+                        , layout: ['prev', 'page', 'next', 'skip']
+                        , jump: function (obj, first) {
+                            if (!first) {
+                                $.ajax({
+                                    url: 'garden_user_new',
+                                    type: 'get',
+                                    data: { page: obj.curr },
+                                    dataType: 'html',
+                                    success: function (data) {
+                                        console.log(data);
+                                        $('#box').children('#chunk').html(data);
+                                        console.log($('#totalPage').val());
+                                    },
+                                    error: function (type) {
+                                        console.log(type)
+                                    }
+                                })
+                            }
+                        }
+                    });
+                },
+                error: function (type) {
+                    console.log(type)
+                }
+            })
+        }
+        function renderSelect(data) {
+            $('#farmSelct').html('');
+            var html = '';
+            for (var i = 0; i < data.length; i++) {
+                html += '<option value="' + data[i].id + '">' + data[i].name + '</option>';
+                if (i == data.length - 1) {
+                    $('#farmSelct').html(html);
+                    layui.use(['form'], function () {
+                        form.render('select'); //刷新select选择框渲染
+                    })
+                    gedata('garden_user_new', 1)
+                }
+            }
+        }
         //删除
-        function del (id) {
-            layer.confirm('真的删除行么',{title:'删除'}, function (index) {
+        function del(id) {
+            layer.confirm('真的删除行么', { title: '删除' }, function (index) {
                 $.ajax({
                     url: 'garden_user_new',
                     type: 'post',
@@ -399,7 +432,7 @@
                         if (data) {
                             layer.close(index);
                             location.reload();
-                            layer.msg("操作成功!", {time: 1000, icon: 1})
+                            layer.msg("操作成功!", { time: 1000, icon: 1 })
                         }
                     }
                 })
@@ -408,9 +441,9 @@
 
 
         //修改 
-        function amend (id) {
+        function amend(id) {
             if (sessionStorage.getItem('seelectID') !== null) {
-                    $.ajax({
+                $.ajax({
                     url: 'garden_user_new',
                     type: 'post',
                     async: false,
@@ -420,7 +453,7 @@
                     },
                     dataType: 'json',
                     success: function (data) {
-                        selectModelFun ()
+                        selectModelFun()
                         $('input[name="name"]').val(data[0].name) //名称
                         $("input[name=sex][value=男]").attr("checked", data[0].gender == '男' ? true : false);
                         $("input[name=sex][value=女]").attr("checked", data[0].gender == '女' ? true : false);
@@ -435,7 +468,7 @@
             } else {
                 layer.msg("请先选择园区！", { time: 1000, icon: 5 })
             }
-            
+
         }
 
         //重置
@@ -452,17 +485,17 @@
         }
 
         function selectModelFun() {
-            if (sessionStorage.getItem('seelectID') !== null ) {
-                    layui.use(['layer'], function () {
+            if (sessionStorage.getItem('seelectID') !== null) {
+                layui.use(['layer'], function () {
                     layer = layui.layer;
                     var index = layer.open({
                         type: 1,
                         title: '人员管理',
                         content: $('#selectModel'),
-                        area: ['550px', '600px'],
-                        cancel: function(){
+                        area: ['600px', '600px'],
+                        cancel: function () {
                             // 右上角关闭事件的逻辑
-                            clearForm ()
+                            clearForm()
                             sessionStorage.removeItem('seelectID')
                         }
                     })
@@ -470,7 +503,7 @@
             } else {
                 layer.msg("请先选择园区！", { time: 1000, icon: 5 })
             }
-           
+
 
         }
     </script>