diff --git a/nezha-fronted/build/webpack.prod.conf.js b/nezha-fronted/build/webpack.prod.conf.js index d9f99f65a..28db21626 100644 --- a/nezha-fronted/build/webpack.prod.conf.js +++ b/nezha-fronted/build/webpack.prod.conf.js @@ -12,7 +12,11 @@ const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin') const UglifyJsPlugin = require('uglifyjs-webpack-plugin') const env = require('../config/prod.env') - +const GenerateAssetPlugin = require('generate-asset-webpack-plugin'); +const createServerConfig = function(compilation){ + let cfgJson={ApiUrl:"http://192.168.40.247:8080/nz-admin"}; + return JSON.stringify(cfgJson); +} const webpackConfig = merge(baseWebpackConfig, { module: { rules: utils.styleLoaders({ @@ -28,6 +32,13 @@ const webpackConfig = merge(baseWebpackConfig, { chunkFilename: utils.assetsPath('js/[id].[chunkhash].js') }, plugins: [ + new GenerateAssetPlugin({ + filename: 'serverconfig.json', + fn: (compilation, cb) => { + cb(null, createServerConfig(compilation)); + }, + extraFiles: [] + }), // http://vuejs.github.io/vue-loader/en/workflow/production.html new webpack.DefinePlugin({ 'process.env': env diff --git a/nezha-fronted/package-lock.json b/nezha-fronted/package-lock.json index ea8071743..3472c4b41 100644 --- a/nezha-fronted/package-lock.json +++ b/nezha-fronted/package-lock.json @@ -4,6 +4,12 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@sindresorhus/is": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", + "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==", + "dev": true + }, "@types/q": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz", @@ -212,6 +218,13 @@ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", "dev": true }, + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", + "dev": true, + "optional": true + }, "asn1": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", @@ -1580,6 +1593,66 @@ "unset-value": "^1.0.0" } }, + "cacheable-request": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz", + "integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=", + "dev": true, + "requires": { + "clone-response": "1.0.2", + "get-stream": "3.0.0", + "http-cache-semantics": "3.8.1", + "keyv": "3.0.0", + "lowercase-keys": "1.0.0", + "normalize-url": "2.0.1", + "responselike": "1.0.2" + }, + "dependencies": { + "lowercase-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", + "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=", + "dev": true + }, + "normalize-url": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz", + "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", + "dev": true, + "requires": { + "prepend-http": "^2.0.0", + "query-string": "^5.0.1", + "sort-keys": "^2.0.0" + } + }, + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "dev": true + }, + "query-string": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz", + "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", + "dev": true, + "requires": { + "decode-uri-component": "^0.2.0", + "object-assign": "^4.1.0", + "strict-uri-encode": "^1.0.0" + } + }, + "sort-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz", + "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=", + "dev": true, + "requires": { + "is-plain-obj": "^1.0.0" + } + } + } + }, "caller-callsite": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", @@ -1859,6 +1932,15 @@ } } }, + "clone-response": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", + "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", + "dev": true, + "requires": { + "mimic-response": "^1.0.0" + } + }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -3146,6 +3228,15 @@ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", "dev": true }, + "decompress-response": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", + "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "dev": true, + "requires": { + "mimic-response": "^1.0.0" + } + }, "deep-equal": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", @@ -3429,6 +3520,12 @@ "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", "dev": true }, + "duplexer3": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", + "dev": true + }, "duplexify": { "version": "3.7.1", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", @@ -4890,6 +4987,12 @@ "globule": "^1.0.0" } }, + "generate-asset-webpack-plugin": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/generate-asset-webpack-plugin/-/generate-asset-webpack-plugin-0.3.0.tgz", + "integrity": "sha1-ZmLvgDP21DMMeImBZGHOJWgxMxg=", + "dev": true + }, "get-caller-file": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", @@ -4984,6 +5087,31 @@ "minimatch": "~3.0.2" } }, + "got": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz", + "integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==", + "dev": true, + "requires": { + "@sindresorhus/is": "^0.7.0", + "cacheable-request": "^2.1.1", + "decompress-response": "^3.3.0", + "duplexer3": "^0.1.4", + "get-stream": "^3.0.0", + "into-stream": "^3.1.0", + "is-retry-allowed": "^1.1.0", + "isurl": "^1.0.0-alpha5", + "lowercase-keys": "^1.0.0", + "mimic-response": "^1.0.0", + "p-cancelable": "^0.4.0", + "p-timeout": "^2.0.1", + "pify": "^3.0.0", + "safe-buffer": "^5.1.1", + "timed-out": "^4.0.1", + "url-parse-lax": "^3.0.0", + "url-to-options": "^1.0.1" + } + }, "graceful-fs": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", @@ -5071,12 +5199,27 @@ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, + "has-symbol-support-x": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz", + "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==", + "dev": true + }, "has-symbols": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", "dev": true }, + "has-to-string-tag-x": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz", + "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", + "dev": true, + "requires": { + "has-symbol-support-x": "^1.4.1" + } + }, "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", @@ -5296,6 +5439,12 @@ } } }, + "http-cache-semantics": { + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", + "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==", + "dev": true + }, "http-deceiver": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", @@ -5410,6 +5559,13 @@ "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", "dev": true }, + "image-size": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", + "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", + "dev": true, + "optional": true + }, "import-cwd": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", @@ -5502,6 +5658,16 @@ "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==", "dev": true }, + "into-stream": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz", + "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=", + "dev": true, + "requires": { + "from2": "^2.1.1", + "p-is-promise": "^1.1.0" + } + }, "invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", @@ -5678,6 +5844,12 @@ "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", "dev": true }, + "is-object": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz", + "integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=", + "dev": true + }, "is-path-cwd": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", @@ -5732,6 +5904,12 @@ "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", "dev": true }, + "is-retry-allowed": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", + "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==", + "dev": true + }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", @@ -5799,6 +5977,16 @@ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, + "isurl": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz", + "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", + "dev": true, + "requires": { + "has-to-string-tag-x": "^1.2.0", + "is-object": "^1.0.1" + } + }, "js-base64": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz", @@ -5831,6 +6019,12 @@ "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", "dev": true }, + "json-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", + "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", + "dev": true + }, "json-loader": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz", @@ -5882,6 +6076,15 @@ "verror": "1.10.0" } }, + "keyv": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz", + "integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==", + "dev": true, + "requires": { + "json-buffer": "3.0.0" + } + }, "killable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", @@ -5921,6 +6124,56 @@ "invert-kv": "^1.0.0" } }, + "less": { + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/less/-/less-3.10.3.tgz", + "integrity": "sha512-vz32vqfgmoxF1h3K4J+yKCtajH0PWmjkIFgbs5d78E/c/e+UQTnI+lWK+1eQRE95PXM2mC3rJlLSSP9VQHnaow==", + "dev": true, + "requires": { + "clone": "^2.1.2", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "mime": "^1.4.1", + "mkdirp": "^0.5.0", + "promise": "^7.1.1", + "request": "^2.83.0", + "source-map": "~0.6.0" + }, + "dependencies": { + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", + "dev": true + } + } + }, + "less-loader": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-5.0.0.tgz", + "integrity": "sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==", + "dev": true, + "requires": { + "clone": "^2.1.1", + "loader-utils": "^1.1.0", + "pify": "^4.0.1" + }, + "dependencies": { + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", + "dev": true + }, + "pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true + } + } + }, "load-json-file": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", @@ -6062,6 +6315,12 @@ "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=", "dev": true }, + "lowercase-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", + "dev": true + }, "lru-cache": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", @@ -6327,6 +6586,12 @@ "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", "dev": true }, + "mimic-response": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", + "dev": true + }, "minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", @@ -6983,12 +7248,24 @@ "os-tmpdir": "^1.0.0" } }, + "p-cancelable": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz", + "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==", + "dev": true + }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", "dev": true }, + "p-is-promise": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", + "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=", + "dev": true + }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -7013,6 +7290,15 @@ "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", "dev": true }, + "p-timeout": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz", + "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", + "dev": true, + "requires": { + "p-finally": "^1.0.0" + } + }, "p-try": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", @@ -9558,6 +9844,16 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, + "promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "dev": true, + "optional": true, + "requires": { + "asap": "~2.0.3" + } + }, "promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", @@ -10043,6 +10339,15 @@ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", "dev": true }, + "responselike": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", + "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", + "dev": true, + "requires": { + "lowercase-keys": "^1.0.0" + } + }, "restore-cursor": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", @@ -11266,6 +11571,12 @@ "integrity": "sha512-zxke8goJQpBeEgD82CXABeMh0LSJcj7CXEd0OHOg45HgcofF7pxNwZm9+RknpxpDhwN4gFpySkApKfFYfRQnUA==", "dev": true }, + "timed-out": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", + "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=", + "dev": true + }, "timers-browserify": { "version": "2.0.11", "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz", @@ -11677,6 +11988,29 @@ "requires-port": "^1.0.0" } }, + "url-parse-lax": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", + "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "dev": true, + "requires": { + "prepend-http": "^2.0.0" + }, + "dependencies": { + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", + "dev": true + } + } + }, + "url-to-options": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", + "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=", + "dev": true + }, "use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", @@ -11850,6 +12184,15 @@ } } }, + "vue-resource": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/vue-resource/-/vue-resource-1.5.1.tgz", + "integrity": "sha512-o6V4wNgeqP+9v9b2bPXrr20CGNQPEXjpbUWdZWq9GJhqVeAGcYoeTtn/D4q059ZiyN0DIrDv/ADrQUmlUQcsmg==", + "dev": true, + "requires": { + "got": "^8.0.3" + } + }, "vue-router": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.3.tgz", diff --git a/nezha-fronted/package.json b/nezha-fronted/package.json index 592dc5225..d9b9e6610 100644 --- a/nezha-fronted/package.json +++ b/nezha-fronted/package.json @@ -36,6 +36,7 @@ "extract-text-webpack-plugin": "^3.0.0", "file-loader": "^1.1.4", "friendly-errors-webpack-plugin": "^1.6.1", + "generate-asset-webpack-plugin": "^0.3.0", "html-webpack-plugin": "^2.30.1", "node-notifier": "^5.1.2", "optimize-css-assets-webpack-plugin": "^3.2.0", @@ -52,6 +53,7 @@ "uglifyjs-webpack-plugin": "^1.1.1", "url-loader": "^0.5.8", "vue-loader": "^13.3.0", + "vue-resource": "^1.5.1", "vue-style-loader": "^3.0.1", "vue-template-compiler": "^2.5.2", "webpack": "^3.6.0", diff --git a/nezha-fronted/src/App.vue b/nezha-fronted/src/App.vue index e768e0fce..fd4038b1f 100644 --- a/nezha-fronted/src/App.vue +++ b/nezha-fronted/src/App.vue @@ -6,7 +6,13 @@ diff --git a/nezha-fronted/src/assets/css/main.css b/nezha-fronted/src/assets/css/main.css index d94920bc7..f3f9de3b3 100644 --- a/nezha-fronted/src/assets/css/main.css +++ b/nezha-fronted/src/assets/css/main.css @@ -106,6 +106,11 @@ html { color: #444; text-shadow: 0 1px 1px rgba(255,255,255,.75); } +.nz-btn.nz-btn-style-pure-white { /*纯白色按钮*/ + background-color: white; + color: #444; + border: 1px solid #dcdfe6; +} .nz-btn.nz-btn-size-small.nz-btn-style-square { /* 单图标时是个正方形*/ padding: 2px 5px; } @@ -118,6 +123,9 @@ html { .nz-btn.nz-btn-style-normal:hover:not(.nz-btn-disabled) { background-image: linear-gradient(#16b, #0d4d8c); } +.nz-btn.nz-btn-style-pure-white:hover:not(.nz-btn-disabled) { + background-color: #dedede; +} .nz-btn:focus { outline: 0; } diff --git a/nezha-fronted/src/components/common/elementSet.vue b/nezha-fronted/src/components/common/elementSet.vue new file mode 100644 index 000000000..3d7cd5c14 --- /dev/null +++ b/nezha-fronted/src/components/common/elementSet.vue @@ -0,0 +1,179 @@ + + + + + diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 41e39730c..13040e35a 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -19,7 +19,10 @@ const en = { clear: "Clear", name: 'Name', cover: 'Cover', - signOut: 'Sign Out' + signOut: 'Sign Out', + select: 'Select', + ok: 'Ok', + all: 'All' }, dashboard:{ title:'Dashboard', diff --git a/nezha-fronted/src/components/common/login.vue b/nezha-fronted/src/components/common/login.vue index bb231f3e4..4617ea80e 100644 --- a/nezha-fronted/src/components/common/login.vue +++ b/nezha-fronted/src/components/common/login.vue @@ -58,6 +58,7 @@ export default { if (res.code == 200) { sessionStorage.setItem("nz-token", res.data.token); sessionStorage.setItem("nz-username", this.loginData.username); + localStorage.setItem("nz-username", this.loginData.username); this.$router.push({ path: "/dashboard", query: { diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue index 00bde7bc7..fdd02b9db 100644 --- a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue +++ b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue @@ -39,10 +39,11 @@
{{endpoint.module.name}}
- - + +
- + +
@@ -65,11 +66,9 @@ - -
+
-
-
@@ -112,6 +111,11 @@
{{endpoint.host}}
+ + + +
{{endpoint.host}}
+ @@ -145,7 +149,7 @@ - +
{{item.key}}={{item.value}}
@@ -246,6 +250,9 @@ 'module.id':[ {required:true,message:this.$t('validate.required'),trigger:'change'} ], + assetId: [ + {required:true,message:this.$t('validate.required'),trigger:'blur'} + ], port:[ {required:true,message:this.$t('validate.required'),trigger:'blur'} ], @@ -473,202 +480,4 @@ diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue index 00e817d89..ae950b7a5 100644 --- a/nezha-fronted/src/components/common/searchInput.vue +++ b/nezha-fronted/src/components/common/searchInput.vue @@ -300,6 +300,13 @@ } }); }, + getModelData() { + this.$get('asset', {pageNo: 1, pageSize: 999}).then(response => { + if (response.code === 200) { + this.assetSelect = response.data.list; + } + }); + }, //点击确认选择下拉内容 tr_selectInfo(selectLabel,value,label,e){ this.stop_click(e); @@ -497,16 +504,16 @@ this.getHeight() //搜索完成后存储在本地历史记录中 if(this.select_list.length!=0){ - if (JSON.parse(localStorage.getItem('NZ_history_'+this.$route.path)) == undefined || JSON.parse(localStorage.getItem('NZ_history_'+this.$route.path)) == []) { + if (JSON.parse(localStorage.getItem('nz-history-'+this.$route.path)) == undefined || JSON.parse(localStorage.getItem('nz-history-'+this.$route.path)) == []) { this.historyList.unshift(this.select_list); - localStorage.setItem('NZ_history_'+this.$route.path, JSON.stringify(this.historyList)); + localStorage.setItem('nz-history-'+this.$route.path, JSON.stringify(this.historyList)); } else { - this.historyList = JSON.parse(localStorage.getItem('NZ_history_'+this.$route.path)); + this.historyList = JSON.parse(localStorage.getItem('nz-history-'+this.$route.path)); this.historyList.unshift(this.select_list); if (this.historyList.length > 10) { this.historyList.length = 10; } - localStorage.setItem('NZ_history_'+this.$route.path, JSON.stringify(this.historyList)); + localStorage.setItem('nz-history-'+this.$route.path, JSON.stringify(this.historyList)); } } this.input_list = true; @@ -517,7 +524,7 @@ clear_history() { this.historyList = []; this.history_once = []; - localStorage.setItem('NZ_history_'+this.$route.path, JSON.stringify(this.historyList)); + localStorage.setItem('nz-history-'+this.$route.path, JSON.stringify(this.historyList)); }, //再次点击之前的历史记录 select_history(ind,e) { @@ -526,7 +533,7 @@ this.change_sreach_show = true; this.localStorage_display = !this.localStorage_display; this.select_list = []; - JSON.parse(localStorage.getItem('NZ_history_'+this.$route.path)).splice(ind,1); + JSON.parse(localStorage.getItem('nz-history-'+this.$route.path)).splice(ind,1); this.select_list = JSON.parse(JSON.stringify(this.history_once[ind])); this.sreach_num = this.select_list.length; this.select_list.forEach(val => { @@ -540,8 +547,8 @@ }, // 获取历史记录 数据进行处理以便循环展示 restructure_historyDate() { - if (localStorage.getItem('NZ_history_'+this.$route.path) !== undefined && localStorage.getItem('NZ_history_'+this.$route.path) !== null) { - this.history_once = JSON.parse(localStorage.getItem('NZ_history_'+this.$route.path)); + if (localStorage.getItem('nz-history-'+this.$route.path) !== undefined && localStorage.getItem('nz-history-'+this.$route.path) !== null) { + this.history_once = JSON.parse(localStorage.getItem('nz-history-'+this.$route.path)); } }, clear_search_list(e){ @@ -993,6 +1000,9 @@ if (this.$route.path == '/project') { this.getAssetData(); } + if (this.$route.path == '/asset') { + this.getModelData(); + } JSON.parse(JSON.stringify(this.searchMsg.searchLabelList)).forEach(val => { if(val.name=='Protocol'){ this.schemaTypeSelect=val.doc.data diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index 91706292c..4ffe06dc5 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -26,13 +26,24 @@ style="width: 100%;"> + @@ -115,6 +132,8 @@ export default { description: '', receiver: '', }, + tablelable: [], + dropCol: [], pageObj: { pageNo: 1, pageSize: 20, @@ -199,6 +218,36 @@ export default { } }, methods: { + elementsetShow(s, e) { + var eventfixed = { + shezhi: 0, + screen: 0 + }; + eventfixed[s] = 1; + e.preventDefault(); + this.$store.commit('setHeaderTable', this.tablelable); + this.$store.commit('setEventfixed', eventfixed); + const h = document.documentElement.clientHeight; + const w = document.documentElement.clientWidth; + const dw = this.$refs.elementset.$el.offsetWidth; + const dh = this.$refs.elementset.$el.offsetHeight; + let positionx = + e.clientX + dw <= w - 10 ? e.clientX - 250 : e.clientX - 250 - dw; + let positiony = + e.clientY + dh <= h - 10 + ? e.clientY - 70 + : e.clientY - 70 - (e.clientY + dh - h); + this.$store.commit('setPosition', { positionx, positiony }); + }, + elementsetHide() { + //悬浮点击空白隐藏 + this.$refs.elementset.elementsetHide(); + }, + tablelabelEmit(data) { + //获取子组件传过来的参数 + this.$store.commit('setHeaderTable', data); + this.tablelable = data; + }, toEdit: function(u) { this.alertRule = Object.assign({}, u); this.$refs.alertConfigBox.show(true, true); @@ -334,6 +383,12 @@ export default { }, mounted() { this.getTableData(); + this.tablelable = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path) + ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)) + : this.tableTitle; + this.dropCol = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path) + ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)) + : this.tableTitle; } } diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index 150825831..61f508e1a 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -23,12 +23,23 @@ style="width: 100%;"> + @@ -77,11 +94,6 @@ export default { total:13 }, tableTitle: [ - { - label:'ID', - prop:'id', - show:false - }, { label: this.$t("alert.alertName"), prop: 'alertRule', @@ -145,6 +157,8 @@ export default { searchLabel: { //搜索参数 }, + tablelable: [], + dropCol: [], severityData: [ { key: 'medium', @@ -179,6 +193,36 @@ export default { } }, methods: { + elementsetShow(s, e) { + var eventfixed = { + shezhi: 0, + screen: 0 + }; + eventfixed[s] = 1; + e.preventDefault(); + this.$store.commit('setHeaderTable', this.tablelable); + this.$store.commit('setEventfixed', eventfixed); + const h = document.documentElement.clientHeight; + const w = document.documentElement.clientWidth; + const dw = this.$refs.elementset.$el.offsetWidth; + const dh = this.$refs.elementset.$el.offsetHeight; + let positionx = + e.clientX + dw <= w - 10 ? e.clientX - 250 : e.clientX - 250 - dw; + let positiony = + e.clientY + dh <= h - 10 + ? e.clientY - 70 + : e.clientY - 70 - (e.clientY + dh - h); + this.$store.commit('setPosition', { positionx, positiony }); + }, + elementsetHide() { + //悬浮点击空白隐藏 + this.$refs.elementset.elementsetHide(); + }, + tablelabelEmit(data) { + //获取子组件传过来的参数 + this.$store.commit('setHeaderTable', data); + this.tablelable = data; + }, getAlertList: function() { this.$set(this.searchLabel, "pageNo", this.pageObj.pageNo); this.$set(this.searchLabel, "pageSize", this.pageObj.pageSize); @@ -274,6 +318,12 @@ export default { }, mounted() { this.getAlertList(); + this.tablelable = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path) + ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)) + : this.tableTitle; + this.dropCol = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path) + ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)) + : this.tableTitle; } } diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 19d9dff84..209891d29 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -94,14 +94,24 @@ border > - {{item}} + @@ -201,6 +217,8 @@ }, searchLabel: {}, //搜索参数 checkList: [], + tablelable: [], + dropCol: [], tableTitle: [ { label: this.$t("asset.tableTitle.id"), @@ -355,6 +373,36 @@ }, methods: { + elementsetShow(s, e) { + var eventfixed = { + shezhi: 0, + screen: 0 + }; + eventfixed[s] = 1; + e.preventDefault(); + this.$store.commit('setHeaderTable', this.tablelable); + this.$store.commit('setEventfixed', eventfixed); + const h = document.documentElement.clientHeight; + const w = document.documentElement.clientWidth; + const dw = this.$refs.elementset.$el.offsetWidth; + const dh = this.$refs.elementset.$el.offsetHeight; + let positionx = + e.clientX + dw <= w - 10 ? e.clientX - 250 : e.clientX - 250 - dw; + let positiony = + e.clientY + dh <= h - 10 + ? e.clientY - 70 + : e.clientY - 70 - (e.clientY + dh - h); + this.$store.commit('setPosition', { positionx, positiony }); + }, + elementsetHide() { + //悬浮点击空白隐藏 + this.$refs.elementset.elementsetHide(); + }, + tablelabelEmit(data) { + //获取子组件传过来的参数 + this.$store.commit('setHeaderTable', data); + this.tablelable = data; + }, ssss(id, sn) { let routeData = this.$router.resolve({ name: "terminal", @@ -559,9 +607,12 @@ this.getUserData(); this.getAssetData(); this.getIDCOptionData(); - window.onresize = () => { - this.tableHeight = document.documentElement.clientHeight - 200; - } + this.tablelable = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path) + ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)) + : this.tableTitle; + this.dropCol = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path) + ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)) + : this.tableTitle; } } diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue index b58d7ccca..ab6e58f62 100644 --- a/nezha-fronted/src/components/page/config/account.vue +++ b/nezha-fronted/src/components/page/config/account.vue @@ -26,12 +26,23 @@ style="width: 100%;"> + diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue index 72ca3c2dd..8b767fa01 100644 --- a/nezha-fronted/src/components/page/config/promServer.vue +++ b/nezha-fronted/src/components/page/config/promServer.vue @@ -20,25 +20,32 @@
- + + - - - @@ -114,6 +121,12 @@ + @@ -189,8 +202,15 @@ export default { label: this.$t("config.promServer.type"), prop: 'type', show: true, + }, { + label: this.$t('config.account.option'), + prop: 'option', + show: true, + width: 100 } ], + tablelable: [], + dropCol: [], tableData: [], idcData: [], typeData: [ @@ -262,6 +282,36 @@ export default { } }, methods: { + elementsetShow(s, e) { + var eventfixed = { + shezhi: 0, + screen: 0 + }; + eventfixed[s] = 1; + e.preventDefault(); + this.$store.commit('setHeaderTable', this.tablelable); + this.$store.commit('setEventfixed', eventfixed); + const h = document.documentElement.clientHeight; + const w = document.documentElement.clientWidth; + const dw = this.$refs.elementset.$el.offsetWidth; + const dh = this.$refs.elementset.$el.offsetHeight; + let positionx = + e.clientX + dw <= w - 10 ? e.clientX - 250 : e.clientX - 250 - dw; + let positiony = + e.clientY + dh <= h - 10 + ? e.clientY - 70 + : e.clientY - 70 - (e.clientY + dh - h); + this.$store.commit('setPosition', { positionx, positiony }); + }, + elementsetHide() { + //悬浮点击空白隐藏 + this.$refs.elementset.elementsetHide(); + }, + tablelabelEmit(data) { + //获取子组件传过来的参数 + this.$store.commit('setHeaderTable', data); + this.tablelable = data; + }, toEdit: function(u) { this.promServer = Object.assign({}, u); this.rightBox.isEdit = true; @@ -529,6 +579,12 @@ export default { mounted: function() { this.getIdcData(); this.getUserData(); + this.tablelable = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path) + ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)) + : this.tableTitle; + this.dropCol = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path) + ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)) + : this.tableTitle; }, watch: { 'promServer.idc': function(n, o) { diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue index cc24c1dce..04d4ced06 100644 --- a/nezha-fronted/src/components/page/project/project.vue +++ b/nezha-fronted/src/components/page/project/project.vue @@ -72,28 +72,35 @@ style="width: 100%;"> + - - - @@ -104,6 +111,12 @@ + @@ -118,8 +131,11 @@ { label: this.$t("project.endpoint.endpointId"), prop: 'id', + show: true + },{ + label: this.$t("project.endpoint.asset"), + prop: 'asset', show: true, - width: 110 },{ label: this.$t("project.endpoint.host"), prop: 'host', @@ -144,10 +160,10 @@ label: this.$t("project.endpoint.lastUpdate"), prop: 'lastUpdate', show: true, - },{ - label: this.$t("project.endpoint.asset"), - prop: 'asset', - show: true, + }, { + label: this.$t('config.account.option'), + prop: 'option', + show: true } ], endpointTableData: [], @@ -179,6 +195,8 @@ pageSize: 20, total: 0 }, + tablelable: [], + dropCol: [], moduleList: [], projectList: [], currentProject: {id: '', name: '', remark: ''}, //endpoint弹框、module列表用来回显project @@ -216,6 +234,36 @@ } }, methods: { + elementsetShow(s, e) { + var eventfixed = { + shezhi: 0, + screen: 0 + }; + eventfixed[s] = 1; + e.preventDefault(); + this.$store.commit('setHeaderTable', this.tablelable); + this.$store.commit('setEventfixed', eventfixed); + const h = document.documentElement.clientHeight; + const w = document.documentElement.clientWidth; + const dw = this.$refs.elementset.$el.offsetWidth; + const dh = this.$refs.elementset.$el.offsetHeight; + let positionx = + e.clientX + dw <= w - 10 ? e.clientX - 250 : e.clientX - 250 - dw; + let positiony = + e.clientY + dh <= h - 10 + ? e.clientY - 70 + : e.clientY - 70 - (e.clientY + dh - h); + this.$store.commit('setPosition', { positionx, positiony }); + }, + elementsetHide() { + //悬浮点击空白隐藏 + this.$refs.elementset.elementsetHide(); + }, + tablelabelEmit(data) { + //获取子组件传过来的参数 + this.$store.commit('setHeaderTable', data); + this.tablelable = data; + }, getEndpointTableData() { this.endpointSearchLabel.moduleId = this.currentModule.id; this.$set(this.endpointSearchLabel, 'pageNo', this.endpointPageObj.pageNo); @@ -319,9 +367,9 @@ //弹出endpoint编辑页 toEditEndpoint(endpoint) { + this.editEndpoint = JSON.parse(JSON.stringify(endpoint)); this.rightBoxHandler(3); this.$refs.editEndpointBox.toEdit(true); - this.editEndpoint = JSON.parse(JSON.stringify(endpoint)); if (!this.editEndpoint.paramObj) { this.$set(this.editEndpoint, 'paramObj', []); } @@ -448,6 +496,12 @@ setTimeout(()=>{ this.getEndpointTableData(); }, 200); + this.tablelable = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path) + ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)) + : this.endpointTableTitle; + this.dropCol = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path) + ? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)) + : this.endpointTableTitle; }, computed: { currentProjectChange() { diff --git a/nezha-fronted/src/http.js b/nezha-fronted/src/http.js index 49ae10496..0ee8a11e9 100644 --- a/nezha-fronted/src/http.js +++ b/nezha-fronted/src/http.js @@ -5,7 +5,7 @@ import qs from 'qs' import he from "element-ui/src/locale/lang/he"; //引入数据格式化 //axios.defaults.baseURL = 'http://localhost:8088/nz-admin'; // axios.defaults.baseURL = 'http://192.168.41.101:8088/nz-admin'; -axios.defaults.baseURL = 'http://192.168.40.247:8080/nz-admin'; +//axios.defaults.baseURL = 'http://192.168.40.247:8080/nz-admin'; axios.interceptors.request.use(config => { // config.headers = { diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js index da2bddbad..d3f97b005 100644 --- a/nezha-fronted/src/main.js +++ b/nezha-fronted/src/main.js @@ -10,13 +10,15 @@ import Vuex from 'vuex' import store from './store/index'; import App from './App' import router from './router' - +import VueResource from 'vue-resource' import './assets/stylus/index.scss' import axios from 'axios'; import {post, get, put, del} from './http.js' import Pagination from "./components/common/pagination"; //引入全局分页组件 import searchInput from "./components/common/searchInput"; //搜索框组件 +import elementSet from "./components/common/elementSet"; //自定义表头组件 + import projectBox from './components/common/rightBox/projectBox'; //project弹框组件 import moduleBox from './components/common/rightBox/moduleBox'; //module弹框组件 import editEndpointBox from './components/common/rightBox/editEndpointBox'; //endpoint弹框组件 @@ -29,6 +31,7 @@ import panelBox from "./components/common/rightBox/panelBox"; //面板弹框组 Vue.component("Pagination", Pagination); Vue.component("searchInput", searchInput); +Vue.component("element-set", elementSet); Vue.component("project-box", projectBox); Vue.component("module-box", moduleBox); Vue.component("edit-endpoint-box", editEndpointBox); @@ -48,7 +51,7 @@ Vue.prototype.$delete = del; Vue.config.productionTip = false; Vue.use(ElementUI); Vue.use(Vuex); - +Vue.use(VueResource); const clickoutside = { // 初始化指令 diff --git a/nezha-fronted/src/store/index.js b/nezha-fronted/src/store/index.js index 1f790bf29..c6f868aa5 100644 --- a/nezha-fronted/src/store/index.js +++ b/nezha-fronted/src/store/index.js @@ -17,7 +17,16 @@ const store = new Vuex.Store({ projectListChange: 0, moduleListChange: 0, flushDataSign: false, - panelListReload:false + panelListReload:false, + eventfixed: { + shezhi: 0, + screen: 0 + }, + tablelable: [], //获取头部信息 + position: { + event_positiony: 0, + event_positionx: -200 + }, }, getters: { }, @@ -39,7 +48,16 @@ const store = new Vuex.Store({ }, assetDcListChange(state) { state.assetDcList++; - } + }, + setHeaderTable(state, data) { //设置table头部 + state.tablelable = data; + }, + setEventfixed(state, data) { //设置坐标 + state.eventfixed = data; + }, + setPosition(state, data) { //设置坐标 + state.position = data; + }, }, actions: { }