diff --git a/package-lock.json b/package-lock.json index df5eed9f..99b3a73b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,8 +16,11 @@ "echarts4": "npm:echarts@^4.8.0", "element-ui": "^2.4.5", "ezuikit-js": "^0.1.7", + "flv.js": "^1.6.2", "gantt-elastic": "^1.0.12", "html2canvas": "^1.0.0-rc.7", + "js-base64": "^3.7.2", + "js-md5": "^0.7.3", "moment": "^2.29.1", "monitorjs_horse": "^2.2.1", "mqtt": "^4.2.6", @@ -3050,6 +3053,11 @@ "node": ">=0.10.0" } }, + "node_modules/autoprefixer-loader/node_modules/js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "node_modules/autoprefixer-loader/node_modules/json5": { "version": "0.5.1", "resolved": "https://registry.npmmirror.com/json5/-/json5-0.5.1.tgz", @@ -3133,7 +3141,7 @@ "version": "0.19.2", "resolved": "https://registry.npmmirror.com/axios/-/axios-0.19.2.tgz", "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", - "license": "MIT", + "deprecated": "Critical security vulnerability fixed in v0.21.1. For more information, see https://github.com/axios/axios/pull/3410", "dependencies": { "follow-redirects": "1.5.10" } @@ -7429,6 +7437,11 @@ "event-emitter": "~0.3.5" } }, + "node_modules/es6-promise": { + "version": "4.2.8", + "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" + }, "node_modules/es6-set": { "version": "0.1.5", "resolved": "https://registry.npmmirror.com/es6-set/-/es6-set-0.1.5.tgz", @@ -8160,6 +8173,15 @@ "readable-stream": "^2.3.6" } }, + "node_modules/flv.js": { + "version": "1.6.2", + "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz", + "integrity": "sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==", + "dependencies": { + "es6-promise": "^4.2.8", + "webworkify-webpack": "^2.1.5" + } + }, "node_modules/follow-redirects": { "version": "1.12.1", "funding": [ @@ -9957,10 +9979,14 @@ } }, "node_modules/js-base64": { - "version": "2.6.4", - "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", - "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==", - "license": "BSD-3-Clause" + "version": "3.7.2", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.2.tgz", + "integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==" + }, + "node_modules/js-md5": { + "version": "0.7.3", + "resolved": "https://registry.npmmirror.com/js-md5/-/js-md5-0.7.3.tgz", + "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==" }, "node_modules/js-message": { "version": "1.0.5", @@ -13118,6 +13144,11 @@ "node": ">=0.10.0" } }, + "node_modules/postcss-discard-unused/node_modules/js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "node_modules/postcss-discard-unused/node_modules/postcss": { "version": "5.2.18", "resolved": "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz", @@ -13218,6 +13249,11 @@ "node": ">=0.10.0" } }, + "node_modules/postcss-filter-plugins/node_modules/js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "node_modules/postcss-filter-plugins/node_modules/postcss": { "version": "5.2.18", "resolved": "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz", @@ -13449,6 +13485,11 @@ "node": ">=0.10.0" } }, + "node_modules/postcss-merge-idents/node_modules/js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "node_modules/postcss-merge-idents/node_modules/postcss": { "version": "5.2.18", "resolved": "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz", @@ -13985,6 +14026,11 @@ "node": ">=0.10.0" } }, + "node_modules/postcss-reduce-idents/node_modules/js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "node_modules/postcss-reduce-idents/node_modules/postcss": { "version": "5.2.18", "resolved": "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz", @@ -14130,6 +14176,11 @@ "node": ">=0.10.0" } }, + "node_modules/postcss-safe-parser/node_modules/js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "node_modules/postcss-safe-parser/node_modules/postcss": { "version": "5.2.18", "resolved": "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz", @@ -14286,6 +14337,11 @@ "node": ">=0.10.0" } }, + "node_modules/postcss-zindex/node_modules/js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "node_modules/postcss-zindex/node_modules/postcss": { "version": "5.2.18", "resolved": "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz", @@ -15466,6 +15522,11 @@ "source-map": "^0.7.1" } }, + "node_modules/scss-tokenizer/node_modules/js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "node_modules/scss-tokenizer/node_modules/source-map": { "version": "0.7.3", "license": "BSD-3-Clause", @@ -18683,6 +18744,11 @@ "node": ">=0.10.0" } }, + "node_modules/vue-photo-preview/node_modules/js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "node_modules/vue-photo-preview/node_modules/js-yaml": { "version": "3.7.0", "resolved": "https://registry.npmmirror.com/js-yaml/-/js-yaml-3.7.0.tgz", @@ -20933,6 +20999,11 @@ "node": ">=0.8.0" } }, + "node_modules/webworkify-webpack": { + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz", + "integrity": "sha512-2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw==" + }, "node_modules/when": { "version": "3.6.4", "resolved": "https://registry.npmmirror.com/when/-/when-3.6.4.tgz", @@ -23443,6 +23514,11 @@ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-1.0.0.tgz", "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==" }, + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "json5": { "version": "0.5.1", "resolved": "https://registry.npmmirror.com/json5/-/json5-0.5.1.tgz", @@ -26800,6 +26876,11 @@ "event-emitter": "~0.3.5" } }, + "es6-promise": { + "version": "4.2.8", + "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" + }, "es6-set": { "version": "0.1.5", "resolved": "https://registry.npmmirror.com/es6-set/-/es6-set-0.1.5.tgz", @@ -27359,6 +27440,15 @@ "readable-stream": "^2.3.6" } }, + "flv.js": { + "version": "1.6.2", + "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz", + "integrity": "sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==", + "requires": { + "es6-promise": "^4.2.8", + "webworkify-webpack": "^2.1.5" + } + }, "follow-redirects": { "version": "1.12.1" }, @@ -28597,9 +28687,14 @@ } }, "js-base64": { - "version": "2.6.4", - "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", - "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + "version": "3.7.2", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-3.7.2.tgz", + "integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==" + }, + "js-md5": { + "version": "0.7.3", + "resolved": "https://registry.npmmirror.com/js-md5/-/js-md5-0.7.3.tgz", + "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==" }, "js-message": { "version": "1.0.5", @@ -30839,6 +30934,11 @@ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-1.0.0.tgz", "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==" }, + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "postcss": { "version": "5.2.18", "resolved": "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz", @@ -30910,6 +31010,11 @@ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-1.0.0.tgz", "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==" }, + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "postcss": { "version": "5.2.18", "resolved": "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz", @@ -31082,6 +31187,11 @@ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-1.0.0.tgz", "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==" }, + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "postcss": { "version": "5.2.18", "resolved": "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz", @@ -31519,6 +31629,11 @@ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-1.0.0.tgz", "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==" }, + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "postcss": { "version": "5.2.18", "resolved": "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz", @@ -31627,6 +31742,11 @@ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-1.0.0.tgz", "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==" }, + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "postcss": { "version": "5.2.18", "resolved": "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz", @@ -31742,6 +31862,11 @@ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-1.0.0.tgz", "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==" }, + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "postcss": { "version": "5.2.18", "resolved": "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz", @@ -32593,6 +32718,11 @@ "source-map": "^0.7.1" }, "dependencies": { + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "source-map": { "version": "0.7.3" } @@ -34926,6 +35056,11 @@ "html-comment-regex": "^1.1.0" } }, + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "js-yaml": { "version": "3.7.0", "resolved": "https://registry.npmmirror.com/js-yaml/-/js-yaml-3.7.0.tgz", @@ -36609,6 +36744,11 @@ "resolved": "https://registry.npmmirror.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz", "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==" }, + "webworkify-webpack": { + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz", + "integrity": "sha512-2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw==" + }, "when": { "version": "3.6.4", "resolved": "https://registry.npmmirror.com/when/-/when-3.6.4.tgz", diff --git a/package.json b/package.json index f82301ee..ee43457f 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,11 @@ "echarts4": "npm:echarts@^4.8.0", "element-ui": "^2.4.5", "ezuikit-js": "^0.1.7", + "flv.js": "^1.6.2", "gantt-elastic": "^1.0.12", "html2canvas": "^1.0.0-rc.7", + "js-base64": "^3.7.2", + "js-md5": "^0.7.3", "moment": "^2.29.1", "monitorjs_horse": "^2.2.1", "mqtt": "^4.2.6", diff --git a/src/assets/i18n/langs/cn/videoManage.js b/src/assets/i18n/langs/cn/videoManage.js index 6284bf98..392fe97c 100644 --- a/src/assets/i18n/langs/cn/videoManage.js +++ b/src/assets/i18n/langs/cn/videoManage.js @@ -23,7 +23,7 @@ export default { edit: '编辑', delete: '删除', video_type_tips: '视频类型(以下视频类型同时只可开启一种,如果当前有开启的视频,在选择其他视频类型时,该类型配置及所有信息将归零)', - videoTypeList: ['萤石云', '乐橙', 'ISC', '大华', '宇视', '国标'], + videoTypeList: ['萤石云', '乐橙', 'ISC', '大华', '宇视', '国标','国密'], playTypeList: ['RTMP(高清)', 'RTMP(流畅)', 'HLS(高清)', 'HLS(流畅)', '高清轻量级插件(高清)', '流畅轻量级插件(流畅)'], deviceType: ['枪机', '球机', '热成像', '单兵', '全景', '无人机'], dialog_video_config: { diff --git a/src/assets/i18n/langs/en/videoManage.js b/src/assets/i18n/langs/en/videoManage.js index c88c2218..bec5347e 100644 --- a/src/assets/i18n/langs/en/videoManage.js +++ b/src/assets/i18n/langs/en/videoManage.js @@ -22,7 +22,7 @@ export default { edit: '编辑', delete: '删除', video_type_tips: '视频类型(以下视频类型同时只可开启一种,如果当前有开启的视频,在选择其他视频类型时,该类型配置及所有信息将归零)', - videoTypeList: ['萤石云', '乐橙', 'ISC', '大华', '宇视', '国标'], + videoTypeList: ['萤石云', '乐橙', 'ISC', '大华', '宇视', '国标','国密'], playTypeList: ['RTMP(高清)', 'RTMP(流畅)', 'HLS(高清)', 'HLS(流畅)', '高清轻量级插件(高清)', '流畅轻量级插件(流畅)'], deviceType: ['枪机', '球机', '热成像', '单兵', '全景', '无人机'], dialog_video_config: { diff --git a/src/assets/js/http.js b/src/assets/js/http.js index f5038864..b5f2d39e 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -42,8 +42,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.125:6023/' // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // tag: 本地 - axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 - // axios.defaults.baseURL = 'http://192.168.34.125:6043/'; //杨意本地 http/1.1 + // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 + axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //杨意本地 http/1.1 // axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇 // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // axios.defaults.baseURL = 'http://139.9.66.234:8/'; diff --git a/src/components/account.vue b/src/components/account.vue index bfbccef5..9a086618 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -140,11 +140,21 @@ export default { this.seeEquipment = this.$store.state.userInfo.seeEquipment; this.loginData = JSON.parse(localStorage.getItem('systemInfo')) console.log(' this.loginData', this.loginData) + if( this.loginData.headerConfiguration != null){ this.headerConfiguration = this.loginData.headerConfiguration + } + if( this.loginData.projectBackground != null){ this.projectBackground = this.loginData.projectBackground + } + if( this.loginData.enterpriseBackground != null){ this.enterpriseBackground = this.loginData.enterpriseBackground - this.dataCenter1 = this.loginData.dataCenter + } + if(this.loginData.equipmentChina !=null ){ this.equipmentChina = this.loginData.equipmentChina + } + if(this.loginData.dataCenter != null){ + this.dataCenter1 = this.loginData.dataCenter + } // console.log('项目后台',this.projectBackground) // console.log('企业后台',this.enterpriseBackground) }, diff --git a/src/components/videoModule/videoModule.vue b/src/components/videoModule/videoModule.vue index 82756fe6..3b890276 100644 --- a/src/components/videoModule/videoModule.vue +++ b/src/components/videoModule/videoModule.vue @@ -1,42 +1,94 @@