添加去除实验功能

main
nz618 2 years ago
parent 1cb1e6de15
commit 119b7f572d

@ -74,7 +74,7 @@ module.exports = {
limit: 10000, limit: 10000,
name: utils.assetsPath('fonts/[name].[hash:7].[ext]') name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
} }
} },
] ]
}, },
node: { node: {

Binary file not shown.

@ -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]
}

293
package-lock.json generated

@ -36,7 +36,7 @@
"babel-preset-stage-2": "^6.22.0", "babel-preset-stage-2": "^6.22.0",
"chalk": "^2.0.1", "chalk": "^2.0.1",
"copy-webpack-plugin": "^4.0.1", "copy-webpack-plugin": "^4.0.1",
"css-loader": "^0.28.11", "css-loader": "^0.28.0",
"eslint": "^4.15.0", "eslint": "^4.15.0",
"eslint-config-standard": "^10.2.1", "eslint-config-standard": "^10.2.1",
"eslint-friendly-formatter": "^3.0.0", "eslint-friendly-formatter": "^3.0.0",
@ -52,8 +52,6 @@
"html-webpack-plugin": "^2.30.1", "html-webpack-plugin": "^2.30.1",
"jest": "^22.0.4", "jest": "^22.0.4",
"jest-serializer-vue": "^0.3.0", "jest-serializer-vue": "^0.3.0",
"less": "^4.1.3",
"less-loader": "^11.1.3",
"node-notifier": "^5.1.2", "node-notifier": "^5.1.2",
"optimize-css-assets-webpack-plugin": "^3.2.0", "optimize-css-assets-webpack-plugin": "^3.2.0",
"ora": "^1.2.0", "ora": "^1.2.0",
@ -68,7 +66,7 @@
"url-loader": "^0.5.8", "url-loader": "^0.5.8",
"vue-jest": "^1.0.2", "vue-jest": "^1.0.2",
"vue-loader": "^13.3.0", "vue-loader": "^13.3.0",
"vue-style-loader": "^3.1.2", "vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.2", "vue-template-compiler": "^2.5.2",
"webpack": "^3.6.0", "webpack": "^3.6.0",
"webpack-bundle-analyzer": "^2.9.0", "webpack-bundle-analyzer": "^2.9.0",
@ -3530,15 +3528,6 @@
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
"dev": true "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": { "node_modules/copy-concurrently": {
"version": "1.0.5", "version": "1.0.5",
"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
@ -3741,7 +3730,7 @@
}, },
"node_modules/css-loader": { "node_modules/css-loader": {
"version": "0.28.11", "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==", "integrity": "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
@ -8212,19 +8201,6 @@
"integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
"dev": true "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": { "node_modules/import-cwd": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
@ -8961,12 +8937,6 @@
"url": "https://github.com/sponsors/ljharb" "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": { "node_modules/is-whitespace": {
"version": "0.3.0", "version": "0.3.0",
"resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz", "resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz",
@ -9850,79 +9820,6 @@
"deprecated": "use String.prototype.padStart()", "deprecated": "use String.prototype.padStart()",
"dev": true "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": { "node_modules/leven": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz", "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
@ -10692,54 +10589,6 @@
"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
"dev": true "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": { "node_modules/negotiator": {
"version": "0.6.3", "version": "0.6.3",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@ -11562,15 +11411,6 @@
"node": ">=4" "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": { "node_modules/parse5": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
@ -18694,7 +18534,7 @@
}, },
"node_modules/vue-style-loader": { "node_modules/vue-style-loader": {
"version": "3.1.2", "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==", "integrity": "sha512-ICtVdK/p+qXWpdSs2alWtsXt9YnDoYjQe0w5616j9+/EhjoxZkbun34uWgsMFnC1MhrMMwaWiImz3K2jK1Yp2Q==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
@ -23418,15 +23258,6 @@
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
"dev": true "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": { "copy-concurrently": {
"version": "1.0.5", "version": "1.0.5",
"resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
@ -23603,7 +23434,7 @@
}, },
"css-loader": { "css-loader": {
"version": "0.28.11", "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==", "integrity": "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==",
"dev": true, "dev": true,
"requires": { "requires": {
@ -27215,13 +27046,6 @@
"integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
"dev": true "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": { "import-cwd": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
@ -27768,12 +27592,6 @@
"call-bind": "^1.0.2" "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": { "is-whitespace": {
"version": "0.3.0", "version": "0.3.0",
"resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz", "resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz",
@ -28579,58 +28397,6 @@
"integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==", "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
"dev": true "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": { "leven": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz", "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
@ -29263,47 +29029,6 @@
"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
"dev": true "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": { "negotiator": {
"version": "0.6.3", "version": "0.6.3",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@ -29964,12 +29689,6 @@
"json-parse-better-errors": "^1.0.1" "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": { "parse5": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
@ -35760,7 +35479,7 @@
}, },
"vue-style-loader": { "vue-style-loader": {
"version": "3.1.2", "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==", "integrity": "sha512-ICtVdK/p+qXWpdSs2alWtsXt9YnDoYjQe0w5616j9+/EhjoxZkbun34uWgsMFnC1MhrMMwaWiImz3K2jK1Yp2Q==",
"dev": true, "dev": true,
"requires": { "requires": {

@ -14,7 +14,7 @@
}, },
"dependencies": { "dependencies": {
"axios": "^0.27.2", "axios": "^0.27.2",
"echarts": "^5.4.1", "echarts": "^5.4.2",
"element-ui": "^2.15.9", "element-ui": "^2.15.9",
"highcharts": "^10.2.0", "highcharts": "^10.2.0",
"highcharts-vue": "^1.4.0", "highcharts-vue": "^1.4.0",
@ -42,7 +42,7 @@
"babel-preset-stage-2": "^6.22.0", "babel-preset-stage-2": "^6.22.0",
"chalk": "^2.0.1", "chalk": "^2.0.1",
"copy-webpack-plugin": "^4.0.1", "copy-webpack-plugin": "^4.0.1",
"css-loader": "^0.28.11", "css-loader": "^0.28.0",
"eslint": "^4.15.0", "eslint": "^4.15.0",
"eslint-config-standard": "^10.2.1", "eslint-config-standard": "^10.2.1",
"eslint-friendly-formatter": "^3.0.0", "eslint-friendly-formatter": "^3.0.0",
@ -58,9 +58,10 @@
"html-webpack-plugin": "^2.30.1", "html-webpack-plugin": "^2.30.1",
"jest": "^22.0.4", "jest": "^22.0.4",
"jest-serializer-vue": "^0.3.0", "jest-serializer-vue": "^0.3.0",
"less": "^3.9.0", "less": "^4.1.3",
"less-loader": "^4.1.0", "less-loader": "^5.0.0",
"node-notifier": "^5.1.2", "node-notifier": "^5.1.2",
"node-sass": "^6.0.1",
"optimize-css-assets-webpack-plugin": "^3.2.0", "optimize-css-assets-webpack-plugin": "^3.2.0",
"ora": "^1.2.0", "ora": "^1.2.0",
"portfinder": "^1.0.13", "portfinder": "^1.0.13",
@ -68,14 +69,14 @@
"postcss-loader": "^2.0.8", "postcss-loader": "^2.0.8",
"postcss-url": "^7.2.1", "postcss-url": "^7.2.1",
"rimraf": "^2.6.0", "rimraf": "^2.6.0",
"sass-loader": "^10.2.0",
"semver": "^5.3.0", "semver": "^5.3.0",
"shelljs": "^0.7.6", "shelljs": "^0.7.6",
"style-loader": "^3.3.3",
"uglifyjs-webpack-plugin": "^1.1.1", "uglifyjs-webpack-plugin": "^1.1.1",
"url-loader": "^0.5.8", "url-loader": "^0.5.8",
"vue-jest": "^1.0.2", "vue-jest": "^1.0.2",
"vue-loader": "^13.3.0", "vue-loader": "^13.3.0",
"vue-style-loader": "^3.1.2", "vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.2", "vue-template-compiler": "^2.5.2",
"webpack": "^3.6.0", "webpack": "^3.6.0",
"webpack-bundle-analyzer": "^2.9.0", "webpack-bundle-analyzer": "^2.9.0",

@ -4,7 +4,7 @@ import Qs from 'qs'
//打开仓门 //打开仓门
export function openDoor(data) { export function openDoor(data) {
return request({ return request({
url: '/experiment/open_barn_door', url: 'experiment/barn_door_operate',
method: 'post', method: 'post',
data: Qs.stringify(data) data: Qs.stringify(data)
}) })
@ -17,5 +17,20 @@ export function colseDoor(data) {
data: Qs.stringify(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)
})
}

@ -23,7 +23,7 @@ export function exportReportList(data) {
return request({ return request({
url: '/experiment/export_experiment_data', url: '/experiment/export_experiment_data',
method: 'post', method: 'post',
data: Qs.stringify(data) data: data
}) })
} }

@ -56,10 +56,10 @@ import {getDate} from '@/utils/common.js'
import {openDoor,colseDoor} from '@/api/home.js' import {openDoor,colseDoor} from '@/api/home.js'
export default { export default {
name: 'Headers', name: 'Headers',
props:['user','role'], props:['user','role','step'],
data(){ data(){
return { return {
step:'1', // step:'1',
nowDate: "", nowDate: "",
nowTime: "", nowTime: "",
nowWeek: "", nowWeek: "",
@ -148,9 +148,14 @@ export default {
_this.nowDate=yy+ "/"+mm + "/" + dd + " "+' '+hh + ":" + mf; _this.nowDate=yy+ "/"+mm + "/" + dd + " "+' '+hh + ":" + mf;
}, },
handOpen(){ handOpen(){
console.log('打开1') console.log('打开2')
openDoor().then(res=>{ openDoor().then(res=>{
console.log(res,'打开仓门') console.log(res,'打开成功')
if(res.data.status==0){
this.$message.success('打开仓门成功')
}else{
this.$message.error(res.data.message)
}
}) })
} }
}, },

@ -1,6 +1,6 @@
<template> <template>
<div class="mainbody"> <div class="mainbody">
<router-view @send_user ="getuserdata" /> <router-view @send_user ="getuserdata" @currentStep="getStep"/>
</div> </div>
</template> </template>
@ -11,6 +11,9 @@
getuserdata(res){ getuserdata(res){
var that =this var that =this
that.$emit('user_header',res) that.$emit('user_header',res)
},
getStep(res){
this.$emit('currentStep',res)
} }
} }
} }

@ -31,7 +31,7 @@ try{
// extraHeaders: { "Access-Control-Allow-Origin": "*" } // extraHeaders: { "Access-Control-Allow-Origin": "*" }
// })); // }));
Vue.use(new VueSocketIO({ Vue.use(new VueSocketIO({
connection: SocketIO("http://192.168.101.50:5001", { connection: SocketIO("http://192.168.101.75:5001", {
autoConnect: true // 自动连接 autoConnect: true // 自动连接
}), }),
extraHeaders: { "Access-Control-Allow-Origin": "*" } extraHeaders: { "Access-Control-Allow-Origin": "*" }

@ -1,35 +1,11 @@
<template> <template>
<div class="adduserbox"> <div class="adduserbox">
<!-- <div class="usertop">
<div class="row" @click="go('userlist')">
<i class="el-icon-arrow-left"></i>
<span>{{title}}</span>
</div>
<div class="row">
</div>
</div> -->
<div class="usertop"><span>{{title}}</span></div> <div class="usertop"><span>{{title}}</span></div>
<div class="card"> <div class="card">
<!-- <p class="P3">{{p3}}</p> -->
<div class="pinput"> <div class="pinput">
<span class="label">用户名</span> <span class="label">用户名</span>
<el-input class="numkeyboard" v-model="name" placeholder="请输入" ></el-input> <el-input class="numkeyboard" v-model="name" placeholder="请输入" ></el-input>
</div> </div>
<!-- <div class="pinput">
<span>账号</span>
<el-input class="numkeyboard" v-model="user" placeholder="请输入" show-password></el-input>
</div>
<div class="pinput">
<span>性别</span>
<el-select v-model="sex" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div> -->
<div class="pinput"> <div class="pinput">
<span class="label">角色</span> <span class="label">角色</span>
<el-select v-model="role" placeholder="请选择"> <el-select v-model="role" placeholder="请选择">

@ -1,10 +1,10 @@
<template> <template>
<el-container class="container"> <el-container class="container">
<el-header class="header"> <el-header class="header">
<headers :user="user" :role="role"></headers> <headers :user="user" :role="role" :step="step"></headers>
</el-header> </el-header>
<el-main class="main" > <el-main class="main" >
<views @user_header="getData"></views> <views @user_header="getData" @currentStep="getStep"></views>
</el-main> </el-main>
</el-container> </el-container>
</template> </template>
@ -19,13 +19,18 @@ export default {
data(){ data(){
return { return {
user:'请登录', user:'请登录',
role:0 role:0,
step:''
} }
}, },
methods:{ methods:{
getData(res){ getData(res){
this.user =res.real_name this.user =res.real_name
this.role =res.user_role this.role =res.user_role
},
getStep(res){
console.log('当前步骤',res)
this.step=res
} }
} }
} }

@ -93,7 +93,7 @@ export default {
}, },
}; };
</script> </script>
<style scoped > <style scoped lang="less">
.loginbox { .loginbox {
width: 1024px; width: 1024px;
height: 658px; height: 658px;

@ -9,9 +9,8 @@
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
<span class="title">数据报表</span> <span class="title">数据报表</span>
<el-select v-model="standard" clearable placeholder="请选择" class="custom-select"> <el-select v-model="standard" clearable placeholder="请选择" class="custom-select" @change="get_List">
<el-option <el-option
@change="get_List"
v-for="item in standards" v-for="item in standards"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
@ -23,7 +22,7 @@
<div class="usertable"> <div class="usertable">
<el-input <el-input
class="numkeyboard" class="numkeyboard"
v-model="searchValue" v-model="search_value"
size="middle" size="middle"
@blur="get_List" @blur="get_List"
placeholder="搜索用户" placeholder="搜索用户"
@ -94,7 +93,7 @@ export default {
label:'SH/T 0768(1ml)' label:'SH/T 0768(1ml)'
}, },
], ],
searchValue: "", search_value: "",
tableData: [ tableData: [
], ],
multipleSelection: [] multipleSelection: []
@ -113,7 +112,7 @@ export default {
background: "rgba(0, 0, 0, 0.7)", background: "rgba(0, 0, 0, 0.7)",
}); });
let data={ let data={
searchValue: this.searchValue, search_value: this.search_value,
choose_date:this.value2, choose_date:this.value2,
determination_standard:this.standard, determination_standard:this.standard,
page:this.params.page, page:this.params.page,
@ -121,7 +120,7 @@ export default {
} }
getExperimentList(data) getExperimentList(data)
.then((response) => { .then((response) => {
if (data.status == 1) { if (response.data.status == 1) {
that.$message.error(data.message); that.$message.error(data.message);
} else { } else {
console.log(response.data,'返回数据2') console.log(response.data,'返回数据2')
@ -146,11 +145,17 @@ export default {
console.log(this.multipleSelection,'选中参数',val) console.log(this.multipleSelection,'选中参数',val)
}, },
handExport(){ handExport(){
let data={ // let data={
experiment_id:this.multipleSelection // experiment_id:this.multipleSelection
} // }
exportReportList(data).then(response=>{ var formData = new FormData()
console.log(response,'导出成功')       formData.append('experiment_id_list',JSON.stringify(this.multipleSelection))
exportReportList(formData).then(response=>{
if(response.data.status==0){
this.$message.success('导出成功')
}else{
this.$message.error(response.data.message)
}
}) })
} }
}, },

@ -64,7 +64,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-radio :label="9"> <el-radio :label="9">
<el-input placeholder="请输入内容" type="number" v-model="ruleForm.input1" @blur="changeRadio('升温速率',ruleForm.radio1,'ASTM_D6450',ruleForm.input1)"> <el-input placeholder="请输入内容" v-model="ruleForm.input1" @blur="changeRadio('升温速率',ruleForm.radio1,'ASTM_D6450',ruleForm.input1)">
<template slot="append">/min</template> <template slot="append">/min</template>
</el-input> </el-input>
</el-radio> </el-radio>
@ -252,6 +252,9 @@ export default {
}, },
created: function () { created: function () {
this.getInit() this.getInit()
this.dateTime=this.getDay()
this.timeTime=this.getTime()
console.log(this.dateTime,'时间参数',this.timeTime)
}, },
methods: { methods: {
async getInit(){ async getInit(){
@ -398,16 +401,62 @@ export default {
}, },
handInit(){ handInit(){
console.log(this.ruleForm.radio1,'参数1',this.ruleForm.input1)
if(this.ruleForm.radio1=='9'){ if(this.ruleForm.radio1=='9'){
if(this.ruleForm.input1== null && this.ruleForm.input1== ""){ if(this.ruleForm.input1== null ||this.ruleForm.input1== ""){
return this.$message.warning('升温速率 ASTM_D6450自定义值不能为空') return this.$message.warning('升温速率 ASTM_D6450自定义值不能为空')
} }
if(isNaN(this.ruleForm.input1)){ if(isNaN(this.ruleForm.input1)){
return this.$message.warning('升温速率 ASTM_D6450自定义值不能非数值') return this.$message.warning('升温速率 ASTM_D6450自定义值不能非数值')
} }
} }
initParams(this.params).then(res=>{ if(this.ruleForm.radio2=='9'){
if(this.ruleForm.input2== null ||this.ruleForm.input2== ""){
return this.$message.warning('升温速率 ASTM_D7094自定义值不能为空')
}
if(isNaN(this.ruleForm.input2)){
return this.$message.warning('升温速率 ASTM_D7094自定义值不能非数值')
}
}
if(this.ruleForm.radio3=='9'){
if(this.ruleForm.input3== null ||this.ruleForm.input3== ""){
return this.$message.warning('升温速率 SH/T0768自定义值不能为空')
}
if(isNaN(this.ruleForm.input3)){
return this.$message.warning('升温速率 SH/T0768自定义值不能非数值')
}
}
if(this.ruleForm.radio4=='9'){
if(this.ruleForm.input4== null ||this.ruleForm.input4== ""){
return this.$message.warning('点火间隔 ASTM_D6450自定义值不能为空')
}
if(isNaN(this.ruleForm.input4)){
return this.$message.warning('点火间隔 ASTM_D6450自定义值不能非数值')
}
}
if(this.ruleForm.radio5=='9'){
if(this.ruleForm.input5== null ||this.ruleForm.input5== ""){
return this.$message.warning('点火间隔 ASTM_D7094自定义值不能为空')
}
if(isNaN(this.ruleForm.input5)){
return this.$message.warning('点火间隔 ASTM_D7094自定义值不能非数值')
}
}
if(this.ruleForm.radio6=='9'){
if(this.ruleForm.input6== null ||this.ruleForm.input6== ""){
return this.$message.warning('点火间隔 SH/T0768自定义值不能为空')
}
if(isNaN(this.ruleForm.input6)){
return this.$message.warning('点火间隔 SH/T0768自定义值不能非数值')
}
}
initParams(this.params).then(response=>{
console.log(res,'初始化成功') console.log(res,'初始化成功')
if(response.data.status==0){
this.$message.success('初始化成功')
}else{
this.$message.error(response.data.message)
}
}) })
}, },
handTime(){ handTime(){
@ -420,7 +469,25 @@ export default {
setTime(data).then(res=>{ setTime(data).then(res=>{
console.log('测试',res) console.log('测试',res)
}) })
} },
getDay(){
let currentDate = new Date();
let currentYear = currentDate.getFullYear(); //
let currentMonth = currentDate.getMonth() + 1; // 0
let currentDay = currentDate.getDate(); //
let currentHour = currentDate.getHours(); //
let currentMinute = currentDate.getMinutes(); //
let currentSecond = currentDate.getSeconds(); //
return currentYear+'-'+currentMonth+'-'+currentDay
},
getTime(){
let currentDate = new Date();
let currentHour = currentDate.getHours(); //
let currentMinute = currentDate.getMinutes(); //
let currentSecond = currentDate.getSeconds(); //
return currentHour+':'+currentMinute+':'+currentSecond
},
}, },
}; };
</script> </script>

@ -430,7 +430,7 @@ export default {
page:{ page:{
handler(newValue){ handler(newValue){
console.log(newValue,'监听页数') console.log(newValue,'监听页数')
// this.$emit('currentStep',newValue) this.$emit('currentStep',newValue)
// this.$store.commit('CHANGE_STEP',newValue); // this.$store.commit('CHANGE_STEP',newValue);
localStorage.setItem('currentStep',newValue) localStorage.setItem('currentStep',newValue)
}, },
@ -440,7 +440,7 @@ export default {
}, },
sockets: { sockets: {
process_data:function(data){ process_data:function(data){
console.log(data,'process_data参数2') console.log(data,'process_data参数23')
this.lit_temperature=data.lit_temperature; this.lit_temperature=data.lit_temperature;
this.moment_pressure=data.moment_pressure; this.moment_pressure=data.moment_pressure;
this.samples_temperature=data.samples_temperature this.samples_temperature=data.samples_temperature
@ -476,6 +476,7 @@ export default {
}, },
created(){ created(){
console.log('creart')
if(this.page !='1'){ if(this.page !='1'){
chart.reflow() chart.reflow()
} }

@ -22,7 +22,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="预期闪点" prop="expected_flash_point"> <el-form-item label="预期闪点" prop="expected_flash_point">
<el-input v-model="ruleForm.expected_flash_point" class="flash rightBorder"> <el-input v-model="ruleForm.expected_flash_point" @input="handInput" class="flash rightBorder">
<template slot="append"></template> <template slot="append"></template>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -36,6 +36,8 @@
<el-form-item label="温度选择" prop="temperature_selection"> <el-form-item label="温度选择" prop="temperature_selection">
<el-select <el-select
v-model="ruleForm.temperature_selection" v-model="ruleForm.temperature_selection"
@change="handChange"
:disabled="isDisabled"
placeholder="请选择温度" placeholder="请选择温度"
style="width: 100%" style="width: 100%"
> >
@ -48,6 +50,7 @@
<el-input <el-input
class="rightBorder" class="rightBorder"
v-model="ruleForm.initial_temperature_set" v-model="ruleForm.initial_temperature_set"
:disabled="isDisabled"
placeholder="≤预期闪点-18℃" placeholder="≤预期闪点-18℃"
> >
@ -59,7 +62,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="样品名称" prop="material_name"> <el-form-item label="样品名称" prop="material_name">
<el-input v-model="ruleForm.material_name" placeholder="≤预期闪点-18℃"> <el-input v-model="ruleForm.material_name" placeholder="请输入样品名称">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -68,7 +71,8 @@
<el-input <el-input
class="rightBorder" class="rightBorder"
v-model="ruleForm.final_temperature_set" v-model="ruleForm.final_temperature_set"
placeholder="≤预期闪点-18℃" :disabled="isDisabled"
placeholder="≥预期闪点+10℃"
> >
<template slot="append"></template> <template slot="append"></template>
</el-input> </el-input>
@ -78,7 +82,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="样品编号" prop="material_code"> <el-form-item label="样品编号" prop="material_code">
<el-input v-model="ruleForm.material_code" placeholder="≤预期闪点-18℃"> <el-input v-model="ruleForm.material_code" placeholder="请输入样品编号">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -109,6 +113,9 @@ import { getInitParams } from "@/api/setSystem";
export default { export default {
data() { data() {
return { return {
isDisabled:false,
initialMinNum:100,
initialMaxNum:420,
isShow:false, isShow:false,
standards:[ standards:[
// { // {
@ -157,33 +164,55 @@ export default {
material_code:[ material_code:[
{ required: true, message: '该项不能为空', trigger: 'blur' }, { required: true, message: '该项不能为空', trigger: 'blur' },
], ],
expected_flash_point:[
{ required: true, message: '该项不能为空', trigger: 'blur' },
],
initial_temperature_set:[
{ required: true, message: '该项不能为空', trigger: 'blur' },
],
final_temperature_set:[
{ required: true, message: '该项不能为空', trigger: 'blur' },
],
}, },
}; };
}, },
watch:{ // watch:{
ruleForm:{ // ruleForm:{
handler(newVal) { // handler(newVal) {
if (newVal) { // if (newVal) {
console.log(this.ruleForm,'温度改变') // console.log(this.ruleForm,'2')
if(this.ruleForm.temperature_selection=='低温测试(-25~100℃)'){ // if(this.ruleForm.temperature_selection=='(-25~100)'){
this.isShow=true; // this.isShow=true;
}else{ // }else{
this.isShow=false; // this.isShow=false;
} // }
} // }
}, // },
deep:true, // deep:true,
immediate: true, // immediate: true,
},
}, // },
// },
mounted(){ mounted(){
this.getInit() this.getInit()
}, },
methods: { methods: {
handChange(val){
if(val=='低温测试(-25~100℃)'){
this.isShow=true
}else{
this.isShow=false
}
},
handInput(val){
console.log(val,'闪电值')
if(val!='未知'){
this.isDisabled=false;
}
},
getInit(){ getInit(){
getInitParams().then(res=>{ getInitParams().then(res=>{
console.log(res.data.data,'初始化数据11')
if(res.data.data.length>0){ if(res.data.data.length>0){
res.data.data.map(item=>{ res.data.data.map(item=>{
this.standards.push({ this.standards.push({
@ -194,16 +223,16 @@ export default {
}else{ }else{
this.$message.warning('请初始化测定标准参数') this.$message.warning('请初始化测定标准参数')
} }
console.log(this.standards,'初始化数据22')
// this.initResult=res.data.data
}) })
}, },
handSet() { handSet() {
console.log('设置1') this.ruleForm.expected_flash_point='未知';
this.ruleForm.expected_flash_point='未知' this.ruleForm.temperature_selection='低温测试(-25~100℃)';
this.ruleForm.initial_temperature_set='10';
this.ruleForm.final_temperature_set='100';
this.isDisabled=true
}, },
handCancel(){ handCancel(){
console.log('取消')
this.ruleForm.temperature_selection='高温测定(100~420℃)' this.ruleForm.temperature_selection='高温测定(100~420℃)'
this.isShow=false this.isShow=false
}, },
@ -213,21 +242,40 @@ export default {
}, },
handBack(){ handBack(){
window.history.go('-1') window.history.go('-1')
console.log('111')
}, },
handTake(formName){ handTake(formName){
console.log('222',this.ruleForm,) var that=this
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
addExperiment(this.ruleForm).then(res=>{ if(that.ruleForm.expected_flash_point!='未知'&&isNaN(that.ruleForm.expected_flash_point)){
console.log(res.data,'测试44',res.data.status) return that.$message.warning('预期闪点只能设置为数值或未知!')
}
if(Number(that.ruleForm.final_temperature_set)<Number(that.ruleForm.initial_temperature_set)){
return that.$message.warning('最终温度不能小于初始温度')
}
if(that.ruleForm.temperature_selection=='高温测定(100~420℃)'){
if(that.ruleForm.initial_temperature_set<100||that.ruleForm.initial_temperature_set>420){
return that.$message.warning('高温模式下初始温度范围为100-420℃')
}
if(that.ruleForm.final_temperature_set<100||that.ruleForm.final_temperature_set>420){
return that.$message.warning('高温模式下最终温度范围为100-420℃')
}
}else if(that.ruleForm.temperature_selection=='低温测试(-25~100℃)'){
if(that.ruleForm.initial_temperature_set<-25||that.ruleForm.initial_temperature_set>100){
return that.$message.warning('低温模式下初始温度范围为-25~100℃')
}
if(that.ruleForm.final_temperature_set<-25||that.ruleForm.final_temperature_set>100){
return that.$message.warning('低温模式下最终温度范围为-25~100℃')
}
}
addExperiment(this.ruleForm).then(res=>{
if(res.data.status==0){ if(res.data.status==0){
console.log('测试8877',res.data.data)
localStorage.setItem('experiment_info',JSON.stringify(res.data.data)) localStorage.setItem('experiment_info',JSON.stringify(res.data.data))
console.log(JSON.parse(localStorage.getItem('experiment_info')),'获取')
this.$emit('next') this.$emit('next')
} }else{
this.$message.error(res.data.message)
}
}) })
} }
}) })

@ -6,7 +6,7 @@
</div> </div>
<div class="echarts" > <div class="echarts" >
<div class="top"> <div class="top">
<div class="title">{{flash_point_value}}</div> <div class="title">{{flash_point_value?flash_point_value:'-'}}</div>
<div class="subTitle">{{material_name}}</div> <div class="subTitle">{{material_name}}</div>
</div> </div>
<div id="main" style="width: 100%; height: 400px"></div> <div id="main" style="width: 100%; height: 400px"></div>
@ -100,7 +100,7 @@ export default {
that.items[5].value=response.data.data.ambient_pressure;// that.items[5].value=response.data.data.ambient_pressure;//
that.items[3].value=response.data.data.application_scope;// that.items[3].value=response.data.data.application_scope;//
that.flash_point_value=response.data.data.flash_point_value; that.flash_point_value=response.data.data.flash_point_value;
that.material_name=response.data.data.flash_point_value.material_name; that.material_name=response.data.data.material_name;
// that.$message.success('') // that.$message.success('')
that.init() that.init()
}) })
@ -182,14 +182,19 @@ export default {
}) })
}, },
handExport(){ handExport(){
let data={ // let data={
experiment_id:JSON.parse(localStorage.getItem('experiment_info')).experiment_id // experiment_id:JSON.parse(localStorage.getItem('experiment_info')).experiment_id
} // }
exportReportList(data).then(response=>{ var formData = new FormData()
console.log(response,'导出成功') let arr=[]
arr.push(JSON.parse(localStorage.getItem('experiment_info')).experiment_id);
this.$message.success('导出成功')       formData.append('experiment_id_list',JSON.stringify(arr));
// this.$message.error(response.desc) exportReportList(formData).then(response=>{
if(response.data.status==0){
this.$message.success('导出成功')
}else{
this.$message.error(response.data.message)
}
}) })
}, },
handClean(){ handClean(){

@ -98,8 +98,8 @@ export default {
default:false default:false
}, },
pic_step:{// pic_step:{//
type:Number, type:String,
default:1 default:'1'
}, },
}, },
@ -119,15 +119,15 @@ export default {
items:[ items:[
{ {
label:'预计闪点', label:'预计闪点',
value:'78.6' value:'77.7'
}, },
{ {
label:'初始温度', label:'初始温度',
value:'60.6' value:'66.6'
}, },
{ {
label:'最终温度', label:'最终温度',
value:'86.6' value:'88.8'
} }
], ],
}; };
@ -150,11 +150,12 @@ export default {
// //
startExperiment(data).then(res=>{ startExperiment(data).then(res=>{
console.log('测试111',res.status) console.log('测试1222',res.status)
this.$emit('next') if(res.data.status=='0'){
if(res.status=='0'){
this.$emit('next') this.$emit('next')
} }else{
this.$message.error(res.message)
}
}) })
}, },
handMeasure(){ handMeasure(){

@ -36,10 +36,10 @@
</div> </div>
<div class="right"> <div class="right">
<div class="title"> <div class="title">
高温测定 {{experiment_info.temperature_selection}}
</div> </div>
<div class="subTitle"> <div class="subTitle">
ASTM D6450 {{experiment_info.determination_standard}}
</div> </div>
<div class="itemBox"> <div class="itemBox">
<div class="item" v-for="(item,index) in items" :key="index"> <div class="item" v-for="(item,index) in items" :key="index">
@ -74,8 +74,8 @@ import { startExperiment } from "@/api/step";
export default { export default {
props:{ props:{
pic_step:{// pic_step:{//
type:Number, type:String,
default:1 default:'1'
}, },
result_step:{// result_step:{//
type:Boolean, type:Boolean,
@ -109,15 +109,15 @@ export default {
items:[ items:[
{ {
label:'预计闪点', label:'预计闪点',
value:'78.6' value:'77.7'
}, },
{ {
label:'初始温度', label:'初始温度',
value:'60.6' value:'66.6'
}, },
{ {
label:'最终温度', label:'最终温度',
value:'86.6' value:'88.8'
} }
], ],
}; };
@ -134,6 +134,14 @@ export default {
immediate:true immediate:true
} }
}, },
mounted(){
this.experiment_info=JSON.parse(localStorage.experiment_info)
console.log(this.experiment_info,'本地储存')
this.items[0].value=this.experiment_info.expected_flash_point;
this.items[1].value=this.experiment_info.initial_temperature_set;
this.items[2].value=this.experiment_info.final_temperature_set;
// this.$refs.videoRef.play()
},
methods: { methods: {
handSet() {}, handSet() {},
handBack(){ handBack(){

@ -1,70 +1,6 @@
<template> <template>
<div> <div>
<el-form {{ meassage }}
:model="ruleForm"
:rules="rules"
ref="ruleForm"
label-width="100px"
class="demo-ruleForm"
>
<el-form-item label="活动名称" prop="name">
<el-input v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item label="活动区域" prop="region">
<el-select v-model="ruleForm.region" placeholder="请选择活动区域">
<el-option label="区域一" value="shanghai"></el-option>
<el-option label="区域二" value="beijing"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="活动时间" required>
<el-col :span="11">
<el-form-item prop="date1">
<el-date-picker
type="date"
placeholder="选择日期"
v-model="ruleForm.date1"
style="width: 100%"
></el-date-picker>
</el-form-item>
</el-col>
<el-col class="line" :span="2">-</el-col>
<el-col :span="11">
<el-form-item prop="date2">
<el-time-picker
placeholder="选择时间"
v-model="ruleForm.date2"
style="width: 100%"
></el-time-picker>
</el-form-item>
</el-col>
</el-form-item> -->
<el-form-item label="即时配送" prop="delivery">
<el-switch v-model="ruleForm.delivery"></el-switch>
</el-form-item>
<el-form-item label="活动性质" prop="type">
<el-checkbox-group v-model="ruleForm.type">
<el-checkbox label="美食/餐厅线上活动" name="type"></el-checkbox>
<el-checkbox label="地推活动" name="type"></el-checkbox>
<el-checkbox label="线下主题活动" name="type"></el-checkbox>
<el-checkbox label="单纯品牌曝光" name="type"></el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="特殊资源" prop="resource">
<el-radio-group v-model="ruleForm.resource">
<el-radio label="线上品牌商赞助"></el-radio>
<el-radio label="线下场地免费"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="活动形式" prop="desc">
<el-input type="textarea" v-model="ruleForm.desc"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm('ruleForm')"
>立即创建</el-button
>
<el-button @click="resetForm('ruleForm')"></el-button>
</el-form-item>
</el-form>
</div> </div>
</template> </template>
<script> <script>

@ -16,9 +16,10 @@ import Clean from '@/pages/Clean'
import SetSystem from '@/pages/SetSystem' import SetSystem from '@/pages/SetSystem'
import AutoClean from '@/pages/components/autoClean' import AutoClean from '@/pages/components/autoClean'
import Test from '@/pages/test' import Test from '@/pages/test'
import {stopExperiment,stopClean} from '@/api/home.js'
Vue.use(Router) Vue.use(Router)
//路由守卫
export default new Router({ const router = new Router({
routes: [ routes: [
{ {
path: '/', path: '/',
@ -105,3 +106,17 @@ export default new Router({
] ]
}) })
router.beforeEach((to, from, next) => {
if(from.path=='/shiyan'){
stopExperiment().then(res=>{
console.log(res,'停止实验')
})
}
if(from.path=='/autoClean'){
stopClean().then(res=>{
console.log(res,'停止实验')
})
}
next()
})
export default router

@ -3,7 +3,7 @@ import axios from 'axios'
// axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' // axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
const service = axios.create({ const service = axios.create({
// baseURL: 'http:///127.0.0.1:5555/', // baseURL: 'http:///127.0.0.1:5555/',
baseURL: 'http://192.168.101.50:5001/api', baseURL: 'http://192.168.101.75:5001/api',
// baseURL: 'http://127.0.0.1:5001/api', // baseURL: 'http://127.0.0.1:5001/api',
timeout: 15000, timeout: 15000,
}) })

Loading…
Cancel
Save