diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000..086558a --- /dev/null +++ b/deploy.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env sh + +# 当发生错误时中止脚本 +set -e + +# 构建 +npm run build + +# cd 到构建输出的目录下 +cd dist + +git init +git add -A +git commit -m 'deploy' + +# push to server +git remote add origin ssh://git@192.168.10.123:3022/yaclty/altitudereaction-web.git +git push -f origin master:deploy + +# 删除文件 +rm -rf dist \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index de9a792..6620587 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,30 +39,6 @@ "@antv/util": "~1.3.1" } }, - "@antv/data-set": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/@antv/data-set/-/data-set-0.10.2.tgz", - "integrity": "sha512-FFWG5tiTiFiUrLDRwulraU5XfOdDjkYOlZna+AMT9FJw406D/gfS8eXM9YibscBH28M/+KLAVO8xEwuD1sc3bw==", - "requires": { - "@antv/hierarchy": "~0.4.0", - "@antv/util": "~1.3.1", - "d3-array": "~1.2.0", - "d3-composite-projections": "~1.2.0", - "d3-dsv": "~1.0.5", - "d3-geo": "~1.6.4", - "d3-geo-projection": "~2.1.2", - "d3-hexjson": "~1.0.1", - "d3-hierarchy": "~1.1.5", - "d3-sankey": "~0.7.1", - "d3-voronoi": "~1.1.2", - "dagre": "~0.8.2", - "point-at-length": "~1.0.2", - "regression": "~2.0.0", - "simple-statistics": "~6.1.0", - "topojson-client": "~3.0.0", - "wolfy87-eventemitter": "~5.1.0" - } - }, "@antv/g": { "version": "3.3.6", "resolved": "https://registry.npmjs.org/@antv/g/-/g-3.3.6.tgz", @@ -107,14 +83,6 @@ "resolved": "https://registry.npmjs.org/@antv/gl-matrix/-/gl-matrix-2.7.1.tgz", "integrity": "sha512-oOWcVNlpELIKi9x+Mm1Vwbz8pXfkbJKykoCIOJ/dNK79hSIANbpXJ5d3Rra9/wZqK6MC961B7sybFhPlLraT3Q==" }, - "@antv/hierarchy": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@antv/hierarchy/-/hierarchy-0.4.0.tgz", - "integrity": "sha512-ols+m+Z8QA4895SWMTOSjVImOX4tEbWQTwJ0NE+WATc0WLSKs6D9y2yaR+ZWt6P60BMGVIKS6lIfabO3CwGgnQ==", - "requires": { - "@antv/util": "~1.3.1" - } - }, "@antv/scale": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@antv/scale/-/scale-0.1.2.tgz", @@ -1696,11 +1664,6 @@ "integrity": "sha1-XIXWYvdvodNFdXZsXc1mFavNMNg=", "dev": true }, - "abs-svg-path": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/abs-svg-path/-/abs-svg-path-0.1.1.tgz", - "integrity": "sha1-32Acjo0roQ1KdtYl4japo5wnI78=" - }, "accepts": { "version": "1.3.5", "resolved": "http://registry.npm.taobao.org/accepts/download/accepts-1.3.5.tgz", @@ -3009,7 +2972,8 @@ "commander": { "version": "2.20.0", "resolved": "http://registry.npm.taobao.org/commander/download/commander-2.20.0.tgz?cache=0&other_urls=http%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.20.0.tgz", - "integrity": "sha1-1YuytcHuj4ew00ACfp6U4iLFpCI=" + "integrity": "sha1-1YuytcHuj4ew00ACfp6U4iLFpCI=", + "dev": true }, "commondir": { "version": "1.0.1", @@ -3719,55 +3683,16 @@ "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", "dev": true }, - "d3-array": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz", - "integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==" - }, - "d3-collection": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz", - "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==" - }, "d3-color": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.2.3.tgz", "integrity": "sha512-x37qq3ChOTLd26hnps36lexMRhNXEtVxZ4B25rL0DVdDsGQIJGB18S7y9XDwlDD6MD/ZBzITCf4JjGMM10TZkw==" }, - "d3-composite-projections": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/d3-composite-projections/-/d3-composite-projections-1.2.0.tgz", - "integrity": "sha1-+g5vFELxfQRkOEOjqIPH2U4MJ8A=", - "requires": { - "d3-geo": "1.2.4", - "d3-path": "^1.0.1" - }, - "dependencies": { - "d3-geo": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.2.4.tgz", - "integrity": "sha1-0XnzuqduYj7x4Ng2k9twW3xZkAY=", - "requires": { - "d3-array": "1" - } - } - } - }, "d3-dispatch": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.5.tgz", "integrity": "sha512-vwKx+lAqB1UuCeklr6Jh1bvC4SZgbSqbkGBLClItFBIYH4vqDJCA7qfoy14lXmJdnBOdxndAMxjCbImJYW7e6g==" }, - "d3-dsv": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.0.10.tgz", - "integrity": "sha512-vqklfpxmtO2ZER3fq/B33R/BIz3A1PV0FaZRuFM8w6jLo7sUX1BZDh73fPlr0s327rzq4H6EN1q9U+eCBCSN8g==", - "requires": { - "commander": "2", - "iconv-lite": "0.4", - "rw": "1" - } - }, "d3-ease": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.5.tgz", @@ -3778,37 +3703,6 @@ "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.3.2.tgz", "integrity": "sha512-Z18Dprj96ExragQ0DeGi+SYPQ7pPfRMtUXtsg/ChVIKNBCzjO8XYJvRTC1usblx52lqge56V5ect+frYTQc8WQ==" }, - "d3-geo": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.6.4.tgz", - "integrity": "sha1-8g4eRhyxhF9ai+Vatvh2VCp+MZk=", - "requires": { - "d3-array": "1" - } - }, - "d3-geo-projection": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-2.1.2.tgz", - "integrity": "sha1-ffjh6dBG1jHGUJ9+UxNX1K3CSqM=", - "requires": { - "commander": "2", - "d3-array": "1", - "d3-geo": "^1.1.0" - } - }, - "d3-hexjson": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/d3-hexjson/-/d3-hexjson-1.0.1.tgz", - "integrity": "sha512-TeH4T0PSbDazMm3gHgc4ulO0PfrZpz0Uk3y5tCGz+NgC7HnX7KBdem7uAN+j9x3ZshTh7raN3V/bFhaLB2C8DA==", - "requires": { - "d3-array": "1" - } - }, - "d3-hierarchy": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.8.tgz", - "integrity": "sha512-L+GHMSZNwTpiq4rt9GEsNcpLa4M96lXMR8M/nMG9p5hBE0jy6C+3hWtyZMenPQdwla249iJy7Nx0uKt3n+u9+w==" - }, "d3-interpolate": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.6.tgz", @@ -3817,34 +3711,11 @@ "d3-color": "1" } }, - "d3-path": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.7.tgz", - "integrity": "sha512-q0cW1RpvA5c5ma2rch62mX8AYaiLX0+bdaSM2wxSU9tXjU4DNvkx9qiUvjkuWCj3p22UO/hlPivujqMiR9PDzA==" - }, - "d3-sankey": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/d3-sankey/-/d3-sankey-0.7.1.tgz", - "integrity": "sha1-0imDImj8aaf+yEgD6WwiVqYUxSE=", - "requires": { - "d3-array": "1", - "d3-collection": "1", - "d3-shape": "^1.2.0" - } - }, "d3-selection": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.0.tgz", "integrity": "sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg==" }, - "d3-shape": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.5.tgz", - "integrity": "sha512-VKazVR3phgD+MUCldapHD7P9kcrvPcexeX/PkMJmkUov4JM8IxsSg1DvbYoYich9AtdTsa5nNk2++ImPiDiSxg==", - "requires": { - "d3-path": "1" - } - }, "d3-timer": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.9.tgz", @@ -3863,20 +3734,6 @@ "d3-timer": "1" } }, - "d3-voronoi": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.4.tgz", - "integrity": "sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg==" - }, - "dagre": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/dagre/-/dagre-0.8.4.tgz", - "integrity": "sha512-Dj0csFDrWYKdavwROb9FccHfTC4fJbyF/oJdL9LNZJ8WUvl968P6PAKEriGqfbdArVJEmmfA+UyumgWEwcHU6A==", - "requires": { - "graphlib": "^2.1.7", - "lodash": "^4.17.4" - } - }, "dashdash": { "version": "1.14.1", "resolved": "http://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz", @@ -6094,14 +5951,6 @@ "integrity": "sha1-/7cD4QZuig7qpMi4C6klPu77+wA=", "dev": true }, - "graphlib": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.7.tgz", - "integrity": "sha512-TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w==", - "requires": { - "lodash": "^4.17.5" - } - }, "gzip-size": { "version": "5.1.0", "resolved": "http://registry.npm.taobao.org/gzip-size/download/gzip-size-5.1.0.tgz", @@ -6468,6 +6317,7 @@ "version": "0.4.24", "resolved": "http://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.24.tgz", "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=", + "dev": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" } @@ -8363,11 +8213,6 @@ "json-parse-better-errors": "^1.0.1" } }, - "parse-svg-path": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/parse-svg-path/-/parse-svg-path-0.1.2.tgz", - "integrity": "sha1-en7A0esG+lMlx9PgCbhZoJtdSes=" - }, "parseurl": { "version": "1.3.3", "resolved": "http://registry.npm.taobao.org/parseurl/download/parseurl-1.3.3.tgz", @@ -8499,23 +8344,6 @@ "dev": true, "optional": true }, - "point-at-length": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/point-at-length/-/point-at-length-1.0.2.tgz", - "integrity": "sha1-kXbY1tfIFi8Stkb3B9ufDqcoEl4=", - "requires": { - "abs-svg-path": "~0.1.1", - "isarray": "~0.0.1", - "parse-svg-path": "~0.1.1" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" - } - } - }, "portfinder": { "version": "1.0.20", "resolved": "http://registry.npm.taobao.org/portfinder/download/portfinder-1.0.20.tgz", @@ -9245,8 +9073,7 @@ "qs": { "version": "6.7.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", - "dev": true + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" }, "query-string": { "version": "5.1.1", @@ -9451,11 +9278,6 @@ } } }, - "regression": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/regression/-/regression-2.0.1.tgz", - "integrity": "sha1-jSnD6CJKEIUMNeM36FqLL6w7DIc=" - }, "relateurl": { "version": "0.2.7", "resolved": "http://registry.npm.taobao.org/relateurl/download/relateurl-0.2.7.tgz", @@ -9857,7 +9679,8 @@ "safer-buffer": { "version": "2.1.2", "resolved": "http://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz", - "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=" + "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=", + "dev": true }, "sass": { "version": "1.21.0", @@ -10124,11 +9947,6 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, - "simple-statistics": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/simple-statistics/-/simple-statistics-6.1.1.tgz", - "integrity": "sha512-zGwn0DDRa9Zel4H4n2pjTFIyGoAGpnpjrGIctreCxj5XWrcx9v7Xy7270FkC967WMmcvuc8ZU7m0ZG+hGN7gAA==" - }, "simple-swizzle": { "version": "0.2.2", "resolved": "http://registry.npm.taobao.org/simple-swizzle/download/simple-swizzle-0.2.2.tgz", @@ -11005,14 +10823,6 @@ "hoek": "6.x.x" } }, - "topojson-client": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/topojson-client/-/topojson-client-3.0.0.tgz", - "integrity": "sha1-H5kpOnfvQqRI0DKoGqmCtz82DS8=", - "requires": { - "commander": "2" - } - }, "toposort": { "version": "1.0.7", "resolved": "http://registry.npm.taobao.org/toposort/download/toposort-1.0.7.tgz", diff --git a/public/a.html b/public/a.html deleted file mode 100644 index 2b474af..0000000 --- a/public/a.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - Title - - - - - - -
-

