Merge branch 'master' of http://49.4.49.126:3000/shilin/sisweb

src/jsonData/menu.json

@@ -77,6 +77,18 @@
       "url": "/",
       "children": [
         {
+          "name": "风机绩效",
+          "url": "/",
+          "children": [
+            {
+              "name": "风机绩效榜单",
+              "url": "/",
+              "children": []
+            }
+          ]
+        }
+        ,
+        {
           "name": "场际对标",
           "url": "/a",
           "children": [
@@ -93,6 +105,36 @@
             }
           ]
         }
+        ,
+        {
+          "name": "项目对标",
+          "url": "/",
+          "children": [
+            {
+              "name": "项目对标",
+              "url": "/",
+              "children": []
+            }
+          ]
+        }
+        ,
+        {
+          "name": "性能对标",
+          "url": "/",
+          "children": [
+            {
+              "name": "性能对标",
+              "url": "/",
+              "children": []
+            }
+            ,
+            {
+              "name": "单机横向对比",
+              "url": "/",
+              "children": []
+            }
+          ]
+        }
       ]
     },
     {

src/tools/base.js

@@ -22,7 +22,7 @@ export function getBzDate(time, tag, type = "date") {
       return result;
       break;
     case "datetime":
-      return neresult + " " + numberB0(newDate.getHours()) + ":" + numberB0(newDate.getMinutes()) + ":" + numberB0(newDate.getSeconds());
+      return result + " " + numberB0(newDate.getHours()) + ":" + numberB0(newDate.getMinutes()) + ":" + numberB0(newDate.getSeconds());
       break;
     default:
       return result;