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

apps/Equipment/urls.py

@@ -271,7 +271,9 @@ urlpatterns = [
     url(r'^map_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\map_photo'}), #本地
     url(r'^sightsee_photos/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\sightsee_photos'}), #本地
     url(r'^media/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\media'}), #本地
-    
+    url(r'^sell_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\sell_photo'}), #本地
+    url(r'^cropcount_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\cropcount_photo'}), #本地
+    url(r'^garden_photo/(?P<path>.*)', serve, {'document_root': 'F:\YFWLW\second\garden_photo'}), #本地
     
 
     # url(r'^hotel_photo/(?P<path>.*)', serve, {'document_root': '/home/web/second/second/hotel_photo'}), #本地

templates/backstageNet/production/cropcount.html

@@ -518,7 +518,6 @@
                             //         },
                             //         error: function (type) {
                             //             console.log(type)
-                            //             alert('失败')
                             //         }
                             //     })
                             // }
@@ -536,6 +535,7 @@
                 //页面数据渲染
                 gedata('cropcount_view', 1)
                 function gedata(url, page) {
+                    var ids = data.value
                     $.ajax({
                         url: 'cropcount_view',
                         type: 'get',
@@ -578,8 +578,7 @@
                                         '<div class="userItem">' +
                                         '<div class="userMsg">' +
                                         '<div class="fl imgDiv">' +
-                                        '<img src="" alt="">' +
-                                        '<p>' + group[i].data.cropname + '</p>' +
+                                        '<img src="' + group[i].data.crop_img + '" alt="">' +
                                         '</div>' +
                                         '<div class="userInfo">' +
                                         // '<p>当前阶段：' + group[i].curro + '</p>' +
@@ -612,7 +611,8 @@
                                                 url: 'cropcount_view',
                                                 type: 'get',
                                                 // data: { page: obj.curr, ids: sessionStorage.getItem('seelectID') },
-                                                data: { page: obj.curr, ids: $('#farmSelect').val() },
+                                                // data: { page: obj.curr, ids: $('#farmSelect').val() },
+                                                data: { page: obj.curr, ids: ids },
                                                 dataType: 'html',
                                                 success: function (data) {
                                                     //转换格式
@@ -649,7 +649,7 @@
                                                             '<div class="userItem">' +
                                                             '<div class="userMsg">' +
                                                             '<div class="fl imgDiv">' +
-                                                            '<img src="" alt="">' +
+                                                            '<img src="' + group[i].data.crop_img +'" alt="">' +
                                                             '<p>' + group[i].data.cropname + '</p>' +
                                                             '</div>' +
                                                             '<div class="userInfo">' +
@@ -686,7 +686,6 @@
                         },
                         error: function (type) {
                             console.log(type)
-                            // alert('失败')
                         }
                     })
                 }
@@ -719,8 +718,8 @@
                 return false;
             });
 
