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

templates/backstageNet/info/dormPub.html

@@ -495,30 +495,36 @@
                 CKupdate()
 
                 var fields = data.field;
-                $.ajax({
-                    url: 'dorm_pub',
-                    data: $("#formDiv").serialize(),
-                    type: 'post',
-                    success: function (data) {
-                        if (data) {
-                            if (window.id !== '') {
-                                parent.layer.msg("发布成功，等待审核", { icon: 1 });
-                            } else {
-                                layer.msg("发布成功，等待审核", { icon: 1 });
-                            }
-                            msgTitleSaveFun(fields.title,9)
-                            clearForm()
-                        } else {
-                            if (window.id !== '') {
-                                parent.layer.msg("发布失败", { icon: 2 });
+                if(window.id !== ''){
+                    var edit = 1;
+                }else{
+                    var edit = '';
+                }
+                msgTitleSaveFun(fields.name,9,edit,function(){
+                    $.ajax({
+                        url: 'dorm_pub',
+                        data: $("#formDiv").serialize(),
+                        type: 'post',
+                        success: function (data) {
+                            if (data == 1) {
+                                if (window.id !== '') {
+                                    parent.layer.msg("发布成功，等待审核", { icon: 1 });
+                                } else {
+                                    layer.msg("发布成功，等待审核", { icon: 1 });
+                                }
+                                clearForm()
                             } else {
-                                layer.msg("发布失败", { icon: 2 });
+                                if (window.id !== '') {
+                                    parent.layer.msg("发布失败", { icon: 2 });
+                                } else {
+                                    layer.msg("发布失败", { icon: 2 });
+                                }
                             }
-                        }
-                    },
-                    error: function (type) {
+                        },
+                        error: function (type) {
 
-                    }
+                        }
+                    })
                 })
                 return false;
 

templates/backstageNet/info/gardenPub.html

@@ -364,33 +364,41 @@
                 field = Object.assign(data.field, { content: content });
                 data.field.scale = data.field.scale+data.field.unit;
                 var fields = data.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 });
-                            }
-                            msgTitleSaveFun(fields.title,8)
-                            clearForm()
+                data.field.art_type = 8;
+
+                if(window.id !== ''){
+                    var edit = 1;
+                }else{
+                    var edit = '';
+                }
+                msgTitleSaveFun(fields.name,8,edit,function(){
+                    $.ajax({
+                        url: 'garden_pub',
+                        type: 'post',
+                        data: data.field,
+                        success: function (data) {
+                            if (data == 1) {
+                                if (window.id !== '') {
+                                    parent.layer.msg("发布成功，等待审核", { icon: 1 });
+                                } else {
+                                    layer.msg("发布成功，等待审核", { icon: 1 });
+                                }
+                                clearForm()
 
-                        } else {
-                            if (window.id !== '') {
-                                parent.layer.msg("发布失败", { icon: 2 });
                             } else {
-                                layer.msg("发布失败", { icon: 2 });
+                                if (window.id !== '') {
+                                    parent.layer.msg("发布失败", { icon: 2 });
+                                } else {
+                                    layer.msg("发布失败", { icon: 2 });
+                                }
                             }
+                        },
+                        error: function (type) {
+                            console.log(type)
                         }
-                    },
-                    error: function (type) {
-                        console.log(type)
-                    }
-                })
+                    })
 
+                })
                 return false
                 // }
             });

templates/backstageNet/info/newsPub.html

@@ -183,7 +183,7 @@
                         <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="请填写发布人"
+                                <input type="text" name="writer" maxlength="6" required lay-verify="required" placeholder="请填写发布人"
                                     autocomplete="off" class="layui-input">
                             </div>
                         </div>
@@ -298,33 +298,42 @@
                     return false;
                 }
                 var fields = data.field;
+                data.field.art_type = 6;
+                if(window.id !== ''){
+                    var edit = 1;
+                }else{
+                    var edit = '';
+                }
                 CKupdate()
