3 years ago · 2ce222a9a0
--- a/dist.zip
+++ b/dist.zip
--- a/dist/index.html
+++ b/dist/index.html
@@ -1 +0,0 @@
 
				-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>arm_web</title><script type=text/javascript src=./static/js/getscript.js></script><script src=./static/serve.js></script><link href=./static/css/app.b50784b767291cc48c004642bf6a3918.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.12d5c74b6d8030bac0db.js></script><script type=text/javascript src=./static/js/vendor.4f0689f4886fa52ac627.js></script><script type=text/javascript src=./static/js/app.2e25c6c139a8317e6af7.js></script></body></html>
			
--- a/dist/static/css/app.b50784b767291cc48c004642bf6a3918.css
+++ b/dist/static/css/app.b50784b767291cc48c004642bf6a3918.css
--- a/dist/static/css/app.b50784b767291cc48c004642bf6a3918.css.map
+++ b/dist/static/css/app.b50784b767291cc48c004642bf6a3918.css.map
--- a/dist/static/fonts/element-icons.535877f.woff
+++ b/dist/static/fonts/element-icons.535877f.woff
--- a/dist/static/fonts/element-icons.732389d.ttf
+++ b/dist/static/fonts/element-icons.732389d.ttf
--- a/dist/static/img/Handle.png
+++ b/dist/static/img/Handle.png
--- a/dist/static/img/System4.9952cba.png
+++ b/dist/static/img/System4.9952cba.png
--- a/dist/static/img/Transfer_left.png
+++ b/dist/static/img/Transfer_left.png
--- a/dist/static/img/Transfer_right.png
+++ b/dist/static/img/Transfer_right.png
--- a/dist/static/img/aa.f7c4034.png
+++ b/dist/static/img/aa.f7c4034.png
--- a/dist/static/img/bg-01.16aaefa.png
+++ b/dist/static/img/bg-01.16aaefa.png
--- a/dist/static/img/border.472cdf7.png
+++ b/dist/static/img/border.472cdf7.png
--- a/dist/static/img/border2.eb3177e.png
+++ b/dist/static/img/border2.eb3177e.png
--- a/dist/static/img/border_two_upper.a4f91ff.png
+++ b/dist/static/img/border_two_upper.a4f91ff.png
--- a/dist/static/img/dialogBack.c626f6c.png
+++ b/dist/static/img/dialogBack.c626f6c.png
--- a/dist/static/img/juxing.png
+++ b/dist/static/img/juxing.png
--- a/dist/static/img/restart.png
+++ b/dist/static/img/restart.png
--- a/dist/static/img/upper_daohang3@2x.5d1fb14.png
+++ b/dist/static/img/upper_daohang3@2x.5d1fb14.png
--- a/dist/static/img/upperdaohang2@2x.7acd4f2.png
+++ b/dist/static/img/upperdaohang2@2x.7acd4f2.png
--- a/dist/static/img/upperdhang4@2x.7ddd6b3.png
+++ b/dist/static/img/upperdhang4@2x.7ddd6b3.png
--- a/dist/static/img/web_position.png
+++ b/dist/static/img/web_position.png
--- a/dist/static/js/0.e3430b297c6209e7bf9d.js
+++ b/dist/static/js/0.e3430b297c6209e7bf9d.js
--- a/dist/static/js/0.e3430b297c6209e7bf9d.js.map
+++ b/dist/static/js/0.e3430b297c6209e7bf9d.js.map
--- a/dist/static/js/1.f207b68de19267ef5b54.js
+++ b/dist/static/js/1.f207b68de19267ef5b54.js
--- a/dist/static/js/1.f207b68de19267ef5b54.js.map
+++ b/dist/static/js/1.f207b68de19267ef5b54.js.map
--- a/dist/static/js/10.f5ed2ea2415402be75b8.js
+++ b/dist/static/js/10.f5ed2ea2415402be75b8.js
--- a/dist/static/js/10.f5ed2ea2415402be75b8.js.map
+++ b/dist/static/js/10.f5ed2ea2415402be75b8.js.map
--- a/dist/static/js/11.c7dd9df1daa12226d21e.js
+++ b/dist/static/js/11.c7dd9df1daa12226d21e.js
@@ -1,2 +0,0 @@
 
				-webpackJsonp([11],{"1dIK":function(t,e,s){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=s("l/JR"),i={name:"System",data:function(){return{isAdmin:!1}},created:function(){"admin"==JSON.parse(sessionStorage.getItem("userData")).userName&&(this.isAdmin=!0)},methods:{Reboots:function(){Object(n.p)().then(function(t){console.log(t)})},goToUser:function(){this.$router.push("/SystemSet/User")},goToUsers:function(){this.$router.push("/SystemSet/Users")},goToRestart:function(){var t=this;this.$confirm("是否需要重启系统?","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){t.Reboots(),t.$message({type:"success",duration:800,message:"重启成功!"})}).catch(function(){t.$message({type:"info",duration:800,message:"已取消操作"})})},goToTaskSetting:function(){this.$router.push("/SystemSet/taskSetting")}}},r={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"System"},[n("div",{on:{click:t.goToUser}},[t._m(0),t._v(" "),n("img",{attrs:{src:s("Qf5d"),alt:""}})]),t._v(" "),n("div",{on:{click:t.goToUsers}},[t._m(1),t._v(" "),n("img",{attrs:{src:s("Qf5d"),alt:""}})]),t._v(" "),n("div",{on:{click:t.goToRestart}},[t._m(2),t._v(" "),n("img",{attrs:{src:s("Qf5d"),alt:""}})])])},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("label",[this._v("参数"),e("br"),this._v("配置")])},function(){var t=this.$createElement,e=this._self._c||t;return e("label",[this._v("用户"),e("br"),this._v("管理")])},function(){var t=this.$createElement,e=this._self._c||t;return e("label",[this._v("系统"),e("br"),this._v("重启")])}]};var o=s("VU/8")(i,r,!1,function(t){s("Mwlq")},"data-v-2441b1ae",null);e.default=o.exports},Mwlq:function(t,e){},Qf5d:function(t,e,s){t.exports=s.p+"static/img/System4.9952cba.png"}});
			
 
				-//# sourceMappingURL=11.c7dd9df1daa12226d21e.js.map
			
--- a/dist/static/js/11.c7dd9df1daa12226d21e.js.map
+++ b/dist/static/js/11.c7dd9df1daa12226d21e.js.map
--- a/dist/static/js/12.a5829273dcea2c28199f.js
+++ b/dist/static/js/12.a5829273dcea2c28199f.js
--- a/dist/static/js/12.a5829273dcea2c28199f.js.map
+++ b/dist/static/js/12.a5829273dcea2c28199f.js.map
--- a/dist/static/js/13.09085b7259f818d9d1c4.js
+++ b/dist/static/js/13.09085b7259f818d9d1c4.js
@@ -1,2 +0,0 @@
 
				-webpackJsonp([13],{"7lf9":function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var o=a("XLwt"),r=a.n(o),n={name:"echarts",props:["userJson"],data:function(){return{chart:null}},mounted:function(){this.chinaConfigure()},beforeDestroy:function(){this.chart&&(this.chart.dispose(),this.chart=null)},methods:{chinaConfigure:function(){console.log(this.userJson);var e=r.a.init(this.$refs.myEchart);window.onresize=e.resize,e.setOption({backgroundColor:"#02AFDB",tooltip:{},dataRange:{show:!1,min:0,max:1e3,text:["High","Low"],realtime:!0,calculable:!0,color:["orangered","yellow","lightskyblue"]},geo:{map:"china",roam:!0,label:{normal:{show:!0,textStyle:{color:"rgba(0,0,0,0.4)"}}},itemStyle:{normal:{borderColor:"rgba(0, 0, 0, 0.2)"},emphasis:{areaColor:null,shadowOffsetX:0,shadowOffsetY:0,shadowBlur:20,borderWidth:0,shadowColor:"rgba(0, 0, 0, 0.5)"}}},series:[{type:"scatter",coordinateSystem:"geo"},{name:"启动次数",type:"map",geoIndex:0,data:[{name:"北京",value:599},{name:"上海",value:142},{name:"黑龙江",value:44},{name:"深圳",value:92},{name:"湖北",value:810},{name:"四川",value:453}]}]})}}},s={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"echarts"},[t("div",{ref:"myEchart",style:{height:"400px",width:"100%"}})])},staticRenderFns:[]};var l=a("VU/8")(n,s,!1,function(e){a("KzPz")},null,null);t.default=l.exports},KzPz:function(e,t){}});
			
 
				-//# sourceMappingURL=13.09085b7259f818d9d1c4.js.map
			
--- a/dist/static/js/13.09085b7259f818d9d1c4.js.map
+++ b/dist/static/js/13.09085b7259f818d9d1c4.js.map
--- a/dist/static/js/14.d06a2b534adbd838b3d2.js
+++ b/dist/static/js/14.d06a2b534adbd838b3d2.js
--- a/dist/static/js/14.d06a2b534adbd838b3d2.js.map
+++ b/dist/static/js/14.d06a2b534adbd838b3d2.js.map
--- a/dist/static/js/15.1204cc1b9b130b094be7.js
+++ b/dist/static/js/15.1204cc1b9b130b094be7.js
--- a/dist/static/js/15.1204cc1b9b130b094be7.js.map
+++ b/dist/static/js/15.1204cc1b9b130b094be7.js.map
--- a/dist/static/js/16.a67cf8dd0cc78042222e.js
+++ b/dist/static/js/16.a67cf8dd0cc78042222e.js
--- a/dist/static/js/16.a67cf8dd0cc78042222e.js.map
+++ b/dist/static/js/16.a67cf8dd0cc78042222e.js.map
--- a/dist/static/js/17.54a676d26d2a85840b2a.js
+++ b/dist/static/js/17.54a676d26d2a85840b2a.js
--- a/dist/static/js/17.54a676d26d2a85840b2a.js.map
+++ b/dist/static/js/17.54a676d26d2a85840b2a.js.map
--- a/dist/static/js/18.9cabc7f2a5ba04b2200b.js
+++ b/dist/static/js/18.9cabc7f2a5ba04b2200b.js
@@ -1,2 +0,0 @@
 
				-webpackJsonp([18],{ekdI:function(e,t){},"wKA/":function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this.$createElement;return(this._self._c||e)("router-view")},staticRenderFns:[]};var c=n("VU/8")({},r,!1,function(e){n("ekdI")},"data-v-530dfb0c",null);t.default=c.exports}});
			
 
				-//# sourceMappingURL=18.9cabc7f2a5ba04b2200b.js.map
			