-             //图片上传
-             var uploadInst = upload.render({
+            //图片上传
+            var uploadInst = upload.render({
                 elem: '#pickImg'
                 , url: 'cropcount_photo'
                 , field: 'gar_img'
@@ -754,6 +753,164 @@
                 }
             });
 
+
+            // 选中农场进行渲染列表
+            gedata('cropcount_view', 1, $('#farmSelct').val())
+            function gedata(url, page, id) {
+                $.ajax({
+                    url: 'cropcount_view',
+                    type: 'get',
+                    data: {
+                        page: page,
+                        ids: id,
+                    },
+                    dataType: 'json',
+                    success: function (data) {
+                        if (data.nums !== 0) {
+                            //获取需要的数据
+                            var group = data.dat;
+                            //拼接字符串
+                            var str = '';
+                            //对数据做遍历，拼接到页面显示
+                            for (var i = 0; i < group.length; i++) {
+                                var strSeparator = "-"; //日期分隔符
+                                var oDate1
+                                var oDate2
+                                var strDateStart = new Date()
+                                var Str = strDateStart.getFullYear() + '-' +
+                                    (strDateStart.getMonth() + 1) + '-' +
+                                    strDateStart.getDate() + ' '
+                                var strDateEnd = group[i].data.upl_time
+                                var iDays;
+                                oDate1 = Str.split(strSeparator);
+                                oDate2 = strDateEnd.split(strSeparator);
+                                var strDateS = new Date(oDate1[0], oDate1[1] - 1, oDate1[2]);
+                                var strDateE = new Date(oDate2[0], oDate2[1] - 1, oDate2[2]);
+                                iDays = parseInt(Math.ceil(strDateS - strDateE) / 1000 / 60 / 60 / 24)//把相差的毫秒数转换为天数
+                                if (iDays > 0) {
+                                    //正数
+                                    var dateNum = iDays
+                                } else if (iDays <= 0) {
+                                    //负数
+                                    var dateNum = 0
+                                }
+                                str += '<div class="layui-col-xs6 layui-col-sm6 layui-col-md4">' +
+                                    '<div class="userItem">' +
+                                    '<div class="userMsg">' +
+                                    '<div class="fl imgDiv">' +
+                                    '<img src="' + group[i].data.crop_img + '" alt="">' +
+                                    '<p>' + group[i].data.cropname + '</p>' +
+                                    '</div>' +
+                                    '<div class="userInfo">' +
+                                    // '<p>当前阶段：' + group[i].curro + '</p>' +
+                                    '<p>所属农场：' + group[i].data.area + '</p>' +
+                                    '<p>规　　模：' + group[i].data.crop_count + '</p>' +
+                                    '<p>种植日期：' + group[i].data.upl_time + '</p>' +
+                                    '<p>已生长/天：' + dateNum + '</p>' +
+                                    '</div>' +
+                                    '</div>' +
+                                    '<div class="operateDiv">' +
+                                    '<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" onclick="amend( ' + group[i].data.id + ' )">修改</button>' +
+                                    '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="del(' + group[i].data.id + ')">删除</button>' +
+                                    // '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="over(\'' + group[i].data.id + '\',\'' + group[i].curro + '\')">结束</button>' +
+                                    '</div>' +
+                                    '</div>' +
+                                    '</div>';
+                            }
+                            //放入页面的容器显示
+                            $('#box').html(str)
+
+                            laypage.render({
+                                elem: 'page' //注意，这里的 test1 是 ID，不用加 # 号
+                                , count: data.nums
+                                , limit: '9'
+                                , theme: '#2ca9f9'
+                                , layout: ['prev', 'page', 'next', 'skip']
+                                , jump: function (obj, first) {
+                                    if (!first) {
+                                        $.ajax({
+                                            url: 'cropcount_view',
+                                            type: 'get',
+                                            // data: { page: obj.curr, ids: sessionStorage.getItem('seelectID') },
+                                            // data: { page: obj.curr, ids: $('#farmSelect').val() },
+                                            data: { page: obj.curr, ids: $('#farmSelct').val() },
+                                            dataType: 'html',
+                                            success: function (data) {
+                                                //转换格式
+                                                var res = JSON.parse(data)
+                                                //获取需要的数据
+                                                var group = res.dat;
+                                                //拼接字符串
+                                                var str = '';
+                                                //对数据做遍历，拼接到页面显示
+                                                for (var i = 0; i < group.length; i++) {
+                                                    var strSeparator = "-"; //日期分隔符
+                                                    var oDate1
+                                                    var oDate2
+                                                    var strDateStart = new Date()
+                                                    var Str = strDateStart.getFullYear() + '-' +
+                                                        (strDateStart.getMonth() + 1) + '-' +
+                                                        strDateStart.getDate() + ' '
+                                                    var strDateEnd = group[i].data.upl_time
+                                                    var iDays;
+                                                    oDate1 = Str.split(strSeparator);
+                                                    oDate2 = strDateEnd.split(strSeparator);
+                                                    var strDateS = new Date(oDate1[0], oDate1[1] - 1, oDate1[2]);
+                                                    var strDateE = new Date(oDate2[0], oDate2[1] - 1, oDate2[2]);
+                                                    iDays = parseInt(Math.ceil(strDateS - strDateE) / 1000 / 60 / 60 / 24)//把相差的毫秒数转换为天数
+
+                                                    if (iDays > 0) {
+                                                        //正数
+                                                        var dateNum = iDays
+                                                    } else if (iDays <= 0) {
+                                                        //负数
+                                                        var dateNum = 0
+                                                    }
+                                                    str += '<div class="layui-col-xs6 layui-col-sm6 layui-col-md4">' +
+                                                        '<div class="userItem">' +
+                                                        '<div class="userMsg">' +
+                                                        '<div class="fl imgDiv">' +
+                                                        '<img src="' + group[i].data.crop_img + '" alt="">' +
+
+                                                        '<p>' + group[i].data.cropname + '</p>' +
+                                                        '</div>' +
+                                                        '<div class="userInfo">' +
+                                                        // '<p>当前阶段：' + group[i].curro + '</p>' +
+                                                        '<p>所属农场：' + group[i].data.area + '</p>' +
+                                                        '<p>规　　模：' + group[i].data.crop_count + '</p>' +
+                                                        '<p>种植日期：' + group[i].data.upl_time + '</p>' +
+                                                        '<p>已生长/天：' + dateNum + '</p>' +
+                                                        '</div>' +
+                                                        '</div>' +
+                                                        '<div class="operateDiv">' +
+                                                        '<button type="button" class="layui-btn layui-btn-sm layui-btn-normal" onclick="amend( ' + group[i].data.id + ' )">修改</button>' +
+                                                        '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="del(' + group[i].data.id + ')">删除</button>' +
+                                                        // '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="over(' + group[i].id + ')">结束</button>' +
+                                                        // '<button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="over(\'' + group[i].data.id + '\',\'' + group[i].curro + '\')">结束</button>' +
+                                                        '</div>' +
+                                                        '</div>' +
+                                                        '</div>';
+                                                }
+                                                //放入页面的容器显示
+                                                $('#box').html(str)
+                                            },
+                                            error: function (type) {
+                                                console.log(type)
+                                            }
+                                        })
+                                    }
+                                }
+                            });
+                        } else {
+                            var html = '<div class="layui-col-xs12 " style="line-height:100px;text-align:center">暂无数据</div>'
+                            $('#box').html(html);
+                        }
+                    },
+                    error: function (type) {
+                        console.log(type)
+                    }
+                })
+            }
         })
 
         // 渲染农场下拉框数据