-
-                $.ajax({
-                    url: 'news_pub',
-                    data: $("#formDiv").serialize(),
-                    type: 'post',
-                    success: function (data) {
-                        if (data) {
-                            if (window.id !== '') {
-                                parent.layer.msg("发布成功，等待审核", { icon: 1 });
+                msgTitleSaveFun(fields.title,5,edit,function(){
+                    $.ajax({
+                        url: 'news_pub',
+                        data: $("#formDiv").serialize(),
+                        type: 'post',
+                        success: function (data) {
+                            if (data == 1) {
+                                if (window.id !== '') {
+                                    parent.layer.msg("发布成功，等待审核", { icon: 1 });
+                                } else {
+                                    layer.msg("发布成功，等待审核", { icon: 1 });
+                                }
+                                clearForm()
                             } else {
-                                layer.msg("发布成功，等待审核", { icon: 1 });
+                                if (window.id !== '') {
+                                    parent.layer.msg("发布失败", { icon: 2 });
+                                } else {
+                                    layer.msg("发布失败", { icon: 2 });
+                                }
                             }
-                            msgTitleSaveFun(fields.title,5)
-                            clearForm()
-                        } else {
-                            if (window.id !== '') {
-                                parent.layer.msg("发布失败", { icon: 2 });
-                            } else {
-                                layer.msg("发布失败", { icon: 2 });
-                            }
-                        }
-                    },
-                    error: function (type) {
+                        },
+                        error: function (type) {
 
-                    }
+                        }
+                    })
                 })
+
+
+                
                 return false;
 
             });

templates/backstageNet/info/productPub.html

@@ -287,31 +287,37 @@
                     var field = data.field;
                     field = Object.assign(data.field, { content: content });
                     var fields = data.field;
-                    $.ajax({
-                        url: 'equip_pub',
-                        type: 'post',
-                        data: data.field,
-                        success: function (data) {
-                            if (data) {
-                                if (window.id !== '') {
-                                    parent.layer.msg("发布成功，等待审核", { icon: 1 });
-                                } else {
-                                    layer.msg("发布成功，等待审核", { icon: 1 });
-                                }
-                                msgTitleSaveFun(fields.title,7)
-                                clearForm()
+                    if(window.id !== ''){
+                        var edit = 1;
+                    }else{
+                        var edit = '';
+                    }
+                    msgTitleSaveFun(fields.title,7,edit,function(){
+                        $.ajax({
+                            url: 'equip_pub',
+                            type: 'post',
+                            data: data.field,
+                            success: function (data) {
+                                if (data == 1) {
+                                    if (window.id !== '') {
+                                        parent.layer.msg("发布成功，等待审核", { icon: 1 });
+                                    } else {
+                                        layer.msg("发布成功，等待审核", { icon: 1 });
+                                    }
+                                    clearForm()
 
-                            } else {
-                                if (window.id !== '') {
-                                    parent.layer.msg("发布失败", { icon: 2 });
                                 } else {
-                                    layer.msg("发布失败", { icon: 2 });
+                                    if (window.id !== '') {
+                                        parent.layer.msg("发布失败", { icon: 2 });
+                                    } else {
+                                        layer.msg("发布失败", { icon: 2 });
+                                    }
                                 }
+                            },
+                            error: function (type) {
+                                console.log(type)
                             }
-                        },
-                        error: function (type) {
-                            console.log(type)
-                        }
+                        })
                     })
                     return false;
                 }

templates/backstageNet/info/sightseePub.html

@@ -516,30 +516,36 @@
                 CKupdate()
 
                 var fields = data.field;
-                $.ajax({
-                    url: 'sightsee_pub',
-                    data: $("#formDiv").serialize(),
-                    type: 'post',
-                    success: function (data) {
-                        if (data) {
-                            if (window.id !== '') {
-                                parent.layer.msg("发布成功，等待审核", { icon: 1 });
-                            } else {
-                                layer.msg("发布成功，等待审核", { icon: 1 });
-                            }
-                            msgTitleSaveFun(fields.title,5)
-                            clearForm()
-                        } else {
-                            if (window.id !== '') {
-                                parent.layer.msg("发布失败", { icon: 2 });
+                if(window.id !== ''){
+                    var edit = 1;
+                }else{
+                    var edit = '';
+                }
+                msgTitleSaveFun(fields.name,10,edit,function(){
+                    $.ajax({
+                        url: 'sightsee_pub',
+                        data: $("#formDiv").serialize(),
+                        type: 'post',
+                        success: function (data) {
+                            if (data == 1) {
+                                if (window.id !== '') {
+                                    parent.layer.msg("发布成功，等待审核", { icon: 1 });
+                                } else {
+                                    layer.msg("发布成功，等待审核", { icon: 1 });
+                                }
+                                clearForm()
                             } else {
-                                layer.msg("发布失败", { icon: 2 });
+                                if (window.id !== '') {
+                                    parent.layer.msg("发布失败", { icon: 2 });
+                                } else {
+                                    layer.msg("发布失败", { icon: 2 });
+                                }
                             }
-                        }
-                    },
-                    error: function (type) {
+                        },
+                        error: function (type) {
 
-                    }
+                        }
+                    })
                 })
                 return false;
 

templates/backstageNet/info/videoPub.html

@@ -328,31 +328,38 @@
                     return false;
                 } else {
                     var fields = data.field;
-                    $.ajax({
-                        url: 'video_pub',
-                        type: 'post',
-                        data: data.field,
-                        success: function (data) {
-                            if (data) {
-                                if (window.id !== '') {
-                                    parent.layer.msg("发布成功，等待审核", { icon: 1 });
-                                } else {
-                                    layer.msg("发布成功，等待审核", { icon: 1 });
-                                }
-                                msgTitleSaveFun(fields.title,6)
-                                clearForm()
+                    data.field.art_type = 6;
+                    if(window.id !== ''){
+                        var edit = 1;
+                    }else{
+                        var edit = '';
+                    }
+                    msgTitleSaveFun(fields.title,6,edit,function(){
+                        $.ajax({
+                            url: 'video_pub',
+                            type: 'post',
+                            data: data.field,
+                            success: function (data) {
+                                if (data == 1) {
+                                    if (window.id !== '') {
+                                        parent.layer.msg("发布成功，等待审核", { icon: 1 });
+                                    } else {
+                                        layer.msg("发布成功，等待审核", { icon: 1 });
+                                    }
+                                    clearForm()
 
-                            } else {
-                                if (window.id !== '') {
-                                    parent.layer.msg("发布失败", { icon: 2 });
                                 } else {
-                                    layer.msg("发布失败", { icon: 2 });
+                                    if (window.id !== '') {
+                                        parent.layer.msg("发布失败", { icon: 2 });
+                                    } else {
+                                        layer.msg("发布失败", { icon: 2 });
+                                    }
                                 }
+                            },
+                            error: function (type) {
+                                console.log(type)
                             }
-                        },
-                        error: function (type) {
-                            console.log(type)
-                        }
+                        })
                     })
                     return false;
                 }

templates/backstageNet/infoManage/sightseeManage.html

@@ -260,7 +260,7 @@
                 }
             })
             var index = layer.open({
-                title: '四季编辑',
+                title: '景点编辑',
                 type: 2,
                 area: ['850px', '560px'],
                 content: 'sightsee_pub',

templates/backstageNet/jk/equipmanage_jk.html

@@ -530,7 +530,7 @@
             <div id="allmap"></div>
         </div>
     </div>
-
+    <input type="hidden" id="token" value="{{token}}">
     <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>
@@ -641,7 +641,7 @@
                                 },
                                 success:function(data){
                                     console.log(data)
-                                    if(data == 0){
+                                    if(data == 1){
                                         layer.closeAll();
                                     }else{
                                         layer.msg('添加失败', {icon: 2}); 
@@ -689,7 +689,7 @@
                 data: data,
                 dataType: "json",
                 success: function (data) {
-                    if (data == 1) {
+                    if (data == 0) {
                         // layer.tips("设备名已存在！", '#ename');
                         layui.use('layer', function () {
                             var layer = layui.layer;
@@ -697,7 +697,7 @@
                         })
                         return false;
                     }
-                    else if (data == 2) {
+                    else if (data == 1) {
                         layui.use('layer', function () {
                             var layer = layui.layer;
                             layer.msg('设备位置添加成功！');
@@ -705,7 +705,7 @@
                         })
                     }
 
-                    else if (data == 0) {
+                    else if (data == 1) {
                         layui.use('layer', function () {
                             var layer = layui.layer;
                             layer.msg('设备名称修改成功！');
@@ -815,7 +815,7 @@
 
             var playHtml;
             var script;
-            var token = 'at.0izp4b188fna8vvk8j28o2l4a980qqex-1otrmuqf8l-1k26cbi-cletdiwkp'
+            var token = $('#token').val()
              
 
             if (isIE) {

templates/backstageNet/qxzctrl/qxzData.html

@@ -7,9 +7,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>Document</title>
-    <link rel="stylesheet" href="{% static '/lib/layui/css/layui.css' %}">
     <link rel="stylesheet" href="{% static '/lib/font/fontIcon/iconfont.css' %}">
     <link rel="stylesheet" href="{% static '/lib/css/reset.css' %}">
+    <link rel="stylesheet" href="{% static '/lib/layui/css/layui.css' %}">
     <style>
         /* 面包屑导航 */
 
@@ -208,7 +208,10 @@
             width: 30%;
             text-align: right;
         }
-
+        .dev .devLeft img{
+            width: 60px;
+            height: 60px;
+        }
 
         .dev .devRight {
             padding-left: 15px;
@@ -244,6 +247,9 @@
             padding: 5px 15px;
         }
 
+        #myModal>div{
+            padding-top: 20px;
+        }
         .layui-input {
             font-size: 14px;
             color: #333;
@@ -254,6 +260,19 @@
             height: 30px;
             vertical-align: middle;
         }
+        .layui-form-select .layui-input,.layui-form-item .layui-input-inline{
+            width: 210px;
+        }
+        .layui-form input{
+            color: #858585;
+            background-color: #FFF;
+            border: 1px solid #D5D5D5;
+            padding: 5px 4px 6px;
+            width: 200px;
+        }
+        .timeStage{
+            display: none;
+        }
     </style>
 </head>
 
@@ -319,7 +338,43 @@
         </div>
     </div>
     <input type="hidden" id="qxzPhotoId">
-
+    <!-- 导出提示框 -->
+    <div id="myModal" >
+        <div>
+            <form class="layui-form" action="">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">文件名称：</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="filename" name="name" required  lay-verify="required" placeholder="请输入文件的名称" maxlength="15" class="col-xs-12">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">下载类型：</label>
+                    <div class="layui-input-inline">
+                        <select name="downtype" lay-verify="required" lay-filter="downtype" id="downtype">
+                            <option value="1">全部</option>
+                            <option value="2">时间段</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="layui-form-item timeStage">
+                    <label class="layui-form-label">时间段：</label>
+                    <div class="layui-input-inline">
+                        <input type="text" id="timSelectBox3" autocomplete="off" placeholder="请选择时间段 " class="col-xs-12">
+                        <input type="hidden" id="downbegin" name="begin">
+                        <input type="hidden" id="downend" name="end">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <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>
+                    </div>
+                </div>
+            </form> 
+        </div>
+        
+    </div>
 
     <script src="{% static '/lib/js/jquery-2.1.4.min.js'%}"></script>
     <script src="{% static '/lib/layui/layui.js'%}"></script>
@@ -328,12 +383,13 @@
     <script src="{% static '/lib/js/qxz_dict.js'%}"></script>
     <script>
         var currPage = 1, totelpage;
-        var layer, element, laydate, laypage;
-        layui.use(['element', 'layer', 'laydate', 'laypage'], function () {
+        var layer, element, laydate, laypage,form;
+        layui.use(['element', 'layer', 'laydate', 'laypage','form'], function () {
             element = layui.element;
             layer = layui.layer;
             laydate = layui.laydate;
             laypage = layui.laypage;
+            form = layui.form;
             getEquipList(1, '');
             // 搜索
             $('#searchBtn').on('click', function () {
@@ -354,7 +410,63 @@
                     $('#tableEnd').val(dateArray[1])
                 }
             });
+            //执行一个laydate实例
+            laydate.render({
+                elem: '#timSelectBox3' //指定元素
+                , range: true
+                , done: function (value, date) {
+                    var dateArray = value.split(' - ')
+                    $('#downbegin').val(dateArray[0])
+                    $('#downend').val(dateArray[1])
+                }
+            });
+            form.on('select(downtype)', function(data){
+                if (data.value == 2) {
+                    $('.timeStage').show();
+                } else {
+                    $('.timeStage').hide();
+                    $('#downbegin').val('');
+                    $('#downend').val('');
+                    $('#downtimSelectBox').val('');
+                }
+            }); 
+            form.on('submit(formDemo)', function(data){
+                if(data.field.downtype == 2){
+                    if(!data.field.begin || !data.field.end){
+                        layer.msg('请将时间填写完整！')
+                        return false;
+                    }
+                }
+                window.location.href = 'qxz_data_export?id='+$('.equipListUl li.active').attr('id')+'&begin='+$('#downbegin').val()+'&end='+$('#downend').val()+'&filename='+$('#filename').val()
+                layer.msg(JSON.stringify(data.field));
+                return false;
+            });
         })
+        // 判断主流浏览器
+        function decideExport(){
+            // $('#myModal').modal('toggle')
+            layer.open({
+                type:1,
+                title: '下载'
+                ,area:['550px','350px']
+                ,content: $('#myModal')
+            }); 
+        }
+        //导出
+        function operation() {
+            if (!$('#filename').val()) {
+                layer.msg("请填写文件名！", { time: 2000 });
+                return false;
+            }
+            if ($('#downtype').val() == 2) {
+                if (!($('#downbegin').val() && $('#downbegin').val())) {
+                    layer.msg("请选择时间段！", { time: 2000 });
+                    return false;
+                }
+            }
+            window.location.href = 'cbd_data_export?id='+$('#equip_id').val()+'&begin='+$('#downbegin').val()+'&end='+$('#downend').val()+'&filename='+$('#filename').val()
+
+        }
         // 首页
         function gotofirstpage() {
             currpage = 1;
@@ -500,26 +612,29 @@
                 , 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)
-                        }
-                    })
+                    if(!first){
+                        $.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)
+                            }
+                        })
+                    }
+                   
                 }
             });
         }

templates/backstageNet/qxzctrl/qxzchart.html

@@ -200,7 +200,10 @@
             width: 30%;
             text-align: right;
         }
-
+        .dev .devLeft img{
+            width: 60px;
+            height: 60px;
+        }
 
         .dev .devRight {
             padding-left: 15px;

templates/backstageNet/qxzctrl/qxzctrl.html

@@ -457,7 +457,7 @@
                                 },
                                 success:function(data){
                                     console.log(data)
-                                    if(data == 0){
+                                    if(data == 1){
                                         layer.closeAll();
                                     }else{
                                         layer.msg('添加失败', {icon: 2}); 
@@ -505,7 +505,7 @@
                 data: data,
                 dataType: "json",
                 success: function (data) {
-                    if (data == 1) {
+                    if (data == 0) {
                         // layer.tips("设备名已存在！", '#ename');
                         layui.use('layer', function () {
                             var layer = layui.layer;
@@ -513,7 +513,7 @@
                         })
                         return false;
                     }
-                    else if (data == 2) {
+                    else if (data == 1) {
                         layui.use('layer', function () {
                             var layer = layui.layer;
                             layer.msg('设备位置添加成功！');
@@ -521,7 +521,7 @@
                         })
                     }
 
-                    else if (data == 0) {
+                    else if (data == 1) {
                         layui.use('layer', function () {
                             var layer = layui.layer;
                             layer.msg('设备名称修改成功！');

templates/backstageNet/warn/productionset.html

@@ -233,7 +233,7 @@
                 <div class="ctrlDiv">
                     <div class="title">
                         <div class="widget-title">
-                            <h2>控制开关
+                            <h2>阈值控制
                                 <span id="Uptime"></span>
                             </h2>
                         </div>

templates/backstageNet/warn/warnSet.html

@@ -198,23 +198,13 @@
             $('.currEquipSelect').select2({
                 width: 217
             });
+            getthreVal($('.currEquipSelect').val())
              //select2事件
              $(".currEquipSelect").on("change", function () {
                 var data = $(this).val();
                 getthreVal(data)
                 console.log(data)
             });
-            console.log($('.currEquipSelect').val())
-            //执行一个laydate实例
-            laydate.render({
-                elem: '#timSelectBox' //指定元素
-                , range: true
-                , done: function (value, date) {
-                    var dateArray = value.split(' - ')
-                    $('#tableBegin').val(dateArray[0])
-                    $('#tableEnd').val(dateArray[1])
-                }
-            });
             form.verify({
                 userphone: function(value, item){ //value：表单的值、item：表单的DOM对象
                     if(value !='' ){
@@ -274,38 +264,47 @@
         function getthreVal(data){
             var imei = $('#equipSelect').val()
             $.ajax({
-                url: 'qxz_alarm',
+                url: 'qxz_warning_view',
                 data: {
-                    imei:imei
+                    equip_id:imei
                 },
                 type: 'post',
+                dataType:'json',
                 success: function (data) {
                     renderHtml(data);
                 },
                 error: function (type) {
-                    // var data = {
-                    //     alarm:'{"dat":{"e8":"1#5","e2":"0#7","e3":"0#3","e4":"0#2","e5":"1#56"},"tel":"","equip_id":"16057231"}',
-                    //     conf: {e8: "盐分", e2: "温度#°", e3: "雨量",e4: "气压#hpa",e5: ""}
-                    // }
-                    // renderHtml(data);
+                    renderHtml(data);
                 }
             })
         }
-        var data = {
-            alarm:'{"dat":{"e6":"0#","e2":"0#","e3":"0#3","e4":"0#2","e5":"1#56"},"tel":"","equip_id":"16057231"}',
-            conf: {e6: "ces", e2: "", e3: "",e4: "风向#°",e5: "数字气压#hpa"}
-        }
+        // var data = {
+        //     alarm:'{"dat":{"e6":"0#","e2":"0#","e3":"0#3","e4":"0#2","e5":"1#56"},"tel":"","equip_id":"16057231"}',
+        //     conf: {e6: "ces", e2: "", e3: "",e4: "风向#°",e5: "数字气压#hpa"}
+        // }
         // renderHtml(data);
         function renderHtml(data){
-            var dat = eval('('+data.alarm+')').dat;
+            if (data.alarm) {
+                var dat = eval('(' + data.alarm + ')');
+            } else {
+                var dat = {}
+            }
             var conf = data.conf;
             var html = '';
             for(var i = 1;i<=30;i++){
                 var keyEl = 'e'+i;
                 if(conf[keyEl]){
                     var unit = conf[keyEl].split('#')[0];
-                    var typenum = dat[keyEl].split('#')[0];
-                    var val = dat[keyEl].split('#')[1] || '';
+                    if (dat.dat) {
+                        if (dat.dat[key]) {
+                            var typenum = dat[keyEl].split('#')[0];
+                            var val = dat[keyEl].split('#')[1] || '';
+                        } else {
+                            var typenum = 0;
+                            var val = '';
+                        }
+                    }
+                    
                     html += '<div class="layui-form-item">'+
                                 '<div class="layui-input-block"><span class="eleTitle">'+unit+'</span></div>'+
                                 '<div class="layui-input-block">'+

templates/outerNet/exhibitionList.html

@@ -13,6 +13,11 @@
     <link rel="stylesheet" href="{% static '/css/common.css' %}">
     <link rel="stylesheet" href="{% static '/css/module.css' %}">
     <link rel="stylesheet" href="{% static '/css/exhibitionList.css' %}">
+    <style>
+        .layui-breadcrumb .curr cite{
+            color: #3ab851;
+        }
+    </style>
 </head>
 
 <body>
@@ -34,8 +39,13 @@
                 <!-- 面包屑导航 -->
                 <div class="breadcrumb">
                     <span class="layui-breadcrumb">
-                        <a href="home">首页</a>
-                        <a>
+                        <a href="newslist_view?page=1&type=5">
+                            <cite>新闻资讯</cite>
+                        </a>
+                        <a href="video_list?page=1">
+                            <cite>视频资讯</cite>
+                        </a>
+                        <a href="equip_show_list?page=1" class="curr">
                             <cite>产品展厅</cite>
                         </a>
                     </span>

templates/outerNet/index2.html

@@ -245,7 +245,7 @@
                     <div class="news">
                         <div class="newsTitle">
                             <span>焦点新闻</span>
-                            <a href="newslist_view?page=1&type=''" target="_blank" class="more">更多</a>
+                            <a href="newslist_view?page=1&type=5" target="_blank" class="more">更多</a>
                         </div>
                         <div class="newsContent">
                             <ul class="news-txt-list">

templates/outerNet/newsList.html

@@ -13,6 +13,11 @@
     <link rel="stylesheet" href="{% static '/css/common.css' %}">
     <link rel="stylesheet" href="{% static '/css/module.css' %}">
     <link rel="stylesheet" href="{% static '/css/newsList.css' %}">
+    <style>
+        .layui-breadcrumb .curr cite{
+            color: #3ab851;
+        }
+    </style>
 </head>
 
 <body>
@@ -34,10 +39,15 @@
                 <!-- 面包屑导航 -->
                 <div class="breadcrumb">
                     <span class="layui-breadcrumb">
-                        <a href="home">首页</a>
-                        <a>
+                        <a href="newslist_view?page=1&type=5" class="curr">
                             <cite>新闻资讯</cite>
                         </a>
+                        <a href="video_list?page=1">
+                            <cite>视频资讯</cite>
+                        </a>
+                        <a href="equip_show_list?page=1">
+                            <cite>产品展厅</cite>
+                        </a>
                     </span>
                     <div class="searchDiv">
                         <input type="text" id="searchTitlt" value="{{con|default:''}}" placeholder="请输入标题" autocomplete="off" class="layui-input" >

templates/outerNet/videoList.html

@@ -13,6 +13,11 @@
     <link rel="stylesheet" href="{% static '/css/common.css' %}">
     <link rel="stylesheet" href="{% static '/css/module.css' %}">
     <link rel="stylesheet" href="{% static '/css/videoList.css' %}">
+    <style>
+        .layui-breadcrumb .curr cite{
+            color: #3ab851;
+        }
+    </style>
 </head>
 
 <body>
@@ -34,10 +39,15 @@
                 <!-- 面包屑导航 -->
                 <div class="breadcrumb">
                     <span class="layui-breadcrumb">
-                        <a href="home">首页</a>
-                        <a>
+                        <a href="newslist_view?page=1&type=5">
+                            <cite>新闻资讯</cite>
+                        </a>
+                        <a href="video_list?page=1" class="curr">
                             <cite>视频资讯</cite>
                         </a>
+                        <a href="equip_show_list?page=1">
+                            <cite>产品展厅</cite>
+                        </a>
                     </span>
                     <div class="searchDiv">
                         <input type="text" id="searchTitlt" value="{{con|default:''}}" placeholder="请输入标题" autocomplete="off" class="layui-input">

templates/static/css/home.css

@@ -17,6 +17,7 @@
 }
 .header .logo img{
     cursor: pointer;
+    margin-top: -10px;
 }
 .header .navigation{
     float: right;

templates/static/js/backstageNet/common.js

@@ -16,16 +16,21 @@ function scrollBar() {
 }
 
 // 信息发布另存标题
-function msgTitleSaveFun(title,type){
+function msgTitleSaveFun(title,type,edit,callbackFun){
     $.ajax({
         url: 'ckarticle_view',
         data: {
             title:title,
             art_type:type,
+            edit:edit
         },
         type: 'post',
         success: function (data) {
-            
+            if(data == 1){
+                callbackFun();
+            }else if(data == 2){
+                layer.msg('标题存在，请重新输入',{icon:2})
+            }
         },
         error: function (type) {
 

templates/static/js/limit/limit.js

@@ -283,6 +283,12 @@ var navList = [
                 "title": "合作伙伴",
                 "url": "add_relation",
                 "disabled": "true",
+            },
+            {
+                "id": 13.4,
+                "title": "首页图片",
+                "url": "system_photo",
+                "disabled": "true",
             }
         ]
     },

templates/static/js/warn/qxz_dict.js

@@ -55,10 +55,14 @@ var qxz_dict = {'100':['未定义',],
 '155':['155','氮','mg/kg'],
 '156':['156','磷','mg/kg'],
 '157':['157','钾','mg/kg'],
-'158':['158','NO2','ug/m3'],
-'159':['159','O3','ug/m3'],
-'160':['160','管道流量','m3/s'],
-'161':['161','流速','L/min'],
-'162':['162','管道压力','KPa'],
-'208':['208','照度','Lux']
+'158':['158','热通量','W/m2'],
+'159':['159','叶面温度','℃'],
+'160':['160','叶面湿度','%RH'],
+'161':['161','茎秆','mm'],
+'162':['162','负氧离子','个/cm3'],
+'201':['201','土壤水势','KPA'],
+'202':['202','露点温度','℃'],
+'203':['203','PM100','ug/m3'],
+'208':['208','照度','Lux'],
+'211':['211','电导率','uS/cm']
 }

templates/static/lib/js/qxz_dict.js

@@ -55,10 +55,14 @@ var qxz_dict = {'100':['未定义',],
 '155':['155','氮','mg/kg'],
 '156':['156','磷','mg/kg'],
 '157':['157','钾','mg/kg'],
-'158':['158','NO2','ug/m3'],
-'159':['159','O3','ug/m3'],
-'160':['160','管道流量','m3/s'],
-'161':['161','流速','L/min'],
-'162':['162','管道压力','KPa'],
-'208':['208','照度','Lux']
+'158':['158','热通量','W/m2'],
+'159':['159','叶面温度','℃'],
+'160':['160','叶面湿度','%RH'],
+'161':['161','茎秆','mm'],
+'162':['162','负氧离子','个/cm3'],
+'201':['201','土壤水势','KPA'],
+'202':['202','露点温度','℃'],
+'203':['203','PM100','ug/m3'],
+'208':['208','照度','Lux'],
+'211':['211','电导率','uS/cm']
 }