diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 1f4f47e..9a8c13a 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -74,7 +74,7 @@ module.exports = { limit: 10000, name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } - } + }, ] }, node: { diff --git a/src/assets/step.rar b/dist.zip similarity index 72% rename from src/assets/step.rar rename to dist.zip index 521b226..f247f68 100644 Binary files a/src/assets/step.rar and b/dist.zip differ diff --git a/npminstall-debug.log b/npminstall-debug.log deleted file mode 100644 index 1e666da..0000000 --- a/npminstall-debug.log +++ /dev/null @@ -1,202 +0,0 @@ -{ - root: 'D:\\VueSmsvp\\VueSmsvp', - registry: 'https://registry.npmmirror.com', - pkgs: [ - { - name: 'node-sass', - version: '4.14', - type: 'range', - alias: undefined, - arg: [Result] - } - ], - production: false, - cacheStrict: false, - cacheDir: 'C:\\Users\\49912\\.npminstall_tarball', - env: { - npm_config_registry: 'https://registry.npmmirror.com', - npm_config_argv: '{"remain":[],"cooked":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\49912\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com","node-sass@4.14","--save"],"original":["--fix-bug-versions","--china","--userconfig=C:\\\\Users\\\\49912\\\\.cnpmrc","--disturl=https://cdn.npmmirror.com/binaries/node","--registry=https://registry.npmmirror.com","node-sass@4.14","--save"]}', - npm_config_user_agent: 'npminstall/7.9.0 npm/? node/v16.18.1 win32 x64', - npm_config_cache: 'C:\\Users\\49912\\.npminstall_tarball', - NODE: 'C:\\Program Files\\nodejs\\node.exe', - npm_node_execpath: 'C:\\Program Files\\nodejs\\node.exe', - npm_execpath: 'D:\\soft\\nvm\\v16.18.1\\node_modules\\cnpm\\node_modules\\npminstall\\bin\\install.js', - npm_config_userconfig: 'C:\\Users\\49912\\.cnpmrc', - npm_config_disturl: 'https://cdn.npmmirror.com/binaries/node', - npm_config_r: 'https://registry.npmmirror.com', - COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com', - NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node', - NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node', - PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs', - CHROMEDRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/chromedriver', - OPERADRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/operadriver', - CYPRESS_DOWNLOAD_PATH_TEMPLATE: 'https://cdn.npmmirror.com/binaries/cypress/${version}/${platform}-${arch}/cypress.zip', - ELECTRON_MIRROR: 'https://cdn.npmmirror.com/binaries/electron/', - ELECTRON_BUILDER_BINARIES_MIRROR: 'https://cdn.npmmirror.com/binaries/electron-builder-binaries/', - SASS_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-sass', - SWC_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-swc', - NWJS_URLBASE: 'https://cdn.npmmirror.com/binaries/nwjs/v', - PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/chrome-for-testing', - PUPPETEER_DOWNLOAD_BASE_URL: 'https://cdn.npmmirror.com/binaries/chrome-for-testing', - PLAYWRIGHT_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/playwright', - SENTRYCLI_CDNURL: 'https://cdn.npmmirror.com/binaries/sentry-cli', - SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl', - RE2_DOWNLOAD_MIRROR: 'https://cdn.npmmirror.com/binaries/node-re2', - RE2_DOWNLOAD_SKIP_PATH: 'true', - PRISMA_ENGINES_MIRROR: 'https://cdn.npmmirror.com/binaries/prisma', - npm_config_better_sqlite3_binary_host: 'https://cdn.npmmirror.com/binaries/better-sqlite3', - npm_config_keytar_binary_host: 'https://cdn.npmmirror.com/binaries/keytar', - npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp', - npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips', - npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs', - npm_rootpath: 'D:\\VueSmsvp\\VueSmsvp', - INIT_CWD: 'D:\\VueSmsvp\\VueSmsvp' - }, - binaryMirrors: { - ENVS: { - COREPACK_NPM_REGISTRY: 'https://registry.npmmirror.com', - NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node', - NVM_NODEJS_ORG_MIRROR: 'https://cdn.npmmirror.com/binaries/node', - PHANTOMJS_CDNURL: 'https://cdn.npmmirror.com/binaries/phantomjs', - CHROMEDRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/chromedriver', - OPERADRIVER_CDNURL: 'https://cdn.npmmirror.com/binaries/operadriver', - CYPRESS_DOWNLOAD_PATH_TEMPLATE: 'https://cdn.npmmirror.com/binaries/cypress/${version}/${platform}-${arch}/cypress.zip', - ELECTRON_MIRROR: 'https://cdn.npmmirror.com/binaries/electron/', - ELECTRON_BUILDER_BINARIES_MIRROR: 'https://cdn.npmmirror.com/binaries/electron-builder-binaries/', - SASS_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-sass', - SWC_BINARY_SITE: 'https://cdn.npmmirror.com/binaries/node-swc', - NWJS_URLBASE: 'https://cdn.npmmirror.com/binaries/nwjs/v', - PUPPETEER_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/chrome-for-testing', - PUPPETEER_DOWNLOAD_BASE_URL: 'https://cdn.npmmirror.com/binaries/chrome-for-testing', - PLAYWRIGHT_DOWNLOAD_HOST: 'https://cdn.npmmirror.com/binaries/playwright', - SENTRYCLI_CDNURL: 'https://cdn.npmmirror.com/binaries/sentry-cli', - SAUCECTL_INSTALL_BINARY_MIRROR: 'https://cdn.npmmirror.com/binaries/saucectl', - RE2_DOWNLOAD_MIRROR: 'https://cdn.npmmirror.com/binaries/node-re2', - RE2_DOWNLOAD_SKIP_PATH: 'true', - PRISMA_ENGINES_MIRROR: 'https://cdn.npmmirror.com/binaries/prisma', - npm_config_better_sqlite3_binary_host: 'https://cdn.npmmirror.com/binaries/better-sqlite3', - npm_config_keytar_binary_host: 'https://cdn.npmmirror.com/binaries/keytar', - npm_config_sharp_binary_host: 'https://cdn.npmmirror.com/binaries/sharp', - npm_config_sharp_libvips_binary_host: 'https://cdn.npmmirror.com/binaries/sharp-libvips', - npm_config_robotjs_binary_host: 'https://cdn.npmmirror.com/binaries/robotjs' - }, - '@ali/s2': { host: 'https://cdn.npmmirror.com/binaries/looksgood-s2' }, - sharp: { replaceHostFiles: [Array], replaceHostMap: [Object] }, - '@tensorflow/tfjs-node': { - replaceHostFiles: [Array], - replaceHostRegExpMap: [Object], - replaceHostMap: [Object] - }, - cypress: { - host: 'https://cdn.npmmirror.com/binaries/cypress', - newPlatforms: [Object] - }, - 'utf-8-validate': { - host: 'https://cdn.npmmirror.com/binaries/utf-8-validate/v{version}' - }, - xprofiler: { - remote_path: './xprofiler/v{version}/', - host: 'https://cdn.npmmirror.com/binaries' - }, - leveldown: { host: 'https://cdn.npmmirror.com/binaries/leveldown/v{version}' }, - couchbase: { host: 'https://cdn.npmmirror.com/binaries/couchbase/v{version}' }, - gl: { host: 'https://cdn.npmmirror.com/binaries/gl/v{version}' }, - sqlite3: { - host: 'https://cdn.npmmirror.com/binaries/sqlite3', - remote_path: 'v{version}' - }, - '@journeyapps/sqlcipher': { host: 'https://cdn.npmmirror.com/binaries' }, - grpc: { - host: 'https://cdn.npmmirror.com/binaries', - remote_path: '{name}/v{version}' - }, - 'grpc-tools': { host: 'https://cdn.npmmirror.com/binaries' }, - wrtc: { - host: 'https://cdn.npmmirror.com/binaries', - remote_path: '{name}/v{version}' - }, - fsevents: { host: 'https://cdn.npmmirror.com/binaries/fsevents' }, - nodejieba: { host: 'https://cdn.npmmirror.com/binaries/nodejieba' }, - canvas: { host: 'https://cdn.npmmirror.com/binaries/canvas' }, - 'skia-canvas': { host: 'https://cdn.npmmirror.com/binaries/skia-canvas' }, - 'flow-bin': { - replaceHost: 'https://github.com/facebook/flow/releases/download/v', - host: 'https://cdn.npmmirror.com/binaries/flow/v' - }, - 'jpegtran-bin': { - replaceHost: [Array], - host: 'https://cdn.npmmirror.com/binaries/jpegtran-bin' - }, - 'cwebp-bin': { - replaceHost: [Array], - host: 'https://cdn.npmmirror.com/binaries/cwebp-bin' - }, - 'zopflipng-bin': { - replaceHost: [Array], - host: 'https://cdn.npmmirror.com/binaries/zopflipng-bin' - }, - 'optipng-bin': { - replaceHost: [Array], - host: 'https://cdn.npmmirror.com/binaries/optipng-bin' - }, - mozjpeg: { - replaceHost: [Array], - host: 'https://cdn.npmmirror.com/binaries/mozjpeg-bin' - }, - gifsicle: { - replaceHost: [Array], - host: 'https://cdn.npmmirror.com/binaries/gifsicle-bin' - }, - 'pngquant-bin': { - replaceHost: [Array], - host: 'https://cdn.npmmirror.com/binaries/pngquant-bin', - replaceHostMap: [Object] - }, - 'pngcrush-bin': { - replaceHost: [Array], - host: 'https://cdn.npmmirror.com/binaries/pngcrush-bin' - }, - 'jpeg-recompress-bin': { - replaceHost: [Array], - host: 'https://cdn.npmmirror.com/binaries/jpeg-recompress-bin' - }, - 'advpng-bin': { - replaceHost: [Array], - host: 'https://cdn.npmmirror.com/binaries/advpng-bin' - }, - 'pngout-bin': { - replaceHost: [Array], - host: 'https://cdn.npmmirror.com/binaries/pngout-bin' - }, - 'jpegoptim-bin': { - replaceHost: [Array], - host: 'https://cdn.npmmirror.com/binaries/jpegoptim-bin' - }, - argon2: { host: 'https://cdn.npmmirror.com/binaries/argon2' }, - 'ali-zeromq': { host: 'https://cdn.npmmirror.com/binaries/ali-zeromq' }, - 'ali-usb_ctl': { host: 'https://cdn.npmmirror.com/binaries/ali-usb_ctl' }, - 'gdal-async': { host: 'https://cdn.npmmirror.com/binaries/node-gdal-async' } - }, - forbiddenLicenses: null, - flatten: false, - proxy: undefined, - prune: false, - disableFallbackStore: false, - workspacesMap: Map(0) {}, - enableWorkspace: false, - workspaceRoot: 'D:\\VueSmsvp\\VueSmsvp', - isWorkspaceRoot: true, - isWorkspacePackage: false, - offline: false, - strictSSL: true, - ignoreScripts: false, - foregroundScripts: false, - ignoreOptionalDependencies: false, - detail: false, - forceLinkLatest: false, - trace: false, - engineStrict: false, - registryOnly: false, - client: false, - autoFixVersion: [Function: autoFixVersion] -} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index b94cbfe..ed7e556 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "babel-preset-stage-2": "^6.22.0", "chalk": "^2.0.1", "copy-webpack-plugin": "^4.0.1", - "css-loader": "^0.28.11", + "css-loader": "^0.28.0", "eslint": "^4.15.0", "eslint-config-standard": "^10.2.1", "eslint-friendly-formatter": "^3.0.0", @@ -52,8 +52,6 @@ "html-webpack-plugin": "^2.30.1", "jest": "^22.0.4", "jest-serializer-vue": "^0.3.0", - "less": "^4.1.3", - "less-loader": "^11.1.3", "node-notifier": "^5.1.2", "optimize-css-assets-webpack-plugin": "^3.2.0", "ora": "^1.2.0", @@ -68,7 +66,7 @@ "url-loader": "^0.5.8", "vue-jest": "^1.0.2", "vue-loader": "^13.3.0", - "vue-style-loader": "^3.1.2", + "vue-style-loader": "^3.0.1", "vue-template-compiler": "^2.5.2", "webpack": "^3.6.0", "webpack-bundle-analyzer": "^2.9.0", @@ -3530,15 +3528,6 @@ "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "dev": true }, - "node_modules/copy-anything": { - "version": "2.0.6", - "resolved": "https://registry.npmmirror.com/copy-anything/-/copy-anything-2.0.6.tgz", - "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", - "dev": true, - "dependencies": { - "is-what": "^3.14.1" - } - }, "node_modules/copy-concurrently": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", @@ -3741,7 +3730,7 @@ }, "node_modules/css-loader": { "version": "0.28.11", - "resolved": "https://registry.npmmirror.com/css-loader/-/css-loader-0.28.11.tgz", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.11.tgz", "integrity": "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==", "dev": true, "dependencies": { @@ -8212,19 +8201,6 @@ "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", "dev": true }, - "node_modules/image-size": { - "version": "0.5.5", - "resolved": "https://registry.npmmirror.com/image-size/-/image-size-0.5.5.tgz", - "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", - "dev": true, - "optional": true, - "bin": { - "image-size": "bin/image-size.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/import-cwd": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", @@ -8961,12 +8937,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-what": { - "version": "3.14.1", - "resolved": "https://registry.npmmirror.com/is-what/-/is-what-3.14.1.tgz", - "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", - "dev": true - }, "node_modules/is-whitespace": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz", @@ -9850,79 +9820,6 @@ "deprecated": "use String.prototype.padStart()", "dev": true }, - "node_modules/less": { - "version": "4.1.3", - "resolved": "https://registry.npmmirror.com/less/-/less-4.1.3.tgz", - "integrity": "sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==", - "dev": true, - "dependencies": { - "copy-anything": "^2.0.1", - "parse-node-version": "^1.0.1", - "tslib": "^2.3.0" - }, - "bin": { - "lessc": "bin/lessc" - }, - "engines": { - "node": ">=6" - }, - "optionalDependencies": { - "errno": "^0.1.1", - "graceful-fs": "^4.1.2", - "image-size": "~0.5.0", - "make-dir": "^2.1.0", - "mime": "^1.4.1", - "needle": "^3.1.0", - "source-map": "~0.6.0" - } - }, - "node_modules/less-loader": { - "version": "11.1.3", - "resolved": "https://registry.npmmirror.com/less-loader/-/less-loader-11.1.3.tgz", - "integrity": "sha512-A5b7O8dH9xpxvkosNrP0dFp2i/dISOJa9WwGF3WJflfqIERE2ybxh1BFDj5CovC2+jCE4M354mk90hN6ziXlVw==", - "dev": true, - "engines": { - "node": ">= 14.15.0" - }, - "peerDependencies": { - "less": "^3.5.0 || ^4.0.0", - "webpack": "^5.0.0" - } - }, - "node_modules/less/node_modules/make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "dev": true, - "optional": true, - "dependencies": { - "pify": "^4.0.1", - "semver": "^5.6.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/less/node_modules/pify": { - "version": "4.0.1", - "resolved": "https://registry.npmmirror.com/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true, - "optional": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/less/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/leven": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz", @@ -10692,54 +10589,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "node_modules/needle": { - "version": "3.2.0", - "resolved": "https://registry.npmmirror.com/needle/-/needle-3.2.0.tgz", - "integrity": "sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==", - "dev": true, - "optional": true, - "dependencies": { - "debug": "^3.2.6", - "iconv-lite": "^0.6.3", - "sax": "^1.2.4" - }, - "bin": { - "needle": "bin/needle" - }, - "engines": { - "node": ">= 4.4.x" - } - }, - "node_modules/needle/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmmirror.com/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "optional": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/needle/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "optional": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/needle/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "optional": true - }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -11562,15 +11411,6 @@ "node": ">=4" } }, - "node_modules/parse-node-version": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/parse-node-version/-/parse-node-version-1.0.1.tgz", - "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/parse5": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", @@ -18694,7 +18534,7 @@ }, "node_modules/vue-style-loader": { "version": "3.1.2", - "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-3.1.2.tgz", + "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.1.2.tgz", "integrity": "sha512-ICtVdK/p+qXWpdSs2alWtsXt9YnDoYjQe0w5616j9+/EhjoxZkbun34uWgsMFnC1MhrMMwaWiImz3K2jK1Yp2Q==", "dev": true, "dependencies": { @@ -23418,15 +23258,6 @@ "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "dev": true }, - "copy-anything": { - "version": "2.0.6", - "resolved": "https://registry.npmmirror.com/copy-anything/-/copy-anything-2.0.6.tgz", - "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", - "dev": true, - "requires": { - "is-what": "^3.14.1" - } - }, "copy-concurrently": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", @@ -23603,7 +23434,7 @@ }, "css-loader": { "version": "0.28.11", - "resolved": "https://registry.npmmirror.com/css-loader/-/css-loader-0.28.11.tgz", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.11.tgz", "integrity": "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==", "dev": true, "requires": { @@ -27215,13 +27046,6 @@ "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", "dev": true }, - "image-size": { - "version": "0.5.5", - "resolved": "https://registry.npmmirror.com/image-size/-/image-size-0.5.5.tgz", - "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", - "dev": true, - "optional": true - }, "import-cwd": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", @@ -27768,12 +27592,6 @@ "call-bind": "^1.0.2" } }, - "is-what": { - "version": "3.14.1", - "resolved": "https://registry.npmmirror.com/is-what/-/is-what-3.14.1.tgz", - "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", - "dev": true - }, "is-whitespace": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz", @@ -28579,58 +28397,6 @@ "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==", "dev": true }, - "less": { - "version": "4.1.3", - "resolved": "https://registry.npmmirror.com/less/-/less-4.1.3.tgz", - "integrity": "sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==", - "dev": true, - "requires": { - "copy-anything": "^2.0.1", - "errno": "^0.1.1", - "graceful-fs": "^4.1.2", - "image-size": "~0.5.0", - "make-dir": "^2.1.0", - "mime": "^1.4.1", - "needle": "^3.1.0", - "parse-node-version": "^1.0.1", - "source-map": "~0.6.0", - "tslib": "^2.3.0" - }, - "dependencies": { - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "dev": true, - "optional": true, - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - } - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmmirror.com/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true, - "optional": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "optional": true - } - } - }, - "less-loader": { - "version": "11.1.3", - "resolved": "https://registry.npmmirror.com/less-loader/-/less-loader-11.1.3.tgz", - "integrity": "sha512-A5b7O8dH9xpxvkosNrP0dFp2i/dISOJa9WwGF3WJflfqIERE2ybxh1BFDj5CovC2+jCE4M354mk90hN6ziXlVw==", - "dev": true, - "requires": {} - }, "leven": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz", @@ -29263,47 +29029,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "needle": { - "version": "3.2.0", - "resolved": "https://registry.npmmirror.com/needle/-/needle-3.2.0.tgz", - "integrity": "sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==", - "dev": true, - "optional": true, - "requires": { - "debug": "^3.2.6", - "iconv-lite": "^0.6.3", - "sax": "^1.2.4" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmmirror.com/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "optional": true, - "requires": { - "ms": "^2.1.1" - } - }, - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "optional": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "optional": true - } - } - }, "negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -29964,12 +29689,6 @@ "json-parse-better-errors": "^1.0.1" } }, - "parse-node-version": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/parse-node-version/-/parse-node-version-1.0.1.tgz", - "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", - "dev": true - }, "parse5": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", @@ -35760,7 +35479,7 @@ }, "vue-style-loader": { "version": "3.1.2", - "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-3.1.2.tgz", + "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.1.2.tgz", "integrity": "sha512-ICtVdK/p+qXWpdSs2alWtsXt9YnDoYjQe0w5616j9+/EhjoxZkbun34uWgsMFnC1MhrMMwaWiImz3K2jK1Yp2Q==", "dev": true, "requires": { diff --git a/package.json b/package.json index ac135d8..fd313de 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "axios": "^0.27.2", - "echarts": "^5.4.1", + "echarts": "^5.4.2", "element-ui": "^2.15.9", "highcharts": "^10.2.0", "highcharts-vue": "^1.4.0", @@ -42,7 +42,7 @@ "babel-preset-stage-2": "^6.22.0", "chalk": "^2.0.1", "copy-webpack-plugin": "^4.0.1", - "css-loader": "^0.28.11", + "css-loader": "^0.28.0", "eslint": "^4.15.0", "eslint-config-standard": "^10.2.1", "eslint-friendly-formatter": "^3.0.0", @@ -58,9 +58,10 @@ "html-webpack-plugin": "^2.30.1", "jest": "^22.0.4", "jest-serializer-vue": "^0.3.0", - "less": "^3.9.0", - "less-loader": "^4.1.0", + "less": "^4.1.3", + "less-loader": "^5.0.0", "node-notifier": "^5.1.2", + "node-sass": "^6.0.1", "optimize-css-assets-webpack-plugin": "^3.2.0", "ora": "^1.2.0", "portfinder": "^1.0.13", @@ -68,14 +69,14 @@ "postcss-loader": "^2.0.8", "postcss-url": "^7.2.1", "rimraf": "^2.6.0", + "sass-loader": "^10.2.0", "semver": "^5.3.0", "shelljs": "^0.7.6", - "style-loader": "^3.3.3", "uglifyjs-webpack-plugin": "^1.1.1", "url-loader": "^0.5.8", "vue-jest": "^1.0.2", "vue-loader": "^13.3.0", - "vue-style-loader": "^3.1.2", + "vue-style-loader": "^3.0.1", "vue-template-compiler": "^2.5.2", "webpack": "^3.6.0", "webpack-bundle-analyzer": "^2.9.0", diff --git a/src/api/home.js b/src/api/home.js index daacc4d..c070665 100644 --- a/src/api/home.js +++ b/src/api/home.js @@ -4,7 +4,7 @@ import Qs from 'qs' //打开仓门 export function openDoor(data) { return request({ - url: '/experiment/open_barn_door', + url: 'experiment/barn_door_operate', method: 'post', data: Qs.stringify(data) }) @@ -17,5 +17,20 @@ export function colseDoor(data) { data: Qs.stringify(data) }) } - +//结束实验(结束线程) +export function stopExperiment() { + return request({ + url: '/experiment/stop_experiment', + method: 'post', + // data: Qs.stringify(data) + }) +} +//结束实验(结束线程) +export function stopClean() { + return request({ + url: '/experiment/stop_clean', + method: 'post', + // data: Qs.stringify(data) + }) +} diff --git a/src/api/report.js b/src/api/report.js index b92ac2b..b21b080 100644 --- a/src/api/report.js +++ b/src/api/report.js @@ -23,7 +23,7 @@ export function exportReportList(data) { return request({ url: '/experiment/export_experiment_data', method: 'post', - data: Qs.stringify(data) + data: data }) } diff --git a/src/components/Headers.vue b/src/components/Headers.vue index 4bd0a8d..42158a2 100644 --- a/src/components/Headers.vue +++ b/src/components/Headers.vue @@ -56,10 +56,10 @@ import {getDate} from '@/utils/common.js' import {openDoor,colseDoor} from '@/api/home.js' export default { name: 'Headers', - props:['user','role'], + props:['user','role','step'], data(){ return { - step:'1', + // step:'1', nowDate: "", nowTime: "", nowWeek: "", @@ -148,9 +148,14 @@ export default { _this.nowDate=yy+ "/"+mm + "/" + dd + " "+' '+hh + ":" + mf; }, handOpen(){ - console.log('打开1') + console.log('打开2') openDoor().then(res=>{ - console.log(res,'打开仓门') + console.log(res,'打开成功') + if(res.data.status==0){ + this.$message.success('打开仓门成功') + }else{ + this.$message.error(res.data.message) + } }) } }, diff --git a/src/components/Views.vue b/src/components/Views.vue index 5177811..4ebc7f2 100644 --- a/src/components/Views.vue +++ b/src/components/Views.vue @@ -1,6 +1,6 @@ @@ -11,6 +11,9 @@ getuserdata(res){ var that =this that.$emit('user_header',res) + }, + getStep(res){ + this.$emit('currentStep',res) } } } diff --git a/src/main.js b/src/main.js index 460c130..f4c9c72 100644 --- a/src/main.js +++ b/src/main.js @@ -31,7 +31,7 @@ try{ // extraHeaders: { "Access-Control-Allow-Origin": "*" } // })); Vue.use(new VueSocketIO({ - connection: SocketIO("http://192.168.101.50:5001", { + connection: SocketIO("http://192.168.101.75:5001", { autoConnect: true // 自动连接 }), extraHeaders: { "Access-Control-Allow-Origin": "*" } diff --git a/src/pages/AddUser.vue b/src/pages/AddUser.vue index 26dc78a..c17c2ff 100644 --- a/src/pages/AddUser.vue +++ b/src/pages/AddUser.vue @@ -1,35 +1,11 @@