四季采摘发布+气象站历史数据分页

templates/backstageNet/annunciate/policyPub.html

@@ -105,7 +105,7 @@
 
         /* 表单样式 */
 
-        
+
 
         .layui-form-item .layui-input-inline {
             width: 50%;
@@ -114,7 +114,8 @@
         .layui-form-item .layui-input-textarea {
             width: 50%;
         }
-        .layui-form-item .layui-input-width{
+
+        .layui-form-item .layui-input-width {
             width: 30%;
         }
 
@@ -176,7 +177,8 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">标题：</label>
                             <div class="layui-input-inline layui-input-width">
-                                <input type="text" name="title" required lay-verify="required" placeholder="请输入标题" autocomplete="off" class="layui-input">
+                                <input type="text" name="title" required lay-verify="required" placeholder="请输入标题"
+                                    autocomplete="off" class="layui-input">
                             </div>
                         </div>
 
@@ -190,7 +192,8 @@
                             <div class="layui-input-block">
                                 <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
                                 <!-- <button type="reset" class="layui-btn layui-btn-primary">重置</button> -->
-                                <button class="layui-btn layui-btn-primary" type="button" onclick="clearForm()">取消</button>
+                                <button class="layui-btn layui-btn-primary" type="button"
+                                    onclick="clearForm()">取消</button>
                             </div>
                         </div>
                     </form>
@@ -237,20 +240,20 @@
                     type: 'post',
                     success: function (data) {
                         if (data) {
-                            if($('#msgid').val()){
+                            if ($('#msgid').val()) {
                                 parent.layer.msg("发布成功", { icon: 1 });
                                 var index = parent.layer.getFrameIndex(window.name);
                                 parent.layer.close(index);//关闭当前页
-                            }else{
+                            } else {
                                 layer.msg("发布成功", { icon: 1 });
                                 clearForm()
                             }
-                        }else{
-                            if($('#msgid').val()){
+                        } else {
+                            if ($('#msgid').val()) {
                                 parent.layer.msg("发布失败", { icon: 2 });
                                 var index = parent.layer.getFrameIndex(window.name);
                                 parent.layer.close(index);//关闭当前页
-                            }else{
+                            } else {
                                 layer.msg("发布失败", { icon: 1 });
                             }
                         }
@@ -286,9 +289,18 @@
                 height: 430,
                 toolbar:
                     [
-                        ['Undo', 'Redo'],
-                        ['Styles', 'FontSize', 'Format', 'JustifyLeft ', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
-                        ['Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Image']
+                        { name: 'document', items: ['Source', '-', 'DocProps', 'Preview', 'Print', '-'] },
+                        { name: 'clipboard', items: ['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo'] },
+                        { name: 'editing', items: ['Find', 'Replace', '-', 'SelectAll', '-'] },
+                        { name: 'basicstyles', items: ['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat'] },
+                        '/',
+                        { name: 'paragraph', items: ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', '-', 'BidiLtr', 'BidiRtl'] },
+                        { name: 'links', items: ['Link', 'Unlink', 'Anchor'] },
+                        { name: 'insert', items: ['Image', 'Flash', 'Table', 'HorizontalRule', 'Smiley', 'SpecialChar', 'PageBreak'] },
+                        '/',
+                        { name: 'styles', items: ['Styles', 'Format', 'Font', 'FontSize'] },
+                        { name: 'colors', items: ['TextColor', 'BGColor'] },
+                        { name: 'tools', items: ['ShowBlocks', '-'] }
                     ]
             }
         );
@@ -306,9 +318,9 @@
         function insertText(value) { //插入文本
             editor1.insertText('value');
         }
-        
+
         // 编辑赋值操作
-        function fillForm(obj,id) {
+        function fillForm(obj, id) {
             form.val('newsFormDiv', {
                 "type": obj.art_type,
                 "title": obj.title,

templates/backstageNet/info/dormPub.html

@@ -11,7 +11,8 @@
     <link rel="stylesheet" href="{% static '/lib/css/reset.css' %}">
     <link rel="stylesheet" href="{% static '/lib/font/fontIcon/iconfont.css' %}">
     <link rel="stylesheet" href="https://api.map.baidu.com/library/SearchInfoWindow/1.5/src/SearchInfoWindow_min.css" />
-    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=EpbgpqakDpXGN9E3ejg6e93ffsi83b0t"></script>
+    <script type="text/javascript"
+        src="https://api.map.baidu.com/api?v=2.0&ak=EpbgpqakDpXGN9E3ejg6e93ffsi83b0t"></script>
     <style>
         .breadcrumbs {
             padding: 12px 0 12px 30px;
@@ -234,19 +235,22 @@
                         <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>
                         <div class="layui-form-item">
                             <label class="layui-form-label">民宿价格：</label>
                             <div class="layui-input-inline">
-                                <input type="number" name="price" required lay-verify="required" placeholder="请输入价格" autocomplete="off" class="layui-input">
+                                <input type="number" name="price" 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-inline">
-                                <input type="text" name="person" required lay-verify="required" placeholder="请填写法人代表" autocomplete="off" class="layui-input">
+                                <input type="text" name="person" required lay-verify="required" placeholder="请填写法人代表"
+                                    autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-form-item">
@@ -264,23 +268,27 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">联系电话：</label>
                             <div class="layui-input-inline">
-                                <input type="phone" name="mobile" required="" lay-verify="required|phone" placeholder="请输入联系电话" autocomplete="off" class="layui-input">
+                                <input type="phone" name="mobile" required="" lay-verify="required|phone"
+                                    placeholder="请输入联系电话" autocomplete="off" class="layui-input">
                                 <!-- <input type="phone" name="mobile" required="" lay-verify="required|phone" placeholder="请输入联系电话" autocomplete="off" class="layui-input"> -->
                             </div>
                         </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label">民宿地址：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="addr" required="" lay-verify="required" placeholder="请输入民宿地址" autocomplete="off" class="layui-input">
+                                <input type="text" name="addr" required="" lay-verify="required" placeholder="请输入民宿地址"
+                                    autocomplete="off" class="layui-input">
                             </div>
-                            <button type="button" class="layui-btn  layui-btn-success layui-btn-md " onclick="getMapTxt()">定位</button>
+                            <button type="button" class="layui-btn  layui-btn-success layui-btn-md "
+                                onclick="getMapTxt()">定位</button>
                             <input type="hidden" value="" id="location" name="location">
                         </div>
 
                         <div class="layui-form-item">
                             <label class="layui-form-label">民宿简介：</label>
                             <div class="layui-input-inline layui-input-textarea">
-                                <textarea name="intro" lay-verify="required" placeholder="请输入内容" class="layui-textarea"></textarea>
+                                <textarea name="intro" lay-verify="required" placeholder="请输入内容"
+                                    class="layui-textarea"></textarea>
                             </div>
                         </div>
                         <div class="layui-form-item">
@@ -293,7 +301,8 @@
                                     <input type="hidden" value="" name="pic_list" id="picList">
                                     <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
                                         预览图：
-                                        <div class="layui-upload-list uploader-list" style="overflow: auto;" id="uploader-list">
+                                        <div class="layui-upload-list uploader-list" style="overflow: auto;"
+                                            id="uploader-list">
 
                                         </div>
                                     </blockquote>
@@ -311,7 +320,8 @@
                             <div class="layui-input-block">
                                 <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
                                 <!-- <button type="reset" class="layui-btn layui-btn-primary">重置</button> -->
-                                <button class="layui-btn layui-btn-primary" type="button" onclick="clearForm()">取消</button>
+                                <button class="layui-btn layui-btn-primary" type="button"
+                                    onclick="clearForm()">取消</button>
                             </div>
                         </div>
                     </form>
@@ -338,7 +348,7 @@
             var txt = $("input[name='addr']").val();
             geoc.getPoint(txt, function (point) {
                 if (point) {
-                    var latlng = point.lng+','+point.lat;
+                    var latlng = point.lng + ',' + point.lat;
                     $('#location').val(latlng)
                     getMapSite(point.lng, point.lat);
                 } else {
@@ -360,7 +370,7 @@
         //单击获取点击的经纬度
         map.addEventListener("click", function (e) {
             getMapSite(e.point.lng, e.point.lat);
-            var latlng = e.point.lng+','+e.point.lat;
+            var latlng = e.point.lng + ',' + e.point.lat;
             $('#location').val(latlng)
             var pt = e.point;
             geoc.getLocation(pt, function (rs) {
@@ -456,7 +466,7 @@
                     layer.msg("请上传文章封面图", { icon: 5 });
                     return false;
                 }
-                if(!location){
+                if (!location) {
                     layer.msg("请点击定位获取位置", { icon: 5 });
                     return false;
                 }
@@ -516,11 +526,11 @@
 
         // 删除图片
         $(document).on("click", ".file-iteme .handle", function (event) {
-            var curEle =  $(this).next().next();
+            var curEle = $(this).next().next();
             console.log(picList)
             var index = picList.indexOf(curEle.html());
             alert(index)
-            picList.splice(index,1);
+            picList.splice(index, 1);
             $(this).parent().remove();
             $('#picList').val(picList)
         });
@@ -542,7 +552,7 @@
             fuzhi()
             if (window.id !== '') {
                 var index = parent.layer.getFrameIndex(window.name);
-			    parent.layer.close(index);//关闭当前页
+                parent.layer.close(index);//关闭当前页
             }
         }
 
@@ -553,9 +563,18 @@
                 height: 430,
                 toolbar:
                     [
-                        ['Undo', 'Redo'],
-                        ['Styles', 'FontSize', 'Format', 'JustifyLeft ', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
-                        ['Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Image']
+                        { name: 'document', items: ['Source', '-', 'DocProps', 'Preview', 'Print', '-'] },
+                        { name: 'clipboard', items: ['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo'] },
+                        { name: 'editing', items: ['Find', 'Replace', '-', 'SelectAll', '-'] },
+                        { name: 'basicstyles', items: ['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat'] },
+                        '/',
+                        { name: 'paragraph', items: ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', '-', 'BidiLtr', 'BidiRtl'] },
+                        { name: 'links', items: ['Link', 'Unlink', 'Anchor'] },
+                        { name: 'insert', items: ['Image', 'Flash', 'Table', 'HorizontalRule', 'Smiley', 'SpecialChar', 'PageBreak'] },
+                        '/',
+                        { name: 'styles', items: ['Styles', 'Format', 'Font', 'FontSize'] },
+                        { name: 'colors', items: ['TextColor', 'BGColor'] },
+                        { name: 'tools', items: ['ShowBlocks', '-'] }
                     ]
             }
         );

templates/backstageNet/info/gardenPub.html

@@ -6,7 +6,7 @@
     <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>Document</title>
+    <title>四季采摘</title>
     <link rel="stylesheet" href="{% static '/lib/layui/css/layui.css' %}">
     <link rel="stylesheet" href="{% static '/lib/css/reset.css' %}">
     <style>
@@ -109,6 +109,10 @@
             width: 30%;
         }
 
+        .layui-form-item .layui-input-inline.plantScaleWidth {
+            width: 14.7%;
+        }
+
         .uploadImg {
             position: absolute;
             margin: 10px 0;
@@ -163,23 +167,52 @@
                         <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>
+                        <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"
+                                    placeholder="请输入种植规模" autocomplete="off" class="layui-input">
+                            </div>
+                            <div class="layui-input-inline plantScaleWidth">
+                                <select name="city" lay-verify="required">
+                                    <option value="株">株</option>
+                                    <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 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"
+                                    id="matureTime" autocomplete="off" placeholder="请选择成熟日期">
                             </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" id="pickTime" autocomplete="off" placeholder="请输入采摘时间">
+                                <input type="text" name="time" required lay-verify="required" class="layui-input"
+                                    id="pickTime" autocomplete="off" placeholder="请选择采摘时间">
                             </div>
                         </div>
                         <div class="layui-form-item">
-                            <label class="layui-form-label">采摘企业：</label>
+                            <label class="layui-form-label">详细地址：</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="company" required lay-verify="required" placeholder="请输入采摘企业" autocomplete="off" class="layui-input">
+                                <input type="text" name="company" required lay-verify="required" placeholder="请输入详细地址"
+                                    autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-form-item">
-                            <label class="layui-form-label">采摘图：</label>
+                            <label class="layui-form-label">作物图：</label>
                             <div class="layui-input-inline">
                                 <button type="button" class="uploadImg uploadImgIcon" id="pickImg"></button>
                                 <!-- 隐藏的input -->
@@ -190,13 +223,21 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="layui-form-item layui-form-text">
+                            <label class="layui-form-label">详细介绍：</label>
+                            <div class="layui-input-block">
+                                <textarea name="content" id="editor1" rows="10" cols="80"></textarea>
+                            </div>
+                        </div>
 
 
                         <div class="layui-form-item">
                             <div class="layui-input-block">
-                                <button class="layui-btn layui-btn-normal" lay-submit lay-filter="newsForm">立即提交</button>
+                                <button class="layui-btn layui-btn-normal" lay-submit
+                                    lay-filter="newsForm">立即提交</button>
                                 <!-- <button type="reset" class="layui-btn layui-btn-primary">重置</button> -->
-                                <button class="layui-btn layui-btn-primary" type="button" onclick="clearForm()">取消</button>
+                                <button class="layui-btn layui-btn-primary" type="button"
+                                    onclick="clearForm()">取消</button>
                             </div>
                         </div>
                     </form>
@@ -224,10 +265,22 @@
                 console.log(data);
             });
 
+            //成熟日期
+            laydate.render({
+                elem: '#matureTime' //指定元素
+                , type: 'month'
+                , format: 'M月' //可任意组合
+                , done: function (value, date) {
+                    //    alert(2)
+                }
+            });
+
             //年月选择器
             laydate.render({
                 elem: '#pickTime' //指定元素
                 , type: 'month'
+                , range: true
+                , format: 'M月' //可任意组合
                 , done: function (value, date) {
                     //    alert(2)
                 }
@@ -238,17 +291,17 @@
                 url: 'farm_choice',
                 type: 'post',
                 data: {},
-                dataType:'json',
+                dataType: 'json',
                 success: function (data) {
                     if (data) {
                         // layer.msg('发布成功,等待管理员审核', { icon: 1 })
                         var html = '';
-                        if(data.length){
+                        if (data.length) {
                             html += '<option value=""></option>';
-                            for(var i = 0;i<data.length;i++){
-                                html += '<option value="'+data[i].name+'">'+data[i].name+'</option>'
+                            for (var i = 0; i < data.length; i++) {
+                                html += '<option value="' + data[i].name + '">' + data[i].name + '</option>'
                             }
-                        }else{
+                        } else {
                             html = '<dd lay-value="" class="layui-select-tips layui-this">暂无农场</dd>';
                         }
                         $('#farmSelect').html(html)
@@ -297,48 +350,96 @@
                 }
             });
 
+
+
             //监听提交
             form.on('submit(newsForm)', function (data) {
+                console.log(data)
                 window.id = data.field.id
-                if (data.field.farm == ''){
+                if (data.field.farm == '') {
                     layer.msg('请选择采摘农场', { icon: 2 });
                     return false;
                 }
                 if (data.field.img_url == '') {
                     layer.msg('请上传采摘图', { icon: 2 });
                     return false;
-                } 
-                    $.ajax({
-                        url: 'garden_pub',
-                        type: 'post',
-                        data: data.field,
-                        success: function (data) {
-                            if (data) {
-                                if (window.id !== '') {
-                                    parent.layer.msg("发布成功，等待审核", { icon: 1 });
-                                } else {
-                                    layer.msg("发布成功，等待审核", { icon: 1 });
-                                }
-                                clearForm()
+                }
+                var content = editor1.getData();
+                // alert(content)
+                if (!content) {
+                    layer.msg("请填写文章正文", { icon: 5 });
+                    return false;
+                }
+                field = Object.assign(data.field, { content: content });
+                console.log(field)
+                $.ajax({
+                    url: 'garden_pub',
+                    type: 'post',
+                    data: data.field,
+                    success: function (data) {
+                        if (data) {
+                            if (window.id !== '') {
+                                parent.layer.msg("发布成功，等待审核", { icon: 1 });
+                            } else {
+                                layer.msg("发布成功，等待审核", { icon: 1 });
+                            }
+                            clearForm()
 
+                        } else {
+                            if (window.id !== '') {
+                                parent.layer.msg("发布失败", { icon: 2 });
                             } else {
-                                if (window.id !== '') {
-                                    parent.layer.msg("发布失败", { icon: 2 });
-                                } else {
-                                    layer.msg("发布失败", { icon: 2 });
-                                }
+                                layer.msg("发布失败", { icon: 2 });
                             }
-                        },
-                        error: function (type) {
-                            console.log(type)
                         }
-                    })
+                    },
+                    error: function (type) {
+                        console.log(type)
+                    }
+                })
 
-                    return false
+                return false
                 // }
             });
         });
 
+        // 示例1：设置工具栏为基本工具栏，高度为70
+        var editor1 = CKEDITOR.replace('editor1',
+            {
+                filebrowserBrowseUrl: 'test_photo',
+                height: 430,
+                toolbar:
+                    [
+                        { name: 'document', items: ['Source', '-', 'DocProps', 'Preview', 'Print', '-'] },
+                        { name: 'clipboard', items: ['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo'] },
+                        { name: 'editing', items: ['Find', 'Replace', '-', 'SelectAll', '-'] },
+                        { name: 'basicstyles', items: ['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat'] },
+                        '/',
+                        { name: 'paragraph', items: ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', '-', 'BidiLtr', 'BidiRtl'] },
+                        { name: 'links', items: ['Link', 'Unlink', 'Anchor'] },
+                        { name: 'insert', items: ['Image', 'Flash', 'Table', 'HorizontalRule', 'Smiley', 'SpecialChar', 'PageBreak'] },
+                        '/',
+                        { name: 'styles', items: ['Styles', 'Format', 'Font', 'FontSize'] },
+                        { name: 'colors', items: ['TextColor', 'BGColor'] },
+                        { name: 'tools', items: ['ShowBlocks', '-'] }
+                    ]
+            }
+        );
+
+        //处理CKEDITOR的值
+        function CKupdate() {
+            for (instance in CKEDITOR.instances)
+                CKEDITOR.instances[instance].updateElement();
+        }
+
+        function fuzhi() { //编辑器赋值
+            editor1.setData("");
+        }
+
+        function insertText(value) { //插入文本
+            editor1.insertText('value');
+        }
+
         //创建监听函数
         var xhrOnProgress = function (fun) {
             xhrOnProgress.onprogress = fun; //绑定监听
@@ -357,6 +458,7 @@
             }
         }
 
+
         function clearForm() {
             form.val('newsForm', {
                 "farm": "",
@@ -364,12 +466,14 @@
                 "time": "",
                 "company": "",
                 "img_url": "",
+                "crop_count":""
             });
             $('.uploadImg').addClass('uploadImgIcon');
             $('#demo1').removeAttr('src'); //图片链接（base64）
+            fuzhi()
             if (window.id !== '') {
                 var index = parent.layer.getFrameIndex(window.name);
-			    parent.layer.close(index);//关闭当前页
+                parent.layer.close(index);//关闭当前页
             }
         }
 

templates/backstageNet/info/newsPub.1.html

@@ -35,13 +35,15 @@
     <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" 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-inline">
-            <input type="text" name="writer" required lay-verify="required" placeholder="请填写发布人" autocomplete="off" class="layui-input">
+            <input type="text" name="writer" required lay-verify="required" placeholder="请填写发布人" autocomplete="off"
+                class="layui-input">
         </div>
     </div>
     <div class="layui-form-item">
@@ -195,12 +197,21 @@
         {
             filebrowserBrowseUrl: 'test_aaphoto',
             height: 430,
-            toolbar :
-            [
-                ['Undo','Redo'],
-                ['Styles', 'FontSize','Format','JustifyLeft ','JustifyCenter','JustifyRight','JustifyBlock'],
-                ['Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Image']
-            ]
+            toolbar:
+                [
+                    { name: 'document', items: ['Source', '-', 'DocProps', 'Preview', 'Print', '-'] },
+                    { name: 'clipboard', items: ['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo'] },
+                    { name: 'editing', items: ['Find', 'Replace', '-', 'SelectAll', '-'] },
+                    { name: 'basicstyles', items: ['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat'] },
+                    '/',
+                    { name: 'paragraph', items: ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', '-', 'BidiLtr', 'BidiRtl'] },
+                    { name: 'links', items: ['Link', 'Unlink', 'Anchor'] },
+                    { name: 'insert', items: ['Image', 'Flash', 'Table', 'HorizontalRule', 'Smiley', 'SpecialChar', 'PageBreak'] },
+                    '/',
+                    { name: 'styles', items: ['Styles', 'Format', 'Font', 'FontSize'] },
+                    { name: 'colors', items: ['TextColor', 'BGColor'] },
+                    { name: 'tools', items: ['ShowBlocks', '-'] }
+                ]
         }
     );
 

templates/backstageNet/info/productPub.html

@@ -313,9 +313,18 @@
                 height: 430,
                 toolbar:
                     [
-                        ['Undo', 'Redo'],
-                        ['Styles', 'FontSize', 'Format', 'JustifyLeft ', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
-                        ['Bold', 'Italic', '-', 'NumberedList', 'BulletedList', '-', 'Image']
+                        { name: 'document', items: ['Source', '-', 'DocProps', 'Preview', 'Print', '-'] },
+                        { name: 'clipboard', items: ['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo'] },
+                        { name: 'editing', items: ['Find', 'Replace', '-', 'SelectAll', '-'] },
+                        { name: 'basicstyles', items: ['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat'] },
+                        '/',
+                        { name: 'paragraph', items: ['NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', '-', 'BidiLtr', 'BidiRtl'] },
+                        { name: 'links', items: ['Link', 'Unlink', 'Anchor'] },
+                        { name: 'insert', items: ['Image', 'Flash', 'Table', 'HorizontalRule', 'Smiley', 'SpecialChar', 'PageBreak'] },
+                        '/',
+                        { name: 'styles', items: ['Styles', 'Format', 'Font', 'FontSize'] },
+                        { name: 'colors', items: ['TextColor', 'BGColor'] },
+                        { name: 'tools', items: ['ShowBlocks', '-'] }
                     ]
             }
         );

templates/backstageNet/qxzctrl/qxzData.html

@@ -61,7 +61,7 @@
             position: absolute;
             top: 0;
             right: 0;
-            line-height: 30px;
+            line-height: 31px;
             background: #bbb;
             color: #fff;
         }
@@ -262,7 +262,7 @@
                     <div class="searchInp">
                         <input type="text" id="searchImei" autocomplete="off" placeholder="请输入设备ID搜索">
                         <button id="searchBtn">
-                            <span class="iconfont">&#x33;</span>
+                            <span class="iconfont"><i class="layui-icon layui-icon-search"></i></span>
                         </button>
                     </div>
                     <ul class="equipListUl">
@@ -341,16 +341,6 @@
                     $('#tableEnd').val(dateArray[1])
                 }
             });
-            laypage.render({
-                elem: 'page' //注意，这里的 test1 是 ID，不用加 # 号
-                // , count: 30
-                , count: 199
-                , theme: '#2ca9f9'
-                , layout: ['prev', 'page', 'next', 'skip']
-                , jump: function (obj, first) {
-                    scrollBar()
-                }
-            });
         })
         // 首页
         function gotofirstpage() {
@@ -481,11 +471,45 @@
                 },
                 success: function (data) {
                     randerTable(data)
+                    randerPage(data.nums,1)
                 }
             })
 
 
         }
+        function randerPage(totalPage,currPage){
+            laypage.render({
+                elem: 'page' //注意，这里的 test1 是 ID，不用加 # 号
+                // , count: 30
+                , count: totalPage
+                , theme: '#2ca9f9'
+                , curr:currPage
+                , layout: ['prev', 'page', 'next', 'skip']
+                , jump: function (obj, first) {
+                    var currId = $(".equipListUl .active").attr("id");
+                    $.ajax({
+                        url: 'qxz_report_detail2',
+                        type: 'post',
+                        data: {
+                            page: obj.curr,
+                            e_id: currId,
+                            begin: $('#tableBegin').val(),
+                            end: $('#tableEnd').val(),
+                        },
+                        dataType: 'json',
+                        beforeSend: function () {
+                            loadFlage = layer.load();
+                        },
+                        complete: function () {
+                            layer.close(loadFlage);
+                        },
+                        success: function (data) {
+                            randerTable(data)
+                        }
+                    })
+                }
+            });
+        }
 
         function randerTable(data) {
             $(document.getElementById('datatable')).empty();

templates/backstageNet/qxzctrl/qxzchart.html

@@ -61,7 +61,7 @@
             position: absolute;
             top: 1px;
             right: 0;
-            line-height: 30px;
+            line-height: 31px;
             background: #bbb;
             color: #fff;
         }
@@ -247,7 +247,7 @@
             <span class="layui-breadcrumb">
                 <a href="info_pub" target="BoardRight">首页</a>
                 <a>
-                    <cite>数据分析</cite>
+                    <cite>趋势分析</cite>
                 </a>
             </span>
         </div>
@@ -258,7 +258,7 @@
                     <div class="searchInp">
                         <input type="text" id="searchImei" autocomplete="off" placeholder="请输入设备ID搜索">
                         <button id="searchBtn">
-                            <span class="iconfont">&#x33;</span>
+                            <span class="iconfont"><i class="layui-icon layui-icon-search"></i></span>
                         </button>
                     </div>
                     <ul class="equipListUl">

templates/backstageNet/qxzctrl/qxzctrl.html

@@ -62,7 +62,7 @@
             position: absolute;
             top: 1px;
             right: 0;
-            line-height: 30px;
+            line-height: 31px;
             background: #bbb;
             color: #fff;
         }
@@ -300,7 +300,7 @@
                     <div class="searchInp">
                         <input type="text" id="searchImei" autocomplete="off" placeholder="请输入设备ID搜索">
                         <button id="searchBtn">
-                            <span class="iconfont">&#x33;</span>
+                            <span class="iconfont"><i class="layui-icon layui-icon-search"></i></span>
                         </button>
                     </div>
                     <ul class="equipListUl">