diff --git a/.env.development b/.env.development index be04f184b..d1c8a3e7c 100644 --- a/.env.development +++ b/.env.development @@ -11,5 +11,4 @@ VUE_APP_API_SERVER = http://192.168.1.140/api # VUE_APP_NODE_ENV=dev_sdtdt VUE_APP_NODE_ENV=dev #项目根路径 -VUE_APP_PUBLIC_PATH=epmet-oper -VUE_APP_CUSTOMER=yantai \ No newline at end of file +VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/.env.production b/.env.production index 242b46892..5b72f6d9d 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,3 @@ NODE_ENV=production VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api VUE_APP_NODE_ENV=prod VUE_APP_PUBLIC_PATH=epmet-oper -VUE_APP_CUSTOMER=yantai diff --git a/.env.production.sit b/.env.production.sit index 9edee48dd..b0c600ea6 100644 --- a/.env.production.sit +++ b/.env.production.sit @@ -2,5 +2,4 @@ NODE_ENV=production # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api VUE_APP_API_SERVER = http://192.168.1.140/api VUE_APP_NODE_ENV=prod:sit -VUE_APP_PUBLIC_PATH=epmet-oper -VUE_APP_CUSTOMER=yantai \ No newline at end of file +VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/.env.production.uat b/.env.production.uat index 7b14d657d..83e93d4d1 100644 --- a/.env.production.uat +++ b/.env.production.uat @@ -2,5 +2,4 @@ NODE_ENV=production # VUE_APP_API_SERVER = http://120.27.18.76/api VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api VUE_APP_NODE_ENV=prod:uat -VUE_APP_PUBLIC_PATH=epmet-oper -VUE_APP_CUSTOMER=yantai +VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/package.json b/package.json index 636a2262a..799ec0ed1 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,6 @@ "mint-ui": "^2.2.13", "node-sass": "^4.12.0", "ol": "^6.9.0", - "particles.js": "^2.0.0", "portfinder": "^1.0.21", "proj4": "^2.8.0", "qs": "^6.7.0", diff --git a/report.20221017.102821.29368.0.001.json b/report.20221017.102821.29368.0.001.json deleted file mode 100644 index b353bde73..000000000 --- a/report.20221017.102821.29368.0.001.json +++ /dev/null @@ -1,580 +0,0 @@ - -{ - "header": { - "event": "Allocation failed - JavaScript heap out of memory", - "trigger": "FatalError", - "filename": "report.20221017.102821.29368.0.001.json", - "dumpEventTime": "2022-10-17T10:28:21Z", - "processId": 29368, - "cwd": "D:\\Project\\Web\\epmet-oper-gov", - "commandLine": [ - "node", - "D:\\Project\\Web\\epmet-oper-gov\\node_modules\\.bin\\\\..\\_@vue_cli-service@3.12.1@@vue\\cli-service\\bin\\vue-cli-service.js", - "serve" - ], - "nodejsVersion": "v11.15.0", - "wordSize": 64, - "arch": "x64", - "platform": "win32", - "componentVersions": { - "node": "11.15.0", - "v8": "7.0.276.38-node.19", - "uv": "1.27.0", - "zlib": "1.2.11", - "brotli": "1.0.7", - "ares": "1.15.0", - "modules": "67", - "nghttp2": "1.37.0", - "napi": "4", - "llhttp": "1.1.1", - "http_parser": "2.8.0", - "openssl": "1.1.1b", - "cldr": "34.0", - "icu": "63.1", - "tz": "2018e", - "unicode": "11.0" - }, - "release": { - "name": "node", - "headersUrl": "https://nodejs.org/download/release/v11.15.0/node-v11.15.0-headers.tar.gz", - "sourceUrl": "https://nodejs.org/download/release/v11.15.0/node-v11.15.0.tar.gz", - "libUrl": "https://nodejs.org/download/release/v11.15.0/win-x64/node.lib" - }, - "osName": "Windows_NT", - "osRelease": "10.0.22621", - "osVersion": "Windows 10 Home China", - "osMachine": "x86_64", - "host": "DESKTOP-KD168PS" - }, - "javascriptStack": { - "message": "No stack.", - "stack": [ - "Unavailable." - ] - }, - "nativeStack": [ - { - "pc": "0x00007ff7ab21d24e", - "symbol": "std::basic_ios >::fill+16366" - }, - { - "pc": "0x00007ff7ab21c0f9", - "symbol": "std::basic_ios >::fill+11929" - }, - { - "pc": "0x00007ff7ab21b923", - "symbol": "std::basic_ios >::fill+9923" - }, - { - "pc": "0x00007ff7ab30dc22", - "symbol": "uv_loop_fork+89362" - }, - { - "pc": "0x00007ff7ab73609e", - "symbol": "v8::internal::FatalProcessOutOfMemory+798" - }, - { - "pc": "0x00007ff7ab735fd7", - "symbol": "v8::internal::FatalProcessOutOfMemory+599" - }, - { - "pc": "0x00007ff7ab7e9a14", - "symbol": "v8::internal::Heap::RootIsImmortalImmovable+14068" - }, - { - "pc": "0x00007ff7ab7df822", - "symbol": "v8::internal::Heap::CollectGarbage+7234" - }, - { - "pc": "0x00007ff7ab7de038", - "symbol": "v8::internal::Heap::CollectGarbage+1112" - }, - { - "pc": "0x00007ff7ab7e7967", - "symbol": "v8::internal::Heap::RootIsImmortalImmovable+5703" - }, - { - "pc": "0x00007ff7ab7e79e6", - "symbol": "v8::internal::Heap::RootIsImmortalImmovable+5830" - }, - { - "pc": "0x00007ff7ab91f8b1", - "symbol": "v8::internal::Factory::NewFillerObject+49" - }, - { - "pc": "0x00007ff7ab9d9786", - "symbol": "v8::internal::StoreBuffer::StoreBufferOverflow+27190" - }, - { - "pc": "0x00000104951d0481", - "symbol": "" - } - ], - "javascriptHeap": { - "totalMemory": 1501376512, - "totalCommittedMemory": 1501376512, - "usedMemory": 1346924536, - "availableMemory": 39500640, - "memoryLimit": 1526909922, - "heapSpaces": { - "read_only_space": { - "memorySize": 524288, - "committedMemory": 524288, - "capacity": 515584, - "used": 33520, - "available": 482064 - }, - "new_space": { - "memorySize": 33554432, - "committedMemory": 33554432, - "capacity": 16498688, - "used": 1868816, - "available": 14629872 - }, - "old_space": { - "memorySize": 1206063104, - "committedMemory": 1206063104, - "capacity": 1114694856, - "used": 1113755240, - "available": 939616 - }, - "code_space": { - "memorySize": 11534336, - "committedMemory": 11534336, - "capacity": 9093152, - "used": 9093152, - "available": 0 - }, - "map_space": { - "memorySize": 31993856, - "committedMemory": 31993856, - "capacity": 6363360, - "used": 6363360, - "available": 0 - }, - "large_object_space": { - "memorySize": 217706496, - "committedMemory": 217706496, - "capacity": 239259536, - "used": 215810448, - "available": 23449088 - }, - "new_large_object_space": { - "memorySize": 0, - "committedMemory": 0, - "capacity": 0, - "used": 0, - "available": 0 - } - } - }, - "resourceUsage": { - "userCpuSeconds": 2690.61, - "kernelCpuSeconds": 179.828, - "cpuConsumptionPercent": 0.692249, - "maxRss": 1829195776, - "pageFaults": { - "IORequired": 48054699, - "IONotRequired": 0 - }, - "fsActivity": { - "reads": 145756, - "writes": 5834 - } - }, - "libuv": [ - ], - "environmentVariables": { - "=C:": "C:\\", - "=D:": "D:\\Project\\Web\\epmet-oper-gov", - "add_path": "D:\\APP\\cmder", - "add_to_path": "D:\\APP\\cmder", - "aliases": "D:\\APP\\cmder\\config\\user_aliases.cmd", - "ALLUSERSPROFILE": "C:\\ProgramData", - "ANSICON": "90x1000 (90x24)", - "ANSICON_DEF": "7", - "APPDATA": "C:\\Users\\lenovo\\AppData\\Roaming", - "architecture_bits": "64", - "BABEL_ENV": "development", - "ccall": "call \"D:\\APP\\cmder\\vendor\\bin\\cexec.cmd\"", - "cexec": "\"D:\\APP\\cmder\\vendor\\bin\\cexec.cmd\"", - "clink_architecture": "x64", - "CMDER_ALIASES": "1", - "CMDER_CLINK": "1", - "CMDER_CONFIGURED": "1", - "CMDER_INIT_END": "10:45:24.68", - "CMDER_INIT_START": "10:45:22.18", - "CMDER_ROOT": "D:\\APP\\cmder", - "CMDER_SHELL": "cmd", - "CMDER_USER_FLAGS": " ", - "COLUMNS": "90", - "CommonProgramFiles": "C:\\Program Files\\Common Files", - "CommonProgramFiles(x86)": "C:\\Program Files (x86)\\Common Files", - "CommonProgramW6432": "C:\\Program Files\\Common Files", - "COMPUTERNAME": "DESKTOP-KD168PS", - "ComSpec": "C:\\WINDOWS\\system32\\cmd.exe", - "ConEmuANSI": "ON", - "ConEmuAnsiLog": "", - "ConEmuArgs": "/Icon \"D:\\APP\\cmder\\icons\\cmder.ico\" /Title Cmder /dir \"D:\\Project\\Web\\epmet-oper-gov\"", - "ConEmuArgs2": "", - "ConEmuBackHWND": "0x00020E34", - "ConEmuBaseDir": "D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu", - "ConEmuBaseDirShort": "D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu", - "ConEmuBuild": "210912", - "ConEmuCfgDir": "D:\\APP\\cmder\\vendor\\conemu-maximus5", - "ConEmuConfig": "", - "ConEmuDir": "D:\\APP\\cmder\\vendor\\conemu-maximus5", - "ConEmuDrawHWND": "0x00020E38", - "ConEmuDrive": "D:", - "ConEmuHooks": "Enabled", - "ConEmuHWND": "0x00390A98", - "ConEmuPalette": "Monokai", - "ConEmuPID": "24844", - "ConEmuServerPID": "14680", - "ConEmuTask": "{cmd::Cmder}", - "ConEmuWorkDir": "D:\\Project\\Web\\epmet-oper-gov", - "ConEmuWorkDrive": "D:", - "currenArgu": "/setpath", - "debug_output": "0", - "depth": "1", - "dp0": "D:\\Project\\Web\\epmet-oper-gov\\node_modules\\.bin\\", - "DriverData": "C:\\Windows\\System32\\Drivers\\DriverData", - "fast_init": "0", - "feFlagName": " ", - "feNot": "false", - "find_query": "D:\\\\APP\\\\cmder", - "found": "1", - "git_executable": "D:\\APP\\Git\\cmd\\git.exe", - "GIT_INSTALL_ROOT": "D:\\APP\\Git", - "git_locale": "\"D:\\APP\\Git\\usr\\bin\\locale.exe\"", - "GIT_VERSION_USER": "2.31.1.windows.1", - "HOME": "C:\\Users\\lenovo", - "HOMEDRIVE": "C:", - "HOMEPATH": "\\Users\\lenovo", - "INIT_CWD": "D:\\Project\\Web\\epmet-oper-gov", - "LANG": "zh_CN.UTF-8", - "lib_base": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_base.cmd\"", - "lib_console": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_console.cmd\"", - "lib_git": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_git.cmd\"", - "lib_path": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_path.cmd\"", - "lib_profile": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_profile.cmd\"", - "LINES": "24", - "LOCALAPPDATA": "C:\\Users\\lenovo\\AppData\\Local", - "LOGONSERVER": "\\\\DESKTOP-KD168PS", - "max_depth": "1", - "nix_tools": "1", - "NODE": "D:\\APP\\nodejs\\node.exe", - "NODE_ENV": "development", - "NODE_EXE": "D:\\APP\\nodejs\\\\node.exe", - "NPM_CLI_JS": "D:\\APP\\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\":[\"run\",\"dev\"],\"original\":[\"run\",\"dev\"]}", - "npm_config_audit": "true", - "npm_config_audit_level": "low", - "npm_config_auth_type": "legacy", - "npm_config_bin_links": "true", - "npm_config_browser": "", - "npm_config_ca": "", - "npm_config_cache": "C:\\Users\\lenovo\\AppData\\Roaming\\npm-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_git": "git", - "npm_config_git_tag_version": "true", - "npm_config_global": "", - "npm_config_globalconfig": "C:\\Users\\lenovo\\AppData\\Roaming\\npm\\etc\\npmrc", - "npm_config_globalignorefile": "C:\\Users\\lenovo\\AppData\\Roaming\\npm\\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\\lenovo\\.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": "https://registry.npmjs.org/", - "npm_config_node_gyp": "D:\\APP\\nodejs\\node_modules\\npm\\node_modules\\node-gyp\\bin\\node-gyp.js", - "npm_config_node_options": "", - "npm_config_node_version": "11.15.0", - "npm_config_noproxy": "", - "npm_config_offline": "", - "npm_config_onload_script": "", - "npm_config_only": "", - "npm_config_optional": "true", - "npm_config_otp": "", - "npm_config_package_lock": "true", - "npm_config_package_lock_only": "", - "npm_config_parseable": "", - "npm_config_prefer_offline": "", - "npm_config_prefer_online": "", - "npm_config_prefix": "C:\\Users\\lenovo\\AppData\\Roaming\\npm", - "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": "https://registry.npmjs.org/", - "npm_config_rollback": "true", - "npm_config_save": "true", - "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\\lenovo\\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\\lenovo\\.npmrc", - "npm_config_user_agent": "npm/6.7.0 node/v11.15.0 win32 x64", - "npm_config_version": "", - "npm_config_versions": "", - "npm_config_viewer": "browser", - "npm_execpath": "D:\\APP\\nodejs\\node_modules\\npm\\bin\\npm-cli.js", - "npm_lifecycle_event": "dev", - "npm_lifecycle_script": "vue-cli-service serve", - "npm_node_execpath": "D:\\APP\\nodejs\\node.exe", - "npm_package_browserslist_0": "> 1%", - "npm_package_browserslist_1": "last 2 versions", - "npm_package_browserslist_2=not ie <": " 10", - "npm_package_dependencies_async_validator": "^4.2.5", - "npm_package_dependencies_axios": "^0.19.0", - "npm_package_dependencies_babel_eslint": "^8.0.1", - "npm_package_dependencies_babel_plugin_component": "^1.1.1", - "npm_package_dependencies_echarts": "^5.2.2", - "npm_package_dependencies_echarts_gl": "^2.0.9", - "npm_package_dependencies_element_theme": "^2.0.1", - "npm_package_dependencies_element_ui": "^2.13.0", - "npm_package_dependencies_file_saver": "^2.0.5", - "npm_package_dependencies_gulp_autoprefixer": "^6.1.0", - "npm_package_dependencies_gulp_clean_css": "^4.2.0", - "npm_package_dependencies_gulp_load_plugins": "^2.0.0", - "npm_package_dependencies_gulp_rename": "^1.4.0", - "npm_package_dependencies_gulp_sass": "^4.0.2", - "npm_package_dependencies_jsencrypt": "^3.0.3", - "npm_package_dependencies_js_cookie": "^2.2.0", - "npm_package_dependencies_lodash": "^4.17.15", - "npm_package_dependencies_mint_ui": "^2.2.13", - "npm_package_dependencies_node_sass": "^4.12.0", - "npm_package_dependencies_ol": "^6.9.0", - "npm_package_dependencies_portfinder": "^1.0.21", - "npm_package_dependencies_qs": "^6.7.0", - "npm_package_dependencies_quill": "^1.3.6", - "npm_package_dependencies_sass_loader": "^7.1.0", - "npm_package_dependencies_screenfull": "^4.2.1", - "npm_package_dependencies_sortablejs": "^1.12.0", - "npm_package_dependencies_svg_sprite_loader": "^4.1.6", - "npm_package_dependencies_throttle_debounce": "^3.0.1", - "npm_package_dependencies_vue": "^2.6.11", - "npm_package_dependencies_vuex": "^3.1.1", - "npm_package_dependencies_vue_baidu_map": "^0.21.22", - "npm_package_dependencies_vue_i18n": "^8.12.0", - "npm_package_dependencies_vue_quill_editor": "^3.0.6", - "npm_package_dependencies_vue_router": "^3.0.7", - "npm_package_dependencies_v_distpicker": "^1.2.2", - "npm_package_dependencies_xlsx": "^0.17.1", - "npm_package_dependencies__antv_l7": "2.9.14", - "npm_package_dependencies__antv_l7_draw": "3.0.5", - "npm_package_dependencies__antv_l7_maps": "2.9.14", - "npm_package_dependencies__riophae_vue_treeselect": "^0.4.0", - "npm_package_dependencies__tinymce_tinymce_vue": "^3.2.8", - "npm_package_description": "## Project setup ``` npm install ```", - "npm_package_devDependencies_dai_js": "^0.0.12", - "npm_package_devDependencies_element_theme_chalk": "^2.13.0", - "npm_package_devDependencies_natives": "^1.1.6", - "npm_package_devDependencies_ol": "^6.9.0", - "npm_package_devDependencies_script_loader": "^0.7.2", - "npm_package_devDependencies_tinymce": "^5.8.2", - "npm_package_devDependencies_vue_template_compiler": "^2.6.11", - "npm_package_devDependencies__antv_f2": "^3.8.10-beta.1", - "npm_package_devDependencies__tinymce_tinymce_vue": "^3.2.8", - "npm_package_devDependencies__vue_cli_plugin_babel": "^3.10.0", - "npm_package_devDependencies__vue_cli_plugin_eslint": "^3.10.0", - "npm_package_devDependencies__vue_cli_service": "^3.10.0", - "npm_package_devDependencies__vue_eslint_config_standard": "^4.0.0", - "npm_package_element_theme_browsers_0": "> 1%", - "npm_package_element_theme_browsers_1": "last 2 versions", - "npm_package_element_theme_browsers_2=not ie <": " 10", - "npm_package_element_theme_config": "./src/element-ui/theme-variables.scss", - "npm_package_element_theme_minimize": "true", - "npm_package_element_theme_out": "./src/element-ui/theme", - "npm_package_engines_node=>": " 8.11.1", - "npm_package_engines_npm=>": " 5.6.0", - "npm_package_eslintConfig_env_node": "true", - "npm_package_eslintConfig_extends_0": "plugin:vue/essential", - "npm_package_eslintConfig_extends_1": "@vue/standard", - "npm_package_eslintConfig_parserOptions_parser": "babel-eslint", - "npm_package_eslintConfig_root": "true", - "npm_package_gitHead": "c3dee098d64cf40debbc5455d165b478a335f317", - "npm_package_name": "epmet-oper-web", - "npm_package_private": "true", - "npm_package_readmeFilename": "README.md", - "npm_package_scripts_build": "vue-cli-service build", - "npm_package_scripts_build_prod": "vue-cli-service build --mode production", - "npm_package_scripts_build_shibei_prod": "vue-cli-service build --mode shibei_production", - "npm_package_scripts_build_sit": "vue-cli-service build --mode production.sit", - "npm_package_scripts_build_uat": "vue-cli-service build --mode production.uat", - "npm_package_scripts_dev": "vue-cli-service serve", - "npm_package_scripts_et": "et", - "npm_package_scripts_et_init": "et -i", - "npm_package_scripts_et_list": "gulp themes", - "npm_package_scripts_lint": "vue-cli-service lint", - "npm_package_scripts_serve": "vue-cli-service serve", - "npm_package_version": "2.0.0", - "NPM_PREFIX_NPM_CLI_JS": "C:\\Users\\lenovo\\AppData\\Roaming\\npm\\node_modules\\npm\\bin\\npm-cli.js", - "NUMBER_OF_PROCESSORS": "8", - "OLD_PATH": "D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu\\Scripts;D:\\APP\\cmder\\vendor\\conemu-maximus5;D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;D:\\APP\\cmder;D:\\APP\\Git\\cmd;D:\\APP\\微信web开发者工具\\dll;D:\\APP\\nodejs\\;D:\\APP\\python\\Scripts\\;D:\\APP\\python\\;C:\\Users\\lenovo\\AppData\\Local\\Microsoft\\WindowsApps;D:\\APP\\Microsoft VS Code\\bin;C:\\Users\\lenovo\\AppData\\Roaming\\npm;D:\\APP\\Git\\mingw64\\bin;D:\\APP\\Git\\usr\\bin;D:\\APP\\cmder\\vendor\\bin", - "OneDrive": "C:\\Users\\lenovo\\OneDrive", - "OS": "Windows_NT", - "Path": "D:\\APP\\nodejs\\node_modules\\npm\\node_modules\\npm-lifecycle\\node-gyp-bin;D:\\Project\\Web\\epmet-oper-gov\\node_modules\\.bin;D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu\\Scripts;D:\\APP\\cmder\\vendor\\conemu-maximus5;D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;D:\\APP\\cmder;D:\\APP\\Git\\cmd;D:\\APP\\微信web开发者工具\\dll;D:\\APP\\nodejs\\;D:\\APP\\python\\Scripts\\;D:\\APP\\python\\;C:\\Users\\lenovo\\AppData\\Local\\Microsoft\\WindowsApps;D:\\APP\\Microsoft VS Code\\bin;C:\\Users\\lenovo\\AppData\\Roaming\\npm;D:\\APP\\Git\\mingw64\\bin;D:\\APP\\Git\\usr\\bin;D:\\APP\\cmder\\vendor\\bin", - "PATHEXT": ".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JSE;.WSF;.WSH;.MSC", - "path_position": "append", - "PLINK_PROTOCOL": "ssh", - "position": "append", - "print_debug": "if 0 gtr 0 call \"D:\\APP\\cmder\\vendor\\lib\\lib_console.cmd\" debug_output", - "print_error": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_console.cmd\" show_error", - "print_verbose": "if 0 gtr 0 call \"D:\\APP\\cmder\\vendor\\lib\\lib_console.cmd\" verbose_output", - "PROCESSOR_ARCHITECTURE": "AMD64", - "PROCESSOR_IDENTIFIER": "Intel64 Family 6 Model 142 Stepping 12, GenuineIntel", - "PROCESSOR_LEVEL": "6", - "PROCESSOR_REVISION": "8e0c", - "ProgramData": "C:\\ProgramData", - "ProgramFiles": "C:\\Program Files", - "ProgramFiles(x86)": "C:\\Program Files (x86)", - "ProgramW6432": "C:\\Program Files", - "PROMPT": "C\bL\bI\bN\bK\b \b$P$G", - "PSModulePath": "C:\\Program Files\\WindowsPowerShell\\Modules;C:\\WINDOWS\\system32\\WindowsPowerShell\\v1.0\\Modules", - "PUBLIC": "C:\\Users\\Public", - "SESSIONNAME": "Console", - "SVN_SSH": "D:\\\\APP\\\\Git\\\\bin\\\\ssh.exe", - "SystemDrive": "C:", - "SystemRoot": "C:\\WINDOWS", - "TEMP": "C:\\Users\\lenovo\\AppData\\Local\\Temp", - "TERM": "cygwin", - "time_init": "0", - "TMP": "C:\\Users\\lenovo\\AppData\\Local\\Temp", - "USERDOMAIN": "DESKTOP-KD168PS", - "USERDOMAIN_ROAMINGPROFILE": "DESKTOP-KD168PS", - "USERNAME": "lenovo", - "USERPROFILE": "C:\\Users\\lenovo", - "user_aliases": "D:\\APP\\cmder\\config\\user_aliases.cmd", - "USER_BUILD": "windows.1", - "USER_MAJOR": "2", - "USER_MINOR": "31", - "USER_PATCH": "1", - "verbose_output": "0", - "VUE_APP_API_SERVER": "http://192.168.1.140/api", - "VUE_APP_NODE_ENV": "dev", - "VUE_APP_PUBLIC_PATH": "epmet-oper", - "VUE_CLI_ENTRY_FILES": "[\"D:\\\\Project\\\\Web\\\\epmet-oper-gov\\\\src\\\\main.js\"]", - "WEBPACK_DEV_SERVER": "true", - "windir": "C:\\WINDOWS", - "ZES_ENABLE_SYSMAN": "1", - "_prog": "node" - }, - "sharedObjects": [ - "D:\\APP\\nodejs\\node.exe", - "C:\\WINDOWS\\SYSTEM32\\ntdll.dll", - "C:\\WINDOWS\\System32\\KERNEL32.DLL", - "C:\\WINDOWS\\System32\\KERNELBASE.dll", - "C:\\WINDOWS\\System32\\PSAPI.DLL", - "C:\\WINDOWS\\System32\\WS2_32.dll", - "C:\\WINDOWS\\System32\\RPCRT4.dll", - "C:\\WINDOWS\\System32\\ADVAPI32.dll", - "C:\\WINDOWS\\System32\\msvcrt.dll", - "C:\\WINDOWS\\System32\\sechost.dll", - "C:\\WINDOWS\\System32\\USER32.dll", - "C:\\WINDOWS\\System32\\win32u.dll", - "C:\\WINDOWS\\System32\\GDI32.dll", - "C:\\WINDOWS\\System32\\gdi32full.dll", - "C:\\WINDOWS\\SYSTEM32\\dbghelp.dll", - "C:\\WINDOWS\\System32\\msvcp_win.dll", - "C:\\WINDOWS\\System32\\ucrtbase.dll", - "C:\\WINDOWS\\System32\\combase.dll", - "C:\\WINDOWS\\System32\\CRYPT32.dll", - "C:\\WINDOWS\\System32\\OLEAUT32.dll", - "C:\\WINDOWS\\SYSTEM32\\IPHLPAPI.DLL", - "C:\\WINDOWS\\SYSTEM32\\bcrypt.dll", - "C:\\WINDOWS\\SYSTEM32\\USERENV.dll", - "C:\\WINDOWS\\SYSTEM32\\WINMM.dll", - "C:\\WINDOWS\\System32\\IMM32.DLL", - "D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu\\ConEmuHk64.dll", - "C:\\WINDOWS\\SYSTEM32\\powrprof.dll", - "C:\\WINDOWS\\SYSTEM32\\UMPDC.dll", - "C:\\WINDOWS\\system32\\uxtheme.dll", - "C:\\WINDOWS\\system32\\mswsock.dll", - "C:\\WINDOWS\\SYSTEM32\\kernel.appcore.dll", - "C:\\WINDOWS\\System32\\bcryptprimitives.dll", - "C:\\WINDOWS\\system32\\napinsp.dll", - "C:\\WINDOWS\\system32\\pnrpnsp.dll", - "C:\\WINDOWS\\SYSTEM32\\DNSAPI.dll", - "C:\\WINDOWS\\System32\\NSI.dll", - "C:\\WINDOWS\\System32\\winrnr.dll", - "C:\\WINDOWS\\system32\\wshbth.dll", - "C:\\WINDOWS\\system32\\nlansp_c.dll", - "C:\\WINDOWS\\SYSTEM32\\dhcpcsvc6.DLL", - "C:\\WINDOWS\\SYSTEM32\\dhcpcsvc.DLL", - "C:\\WINDOWS\\SYSTEM32\\CRYPTBASE.DLL", - "\\\\?\\D:\\Project\\Web\\epmet-oper-gov\\node_modules\\_node-sass@4.14.1@node-sass\\vendor\\win32-x64-67\\binding.node" - ] -} \ No newline at end of file diff --git a/src/assets/img/yantai/index/bg.png b/src/assets/img/yantai/index/bg.png deleted file mode 100644 index 82f6f5d03..000000000 Binary files a/src/assets/img/yantai/index/bg.png and /dev/null differ diff --git a/src/assets/img/yantai/index/db.png b/src/assets/img/yantai/index/db.png deleted file mode 100644 index 679fd8724..000000000 Binary files a/src/assets/img/yantai/index/db.png and /dev/null differ diff --git a/src/assets/img/yantai/index/guanli.png b/src/assets/img/yantai/index/guanli.png deleted file mode 100644 index c596ecf24..000000000 Binary files a/src/assets/img/yantai/index/guanli.png and /dev/null differ diff --git a/src/assets/img/yantai/index/shuju.png b/src/assets/img/yantai/index/shuju.png deleted file mode 100644 index c57b52e0c..000000000 Binary files a/src/assets/img/yantai/index/shuju.png and /dev/null differ diff --git a/src/assets/img/yantai/index/you.png b/src/assets/img/yantai/index/you.png deleted file mode 100644 index 7eb7242ce..000000000 Binary files a/src/assets/img/yantai/index/you.png and /dev/null differ diff --git a/src/assets/img/yantai/index/yuanhu-you.png b/src/assets/img/yantai/index/yuanhu-you.png deleted file mode 100644 index 7ba616c01..000000000 Binary files a/src/assets/img/yantai/index/yuanhu-you.png and /dev/null differ diff --git a/src/assets/img/yantai/index/yuanhu-zuo.png b/src/assets/img/yantai/index/yuanhu-zuo.png deleted file mode 100644 index f32150814..000000000 Binary files a/src/assets/img/yantai/index/yuanhu-zuo.png and /dev/null differ diff --git a/src/assets/img/yantai/index/zuo.png b/src/assets/img/yantai/index/zuo.png deleted file mode 100644 index 8a9b1952a..000000000 Binary files a/src/assets/img/yantai/index/zuo.png and /dev/null differ diff --git a/src/assets/img/yantai/login/bg.jpg b/src/assets/img/yantai/login/bg.jpg deleted file mode 100644 index 99e746c23..000000000 Binary files a/src/assets/img/yantai/login/bg.jpg and /dev/null differ diff --git a/src/assets/img/yantai/login/bg.png b/src/assets/img/yantai/login/bg.png deleted file mode 100644 index b66d4a657..000000000 Binary files a/src/assets/img/yantai/login/bg.png and /dev/null differ diff --git a/src/assets/scss/modules/visual/shijianchulifenxi.scss b/src/assets/scss/modules/visual/shijianchulifenxi.scss index 04bb0330e..79dfe912c 100644 --- a/src/assets/scss/modules/visual/shijianchulifenxi.scss +++ b/src/assets/scss/modules/visual/shijianchulifenxi.scss @@ -22,7 +22,6 @@ } .l_bottom { height: calc(988px - 200px - 365px); - max-height: 450px; margin-top: 0; } } diff --git a/src/assets/scss/pages/yantai-index.scss b/src/assets/scss/pages/yantai-index.scss deleted file mode 100644 index d72f4162d..000000000 --- a/src/assets/scss/pages/yantai-index.scss +++ /dev/null @@ -1,185 +0,0 @@ -@import "~@/assets/scss/c/config.scss"; -@import "~@/assets/scss/c/function.scss"; - -.g-cnt { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - background-image: url(~@/assets/img/yantai/index/bg.png); - background-size: cover; - background-position: center; -} - -.m-top { - position: absolute; - top: 0; - width: 1920px; - left: -1000px; - right: -1000px; - margin: 0 auto; - - .name { - position: absolute; - top: 0; - left: 0; - text-align: center; - width: 100%; - line-height: 90px; - font-size: 42px; - font-weight: bold; - color: #fff; - background-image: -webkit-linear-gradient(bottom, rgb(23, 222, 238), rgb(23, 222, 238), #fff, #fff); - background-clip: text; - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - } -} - -.m-list { - position: absolute; - top: 50%; - left: 0; - right: 0; - margin: auto; - transform: translateY(-50%); - - .list { - display: flex; - justify-content: space-around; - align-items: center; - width: 100%; - margin: 0 auto; - - .menu { - position: relative; - - .menu-list { - position: absolute; - top: 50px; - width: 100%; - left: 0; - - .menu-item { - position: relative; - margin-bottom: 40px; - width: 150px; - height: 70px; - line-height: 70px; - color: rgba(#fff, 0.6); - font-size: 20px; - border-radius: 60px; - text-align: center; - transition: all 0.2s ease; - cursor: pointer; - - &.z-zuo { - left: 60px; - background: linear-gradient(to left, rgba(rgb(67, 67, 210), 0.3), rgba(#00a, 0)); - box-shadow: -4px 4px 6px 0 inset rgba(#fff, 0.2); - &:nth-child(2), - &:nth-child(6) { - margin-left: 20px; - } - &:nth-child(3), - &:nth-child(5) { - margin-left: 20px * 2; - } - &:nth-child(4) { - margin-left: 20px * 2 + 1px; - } - } - - &.z-you { - left: 70px; - background: linear-gradient(to right, rgba(rgb(67, 67, 210), 0.3), rgba(#00a, 0)); - box-shadow: 4px 4px 6px 0 inset rgba(#fff, 0.2); - - &:nth-child(2), - &:nth-child(6) { - margin-left: -20px; - } - &:nth-child(3), - &:nth-child(5) { - margin-left: -20px * 2; - } - &:nth-child(4) { - margin-left: -20px * 2 - 1px; - } - } - - &:hover, - &.z-on { - transform: scale(1.15); - color: rgba(#fff, 0.95); - } - } - } - } - - .arrow { - width: 60px; - margin: 0 20px; - } - - .item { - position: relative; - margin: 0 50px; - width: 420px; - - .item-wrap { - text-align: center; - cursor: pointer; - transition: all 0.2s ease; - &:hover { - transform: scale(1.1); - } - } - - &.z-on { - .name { - color: #ffffff; - background-color: transparent; - border-color: #ffffff; - &::before { - background-color: #ffffff; - } - } - } - .logo { - width: 100%; - } - .name { - position: absolute; - top: 12%; - left: 0; - width: 100%; - font-size: 36px; - line-height: 40px; - color: #fff; - } - } - } -} - -.m-footer { - position: absolute; - bottom: 0; - left: 0; - right: 0; - padding: 20px; - color: rgba(255, 255, 255, 0.6); - text-align: center; - p { - margin: 10px 0; - } - a { - padding: 0 5px; - color: rgba(255, 255, 255, 0.6); - &:focus, - &:hover { - color: #fff; - } - } -} diff --git a/src/assets/scss/pages/yantai-login.scss b/src/assets/scss/pages/yantai-login.scss deleted file mode 100644 index beb4978f9..000000000 --- a/src/assets/scss/pages/yantai-login.scss +++ /dev/null @@ -1,210 +0,0 @@ -@import "~@/assets/scss/c/config.scss"; -@import "~@/assets/scss/c/function.scss"; - -.g-bd { - &::before, - &::after { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: -1; - content: ""; - } - &::before { - background-image: url(~@/assets/img/yantai/login/bg.jpg); - background-size: cover; - } - &::after { - // background-color: rgba(38, 50, 56, 0.1); - } -} - -.m-snow-box { - position: absolute; - top: 20vh; - width: 35vw; - height: 50vh; - left: 13vw; - border-radius: 40%; - // overflow: hidden; -} - -.m-fm { - position: absolute; - top: 0; - bottom: 0; - right: 13%; - margin: auto; - width: 484px; - height: 429px; - background: rgba(#fff, 1); - box-shadow: 0px 0px 20px 2px rgba(150, 150, 200, 0.6); - border-radius: 12px 12px 12px 12px; - - &:hover { - opacity: 1; - background: rgba(#fff, 1); - } - - .wrap { - padding-top: 5px; - - .title { - margin: 0 auto; - width: 400px; - line-height: 80px; - border-bottom: 1px solid #d4d4d4; - font-size: 34px; - font-family: PingFang SC; - font-weight: bold; - color: #000000; - text-align: center; - } - .fm { - padding: 15px 30px; - - .fm-item { - box-sizing: border-box; - margin: 0 auto; - margin-top: 16px; - width: 400px; - height: 46px; - line-height: 46px; - border: 1px solid #c6c6c6; - border-radius: 4px; - display: flex; - align-items: center; - - .input { - width: 85%; - - input { - display: block; - padding-left: 15px; - line-height: 44px; - height: 44px; - width: 100%; - border: none; - } - } - - .ico { - position: relative; - width: 35px; - height: 46px; - - img { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - margin: auto; - } - } - } - - .fm-captcha { - box-sizing: border-box; - margin: 0 auto; - margin-top: 16px; - width: 400px; - display: flex; - align-items: center; - - .fm-item { - margin: 0; - width: 200px; - } - - .captcha { - position: relative; - margin-left: auto; - width: 180px; - height: 46px; - - img { - display: block; - width: 100%; - height: 100%; - background-color: #eee; - border: none; - } - } - } - - .fm-btn { - box-sizing: border-box; - margin: 0 auto; - margin-top: 40px; - width: 400px; - height: 56px; - line-height: 56px; - background: linear-gradient(90deg, #1a5afd, #26c4ff); - border-radius: 4px; - font-size: 23px; - font-family: PingFang SC; - font-weight: 500; - color: #ffffff; - text-align: center; - cursor: pointer; - } - } - .hint { - display: none; - padding-left: 40px; - color: rgb(255, 80, 80); - } - } -} - -.m-footer { - position: absolute; - bottom: 0; - left: 0; - right: 0; - padding: 20px; - color: rgba(255, 255, 255, 0.6); - text-align: center; - p { - margin: 10px 0; - } - a { - padding: 0 5px; - color: rgba(255, 255, 255, 0.6); - &:focus, - &:hover { - color: #fff; - } - } -} - -.m-pop { - height: auto; - - .div_row { - height: 50px; - text-align: center; - line-height: 50px; - - &:hover { - color: rgb(2, 119, 173); - font-weight: bold; - text-decoration: underline; - } - - .i_icon { - width: 15px; - height: 15px; - margin-right: 10px; - float: left; - } - .span_name { - font-size: 18px; - cursor: pointer; - /* color: rgb(37, 156, 235); */ - } - } -} diff --git a/src/assets/scss/people-info.scss b/src/assets/scss/people-info.scss index 5aeac2e12..b0aca9ec0 100644 --- a/src/assets/scss/people-info.scss +++ b/src/assets/scss/people-info.scss @@ -20,7 +20,6 @@ width: 1180px; overflow-y: auto; overflow-x: hidden; - position: relative; } .title { @@ -41,12 +40,6 @@ } } - .div_tuomin{ - position: absolute; - top:25px; - right:40px; - } - .btn-close { position: absolute; z-index: 2; diff --git a/src/router/index.js b/src/router/index.js index 32e11d48f..eca051a0d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -27,11 +27,7 @@ export const pageRoutes = [ }, { path: "/login", - component: () => { - return CUSTOMER == "yantai" - ? import("@/views/pages/yantai-login") - : import("@/views/pages/login"); - }, + component: () => import("@/views/pages/login"), name: "login", meta: { title: "登录", @@ -40,11 +36,7 @@ export const pageRoutes = [ { path: "/", name: "index", - component: () => { - return CUSTOMER == "yantai" - ? import("@/views/pages/yantai-index") - : import("@/views/pages/index"); - }, + component: () => import("@/views/pages/index"), }, { path: "/indexWork", @@ -184,10 +176,7 @@ export const moduleShujuRoutes = { component: () => import("@/views/main-shuju/main"), name: "main-shuju", redirect: { - path: - CUSTOMER == "yantai" && process.env.VUE_APP_NODE_ENV == "prod" - ? "/main-shuju/i-1536625421829599234" - : "/main-shuju/visual-basicinfo-basicInfoMain", + path:"/main-shuju/visual-basicinfo-basicInfoMain", }, meta: { title: "主入口布局", diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index abcd89837..075118bfe 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -8,10 +8,10 @@

{{ - $store.state.user.agencyName + customerName }} {{ - $store.state.user.agencyName .slice(0, 2) + customerName.slice(0, 2) }}

diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue index 94e303e02..2672b6952 100644 --- a/src/views/main-shuju/main-navbar.vue +++ b/src/views/main-shuju/main-navbar.vue @@ -3,9 +3,9 @@