细节修复

templates/backstageNet/limit/expertList.html

@@ -5,7 +5,7 @@
         <img src="{% static '/imgs/cornerIcon.png' %}" alt="">
         <div class="expertInner">
             <div class="expertImg">
-                <img src="http://127.0.0.1:8000{{msg.pic}}" alt="">
+                <img src="http://127.0.0.1:8000/{{msg.pic}}" alt="">
             </div>
             <div class="expertTxt">
                 <h1>{{msg.name}}</h1>

templates/backstageNet/qxzctrl/qxzchart.html

@@ -764,10 +764,18 @@
                             legend.push(dat[0].unit[j][3] + elementName);
                         }
                         if (seriesDat[j]) {
-                            seriesDat[j].unshift(parseFloat(dat[i].unit[j][0]));
+                            if(dat[i].unit[j][0] == '-99.99'){
+                                seriesDat[j].unshift('-');
+                            }else{
+                                seriesDat[j].unshift(parseFloat(dat[i].unit[j][0]));
+                            }
                         } else {
                             var arr = [];
-                            arr.unshift(parseFloat(dat[i].unit[j][0]));
+                            if(dat[i].unit[j][0] == '-99.99'){
+                                arr.unshift('-');
+                            }else{
+                                arr.unshift(parseFloat(dat[i].unit[j][0]));
+                            }
                             seriesDat[j] = arr;
                         }
                     }

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>
@@ -381,9 +381,9 @@
                                         var eNum = qxz_list[j].eNum;
                                         var txt = qxz_dict[qxz_list[j].eNum][1];
 
-                                        html += '<div class="layui-col-xs6 layui-col-md3"><div class="grid-demo ctrlItem">' +
+                                        html += '<div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3"><div class="grid-demo ctrlItem">' +
                                             '<div class="ctrlUp"><input type="hidden" value=' + JSON.stringify(switchData[i]) + ' class="currStutas">' +
-                                            '<div class="ctrlName"><p class="switchName">开关' + switchData[i].JK + '（通道' + switchData[i].eKey + '）</p><div class="clearfix">' +
+                                            '<div class="ctrlName"><p class="switchName">开关' + (parseInt(switchData[i].JK)+1) + '（通道' + (parseInt(switchData[i].eKey)+1) + '）</p><div class="clearfix">' +
                                             '<div class="fl warnEleName"><div class="bySwitchName"><span title="' + txt + '">' + txt + '</span>' +
                                             '<img src="http://www.yfzhwlw.com/static/img/dev/icon_' + eNum + '.png" alt=""></div></div>' +
                                             '<div class="warnEleVal"><p>最大值：' + switchData[i].upper + '</p><p>最小值：' + switchData[i].lower + '</p></div></div></div>' +

templates/backstageNet/warn/warnSet.html

@@ -131,7 +131,7 @@
         <!-- 内容 -->
         <div class="mainContent">
             <div class="widget-title">
-                <h2>阈值设置</h2>
+                <h2>预警设置</h2>
             </div>
             <div class="currEquip">
                 当前设备： 

templates/static/js/limit/limit.js

@@ -97,12 +97,12 @@ var navList = [
         "children": [
             {
                 "id": 7.1,
-                "title": "阈值设置",
+                "title": "预警设置",
                 "url": "qxz_warning_view",
             },
             {
                 "id": 7.2,
-                "title": "生产方式设置",
+                "title": "阈值设置",
                 "url": "productionset",
             },
             {
@@ -264,7 +264,6 @@ var navList = [
         "title": "系统设置",
         "icon": "",
         "url": "",
-        "disabled": "true",
         "children": [
             {
                 "id": 13.1,
@@ -276,7 +275,6 @@ var navList = [
                 "id": 13.2,
                 "title": "地图设置",
                 "url": "setMap",
-                "disabled": "true",
             },
             {
                 "id": 13.3,
@@ -297,7 +295,6 @@ var navList = [
         "title": "专家诊断",
         "icon": "",
         "url": "",
-        "disabled": "true",
         "children": [
             {
                 "id": 14.1,