Merge remote-tracking branch 'origin/master'

xudada
config/index.js
index.html
package-lock.json
package.json
src/api/Allocat.js
src/api/InResponse.js
src/api/api.js
src/api/company.js
src/api/country.js
src/api/department.js
src/api/el-ext/eltree.js
src/api/exitArrive.js
src/api/exitFlight.js
src/api/exitLoading.js
src/api/exitManifest.js
src/api/exitPre.js
src/api/exitTidy.js
src/api/group_company.js
src/api/htmlToPdf.js
src/api/http.js
--- a/config/index.js
查看文件 @5eaec74
+++ b/config/index.js
查看文件 @5eaec74
@@ -9,11 +9,12 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: './',
     productionSourceMap: true,
-    // Gzip off by default as many popular static hosts such as
+  // Gzip off by default as many popular static hosts such as2.20202
     // Surge or Netlify already gzip all static assets for you.
     // Before setting to `true`, make sure to:
     // npm install --save-dev compression-webpack-plugin
     productionGzip: false,
+
     productionGzipExtensions: ['js', 'css'],
     // Run the build command with an extra argument to
     // View the bundle analyzer report after build finishes:
@@ -23,17 +24,17 @@ module.exports = {
   },
   dev: {
     env: require('./dev.env'),
-    port: 4006,
+    port: 12020,
     autoOpenBrowser: true,
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: {
       '/api':{
           target: 'http://192.168.1.53:12343',//设置你调用的接口域名和端口号 别忘了加http
-          // target: 'http://192.168.43.78:12343',//设置你调用的接口域名和端口号 别忘了加http
+          // target: 'http://localhost:12343',//设置你调用的接口域名和端口号 别忘了加http
           changeOrigin: true,
           pathRewrite: {
-              '^/api': '/'//这里理解成用‘/api’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可
+              '^/api/': '/'//这里理解成用‘/api’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://40.00.100.100:3002/user/add'，直接写‘/api/user/add’即可
           }
       }
     },
--- a/index.html
查看文件 @5eaec74
+++ b/index.html
查看文件 @5eaec74
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
-  <title>流浪地球项目</title>
+  <title>易通快速通关申报管理系统</title>
   <link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
 </head>
--- a/package-lock.json 100755 → 100644
查看文件 @5eaec74
+++ b/package-lock.json 100755 → 100644
查看文件 @5eaec74
@@ -34,6 +34,11 @@
         }
       }
     },
+    "abab": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
+      "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4="
+    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -72,6 +77,21 @@
         }
       }
     },
+    "acorn-globals": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz",
+      "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=",
+      "requires": {
+        "acorn": "^2.1.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
+          "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc="
+        }
+      }
+    },
     "acorn-jsx": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz",
@@ -487,6 +507,11 @@
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
       "dev": true
     },
+    "array-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
+      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM="
+    },
     "array-find-index": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
@@ -524,7 +549,6 @@
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
       "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
       "requires": {
         "safer-buffer": "~2.1.0"
       }
@@ -570,8 +594,7 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -613,8 +636,8 @@
     },
     "async-validator": {
       "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
-      "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
+      "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz",
+      "integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=",
       "requires": {
         "babel-runtime": "6.x"
       }
@@ -622,8 +645,7 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "atob": {
       "version": "2.1.2",
@@ -648,14 +670,12 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-      "dev": true
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
     },
     "axios": {
       "version": "0.19.0",
@@ -896,8 +916,8 @@
     },
     "babel-helper-vue-jsx-merge-props": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
-      "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
+      "resolved": "https://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
+      "integrity": "sha1-Iq69OzOQIyjlEyk6jkmSs4T58bY="
     },
     "babel-helpers": {
       "version": "6.24.1",
@@ -1610,6 +1630,11 @@
         }
       }
     },
+    "base64-arraybuffer": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz",
+      "integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ=="
+    },
     "base64-js": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
@@ -1620,7 +1645,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
       "requires": {
         "tweetnacl": "^0.14.3"
       }
@@ -1955,11 +1979,28 @@
       "integrity": "sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==",
       "dev": true
     },
+    "canvg": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/canvg/-/canvg-1.5.3.tgz",
+      "integrity": "sha512-7Gn2IuQzvUQWPIuZuFHrzsTM0gkPz2RRT9OcbdmA03jeKk8kltrD8gqUzNX15ghY/4PV5bbe5lmD6yDLDY6Ybg==",
+      "requires": {
+        "jsdom": "^8.1.0",
+        "rgbcolor": "^1.0.1",
+        "stackblur-canvas": "^1.4.1",
+        "xmldom": "^0.1.22"
+      },
+      "dependencies": {
+        "stackblur-canvas": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-1.4.1.tgz",
+          "integrity": "sha1-hJqm+UsnL/JvZHH6QTDtH35HlVs="
+        }
+      }
+    },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "center-align": {
       "version": "0.1.3",
@@ -1972,9 +2013,9 @@
       }
     },
     "cfb": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.1.3.tgz",
-      "integrity": "sha512-joXBW0nMuwV9no7UTMiyVJnQL6XIU3ThXVjFUDHgl9MpILPOomyfaGqC290VELZ48bbQKZXnQ81UT5HouTxHsw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.1.4.tgz",
+      "integrity": "sha512-rwFkl3aFO3f+ljR27YINwC0x8vPjyiEVbYbrTCKzspEf7Q++3THdfHVgJYNUbxNcupJECrLX+L40Mjm9hm/Bgw==",
       "requires": {
         "adler-32": "~1.2.0",
         "commander": "^2.16.0",
@@ -2418,7 +2459,6 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -2754,6 +2794,14 @@
       "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
       "dev": true
     },
+    "css-line-break": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-1.1.1.tgz",
+      "integrity": "sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA==",
+      "requires": {
+        "base64-arraybuffer": "^0.2.0"
+      }
+    },
     "css-loader": {
       "version": "0.26.4",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.26.4.tgz",
@@ -2906,6 +2954,19 @@
         "source-map": "^0.5.3"
       }
     },
+    "cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
+    },
+    "cssstyle": {
+      "version": "0.2.37",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz",
+      "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
+      "requires": {
+        "cssom": "0.3.x"
+      }
+    },
     "currently-unhandled": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
@@ -2925,7 +2986,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -2975,8 +3035,8 @@
     },
     "deepmerge": {
       "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
+      "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz?cache=0&sync_timestamp=1570547201087&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeepmerge%2Fdownload%2Fdeepmerge-1.5.2.tgz",
+      "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M="
     },
     "define-property": {
       "version": "2.0.2",
@@ -3040,8 +3100,7 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "delegates": {
       "version": "1.0.0",
@@ -3188,7 +3247,6 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
       "requires": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
@@ -3350,6 +3408,26 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
+    "escodegen": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz",
+      "integrity": "sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==",
+      "requires": {
+        "esprima": "^4.0.1",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "optional": true
+        }
+      }
+    },
     "eslint": {
       "version": "5.16.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
@@ -3749,8 +3827,7 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fast-deep-equal": {
       "version": "2.0.1",
@@ -3970,14 +4047,12 @@
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
       "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.6",
@@ -4721,7 +4796,6 @@
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -4804,14 +4878,12 @@
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
       "version": "5.1.3",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
       "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "dev": true,
       "requires": {
         "ajv": "^6.5.5",
         "har-schema": "^2.0.0"
@@ -5020,6 +5092,14 @@
         "toposort": "^1.0.0"
       }
     },
+    "html2canvas": {
+      "version": "1.0.0-rc.5",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-rc.5.tgz",
+      "integrity": "sha512-DtNqPxJNXPoTajs+lVQzGS1SULRI4GQaROeU5R41xH8acffHukxRh/NBVcTBsfCkJSkLq91rih5TpbEwUP9yWA==",
+      "requires": {
+        "css-line-break": "1.1.1"
+      }
+    },
     "htmlparser2": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
@@ -5101,7 +5181,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "jsprim": "^1.2.2",
@@ -5431,8 +5510,7 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -5465,8 +5543,7 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "js-base64": {
       "version": "2.5.1",
@@ -5521,8 +5598,38 @@
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+    },
+    "jsdom": {
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-8.5.0.tgz",
+      "integrity": "sha1-1Nj12/J2hjW2KmKCO5R89wcevJg=",
+      "requires": {
+        "abab": "^1.0.0",
+        "acorn": "^2.4.0",
+        "acorn-globals": "^1.0.4",
+        "array-equal": "^1.0.0",
+        "cssom": ">= 0.3.0 < 0.4.0",
+        "cssstyle": ">= 0.2.34 < 0.3.0",
+        "escodegen": "^1.6.1",
+        "iconv-lite": "^0.4.13",
+        "nwmatcher": ">= 1.3.7 < 2.0.0",
+        "parse5": "^1.5.1",
+        "request": "^2.55.0",
+        "sax": "^1.1.4",
+        "symbol-tree": ">= 3.1.0 < 4.0.0",
+        "tough-cookie": "^2.2.0",
+        "webidl-conversions": "^3.0.1",
+        "whatwg-url": "^2.0.1",
+        "xml-name-validator": ">= 2.0.1 < 3.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz",
+          "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc="
+        }
+      }
     },
     "jsesc": {
       "version": "1.3.0",
@@ -5539,8 +5646,7 @@
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-schema-traverse": {
       "version": "0.4.1",
@@ -5564,8 +5670,7 @@
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json5": {
       "version": "0.5.1",
@@ -5579,11 +5684,50 @@
       "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
       "dev": true
     },
+    "jspdf": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-1.5.3.tgz",
+      "integrity": "sha512-J9X76xnncMw+wIqb15HeWfPMqPwYxSpPY8yWPJ7rAZN/ZDzFkjCSZObryCyUe8zbrVRNiuCnIeQteCzMn7GnWw==",
+      "requires": {
+        "canvg": "1.5.3",
+        "file-saver": "github:eligrey/FileSaver.js#1.3.8",
+        "html2canvas": "1.0.0-alpha.12",
+        "omggif": "1.0.7",
+        "promise-polyfill": "8.1.0",
+        "stackblur-canvas": "2.2.0"
+      },
+      "dependencies": {
+        "base64-arraybuffer": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+          "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
+        },
+        "css-line-break": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-1.0.1.tgz",
+          "integrity": "sha1-GfIGOjPpX7KDG4ZEbAuAwYivRQo=",
+          "requires": {
+            "base64-arraybuffer": "^0.1.5"
+          }
+        },
+        "file-saver": {
+          "version": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
+          "from": "github:eligrey/FileSaver.js#1.3.8"
+        },
+        "html2canvas": {
+          "version": "1.0.0-alpha.12",
+          "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-alpha.12.tgz",
+          "integrity": "sha1-OxmS48mz9WBjw1/WIElPN+uohRM=",
+          "requires": {
+            "css-line-break": "1.0.1"
+          }
+        }
+      }
+    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -5941,14 +6085,12 @@
     "mime-db": {
       "version": "1.40.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
-      "dev": true
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
     },
     "mime-types": {
       "version": "2.1.24",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
       "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
-      "dev": true,
       "requires": {
         "mime-db": "1.40.0"
       }
@@ -6316,7 +6458,7 @@
     },
     "normalize-wheel": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
       "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
     },
     "npm": {
@@ -9402,11 +9544,15 @@
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
       "dev": true
     },
+    "nwmatcher": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz",
+      "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ=="
+    },
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
     },
     "object-assign": {
       "version": "4.1.1",
@@ -9469,6 +9615,11 @@
         }
       }
     },
+    "omggif": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.7.tgz",
+      "integrity": "sha1-WdLuywJj3oRjWz/riHwMmXPx5J0="
+    },
     "on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -9726,6 +9877,11 @@
         "error-ex": "^1.2.0"
       }
     },
+    "parse5": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
+      "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ="
+    },
     "parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -9811,8 +9967,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "pify": {
       "version": "3.0.0",
@@ -10407,6 +10562,11 @@
       "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
       "dev": true
     },
+    "promise-polyfill": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.1.0.tgz",
+      "integrity": "sha512-OzSf6gcCUQ01byV4BgwyUCswlaQQ6gzXc23aLQWhicvfX9kfsUiUhgt3CCQej8jDnl8/PhGF31JdHX2/MzF3WA=="
+    },
     "proto-list": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
@@ -10438,8 +10598,7 @@
     "psl": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz",
-      "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==",
-      "dev": true
+      "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag=="
     },
     "public-encrypt": {
       "version": "4.0.3",
@@ -11126,7 +11285,6 @@
       "version": "2.88.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
       "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
         "aws4": "^1.8.0",
@@ -11153,8 +11311,7 @@
         "qs": {
           "version": "6.5.2",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-          "dev": true
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
         }
       }
     },
@@ -11184,8 +11341,8 @@
     },
     "resize-observer-polyfill": {
       "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
+      "resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fresize-observer-polyfill%2Fdownload%2Fresize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
     },
     "resolve": {
       "version": "1.12.0",
@@ -11222,6 +11379,11 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
+    "rgbcolor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz",
+      "integrity": "sha1-1lBezbMEplldom+ktDMHMGd1lF0="
+    },
     "right-align": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
@@ -11355,8 +11517,7 @@
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "schema-utils": {
       "version": "0.3.0",
@@ -11811,9 +11972,9 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
     "ssf": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.10.2.tgz",
-      "integrity": "sha512-rDhAPm9WyIsY8eZEKyE8Qsotb3j/wBdvMWBUsOhJdfhKGLfQidRjiBUV0y/MkyCLiXQ38FG6LWW/VYUtqlIDZQ==",
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.10.3.tgz",
+      "integrity": "sha512-pRuUdW0WwyB2doSqqjWyzwCD6PkfxpHAHdZp39K3dp/Hq7f+xfMwNAWIi16DyrRg4gg9c/RvLYkJTSawTPTm1w==",
       "requires": {
         "frac": "~1.1.2"
       }
@@ -11822,7 +11983,6 @@
       "version": "1.16.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
       "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dev": true,
       "requires": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -11844,6 +12004,11 @@
         "safe-buffer": "^5.1.1"
       }
     },
+    "stackblur-canvas": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.2.0.tgz",
+      "integrity": "sha512-5Gf8dtlf8k6NbLzuly2NkGrkS/Ahh+I5VUjO7TnFizdJtgpfpLLEdQlLe9umbcnZlitU84kfYjXE67xlSXfhfQ=="
+    },
     "stackframe": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
@@ -12038,6 +12203,11 @@
         }
       }
     },
+    "symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
+    },
     "table": {
       "version": "5.4.6",
       "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
@@ -12103,8 +12273,8 @@
     },
     "throttle-debounce": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
