Skip to content

S
station-elec-manage-view
Commit d7e5ee38 authored by zhengjiangtao's avatar zhengjiangtao
Browse files
Options

Merge branch 'developer' of http://172.16.10.76/station/station-elec-manage-view into developer

parents becf5f9c 11c42e31
Show whitespace changes
Inline Side-by-side
Showing with 979 additions and 292 deletions
report.20200527.184722.3868.0.001.json 0 → 100644
View file @ d7e5ee38
{
"header": {
"reportVersion": 1,
"event": "Allocation failed - JavaScript heap out of memory",
"trigger": "FatalError",
"filename": "report.20200527.184722.3868.0.001.json",
"dumpEventTime": "2020-05-27T18:47:22Z",
"dumpEventTimeStamp": "1590576442875",
"processId": 3868,
"cwd": "G:\\git\\station-elec-manage-view",
"commandLine": [
"node",
"G:\\git\\station-elec-manage-view\\node_modules\\.bin\\\\..\\webpack-dev-server\\bin\\webpack-dev-server.js"
],
"nodejsVersion": "v12.16.1",
"wordSize": 64,
"arch": "x64",
"platform": "win32",
"componentVersions": {
"node": "12.16.1",
"v8": "7.8.279.23-node.31",
"uv": "1.34.0",
"zlib": "1.2.11",
"brotli": "1.0.7",
"ares": "1.15.0",
"modules": "72",
"nghttp2": "1.40.0",
"napi": "5",
"llhttp": "2.0.4",
"http_parser": "2.9.3",
"openssl": "1.1.1d",
"cldr": "35.1",
"icu": "64.2",
"tz": "2019c",
"unicode": "12.1"
},
"release": {
"name": "node",
"lts": "Erbium",
"headersUrl": "https://nodejs.org/download/release/v12.16.1/node-v12.16.1-headers.tar.gz",
"sourceUrl": "https://nodejs.org/download/release/v12.16.1/node-v12.16.1.tar.gz",
"libUrl": "https://nodejs.org/download/release/v12.16.1/win-x64/node.lib"
},
"osName": "Windows_NT",
"osRelease": "10.0.18362",
"osVersion": "Windows 10 Pro",
"osMachine": "x86_64",
"cpus": [
{
"model": "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz",
"speed": 3000,
"user": 20548453,
"nice": 0,
"sys": 36556109,
"idle": 974551890,
"irq": 25170437
},
{
"model": "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz",
"speed": 3000,
"user": 41359984,
"nice": 0,
"sys": 14032671,
"idle": 976263375,
"irq": 209515
},
{
"model": "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz",
"speed": 3000,
"user": 19856171,
"nice": 0,
"sys": 8698812,
"idle": 1003101046,
"irq": 126421
},
{
"model": "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz",
"speed": 3000,
"user": 17165500,
"nice": 0,
"sys": 5548109,
"idle": 1008942421,
"irq": 131109
},
{
"model": "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz",
"speed": 3000,
"user": 12880265,
"nice": 0,
"sys": 5372718,
"idle": 1013403046,
"irq": 107640
},
{
"model": "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz",
"speed": 3000,
"user": 10620093,
"nice": 0,
"sys": 5319875,
"idle": 1015716046,
"irq": 115156
},
{
"model": "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz",
"speed": 3000,
"user": 10757500,
"nice": 0,
"sys": 6746140,
"idle": 1014152375,
"irq": 114203
},
{
"model": "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz",
"speed": 3000,
"user": 35946281,
"nice": 0,
"sys": 9786109,
"idle": 985923625,
"irq": 138062
}
],
"networkInterfaces": [
{
"name": "以太网",
"internal": false,
"mac": "e4:54:e8:bc:0d:82",
"address": "fe80::f930:c231:c236:b1f3",
"netmask": "ffff:ffff:ffff:ffff::",
"family": "IPv6",
"scopeid": 9
},
{
"name": "以太网",
"internal": false,
"mac": "e4:54:e8:bc:0d:82",
"address": "172.16.3.77",
"netmask": "255.255.0.0",
"family": "IPv4"
},
{
"name": "Loopback Pseudo-Interface 1",
"internal": true,
"mac": "00:00:00:00:00:00",
"address": "::1",
"netmask": "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
"family": "IPv6",
"scopeid": 0
},
{
"name": "Loopback Pseudo-Interface 1",
"internal": true,
"mac": "00:00:00:00:00:00",
"address": "127.0.0.1",
"netmask": "255.0.0.0",
"family": "IPv4"
}
],
"host": "DESKTOP-KKH52JE"
},
"javascriptStack": {
"message": "No stack.",
"stack": [
"Unavailable."
]
},
"nativeStack": [
{
"pc": "0x00007ff6832119f9",
"symbol": "std::basic_ostream<char,std::char_traits<char> >::operator<<+10873"
},
{
"pc": "0x00007ff683215e1c",
"symbol": "std::basic_ostream<char,std::char_traits<char> >::operator<<+28316"
},
{
"pc": "0x00007ff683214dd8",
"symbol": "std::basic_ostream<char,std::char_traits<char> >::operator<<+24152"
},
{
"pc": "0x00007ff6833134cb",
"symbol": "v8::base::CPU::has_sse+38363"
},
{
"pc": "0x00007ff683b29f4e",
"symbol": "v8::Isolate::ReportExternalAllocationLimitReached+94"
},
{
"pc": "0x00007ff683b12021",
"symbol": "v8::SharedArrayBuffer::Externalize+833"
},
{
"pc": "0x00007ff6839de57c",
"symbol": "v8::internal::Heap::EphemeronKeyWriteBarrierFromCode+1436"
},
{
"pc": "0x00007ff6839da289",
"symbol": "v8::internal::Heap::AddRetainedMap+2713"
},
{
"pc": "0x00007ff6839fb4ab",
"symbol": "v8::internal::Factory::NewFixedArrayWithFiller+107"
},
{
"pc": "0x00007ff6839fb431",
"symbol": "v8::internal::Factory::NewUninitializedFixedArray+65"
},
{
"pc": "0x00007ff6838d857f",
"symbol": "v8::debug::Script::GetIsolate+8527"
},
{
"pc": "0x00007ff68378824a",
"symbol": "v8::internal::interpreter::JumpTableTargetOffsets::iterator::operator=+162938"
},
{
"pc": "0x00007ff683f74ddd",
"symbol": "v8::internal::SetupIsolateDelegate::SetupHeap+546637"
},
{
"pc": "0x0000026be060f3b0",
"symbol": ""
}
],
"javascriptHeap": {
"totalMemory": 2160898048,
"totalCommittedMemory": 2160898048,
"usedMemory": 2150620080,
"availableMemory": 39100960,
"memoryLimit": 2197815296,
"heapSpaces": {
"read_only_space": {
"memorySize": 262144,
"committedMemory": 262144,
"capacity": 32808,
"used": 32808,
"available": 0
},
"new_space": {
"memorySize": 1048576,
"committedMemory": 1048576,
"capacity": 1047456,
"used": 0,
"available": 1047456
},
"old_space": {
"memorySize": 273301504,
"committedMemory": 273301504,
"capacity": 271773264,
"used": 271773264,
"available": 0
},
"code_space": {
"memorySize": 2789376,
"committedMemory": 2789376,
"capacity": 2328256,
"used": 2239456,
"available": 88800
},
"map_space": {
"memorySize": 8392704,
"committedMemory": 8392704,
"capacity": 2226480,
"used": 2226480,
"available": 0
},
"large_object_space": {
"memorySize": 1874481152,
"committedMemory": 1874481152,
"capacity": 1873803784,
"used": 1873803784,
"available": 0
},
"code_large_object_space": {
"memorySize": 622592,
"committedMemory": 622592,
"capacity": 544288,
"used": 544288,
"available": 0
},
"new_large_object_space": {
"memorySize": 0,
"committedMemory": 0,
"capacity": 1047456,
"used": 0,
"available": 1047456
}
}
},
"resourceUsage": {
"userCpuSeconds": 1428.78,
"kernelCpuSeconds": 141.5,
"cpuConsumptionPercent": 1.46566,
"maxRss": 1810644992,
"pageFaults": {
"IORequired": 103461986,
"IONotRequired": 0
},
"fsActivity": {
"reads": 11592,
"writes": 327
}
},
"libuv": [
],
"environmentVariables": {
"=G:": "G:\\git\\station-elec-manage-view",
"ALLUSERSPROFILE": "C:\\ProgramData",
"APPDATA": "C:\\Users\\DELL\\AppData\\Roaming",
"CLASSPATH": ".;F:\\java\\jdk\\lib\\dt.jar;F:\\java\\jdk\\lib\\tools.jar",
"COLORTERM": "truecolor",
"CommonProgramFiles": "C:\\Program Files\\Common Files",
"CommonProgramFiles(x86)": "C:\\Program Files (x86)\\Common Files",
"CommonProgramW6432": "C:\\Program Files\\Common Files",
"COMPUTERNAME": "DESKTOP-KKH52JE",
"ComSpec": "C:\\Windows\\system32\\cmd.exe",
"dp0": "G:\\git\\station-elec-manage-view\\node_modules\\.bin\\",
"DriverData": "C:\\Windows\\System32\\Drivers\\DriverData",
"GIT_ASKPASS": "c:\\Users\\DELL\\AppData\\Local\\Programs\\Microsoft VS Code\\resources\\app\\extensions\\git\\dist\\askpass.sh",
"GRADLE_HOME": "F:\\gradle-5.5.1",
"HOME": "C:\\Users\\DELL",
"HOMEDRIVE": "C:",
"HOMEPATH": "\\Users\\DELL",
"INIT_CWD": "G:\\git\\station-elec-manage-view",
"JAVA_HOME": "F:\\java\\jdk",
"LANG": "zh_CN.UTF-8",
"LOCALAPPDATA": "C:\\Users\\DELL\\AppData\\Local",
"LOGONSERVER": "\\\\DESKTOP-KKH52JE",
"M2_HOME": "F:\\apache-maven-3.6.1",
"NODE": "C:\\Program Files\\nodejs\\node.exe",
"NODE_ENV": "development ",
"NODE_EXE": "C:\\Program Files\\nodejs\\\\node.exe",
"NODE_PATH": "C:\\Program Files\\nodejs\\node_global\\node_modules",
"NPM_CLI_JS": "C:\\Program Files\\nodejs\\\\node_modules\\npm\\bin\\npm-cli.js",
"npm_config_access": "",
"npm_config_allow_same_version": "",
"npm_config_also": "",
"npm_config_always_auth": "",
"npm_config_argv": "{\"remain\":[],\"cooked\":[\"start\"],\"original\":[\"start\"]}",
"npm_config_audit": "true",
"npm_config_audit_level": "low",
"npm_config_auth_type": "legacy",
"npm_config_before": "",
"npm_config_bin_links": "true",
"npm_config_browser": "",
"npm_config_ca": "",
"npm_config_cache": "C:\\Program Files\\nodejs\\node_cache",
"npm_config_cache_lock_retries": "10",
"npm_config_cache_lock_stale": "60000",
"npm_config_cache_lock_wait": "10000",
"npm_config_cache_max": "Infinity",
"npm_config_cache_min": "10",
"npm_config_cafile": "",
"npm_config_cert": "",
"npm_config_cidr": "",
"npm_config_color": "true",
"npm_config_commit_hooks": "true",
"npm_config_depth": "Infinity",
"npm_config_description": "true",
"npm_config_dev": "",
"npm_config_dry_run": "",
"npm_config_editor": "notepad.exe",
"npm_config_engine_strict": "",
"npm_config_fetch_retries": "2",
"npm_config_fetch_retry_factor": "10",
"npm_config_fetch_retry_maxtimeout": "60000",
"npm_config_fetch_retry_mintimeout": "10000",
"npm_config_force": "",
"npm_config_format_package_lock": "true",
"npm_config_fund": "true",
"npm_config_git": "git",
"npm_config_git_tag_version": "true",
"npm_config_global": "",
"npm_config_globalconfig": "C:\\Program Files\\nodejs\\node_global\\etc\\npmrc",
"npm_config_globalignorefile": "C:\\Program Files\\nodejs\\node_global\\etc\\npmignore",
"npm_config_global_style": "",
"npm_config_group": "",
"npm_config_ham_it_up": "",
"npm_config_heading": "npm",
"npm_config_https_proxy": "",
"npm_config_if_present": "",
"npm_config_ignore_prepublish": "",
"npm_config_ignore_scripts": "",
"npm_config_init_author_email": "",
"npm_config_init_author_name": "",
"npm_config_init_author_url": "",
"npm_config_init_license": "ISC",
"npm_config_init_module": "C:\\Users\\DELL\\.npm-init.js",
"npm_config_init_version": "1.0.0",
"npm_config_json": "",
"npm_config_key": "",
"npm_config_legacy_bundling": "",
"npm_config_link": "",
"npm_config_local_address": "",
"npm_config_loglevel": "notice",
"npm_config_logs_max": "10",
"npm_config_long": "",
"npm_config_maxsockets": "50",
"npm_config_message": "%s",
"npm_config_metrics_registry": "http://172.16.11.26:9696/",
"npm_config_node_gyp": "C:\\Program Files\\nodejs\\node_modules\\npm\\node_modules\\node-gyp\\bin\\node-gyp.js",
"npm_config_node_options": "",
"npm_config_node_version": "12.16.1",
"npm_config_noproxy": "",
"npm_config_offline": "",
"npm_config_onload_script": "",
"npm_config_only": "",
"npm_config_optional": "true",
"npm_config_otp": "",
"npm_config_package_lock": "",
"npm_config_package_lock_only": "",
"npm_config_parseable": "",
"npm_config_prefer_offline": "",
"npm_config_prefer_online": "",
"npm_config_prefix": "C:\\Program Files\\nodejs\\node_global",
"npm_config_preid": "",
"npm_config_production": "",
"npm_config_progress": "true",
"npm_config_proxy": "",
"npm_config_read_only": "",
"npm_config_rebuild_bundle": "true",
"npm_config_registry": "http://172.16.11.26:9696/",
"npm_config_rollback": "true",
"npm_config_sass_binary_site": "http://172.16.11.26:8888/node-sass",
"npm_config_save": "",
"npm_config_save_bundle": "",
"npm_config_save_dev": "",
"npm_config_save_exact": "",
"npm_config_save_optional": "",
"npm_config_save_prefix": "^",
"npm_config_save_prod": "",
"npm_config_scope": "",
"npm_config_scripts_prepend_node_path": "warn-only",
"npm_config_script_shell": "",
"npm_config_searchexclude": "",
"npm_config_searchlimit": "20",
"npm_config_searchopts": "",
"npm_config_searchstaleness": "900",
"npm_config_send_metrics": "",
"npm_config_shell": "C:\\Windows\\system32\\cmd.exe",
"npm_config_shrinkwrap": "true",
"npm_config_sign_git_commit": "",
"npm_config_sign_git_tag": "",
"npm_config_sso_poll_frequency": "500",
"npm_config_sso_type": "oauth",
"npm_config_strict_ssl": "true",
"npm_config_tag": "latest",
"npm_config_tag_version_prefix": "v",
"npm_config_timing": "",
"npm_config_tmp": "C:\\Users\\DELL\\AppData\\Local\\Temp",
"npm_config_umask": "0000",
"npm_config_unicode": "",
"npm_config_unsafe_perm": "true",
"npm_config_update_notifier": "true",
"npm_config_usage": "",
"npm_config_user": "",
"npm_config_userconfig": "C:\\Users\\DELL\\.npmrc",
"npm_config_user_agent": "npm/6.13.4 node/v12.16.1 win32 x64",
"npm_config_version": "",
"npm_config_versions": "",
"npm_config_viewer": "browser",
"npm_execpath": "C:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js",
"npm_lifecycle_event": "start",
"npm_lifecycle_script": "set NODE_ENV=development && nodemon --exec \"webpack-dev-server\"",
"npm_node_execpath": "C:\\Program Files\\nodejs\\node.exe",
"npm_package_author_name": "ilex.h",
"npm_package_dependencies_amos_amap": "^1.0.6",
"npm_package_dependencies_amos_core": "^2.0.27",
"npm_package_dependencies_amos_devgrid": "^1.0.10",
"npm_package_dependencies_amos_dll": "^1.0.4",
"npm_package_dependencies_amos_icon": "^1.0.3",
"npm_package_dependencies_amos_processor": "^1.2.18",
"npm_package_dependencies_amos_security": "2.0.10",
"npm_package_dependencies_amos_tool": "^1.2.34",
"npm_package_dependencies_amos_viz": "^1.1.0",
"npm_package_dependencies_amos_websocket": "^1.0.0",
"npm_package_dependencies_canvg": "^2.0.0",
"npm_package_dependencies_classnames": "^2.2.5",
"npm_package_dependencies_dt2react": "^1.0.7",
"npm_package_dependencies_html2canvas": "^1.0.0-rc.3",
"npm_package_dependencies_lodash": "^4.17.4",
"npm_package_dependencies_lodash_debounce": "^4.0.8",
"npm_package_dependencies_raphael": "^2.3.0",
"npm_package_dependencies_ray_animate": "^1.0.0",
"npm_package_dependencies_ray_eventpool": "^1.0.0",
"npm_package_dependencies_ray_mediaquery": "^1.0.0",
"npm_package_dependencies_ray_progress": "^1.0.0",
"npm_package_dependencies_ray_tween": "^1.0.2",
"npm_package_dependencies_react": "~16.0.0",
"npm_package_dependencies_react_dom": "~16.0.0",
"npm_package_dependencies_react_svg": "^10.0.19",
"npm_package_dependencies_vertx3_eventbus_client": "^3.4.1",
"npm_package_devDependencies_amos_build": "^3.x",
"npm_package_devDependencies_amos_core": "^2.0.27",
"npm_package_devDependencies_amos_framework": "^1.0.35",
"npm_package_devDependencies_cross_env": "^5.2.0",
"npm_package_devDependencies_eslint_config_ray": "^1.0.25",
"npm_package_devDependencies_mockjs": "^1.0.1-beta3",
"npm_package_devDependencies_stylelint_config_ray": "^2.x",
"npm_package_devDependencies_ws": "^4.0.0",
"npm_package_gitHead": "4f698c35ed2ad64c343589a3129cd909d1fc04f6",
"npm_package_lint_staged____js_json_css__0": "prettier --write",
"npm_package_lint_staged____js_json_css__1": "git add",
"npm_package_name": "amos-toip",
"npm_package_private": "true",
"npm_package_scripts_build": "set NODE_ENV=production && npm run clean && webpack",
"npm_package_scripts_build_dev": "set NODE_ENV=development && npm run clean && webpack",
"npm_package_scripts_build_pro": "set NODE_ENV=production && npm run clean && webpack",
"npm_package_scripts_clean": "rimraf dist released",
"npm_package_scripts_compile_dev": "set NODE_ENV=development && npm run clean && webpack --config webpack.config.dev.js",
"npm_package_scripts_compile_pro": "set NODE_ENV=production && npm run clean && webpack --config webpack.config.prod.js",
"npm_package_scripts_format": "prettier --write \"src/**/*.{js,jsx,css,scss,less,sass}\"",
"npm_package_scripts_lint": "eslint src tests",
"npm_package_scripts_lint_fix": "npm run lint -- --fix",
"npm_package_scripts_precommit": "lint-staged",
"npm_package_scripts_pub": "npm run compile:pro && amos-run extraReleased",
"npm_package_scripts_pub_build": "npm run build:pro && amos-run extraReleased",
"npm_package_scripts_pub_dev": "npm run compile:dev && amos-run extraReleased",
"npm_package_scripts_server": "nodemon server/index.js --watch server",
"npm_package_scripts_start": "set NODE_ENV=development && nodemon --exec \"webpack-dev-server\"",
"npm_package_scripts_start2": "set NODE_ENV=development && webpack-dev-server",
"npm_package_scripts_startDev": "set NODE_ENV=development && webpack-dev-server --config webpack.config.dev.js",
"npm_package_scripts_stylelint": "stylelint src",
"npm_package_scripts_themes": "amos-run themes",
"npm_package_scripts_themes_watch": "amos-run themes-watch",
"npm_package_scripts_watch": "webpack -w",
"npm_package_scripts_zip": "amos-run released2zip",
"npm_package_version": "1.0.0",
"NPM_PREFIX_NPM_CLI_JS": "C:\\Program Files\\nodejs\\node_global\\node_modules\\npm\\bin\\npm-cli.js",
"NUMBER_OF_PROCESSORS": "8",
"OneDrive": "C:\\Users\\DELL\\OneDrive",
"OS": "Windows_NT",
"Path": "C:\\Program Files\\nodejs\\node_modules\\npm\\node_modules\\npm-lifecycle\\node-gyp-bin;G:\\git\\station-elec-manage-view\\node_modules\\.bin;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\system32\\Wbem;C:\\Windows\\system32\\WindowsPowerShell\\v1.0\\;C:\\Windows\\system32\\OpenSSH\\;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;F:\\xshell;F:\\xftp;F:\\java\\jdk\\bin;F:\\java\\jdk\\jre\\bin;F:\\Git\\cmd;F:\\svn\\bin;F:\\apache-maven-3.6.1\\bin;F:\\gradle-5.5.1\\bin;C:\\Program Files\\nodejs\\;C:\\Python27;C:\\Program Files (x86)\\Windows Kits\\8.1\\Windows Performance Toolkit\\;D:\\develop\\FrontEnd\\Basic\\nodejs\\;D:\\develop\\FrontEnd\\Basic\\node_global\\npm;C:\\Program Files\\NVIDIA Corporation\\NVIDIA NvDLISR;F:\\Program Files\\Git\\cmd;C:\\Users\\DELL\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Users\\DELL\\AppData\\Local\\GitHubDesktop\\bin;F:\\Bandizip\\;C:\\Program Files\\nodejs\\node_global;C:\\Users\\DELL\\AppData\\Local\\Programs\\Microsoft VS Code\\bin",
"PATH": "G:\\git\\station-elec-manage-view/node_modules/.bin:C:\\Program Files\\nodejs\\node_modules\\npm\\node_modules\\npm-lifecycle\\node-gyp-bin;G:\\git\\station-elec-manage-view\\node_modules\\.bin;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\system32\\Wbem;C:\\Windows\\system32\\WindowsPowerShell\\v1.0\\;C:\\Windows\\system32\\OpenSSH\\;C:\\Program Files (x86)\\NVIDIA Corporation\\PhysX\\Common;F:\\xshell;F:\\xftp;F:\\java\\jdk\\bin;F:\\java\\jdk\\jre\\bin;F:\\Git\\cmd;F:\\svn\\bin;F:\\apache-maven-3.6.1\\bin;F:\\gradle-5.5.1\\bin;C:\\Program Files\\nodejs\\;C:\\Python27;C:\\Program Files (x86)\\Windows Kits\\8.1\\Windows Performance Toolkit\\;D:\\develop\\FrontEnd\\Basic\\nodejs\\;D:\\develop\\FrontEnd\\Basic\\node_global\\npm;C:\\Program Files\\NVIDIA Corporation\\NVIDIA NvDLISR;F:\\Program Files\\Git\\cmd;C:\\Users\\DELL\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Users\\DELL\\AppData\\Local\\GitHubDesktop\\bin;F:\\Bandizip\\;C:\\Program Files\\nodejs\\node_global;C:\\Users\\DELL\\AppData\\Local\\Programs\\Microsoft VS Code\\bin",
"PATHEXT": ".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JSE;.WSF;.WSH;.MSC;.CPL",
"PROCESSOR_ARCHITECTURE": "AMD64",
"PROCESSOR_IDENTIFIER": "Intel64 Family 6 Model 158 Stepping 13, GenuineIntel",
"PROCESSOR_LEVEL": "6",
"PROCESSOR_REVISION": "9e0d",
"ProgramData": "C:\\ProgramData",
"ProgramFiles": "C:\\Program Files",
"ProgramFiles(x86)": "C:\\Program Files (x86)",
"ProgramW6432": "C:\\Program Files",
"PROMPT": "$P$G",
"PSModulePath": "C:\\Users\\DELL\\Documents\\WindowsPowerShell\\Modules;C:\\Program Files\\WindowsPowerShell\\Modules;C:\\Windows\\system32\\WindowsPowerShell\\v1.0\\Modules",
"PUBLIC": "C:\\Users\\Public",
"SystemDrive": "C:",
"SystemRoot": "C:\\Windows",
"TEMP": "C:\\Users\\DELL\\AppData\\Local\\Temp",
"TERM_PROGRAM": "vscode",
"TERM_PROGRAM_VERSION": "1.45.1",
"TMP": "C:\\Users\\DELL\\AppData\\Local\\Temp",
"USERDOMAIN": "DESKTOP-KKH52JE",
"USERDOMAIN_ROAMINGPROFILE": "DESKTOP-KKH52JE",
"USERNAME": "DELL",
"USERPROFILE": "C:\\Users\\DELL",
"VS140COMNTOOLS": "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\Tools\\",
"VSCODE_GIT_ASKPASS_MAIN": "c:\\Users\\DELL\\AppData\\Local\\Programs\\Microsoft VS Code\\resources\\app\\extensions\\git\\dist\\askpass-main.js",
"VSCODE_GIT_ASKPASS_NODE": "C:\\Users\\DELL\\AppData\\Local\\Programs\\Microsoft VS Code\\Code.exe",
"VSCODE_GIT_IPC_HANDLE": "\\\\.\\pipe\\vscode-git-1acf11dbfb-sock",
"windir": "C:\\Windows",
"_prog": "node"
},
"sharedObjects": [
"C:\\Program Files\\nodejs\\node.exe",
"C:\\Windows\\SYSTEM32\\ntdll.dll",
"C:\\Windows\\System32\\KERNEL32.DLL",
"C:\\Windows\\System32\\KERNELBASE.dll",
"C:\\Windows\\System32\\WS2_32.dll",
"C:\\Windows\\System32\\RPCRT4.dll",
"C:\\Windows\\System32\\PSAPI.DLL",
"C:\\Windows\\SYSTEM32\\dbghelp.dll",
"C:\\Windows\\System32\\ucrtbase.dll",
"C:\\Windows\\System32\\ADVAPI32.dll",
"C:\\Windows\\System32\\msvcrt.dll",
"C:\\Windows\\System32\\sechost.dll",
"C:\\Windows\\SYSTEM32\\IPHLPAPI.DLL",
"C:\\Windows\\SYSTEM32\\USERENV.dll",
"C:\\Windows\\System32\\USER32.dll",
"C:\\Windows\\System32\\profapi.dll",
"C:\\Windows\\System32\\win32u.dll",
"C:\\Windows\\System32\\GDI32.dll",
"C:\\Windows\\System32\\gdi32full.dll",
"C:\\Windows\\System32\\msvcp_win.dll",
"C:\\Windows\\System32\\CRYPT32.dll",
"C:\\Windows\\System32\\MSASN1.dll",
"C:\\Windows\\System32\\bcrypt.dll",
"C:\\Windows\\SYSTEM32\\WINMM.dll",
"C:\\Windows\\SYSTEM32\\winmmbase.dll",
"C:\\Windows\\System32\\cfgmgr32.dll",
"C:\\Windows\\System32\\bcryptPrimitives.dll",
"C:\\Windows\\System32\\IMM32.DLL",
"C:\\Windows\\System32\\powrprof.dll",
"C:\\Windows\\System32\\UMPDC.dll",
"C:\\Windows\\SYSTEM32\\CRYPTBASE.DLL",
"C:\\Windows\\system32\\uxtheme.dll",
"C:\\Windows\\System32\\combase.dll",
"C:\\Windows\\system32\\mswsock.dll",
"C:\\Windows\\System32\\kernel.appcore.dll",
"C:\\Windows\\System32\\NSI.dll",
"C:\\Windows\\SYSTEM32\\dhcpcsvc6.DLL",
"C:\\Windows\\SYSTEM32\\dhcpcsvc.DLL",
"C:\\Windows\\SYSTEM32\\DNSAPI.dll",
"\\\\?\\G:\\git\\station-elec-manage-view\\node_modules\\node-sass\\vendor\\win32-x64-72\\binding.node",
"C:\\Windows\\system32\\napinsp.dll",
"C:\\Windows\\system32\\pnrpnsp.dll",
"C:\\Windows\\System32\\winrnr.dll",
"C:\\Windows\\system32\\NLAapi.dll",
"C:\\Windows\\system32\\wshbth.dll"
]
}
\ No newline at end of file
src/styles/view/biz/detail/detail.scss
View file @ d7e5ee38
......@@ -6,6 +6,7 @@
margin: -60px 0;
position: absolute;
z-index: 9999;
overflow-y:auto;
.amos-layout{
widows:100%;
height:100%;
......@@ -27,7 +28,7 @@
color: #F7FF00;
line-height: 32px;
float: left;
margin-left: 40px;
margin-left: 50px;
}
.headerRight{
margin-top: 15px;
......@@ -134,14 +135,14 @@
.oneHeaderContent{
border:1px solid rgba(95,255,253,1);
text-align: center;
height:575px;
height:550px;
background:linear-gradient(180deg,rgba(0,0,0,0.57) 0%,rgba(12,181,213,0.1) 100%);
}
}
.blockOneContent{
width:47%;
width:46%;
height: 370px;
margin-left: 30px;
margin: 45px 0 0 30px;
display: inline-block;
.oneChildLayout {
background: transparent;
......@@ -156,18 +157,19 @@
border:1px solid rgba(95,255,253,1);
}
.twoHeaderContent{
height:330px;
width: 748px;
height:320px;
width: 648px;
border:1px solid rgba(95,255,253,1);
background: linear-gradient(180deg, rgba(0,0,0,0.57) 0%, rgba(12,181,213,0.1) 100%);
}
}
}
}
.blockTwoContent{
width:47%;
width:46%;
height: 370px;
display: inline-block;
margin-left: 35px;
margin: 45px 0 0 35px;
.oneChildLayout {
height: 360px;
background: transparent;
......@@ -181,9 +183,13 @@
border:1px solid rgba(95,255,253,1);
}
.twoHeaderContent{
height:330px;
width: 748px;
height:320px;
width: 648px;
border:1px solid rgba(95,255,253,1);
background: linear-gradient(180deg, rgba(0,0,0,0.57) 0%, rgba(12,181,213,0.1) 100%);
.risk-incidence-severity-matrix{
height: 95%;
}
}
}
}
......@@ -193,15 +199,15 @@
}
}
.risksider{
height:1020px;
flex: 0 0 486px!important;
width: 486px!important;
height:970px;
flex: 0 0 456px!important;
width: 456px!important;
margin: 6px 40px 0px 0px;
background: transparent;
.amos-layout-sider-children{
margin-top: 10px;
.risksiderHeader{
height:40px;
height:35px;
background: transparent;
margin-left: -50px;
}
......@@ -213,12 +219,11 @@
}
.risksiderContent{
margin-top: -3px;
height:980px;
height:939px;
border:1px solid rgba(95,255,253,1);
background: linear-gradient(180deg, rgba(0,0,0,0.57) 0%, rgba(12,181,213,0.1) 100%);
}
}
}
}
......@@ -261,7 +266,7 @@
}
.blockTwoContent{
width: 699;
width: 699px;
height: 342px;
display: inline-block;
.oneChildLayout {
......@@ -288,7 +293,7 @@
font-size: 18px;
display: inline-block;
margin-top: 380px;
margin-left: 140px;
margin-left: 80px;
position: initial;
width: 108px;
height:30px;
......@@ -307,6 +312,90 @@
}
}
}
.risk-degree-pie-child {
display: inline-block;
width: 100%;
height: 310px;;
.risk-degree-pie1 {
display: inline-block;
width: 30%;
height: 75%;
text-align: center;
}
.risk-degree-pie2 {
display: inline-block;
width: 30%;
height: 75%;
text-align: center;
}
.risk-degree-pie3 {
display: inline-block;
width: 30%;
height: 75%;
text-align: center;
}
}
.risk-top-ten-content{
color: '#fff';
font-size: 14px;
width: 100%;
height: 100%;
.top-ten-content{
padding:pxToRem(30px) pxToRem(20px);
display: flex;
flex-direction: column;
justify-content: space-around;
height: 100%;
.top-ten-item{
display: flex;
justify-content: space-between;
align-items: center;
color: #fff;
font-size: 15px;
.top-risk{
display: block;
margin-left: pxToRem(16px);
width: pxToRem(320px);
.top-ten-item-middle{
width:pxToRem(248px);
height: pxToRem(16px);
display: flex;
justify-content: center;
background-color: #1C6264;
.top-ten-item-middlelinear{
display: flex;
height: pxToRem(16px)!important;
background-image: linear-gradient(to right, #1C6264 , #00FFF7);
}
}
.top-ten-item-middleRed{
margin-top: pxToRem(15px);
width:pxToRem(248px);
height: pxToRem(16px);
display: flex;
justify-content: center;
background-color: #1C6264;
.top-ten-item-middlelinearRed{
display: flex;
height: pxToRem(16px)!important;
background-image: linear-gradient(172deg,rgba(255,0,0,1) 0%,rgba(255,128,0,0) 100%);
}
}
}
.top-ten-item-bottom{
width:pxToRem(36px);
display: pxToRem(16px);
flex-direction:row;
justify-content: flex-end;
}
}
}
}
\ No newline at end of file
src/view/biz/duty/detail/data.js
View file @ d7e5ee38
......@@ -44,63 +44,63 @@ const riskData = [
]
const dangerWeekCensusData = [
{
'da': '复龙换流站', 'db': '12', 'dc': '12',
'da': '复龙换流站', 'db': 23, 'dc': 22,
},
{
'da': '奉贤换流站', 'db': '12', 'dc': '12',
'da': '奉贤换流站', 'db': 23, 'dc': 22,
},
{
'da': '苏州换流站', 'db': '12', 'dc': '12',
'da': '苏州换流站', 'db': 23, 'dc': 22,
},
{
'da': '中州换流站', 'db': '12', 'dc': '12',
'da': '中州换流站', 'db': 23, 'dc': 22,
},
{
'da': '天山换流站', 'db': '12', 'dc': '12',
'da': '天山换流站', 'db': 23, 'dc': 22,
},
{
'da': '金华换流站', 'db': '12', 'dc': '12',
'da': '金华换流站', 'db': 23, 'dc': 22,
},
{
'da': '龙泉换流站', 'db': '12', 'dc': '12',
'da': '龙泉换流站', 'db': 23, 'dc': 22,
},
{
'da': '政平换流站', 'db': '12', 'dc': '12',
'da': '政平换流站', 'db': 23, 'dc': 22,
},
{
'da': '伊克昭换流站', 'db': '12', 'dc': '12'
'da': '伊克昭换流站', 'db': 23, 'dc': 22
},
{
'da': '陕北换流站', 'db': '12', 'dc': '12',
'da': '陕北换流站', 'db': 23, 'dc': 22,
},
{
'da': '武汉换流站', 'db': '12', 'dc': '12',
'da': '武汉换流站', 'db': 23, 'dc': 22,
},
{
'da': '金华换流站', 'db': '12', 'dc': '12',
'da': '金华换流站', 'db': 23, 'dc': 22,
},
{
'da': '龙泉换流站', 'db': '12', 'dc': '12',
'da': '龙泉换流站', 'db': 23, 'dc': 22,
},
{
'da': '政平换流站', 'db': '12', 'dc': '12',
'da': '政平换流站', 'db': 23, 'dc': 22,
},
{
'da': '伊克昭换流站', 'db': '12', 'dc': '12'
'da': '伊克昭换流站', 'db': 23, 'dc': 22
},
{
'da': '陕北换流站', 'db': '12', 'dc': '12',
'da': '陕北换流站', 'db': 23, 'dc': 22,
},
{
'da': '武汉换流站', 'db': '12', 'dc': '12',
'da': '武汉换流站', 'db': 23, 'dc': 22,
}]
const sevenDaysRiskCensusData = [{
......@@ -143,6 +143,20 @@ const sevenDaysRiskCensusData = [{
}]
export const riskTopTenData=[
{name:'1.极1低端换流变流台',rpni:100,rpnr:99},
{name:'2.极2低端换流变流台',rpni:100,rpnr:99},
{name:'3.极1高端换流变流台',rpni:100,rpnr:99},
{name:'4.极2高端换流变流台',rpni:100,rpnr:99},
{name:'5.极1低端换流变流台',rpni:100,rpnr:99},
{name:'6.极2低端换流变流台',rpni:100,rpnr:99},
{name:'7.极1低端换流变流台',rpni:100,rpnr:99},
{name:'8.极2低端换流变流台',rpni:100,rpnr:99},
{name:'9.极1低端换流变流台',rpni:100,rpnr:99},
{name:'10.极2低端换流变流台',rpni:100,rpnr:99},
]
/**
* 数据组件
*/
......@@ -150,4 +164,4 @@ class JsonData extends Component {
}
export default JsonData = { riskData, dangerWeekCensusData, sevenDaysRiskCensusData };
export default JsonData = { riskData, dangerWeekCensusData, sevenDaysRiskCensusData,riskTopTenData};
src/view/biz/duty/detail/echarts/IncidenceSeverityMatrix.js
View file @ d7e5ee38
......@@ -19,182 +19,133 @@ class IncidenceSeverityMatrix extends Component {
};
}
componentDidMount() {
this.queryRiskSourceMatrix();
}
getOptions() {
return {
grid: [{ x: '8%', y: '13%', width: '75%', height: '75%' }],
tooltip: {
formatter: item => {
let text = item.value;
// console.log(JSON.stringify(item));
return text[2] + '<br>' + 'S:' + text[0] + ' ' + ' O:' + text[1];
}
legend: {
data: ['故障率(O)', '严重度(S)', '最低线', '最高线'],
x: 100,
y: 20,
textStyle: {
color: '#fff',
fontSize: 14,
},
color: ['green', 'red', '#ff6600'],
xAxis: [
{
nameGap: 5,
gridIndex: 0,
min: 0,
max: 10,
name: 'S(严重度)',
// nameRotate: 90,
},
xAxis: {
type: 'category',
name: 'S',
nameTextStyle: {
fontWeight: 'bold',
fontSize: 15
fontSize: 20,
color:'#5FFFFD',
},
boundaryGap: false,
data: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
axisLabel: {
show: true,
textStyle: {
color: '#fff',
fontSize: 14,
}
},
axisLine: {
lineStyle: {
color: '#245665',
}
],
yAxis: [
{
nameGap: 5,
gridIndex: 0,
min: 0,
max: 10,
name: 'O(故障率)',
},
splitLine: {
show: true,
lineStyle: {
color: ['#245665'],
width: 1,
},
}
},
yAxis: {
type: 'value',
name: 'O',
nameTextStyle: {
fontWeight: 'bold',
fontSize: 15
fontSize: 20,
color:'#5FFFFD',
},
fontSize:20,
data: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
axisLabel: {
show: true,
textStyle: {
color: '#fff',
fontSize: 14
}
},
axisLine: {
lineStyle: {
color: '#245665',
}
],
// symbol: 'rect',
legend: {
top: 5,
right: 100,
selectedMode: false,
data: ['最低线', '最高线', '']
},
series: this.getSeries()
};
splitLine: {
show: true,
lineStyle: {
color: ['#245665'],
width: 1,
}
getSeries() {
let series = [];
let safetySeries = {
name: '最低线',
type: 'scatter',
xAxisIndex: 0,
yAxisIndex: 0,
data: this.state.dataAll[2],
markLine: this.markLineOpt('safety')
};
let dangerSeries = {
name: '最高线',
type: 'scatter',
xAxisIndex: 0,
yAxisIndex: 0,
data: this.state.dataAll[0],
markLine: this.markLineOpt('danger')
};
let warnSeries = {
name: '111',
type: 'scatter',
xAxisIndex: 0,
yAxisIndex: 0,
data: this.state.dataAll[1]
};
series.push(safetySeries);
series.push(dangerSeries);
series.push(warnSeries);
return series;
}
markLineOpt(type) {
var data1 = [];
let color = 'green';
if (type === 'safety') {
color = 'green';
data1 = [
{
coord: [7, 0],
symbol: 'none'
},
series: [
{
coord: [0, 4],
symbol: 'none'
}
];
} else if (type === 'danger') {
color = 'red';
data1 = [
name: '故障率(O)',
type: 'line',
data: []
},
{
coord: [9, 0],
symbol: 'none'
name: '严重度(S)',
type: 'line',
data: []
},
{
coord: [0, 8],
symbol: 'none'
}
];
}
return {
animation: false,
label: {
name: '最低线',
type: 'line',
symbol: 'circle',
symbolSize: 8,
data: [0, 2, 4, 5, 3, 2, 1, 3, 4, 9],
itemStyle: {
normal: {
formatter: '',
textStyle: {
align: ''
}
}
},
color: '#0A73FF',
lineStyle: {
normal: {
type: 'solid',
color: color
}
color: '#0A73FF',
width: 2
},
tooltip: {
formatter: ''
},
data: [data1]
};
}
queryRiskSourceMatrix() {
// queryRiskSourceMatrixAction().then(data => {
// data &&
// data.map(e => {
// this.classifyPoints(e);
// });
// let { dataAll, dangerPoints, safePoints, warnPoints } = this.state;
// dataAll.push(dangerPoints);
// dataAll.push(warnPoints);
// dataAll.push(safePoints);
// this.setState({
// dataAll
// });
// });
}
},
{
name: '最高线',
type: 'line',
symbol: 'circle',
symbolSize: 8,
data: [4, 5, 1, 2, 3, 7, 9, 3, 2, 1],
itemStyle: {
normal: {
color: '#FF0000',
lineStyle: {
color: '#FF0000',
width: 2
},
},
classifyPoints(point) {
let { dangerPoints, safePoints, warnPoints } = this.state;
let d = [];
d.push(point.evaluationSid);
d.push(point.evaluationOid);
d.push(point.name);
if (((8 * point.evaluationSid) + (9 * point.evaluationOid)) > 72) {//红色区域：S>=9或O>=8 (直线右侧区域8x + 9y - 72 > 0)
dangerPoints.push(d);
} else if (((4 * point.evaluationSid) + (7 * point.evaluationOid)) < 28) {//绿色区域：S<7且O<4 (直线左侧区域4x + 7y - 28 < 0)
safePoints.push(d);
} else {//橙色区域：S<9且O<8&&S>=7且O>=4
warnPoints.push(d);
},
},
]
}
this.setState({
dangerPoints,
safePoints,
warnPoints
});
}
render() {
const option = this.getOptions();
return (
<div className="risk-incidence-severity-matrix">
<AmosEcharts option={option} />
<AmosEcharts option={option} style={{ height: '330px', width: '660px' }} />
</div>
);
}
......
src/view/biz/duty/detail/echarts/RiskDegreeHistogram.js
View file @ d7e5ee38
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import AmosEcharts from 'amos-viz/lib/echarts';
import AmosWebSocket from 'amos-websocket';
import { Connect } from 'amos-framework';
import JsonData from './../data';
import { OverFlowText } from 'amos-framework';
// import { queryRiskSourceRpnCountAction } from './../../../../services/situationService';
// import SysWsURL, { completeToken } from './../../../../consts/wsUrlConsts';
const eventConnect = Connect.eventConnect;
const riskTopTenData=JsonData.riskTopTenData;
const labelOption = {
normal: {
show: true,
......@@ -42,26 +42,7 @@ class RiskDegreeHistogram extends Component {
}
getBarViewContent() {
// queryRiskSourceRpnCountAction().then(
// data => {
// let riskNameList = [];
// let rpniData = [];
// let rpnrData = [];
// data && data.map(e => {
// riskNameList.push(e.name);
// rpniData.push(e.rpni);
// rpnrData.push(e.rpn);
// });
// this.setState({
// riskNameList: riskNameList.reverse(),
// rpniData: rpniData.reverse(),
// rpnrData: rpnrData.reverse()
// });
// },
// err => {
// console.log(err);
// }
// );
}
getOptions() {
......@@ -73,50 +54,52 @@ class RiskDegreeHistogram extends Component {
}
},
legend: {
data: [
{
name: 'RPNi',
icon: 'circle'
},
{
name: 'RPNr',
icon: 'circle'
}
],
x: 'right',
top: '20',
right: '120'
data: ['RPNi', 'RPNr']
},
grid: {
left: '3%',
right: '6%',
bottom: '3%',
right: '3%',
bottom: '1%',
containLabel: true
},
xAxis: {
type: 'value',
boundaryGap: [0, 0.03]
boundaryGap: [0, 0]
},
yAxis: {
type: 'category',
data: this.state.riskNameList
data: ['极3低端换流变流台', '极2低端换流变流台','极1低端换流变流台','极3低端换流变流台','极2低端换流变流台', '极1低端换流变流台',
'极3低端换流变流台', '极2低端换流变流台', '极1低端换流变流台','极3低端换流变流台' ],
width:50,
axisLabel: {
show: true,
textStyle: {
color: '#fff',
fontSize: 18,
width:'10px'
}
},
},
color: ['#35bf73', '#f16060'],
series: [
{
name: 'RPNi',
type: 'bar',
label: labelOption,
data: this.state.rpniData,
// barGap: 2
barWidth: 14
itemStyle:{
normal: {
color:'#5FFFFD',
},
},
data: [100, 100, 100, 100, 100, 100, 100, 100, 100,100]
},
{
name: 'RPNr',
type: 'bar',
label: labelOption,
data: this.state.rpnrData,
barWidth: 14
itemStyle:{
normal: {
color:'#FF0000',
},
},
data: [99,99,99,99,99,99,99,99,99,99]
}
]
};
......@@ -130,9 +113,36 @@ class RiskDegreeHistogram extends Component {
const option = this.getOptions();
// const wsURL = completeToken(SysWsURL.rulews);
return (
<div className="risk-degree-rpn-histogram">
<AmosWebSocket ref={node => this.aws = node} onMessage={this.handleData} reconnect debug />
<AmosEcharts option={option} />
<div className="risk-top-ten-content">
{/* <AmosEcharts option={option} style={{ height: '970px', width: '480px' }}/> */}
<div className='top-ten-content' style={{position:"initial"}}>
<div style={{position:"initial",width:28,height:28,marginTop:-32,marginLeft:352}}
onClick={this.props.onClick}></div>
{
riskTopTenData.map((item,index)=>
<div className='top-ten-item' key={index}>
<OverFlowText style={{marginTop:10}}>
<div style={{ width: '100px',height:'70px',whiteSpace:'normal',lineHeight:'30px'}}>{item.name}</div>
</OverFlowText>
<div className="top-risk">
<div className='top-ten-item-middle' style={{display:'flex'}}>
<div className='top-ten-item-middlelinear' style={{height:16,width:`${item.rpni}%`}}> </div>
<div style={{lineHeight:'15px',position:'absolute',right:'45px'}}>{item.rpni}</div>
</div>
<div className='top-ten-item-middleRed' style={{display:'flex'}}>
<div className='top-ten-item-middlelinearRed' style={{height:16,width:`${item.rpnr}%`}}></div>
<div style={{lineHeight:'15px',position:'absolute',right:'45px'}}>{item.rpnr}</div>
</div>
</div>
<div className ='top-ten-item-bottom'>
<span>{item.value}</span>
</div>
</div>
)
}
</div>
</div>
);
}
......@@ -143,7 +153,7 @@ RiskDegreeHistogram.propTypes = {};
RiskDegreeHistogram.defaultProps = {
data: {},
legend: [],
chartStyle: { width: '100%', height: '20rem' }
chartStyle: { width: '100%', height: '100%' }
};
export default RiskDegreeHistogram;
src/view/biz/duty/detail/echarts/RiskDegreePie.js
View file @ d7e5ee38
......@@ -17,9 +17,9 @@ class RiskDegreePie extends Component {
constructor(props) {
super(props);
this.state = {
monthData: { type0Rate: '0%', countOfType0: 0 },
seasonData: { type0Rate: '0%', countOfType0: 0 },
yearData: { type0Rate: '0%', countOfType0: 0 }
monthData: { type0Rate: '2%', countOfType0: 5 },
seasonData: { type0Rate: '2%', countOfType0: 5 },
yearData: { type0Rate: '2%', countOfType0: 5 }
};
}
......@@ -45,19 +45,15 @@ class RiskDegreePie extends Component {
getMonthOptions(value, obj) {
let data = [];
let color = 'lightgray';
let data1 = {};
let data2 = {};
if (obj) {
if (value === 'month') {
data1.name = obj.type0Rate + '\r\n' + '本月风险' + '\r\n' + '上升率';
color = '#3aa0fe';
} else if (value === 'season') {
data1.name = obj.type0Rate + '\r\n' + '本季度风险' + '\r\n' + '上升率';
color = '#68d288';
} else if (value === 'year') {
data1.name = obj.type0Rate + '\r\n' + '本年风险' + '\r\n' + '上升率';
color = '#fad955';
}
data1.value = obj.countOfType0;
data2.value = obj.countOfSource - obj.countOfType0;
......@@ -65,21 +61,19 @@ class RiskDegreePie extends Component {
data.push(data1);
data.push(data2);
}
let colors = [];
colors.push(color);
colors.push('lightgray');
return {
color: colors,
series: [
{
name: '风险率',
type: 'pie',
radius: ['50%', '70%'],
radius: ['60%', '70%'],
avoidLabelOverlap: false,
color:['#FE0000','#5FFFFD'],
label: {
normal: {
show: true,
color: 'black',
color: 'white',
fontSize:25,
position: 'center',
formatter: '{b}'
}
......@@ -89,7 +83,10 @@ class RiskDegreePie extends Component {
show: false
}
},
data
data:[
{value: 125, name: null},
{value: 810, name: '2%'},
]
}
]
};
......@@ -97,19 +94,15 @@ class RiskDegreePie extends Component {
getSeasonOptions(value, obj) {
let data = [];
let color = 'lightgray';
let data1 = {};
let data2 = {};
if (obj) {
if (value === 'month') {
data1.name = obj.type0Rate + '\r\n' + '本月风险' + '\r\n' + '上升率';
color = '#3aa0fe';
} else if (value === 'season') {
data1.name = obj.type0Rate + '\r\n' + '本季度风险' + '\r\n' + '上升率';
color = '#68d288';
} else if (value === 'year') {
data1.name = obj.type0Rate + '\r\n' + '本年风险' + '\r\n' + '上升率';
color = '#fad955';
}
data1.value = obj.countOfType0;
data2.value = obj.countOfSource - obj.countOfType0;
......@@ -117,21 +110,19 @@ class RiskDegreePie extends Component {
data.push(data1);
data.push(data2);
}
let colors = [];
colors.push(color);
colors.push('lightgray');
return {
color: colors,
series: [
{
name: '风险率',
type: 'pie',
radius: ['50%', '70%'],
radius: ['60%', '70%'],
avoidLabelOverlap: false,
color:['#FE6600','#5FFFFD'],
label: {
normal: {
show: true,
color: 'black',
color: 'white',
fontSize:25,
position: 'center',
formatter: '{b}'
}
......@@ -141,7 +132,10 @@ class RiskDegreePie extends Component {
show: false
}
},
data
data:[
{value: 125, name: null},
{value: 810, name: '2%'},
]
}
]
};
......@@ -149,19 +143,15 @@ class RiskDegreePie extends Component {
getYearOptions(value, obj) {
let data = [];
let color = 'lightgray';
let data1 = {};
let data2 = {};
if (obj) {
if (value === 'month') {
data1.name = obj.type0Rate + '\r\n' + '本月风险' + '\r\n' + '上升率';
color = '#3aa0fe';
} else if (value === 'season') {
data1.name = obj.type0Rate + '\r\n' + '本季度风险' + '\r\n' + '上升率';
color = '#68d288';
} else if (value === 'year') {
data1.name = obj.type0Rate + '\r\n' + '本年风险' + '\r\n' + '上升率';
color = '#fad955';
}
data1.value = obj.countOfType0;
data2.value = obj.countOfSource - obj.countOfType0;
......@@ -169,21 +159,19 @@ class RiskDegreePie extends Component {
data.push(data1);
data.push(data2);
}
let colors = [];
colors.push(color);
colors.push('lightgray');
return {
color: colors,
series: [
{
name: '风险率',
type: 'pie',
radius: ['50%', '70%'],
radius: ['60%', '70%'],
color:['#FFD600','#5FFFFD'],
avoidLabelOverlap: false,
label: {
normal: {
show: true,
color: 'black',
color: 'white',
fontSize:25,
position: 'center',
formatter: '{b}'
}
......@@ -193,7 +181,10 @@ class RiskDegreePie extends Component {
show: false
}
},
data
data:[
{value: 125, name: null},
{value: 810, name: '2%'},
]
}
]
};
......@@ -210,19 +201,31 @@ class RiskDegreePie extends Component {
let seasonOption = this.getSeasonOptions('season', seasonData);
let yearOption = this.getYearOptions('year', yearData);
return (
<div className="risk-degree-pie">
<AmosWebSocket ref={node => this.aws = node} onMessage={this.handleData} reconnect debug />
<div className="risk-degree-pie-child" style={{color:'#5FFFFD',textAlign:'center'}}>
<div className="risk-degree-pie1">
<AmosEcharts option={monthOption} />
<span>本月风险上升率 | {monthData.type0Rate} {monthData.countOfType0}个</span>
<AmosEcharts option={monthOption} style={{ height: '210px', width: '210px' }}/>
<div>
<div style={{fontSize:34,fontWeight:'bold',display:'inline-block'}}>{monthData.countOfType0} </div>
<div style={{fontSize:22,color:'red',fontWeight:'bold',display:'inline-block',marginLeft:10}}>{monthData.type0Rate}↑</div>
</div>
<div style={{fontSize:22,color:'#CEC700'}}>本月风险</div>
</div>
<div className="risk-degree-pie2">
<AmosEcharts option={seasonOption} />
<span>本季度风险上升率 | {seasonData.type0Rate} {seasonData.countOfType0}个</span>
<AmosEcharts option={seasonOption} style={{ height: '210px', width: '210px' }}/>
<div>
<div style={{fontSize:34,fontWeight:'bold',display:'inline-block'}}>{monthData.countOfType0} </div>
<div style={{fontSize:22,fontWeight:'bold',color:'red',display:'inline-block',marginLeft:10}}>{monthData.type0Rate}↑</div>
</div>
<div style={{fontSize:22,color:'#CEC700'}}>本季度风险</div>
</div>
<div className="risk-degree-pie3">
<AmosEcharts option={yearOption} />
<span>本年风险上升率 | {yearData.type0Rate} {yearData.countOfType0}个</span>
<AmosEcharts option={yearOption} style={{ height: '210px', width: '210px' }}/>
<div>
<div style={{fontSize:34,fontWeight:'bold',display:'inline-block'}}>{monthData.countOfType0} </div>
<div style={{fontSize:22,color:'red',fontWeight:'bold',display:'inline-block',marginLeft:10}}>{monthData.type0Rate}↑</div>
</div>
<div style={{fontSize:22,color:'#CEC700'}}>本年风险</div>
</div>
</div>
);
......
src/view/biz/duty/detail/index.js
View file @ d7e5ee38
......@@ -247,12 +247,18 @@ class CentralInfoView extends Component {
{
title: '告警',
dataIndex: 'db',
width: 120
width: 120,
render : (text, record) => {
return(<div><span>{text}</span><span style={{marginLeft:100}}>{Math.round((text/(record.db+record.dc))*100)}%</span></div>)
}
},
{
title: '隐患',
dataIndex: 'dc',
width: 120
width: 120,
render : (text, record) => {
return(<div><span>{text}</span><span style={{marginLeft:100}}>{Math.round((text/(record.db+record.dc))*100)}%</span></div>)
}
},
]
)
......@@ -390,7 +396,7 @@ class CentralInfoView extends Component {
<Header className="contentHeader">
<div className="headerLeft" style={{display:'inline'}}>{title}</div>
<div className="headerRight" style={{display:'inline'}}>
<img src="/src/assets/detail/close.png" onClick={this.closeDiv} width="42px" style={{marginTop:'5px'}}/>
<img src="/src/assets/detail/close.png" onClick={this.closeDiv} width="42px" style={{marginTop:'3px'}}/>
</div>
</Header>
<Content className="content">
......
src/view/biz/duty/detail/riskDetail.js
View file @ d7e5ee38
......@@ -51,7 +51,7 @@ class RiskAssessment extends Component {
<Header className="contentHeader">
<div className="headerLeft" style={{ display: 'inline' }}>{this.props.detailTitle}</div>
<div className="headerRight" style={{ display: 'inline' }}>
<img src="/src/assets/detail/return.png" onClick={this.onClick} width="42px" style={{marginTop:5}} />
<img src="/src/assets/detail/return.png" onClick={this.onClick} width="42px" style={{marginTop:3}} />
</div>
</Header>
<Layout>
......@@ -59,10 +59,10 @@ class RiskAssessment extends Component {
<Header className="blockOneHeader">
<Header className="oneChildHeader">
<img src="/src/assets/detail/secondTitle1.png" style={{ width: 256, height: 38, margin: 0 }} />
<img src="/src/assets/detail/secondTitle4.png" style={{ width: 256, height: 38, margin: 0 }} />
</Header>
<Content className="oneHeaderContent">
<img src="/src/assets/detail/RPNr.png" style={{ width: 922, height: 503, marginTop: 35 ,marginLeft:248}} />
<img src="/src/assets/detail/RPNr.png" style={{ width: 922, height: 503, marginTop: 35 ,marginLeft:160}} />
{this.getLegend()}
</Content>
......@@ -70,31 +70,32 @@ class RiskAssessment extends Component {
<Content className="blockOneContent">
<Layout className="oneChildLayout">
<Sider className="oneChildSider">
<Layout>
<Header className="twoChildHeader">
<img src="/src/assets/detail/secondTitle2.png" style={{ width: 277, height: 38, margin: 0 }} />
<img src="/src/assets/detail/secondTitle1.png" style={{ width: 277, height: 38, margin: 0 }} />
</Header>
<Content className="twoHeaderContent">
<div className="risk-degree-pie">
<div className="risk-degree-pie1">
{/* <RiskDegreePie /> */}
<div>5</div>
<div>2%↑</div>
<div>本年风险</div>
<RiskDegreePie />
</div>
</div>
</Content>
</Layout>
</Sider>
</Layout>
</Content>
<Content className="blockTwoContent">
<Layout className="oneChildLayout">
<Sider className="oneChildSider">
<Layout>
<Header className="twoChildHeader">
<img src="/src/assets/detail/secondTitle3.png" style={{ width: 277, height: 38, margin: 0 }} />
<img src="/src/assets/detail/secondTitle2.png" style={{ width: 277, height: 38, margin: 0 }} />
</Header>
<Content className="twoHeaderContent">
{/* <IncidenceSeverityMatrix /> */}
<IncidenceSeverityMatrix />
</Content>
</Layout>
</Sider>
</Layout>
</Content>
......@@ -103,10 +104,10 @@ class RiskAssessment extends Component {
<Sider className="risksider">
<Header className="risksiderHeader">
<img src="/src/assets/detail/secondTitle4.png" style={{ width: 256, height: 38, margin: 0 }} />
<img src="/src/assets/detail/secondTitle3.png" style={{ width: 256, height: 38, margin: 0 }} />
</Header>
<Content className="risksiderContent">
{/* <RiskDegreeHistogram /> */}
<RiskDegreeHistogram />
</Content>
</Sider>
</Layout>
......
src/view/biz/duty/situation/GrowthStatistics.js
View file @ d7e5ee38
......@@ -11,7 +11,7 @@ class GrowthStatistics extends Component {
onClick={this.props.onWarnClick}></div>
<div className='growth-item growth-item-header'>
<div>日期</div>
<div>告警隐患</div>
<div>告警/隐患</div>
<div>周增量</div>
</div>
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment