温红权 9 år sedan
förälder
incheckning
7e1ff66982

+ 7 - 2
VisualInspection/js/main.js

@@ -9,11 +9,16 @@ $(document).ready(function() {
         if ($(this).hasClass("p_m")) { return; }
         $('#treeMenu li.active').removeClass('active');
         $(this).closest('li').addClass('active');
+        $("#main_content").html(getPageInfo(this.id));
+    });
+
+    //获取用户信息
+    var user = $.zui.store.get("user")
+    var html = "<i class=\"icon icon-user\"></i>  " + user.username + ",欢迎您"
+    $("#user").html(html);
 
 
-        $("#main_content").html(getPageInfo(this.id));
 
-    });
 });
 
 function setletftime() {

+ 17 - 3
VisualInspection/js/user/login.js

@@ -4,10 +4,24 @@ $(document).ready(function() {
         var $btn = $(this);
         $btn.button('loading');
 
-        // 此处使用 setTimeout 来模拟你的复杂功能逻辑
-        setTimeout(function() {
+
+        //获取用户名
+        //获取密码
+        var data = {
+            "username": $("#username").val(),
+            "password": md5($("#password").val())
+        }
+        UserLogin(data, function(data) {
             $btn.button('reset');
+
             window.location.href = base_ui_url + "view/main.html"
-        }, 2000);
+
+        }, function(error) {
+            $btn.button('reset');
+        });
+
+
+
+
     });
 });

+ 3 - 1
VisualInspection/js/util/const.js

@@ -1 +1,3 @@
-var USER_LOGIN = "/user/auth/login"
+var USER_LOGIN = "/user/auth/login"
+var USER_LOGOUT = "/user/logout"
+var USER_GET_ALL = "/user/addUser"

+ 12 - 14
VisualInspection/js/util/service.js