@@ -773,7 +930,7 @@
         }
 
 
-        // 选中农场进行渲染列表
+        // // 选中农场进行渲染列表
         gedata('cropcount_view', 1, $('#farmSelct').val())
         function gedata(url, page, id) {
             $.ajax({
@@ -817,7 +974,6 @@
                                 '<div class="userItem">' +
                                 '<div class="userMsg">' +
                                 '<div class="fl imgDiv">' +
-                                // '<img src="" alt="">' +
                                 '<img src="' + group[i].data.crop_img +'" alt="">' +
                                 '<p>' + group[i].data.cropname + '</p>' +
                                 '</div>' +
@@ -852,7 +1008,8 @@
                                         url: 'cropcount_view',
                                         type: 'get',
                                         // data: { page: obj.curr, ids: sessionStorage.getItem('seelectID') },
-                                        data: { page: obj.curr, ids: $('#farmSelect').val() },
+                                        // data: { page: obj.curr, ids: $('#farmSelect').val() },
+                                        data: { page: obj.curr, ids: $('#farmSelct').val() },
                                         dataType: 'html',
                                         success: function (data) {
                                             //转换格式
@@ -889,7 +1046,7 @@
                                                     '<div class="userItem">' +
                                                     '<div class="userMsg">' +
                                                     '<div class="fl imgDiv">' +
-                                                    '<img src="" alt="">' +
+                                                    '<img src="' + group[i].data.crop_img + '" alt="">' +
                                                     '<p>' + group[i].data.cropname + '</p>' +
                                                     '</div>' +
                                                     '<div class="userInfo">' +
@@ -926,7 +1083,6 @@
                 },
                 error: function (type) {
                     console.log(type)
-                    // alert('失败')
                 }
             })
         }

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='{{ msg.farm_img }}' class="fl" alt="">
             <div class="userInfo">
                 <p>基地面积（亩）： {{ msg.area }}</p>
                 <p>管理者： {{ msg.manage_user.name }}</p>