Hello App!

-

- - - - Home - About -

- - - -
- - - \ No newline at end of file diff --git a/public/favicon.ico b/public/favicon.ico index df36fcf..fbd4bfc 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/index.html b/public/index.html index 81d103d..613fda9 100644 --- a/public/index.html +++ b/public/index.html @@ -5,6 +5,8 @@ 急性高原反应自评 - 管理平台 + + ")}catch(e){console&&console.log(e)}}ready(appendSvg)})(window) \ No newline at end of file diff --git a/src/components/YCIcon/icons.svg b/src/components/YCIcon/icons.svg deleted file mode 100644 index dbc120d..0000000 --- a/src/components/YCIcon/icons.svg +++ /dev/null @@ -1,1496 +0,0 @@ - - - - - -Created by iconfont - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/components/YCIcon/index.vue b/src/components/YCIcon/index.vue deleted file mode 100644 index 62debed..0000000 --- a/src/components/YCIcon/index.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main.js b/src/main.js index db01284..183720f 100644 --- a/src/main.js +++ b/src/main.js @@ -2,7 +2,7 @@ import Vue from 'vue' import App from './App' import router from './router' import Element from 'element-ui' -import Viser from 'viser-vue'; +// import Viser from 'viser-vue'; // import YCIcon from './components/YCIcon' import './assets/element-theme.scss' import 'element-ui/lib/theme-chalk/reset.css' @@ -12,7 +12,7 @@ import './assets/index.less' // require('es6-promise').polyfill() Vue.use(Element, {size: 'medium'}) // 加载element-ui -Vue.use(Viser) +// Vue.use(Viser) // Vue.use(YCIcon); // 加载图标 Vue.config.productionTip = false diff --git a/src/pages/user/Index.vue b/src/pages/user/Index.vue index 35fca3e..43f66fe 100644 --- a/src/pages/user/Index.vue +++ b/src/pages/user/Index.vue @@ -192,14 +192,13 @@ .user-head-name { height: 80px; + display: flex; &:after { content: ' '; display: block; clear: both; } .img { - - float: left; } img { width: 80px; @@ -212,7 +211,7 @@ position: relative; height: 80px; padding-top: 10px; - margin-left: 80px; + overflow: hidden; p { height: 30px; line-height: 30px; diff --git a/src/pages/user/Login.vue b/src/pages/user/Login.vue index 8170c6a..076224c 100644 --- a/src/pages/user/Login.vue +++ b/src/pages/user/Login.vue @@ -4,8 +4,7 @@
- 急性高原反应自评 - 管理平台 + 急性高原反应自评 管理平台
{ if (valid) { this.loginLoading = true; @@ -91,6 +91,7 @@ try { data = await adminLogin(this.ruleForm); } catch (error) { + window.console.log('login -error'); } if (data.code && data.code != 0) { this.loginLoading = false; @@ -101,7 +102,7 @@ let redirect = this.$router.query && this.$router.query.redirect ?this.$router.query.redirect:null; - this.$router.push(redirect?redirect:"/"); + that.$router.push(redirect?redirect:"/users"); } } else { // this.$message.error('请填写正确的登录信息'); diff --git a/src/router/routes.js b/src/router/routes.js index 58537f3..b2821fe 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -1,17 +1,12 @@ import LoginPage from './../pages/user/Login'; export const adminRoutes = [ - { - path: '/', - redirect: '/dashboard', - name: 'home' - }, - { - path: '/dashboard', - name: 'dashboard', - component: ()=>import(/* Dashboard */'./../pages/Dashboard'), - icon: 'home' - }, + // { + // path: '/dashboard', + // name: 'dashboard', + // component: ()=>import(/* Dashboard */'./../pages/Dashboard'), + // icon: 'home' + // }, { path: '/users', name: 'user_index', @@ -27,11 +22,6 @@ export const adminRoutes = [ ]; const routes = [ - { - path: '/user', - redirect: '/user/login', - name: 'user_index' - }, { path: '/user/login', name: 'user_login', @@ -50,7 +40,7 @@ const routes = [ { path: '/', component: () => import( /* layout_admin */ './../pages/Layout.vue'), - //children + //children children: adminRoutes }, { diff --git a/src/utils/config.js b/src/utils/config.js index d353345..d1d5a92 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -1,7 +1,7 @@ let currentUserData = null; export default { // apiUrl:'//home.xiaoyan.me:10086/api/v1', - apiUrl: '//127.0.0.1:8000', + apiUrl: 'https://home.xiaoyan.me:10087/are/api/v1', /** * h呵呵呵 */ diff --git a/vue.config.js b/vue.config.js new file mode 100644 index 0000000..42c875b --- /dev/null +++ b/vue.config.js @@ -0,0 +1,31 @@ +module.exports = { + outputDir: 'dist', + //生产环境是否生成 sourceMap 文件 + productionSourceMap: false, + // cors 相关 https://jakearchibald.com/2017/es-modules-in-browsers/#always-cors + // corsUseCredentials: false, + // webpack 配置,键值对象时会合并配置,为方法时会改写配置 + // https://cli.vuejs.org/guide/webpack.html#simple-configuration + configureWebpack: (config) => { + if (process.env.NODE_ENV === 'production') { + // 为生产环境修改配置... + } else { + // 为开发环境修改配置... + } + return { + externals:{ + 'vue': 'Vue', + 'vue-router': 'VueRouter', + 'i18n': 'i18n', + "element-ui": 'ELEMENT' + } + } + }, + chainWebpack: (config) => { + // 因为是多页面,所以取消 chunks,每个页面只对应一个单独的 JS / CSS + // config.optimization.splitChunks({ + // cacheGroups: {} + // }); + } + +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 7bd5d39..46b0ed0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -32,6 +32,7 @@ "@antv/data-set@^0.10.2": version "0.10.2" resolved "https://registry.npm.taobao.org/@antv/data-set/download/@antv/data-set-0.10.2.tgz#584a9574e7e0853847cb658d51b9f7345a00032f" + integrity sha1-WEqVdOfghThHy2WNUbn3NFoAAy8= dependencies: "@antv/hierarchy" "~0.4.0" "@antv/util" "~1.3.1" @@ -91,6 +92,7 @@ "@antv/hierarchy@~0.4.0": version "0.4.0" resolved "https://registry.npm.taobao.org/@antv/hierarchy/download/@antv/hierarchy-0.4.0.tgz#712b5b4477ee0b8b8db174c682b5356b0411aab6" + integrity sha1-cStbRHfuC4uNsXTGgrU1awQRqrY= dependencies: "@antv/util" "~1.3.1" @@ -1106,6 +1108,7 @@ abbrev@1: abs-svg-path@~0.1.1: version "0.1.1" resolved "https://registry.npm.taobao.org/abs-svg-path/download/abs-svg-path-0.1.1.tgz#df601c8e8d2ba10d4a76d625e236a9a39c2723bf" + integrity sha1-32Acjo0roQ1KdtYl4japo5wnI78= accepts@~1.3.4, accepts@~1.3.5: version "1.3.7" @@ -2028,6 +2031,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: commander@2, commander@^2.18.0, commander@^2.19.0: version "2.20.0" resolved "https://registry.npm.taobao.org/commander/download/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" + integrity sha1-1YuytcHuj4ew00ACfp6U4iLFpCI= commander@2.17.x: version "2.17.1" @@ -2413,21 +2417,24 @@ cyclist@~0.2.2: d3-array@1, d3-array@~1.2.0: version "1.2.4" resolved "https://registry.npm.taobao.org/d3-array/download/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f" + integrity sha1-Y1zk1e6nWfb2BYY9vPww7cc39x8= d3-collection@1: version "1.0.7" resolved "https://registry.npm.taobao.org/d3-collection/download/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e" + integrity sha1-NJvSqpl32wcQkcExRNXk8WtbMQ4= d3-color@1: version "1.2.3" resolved "https://registry.npm.taobao.org/d3-color/download/d3-color-1.2.3.tgz#6c67bb2af6df3cc8d79efcc4d3a3e83e28c8048f" d3-composite-projections@~1.2.0: - version "1.2.0" - resolved "https://registry.npm.taobao.org/d3-composite-projections/download/d3-composite-projections-1.2.0.tgz#fa0e6f1442f17d04643843a3a883c7d94e0c27c0" + version "1.2.2" + resolved "https://registry.npm.taobao.org/d3-composite-projections/download/d3-composite-projections-1.2.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fd3-composite-projections%2Fdownload%2Fd3-composite-projections-1.2.2.tgz#24837d3c70ce9270398f11c722548a4688bb15a7" + integrity sha1-JIN9PHDOknA5jxHHIlSKRoi7Fac= dependencies: - d3-geo "1.2.4" - d3-path "^1.0.1" + d3-geo "^1.11" + d3-path "^1.0.7" d3-dispatch@1: version "1.0.5" @@ -2436,6 +2443,7 @@ d3-dispatch@1: d3-dsv@~1.0.5: version "1.0.10" resolved "https://registry.npm.taobao.org/d3-dsv/download/d3-dsv-1.0.10.tgz#4371c489a2a654a297aca16fcaf605a6f31a6f51" + integrity sha1-Q3HEiaKmVKKXrKFvyvYFpvMab1E= dependencies: commander "2" iconv-lite "0.4" @@ -2452,38 +2460,37 @@ d3-format@^1.3.0: d3-geo-projection@~2.1.2: version "2.1.2" resolved "https://registry.npm.taobao.org/d3-geo-projection/download/d3-geo-projection-2.1.2.tgz#7df8e1e9d046d631c6509f7e531357d4adc24aa3" + integrity sha1-ffjh6dBG1jHGUJ9+UxNX1K3CSqM= dependencies: commander "2" d3-array "1" d3-geo "^1.1.0" -d3-geo@1.2.4: - version "1.2.4" - resolved "https://registry.npm.taobao.org/d3-geo/download/d3-geo-1.2.4.tgz#d179f3baa76e623ef1e0d83693db705b7c599006" - dependencies: - d3-array "1" - -d3-geo@^1.1.0: - version "1.11.3" - resolved "https://registry.npm.taobao.org/d3-geo/download/d3-geo-1.11.3.tgz#5bb08388f45e4b281491faa72d3abd43215dbd1c" +d3-geo@^1.1.0, d3-geo@^1.11: + version "1.11.6" + resolved "https://registry.npm.taobao.org/d3-geo/download/d3-geo-1.11.6.tgz#134f2ef035ff75a448075fafdea92702a2e0e0cf" + integrity sha1-E08u8DX/daRIB1+v3qknAqLg4M8= dependencies: d3-array "1" d3-geo@~1.6.4: version "1.6.4" resolved "https://registry.npm.taobao.org/d3-geo/download/d3-geo-1.6.4.tgz#f20e1e461cb1845f5a8be55ab6f876542a7e3199" + integrity sha1-8g4eRhyxhF9ai+Vatvh2VCp+MZk= dependencies: d3-array "1" d3-hexjson@~1.0.1: version "1.0.1" resolved "https://registry.npm.taobao.org/d3-hexjson/download/d3-hexjson-1.0.1.tgz#6a23111e8359f1e214f5d0afa379c02b2b67df0b" + integrity sha1-aiMRHoNZ8eIU9dCvo3nAKytn3ws= dependencies: d3-array "1" d3-hierarchy@~1.1.5: version "1.1.8" resolved "https://registry.npm.taobao.org/d3-hierarchy/download/d3-hierarchy-1.1.8.tgz#7a6317bd3ed24e324641b6f1e76e978836b008cc" + integrity sha1-emMXvT7STjJGQbbx526XiDawCMw= d3-interpolate@1: version "1.3.2" @@ -2497,13 +2504,15 @@ d3-interpolate@~1.1.5: dependencies: d3-color "1" -d3-path@1, d3-path@^1.0.1: +d3-path@1, d3-path@^1.0.7: version "1.0.7" resolved "https://registry.npm.taobao.org/d3-path/download/d3-path-1.0.7.tgz#8de7cd693a75ac0b5480d3abaccd94793e58aae8" + integrity sha1-jefNaTp1rAtUgNOrrM2UeT5Yqug= d3-sankey@~0.7.1: version "0.7.1" resolved "https://registry.npm.taobao.org/d3-sankey/download/d3-sankey-0.7.1.tgz#d229832268fc69a7fec84803e96c2256a614c521" + integrity sha1-0imDImj8aaf+yEgD6WwiVqYUxSE= dependencies: d3-array "1" d3-collection "1" @@ -2516,6 +2525,7 @@ d3-selection@^1.0.2, d3-selection@^1.1.0: d3-shape@^1.2.0: version "1.3.5" resolved "https://registry.npm.taobao.org/d3-shape/download/d3-shape-1.3.5.tgz#e81aea5940f59f0a79cfccac012232a8987c6033" + integrity sha1-6BrqWUD1nwp5z8ysASIyqJh8YDM= dependencies: d3-path "1" @@ -2537,10 +2547,12 @@ d3-transition@^1.0.1: d3-voronoi@~1.1.2: version "1.1.4" resolved "https://registry.npm.taobao.org/d3-voronoi/download/d3-voronoi-1.1.4.tgz#dd3c78d7653d2bb359284ae478645d95944c8297" + integrity sha1-3Tx412U9K7NZKErkeGRdlZRMgpc= dagre@~0.8.2: version "0.8.4" resolved "https://registry.npm.taobao.org/dagre/download/dagre-0.8.4.tgz#26b9fb8f7bdc60c6110a0458c375261836786061" + integrity sha1-Jrn7j3vcYMYRCgRYw3UmGDZ4YGE= dependencies: graphlib "^2.1.7" lodash "^4.17.4" @@ -3661,6 +3673,7 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6 graphlib@^2.1.7: version "2.1.7" resolved "https://registry.npm.taobao.org/graphlib/download/graphlib-2.1.7.tgz#b6a69f9f44bd9de3963ce6804a2fc9e73d86aecc" + integrity sha1-tqafn0S9neOWPOaASi/J5z2Grsw= dependencies: lodash "^4.17.5" @@ -3899,7 +3912,8 @@ https-browserify@^1.0.0: iconv-lite@0.4, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4: version "0.4.24" - resolved "https://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + resolved "https://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.24.tgz?cache=0&sync_timestamp=1561588160612&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ficonv-lite%2Fdownload%2Ficonv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha1-ICK0sl+93CHS9SSXSkdKr+czkIs= dependencies: safer-buffer ">= 2.1.2 < 3" @@ -4291,6 +4305,7 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: isarray@~0.0.1: version "0.0.1" resolved "https://registry.npm.taobao.org/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= isemail@3.x.x: version "3.2.0" @@ -5375,6 +5390,7 @@ parse-json@^4.0.0: parse-svg-path@~0.1.1: version "0.1.2" resolved "https://registry.npm.taobao.org/parse-svg-path/download/parse-svg-path-0.1.2.tgz#7a7ec0d1eb06fa5325c7d3e009b859a09b5d49eb" + integrity sha1-en7A0esG+lMlx9PgCbhZoJtdSes= parse5@^4.0.0: version "4.0.0" @@ -5499,6 +5515,7 @@ pluralize@^7.0.0: point-at-length@~1.0.2: version "1.0.2" resolved "https://registry.npm.taobao.org/point-at-length/download/point-at-length-1.0.2.tgz#9176d8d6d7c8162f12b646f707db9f0ea728125e" + integrity sha1-kXbY1tfIFi8Stkb3B9ufDqcoEl4= dependencies: abs-svg-path "~0.1.1" isarray "~0.0.1" @@ -6114,6 +6131,7 @@ regjsparser@^0.6.0: regression@~2.0.0: version "2.0.1" resolved "https://registry.npm.taobao.org/regression/download/regression-2.0.1.tgz#8d29c3e8224a10850c35e337e85a8b2fac3b0c87" + integrity sha1-jSnD6CJKEIUMNeM36FqLL6w7DIc= relateurl@0.2.x: version "0.2.7" @@ -6306,6 +6324,7 @@ run-queue@^1.0.0, run-queue@^1.0.3: rw@1, rw@^1.3.2: version "1.3.3" resolved "https://registry.npm.taobao.org/rw/download/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" + integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q= rx-lite-aggregates@^4.0.8: version "4.0.8" @@ -6505,6 +6524,7 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: simple-statistics@~6.1.0: version "6.1.1" resolved "https://registry.npm.taobao.org/simple-statistics/download/simple-statistics-6.1.1.tgz#e3a0799ffc49914d6f421c5a4ac585f6a13e2bad" + integrity sha1-46B5n/xJkU1vQhxaSsWF9qE+K60= simple-swizzle@^0.2.2: version "0.2.2" @@ -7077,6 +7097,7 @@ topo@3.x.x: topojson-client@~3.0.0: version "3.0.0" resolved "https://registry.npm.taobao.org/topojson-client/download/topojson-client-3.0.0.tgz#1f99293a77ef42a448d032a81aa982b73f360d2f" + integrity sha1-H5kpOnfvQqRI0DKoGqmCtz82DS8= dependencies: commander "2"