--- a/dist/static/js/18.9cabc7f2a5ba04b2200b.js.map
+++ b/dist/static/js/18.9cabc7f2a5ba04b2200b.js.map
--- a/dist/static/js/19.e5737dbedc36ded9db76.js
+++ b/dist/static/js/19.e5737dbedc36ded9db76.js
@@ -1,2 +0,0 @@
 
				-webpackJsonp([19],{IeZm:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var c={render:function(){var e=this.$createElement;return(this._self._c||e)("div",{staticClass:"Baggageser"})},staticRenderFns:[]};var r=n("VU/8")({},c,!1,function(e){n("cctY")},null,null);t.default=r.exports},cctY:function(e,t){}});
			
 
				-//# sourceMappingURL=19.e5737dbedc36ded9db76.js.map
			
--- a/dist/static/js/19.e5737dbedc36ded9db76.js.map
+++ b/dist/static/js/19.e5737dbedc36ded9db76.js.map
--- a/dist/static/js/2.74db3cbcc6eeefc6eb57.js
+++ b/dist/static/js/2.74db3cbcc6eeefc6eb57.js
--- a/dist/static/js/2.74db3cbcc6eeefc6eb57.js.map
+++ b/dist/static/js/2.74db3cbcc6eeefc6eb57.js.map
--- a/dist/static/js/20.8dcb8aac292269799867.js
+++ b/dist/static/js/20.8dcb8aac292269799867.js
@@ -1,2 +0,0 @@
 
				-webpackJsonp([20],{WgMQ:function(e,t){},by9T:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this.$createElement;return(this._self._c||e)("router-view")},staticRenderFns:[]};var u=n("VU/8")({},r,!1,function(e){n("WgMQ")},"data-v-196249d6",null);t.default=u.exports}});
			
 
				-//# sourceMappingURL=20.8dcb8aac292269799867.js.map
			
