diff --git a/config/index.js b/config/index.js
index 325121c..21da454 100644
--- a/config/index.js
+++ b/config/index.js
@@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2021-11-19 10:10:51
* @LastEditors: gtz
- * @LastEditTime: 2021-12-08 16:04:48
+ * @LastEditTime: 2021-12-10 09:04:19
* @Description: file content
* @FilePath: \mt-qj-wms-ui\config\index.js
*/
@@ -22,7 +22,7 @@ module.exports = {
// 代理列表, 是否开启代理通过[./dev.env.js]配置
proxyTable: devEnv.OPEN_PROXY === false ? {} : {
'/proxyApi': {
- target: 'http://192.168.0.134:8080/',
+ target: 'http://192.168.0.134:8080',
changeOrigin: true,
pathRewrite: {
'^/proxyApi': '/api'
diff --git a/package-lock.json b/package-lock.json
index c37186c..a82eaf3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,52 +4,12 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
- "@babel/code-frame": {
- "version": "7.16.0",
- "resolved": "https://registry.npmmirror.com/@babel/code-frame/download/@babel/code-frame-7.16.0.tgz?cache=0&sync_timestamp=1635560657003&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcode-frame%2Fdownload%2F%40babel%2Fcode-frame-7.16.0.tgz",
- "integrity": "sha1-DfyAMJvuyEEeZecGRhxAiwu5tDE=",
- "requires": {
- "@babel/highlight": "^7.16.0"
- }
- },
- "@babel/helper-validator-identifier": {
- "version": "7.15.7",
- "resolved": "https://registry.nlark.com/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.15.7.tgz?cache=0&sync_timestamp=1631920857390&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-validator-identifier%2Fdownload%2F%40babel%2Fhelper-validator-identifier-7.15.7.tgz",
- "integrity": "sha1-Ig35k7/pBKSmsCq08zhaXr9uI4k="
- },
- "@babel/highlight": {
- "version": "7.16.0",
- "resolved": "https://registry.npmmirror.com/@babel/highlight/download/@babel/highlight-7.16.0.tgz",
- "integrity": "sha1-bOsysspLj182H7f9gh4/3fShclo=",
- "requires": {
- "@babel/helper-validator-identifier": "^7.15.7",
- "chalk": "^2.0.0",
- "js-tokens": "^4.0.0"
- },
- "dependencies": {
- "js-tokens": {
- "version": "4.0.0",
- "resolved": "https://registry.nlark.com/js-tokens/download/js-tokens-4.0.0.tgz",
- "integrity": "sha1-GSA/tZmR35jjoocFDUZHzerzJJk="
- }
- }
- },
- "@types/minimist": {
- "version": "1.2.2",
- "resolved": "https://registry.nlark.com/@types/minimist/download/@types/minimist-1.2.2.tgz?cache=0&sync_timestamp=1629708337116&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fminimist%2Fdownload%2F%40types%2Fminimist-1.2.2.tgz",
- "integrity": "sha1-7nceK6Sz3Fs3KTXVSf2WF780W4w="
- },
"@types/node": {
"version": "8.10.48",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.48.tgz",
"integrity": "sha512-c35YEBTkL4rzXY2ucpSKy+UYHjUBIIkuJbWYbsGIrKLEWU5dgJMmLkkIb3qeC3O3Tpb1ZQCwecscvJTDjDjkRw==",
"dev": true
},
- "@types/normalize-package-data": {
- "version": "2.4.1",
- "resolved": "https://registry.nlark.com/@types/normalize-package-data/download/@types/normalize-package-data-2.4.1.tgz?cache=0&sync_timestamp=1629708548426&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fnormalize-package-data%2Fdownload%2F%40types%2Fnormalize-package-data-2.4.1.tgz",
- "integrity": "sha1-0zV0eaD9/dWQf+Z+F+CoXJBuEwE="
- },
"@types/strip-bom": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -157,7 +117,7 @@
},
"ajv": {
"version": "6.12.6",
- "resolved": "https://registry.npmmirror.com/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1636828500604&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-6.12.6.tgz",
+ "resolved": "https://registry.npmmirror.com/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1637522259668&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-6.12.6.tgz",
"integrity": "sha1-uvWmLoArB9l3A0WG+MO69a3ybfQ=",
"requires": {
"fast-deep-equal": "^3.1.1",
@@ -366,8 +326,7 @@
"array-find-index": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
- "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
- "dev": true
+ "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
},
"array-flatten": {
"version": "1.1.1",
@@ -412,7 +371,8 @@
"arrify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
- "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+ "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+ "dev": true
},
"asn1": {
"version": "0.2.4",
@@ -1760,6 +1720,14 @@
"resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-1.0.1.tgz",
"integrity": "sha1-HmN0iLNbWL2l9HdL+WpSEqjJB1U="
},
+ "block-stream": {
+ "version": "0.0.9",
+ "resolved": "https://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz",
+ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+ "requires": {
+ "inherits": "~2.0.0"
+ }
+ },
"bluebird": {
"version": "3.5.4",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
@@ -2213,14 +2181,12 @@
"camelcase": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
- "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
- "dev": true
+ "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
},
"camelcase-keys": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
- "dev": true,
"requires": {
"camelcase": "^2.0.0",
"map-obj": "^1.0.0"
@@ -2308,6 +2274,7 @@
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+ "dev": true,
"requires": {
"ansi-styles": "^3.1.0",
"escape-string-regexp": "^1.0.5",
@@ -2318,6 +2285,7 @@
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
"requires": {
"color-convert": "^1.9.0"
}
@@ -2325,12 +2293,14 @@
"has-flag": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
- "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
+ "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+ "dev": true
},
"supports-color": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+ "dev": true,
"requires": {
"has-flag": "^2.0.0"
}
@@ -3362,7 +3332,6 @@
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
"integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
- "dev": true,
"requires": {
"array-find-index": "^1.0.1"
}
@@ -3429,15 +3398,6 @@
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
},
- "decamelize-keys": {
- "version": "1.1.0",
- "resolved": "https://registry.nlark.com/decamelize-keys/download/decamelize-keys-1.1.0.tgz",
- "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
- "requires": {
- "decamelize": "^1.1.0",
- "map-obj": "^1.0.0"
- }
- },
"decode-uri-component": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
@@ -3974,11 +3934,6 @@
"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
"integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
},
- "env-paths": {
- "version": "2.2.1",
- "resolved": "https://registry.nlark.com/env-paths/download/env-paths-2.2.1.tgz?cache=0&sync_timestamp=1630095479786&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fenv-paths%2Fdownload%2Fenv-paths-2.2.1.tgz",
- "integrity": "sha1-QgOZ1BbOH76bwKB8Yvpo1n/Q+PI="
- },
"errno": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
@@ -5284,7 +5239,6 @@
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
- "dev": true,
"requires": {
"path-exists": "^2.0.0",
"pinkie-promise": "^2.0.0"
@@ -5573,14 +5527,6 @@
}
}
},
- "fs-minipass": {
- "version": "2.1.0",
- "resolved": "https://registry.npm.taobao.org/fs-minipass/download/fs-minipass-2.1.0.tgz",
- "integrity": "sha1-f1A2/b8SxjwWkZDL5BmchSJx+fs=",
- "requires": {
- "minipass": "^3.0.0"
- }
- },
"fs-write-stream-atomic": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
@@ -6154,6 +6100,24 @@
}
}
},
+ "fstream": {
+ "version": "1.0.12",
+ "resolved": "https://registry.npm.taobao.org/fstream/download/fstream-1.0.12.tgz",
+ "integrity": "sha1-Touo7i1Ivk99DeUFRVVI6uWTIEU=",
+ "requires": {
+ "graceful-fs": "^4.1.2",
+ "inherits": "~2.0.0",
+ "mkdirp": ">=0.5 0",
+ "rimraf": "2"
+ },
+ "dependencies": {
+ "graceful-fs": {
+ "version": "4.2.8",
+ "resolved": "https://registry.npmmirror.com/graceful-fs/download/graceful-fs-4.2.8.tgz",
+ "integrity": "sha1-5BK40z9eAGWTy9PO5t+fLOu+gCo="
+ }
+ }
+ },
"ftp": {
"version": "0.3.10",
"resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
@@ -6167,11 +6131,12 @@
"function-bind": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+ "dev": true
},
"gauge": {
"version": "2.7.4",
- "resolved": "https://registry.nlark.com/gauge/download/gauge-2.7.4.tgz?cache=0&sync_timestamp=1627307755867&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fgauge%2Fdownload%2Fgauge-2.7.4.tgz",
+ "resolved": "https://registry.npmmirror.com/gauge/download/gauge-2.7.4.tgz?cache=0&sync_timestamp=1636989413004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fgauge%2Fdownload%2Fgauge-2.7.4.tgz",
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"requires": {
"aproba": "^1.0.3",
@@ -6977,15 +6942,11 @@
"har-schema": "^2.0.0"
}
},
- "hard-rejection": {
- "version": "2.1.0",
- "resolved": "https://registry.nlark.com/hard-rejection/download/hard-rejection-2.1.0.tgz",
- "integrity": "sha1-HG7aXBaFxjlCdm15u0Cudzzs2IM="
- },
"has": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+ "dev": true,
"requires": {
"function-bind": "^1.1.1"
}
@@ -7132,8 +7093,7 @@
"hosted-git-info": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
- "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
- "dev": true
+ "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
},
"hpack.js": {
"version": "2.1.6",
@@ -7478,7 +7438,7 @@
},
"http-signature": {
"version": "1.2.0",
- "resolved": "https://registry.npm.taobao.org/http-signature/download/http-signature-1.2.0.tgz?cache=0&sync_timestamp=1600868555829&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhttp-signature%2Fdownload%2Fhttp-signature-1.2.0.tgz",
+ "resolved": "https://registry.npmmirror.com/http-signature/download/http-signature-1.2.0.tgz?cache=0&sync_timestamp=1637178514819&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-signature%2Fdownload%2Fhttp-signature-1.2.0.tgz",
"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
"requires": {
"assert-plus": "^1.0.0",
@@ -7546,11 +7506,15 @@
"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
"dev": true
},
+ "in-publish": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npm.taobao.org/in-publish/download/in-publish-2.0.1.tgz",
+ "integrity": "sha1-lIsaU1yAMFYc6lIvc/ePS+NX4Aw="
+ },
"indent-string": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
- "dev": true,
"requires": {
"repeating": "^2.0.0"
}
@@ -7739,14 +7703,6 @@
"ci-info": "^1.5.0"
}
},
- "is-core-module": {
- "version": "2.8.0",
- "resolved": "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz",
- "integrity": "sha1-AyEzbD0JJeSX/Zf12VyxFKXM1Ug=",
- "requires": {
- "has": "^1.0.3"
- }
- },
"is-data-descriptor": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -7821,7 +7777,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
- "dev": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -9419,11 +9374,6 @@
"integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
"dev": true
},
- "json-parse-even-better-errors": {
- "version": "2.3.1",
- "resolved": "https://registry.npm.taobao.org/json-parse-even-better-errors/download/json-parse-even-better-errors-2.3.1.tgz",
- "integrity": "sha1-fEeAWpQxmSjgV3dAXcEuH3pO4C0="
- },
"json-schema": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -9587,16 +9537,10 @@
"resolve": "^1.1.7"
}
},
- "lines-and-columns": {
- "version": "1.1.6",
- "resolved": "https://registry.nlark.com/lines-and-columns/download/lines-and-columns-1.1.6.tgz",
- "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
- },
"load-json-file": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
- "dev": true,
"requires": {
"graceful-fs": "^4.1.2",
"parse-json": "^2.2.0",
@@ -9608,14 +9552,12 @@
"graceful-fs": {
"version": "4.1.15",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
- "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
- "dev": true
+ "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
},
"strip-bom": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
- "dev": true,
"requires": {
"is-utf8": "^0.2.0"
}
@@ -9962,7 +9904,6 @@
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
"integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
- "dev": true,
"requires": {
"currently-unhandled": "^0.4.1",
"signal-exit": "^3.0.0"
@@ -10114,7 +10055,6 @@
"version": "3.7.0",
"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
- "dev": true,
"requires": {
"camelcase-keys": "^2.0.0",
"decamelize": "^1.1.2",
@@ -10131,8 +10071,7 @@
"object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
- "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
- "dev": true
+ "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
}
}
},
@@ -10217,11 +10156,6 @@
"integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
"dev": true
},
- "min-indent": {
- "version": "1.0.1",
- "resolved": "https://registry.npm.taobao.org/min-indent/download/min-indent-1.0.1.tgz",
- "integrity": "sha1-pj9oFnOzBXH76LwlaGrnRu76mGk="
- },
"minimalistic-assert": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -10247,54 +10181,6 @@
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
},
- "minimist-options": {
- "version": "4.1.0",
- "resolved": "https://registry.npm.taobao.org/minimist-options/download/minimist-options-4.1.0.tgz",
- "integrity": "sha1-wGVXE8U6ii69d/+iR9NCxA8BBhk=",
- "requires": {
- "arrify": "^1.0.1",
- "is-plain-obj": "^1.1.0",
- "kind-of": "^6.0.3"
- },
- "dependencies": {
- "kind-of": {
- "version": "6.0.3",
- "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz",
- "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0="
- }
- }
- },
- "minipass": {
- "version": "3.1.5",
- "resolved": "https://registry.nlark.com/minipass/download/minipass-3.1.5.tgz",
- "integrity": "sha1-cfYlGwozpJwBs8+X/3ftoDDf9zI=",
- "requires": {
- "yallist": "^4.0.0"
- },
- "dependencies": {
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.nlark.com/yallist/download/yallist-4.0.0.tgz",
- "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI="
- }
- }
- },
- "minizlib": {
- "version": "2.1.2",
- "resolved": "https://registry.npm.taobao.org/minizlib/download/minizlib-2.1.2.tgz",
- "integrity": "sha1-6Q00Zrogm5MkUVCKEc49NjIUWTE=",
- "requires": {
- "minipass": "^3.0.0",
- "yallist": "^4.0.0"
- },
- "dependencies": {
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.nlark.com/yallist/download/yallist-4.0.0.tgz",
- "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI="
- }
- }
- },
"mississippi": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
@@ -10686,20 +10572,22 @@
"dev": true
},
"node-gyp": {
- "version": "7.1.2",
- "resolved": "https://registry.npmmirror.com/node-gyp/download/node-gyp-7.1.2.tgz?cache=0&sync_timestamp=1636105025371&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnode-gyp%2Fdownload%2Fnode-gyp-7.1.2.tgz",
- "integrity": "sha1-IagQrrsYcSAlHDvOyXmvFYexiK4=",
+ "version": "3.8.0",
+ "resolved": "https://registry.npmmirror.com/node-gyp/download/node-gyp-3.8.0.tgz?cache=0&sync_timestamp=1637570140025&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnode-gyp%2Fdownload%2Fnode-gyp-3.8.0.tgz",
+ "integrity": "sha1-VAMEJhwzDoDQ1e3OJTpoyzlkIYw=",
"requires": {
- "env-paths": "^2.2.0",
- "glob": "^7.1.4",
- "graceful-fs": "^4.2.3",
- "nopt": "^5.0.0",
- "npmlog": "^4.1.2",
- "request": "^2.88.2",
- "rimraf": "^3.0.2",
- "semver": "^7.3.2",
- "tar": "^6.0.2",
- "which": "^2.0.2"
+ "fstream": "^1.0.0",
+ "glob": "^7.0.3",
+ "graceful-fs": "^4.1.2",
+ "mkdirp": "^0.5.0",
+ "nopt": "2 || 3",
+ "npmlog": "0 || 1 || 2 || 3 || 4",
+ "osenv": "0",
+ "request": "^2.87.0",
+ "rimraf": "2",
+ "semver": "~5.3.0",
+ "tar": "^2.0.0",
+ "which": "1"
},
"dependencies": {
"glob": {
@@ -10720,14 +10608,6 @@
"resolved": "https://registry.npmmirror.com/graceful-fs/download/graceful-fs-4.2.8.tgz",
"integrity": "sha1-5BK40z9eAGWTy9PO5t+fLOu+gCo="
},
- "lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz",
- "integrity": "sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ=",
- "requires": {
- "yallist": "^4.0.0"
- }
- },
"minimatch": {
"version": "3.0.4",
"resolved": "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz",
@@ -10763,22 +10643,6 @@
"uuid": "^3.3.2"
}
},
- "rimraf": {
- "version": "3.0.2",
- "resolved": "https://registry.npm.taobao.org/rimraf/download/rimraf-3.0.2.tgz",
- "integrity": "sha1-8aVAK6YiCtUswSgrrBrjqkn9Bho=",
- "requires": {
- "glob": "^7.1.3"
- }
- },
- "semver": {
- "version": "7.3.5",
- "resolved": "https://registry.nlark.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz",
- "integrity": "sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc=",
- "requires": {
- "lru-cache": "^6.0.0"
- }
- },
"tough-cookie": {
"version": "2.5.0",
"resolved": "https://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.5.0.tgz",
@@ -10787,19 +10651,6 @@
"psl": "^1.1.28",
"punycode": "^2.1.1"
}
- },
- "which": {
- "version": "2.0.2",
- "resolved": "https://registry.nlark.com/which/download/which-2.0.2.tgz",
- "integrity": "sha1-fGqN0KY2oDJ+ELWckobu6T8/UbE=",
- "requires": {
- "isexe": "^2.0.0"
- }
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.nlark.com/yallist/download/yallist-4.0.0.tgz",
- "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI="
}
}
},
@@ -10902,20 +10753,22 @@
}
},
"node-sass": {
- "version": "6.0.1",
- "resolved": "https://registry.npmmirror.com/node-sass/download/node-sass-6.0.1.tgz",
- "integrity": "sha1-ytHM0M5j41xxgfVF2LmG86moh/4=",
+ "version": "4.14.1",
+ "resolved": "https://registry.npmmirror.com/node-sass/download/node-sass-4.14.1.tgz",
+ "integrity": "sha1-mch+wu+3BH7WOPtMnbfzpC4iF7U=",
"requires": {
"async-foreach": "^0.1.3",
"chalk": "^1.1.1",
- "cross-spawn": "^7.0.3",
+ "cross-spawn": "^3.0.0",
"gaze": "^1.0.0",
"get-stdin": "^4.0.1",
"glob": "^7.0.3",
+ "in-publish": "^2.0.0",
"lodash": "^4.17.15",
- "meow": "^9.0.0",
+ "meow": "^3.7.0",
+ "mkdirp": "^0.5.1",
"nan": "^2.13.2",
- "node-gyp": "^7.1.0",
+ "node-gyp": "^3.8.0",
"npmlog": "^4.0.0",
"request": "^2.88.0",
"sass-graph": "2.2.5",
@@ -10923,24 +10776,9 @@
"true-case-path": "^1.0.2"
},
"dependencies": {
- "camelcase": {
- "version": "5.3.1",
- "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz",
- "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA="
- },
- "camelcase-keys": {
- "version": "6.2.2",
- "resolved": "https://registry.npmmirror.com/camelcase-keys/download/camelcase-keys-6.2.2.tgz?cache=0&sync_timestamp=1633333078823&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase-keys%2Fdownload%2Fcamelcase-keys-6.2.2.tgz",
- "integrity": "sha1-XnVda6UaoiPsfT1S8ld4IQ+dw8A=",
- "requires": {
- "camelcase": "^5.3.1",
- "map-obj": "^4.0.0",
- "quick-lru": "^4.0.1"
- }
- },
"chalk": {
"version": "1.1.3",
- "resolved": "https://registry.nlark.com/chalk/download/chalk-1.1.3.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz",
+ "resolved": "https://registry.npmmirror.com/chalk/download/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": {
"ansi-styles": "^2.2.1",
@@ -10951,27 +10789,17 @@
}
},
"cross-spawn": {
- "version": "7.0.3",
- "resolved": "https://registry.nlark.com/cross-spawn/download/cross-spawn-7.0.3.tgz",
- "integrity": "sha1-9zqFudXUHQRVUcF34ogtSshXKKY=",
+ "version": "3.0.1",
+ "resolved": "https://registry.nlark.com/cross-spawn/download/cross-spawn-3.0.1.tgz",
+ "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
"requires": {
- "path-key": "^3.1.0",
- "shebang-command": "^2.0.0",
- "which": "^2.0.1"
- }
- },
- "find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmmirror.com/find-up/download/find-up-4.1.0.tgz?cache=0&sync_timestamp=1633618631704&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffind-up%2Fdownload%2Ffind-up-4.1.0.tgz",
- "integrity": "sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk=",
- "requires": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
+ "lru-cache": "^4.0.1",
+ "which": "^1.2.9"
}
},
"gaze": {
"version": "1.1.3",
- "resolved": "https://registry.npm.taobao.org/gaze/download/gaze-1.1.3.tgz",
+ "resolved": "https://registry.npmmirror.com/gaze/download/gaze-1.1.3.tgz",
"integrity": "sha1-xEFzPhO5J6yMD/C0w7Az8ogSkko=",
"requires": {
"globule": "^1.0.0"
@@ -11015,62 +10843,18 @@
}
}
},
- "hosted-git-info": {
- "version": "4.0.2",
- "resolved": "https://registry.nlark.com/hosted-git-info/download/hosted-git-info-4.0.2.tgz",
- "integrity": "sha1-XkJVB+7eT+qEa3Ji8IOEVsQgmWE=",
- "requires": {
- "lru-cache": "^6.0.0"
- }
- },
- "indent-string": {
- "version": "4.0.0",
- "resolved": "https://registry.nlark.com/indent-string/download/indent-string-4.0.0.tgz?cache=0&sync_timestamp=1618847271946&other_urls=https%3A%2F%2Fregistry.nlark.com%2Findent-string%2Fdownload%2Findent-string-4.0.0.tgz",
- "integrity": "sha1-Yk+PRJfWGbLZdoUx1Y9BIoVNclE="
- },
- "locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.nlark.com/locate-path/download/locate-path-5.0.0.tgz",
- "integrity": "sha1-Gvujlq/WdqbUJQTQpno6frn2KqA=",
- "requires": {
- "p-locate": "^4.1.0"
- }
- },
"lodash": {
"version": "4.17.21",
"resolved": "https://registry.nlark.com/lodash/download/lodash-4.17.21.tgz?cache=0&sync_timestamp=1618847150612&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flodash%2Fdownload%2Flodash-4.17.21.tgz",
"integrity": "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw="
},
"lru-cache": {
- "version": "6.0.0",
- "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz",
- "integrity": "sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ=",
+ "version": "4.1.5",
+ "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-4.1.5.tgz",
+ "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=",
"requires": {
- "yallist": "^4.0.0"
- }
- },
- "map-obj": {
- "version": "4.3.0",
- "resolved": "https://registry.npmmirror.com/map-obj/download/map-obj-4.3.0.tgz?cache=0&sync_timestamp=1634552719803&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmap-obj%2Fdownload%2Fmap-obj-4.3.0.tgz",
- "integrity": "sha1-kwT5Buk/qucIgNoQKp8d8OqLsFo="
- },
- "meow": {
- "version": "9.0.0",
- "resolved": "https://registry.nlark.com/meow/download/meow-9.0.0.tgz?cache=0&sync_timestamp=1627560954223&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmeow%2Fdownload%2Fmeow-9.0.0.tgz",
- "integrity": "sha1-zZUQvFysne59A8c+4fmtlZ9Oo2Q=",
- "requires": {
- "@types/minimist": "^1.2.0",
- "camelcase-keys": "^6.2.2",
- "decamelize": "^1.2.0",
- "decamelize-keys": "^1.1.0",
- "hard-rejection": "^2.1.0",
- "minimist-options": "4.1.0",
- "normalize-package-data": "^3.0.0",
- "read-pkg-up": "^7.0.1",
- "redent": "^3.0.0",
- "trim-newlines": "^3.0.0",
- "type-fest": "^0.18.0",
- "yargs-parser": "^20.2.3"
+ "pseudomap": "^1.0.2",
+ "yallist": "^2.1.2"
}
},
"minimatch": {
@@ -11081,124 +10865,6 @@
"brace-expansion": "^1.1.7"
}
},
- "normalize-package-data": {
- "version": "3.0.3",
- "resolved": "https://registry.nlark.com/normalize-package-data/download/normalize-package-data-3.0.3.tgz?cache=0&sync_timestamp=1629301911873&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnormalize-package-data%2Fdownload%2Fnormalize-package-data-3.0.3.tgz",
- "integrity": "sha1-28w+LaWVCaCYNCKITNFy7v36Ul4=",
- "requires": {
- "hosted-git-info": "^4.0.1",
- "is-core-module": "^2.5.0",
- "semver": "^7.3.4",
- "validate-npm-package-license": "^3.0.1"
- }
- },
- "p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.nlark.com/p-limit/download/p-limit-2.3.0.tgz",
- "integrity": "sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE=",
- "requires": {
- "p-try": "^2.0.0"
- }
- },
- "p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.nlark.com/p-locate/download/p-locate-4.1.0.tgz?cache=0&sync_timestamp=1629892721671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-locate%2Fdownload%2Fp-locate-4.1.0.tgz",
- "integrity": "sha1-o0KLtwiLOmApL2aRkni3wpetTwc=",
- "requires": {
- "p-limit": "^2.2.0"
- }
- },
- "p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmmirror.com/p-try/download/p-try-2.2.0.tgz",
- "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY="
- },
- "parse-json": {
- "version": "5.2.0",
- "resolved": "https://registry.npmmirror.com/parse-json/download/parse-json-5.2.0.tgz?cache=0&sync_timestamp=1636012033195&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fparse-json%2Fdownload%2Fparse-json-5.2.0.tgz",
- "integrity": "sha1-x2/Gbe5UIxyWKyK8yKcs8vmXU80=",
- "requires": {
- "@babel/code-frame": "^7.0.0",
- "error-ex": "^1.3.1",
- "json-parse-even-better-errors": "^2.3.0",
- "lines-and-columns": "^1.1.6"
- }
- },
- "path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.nlark.com/path-exists/download/path-exists-4.0.0.tgz",
- "integrity": "sha1-UTvb4tO5XXdi6METfvoZXGxhtbM="
- },
- "path-key": {
- "version": "3.1.1",
- "resolved": "https://registry.nlark.com/path-key/download/path-key-3.1.1.tgz",
- "integrity": "sha1-WB9q3mWMu6ZaDTOA3ndTKVBU83U="
- },
- "read-pkg": {
- "version": "5.2.0",
- "resolved": "https://registry.nlark.com/read-pkg/download/read-pkg-5.2.0.tgz?cache=0&sync_timestamp=1628984695234&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fread-pkg%2Fdownload%2Fread-pkg-5.2.0.tgz",
- "integrity": "sha1-e/KVQ4yloz5WzTDgU7NO5yUMk8w=",
- "requires": {
- "@types/normalize-package-data": "^2.4.0",
- "normalize-package-data": "^2.5.0",
- "parse-json": "^5.0.0",
- "type-fest": "^0.6.0"
- },
- "dependencies": {
- "hosted-git-info": {
- "version": "2.8.9",
- "resolved": "https://registry.nlark.com/hosted-git-info/download/hosted-git-info-2.8.9.tgz",
- "integrity": "sha1-3/wL+aIcAiCQkPKqaUKeFBTa8/k="
- },
- "normalize-package-data": {
- "version": "2.5.0",
- "resolved": "https://registry.nlark.com/normalize-package-data/download/normalize-package-data-2.5.0.tgz?cache=0&sync_timestamp=1629301911873&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnormalize-package-data%2Fdownload%2Fnormalize-package-data-2.5.0.tgz",
- "integrity": "sha1-5m2xg4sgDB38IzIl0SyzZSDiNKg=",
- "requires": {
- "hosted-git-info": "^2.1.4",
- "resolve": "^1.10.0",
- "semver": "2 || 3 || 4 || 5",
- "validate-npm-package-license": "^3.0.1"
- }
- },
- "semver": {
- "version": "5.7.1",
- "resolved": "https://registry.nlark.com/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz",
- "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc="
- },
- "type-fest": {
- "version": "0.6.0",
- "resolved": "https://registry.npmmirror.com/type-fest/download/type-fest-0.6.0.tgz",
- "integrity": "sha1-jSojcNPfiG61yQraHFv2GIrPg4s="
- }
- }
- },
- "read-pkg-up": {
- "version": "7.0.1",
- "resolved": "https://registry.npmmirror.com/read-pkg-up/download/read-pkg-up-7.0.1.tgz?cache=0&sync_timestamp=1634147799745&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fread-pkg-up%2Fdownload%2Fread-pkg-up-7.0.1.tgz",
- "integrity": "sha1-86YTV1hFlzOuK5VjgFbhhU5+9Qc=",
- "requires": {
- "find-up": "^4.1.0",
- "read-pkg": "^5.2.0",
- "type-fest": "^0.8.1"
- },
- "dependencies": {
- "type-fest": {
- "version": "0.8.1",
- "resolved": "https://registry.npmmirror.com/type-fest/download/type-fest-0.8.1.tgz",
- "integrity": "sha1-CeJJ696FHTseSNJ8EFREZn8XuD0="
- }
- }
- },
- "redent": {
- "version": "3.0.0",
- "resolved": "https://registry.nlark.com/redent/download/redent-3.0.0.tgz?cache=0&sync_timestamp=1620069702182&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fredent%2Fdownload%2Fredent-3.0.0.tgz",
- "integrity": "sha1-5Ve3mYMWu1PJ8fVvpiY1LGljBZ8=",
- "requires": {
- "indent-string": "^4.0.0",
- "strip-indent": "^3.0.0"
- }
- },
"request": {
"version": "2.88.2",
"resolved": "https://registry.npmmirror.com/request/download/request-2.88.2.tgz",
@@ -11226,35 +10892,6 @@
"uuid": "^3.3.2"
}
},
- "semver": {
- "version": "7.3.5",
- "resolved": "https://registry.nlark.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz",
- "integrity": "sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc=",
- "requires": {
- "lru-cache": "^6.0.0"
- }
- },
- "shebang-command": {
- "version": "2.0.0",
- "resolved": "https://registry.nlark.com/shebang-command/download/shebang-command-2.0.0.tgz",
- "integrity": "sha1-zNCvT4g1+9wmW4JGGq8MNmY/NOo=",
- "requires": {
- "shebang-regex": "^3.0.0"
- }
- },
- "shebang-regex": {
- "version": "3.0.0",
- "resolved": "https://registry.nlark.com/shebang-regex/download/shebang-regex-3.0.0.tgz",
- "integrity": "sha1-rhbxZE2HPsrYQ7AwexQzYtTEIXI="
- },
- "strip-indent": {
- "version": "3.0.0",
- "resolved": "https://registry.nlark.com/strip-indent/download/strip-indent-3.0.0.tgz",
- "integrity": "sha1-wy4c7pQLazQyx3G8LFS8znPNMAE=",
- "requires": {
- "min-indent": "^1.0.0"
- }
- },
"tough-cookie": {
"version": "2.5.0",
"resolved": "https://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.5.0.tgz",
@@ -11263,31 +10900,13 @@
"psl": "^1.1.28",
"punycode": "^2.1.1"
}
- },
- "trim-newlines": {
- "version": "3.0.1",
- "resolved": "https://registry.nlark.com/trim-newlines/download/trim-newlines-3.0.1.tgz",
- "integrity": "sha1-Jgpdli2LdSQlsy86fbDcrNF2wUQ="
- },
- "which": {
- "version": "2.0.2",
- "resolved": "https://registry.nlark.com/which/download/which-2.0.2.tgz",
- "integrity": "sha1-fGqN0KY2oDJ+ELWckobu6T8/UbE=",
- "requires": {
- "isexe": "^2.0.0"
- }
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.nlark.com/yallist/download/yallist-4.0.0.tgz",
- "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI="
}
}
},
"nopt": {
- "version": "5.0.0",
- "resolved": "https://registry.npm.taobao.org/nopt/download/nopt-5.0.0.tgz?cache=0&sync_timestamp=1597649892953&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnopt%2Fdownload%2Fnopt-5.0.0.tgz",
- "integrity": "sha1-UwlCu1ilEvzK/lP+IQ8TolNV3Ig=",
+ "version": "3.0.6",
+ "resolved": "https://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz?cache=0&sync_timestamp=1597649892953&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnopt%2Fdownload%2Fnopt-3.0.6.tgz",
+ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
"requires": {
"abbrev": "1"
}
@@ -11296,7 +10915,6 @@
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
- "dev": true,
"requires": {
"hosted-git-info": "^2.1.4",
"resolve": "^1.10.0",
@@ -11307,8 +10925,7 @@
"semver": {
"version": "5.7.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
- "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
- "dev": true
+ "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
}
}
},
@@ -14818,7 +14435,7 @@
},
"npmlog": {
"version": "4.1.2",
- "resolved": "https://registry.nlark.com/npmlog/download/npmlog-4.1.2.tgz",
+ "resolved": "https://registry.npmmirror.com/npmlog/download/npmlog-4.1.2.tgz?cache=0&sync_timestamp=1637084876572&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnpmlog%2Fdownload%2Fnpmlog-4.1.2.tgz",
"integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
"requires": {
"are-we-there-yet": "~1.1.2",
@@ -15158,14 +14775,12 @@
"os-tmpdir": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
- "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
- "dev": true
+ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
},
"osenv": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
- "dev": true,
"requires": {
"os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.0"
@@ -15354,7 +14969,6 @@
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
- "dev": true,
"requires": {
"error-ex": "^1.2.0"
}
@@ -15402,7 +15016,6 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
- "dev": true,
"requires": {
"pinkie-promise": "^2.0.0"
}
@@ -15452,7 +15065,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
- "dev": true,
"requires": {
"graceful-fs": "^4.1.2",
"pify": "^2.0.0",
@@ -15462,8 +15074,7 @@
"graceful-fs": {
"version": "4.1.15",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
- "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
- "dev": true
+ "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
}
}
},
@@ -15488,20 +15099,17 @@
"pify": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
- "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
- "dev": true
+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
},
"pinkie": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
- "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
- "dev": true
+ "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
},
"pinkie-promise": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
- "dev": true,
"requires": {
"pinkie": "^2.0.0"
}
@@ -16665,8 +16273,7 @@
"pseudomap": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
- "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
- "dev": true
+ "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
},
"psl": {
"version": "1.1.31",
@@ -16780,11 +16387,6 @@
"integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
"dev": true
},
- "quick-lru": {
- "version": "4.0.1",
- "resolved": "https://registry.nlark.com/quick-lru/download/quick-lru-4.0.1.tgz",
- "integrity": "sha1-W4h48ROlgheEjGSCAmxz4bpXcn8="
- },
"randomatic": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
@@ -16852,7 +16454,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
- "dev": true,
"requires": {
"load-json-file": "^1.0.0",
"normalize-package-data": "^2.3.2",
@@ -16863,7 +16464,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
- "dev": true,
"requires": {
"find-up": "^1.0.0",
"read-pkg": "^1.0.0"
@@ -16952,7 +16552,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
"integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
- "dev": true,
"requires": {
"indent-string": "^2.1.0",
"strip-indent": "^1.0.1"
@@ -17105,7 +16704,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
- "dev": true,
"requires": {
"is-finite": "^1.0.0"
}
@@ -17381,7 +16979,6 @@
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.0.tgz",
"integrity": "sha1-ibig/kMrn/nsmpJaALbNs6kbuto=",
- "dev": true,
"requires": {
"glob": "^7.0.5"
},
@@ -17390,7 +16987,6 @@
"version": "7.1.4",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
"integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
- "dev": true,
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -17404,7 +17000,6 @@
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
- "dev": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -17623,8 +17218,7 @@
"semver": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
- "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
- "dev": true
+ "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
},
"send": {
"version": "0.16.2",
@@ -18581,7 +18175,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
"integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
- "dev": true,
"requires": {
"get-stdin": "^4.0.1"
}
@@ -18857,33 +18450,13 @@
"dev": true
},
"tar": {
- "version": "6.1.11",
- "resolved": "https://registry.nlark.com/tar/download/tar-6.1.11.tgz?cache=0&sync_timestamp=1629994598621&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftar%2Fdownload%2Ftar-6.1.11.tgz",
- "integrity": "sha1-Z2CjjwA6+hsv/Q/+npq70Oqz1iE=",
+ "version": "2.2.2",
+ "resolved": "https://registry.nlark.com/tar/download/tar-2.2.2.tgz?cache=0&sync_timestamp=1629994598621&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftar%2Fdownload%2Ftar-2.2.2.tgz",
+ "integrity": "sha1-DKiEhWLHKZuLRG/2pNYM27I+3EA=",
"requires": {
- "chownr": "^2.0.0",
- "fs-minipass": "^2.0.0",
- "minipass": "^3.0.0",
- "minizlib": "^2.1.1",
- "mkdirp": "^1.0.3",
- "yallist": "^4.0.0"
- },
- "dependencies": {
- "chownr": {
- "version": "2.0.0",
- "resolved": "https://registry.nlark.com/chownr/download/chownr-2.0.0.tgz",
- "integrity": "sha1-Fb++U9LqtM9w8YqM1o6+Wzyx3s4="
- },
- "mkdirp": {
- "version": "1.0.4",
- "resolved": "https://registry.npmmirror.com/mkdirp/download/mkdirp-1.0.4.tgz",
- "integrity": "sha1-PrXtYmInVteaXw4qIh3+utdcL34="
- },
- "yallist": {
- "version": "4.0.0",
- "resolved": "https://registry.nlark.com/yallist/download/yallist-4.0.0.tgz",
- "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI="
- }
+ "block-stream": "*",
+ "fstream": "^1.0.12",
+ "inherits": "2"
}
},
"test-exclude": {
@@ -19201,8 +18774,7 @@
"trim-newlines": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
- "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
- "dev": true
+ "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
},
"trim-right": {
"version": "1.0.1",
@@ -19300,11 +18872,6 @@
"integrity": "sha1-C6XsKohWQORw6k6FBZcZANrFiCI=",
"dev": true
},
- "type-fest": {
- "version": "0.18.1",
- "resolved": "https://registry.npmmirror.com/type-fest/download/type-fest-0.18.1.tgz",
- "integrity": "sha1-20vBUaSiz07r+a3V23VQjbbMhB8="
- },
"type-is": {
"version": "1.6.18",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -20833,12 +20400,11 @@
"yallist": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
- "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
- "dev": true
+ "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
},
"yargs": {
"version": "13.3.2",
- "resolved": "https://registry.npmmirror.com/yargs/download/yargs-13.3.2.tgz?cache=0&sync_timestamp=1632605487521&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyargs%2Fdownload%2Fyargs-13.3.2.tgz",
+ "resolved": "https://registry.npmmirror.com/yargs/download/yargs-13.3.2.tgz",
"integrity": "sha1-rX/+/sGqWVZayRX4Lcyzipwxot0=",
"requires": {
"cliui": "^5.0.0",
@@ -20866,11 +20432,6 @@
"color-convert": "^1.9.0"
}
},
- "camelcase": {
- "version": "5.3.1",
- "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz",
- "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA="
- },
"cliui": {
"version": "5.0.0",
"resolved": "https://registry.nlark.com/cliui/download/cliui-5.0.0.tgz",
@@ -20976,22 +20537,24 @@
"version": "4.0.3",
"resolved": "https://registry.nlark.com/y18n/download/y18n-4.0.3.tgz",
"integrity": "sha1-tfJZyCzW4zaSHv17/Yv1YN6e7t8="
- },
- "yargs-parser": {
- "version": "13.1.2",
- "resolved": "https://registry.nlark.com/yargs-parser/download/yargs-parser-13.1.2.tgz?cache=0&sync_timestamp=1624233514145&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fyargs-parser%2Fdownload%2Fyargs-parser-13.1.2.tgz",
- "integrity": "sha1-Ew8JcC667vJlDVTObj5XBvek+zg=",
- "requires": {
- "camelcase": "^5.0.0",
- "decamelize": "^1.2.0"
- }
}
}
},
"yargs-parser": {
- "version": "20.2.9",
- "resolved": "https://registry.nlark.com/yargs-parser/download/yargs-parser-20.2.9.tgz?cache=0&sync_timestamp=1624233514145&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fyargs-parser%2Fdownload%2Fyargs-parser-20.2.9.tgz",
- "integrity": "sha1-LrfcOwKJcY/ClfNidThFxBoMlO4="
+ "version": "13.1.2",
+ "resolved": "https://registry.npmmirror.com/yargs-parser/download/yargs-parser-13.1.2.tgz?cache=0&sync_timestamp=1637031026512&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyargs-parser%2Fdownload%2Fyargs-parser-13.1.2.tgz",
+ "integrity": "sha1-Ew8JcC667vJlDVTObj5XBvek+zg=",
+ "requires": {
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
+ },
+ "dependencies": {
+ "camelcase": {
+ "version": "5.3.1",
+ "resolved": "https://registry.npmmirror.com/camelcase/download/camelcase-5.3.1.tgz?cache=0&sync_timestamp=1636945130104&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-5.3.1.tgz",
+ "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA="
+ }
+ }
},
"zrender": {
"version": "5.2.1",
diff --git a/package.json b/package.json
index 6892f59..503cf92 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
"gulp-replace": "0.6.1",
"gulp-shell": "0.6.5",
"lodash": "4.17.5",
- "node-sass": "^6.0.1",
+ "node-sass": "^4.14.1",
"npm": "^6.9.0",
"sass-loader": "6.0.6",
"svg-sprite-loader": "3.7.3",
diff --git a/src/assets/scss/_variables.scss b/src/assets/scss/_variables.scss
index ccfe93f..5a058b8 100644
--- a/src/assets/scss/_variables.scss
+++ b/src/assets/scss/_variables.scss
@@ -1,6 +1,6 @@
// 站点主色
// tips: 要达到整站主题修改效果, 请确保[$--color-primary]站点主色与[/src/element-ui-theme/index.js]文件中[import './element-[#17B3A3]/index.css']当前主题色一致
-$--color-primary: #17B3A3;
+$--color-primary: #3E8EF7;
// Navbar
$navbar--background-color: $--color-primary;
diff --git a/src/element-ui-theme/index.js b/src/element-ui-theme/index.js
index fab8f39..57946c3 100644
--- a/src/element-ui-theme/index.js
+++ b/src/element-ui-theme/index.js
@@ -1,3 +1,11 @@
+/*
+ * @Author: gtz
+ * @Date: 2021-11-19 10:10:51
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-09 19:38:26
+ * @Description: file content
+ * @FilePath: \mt-qj-wms-ui\src\element-ui-theme\index.js
+ */
/**
* element-ui组件主题
*
@@ -5,7 +13,7 @@
* 1. 此处只包含element-ui组件主题
* 2. 要达到整站主题修改效果, 请确保[import './element-[#17B3A3]/index.css']当前主题色与[/src/assets/scss/_variables.scss]文件中[$--color-primary]属性值一致
*/
-import './element-#17B3A3/index.css' // 当前主题色
+import './element-#3E8EF7/index.css' // 当前主题色
export default {
list: [
'#0BB2D4', // 青色
diff --git a/src/mock/index.js b/src/mock/index.js
index c176c4d..9d5ba51 100644
--- a/src/mock/index.js
+++ b/src/mock/index.js
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-15 08:20:28
* @LastEditors: gtz
- * @LastEditTime: 2021-12-08 16:04:50
+ * @LastEditTime: 2021-12-09 10:08:24
* @Description:
*/
import Mock from 'mockjs'
diff --git a/src/router/index.js b/src/router/index.js
index 807fc91..9f1aa2a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,8 +1,8 @@
/*
* @Author: zwq
* @Date: 2021-11-15 08:20:28
- * @LastEditors: zwq
- * @LastEditTime: 2021-12-08 14:18:09
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-09 16:23:55
* @Description:
*/
/**
@@ -38,39 +38,39 @@ const mainRoutes = {
// 1. isTab: 是否通过tab展示内容, true: 是, false: 否
// 2. iframeUrl: 是否通过iframe嵌套展示内容, '以http[s]://开头': 是, '': 否
// 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理!
- { path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页' } },
- { path: '/orderProcess', component: _import('common/order-process'), name: 'orderProcess', meta: { title: '订单加工' } },
- { path: '/exWarehouse', component: _import('common/ex-warehouse'), name: 'exWarehouse', meta: { title: '货物出库' } },
- { path: '/addProcess', component: _import('common/add-process'), name: 'addProcess', meta: { title: '追加加工' } },
- { path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题' } },
+ { path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页', isTab: true } },
+ { path: '/orderProcess', component: _import('common/order-process'), name: 'orderProcess', meta: { title: '订单加工', isTab: true } },
+ { path: '/exWarehouse', component: _import('common/ex-warehouse'), name: 'exWarehouse', meta: { title: '货物出库', isTab: true } },
+ { path: '/addProcess', component: _import('common/add-process'), name: 'addProcess', meta: { title: '追加加工', isTab: true } },
+ { path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题', isTab: true } },
{ path: '/demo-echarts', component: _import('demo/echarts'), name: 'demo-echarts', meta: { title: 'demo-echarts', isTab: true } },
{ path: '/demo-ueditor', component: _import('demo/ueditor'), name: 'demo-ueditor', meta: { title: 'demo-ueditor', isTab: true } },
- { path: '/basic-cache', component: _import('basic/cache'), name: 'basic-cache', meta: { title: '缓存区信息' } },
- { path: '/basic-processInfo', component: _import('basic/processInfo'), name: 'basic-processInfo', meta: { title: '工艺信息' } },
- { path: '/basic-cache-location', component: _import('basic/components/location'), name: 'basic-cache-location', meta: { title: '库位信息' } },
- { path: '/basic-equipmentInfo', component: _import('basic/equipmentInfo'), name: 'basic-equipmentInfo', meta: { title: '设备基础信息' } },
- { path: '/basic-carInfo', component: _import('basic/carInfo'), name: 'basic-carInfo', meta: { title: '车辆信息' } },
- { path: '/basic-alarmInfo', component: _import('basic/alarmInfo'), name: 'basic-alarmInfo', meta: { title: '报警基础信息' } },
- { path: '/order-current-order', component: _import('order/current-order'), name: 'order-current-order', meta: { title: '当前订单列表' } },
- { path: '/order-current-order-task', component: _import('order/components/current-order-task'), name: 'order-current-order-task', meta: { title: '当前订单任务详情' } },
- { path: '/order-current-task', component: _import('order/current-task'), name: 'order-current-task', meta: { title: '当前执行任务' } },
- { path: '/order-current-task-detail', component: _import('order/components/current-task-detail'), name: 'order-current-task-detail', meta: { title: '当前执行任务详情' } },
- { path: '/report-kiln-alarm', component: _import('report/kiln-alarm'), name: 'report-kiln-alarm', meta: { title: '窑炉报警' } },
- { path: '/report-car-alarm', component: _import('report/car-alarm'), name: 'report-car-alarm', meta: { title: '车辆运行报警' } },
- { path: '/report-order-history', component: _import('report/order-history'), name: 'report-order-history', meta: { title: '订单历史列表' } },
- { path: '/report-order-history-task', component: _import('report/components/order-history-task'), name: 'report-order-history-task', meta: { title: '订单历史任务详情' } },
- { path: '/report-task-history', component: _import('report/task-history'), name: 'report-task-history', meta: { title: '执行任务历史列表' } },
- { path: '/report-task-history-detail', component: _import('report/components/task-history-detail'), name: 'report-task-history-detail', meta: { title: '执行任务历史详情' } },
- { path: '/energy-sulfur-dioxide', component: _import('energy/sulfur-dioxide'), name: 'energy-sulfur-dioxide', meta: { title: '二氧化硫流量分析' } },
+ { path: '/basic-cache', component: _import('basic/cache'), name: 'basic-cache', meta: { title: '缓存区信息', isTab: true } },
+ { path: '/basic-processInfo', component: _import('basic/processInfo'), name: 'basic-processInfo', meta: { title: '工艺信息', isTab: true } },
+ { path: '/basic-cache-location', component: _import('basic/components/location'), name: 'basic-cache-location', meta: { title: '库位信息', isTab: true } },
+ { path: '/basic-equipmentInfo', component: _import('basic/equipmentInfo'), name: 'basic-equipmentInfo', meta: { title: '设备基础信息', isTab: true } },
+ { path: '/basic-carInfo', component: _import('basic/carInfo'), name: 'basic-carInfo', meta: { title: '车辆信息', isTab: true } },
+ { path: '/basic-alarmInfo', component: _import('basic/alarmInfo'), name: 'basic-alarmInfo', meta: { title: '报警基础信息', isTab: true } },
+ { path: '/order-current-order', component: _import('order/current-order'), name: 'order-current-order', meta: { title: '当前订单列表', isTab: true } },
+ { path: '/order-current-order-task', component: _import('order/components/current-order-task'), name: 'order-current-order-task', meta: { title: '当前订单任务详情', isTab: true } },
+ { path: '/order-current-task', component: _import('order/current-task'), name: 'order-current-task', meta: { title: '当前执行任务', isTab: true } },
+ { path: '/order-current-task-detail', component: _import('order/components/current-task-detail'), name: 'order-current-task-detail', meta: { title: '当前执行任务详情', isTab: true } },
+ { path: '/report-kiln-alarm', component: _import('report/kiln-alarm'), name: 'report-kiln-alarm', meta: { title: '窑炉报警', isTab: true } },
+ { path: '/report-car-alarm', component: _import('report/car-alarm'), name: 'report-car-alarm', meta: { title: '车辆运行报警', isTab: true } },
+ { path: '/report-order-history', component: _import('report/order-history'), name: 'report-order-history', meta: { title: '订单历史列表', isTab: true } },
+ { path: '/report-order-history-task', component: _import('report/components/order-history-task'), name: 'report-order-history-task', meta: { title: '订单历史任务详情', isTab: true } },
+ { path: '/report-task-history', component: _import('report/task-history'), name: 'report-task-history', meta: { title: '执行任务历史列表', isTab: true } },
+ { path: '/report-task-history-detail', component: _import('report/components/task-history-detail'), name: 'report-task-history-detail', meta: { title: '执行任务历史详情', isTab: true } },
+ { path: '/energy-sulfur-dioxide', component: _import('energy/sulfur-dioxide'), name: 'energy-sulfur-dioxide', meta: { title: '二氧化硫流量分析', isTab: true } },
{ path: '/energy-electric', component: _import('energy/electric'), name: 'energy-electric', meta: { title: '用电能源分析' } },
- { path: '/energy-kiln-electric', component: _import('energy/kiln-electric'), name: 'energy-kiln-electric', meta: { title: '窑炉用电分析' } },
- { path: '/energy-ammonia', component: _import('energy/ammonia'), name: 'energy-ammonia', meta: { title: '氨气流量分析' } },
- { path: '/energy-nitrogen', component: _import('energy/nitrogen'), name: 'energy-nitrogen', meta: { title: '氮气流量分析' } },
- { path: '/energy-electric-acquisition', component: _import('energy/electric-acquisition'), name: 'energy-electric-acquisition', meta: { title: '电能采集数据' } },
- { path: '/energy-process-temperature', component: _import('energy/process-temperature'), name: 'energy-process-temperature', meta: { title: '窑炉加工温度' } },
- { path: '/energy-sump-temperature', component: _import('energy/sump-temperature'), name: 'energy-sump-temperature', meta: { title: '油槽温度' } },
- { path: '/energy-ammonia-analysis', component: _import('energy/ammonia-analysis'), name: 'energy-ammonia-analysis', meta: { title: '使用氮气分析' } },
- { path: '/energy-kiln-speed', component: _import('energy/kiln-speed'), name: 'energy-kiln-speed', meta: { title: '窑炉速度参数' } }
+ { path: '/energy-kiln-electric', component: _import('energy/kiln-electric'), name: 'energy-kiln-electric', meta: { title: '窑炉用电分析', isTab: true } },
+ { path: '/energy-ammonia', component: _import('energy/ammonia'), name: 'energy-ammonia', meta: { title: '氨气流量分析', isTab: true } },
+ { path: '/energy-nitrogen', component: _import('energy/nitrogen'), name: 'energy-nitrogen', meta: { title: '氮气流量分析', isTab: true } },
+ { path: '/energy-electric-acquisition', component: _import('energy/electric-acquisition'), name: 'energy-electric-acquisition', meta: { title: '电能采集数据', isTab: true } },
+ { path: '/energy-process-temperature', component: _import('energy/process-temperature'), name: 'energy-process-temperature', meta: { title: '窑炉加工温度', isTab: true } },
+ { path: '/energy-sump-temperature', component: _import('energy/sump-temperature'), name: 'energy-sump-temperature', meta: { title: '油槽温度', isTab: true } },
+ { path: '/energy-ammonia-analysis', component: _import('energy/ammonia-analysis'), name: 'energy-ammonia-analysis', meta: { title: '使用氮气分析', isTab: true } },
+ { path: '/energy-kiln-speed', component: _import('energy/kiln-speed'), name: 'energy-kiln-speed', meta: { title: '窑炉速度参数', isTab: true } }
],
beforeEnter (to, from, next) {
let token = Vue.cookie.get('token')
diff --git a/src/views/basic/alarmInfo.vue b/src/views/basic/alarmInfo.vue
index 4f0611b..f489640 100644
--- a/src/views/basic/alarmInfo.vue
+++ b/src/views/basic/alarmInfo.vue
@@ -106,7 +106,7 @@
getDataList () {
this.dataListLoading = true
this.$http({
- url: this.$http.adornUrl('alarmBase/page'),
+ url: this.$http.adornUrl('/alarmBase/page'),
method: 'post',
data: this.$http.adornData({
'current': this.pageIndex,
@@ -150,7 +150,7 @@
type: 'warning'
}).then(() => {
this.$http({
- url: this.$http.adornUrl('alarmBase/delete'),
+ url: this.$http.adornUrl('/alarmBase/delete'),
method: 'post',
data: this.$http.adornData({id})
}).then(({data}) => {
diff --git a/src/views/basic/cache.vue b/src/views/basic/cache.vue
index b709d4e..379ef7c 100644
--- a/src/views/basic/cache.vue
+++ b/src/views/basic/cache.vue
@@ -40,11 +40,17 @@
label="编码">
+
+
{
this.$http({
- url: this.$http.adornUrl('warehouse/delete'),
+ url: this.$http.adornUrl('/warehouse/delete'),
method: 'post',
data: this.$http.adornData({id})
}).then(({data}) => {
diff --git a/src/views/basic/carInfo.vue b/src/views/basic/carInfo.vue
index 376104b..014e8ea 100644
--- a/src/views/basic/carInfo.vue
+++ b/src/views/basic/carInfo.vue
@@ -106,7 +106,7 @@
getDataList () {
this.dataListLoading = true
this.$http({
- url: this.$http.adornUrl('vehicle/page'),
+ url: this.$http.adornUrl('/vehicle/page'),
method: 'post',
data: this.$http.adornData({
'current': this.pageIndex,
@@ -150,7 +150,7 @@
type: 'warning'
}).then(() => {
this.$http({
- url: this.$http.adornUrl('vehicle/delete'),
+ url: this.$http.adornUrl('/vehicle/delete'),
method: 'post',
data: this.$http.adornData({id})
}).then(({data}) => {
diff --git a/src/views/basic/components/alarmInfo-add.vue b/src/views/basic/components/alarmInfo-add.vue
index d31a841..d155062 100644
--- a/src/views/basic/components/alarmInfo-add.vue
+++ b/src/views/basic/components/alarmInfo-add.vue
@@ -1,8 +1,8 @@
@@ -57,7 +57,7 @@
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.$http({
- url: this.$http.adornUrl(`alarmBase/get`),
+ url: this.$http.adornUrl(`/alarmBase/get`),
method: 'post',
data: this.$http.adornData({id})
}).then(({data}) => {
@@ -67,7 +67,7 @@
})
} else {
this.$http({
- url: this.$http.adornUrl(`alarmBase/codeGenerator`),
+ url: this.$http.adornUrl(`/alarmBase/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then((data) => {
@@ -81,7 +81,7 @@
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.$http({
- url: this.$http.adornUrl(`alarmBase/${!this.dataForm.id ? 'add' : 'update'}`),
+ url: this.$http.adornUrl(`/alarmBase/${!this.dataForm.id ? 'add' : 'update'}`),
method: 'post',
data: this.$http.adornData({
'id': this.dataForm.id || undefined,
diff --git a/src/views/basic/components/cache-add.vue b/src/views/basic/components/cache-add.vue
index b1e5256..eef2c77 100644
--- a/src/views/basic/components/cache-add.vue
+++ b/src/views/basic/components/cache-add.vue
@@ -1,8 +1,8 @@
@@ -16,7 +16,7 @@
:rules="dataRule"
ref="dataForm"
@keyup.enter.native="dataFormSubmit()"
- label-width="80px"
+ label-width="100px"
>
@@ -27,14 +27,14 @@
placeholder="缓存区名称"
>
-
+
-
-
+
+
-
+
@@ -79,9 +79,18 @@ export default {
code: '',
description: '',
spec: '',
+ number: null,
+ englishName: '',
+ aliasName: '',
warehouseName: ''
},
dataRule: {
+ code: [
+ { required: true, message: '编码不能为空', trigger: 'blur' }
+ ],
+ warehouseName: [
+ { required: true, message: '缓存区名称不能为空', trigger: 'blur' }
+ ]
}
}
},
@@ -93,7 +102,7 @@ export default {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.$http({
- url: this.$http.adornUrl(`warehouse/get`),
+ url: this.$http.adornUrl(`/warehouse/get`),
method: 'post',
data: this.$http.adornData({ id })
}).then(({ data }) => {
@@ -103,7 +112,7 @@ export default {
})
} else {
this.$http({
- url: this.$http.adornUrl(`warehouse/codeGenerator`),
+ url: this.$http.adornUrl(`/warehouse/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then(data => {
@@ -118,7 +127,7 @@ export default {
if (valid) {
this.$http({
url: this.$http.adornUrl(
- `warehouse/${!this.dataForm.id ? 'add' : 'update'}`
+ `/warehouse/${!this.dataForm.id ? 'add' : 'update'}`
),
method: 'post',
data: this.$http.adornData({
diff --git a/src/views/basic/components/carInfo-add.vue b/src/views/basic/components/carInfo-add.vue
index b8db9d6..e25191a 100644
--- a/src/views/basic/components/carInfo-add.vue
+++ b/src/views/basic/components/carInfo-add.vue
@@ -1,8 +1,8 @@
@@ -53,7 +53,7 @@
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.$http({
- url: this.$http.adornUrl(`vehicle/get`),
+ url: this.$http.adornUrl(`/vehicle/get`),
method: 'post',
data: this.$http.adornData({id})
}).then(({data}) => {
@@ -63,7 +63,7 @@
})
} else {
this.$http({
- url: this.$http.adornUrl(`vehicle/codeGenerator`),
+ url: this.$http.adornUrl(`/vehicle/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then((data) => {
@@ -77,7 +77,7 @@
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.$http({
- url: this.$http.adornUrl(`vehicle/${!this.dataForm.id ? 'add' : 'update'}`),
+ url: this.$http.adornUrl(`/vehicle/${!this.dataForm.id ? 'add' : 'update'}`),
method: 'post',
data: this.$http.adornData({
'id': this.dataForm.id || undefined,
diff --git a/src/views/basic/components/equipmentInfo-add.vue b/src/views/basic/components/equipmentInfo-add.vue
index a69d206..44ae9c5 100644
--- a/src/views/basic/components/equipmentInfo-add.vue
+++ b/src/views/basic/components/equipmentInfo-add.vue
@@ -1,17 +1,37 @@
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+ -->
{
this.$http({
- url: this.$http.adornUrl('locationInfo/delete'),
+ url: this.$http.adornUrl('/locationInfo/delete'),
method: 'post',
data: this.$http.adornData({id})
}).then(({data}) => {
diff --git a/src/views/basic/components/processInfo-add.vue b/src/views/basic/components/processInfo-add.vue
index 1251c31..f6b882d 100644
--- a/src/views/basic/components/processInfo-add.vue
+++ b/src/views/basic/components/processInfo-add.vue
@@ -1,8 +1,8 @@
@@ -71,7 +71,7 @@
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.$http({
- url: this.$http.adornUrl(`alarmBase/get`),
+ url: this.$http.adornUrl(`/alarmBase/get`),
method: 'post',
data: this.$http.adornData({id})
}).then(({data}) => {
@@ -81,7 +81,7 @@
})
} else {
this.$http({
- url: this.$http.adornUrl(`alarmBase/codeGenerator`),
+ url: this.$http.adornUrl(`/alarmBase/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then((data) => {
@@ -95,7 +95,7 @@
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.$http({
- url: this.$http.adornUrl(`alarmBase/${!this.dataForm.id ? 'add' : 'update'}`),
+ url: this.$http.adornUrl(`/alarmBase/${!this.dataForm.id ? 'add' : 'update'}`),
method: 'post',
data: this.$http.adornData({
'id': this.dataForm.id || undefined,
diff --git a/src/views/basic/equipmentInfo.vue b/src/views/basic/equipmentInfo.vue
index c518981..05e49ee 100644
--- a/src/views/basic/equipmentInfo.vue
+++ b/src/views/basic/equipmentInfo.vue
@@ -5,7 +5,7 @@
:model="dataForm"
@keyup.enter.native="getDataList()"
>
-
+
查询
新增
@@ -36,45 +36,52 @@
>
-
-
-
-
+ -->
+
+
+
+
{
if (data && data.code === 0) {
- this.dataList = data.page.list
- this.totalPage = data.page.totalCount
+ this.dataList = data.data.records
+ this.totalPage = data.data.total
} else {
this.dataList = []
this.totalPage = 0
diff --git a/src/views/basic/processInfo.vue b/src/views/basic/processInfo.vue
index 569556e..e1aa70d 100644
--- a/src/views/basic/processInfo.vue
+++ b/src/views/basic/processInfo.vue
@@ -118,7 +118,7 @@
getDataList () {
this.dataListLoading = true
this.$http({
- url: this.$http.adornUrl('alarmBase/page'),
+ url: this.$http.adornUrl('/alarmBase/page'),
method: 'post',
data: this.$http.adornData({
'current': this.pageIndex,
@@ -162,7 +162,7 @@
type: 'warning'
}).then(() => {
this.$http({
- url: this.$http.adornUrl('alarmBase/delete'),
+ url: this.$http.adornUrl('/alarmBase/delete'),
method: 'post',
data: this.$http.adornData({id})
}).then(({data}) => {
diff --git a/src/views/common/home.vue b/src/views/common/home.vue
index 4760b58..fc10261 100644
--- a/src/views/common/home.vue
+++ b/src/views/common/home.vue
@@ -155,7 +155,7 @@ export default {
getDataList () {
this.dataListLoading = true
this.$http({
- url: this.$http.adornUrl('currTask/mainCurrentTaskNow'),
+ url: this.$http.adornUrl('/currTask/mainCurrentTaskNow'),
method: 'post',
data: this.$http.adornData({
current: this.pageIndex,
diff --git a/src/views/common/login.vue b/src/views/common/login.vue
index 49b8a01..94cc268 100644
--- a/src/views/common/login.vue
+++ b/src/views/common/login.vue
@@ -30,8 +30,8 @@
data () {
return {
dataForm: {
- mobile: '',
- password: ''
+ mobile: '13588441519',
+ password: '123abc.'
},
dataRule: {
mobile: [
@@ -52,7 +52,7 @@
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.$http({
- url: this.$http.adornUrl('passport/login'),
+ url: this.$http.adornUrl('/passport/login'),
method: 'post',
data: this.$http.adornData({
'mobile': this.dataForm.mobile,
diff --git a/src/views/common/order-process-add.vue b/src/views/common/order-process-add.vue
index bbadefb..38adf99 100644
--- a/src/views/common/order-process-add.vue
+++ b/src/views/common/order-process-add.vue
@@ -1,20 +1,32 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+