-      "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
+      "resolved": "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz",
+      "integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0="
     },
     "through": {
       "version": "2.3.8",
@@ -12214,7 +12384,6 @@
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
       "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-      "dev": true,
       "requires": {
         "psl": "^1.1.24",
         "punycode": "^1.4.1"
@@ -12223,11 +12392,15 @@
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
         }
       }
     },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
     "trim-newlines": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
@@ -12270,7 +12443,6 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -12278,8 +12450,7 @@
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
     },
     "type-check": {
       "version": "0.3.2",
@@ -12578,8 +12749,7 @@
     "uuid": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
-      "dev": true
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -12607,7 +12777,6 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
@@ -12625,6 +12794,11 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.10.tgz",
       "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ=="
     },
+    "vue-count-to": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/vue-count-to/-/vue-count-to-1.0.13.tgz",
+      "integrity": "sha512-6R4OVBVNtQTlcbXu6SJ8ENR35M2/CdWt3Jmv57jOUM+1ojiFmjVGvZPH8DfHpMDSA+ITs+EW5V6qthADxeyYOQ=="
+    },
     "vue-hot-reload-api": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.3.tgz",
@@ -12780,6 +12954,11 @@
         "neo-async": "^2.5.0"
       }
     },
+    "webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+    },
     "webpack": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.7.0.tgz",
@@ -13103,6 +13282,15 @@
         }
       }
     },
+    "whatwg-url": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-2.0.1.tgz",
+      "integrity": "sha1-U5ayBD8CDub3BNnEXqhRnnJN5lk=",
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "whet.extend": {
       "version": "0.9.9",
       "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz",
@@ -13156,6 +13344,11 @@
       "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
       "dev": true
     },
+    "wmf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
+      "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw=="
+    },
     "wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
@@ -13231,19 +13424,30 @@
       }
     },
     "xlsx": {
-      "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.15.1.tgz",
-      "integrity": "sha512-z+o4+QPMc32EPboLCzJAz94o0Zyy+8jrmWTsVpfzwknFln9qDO6/HN1KrGGVC4//sGA7dh4R3HA4fhbGIKCDOA==",
+      "version": "0.15.6",
+      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.15.6.tgz",
+      "integrity": "sha512-7vD9eutyLs65iDjNFimVN+gk/oDkfkCgpQUjdE82QgzJCrBHC4bGPH7fzKVyy0UPp3gyFVQTQEFJaWaAvZCShQ==",
       "requires": {
         "adler-32": "~1.2.0",
-        "cfb": "^1.1.3",
+        "cfb": "^1.1.4",
         "codepage": "~1.14.0",
         "commander": "~2.17.1",
         "crc-32": "~1.2.0",
         "exit-on-epipe": "~1.0.1",
-        "ssf": "~0.10.2"
+        "ssf": "~0.10.3",
+        "wmf": "~1.0.1"
       }
     },
+    "xml-name-validator": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz",
+      "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU="
+    },
+    "xmldom": {
+      "version": "0.1.31",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz",
+      "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="
+    },
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
--- a/package.json
查看文件 @5eaec74
+++ b/package.json
查看文件 @5eaec74
@@ -16,19 +16,22 @@
     "eslint": "^5.14.1",
     "file-saver": "^2.0.2",
     "font-awesome": "^4.7.0",
+    "html2canvas": "^1.0.0-rc.5",
     "install": "^0.12.2",
     "js-cookie": "^2.2.1",
+    "jspdf": "^1.5.3",
     "jszip": "^3.2.2",
     "moment": "^2.24.0",
     "npm": "^6.8.0",
     "nprogress": "^0.2.0",
     "script-loader": "^0.7.2",
     "vue": "^2.2.2",
+    "vue-count-to": "^1.0.13",
     "vue-i18n": "^8.14.0",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^2.3.0",
     "vuex": "^2.0.0-rc.6",