--- a/dist/static/js/20.8dcb8aac292269799867.js.map
+++ b/dist/static/js/20.8dcb8aac292269799867.js.map
--- a/dist/static/js/21.3bf6c515dfae2eb3a0d3.js
+++ b/dist/static/js/21.3bf6c515dfae2eb3a0d3.js
@@ -1,2 +0,0 @@
 
				-webpackJsonp([21],{Gc5M:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this.$createElement;return(this._self._c||e)("router-view")},staticRenderFns:[]};var c=n("VU/8")({},r,!1,function(e){n("o2p9")},"data-v-0d39dc5b",null);t.default=c.exports},o2p9:function(e,t){}});
			
 
				-//# sourceMappingURL=21.3bf6c515dfae2eb3a0d3.js.map
			
--- a/dist/static/js/21.3bf6c515dfae2eb3a0d3.js.map
+++ b/dist/static/js/21.3bf6c515dfae2eb3a0d3.js.map
--- a/dist/static/js/22.f6099f89ec53dd927e93.js
+++ b/dist/static/js/22.f6099f89ec53dd927e93.js
@@ -1,2 +0,0 @@
 
				-webpackJsonp([22],{SPdZ:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this.$createElement;return(this._self._c||e)("router-view")},staticRenderFns:[]};var c=n("VU/8")({},r,!1,function(e){n("tkJN")},"data-v-0c5c7a0e",null);t.default=c.exports},tkJN:function(e,t){}});
			
 
				-//# sourceMappingURL=22.f6099f89ec53dd927e93.js.map
			
