细节修复

templates/backstageNet/annunciate/policyListView.html

@@ -119,7 +119,7 @@
                                 <label class="layui-form-label" style="color:#029eef">类型选择：</label>
                                 <div class="layui-input-inline">
                                     <select name="type" lay-verify="required" lay-filter="type">
-                                        <option value=""></option>
+                                        <!-- <option value=""></option> -->
                                         <option value="0">新闻</option>
                                         <option value="1">政策</option>
                                         <option value="2">技术</option>
@@ -206,15 +206,15 @@
                 })
             });
 
-            getData('policy_list', { page: 1, type: '' });
+            getData('policy_list', 1, 0 );
         });
 
 
-        function getData(page, data) {
+        function getData(page, page,req) {
             $.ajax({
                 url: 'policy_list',
-                type: 'get',
-                data: data,
+                type: 'post',
+                data: { page: page, req: req },
                 dataType: 'html',
                 success: function (data) {
                     $('#dataTable').children('tbody').html(data);
@@ -229,7 +229,7 @@
                                 $.ajax({
                                     url: 'policy_list',
                                     type: 'get',
-                                    data: { page: obj.curr },
+                                    data: { page: obj.curr, req: req },
                                     dataType: 'html',
                                     success: function (data) {
                                         $('#dataTable').children('tbody').html(data);

templates/backstageNet/infoManage/pickManageList.html

@@ -32,7 +32,7 @@
 </tr>
 {% endfor %} {% else %}
 <tr>
-    <td colspan="6" style="text-align:center;">暂无数据</td>
+    <td colspan="7" style="text-align:center;">暂无数据</td>
 </tr>
 {% endif %}
 <input type="hidden" value="{{nums}}" id="totalPage">

templates/backstageNet/infoManage/sightseeManageList.html

@@ -15,12 +15,6 @@
         <a href="JavaScript:;" class="passBtn"  onclick="passFun('{{msg.id}}')">通过</a>
         |
         {% else %}
-            {% if msg.hatType == 1 %}
-            <button type="button" onclick="hatPush('{{msg.id}}',1)" class="layui-btn layui-btn-xs layui-btn-danger hatPush"><i class="layui-icon layui-icon-fire"></i></button>
-            {% else %}
-            <button type="button" onclick="hatPush('{{msg.id}}',0)" class="layui-btn layui-btn-xs layui-btn-primary rejectBtn"><i class="layui-icon layui-icon-fire"></i></button>
-            {% endif %}
-            <span>|</span>
         {% endif %}
         <a href="JavaScript:;" class="delBtn" onclick="delFun('{{msg.id}}')">删除</a>
         |

templates/backstageNet/limit/expertList.html

@@ -23,6 +23,6 @@
     </div>
     {% endfor %}
 {% else %}
-    <div style="text-align:center;line-height: 200px;">暂无数据</div>
+    <div style="text-align:center;line-height: 200px;flex: 1;">暂无数据</div>
 {% endif %}
 <input type="hidden" value="{{nums}}" id="totalPage">

templates/backstageNet/production/gardenManage.html

@@ -542,7 +542,7 @@
                             if (data) {
                                 layer.close(index);
                                 location.reload();
-                                parent.layer.msg("操作成功!", { time: 1000, icon: 1 })
+                                layer.msg("操作成功!", { time: 1000, icon: 1 })
                             }
                         }
                     })

templates/backstageNet/systemSet/user_list.html

@@ -15,7 +15,9 @@
 	<td>{{ user.date_joined }}</td>
 	<td>
 		<button class="layui-btn layui-btn-sm  btn-shaixuan" onclick="allotEquipPage('{{ user.username }}')">在线分地</button>
+		{% if user.username == 'admin' %}  {% else %}
 		<button class="layui-btn layui-btn-sm  layui-btn-warm" onclick="addUser('{{ user.id }}')">编辑</button>
+		{% endif %}
 		<button class="layui-btn layui-btn-sm layui-btn-normal btn-shaixuan" onclick="resetPwd('{{ user.username }}')">重置密码</button>
 		{% if user.username == 'admin' %}  {% else %}
 		<button class="layui-btn layui-btn-sm layui-btn-danger btn-shaixuan" onclick="deluser('{{ user.username }}')">删除</button>

templates/backstageNet/warn/productionset.html

@@ -250,7 +250,7 @@
                             {% else %} 当前暂无设备 {% endif %}
                         </div>
                         <div class="layui-row controlInfo" id="getthresholdDiv">
-                            <div class="layui-col-xs6 layui-col-md3">
+                            <!-- <div class="layui-col-xs6 layui-col-md3">
                                 <div class="grid-demo ctrlItem">
                                     <div class="ctrlUp">
                                         <input type="hidden" value="" class="currStutas">
@@ -279,7 +279,7 @@
                                         </form>
                                     </div>
                                 </div>
-                            </div>
+                            </div> -->
 
                         </div>
                     </div>

templates/backstageNet/warn/warnRecord.html

@@ -163,7 +163,7 @@
                 dataType:'json',
                 success:function(data){
                     console.log(data)
-                    if(data.dat){
+                    if(data.dat.length){
                         Fill_Table('datatable', data.dat, '');
                         $('.fenpei-bottom').show();
                         Fill_page(data.nums,curr);
@@ -190,9 +190,9 @@
         }
         function Fill_null_Table(table_id) {
             var html = "";
-            html += "<thead><tr><th>采集时间</th><th>风速</th><th>温度</th></tr></thead>";
-            html += "<tr><td colspan=3 style='line-height:100px'>暂无数据</td></tr>";
-            $(document.getElementById(table_id)).html(html);
+            // html += "<thead><tr><th>采集时间</th><th>风速</th><th>温度</th></tr></thead>";
+            html += "<tr><td colspan=4 style='line-height:100px'>暂无数据</td></tr>";
+            $(document.getElementById(table_id).children[1]).html(html);
             scrollBar()
         }
 

templates/backstageNet/warn/warnSet.html

@@ -291,11 +291,11 @@
                     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);
+                    // 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);
                 }
             })
         }
@@ -303,7 +303,7 @@
             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);
+        // renderHtml(data);
         function renderHtml(data){
             var dat = eval('('+data.alarm+')').dat;
             var conf = data.conf;

templates/outerNet/farmList.html

@@ -15,6 +15,10 @@
     <link rel="stylesheet" href="{% static '/css/module.css' %}">
     <!-- <link rel="stylesheet" href="{% static '/css/hotelList.css' %}"> -->
     <style>
+        .advImg{
+            background: url(../static/imgs/farmAdv.jpg) no-repeat center;
+            background-size: cover;
+        }
         /* 内容模块 */
         .hacienda .haciendaList{
             display: flex;

templates/outerNet/touristList.html

@@ -13,6 +13,12 @@
     <link rel="stylesheet" href="{% static '/css/common.css' %}">
     <link rel="stylesheet" href="{% static '/css/module.css' %}">
     <link rel="stylesheet" href="{% static '/css/hotelList.css' %}">
+    <style>
+        .advImg{
+            background: url(../static/imgs/scenicAdv.jpg) no-repeat center;
+            background-size: cover;
+        }
+    </style>
 </head>
 
 <body>

templates/static/js/index2.js

@@ -9,6 +9,9 @@ $(function () {
         },
     })
 
+    $('.searchBoxBj button').on('click',function(){
+        window.open('farm_list?page=1&condition='+$('.searchBoxBj input').val())
+    })
  
 
      // 轮播
@@ -155,7 +158,6 @@ $(function () {
 // 定位
 function city_change(obj){
     var txt = $(obj).html();
-    alert(txt)
     $('.currCity span').html(txt);
 }