-    "xlsx": "^0.15.1"
+    "xlsx": "^0.15.6"
   },
   "devDependencies": {
     "autoprefixer": "^6.7.2",
--- a/src/api/Allocat.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/Allocat.js 0 → 100644
查看文件 @5eaec74
+import http from './http.js'
+let baseUrl = 'nmms-server-import/nmms/allocat'
+
+
+export const addAllocatImport=params=>{return http.post(`${baseUrl}/addAllocatImport`,  params);};
+export const addAllocatArrive=params=>{return http.post(`${baseUrl}/addAllocatArrive`,  params);};
+export const QueryData=params=>{return http.get(`${baseUrl}/QueryData`,  params);};
+export const ediAllocat=params=>{return http.put(`${baseUrl}/ediAllocat`,  params);};
+
+export const sendCreateMt6202=params=>{return http.post(`${baseUrl}/sendCreateMt6202`,  params);};
+export const sendRemoveMt6202=params=>{return http.post(`${baseUrl}/sendRemoveMt6202`,  params);};
+export const sendCreateMt3202=params=>{return http.post(`${baseUrl}/sendCreateMt3202`,  params);};
+export const sendRemoveMt3202=params=>{return http.post(`${baseUrl}/sendRemoveMt3202`,  params);};
--- a/src/api/InResponse.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/InResponse.js 0 → 100644
查看文件 @5eaec74
+import http from './http.js'
+
+let baseUrl = 'nmms-server-import/nmms/rep'
+//添加回执明细
+export const addResponse=params=>{return http.post(`${baseUrl}/InsertResponse`,  params);};
+//查询回执明细列表
+export const selectResponseList=params=>{return http.post(`${baseUrl}/selectResponseList`,  params);};
--- a/src/api/api.js
查看文件 @5eaec74
+++ b/src/api/api.js
查看文件 @5eaec74
@@ -5,13 +5,13 @@ import qs from 'qs'
 Vue.prototype.$http = axios;
-export const getuserMenus = params => { return axios.get(`/perm/userMenus`, { params: params }); };
+export const getuserMenus = params => { return axios.get(`USER-CENTER/perm/userMenus`, { params: params }); };
-export const getUserList = params => { return axios.get(`/hqpt-user-center/user/list`, { params: params }); };
+export const getUserList = params => { return axios.get(`/cloud-user-center/user/list`, { params: params }); };
 export const getUserListPage = params => { return axios({
     method: 'GET',
-    url: `/user/list`,
+    url: `/cloud-user-center/user/list`,
     data: params,
     headers: {
         'Content-Type': 'application/json;charset=UTF-8'
@@ -21,18 +21,18 @@ export const getUserListPage = params => { return axios({
 export const removeUser = params => { return axios({
     method: 'DELETE',
-    url: `/user/del`,
+    url: `/cloud-user-center/user/del`,
     data: params,
     headers: {
         'Content-Type': 'application/json;charset=UTF-8'
     }
 })};
-export const batchRemoveUser = params => { return axios.get(`/user/batchremove`, { params: params }); };
+export const batchRemoveUser = params => { return axios.get(`USER-CENTER/user/batchremove`, { params: params }); };
 export const editUser = params => { return axios({
     method: 'PUT',
-    url: `/user/edit`,
+    url: `/cloud-user-center/user/edit`,
     data: params,
     headers: {
         'Content-Type': 'application/json;charset=UTF-8'
@@ -41,7 +41,7 @@ export const editUser = params => { return axios({
 export const addUser = params => { return axios({
     method: 'POST',
-    url: `/user/add`,
+    url: `/cloud-user-center/user/add`,
     data: params,
     headers: {
         'Content-Type': 'application/json;charset=UTF-8'
@@ -50,7 +50,7 @@ export const addUser = params => { return axios({
 export const setUserRole = params => { return axios({
     method: 'PUT',
-    url: `/user/roleset`,
+    url: `/cloud-user-center/user/roleset`,
     data: params,
     headers: {
         'Content-Type': 'application/json;charset=UTF-8'
--- a/src/api/company.js
查看文件 @5eaec74
+++ b/src/api/company.js
查看文件 @5eaec74
 import axios from 'axios'
-let base = '/hqpt-user-center/company';
+let base = '/cloud-user-center/company';
 export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
--- a/src/api/country.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/country.js 0 → 100644
查看文件 @5eaec74
+import http from './http.js'
+let baseUrl = 'nmms-server-export/nmms/country'
+
+
+export const getCountry = params => { return http.get(`${baseUrl}/getCountryCode`,  params); };
+
+export const getByCountryCodeForName = params => { return http.post(`${baseUrl}/getByCountryCodeForName`,params)};
+
+export const getByCountryCode = params => { return http.post(`${baseUrl}/getByCountryCode`,params)};
+
+export const getAirportCode = params =>{return http.get(`/nmms-server-import/nmms/mt1201/selectList`,params)}
+
+export const getCustomCode = params =>{return http.get(`/nmms-server-import/nmms/mt1201/selectCustomcode`,params)}
--- a/src/api/department.js
查看文件 @5eaec74
+++ b/src/api/department.js
查看文件 @5eaec74
 import axios from 'axios'
-let base = '/hqpt-user-center/department';
+let base = '/cloud-user-center/department';
 export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
--- a/src/api/el-ext/eltree.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/el-ext/eltree.js 0 → 100644
查看文件 @5eaec74
+
--- a/src/api/exitArrive.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/exitArrive.js 0 → 100644
查看文件 @5eaec74
+import http from './http.js'
+
+let baseUrl = 'nmms-server-export/nmms/mt3201'
+
+export const getMt3201ListForParam = params => {
+    return http.get(`${baseUrl}/getMt3201ListForParam`, params);
+};
+export const deleteByIsDelete = params => { return http.del(`${baseUrl}/deleteByIsDelete`,params)};
+
+export const updateStatus = params => { return http.put(`${baseUrl}/updateStatus`,  params)};
+
+export const updateMT3201 = params => { return http.put(`${baseUrl}/updateMt3201`,params)};
+
+export const addMt3201 = params => { return http.post(`${baseUrl}/addMt3201`,params)};
+
+export const sendCreateMt3201 = params => { return http.post(`${baseUrl}/sendCreateMt3201`,params)};
+
+export const sendRemoveMt3201 = params => { return http.post(`${baseUrl}/sendRemoveMt3201`,params)};
--- a/src/api/exitFlight.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/exitFlight.js 0 → 100644
查看文件 @5eaec74
+import http from './http.js'
+
+let baseUrl = 'nmms-server-export/nmms/flight'
+
+export const getFlightListForParam = params => {
+    return http.get(`${baseUrl}/getFlight`, params);
+};
--- a/src/api/exitLoading.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/exitLoading.js 0 → 100644
查看文件 @5eaec74
+import http from './http.js'
+
+let baseUrl = 'nmms-server-export/nmms/mt4201'
+
+export const getMt4201ListForParam = params => {
+    return http.get(`${baseUrl}/getMt4201ListForParam`, params);
+};
+export const deleteByIsDelete = params => { return http.del(`${baseUrl}/deleteByIsDelete`,params)};
+
+export const updateStatus = params => { return http.put(`${baseUrl}/updateStatus`,  params)};
+
+export const updateMT4201 = params => { return http.put(`${baseUrl}/updateMt4201`,params)};
+
+export const addMt4201 = params => { return http.post(`${baseUrl}/addMt4201`,params)};
+
+
+export const sendCreateMt4201 = params => { return http.post(`${baseUrl}/sendCreateMt4201`,params)};
+
+export const sendDeleteMt4201 = params => { return http.post(`${baseUrl}/sendDeleteMt4201`,params)};
+
+
+
--- a/src/api/exitManifest.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/exitManifest.js 0 → 100644
查看文件 @5eaec74
+import http from './http.js'
+
+let baseUrl = 'nmms-server-export/nmms/manifest'
+
+export const getManifests = params => {
+    return http.get(`${baseUrl}/getManifests`, params);
+};
--- a/src/api/exitPre.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/exitPre.js 0 → 100644
查看文件 @5eaec74
+import http from './http.js'
+
+let baseUrl = 'nmms-server-export/nmms/mt2201'
+
+export const getMt2201ListForParam = params => { return http.get(`${baseUrl}/getMt2201ListForParam`,  params)};
+
+export const deleteByIsDelete = params => { return http.del(`${baseUrl}/deleteByIsDelete`,params)};
+
+export const updateStatus = params => { return http.put(`${baseUrl}/updateStatus`, params) };
+
+export const updateMT2201 = params => { return http.put(`${baseUrl}/updateMt2201`,params)};
+
+export const addMt2201 = params => { return http.post(`${baseUrl}/addMt2201`,params)};
+
+export const getLostLoadChange = params => { return http.get(`${baseUrl}/getLostLoadChange`,  params)};
+
+export const saveLostChange = params => { return http.get(`${baseUrl}/saveLostChange`,  params)};
+
+export const saveLostLoad = params => { return http.put(`${baseUrl}/saveLostLoad`,params)};
+
+export const sendDeleteMt2201 = params =>{return http.post(`${baseUrl}/sendDeleteMt2201`,params)}
+
+export const sendUpdateMt2201 = params =>{return http.post(`${baseUrl}/sendUpdateMt2201`,params)}
+
+export const sendCreateMt2201 = params =>{return http.post(`${baseUrl}/sendCreateMt2201`,params)}
+
+export const uploadFileExcel = params =>{return http.post(`${baseUrl}/uploadFileExcel`,params)}
+
+
--- a/src/api/exitTidy.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/exitTidy.js 0 → 100644
查看文件 @5eaec74
+import http from './http.js'
+
+let baseUrl = 'nmms-server-export/nmms/mt520x'
+
+export const getMt520XListForParam = params => {
+    return http.get(`${baseUrl}/getMt520xListForParam`, params);
+};
+export const deleteByIsDelete = params => { return http.del(`${baseUrl}/deleteByIsDelete`,params)};
+
+export const updateStatus = params => { return http.put(`${baseUrl}/updateStatus`,  params)};
+
+export const updateMt520X = params => { return http.put(`${baseUrl}/updateMt520x`,params)};
+
+export const addMt520X = params => { return http.post(`${baseUrl}/addMt520x`,params)};
+
+export const sendCreateMt5202 = params => { return http.post(`${baseUrl}/sendCreateMt5202`,params)};
+
+export const sendRemoveMt5202 = params => { return http.post(`${baseUrl}/sendRemoveMt5202`,params)};
--- a/src/api/group_company.js
查看文件 @5eaec74
+++ b/src/api/group_company.js
查看文件 @5eaec74
 import axios from 'axios'
-let base = '/hqpt-user-center/group';
+let base = '/cloud-user-center/group';
 export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
--- a/src/api/htmlToPdf.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/htmlToPdf.js 0 → 100644
查看文件 @5eaec74
+//不使用JQuery版的
+
+import html2canvas from 'html2canvas';
+import JsPDF from 'jspdf';
+
+/**
+ * @param  ele          要生成 pdf 的DOM元素（容器）
+ * @param  padfName     PDF文件生成后的文件名字
+ * */
+
+function downloadPDF(ele, pdfName){
+
+    let eleW = ele.offsetWidth;// 获得该容器的宽
+    let eleH = ele.offsetHeight;// 获得该容器的高
+
+
+    let eleOffsetTop = ele.offsetTop;  // 获得该容器到文档顶部的距离
+    let eleOffsetLeft = ele.offsetLeft; // 获得该容器到文档最左的距离
+
+    var canvas = document.createElement("canvas");
+    var abs = 0;
+
+    let win_in = document.documentElement.clientWidth || document.body.clientWidth; // 获得当前可视窗口的宽度（不包含滚动条）
+    let win_out = window.innerWidth; // 获得当前窗口的宽度（包含滚动条）
+
+    if(win_out>win_in){
+        // abs = (win_o - win_i)/2;    // 获得滚动条长度的一半
+        abs = (win_out - win_in)/2;    // 获得滚动条宽度的一半
+        // console.log(a, '新abs');
+    }
+
+    canvas.width = eleW * 2;    // 将画布宽&&高放大两倍
+    canvas.height = eleH * 2;
+
+
+
+
+    var context = canvas.getContext("2d");
+
+    context.scale(2, 2);
+
+    context.translate(-eleOffsetLeft -abs, -eleOffsetTop);
+    // 这里默认横向没有滚动条的情况，因为offset.left(),有无滚动条的时候存在差值，因此
+    // translate的时候，要把这个差值去掉
+
+    // html2canvas(element).then( (canvas)=>{ //报错
+    // html2canvas(element[0]).then( (canvas)=>{
+    html2canvas( ele, {
+        dpi: 300,
+        // allowTaint: true,  //允许 canvas 污染， allowTaint参数要去掉，否则是无法通过toDataURL导出canvas数据的
+        useCORS:true  //允许canvas画布内 可以跨域请求外部链接图片, 允许跨域请求。
+    } ).then( (canvas)=>{
+
+        var contentWidth = canvas.width;
+        var contentHeight = canvas.height;
+        //一页pdf显示html页面生成的canvas高度;
+        var pageHeight = contentWidth / 592.28 * 841.89;
+        //未生成pdf的html页面高度
+        var leftHeight = contentHeight;
+        //页面偏移
+        var position = 0;
+        //a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的宽高
+        var imgWidth = 595.28;
+        var imgHeight = 595.28/contentWidth * contentHeight;
+
+        var pageData = canvas.toDataURL('image/jpeg', 1.0);
+
+
+
+        var pdf = new JsPDF('', 'pt', 'a4');
+
+        //有两个高度需要区分，一个是html页面的实际高度，和生成pdf的页面高度(841.89)
+        //当内容未超过pdf一页显示的范围，无需分页
+        if (leftHeight < pageHeight) {
+            //在pdf.addImage(pageData, 'JPEG', 左，上，宽度，高度)设置在pdf中显示；
+            pdf.addImage(pageData, 'JPEG', 0, 0, imgWidth, imgHeight);
+            // pdf.addImage(pageData, 'JPEG', 20, 40, imgWidth, imgHeight);
+        } else {    // 分页
+            while(leftHeight > 0) {
+                pdf.addImage(pageData, 'JPEG', 0, position, imgWidth, imgHeight);
+                leftHeight -= pageHeight;
+                position -= 841.89;
+                //避免添加空白页
+                if(leftHeight > 0) {
+                    pdf.addPage();
+                }
+            }
+        }
+
+        //可动态生成
+        pdf.save(pdfName);
+    })
+
+
+}
+
+
+export default {
+    downloadPDF
+}
--- a/src/api/http.js 100755 → 100644
查看文件 @5eaec74
+++ b/src/api/http.js 100755 → 100644
查看文件 @5eaec74
@@ -46,7 +46,7 @@ export default {
     login: data =>{
         return axios({
             method: 'POST', // 请求协议
-            url: 'hqpt-user-center/login', // 请求的地址
+            url: 'cloud-user-center/login', // 请求的地址
             data: qs.stringify(data), // post 请求的数据
             timeout: 30000, // 超时时间, 单位毫秒
             headers: {
--- a/src/api/log_api.js 100755 → 100644
查看文件 @5eaec74
+++ b/src/api/log_api.js 100755 → 100644
查看文件 @5eaec74
 import axios from 'axios'
-let base = '/hqpt-user-center/system/log';
+let base = '/cloud-user-center/system/log';
 export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
--- a/src/api/mt1201.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/mt1201.js 0 → 100644
查看文件 @5eaec74
+import http from './http.js'
+let baseUrl = 'nmms-server-import/nmms/mt1201'
+
+export const selectFlightLists = params => { return http.get(`${baseUrl}/selectFlightLists`,  params); };
+export const getMt1201List=params=>{return http.get(`${baseUrl}/getMt1201List`,  params);};
+export const getFenList=params=>{return http.get(`${baseUrl}/getFenList`,  params);};
+export const addMt1201=params=>{return http.post(`${baseUrl}/addMt1201`,  params);};
+export const ediMt1201=params=>{return http.put(`${baseUrl}/ediMt1201`,  params);};
+export const selectAirport=params=>{return http.get(`${baseUrl}/selectList`,  params);};
+export const getCountryCode=params=>{return http.get(`${baseUrl}/getCountryCode`,  params);};
+export const selectCustomcode=params=>{return http.get(`${baseUrl}/selectCustomcode`,  params);};
+
+export const sendCreateMt1201=params=>{return http.post(`${baseUrl}/sendCreateMt1201`,  params);};
+export const sendEditeMt1201=params=>{return http.post(`${baseUrl}/sendEditeMt1201`,  params);};
+export const sendRemoveMt1201=params=>{return http.post(`${baseUrl}/sendRemoveMt1201`,  params);};
--- a/src/api/mt5201.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/mt5201.js 0 → 100644
查看文件 @5eaec74
+import http from './http.js'
+let baseUrl = 'nmms-server-import/nmms/mt5201'
+let baseUrl2='nmms-server-import/nmms/mt1201'
+
+export const getMt5201List=params=>{return http.get(`${baseUrl}/getMt5201List`,  params);};
+export const addMt5201=params=>{return http.post(`${baseUrl}/addMt5201`,  params);};
+export const ediMt5201=params=>{return http.put(`${baseUrl}/ediMt5201`,  params);};
+export const delMt5201 = params => { return http.del(`${baseUrl}/delMt5201`,params)};
+
+export const sendCreateMt520x=params=>{return http.post(`${baseUrl}/sendCreateMt520x`,  params);};
+export const sendRemoveMt520x=params=>{return http.post(`${baseUrl}/sendRemoveMt520x`,  params);};
+export const selectCustomcode=params=>{return http.get(`${baseUrl2}/selectCustomcode`,  params);};
+
+
--- a/src/api/orgManifest.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/orgManifest.js 0 → 100644
查看文件 @5eaec74
+import http from './http.js'
+let baseUrl = 'nmms-server-export/nmms/mt1201'
+
+export const getMt1201ListForParam = params => { return http.get(`${baseUrl}/getMt1201ListForParam`,  params); };
+
+export const deleteByIsDelete = params => { return http.del(`${baseUrl}/deleteByIsDelete`,params)};
+
+export const updateStatus = params => { return http.put(`${baseUrl}/updateStatus`, { params: params }); };
+
+export const updateMT1201 = params => { return http.put(`${baseUrl}/updateMT1201`,params)};
+
+export const addMt1201 = params => { return http.post(`${baseUrl}/addMt1201`,params)};
+
+
--- a/src/api/perm_api.js
查看文件 @5eaec74
+++ b/src/api/perm_api.js
查看文件 @5eaec74
 import axios from 'axios'
-let base = '/hqpt-user-center/perm';
+let base = '/cloud-user-center/perm';
 export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
--- a/src/api/remote-search.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/remote-search.js 0 → 100644
查看文件 @5eaec74
+import request from '@/utils/request'
+
+export function searchUser(name) {
+  return request({
+    url: '/vue-element-admin/search/user',
+    method: 'get',
+    params: { name }
+  })
+}
+
+export function transactionList(query) {
+  return request({
+    url: '/vue-element-admin/transaction/list',
+    method: 'get',
+    params: query
+  })
+}
--- a/src/api/responseDetail.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/responseDetail.js 0 → 100644
查看文件 @5eaec74
+import http from './http.js'
+
+let baseUrl = 'nmms-server-export/nmms/rep'
+
+export const getResponseForParam = params => {
+    return http.get(`${baseUrl}/getResponseForParam`, params);
+};
--- a/src/api/role_api.js
查看文件 @5eaec74
+++ b/src/api/role_api.js
查看文件 @5eaec74
 import axios from 'axios'
-let base = '/hqpt-user-center/role';
+let base = '/cloud-user-center/role';
 export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
--- a/src/api/user.js 100755 → 100644
查看文件 @5eaec74
+++ b/src/api/user.js 100755 → 100644
查看文件 @5eaec74
 import http from './http.js'
-let baseUrl = '/hqpt-user-center/user'
-
+let baseUrl = '/cloud-user-center/user'
 export const getUserList = params => { return http.get(`${baseUrl}/list`,  params); };
 export const getUserListPage = params => { return http.get(`/user/list`,params) };
-export const removeUser = params => { return http.del(`/user/del`,params)};
+export const removeUser = params => { return http.del(`${baseUrl}/del`,params)};
+
+export const batchRemoveUser = params => { return http.del(`${baseUrl}/batchremove`, { params: params }); };
-export const batchRemoveUser = params => { return http.del(`/user/batchremove`, { params: params }); };
+export const editPass = params => { return http.put(`${baseUrl}/password`,params)};
-export const editUser = params => { return http.put(`/user/edit`,params)};
+export const editUser = params => { return http.put(`${baseUrl}/edit`,params)};
-export const addUser = params => { return http.post(`/user/add`,params)};
+export const addUser = params => { return http.post(`${baseUrl}/add`,params)};
-export const setUserRole = params => { return http.put(`/user/roleset`,params)};
+export const setUserRole = params => { return http.put(`${baseUrl}/roleset`,params)};
--- a/src/api/wayDeclaration.js 0 → 100644
查看文件 @5eaec74
+++ b/src/api/wayDeclaration.js 0 → 100644
查看文件 @5eaec74
+import http from './http.js'
+let baseUrl = 'nmms-server-import/nmms/wayDeclaration'
+export const QueryData=params=>{return http.get(`${baseUrl}/Query`,  params);};
--- a/src/common/js/util.js
查看文件 @5eaec74
+++ b/src/common/js/util.js
查看文件 @5eaec74
 var SIGN_REGEXP = /([yMdhsm])(\1*)/g;
 var DEFAULT_PATTERN = 'yyyy-MM-dd';
+/**
+ *  根据数组 元素的“值” 来删除或者获取数据
+ *  使用方法arrList.splice(arrList.contains('c'),1)
+ */
+Array.prototype.contains = function(obj) {
+    var i = this.length;
+    while (i--) {
+        if (this[i] === obj) {
+            return i; // 返回的这个 i 就是元素的索引下标，
+        }
+    }
+    return false;
+}
 function padding(s, len) {
-    var len = len - (s + '').length;
+    len = len - (s + '').length;
     for (var i = 0; i < len; i++) { s = '0' + s; }
     return s;
-};
+}
 export default {
     getQueryStringByName: function (name) {
--- a/src/components/GithubCorner/index.vue 0 → 100644
查看文件 @5eaec74
+++ b/src/components/GithubCorner/index.vue 0 → 100644
查看文件 @5eaec74
+<template>
+<!--  href="https://github.com/PanJiaChen/vue-element-admin"-->
+  <a  target="_blank" class="github-corner" aria-label="View source on Github">
+    <svg
+      width="80"
+      height="80"
+      viewBox="0 0 250 250"
+      style="fill:#40c9c6; color:#fff;"
+      aria-hidden="true"
+    >
+      <path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z" />
+      <path
+        d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2"
+        fill="currentColor"
+        style="transform-origin: 130px 106px;"
+        class="octo-arm"
+      />
+      <path
+        d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z"
+        fill="currentColor"
+        class="octo-body"
+      />
+    </svg>
+  </a>
+</template>
+
+<style scoped>
+.github-corner:hover .octo-arm {
+  animation: octocat-wave 560ms ease-in-out
+}
+
+@keyframes octocat-wave {
+  0%,
+  100% {
+    transform: rotate(0)
+  }
+  20%,
+  60% {
+    transform: rotate(-25deg)
+  }
+  40%,
+  80% {
+    transform: rotate(10deg)
+  }
+}
+
+@media (max-width:500px) {
+  .github-corner:hover .octo-arm {
+    animation: none
+  }
+  .github-corner .octo-arm {
+    animation: octocat-wave 560ms ease-in-out
+  }
+}
+</style>
--- a/src/components/Pagination/index.vue
查看文件 @5eaec74
+++ b/src/components/Pagination/index.vue
查看文件 @5eaec74
@@ -29,12 +29,12 @@ export default {
     },
     limit: {
       type: Number,
-      default: 20
+      default: 100
     },
     pageSizes: {
       type: Array,
       default() {
-        return [10, 20, 30, 50]
+        return [10, 20, 30, 50, 100]
       }
     },
     layout: {
@@ -92,7 +92,7 @@ export default {
 <style scoped>
 .pagination-container {
   background: #fff;
-  padding: 32px 16px;
+  /*padding: 32px 16px;*/
 }
 .pagination-container.hidden {
   display: none;
--- a/src/components/PanThumb/index.vue 0 → 100644
查看文件 @5eaec74
+++ b/src/components/PanThumb/index.vue 0 → 100644
查看文件 @5eaec74
+<template>
+  <div :style="{zIndex:zIndex,height:height,width:width}" class="pan-item">
+    <div class="pan-info">
+      <div class="pan-info-roles-container">
+        <slot />
+      </div>
+    </div>
+    <!-- eslint-disable-next-line -->
+    <div :style="{backgroundImage: `url(${image})`}" class="pan-thumb"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PanThumb',
+  props: {
+    image: {
+      type: String,
+      required: true
+    },
+    zIndex: {
+      type: Number,
+      default: 1
+    },
+    width: {
+      type: String,
+      default: '150px'
+    },
+    height: {
+      type: String,
+      default: '150px'
+    }
+  }
+}
+</script>
+
+<style scoped>
+.pan-item {
+  width: 200px;
+  height: 200px;
+  border-radius: 50%;
+  display: inline-block;
+  position: relative;
+  cursor: default;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+}
+
+.pan-info-roles-container {
+  padding: 20px;
+  text-align: center;
+}
+
+.pan-thumb {
+  width: 100%;
+  height: 100%;
+  background-position: center center;
+  background-size: cover;
+  border-radius: 50%;
+  overflow: hidden;
+  position: absolute;
+  transform-origin: 95% 40%;
+  transition: all 0.3s ease-in-out;
+}
+
+/* .pan-thumb:after {
+  content: '';
+  width: 8px;
+  height: 8px;
+  position: absolute;
+  border-radius: 50%;
+  top: 40%;
+  left: 95%;
+  margin: -4px 0 0 -4px;
+  background: radial-gradient(ellipse at center, rgba(14, 14, 14, 1) 0%, rgba(125, 126, 125, 1) 100%);
+  box-shadow: 0 0 1px rgba(255, 255, 255, 0.9);
+} */
+
+.pan-info {
+  position: absolute;
+  width: inherit;
+  height: inherit;
+  border-radius: 50%;
+  overflow: hidden;
+  box-shadow: inset 0 0 0 5px rgba(0, 0, 0, 0.05);
+}
+
+.pan-info h3 {
+  color: #fff;
+  text-transform: uppercase;
+  position: relative;
+  letter-spacing: 2px;
+  font-size: 18px;
+  margin: 0 60px;
+  padding: 22px 0 0 0;
+  height: 85px;
+  font-family: 'Open Sans', Arial, sans-serif;
+  text-shadow: 0 0 1px #fff, 0 1px 2px rgba(0, 0, 0, 0.3);
+}
+
+.pan-info p {
+  color: #fff;
+  padding: 10px 5px;
+  font-style: italic;
+  margin: 0 30px;
+  font-size: 12px;
+  border-top: 1px solid rgba(255, 255, 255, 0.5);
+}
+
+.pan-info p a {
+  display: block;
+  color: #333;
+  width: 80px;
+  height: 80px;
+  background: rgba(255, 255, 255, 0.3);
+  border-radius: 50%;
+  color: #fff;
+  font-style: normal;
+  font-weight: 700;
+  text-transform: uppercase;
+  font-size: 9px;
+  letter-spacing: 1px;
+  padding-top: 24px;
+  margin: 7px auto 0;
+  font-family: 'Open Sans', Arial, sans-serif;
+  opacity: 0;
+  transition: transform 0.3s ease-in-out 0.2s, opacity 0.3s ease-in-out 0.2s, background 0.2s linear 0s;
+  transform: translateX(60px) rotate(90deg);
+}
+
+.pan-info p a:hover {
+  background: rgba(255, 255, 255, 0.5);
+}
+
+.pan-item:hover .pan-thumb {
+  transform: rotate(-110deg);
+}
+
+.pan-item:hover .pan-info p a {
+  opacity: 1;
+  transform: translateX(0px) rotate(0deg);
+}
+</style>
--- a/src/components/TextHoverEffect/Mallki.vue 0 → 100644
查看文件 @5eaec74
+++ b/src/components/TextHoverEffect/Mallki.vue 0 → 100644
查看文件 @5eaec74
+<template>
+  <a :class="className" class="link--mallki" href="#">
+    {{ text }}
+    <span :data-letters="text" />
+    <span :data-letters="text" />
+  </a>
+</template>
+
+<script>
+export default {
+  props: {
+    className: {
+      type: String,
+      default: ''
+    },
+    text: {
+      type: String,
+      default: 'vue-element-admin'
+    }
+  }
+}
+</script>
+
+<style>
+/* Mallki */
+
+.link--mallki {
+  font-weight: 800;
+  color: #4dd9d5;
+  font-family: 'Dosis', sans-serif;
+  -webkit-transition: color 0.5s 0.25s;
+  transition: color 0.5s 0.25s;
+  overflow: hidden;
+  position: relative;
+  display: inline-block;
+  line-height: 1;
+  outline: none;
+  text-decoration: none;
+}
+
+.link--mallki:hover {
+  -webkit-transition: none;
+  transition: none;
+  color: transparent;
+}
+
+.link--mallki::before {
+  content: '';
+  width: 100%;
+  height: 6px;
+  margin: -3px 0 0 0;
+  background: #3888fa;
+  position: absolute;
+  left: 0;
+  top: 50%;
+  -webkit-transform: translate3d(-100%, 0, 0);
+  transform: translate3d(-100%, 0, 0);
+  -webkit-transition: -webkit-transform 0.4s;
+  transition: transform 0.4s;
+  -webkit-transition-timing-function: cubic-bezier(0.7, 0, 0.3, 1);
+  transition-timing-function: cubic-bezier(0.7, 0, 0.3, 1);
+}
+
+.link--mallki:hover::before {
+  -webkit-transform: translate3d(100%, 0, 0);
+  transform: translate3d(100%, 0, 0);
+}
+
+.link--mallki span {
+  position: absolute;
+  height: 50%;
+  width: 100%;
+  left: 0;
+  top: 0;
+  overflow: hidden;
+}
+
+.link--mallki span::before {
+  content: attr(data-letters);
+  color: red;
+  position: absolute;
+  left: 0;
+  width: 100%;
+  color: #3888fa;
+  -webkit-transition: -webkit-transform 0.5s;
+  transition: transform 0.5s;
+}
+
+.link--mallki span:nth-child(2) {
+  top: 50%;
+}
+
+.link--mallki span:first-child::before {
+  top: 0;
+  -webkit-transform: translate3d(0, 100%, 0);
+  transform: translate3d(0, 100%, 0);
+}
+
+.link--mallki span:nth-child(2)::before {
+  bottom: 0;
+  -webkit-transform: translate3d(0, -100%, 0);
+  transform: translate3d(0, -100%, 0);
+}
+
+.link--mallki:hover span::before {
+  -webkit-transition-delay: 0.3s;
+  transition-delay: 0.3s;
+  -webkit-transform: translate3d(0, 0, 0);
+  transform: translate3d(0, 0, 0);
+  -webkit-transition-timing-function: cubic-bezier(0.2, 1, 0.3, 1);
+  transition-timing-function: cubic-bezier(0.2, 1, 0.3, 1);
+}
+</style>
--- a/src/components/TreeTable/index.vue
查看文件 @5eaec74
+++ b/src/components/TreeTable/index.vue
查看文件 @5eaec74
 <template>
   <el-table :data="formatData" :row-style="showRow" v-bind="$attrs">
-    <el-table-column type="selection" width="30" align="center"/>
-    <el-table-column v-if="columns.length===0" width="30" align="center">
+    <el-table-column type="selection" width="50" align="center"></el-table-column>
+    <el-table-column v-if="columns.length===0" width="55" align="center">
       <template slot-scope="scope">
         <span v-for="space in scope.row._level" :key="space" class="ms-tree-space"/>
         <span v-if="iconShow(0,scope.row)" class="tree-ctrl" @click="toggleExpanded(scope.$index)">
           <i v-if="!scope.row._expanded" class="el-icon-plus"/>
           <i v-else class="el-icon-minus"/>
         </span>
-        <!--{{ scope.$index }}-->
       </template>
     </el-table-column>
     <el-table-column v-for="(column, index) in columns" v-else :key="column.value" :label="column.text" :width="column.width">
@@ -20,7 +19,6 @@
           <i v-if="!scope.row._expanded" class="el-icon-plus"/>
           <i v-else class="el-icon-minus"/>
         </span>
-        {{ scope.row[column.value] }}
       </template>
     </el-table-column>
     <slot/>
@@ -49,7 +47,7 @@ export default {
     evalArgs: Array,
     expandAll: {
       type: Boolean,
-      default: true
+      default: false
     }
   },
   computed: {
@@ -68,11 +66,8 @@ export default {
   },
   methods: {
     showRow: function(row) {
-        this.data
-        const show = (row.parent ? (row.parent._expanded && row.parent._show) : true)
-//      const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true)
-//      row.row._show = show
-      row._show = show
+      const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true)
+      row.row._show = show
       return show ? 'animation:treeTableShow 1s;-webkit-animation:treeTableShow 1s;' : 'display:none;'
     },
     // 切换下级是否展开
--- a/src/main.js
查看文件 @5eaec74
+++ b/src/main.js
查看文件 @5eaec74
 import Vue from 'vue'
 import App from './App'
+import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 //import './assets/theme/theme-green/index.css'
 import VueRouter from 'vue-router'
@@ -11,9 +12,10 @@ import rout from './routes'
 import Mock from './mock'
 import i18n from './lang'
 import 'font-awesome/css/font-awesome.min.css'
-import ElementUI from 'element-ui'
 import * as socketApi from './api/socket'
+import '@/styles/index.scss'
+
 //定义一个全局过滤器实现日期格式化
 Vue.filter('datefmt',function(input,fmtstring){
@@ -33,8 +35,8 @@ Vue.use(Vuex)
 Vue.prototype.$axios = axios;
 //NProgress.configure({ showSpinner: false });
-console.log("mainjs:");
-console.log(rout.routes);
+// console.log("mainjs:");
+// console.log(rout.routes);
 const router = new VueRouter({
     routes:rout.routes
 });
@@ -61,7 +63,7 @@ router.beforeEach((to, from, next) => {
   }
 });
-var message = Vue.prototype.$message;
+const message = Vue.prototype.$message;
 axios.defaults.baseURL = '/api';
 axios.interceptors.response.use(
     res => {
@@ -89,12 +91,9 @@ axios.interceptors.response.use(
             // 下面是接口回调的satus ,因为我做了一些错误页面,所以都会指向对应的报错页面
             if (error.response.status === 401) {
-                router.push({
-                    path: "/login"
-                });
                 message({
                     //  饿了么的消息弹窗组件
-                    message: '授权超时，或未授权，请重新登录',
+                    message: '授权超时，或访问未授权，请重新登录',
                     type: "error"
                 });
             }
@@ -106,9 +105,14 @@ axios.interceptors.response.use(
                 });
             }
             if (error.response.status === 500) {
-                router.push({
-                    path: "/error/500"
+                message({
+                    //  饿了么的消息弹窗组件
+                    message: error.message,
+                    type: "error"
                 });
+                // router.push({
+                //     path: "/error/500"
+                // });
             }
             if (error.response.status === 502) {
                 router.push({
@@ -116,13 +120,15 @@ axios.interceptors.response.use(
                 });
             }
             if (error.response.status === 404) {
-                router.push({
-                    path: "/error/404"
+                message({
+                    //  饿了么的消息弹窗组件
+                    message: error.message,
+                    type: "error"
                 });
             }
         }
         // 返回 response 里的错误信息
-        let errorInfo =  error.data.error ? error.data.error.message : error.data;
+        let errorInfo =  error.response ? error.response.statusText : (error.data.error ? error.data.error.message : error.message);
         return Promise.reject(errorInfo);
     }
 );
--- a/src/routes.js
查看文件 @5eaec74
+++ b/src/routes.js
查看文件 @5eaec74
 import Login from './views/Login.vue'
 import NotFound from './views/404.vue'
 import Home from './views/Home.vue'
-import Main from './views/Main.vue'
+import Main from './views/dashboard/index'
 // import Table from './views/nav1/Table.vue'
 import Role from './views/nav1/role.vue'
 import Perm from './views/nav1/perm.vue'
@@ -14,6 +14,27 @@ import Process from './views/hqpt/Process.vue'
 import Job from './views/hqpt/Job.vue'
 // import Form from './views/nav1/Form.vue'
+
+import OrgManifest from './views/nmms/orgManifest.vue'
+import ExitFlight from './views/nmms/ExitFlight.vue'
+import ExitPre from './views/nmms/ExitPre.vue'
+import ExitTidy from './views/nmms/ExitTidy.vue'
+import ExitArrive from './views/nmms/ExitArrive.vue'
+import ExitManifest from './views/nmms/ExitManifest.vue'
+import ExitLoading from './views/nmms/ExitLoading.vue'
+import ExitFlightDesc from './views/nmms/ExitFlightDesc.vue'
+import LostLoad from './views/lostLoadChange/lostLoading.vue'
+import LostLoadChange from './views/lostLoadChange/lostLoadChange.vue'
+
+import OrigFlightList from './views/nmms_import/OrigFlightList.vue'
+import EnterFlightInfo from './views/nmms_import/EnterFlightInfo.vue'
+import OrigMaster from './views/nmms_import/OrigMaster.vue'
+import EnterTally from './views/nmms_import/EnterFlightTally.vue'
+import TallyMster from './views/nmms_import/TallyMster.vue'
+import Waybill from './views/nmms_import/Waybill.vue'
+import AllocateSearch from './views/nmms_import/AllocateSearch.vue'
+import Importallocation from './views/nmms_import/Importallocation.vue'
+import Allocatearrive from './views/nmms_import/Allocatearrive.vue'
 import User from './views/nav1/user.vue'
 import Page4 from './views/nav2/Page4.vue'
 import Page5 from './views/nav2/Page5.vue'
@@ -47,7 +68,7 @@ let routes = [
         leaf: true,
         iconCls: 'el-icon-menu',
         children: [
-            { path: '/main', component: Main, name: '首页'},
+            {path: '/main', component: Main, name: '首页'},
         ]
     },
     // { path: '/test', component: Main },
@@ -58,7 +79,7 @@ let routes = [
         iconCls: 'el-icon-setting',//图标样式class
         children: [
             { path: '/user', component: User, name: '用户管理' },
-            { path: '/role', component: Role, name: '岗位管理' },
+            { path: '/role', component: Role, name: '组织机构' },
             { path: '/perm', component: Perm, name: '权限管理' },
             { path: '/log', component: LOG, name: '系统日志' },
             { path: '/department', component: Department, name: '部门管理' },
@@ -73,7 +94,51 @@ let routes = [
         iconCls: 'fa fa-id-card-o',
         children: [
             { path: '/process', component: Process, name: '工单管理' },
-            { path: '/job', component: Job, name: '任务管理' }
+            { path: '/job', component: Job, name: '任务管理' },
+            {path: '/pre1', component: PreManifest, name: '预配'},
+        ]
+    },
+    {
+        path: '/output',
+        component: Home,
+        name: '出港业务申报',
+        iconCls: 'el-icon-collection',
+        children: [
+            {path: '/flight', component: ExitFlight, name: '出港航班申报'},
+            {path: '/manifest', component: ExitManifest, name: '出港运单申报'},
+            {path: '/pre', component: ExitPre, name: '出港预配舱单'},
+            {path: '/arrive', component: ExitArrive, name: '出港运抵'},
+            {path: '/loadingView', component: ExitFlightDesc, name: '出港航班信息'},
+            {path: '/loading', component: ExitLoading, name: '出港装载'},
+            {path: '/tidy', component: ExitTidy, name: '出港理货'}
+        ]
+    },
+    {
+        path: '/nmms2',
+        component: Home,
+        name: '进港业务申报',
+        iconCls: 'fa fa-id-card-o',
+        children: [
+            { path: '/orig', component: OrigFlightList, name: '进港航班申报' },
+            {path:'/waybill',component:Waybill,name:'进港运单申报'},
+            {path:'/allocateSearch',component:AllocateSearch,name:'运单分拨申报'},
+            { path: '/enter', component: EnterFlightInfo, name: '原始舱单'},
+            { path:'/origmaster',component:OrigMaster,name:'进港原始舱单'},
+            {path:'/entertall',component:EnterTally,name:'进港理货'},
+            {path:'/tallymaster',component:TallyMster,name:'进港理货舱单'},
+            {path:'/importallocation',component:Importallocation,name:'进港分拨'},
+            {path:'/allocatearrive',component:Allocatearrive,name:'分拨运抵'},
+        ]
+    },
+    {
+        path: '/lost',
+        component: Home,
+        name: '落装改配申报',
+        iconCls:'el-icon-goods',
+        children:[
+            {path:'/lostLoad',component:LostLoad,name:'落装业务申报'},
+            {path:'/lostLoadChange',component:LostLoadChange,name:'改配业务申报'}
+
         ]
     },
     {
@@ -105,7 +170,6 @@ let routes = [
         iconCls: 'fa fa-address-card',
         // leaf: true,//只有一个节点
         children: [
-
             { path: '/water_stations_patrol', component: WaterStationsPatrol, name: '二水厂-水站巡视记录单管理' },
             // { path: '/page6', component: Page6, name: '水质量检测' },
             // { path: '/page6', component: Page6, name: '污水站' },
@@ -119,13 +183,13 @@ let routes = [
         name: 'Charts',
         iconCls: 'fa fa-bar-chart',
         children: [
-            { path: '/echarts', component: echarts, name: 'echarts' }
+            {path: '/echarts', component: echarts, name: 'echarts'}
         ]
     },
     {
         path: '*',
         hidden: true,
-        redirect: { path: '/404' }
+        redirect: {path: '/404'}
     }
 ];
 let initRouters = routes.concat();
@@ -136,7 +200,7 @@ let setUserMenus = function (list) {
  * 处理登陆后的账号对应的菜单
  * @param menuList
  */
-let handleMenuList = function (router,menu) {
+let handleMenuList = function (router, menu) {
     var _self = this;
     var routerName = "";
     router.forEach(function (v_router) {
@@ -149,16 +213,16 @@ let handleMenuList = function (router,menu) {
             //匹配到继续判断是否子元素,有子元素继续递归
             if (result) {
-                if(v_router.children) {
-                    _self.handleMenuList(v_router.children,result.children);
+                if (v_router.children) {
+                    _self.handleMenuList(v_router.children, result.children);
                 }
                 //没有则可以移除
-            }else {
-                router.splice(router.findIndex(itm => itm.name === routerName ),1);
+            } else {
+                router.splice(router.findIndex(itm => itm.name === routerName), 1);
             }
         })
     });
 }
 export default {
-    routes,setUserMenus,handleMenuList,initRouters
+    routes, setUserMenus, handleMenuList, initRouters
 };
--- a/src/styles/btn.scss 0 → 100644
查看文件 @5eaec74
+++ b/src/styles/btn.scss 0 → 100644
查看文件 @5eaec74
+@import './variables.scss';
+
+@mixin colorBtn($color) {
+  background: $color;
+
+  &:hover {
+    color: $color;
+
+    &:before,
+    &:after {
+      background: $color;
+    }
+  }
+}
+
+.blue-btn {
+  @include colorBtn($blue)
+}
+
+.light-blue-btn {
+  @include colorBtn($light-blue)
+}
+
+.red-btn {
+  @include colorBtn($red)
+}
+
+.pink-btn {
+  @include colorBtn($pink)
+}
+
+.green-btn {
+  @include colorBtn($green)
+}
+
+.tiffany-btn {
+  @include colorBtn($tiffany)
+}
+
+.yellow-btn {
+  @include colorBtn($yellow)
+}
+
+.pan-btn {
+  font-size: 14px;
+  color: #fff;
+  padding: 14px 36px;
+  border-radius: 8px;
+  border: none;
+  outline: none;
+  transition: 600ms ease all;
+  position: relative;
+  display: inline-block;
+
+  &:hover {
+    background: #fff;
+
+    &:before,
+    &:after {
+      width: 100%;
+      transition: 600ms ease all;
+    }
+  }
+
+  &:before,
+  &:after {
+    content: '';
+    position: absolute;
+    top: 0;
+    right: 0;
+    height: 2px;
+    width: 0;
+    transition: 400ms ease all;
+  }
+
+  &::after {
+    right: inherit;
+    top: inherit;
+    left: 0;
+    bottom: 0;
+  }
+}
+
+.custom-button {
+  display: inline-block;
+  line-height: 1;
+  white-space: nowrap;
+  cursor: pointer;
+  background: #fff;
+  color: #fff;
+  -webkit-appearance: none;
+  text-align: center;
+  box-sizing: border-box;
+  outline: 0;
+  margin: 0;
+  padding: 10px 15px;
+  font-size: 14px;
+  border-radius: 4px;
+}
--- a/src/styles/element-ui.scss 0 → 100644
查看文件 @5eaec74
+++ b/src/styles/element-ui.scss 0 → 100644
查看文件 @5eaec74
+//覆盖一些element-ui样式
+
+.el-breadcrumb__inner,
+.el-breadcrumb__inner a {
+  font-weight: 400 !important;
+}
+
+.el-upload {
+  input[type="file"] {
+    display: none !important;
+  }
+}
+
+.el-upload__input {
+  display: none;
+}
+
+.cell {
+  .el-tag {
+    margin-right: 0px;
+  }
+}
+
+.small-padding {
+  .cell {
+    padding-left: 5px;
+    padding-right: 5px;
+  }
+}
+
+.fixed-width {
+  .el-button--mini {
+    padding: 7px 10px;
+    width: 60px;
+  }
+}
+
+.status-col {
+  .cell {
+    padding: 0 10px;
+    text-align: center;
+
+    .el-tag {
+      margin-right: 0px;
+    }
+  }
+}
+
+//暂时性解决dialog 问题 https://github.com/ElemeFE/element/issues/2461
+.el-dialog {
+  transform: none;
+  left: 0;
+  position: relative;
+  margin: 0 auto;
+}
+
+//文章页textarea修改样式
+.article-textarea {
+  textarea {
+    padding-right: 40px;
+    resize: none;
+    border: none;
+    border-radius: 0px;
+    border-bottom: 1px solid #bfcbd9;
+  }
+}
+
+//element ui upload
+.upload-container {
+  .el-upload {
+    width: 100%;
+
+    .el-upload-dragger {
+      width: 100%;
+      height: 200px;
+    }
+  }
+}
+
+//dropdown
+.el-dropdown-menu {
+  a {
+    display: block
+  }
+}
--- a/src/styles/index.scss 0 → 100644
查看文件 @5eaec74
+++ b/src/styles/index.scss 0 → 100644
查看文件 @5eaec74
+@import './variables.scss';
+@import './mixin.scss';
+@import './transition.scss';
+@import './element-ui.scss';
+@import './sidebar.scss';
+@import './btn.scss';
+
+body {
+  height: 100%;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  text-rendering: optimizeLegibility;
+  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+}
+
+label {
+  font-weight: 700;
+}
+
+html {
+  height: 100%;
+  box-sizing: border-box;
+}
+
+#app {
+  height: 100%;
+}
+
+*,
+*:before,
+*:after {
+  box-sizing: inherit;
+}
+
+.no-padding {
+  padding: 0px !important;
+}
+
+.padding-content {
+  padding: 4px 0;
+}
+
+a:focus,
+a:active {
+  outline: none;
+}
+
+a,
+a:focus,
+a:hover {
+  cursor: pointer;
+  color: inherit;
+  text-decoration: none;
+}
+
+div:focus {
+  outline: none;
+}
+
+.fr {
+  float: right;
+}
+
+.fl {
+  float: left;
+}
+
+.pr-5 {
+  padding-right: 5px;
+}
+
+.pl-5 {
+  padding-left: 5px;
+}
+
+.block {
+  display: block;
+}
+
+.pointer {
+  cursor: pointer;
+}
+
+.inlineBlock {
+  display: block;
+}
+
+.clearfix {
+  &:after {
+    visibility: hidden;
+    display: block;
+    font-size: 0;
+    content: " ";
+    clear: both;
+    height: 0;
+  }
+}
+
+code {
+  background: #eef1f6;
+  padding: 15px 16px;
+  margin-bottom: 20px;
+  display: block;
+  line-height: 36px;
+  font-size: 15px;
+  font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif;
+
+  a {
+    color: #337ab7;
+    cursor: pointer;
+
+    &:hover {
+      color: rgb(32, 160, 255);
+    }
+  }
+}
+
+.warn-content {
+  background: rgba(66, 185, 131, .1);
+  border-radius: 2px;
+  padding: 16px;
+  padding: 1rem;
+  line-height: 1.6rem;
+  word-spacing: .05rem;
+
+  a {
+    color: #42b983;
+    font-weight: 600;
+  }
+}
+
+//main-container全局样式
+.app-container {
+  padding: 20px;
+}
+
+.components-container {
+  margin: 30px 50px;
+  position: relative;
+}
+
+.pagination-container {
+  margin-top: 30px;
+}
+
+.text-center {
+  text-align: center
+}
+
+.sub-navbar {
+  height: 50px;
+  line-height: 50px;
+  position: relative;
+  width: 100%;
+  text-align: right;
+  padding-right: 20px;
+  transition: 600ms ease position;
+  background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
+
+  .subtitle {
+    font-size: 20px;
+    color: #fff;
+  }
+
+  &.draft {
+    background: #d0d0d0;
+  }
+
+  &.deleted {
+    background: #d0d0d0;
+  }
+}
+
+.link-type,
+.link-type:focus {
+  color: #337ab7;
+  cursor: pointer;
+
+  &:hover {
+    color: rgb(32, 160, 255);
+  }
+}
+
+.filter-container {
+  padding-bottom: 10px;
+
+  .filter-item {
+    display: inline-block;
+    vertical-align: middle;
+    margin-bottom: 10px;
+  }
+}
+
+//refine vue-multiselect plugin
+.multiselect {
+  line-height: 16px;
+}
+
+.multiselect--active {
+  z-index: 1000 !important;
+}
--- a/src/styles/mixin.scss 0 → 100644
查看文件 @5eaec74
+++ b/src/styles/mixin.scss 0 → 100644
查看文件 @5eaec74
+@mixin clearfix {
+  &:after {
+    content: "";
+    display: table;
+    clear: both;
+  }
+}
+
+@mixin scrollBar {
+  &::-webkit-scrollbar-track-piece {
+    background: #d3dce6;
+  }
+
+  &::-webkit-scrollbar {
+    width: 6px;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background: #99a9bf;
+    border-radius: 20px;
+  }
+}
+
+@mixin relative {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
+@mixin pct($pct) {
+  width: #{$pct};
+  position: relative;
+  margin: 0 auto;
+}
+
+@mixin triangle($width, $height, $color, $direction) {
+  $width: $width/2;
+  $color-border-style: $height solid $color;
+  $transparent-border-style: $width solid transparent;
+  height: 0;
+  width: 0;
+
+  @if $direction==up {
+    border-bottom: $color-border-style;
+    border-left: $transparent-border-style;
+    border-right: $transparent-border-style;
+  }
+
+  @else if $direction==right {
+    border-left: $color-border-style;
+    border-top: $transparent-border-style;
+    border-bottom: $transparent-border-style;
+  }
+
+  @else if $direction==down {
+    border-top: $color-border-style;
+    border-left: $transparent-border-style;
+    border-right: $transparent-border-style;
+  }
+
+  @else if $direction==left {
+    border-right: $color-border-style;
+    border-top: $transparent-border-style;
+    border-bottom: $transparent-border-style;
+  }
+}
--- a/src/styles/sidebar.scss 0 → 100644
查看文件 @5eaec74
+++ b/src/styles/sidebar.scss 0 → 100644
查看文件 @5eaec74
+#app {
+
+  // 主体区域 Main container
+  .main-container {
+    min-height: 100%;
+    transition: margin-left .28s;
+    margin-left: $sideBarWidth;
+    position: relative;
+  }
+
+  // 侧边栏 Sidebar container
+  .sidebar-container {
+    transition: width 0.28s;
+    width: $sideBarWidth !important;
+    height: 100%;
+    position: fixed;
+    font-size: 0px;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 1001;
+    overflow: hidden;
+
+    //reset element-ui css
+    .horizontal-collapse-transition {
+      transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
+    }
+
+    .scrollbar-wrapper {
+      overflow-x: hidden !important;
+
+      .el-scrollbar__view {
+        height: 100%;
+      }
+    }
+
+    .el-scrollbar__bar.is-vertical {
+      right: 0px;
+    }
+
+    .is-horizontal {
+      display: none;
+    }
+
+    a {
+      display: inline-block;
+      width: 100%;
+      overflow: hidden;
+    }
+
+    .svg-icon {
+      margin-right: 16px;
+    }
+
+    .el-menu {
+      border: none;
+      height: 100%;
+      width: 100% !important;
+    }
+
+    // menu hover
+    .submenu-title-noDropdown,
+    .el-submenu__title {
+      &:hover {
+        background-color: $menuHover !important;
+      }
+    }
+
+    .is-active>.el-submenu__title {
+      color: $subMenuActiveText !important;
+    }
+
+    & .nest-menu .el-submenu>.el-submenu__title,
+    & .el-submenu .el-menu-item {
+      min-width: $sideBarWidth !important;
+      background-color: $subMenuBg !important;
+
+      &:hover {
+        background-color: $subMenuHover !important;
+      }
+    }
+  }
+
+  .hideSidebar {
+    .sidebar-container {
+      width: 36px !important;
+    }
+
+    .main-container {
+      margin-left: 36px;
+    }
+
+    .submenu-title-noDropdown {
+      padding-left: 10px !important;
+      position: relative;
+
+      .el-tooltip {
+        padding: 0 10px !important;
+      }
+    }
+
+    .el-submenu {
+      overflow: hidden;
+
+      &>.el-submenu__title {
+        padding-left: 10px !important;
+
+        .el-submenu__icon-arrow {
+          display: none;
+        }
+      }
+    }
+
+    .el-menu--collapse {
+      .el-submenu {
+        &>.el-submenu__title {
+          &>span {
+            height: 0;
+            width: 0;
+            overflow: hidden;
+            visibility: hidden;
+            display: inline-block;
+          }
+        }
+      }
+    }
+  }
+
+  .el-menu--collapse .el-menu .el-submenu {
+    min-width: $sideBarWidth !important;
+  }
+
+  // 适配移动端, Mobile responsive
+  .mobile {
+    .main-container {
+      margin-left: 0px;
+    }
+
+    .sidebar-container {
+      transition: transform .28s;
+      width: $sideBarWidth !important;
+    }
+
+    &.hideSidebar {
+      .sidebar-container {
+        pointer-events: none;
+        transition-duration: 0.3s;
+        transform: translate3d(-$sideBarWidth, 0, 0);
+      }
+    }
+  }
+
+  .withoutAnimation {
+
+    .main-container,
+    .sidebar-container {
+      transition: none;
+    }
+  }
+}
+
+// when menu collapsed
+.el-menu--vertical {
+  &>.el-menu {
+    .svg-icon {
+      margin-right: 16px;
+    }
+  }
+
+  .nest-menu .el-submenu>.el-submenu__title,
+  .el-menu-item {
+    &:hover {
+      // you can use $subMenuHover
+      background-color: $menuHover !important;
+    }
+  }
+
+  // the scroll bar appears when the subMenu is too long
+  >.el-menu--popup {
+    max-height: 100vh;
+    overflow-y: auto;
+
+    &::-webkit-scrollbar-track-piece {
+      background: #d3dce6;
+    }
+
+    &::-webkit-scrollbar {
+      width: 6px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: #99a9bf;
+      border-radius: 20px;
+    }
+  }
+}
--- a/src/styles/transition.scss 0 → 100644
查看文件 @5eaec74
+++ b/src/styles/transition.scss 0 → 100644
查看文件 @5eaec74
+//globl transition css
+
+/*fade*/
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.28s;
+}
+
+.fade-enter,
+.fade-leave-active {
+  opacity: 0;
+}
+
+/*fade-transform*/
+.fade-transform-leave-active,
+.fade-transform-enter-active {
+  transition: all .5s;
+}
+
+.fade-transform-enter {
+  opacity: 0;
+  transform: translateX(-30px);
+}
+
+.fade-transform-leave-to {
+  opacity: 0;
+  transform: translateX(30px);
+}
+
+/*breadcrumb transition*/
+.breadcrumb-enter-active,
+.breadcrumb-leave-active {
+  transition: all .5s;
+}
+
+.breadcrumb-enter,
+.breadcrumb-leave-active {
+  opacity: 0;
+  transform: translateX(20px);
+}
+
+.breadcrumb-move {
+  transition: all .5s;
+}
+
+.breadcrumb-leave-active {
+  position: absolute;
+}
--- a/src/styles/variables.scss 0 → 100644
查看文件 @5eaec74
+++ b/src/styles/variables.scss 0 → 100644
查看文件 @5eaec74
+// base color
+$blue:#324157;
+$light-blue:#3A71A8;
+$red:#C03639;
+$pink: #E65D6E;
+$green: #30B08F;
+$tiffany: #4AB7BD;
+$yellow:#FEC171;
+$panGreen: #30B08F;
+
+//sidebar
+$menuText:#bfcbd9;
+$menuActiveText:#409EFF;
+$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951
+
+$menuBg:#304156;
+$menuHover:#263445;
+
+$subMenuBg:#1f2d3d;
+$subMenuHover:#001528;
+
+$sideBarWidth: 180px;
+
+// the :export directive is the magic sauce for webpack
+:export {
+  menuText: $menuText;
+  menuActiveText: $menuActiveText;
+  subMenuActiveText: $subMenuActiveText;
+  menuBg: $menuBg;
+  menuHover: $menuHover;
+  subMenuBg: $subMenuBg;
+  subMenuHover: $subMenuHover;
+  sideBarWidth: $sideBarWidth;
+}
--- a/src/styles/vars.scss
查看文件 @5eaec74
+++ b/src/styles/vars.scss
查看文件 @5eaec74
-$color-primary: #20a0ff;//#18c79c
+$color-primary: #1a4496;//#18c79c
--- a/src/utils/companyType.js
查看文件 @5eaec74
+++ b/src/utils/companyType.js
查看文件 @5eaec74
@@ -8,7 +8,7 @@ const type = [{
   value: 'CN',
   label: 'PASSPORT'
 }, {
-  value: 'CN',
+  value: 'US',
   label: 'OC'
 }, {
   value: 'CN',
--- a/src/utils/customEval.js 100755 → 100644
查看文件 @5eaec74
+++ b/src/utils/customEval.js 100755 → 100644
查看文件 @5eaec74
--- a/src/views/agent/customEval.js → src/utils/customEval.js~HEAD
查看文件 @5eaec74
+++ b/src/views/agent/customEval.js → src/utils/customEval.js~HEAD
查看文件 @5eaec74
--- a/src/utils/validate.js
查看文件 @5eaec74
+++ b/src/utils/validate.js
查看文件 @5eaec74
@@ -35,6 +35,50 @@ export function validAlphabets(str) {
   return reg.test(str)
 }
+/* 大小写字母数字*/
+export function validAlphabetsAndNum(str) {
+  const reg = /^[0-9A-Za-z]+$/
+  return reg.test(str)
+}
+
+/* 大小写字母数字空格*/
+export function validAlphabetsAndSpanceKey(str) {
+  const reg = /^[0-9a-zA-Z\s]+$/
+  return reg.test(str)
+}
+
+/**
+ * 航班校验
+ */
+export function validFlightNo(str) {
+  const reg = /^[A-Z0-9]{6,7}$/
+  if(!reg.test(str)){
+    return false
+  }
+  const flightNoPre = /^[A-Z]+$/
+  if(!flightNoPre.test(str.substring(0,2))){
+    return false
+  } else {
+    return true
+  }
+}
+
+/**
+ * 主单校验
+ */
+export function validAwb(str) {
+  const reg = /^[0-9\-]{12}$/
+  if(!reg.test(str)){
+    return false
+  }
+  const result = str.split("-")[1]
+  const num = (result.substring(0,7)) % 7
+  if(num === eval(str.substring(11)) ){
+    return true
+  } else {
+    return false
+  }
+}
 /**
  * validate email
  * @param email
@@ -44,3 +88,25 @@ export function validEmail(email) {
   const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
   return re.test(email)
 }
+
+/**
+ *
+ * 整数和小数，小数最多两位
+ * @param value
+ * @returns {boolean}
+ */
+export function validatorNum(value) {
+  const reg = /^(\d*)+(\.[0-9]{1,2})?$/
+  return reg.test(value)
+}
+
+
+/**
+ * 关区校验 4位数字
+ * @param value
+ * @returns {boolean}
+ */
+export function validatorCustomsNum(value) {
+  const reg = /^(\d{4})$/
+  return reg.test(value)
+}
--- a/src/views/Home.vue
查看文件 @5eaec74
+++ b/src/views/Home.vue
查看文件 @5eaec74
 <template>
-	<el-row class="container">
+    <el-row class="container darkmenu" style="margin-top: 0px;">
         <el-col :span="24" class="header">
             <el-col :span="10" class="logo" :class="collapsed?'logo-collapse-width':'logo-width'">
                 {{collapsed?'':sysName}}
@@ -14,16 +14,35 @@
                     <span class="el-dropdown-link userinfo-inner"><img :src="this.sysUserAvatar" /> {{sysUserName}}</span>
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item>我的消息</el-dropdown-item>
-						<el-dropdown-item>设置</el-dropdown-item>
+                        <el-dropdown-item @click.native="editPass">修改密码</el-dropdown-item>
                         <el-dropdown-item divided @click.native="logout">退出登录</el-dropdown-item>
                     </el-dropdown-menu>
                 </el-dropdown>
             </el-col>
         </el-col>
+        <el-col>
+            <el-dialog title="修改密码" :visible.sync="dialogFormVisible">
+                <el-form :model="resetForm" status-icon :rules="resetFormRules" ref="resetForm" label-width="100px">
+                    <el-form-item label="用户名" prop="name">
+                        <span>{{sysUserName}}</span>
+                    </el-form-item>
+                    <el-form-item label="新密码" prop="newpwd">
+                        <el-input type="password" v-model="resetForm.newpwd" autocomplete="off" placeholder="8-20位字符在数字、小写、大写字母以及特殊字符中四选三"></el-input>
+                    </el-form-item>
+                    <el-form-item label="确认密码" prop="renewpwd">
+                        <el-input type="password" v-model="resetForm.renewpwd" auto-complete="off"></el-input>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="submitEdit('resetForm')" style="float:right">提 交</el-button>
+                    </el-form-item>
+
+                </el-form>
+            </el-dialog>
+        </el-col>
         <el-col :span="24" class="main">
             <aside :class="collapsed?'menu-collapsed':'menu-expanded'">
                 <!--导航菜单-->
-				<el-menu :default-active="$route.path" class="el-menu-vertical-demo" @open="handleopen" @close="handleclose" @select="handleselect" unique-opened router v-show="!collapsed" style="min-width: 230px" background-color="#545c64" text-color="#fff" active-text-color="#ffd04b">
+                <el-menu :default-active="$route.path" class="el-menu-vertical-demo" @open="handleopen" @close="handleclose" @select="handleselect" unique-opened router v-show="!collapsed" style="min-width: 230px">
                     <template v-for="(item,index) in $router.options.routes" v-if="!item.hidden">
                         <el-submenu :index="index+''" v-if="!item.leaf">
                             <template slot="title"><i :class="item.iconCls"></i>{{item.name}}</template>
@@ -45,11 +64,11 @@
                     <li class="el-submenu">
                         <div class="el-submenu__title el-menu-item" style="padding-left: 20px;height: 56px;line-height: 56px;padding: 0 20px;" :class="$route.path==item.children[0].path?'is-active':''" @click="$router.push(item.children[0].path)"><i :class="item.iconCls"></i></div>
                     </li>
-						</template>
-					</li>
-				</ul>
-			</aside>
-			<section class="content-container">
+</template>
+</li>
+</ul>
+</aside>
+<section class="content-container">
     <div class="grid-content bg-purple-light">
         <el-col :span="24" class="breadcrumb-container">
             <strong class="title">{{$route.name}}</strong>
@@ -61,25 +80,77 @@
         </el-col>
         <el-col :span="24" class="content-wrapper">
             <transition name="fade" mode="out-in">
-							<router-view></router-view>
+                <router-view :key="$route.path +$route.query.t"></router-view>
             </transition>
         </el-col>
     </div>
-			</section>
-		</el-col>
-	</el-row>
+</section>
+</el-col>
+</el-row>
 </template>
-
 <script>
     import rt from '../routes'
+    import { editPass} from '../api/user';
+    import ElFormItem from "element-ui/packages/form/src/form-item";
     export default {
+
+        provide() {
+            return {
+                reload: this.reload
+            }
+        },
+        components: {ElFormItem},
         data() {
+            var validatePass = (rule, value, callback) => {
+                if (!value) {
+                    callback(new Error('请输入新密码'));
+                }else {
+                    var ls=0;
+                 if(value.match(/([a-z])+/)){
+                        ls++;
+                    } if(value.match(/([0-9])+/)){
+                        ls++;
+                    } if(value.match(/([A-Z])+/)){
+                        ls++;
+                    } if((/([\W])+/) && !value.match(/(![\u4E00-\u9FA5])+/)){
+                        ls++;
+                    }  if (value.toString().length < 8 || value.toString().length > 20) {
+                        callback(new Error('密码长度为8 - 20个字符'));
+                        ls=0;
+                    } if(value.match(/([\u4E00-\u9FA5])+/)){
+                        callback(new Error('不能包含中文字符'));
+                        ls=0;
+                    }
+                    switch (ls) {
+                        case 0: this.passwordPercent = 0;callback(new Error('数字、小写字母、大写字母以及特殊字符中四选三'));break;
+                        case 1: this.passwordPercent = 33;callback(new Error('数字、小写字母、大写字母以及特殊字符中四选三'));break;
+                        case 2: this.passwordPercent = 66;callback(new Error('数字、小写字母 、大写字母以及特殊字符中四选三'));break;
+                        case 3:
+                        case 4: this.passwordPercent = 100;break;
+                        default: this.passwordPercent = 0;break;
+                    }
+                    callback();
+                }
+
+            };
+
+            var validatePass2 = (rule, value, callback) => {
+                if (value === '') {
+                    callback(new Error('请再次输入密码'));
+                } else if (value !== this.resetForm.newpwd) {
+                    callback(new Error('两次输入密码不一致!'));
+                } else {
+                    callback();
+                }
+            };
             return {
-				sysName:'后勤管理平台',
+                sysName:'易通快速通关申报管理系统',
                 collapsed:false,
                 sysUserName: '',
+                sysUserId:'',
                 sysUserAvatar: '',
+                isRouterAlive: true,
                 form: {
                     name: '',
                     region: '',
@@ -89,10 +160,67 @@
                     type: [],
                     resource: '',
                     desc: ''
-				}
+                },
+                dialogFormVisible:false,
+                resetForm: {
+                    newpwd: '',
+                    renewpwd: '',
+                },
+                resetFormRules: {
+                    newpwd: [
+                        { required: true, validator: validatePass, trigger: 'blur' }
+                    ],
+                    renewpwd: [
+                        { required: true, validator: validatePass2, trigger: 'blur' }
+                    ]
+                },
+                editForm: {
+                    userId: '',
+                    password: '',
+                },
             }
         },
         methods: {
+            reload() {
+                this.$nextTick(function () {
+                   this.$router.push({
+                       path: this.$router.path,
+                       query:{
+                           t: new Date().getTime()
+                       }
+                   })
+                })
+            },
+            editPass:function(){
+                this.dialogFormVisible=true;
+            },
+            submitEdit(formName){
+                this.$refs[formName].validate((valid) => {
+                    if (valid) {
+                        this.editForm.userId=this.sysUserId;
+                        this.editForm.password=this.resetForm.renewpwd;
+                        editPass(this.editForm).then(res=>{
+                            let response=res.data;
+                            if(response.code=='200'){
+                                this.$notify({
+                                    title: '密码修改成功',
+                                    message: '密码修改成功，退出请重新登录',
+                                    type: 'success'
+                                });
+                                this.dialogFormVisible=false;
+                            }else{
+                                this.$notify.error({
+                                    title: '密码修改失败',
+                                    message: '密码修改失败！！！'
+                                });
+                            }
+                        });
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
             onSubmit() {
                 console.log('submit!');
             },
@@ -103,7 +231,7 @@
                 console.log('handleclose');
             },
             handleselect: function (a, b) {
-                console.log('handleselect!');
+                this.reload()
             },
             //退出登录
             logout: function () {
@@ -113,7 +241,6 @@
                 }).then(() => {
                     sessionStorage.removeItem('user');
                     sessionStorage.removeItem('menu');
-
                     //退出后初始化原来的路由
                     let sysRoutes =  JSON.parse(sessionStorage.getItem('sysMenu'));
                     console.log(sysRoutes);
@@ -140,6 +267,7 @@
             if (user) {
                 user = JSON.parse(user);
                 this.sysUserName = user.username || '';
+                this.sysUserId=user.userId||'';
                 this.sysUserAvatar = user.userface || '/static/images/faceDefault.jpg';
             }
             //操作路由,判断本地存储的用户栏目列表是否存在，如果存在则加载路由
@@ -157,7 +285,6 @@
 <style scoped lang="scss">
     @import '~scss_vars';
-	
     .container {
         position: absolute;
         top: 0px;
@@ -166,7 +293,7 @@
         .header {
             height: 60px;
             line-height: 60px;
-			background: $color-primary;
+            background: $color-primary url("/static/images/air-banner.png");
             color:#fff;
             .userinfo {
                 text-align: right;
@@ -229,9 +356,6 @@
                 // position: absolute;
                 // top: 0px;
                 // bottom: 0px;
-				.el-menu{
-					height: 100%;
-				}
                 .collapsed{
                     width:60px;
                     .item{
@@ -268,16 +392,21 @@
                 // bottom: 0px;
                 // left: 230px;
                 overflow-y: scroll;
-				padding: 20px;
+                padding: 10px;
                 .breadcrumb-container {
                     //margin-bottom: 15px;
                     .title {
                         width: 200px;
                         float: left;
                         color: #475669;
+                        margin-left: 10px;
                     }
                     .breadcrumb-inner {
                         float: right;
+                        margin-right:10px;
+                    }
+                    .el-breadcrumb{
+                        line-height:36px;
                     }
                 }
                 .content-wrapper {
@@ -288,3 +417,41 @@
         }
     }
 </style>
+<style lang="scss">
+    .darkmenu{
+        .main {
+            aside {
+                .el-menu{
+                    height: 100%;
+                    background: #606060;
+                    .el-menu-item {
+                        i{
+                            color: white;
+                        }
+                        color: white;
+                    }
+                    .el-menu-item.is-active{
+                        color:#e6a23c;
+                    }
+                    .el-menu-item:hover,.el-menu-item:focus{
+                        background-color: #1a4496;
+                    }
+                    .el-submenu {
+                        ul.el-menu.el-menu--inline{
+                            background: #303030;
+                        }
+                        .el-submenu__title {
+                            color: white;
+                            i{
+                                color: white;
+                            }
+                        }
+                        .el-submenu__title:hover {
+                            background-color: #1a4496;
+                        }
+                    }
+                }
+            }
+        }
+    }
+</style>
--- a/src/views/Login.vue
查看文件 @5eaec74
+++ b/src/views/Login.vue
查看文件 @5eaec74
@@ -3,12 +3,12 @@
     <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" label-position="left" label-width="0px" class="demo-ruleForm login-container" id="loginForm">
       <h3 class="title">系统登录</h3>
       <el-form-item prop="account">
-        <el-input type="text" v-model="ruleForm2.account" auto-complete="off" placeholder="账号"></el-input>
+        <el-input type="text" v-model="ruleForm2.account" autofocus placeholder="账号"></el-input>
       </el-form-item>
       <el-form-item prop="checkPass">
-        <el-input type="password" v-model="ruleForm2.checkPass" auto-complete="off" placeholder="密码"></el-input>
+        <el-input type="password" v-model="ruleForm2.checkPass"  placeholder="密码" @keyup.enter.native="handleSubmit2"></el-input>
       </el-form-item>
-      <el-checkbox v-model="checked" checked class="remember">记住密码</el-checkbox>
+      <el-checkbox v-model="checked" checked class="remeberme">记住密码</el-checkbox>
       <el-form-item style="width:100%;">
         <el-button type="primary" style="width:100%;" @click.native.prevent="handleSubmit2" :loading="logining" :plain="true">登录</el-button>
         <!--<el-button @click.native.prevent="handleReset2">重置</el-button>-->
@@ -42,8 +42,8 @@
           fixStyle: '',
           logining: false,
           ruleForm2: {
-          account: 'admin',
-          checkPass: '123456'
+          account: '',
+          checkPass: ''
           },
           rules2: {
           account: [
--- a/src/views/agent/PreManifest.vue
查看文件 @5eaec74
+++ b/src/views/agent/PreManifest.vue
查看文件 @5eaec74
@@ -9,7 +9,7 @@
       <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">{{ $t('table.export') }}</el-button>
       <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-message" @click="handleCreate">批量发送</el-button>
     </div>
-    <tree-table :data="data" :eval-func="func" :eval-args="args" :expand-all="expandAll" stripe style="font-size: 13px" border @selection-change="handleSelectionChange">
+    <tree-table :data="tableData" :eval-func="func" :eval-args="args" :expand-all="expandAll" stripe style="font-size: 13px" border @selection-change="handleSelectionChange">
       <el-table-column prop="waybillNo" label="主单号" width="110px" align="center" sortable>
         <template slot-scope="scope">
           <span>{{ scope.row.waybillNo }}</span>
@@ -27,7 +27,7 @@
       </el-table-column>
       <el-table-column label="航班日期" width="100px" align="center" sortable>
         <template slot-scope="scope">
-          <span>{{ scope.row.flightDate | parseTime('{y}-{m}-{d}') }}</span>
+          <span>{{ scope.row.flightDate }}</span>
         </template>
       </el-table-column>
       <el-table-column label="起始站" width="60px" align="center">
@@ -63,7 +63,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('table.actions')" align="center" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('table.actions')" align="center" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button type="primary" size="small" @click="handleUpdate(scope.row)">快速编辑</el-button>
           <el-button type="primary" size="mini" @click="handleUpdate(scope.row)">{{ $t('table.edit') }}</el-button>
@@ -79,8 +79,8 @@
     </tree-table>
     <pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
-    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" fullscreen="true">
-      <el-form ref="" :inline="true" label-position="left" :rules="rules" :model="temp" label-width="100px" style="font-size: 13px">
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" fullscreen>
+      <el-form ref="" :inline="true" :rules="rules" :model="temp" label-width="100px" style="font-size: 13px">
         <div>
           <el-tag type="info" effect="plain">
             航班信息
@@ -350,17 +350,16 @@
   Auth: Lei.j1ang
   Created: 2018/1/19-14:54
 */
-import { fetchList } from '@/api/article'
+
 import treeTable from '@/components/TreeTable'
-import treeToArray from './customEval'
+import treeToArray from '@/utils/customEval'
 import Pagination from '@/components/Pagination'
 import waves from '@/directive/waves' // Waves directive
 import country from '@/utils/country.js'
 import companyType from '@/utils/companyType.js'
 import dangerGoods from '@/utils/dangerGoods.js'
 import goodsPackage from '@/utils/goodsPackage.js'
-import excel from '@/vendor/Export2Excel'
-import { parseTime } from '@/utils'
+
 const calendarTypeOptions = [
   { key: 'CN', display_name: 'China' },
   { key: 'US', display_name: 'USA' },
@@ -403,11 +402,12 @@ export default {
     return {
       func: treeToArray,
       expandAll: true,
+      fullscreen:true,
       total: 1,
       resend: true,
-      listLoading: false,
-      downloadLoading: false,
-      loading: false,
+      loading:false,
+      listLoading: true,
+      downloadLoading:false,
       multipleSelection: [],
       dialogFormVisible: false,
       dialogStatus: '',
@@ -428,6 +428,7 @@ export default {
         flightDate: '',
         custom: ''
       },
+      tableData:[],
       temp: {
         id: undefined,
         waybillNo: '',
@@ -441,7 +442,103 @@ export default {
         maniWeight: undefined
       },
       manifestCustoms: ['4604', '4620', '4613'],
-      data: [
+
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: '今天',
+            onClick(picker) {
+              picker.$emit('pick', new Date())
+            }
+          },
+          {
+            text: '昨天',
+            onClick(picker) {
+              const date = new Date()
+              date.setTime(date.getTime() - 3600 * 1000 * 24)
+              picker.$emit('pick', date)
+            }
+          },
+          {
+            text: '明天',
+            onClick(picker) {
+              const date = new Date()
+              date.setTime(date.getTime() + 3600 * 1000 * 24)
+              picker.$emit('pick', date)
+            }
+          },
+          {
+            text: '一周前',
+            onClick(picker) {
+              const date = new Date()
+              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
+              picker.$emit('pick', date)
+            }
+          }
+        ]
+      },
+      args: [null, null, 'timeLine'],
+      rules: {
+        maniWeight: [{ type: 'number', required: true, message: '重量必须为数字', trigger: 'blur' }],
+        maniPiece: [{ type: 'number', required: true, message: '件数必须为数字', trigger: 'blur' }],
+        desStation: [{ required: true, message: '运单目的地必须输入', trigger: 'blur' }],
+        oriStation: [{ required: true, message: '运单起始站必须数据', trigger: 'change' }],
+        flightDate: [{ type: 'date', required: true, message: '航班日期必须输入', trigger: 'change' }],
+        flight: [{ required: true, message: '航班号必须输入', trigger: 'blur' }],
+        custom: [{ required: true, message: '关区代码必须选择', trigger: 'change' }],
+        waybillNo: [{ required: true, message: '运单号必须输入', trigger: 'blur' }]
+      }
+    }
+  },
+  created(){
+    console.log(this.$route.params.scopeRow)
+    this.getList()
+  },
+  methods: {
+    message(row) {
+      this.$message.info(row.event)
+    },
+    sortChange(data) {
+      const { prop, order } = data
+      if (prop === 'id') {
+        this.sortByID(order)
+      }
+    },
+    sortByID(order) {
+      if (order === 'ascending') {
+        this.listQuery.sort = '+id'
+      } else {
+        this.listQuery.sort = '-id'
+      }
+      this.handleFilter()
+    },
+    handleFilter(){
+
+    },
+    handleSwitch(row){
+
+    },
+    handleDownload(){
+      this.downloadLoading = true
+    },
+    handleUpdate(row) {
+      this.temp = Object.assign({}, row) // copy obj
+      this.temp.timestamp = new Date(this.temp.timestamp)
+      this.dialogStatus = 'update'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs[''].clearValidate()
+      })
+    },
+    handleModifyStatus(row, status) {
+      this.$message({
+        message: '操作成功',
+        type: 'success'
+      })
+      row.status = status
+    },
+    getList() {
+     this.tableData = [
         {
           id: 0,
           waybillNo: '580-20728399',
@@ -520,7 +617,7 @@ export default {
           ]
         },
         {
-          id: 5,
+          id: 4,
           waybillNo: '580-20728391',
           houseWaybillNo: '',
           custom: '4604',
@@ -532,104 +629,278 @@ export default {
           maniWeight: 21321,
           status: '10003',
           customText: ' 已发送预配舱单 '
-        }
-      ],
-      pickerOptions: {
-        shortcuts: [
+        },
         {
-            text: '今天',
-            onClick(picker) {
-              picker.$emit('pick', new Date())
-            }
+          id: 5,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
         },
         {
-            text: '昨天',
-            onClick(picker) {
-              const date = new Date()
-              date.setTime(date.getTime() - 3600 * 1000 * 24)
-              picker.$emit('pick', date)
-            }
+          id: 6,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
         },
         {
-            text: '明天',
-            onClick(picker) {
-              const date = new Date()
-              date.setTime(date.getTime() + 3600 * 1000 * 24)
-              picker.$emit('pick', date)
-            }
+          id: 7,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
         },
         {
-            text: '一周前',
-            onClick(picker) {
-              const date = new Date()
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
-              picker.$emit('pick', date)
-            }
-          }
-        ]
+          id: 8,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
         },
-      args: [null, null, 'timeLine'],
-      rules: {
-        maniWeight: [{ type: 'number', required: true, message: '重量必须为数字', trigger: 'blur' }],
-        maniPiece: [{ type: 'number', required: true, message: '件数必须为数字', trigger: 'blur' }],
-        desStation: [{ required: true, message: '运单目的地必须输入', trigger: 'blur' }],
-        oriStation: [{ required: true, message: '运单起始站必须数据', trigger: 'change' }],
-        flightDate: [{ type: 'date', required: true, message: '航班日期必须输入', trigger: 'change' }],
-        flight: [{ required: true, message: '航班号必须输入', trigger: 'blur' }],
-        custom: [{ required: true, message: '关区代码必须选择', trigger: 'change' }],
-        waybillNo: [{ required: true, message: '运单号必须输入', trigger: 'blur' }]
-      }
-    }
+        {
+          id: 9,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
         },
-  methods: {
-    message(row) {
-      this.$message.info(row.event)
+        {
+          id: 10,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
         },
-    sortChange(data) {
-      const { prop, order } = data
-      if (prop === 'id') {
-        this.sortByID(order)
-      }
+        {
+          id: 11,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
         },
-    sortByID(order) {
-      if (order === 'ascending') {
-        this.listQuery.sort = '+id'
-      } else {
-        this.listQuery.sort = '-id'
-      }
-      this.handleFilter()
+        {
+          id: 12,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
         },
-    handleUpdate(row) {
-      this.temp = Object.assign({}, row) // copy obj
-      this.temp.timestamp = new Date(this.temp.timestamp)
-      this.dialogStatus = 'update'
-      this.dialogFormVisible = true
-      this.$nextTick(() => {
-        this.$refs[''].clearValidate()
-      })
+        {
+          id: 13,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
+        },{
+          id: 14,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
         },
-    handleFilter() {
-        this.listQuery.page = 1
-        this.getList()
+        {
+          id: 15,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
         },
-    handleModifyStatus(row, status) {
-      this.$message({
-        message: '操作成功',
-        type: 'success'
-      })
-      row.status = status
+        {
+          id: 16,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
         },
-    getList() {
-        this.listLoading = true
-        fetchList(this.listQuery).then(response => {
-            this.list = response.data.items
-            this.total = response.data.total
+        {
+          id: 17,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
+        },
+        {
+          id: 18,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
+        },
+        {
+          id: 19,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
+        },
+        {
+          id: 20,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
+        },
+        {
+          id: 23,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41301',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
+        }, {
+          id: 22,
+          waybillNo: '580-20728399',
+          houseWaybillNo: '',
+          custom: '4604',
+          flight: 'CV9733',
+          flightDate: '2019-06-21',
+          oriStation: 'LUX',
+          desStation: 'CGO',
+          maniPiece: 50,
+          maniWeight: 21321,
+          status: '41300',
+          customText: ' 预配舱单主要数据传输成功。',
+          customComplate: 25
+        }
-            // Just to simulate the time of the request
-            setTimeout(() => {
-                this.listLoading = false
-            }, 1.5 * 1000)
-        })
+      ]
+     this.total = this.tableData.length
     },
     handleSelectionChange(val) {
       this.multipleSelection = val
@@ -656,18 +927,6 @@ export default {
         this.$refs[''].clearValidate()
       })
     },
-    handleDownload() {
-      this.downloadLoading = true
-      const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
-      const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
-      const data = this.formatJson(filterVal, this.list)
-      excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: 'table-list'
-      })
-      this.downloadLoading = false
-    },
     remoteMethod(query) {
       if (query !== '') {
         this.loading = true
@@ -696,9 +955,6 @@ export default {
      margin-bottom: 0;
    }
   }
-  .el-col {
-    border-radius: 4px;
-  }
   .bg-purple-dark {
     background: #99a9bf;
   }
@@ -709,7 +965,6 @@ export default {
     background: #e5e9f2;
   }
   .grid-content {
-    border-radius: 4px;
     min-height: 36px;
   }
   .row-bg {
--- a/src/views/dashboard/components/BarChart.vue 0 → 100644
查看文件 @5eaec74
+++ b/src/views/dashboard/components/BarChart.vue 0 → 100644
查看文件 @5eaec74
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+const animationDuration = 6000
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        grid: {
+          top: 10,
+          left: '2%',
+          right: '2%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: [{
+          type: 'category',
+          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+          axisTick: {
+            alignWithLabel: true
+          }
+        }],
+        yAxis: [{
+          type: 'value',
+          axisTick: {
+            show: false
+          }
+        }],
+        series: [{
+          name: 'pageA',
+          type: 'bar',
+          stack: 'vistors',
+          barWidth: '60%',
+          data: [79, 52, 200, 334, 390, 330, 220],
+          animationDuration
+        }, {
+          name: 'pageB',
+          type: 'bar',
+          stack: 'vistors',
+          barWidth: '60%',
+          data: [80, 52, 200, 334, 390, 330, 220],
+          animationDuration
+        }, {
+          name: 'pageC',
+          type: 'bar',
+          stack: 'vistors',
+          barWidth: '60%',
+          data: [30, 52, 200, 334, 390, 330, 220],
+          animationDuration
+        }]
+      })
+    }
+  }
+}
+</script>
--- a/src/views/dashboard/components/BoxCard.vue 0 → 100644
查看文件 @5eaec74
+++ b/src/views/dashboard/components/BoxCard.vue 0 → 100644
查看文件 @5eaec74
+<template>
+  <el-card class="box-card-component" style="margin-left:8px;">
+    <div slot="header" class="box-card-header">
+      <img src="https://wpimg.wallstcn.com/e7d23d71-cf19-4b90-a1cc-f56af8c0903d.png">
+    </div>
+    <div style="position:relative;">
+      <pan-thumb :image="avatar" class="panThumb" />
+      <mallki class-name="mallki-text" text="vue-element-admin" />
+      <div style="padding-top:35px;" class="progress-item">
+        <span>Vue</span>
+        <el-progress :percentage="70" />
+      </div>
+      <div class="progress-item">
+        <span>JavaScript</span>
+        <el-progress :percentage="18" />
+      </div>
+      <div class="progress-item">
+        <span>Css</span>
+        <el-progress :percentage="12" />
+      </div>
+      <div class="progress-item">
+        <span>ESLint</span>
+        <el-progress :percentage="100" status="success" />
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import PanThumb from '../../../components/PanThumb'
+import Mallki from '../../../components/TextHoverEffect/Mallki'
+
+export default {
+  components: { PanThumb, Mallki },
+
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        success: 'success',
+        pending: 'danger'
+      }
+      return statusMap[status]
+    }
+  },
+  data() {
+    return {
+      statisticsData: {
+        article_count: 1024,
+        pageviews_count: 1024
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'name',
+      'avatar',
+      'roles'
+    ])
+  }
+}
+</script>
+
+<style lang="scss" >
+.box-card-component{
+  .el-card__header {
+    padding: 0px!important;
+  }
+}
+</style>
+<style lang="scss" scoped>
+.box-card-component {
+  .box-card-header {
+    position: relative;
+    height: 220px;
+    img {
+      width: 100%;
+      height: 100%;
+      transition: all 0.2s linear;
+      &:hover {
+        transform: scale(1.1, 1.1);
+        filter: contrast(130%);
+      }
+    }
+  }
+  .mallki-text {
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    font-size: 20px;
+    font-weight: bold;
+  }
+  .panThumb {
+    z-index: 100;
+    height: 70px!important;
+    width: 70px!important;
+    position: absolute!important;
+    top: -45px;
+    left: 0px;
+    border: 5px solid #ffffff;
+    background-color: #fff;
+    margin: auto;
+    box-shadow: none!important;
+    /deep/ .pan-info {
+      box-shadow: none!important;
+    }
+  }
+  .progress-item {
+    margin-bottom: 10px;
+    font-size: 14px;
+  }
+  @media only screen and (max-width: 1510px){
+    .mallki-text{
+      display: none;
+    }
+  }
+}
+</style>
--- a/src/views/dashboard/components/LineChart.vue 0 → 100644
查看文件 @5eaec74
+++ b/src/views/dashboard/components/LineChart.vue 0 → 100644
查看文件 @5eaec74
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '350px'
+    },
+    autoResize: {
+      type: Boolean,
+      default: true
+    },
+    chartData: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  watch: {
+    chartData: {
+      deep: true,
+      handler(val) {
+        this.setOptions(val)
+      }
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+      this.setOptions(this.chartData)
+    },
+    setOptions({ expectedData, actualData } = {}) {
+      this.chart.setOption({
+        xAxis: {
+          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+          boundaryGap: false,
+          axisTick: {
+            show: false
+          }
+        },
+        grid: {
+          left: 10,
+          right: 10,
+          bottom: 20,
+          top: 30,
+          containLabel: true
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross'
+          },
+          padding: [5, 10]
+        },
+        yAxis: {
+          axisTick: {
+            show: false
+          }
+        },
+        legend: {
+          data: ['expected', 'actual']
+        },
+        series: [{
+          name: 'expected', itemStyle: {
+            normal: {
+              color: '#FF005A',
+              lineStyle: {
+                color: '#FF005A',
+                width: 2
+              }
+            }
+          },
+          smooth: true,
+          type: 'line',
+          data: expectedData,
+          animationDuration: 2800,
+          animationEasing: 'cubicInOut'
+        },
+        {
+          name: 'actual',
+          smooth: true,
+          type: 'line',
+          itemStyle: {
+            normal: {
+              color: '#3888fa',
+              lineStyle: {
+                color: '#3888fa',
+                width: 2
+              },
+              areaStyle: {
+                color: '#f3f8ff'
+              }
+            }
+          },
+          data: actualData,
+          animationDuration: 2800,
+          animationEasing: 'quadraticOut'
+        }]
+      })
+    }
+  }
+}
+</script>
--- a/src/views/dashboard/components/PanelGroup.vue 0 → 100644
查看文件 @5eaec74
+++ b/src/views/dashboard/components/PanelGroup.vue 0 → 100644
查看文件 @5eaec74
+<template>
+  <el-row :gutter="15" class="panel-group">
+
+    <el-col :span="5" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
+        <div class="card-panel-icon-wrapper icon-people">
+<!--          <svg-icon icon-class="peoples" class-name="card-panel-icon" />-->
+          <i class="el-icon-user-solid" style="font-size: 60px;"></i>
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            New Visits
+          </div>
+          <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
+        </div>
+      </div>
+    </el-col>
+
+<!--    :xs="12" :sm="12" :lg="6"-->
+    <el-col :span="5" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('messages')">
+        <div class="card-panel-icon-wrapper icon-message">
+<!--          <svg-icon icon-class="message" class-name="card-panel-icon" />-->
+          <i class="el-icon-message" style="font-size: 60px;"></i>
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            Messages
+          </div>
+          <count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
+        </div>
+      </div>
+    </el-col>
+
+    <el-col :span="5" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('purchases')">
+        <div class="card-panel-icon-wrapper icon-money">
+<!--          <svg-icon icon-class="money" class-name="card-panel-icon" />-->
+            <i class="el-icon-money" style="font-size: 60px;"></i>
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            Purchases
+          </div>
+          <count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" />
+        </div>
+      </div>
+    </el-col>
+    <el-col :span="5" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+        <div class="card-panel-icon-wrapper icon-shopping">
+<!--          <svg-icon icon-class="shopping" class-name="card-panel-icon" />-->
+            <i class="el-icon-shopping-cart-2" style="font-size: 60px;"></i>
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            Shoppings
+          </div>
+          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
+        </div>
+      </div>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import CountTo from 'vue-count-to'
+// import '../../../icons'
+export default {
+  components: {
+    CountTo
+  },
+  methods: {
+    handleSetLineChartData(type) {
+      this.$emit('handleSetLineChartData', type)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.panel-group {
+  margin-top: 18px;
+
+  .card-panel-col {
+    margin-bottom: 32px;
+  }
+
+  .card-panel {
+    height: 108px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #666;
+    background: #fff;
+    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+    border-color: rgba(0, 0, 0, .05);
+
+    &:hover {
+      .card-panel-icon-wrapper {
+        color: #fff;
+      }
+
+      .icon-people {
+        background: #40c9c6;
+      }
+
+      .icon-message {
+        background: #36a3f7;
+      }
+
+      .icon-money {
+        background: #f4516c;
+      }
+
+      .icon-shopping {
+        background: #34bfa3
+      }
+    }
+
+    .icon-people {
+      color: #40c9c6;
+    }
+
+    .icon-message {
+      color: #36a3f7;
+    }
+
+    .icon-money {
+      color: #f4516c;
+    }
+
+    .icon-shopping {
+      color: #34bfa3
+    }
+
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+    }
+
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
+    }
+
+    .card-panel-description {
+      float: right;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 0px;
+
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
+
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+}
+
+@media (max-width:550px) {
+  .card-panel-description {
+    display: none;
+  }
+
+  .card-panel-icon-wrapper {
+    float: none !important;
+    width: 100%;
+    height: 100%;
+    margin: 0 !important;
+
+    .svg-icon {
+      display: block;
+      margin: 14px auto !important;
+      float: none !important;
+    }
+  }
+}
+</style>
--- a/src/views/dashboard/components/PieChart.vue 0 → 100644
查看文件 @5eaec74
+++ b/src/views/dashboard/components/PieChart.vue 0 → 100644
查看文件 @5eaec74
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b} : {c} ({d}%)'
+        },
+        legend: {
+          left: 'center',
+          bottom: '10',
+          data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
+        },
+        series: [
+          {
+            name: 'WEEKLY WRITE ARTICLES',
+            type: 'pie',
+            roseType: 'radius',
+            radius: [15, 95],
+            center: ['50%', '38%'],
+            data: [
+              { value: 320, name: 'Industries' },
+              { value: 240, name: 'Technology' },
+              { value: 149, name: 'Forex' },
+              { value: 100, name: 'Gold' },
+              { value: 59, name: 'Forecasts' }
+            ],
+            animationEasing: 'cubicInOut',
+            animationDuration: 2600
+          }
+        ]
+      })
+    }
+  }
+}
+</script>
--- a/src/views/dashboard/components/RaddarChart.vue 0 → 100644
查看文件 @5eaec74
+++ b/src/views/dashboard/components/RaddarChart.vue 0 → 100644
查看文件 @5eaec74
+<template>
+  <div :class="className" :style="{height:height,width:width}" />
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import resize from './mixins/resize'
+
+const animationDuration = 3000
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart()
+    })
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        radar: {
+          radius: '66%',
+          center: ['50%', '42%'],
+          splitNumber: 8,
+          splitArea: {
+            areaStyle: {
+              color: 'rgba(127,95,132,.3)',
+              opacity: 1,
+              shadowBlur: 45,
+              shadowColor: 'rgba(0,0,0,.5)',
+              shadowOffsetX: 0,
+              shadowOffsetY: 15
+            }
+          },
+          indicator: [
+            { name: 'Sales', max: 10000 },
+            { name: 'Administration', max: 20000 },
+            { name: 'Information Technology', max: 20000 },
+            { name: 'Customer Support', max: 20000 },
+            { name: 'Development', max: 20000 },
+            { name: 'Marketing', max: 20000 }
+          ]
+        },
+        legend: {
+          left: 'center',
+          bottom: '10',
+          data: ['Allocated Budget', 'Expected Spending', 'Actual Spending']
+        },
+        series: [{
+          type: 'radar',
+          symbolSize: 0,
+          areaStyle: {
+            normal: {
+              shadowBlur: 13,
+              shadowColor: 'rgba(0,0,0,.2)',
+              shadowOffsetX: 0,
+              shadowOffsetY: 10,
+              opacity: 1
+            }
+          },
+          data: [
+            {
+              value: [5000, 7000, 12000, 11000, 15000, 14000],
+              name: 'Allocated Budget'
+            },
+            {
+              value: [4000, 9000, 15000, 15000, 13000, 11000],
+              name: 'Expected Spending'
+            },
+            {
+              value: [5500, 11000, 12000, 15000, 12000, 12000],
+              name: 'Actual Spending'
+            }
+          ],
+          animationDuration: animationDuration
+        }]
+      })
+    }
+  }
+}
+</script>
--- a/src/views/dashboard/components/TodoList/Todo.vue 0 → 100644
查看文件 @5eaec74
+++ b/src/views/dashboard/components/TodoList/Todo.vue 0 → 100644
查看文件 @5eaec74
+<template>
+  <li :class="{ completed: todo.done, editing: editing }" class="todo">
+    <div class="view">
+      <input
+        :checked="todo.done"
+        class="toggle"
+        type="checkbox"
+        @change="toggleTodo( todo)"
+      >
+      <label @dblclick="editing = true" v-text="todo.text" />
+      <button class="destroy" @click="deleteTodo( todo )" />
+    </div>
+    <input
+      v-show="editing"
+      v-focus="editing"
+      :value="todo.text"
+      class="edit"
+      @keyup.enter="doneEdit"
+      @keyup.esc="cancelEdit"
+      @blur="doneEdit"
+    >
+  </li>
+</template>
+
+<script>
+export default {
+  name: 'Todo',
+  directives: {
+    focus(el, { value }, { context }) {
+      if (value) {
+        context.$nextTick(() => {
+          el.focus()
+        })
+      }
+    }
+  },
+  props: {
+    todo: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      editing: false
+    }
+  },
+  methods: {
+    deleteTodo(todo) {
+      this.$emit('deleteTodo', todo)
+    },
+    editTodo({ todo, value }) {
+      this.$emit('editTodo', { todo, value })
+    },
+    toggleTodo(todo) {
+      this.$emit('toggleTodo', todo)
+    },
+    doneEdit(e) {
+      const value = e.target.value.trim()
+      const { todo } = this
+      if (!value) {
+        this.deleteTodo({
+          todo
+        })
+      } else if (this.editing) {
+        this.editTodo({
+          todo,
+          value
+        })
+        this.editing = false
+      }
+    },
+    cancelEdit(e) {
+      e.target.value = this.todo.text
+      this.editing = false
+    }
+  }
+}
+</script>