--- a/dist/static/js/22.f6099f89ec53dd927e93.js.map
+++ b/dist/static/js/22.f6099f89ec53dd927e93.js.map
--- a/dist/static/js/3.e4484cde101dfe6429db.js
+++ b/dist/static/js/3.e4484cde101dfe6429db.js
--- a/dist/static/js/3.e4484cde101dfe6429db.js.map
+++ b/dist/static/js/3.e4484cde101dfe6429db.js.map
--- a/dist/static/js/4.e74cc6b646e52ba53197.js
+++ b/dist/static/js/4.e74cc6b646e52ba53197.js
--- a/dist/static/js/4.e74cc6b646e52ba53197.js.map
+++ b/dist/static/js/4.e74cc6b646e52ba53197.js.map
--- a/dist/static/js/5.15b63eb75060eb2faa46.js
+++ b/dist/static/js/5.15b63eb75060eb2faa46.js
--- a/dist/static/js/5.15b63eb75060eb2faa46.js.map
+++ b/dist/static/js/5.15b63eb75060eb2faa46.js.map
--- a/dist/static/js/6.9817d9b869cf9f369c9d.js
+++ b/dist/static/js/6.9817d9b869cf9f369c9d.js
--- a/dist/static/js/6.9817d9b869cf9f369c9d.js.map
+++ b/dist/static/js/6.9817d9b869cf9f369c9d.js.map
--- a/dist/static/js/7.bd27c263fba760384dae.js
+++ b/dist/static/js/7.bd27c263fba760384dae.js
--- a/dist/static/js/7.bd27c263fba760384dae.js.map
+++ b/dist/static/js/7.bd27c263fba760384dae.js.map
--- a/dist/static/js/8.4d340226df8fe234e37a.js
+++ b/dist/static/js/8.4d340226df8fe234e37a.js
--- a/dist/static/js/8.4d340226df8fe234e37a.js.map
+++ b/dist/static/js/8.4d340226df8fe234e37a.js.map
--- a/dist/static/js/9.7f3abb63eb4ace4ec4c9.js
+++ b/dist/static/js/9.7f3abb63eb4ace4ec4c9.js
--- a/dist/static/js/9.7f3abb63eb4ace4ec4c9.js.map
+++ b/dist/static/js/9.7f3abb63eb4ace4ec4c9.js.map
--- a/dist/static/js/app.2e25c6c139a8317e6af7.js
+++ b/dist/static/js/app.2e25c6c139a8317e6af7.js
--- a/dist/static/js/app.2e25c6c139a8317e6af7.js.map
+++ b/dist/static/js/app.2e25c6c139a8317e6af7.js.map
--- a/dist/static/js/getscript.js
+++ b/dist/static/js/getscript.js
--- a/dist/static/js/manifest.12d5c74b6d8030bac0db.js
+++ b/dist/static/js/manifest.12d5c74b6d8030bac0db.js
@@ -1,2 +0,0 @@
 
				-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,o){for(var d,f,b,i=0,u=[];i<r.length;i++)f=r[i],t[f]&&u.push(t[f][0]),t[f]=0;for(d in a)Object.prototype.hasOwnProperty.call(a,d)&&(e[d]=a[d]);for(n&&n(r,a,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=c(c.s=o[i]);return b};var r={},t={25:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});n[2]=r;var a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,c.nc&&o.setAttribute("nonce",c.nc),o.src=c.p+"static/js/"+e+"."+{0:"e3430b297c6209e7bf9d",1:"f207b68de19267ef5b54",2:"74db3cbcc6eeefc6eb57",3:"e4484cde101dfe6429db",4:"e74cc6b646e52ba53197",5:"15b63eb75060eb2faa46",6:"9817d9b869cf9f369c9d",7:"bd27c263fba760384dae",8:"4d340226df8fe234e37a",9:"7f3abb63eb4ace4ec4c9",10:"f5ed2ea2415402be75b8",11:"c7dd9df1daa12226d21e",12:"a5829273dcea2c28199f",13:"09085b7259f818d9d1c4",14:"d06a2b534adbd838b3d2",15:"1204cc1b9b130b094be7",16:"a67cf8dd0cc78042222e",17:"54a676d26d2a85840b2a",18:"9cabc7f2a5ba04b2200b",19:"e5737dbedc36ded9db76",20:"8dcb8aac292269799867",21:"3bf6c515dfae2eb3a0d3",22:"f6099f89ec53dd927e93"}[e]+".js";var d=setTimeout(f,12e4);function f(){o.onerror=o.onload=null,clearTimeout(d);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=f,a.appendChild(o),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="./",c.oe=function(e){throw console.error(e),e}}([]);
			
 
				-//# sourceMappingURL=manifest.12d5c74b6d8030bac0db.js.map
			
--- a/dist/static/js/manifest.12d5c74b6d8030bac0db.js.map
+++ b/dist/static/js/manifest.12d5c74b6d8030bac0db.js.map
--- a/dist/static/js/serve.json
+++ b/dist/static/js/serve.json
@@ -1,4 +0,0 @@
 
				-{
			
 
				-  baseUrl:'http://192.168.30.250:3420/api',
			
 
				-  mapURL:'http://192.168.30.250:3420/api'
			
 
				-}
			
--- a/dist/static/js/vendor.4f0689f4886fa52ac627.js
+++ b/dist/static/js/vendor.4f0689f4886fa52ac627.js
--- a/dist/static/js/vendor.4f0689f4886fa52ac627.js.map
+++ b/dist/static/js/vendor.4f0689f4886fa52ac627.js.map
--- a/dist/static/serve.js
+++ b/dist/static/serve.js
@@ -1,5 +0,0 @@
 
				-window.g = {
			
 
				-  url: `http://192.168.30.249:3420`,// 配置服务器地址
			
 
				-  // url: `http://139.198.181.133:5000`,// 配置服务器地址
			
 
				-  mapURL: `http://192.168.30.250:3420/api` // 地图地址
			
 
				-}
			
--- a/package-lock.json
+++ b/package-lock.json
@@ -5193,6 +5193,11 @@
 
				       "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
			
 
				       "dev": true
			
 
				     },
			
 
				+    "js-cookie": {
			
 
				+      "version": "3.0.1",
			
 
				+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
			
 
				+      "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw=="
			
 
				+    },
			
 
				     "js-tokens": {
			
 
				       "version": "3.0.2",
			
 
				       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
			
@@ -10457,6 +10462,11 @@
 
				       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
			
 
				       "dev": true
			
 
				     },
			
 
				+    "tiny-cookie": {
			
 
				+      "version": "1.0.1",
			
 
				+      "resolved": "https://registry.npmjs.org/tiny-cookie/-/tiny-cookie-1.0.1.tgz",
			
 
				+      "integrity": "sha1-dTeGB5xkKjw9CyrMrWAPjeEZrCo="
			
 
				+    },
			
 
				     "to-arraybuffer": {
			
 
				       "version": "1.0.1",
			
 
				       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
			
@@ -10916,6 +10926,14 @@
 
				       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
			
 
				       "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
			
 
				     },
			
 
				+    "vue-cookie": {
			
 
				+      "version": "1.1.4",
			
 
				+      "resolved": "https://registry.npmjs.org/vue-cookie/-/vue-cookie-1.1.4.tgz",
			
 
				+      "integrity": "sha1-uLRtESvan5Oi9HAXwu1SgtIGT9o=",
			
 
				+      "requires": {
			
 
				+        "tiny-cookie": "^1.0"
			
 
				+      }
			
 
				+    },
			
 
				     "vue-hot-reload-api": {
			
 
				       "version": "2.3.4",
			
 
				       "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
			
--- a/package.json
+++ b/package.json
@@ -13,7 +13,9 @@
 
				     "axios": "^0.20.0",
			
 
				     "element-ui": "^2.13.2",
			
 
				     "file-saver": "^2.0.5",
			
 
				+    "js-cookie": "^3.0.1",
			
 
				     "vue": "^2.5.2",
			
 
				+    "vue-cookie": "^1.1.4",
			
 
				     "vue-router": "^3.0.7",
			
 
				     "vue-seamless-scroll": "^1.1.23",
			
 
				     "vuex": "^3.5.1",
			
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -140,7 +140,7 @@ export function Homeadduser(data) {//注册用户
 
				 }
			
 
				 export function Home(data) {//登录
			
 
				   return Service({
			
 
				-    url: '/home',
			
 
				+    url: '/Framework/Authenticate/Login',
			
 
				     method: 'post',
			
 
				     data: data
			
 
				   })
			
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -1,22 +1,38 @@
 
				 <template>
			
 
				   <div id="login">
			
 
				     <div class="header">
			
 
				-     <div class="hint"><span>AMR</span> &nbsp;&nbsp; AMR管理系统</div>
			
 
				+      <div class="hint"><span>AMR</span> &nbsp;&nbsp; AMR管理系统</div>
			
 
				     </div>
			
 
				-	<div id="backPic"></div>
			
 
				+    <div id="backPic"></div>
			
 
				     <div class="nav">
			
 
				       <div class="inputs">
			
 
				         <span>Hi，欢迎登录</span>
			
 
				         <div class="zhanghao inputDiv">
			
 
				-          <div class="iconfont username" style="font-size:20px;margin:auto 10px;"></div>
			
 
				+          <div
			
 
				+            class="iconfont username"
			
 
				+            style="font-size: 20px; margin: auto 10px"
			
 
				+          ></div>
			
 
				           <div>
			
 
				-            <input class="text" type="text" placeholder="请输入账号" v-model="username" />
			
 
				+            <input
			
 
				+              class="text"
			
 
				+              type="text"
			
 
				+              placeholder="请输入账号"
			
 
				+              v-model="username"
			
 
				+            />
			
 
				           </div>
			
 
				         </div>
			
 
				         <div class="password inputDiv">
			
 
				-          <div class="iconfont  password" style="font-size:20px;margin:auto 10px;"></div>
			
 
				+          <div
			
 
				+            class="iconfont password"
			
 
				+            style="font-size: 20px; margin: auto 10px"
			
 
				+          ></div>
			
 
				           <div>
			
 
				-            <input class="pass" type="password" placeholder="请输入密码" v-model="password" />
			
 
				+            <input
			
 
				+              class="pass"
			
 
				+              type="password"
			
 
				+              placeholder="请输入密码"
			
 
				+              v-model="password"
			
 
				+            />
			
 
				           </div>
			
 
				         </div>
			
 
				         <!-- <div class="vcode inputDiv">
			
@@ -24,7 +40,9 @@
 
				               <input class="inputcode" type="text" placeholder="请输入验证码" v-model="getcode" />
			
 
				             <div class="createcode" ref="vvcode">{{code}}</div>
			
 
				         </div> -->
			
 
				-        <div class="tologin"  id="tologin" @click="UpLogin">登&nbsp;&nbsp;&nbsp;&nbsp;录</div>
			
 
				+        <div class="tologin" id="tologin" @click="UpLogin">
			
 
				+          登&nbsp;&nbsp;&nbsp;&nbsp;录
			
 
				+        </div>
			
 
				       </div>
			
 
				     </div>
			
 
				   </div>
			
@@ -32,16 +50,17 @@
 
				 
			
 
				 <script>
			
 
				 import { mapGetters } from "vuex";
			
 
				-import {Home} from '@/api/request.js'
			
 
				+import { Home } from "@/api/request.js";
			
 
				+import { setCodeToken } from "../utilts/auth";
			
 
				 export default {
			
 
				   data() {
			
 
				     return {
			
 
				-      aa:{},
			
 
				-      UId:"",
			
 
				+      aa: {},
			
 
				+      UId: "",
			
 
				       username: "",
			
 
				       password: "",
			
 
				       getcode: "",
			
 
				-      code: ""
			
 
				+      code: "",
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
@@ -101,14 +120,14 @@ export default {
 
				       if (!GetText) {
			
 
				         this.$message({
			
 
				           showClose: true,
			
 
				-          message: "请输入账号"
			
 
				+          message: "请输入账号",
			
 
				         });
			
 
				         return;
			
 
				       }
			
 
				       if (!GetPassword) {
			
 
				         this.$message({
			
 
				           showClose: true,
			
 
				-          message: "请输入密码"
			
 
				+          message: "请输入密码",
			
 
				         });
			
 
				         return;
			
 
				       }
			
@@ -129,10 +148,10 @@ export default {
 
				       //   this.getcode = "";
			
 
				       //   return;
			
 
				       // }
			
 
				-      let loginData={
			
 
				-        username:this.username,
			
 
				-        password:this.password
			
 
				-      }
			
 
				+      let loginData = {
			
 
				+        username: this.username,
			
 
				+        password: this.password,
			
 
				+      };
			
 
				       // this.aa={
			
 
				       //       userinfo: null,
			
 
				       //       valide_info: "True",
			
@@ -142,50 +161,62 @@ export default {
 
				       // this.$store.state.login.userData=this.aa;
			
 
				       // console.log(this.$store.state.login.userData)
			
 
				 
			
 
				-      Home(loginData).then(res=>{
			
 
				-        console.log(res);
			
 
				-      this.$store.state.login.userData=res
			
 
				-      })
			
 
				-      }
			
 
				-
			
 
				-
			
 
				+      Home(loginData).then((res) => {
			
 
				+        if (res.resultCode == 0) {
			
 
				+          setCodeToken(res.token);
			
 
				+          this.$router.push({ path: "/admin" });
			
 
				+        } else {
			
 
				+          this.$message({
			
 
				+            showClose: true,
			
 
				+            message: "账户密码有误！",
			
 
				+          });
			
 
				+        }
			
 
				+        //   console.log(res);
			
 
				+        // this.$store.state.login.userData=res
			
 
				+      });
			
 
				     },
			
 
				+  },
			
 
				   mounted() {
			
 
				     this.CreateCode();
			
 
				     document.onkeydown = function (event) {
			
 
				-        var e = event || window.event;
			
 
				-        if (e && e.keyCode == 13) { //回车键的键值为13
			
 
				-           document.getElementById('tologin').click(); //调用登录按钮的登录事件
			
 
				-
			
 
				-        }
			
 
				+      var e = event || window.event;
			
 
				+      if (e && e.keyCode == 13) {
			
 
				+        //回车键的键值为13
			
 
				+        document.getElementById("tologin").click(); //调用登录按钮的登录事件
			
 
				+      }
			
 
				     };
			
 
				   },
			
 
				   computed: {
			
 
				-      ...mapGetters(['login'])
			
 
				+    ...mapGetters(["login"]),
			
 
				   },
			
 
				   watch: {
			
 
				-      login:function(data){
			
 
				-        console.log(data)
			
 
				-        if(data.valide_info=="True"){
			
 
				-          // alert('成功')
			
 
				-          sessionStorage.setItem("userData", JSON.stringify({userName:this.username,time:Date.now()}));
			
 
				-          this.$message({
			
 
				-            message: '登录成功！',
			
 
				-            type: 'success'
			
 
				-          });
			
 
				-          this.$router.push({path:'/admin'})
			
 
				-        }else{
			
 
				-          this.$message({
			
 
				-            showClose: true,
			
 
				-            message: "账户密码有误！"
			
 
				-          });
			
 
				-        }
			
 
				-      }
			
 
				+    // login: function (data) {
			
 
				+    //   console.log(data);
			
 
				+    //   if (data.valide_info == "True") {
			
 
				+    //     // alert('成功')
			
 
				+    //     sessionStorage.setItem(
			
 
				+    //       "userData",
			
 
				+    //       JSON.stringify({ userName: this.username, time: Date.now() })
			
 
				+    //     );
			
 
				+    //     this.$message({
			
 
				+    //       message: "登录成功！",
			
 
				+    //       type: "success",
			
 
				+    //     });
			
 
				+    //     this.$router.push({ path: "/admin" });
			
 
				+    //   } else {
			
 
				+    //     this.$message({
			
 
				+    //       showClose: true,
			
 
				+    //       message: "账户密码有误！",
			
 
				+    //     });
			
 
				+    //   }
			
 
				+    // },
			
 
				   },
			
 
				-  created(){
			
 
				-	  for(var i = 0; i < 5; i++){ requestAnimationFrame(() => console.log(i)); }
			
 
				-  }
			
 
				-}
			
 
				+  created() {
			
 
				+    for (var i = 0; i < 5; i++) {
			
 
				+      requestAnimationFrame(() => console.log(i));
			
 
				+    }
			
 
				+  },
			
 
				+};
			
 
				 </script>
			
 
				 
			
 
				 <style scoped lang="less">
			
@@ -204,8 +235,8 @@ export default {
 
				   position: absolute;
			
 
				   left: 0;
			
 
				   top: 0;
			
 
				-  background:rgba(255,255,255,1);
			
 
				-  box-shadow:0px 1px 6px 0px rgba(206,208,212,0.47);
			
 
				+  background: rgba(255, 255, 255, 1);
			
 
				+  box-shadow: 0px 1px 6px 0px rgba(206, 208, 212, 0.47);
			
 
				 }
			
 
				 .nav {
			
 
				   width: 100%;
			
@@ -224,21 +255,21 @@ export default {
 
				   left: 2.21%;
			
 
				   line-height: 4.25rem;
			
 
				   font-size: 1.125rem;
			
 
				-  font-weight:500;
			
 
				-  color:rgba(161,169,186,1);
			
 
				+  font-weight: 500;
			
 
				+  color: rgba(161, 169, 186, 1);
			
 
				 }
			
 
				 .hint > span {
			
 
				-  font-size:1.125rem;
			
 
				-  font-weight:500;
			
 
				-  color:rgba(70,78,86,1);
			
 
				-  line-height:25px;
			
 
				+  font-size: 1.125rem;
			
 
				+  font-weight: 500;
			
 
				+  color: rgba(70, 78, 86, 1);
			
 
				+  line-height: 25px;
			
 
				 }
			
 
				-.hint > span::after{
			
 
				-	content: "";
			
 
				-	width: 0.0625rem;
			
 
				-	height: 4.25rem;
			
 
				-	border-left: 1px solid #000000;
			
 
				-	margin-left: 10px;
			
 
				+.hint > span::after {
			
 
				+  content: "";
			
 
				+  width: 0.0625rem;
			
 
				+  height: 4.25rem;
			
 
				+  border-left: 1px solid #000000;
			
 
				+  margin-left: 10px;
			
 
				 }
			
 
				 
			
 
				 .inputs {
			
@@ -249,17 +280,17 @@ export default {
 
				   right: 15.4375rem;
			
 
				   top: 12.375rem;
			
 
				   text-align: center;
			
 
				-  box-shadow:0px 10px 20px 0px rgba(47,111,243,0.23);
			
 
				+  box-shadow: 0px 10px 20px 0px rgba(47, 111, 243, 0.23);
			
 
				   padding: 4.5625rem 3.75rem;
			
 
				   box-sizing: border-box;
			
 
				   display: flex;
			
 
				   flex-wrap: wrap;
			
 
				 }
			
 
				 .inputs > span {
			
 
				-  font-size:2.25rem;
			
 
				-  font-weight:500;
			
 
				-  color:rgba(0,0,0,1);
			
 
				-  line-height:3.125rem;
			
 
				+  font-size: 2.25rem;
			
 
				+  font-weight: 500;
			
 
				+  color: rgba(0, 0, 0, 1);
			
 
				+  line-height: 3.125rem;
			
 
				 }
			
 
				 
			
 
				 .footer {
			
@@ -313,8 +344,8 @@ export default {
 
				   border: none;
			
 
				   line-height: 4.25rem;
			
 
				   border-left: solid 1px gray;
			
 
				-  font-size:14px;
			
 
				-  font-weight:500;
			
 
				+  font-size: 14px;
			
 
				+  font-weight: 500;
			
 
				 }
			
 
				 
			
 
				 .iconfont:after {
			
@@ -333,8 +364,8 @@ export default {
 
				   border: none;
			
 
				   line-height: 4.25rem;
			
 
				   border-left: solid 1px gray;
			
 
				-  font-size:14px;
			
 
				-  font-weight:500;
			
 
				+  font-size: 14px;
			
 
				+  font-weight: 500;
			
 
				 }
			
 
				 
			
 
				 .inputcode {
			
@@ -342,8 +373,8 @@ export default {
 
				   width: 55%;
			
 
				   border: none;
			
 
				   line-height: 4.25rem;
			
 
				-  font-size:14px;
			
 
				-  font-weight:500;
			
 
				+  font-size: 14px;
			
 
				+  font-weight: 500;
			
 
				 }
			
 
				 .createcode {
			
 
				   height: 30px;
			
--- a/src/utilts/auth.js
+++ b/src/utilts/auth.js
@@ -0,0 +1,13 @@
 
				+import Cookies from 'js-cookie'
			
 
				+
			
 
				+export function removeToken(name = TokenKey) {
			
 
				+  return Cookies.remove(name)
			
 
				+}
			
 
				+
			
 
				+export function setCodeToken(token) {
			
 
				+  return Cookies.set('codeToken', token)
			
 
				+}
			
 
				+
			
 
				+export function getCodeToken() {
			
 
				+  return Cookies.get('codeToken')
			
 
				+}