@@ -1,20 +1,18 @@
-function addUser(url, body, success, fail) {
-    axios.get('http://localhost:8089/login')
+function UserLogin(body, success, fail) {
+    var url = base_server_url + USER_LOGIN
+    axios.post(url, body)
         .then(function(response) {
-            console.log(response);
-        })
-        .catch(function(error) {
-            console.log(error);
-        });
 
-}
-
-function get() {
-    axios.get('http://localhost:8089/login')
-        .then(function(response) {
-            console.log(response);
+            var data = response["data"];
+            if (data.result_code == 0) {
+                //存储token
+                $.zui.store.set("user", data.result_data);
+                success(data.result_data)
+            } else {
+                fail(data.result_desc);
+            }
         })
         .catch(function(error) {
-            console.log(error);
+            fail("网络错误");
         });
 }

+ 113 - 0
VisualInspection/node_modules/blueimp-md5/README.md

@@ -0,0 +1,113 @@
+# JavaScript MD5
+
+## Demo
+[JavaScript MD5 Demo](https://blueimp.github.io/JavaScript-MD5/)
+
+## Description
+JavaScript MD5 implementation. Compatible with server-side environments like
+Node.js, module loaders like RequireJS, Browserify or webpack and all web
+browsers.
+
+## Usage
+
+### Client-side
+Include the (minified) JavaScript [MD5](https://en.wikipedia.org/wiki/MD5)
+script in your HTML markup:
+
+```html
+<script src="js/md5.min.js"></script>
+```
+
+In your application code, calculate the
+([hex](https://en.wikipedia.org/wiki/Hexadecimal)-encoded)
+[MD5](https://en.wikipedia.org/wiki/MD5) hash of a string by calling the **md5**
+method with the string as argument:
+
+```js
+var hash = md5("value"); // "2063c1608d6e0baf80249c42e2be5804"
+```
+
+### Server-side
+
+The following is an example how to use the JavaScript MD5 module on the
+server-side with [Node.js](http://nodejs.org/).
+
+Create a new directory and add the **md5.js** file. Or alternatively,
+install the **blueimp-md5** package with [npm](https://www.npmjs.org/):
+
+```sh
+npm install blueimp-md5
+```
+
+Add a file **server.js** with the following content:
+
+```js
+require("http").createServer(function (req, res) {
+    // The md5 module exports the md5() function:
+    var md5 = require("./md5"),
+    // Use the following version if you installed the package with npm:
+    // var md5 = require("blueimp-md5"),
+        url  = require("url"),
+        query = url.parse(req.url).query;
+    res.writeHead(200, {"Content-Type": "text/plain"});
+    // Calculate and print the MD5 hash of the url query:
+    res.end(md5(query));
+}).listen(8080, "localhost");
+console.log("Server running at http://localhost:8080/");
+```
+
+Run the application with the following command:
+
+```sh
+node server.js
+```
+
+## Requirements
+The JavaScript MD5 script has zero dependencies.
+
+## API
+
+Calculate the ([hex](https://en.wikipedia.org/wiki/Hexadecimal)-encoded)
+[MD5](https://en.wikipedia.org/wiki/MD5) hash of a given string value:
+
+```js
+var hash = md5("value"); // "2063c1608d6e0baf80249c42e2be5804"
+```
+
+Calculate the ([hex](https://en.wikipedia.org/wiki/Hexadecimal)-encoded)
+[HMAC](https://en.wikipedia.org/wiki/HMAC)-MD5 hash of a given string value and
+key:
+
+```js
+var hash = md5("value", "key"); // "01433efd5f16327ea4b31144572c67f6"
+```
+
+Calculate the raw [MD5](https://en.wikipedia.org/wiki/MD5) hash of a given
+string value:
+
+```js
+var hash = md5("value", null, true);
+```
+
+Calculate the raw [HMAC](https://en.wikipedia.org/wiki/HMAC)-MD5 hash of a given
+string value and key:
+
+```js
+var hash = md5("value", "key", true);
+```
+
+## Tests
+The JavaScript MD5 project comes with
+[Unit Tests](https://en.wikipedia.org/wiki/Unit_testing).  
+There are two different ways to run the tests:
+
+* Open test/index.html in your browser or
+* run `npm test` in the Terminal in the root path of the repository package.
+
+The first one tests the browser integration, the second one the
+[node.js](http://nodejs.org/) integration.
+
+
+## License
+The JavaScript MD5 script is released under the
+[MIT license](https://opensource.org/licenses/MIT).

+ 281 - 0
VisualInspection/node_modules/blueimp-md5/js/md5.js

@@ -0,0 +1,281 @@
+/*
+ * JavaScript MD5
+ * https://github.com/blueimp/JavaScript-MD5
+ *
+ * Copyright 2011, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ *
+ * Based on
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for more info.
+ */
+
+/* global define */
+
+;(function ($) {
+  'use strict'
+
+  /*
+  * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+  * to work around bugs in some JS interpreters.
+  */
+  function safeAdd (x, y) {
+    var lsw = (x & 0xFFFF) + (y & 0xFFFF)
+    var msw = (x >> 16) + (y >> 16) + (lsw >> 16)
+    return (msw << 16) | (lsw & 0xFFFF)
+  }
+
+  /*
+  * Bitwise rotate a 32-bit number to the left.
+  */
+  function bitRotateLeft (num, cnt) {
+    return (num << cnt) | (num >>> (32 - cnt))
+  }
+
+  /*
+  * These functions implement the four basic operations the algorithm uses.
+  */
+  function md5cmn (q, a, b, x, s, t) {
+    return safeAdd(bitRotateLeft(safeAdd(safeAdd(a, q), safeAdd(x, t)), s), b)
+  }
+  function md5ff (a, b, c, d, x, s, t) {
+    return md5cmn((b & c) | ((~b) & d), a, b, x, s, t)
+  }
+  function md5gg (a, b, c, d, x, s, t) {
+    return md5cmn((b & d) | (c & (~d)), a, b, x, s, t)
+  }
+  function md5hh (a, b, c, d, x, s, t) {
+    return md5cmn(b ^ c ^ d, a, b, x, s, t)
+  }
+  function md5ii (a, b, c, d, x, s, t) {
+    return md5cmn(c ^ (b | (~d)), a, b, x, s, t)
+  }
+
+  /*
+  * Calculate the MD5 of an array of little-endian words, and a bit length.
+  */
+  function binlMD5 (x, len) {
+    /* append padding */
+    x[len >> 5] |= 0x80 << (len % 32)
+    x[(((len + 64) >>> 9) << 4) + 14] = len
+
+    var i
+    var olda
+    var oldb
+    var oldc
+    var oldd
+    var a = 1732584193
+    var b = -271733879
+    var c = -1732584194
+    var d = 271733878
+
+    for (i = 0; i < x.length; i += 16) {
+      olda = a
+      oldb = b
+      oldc = c
+      oldd = d
+
+      a = md5ff(a, b, c, d, x[i], 7, -680876936)
+      d = md5ff(d, a, b, c, x[i + 1], 12, -389564586)
+      c = md5ff(c, d, a, b, x[i + 2], 17, 606105819)
+      b = md5ff(b, c, d, a, x[i + 3], 22, -1044525330)
+      a = md5ff(a, b, c, d, x[i + 4], 7, -176418897)
+      d = md5ff(d, a, b, c, x[i + 5], 12, 1200080426)
+      c = md5ff(c, d, a, b, x[i + 6], 17, -1473231341)
+      b = md5ff(b, c, d, a, x[i + 7], 22, -45705983)
+      a = md5ff(a, b, c, d, x[i + 8], 7, 1770035416)
+      d = md5ff(d, a, b, c, x[i + 9], 12, -1958414417)
+      c = md5ff(c, d, a, b, x[i + 10], 17, -42063)
+      b = md5ff(b, c, d, a, x[i + 11], 22, -1990404162)
+      a = md5ff(a, b, c, d, x[i + 12], 7, 1804603682)
+      d = md5ff(d, a, b, c, x[i + 13], 12, -40341101)
+      c = md5ff(c, d, a, b, x[i + 14], 17, -1502002290)
+      b = md5ff(b, c, d, a, x[i + 15], 22, 1236535329)
+
+      a = md5gg(a, b, c, d, x[i + 1], 5, -165796510)
+      d = md5gg(d, a, b, c, x[i + 6], 9, -1069501632)
+      c = md5gg(c, d, a, b, x[i + 11], 14, 643717713)
+      b = md5gg(b, c, d, a, x[i], 20, -373897302)
+      a = md5gg(a, b, c, d, x[i + 5], 5, -701558691)
+      d = md5gg(d, a, b, c, x[i + 10], 9, 38016083)
+      c = md5gg(c, d, a, b, x[i + 15], 14, -660478335)
+      b = md5gg(b, c, d, a, x[i + 4], 20, -405537848)
+      a = md5gg(a, b, c, d, x[i + 9], 5, 568446438)
+      d = md5gg(d, a, b, c, x[i + 14], 9, -1019803690)
+      c = md5gg(c, d, a, b, x[i + 3], 14, -187363961)
+      b = md5gg(b, c, d, a, x[i + 8], 20, 1163531501)
+      a = md5gg(a, b, c, d, x[i + 13], 5, -1444681467)
+      d = md5gg(d, a, b, c, x[i + 2], 9, -51403784)
+      c = md5gg(c, d, a, b, x[i + 7], 14, 1735328473)
+      b = md5gg(b, c, d, a, x[i + 12], 20, -1926607734)
+
+      a = md5hh(a, b, c, d, x[i + 5], 4, -378558)
+      d = md5hh(d, a, b, c, x[i + 8], 11, -2022574463)
+      c = md5hh(c, d, a, b, x[i + 11], 16, 1839030562)
+      b = md5hh(b, c, d, a, x[i + 14], 23, -35309556)
+      a = md5hh(a, b, c, d, x[i + 1], 4, -1530992060)
+      d = md5hh(d, a, b, c, x[i + 4], 11, 1272893353)
+      c = md5hh(c, d, a, b, x[i + 7], 16, -155497632)
+      b = md5hh(b, c, d, a, x[i + 10], 23, -1094730640)
+      a = md5hh(a, b, c, d, x[i + 13], 4, 681279174)
+      d = md5hh(d, a, b, c, x[i], 11, -358537222)
+      c = md5hh(c, d, a, b, x[i + 3], 16, -722521979)
+      b = md5hh(b, c, d, a, x[i + 6], 23, 76029189)
+      a = md5hh(a, b, c, d, x[i + 9], 4, -640364487)
+      d = md5hh(d, a, b, c, x[i + 12], 11, -421815835)
+      c = md5hh(c, d, a, b, x[i + 15], 16, 530742520)
+      b = md5hh(b, c, d, a, x[i + 2], 23, -995338651)
+
+      a = md5ii(a, b, c, d, x[i], 6, -198630844)
+      d = md5ii(d, a, b, c, x[i + 7], 10, 1126891415)
+      c = md5ii(c, d, a, b, x[i + 14], 15, -1416354905)
+      b = md5ii(b, c, d, a, x[i + 5], 21, -57434055)
+      a = md5ii(a, b, c, d, x[i + 12], 6, 1700485571)
+      d = md5ii(d, a, b, c, x[i + 3], 10, -1894986606)
+      c = md5ii(c, d, a, b, x[i + 10], 15, -1051523)
+      b = md5ii(b, c, d, a, x[i + 1], 21, -2054922799)
+      a = md5ii(a, b, c, d, x[i + 8], 6, 1873313359)
+      d = md5ii(d, a, b, c, x[i + 15], 10, -30611744)
+      c = md5ii(c, d, a, b, x[i + 6], 15, -1560198380)
+      b = md5ii(b, c, d, a, x[i + 13], 21, 1309151649)
+      a = md5ii(a, b, c, d, x[i + 4], 6, -145523070)
+      d = md5ii(d, a, b, c, x[i + 11], 10, -1120210379)
+      c = md5ii(c, d, a, b, x[i + 2], 15, 718787259)
+      b = md5ii(b, c, d, a, x[i + 9], 21, -343485551)
+
+      a = safeAdd(a, olda)
+      b = safeAdd(b, oldb)
+      c = safeAdd(c, oldc)
+      d = safeAdd(d, oldd)
+    }
+    return [a, b, c, d]
+  }
+
+  /*
+  * Convert an array of little-endian words to a string
+  */
+  function binl2rstr (input) {
+    var i
+    var output = ''
+    var length32 = input.length * 32
+    for (i = 0; i < length32; i += 8) {
+      output += String.fromCharCode((input[i >> 5] >>> (i % 32)) & 0xFF)
+    }
+    return output
+  }
+
+  /*
+  * Convert a raw string to an array of little-endian words
+  * Characters >255 have their high-byte silently ignored.
+  */
+  function rstr2binl (input) {
+    var i
+    var output = []
+    output[(input.length >> 2) - 1] = undefined
+    for (i = 0; i < output.length; i += 1) {
+      output[i] = 0
+    }
+    var length8 = input.length * 8
+    for (i = 0; i < length8; i += 8) {
+      output[i >> 5] |= (input.charCodeAt(i / 8) & 0xFF) << (i % 32)
+    }
+    return output
+  }
+
+  /*
+  * Calculate the MD5 of a raw string
+  */
+  function rstrMD5 (s) {
+    return binl2rstr(binlMD5(rstr2binl(s), s.length * 8))
+  }
+
+  /*
+  * Calculate the HMAC-MD5, of a key and some data (raw strings)
+  */
+  function rstrHMACMD5 (key, data) {
+    var i
+    var bkey = rstr2binl(key)
+    var ipad = []
+    var opad = []
+    var hash
+    ipad[15] = opad[15] = undefined
+    if (bkey.length > 16) {
+      bkey = binlMD5(bkey, key.length * 8)
+    }
+    for (i = 0; i < 16; i += 1) {
+      ipad[i] = bkey[i] ^ 0x36363636
+      opad[i] = bkey[i] ^ 0x5C5C5C5C
+    }
+    hash = binlMD5(ipad.concat(rstr2binl(data)), 512 + data.length * 8)
+    return binl2rstr(binlMD5(opad.concat(hash), 512 + 128))
+  }
+
+  /*
+  * Convert a raw string to a hex string
+  */
+  function rstr2hex (input) {
+    var hexTab = '0123456789abcdef'
+    var output = ''
+    var x
+    var i
+    for (i = 0; i < input.length; i += 1) {
+      x = input.charCodeAt(i)
+      output += hexTab.charAt((x >>> 4) & 0x0F) +
+      hexTab.charAt(x & 0x0F)
+    }
+    return output
+  }
+
+  /*
+  * Encode a string as utf-8
+  */
+  function str2rstrUTF8 (input) {
+    return unescape(encodeURIComponent(input))
+  }
+
+  /*
+  * Take string arguments and return either raw or hex encoded strings
+  */
+  function rawMD5 (s) {
+    return rstrMD5(str2rstrUTF8(s))
+  }
+  function hexMD5 (s) {
+    return rstr2hex(rawMD5(s))
+  }
+  function rawHMACMD5 (k, d) {
+    return rstrHMACMD5(str2rstrUTF8(k), str2rstrUTF8(d))
+  }
+  function hexHMACMD5 (k, d) {
+    return rstr2hex(rawHMACMD5(k, d))
+  }
+
+  function md5 (string, key, raw) {
+    if (!key) {
+      if (!raw) {
+        return hexMD5(string)
+      }
+      return rawMD5(string)
+    }
+    if (!raw) {
+      return hexHMACMD5(key, string)
+    }
+    return rawHMACMD5(key, string)
+  }
+
+  if (typeof define === 'function' && define.amd) {
+    define(function () {
+      return md5
+    })
+  } else if (typeof module === 'object' && module.exports) {
+    module.exports = md5
+  } else {
+    $.md5 = md5
+  }
+}(this))

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
VisualInspection/node_modules/blueimp-md5/js/md5.min.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
VisualInspection/node_modules/blueimp-md5/js/md5.min.js.map


+ 112 - 0
VisualInspection/node_modules/blueimp-md5/package.json

@@ -0,0 +1,112 @@
+{
+  "_args": [
+    [
+      {
+        "raw": "blueimp-md5",
+        "scope": null,
+        "escapedName": "blueimp-md5",
+        "name": "blueimp-md5",
+        "rawSpec": "",
+        "spec": "latest",
+        "type": "tag"
+      },
+      "/Users/wenhongquan/Desktop/项目/新通/沿海高速/VisualInspection/VisualInspection"
+    ]
+  ],
+  "_cnpm_publish_time": 1487347863968,
+  "_from": "blueimp-md5@latest",
+  "_hasShrinkwrap": false,
+  "_id": "blueimp-md5@2.7.0",
+  "_inCache": true,
+  "_location": "/blueimp-md5",
+  "_nodeVersion": "7.5.0",
+  "_npmOperationalInternal": {
+    "host": "packages-18-east.internal.npmjs.com",
+    "tmp": "tmp/blueimp-md5-2.7.0.tgz_1487347862644_0.3410502867773175"
+  },
+  "_npmUser": {
+    "name": "blueimp",
+    "email": "mail@blueimp.net"
+  },
+  "_npmVersion": "4.1.2",
+  "_phantomChildren": {},
+  "_requested": {
+    "raw": "blueimp-md5",
+    "scope": null,
+    "escapedName": "blueimp-md5",
+    "name": "blueimp-md5",
+    "rawSpec": "",
+    "spec": "latest",
+    "type": "tag"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npm.taobao.org/blueimp-md5/download/blueimp-md5-2.7.0.tgz",
+  "_shasum": "7f518e0dd70467fefe28ecba398916092f2a02a9",
+  "_shrinkwrap": null,
+  "_spec": "blueimp-md5",
+  "_where": "/Users/wenhongquan/Desktop/项目/新通/沿海高速/VisualInspection/VisualInspection",
+  "author": {
+    "name": "Sebastian Tschan",
+    "url": "https://blueimp.net"
+  },
+  "bugs": {
+    "url": "https://github.com/blueimp/JavaScript-MD5/issues"
+  },
+  "contributors": [
+    {
+      "name": "Paul Johnston",
+      "url": "http://pajhome.org.uk/crypt/md5"
+    }
+  ],
+  "dependencies": {},
+  "description": "JavaScript MD5 implementation. Compatible with server-side environments like Node.js, module loaders like RequireJS, Browserify or webpack and all web browsers.",
+  "devDependencies": {
+    "chai": "3.5.0",
+    "mocha": "3.1.0",
+    "standard": "8.3.0",
+    "uglify-js": "2.7.3"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "7f518e0dd70467fefe28ecba398916092f2a02a9",
+    "size": 7634,
+    "noattachment": false,
+    "tarball": "http://registry.npm.taobao.org/blueimp-md5/download/blueimp-md5-2.7.0.tgz"
+  },
+  "gitHead": "9756d82db70b0f678bc6cd055e7aa08f5c1a0390",
+  "homepage": "https://github.com/blueimp/JavaScript-MD5",
+  "keywords": [
+    "javascript",
+    "md5"
+  ],
+  "license": "MIT",
+  "main": "js/md5.js",
+  "maintainers": [
+    {
+      "name": "blueimp",
+      "email": "sebastian.tschan@gmail.com"
+    }
+  ],
+  "name": "blueimp-md5",
+  "optionalDependencies": {},
+  "publish_time": 1487347863968,
+  "readme": "ERROR: No README data found!",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/blueimp/JavaScript-MD5.git"
+  },
+  "scripts": {
+    "build": "cd js && uglifyjs md5.js -c -m -o md5.min.js --source-map md5.min.js.map",
+    "lint": "standard js/*.js test/*.js",
+    "postversion": "git push --tags origin master master:gh-pages && npm publish",
+    "preversion": "npm test",
+    "test": "npm run lint && npm run unit",
+    "unit": "mocha",
+    "version": "npm run build && git add -A js"
+  },
+  "title": "JavaScript MD5",
+  "version": "2.7.0"
+}

+ 29 - 28
VisualInspection/package.json

@@ -1,29 +1,30 @@
 {
-    "name": "default",
-    "version": "1.0.0",
-    "description": "Default template for fis scaffold",
-    "main": "index.js",
-    "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/fis-scaffold/default.git"
-    },
-    "keywords": [
-        "fis",
-        "scaffold"
-    ],
-    "author": "xt",
-    "license": "",
-    "bugs": {
-        "url": "https://github.com/fis-scaffold/default/issues"
-    },
-    "homepage": "https://github.com/fis-scaffold/default",
-    "dependencies": {
-        "axios": "^0.16.1",
-        "moment": "^2.18.1",
-        "websocket": "^1.0.24",
-        "zui": "^1.6.0"
-    }
-}
+  "name": "default",
+  "version": "1.0.0",
+  "description": "Default template for fis scaffold",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/fis-scaffold/default.git"
+  },
+  "keywords": [
+    "fis",
+    "scaffold"
+  ],
+  "author": "xt",
+  "license": "",
+  "bugs": {
+    "url": "https://github.com/fis-scaffold/default/issues"
+  },
+  "homepage": "https://github.com/fis-scaffold/default",
+  "dependencies": {
+    "axios": "^0.16.1",
+    "blueimp-md5": "^2.7.0",
+    "moment": "^2.18.1",
+    "websocket": "^1.0.24",
+    "zui": "^1.6.0"
+  }
+}

+ 1 - 0
VisualInspection/view/common/commonscriptlink.html

@@ -5,6 +5,7 @@
 <script src="/node_modules/moment/min/moment.min.js"></script>
 <script src="/node_modules/moment/locale/zh-cn.js"></script>
 <script src="/node_modules/axios/dist/axios.min.js"></script>
+<script src="/node_modules/blueimp-md5/js/md5.min.js"></script>
 <script src="/js/util/service.js"></script>
 
 

+ 3 - 0
VisualInspection/view/common/head.html

@@ -13,6 +13,9 @@
 
         <ul class="nav navbar-nav navbar-right">
             <li>
+                <p id="user" class="header_font" style="padding-right:20px"></p>
+            </li>
+            <li>
                 <p id="time_p" class="header_font"></p>
             </li>
         </ul>

+ 2 - 2
VisualInspection/view/user/login.html

@@ -23,13 +23,13 @@
                         <div class="row">
                             <div class="input-group">
                                 <span class="input-group-addon fix-border input_login"><i class="icon icon-envelope icon-1x"></i></span>
-                                <input type="text" class="form-control input_login" placeholder="用户账号">
+                                <input id="username" type="text" class="form-control input_login" placeholder="用户账号">
                             </div>
                         </div>
                         <div class="row" style="margin-top:20px">
                             <div class="input-group">
                                 <span class="input-group-addon fix-border input_login"><i class="icon icon-lock icon-1x"></i></span>
-                                <input type="password" class="form-control input_login" placeholder="密码">
+                                <input id="password" type="password" class="form-control input_login" placeholder="密码">
                             </div>
                         </div>
                         <div class="row" style="margin-top:20px">

Vissa filer visades inte eftersom för många filer har ändrats