diff --git a/report.20230426.090430.1984.0.001.json b/report.20230426.090430.1984.0.001.json
new file mode 100644
index 0000000..4ba0a9b
--- /dev/null
+++ b/report.20230426.090430.1984.0.001.json
@@ -0,0 +1,509 @@
+
+{
+  "header": {
+    "event": "Allocation failed - JavaScript heap out of memory",
+    "trigger": "FatalError",
+    "filename": "report.20230426.090430.1984.0.001.json",
+    "dumpEventTime": "2023-04-26T09:04:30Z",
+    "processId": 1984,
+    "cwd": "D:\\Project\\Web\\epmet-cloud-lingshan-integration",
+    "commandLine": [
+      "node",
+      "D:\\Project\\Web\\epmet-cloud-lingshan-integration\\node_modules\\.bin\\\\..\\_@vue_cli-service@3.10.0@@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": "0x00007ff6c60dd24e",
+      "symbol": "std::basic_ios<char,std::char_traits<char> >::fill+16366"
+    },
+    {
+      "pc": "0x00007ff6c60dc0f9",
+      "symbol": "std::basic_ios<char,std::char_traits<char> >::fill+11929"
+    },
+    {
+      "pc": "0x00007ff6c60db923",
+      "symbol": "std::basic_ios<char,std::char_traits<char> >::fill+9923"
+    },
+    {
+      "pc": "0x00007ff6c61cdc22",
+      "symbol": "uv_loop_fork+89362"
+    },
+    {
+      "pc": "0x00007ff6c65f609e",
+      "symbol": "v8::internal::FatalProcessOutOfMemory+798"
+    },
+    {
+      "pc": "0x00007ff6c65f5fd7",
+      "symbol": "v8::internal::FatalProcessOutOfMemory+599"
+    },
+    {
+      "pc": "0x00007ff6c66a9a14",
+      "symbol": "v8::internal::Heap::RootIsImmortalImmovable+14068"
+    },
+    {
+      "pc": "0x00007ff6c669f822",
+      "symbol": "v8::internal::Heap::CollectGarbage+7234"
+    },
+    {
+      "pc": "0x00007ff6c669e038",
+      "symbol": "v8::internal::Heap::CollectGarbage+1112"
+    },
+    {
+      "pc": "0x00007ff6c66a7967",
+      "symbol": "v8::internal::Heap::RootIsImmortalImmovable+5703"
+    },
+    {
+      "pc": "0x00007ff6c66a79e6",
+      "symbol": "v8::internal::Heap::RootIsImmortalImmovable+5830"
+    },
+    {
+      "pc": "0x00007ff6c67df8b1",
+      "symbol": "v8::internal::Factory::NewFillerObject+49"
+    },
+    {
+      "pc": "0x00007ff6c6899786",
+      "symbol": "v8::internal::StoreBuffer::StoreBufferOverflow+27190"
+    },
+    {
+      "pc": "0x000003c014850481",
+      "symbol": ""
+    }
+  ],
+  "javascriptHeap": {
+    "totalMemory": 1482977280,
+    "totalCommittedMemory": 1482977280,
+    "usedMemory": 1335990304,
+    "availableMemory": 43634208,
+    "memoryLimit": 1526909922,
+    "heapSpaces": {
+      "read_only_space": {
+        "memorySize": 524288,
+        "committedMemory": 524288,
+        "capacity": 515584,
+        "used": 33520,
+        "available": 482064
+      },
+      "new_space": {
+        "memorySize": 2097152,
+        "committedMemory": 2097152,
+        "capacity": 1031168,
+        "used": 281424,
+        "available": 749744
+      },
+      "old_space": {
+        "memorySize": 1297289216,
+        "committedMemory": 1297289216,
+        "capacity": 1179969632,
+        "used": 1179825152,
+        "available": 144480
+      },
+      "code_space": {
+        "memorySize": 9437184,
+        "committedMemory": 9437184,
+        "capacity": 7549376,
+        "used": 7549376,
+        "available": 0
+      },
+      "map_space": {
+        "memorySize": 29896704,
+        "committedMemory": 29896704,
+        "capacity": 6416880,
+        "used": 6416880,
+        "available": 0
+      },
+      "large_object_space": {
+        "memorySize": 143732736,
+        "committedMemory": 143732736,
+        "capacity": 184141872,
+        "used": 141883952,
+        "available": 42257920
+      },
+      "new_large_object_space": {
+        "memorySize": 0,
+        "committedMemory": 0,
+        "capacity": 0,
+        "used": 0,
+        "available": 0
+      }
+    }
+  },
+  "resourceUsage": {
+    "userCpuSeconds": 8180.31,
+    "kernelCpuSeconds": 396.093,
+    "cpuConsumptionPercent": 0.828521,
+    "maxRss": 1836003328,
+    "pageFaults": {
+      "IORequired": 178853511,
+      "IONotRequired": 0
+    },
+    "fsActivity": {
+      "reads": 133094,
+      "writes": 1680
+    }
+  },
+  "libuv": [
+  ],
+  "environmentVariables": {
+    "=C:": "C:\\",
+    "=D:": "D:\\Project\\Web\\epmet-cloud-lingshan-integration",
+    "ALLUSERSPROFILE": "C:\\ProgramData",
+    "APPDATA": "C:\\Users\\lenovo\\AppData\\Roaming",
+    "BABEL_ENV": "development",
+    "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",
+    "dp0": "D:\\Project\\Web\\epmet-cloud-lingshan-integration\\node_modules\\.bin\\",
+    "DriverData": "C:\\Windows\\System32\\Drivers\\DriverData",
+    "HOME": "C:\\Users\\lenovo",
+    "HOMEDRIVE": "C:",
+    "HOMEPATH": "\\Users\\lenovo",
+    "INIT_CWD": "D:\\Project\\Web\\epmet-cloud-lingshan-integration",
+    "LOCALAPPDATA": "C:\\Users\\lenovo\\AppData\\Local",
+    "LOGONSERVER": "\\\\DESKTOP-KD168PS",
+    "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": "D:\\APP\\Nodejs\\etc\\npmrc",
+    "npm_config_globalignorefile": "D:\\APP\\Nodejs\\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\\nvm\\v11.15.0\\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": "D:\\APP\\Nodejs",
+    "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\\nvm\\v11.15.0\\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.2",
+    "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_proj4": "2.8.0",
+    "npm_package_dependencies_qs": "6.7.0",
+    "npm_package_dependencies_quill": "1.3.6",
+    "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_sass_loader": "7.3.1",
+    "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": "f653d3c867bd828f8d7da420c8baf74d10941134",
+    "npm_package_name": "lingshan-oper",
+    "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": "1.0.0",
+    "NPM_PREFIX_NPM_CLI_JS": "D:\\APP\\Nodejs\\node_modules\\npm\\bin\\npm-cli.js",
+    "NUMBER_OF_PROCESSORS": "8",
+    "NVM_HOME": "D:\\APP\\nvm",
+    "NVM_SYMLINK": "D:\\APP\\Nodejs",
+    "OneDrive": "C:\\Users\\lenovo\\OneDrive",
+    "OS": "Windows_NT",
+    "Path": "D:\\APP\\nvm\\v11.15.0\\node_modules\\npm\\node_modules\\npm-lifecycle\\node-gyp-bin;D:\\Project\\Web\\epmet-cloud-lingshan-integration\\node_modules\\.bin;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;%NVM_HOME%;%NVM_SYMLINK%;C:\\Program Files\\PowerShell\\7\\;D:\\APP\\python\\Scripts\\;D:\\APP\\python\\;C:\\Users\\lenovo\\AppData\\Local\\Microsoft\\WindowsApps;D:\\APP\\Microsoft VS Code\\bin;D:\\APP\\nvm;D:\\APP\\Nodejs;D:\\APP\\SHH",
+    "PATHEXT": ".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JSE;.WSF;.WSH;.MSC;.CPL",
+    "POWERSHELL_DISTRIBUTION_CHANNEL": "MSI:Windows 10 Home China",
+    "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": "$P$G",
+    "PSModulePath": "C:\\Users\\lenovo\\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\\lenovo\\AppData\\Local\\Temp",
+    "TMP": "C:\\Users\\lenovo\\AppData\\Local\\Temp",
+    "USERDOMAIN": "DESKTOP-KD168PS",
+    "USERDOMAIN_ROAMINGPROFILE": "DESKTOP-KD168PS",
+    "USERNAME": "lenovo",
+    "USERPROFILE": "C:\\Users\\lenovo",
+    "VUE_APP_API_SERVER": "http://localhost:7099/api",
+    "VUE_APP_NODE_ENV": "dev",
+    "VUE_APP_PUBLIC_PATH": "lingshan-oper",
+    "VUE_CLI_ENTRY_FILES": "[\"D:\\\\Project\\\\Web\\\\epmet-cloud-lingshan-integration\\\\src\\\\main.js\"]",
+    "WEBPACK_DEV_SERVER": "true",
+    "windir": "C:\\WINDOWS",
+    "WSLENV": "WT_SESSION::WT_PROFILE_ID",
+    "WT_PROFILE_ID": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+    "WT_SESSION": "d9c7e1a5-e00a-451a-990e-feb4f63fdf55",
+    "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\\dbghelp.dll",
+    "C:\\WINDOWS\\System32\\gdi32full.dll",
+    "C:\\WINDOWS\\System32\\ucrtbase.dll",
+    "C:\\WINDOWS\\System32\\msvcp_win.dll",
+    "C:\\WINDOWS\\System32\\combase.dll",
+    "C:\\WINDOWS\\System32\\CRYPT32.dll",
+    "C:\\WINDOWS\\System32\\OLEAUT32.dll",
+    "C:\\WINDOWS\\SYSTEM32\\USERENV.dll",
+    "C:\\WINDOWS\\SYSTEM32\\IPHLPAPI.DLL",
+    "C:\\WINDOWS\\SYSTEM32\\bcrypt.dll",
+    "C:\\WINDOWS\\SYSTEM32\\WINMM.dll",
+    "C:\\WINDOWS\\System32\\IMM32.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-cloud-lingshan-integration\\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/views/modules/communityParty/article/drafts.vue b/src/views/modules/communityParty/article/drafts.vue
index a3b63a7..6fad761 100644
--- a/src/views/modules/communityParty/article/drafts.vue
+++ b/src/views/modules/communityParty/article/drafts.vue
@@ -299,6 +299,37 @@ export default {
             },
           ],
         },
+				{
+					// 需要转换一下，后端给的参数不适用
+					field: "附件",
+					keyName: "fileList2",
+					type: "upload",
+					limit: 3,
+					listType: "file",
+					editDisabled: true,
+					rules: [],
+					value: () => [],
+					uploadUrl:
+						window.SITE_CONFIG["apiURL"] +
+						"/oss/file/article/upload",
+					supKeys: ["fileListArr2", "fileListItem2"],
+					supValues: [() => [], ""],
+					beforeImgUpload(file, item, that) {
+						console.log(file);
+						const isLt1M = file.size / 1024 / 1024 < 10;
+						const srcType = file.type.toLowerCase();
+
+						if (!isLt1M) {
+							that.$message.error("上传文件大小不能超过 10MB!");
+							return false;
+						}
+						if (srcType.indexOf("pdf") == -1) {
+							that.$message.error("仅限pdf格式");
+							return false;
+						}
+						return true;
+					},
+				},
         {
           field: "置顶",
           keyName: "isTop",
@@ -343,6 +374,13 @@ export default {
             ];
             data.imgUrlArr = [data.imgUrl];
           }
+					data.fileList2 = (data.fileList || []).map((item) => ({
+						url: item.content,
+						name: item.fileName,
+						size: 0,
+						type: item.content.split(".").pop(),
+						format: item.content.split(".").pop(),
+					}));
 
           return data;
         },
@@ -352,6 +390,11 @@ export default {
             that.$message.error("请上传封面图片");
             return false;
           }
+          fmData.fileList = (fmData.fileList2 || []).map((item) => ({
+						content: item.url,
+						fileName: item.name,
+						contentType: "file",
+					}));
           return true;
         },
       },
diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue
index 5d2d6b0..896a926 100644
--- a/src/views/modules/communityParty/article/index.vue
+++ b/src/views/modules/communityParty/article/index.vue
@@ -1,146 +1,151 @@
 <template>
-  <div>
-    <base-page
-      ref="basePage"
-      :searchParams="searchParams"
-      :tableParams="tableParams"
-      :tableUrl="tableUrl"
-      :addUrl="addUrl"
-      :editUrl="editUrl"
-      :delUrl="delUrl"
-      :editAuth="editAuth"
-      :delAuth="delAuth"
-      :infoUrl="infoUrl"
-      :exportUrl="exportUrl"
-      :importUrl="importUrl"
-      :mubanUrl="mubanUrl"
-      :editParams="editParams"
-      :editFixedParams="editFixedParams"
-      :editElseRules="editElseRules"
-      :editConfig="editConfig"
-      :editParamsDiv="5"
-      :editBtnName="(item) => '修改'"
-      :formBtnFixed="true"
-      idName="articleId"
-    >
-      <template v-slot:editOperateSup="{ id, formType, info }">
-        <el-button
-          v-if="formType == 'add'"
-          type="warning"
-          size="small"
-          :disabled="draftBtnDisable"
-          @click="handleClickDraft(info)"
-          >存草稿</el-button
-        >
-      </template>
-
-      <template v-slot:listBtnSup="{ item }">
-        <el-button
-          v-if="
-            item.statusFlag == 'published' &&
-            item.agencyId == $store.state.user.agencyId
-          "
-          @click="handleOfflineShow(item)"
-          type="text"
-          size="small"
-          style="color: #666"
-          >下线</el-button
-        >
-      </template>
-
-      <template v-slot:listBtnbefore="{ item }">
-        <el-button
-          v-if="item.isTop == '1'"
-          v-show="item.statusFlag == 'published'"
-          @click="handleCancleTopArticle(item, 'cancel_top')"
-          type="text"
-          size="small"
-          style="color: #fe6252"
-          >取消置顶</el-button
-        >
-        <el-button
-          v-show="item.statusFlag == 'published'"
-          v-else
-          @click="handleTopArticle(item, 'top')"
-          type="text"
-          size="small"
-          style="color: #22c1c3"
-          >置顶</el-button
-        >
-      </template>
-    </base-page>
-
-    <el-dialog
-      :visible.sync="offlineShowed"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      title="下线"
-      width="850px"
-      top="5vh"
-      class="dialog-h"
-      @closed="offlineShowed = false"
-    >
-      <offline
-        ref="offlineForm"
-        @close="offlineShowed = false"
-        @afterOffline="handleOfflineSuccess"
-      ></offline>
-    </el-dialog>
-    <el-dialog
-      :visible.sync="showAddImage"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      title="上传封面图片"
-      width="650px"
-      top="5vh"
-      class="dialog-h"
-      @closed="showAddImage = false"
-    >
-      <div class="dialog-h-content scroll-h">
-        <!-- <span>请先上 传封面图片</span> -->
-        <el-form
-          ref="ref_form"
-          :inline="true"
-          :model="formData"
-          class="div_form"
-        >
-          <div class="form_flex">
-            <div class="form_item">
-              <el-form-item
-                label=""
-                prop="selImgUrl"
-                label-width="150px"
-                style="display: block"
-              >
-                <el-upload
-                  :headers="$getElUploadHeaders()"
-                  :class="['avatar-uploader', { hide: hideUploadBtn }]"
-                  ref="uploadPic"
-                  :action="uploadUlr"
-                  list-type="picture-card"
-                  :on-exceed="exceedPic"
-                  :before-upload="beforeAvatarUpload"
-                  :on-remove="removePic"
-                  :file-list="replayImgList"
-                  :on-change="handleEditChange"
-                  :on-success="handleSuccess"
-                  :limit="1"
-                >
-                  <span class="font-14">选择图片</span>
-                </el-upload>
-              </el-form-item>
-            </div>
-          </div>
-        </el-form>
-      </div>
-      <div class="div_btn">
-        <el-button size="small" @click="showAddImage = false">取 消</el-button>
-        <el-button size="small" type="primary" @click="handleAddImage"
-          >确 定</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
+	<div>
+		<base-page
+			ref="basePage"
+			:searchParams="searchParams"
+			:tableParams="tableParams"
+			:tableUrl="tableUrl"
+			:addUrl="addUrl"
+			:editUrl="editUrl"
+			:delUrl="delUrl"
+			:editAuth="editAuth"
+			:delAuth="delAuth"
+			:infoUrl="infoUrl"
+			:exportUrl="exportUrl"
+			:importUrl="importUrl"
+			:mubanUrl="mubanUrl"
+			:editParams="editParams"
+			:editFixedParams="editFixedParams"
+			:editElseRules="editElseRules"
+			:editConfig="editConfig"
+			:editParamsDiv="5"
+			:editBtnName="(item) => '修改'"
+			:formBtnFixed="true"
+			idName="articleId"
+		>
+			<template v-slot:editOperateSup="{ id, formType, info }">
+				<el-button
+					v-if="formType == 'add'"
+					type="warning"
+					size="small"
+					:disabled="draftBtnDisable"
+					@click="handleClickDraft(info)"
+					>存草稿</el-button
+				>
+			</template>
+
+			<template v-slot:listBtnSup="{ item }">
+				<el-button
+					v-if="
+						item.statusFlag == 'published' &&
+						item.agencyId == $store.state.user.agencyId
+					"
+					@click="handleOfflineShow(item)"
+					type="text"
+					size="small"
+					style="color: #666"
+					>下线</el-button
+				>
+			</template>
+
+			<template v-slot:listBtnbefore="{ item }">
+				<el-button
+					v-if="item.isTop == '1'"
+					v-show="item.statusFlag == 'published'"
+					@click="handleCancleTopArticle(item, 'cancel_top')"
+					type="text"
+					size="small"
+					style="color: #fe6252"
+					>取消置顶</el-button
+				>
+				<el-button
+					v-show="item.statusFlag == 'published'"
+					v-else
+					@click="handleTopArticle(item, 'top')"
+					type="text"
+					size="small"
+					style="color: #22c1c3"
+					>置顶</el-button
+				>
+			</template>
+		</base-page>
+
+		<el-dialog
+			:visible.sync="offlineShowed"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			title="下线"
+			width="850px"
+			top="5vh"
+			class="dialog-h"
+			@closed="offlineShowed = false"
+		>
+			<offline
+				ref="offlineForm"
+				@close="offlineShowed = false"
+				@afterOffline="handleOfflineSuccess"
+			></offline>
+		</el-dialog>
+		<el-dialog
+			:visible.sync="showAddImage"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			title="上传封面图片"
+			width="650px"
+			top="5vh"
+			class="dialog-h"
+			@closed="showAddImage = false"
+		>
+			<div class="dialog-h-content scroll-h">
+				<!-- <span>请先上 传封面图片</span> -->
+				<el-form
+					ref="ref_form"
+					:inline="true"
+					:model="formData"
+					class="div_form"
+				>
+					<div class="form_flex">
+						<div class="form_item">
+							<el-form-item
+								label=""
+								prop="selImgUrl"
+								label-width="150px"
+								style="display: block"
+							>
+								<el-upload
+									:headers="$getElUploadHeaders()"
+									:class="[
+										'avatar-uploader',
+										{ hide: hideUploadBtn },
+									]"
+									ref="uploadPic"
+									:action="uploadUlr"
+									list-type="picture-card"
+									:on-exceed="exceedPic"
+									:before-upload="beforeAvatarUpload"
+									:on-remove="removePic"
+									:file-list="replayImgList"
+									:on-change="handleEditChange"
+									:on-success="handleSuccess"
+									:limit="1"
+								>
+									<span class="font-14">选择图片</span>
+								</el-upload>
+							</el-form-item>
+						</div>
+					</div>
+				</el-form>
+			</div>
+			<div class="div_btn">
+				<el-button size="small" @click="showAddImage = false"
+					>取 消</el-button
+				>
+				<el-button size="small" type="primary" @click="handleAddImage"
+					>确 定</el-button
+				>
+			</div>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
@@ -152,549 +157,611 @@ import offline from "./cpts/offline";
 import nextTick from "dai-js/tools/nextTick";
 
 export default {
-  props: {},
-
-  data() {
-    return {
-      offlineShowed: false,
-
-      draftBtnDisable: false,
-
-      searchParams: [
-        { field: "文章标题", keyName: "title", type: "input" },
-        {
-          field: "标签",
-          keyName: "tagIds",
-          type: "select",
-          multiple: true,
-          optionUrl: "/gov/voice/tag/taglist",
-          optionUrlParams: {},
-          optionList: [],
-          optionCook(list) {
-            return list.map((item) => ({
-              label: item.tagName,
-              value: item.tagId,
-            }));
-          },
-        },
-        {
-          field: "状态",
-          keyName: "statusFlag",
-          value: "",
-          type: "select",
-          optionUrl: "",
-          optionUrlParams: {},
-          optionList: [
-            {
-              label: "已发布",
-              value: "published",
-            },
-            {
-              label: "已下线",
-              value: "offline",
-            },
-          ],
-        },
-        {
-          field: "发布范围",
-          keyName: "publishRangeIds",
-          type: "cascader",
-          optionUrl: "/gov/org/customeragency/agencygridtree",
-          optionUrlParams: {
-            agencyId: this.$store.state.user.agencyId,
-          },
-          optionList: [],
-          optionProps: {
-            multiple: false,
-            value: "agencyId",
-            label: "agencyName",
-            children: "subAgencyList",
-            checkStrictly: true,
-          },
-          optionCook(obj) {
-            return [obj];
-          },
-          supKeys: ["publishRangeId", "publishRangeType"],
-          supValues: ["", ""],
-          handleChangeFn(vals, item) {
-            const { optionList } = item;
-            if (vals.length > 0) {
-              item["supValues"][0] = vals[vals.length - 1];
-              item["supValues"][1] = getItemByIdInCascader(
-                optionList,
-                vals,
-                "agencyId",
-                "subAgencyList"
-              )[vals.length - 1]["level"];
-              item["supValues"][1] =
-                item["supValues"][1] == "grid" ? "grid" : "agency";
-            } else {
-              item["supValues"][0] = "";
-              item["supValues"][1] = "";
-            }
-          },
-        },
-        {
-          field: "发布时间",
-          keyName: "publishTime",
-          type: "date-range",
-          supKeys: ["startDate", "endDate"],
-          supValues: ["", ""],
-        },
-      ],
-
-      tableParams: [
-        { field: "序号", keyName: "", type: "no" },
-        { field: "文章标题", keyName: "title", type: "text" },
-        {
-          field: "标签",
-          keyName: "tagNameList",
-          type: "array",
-          arrayDiv: "、",
-        },
-        { field: "状态", keyName: "statusFlagName", type: "text" },
-        { field: "发布单位", keyName: "publisherName", type: "text" },
-        { field: "发布时间", keyName: "publishDate", type: "text" },
-        {
-          field: "发布范围",
-          keyName: "publishRangeDesc",
-          type: "text",
-        },
-        { field: "置顶", keyName: "isTopName", type: "text" },
-      ],
-      tableUrl: "/gov/voice/article/articleListV2",
-      mubanUrl: "",
-      importUrl: "",
-      exportUrl: "",
-
-      addUrl: "/gov/voice/article/addOrSaveDraft",
-      editUrl: "/gov/voice/article/updateArticle",
-      infoUrl: "/gov/voice/article/detailV2",
-      delUrl: "/gov/voice/article/delete批量",
-      editAuth(item) {
-        return item.statusFlagName == "已发布";
-      },
-      delAuth(item) {
-        return item.statusFlagName == "已下线";
-      },
-
-      editParams: [
-        {
-          field: "文章标题",
-          keyName: "title",
-          type: "input",
-          maxlength: 50,
-          editDisabled: true,
-          rules: [
-            {
-              required: true,
-              message: "文章标题不能为空",
-              trigger: "blur",
-            },
-          ],
-        },
-        {
-          field: "封面图片",
-          keyName: "imgArr",
-          type: "upload",
-          limit: 1,
-          listType: "picture-card",
-          editDisabled: true,
-          rules: [],
-          value: () => [],
-          uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/article/upload",
-          supKeys: ["imgUrlArr", "imgUrl"],
-          supValues: [() => [], ""],
-          beforeImgUpload(file, item, that) {
-            console.log(file);
-            const isLt1M = file.size / 1024 / 1024 < 10;
-            const srcType = file.type;
-
-            if (!isLt1M) {
-              that.$message.error("上传文件大小不能超过 10MB!");
-              return false;
-            }
-            if (srcType.indexOf("image") == -1) {
-              that.$message.error("仅限图片格式");
-              return false;
-            }
-            return true;
-          },
-        },
-        {
-          field: "发布范围",
-          keyName: "gridIdList",
-          type: "cascader",
-          value: () => [],
-          supKeys: ["publishRangeDesc"],
-          supValues: [""],
-          optionUrl: "/gov/org/customeragency/agencygridtree",
-          optionUrlParams: {
-            agencyId: this.$store.state.user.agencyId,
-          },
-          optionList: [],
-          optionProps: {
-            multiple: true,
-            value: "agencyId",
-            label: "agencyName",
-            children: "subAgencyList",
-            checkStrictly: false,
-            emitPath: false,
-          },
-          optionCook(obj) {
-            return [obj];
-          },
-          handleChangeFn(vals, item, that) {
-            console.log("handleChangeFn", vals);
-            const { optionList } = item;
-            const optionPlaneList = collapse(optionList, "subAgencyList");
-            if (vals.length > 0) {
-              let selectedList = vals.map(
-                (v) =>
-                  getItemByIdInCascader(
-                    optionPlaneList,
-                    [v],
-                    "agencyId",
-                    "subAgencyList"
-                  )[0]
-              );
-              console.log("handleChangeFn", selectedList);
-              let selectedFilterList = selectedList.filter(
-                (a) => a.level == "grid"
-              );
-              that.fmData[item["keyName"]] = selectedFilterList.map(
-                (a) => a.agencyId
-              );
-              that.fmData[item["supKeys"][0]] = selectedFilterList
-                .map((a) => a.agencyName)
-                .join("、");
-            } else {
-            }
-          },
-          rules: [
-            {
-              required: true,
-              message: "发布范围不能为空",
-              trigger: "blur",
-            },
-          ],
-        },
-        {
-          field: "发布时间",
-          keyName: "publishDate",
-          type: "date",
-          value: dateFormat(new Date(), "yyyy-MM-dd"),
-          pickerOptions: {
-            disabledDate(time) {
-              return time.getTime() > Date.now();
-            },
-          },
-          rules: [
-            {
-              required: true,
-              message: "发布时间不能为空",
-              trigger: "blur",
-            },
-          ],
-        },
-        {
-          field: "发布单位",
-          keyName: "publisher",
-          type: "select",
-          optionUrl: "/gov/voice/article/publishagencylist",
-          optionList: [],
-          optionType: "group",
-          supKeys: ["publisherName", "publisherType"],
-          supValues: ["", ""],
-          optionCook(data) {
-            let ret = [];
-            const { agencyDeptList, agencyGridList, agencyId, agencyName } =
-              data;
-            if (agencyId) {
-              ret.push({
-                label: "以组织名义",
-                optionList: [
-                  {
-                    label: agencyName,
-                    value: agencyId,
-                    type: "agency",
-                  },
-                ],
-              });
-            }
-            if (Array.isArray(agencyDeptList) && agencyDeptList.length > 0) {
-              ret.push({
-                label: "以部门名义",
-                optionList: [
-                  ...agencyDeptList.map((d) => ({
-                    label: d.agencyDeptName,
-                    value: d.departmentId,
-                    type: "department",
-                  })),
-                ],
-              });
-            }
-            if (Array.isArray(agencyGridList) && agencyGridList.length > 0) {
-              ret.push({
-                label: "以网格名义",
-                optionList: [
-                  ...agencyGridList.map((d) => ({
-                    label: d.agencyGridName,
-                    value: d.gridId,
-                    type: "grid",
-                  })),
-                ],
-              });
-            }
-            return ret;
-          },
-          handleChangeFn(vals, item, that) {
-            const { optionList } = item;
-            let opts = [];
-            optionList.forEach((g) => {
-              opts = [...opts, ...g.optionList];
-            });
-            let publisher = opts.find((p) => vals == p.value);
-            that.fmData[item["supKeys"][0]] = publisher.label;
-            that.fmData[item["supKeys"][1]] = publisher.type;
-          },
-          rules: [
-            {
-              required: true,
-              message: "发布单位不能为空",
-              trigger: "blur",
-            },
-          ],
-        },
-        {
-          field: "文章标签",
-          keyName: "tagNameList",
-          type: "select",
-          multiple: true,
-          filterable: true,
-          allowCreate: true,
-          optionUrl: "/gov/voice/tag/taglist",
-          optionUrlParams: {},
-          optionList: [],
-          optionCook(list) {
-            return list.map((item) => ({
-              label: item.tagName,
-              value: item.tagName,
-            }));
-          },
-        },
-        {
-          field: "内容",
-          keyName: "content",
-          type: "rich-text",
-          rules: [
-            {
-              required: true,
-              message: "内容不能为空",
-              trigger: "blur",
-            },
-          ],
-        },
-        {
-          field: "置顶",
-          keyName: "isTop",
-          type: "switch",
-          activeValue: "1",
-          inactiveValue: "0",
-        },
-      ],
-      editFixedParams: {
-        type: "article",
-      },
-      editElseRules: {},
-      editConfig: {
-        confirmBtnName: "发布",
-        cookInfoFn(data) {
-          if (data.richTextFlag == "0") {
-            data.content = data.contentList
-              .map((item) => {
-                if (item.contentType == "text") {
-                  return `<p>${item.content}</p>`;
-                } else if (item.contentType == "img") {
-                  return `<img src="${item.content}" style="max-width:100%"></img>`;
-                } else if (item.contentType == "video") {
-                  return `<video src="${item.content}" style="max-width:100%" controls></video>`;
-                } else if (item.contentType == "file") {
-                  return `<a src="${item.content}" target="_blank">附件：${item.fileName}</a>`;
-                }
-              })
-              .join(" ");
-          } else {
-            data.content = data.contentList[0].content;
-          }
-          if (data.imgUrl) {
-            data.imgArr = [
-              {
-                name: "封面",
-                url: data.imgUrl,
-              },
-            ];
-            data.imgUrlArr = [data.imgUrl];
-          }
-
-          return data;
-        },
-
-        beforeSubmit(formType, fmData, that) {
-          if (fmData.isTop == "1" && !fmData.imgUrl) {
-            that.$message.error("请上传封面图片");
-            return false;
-          }
-          return true;
-        },
-      },
-
-      formData: {},
-      showAddImage: false,
-      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
-      replayImgList: [],
-      hideUploadBtn: false,
-      selType: "top",
-      selArticleId: "",
-      selImgUrl: "",
-    };
-  },
-  components: { basePage, offline },
-  computed: {},
-  watch: {},
-
-  async mounted() {},
-
-  methods: {
-    async handleOfflineShow(item) {
-      console.log(item);
-      this.offlineShowed = true;
-      await nextTick(100);
-      this.$refs.offlineForm.initForm(item);
-    },
-
-    async handleAddImage() {
-      console.log("formData", this.formData);
-      this.topArticle();
-    },
-    async handleCancleTopArticle(item, type) {
-      this.selType = type;
-      this.selArticleId = item.articleId;
-      await this.topArticle();
-    },
-
-    async handleTopArticle(item, type) {
-      this.selType = type;
-      this.selArticleId = item.articleId;
-
-      let hasImage = await this.isHasImage();
-
-      if (hasImage === "refrsh") {
-        this.$message.error("请求失败，请重新尝试");
-      } else if (hasImage === "no") {
-        // this.$message.info("请先上传封面图片");
-        this.showAddImage = true;
-      } else {
-        await this.topArticle();
-      }
-    },
-
-    async isHasImage() {
-      const url = "/gov/voice/article/detailV2";
-      const { tableData } = this;
-
-      const { data, code, msg } = await requestPost(url, {
-        articleId: this.selArticleId,
-      });
-
-      if (code === 0) {
-        // this.formData = data
-        if (data.imgUrl) {
-          return "has";
-        } else {
-          return "no";
-        }
-      } else {
-        return "refrsh";
-      }
-    },
-
-    async topArticle() {
-      const url = "/gov/voice/article/topArticle";
-      const { tableData } = this;
-      let params = {
-        articleId: this.selArticleId,
-        type: this.selType,
-      };
-      if (this.selImgUrl) {
-        params.imgUrl = this.selImgUrl;
-      }
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.$message.success("操作成功！");
-        this.showAddImage = false;
-        this.$refs.basePage.refresh();
-      } else {
-        this.$message.success("操作失败！");
-      }
-    },
-
-    removePic(file, fileList) {
-      this.selImgUrl = "";
-      this.replayImgList = [];
-      this.hideUploadBtn = fileList.length >= 1;
-    },
-    // 最多上传3张图，超过时隐藏上传按钮
-    handleEditChange(file, fileList) {
-      this.hideUploadBtn = fileList.length >= 1;
-    },
-    exceedPic() {
-      this.$message.warning("只能上传1张封面图");
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === "image/jpeg";
-      const isLt2M = file.size / 1024 / 1024 < 10;
-
-      if (!isLt2M) {
-        this.$message.error("上传图片大小不能超过 10MB!");
-      }
-      return isLt2M;
-    },
-    handleSuccess(response, file, fileList) {
-      this.replayImgList.push(file);
-      this.selImgUrl = response.data.url;
-    },
-
-    handleOfflineSuccess() {
-      this.$refs.basePage.refresh();
-      this.offlineShowed = false;
-    },
-
-    async handleClickDraft(fmData) {
-      let url = this.addUrl;
-      let params = {
-        ...fmData,
-        type: "draft",
-      };
-      params = this.$refs.basePage.$refs.editForm.cookBeforeSubmit(params);
-      if (!params.title && !params.content) {
-        return this.$message.error("标题或内容不能为空");
-      }
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "保存成功",
-        });
-        this.$refs.basePage.handleClose();
-      } else {
-        this.$message.error(msg);
-      }
-    },
-  },
+	props: {},
+
+	data() {
+		return {
+			offlineShowed: false,
+
+			draftBtnDisable: false,
+
+			searchParams: [
+				{ field: "文章标题", keyName: "title", type: "input" },
+				{
+					field: "标签",
+					keyName: "tagIds",
+					type: "select",
+					multiple: true,
+					optionUrl: "/gov/voice/tag/taglist",
+					optionUrlParams: {},
+					optionList: [],
+					optionCook(list) {
+						return list.map((item) => ({
+							label: item.tagName,
+							value: item.tagId,
+						}));
+					},
+				},
+				{
+					field: "状态",
+					keyName: "statusFlag",
+					value: "",
+					type: "select",
+					optionUrl: "",
+					optionUrlParams: {},
+					optionList: [
+						{
+							label: "已发布",
+							value: "published",
+						},
+						{
+							label: "已下线",
+							value: "offline",
+						},
+					],
+				},
+				{
+					field: "发布范围",
+					keyName: "publishRangeIds",
+					type: "cascader",
+					optionUrl: "/gov/org/customeragency/agencygridtree",
+					optionUrlParams: {
+						agencyId: this.$store.state.user.agencyId,
+					},
+					optionList: [],
+					optionProps: {
+						multiple: false,
+						value: "agencyId",
+						label: "agencyName",
+						children: "subAgencyList",
+						checkStrictly: true,
+					},
+					optionCook(obj) {
+						return [obj];
+					},
+					supKeys: ["publishRangeId", "publishRangeType"],
+					supValues: ["", ""],
+					handleChangeFn(vals, item) {
+						const { optionList } = item;
+						if (vals.length > 0) {
+							item["supValues"][0] = vals[vals.length - 1];
+							item["supValues"][1] = getItemByIdInCascader(
+								optionList,
+								vals,
+								"agencyId",
+								"subAgencyList"
+							)[vals.length - 1]["level"];
+							item["supValues"][1] =
+								item["supValues"][1] == "grid"
+									? "grid"
+									: "agency";
+						} else {
+							item["supValues"][0] = "";
+							item["supValues"][1] = "";
+						}
+					},
+				},
+				{
+					field: "发布时间",
+					keyName: "publishTime",
+					type: "date-range",
+					supKeys: ["startDate", "endDate"],
+					supValues: ["", ""],
+				},
+			],
+
+			tableParams: [
+				{ field: "序号", keyName: "", type: "no" },
+				{ field: "文章标题", keyName: "title", type: "text" },
+				{
+					field: "标签",
+					keyName: "tagNameList",
+					type: "array",
+					arrayDiv: "、",
+				},
+				{ field: "状态", keyName: "statusFlagName", type: "text" },
+				{ field: "发布单位", keyName: "publisherName", type: "text" },
+				{ field: "发布时间", keyName: "publishDate", type: "text" },
+				{
+					field: "发布范围",
+					keyName: "publishRangeDesc",
+					type: "text",
+				},
+				{ field: "置顶", keyName: "isTopName", type: "text" },
+			],
+			tableUrl: "/gov/voice/article/articleListV2",
+			mubanUrl: "",
+			importUrl: "",
+			exportUrl: "",
+
+			addUrl: "/gov/voice/article/addOrSaveDraft",
+			editUrl: "/gov/voice/article/updateArticle",
+			infoUrl: "/gov/voice/article/detailV2",
+			delUrl: "/gov/voice/article/delete批量",
+			editAuth(item) {
+				return item.statusFlagName == "已发布";
+			},
+			delAuth(item) {
+				return item.statusFlagName == "已下线";
+			},
+
+			editParams: [
+				{
+					field: "文章标题",
+					keyName: "title",
+					type: "input",
+					maxlength: 50,
+					editDisabled: true,
+					rules: [
+						{
+							required: true,
+							message: "文章标题不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "封面图片",
+					keyName: "imgArr",
+					type: "upload",
+					limit: 1,
+					listType: "picture-card",
+					editDisabled: true,
+					rules: [],
+					value: () => [],
+					uploadUrl:
+						window.SITE_CONFIG["apiURL"] +
+						"/oss/file/article/upload",
+					supKeys: ["imgUrlArr", "imgUrl"],
+					supValues: [() => [], ""],
+					beforeImgUpload(file, item, that) {
+						console.log(file);
+						const isLt1M = file.size / 1024 / 1024 < 10;
+						const srcType = file.type;
+
+						if (!isLt1M) {
+							that.$message.error("上传文件大小不能超过 10MB!");
+							return false;
+						}
+						if (srcType.indexOf("image") == -1) {
+							that.$message.error("仅限图片格式");
+							return false;
+						}
+						return true;
+					},
+				},
+				{
+					field: "发布范围",
+					keyName: "gridIdList",
+					type: "cascader",
+					value: () => [],
+					supKeys: ["publishRangeDesc"],
+					supValues: [""],
+					optionUrl: "/gov/org/customeragency/agencygridtree",
+					optionUrlParams: {
+						agencyId: this.$store.state.user.agencyId,
+					},
+					optionList: [],
+					optionProps: {
+						multiple: true,
+						value: "agencyId",
+						label: "agencyName",
+						children: "subAgencyList",
+						checkStrictly: false,
+						emitPath: false,
+					},
+					optionCook(obj) {
+						return [obj];
+					},
+					handleChangeFn(vals, item, that) {
+						console.log("handleChangeFn", vals);
+						const { optionList } = item;
+						const optionPlaneList = collapse(
+							optionList,
+							"subAgencyList"
+						);
+						if (vals.length > 0) {
+							let selectedList = vals.map(
+								(v) =>
+									getItemByIdInCascader(
+										optionPlaneList,
+										[v],
+										"agencyId",
+										"subAgencyList"
+									)[0]
+							);
+							console.log("handleChangeFn", selectedList);
+							let selectedFilterList = selectedList.filter(
+								(a) => a.level == "grid"
+							);
+							that.fmData[item["keyName"]] =
+								selectedFilterList.map((a) => a.agencyId);
+							that.fmData[item["supKeys"][0]] = selectedFilterList
+								.map((a) => a.agencyName)
+								.join("、");
+						} else {
+						}
+					},
+					rules: [
+						{
+							required: true,
+							message: "发布范围不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "发布时间",
+					keyName: "publishDate",
+					type: "date",
+					value: dateFormat(new Date(), "yyyy-MM-dd"),
+					pickerOptions: {
+						disabledDate(time) {
+							return time.getTime() > Date.now();
+						},
+					},
+					rules: [
+						{
+							required: true,
+							message: "发布时间不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "发布单位",
+					keyName: "publisher",
+					type: "select",
+					optionUrl: "/gov/voice/article/publishagencylist",
+					optionList: [],
+					optionType: "group",
+					supKeys: ["publisherName", "publisherType"],
+					supValues: ["", ""],
+					optionCook(data) {
+						let ret = [];
+						const {
+							agencyDeptList,
+							agencyGridList,
+							agencyId,
+							agencyName,
+						} = data;
+						if (agencyId) {
+							ret.push({
+								label: "以组织名义",
+								optionList: [
+									{
+										label: agencyName,
+										value: agencyId,
+										type: "agency",
+									},
+								],
+							});
+						}
+						if (
+							Array.isArray(agencyDeptList) &&
+							agencyDeptList.length > 0
+						) {
+							ret.push({
+								label: "以部门名义",
+								optionList: [
+									...agencyDeptList.map((d) => ({
+										label: d.agencyDeptName,
+										value: d.departmentId,
+										type: "department",
+									})),
+								],
+							});
+						}
+						if (
+							Array.isArray(agencyGridList) &&
+							agencyGridList.length > 0
+						) {
+							ret.push({
+								label: "以网格名义",
+								optionList: [
+									...agencyGridList.map((d) => ({
+										label: d.agencyGridName,
+										value: d.gridId,
+										type: "grid",
+									})),
+								],
+							});
+						}
+						return ret;
+					},
+					handleChangeFn(vals, item, that) {
+						const { optionList } = item;
+						let opts = [];
+						optionList.forEach((g) => {
+							opts = [...opts, ...g.optionList];
+						});
+						let publisher = opts.find((p) => vals == p.value);
+						that.fmData[item["supKeys"][0]] = publisher.label;
+						that.fmData[item["supKeys"][1]] = publisher.type;
+					},
+					rules: [
+						{
+							required: true,
+							message: "发布单位不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "文章标签",
+					keyName: "tagNameList",
+					type: "select",
+					multiple: true,
+					filterable: true,
+					allowCreate: true,
+					optionUrl: "/gov/voice/tag/taglist",
+					optionUrlParams: {},
+					optionList: [],
+					optionCook(list) {
+						return list.map((item) => ({
+							label: item.tagName,
+							value: item.tagName,
+						}));
+					},
+				},
+				{
+					field: "内容",
+					keyName: "content",
+					type: "rich-text",
+					rules: [
+						{
+							required: true,
+							message: "内容不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					// 需要转换一下，后端给的参数不适用
+					field: "附件",
+					keyName: "fileList2",
+					type: "upload",
+					limit: 3,
+					listType: "file",
+					editDisabled: true,
+					rules: [],
+					value: () => [],
+					uploadUrl:
+						window.SITE_CONFIG["apiURL"] +
+						"/oss/file/article/upload",
+					supKeys: ["fileListArr2", "fileListItem2"],
+					supValues: [() => [], ""],
+					beforeImgUpload(file, item, that) {
+						console.log(file);
+						const isLt1M = file.size / 1024 / 1024 < 10;
+						const srcType = file.type.toLowerCase();
+
+						if (!isLt1M) {
+							that.$message.error("上传文件大小不能超过 10MB!");
+							return false;
+						}
+						if (srcType.indexOf("pdf") == -1) {
+							that.$message.error("仅限pdf格式");
+							return false;
+						}
+						return true;
+					},
+				},
+				{
+					field: "置顶",
+					keyName: "isTop",
+					type: "switch",
+					activeValue: "1",
+					inactiveValue: "0",
+				},
+			],
+			editFixedParams: {
+				type: "article",
+			},
+			editElseRules: {},
+			editConfig: {
+				confirmBtnName: "发布",
+				cookInfoFn(data) {
+					if (data.richTextFlag == "0") {
+						data.content = data.contentList
+							.map((item) => {
+								if (item.contentType == "text") {
+									return `<p>${item.content}</p>`;
+								} else if (item.contentType == "img") {
+									return `<img src="${item.content}" style="max-width:100%"></img>`;
+								} else if (item.contentType == "video") {
+									return `<video src="${item.content}" style="max-width:100%" controls></video>`;
+								} else if (item.contentType == "file") {
+									return `<a src="${item.content}" target="_blank">附件：${item.fileName}</a>`;
+								}
+							})
+							.join(" ");
+					} else {
+						data.content = data.contentList[0].content;
+					}
+					if (data.imgUrl) {
+						data.imgArr = [
+							{
+								name: "封面",
+								url: data.imgUrl,
+							},
+						];
+						data.imgUrlArr = [data.imgUrl];
+					}
+					data.fileList2 = (data.fileList || []).map((item) => ({
+						url: item.content,
+						name: item.fileName,
+						size: 0,
+						type: item.content.split(".").pop(),
+						format: item.content.split(".").pop(),
+					}));
+
+					return data;
+				},
+
+				beforeSubmit(formType, fmData, that) {
+					if (fmData.isTop == "1" && !fmData.imgUrl) {
+						that.$message.error("请上传封面图片");
+						return false;
+					}
+
+					fmData.fileList = (fmData.fileList2 || []).map((item) => ({
+						content: item.url,
+						fileName: item.name,
+						contentType: "file",
+					}));
+					return true;
+				},
+			},
+
+			formData: {},
+			showAddImage: false,
+			uploadUlr:
+				window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+			replayImgList: [],
+			hideUploadBtn: false,
+			selType: "top",
+			selArticleId: "",
+			selImgUrl: "",
+		};
+	},
+	components: { basePage, offline },
+	computed: {},
+	watch: {},
+
+	async mounted() {},
+
+	methods: {
+		async handleOfflineShow(item) {
+			console.log(item);
+			this.offlineShowed = true;
+			await nextTick(100);
+			this.$refs.offlineForm.initForm(item);
+		},
+
+		async handleAddImage() {
+			console.log("formData", this.formData);
+			this.topArticle();
+		},
+		async handleCancleTopArticle(item, type) {
+			this.selType = type;
+			this.selArticleId = item.articleId;
+			await this.topArticle();
+		},
+
+		async handleTopArticle(item, type) {
+			this.selType = type;
+			this.selArticleId = item.articleId;
+
+			let hasImage = await this.isHasImage();
+
+			if (hasImage === "refrsh") {
+				this.$message.error("请求失败，请重新尝试");
+			} else if (hasImage === "no") {
+				// this.$message.info("请先上传封面图片");
+				this.showAddImage = true;
+			} else {
+				await this.topArticle();
+			}
+		},
+
+		async isHasImage() {
+			const url = "/gov/voice/article/detailV2";
+			const { tableData } = this;
+
+			const { data, code, msg } = await requestPost(url, {
+				articleId: this.selArticleId,
+			});
+
+			if (code === 0) {
+				// this.formData = data
+				if (data.imgUrl) {
+					return "has";
+				} else {
+					return "no";
+				}
+			} else {
+				return "refrsh";
+			}
+		},
+
+		async topArticle() {
+			const url = "/gov/voice/article/topArticle";
+			const { tableData } = this;
+			let params = {
+				articleId: this.selArticleId,
+				type: this.selType,
+			};
+			if (this.selImgUrl) {
+				params.imgUrl = this.selImgUrl;
+			}
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.$message.success("操作成功！");
+				this.showAddImage = false;
+				this.$refs.basePage.refresh();
+			} else {
+				this.$message.success("操作失败！");
+			}
+		},
+
+		removePic(file, fileList) {
+			this.selImgUrl = "";
+			this.replayImgList = [];
+			this.hideUploadBtn = fileList.length >= 1;
+		},
+		// 最多上传3张图，超过时隐藏上传按钮
+		handleEditChange(file, fileList) {
+			this.hideUploadBtn = fileList.length >= 1;
+		},
+		exceedPic() {
+			this.$message.warning("只能上传1张封面图");
+		},
+		beforeAvatarUpload(file) {
+			const isJPG = file.type === "image/jpeg";
+			const isLt2M = file.size / 1024 / 1024 < 10;
+
+			if (!isLt2M) {
+				this.$message.error("上传图片大小不能超过 10MB!");
+			}
+			return isLt2M;
+		},
+		handleSuccess(response, file, fileList) {
+			this.replayImgList.push(file);
+			this.selImgUrl = response.data.url;
+		},
+
+		handleOfflineSuccess() {
+			this.$refs.basePage.refresh();
+			this.offlineShowed = false;
+		},
+
+		async handleClickDraft(fmData) {
+			let url = this.addUrl;
+			let params = {
+				...fmData,
+				type: "draft",
+			};
+			params =
+				this.$refs.basePage.$refs.editForm.cookBeforeSubmit(params);
+			if (!params.title && !params.content) {
+				return this.$message.error("标题或内容不能为空");
+			}
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.$message({
+					type: "success",
+					message: "保存成功",
+				});
+				this.$refs.basePage.handleClose();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+	},
 };
 </script>
 
@@ -702,14 +769,14 @@ export default {
 @import "@/assets/scss/modules/management/form-main.scss";
 
 .avatar-uploader {
-  margin: 0 0 0 20px;
+	margin: 0 0 0 20px;
 }
 </style>
 
 <style lang="scss">
 .hide {
-  .el-upload--picture-card {
-    display: none !important;
-  }
+	.el-upload--picture-card {
+		display: none !important;
+	}
 }
 </style>
diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index afc83f4..0818e4b 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -1,241 +1,287 @@
 <template>
-  <div>
-    <div class="dialog-h-content scroll-h">
-      <el-form
-        v-if="iniLoaded"
-        ref="ref_form"
-        :model="fmData"
-        :inline="true"
-        :disabled="formType === 'watch'"
-        class="m-fm"
-        :class="{ 'z-div': editParamsDiv, 'z-watch': formType === 'watch' }"
-      >
-        <div class="list">
-          <el-form-item
-            v-for="item in editParams"
-            class="item"
-            label-width="140px"
-            style="display: block"
-            :key="'edit' + item.keyName"
-            :label="item.field"
-            :prop="item.keyName"
-            :rules="item.rules || []"
-          >
-            <template v-if="item.type == 'switch'">
-              <el-switch
-                v-model="fmData[item.keyName]"
-                size="small"
-                :active-text="item.activeText || ''"
-                :inactive-text="item.inactiveText || ''"
-                :active-value="item.activeValue || true"
-                :inactive-value="item.inactiveValue || false"
-              >
-              </el-switch>
-            </template>
-
-            <template v-if="item.type == 'input'">
-              <el-input
-                v-if="
-                  formType == 'add' || (formType == 'edit' && !item.editDisable)
-                "
-                v-model="fmData[item.keyName]"
-                class="item-input"
-                size="small"
-                clearable
-                show-word-limit
-                :maxlength="item.maxlength || ''"
-                :placeholder="item.placeholder || '请输入'"
-              >
-              </el-input>
-
-              <div class="item-show" v-else>
-                {{ fmData[item.keyName] || "--" }}
-                <span v-if="item.attach">{{ item.attach }}</span>
-              </div>
-            </template>
-
-            <template v-if="item.type == 'textarea'">
-              <el-input
-                v-if="
-                  formType == 'add' || (formType == 'edit' && !item.editDisable)
-                "
-                v-model="fmData[item.keyName]"
-                type="textarea"
-                class="item-input"
-                size="small"
-                clearable
-                show-word-limit
-                :rows="3"
-                :maxlength="item.maxlength || ''"
-                :placeholder="item.placeholder || '请输入'"
-              >
-              </el-input>
-
-              <div class="item-show" v-else>
-                {{ fmData[item.keyName] || "--" }}
-              </div>
-            </template>
-
-            <template v-if="item.type == 'date'">
-              <el-date-picker
-                v-if="
-                  formType == 'add' || (formType == 'edit' && !item.editDisable)
-                "
-                v-model="fmData[item.keyName]"
-                :picker-options="item.pickerOptions"
-                class="item-input"
-                size="small"
-                clearable
-                show-word-limit
-                :value-format="item.format || 'yyyy-MM-dd'"
-                :placeholder="item.placeholder || '请输入'"
-              >
-              </el-date-picker>
-
-              <div class="item-show" v-else>
-                {{ fmData[item.keyName] || "--" }}
-              </div>
-            </template>
-
-            <template v-if="item.type == 'number'">
-              <el-input-number
-                v-if="
-                  formType == 'add' || (formType == 'edit' && !item.editDisable)
-                "
-                v-model="fmData[item.keyName]"
-                class="item-number"
-                size="small"
-                clearable
-                :precision="item.precision || 0"
-                :step="item.step || 1"
-                :min="item.min || 0"
-                :max="item.max || 999999999999"
-                :placeholder="item.placeholder || '请输入'"
-              >
-              </el-input-number>
-              <span class="item-show" v-else>
-                {{ fmData[item.keyName] || "--" }}
-              </span>
-              <span v-if="item.unitName">（{{ item.unitName }}）</span>
-            </template>
-
-            <template v-else-if="item.type == 'select'">
-              <el-select
-                v-model="fmData[item.keyName]"
-                :placeholder="item.placeholder || '请选择'"
-                size="small"
-                clearable
-                class="item-select"
-                :multiple="item.multiple || false"
-                :filterable="item.filterable || false"
-                :allowCreate="item.allowCreate || false"
-                :collapse-tags="item.collapseTags || false"
-                default-first-option
-                @change="(e) => handleChangeSelect(e, item)"
-              >
-                <template v-if="item.optionType == 'group'">
-                  <el-option-group
-                    v-for="group in item.optionList"
-                    :key="group.label"
-                    :label="group.label"
-                  >
-                    <el-option
-                      v-for="subItem in group.optionList"
-                      :key="subItem.value"
-                      :label="subItem.label"
-                      :value="subItem.value"
-                    >
-                    </el-option>
-                  </el-option-group>
-                </template>
-                <template v-else>
-                  <el-option
-                    v-for="(subItem, subIndex) in item.optionList"
-                    :key="subItem.value + subIndex"
-                    :label="subItem.label"
-                    :value="subItem.value"
-                  >
-                  </el-option>
-                </template>
-              </el-select>
-            </template>
-
-            <template v-else-if="item.type == 'rich-text'">
-              <div
-                v-if="
-                  formType == 'add' || (formType == 'edit' && !item.editDisable)
-                "
-                class="item-rich-text"
-              >
-                <Tinymce
-                  :ref="'richText' + item.keyName"
-                  v-model="fmData[item.keyName]"
-                  :customerId="customerId"
-                  :placeholder="item.placeholder || '请输入'"
-                  :height="500"
-                />
-              </div>
-              <div
-                v-else
-                class="item-rich-text z-show"
-                @click="handleClickHtmlNode"
-              >
-                <div v-html="fmData[item.keyName]"></div>
-              </div>
-            </template>
-
-            <template v-else-if="item.type == 'cascader'">
-              <el-cascader
-                v-model="fmData[item.keyName]"
-                :placeholder="item.placeholder || '请选择'"
-                :options="item.optionList"
-                :props="item.optionProps || {}"
-                :show-all-levels="false"
-                :collapse-tags="item.collapseTags || false"
-                size="small"
-                clearable
-                class="item-select"
-                @change="(e) => handleChangeCascader(e, item)"
-              >
-              </el-cascader>
-            </template>
-
-            <template v-else-if="item.type == 'upload'">
-              <el-upload
-                :headers="$getElUploadHeaders()"
-                v-if="
-                  formType == 'add' || (formType == 'edit' && !item.editDisable)
-                "
-                ref="upload"
-                class="avatar-uploader"
-                :class="{ 'z-full': fmData[item.keyName].length >= item.limit }"
-                :action="item.uploadUrl || uploadUrl"
-                :data="{ customerId: customerId }"
-                :show-file-list="true"
-                :list-type="item.listType || 'picture'"
-                :limit="item.limit || 100"
-                :file-list="fmData[item.keyName]"
-                :on-success="(res, file) => handleImgSuccess(res, file, item)"
-                :on-error="(res, file) => handleImgError(res, file, item)"
-                :on-remove="(res) => handleImgRemove(res, item)"
-                :on-exceed="(res) => handleImgExceed(res, item)"
-                :before-upload="(file) => beforeImgUpload(file, item)"
-              >
-                <a><i class="el-icon-plus"></i> 点击上传</a>
-              </el-upload>
-              <el-image
-                v-else-if="fmData[item.keyName].length > 0"
-                style="width: 100px; height: 100px"
-                :src="fmData[item.keyName][0].url"
-                fit="cover"
-                :preview-src-list="fmData[item.keyName].map((item) => item.url)"
-              ></el-image>
-              <span v-else>--</span>
-            </template>
-
-            <template v-else-if="item.type == 'address'">
-              <div class="address-item">
-                <!-- <el-input class="address-item-input"
+	<div>
+		<div class="dialog-h-content scroll-h">
+			<el-form
+				v-if="iniLoaded"
+				ref="ref_form"
+				:model="fmData"
+				:inline="true"
+				:disabled="formType === 'watch'"
+				class="m-fm"
+				:class="{
+					'z-div': editParamsDiv,
+					'z-watch': formType === 'watch',
+				}"
+			>
+				<div class="list">
+					<el-form-item
+						v-for="item in editParams"
+						class="item"
+						label-width="140px"
+						style="display: block"
+						:key="'edit' + item.keyName"
+						:label="item.field"
+						:prop="item.keyName"
+						:rules="item.rules || []"
+					>
+						<template v-if="item.type == 'switch'">
+							<el-switch
+								v-model="fmData[item.keyName]"
+								size="small"
+								:active-text="item.activeText || ''"
+								:inactive-text="item.inactiveText || ''"
+								:active-value="item.activeValue || true"
+								:inactive-value="item.inactiveValue || false"
+							>
+							</el-switch>
+						</template>
+
+						<template v-if="item.type == 'input'">
+							<el-input
+								v-if="
+									formType == 'add' ||
+									(formType == 'edit' && !item.editDisable)
+								"
+								v-model="fmData[item.keyName]"
+								class="item-input"
+								size="small"
+								clearable
+								show-word-limit
+								:maxlength="item.maxlength || ''"
+								:placeholder="item.placeholder || '请输入'"
+							>
+							</el-input>
+
+							<div class="item-show" v-else>
+								{{ fmData[item.keyName] || "--" }}
+								<span v-if="item.attach">{{
+									item.attach
+								}}</span>
+							</div>
+						</template>
+
+						<template v-if="item.type == 'textarea'">
+							<el-input
+								v-if="
+									formType == 'add' ||
+									(formType == 'edit' && !item.editDisable)
+								"
+								v-model="fmData[item.keyName]"
+								type="textarea"
+								class="item-input"
+								size="small"
+								clearable
+								show-word-limit
+								:rows="3"
+								:maxlength="item.maxlength || ''"
+								:placeholder="item.placeholder || '请输入'"
+							>
+							</el-input>
+
+							<div class="item-show" v-else>
+								{{ fmData[item.keyName] || "--" }}
+							</div>
+						</template>
+
+						<template v-if="item.type == 'date'">
+							<el-date-picker
+								v-if="
+									formType == 'add' ||
+									(formType == 'edit' && !item.editDisable)
+								"
+								v-model="fmData[item.keyName]"
+								:picker-options="item.pickerOptions"
+								class="item-input"
+								size="small"
+								clearable
+								show-word-limit
+								:value-format="item.format || 'yyyy-MM-dd'"
+								:placeholder="item.placeholder || '请输入'"
+							>
+							</el-date-picker>
+
+							<div class="item-show" v-else>
+								{{ fmData[item.keyName] || "--" }}
+							</div>
+						</template>
+
+						<template v-if="item.type == 'number'">
+							<el-input-number
+								v-if="
+									formType == 'add' ||
+									(formType == 'edit' && !item.editDisable)
+								"
+								v-model="fmData[item.keyName]"
+								class="item-number"
+								size="small"
+								clearable
+								:precision="item.precision || 0"
+								:step="item.step || 1"
+								:min="item.min || 0"
+								:max="item.max || 999999999999"
+								:placeholder="item.placeholder || '请输入'"
+							>
+							</el-input-number>
+							<span class="item-show" v-else>
+								{{ fmData[item.keyName] || "--" }}
+							</span>
+							<span v-if="item.unitName"
+								>（{{ item.unitName }}）</span
+							>
+						</template>
+
+						<template v-else-if="item.type == 'select'">
+							<el-select
+								v-model="fmData[item.keyName]"
+								:placeholder="item.placeholder || '请选择'"
+								size="small"
+								clearable
+								class="item-select"
+								:multiple="item.multiple || false"
+								:filterable="item.filterable || false"
+								:allowCreate="item.allowCreate || false"
+								:collapse-tags="item.collapseTags || false"
+								default-first-option
+								@change="(e) => handleChangeSelect(e, item)"
+							>
+								<template v-if="item.optionType == 'group'">
+									<el-option-group
+										v-for="group in item.optionList"
+										:key="group.label"
+										:label="group.label"
+									>
+										<el-option
+											v-for="(subItem,subIndex) in group.optionList"
+											:key="subItem.label + subIndex"
+											:label="subItem.label"
+											:value="subItem.value"
+										>
+										</el-option>
+									</el-option-group>
+								</template>
+								<template v-else>
+									<el-option
+										v-for="(
+											subItem, subIndex
+										) in item.optionList"
+										:key="subItem.value + subIndex"
+										:label="subItem.label"
+										:value="subItem.value"
+									>
+									</el-option>
+								</template>
+							</el-select>
+						</template>
+
+						<template v-else-if="item.type == 'rich-text'">
+							<div
+								v-if="
+									formType == 'add' ||
+									(formType == 'edit' && !item.editDisable)
+								"
+								class="item-rich-text"
+							>
+								<Tinymce
+									:ref="'richText' + item.keyName"
+									v-model="fmData[item.keyName]"
+									:customerId="customerId"
+									:placeholder="item.placeholder || '请输入'"
+									:height="500"
+								/>
+							</div>
+							<div
+								v-else
+								class="item-rich-text z-show"
+								@click="handleClickHtmlNode"
+							>
+								<div v-html="fmData[item.keyName]"></div>
+							</div>
+						</template>
+
+						<template v-else-if="item.type == 'cascader'">
+							<el-cascader
+								v-model="fmData[item.keyName]"
+								:placeholder="item.placeholder || '请选择'"
+								:options="item.optionList"
+								:props="item.optionProps || {}"
+								:show-all-levels="false"
+								:collapse-tags="item.collapseTags || false"
+								size="small"
+								clearable
+								class="item-select"
+								@change="(e) => handleChangeCascader(e, item)"
+							>
+							</el-cascader>
+						</template>
+
+						<template v-else-if="item.type == 'upload'">
+							<el-upload
+								:headers="$getElUploadHeaders()"
+								v-if="
+									formType == 'add' ||
+									(formType == 'edit' && !item.editDisable)
+								"
+								ref="upload"
+								class="avatar-uploader"
+								:class="{
+									'z-full':
+										fmData[item.keyName].length >=
+										item.limit,
+								}"
+								:action="item.uploadUrl || uploadUrl"
+								:data="{ customerId: customerId }"
+								:show-file-list="true"
+								:list-type="item.listType || 'picture'"
+								:limit="item.limit || 100"
+								:file-list="fmData[item.keyName]"
+								:on-success="
+									(res, file) =>
+										handleImgSuccess(res, file, item)
+								"
+								:on-error="
+									(res, file) =>
+										handleImgError(res, file, item)
+								"
+								:on-remove="(res) => handleImgRemove(res, item)"
+								:on-exceed="(res) => handleImgExceed(res, item)"
+								:before-upload="
+									(file) => beforeImgUpload(file, item)
+								"
+							>
+								<a><i class="el-icon-plus"></i> 点击上传</a>
+							</el-upload>
+							<el-image
+								v-else-if="
+									fmData[item.keyName].length > 0 &&
+									item.listType != 'file'
+								"
+								style="width: 100px; height: 100px"
+								:src="fmData[item.keyName][0].url"
+								fit="cover"
+								:preview-src-list="
+									fmData[item.keyName].map((item) => item.url)
+								"
+							></el-image>
+							<div
+								v-else-if="
+									fmData[item.keyName].length > 0 &&
+									item.listType == 'file'
+								"
+							>
+								<a
+									:key="val.url"
+									traget="_blank"
+									:href="val.url"
+									v-for="val in fmData[item.keyName]"
+									>{{ val.name }}</a
+								>
+							</div>
+							<span v-else>--</span>
+						</template>
+
+						<template v-else-if="item.type == 'address'">
+							<div class="address-item">
+								<!-- <el-input class="address-item-input"
                           :placeholder="item.placeholder || '请输入所在地址'"
                           v-model="fmData[item.keyName]"
                           :maxlength="item.maxlength || ''"
@@ -247,120 +293,123 @@
                            size="small"
                            ref="mapSearch"
                            @click="handleSearchMap(item)">查询</el-button> -->
-                <el-select
-                  v-model="searchAddressKeyword"
-                  filterable
-                  class="item-input"
-                  remote
-                  :reserve-keyword="true"
-                  placeholder="请输入关键词"
-                  :remote-method="remoteMethod"
-                  :loading="loading"
-                >
-                  <el-option
-                    v-for="subitem in searchAddressOptions"
-                    @click.native="handleClickKey(subitem, item)"
-                    :key="subitem.value"
-                    :label="subitem.label"
-                    :value="subitem.value"
-                  >
-                  </el-option>
-                </el-select>
-                <div id="app_base" class="div_map"></div>
-                <div style="margin-top: 10px" v-show="false">
-                  <span>经度</span>
-                  <el-input
-                    class="address-item-input2"
-                    maxlength="50"
-                    placeholder="请输入经度"
-                    v-model="fmData[item.supKeys[0]]"
-                  >
-                  </el-input>
-                  <span style="margin-left: 20px">纬度</span>
-                  <el-input
-                    class="address-item-input2"
-                    maxlength="50"
-                    placeholder="请输入纬度"
-                    v-model="fmData[item.supKeys[1]]"
-                  >
-                  </el-input>
-                </div>
-              </div>
-
-              <el-input
-                v-if="
-                  formType == 'add' || (formType == 'edit' && !item.editDisable)
-                "
-                v-model="fmData[item.keyName]"
-                class="item-input"
-                size="small"
-                clearable
-                show-word-limit
-                :maxlength="item.maxlength || ''"
-                :placeholder="item.placeholder || '请输入'"
-              >
-              </el-input>
-
-              <div class="item-show" v-else>
-                {{ fmData[item.keyName] || "--" }}
-              </div>
-            </template>
-          </el-form-item>
-        </div>
-      </el-form>
-
-      <div class="div_btn resi-btns" v-if="!formBtnFixed">
-        <el-button size="small" @click="handleCancle">{{
-          editConfig.cancelBtnName || "取消"
-        }}</el-button>
-        <el-button
-          v-if="formType != 'watch'"
-          type="primary"
-          size="small"
-          :disabled="btnDisable"
-          @click="handleComfirm"
-          >{{ editConfig.confirmBtnName || "确定" }}</el-button
-        >
-        <slot
-          name="operateSup"
-          v-bind:id="formId"
-          v-bind:info="fmData"
-          v-bind:formType="formType"
-        ></slot>
-      </div>
-
-      <slot
-        name="bottomSup"
-        v-bind:id="formId"
-        v-bind:info="fmData"
-        v-bind:formType="formType"
-      ></slot>
-    </div>
-
-    <div class="div_btn resi-btns" v-if="formBtnFixed">
-      <el-button size="small" @click="handleCancle">{{
-        editConfig.cancelBtnName || "取消"
-      }}</el-button>
-      <el-button
-        v-if="formType != 'watch'"
-        type="primary"
-        size="small"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >{{ editConfig.confirmBtnName || "确定" }}</el-button
-      >
-      <slot
-        name="operateSup"
-        v-bind:id="formId"
-        v-bind:info="fmData"
-        v-bind:formType="formType"
-      ></slot>
-    </div>
-  </div>
+								<el-select
+									v-model="searchAddressKeyword"
+									filterable
+									class="item-input"
+									remote
+									:reserve-keyword="true"
+									placeholder="请输入关键词"
+									:remote-method="remoteMethod"
+									:loading="loading"
+								>
+									<el-option
+										v-for="subitem in searchAddressOptions"
+										@click.native="
+											handleClickKey(subitem, item)
+										"
+										:key="subitem.value"
+										:label="subitem.label"
+										:value="subitem.value"
+									>
+									</el-option>
+								</el-select>
+								<div id="app_base" class="div_map"></div>
+								<div style="margin-top: 10px" v-show="false">
+									<span>经度</span>
+									<el-input
+										class="address-item-input2"
+										maxlength="50"
+										placeholder="请输入经度"
+										v-model="fmData[item.supKeys[0]]"
+									>
+									</el-input>
+									<span style="margin-left: 20px">纬度</span>
+									<el-input
+										class="address-item-input2"
+										maxlength="50"
+										placeholder="请输入纬度"
+										v-model="fmData[item.supKeys[1]]"
+									>
+									</el-input>
+								</div>
+							</div>
+
+							<el-input
+								v-if="
+									formType == 'add' ||
+									(formType == 'edit' && !item.editDisable)
+								"
+								v-model="fmData[item.keyName]"
+								class="item-input"
+								size="small"
+								clearable
+								show-word-limit
+								:maxlength="item.maxlength || ''"
+								:placeholder="item.placeholder || '请输入'"
+							>
+							</el-input>
+
+							<div class="item-show" v-else>
+								{{ fmData[item.keyName] || "--" }}
+							</div>
+						</template>
+					</el-form-item>
+				</div>
+			</el-form>
+
+			<div class="div_btn resi-btns" v-if="!formBtnFixed">
+				<el-button size="small" @click="handleCancle">{{
+					editConfig.cancelBtnName || "取消"
+				}}</el-button>
+				<el-button
+					v-if="formType != 'watch'"
+					type="primary"
+					size="small"
+					:disabled="btnDisable"
+					@click="handleComfirm"
+					>{{ editConfig.confirmBtnName || "确定" }}</el-button
+				>
+				<slot
+					name="operateSup"
+					v-bind:id="formId"
+					v-bind:info="fmData"
+					v-bind:formType="formType"
+				></slot>
+			</div>
+
+			<slot
+				name="bottomSup"
+				v-bind:id="formId"
+				v-bind:info="fmData"
+				v-bind:formType="formType"
+			></slot>
+		</div>
+
+		<div class="div_btn resi-btns" v-if="formBtnFixed">
+			<el-button size="small" @click="handleCancle">{{
+				editConfig.cancelBtnName || "取消"
+			}}</el-button>
+			<el-button
+				v-if="formType != 'watch'"
+				type="primary"
+				size="small"
+				:disabled="btnDisable"
+				@click="handleComfirm"
+				>{{ editConfig.confirmBtnName || "确定" }}</el-button
+			>
+			<slot
+				name="operateSup"
+				v-bind:id="formId"
+				v-bind:info="fmData"
+				v-bind:formType="formType"
+			></slot>
+		</div>
+	</div>
 </template>
 
 <script>
-import { requestPost } from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
 import Schema from "async-validator";
 import Tinymce from "@c/tinymce2/index.vue";
@@ -369,708 +418,743 @@ import daiMap from "@/utils/dai-map";
 var map;
 
 export default {
-  components: { Tinymce },
-
-  props: {
-    formId: {
-      type: String,
-      default: "",
-    },
-    formType: {
-      type: String,
-      default: "info",
-    },
-    formBtnFixed: {
-      type: Boolean,
-      default: true,
-    },
-    idName: {
-      type: String,
-      default: "",
-    },
-    addUrl: {
-      type: String,
-      default: "",
-    },
-    editUrl: {
-      type: String,
-      default: "",
-    },
-    delUrl: {
-      type: String,
-      default: "",
-    },
-    infoUrl: {
-      type: String,
-      default: "",
-    },
-
-    editParams: {
-      type: Array,
-      default: () => [],
-    },
-    editFixedParams: {
-      type: Object,
-      default: () => ({}),
-    },
-    editParamsDiv: {
-      type: Number,
-      default: 0,
-    },
-    editElseRules: {
-      type: Object,
-      default: () => ({}),
-    },
-    editConfig: {
-      type: Object,
-      default: () => ({}),
-    },
-  },
-
-  data() {
-    return {
-      iniLoaded: false,
-      loading: false,
-      btnDisable: false,
-
-      fmData: {},
-
-      editParams1: [],
-      editParams2: [],
-
-      uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
-      customerId: localStorage.getItem("customerId"),
-
-      // 做搜索地址用
-      searchAddressOptions: [],
-      searchAddressKeyword: "",
-    };
-  },
-  computed: {},
-  watch: {
-    editParams: {
-      handler() {
-        this.computeFmData();
-      },
-      deep: true,
-    },
-  },
-
-  async mounted() {
-    this.initForm();
-  },
-
-  methods: {
-    async initForm() {
-      this.iniFmData();
-
-      if (this.formId && this.formType != "add") {
-        this.getInfo();
-      }
-    },
-
-    computeFmData() {
-      console.log(this.fmData);
-    },
-
-    iniFmData() {
-      const { editParams, fmData, editParamsDiv } = this;
-      editParams.forEach((item, index) => {
-        if (typeof item.value == "function") {
-          fmData[item.keyName] = item.value();
-        } else if (
-          typeof item.value == "string" ||
-          typeof item.value == "number" ||
-          typeof item.value == "boolean"
-        ) {
-          fmData[item.keyName] = item.value;
-        } else if (typeof item.value == "undefined") {
-          fmData[item.keyName] = "";
-        } else {
-          fmData[item.keyName] = item.value || "";
-          console.error(
-            "不应该直接传入数组或对象的值，这样会导致传入的值被子组件修改。editParams-------------cpts/base/cpts/edit.vue",
-            item
-          );
-        }
-
-        if (item.supValues) {
-          item.supValues.forEach((value, index) => {
-            if (typeof value == "function") {
-              fmData[item.supKeys[index]] = value();
-            } else if (
-              typeof value == "string" ||
-              typeof value == "number" ||
-              typeof value == "boolean"
-            ) {
-              fmData[item.supKeys[index]] = value;
-            } else if (typeof value == "undefined") {
-              fmData[item.supKeys[index]] = "";
-            } else {
-              fmData[item.supKeys[index]] = value;
-              console.error(
-                "不应该直接传入数组或对象的值，这样会导致传入的值被子组件修改。editParams-------------cpts/base/cpts/edit.vue",
-                item
-              );
-            }
-          });
-        }
-
-        if (item.type == "select" || item.type == "cascader") {
-          if (item.optionUrl) {
-            this.getFmOptions(
-              index,
-              item.optionUrl,
-              item.optionUrlParams || {},
-              item.optionCook || null
-            );
-          }
-        } else if (item.type == "address") {
-          this.$nextTick(async () => {
-            await nextTick(300);
-
-            this.initMap(item);
-          });
-        }
-      });
-
-      this.fmData = { ...fmData };
-      if (editParamsDiv) {
-        this.editParams1 = editParams.slice(0, editParamsDiv);
-        this.editParams2 = editParams.slice(editParamsDiv);
-      } else {
-        this.editParams1 = editParams;
-      }
-      console.log("------------------------------------", this.fmData);
-      this.iniLoaded = true;
-    },
-
-    handleClickHtmlNode(e) {
-      //在判断事件目标节点的时候，考虑到兼容性应该统一转换成大写或小写进行判断
-      if (e.target.localName.toLowerCase() === "a") {
-        // 通过判端目标节点以后，就能在这里对其进行操作啦。
-        let url = e.target.getAttribute("src"); //获取a标签属性，我这里自定义了一个属性data-id并将id赋值给了该属性，如何需要获取click方法的参数，需要获取a标签的click属性，并手动解析获取里面的参数
-        window.open(url);
-      }
-    },
-
-    async getFmOptions(index, url, params, cookFn) {
-      const { data, code, msg } = await requestPost(url, {
-        ...params,
-      });
-
-      if (code === 0) {
-        this.editParams[index].optionList =
-          typeof cookFn == "function" ? cookFn(data) : data || [];
-      } else {
-        this.$message.error("请求检索基础数据失败！");
-      }
-    },
-
-    handleChangeCascader(vals, item) {
-      this.fmData[item["keyName"]] = vals;
-      if (typeof item.handleChangeFn == "function") {
-        item.handleChangeFn(vals, item, this);
-      }
-    },
-    handleChangeSelect(vals, item) {
-      console.log(vals, item);
-      this.fmData[item["keyName"]] = vals;
-      if (typeof item.handleChangeFn == "function") {
-        item.handleChangeFn(vals, item, this);
-      }
-    },
-
-    beforeImgUpload(file, item) {
-      if (typeof item.beforeImgUpload == "function") {
-        if (!item.beforeImgUpload(file, item, this)) return false;
-      }
-      return true;
-    },
-
-    handleImgRemove(file, item) {
-      console.log("handleImgRemove", file);
-      let url = file.response ? file.response.data.url : file.url;
-      if (url) {
-        let { fmData } = this;
-        this.fmData[item.keyName] = fmData[item.keyName].filter(
-          (item) => item.url !== url
-        );
-        if (item.supKeys && Array.isArray(item.supKeys)) {
-          if (item.supKeys.length > 0) {
-            this.fmData[item.supKeys[0]] = fmData[item.keyName].map(
-              (item) => item.url
-            );
-          }
-          if (item.supKeys.length > 1) {
-            this.fmData[item.supKeys[1]] =
-              this.fmData[item.supKeys[0]][0] || "";
-          }
-        }
-      }
-    },
-
-    handleImgExceed(res, item) {
-      console.log(res);
-      // this.$message({
-      //   type: "warning",
-      //   message: "文件数量最多不超过三个",
-      // });
-    },
-
-    handleImgSuccess(res, file, item) {
-      console.log("handleImgSuccess", res);
-      if (res.code === 0 && res.msg === "success") {
-        let { fmData } = this;
-        // let picItem = {
-        //   url: res.data.url,
-        //   name: file.name,
-        //   size: file.size,
-        //   type: file.type,
-        //   format: file.name.split(".").pop(),
-        // };
-        let picItem = file;
-        picItem.url = res.data.url;
-        picItem.format = file.name.split(".").pop();
-
-        if (Array.isArray(this.fmData[item.keyName])) {
-          this.fmData[item.keyName].push(picItem);
-        } else {
-          this.fmData[item.keyName] = [picItem];
-        }
-        if (item.supKeys && Array.isArray(item.supKeys)) {
-          if (item.supKeys.length > 0) {
-            this.fmData[item.supKeys[0]] = fmData[item.keyName].map(
-              (item) => item.url
-            );
-          }
-          if (item.supKeys.length > 1) {
-            this.fmData[item.supKeys[1]] =
-              this.fmData[item.supKeys[0]][0] || "";
-          }
-        }
-      } else {
-        this.$message.error(res.msg);
-      }
-    },
-
-    handleImgError(res, file, item) {
-      console.log(res);
-    },
-
-    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap(item) {
-      let { latitude, longitude } = this.$store.state.user;
-
-      map = new daiMap(
-        document.getElementById("app_base"),
-        { latitude, longitude },
-        {
-          zoom: 16.2, // 设置地图缩放级别
-          pitch: 43.5, // 设置俯仰角
-          rotation: 45, // 设置地图旋转角度
-        }
-      );
-
-      // 监听地图平移结束
-      map.on("dragend", (e) => {
-        this.handleMoveCenter(item, e);
-      });
-      map.setCenter(latitude, longitude);
-      map.setMarker(latitude, longitude);
-    },
-
-    async handleSearchMap(item) {
-      const { msg, data } = await map.searchNearby(this.fmData[item.keyName]);
-      if (msg == "success") {
-        const { lat, lng } = data;
-        map.setCenter(lat, lng);
-        map.setMarker(lat, lng);
-        this.fmData[item.supKeys[0]] = lng;
-        this.fmData[item.supKeys[1]] = lat;
-      } else {
-        this.$message.error("未检索到相关位置坐标");
-      }
-    },
-
-    async handleMoveCenter(item, e) {
-      console.log("handleMoveCenter", e);
-      //修改地图中心点
-      const { lat, lng } = map.getCenter();
-      console.log("getCenter", lat);
-
-      this.fmData[item.supKeys[0]] = parseFloat(lng);
-      this.fmData[item.supKeys[1]] = parseFloat(lat);
-      map.setMarker(lat, lng);
-      console.log("setMarker", lat);
-
-      let { msg, data } = await map.getAddress(lat, lng);
-      if (msg == "success") {
-        this.fmData[item.keyName] = data.address;
-        this.searchAddressOptions = [];
-      }
-    },
-
-    async remoteMethod(query) {
-      if (query !== "") {
-        this.loading = true;
-
-        const { msg, data } = await map.searchNearby(query);
-        this.loading = false;
-        console.log("搜索结果", data);
-
-        if (msg == "success" && data.resultList && data.resultList.length > 0) {
-          this.searchAddressOptions = data.resultList.map((item, index) => {
-            return {
-              ...item,
-              value: `${item.lonlat + item.address}`,
-              label: `${item.address + item.name}`,
-            };
-          });
-        } else {
-          this.searchAddressOptions = [
-            {
-              value: "0",
-              label: "未检索到结果",
-            },
-          ];
-        }
-      } else {
-        this.searchAddressOptions = [];
-      }
-    },
-
-    handleClickKey(item, fmItem) {
-      console.log("搜索结果", item);
-      let lonlat = item.lonlat.split(" ");
-      map.setCenter(lonlat[1], lonlat[0]);
-      map.setMarker(lonlat[1], lonlat[0]);
-
-      this.fmData[fmItem.supKeys[0]] = parseFloat(lonlat[1]);
-      this.fmData[fmItem.supKeys[1]] = parseFloat(lonlat[0]);
-      this.fmData[fmItem.keyName] = item.label;
-    },
-
-    async getInfo() {
-      let url = this.infoUrl;
-      if (!url) return;
-      const { idName, formId } = this;
-
-      if (url.endsWith("/")) {
-        url += formId;
-      }
-
-      const params = {
-        [idName]: formId,
-      };
-
-      let { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        const { editConfig } = this;
-        console.log("xxxxxxxxxxxxxxxxxxxxxx", editConfig);
-        if (editConfig && typeof editConfig.cookInfoFn == "function") {
-          data = editConfig.cookInfoFn(data);
-        }
-
-        if (data.latitude && data.longitude) {
-          data.latitude = parseFloat(data.latitude);
-          data.longitude = parseFloat(data.longitude);
-        }
-
-        this.fmData = {
-          ...this.fmData,
-          ...data,
-        };
-
-        await nextTick(600);
-        if (map) {
-          if (data.latitude) {
-            map.setCenter(data.latitude, data.longitude);
-            map.setMarker(data.latitude, data.longitude);
-          } else {
-            if (this.formType == "edit" && this.$refs && this.$refs.mapSearch) {
-              this.$refs.mapSearch[0].handleClick();
-            }
-          }
-        }
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    watchImg(src) {
-      window.open(src);
-    },
-
-    // 过滤文本
-    dormatHtml(content) {
-      if (
-        content.startsWith(
-          "<!DOCTYPE html>\n<html>\n<head>\n</head>\n<body>\n"
-        ) &&
-        content.endsWith("\n</body>\n</html>")
-      ) {
-        content = content.slice(45, -16);
-      }
-      return content;
-    },
-
-    cookBeforeSubmit(data) {
-      Object.keys(data).forEach((k) => {
-        if (typeof data[k] == "string") {
-          data[k] = this.dormatHtml(data[k]);
-        }
-      });
-      return data;
-    },
-
-    async handleComfirm() {
-      this.btnDisable = true;
-      setTimeout(() => {
-        this.btnDisable = false;
-      }, 5000);
-
-      console.log(this.$refs["ref_form"]);
-
-      this.$refs["ref_form"].validate((valid, messageObj) => {
-        console.log(valid, messageObj);
-        if (!valid) {
-          app.util.validateRule(messageObj);
-          this.btnDisable = false;
-        } else {
-          if (this.editElseRules) {
-            const validator = new Schema(this.editElseRules);
-            validator
-              .validate(this.fmData)
-              .then(() => {
-                this.submit();
-              })
-              .catch(({ err, fields }) => {
-                console.log("--------------", err, fields);
-                app.util.validateRule(fields);
-              });
-          } else {
-            this.submit();
-          }
-        }
-      });
-    },
-
-    async submit() {
-      const { editConfig, fmData, formType, editFixedParams } = this;
-      if (
-        typeof editConfig.beforeSubmit == "function" &&
-        !editConfig.beforeSubmit(formType, fmData, this)
-      ) {
-        return;
-      }
-
-      let url = "";
-      let params = {
-        ...fmData,
-        ...editFixedParams,
-        // serviceType: this.fmData.serviceTypeArr.join(","),
-      };
-
-      params = this.cookBeforeSubmit(params);
-
-      if (this.formType === "add") {
-        url = this.addUrl;
-      } else {
-        url = this.editUrl;
-      }
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "操作成功",
-        });
-        this.handleCancle();
-        this.$emit("afterEdit");
-        this.btnDisable = false;
-      } else {
-        this.btnDisable = false;
-        this.$message.error(msg);
-      }
-    },
-
-    handleCancle() {
-      this.$emit("close");
-    },
-  },
+	components: { Tinymce },
+
+	props: {
+		formId: {
+			type: String,
+			default: "",
+		},
+		formType: {
+			type: String,
+			default: "info",
+		},
+		formBtnFixed: {
+			type: Boolean,
+			default: true,
+		},
+		idName: {
+			type: String,
+			default: "",
+		},
+		addUrl: {
+			type: String,
+			default: "",
+		},
+		editUrl: {
+			type: String,
+			default: "",
+		},
+		delUrl: {
+			type: String,
+			default: "",
+		},
+		infoUrl: {
+			type: String,
+			default: "",
+		},
+
+		editParams: {
+			type: Array,
+			default: () => [],
+		},
+		editFixedParams: {
+			type: Object,
+			default: () => ({}),
+		},
+		editParamsDiv: {
+			type: Number,
+			default: 0,
+		},
+		editElseRules: {
+			type: Object,
+			default: () => ({}),
+		},
+		editConfig: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+
+	data() {
+		return {
+			iniLoaded: false,
+			loading: false,
+			btnDisable: false,
+
+			fmData: {},
+
+			editParams1: [],
+			editParams2: [],
+
+			uploadUrl:
+				window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
+			customerId: localStorage.getItem("customerId"),
+
+			// 做搜索地址用
+			searchAddressOptions: [],
+			searchAddressKeyword: "",
+		};
+	},
+	computed: {},
+	watch: {
+		editParams: {
+			handler() {
+				this.computeFmData();
+			},
+			deep: true,
+		},
+	},
+
+	async mounted() {
+		this.initForm();
+	},
+
+	methods: {
+		async initForm() {
+			this.iniFmData();
+
+			if (this.formId && this.formType != "add") {
+				this.getInfo();
+			}
+		},
+
+		computeFmData() {
+			console.log(this.fmData);
+		},
+
+		iniFmData() {
+			const { editParams, fmData, editParamsDiv } = this;
+			editParams.forEach((item, index) => {
+				if (typeof item.value == "function") {
+					fmData[item.keyName] = item.value();
+				} else if (
+					typeof item.value == "string" ||
+					typeof item.value == "number" ||
+					typeof item.value == "boolean"
+				) {
+					fmData[item.keyName] = item.value;
+				} else if (typeof item.value == "undefined") {
+					fmData[item.keyName] = "";
+				} else {
+					fmData[item.keyName] = item.value || "";
+					console.error(
+						"不应该直接传入数组或对象的值，这样会导致传入的值被子组件修改。editParams-------------cpts/base/cpts/edit.vue",
+						item
+					);
+				}
+
+				if (item.supValues) {
+					item.supValues.forEach((value, index) => {
+						if (typeof value == "function") {
+							fmData[item.supKeys[index]] = value();
+						} else if (
+							typeof value == "string" ||
+							typeof value == "number" ||
+							typeof value == "boolean"
+						) {
+							fmData[item.supKeys[index]] = value;
+						} else if (typeof value == "undefined") {
+							fmData[item.supKeys[index]] = "";
+						} else {
+							fmData[item.supKeys[index]] = value;
+							console.error(
+								"不应该直接传入数组或对象的值，这样会导致传入的值被子组件修改。editParams-------------cpts/base/cpts/edit.vue",
+								item
+							);
+						}
+					});
+				}
+
+				if (item.type == "select" || item.type == "cascader") {
+					if (item.optionUrl) {
+						if (item.optionUrlMethod == "get") {
+							this.getFmOptionsGet(
+								index,
+								item.optionUrl,
+								item.optionUrlParams || {},
+								item.optionCook || null
+							);
+						} else {
+							this.getFmOptions(
+								index,
+								item.optionUrl,
+								item.optionUrlParams || {},
+								item.optionCook || null
+							);
+						}
+					}
+				} else if (item.type == "address") {
+					this.$nextTick(async () => {
+						await nextTick(300);
+
+						this.initMap(item);
+					});
+				}
+			});
+
+			this.fmData = { ...fmData };
+			if (editParamsDiv) {
+				this.editParams1 = editParams.slice(0, editParamsDiv);
+				this.editParams2 = editParams.slice(editParamsDiv);
+			} else {
+				this.editParams1 = editParams;
+			}
+			console.log("------------------------------------", this.fmData);
+			this.iniLoaded = true;
+		},
+
+		handleClickHtmlNode(e) {
+			//在判断事件目标节点的时候，考虑到兼容性应该统一转换成大写或小写进行判断
+			if (e.target.localName.toLowerCase() === "a") {
+				// 通过判端目标节点以后，就能在这里对其进行操作啦。
+				let url = e.target.getAttribute("src"); //获取a标签属性，我这里自定义了一个属性data-id并将id赋值给了该属性，如何需要获取click方法的参数，需要获取a标签的click属性，并手动解析获取里面的参数
+				window.open(url);
+			}
+		},
+
+		async getFmOptions(index, url, params, cookFn) {
+			const { data, code, msg } = await requestPost(url, {
+				...params,
+			});
+
+			if (code === 0) {
+				this.editParams[index].optionList =
+					typeof cookFn == "function" ? cookFn(data) : data || [];
+			} else {
+				this.$message.error("请求检索基础数据失败！");
+			}
+		},
+
+		async getFmOptionsGet(index, url, params, cookFn) {
+			const { data, code, msg } = await requestGet(url, {
+				...params,
+			});
+
+			if (code === 0) {
+				this.editParams[index].optionList =
+					typeof cookFn == "function" ? cookFn(data) : data || [];
+			} else {
+				this.$message.error("请求检索基础数据失败！");
+			}
+		},
+
+		handleChangeCascader(vals, item) {
+			this.fmData[item["keyName"]] = vals;
+			if (typeof item.handleChangeFn == "function") {
+				item.handleChangeFn(vals, item, this);
+			}
+		},
+		handleChangeSelect(vals, item) {
+			console.log(vals, item);
+			this.fmData[item["keyName"]] = vals;
+			if (typeof item.handleChangeFn == "function") {
+				item.handleChangeFn(vals, item, this);
+			}
+		},
+
+		beforeImgUpload(file, item) {
+			if (typeof item.beforeImgUpload == "function") {
+				if (!item.beforeImgUpload(file, item, this)) return false;
+			}
+			return true;
+		},
+
+		handleImgRemove(file, item) {
+			console.log("handleImgRemove", file);
+			let url = file.response ? file.response.data.url : file.url;
+			if (url) {
+				let { fmData } = this;
+				this.fmData[item.keyName] = fmData[item.keyName].filter(
+					(item) => item.url !== url
+				);
+				if (item.supKeys && Array.isArray(item.supKeys)) {
+					if (item.supKeys.length > 0) {
+						this.fmData[item.supKeys[0]] = fmData[item.keyName].map(
+							(item) => item.url
+						);
+					}
+					if (item.supKeys.length > 1) {
+						this.fmData[item.supKeys[1]] =
+							this.fmData[item.supKeys[0]][0] || "";
+					}
+				}
+			}
+		},
+
+		handleImgExceed(res, item) {
+			console.log(res);
+			// this.$message({
+			//   type: "warning",
+			//   message: "文件数量最多不超过三个",
+			// });
+		},
+
+		handleImgSuccess(res, file, item) {
+			console.log("handleImgSuccess", res);
+			if (res.code === 0 && res.msg === "success") {
+				let { fmData } = this;
+				// let picItem = {
+				//   url: res.data.url,
+				//   name: file.name,
+				//   size: file.size,
+				//   type: file.type,
+				//   format: file.name.split(".").pop(),
+				// };
+				let picItem = file;
+				picItem.url = res.data.url;
+				picItem.format = file.name.split(".").pop();
+
+				if (Array.isArray(this.fmData[item.keyName])) {
+					this.fmData[item.keyName].push(picItem);
+				} else {
+					this.fmData[item.keyName] = [picItem];
+				}
+				if (item.supKeys && Array.isArray(item.supKeys)) {
+					if (item.supKeys.length > 0) {
+						this.fmData[item.supKeys[0]] = fmData[item.keyName].map(
+							(item) => item.url
+						);
+					}
+					if (item.supKeys.length > 1) {
+						this.fmData[item.supKeys[1]] =
+							this.fmData[item.supKeys[0]][0] || "";
+					}
+				}
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+
+		handleImgError(res, file, item) {
+			console.log(res);
+		},
+
+		// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+		initMap(item) {
+			let { latitude, longitude } = this.$store.state.user;
+
+			map = new daiMap(
+				document.getElementById("app_base"),
+				{ latitude, longitude },
+				{
+					zoom: 16.2, // 设置地图缩放级别
+					pitch: 43.5, // 设置俯仰角
+					rotation: 45, // 设置地图旋转角度
+				}
+			);
+
+			// 监听地图平移结束
+			map.on("dragend", (e) => {
+				this.handleMoveCenter(item, e);
+			});
+			map.setCenter(latitude, longitude);
+			map.setMarker(latitude, longitude);
+		},
+
+		async handleSearchMap(item) {
+			const { msg, data } = await map.searchNearby(
+				this.fmData[item.keyName]
+			);
+			if (msg == "success") {
+				const { lat, lng } = data;
+				map.setCenter(lat, lng);
+				map.setMarker(lat, lng);
+				this.fmData[item.supKeys[0]] = lng;
+				this.fmData[item.supKeys[1]] = lat;
+			} else {
+				this.$message.error("未检索到相关位置坐标");
+			}
+		},
+
+		async handleMoveCenter(item, e) {
+			console.log("handleMoveCenter", e);
+			//修改地图中心点
+			const { lat, lng } = map.getCenter();
+			console.log("getCenter", lat);
+
+			this.fmData[item.supKeys[0]] = parseFloat(lng);
+			this.fmData[item.supKeys[1]] = parseFloat(lat);
+			map.setMarker(lat, lng);
+			console.log("setMarker", lat);
+
+			let { msg, data } = await map.getAddress(lat, lng);
+			if (msg == "success") {
+				this.fmData[item.keyName] = data.address;
+				this.searchAddressOptions = [];
+			}
+		},
+
+		async remoteMethod(query) {
+			if (query !== "") {
+				this.loading = true;
+
+				const { msg, data } = await map.searchNearby(query);
+				this.loading = false;
+				console.log("搜索结果", data);
+
+				if (
+					msg == "success" &&
+					data.resultList &&
+					data.resultList.length > 0
+				) {
+					this.searchAddressOptions = data.resultList.map(
+						(item, index) => {
+							return {
+								...item,
+								value: `${item.lonlat + item.address}`,
+								label: `${item.address + item.name}`,
+							};
+						}
+					);
+				} else {
+					this.searchAddressOptions = [
+						{
+							value: "0",
+							label: "未检索到结果",
+						},
+					];
+				}
+			} else {
+				this.searchAddressOptions = [];
+			}
+		},
+
+		handleClickKey(item, fmItem) {
+			console.log("搜索结果", item);
+			let lonlat = item.lonlat.split(" ");
+			map.setCenter(lonlat[1], lonlat[0]);
+			map.setMarker(lonlat[1], lonlat[0]);
+
+			this.fmData[fmItem.supKeys[0]] = parseFloat(lonlat[1]);
+			this.fmData[fmItem.supKeys[1]] = parseFloat(lonlat[0]);
+			this.fmData[fmItem.keyName] = item.label;
+		},
+
+		async getInfo() {
+			let url = this.infoUrl;
+			if (!url) return;
+			const { idName, formId } = this;
+
+			if (url.endsWith("/")) {
+				url += formId;
+			}
+
+			const params = {
+				[idName]: formId,
+			};
+
+			let { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				const { editConfig } = this;
+				console.log("xxxxxxxxxxxxxxxxxxxxxx", editConfig);
+				if (editConfig && typeof editConfig.cookInfoFn == "function") {
+					data = editConfig.cookInfoFn(data);
+				}
+
+				if (data.latitude && data.longitude) {
+					data.latitude = parseFloat(data.latitude);
+					data.longitude = parseFloat(data.longitude);
+				}
+
+				this.fmData = {
+					...this.fmData,
+					...data,
+				};
+
+				await nextTick(600);
+				if (map) {
+					if (data.latitude) {
+						map.setCenter(data.latitude, data.longitude);
+						map.setMarker(data.latitude, data.longitude);
+					} else {
+						if (
+							this.formType == "edit" &&
+							this.$refs &&
+							this.$refs.mapSearch
+						) {
+							this.$refs.mapSearch[0].handleClick();
+						}
+					}
+				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		watchImg(src) {
+			window.open(src);
+		},
+
+		// 过滤文本
+		dormatHtml(content) {
+			if (
+				content.startsWith(
+					"<!DOCTYPE html>\n<html>\n<head>\n</head>\n<body>\n"
+				) &&
+				content.endsWith("\n</body>\n</html>")
+			) {
+				content = content.slice(45, -16);
+			}
+			return content;
+		},
+
+		cookBeforeSubmit(data) {
+			Object.keys(data).forEach((k) => {
+				if (typeof data[k] == "string") {
+					data[k] = this.dormatHtml(data[k]);
+				}
+			});
+			return data;
+		},
+
+		async handleComfirm() {
+			this.btnDisable = true;
+			setTimeout(() => {
+				this.btnDisable = false;
+			}, 5000);
+
+			console.log(this.$refs["ref_form"]);
+
+			this.$refs["ref_form"].validate((valid, messageObj) => {
+				console.log(valid, messageObj);
+				if (!valid) {
+					app.util.validateRule(messageObj);
+					this.btnDisable = false;
+				} else {
+					if (this.editElseRules) {
+						const validator = new Schema(this.editElseRules);
+						validator
+							.validate(this.fmData)
+							.then(() => {
+								this.submit();
+							})
+							.catch(({ err, fields }) => {
+								console.log("--------------", err, fields);
+								app.util.validateRule(fields);
+							});
+					} else {
+						this.submit();
+					}
+				}
+			});
+		},
+
+		async submit() {
+			const { editConfig, fmData, formType, editFixedParams } = this;
+			if (
+				typeof editConfig.beforeSubmit == "function" &&
+				!editConfig.beforeSubmit(formType, fmData, this)
+			) {
+				return;
+			}
+
+			let url = "";
+			let params = {
+				...fmData,
+				...editFixedParams,
+				// serviceType: this.fmData.serviceTypeArr.join(","),
+			};
+
+			params = this.cookBeforeSubmit(params);
+
+			if (this.formType === "add") {
+				url = this.addUrl;
+			} else {
+				url = this.editUrl;
+			}
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.$message({
+					type: "success",
+					message: "操作成功",
+				});
+				this.handleCancle();
+				this.$emit("afterEdit");
+				this.btnDisable = false;
+			} else {
+				this.btnDisable = false;
+				this.$message.error(msg);
+			}
+		},
+
+		handleCancle() {
+			this.$emit("close");
+		},
+	},
 };
 </script>
 
 <style lang="scss" scoped>
 .m-fm {
-  margin-top: 30px;
-
-  &.z-watch {
-    .list {
-      .item {
-      }
-      ::v-deep .item {
-        // 默认输入框placeholder样式
-        .el-input.is-disabled .el-input__inner,
-        .el-textarea.is-disabled textarea.el-textarea__inner {
-          color: #333;
-          background-color: rgba(#000, 0);
-          border-color: rgba(#000, 0);
-          resize: none;
-          transform: translateX(-15px);
-          cursor: default;
-          &::placeholder {
-            color: rgba(#fff, 0);
-          }
-        }
-        .el-input.is-disabled .el-input__suffix {
-          display: none;
-        }
-        .el-checkbox.is-disabled.is-checked .el-checkbox__label {
-          color: #333;
-        }
-        .el-form-item__label {
-          position: relative;
-          text-align: left;
-          padding-left: 35px;
-
-          &::before {
-            content: "";
-            display: block;
-            position: absolute;
-            top: 0;
-            bottom: 0;
-            left: 20px;
-            width: 6px;
-            height: 6px;
-            margin: auto;
-            background: #0c81fe;
-            border-radius: 3px;
-            margin-right: 10px;
-          }
-
-          &::after {
-            content: " :";
-            display: inline;
-            color: #333;
-          }
-        }
-      }
-    }
-  }
-
-  &.z-div {
-    .list {
-      display: flex;
-      flex-wrap: wrap;
-
-      .item {
-        min-width: 45%;
-
-        /deep/ .item-rich-text {
-          width: 817px;
-          max-height: 500px;
-          overflow: auto;
-
-          img {
-            max-width: 100%;
-            height: auto;
-          }
-          &.z-show {
-            box-sizing: border-box;
-            padding: 15px;
-            border: 1px solid #eee;
-            height: auto;
-          }
-        }
-      }
-    }
-
-    .item-show {
-      width: 324px;
-    }
-
-    .item-input {
-      width: 324px;
-    }
-    .item-select {
-      width: 324px;
-    }
-    .item-number {
-      width: 180px;
-    }
-
-    .address-item {
-      width: 350px;
-
-      .address-item-input {
-        width: 74%;
-      }
-      .address-item-input2 {
-        margin-left: 5px;
-        width: 40%;
-      }
-    }
-  }
-
-  .avatar-uploader {
-    &.z-full {
-      /deep/ .el-upload.el-upload--picture-card {
-        display: none !important;
-      }
-    }
-
-    a {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: #65a5f9;
-      i {
-        margin-right: 4px;
-        color: #65a5f9;
-        font-size: 18px;
-      }
-      &:hover {
-        text-decoration: none;
-      }
-    }
-  }
-
-  .item-rich-text {
-    width: 600px;
-    height: 500px;
-    img {
-      max-width: 100%;
-    }
-    .item-show {
-      width: 100%;
-    }
-  }
-
-  .item-select,
-  .item-show,
-  .item-input {
-    width: 450px;
-  }
-  .item-number {
-    width: 225px;
-  }
-
-  .address-item {
-    width: 450px;
-
-    .address-item-input {
-      width: 85%;
-    }
-    .address-item-input2 {
-      margin-left: 5px;
-      width: 40%;
-    }
-  }
-  .div_map {
-    margin-top: 10px;
-  }
+	margin-top: 30px;
+
+	&.z-watch {
+		.list {
+			.item {
+			}
+			::v-deep .item {
+				// 默认输入框placeholder样式
+				.el-input.is-disabled .el-input__inner,
+				.el-textarea.is-disabled textarea.el-textarea__inner {
+					color: #333;
+					background-color: rgba(#000, 0);
+					border-color: rgba(#000, 0);
+					resize: none;
+					transform: translateX(-15px);
+					cursor: default;
+					&::placeholder {
+						color: rgba(#fff, 0);
+					}
+				}
+				.el-input.is-disabled .el-input__suffix {
+					display: none;
+				}
+				.el-checkbox.is-disabled.is-checked .el-checkbox__label {
+					color: #333;
+				}
+				.el-form-item__label {
+					position: relative;
+					text-align: left;
+					padding-left: 35px;
+
+					&::before {
+						content: "";
+						display: block;
+						position: absolute;
+						top: 0;
+						bottom: 0;
+						left: 20px;
+						width: 6px;
+						height: 6px;
+						margin: auto;
+						background: #0c81fe;
+						border-radius: 3px;
+						margin-right: 10px;
+					}
+
+					&::after {
+						content: " :";
+						display: inline;
+						color: #333;
+					}
+				}
+			}
+		}
+	}
+
+	&.z-div {
+		.list {
+			display: flex;
+			flex-wrap: wrap;
+
+			.item {
+				min-width: 45%;
+
+				/deep/ .item-rich-text {
+					width: 817px;
+					max-height: 500px;
+					overflow: auto;
+
+					img {
+						max-width: 100%;
+						height: auto;
+					}
+					&.z-show {
+						box-sizing: border-box;
+						padding: 15px;
+						border: 1px solid #eee;
+						height: auto;
+					}
+				}
+			}
+		}
+
+		.item-show {
+			width: 324px;
+		}
+
+		.item-input {
+			width: 324px;
+		}
+		.item-select {
+			width: 324px;
+		}
+		.item-number {
+			width: 180px;
+		}
+
+		.address-item {
+			width: 350px;
+
+			.address-item-input {
+				width: 74%;
+			}
+			.address-item-input2 {
+				margin-left: 5px;
+				width: 40%;
+			}
+		}
+	}
+
+	.avatar-uploader {
+		&.z-full {
+			/deep/ .el-upload.el-upload--picture-card {
+				display: none !important;
+			}
+		}
+
+		a {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #65a5f9;
+			i {
+				margin-right: 4px;
+				color: #65a5f9;
+				font-size: 18px;
+			}
+			&:hover {
+				text-decoration: none;
+			}
+		}
+	}
+
+	.item-rich-text {
+		width: 600px;
+		height: 500px;
+		img {
+			max-width: 100%;
+		}
+		.item-show {
+			width: 100%;
+		}
+	}
+
+	.item-select,
+	.item-show,
+	.item-input {
+		width: 450px;
+	}
+	.item-number {
+		width: 225px;
+	}
+
+	.address-item {
+		width: 450px;
+
+		.address-item-input {
+			width: 85%;
+		}
+		.address-item-input2 {
+			margin-left: 5px;
+			width: 40%;
+		}
+	}
+	.div_map {
+		margin-top: 10px;
+	}
 }
 </style>
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 7e66c19..6d0e3b7 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -259,7 +259,7 @@
 </template>
 
 <script>
-import { requestPost } from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 import { mapGetters } from "vuex";
 import axios from "axios";
 import editForm from "./cpts/edit";
@@ -452,12 +452,21 @@ export default {
       searchParams.forEach((item, index) => {
         if (item.type == "select" || item.type == "cascader") {
           if (item.optionUrl) {
-            this.getFmOptions(
-              index,
-              item.optionUrl,
-              item.optionUrlParams || {},
-              item.optionCook || null
-            );
+            if (item.optionUrlMethod == "get") {
+							this.getFmOptionsGet(
+								index,
+								item.optionUrl,
+								item.optionUrlParams || {},
+								item.optionCook || null
+							);
+						} else {
+							this.getFmOptions(
+								index,
+								item.optionUrl,
+								item.optionUrlParams || {},
+								item.optionCook || null
+							);
+						}
           }
         }
       });
@@ -476,6 +485,19 @@ export default {
       }
     },
 
+    async getFmOptionsGet(index, url, params, cookFn) {
+			const { data, code, msg } = await requestGet(url, {
+        ...params,
+      });
+
+      if (code === 0) {
+        this.searchParams[index].optionList =
+          typeof cookFn == "function" ? cookFn(data) : data || [];
+      } else {
+        this.$message.error("请求检索基础数据失败！");
+      }
+		},
+
     handleChangeCascader (vals, item) {
       if (typeof item.handleChangeFn == "function") {
         item.handleChangeFn(vals, item);
diff --git a/src/views/modules/lingshan/aqsc/qyda.vue b/src/views/modules/lingshan/aqsc/qyda.vue
new file mode 100644
index 0000000..935ca53
--- /dev/null
+++ b/src/views/modules/lingshan/aqsc/qyda.vue
@@ -0,0 +1,280 @@
+<template>
+	<div>
+		<base-page
+			:searchParams="searchParams"
+			:tableParams="tableParams"
+			:tableUrl="tableUrl"
+			:addUrl="addUrl"
+			:editUrl="editUrl"
+			:delUrl="delUrl"
+			:editAuth="editAuth"
+			:delAuth="delAuth"
+			:infoUrl="infoUrl"
+			:exportUrl="exportUrl"
+			:importUrl="importUrl"
+			:mubanUrl="mubanUrl"
+			:editParams="editParams"
+			:editElseRules="editElseRules"
+			:editBtnName="(item) => (!item.latitude ? '待完善' : '修改')"
+			idName="icDangerousChemicalsId"
+		></base-page>
+	</div>
+</template>
+
+<script>
+import basePage from "@/views/modules/cpts/base/index";
+import { getItemByIdInCascader, collapse } from "@/utils/cascader";
+
+export default {
+	props: {},
+
+	data() {
+		return {
+			searchParams: [
+				{ field: "企业名称", keyName: "name", type: "input" },
+				{
+					field: "企业类别",
+					keyName: "category",
+					type: "select",
+					optionUrl:
+						"/gov/org/coverage/dict-select-list/dangerous_chemicals",
+					optionUrlParams: {},
+					optionList: [],
+				},
+				{ field: "企业地址", keyName: "address", type: "input" },
+				{ field: "联系人", keyName: "principalName", type: "input" },
+				{
+					field: "安全负责人",
+					keyName: "securityPrincipalName",
+					type: "input",
+				},
+			],
+
+			tableParams: [
+				{ field: "序号", keyName: "", type: "no" },
+				{ field: "所属组织", keyName: "orgName", type: "text" },
+				{ field: "企业名称", keyName: "name", type: "text" },
+				{ field: "企业类别", keyName: "categoryName", type: "text" },
+				{ field: "企业地址", keyName: "address", type: "text" },
+				{ field: "联系人", keyName: "principalName", type: "text" },
+				{ field: "联系电话", keyName: "principalMobile", type: "text" },
+				{
+					field: "安全负责人",
+					keyName: "securityPrincipalName",
+					type: "text",
+				},
+				{
+					field: "安全负责人电话",
+					keyName: "securityPrincipalMobile",
+					type: "text",
+				},
+			],
+			tableUrl: "/gov/org/icDangerousChemicals/list",
+			mubanUrl: "/gov/org/icDangerousChemicals/download",
+			importUrl: "/gov/org/icDangerousChemicals/import",
+			exportUrl: "/gov/org/icDangerousChemicals/export",
+
+			addUrl: "/gov/org/icDangerousChemicals/add",
+			editUrl: "/gov/org/icDangerousChemicals/edit",
+			infoUrl: "/gov/org/icDangerousChemicals/detail",
+			delUrl: "/gov/org/icDangerousChemicals/del",
+			editAuth(item) {
+				return item.agencyId == this.$store.state.user.agencyId;
+			},
+			delAuth(item) {
+				return item.agencyId == this.$store.state.user.agencyId;
+			},
+
+			editParams: [
+				{
+					field: "所属组织",
+					keyName: "orgId",
+					type: "cascader",
+					value: () => [],
+					supKeys: ["orgType"],
+					supValues: [""],
+					optionUrl: "/gov/org/customeragency/agencygridtree",
+					optionUrlParams: {
+						agencyId: this.$store.state.user.agencyId,
+					},
+					optionList: [],
+					optionProps: {
+						multiple: false,
+						value: "agencyId",
+						label: "agencyName",
+						children: "subAgencyList",
+						checkStrictly: true,
+						emitPath: false,
+					},
+					optionCook(obj) {
+						return [obj];
+					},
+					handleChangeFn(val, item, that) {
+						const { optionList } = item;
+						const optionPlaneList = collapse(
+							optionList,
+							"subAgencyList"
+						);
+						if (val) {
+							let selectedItem = getItemByIdInCascader(
+								optionPlaneList,
+								[val],
+								"agencyId",
+								"subAgencyList"
+							)[0];
+							that.fmData[item["keyName"]] =
+								selectedItem.agencyId;
+							that.fmData[item["supKeys"][0]] =
+								selectedItem.level == "grid"
+									? "grid"
+									: "agency";
+							console.log("handleChangeFn", selectedItem);
+						} else {
+							that.fmData[item["keyName"]] = "";
+							that.fmData[item["supKeys"][0]] = "";
+						}
+					},
+					rules: [
+						{
+							required: true,
+							message: "所属组织不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "企业名称",
+					keyName: "name",
+					type: "input",
+					maxlength: 50,
+					editDisabled: false,
+					rules: [
+						{
+							required: true,
+							message: "企业名称不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "企业类别",
+					keyName: "category",
+					type: "select",
+					optionUrl:
+						"/gov/org/coverage/dict-select-list/dangerous_chemicals",
+					optionUrlParams: {
+						// dictType: "ic_service_type",
+					},
+					optionList: [],
+					editDisabled: false,
+					rules: [
+						{
+							required: true,
+							message: "企业类别不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+
+				{
+					field: "是否重点安全企业",
+					keyName: "securityFlag",
+					type: "select",
+					optionUrl: "",
+					optionUrlParams: {},
+					optionList: [
+						{
+							value: true,
+							label: "是",
+						},
+						{
+							value: false,
+							label: "否",
+						},
+					],
+					editDisabled: false,
+					rules: [
+						{
+							required: true,
+							message: "是否重点安全企业不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "联系人",
+					keyName: "principalName",
+					type: "input",
+					maxlength: 50,
+				},
+				{
+					field: "联系电话",
+					keyName: "principalMobile",
+					type: "input",
+					maxlength: 50,
+				},
+				{
+					field: "安全负责人",
+					keyName: "securityPrincipalName",
+					type: "input",
+					maxlength: 50,
+				},
+				{
+					field: "安全负责人电话",
+					keyName: "securityPrincipalMobile",
+					type: "input",
+					maxlength: 50,
+				},
+				{
+					field: "包企领导",
+					keyName: "bqLd",
+					type: "input",
+					maxlength: 50,
+				},
+				{
+					field: "包企干部",
+					keyName: "bqGb",
+					type: "input",
+					maxlength: 50,
+				},
+				{
+					field: "企业地址",
+					keyName: "address",
+					type: "address",
+					maxlength: 50,
+					supKeys: ["longitude", "latitude"],
+					supValues: ["", ""],
+					rules: [
+						{
+							required: true,
+							message: "经营地址坐标不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "企业介绍",
+					keyName: "companyProfile",
+					type: "textarea",
+				},
+			],
+			editElseRules: {
+				longitude: {
+					type: "number",
+					required: true,
+					message: "请拖动地图选择坐标点",
+				},
+			},
+		};
+	},
+	components: { basePage },
+	computed: {},
+	watch: {},
+
+	async mounted() {},
+
+	methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/modules/lingshan/djyl/article/conf.js b/src/views/modules/lingshan/djyl/article/conf.js
new file mode 100644
index 0000000..616b8f4
--- /dev/null
+++ b/src/views/modules/lingshan/djyl/article/conf.js
@@ -0,0 +1,2 @@
+// 文章一级栏目id 先写死吧
+export const parentCategoryId = "1645734953282990082";
diff --git a/src/views/modules/lingshan/djyl/article/cpts/offline.vue b/src/views/modules/lingshan/djyl/article/cpts/offline.vue
new file mode 100644
index 0000000..8a5eee9
--- /dev/null
+++ b/src/views/modules/lingshan/djyl/article/cpts/offline.vue
@@ -0,0 +1,221 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form
+        ref="ref_form"
+        :inline="true"
+        :model="fmData"
+        :rules="dataRule"
+        class="form"
+      >
+        <el-form-item
+          label="文章名称"
+          prop="title"
+          label-width="150px"
+          style="display: block"
+        >
+          <div style="width: 610px">
+            {{ fmData.title || "--" }}
+          </div>
+        </el-form-item>
+
+        <el-form-item
+          label="下线网格	"
+          prop="gridIdList"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-cascader
+            v-model="fmData.gridIdList"
+            placeholder="请选择"
+            :options="gridOptions"
+            :props="{
+              multiple: true,
+              value: 'value',
+              label: 'label',
+              children: 'children',
+              checkStrictly: false,
+              emitPath: false,
+            }"
+            :show-all-levels="false"
+            size="small"
+            clearable
+            class="item-select"
+            style="width: 500px"
+            @change="handleChangeCascader"
+          >
+          </el-cascader>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="div_btn resi-btns">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  props: {},
+
+  data() {
+    return {
+      btnDisable: false,
+
+      fmData: {
+        articleId: "",
+        title: "",
+        gridIdList: [],
+      },
+
+      gridOptions: [],
+    };
+  },
+  components: {},
+  computed: {
+    dataRule() {
+      return {
+        gridIdList: [
+          { required: true, message: "下线网格不能为空", trigger: "blur" },
+        ],
+      };
+    },
+  },
+  watch: {},
+
+  async mounted() {},
+
+  methods: {
+    handleChangeCascader(e) {
+      console.log(e);
+    },
+    async initForm({ articleId, title }) {
+      this.fmData.articleId = articleId;
+      this.fmData.title = title;
+      this.fmData.gridIdList = [];
+      this.gridOptions = [];
+      this.getGridOpitons(articleId);
+    },
+
+    async getGridOpitons(articleId) {
+      const url = "/gov/voice/article/publishgridlist";
+      const params = {
+        articleId,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        function poll(list) {
+          return list.map((item) => {
+            return {
+              label: item.agencyName,
+              value: item.agencyId,
+              type: "agency",
+              children: [
+                ...poll(item.subAgencyGridList),
+                ...item.gridList.map((grid) => ({
+                  label: grid.gridName,
+                  value: grid.gridId,
+                  type: "grid",
+                })),
+              ],
+            };
+          });
+        }
+        let gridOptions = poll([data.agencyGridList]);
+        console.log(gridOptions);
+        this.gridOptions = gridOptions;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async handleComfirm() {
+      this.btnDisable = true;
+      setTimeout(() => {
+        this.btnDisable = false;
+      }, 5000);
+      this.$refs["ref_form"].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj);
+          this.btnDisable = false;
+        } else {
+          this.submit();
+        }
+      });
+    },
+
+    async submit() {
+      let url = "/gov/voice/article/offlinearticle";
+
+      let params = { ...this.fmData };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功",
+        });
+        this.$emit("afterOffline");
+        this.btnDisable = false;
+      } else {
+        this.btnDisable = false;
+        this.$message.error(msg);
+      }
+    },
+
+    handleCancle() {
+      this.$emit("close");
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.item_width_1 {
+  width: 500px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+.item_width_4 {
+  width: 200px;
+}
+
+.div_map {
+  margin-top: 10px;
+}
+
+.div_btn {
+  // display: flex;
+  // justify-content: flex-end;
+}
+.el-tabs {
+  margin: 0 20px;
+}
+.el-upload__tip {
+  color: rgb(155, 155, 155);
+  margin: 0;
+}
+.form {
+  margin-top: 30px;
+}
+
+.attachement-list {
+}
+</style>
diff --git a/src/views/modules/lingshan/djyl/article/drafts.vue b/src/views/modules/lingshan/djyl/article/drafts.vue
new file mode 100644
index 0000000..9f5245c
--- /dev/null
+++ b/src/views/modules/lingshan/djyl/article/drafts.vue
@@ -0,0 +1,479 @@
+<template>
+	<div>
+		<base-page
+			ref="basePage"
+			:searchParams="searchParams"
+			:tableParams="tableParams"
+			:tableUrl="tableUrl"
+			:addUrl="addUrl"
+			:editUrl="editUrl"
+			:delUrl="delUrl"
+			:editAuth="editAuth"
+			:delAuth="delAuth"
+			:infoUrl="infoUrl"
+			:exportUrl="exportUrl"
+			:importUrl="importUrl"
+			:mubanUrl="mubanUrl"
+			:editParams="editParams"
+			:editFixedParams="editFixedParams"
+			:editElseRules="editElseRules"
+			:editConfig="editConfig"
+			:editParamsDiv="5"
+			:infoAuth="() => false"
+			:formBtnFixed="true"
+			idName="draftId"
+		>
+			<template v-slot:editOperateSup="{ id, formType, info }">
+				<el-button
+					v-if="formType != 'watch' && info.richTextFlag == '1'"
+					type="warning"
+					size="small"
+					:disabled="draftBtnDisable"
+					@click="handleClickDraft(info)"
+					>存草稿</el-button
+				>
+			</template>
+		</base-page>
+	</div>
+</template>
+
+<script>
+import basePage from "@/views/modules/cpts/base/index";
+import { getItemByIdInCascader, collapse } from "@/utils/cascader";
+import { requestPost } from "@/js/dai/request";
+import dateFormat from "dai-js/tools/dateFormat.js";
+import { parentCategoryId } from "./conf";
+
+export default {
+	props: {},
+
+	data() {
+		return {
+			draftBtnDisable: false,
+
+			searchParams: [
+				{ field: "文章标题", keyName: "title", type: "input" },
+				{
+					field: "创建时间",
+					keyName: "createdTime",
+					type: "date-range",
+					supKeys: ["startDate", "endDate"],
+					supValues: ["", ""],
+				},
+			],
+
+			tableParams: [
+				{ field: "序号", keyName: "", type: "no" },
+				{ field: "文章标题", keyName: "title", type: "text" },
+				{ field: "创建时间", keyName: "createdTime", type: "text" },
+			],
+			tableUrl: "/gov/voice/draft/draftListV2",
+			mubanUrl: "",
+			importUrl: "",
+			exportUrl: "",
+
+			addUrl: "",
+			editUrl: "/gov/voice/article/addOrSaveDraft",
+			infoUrl: "/gov/voice/draft/detailV2",
+			delUrl: "/gov/voice/draft/deletedraft",
+			editAuth(item) {
+				return true;
+			},
+			delAuth(item) {
+				return true;
+			},
+
+			editParams: [
+				{
+					field: "所属栏目",
+					keyName: "tagIds",
+					type: "select",
+					value: parentCategoryId,
+					multiple: true,
+					optionUrl: `/gov/voice/categoryDict/subCategories?parentCategoryId=${parentCategoryId}`,
+					optionUrlParams: {},
+					optionList: [],
+					optionCook(list) {
+						return [
+							list.map((item) => ({
+								label: item.categoryName,
+								value: item.id,
+							})),
+						];
+					},
+					rules: [
+						{
+							required: true,
+							message: "所属栏目不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "文章标题",
+					keyName: "title",
+					type: "input",
+					maxlength: 50,
+					editDisabled: true,
+					rules: [
+						{
+							required: true,
+							message: "文章标题不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "封面图片",
+					keyName: "imgArr",
+					type: "upload",
+					limit: 1,
+					listType: "picture-card",
+					editDisabled: true,
+					rules: [],
+					value: () => [],
+					uploadUrl:
+						window.SITE_CONFIG["apiURL"] +
+						"/oss/file/article/upload",
+					supKeys: ["imgUrlArr", "imgUrl"],
+					supValues: [() => [], ""],
+					beforeImgUpload(file, item, that) {
+						console.log(file);
+						const isLt1M = file.size / 1024 / 1024 < 10;
+						const srcType = file.type;
+
+						if (!isLt1M) {
+							that.$message.error("上传文件大小不能超过 10MB!");
+							return false;
+						}
+						if (srcType.indexOf("image") == -1) {
+							that.$message.error("仅限图片格式");
+							return false;
+						}
+						return true;
+					},
+				},
+				{
+					field: "发布范围",
+					keyName: "gridIdList",
+					type: "cascader",
+					value: [],
+					supKeys: ["publishRangeDesc"],
+					supValues: [""],
+					optionUrl: "/gov/org/customeragency/agencygridtree",
+					optionUrlParams: {
+						agencyId: this.$store.state.user.agencyId,
+					},
+					optionList: [],
+					optionProps: {
+						multiple: true,
+						value: "agencyId",
+						label: "agencyName",
+						children: "subAgencyList",
+						checkStrictly: false,
+						emitPath: false,
+					},
+					optionCook(obj) {
+						return [obj];
+					},
+					handleChangeFn(vals, item, that) {
+						console.log("handleChangeFn", vals);
+						const { optionList } = item;
+						const optionPlaneList = collapse(
+							optionList,
+							"subAgencyList"
+						);
+						if (vals.length > 0) {
+							let selectedList = vals.map(
+								(v) =>
+									getItemByIdInCascader(
+										optionPlaneList,
+										[v],
+										"agencyId",
+										"subAgencyList"
+									)[0]
+							);
+							console.log("handleChangeFn", selectedList);
+							let selectedFilterList = selectedList.filter(
+								(a) => a.level == "grid"
+							);
+							that.fmData[item["keyName"]] =
+								selectedFilterList.map((a) => a.agencyId);
+							that.fmData[item["supKeys"][0]] = selectedFilterList
+								.map((a) => a.agencyName)
+								.join("、");
+						} else {
+						}
+					},
+					rules: [
+						{
+							required: true,
+							message: "发布范围不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "发布时间",
+					keyName: "publishDate",
+					type: "date",
+					value: dateFormat(new Date(), "yyyy-MM-dd"),
+					pickerOptions: {
+						disabledDate(time) {
+							return time.getTime() > Date.now();
+						},
+					},
+					rules: [
+						{
+							required: true,
+							message: "发布时间不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "发布单位",
+					keyName: "publisher",
+					type: "select",
+					optionUrl: "/gov/voice/article/publishagencylist",
+					optionList: [],
+					optionType: "group",
+					supKeys: ["publisherName", "publisherType"],
+					supValues: ["", ""],
+					optionCook(data) {
+						let ret = [];
+						const {
+							agencyDeptList,
+							agencyGridList,
+							agencyId,
+							agencyName,
+						} = data;
+						if (agencyId) {
+							ret.push({
+								label: "以组织名义",
+								optionList: [
+									{
+										label: agencyName,
+										value: agencyId,
+										type: "agency",
+									},
+								],
+							});
+						}
+						if (
+							Array.isArray(agencyDeptList) &&
+							agencyDeptList.length > 0
+						) {
+							ret.push({
+								label: "以部门名义",
+								optionList: [
+									...agencyDeptList.map((d) => ({
+										label: d.agencyDeptName,
+										value: d.departmentId,
+										type: "department",
+									})),
+								],
+							});
+						}
+						if (
+							Array.isArray(agencyGridList) &&
+							agencyGridList.length > 0
+						) {
+							ret.push({
+								label: "以网格名义",
+								optionList: [
+									...agencyGridList.map((d) => ({
+										label: d.agencyGridName,
+										value: d.gridId,
+										type: "grid",
+									})),
+								],
+							});
+						}
+						return ret;
+					},
+					handleChangeFn(vals, item, that) {
+						const { optionList } = item;
+						let opts = [];
+						optionList.forEach((g) => {
+							opts = [...opts, ...g.optionList];
+						});
+						let publisher = opts.find((p) => vals == p.value);
+						that.fmData[item["supKeys"][0]] = publisher.label;
+						that.fmData[item["supKeys"][1]] = publisher.type;
+					},
+					rules: [
+						{
+							required: true,
+							message: "发布单位不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "文章标签",
+					keyName: "tagNameList",
+					type: "select",
+					multiple: true,
+					filterable: true,
+					allowCreate: true,
+					optionUrl: "/gov/voice/tag/taglist",
+					optionUrlParams: {},
+					optionList: [],
+					optionCook(list) {
+						return list.map((item) => ({
+							label: item.tagName,
+							value: item.tagName,
+						}));
+					},
+				},
+				{
+					field: "内容",
+					keyName: "content",
+					type: "rich-text",
+					rules: [
+						{
+							required: true,
+							message: "内容不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					// 需要转换一下，后端给的参数不适用
+					field: "附件",
+					keyName: "fileList2",
+					type: "upload",
+					limit: 3,
+					listType: "file",
+					editDisabled: true,
+					rules: [],
+					value: () => [],
+					uploadUrl:
+						window.SITE_CONFIG["apiURL"] +
+						"/oss/file/article/upload",
+					supKeys: ["fileListArr2", "fileListItem2"],
+					supValues: [() => [], ""],
+					beforeImgUpload(file, item, that) {
+						console.log(file);
+						const isLt1M = file.size / 1024 / 1024 < 10;
+						const srcType = file.type.toLowerCase();
+
+						if (!isLt1M) {
+							that.$message.error("上传文件大小不能超过 10MB!");
+							return false;
+						}
+						if (srcType.indexOf("pdf") == -1) {
+							that.$message.error("仅限pdf格式");
+							return false;
+						}
+						return true;
+					},
+				},
+				{
+					field: "置顶",
+					keyName: "isTop",
+					type: "switch",
+					activeValue: "1",
+					inactiveValue: "0",
+				},
+			],
+			editFixedParams: {
+				type: "article",
+			},
+			editElseRules: {},
+			editConfig: {
+				confirmBtnName: "发布",
+				cookInfoFn(data) {
+					if (data.richTextFlag == "0") {
+						data.content = data.contentList
+							.map((item) => {
+								if (item.contentType == "text") {
+									return `<p>${item.content}</p>`;
+								} else if (item.contentType == "img") {
+									return `<img src="${item.content}" style="max-width:100%"></img>`;
+								} else if (item.contentType == "video") {
+									return `<video src="${item.content}" style="max-width:100%" controls></video>`;
+								} else if (item.contentType == "file") {
+									return `<a src="${item.content}" target="_blank">附件：${item.fileName}</a>`;
+								}
+							})
+							.join(" ");
+					} else {
+						data.content =
+							Array.isArray(data.contentList) &&
+							data.contentList.length > 0
+								? data.contentList[0].content
+								: "";
+					}
+					if (data.imgUrl) {
+						data.imgArr = [
+							{
+								name: "封面",
+								url: data.imgUrl,
+							},
+						];
+						data.imgUrlArr = [data.imgUrl];
+					}
+					data.fileList2 = (data.fileList || []).map((item) => ({
+						url: item.content,
+						name: item.fileName,
+						size: 0,
+						type: item.content.split(".").pop(),
+						format: item.content.split(".").pop(),
+					}));
+
+					return data;
+				},
+
+				beforeSubmit(formType, fmData, that) {
+					if (fmData.isTop == "1" && !fmData.imgUrl) {
+						that.$message.error("请上传封面图片");
+						return false;
+					}
+					fmData.fileList = (fmData.fileList2 || []).map((item) => ({
+						content: item.url,
+						fileName: item.name,
+						contentType: "file",
+					}));
+					return true;
+				},
+			},
+		};
+	},
+	components: { basePage },
+	computed: {},
+	watch: {},
+
+	async mounted() {},
+
+	methods: {
+		async handleClickDraft(fmData) {
+			let url = "/gov/voice/article/addOrSaveDraft";
+			let params = {
+				...fmData,
+				type: "draft",
+			};
+			params =
+				this.$refs.basePage.$refs.editForm.cookBeforeSubmit(params);
+			if (!params.title && !params.content) {
+				return this.$message.error("标题或内容不能为空");
+			}
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.$message({
+					type: "success",
+					message: "保存成功",
+				});
+				this.$refs.basePage.handleClose();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/modules/lingshan/djyl/article/index.vue b/src/views/modules/lingshan/djyl/article/index.vue
new file mode 100644
index 0000000..7249c4f
--- /dev/null
+++ b/src/views/modules/lingshan/djyl/article/index.vue
@@ -0,0 +1,831 @@
+<template>
+	<div>
+		<base-page
+			ref="basePage"
+			:searchParams="searchParams"
+			:tableParams="tableParams"
+			:tableUrl="tableUrl"
+			:addUrl="addUrl"
+			:editUrl="editUrl"
+			:delUrl="delUrl"
+			:editAuth="editAuth"
+			:delAuth="delAuth"
+			:infoUrl="infoUrl"
+			:exportUrl="exportUrl"
+			:importUrl="importUrl"
+			:mubanUrl="mubanUrl"
+			:editParams="editParams"
+			:editFixedParams="editFixedParams"
+			:editElseRules="editElseRules"
+			:editConfig="editConfig"
+			:editParamsDiv="5"
+			:editBtnName="(item) => '修改'"
+			:formBtnFixed="true"
+			idName="articleId"
+		>
+			<template v-slot:editOperateSup="{ id, formType, info }">
+				<el-button
+					v-if="formType == 'add'"
+					type="warning"
+					size="small"
+					:disabled="draftBtnDisable"
+					@click="handleClickDraft(info)"
+					>存草稿</el-button
+				>
+			</template>
+
+			<template v-slot:listBtnSup="{ item }">
+				<el-button
+					v-if="
+						item.statusFlag == 'published' &&
+						item.agencyId == $store.state.user.agencyId
+					"
+					@click="handleOfflineShow(item)"
+					type="text"
+					size="small"
+					style="color: #666"
+					>下线</el-button
+				>
+			</template>
+
+			<template v-slot:listBtnbefore="{ item }">
+				<el-button
+					v-if="item.isTop == '1'"
+					v-show="item.statusFlag == 'published'"
+					@click="handleCancleTopArticle(item, 'cancel_top')"
+					type="text"
+					size="small"
+					style="color: #fe6252"
+					>取消置顶</el-button
+				>
+				<el-button
+					v-show="item.statusFlag == 'published'"
+					v-else
+					@click="handleTopArticle(item, 'top')"
+					type="text"
+					size="small"
+					style="color: #22c1c3"
+					>置顶</el-button
+				>
+			</template>
+		</base-page>
+
+		<el-dialog
+			:visible.sync="offlineShowed"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			title="下线"
+			width="850px"
+			top="5vh"
+			class="dialog-h"
+			@closed="offlineShowed = false"
+		>
+			<offline
+				ref="offlineForm"
+				@close="offlineShowed = false"
+				@afterOffline="handleOfflineSuccess"
+			></offline>
+		</el-dialog>
+		<el-dialog
+			:visible.sync="showAddImage"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			title="上传封面图片"
+			width="650px"
+			top="5vh"
+			class="dialog-h"
+			@closed="showAddImage = false"
+		>
+			<div class="dialog-h-content scroll-h">
+				<!-- <span>请先上 传封面图片</span> -->
+				<el-form
+					ref="ref_form"
+					:inline="true"
+					:model="formData"
+					class="div_form"
+				>
+					<div class="form_flex">
+						<div class="form_item">
+							<el-form-item
+								label=""
+								prop="selImgUrl"
+								label-width="150px"
+								style="display: block"
+							>
+								<el-upload
+									:headers="$getElUploadHeaders()"
+									:class="[
+										'avatar-uploader',
+										{ hide: hideUploadBtn },
+									]"
+									ref="uploadPic"
+									:action="uploadUlr"
+									list-type="picture-card"
+									:on-exceed="exceedPic"
+									:before-upload="beforeAvatarUpload"
+									:on-remove="removePic"
+									:file-list="replayImgList"
+									:on-change="handleEditChange"
+									:on-success="handleSuccess"
+									:limit="1"
+								>
+									<span class="font-14">选择图片</span>
+								</el-upload>
+							</el-form-item>
+						</div>
+					</div>
+				</el-form>
+			</div>
+			<div class="div_btn">
+				<el-button size="small" @click="showAddImage = false"
+					>取 消</el-button
+				>
+				<el-button size="small" type="primary" @click="handleAddImage"
+					>确 定</el-button
+				>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+import basePage from "@/views/modules/cpts/base/index";
+import { getItemByIdInCascader, collapse } from "@/utils/cascader";
+import { requestPost } from "@/js/dai/request";
+import dateFormat from "dai-js/tools/dateFormat.js";
+import nextTick from "dai-js/tools/nextTick";
+import offline from "./cpts/offline";
+import { parentCategoryId } from "./conf";
+
+export default {
+	props: {},
+
+	data() {
+		return {
+			offlineShowed: false,
+
+			draftBtnDisable: false,
+
+			searchParams: [
+				{
+					field: "所属栏目",
+					keyName: "category",
+					type: "select",
+					value: parentCategoryId,
+					multiple: false,
+					optionUrl: `/gov/voice/categoryDict/subCategories?parentCategoryId=${parentCategoryId}`,
+					optionUrlMethod: "get",
+					optionUrlParams: {},
+					optionList: [],
+					optionCook(list) {
+						return [
+							{
+								label: "全部",
+								value: parentCategoryId,
+							},
+							...list.map((item) => ({
+								label: item.categoryName,
+								value: item.id,
+							})),
+						];
+					},
+				},
+				{ field: "文章标题", keyName: "title", type: "input" },
+				{
+					field: "标签",
+					keyName: "tagIds",
+					type: "select",
+					multiple: true,
+					optionUrl: "/gov/voice/tag/taglist",
+					optionUrlParams: {},
+					optionList: [],
+					optionCook(list) {
+						return list.map((item) => ({
+							label: item.tagName,
+							value: item.tagId,
+						}));
+					},
+				},
+				{
+					field: "状态",
+					keyName: "statusFlag",
+					value: "",
+					type: "select",
+					optionUrl: "",
+					optionUrlParams: {},
+					optionList: [
+						{
+							label: "已发布",
+							value: "published",
+						},
+						{
+							label: "已下线",
+							value: "offline",
+						},
+					],
+				},
+				{
+					field: "发布范围",
+					keyName: "publishRangeIds",
+					type: "cascader",
+					optionUrl: "/gov/org/customeragency/agencygridtree",
+					optionUrlParams: {
+						agencyId: this.$store.state.user.agencyId,
+					},
+					optionList: [],
+					optionProps: {
+						multiple: false,
+						value: "agencyId",
+						label: "agencyName",
+						children: "subAgencyList",
+						checkStrictly: true,
+					},
+					optionCook(obj) {
+						return [obj];
+					},
+					supKeys: ["publishRangeId", "publishRangeType"],
+					supValues: ["", ""],
+					handleChangeFn(vals, item) {
+						const { optionList } = item;
+						if (vals.length > 0) {
+							item["supValues"][0] = vals[vals.length - 1];
+							item["supValues"][1] = getItemByIdInCascader(
+								optionList,
+								vals,
+								"agencyId",
+								"subAgencyList"
+							)[vals.length - 1]["level"];
+							item["supValues"][1] =
+								item["supValues"][1] == "grid"
+									? "grid"
+									: "agency";
+						} else {
+							item["supValues"][0] = "";
+							item["supValues"][1] = "";
+						}
+					},
+				},
+				{
+					field: "发布时间",
+					keyName: "publishTime",
+					type: "date-range",
+					supKeys: ["startDate", "endDate"],
+					supValues: ["", ""],
+				},
+			],
+
+			tableParams: [
+				{ field: "序号", keyName: "", type: "no" },
+				{ field: "文章标题", keyName: "title", type: "text" },
+				{ field: "所属栏目", keyName: "categoryName", type: "text" },
+				{
+					field: "标签",
+					keyName: "tagNameList",
+					type: "array",
+					arrayDiv: "、",
+				},
+				{ field: "状态", keyName: "statusFlagName", type: "text" },
+				{ field: "发布单位", keyName: "publisherName", type: "text" },
+				{ field: "发布时间", keyName: "publishDate", type: "text" },
+				{
+					field: "发布范围",
+					keyName: "publishRangeDesc",
+					type: "text",
+				},
+				{ field: "置顶", keyName: "isTopName", type: "text" },
+			],
+			tableUrl: "/gov/voice/article/articleListV2",
+			mubanUrl: "",
+			importUrl: "",
+			exportUrl: "",
+
+			addUrl: "/gov/voice/article/addOrSaveDraft",
+			editUrl: "/gov/voice/article/updateArticle",
+			infoUrl: "/gov/voice/article/detailV2",
+			delUrl: "/gov/voice/article/delete批量",
+			editAuth(item) {
+				return item.statusFlagName == "已发布";
+			},
+			delAuth(item) {
+				return item.statusFlagName == "已下线";
+			},
+
+			editParams: [
+				{
+					field: "所属栏目",
+					keyName: "category",
+					type: "select",
+					value: "",
+					multiple: false,
+					optionUrl: `/gov/voice/categoryDict/subCategories?parentCategoryId=${parentCategoryId}`,
+					optionUrlMethod: "get",
+					optionUrlParams: {},
+					optionList: [],
+					optionCook(list) {
+						return list.map((item) => ({
+							label: item.categoryName,
+							value: item.id,
+						}));
+					},
+					rules: [
+						{
+							required: true,
+							message: "所属栏目不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "文章标题",
+					keyName: "title",
+					type: "input",
+					maxlength: 50,
+					editDisabled: true,
+					rules: [
+						{
+							required: true,
+							message: "文章标题不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "封面图片",
+					keyName: "imgArr",
+					type: "upload",
+					limit: 1,
+					listType: "picture-card",
+					editDisabled: true,
+					rules: [],
+					value: () => [],
+					uploadUrl:
+						window.SITE_CONFIG["apiURL"] +
+						"/oss/file/article/upload",
+					supKeys: ["imgUrlArr", "imgUrl"],
+					supValues: [() => [], ""],
+					beforeImgUpload(file, item, that) {
+						console.log(file);
+						const isLt1M = file.size / 1024 / 1024 < 10;
+						const srcType = file.type;
+
+						if (!isLt1M) {
+							that.$message.error("上传文件大小不能超过 10MB!");
+							return false;
+						}
+						if (srcType.indexOf("image") == -1) {
+							that.$message.error("仅限图片格式");
+							return false;
+						}
+						return true;
+					},
+				},
+				{
+					field: "发布范围",
+					keyName: "gridIdList",
+					type: "cascader",
+					value: () => [],
+					supKeys: ["publishRangeDesc"],
+					supValues: [""],
+					optionUrl: "/gov/org/customeragency/agencygridtree",
+					optionUrlParams: {
+						agencyId: this.$store.state.user.agencyId,
+					},
+					optionList: [],
+					optionProps: {
+						multiple: true,
+						value: "agencyId",
+						label: "agencyName",
+						children: "subAgencyList",
+						checkStrictly: false,
+						emitPath: false,
+					},
+					optionCook(obj) {
+						return [obj];
+					},
+					handleChangeFn(vals, item, that) {
+						console.log("handleChangeFn", vals);
+						const { optionList } = item;
+						const optionPlaneList = collapse(
+							optionList,
+							"subAgencyList"
+						);
+						if (vals.length > 0) {
+							let selectedList = vals.map(
+								(v) =>
+									getItemByIdInCascader(
+										optionPlaneList,
+										[v],
+										"agencyId",
+										"subAgencyList"
+									)[0]
+							);
+							console.log("handleChangeFn", selectedList);
+							let selectedFilterList = selectedList.filter(
+								(a) => a.level == "grid"
+							);
+							that.fmData[item["keyName"]] =
+								selectedFilterList.map((a) => a.agencyId);
+							that.fmData[item["supKeys"][0]] = selectedFilterList
+								.map((a) => a.agencyName)
+								.join("、");
+						} else {
+						}
+					},
+					rules: [
+						{
+							required: true,
+							message: "发布范围不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "发布时间",
+					keyName: "publishDate",
+					type: "date",
+					value: dateFormat(new Date(), "yyyy-MM-dd"),
+					pickerOptions: {
+						disabledDate(time) {
+							return time.getTime() > Date.now();
+						},
+					},
+					rules: [
+						{
+							required: true,
+							message: "发布时间不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "发布单位",
+					keyName: "publisher",
+					type: "select",
+					optionUrl: "/gov/voice/article/publishagencylist",
+					optionList: [],
+					optionType: "group",
+					supKeys: ["publisherName", "publisherType"],
+					supValues: ["", ""],
+					optionCook(data) {
+						let ret = [];
+						const {
+							agencyDeptList,
+							agencyGridList,
+							agencyId,
+							agencyName,
+						} = data;
+						if (agencyId) {
+							ret.push({
+								label: "以组织名义",
+								optionList: [
+									{
+										label: agencyName,
+										value: agencyId,
+										type: "agency",
+									},
+								],
+							});
+						}
+						if (
+							Array.isArray(agencyDeptList) &&
+							agencyDeptList.length > 0
+						) {
+							ret.push({
+								label: "以部门名义",
+								optionList: [
+									...agencyDeptList.map((d) => ({
+										label: d.agencyDeptName,
+										value: d.departmentId,
+										type: "department",
+									})),
+								],
+							});
+						}
+						if (
+							Array.isArray(agencyGridList) &&
+							agencyGridList.length > 0
+						) {
+							ret.push({
+								label: "以网格名义",
+								optionList: [
+									...agencyGridList.map((d) => ({
+										label: d.agencyGridName,
+										value: d.gridId,
+										type: "grid",
+									})),
+								],
+							});
+						}
+						return ret;
+					},
+					handleChangeFn(vals, item, that) {
+						const { optionList } = item;
+						let opts = [];
+						optionList.forEach((g) => {
+							opts = [...opts, ...g.optionList];
+						});
+						let publisher = opts.find((p) => vals == p.value);
+						that.fmData[item["supKeys"][0]] = publisher.label;
+						that.fmData[item["supKeys"][1]] = publisher.type;
+					},
+					rules: [
+						{
+							required: true,
+							message: "发布单位不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					field: "文章标签",
+					keyName: "tagNameList",
+					type: "select",
+					multiple: true,
+					filterable: true,
+					allowCreate: true,
+					optionUrl: "/gov/voice/tag/taglist",
+					optionUrlParams: {},
+					optionList: [],
+					optionCook(list) {
+						return list.map((item) => ({
+							label: item.tagName,
+							value: item.tagName,
+						}));
+					},
+				},
+				{
+					field: "内容",
+					keyName: "content",
+					type: "rich-text",
+					rules: [
+						{
+							required: true,
+							message: "内容不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+				{
+					// 需要转换一下，后端给的参数不适用
+					field: "附件",
+					keyName: "fileList2",
+					type: "upload",
+					limit: 3,
+					listType: "file",
+					editDisabled: true,
+					rules: [],
+					value: () => [],
+					uploadUrl:
+						window.SITE_CONFIG["apiURL"] +
+						"/oss/file/article/upload",
+					supKeys: ["fileListArr2", "fileListItem2"],
+					supValues: [() => [], ""],
+					beforeImgUpload(file, item, that) {
+						console.log(file);
+						const isLt1M = file.size / 1024 / 1024 < 10;
+						const srcType = file.type.toLowerCase();
+
+						if (!isLt1M) {
+							that.$message.error("上传文件大小不能超过 10MB!");
+							return false;
+						}
+						if (srcType.indexOf("pdf") == -1) {
+							that.$message.error("仅限pdf格式");
+							return false;
+						}
+						return true;
+					},
+				},
+				{
+					field: "置顶",
+					keyName: "isTop",
+					type: "switch",
+					activeValue: "1",
+					inactiveValue: "0",
+				},
+			],
+			editFixedParams: {
+				type: "article",
+			},
+			editElseRules: {},
+			editConfig: {
+				confirmBtnName: "发布",
+				cookInfoFn(data) {
+					if (data.richTextFlag == "0") {
+						data.content = data.contentList
+							.map((item) => {
+								if (item.contentType == "text") {
+									return `<p>${item.content}</p>`;
+								} else if (item.contentType == "img") {
+									return `<img src="${item.content}" style="max-width:100%"></img>`;
+								} else if (item.contentType == "video") {
+									return `<video src="${item.content}" style="max-width:100%" controls></video>`;
+								} else if (item.contentType == "file") {
+									return `<a src="${item.content}" target="_blank">附件：${item.fileName}</a>`;
+								}
+							})
+							.join(" ");
+					} else {
+						data.content = data.contentList[0].content;
+					}
+					if (data.imgUrl) {
+						data.imgArr = [
+							{
+								name: "封面",
+								url: data.imgUrl,
+							},
+						];
+						data.imgUrlArr = [data.imgUrl];
+					}
+					data.fileList2 = (data.fileList || []).map((item) => ({
+						url: item.content,
+						name: item.fileName,
+						size: 0,
+						type: item.content.split(".").pop(),
+						format: item.content.split(".").pop(),
+					}));
+
+					return data;
+				},
+
+				beforeSubmit(formType, fmData, that) {
+					if (fmData.isTop == "1" && !fmData.imgUrl) {
+						that.$message.error("请上传封面图片");
+						return false;
+					}
+
+					fmData.fileList = (fmData.fileList2 || []).map((item) => ({
+						content: item.url,
+						fileName: item.name,
+						contentType: "file",
+					}));
+					return true;
+				},
+			},
+
+			formData: {},
+			showAddImage: false,
+			uploadUlr:
+				window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+			replayImgList: [],
+			hideUploadBtn: false,
+			selType: "top",
+			selArticleId: "",
+			selImgUrl: "",
+		};
+	},
+	components: { basePage, offline },
+	computed: {},
+	watch: {},
+
+	async mounted() {},
+
+	methods: {
+		async handleOfflineShow(item) {
+			console.log(item);
+			this.offlineShowed = true;
+			await nextTick(100);
+			this.$refs.offlineForm.initForm(item);
+		},
+
+		async handleAddImage() {
+			console.log("formData", this.formData);
+			this.topArticle();
+		},
+		async handleCancleTopArticle(item, type) {
+			this.selType = type;
+			this.selArticleId = item.articleId;
+			await this.topArticle();
+		},
+
+		async handleTopArticle(item, type) {
+			this.selType = type;
+			this.selArticleId = item.articleId;
+
+			let hasImage = await this.isHasImage();
+
+			if (hasImage === "refrsh") {
+				this.$message.error("请求失败，请重新尝试");
+			} else if (hasImage === "no") {
+				// this.$message.info("请先上传封面图片");
+				this.showAddImage = true;
+			} else {
+				await this.topArticle();
+			}
+		},
+
+		async isHasImage() {
+			const url = "/gov/voice/article/detailV2";
+			const { tableData } = this;
+
+			const { data, code, msg } = await requestPost(url, {
+				articleId: this.selArticleId,
+			});
+
+			if (code === 0) {
+				// this.formData = data
+				if (data.imgUrl) {
+					return "has";
+				} else {
+					return "no";
+				}
+			} else {
+				return "refrsh";
+			}
+		},
+
+		async topArticle() {
+			const url = "/gov/voice/article/topArticle";
+			const { tableData } = this;
+			let params = {
+				articleId: this.selArticleId,
+				type: this.selType,
+			};
+			if (this.selImgUrl) {
+				params.imgUrl = this.selImgUrl;
+			}
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.$message.success("操作成功！");
+				this.showAddImage = false;
+				this.$refs.basePage.refresh();
+			} else {
+				this.$message.success("操作失败！");
+			}
+		},
+
+		removePic(file, fileList) {
+			this.selImgUrl = "";
+			this.replayImgList = [];
+			this.hideUploadBtn = fileList.length >= 1;
+		},
+		// 最多上传3张图，超过时隐藏上传按钮
+		handleEditChange(file, fileList) {
+			this.hideUploadBtn = fileList.length >= 1;
+		},
+		exceedPic() {
+			this.$message.warning("只能上传1张封面图");
+		},
+		beforeAvatarUpload(file) {
+			const isJPG = file.type === "image/jpeg";
+			const isLt2M = file.size / 1024 / 1024 < 10;
+
+			if (!isLt2M) {
+				this.$message.error("上传图片大小不能超过 10MB!");
+			}
+			return isLt2M;
+		},
+		handleSuccess(response, file, fileList) {
+			this.replayImgList.push(file);
+			this.selImgUrl = response.data.url;
+		},
+
+		handleOfflineSuccess() {
+			this.$refs.basePage.refresh();
+			this.offlineShowed = false;
+		},
+
+		async handleClickDraft(fmData) {
+			let url = this.addUrl;
+			let params = {
+				...fmData,
+				type: "draft",
+			};
+			params =
+				this.$refs.basePage.$refs.editForm.cookBeforeSubmit(params);
+			if (!params.title && !params.content) {
+				return this.$message.error("标题或内容不能为空");
+			}
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.$message({
+					type: "success",
+					message: "保存成功",
+				});
+				this.$refs.basePage.handleClose();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/form-main.scss";
+
+.avatar-uploader {
+	margin: 0 0 0 20px;
+}
+</style>
+
+<style lang="scss">
+.hide {
+	.el-upload--picture-card {
+		display: none !important;
+	}
+}
+</style>
diff --git a/src/views/modules/lingshan/shzl/mapConfig.vue b/src/views/modules/lingshan/shzl/mapConfig.vue
new file mode 100644
index 0000000..a643558
--- /dev/null
+++ b/src/views/modules/lingshan/shzl/mapConfig.vue
@@ -0,0 +1,1317 @@
+<template>
+	<div>
+		<div style="position: relative">
+			<div class="div_search">
+				<el-select
+					v-model="selAgencyId"
+					size="small"
+					placeholder="请选择或点击区域选择"
+				>
+					<el-option
+						@click.native="orgChange(index)"
+						v-for="(item, index) in subAgencyArray"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id"
+					>
+					</el-option>
+				</el-select>
+				<div v-if="selAgencyId && subAgencyArray.length > 0">
+					<el-button
+						v-if="showBtn && !hasPolygon"
+						size="small"
+						style="margin-left: 10px"
+						type="primary"
+						icon="el-icon-plus"
+						@click="handleAddPolygon"
+						>{{
+							method === "mAddPolygon" ? "取消绘制" : "绘制区域"
+						}}</el-button
+					>
+					<el-button
+						v-if="showBtn && hasPolygon"
+						size="small"
+						style="margin-left: 10px"
+						type="primary"
+						icon="el-icon-edit"
+						@click="handleEditPolygon"
+						>{{
+							method === "mEditPolygon" ? "取消绘制" : "重新绘制"
+						}}</el-button
+					>
+					<!-- <el-button v-if="showBtn&&hasPolygon"
+                     size="small"
+                     style="margin-left:10px"
+                     type="primary"
+                     icon="el-icon-delete"
+                     @click="handleDelPolygon">删除区域</el-button> -->
+					<el-button
+						v-if="showBtn"
+						size="small"
+						style="margin-left: 10px"
+						type="primary"
+						icon="el-icon-upload2"
+						@click="handleManually"
+						>手动录入</el-button
+					>
+					<!-- <el-button v-if="showBtn"
+                     style="margin-left:10px"
+                     type="primary"
+                     icon="el-icon-delete"
+                     @click="handleSetOffset">设置偏差</el-button> -->
+					<span v-if="showBtn && hasPolygon"> 经度偏差：</span>
+					<el-input-number
+						v-if="showBtn && hasPolygon"
+						resize="none"
+						size="small"
+						style="width: 200px"
+						:precision="5"
+						:step="0.0001"
+						placeholder="请输入经度偏差"
+						v-model="xOffset"
+					>
+					</el-input-number>
+					<span v-if="showBtn && hasPolygon"> 纬度偏差：</span>
+					<el-input-number
+						v-if="showBtn && hasPolygon"
+						resize="none"
+						size="small"
+						:precision="5"
+						:step="0.0001"
+						style="width: 200px"
+						placeholder="请输入维度偏差"
+						v-model="yOffset"
+					>
+					</el-input-number>
+
+					<el-button
+						v-if="showBtn && hasPolygon"
+						style="margin-left: 10px"
+						type="primary"
+						size="small"
+						icon="el-icon-folder-add"
+						@click="handleOffsetOk"
+						>保存</el-button
+					>
+					<!-- <el-button v-if="showBtn"
+                     style="margin-left:10px"
+                     type="primary"
+                     size="mini"
+                     icon="el-icon-delete"
+                     @click="handleOffsetCancel">预览</el-button> -->
+				</div>
+			</div>
+			<div class="div_back">
+				<el-button
+					v-if="runNum > 0"
+					style="margin-left: 10px"
+					type="primary"
+					icon="el-icon-back"
+					@click="handleBack"
+					>返回上一级</el-button
+				>
+			</div>
+			<div class="div_tip">
+				<span>按住alt键单击标注，可以进入下一级地图</span>
+			</div>
+			<div
+				id="map"
+				class="div_map"
+				:style="{ height: mapHeight + 'px' }"
+			></div>
+		</div>
+		<el-dialog
+			title="手动录入"
+			:visible.sync="dialogVisible"
+			width="50%"
+			:before-close="handleClose"
+		>
+			<div class="div_textarea">
+				<div style="margin-top: 10px">
+					<span> 中心点经度：</span>
+					<el-input-number
+						size="small"
+						style="width: 250px"
+						v-model="longitude"
+					>
+					</el-input-number>
+					<span style="margin-left: 15px"> 中心点纬度：</span>
+					<el-input-number
+						size="small"
+						style="width: 250px"
+						v-model="latitude"
+					>
+					</el-input-number>
+				</div>
+				<div style="margin-top: 20px">
+					<el-input
+						type="textarea"
+						:rows="15"
+						style="width: 600px; max-height: 500px"
+						placeholder="请复制坐标数据"
+						v-model="polygonManullyString"
+					>
+					</el-input>
+				</div>
+				<div style="margin-top: 20px">
+					<span> 经度偏差：</span>
+					<el-input-number
+						resize="none"
+						size="small"
+						style="width: 200px"
+						:precision="5"
+						:step="0.0001"
+						placeholder="请输入经度偏差"
+						v-model="xOffset_customize"
+					>
+					</el-input-number>
+					<span style="margin-left: 15px"> 纬度偏差：</span>
+					<el-input-number
+						resize="none"
+						size="small"
+						:precision="5"
+						:step="0.0001"
+						style="width: 200px"
+						placeholder="请输入维度偏差"
+						v-model="yOffset_customize"
+					>
+					</el-input-number>
+				</div>
+			</div>
+
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="dialogVisible = false">取 消</el-button>
+				<el-button type="primary" @click="handleManuallyOk"
+					>确 定</el-button
+				>
+			</span>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+import "ol/ol.css";
+import { Map, View } from "ol";
+import TileLayer from "ol/layer/Tile.js";
+import XYZ from "ol/source/XYZ.js";
+import VectorLayer from "ol/layer/Vector.js";
+import VectorSource from "ol/source/Vector.js";
+import GeoJSON from "ol/format/GeoJSON.js";
+import { defaults as defaultControls, ZoomToExtent } from "ol/control.js";
+import {
+	defaults as defaultInteractions,
+	Modify,
+	Select,
+	DoubleClickZoom,
+} from "ol/interaction.js";
+import { getCenter, getWidth } from "ol/extent.js";
+import { Circle as CircleStyle, Fill, Stroke, Style, Text } from "ol/style.js";
+import Draw from "ol/interaction/Draw.js";
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; //引入Loading服务
+import { requestPost } from "@/js/dai/request";
+import { altKeyOnly, click, pointerMove } from "ol/events/condition";
+import WMTS from "ol/source/WMTS.js";
+import WMTSTileGrid from "ol/tilegrid/WMTS.js";
+import { mapType } from "@/utils/dai-map";
+import {
+	get as getProjection,
+	Projection,
+	addProjection,
+	transform,
+} from "ol/proj.js";
+import proj4 from "proj4";
+import { register as registerProj4 } from "ol/proj/proj4";
+
+var centerPointGlobal = [120.664619, 36.504963];
+let loading; //加载动画
+
+let x = 1500;
+let y = 700;
+let size = [x, y];
+let extent = [-x, -y, x, y];
+let projection = new Projection({
+	code: "xkcd-image",
+	units: "pixels",
+	extent: extent,
+});
+
+let map;
+let mapView;
+let baseMapLayer; //背景地图图层
+let parentLayer; //上级组织图层
+let parentSource; //上级组织多边形
+let polygonLayer; //标注图层
+let polygonSource; //标注多边形
+
+let draw; //绘制handle
+let select; //选中标注
+let selectAltClick;
+let selectedFeatures;
+
+//标注的文字样式
+var createTextStyle = function (feature) {
+	return new Text({
+		textAlign: undefined,
+		font: "bold 18px Arial",
+		//fontFamily: "Courier New, monospace",
+		fontWeight: "bold",
+		text: feature.values_.name,
+		//text: "名称",
+		fill: new Fill({ color: "#007ab9" }),
+		stroke: new Stroke({ color: "#ffffff", width: 3 }),
+		offsetY: 0,
+		overflow: true,
+	});
+};
+//上级组织标注样式
+var parentStyleFunction = (function () {
+	return function (feature) {
+		return new Style({
+			// fill: new Fill({
+			//   color: [255, 255, 255, 0.3]
+			// }),
+			stroke: new Stroke({
+				color: [0, 103, 182, 1],
+				width: 2,
+			}),
+
+			// text: createTextStyle(feature)
+		});
+	};
+})();
+
+var polygonStyleFunction = (function () {
+	return function (feature) {
+		return new Style({
+			fill: new Fill({
+				color: [255, 255, 255, 0.3],
+			}),
+			stroke: new Stroke({
+				color: [0, 153, 255, 1],
+				width: 3,
+			}),
+
+			text: createTextStyle(feature),
+		});
+	};
+})();
+
+const vueGis = {
+	name: "HomeMap",
+	data() {
+		return {
+			method: "", //绘制方法
+			centerPoint: [], //中心点位置
+			zoom: 14, //缩放范围：区14
+			minZoom: 1, //最小缩放
+			isMapLoaded: false, //地图是否加载完毕
+
+			orgData: {}, //当前组织对象
+			orgId: "",
+			orgLevel: "",
+
+			subAgencyArray: [], //下拉框数据
+			selAgencyIndex: 0,
+			selAgencyId: "", //下拉框选中的组织id
+			selAgency: {}, //下拉框选中的组织对象
+			hasPolygon: false, //下拉框选中的组织是否有标注
+			showBtn: false,
+
+			selPolygonId: "", //选择的多边形id
+			selPolygon: {},
+
+			//下钻层级记录
+			runNum: 0,
+			runAgency: [],
+			center: [],
+			zoom: null,
+			parentPolygon: [],
+
+			//手动录入弹出框
+			dialogVisible: false,
+			showOffset: false,
+			// polygonManullyString: "POLYGON (( 120.33902844 36.10290786, 120.33928218 36.10292997, 120.33956336 36.10316381, 120.34016675 36.10367715, 120.34044913 36.10391476, 120.34045707 36.10392145, 120.34068696 36.10411489, 120.34103181 36.10436285, 120.34117309 36.10441824, 120.34134613 36.10447927, 120.34164715 36.10465122, 120.34124679 36.10507284, 120.34088128 36.10538902, 120.34076198 36.10549222, 120.34053890 36.10520966, 120.34044967 36.10507284, 120.34030632 36.10494761, 120.34019091 36.10484679, 120.33976558 36.10448095, 120.33966658 36.10439980, 120.33947147 36.10425822, 120.33932037 36.10417613, 120.33913002 36.10411307, 120.33895751 36.10406073, 120.33879451 36.10403693, 120.33864104 36.10403158, 120.33864031 36.10395235, 120.33863211 36.10305897, 120.33902175 36.10290728, 120.33902844 36.10290786))",
+			polygonManullyString: "",
+
+			xOffset: 0,
+			yOffset: 0,
+			xOffset_customize: 0,
+			yOffset_customize: 0,
+			// xOffset_customize: 0.0051,//市北默认偏移
+			// yOffset_customize: 0.0002,//市北默认偏移
+
+			longitude: undefined,
+			latitude: undefined,
+		};
+	},
+	async mounted() {
+		//加载组织数据
+		await this.loadOrgData();
+		// this.runAgency.push(this.orgData)
+
+		//
+		if (mapType == "tdzw") {
+		} else {
+		}
+		// this.initMap2();
+		this.initMap();
+
+		//上级组织多边形图层
+		this.addParentLayer();
+		this.loadParentPolygon();
+
+		//添加标注图层
+		this.addPolygonLayer();
+
+		//加载当前园区的标注
+		this.loadPolygon(this.subAgencyArray);
+	},
+	methods: {
+		//切换下级组织
+		orgChange(index) {
+			this.selAgencyIndex = index;
+
+			selectedFeatures.clear();
+
+			if (this.subAgencyArray.length > 0 && (index || index === 0)) {
+				this.showBtn = true;
+				this.selAgency = this.subAgencyArray[index];
+				if (this.selAgency.coordinates) {
+					this.hasPolygon = true;
+					this.highlightPolygon();
+				} else {
+					this.hasPolygon = false;
+				}
+			} else {
+				this.showBtn = false;
+			}
+		},
+
+		//刷新地图  isRefreshView:是否需要重置中心点，如果是绘制、删除区域，不需要，如果是下钻或返回需要
+		async refreshMap(isRefreshView) {
+			//加载组织数据
+			await this.loadOrgData();
+			this.loadParentPolygon();
+			//加载当前园区的标注
+			this.loadPolygon(this.subAgencyArray);
+
+			//重置地图中心点
+			// if (isRefreshView) {
+			//   this.setMapLocation()
+			//   mapView.setCenter(this.centerPoint);
+			//   mapView.setZoom(this.zoom);
+			// }
+		},
+
+		//返回上一级组织
+		handleBack() {
+			this.center = this.runAgency[this.runNum - 1].center;
+			this.zoom = this.runAgency[this.runNum - 1].zoom;
+			this.selAgencyId = "";
+			this.runNum--;
+			this.runAgency.pop();
+
+			if (this.runNum === 0) {
+				this.orgId = "";
+				this.orgLevel = "";
+			} else {
+				this.orgId = this.runAgency[this.runAgency.length - 1].id;
+				this.orgLevel = this.runAgency[this.runAgency.length - 1].level;
+			}
+
+			this.refreshMap(true);
+		},
+
+		//加载组织数据
+		async loadOrgData() {
+			const url = "/gov/org/agency/maporg";
+			// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
+			let params = {
+				orgId: this.orgId,
+				level: this.orgLevel,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.orgData = data;
+				this.subAgencyArray = [];
+				if (this.runNum === 0) {
+					//第一次进入，绘制本级
+					this.subAgencyArray.push(data);
+					// this.selAgencyId = data.id
+				} else {
+					this.parentPolygon = [];
+					this.parentPolygon.push(data);
+
+					if (data.children && data.children.length > 0) {
+						this.subAgencyArray = data.children;
+						// this.selAgencyId = this.subAgencyArray[0].id
+					} else {
+						this.subAgencyArray = [];
+						// this.selAgencyId = ''
+					}
+				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		//加载父级组织多边形
+		loadParentPolygon() {
+			parentSource.clear(); //清空标注
+
+			let featureData = []; //标注数据
+			if (this.parentPolygon && this.parentPolygon.length > 0) {
+				//判断是否存在下级标注
+				let oneData = {};
+
+				this.parentPolygon.forEach((agencyItem) => {
+					if (
+						agencyItem.coordinates &&
+						agencyItem.coordinates !== ""
+					) {
+						//如果有坐标
+						oneData = {
+							type: "Feature",
+							id: agencyItem.id,
+							properties: {
+								id: agencyItem.id,
+								level: agencyItem.level,
+								name: agencyItem.name,
+							},
+							geometry: {
+								type: "Polygon",
+								coordinates: [],
+							},
+						};
+						let coorArray = agencyItem.coordinates.split(","); //坐标数组
+
+						let itemArray = []; //单个点位的[lon,lat]，数组
+						let polygonArray = []; //整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+
+						coorArray.forEach((item, index) => {
+							itemArray.push(item);
+							if (index % 2 == 0) {
+								//偶
+							} else {
+								//奇
+								polygonArray.push(itemArray);
+								itemArray = [];
+							}
+						});
+						oneData.geometry.coordinates.push(polygonArray);
+						featureData.push(oneData);
+					}
+				});
+			}
+
+			if (featureData && featureData.length > 0) {
+				var geojsonObject = {
+					type: "FeatureCollection",
+					features: featureData,
+				};
+				let feature = new GeoJSON().readFeatures(geojsonObject);
+				parentSource.addFeatures(feature);
+			}
+		},
+		//加载当前园区的标注
+		loadPolygon(subAgencyArray) {
+			polygonSource.clear(); //清空标注
+
+			let featureData = []; //标注数据
+			if (subAgencyArray && subAgencyArray.length > 0) {
+				//判断是否存在下级标注
+				let oneData = {};
+
+				subAgencyArray.forEach((agencyItem) => {
+					if (
+						agencyItem.coordinates &&
+						agencyItem.coordinates !== ""
+					) {
+						//如果有坐标
+						oneData = {
+							type: "Feature",
+							id: agencyItem.id,
+							properties: {
+								id: agencyItem.id,
+								level: agencyItem.level,
+								name: agencyItem.name,
+							},
+							geometry: {
+								type: "Polygon",
+								coordinates: [],
+							},
+						};
+						let coorArray = agencyItem.coordinates.split(","); //坐标数组
+
+						let itemArray = []; //单个点位的[lon,lat]，数组
+						let polygonArray = []; //整个多边形的[[lon,lat],[lon,lat],[lon,lat]]数组
+
+						coorArray.forEach((item, index) => {
+							itemArray.push(parseFloat(item));
+							if (index % 2 == 0) {
+								//偶
+							} else {
+								//奇
+								// itemArray = transform(
+								// 	itemArray,
+								// 	new Projection({ code: "EPSG:4326" }),
+								// 	new Projection({ code: "EPSG:4490" })
+								// );
+								polygonArray.push(itemArray);
+								itemArray = [];
+							}
+						});
+						oneData.geometry.coordinates.push(polygonArray);
+						featureData.push(oneData);
+					}
+				});
+			}
+
+			if (featureData && featureData.length > 0) {
+				var geojsonObject = {
+					type: "FeatureCollection",
+					features: featureData,
+				};
+				let feature = new GeoJSON().readFeatures(geojsonObject);
+				polygonSource.addFeatures(feature);
+			}
+			this.orgChange(this.selAgencyIndex);
+		},
+
+		//选择feature
+		selectFeature(e) {
+			if (e.selected.length > 0) {
+				console.log("selectFeature22222222222222222222222");
+				if (this.method === undefined || this.method === "") {
+					this.selAgencyId = e.selected[0].id_;
+					this.subAgencyArray.forEach((element, index) => {
+						if (element.id === e.selected[0].id_) {
+							this.selAgencyIndex = index;
+							this.orgChange(index);
+						}
+					});
+				}
+			}
+		},
+		//下钻到下一级
+		toSubAgency(e) {
+			if (!e.selected[0]) {
+				return false;
+			}
+
+			if (this.method != "mAddPolygon" && this.level != "neighborHood") {
+				this.selAgencyId = "";
+				//下钻到下一级
+				this.subAgencyArray.forEach((item) => {
+					if (item.id === e.selected[0].id_) {
+						this.selPolygonId = item.id;
+						this.selPolygon = item;
+						this.orgId = item.id;
+						this.orgLevel = item.level;
+					}
+				});
+
+				this.runNum++;
+				this.selPolygon.center = map.getView().getCenter();
+				this.selPolygon.zoom = map.getView().getZoom();
+				console.log("center", map.getView().getCenter());
+				console.log("zoom", map.getView().getZoom());
+
+				this.runAgency.push(this.selPolygon);
+				this.selAgencyIndex = 0;
+				this.refreshMap(true);
+			}
+		},
+
+		//高亮某个标注
+		highlightPolygon() {
+			let features = polygonSource.getFeatures();
+			features.forEach((element) => {
+				if (element.id_ === this.selAgencyId) {
+					selectedFeatures.push(element);
+					let polygon = element.getGeometry();
+					map.getView().fit(polygon, map.getSize());
+					this.zoom = map.getView().getZoom() - 2;
+					mapView.setZoom(this.zoom);
+				}
+			});
+		},
+		//设置地图定位的中心点和缩放级别
+		setMapLocation() {
+			this.centerPoint = [];
+
+			if (this.center && this.center.length > 0) {
+				this.centerPoint = this.center;
+			} else if (this.orgData.longitude && this.orgData.latitude) {
+				this.centerPoint.push(this.orgData.longitude);
+				this.centerPoint.push(this.orgData.latitude);
+			} else {
+				this.centerPoint = centerPointGlobal;
+			}
+
+			if (!this.zoom) {
+				this.setZoom(this.orgData.agencyLevel);
+			}
+		},
+
+		//根据组织层级设置缩放级别
+		setZoom(agencyLevel) {
+			if (agencyLevel === "district") {
+				this.zoom = 12;
+			} else if (agencyLevel === "street") {
+				this.zoom = 13;
+			} else if (agencyLevel === "community") {
+				this.zoom = 14;
+			} else {
+				this.zoom = 11;
+			}
+		},
+
+		// 全国天地图，清晰度一般
+		initMap() {
+			this.setMapLocation();
+
+			baseMapLayer = new TileLayer({
+				title: "地图",
+				source: new XYZ({
+					// url: "http://t4.tianditu.com/DataServer?T=img_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
+					//   url: "http://api.tianditu.gov.cn/api?v=4.0&tk=c4dc987b442bd141a887d8d4a5d07926&x={x}&y={y}&l={z}"
+					  url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&style=7&ltype=7&scl=0&size=0&x={x}&y={y}&z={z}",
+					//   wrapX: true, //x方向平铺，也可以选择false
+				}),
+				zIndex: 20,
+			});
+			var sourceMark = new XYZ({
+				url: "http://t4.tianditu.com/DataServer?T=cia_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
+				zIndex: 22,
+			});
+			var baseLabelMark = new TileLayer({
+				title: "标注图层",
+				source: sourceMark,
+			});
+
+			(mapView = new View({
+				//中心点坐标
+				center: this.centerPoint,
+				// projection: 'EPSG:3857',
+				projection: "EPSG:4326",
+				zoom: this.zoom,
+				minZoom: this.minZoom,
+			})),
+				//初始化map和地图底图
+				//创建地图容器
+				(map = new Map({
+					layers: [baseMapLayer],
+					// layers: [baseMapLayer, baseLabelMark],
+					//加载瓦片图层数据
+					view: mapView,
+					target: "map",
+					//目标加载到map中
+				}));
+
+			map.on("singleclick", function (e) {
+				console.log(e.coordinate);
+				// console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
+			});
+
+			//去除双击放大效果
+			const dblClickInteraction = map
+				.getInteractions()
+				.getArray()
+				.find((interaction) => {
+					return interaction instanceof DoubleClickZoom;
+				});
+			map.removeInteraction(dblClickInteraction);
+		},
+
+		// 山东天地图，清晰度高，但需要转换坐标系
+		initMap2() {
+			this.setMapLocation();
+
+			proj4.defs(
+				"EPSG:4490",
+				'GEOGCS["China Geodetic Coordinate System 2000",DATUM["China_2000",SPHEROID["CGCS2000",6378137,298.257222101,AUTHORITY["EPSG","1024"]],AUTHORITY["EPSG","1043"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4490"]]'
+			);
+			registerProj4(proj4);
+			//重写projection4490，
+			var projection = new Projection({
+				code: "EPSG:4490",
+				units: "degrees",
+				axisOrientation: "neu",
+			});
+			projection.setExtent([-180, -90, 180, 90]);
+			projection.setWorldExtent([-180, -90, 180, 90]);
+			addProjection(projection);
+			// addTransforms({
+			// 	t: "EPSG:4326",
+			// 	e: "EPSG:4490",
+			// 	r: function (coor) {
+			// 		return proj4("EPSG:4326", "EPSG:4490", coor);
+			// 	},
+			// 	n: function (coor) {
+			// 		return proj4("EPSG:4490", "EPSG:4326", coor);
+			// 	},
+			// });
+
+			let projectionExtent = projection.getExtent();
+			let size = getWidth(projectionExtent) / 256; //size就是一个像素代表的经纬度
+			let matrixIds = [];
+
+			function getResolutions() {
+				let resolutions = [];
+				for (let z = 7; z < 19; ++z) {
+					resolutions[z] = size / Math.pow(2, z);
+					matrixIds[z] = z;
+				}
+				return resolutions;
+			}
+
+			const resolutions = getResolutions();
+
+			// console.log("========= getProjection", getProjection("EPSG:4490"));
+
+			baseMapLayer = new TileLayer({
+				title: "地图",
+				source: new WMTS({
+					url: "http://service.sdmap.gov.cn/tileservice/sdrasterpubmap?tk=e758167d5b90c351b70a979c0820840c",
+					layer: "sdvec",
+					matrixSet: "c",
+					format: "image/png",
+					projection: getProjection("EPSG:4490"),
+					tileGrid: new WMTSTileGrid({
+						origin: [-180, 90],
+						resolutions,
+						matrixIds,
+					}),
+					style: "default",
+					tilematrixset: "c",
+					zIndex: 20,
+				}),
+			});
+
+			var sourceMark = new WMTS({
+				url: "http://service.sdmap.gov.cn/tileservice/sdrasterpubmapdj?tk=e758167d5b90c351b70a979c0820840c",
+				layer: "sdvec",
+				matrixSet: "c",
+				format: "image/png",
+				projection: getProjection("EPSG:4490"),
+				tileGrid: new WMTSTileGrid({
+					origin: [-180, 90],
+					resolutions,
+					matrixIds,
+				}),
+				style: "default",
+				tilematrixset: "c",
+				zIndex: 22,
+			});
+			var baseLabelMark = new TileLayer({
+				title: "标注图层",
+				source: sourceMark,
+			});
+
+			(mapView = new View({
+				//中心点坐标
+				center: this.centerPoint,
+				projection: getProjection("EPSG:4490"),
+				zoom: this.zoom,
+				minZoom: this.minZoom,
+			})),
+				//初始化map和地图底图
+				//创建地图容器
+				(map = new Map({
+					layers: [baseMapLayer, baseLabelMark],
+					//加载瓦片图层数据
+					view: mapView,
+					target: "map",
+					//目标加载到map中
+				}));
+
+			map.on("singleclick", function (e) {
+				console.log(e.coordinate);
+				console.log(transform(e.coordinate, "EPSG:4490", "EPSG:4326"));
+				console.log(proj4("EPSG:4490", "EPSG:4326", e.coordinate));
+				console.log(
+					transform(
+						e.coordinate,
+						new Projection({ code: "EPSG:4490" }),
+						new Projection({ code: "EPSG:4326" })
+					)
+				);
+			});
+
+			//去除双击放大效果
+			const dblClickInteraction = map
+				.getInteractions()
+				.getArray()
+				.find((interaction) => {
+					return interaction instanceof DoubleClickZoom;
+				});
+			map.removeInteraction(dblClickInteraction);
+		},
+
+		//添加标注图层
+		addParentLayer() {
+			parentSource = new VectorSource({
+				//features: (new GeoJSON()).readFeatures(geojsonObject)
+			});
+
+			parentLayer = new VectorLayer({
+				source: parentSource,
+				style: parentStyleFunction,
+				zIndex: 50,
+			});
+
+			map.addLayer(parentLayer);
+		},
+		//添加标注图层
+		addPolygonLayer() {
+			polygonSource = new VectorSource({
+				//features: (new GeoJSON()).readFeatures(geojsonObject)
+			});
+
+			polygonLayer = new VectorLayer({
+				source: polygonSource,
+				style: polygonStyleFunction,
+				zIndex: 50,
+			});
+
+			//选中多边形后的样式
+			var overlayStyle = (function () {
+				return function (feature) {
+					var styles = {};
+					styles["Polygon"] = [
+						new Style({
+							stroke: new Stroke({
+								color: "#ec9000",
+								width: 2,
+							}),
+						}),
+
+						new Style({
+							fill: new Fill({
+								color: "rgba(0, 0, 255, 0.1)",
+							}),
+						}),
+						new Style({
+							text: createTextStyle(feature),
+						}),
+					];
+					styles["MultiPolygon"] = styles["Polygon"];
+					return styles[feature.getGeometry().getType()];
+				};
+			})();
+
+			select = new Select({
+				style: overlayStyle,
+			});
+
+			selectAltClick = new Select({
+				condition: function (mapBrowserEvent) {
+					return (
+						click(mapBrowserEvent) && altKeyOnly(mapBrowserEvent)
+					);
+				},
+			});
+
+			selectedFeatures = select.getFeatures();
+
+			map.addLayer(polygonLayer);
+			map.addInteraction(select);
+			map.addInteraction(selectAltClick);
+
+			select.on("select", (e) => {
+				this.selectFeature(e);
+			});
+			selectAltClick.on("select", (e) => {
+				this.toSubAgency(e);
+			});
+		},
+		//点击【手动录入】
+		handleManually() {
+			this.dialogVisible = true;
+			this.polygonManullyString = "";
+			this.longitude = undefined;
+			this.latitude = undefined;
+			if (this.selAgency) {
+				if (this.selAgency.longitude) {
+					this.longitude = this.selAgency.longitude;
+				}
+				if (this.selAgency.latitude) {
+					this.latitude = this.selAgency.latitude;
+				}
+			}
+		},
+
+		//点击【手动录入】
+		handleClose() {
+			this.dialogVisible = false;
+		},
+
+		handleManuallyOk() {
+			if (this.longitude || this.latitude) {
+				if (!(this.longitude && this.latitude)) {
+					this.$message({
+						type: "warning",
+						message: "请同时填写中心点经纬度，或不填写",
+					});
+					return false;
+				}
+			}
+			//转化成需要的格式
+			//120.54033616308595,36.53603370922851,120.69620469335939,36.5408402277832,120.63166001562502,36.46771248120117,120.52728989843752,36.458786089599606,120.54033616308595,36.53603370922851
+			//中国经纬度范围
+			// 经度范围：73°33′E至135°05′E 东经
+			// 纬度范围：3°51′N至53°33′N 北纬
+			let aaa = this.polygonManullyString.replace(/\[/g, ",");
+			aaa = aaa.replace(/\]/g, ",");
+
+			let array = aaa.split(/[, ()]/);
+			// const arrayString = this.polygonManullyString
+			// let array = arrayString.split(",|(|)|[|]")
+			console.log(array);
+			let polygonStringResult = "";
+
+			// const arrayString = this.polygonManullyString
+			// let array = arrayString.split(/[, ()]/)
+			// console.log(array)
+			// let polygonStringResult = ''
+
+			array.forEach((element) => {
+				let num = Number(element);
+				if (num) {
+					polygonStringResult = polygonStringResult + element + ",";
+				}
+			});
+
+			polygonStringResult = polygonStringResult.substring(
+				0,
+				polygonStringResult.length - 1
+			);
+
+			if (this.xOffset_customize !== 0 || this.yOffset_customize !== 0) {
+				this.saveOffset(
+					this.xOffset_customize,
+					this.yOffset_customize,
+					polygonStringResult
+				);
+			} else {
+				this.addPolygon(polygonStringResult);
+			}
+		},
+
+		handleSetOffset() {
+			this.showOffset = true;
+		},
+		handleOffsetOk() {
+			let selPolygonString = "";
+
+			this.subAgencyArray.forEach((element) => {
+				if (
+					element.id === this.selAgencyId &&
+					element.coordinates &&
+					element.coordinates.length > 0
+				) {
+					selPolygonString = element.coordinates;
+				}
+			});
+
+			if (selPolygonString) {
+				this.saveOffset(this.xOffset, this.yOffset, selPolygonString);
+			}
+		},
+		saveOffset(xOffset, yOffset, selPolygonString) {
+			let offsetPolygonString = ""; //偏移后的坐标字符串
+			let tempArray = selPolygonString.split(",");
+
+			tempArray.forEach((element, index) => {
+				let aaa = 0;
+
+				if (index % 2 === 0) {
+					//偶数
+					aaa = parseFloat(element) + parseFloat(xOffset);
+				} else {
+					aaa = parseFloat(element) + parseFloat(yOffset);
+				}
+
+				if (index % 2 !== 0) {
+					//奇数
+				}
+				offsetPolygonString = offsetPolygonString + aaa + ",";
+			});
+
+			offsetPolygonString = offsetPolygonString.substring(
+				0,
+				offsetPolygonString.length - 1
+			);
+			this.addPolygon(offsetPolygonString);
+		},
+		handleSetOffset() {
+			this.handleOffsetCancel = false;
+		},
+
+		//点击【绘制区域】
+		handleAddPolygon() {
+			if (this.method === "mAddPolygon") {
+				this.method = "";
+				map.removeInteraction(draw);
+			} else if (this.selAgency) {
+				this.method = "mAddPolygon";
+				//绘制
+				this.drawPolygon();
+			} else {
+				this.$message({
+					type: "warning",
+					message: "请先选择组织",
+				});
+			}
+		},
+
+		//点击【重新绘制】
+		handleEditPolygon() {
+			if (this.method === "mEditPolygon") {
+				this.method = "";
+				map.removeInteraction(draw);
+				this.loadPolygon(this.subAgencyArray);
+			} else {
+				this.method = "mEditPolygon";
+				//暂时隐藏要重新绘制的标注
+				this.hidePolygon();
+
+				//绘制
+				this.drawPolygon();
+			}
+		},
+
+		//点击【删除标注】
+		handleDelPolygon() {
+			map.removeInteraction(draw);
+			this.$confirm("确认删除" + this.selAgency.name + "?", "提示", {
+				confirmButtonText: "确定",
+				cancelButtonText: "取消",
+				type: "warning",
+			})
+				.then(() => {
+					this.method = "delPolygon";
+					this.delPolygon();
+				})
+				.catch((err) => {
+					if (err == "cancel") {
+						// this.$message({
+						//   type: "info",
+						//   message: "已取消删除"
+						// });
+					}
+					this.method = "";
+				});
+		},
+
+		//隐藏Polygon（前端隐藏，非删除）
+		hidePolygon() {
+			let polygonTempArray = [];
+
+			this.subAgencyArray.forEach((element) => {
+				if (element.id !== this.selAgencyId) {
+					polygonTempArray.push(element);
+				}
+			});
+
+			this.loadPolygon(polygonTempArray);
+		},
+
+		//绘制Polygon
+		drawPolygon() {
+			draw = new Draw({
+				source: polygonSource,
+				type: "Polygon",
+			});
+			map.addInteraction(draw);
+
+			draw.on("drawend", (feature) => {
+				this.polygonCoor =
+					feature.feature.values_.geometry.flatCoordinates;
+
+				let coorString = "";
+				for (let i = 0; i < this.polygonCoor.length; i++) {
+					coorString = coorString + this.polygonCoor[i] + ",";
+				}
+				if (this.polygonCoor.length > 0) {
+					coorString = coorString.substring(0, coorString.length - 1);
+				}
+
+				if (this.method === "mEditPolygon") {
+					this.$confirm("是否确认覆盖原有区域?", "提示", {
+						confirmButtonText: "确定",
+						cancelButtonText: "取消",
+						type: "warning",
+					})
+						.then(() => {
+							this.addPolygon(coorString);
+						})
+						.catch((err) => {
+							this.loadPolygon(this.subAgencyArray);
+						});
+				} else {
+					this.addPolygon(coorString);
+				}
+
+				this.method = "";
+				map.removeInteraction(draw);
+			});
+		},
+
+		//新增标注
+		async addPolygon(coorString) {
+			console.log(coorString);
+			const url = "/gov/org/agency/mapaddarea";
+
+			let params = {
+				orgId: this.selAgency.id,
+				level: this.selAgency.level,
+				coordinates: coorString,
+				longitude: this.longitude,
+				latitude: this.latitude,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.$message({
+					type: "success",
+					message: "绘制成功",
+				});
+				if (this.dialogVisible) {
+					this.polygonManullyString = "";
+					this.dialogVisible = false;
+				}
+				this.refreshMap(false);
+			} else {
+				this.$message({
+					type: "error",
+					message: "绘制失败，请重试",
+				});
+			}
+		},
+
+		//删除标注
+		async delPolygon() {
+			const url = "/gov/org/agency/mapdelarea";
+
+			let params = {
+				orgId: this.selAgency.id,
+				level: this.selAgency.level,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.$message({
+					type: "success",
+					message: "删除成功",
+				});
+				this.method = "";
+				this.selAgencyIndex = 0;
+				this.refreshMap(false);
+			}
+		},
+		//开启加载动画
+		startLoading() {
+			loading = Loading.service({
+				lock: true, //是否锁定
+				text: "正在加载……", //加载中需要显示的文字
+				background: "rgba(0,0,0,.7)", //背景颜色
+			});
+		},
+
+		//结束加载动画
+		endLoading() {
+			//clearTimeout(timer);
+			if (loading) {
+				loading.close();
+			}
+		},
+	},
+	props: {
+		vueFlag: {
+			type: String,
+			default: "alarm",
+		},
+	},
+	computed: {
+		extentXOffset() {
+			if (this.clientHeight < 900) {
+				return 0.88;
+			} else {
+				return 0.95;
+			}
+		},
+		extentYOffset() {
+			return 0.95;
+		},
+		imgExtent() {
+			return [
+				-x * this.extentXOffset,
+				-y * this.extentYOffset,
+				x * this.extentXOffset,
+				y * this.extentYOffset,
+			];
+		},
+		mapHeight() {
+			return this.clientHeight - 170;
+		},
+		// zoom: {
+		//   get () {
+		//     //根据不同屏幕分辨率，控制zoom大小
+		//     if (this.clientHeight < 900) {
+		//       return 2.3
+		//     } else {
+		//       return 2.8
+		//     }
+		//   },
+		//   set (value) {
+		//   }
+		// },
+		...mapGetters(["clientHeight"]),
+	},
+	components: {},
+};
+export default vueGis;
+</script>
+
+<style scoped>
+.div_search {
+	z-index: 10;
+
+	display: flex;
+}
+.div_back {
+	z-index: 10;
+	right: 10px;
+	top: 1px;
+	position: absolute;
+	display: flex;
+}
+.div_tip {
+	z-index: 10;
+	position: absolute;
+	bottom: 1px;
+	right: 2px;
+	background: rgba(255, 255, 255, 0.6);
+	padding: 3px 10px;
+	font-size: 15px;
+}
+.div_map {
+	margin-top: 15px;
+	width: 100%;
+}
+.div_textarea {
+	text-align: center;
+}
+</style>
+<style>
+.ol-overlaycontainer-stopevent {
+	display: none;
+}
+</style>
diff --git a/src/views/modules/lingshan/shzl/tsrq/cpts/edit.vue b/src/views/modules/lingshan/shzl/tsrq/cpts/edit.vue
new file mode 100644
index 0000000..328664a
--- /dev/null
+++ b/src/views/modules/lingshan/shzl/tsrq/cpts/edit.vue
@@ -0,0 +1,1661 @@
+<template>
+	<div>
+		<div class="dialog-h-content scroll-h">
+			<el-form
+				ref="ref_form"
+				:inline="true"
+				:model="fmData"
+				:rules="dataRule"
+				:disabled="formType === 'detail'"
+				class="m-fm"
+			>
+				<div class="group">
+					<h3>基本信息</h3>
+
+					<div class="row">
+						<el-form-item
+							label="姓名	"
+							prop="name"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入人员姓名"
+								v-model="fmData.name"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="身份证号"
+							prop="idCard"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入人员身份证号"
+								v-model="fmData.idCard"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="特殊人群类别	"
+							prop="specialType"
+							label-width="120px"
+						>
+							<el-select
+								class="s-w1"
+								v-model="fmData.specialType"
+								placeholder="请选择"
+								multiple
+								clearable
+							>
+								<el-option
+									v-for="item in specialTypeOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
+						<el-form-item
+							label="头像"
+							prop="headPhoto"
+							label-width="120px"
+						>
+							<el-upload
+								:headers="$getElUploadHeaders()"
+								:class="[
+									'avatar-uploader',
+									{ 'z-hide': headPhotoList.length > 0 },
+								]"
+								ref="uploadPic"
+								:action="uploadUlr"
+								list-type="picture-card"
+								:on-exceed="exceedPic"
+								:on-remove="removePic"
+								:file-list="headPhotoList"
+								:on-change="handleEditChange"
+								:on-success="handleSuccess"
+								:multiple="false"
+								:limit="1"
+							>
+								<i
+									class="el-icon-plus avatar-uploader-icon"
+								></i>
+							</el-upload>
+						</el-form-item>
+
+						<el-form-item
+							v-if="fmData.genderZh"
+							label="性别"
+							prop="genderZh"
+							label-width="120px"
+						>
+							<span class="s-w1">{{ fmData.genderZh }}</span>
+						</el-form-item>
+						<el-form-item
+							label="民族"
+							v-if="fmData.nation"
+							prop="nation"
+							label-width="120px"
+						>
+							<span class="s-w1">{{ fmData.nation }}</span>
+						</el-form-item>
+						<el-form-item
+							label="出生年月"
+							v-if="fmData.birthday"
+							prop="birthday"
+							label-width="120px"
+						>
+							<span class="s-w1">{{ fmData.birthday }}</span>
+						</el-form-item>
+						<el-form-item
+							label="户籍地"
+							v-if="fmData.domicilePlace"
+							prop="domicilePlace"
+							label-width="120px"
+						>
+							<span class="s-w1">{{ fmData.domicilePlace }}</span>
+						</el-form-item>
+						<el-form-item
+							label="手机号"
+							v-if="fmData.mobile"
+							prop="mobile"
+							label-width="120px"
+						>
+							<span class="s-w1">{{ fmData.mobile }}</span>
+						</el-form-item>
+						<el-form-item
+							label="家庭住址"
+							v-if="fmData.address"
+							prop="address"
+							label-width="120px"
+						>
+							<span class="s-w1">{{ fmData.address }}</span>
+						</el-form-item>
+					</div>
+				</div>
+
+				<div
+					class="group"
+					v-if="fmData.specialType.indexOf('anzhibangjiao') != -1"
+				>
+					<h3>安置帮教</h3>
+					<div class="row">
+						<el-form-item
+							label="原罪名"
+							prop="specialCrowdDetails.anzhibangjiao.originalCharge"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入原罪名"
+								v-model="
+									fmData.specialCrowdDetails.anzhibangjiao
+										.originalCharge
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="释放日期"
+							label-width="120px"
+							prop="specialCrowdDetails.anzhibangjiao.releaseDate"
+						>
+							<el-date-picker
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.anzhibangjiao
+										.releaseDate
+								"
+								value-format="yyyy-MM-dd"
+								clearable
+							>
+							</el-date-picker>
+						</el-form-item>
+
+						<el-form-item
+							label="原判刑期"
+							label-width="120px"
+							prop="specialCrowdDetails.anzhibangjiao.originPrisonTerm"
+						>
+							<el-date-picker
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.anzhibangjiao
+										.originPrisonTerm
+								"
+								value-format="yyyy-MM-dd"
+								clearable
+							>
+							</el-date-picker>
+						</el-form-item>
+
+						<el-form-item
+							label="是否累犯"
+							prop="specialCrowdDetails.anzhibangjiao.recidivismFlag"
+							label-width="120px"
+						>
+							<el-select
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.anzhibangjiao
+										.recidivismFlag
+								"
+								placeholder="请选择"
+								clearable
+							>
+								<el-option
+									v-for="item in yesOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
+						<el-form-item
+							label="是否安置"
+							prop="specialCrowdDetails.anzhibangjiao.emplacementFlag"
+							label-width="120px"
+						>
+							<el-select
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.anzhibangjiao
+										.emplacementFlag
+								"
+								placeholder="请选择"
+								clearable
+							>
+								<el-option
+									v-for="item in yesOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
+						<el-form-item
+							label="安置日期"
+							label-width="120px"
+							prop="specialCrowdDetails.anzhibangjiao.emplacementDate"
+						>
+							<el-date-picker
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.anzhibangjiao
+										.emplacementDate
+								"
+								value-format="yyyy-MM-dd"
+								clearable
+							>
+							</el-date-picker>
+						</el-form-item>
+
+						<el-form-item
+							label="安置帮教情况"
+							prop="specialCrowdDetails.anzhibangjiao.emplacementInfo"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								type="textarea"
+								maxlength="1000"
+								show-word-limit
+								:rows="3"
+								placeholder="请输入安置帮教情况，不超过200字"
+								v-model="
+									fmData.specialCrowdDetails.anzhibangjiao
+										.emplacementInfo
+								"
+							></el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="是否注销"
+							prop="specialCrowdDetails.anzhibangjiao.canceledFlag"
+							label-width="120px"
+						>
+							<el-select
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.anzhibangjiao
+										.canceledFlag
+								"
+								placeholder="请选择"
+								clearable
+							>
+								<el-option
+									v-for="item in yesOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
+						<el-form-item
+							label="注销原因"
+							prop="specialCrowdDetails.anzhibangjiao.canceledReason"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								type="textarea"
+								maxlength="1000"
+								show-word-limit
+								:rows="3"
+								placeholder="请输入注销原因，不超过200字"
+								v-model="
+									fmData.specialCrowdDetails.anzhibangjiao
+										.canceledReason
+								"
+							></el-input>
+						</el-form-item>
+					</div>
+				</div>
+
+				<div
+					class="group"
+					v-if="fmData.specialType.indexOf('jiedurenyuan') != -1"
+				>
+					<h3>戒毒人员</h3>
+					<div class="row">
+						<el-form-item
+							label="有无犯罪史"
+							prop="specialCrowdDetails.jiedurenyuan.criminalHistoryFlag"
+							label-width="120px"
+						>
+							<el-select
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.jiedurenyuan
+										.criminalHistoryFlag
+								"
+								placeholder="请选择"
+								clearable
+							>
+								<el-option
+									v-for="item in yesOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
+						<el-form-item
+							label="有无复吸史"
+							prop="specialCrowdDetails.jiedurenyuan.drugRepetitionFlag"
+							label-width="120px"
+						>
+							<el-select
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.jiedurenyuan
+										.drugRepetitionFlag
+								"
+								placeholder="请选择"
+								clearable
+							>
+								<el-option
+									v-for="item in yesOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
+						<el-form-item
+							label="初次发现日期"
+							label-width="120px"
+							prop="specialCrowdDetails.jiedurenyuan.firstDiscoveryDate"
+						>
+							<el-date-picker
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.jiedurenyuan
+										.firstDiscoveryDate
+								"
+								value-format="yyyy-MM-dd"
+								clearable
+							>
+							</el-date-picker>
+						</el-form-item>
+
+						<el-form-item
+							label="管控人姓名"
+							prop="specialCrowdDetails.jiedurenyuan.controllerName"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入管控人姓名"
+								v-model="
+									fmData.specialCrowdDetails.jiedurenyuan
+										.controllerName
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="管控人联系方式"
+							prop="specialCrowdDetails.jiedurenyuan.controllerContact"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入管控人联系方式"
+								v-model="
+									fmData.specialCrowdDetails.jiedurenyuan
+										.controllerContact
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="帮扶人姓名"
+							prop="specialCrowdDetails.jiedurenyuan.helperName"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入帮扶人姓名"
+								v-model="
+									fmData.specialCrowdDetails.jiedurenyuan
+										.helperName
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="帮扶人联系方式"
+							prop="specialCrowdDetails.jiedurenyuan.helperContact"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入帮扶人联系方式"
+								v-model="
+									fmData.specialCrowdDetails.jiedurenyuan
+										.helperContact
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="是否脱管"
+							prop="specialCrowdDetails.jiedurenyuan.detachedFlag"
+							label-width="120px"
+						>
+							<el-select
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.jiedurenyuan
+										.detachedFlag
+								"
+								placeholder="请选择"
+								clearable
+							>
+								<el-option
+									v-for="item in yesOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
+						<el-form-item
+							label="脱管原因"
+							prop="specialCrowdDetails.jiedurenyuan.detachedReason"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								type="textarea"
+								maxlength="1000"
+								show-word-limit
+								:rows="3"
+								placeholder="请输入脱管原因，不超过200字"
+								v-model="
+									fmData.specialCrowdDetails.jiedurenyuan
+										.emplacementInfo
+								"
+							></el-input>
+						</el-form-item>
+					</div>
+				</div>
+
+				<div
+					class="group"
+					v-if="fmData.specialType.indexOf('jingzhanghuanzhe') != -1"
+				>
+					<h3>精障患者</h3>
+					<div class="row">
+						<el-form-item
+							label="有无肇事肇祸史"
+							prop="specialCrowdDetails.jingzhanghuanzhe.causeTroubleHistoryFlag"
+							label-width="120px"
+						>
+							<el-select
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.jingzhanghuanzhe
+										.causeTroubleHistoryFlag
+								"
+								placeholder="请选择"
+								clearable
+							>
+								<el-option
+									v-for="item in yesOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
+						<el-form-item
+							label="肇事肇祸次数"
+							prop="specialCrowdDetails.jingzhanghuanzhe.causeTroubleTimes"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								type="number"
+								show-word-limit
+								placeholder="请输入肇事肇祸次数"
+								v-model="
+									fmData.specialCrowdDetails.jingzhanghuanzhe
+										.causeTroubleTimes
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="目前诊断类型"
+							prop="specialCrowdDetails.jingzhanghuanzhe.currentDiagnosis"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入目前诊断类型"
+								v-model="
+									fmData.specialCrowdDetails.jingzhanghuanzhe
+										.currentDiagnosis
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="危险性评估等级"
+							prop="specialCrowdDetails.jingzhanghuanzhe.dangerousClass"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入危险性评估等级"
+								v-model="
+									fmData.specialCrowdDetails.jingzhanghuanzhe
+										.dangerousClass
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="是否具备外出能力"
+							prop="specialCrowdDetails.jingzhanghuanzhe.canGoOutFlag"
+							label-width="120px"
+						>
+							<el-select
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.jingzhanghuanzhe
+										.canGoOutFlag
+								"
+								placeholder="请选择"
+								clearable
+							>
+								<el-option
+									v-for="item in yesOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
+						<el-form-item
+							label="是否有暴力倾向"
+							prop="specialCrowdDetails.jingzhanghuanzhe.violenceFlag"
+							label-width="120px"
+						>
+							<el-select
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.jingzhanghuanzhe
+										.violenceFlag
+								"
+								placeholder="请选择"
+								clearable
+							>
+								<el-option
+									v-for="item in yesOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
+						<el-form-item
+							label="是否落实监管补助"
+							prop="specialCrowdDetails.jingzhanghuanzhe.allowanceFlag"
+							label-width="120px"
+						>
+							<el-select
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.jingzhanghuanzhe
+										.allowanceFlag
+								"
+								placeholder="请选择"
+								clearable
+							>
+								<el-option
+									v-for="item in yesOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
+						<el-form-item
+							label="是否纳入低保"
+							prop="specialCrowdDetails.jingzhanghuanzhe.subsistenceFlag"
+							label-width="120px"
+						>
+							<el-select
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.jingzhanghuanzhe
+										.subsistenceFlag
+								"
+								placeholder="请选择"
+								clearable
+							>
+								<el-option
+									v-for="item in yesOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
+						<el-form-item
+							label="监护人姓名"
+							prop="specialCrowdDetails.jingzhanghuanzhe.guardianName"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入监护人姓名"
+								v-model="
+									fmData.specialCrowdDetails.jingzhanghuanzhe
+										.guardianName
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="监护人联系方式"
+							prop="specialCrowdDetails.jingzhanghuanzhe.guardianContact"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入监护人联系方式"
+								v-model="
+									fmData.specialCrowdDetails.jingzhanghuanzhe
+										.guardianContact
+								"
+							>
+							</el-input>
+						</el-form-item>
+					</div>
+				</div>
+
+				<div
+					class="group"
+					v-if="fmData.specialType.indexOf('shequjiaozheng') != -1"
+				>
+					<h3>社区矫正</h3>
+					<div class="row">
+						<el-form-item
+							label="矫正类型"
+							prop="specialCrowdDetails.shequjiaozheng.rectificateType"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入矫正类型"
+								v-model="
+									fmData.specialCrowdDetails.shequjiaozheng
+										.rectificateType
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="矫正开始日期"
+							label-width="120px"
+							prop="specialCrowdDetails.shequjiaozheng.rectificateStartDate"
+						>
+							<el-date-picker
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.shequjiaozheng
+										.rectificateStartDate
+								"
+								value-format="yyyy-MM-dd"
+								clearable
+							>
+							</el-date-picker>
+						</el-form-item>
+
+						<el-form-item
+							label="矫正结束日期"
+							label-width="120px"
+							prop="specialCrowdDetails.shequjiaozheng.rectificateEndDate"
+						>
+							<el-date-picker
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.shequjiaozheng
+										.rectificateEndDate
+								"
+								value-format="yyyy-MM-dd"
+								clearable
+							>
+							</el-date-picker>
+						</el-form-item>
+
+						<el-form-item
+							label="原羁押场所"
+							prop="specialCrowdDetails.shequjiaozheng.originDetainAddress"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入原羁押场所"
+								v-model="
+									fmData.specialCrowdDetails.shequjiaozheng
+										.originDetainAddress
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="原罪名"
+							prop="specialCrowdDetails.shequjiaozheng.originalCharge"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入原罪名"
+								v-model="
+									fmData.specialCrowdDetails.shequjiaozheng
+										.originalCharge
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="接受方式"
+							prop="specialCrowdDetails.shequjiaozheng.receiveWay"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入接受方式"
+								v-model="
+									fmData.specialCrowdDetails.shequjiaozheng
+										.receiveWay
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="矫正情况说明"
+							prop="specialCrowdDetails.shequjiaozheng.rectificateInfo"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								type="textarea"
+								maxlength="1000"
+								show-word-limit
+								:rows="3"
+								placeholder="请输入矫正情况说明，不超过200字"
+								v-model="
+									fmData.specialCrowdDetails.shequjiaozheng
+										.rectificateInfo
+								"
+							></el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="是否脱管"
+							prop="specialCrowdDetails.shequjiaozheng.detachedFlag"
+							label-width="120px"
+						>
+							<el-select
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.shequjiaozheng
+										.detachedFlag
+								"
+								placeholder="请选择"
+								clearable
+							>
+								<el-option
+									v-for="item in yesOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
+						<el-form-item
+							label="脱管原因"
+							prop="specialCrowdDetails.shequjiaozheng.detachedReason"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								type="textarea"
+								maxlength="1000"
+								show-word-limit
+								:rows="3"
+								placeholder="请输入脱管原因，不超过200字"
+								v-model="
+									fmData.specialCrowdDetails.shequjiaozheng
+										.detachedReason
+								"
+							></el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="是否注销"
+							prop="specialCrowdDetails.shequjiaozheng.canceledFlag"
+							label-width="120px"
+						>
+							<el-select
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.shequjiaozheng
+										.canceledFlag
+								"
+								placeholder="请选择"
+								clearable
+							>
+								<el-option
+									v-for="item in yesOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
+						<el-form-item
+							label="注销原因"
+							prop="specialCrowdDetails.shequjiaozheng.canceledReason"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								type="textarea"
+								maxlength="1000"
+								show-word-limit
+								:rows="3"
+								placeholder="请输入注销原因，不超过200字"
+								v-model="
+									fmData.specialCrowdDetails.shequjiaozheng
+										.canceledReason
+								"
+							></el-input>
+						</el-form-item>
+					</div>
+				</div>
+
+				<div
+					class="group"
+					v-if="fmData.specialType.indexOf('xinfangrenyuan') != -1"
+				>
+					<h3>信访人员</h3>
+					<div class="row">
+						<el-form-item
+							label="反映问题"
+							prop="specialCrowdDetails.xinfangrenyuan.problem"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入反映问题"
+								v-model="
+									fmData.specialCrowdDetails.xinfangrenyuan
+										.problem
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="稳控措施"
+							prop="specialCrowdDetails.xinfangrenyuan.stableControlMeasurement"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入稳控措施"
+								v-model="
+									fmData.specialCrowdDetails.xinfangrenyuan
+										.stableControlMeasurement
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="是否多次上访"
+							prop="specialCrowdDetails.xinfangrenyuan.multipleFlag"
+							label-width="120px"
+						>
+							<el-select
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.xinfangrenyuan
+										.multipleFlag
+								"
+								placeholder="请选择"
+								clearable
+							>
+								<el-option
+									v-for="item in yesOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
+						<el-form-item
+							label="是否在当地"
+							prop="specialCrowdDetails.xinfangrenyuan.localFlag"
+							label-width="120px"
+						>
+							<el-select
+								class="s-w1"
+								v-model="
+									fmData.specialCrowdDetails.xinfangrenyuan
+										.localFlag
+								"
+								placeholder="请选择"
+								clearable
+							>
+								<el-option
+									v-for="item in yesOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+
+						<el-form-item
+							label="分管领导姓名"
+							prop="specialCrowdDetails.jingzhanghuanzhe.branchLeader"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入分管领导姓名"
+								v-model="
+									fmData.specialCrowdDetails.jingzhanghuanzhe
+										.branchLeader
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="分管领导联系方式"
+							prop="specialCrowdDetails.jingzhanghuanzhe.branchLeaderContact"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								maxlength="50"
+								show-word-limit
+								placeholder="请输入分管领导联系方式"
+								v-model="
+									fmData.specialCrowdDetails.jingzhanghuanzhe
+										.branchLeaderContact
+								"
+							>
+							</el-input>
+						</el-form-item>
+
+						<el-form-item
+							label="稳控人员名单"
+							prop="specialCrowdDetails.xinfangrenyuan.stableControlerList"
+							label-width="120px"
+						>
+							<el-input
+								class="s-w1"
+								type="textarea"
+								maxlength="1000"
+								show-word-limit
+								:rows="3"
+								placeholder="请输入稳控人员名单，不超过200字"
+								v-model="
+									fmData.specialCrowdDetails.xinfangrenyuan
+										.stableControlerList
+								"
+							></el-input>
+						</el-form-item>
+					</div>
+				</div>
+			</el-form>
+		</div>
+
+		<div class="div_btn resi-btns">
+			<el-button size="small" @click="handleCancle">取 消</el-button>
+			<el-button
+				v-if="formType != 'detail'"
+				type="primary"
+				size="small"
+				:disabled="btnDisable"
+				@click="handleComfirm"
+				>确 定</el-button
+			>
+		</div>
+	</div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost, requestGet } from "@/js/dai/request";
+import formVltHelper from "dai-js/tools/formVltHelper";
+import nextTick from "dai-js/tools/nextTick";
+import dict from "@/views/modules/lingshan/shzl/tsrq/dict";
+
+let loading; // 加载动画
+
+function iniFmData() {
+	return {
+		gender: "",
+		genderZh: "",
+		nation: null,
+		birthday: "",
+		domicilePlace: "",
+		mobile: "",
+		address: "",
+		name: "",
+		idCard: "",
+		specialType: [],
+		headPhoto: "",
+		specialCrowdDetails: {
+			anzhibangjiao: {
+				id: "", // 修改的时候用到，新增用不到
+				originalCharge: "", // 原罪名
+				releaseDate: "", // 释放日期
+				originPrisonTerm: "", // 原判刑期
+				recidivismFlag: "", // 是否累犯
+				emplacementFlag: "", // 是否安置
+				emplacementDate: "", // 安置日期
+				emplacementInfo: "", //安置帮教情况
+				canceledFlag: "", //是否注销
+				canceledReason: "", //注销原因
+			},
+			jiedurenyuan: {
+				id: "", // 修改的时候用到，新增用不到
+				criminalHistoryFlag: "", // 有无犯罪史
+				drugRepetitionFlag: "", //有无复吸史
+				firstDiscoveryDate: "", //初次发现日期
+				controllerName: "", //管控人姓名
+				controllerContact: "", //管控人联系方式
+				helperName: "", //帮扶人姓名
+				helperContact: "", //帮扶人联系方式
+				detachedFlag: "", //是否脱管
+				detachedReason: "", //脱管原因
+			},
+			jingzhanghuanzhe: {
+				id: "", // 修改的时候用到，新增用不到
+				causeTroubleHistoryFlag: "", //有无肇事肇祸史
+				causeTroubleTimes: "", //肇事肇祸次数
+				currentDiagnosis: "", //目前诊断类型
+				dangerousClass: "", //危险性评估等级
+				canGoOutFlag: "", //是否具备外出能力
+				violenceFlag: "", //是否有暴力倾向
+				allowanceFlag: "", //是否落实监管补助
+				subsistenceFlag: "", //是否纳入低保
+				guardianName: "", //监护人姓名
+				guardianContact: "", //监护人联系方式
+			},
+			shequjiaozheng: {
+				id: "", // 修改的时候用到，新增用不到
+				rectificateType: "", //矫正类型
+				rectificateStartDate: "", //矫正开始日期
+				rectificateEndDate: "", //矫正结束日期
+				originDetainAddress: "", //原羁押场所
+				originalCharge: "", //原罪名
+				receiveWay: "", //接受方式
+				rectificateInfo: "", //矫正情况说明
+				detachedFlag: "", //是否脱管
+				detachedReason: "", //脱管原因
+				canceledFlag: "", //是否注销
+				canceledReason: "", //注销原因
+			},
+			xinfangrenyuan: {
+				id: "", // 修改的时候用到，新增用不到
+				problem: "", //反映问题
+				stableControlMeasurement: "", //稳控措施
+				multipleFlag: "", //是否多次上访
+				localFlag: "", //是否在当地
+				branchLeader: "", //分管领导
+				branchLeaderContact: "", //分管领导联系方式
+				principal: "", //负责人
+				principalContact: "", //负责人联系方式
+				stableControlerList: "", //稳控人员名单
+			},
+		},
+	};
+}
+
+export default {
+	components: {},
+	props: { displayed: Boolean },
+	data() {
+		return {
+			formType: "add", //表单操作类型 add新增，edit编辑，detail详情
+
+			loading: false,
+
+			btnDisable: false,
+
+			specialTypeOptions: dict.specialType,
+			yesOptions: [
+				{
+					value: "0",
+					label: "否",
+				},
+				{
+					value: "1",
+					label: "是",
+				},
+			],
+
+			resiId: "",
+			fmData: iniFmData(),
+
+			headPhotoList: [],
+			uploadUlr:
+				window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+		};
+	},
+	computed: {
+		dataRule() {
+			let rules = {
+				name: [
+					{
+						required: true,
+						message: "姓名不能为空",
+						trigger: "blur",
+					},
+				],
+				specialType: [
+					{
+						required: true,
+						message: "分类名称不能为空",
+						trigger: "blur",
+					},
+				],
+				idCard: [
+					{
+						required: true,
+						message: "身份证号不能为空",
+						trigger: "blur",
+					},
+				],
+			};
+
+			const {
+				fmData: { specialType },
+			} = this;
+			const specialTypeRules = {
+				anzhibangjiao: {
+					"specialCrowdDetails.anzhibangjiao.originalCharge": [
+						{
+							required: true,
+							message: "安置帮教-原罪名不能为空",
+							trigger: "blur",
+						},
+					],
+					"specialCrowdDetails.anzhibangjiao.releaseDate": [
+						{
+							required: true,
+							message: "安置帮教-释放日期不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+
+				jiedurenyuan: {
+					"specialCrowdDetails.jiedurenyuan.criminalHistoryFlag": [
+						{
+							required: true,
+							message: "戒毒人员-有无犯罪史不能为空",
+							trigger: "blur",
+						},
+					],
+					"specialCrowdDetails.jiedurenyuan.drugRepetitionFlag": [
+						{
+							required: true,
+							message: "戒毒人员-有无复吸史不能为空",
+							trigger: "blur",
+						},
+					],
+					"specialCrowdDetails.jiedurenyuan.firstDiscoveryDate": [
+						{
+							required: true,
+							message: "戒毒人员-初次发现日期不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+
+				jingzhanghuanzhe: {
+					"specialCrowdDetails.jingzhanghuanzhe.causeTroubleHistoryFlag":
+						[
+							{
+								required: true,
+								message: "精障患者-有无肇事肇祸史不能为空",
+								trigger: "blur",
+							},
+						],
+					"specialCrowdDetails.jingzhanghuanzhe.causeTroubleTimes": [
+						{
+							required: true,
+							message: "精障患者-肇事肇祸次数不能为空",
+							trigger: "blur",
+						},
+					],
+					"specialCrowdDetails.jingzhanghuanzhe.currentDiagnosis": [
+						{
+							required: true,
+							message: "精障患者-目前诊断类型不能为空",
+							trigger: "blur",
+						},
+					],
+					"specialCrowdDetails.jingzhanghuanzhe.dangerousClass": [
+						{
+							required: true,
+							message: "精障患者-危险性评估等级不能为空",
+							trigger: "blur",
+						},
+					],
+					"specialCrowdDetails.jingzhanghuanzhe.canGoOutFlag": [
+						{
+							required: true,
+							message: "精障患者-是否具备外出能力不能为空",
+							trigger: "blur",
+						},
+					],
+					"specialCrowdDetails.jingzhanghuanzhe.violenceFlag": [
+						{
+							required: true,
+							message: "精障患者-是否有暴力倾向不能为空",
+							trigger: "blur",
+						},
+					],
+					"specialCrowdDetails.jingzhanghuanzhe.allowanceFlag": [
+						{
+							required: true,
+							message: "精障患者-是否落实监管补助不能为空",
+							trigger: "blur",
+						},
+					],
+					"specialCrowdDetails.jingzhanghuanzhe.subsistenceFlag": [
+						{
+							required: true,
+							message: "精障患者-是否纳入低保不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+
+				shequjiaozheng: {
+					"specialCrowdDetails.shequjiaozheng.rectificateType": [
+						{
+							required: true,
+							message: "社区矫正-矫正类型不能为空",
+							trigger: "blur",
+						},
+					],
+					"specialCrowdDetails.shequjiaozheng.rectificateStartDate": [
+						{
+							required: true,
+							message: "社区矫正-矫正开始日期不能为空",
+							trigger: "blur",
+						},
+					],
+					"specialCrowdDetails.shequjiaozheng.rectificateEndDate": [
+						{
+							required: true,
+							message: "社区矫正-矫正结束日期不能为空",
+							trigger: "blur",
+						},
+					],
+					"specialCrowdDetails.shequjiaozheng.receiveWay": [
+						{
+							required: true,
+							message: "社区矫正-接受方式不能为空",
+							trigger: "blur",
+						},
+					],
+					"specialCrowdDetails.shequjiaozheng.detachedFlag": [
+						{
+							required: true,
+							message: "社区矫正-是否脱管不能为空",
+							trigger: "blur",
+						},
+					],
+					"specialCrowdDetails.shequjiaozheng.canceledFlag": [
+						{
+							required: true,
+							message: "社区矫正-是否注销不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+
+				xinfangrenyuan: {
+					"specialCrowdDetails.xinfangrenyuan.problem": [
+						{
+							required: true,
+							message: "信访人员-反映问题不能为空",
+							trigger: "blur",
+						},
+					],
+					"specialCrowdDetails.xinfangrenyuan.stableControlMeasurement":
+						[
+							{
+								required: true,
+								message: "信访人员-稳控措施不能为空",
+								trigger: "blur",
+							},
+						],
+					"specialCrowdDetails.xinfangrenyuan.multipleFlag": [
+						{
+							required: true,
+							message: "信访人员-是否多次上访不能为空",
+							trigger: "blur",
+						},
+					],
+					"specialCrowdDetails.xinfangrenyuan.localFlag": [
+						{
+							required: true,
+							message: "信访人员-是否在当地不能为空",
+							trigger: "blur",
+						},
+					],
+				},
+			};
+
+			specialType.forEach((ki) => {
+				rules = { ...rules, ...specialTypeRules[ki] };
+			});
+
+			return rules;
+		},
+	},
+	watch: {
+		displayed(val) {
+			if (!val) {
+				this.resetData();
+			}
+		},
+	},
+
+	async mounted() {
+		// this.getCategoryList();
+	},
+
+	methods: {
+		removePic(file, fileList) {
+			this.fmData.headPhoto = "";
+			this.headPhotoList = [];
+		},
+		// 最多上传3张图，超过时隐藏上传按钮
+		handleEditChange(file, fileList) {},
+		exceedPic() {
+			this.$message.warning("最多上传1张图片");
+		},
+		handleSuccess(response, file, fileList) {
+			console.log(file);
+			this.headPhotoList.push(file);
+			this.fmData.headPhoto = response.data.url;
+		},
+
+		async getInfo() {
+			const url = `/epmetuser/lingShan/specialCrowd/getPersonSpecialTypeDetail`;
+			const { resiId } = this;
+			const params = {
+				resiId,
+			};
+			const { data, code, msg } = await requestGet(url, params);
+			if (code === 0) {
+				let fmData = iniFmData();
+				let specialType = Object.keys(data.specialCrowdDetails).filter(
+					(ki) => data.specialCrowdDetails[ki]
+				);
+				let specialCrowdDetails = fmData.specialCrowdDetails;
+				specialType.forEach((ki) => {
+					specialCrowdDetails[ki] = data.specialCrowdDetails[ki];
+				});
+				this.fmData = {
+					...fmData,
+					...data,
+					specialType,
+					specialCrowdDetails,
+				};
+				if (this.fmData.headPhoto) {
+					this.headPhotoList = [{ url: this.fmData.headPhoto }];
+				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		// 先弃用，本地写死字典
+		async getCategoryList() {
+			const url = "/sys/dict/data/dictlist";
+			const params = {
+				dictType: "self_org_category",
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.specialTypeOptions = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async initForm(type, row) {
+			// this.$refs.ref_form.resetFields();
+
+			this.formType = type;
+
+			if (row) {
+				this.resiId = row.resiId;
+				this.getInfo();
+			}
+		},
+
+		async handleComfirm() {
+			this.btnDisable = true;
+			setTimeout(() => {
+				this.btnDisable = false;
+			}, 5000);
+			this.$refs["ref_form"].validate((valid, messageObj) => {
+				if (!valid) {
+					app.util.validateRule(messageObj);
+					this.btnDisable = false;
+				} else {
+					this.submit();
+				}
+			});
+		},
+
+		async submit() {
+			let url = "/epmetuser/lingShan/specialCrowd/save";
+			const {
+				resiId,
+				fmData: {
+					name,
+					idCard,
+					headPhoto,
+					specialCrowdDetails: allDetails,
+					specialType,
+				},
+			} = this;
+			let specialCrowdDetails = {};
+			specialType.forEach((ki) => {
+				specialCrowdDetails[ki] = allDetails[ki];
+			});
+
+			const { data, code, msg } = await requestPost(url, {
+				resiId,
+				name,
+				headPhoto,
+				idCard,
+				specialCrowdDetails,
+			});
+
+			if (code === 0) {
+				this.$message({
+					type: "success",
+					message: "保存成功",
+				});
+				this.resetData();
+				this.$emit("dialogOk");
+				this.btnDisable = false;
+			} else {
+				this.btnDisable = false;
+				this.$message.error(msg);
+			}
+		},
+
+		handleCancle() {
+			this.resetData();
+			this.$emit("dialogCancle");
+		},
+
+		resetData() {
+			this.resiId = "";
+			this.headPhotoList = [];
+			this.fmData = iniFmData();
+		},
+
+		// 开启加载动画
+		startLoading() {
+			loading = Loading.service({
+				lock: true, // 是否锁定
+				text: "正在加载……", // 加载中需要显示的文字
+				background: "rgba(0,0,0,.7)", // 背景颜色
+			});
+		},
+		// 结束加载动画
+		endLoading() {
+			// clearTimeout(timer);
+			if (loading) {
+				loading.close();
+			}
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+.m-fm {
+	.z-hide {
+		/deep/ .el-upload--picture-card {
+			display: none !important;
+		}
+	}
+	.group {
+		padding: 0 10px;
+		h3 {
+			position: relative;
+			padding-left: 20px;
+			line-height: 25px;
+			&::before {
+				position: absolute;
+				content: "";
+				display: block;
+				left: 2px;
+				top: 0;
+				bottom: 0;
+				margin: auto 0;
+				width: 4px;
+				height: 16px;
+				border-radius: 1px;
+				background-color: #ff3333;
+			}
+		}
+	}
+	.s-w1 {
+		display: block;
+		width: 220px;
+	}
+}
+</style>
diff --git a/src/views/modules/lingshan/shzl/tsrq/cpts/pop-import.vue b/src/views/modules/lingshan/shzl/tsrq/cpts/pop-import.vue
new file mode 100644
index 0000000..4488a11
--- /dev/null
+++ b/src/views/modules/lingshan/shzl/tsrq/cpts/pop-import.vue
@@ -0,0 +1,390 @@
+<template>
+	<!-- 修改弹出框 -->
+	<el-dialog
+		:visible="true"
+		:close-on-click-modal="false"
+		:close-on-press-escape="false"
+		title="批量导入"
+		width="850px"
+		top="5vh"
+		@close="handleClose"
+	>
+		<div class="m-imp">
+			<el-steps
+				:space="250"
+				align-center
+				:active="step"
+				finish-status="success"
+			>
+				<el-step title="选择文件"></el-step>
+				<el-step title="开始导入"></el-step>
+				<el-step title="导入完成"></el-step>
+			</el-steps>
+
+			<div class="cnt" v-show="step === 0">
+				<div class="item">
+					<div class="field"><i>*</i> 选择要导入的人员类型：</div>
+					<div class="input">
+						<el-select
+							v-model="fmData.specialType"
+							placeholder="请选择"
+							size="small"
+							clearable
+							class="item_width_2"
+						>
+							<el-option
+								v-for="item in specialTypeOptions"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+					</div>
+				</div>
+				<div class="item">
+					<div class="field"><i>*</i> 选择要导入的人员类型：</div>
+					<div class="input">
+						<el-upload
+							:headers="$getElUploadHeaders()"
+							ref="upload"
+							class="upload-btn"
+							action="uploadUlr"
+							:limit="1"
+							:accept="'.xls,.xlsx'"
+							:with-credentials="true"
+							:show-file-list="true"
+							:on-progress="handleProgress"
+							:on-success="handleExcelSuccess"
+							:before-upload="beforeExcelUpload"
+							:http-request="uploadHttpRequest"
+							drag
+							align-center
+							:auto-upload="true"
+							:file="fmData.file"
+						>
+							<i class="el-icon-upload"></i>
+							<div class="el-upload__text">
+								将文件拖到此处，或<em>点击上传</em>
+							</div>
+							<div class="el-upload__tip" slot="tip">
+								只能上传excel文件，且不超过10M
+							</div>
+						</el-upload>
+					</div>
+				</div>
+
+				<div class="hint">
+					<h4>批量导入说明：</h4>
+					<p>
+						1、<a @click="handleExportModule()">点击下载</a
+						>特殊人群信息模板；
+					</p>
+					<p>2、按模板采集特殊人群信息；</p>
+					<p>3、上传文件导入。</p>
+				</div>
+
+				<div class="operate">
+					<el-button size="small" type="primary" @click="toNext(1)">{{
+						importBtnTitle
+					}}</el-button>
+				</div>
+			</div>
+
+			<div class="cnt" v-show="step === 1">
+				<div class="process">
+					<el-progress
+						:format="(per) => '导入进度：' + per + '%'"
+						:show-text="true"
+						:text-inside="true"
+						:stroke-width="24"
+						:percentage="importPer"
+						status="warning"
+					></el-progress>
+				</div>
+
+				<div class="operate">
+					<el-button size="small" @click="handleClose">
+						取消
+					</el-button>
+				</div>
+			</div>
+
+			<div class="cnt" v-show="step === 2">
+				<div class="hint">
+					<p>
+						导入完成：<b>{{ importResult.successItemsQty }}</b
+						>条
+					</p>
+					<p>
+						导入失败：<b class="z-fail">{{
+							importResult.failItemsQty
+						}}</b
+						>条
+						<span
+							>，
+							<a
+								target="_blank"
+								:href="importResult.resultDescFile"
+								>点击下载</a
+							>未成功导入人员信息</span
+						>
+					</p>
+				</div>
+
+				<div class="operate">
+					<el-button size="small" @click="handleClose">
+						关闭
+					</el-button>
+				</div>
+			</div>
+		</div>
+	</el-dialog>
+</template>
+
+<script>
+import { requestPost, requestGet } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import axios from "axios";
+import dict from "@/views/modules/lingshan/shzl/tsrq/dict";
+
+export default {
+	components: {},
+	data() {
+		return {
+			// 当前步骤
+			step: 0,
+
+			importBtnTitle: "下一步",
+			importLoading: false,
+			// 导入进度百分比
+			taskId: "",
+			importPer: 20,
+			importResult: {
+				taskId: "1648930494377668610",
+				originFileName: "社区矫正人员信息采集表.xlsx",
+				bizType: "special_crowd",
+				processStatus: "finished_fail",
+				startTime: "2023-04-20 14:04:00",
+				resultDescFile:
+					"https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20230420/bda8c794796b4554aefc4e648fb17fd8.xlsx", // 结果描述文件地址
+				successItemsQty: 0, //成功条数
+				failItemsQty: 1, //失败条数
+			},
+
+			specialTypeOptions: dict.specialType,
+			fmData: {
+				specialType: "",
+				file: null,
+			},
+		};
+	},
+	computed: {},
+	watch: {},
+	mounted() {},
+	methods: {
+		async handleExportModule() {
+			const {
+				fmData: { specialType },
+			} = this;
+			if (!specialType) {
+				return this.$message.error("请先选择导入人员类型");
+			}
+			let url = "/epmetuser/lingShan/specialCrowd/downloadTemplate";
+
+			let params = {
+				specialType,
+			};
+			await this.$http({
+				method: "GET",
+				url,
+				responseType: "blob",
+				params,
+			})
+				.then((res) => {
+					// this.download(res.data, title + '.xls')
+					if (res.headers["content-disposition"]) {
+						let fileName = window.decodeURI(
+							res.headers["content-disposition"]
+								.split(";")[1]
+								.split("=")[1]
+						);
+						console.log("filename", fileName);
+						let blob = new Blob([res.data], {
+							type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+						});
+						var url = window.URL.createObjectURL(blob);
+						var aLink = document.createElement("a");
+						aLink.style.display = "none";
+						aLink.href = url;
+						aLink.setAttribute("download", fileName);
+						document.body.appendChild(aLink);
+						aLink.click();
+						document.body.removeChild(aLink); //下载完成移除元素
+						window.URL.revokeObjectURL(url); //释放掉blob对象
+					} else this.$message.error("下载失败");
+				})
+				.catch((err) => {
+					console.log("err", err);
+					return this.$message.error("网络错误");
+				});
+		},
+
+		// 上传大图标成功
+		handleExcelSuccess(res, file) {
+			if (res.code === 0 && res.msg === "success") {
+				console.log("resss---ppp", res);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+
+		handleProgress(event, file, fileList) {
+			console.log("percentage", file.percentage);
+		},
+
+		beforeExcelUpload(file) {
+			console.log("file", file);
+			const isType = file.type === "application/vnd.ms-excel";
+			const isTypeComputer =
+				file.type ===
+				"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+			const fileType = isType || isTypeComputer;
+			const isLt1M = file.size / 1024 / 1024 < 10;
+			if (!fileType) {
+				this.$message.error("上传文件只能是xls/xlsx格式！");
+			}
+
+			if (!isLt1M) {
+				this.$message.error("上传文件大小不能超过 10MB!");
+			}
+			return fileType && isLt1M;
+		},
+
+		toNext(step) {
+			if (step == 1) {
+				this.$refs.upload.submit();
+			}
+		},
+
+		async uploadHttpRequest(file) {
+			const {
+				fmData: { specialType },
+			} = this;
+			if (!specialType) {
+				this.$refs.upload.clearFiles();
+				return this.$message.error("请先选择导入人员类型");
+			}
+			if (!file) {
+				return this.$message.error("请先选择导入文件");
+			}
+
+			this.importLoading = true;
+			this.importBtnTitle = "上传中…";
+
+			const fmData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+			fmData.append("file", file.file); //添加文件对象
+
+			await this.$http
+				.post(
+					`/epmetuser/lingShan/specialCrowd/import?crowdCategory=${specialType}`,
+					fmData
+				)
+				.then((res) => {
+					console.log("res-up", res);
+					if (res.data.code == 0 && res.data.msg == "success") {
+						this.$message.success("上传成功");
+						this.step = 1;
+
+						// 轮训结果
+						this.taskId = res.data.data;
+						this.queryProcess();
+					} else this.$message.error(res.data.msg);
+				})
+				.catch((err) => {
+					console.log("失败", err);
+					file.onError(); //上传失败的文件会从文件列表中删除
+					// this.$message.error('导入失败')
+				});
+			this.importLoading = false;
+			this.importBtnTitle = "下一步";
+			this.$refs.upload.clearFiles();
+		},
+
+		async queryProcess() {
+			const { taskId } = this;
+			const url = `/commonservice/import-task/getById?taskId=${taskId}`;
+
+			const { data, code, msg } = await requestPost(url, {});
+
+			if (code === 0) {
+				if (
+					data.processStatus == "finished_fail" ||
+					data.processStatus == "finished_success"
+				) {
+					this.importResult = data;
+					this.step = 2;
+					this.importPer = 0;
+				} else {
+					let per = this.importPer + parseInt(Math.random() * 20);
+					this.importPer = Math.min(99, per);
+					await nextTick(5000);
+					this.queryProcess();
+				}
+			} else {
+				this.$message.error(msg);
+				await nextTick(5000);
+				this.queryProcess();
+				// this.$message.success("操作失败！");
+			}
+		},
+
+		handleClose() {
+			console.log(">>>>>>>>>>>  handleClose");
+			this.$emit("close");
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/c/function.scss";
+/deep/ .m-imp {
+	padding: 0 50px;
+	.cnt {
+		margin-top: 20px;
+		.item {
+			display: flex;
+			margin-top: 15px;
+			.field {
+				i {
+					color: #ff3333;
+				}
+				line-height: 32px;
+			}
+		}
+		.hint {
+			p {
+				a {
+					cursor: pointer;
+				}
+				b {
+					color: #05f70d;
+					&.z-fail {
+						color: #ff3333;
+					}
+				}
+			}
+		}
+
+		.process {
+			margin: 50px;
+		}
+
+		.operate {
+			text-align: right;
+		}
+	}
+}
+</style>
diff --git a/src/views/modules/lingshan/shzl/tsrq/dict.js b/src/views/modules/lingshan/shzl/tsrq/dict.js
new file mode 100644
index 0000000..1b8e72e
--- /dev/null
+++ b/src/views/modules/lingshan/shzl/tsrq/dict.js
@@ -0,0 +1,24 @@
+export default {
+	specialType: [
+		{
+			value: "anzhibangjiao",
+			label: "安置帮教",
+		},
+		{
+			value: "jiedurenyuan",
+			label: "戒毒人员",
+		},
+		{
+			value: "jingzhanghuanzhe",
+			label: "精障患者",
+		},
+		{
+			value: "shequjiaozheng",
+			label: "社区矫正",
+		},
+		{
+			value: "xinfangrenyuan",
+			label: "信访人员",
+		},
+	],
+};
diff --git a/src/views/modules/lingshan/shzl/tsrq/index.vue b/src/views/modules/lingshan/shzl/tsrq/index.vue
new file mode 100644
index 0000000..dd759a3
--- /dev/null
+++ b/src/views/modules/lingshan/shzl/tsrq/index.vue
@@ -0,0 +1,670 @@
+<template>
+	<div class="resi-container">
+		<el-card ref="searchCard" class="search-card">
+			<el-form
+				ref="searchForm"
+				:inline="true"
+				:model="fmData"
+				class="demo-form-inline"
+			>
+				<el-form-item label="所属组织" prop="gridId">
+					<el-cascader
+						class="customer_cascader"
+						ref="myCascader"
+						v-model="agencyIdArray"
+						:options="orgOptions"
+						:props="orgOptionProps"
+						:show-all-levels="false"
+						@change="handleChangeAgency"
+						clearable
+					></el-cascader>
+				</el-form-item>
+
+				<el-form-item label="特殊人群类型" prop="specialType">
+					<el-select
+						v-model="fmData.specialType"
+						placeholder="请选择"
+						size="small"
+						clearable
+						class="item_width_2"
+					>
+						<el-option
+							v-for="item in specialTypeOptions"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+						>
+						</el-option>
+					</el-select>
+				</el-form-item>
+
+				<el-form-item label="人员姓名" prop="name">
+					<el-input
+						v-model="fmData.name"
+						class="resi-cell-input"
+						size="small"
+						clearable
+						placeholder="请输入"
+					>
+					</el-input>
+				</el-form-item>
+
+				<el-form-item label="手机号" prop="mobile">
+					<el-input
+						v-model="fmData.mobile"
+						class="resi-cell-input"
+						size="small"
+						clearable
+						placeholder="请输入"
+					>
+					</el-input>
+				</el-form-item>
+
+				<el-form-item label="身份证号" prop="idCard">
+					<el-input
+						v-model="fmData.idCard"
+						class="resi-cell-input"
+						size="small"
+						clearable
+						placeholder="请输入"
+					>
+					</el-input>
+				</el-form-item>
+
+				<el-form-item>
+					<el-button
+						class="diy-button--search"
+						size="small"
+						@click="handleSearch"
+						>查询</el-button
+					>
+					<el-button
+						class="diy-button--reset"
+						size="small"
+						@click="resetForm('searchForm')"
+						>重置</el-button
+					>
+				</el-form-item>
+			</el-form>
+		</el-card>
+
+		<el-card class="resi-card-table">
+			<div class="resi-row-btn">
+				<el-button
+					class="diy-button--add"
+					size="small"
+					@click="handleAdd"
+					>新增</el-button
+				>
+
+				<el-button
+					class="diy-button--export"
+					size="small"
+					@click="displayed.popImport = true"
+					>批量导入</el-button
+				>
+
+				<el-button
+					@click="handleChu"
+					class="diy-button--reset"
+					size="small"
+					>导出</el-button
+				>
+			</div>
+
+			<el-table
+				:data="tableData"
+				border
+				style="width: 100%"
+				class="resi-table"
+				:height="maxTableHeight"
+			>
+				<el-table-column
+					label="序号"
+					type="index"
+					align="center"
+					width="50"
+				/>
+				<el-table-column
+					prop="orgNamePath"
+					label="所属组织"
+					align="center"
+					:show-overflow-tooltip="true"
+				/>
+				<el-table-column
+					prop="specialTypeDisplay"
+					align="center"
+					label="特殊人群类型"
+					:show-overflow-tooltip="true"
+				/>
+				<el-table-column
+					prop="name"
+					align="center"
+					label="人员姓名"
+					:show-overflow-tooltip="true"
+				/>
+				<el-table-column
+					prop="mobile"
+					label="手机号"
+					align="center"
+					:show-overflow-tooltip="true"
+				/>
+				<el-table-column
+					prop="idCard"
+					align="center"
+					label="身份证号"
+					:show-overflow-tooltip="true"
+				/>
+				<el-table-column
+					prop="address"
+					align="center"
+					label="家庭地址"
+					:show-overflow-tooltip="true"
+				/>
+				<el-table-column
+					prop="createdTime"
+					align="center"
+					label="创建时间"
+					:show-overflow-tooltip="true"
+				/>
+				<el-table-column
+					prop="updatedTime"
+					align="center"
+					label="更新时间"
+					:show-overflow-tooltip="true"
+				/>
+				<el-table-column
+					fixed="right"
+					label="操作"
+					align="center"
+					width="220"
+				>
+					<template slot-scope="scope">
+						<el-button
+							@click="handleWatch(scope.$index)"
+							type="text"
+							size="small"
+							>查看</el-button
+						>
+
+						<el-button
+							@click="handleEdit(scope.$index)"
+							v-if="
+								true ||
+								scope.row.agencyId == $store.state.user.agencyId
+							"
+							type="text"
+							size="small"
+							class="div-table-button--edit"
+							>修改</el-button
+						>
+
+						<el-popconfirm
+							title="删除之后无法回复，确认删除？"
+							v-if="
+								true ||
+								scope.row.agencyId == $store.state.user.agencyId
+							"
+							@onConfirm="handleDel(scope.row, scope.$index)"
+							@confirm="handleDel(scope.row, scope.$index)"
+						>
+							<el-button
+								slot="reference"
+								type="text"
+								size="small"
+								class="div-table-button--delete"
+								style="margin-left: 10px"
+								>删除</el-button
+							>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</el-table>
+			<div>
+				<el-pagination
+					@size-change="handleSizeChange"
+					@current-change="handleCurrentChange"
+					:current-page.sync="pageNo"
+					:page-sizes="[20, 50, 100, 200]"
+					:page-size="parseInt(pageSize)"
+					layout="sizes, prev, pager, next, total"
+					:total="total"
+				>
+				</el-pagination>
+			</div>
+		</el-card>
+
+		<!-- 修改弹出框 -->
+		<el-dialog
+			:visible.sync="formShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="formTitle"
+			width="850px"
+			top="5vh"
+			class="dialog-h"
+			@closed="handleClose"
+		>
+			<edit-form
+				ref="eleEditForm"
+				:displayed="formShow"
+				@dialogCancle="handleClose"
+				@dialogOk="handleEditSuccess"
+			></edit-form>
+		</el-dialog>
+
+		<pop-import
+			v-if="displayed.popImport"
+			@close="displayed.popImport = false"
+		/>
+	</div>
+</template>
+
+<script>
+import { requestPost, requestGet } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import dict from "@/views/modules/lingshan/shzl/tsrq/dict";
+import editForm from "./cpts/edit";
+import popImport from "./cpts/pop-import";
+import axios from "axios";
+
+export default {
+	components: { editForm, popImport },
+	data() {
+		return {
+			openSearch: false,
+
+			formShow: false,
+			formTitle: "特殊人群信息",
+
+			pageNo: 1,
+			pageSize: window.localStorage.getItem("pageSize") || 20,
+			total: 1,
+
+			tableData: [],
+
+			agencyIdArray: [],
+			orgOptions: [],
+			orgOptionProps: {
+				multiple: false,
+				value: "agencyId",
+				label: "agencyName",
+				children: "subAgencyList",
+				checkStrictly: true,
+			},
+
+			specialTypeOptions: dict.specialType,
+
+			fmData: {
+				orgId: "",
+				orgType: "",
+				specialType: "",
+				name: "",
+				mobile: "",
+				idCard: "",
+			},
+
+			importBtnTitle: "导入",
+			importLoading: false,
+
+			//积分记录
+			displayed: {
+				popImport: false,
+			},
+		};
+	},
+	computed: {
+		maxTableHeight() {
+			return this.$store.state.inIframe
+				? this.clientHeight - 360 + this.iframeHeigh
+				: this.clientHeight - 360;
+		},
+		...mapGetters(["clientHeight", "iframeHeight"]),
+	},
+	watch: {
+		"fmData.createTime": function (val) {
+			if (Array.isArray(val) && val.length == 2) {
+				this.fmData.startTime = val[0];
+				this.fmData.endTime = val[1];
+			} else {
+				this.fmData.startTime = "";
+				this.fmData.endTime = "";
+			}
+		},
+		popImport(val) {
+			if (!val) {
+				this.getTableData();
+			}
+		},
+	},
+	mounted() {
+		this.getOrgTreeList();
+		this.getTableData();
+	},
+	methods: {
+		getOrgTreeList() {
+			const { user } = this.$store.state;
+			this.$http
+				.post("/gov/org/customeragency/agencygridtree", {})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("获取组织树成功", res.data);
+						this.orgOptions = [];
+						this.orgOptions.push(res.data);
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+
+		handleChangeAgency() {
+			let nodes = this.$refs["myCascader"].getCheckedNodes();
+			if (nodes && nodes.length > 0) {
+				let obj = nodes()[0].data;
+				this.fmData.orgType = obj.level === "grid" ? "grid" : "agency";
+				this.fmData.orgId =
+					this.agencyIdArray.length > 0
+						? this.agencyIdArray[this.agencyIdArray.length - 1]
+						: "";
+			} else {
+				this.fmData.orgType = "";
+				this.fmData.orgId = "";
+			}
+		},
+
+		async handleExportModule() {
+			let url =
+				"/heart/iccommunityselforganization/import-template-download";
+
+			let params = {};
+			await this.$http({
+				method: "POST",
+				url,
+				responseType: "blob",
+				data: params,
+			})
+				.then((res) => {
+					// this.download(res.data, title + '.xls')
+					if (res.headers["content-disposition"]) {
+						let fileName = window.decodeURI(
+							res.headers["content-disposition"]
+								.split(";")[1]
+								.split("=")[1]
+						);
+						console.log("filename", fileName);
+						let blob = new Blob([res.data], {
+							type: "application/vnd.ms-excel",
+						});
+						var url = window.URL.createObjectURL(blob);
+						var aLink = document.createElement("a");
+						aLink.style.display = "none";
+						aLink.href = url;
+						aLink.setAttribute("download", fileName);
+						document.body.appendChild(aLink);
+						aLink.click();
+						document.body.removeChild(aLink); //下载完成移除元素
+						window.URL.revokeObjectURL(url); //释放掉blob对象
+					} else this.$message.error("下载失败");
+				})
+				.catch((err) => {
+					console.log("err", err);
+					return this.$message.error("网络错误");
+				});
+		},
+		// 上传大图标成功
+		handleExcelSuccess(res, file) {
+			if (res.code === 0 && res.msg === "success") {
+				console.log("resss---ppp", res);
+			} else {
+				this.$message.error(res.msg);
+			}
+		},
+		handleProgress(event, file, fileList) {
+			console.log("percentage", file.percentage);
+		},
+
+		beforeExcelUpload(file) {
+			console.log("file", file);
+			const isType = file.type === "application/vnd.ms-excel";
+			const isTypeComputer =
+				file.type ===
+				"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+			const fileType = isType || isTypeComputer;
+			const isLt1M = file.size / 1024 / 1024 < 10;
+			if (!fileType) {
+				this.$message.error("上传文件只能是xls/xlsx格式！");
+			}
+
+			if (!isLt1M) {
+				this.$message.error("上传文件大小不能超过 10MB!");
+			}
+			return fileType && isLt1M;
+		},
+		async uploadHttpRequest(file) {
+			this.importLoading = true;
+			this.importBtnTitle = "正在上传中...";
+			this.$message({
+				showClose: true,
+				message: "导入中，请到系统管理-导入记录中查看进度",
+				duration: 0,
+			});
+			const fmData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+			fmData.append("file", file.file); //添加文件对象
+			await this.$http
+				.post(
+					"/heart/iccommunityselforganization/importcommunityselforganization",
+					fmData
+				)
+				.then((res) => {
+					console.log("res-up", res);
+					if (res.data.code == 0 && res.data.msg == "success") {
+						// this.$message.success('导入成功')
+						this.getTableData();
+					} else this.$message.error(res.data.msg);
+				})
+				.catch((err) => {
+					console.log("失败", err);
+					file.onError(); //上传失败的文件会从文件列表中删除
+					// this.$message.error('导入失败')
+				});
+			// axios({
+			//   url:
+			//     window.SITE_CONFIG["apiURL"] +
+			//     "/heart/iccommunityselforganization/importcommunityselforganization",
+			//   method: "post",
+			//   data: fmData,
+			//   // responseType: "blob",
+			// })
+			//   .then((res) => {
+			//     this.importLoading = false;
+			//     this.importBtnTitle = "导入";
+			//     console.log("resresresresresresres", res);
+
+			//     this.getTableData();
+			//     if (res.data.code == 0) {
+			//       return this.$message.success(res.data.data || "导入成功");
+			//     } else {
+			//       return this.$message.error(res.data.msg);
+			//     }
+			//   })
+			//   .catch((err) => {
+			//     console.log("失败", err);
+			//   });
+			this.importLoading = false;
+			this.importBtnTitle = "导入";
+			this.$refs.upload.clearFiles();
+		},
+
+		handleSizeChange(val) {
+			console.log(`每页 ${val} 条`);
+			this.pageSize = val;
+			window.localStorage.setItem("pageSize", val);
+			this.getTableData();
+		},
+		handleCurrentChange(val) {
+			console.log(`当前页: ${val}`);
+			this.pageNo = val;
+			this.getTableData();
+		},
+
+		handleClose() {
+			this.formShow = false;
+		},
+		handleSearch(val) {
+			console.log(this.fmData);
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		resetForm(formName) {
+			this.$refs[formName].resetFields();
+			this.handleSearch();
+		},
+		async handleAdd() {
+			this.formShow = true;
+			this.formTitle = "新增";
+			await nextTick();
+			console.log(this.$refs);
+			this.$refs.eleEditForm.initForm("add");
+		},
+
+		async handleChu() {
+			const url =
+				"/heart/iccommunityselforganization/exportcommunityselforganization";
+			const { pageSize, pageNo, fmData } = this;
+			axios({
+				url: window.SITE_CONFIG["apiURL"] + url,
+				method: "post",
+				data: {
+					pageSize,
+					pageNo,
+					...fmData,
+				},
+				responseType: "blob",
+			})
+				.then((res) => {
+					let fileName = window.decodeURI(
+						res.headers["content-disposition"]
+							.split(";")[1]
+							.split("=")[1]
+					);
+					console.log("filename", fileName);
+					let blob = new Blob([res.data], {
+						type: "application/vnd.ms-excel",
+					});
+					var url = window.URL.createObjectURL(blob);
+					var aLink = document.createElement("a");
+					aLink.style.display = "none";
+					aLink.href = url;
+					aLink.setAttribute("download", fileName);
+					document.body.appendChild(aLink);
+					aLink.click();
+					document.body.removeChild(aLink); //下载完成移除元素
+					window.URL.revokeObjectURL(url); //释放掉blob对象
+				})
+				.catch((err) => {
+					console.log("获取导出情失败", err);
+					return this.$message.error("网络错误");
+				});
+		},
+
+		async handleWatch(rowIndex) {
+			this.formShow = true;
+			this.formTitle = "查看";
+			await nextTick();
+			this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
+		},
+
+		async handleEdit(rowIndex) {
+			this.formShow = true;
+			this.formTitle = "编辑";
+			await nextTick();
+			this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
+		},
+
+		handleEditSuccess() {
+			this.handleClose();
+			this.getTableData();
+		},
+
+		async handleDel(rowData, rowIndex) {
+			console.log(rowData, rowIndex);
+			const url = "/epmetuser/lingShan/specialCrowd/deleteByResi";
+			const { tableData } = this;
+
+			const { data, code, msg } = await requestPost(url, {
+				resiId: tableData[rowIndex].resiId,
+			});
+
+			if (code === 0) {
+				this.$message.success("删除成功！");
+				this.getTableData();
+			} else {
+				this.$message.error(msg);
+				// this.$message.success("操作失败！");
+			}
+		},
+
+		async getTableData() {
+			const url = "/epmetuser/lingShan/specialCrowd/listSpecialCrowd";
+			const { pageSize, pageNo, fmData } = this;
+			const { data, code, msg } = await requestGet(url, {
+				pageSize,
+				pageNo,
+				...fmData,
+			});
+			if (code === 0) {
+				console.log("列表请求成功！！！！！！！！！！！！！！");
+				this.total = data.total || 0;
+				this.tableData = data.list
+					? data.list.map((item) => {
+							return item;
+					  })
+					: [];
+			} else {
+				this.$message.error(msg);
+			}
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+
+.resi-container .resi-card-table {
+	::v-deep .el-table th {
+		color: #fff;
+		background-color: rgba(33, 149, 254, 1);
+		// border-right: 1px solid rgba(33, 149, 254, 1);
+	}
+}
+.resi-table {
+	::v-deep .el-button--text {
+		text-decoration: underline;
+	}
+}
+.resi-card-table {
+	margin-top: 20px;
+}
+.resi-row-btn {
+	margin-bottom: 13px;
+	.upload-btn {
+		display: inline-block;
+		margin: 0 10px;
+	}
+}
+
+.resi-btns {
+	margin-top: 20px;
+	text-align: center;
+}
+
+.resi-container .resi-card {
+	position: relative;
+	overflow: visible;
+}
+</style>
diff --git a/src/views/modules/lingshan/xtgl/articleCategory.vue b/src/views/modules/lingshan/xtgl/articleCategory.vue
index 976e1da..7ed9220 100644
--- a/src/views/modules/lingshan/xtgl/articleCategory.vue
+++ b/src/views/modules/lingshan/xtgl/articleCategory.vue
@@ -1,540 +1,555 @@
 <template>
-  <div v-if="pageLoading"
-       class="resi-container">
-    <el-card ref="searchCard"
-             class="search-card">
-      <div>
-        <el-form :inline="true"
-                  ref="searchForm"
-                 :model="form"
-                 class="demo-form-inline">
-          <el-form-item label="需求分类">
-            <el-select size="small"
-                       v-model="form.firstCategoryCode"
-                       filterable
-                       placeholder="请选择"
-                       clearable>
-              <el-option v-for="item in demandOptions"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button class="diy-button--search"
-                       size="small"
-                       @click="handleSearch">查询</el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-card>
-    <el-card class="resi-card-table">
-      <div class="resi-row-btn">
-        <el-button class="diy-button--add"
-                   size="small"
-                   @click="handleAdd('1', 'add')">新增</el-button>
-      </div>
-
-      <el-table :data="tableData"
-                row-key="categoryId"
-                v-loading="tableLoading"
-                border
-                :height="tableHeight"
-                style="width: 100%"
-                class="resi-table">
-        <el-table-column label="序号"
-                         type="index"
-                         align="center"
-                         width="50">
-          <template slot-scope="scope">{{ scope.row.index }}</template>
-        </el-table-column>
-        <el-table-column v-for="item in tableHeader"
-                         :key="item.columnName"
-                         :prop="item.columnName"
-                         :label="item.label"
-                         :align="item.align">
-          <template slot-scope="scope">
-            <span>{{ handleFilterSpan(scope.row, item) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作"
-                         align="center"
-                         width="200">
-          <template slot-scope="scope">
-            <el-button v-if="scope.row.hasBtn"
-                       @click="handleLook(scope.row)"
-                       type="text"
-                       size="small"
-                       class="div-table-button--detail">{{(scope.row.usableFlag&&'禁用') || '启用'}}</el-button>
-            <el-button v-if="scope.row.level == 1"
-                       @click="handleAdd('2', 'add', scope.row)"
-                       type="text"
-                       size="small"
-                       class="div-table-button--delete">添加二级分类</el-button>
-            <el-button @click="handleEdit(scope.row, 'edit')"
-                       type="text"
-                       size="small"
-                       class="div-table-button--edit">修改</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="currentPage"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
-        </el-pagination>
-      </div>
-    </el-card>
-
-    <el-dialog title="居民需求分类"
-               :visible.sync="dialogVisible"
-               width="40%"
-               append-to-body
-               :close-on-click-modal="false"
-               :before-close="handlerCancle">
-      <el-form label-width="100px"
-               :model="form"
-               :rules="rules"
-               ref="ruleForm">
-        <el-form-item label="分类名称"
-                      prop="categoryName">
-          <el-input v-model="form.categoryName"
-                    size="small"
-                    style="width: 180px;"></el-input>
-        </el-form-item>
-
-        <!-- <el-form-item label="状态">
-          <el-switch v-model="form.usableFlag"></el-switch>
-        </el-form-item> -->
-        <el-form-item v-if="addLevel == '2'"
-                      label="奖励积分">
-          <el-input-number v-model="form.awardPoint"
-                           :min="0"
-                           size="small"
-                           label="描述文字"></el-input-number>
-        </el-form-item>
-      </el-form>
-      <div class="resi-btns">
-        <el-button size="small"
-                   @click="handlerCancle">取消</el-button>
-        <el-button type="primary"
-                   size="small"
-                   :loading="btnLoading"
-                   @click="handleSUbmit">提交</el-button>
-      </div>
-    </el-dialog>
-
-  </div>
+	<div v-if="pageLoading" class="resi-container">
+		<!-- <el-card ref="searchCard" class="search-card">
+			<div>
+				<el-form
+					:inline="true"
+					ref="searchForm"
+					:model="searchFm"
+					class="demo-form-inline"
+				>
+					<el-form-item label="文章栏目">
+						<el-select
+							size="small"
+							v-model="searchFm.firstCategoryCode"
+							filterable
+							placeholder="请选择"
+							clearable
+						>
+							<el-option
+								v-for="item in firstCategoryOptions"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item>
+						<el-button
+							class="diy-button--search"
+							size="small"
+							@click="handleSearch"
+							>查询</el-button
+						>
+					</el-form-item>
+					<el-form-item>
+						<el-button
+							class="diy-button--reset"
+							size="small"
+							@click="resetForm('searchForm')"
+							>重置</el-button
+						>
+					</el-form-item>
+				</el-form>
+			</div>
+		</el-card> -->
+
+		<el-card class="resi-card-table">
+			<div class="resi-row-btn">
+				<el-button
+					class="diy-button--add"
+					size="small"
+					@click="handleAdd('1', 'add')"
+					>新增</el-button
+				>
+			</div>
+
+			<el-table
+				:data="tableData"
+				row-key="id"
+				v-loading="tableLoading"
+				border
+				:height="tableHeight"
+				style="width: 100%"
+				class="resi-table"
+				:default-expand-all="true"
+			>
+				<el-table-column
+					label="序号"
+					type="index"
+					align="center"
+					width="50"
+				>
+					<template slot-scope="scope">{{
+						scope.row.index
+					}}</template>
+				</el-table-column>
+				<el-table-column
+					v-for="item in tableHeader"
+					:key="item.columnName"
+					:prop="item.columnName"
+					:label="item.label"
+					:align="item.align"
+				>
+					<template slot-scope="scope">
+						<span>{{ handleFilterSpan(scope.row, item) }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" align="center" width="200">
+					<template slot-scope="scope">
+						<!-- <el-button
+							v-if="scope.row.hasBtn"
+							@click="handleLook(scope.row)"
+							type="text"
+							size="small"
+							class="div-table-button--detail"
+							>{{
+								(scope.row.usableFlag && "禁用") || "启用"
+							}}</el-button
+						> -->
+						<el-button
+							v-if="scope.row.level == 1"
+							@click="handleAdd('2', 'add', scope.row)"
+							type="text"
+							size="small"
+							class="div-table-button--delete"
+							>添加二级栏目</el-button
+						>
+						<el-button
+							@click="handleEdit(scope.row, 'edit')"
+							type="text"
+							size="small"
+							class="div-table-button--edit"
+							>修改</el-button
+						>
+						<el-button
+							@click="handleDel(scope.row)"
+							type="text"
+							size="small"
+							class="div-table-button--edit"
+							>删除</el-button
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+		</el-card>
+
+		<el-dialog
+			title="文章栏目"
+			:visible.sync="dialogVisible"
+			width="40%"
+			append-to-body
+			:close-on-click-modal="false"
+			:before-close="handlerCancle"
+		>
+			<el-form
+				label-width="100px"
+				:model="form"
+				:rules="rules"
+				ref="ruleForm"
+			>
+				<el-form-item label="栏目名称" prop="categoryName">
+					<el-input
+						v-model="form.categoryName"
+						size="small"
+						style="width: 180px"
+					></el-input>
+				</el-form-item>
+			</el-form>
+
+			<div class="resi-btns">
+				<el-button size="small" @click="handlerCancle">取消</el-button>
+				<el-button
+					type="primary"
+					size="small"
+					:loading="btnLoading"
+					@click="handleSUbmit"
+					>提交</el-button
+				>
+			</div>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters } from "vuex";
 export default {
-  data () {
-    return {
-      tableLoading: false,
-      btnLoading: false,
-      disabled: false,
-      pageLoading: false,
-      dialogVisible: false,
-      currentPage: 1,
-      pageSize: 20,
-      total: null,
-      tableData: [],
-      sHeight: 0,
-      addLevel: '1',
-      addType: 'add',
-      value: '',
-      options: [
-        {
-          label: '是',
-          value: 1
-        }, {
-          label: '否',
-          value: 2
-        }
-      ],
-      demandOptions: [],
-      tableHeader: [
-        {
-          label: '分类名称',
-          align: 'left',
-          columnName: 'categoryName'
-        }, {
-          label: '状态',
-          columnName: 'usableFlag',
-          align: 'center',
-          options: [{
-            value: true,
-            label: '启用'
-          }, {
-            value: false,
-            label: '禁用'
-          }]
-        }
-      ],
-      customerId: '',
-      form: {
-        firstCategoryCode: '',
-        categoryName: '',
-        awardPoint: '',
-        usableFlag: false
-      },
-      rules: {
-        categoryName: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }]
-      }
-    }
-  },
-  computed: {
-    tableHeight () {
-      const h = this.clientHeight - this.sHeight + this.iframeHeigh
-      const _h = this.clientHeight - this.sHeight
-      return this.$store.state.inIframe ? h : _h
-    },
-
-    ...mapGetters(['clientHeight', 'iframeHeight'])
-  },
-  async created () {
-    this.customerId = localStorage.getItem('customerId')
-    this.getTableData()
-    this.getOptions()
-    this.pageLoading = true
-  },
-  mounted () {
-    this.$nextTick(() => {
-      this.sHeight = this.$refs.searchCard.$el.offsetHeight + 280
-      console.log('tableHeight', this.tableHeight)
-    })
-  },
-  methods: {
-    handleSizeChange (val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getTableData()
-    },
-    handleCurrentChange (val) {
-      console.log(`当前页: ${val}`)
-      this.currentPage = val
-      this.getTableData()
-    },
-    handleFilterSpan (row, item) {
-      let _val = ''
-      if (item.options && item.options.length > 0) {
-        item.options.forEach((n) => {
-          if (n.value === row[item.columnName]) _val = n.label
-        })
-      }
-      return _val || row[item.columnName]
-    },
-    resetForm(formName) {
-      
-      this.form.firstCategoryCode = ''
-      this.handleSearch();
-    },
-    handleSearch (val) {
-      console.log('searchhh--', val)
-      this.currentPage = 1
-      this.getTableData()
-    },
-    handleAdd (type, addType, row) {
-      this.addLevel = type
-      this.addType = addType
-      if (type == '2') this.form = { ...row, categoryName: '' }
-      this.dialogVisible = true
-    },
-    handlerCancle () {
-      this.dialogVisible = false
-    },
-    async handleLook (row) {
-      const params = {
-        categoryId: row.categoryId,
-        usableFlag: !row.usableFlag
-      }
-      this.$http
-        .post('/heart/icresidemanddict/updatestatus', params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.getTableData()
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    async handleEdit (row, addType) {
-
-      this.form = { ...row }
-      this.addLevel = row.level
-      this.addType = addType
-      this.dialogVisible = true
-    },
-    async addLevelFirst () {
-      const _form = {
-        customerId: localStorage.getItem('customerId'),
-        categoryName: this.form.categoryName
-      }
-      await this.$http
-        .post('/heart/icresidemanddict/addfirst', _form)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.dialogVisible = false
-            this.getTableData()
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-      this.btnLoading = false
-    },
-    async addLevelChild () {
-      const _form = {
-        customerId: localStorage.getItem('customerId'),
-        categoryName: this.form.categoryName,
-        parentCategoryCode: this.form.categoryCode,
-        awardPoint: this.form.awardPoint
-      }
-      await this.$http
-        .post('/heart/icresidemanddict/addchild', _form)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.dialogVisible = false
-            this.getTableData()
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-      this.btnLoading = false
-    },
-    async editCate () {
-      const _form = {
-        customerId: localStorage.getItem('customerId'),
-        categoryName: this.form.categoryName,
-        categoryId: this.form.categoryId,
-        level: this.form.level,
-        awardPoint: this.form.awardPoint
-      }
-      await this.$http
-        .post('/heart/icresidemanddict/update', _form)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.dialogVisible = false
-            this.getTableData()
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-      this.btnLoading = false
-    },
-    handleSUbmit () {
-      this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          this.btnLoading = true
-          if (this.addType == 'add') {
-            if (this.addLevel == '1') this.addLevelFirst()
-            else this.addLevelChild()
-          } else this.editCate()
-
-        } else {
-          console.log('error submit!!');
-          return false;
-        }
-      });
-
-    },
-    handleDel (row) {
-      let params = {
-        formCode: 'resi_base_info',
-        icResiUserId: row.icResiUserId
-      }
-      console.log('row1', row)
-      this.$http
-        .post('/epmetuser/icresiuser/delete', params)
-        .then(({ data: res }) => {
-          console.log('row2', row)
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('row3', row)
-            this.$message.success('删除成功')
-            this.getTableData()
-          }
-        })
-        .catch((err) => {
-          console.log('row4', err)
-          return this.$message.error('网络错误')
-        })
-    },
-    sortData () {
-      const _data = this.tableData.map((item, index) => {
-        return {
-          id: item.id,
-          sort: index
-        }
-      })
-      this.$http
-        .post('/oper/customize/resicategorystatsconfig/updatesort', _data)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            // this.getTableData()
-          }
-        })
-        .catch((err) => {
-          console.log('row4', err)
-          return this.$message.error('网络错误')
-        })
-    },
-    async getOptions () {
-      const params = {
-        parentCategoryCode: 0
-      }
-      this.$http
-        .post('/heart/icresidemanddict/subcodelist', params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.demandOptions = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    async getTableData () {
-      this.tableLoading = true
-      let params = {
-        // formCode: 'resi_base_info',
-        customerId: localStorage.getItem('customerId'),
-        pageNo: this.currentPage,
-        pageSize: this.pageSize,
-        firstCategoryCode: this.form.firstCategoryCode
-      }
-      await this.$http
-        .post('/heart/icresidemanddict/pagelist', params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.tableData = res.data.list.map((item, index) => {
-              return {
-                ...item,
-                index: index + 1,
-                hasBtn: true,
-                children: item.children.map(n => {
-                  return {
-                    ...n,
-                    hasBtn: item.usableFlag
-                  }
-                })
-              }
-            })
-            this.total = res.data.total
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-      this.tableLoading = false
-    }
-
-  }
-}
+	data() {
+		return {
+			tableLoading: false,
+			btnLoading: false,
+			disabled: false,
+			pageLoading: false,
+			dialogVisible: false,
+
+			total: null,
+			tableData: [],
+
+			sHeight: 0,
+			addLevel: "1",
+			addType: "add",
+			value: "",
+			options: [
+				{
+					label: "是",
+					value: 1,
+				},
+				{
+					label: "否",
+					value: 2,
+				},
+			],
+			firstCategoryOptions: [],
+
+			tableHeader: [
+				{
+					label: "栏目名称",
+					align: "left",
+					columnName: "categoryName",
+				},
+				// {
+				// 	label: "状态",
+				// 	columnName: "usableFlag",
+				// 	align: "center",
+				// 	options: [
+				// 		{
+				// 			value: true,
+				// 			label: "启用",
+				// 		},
+				// 		{
+				// 			value: false,
+				// 			label: "禁用",
+				// 		},
+				// 	],
+				// },
+			],
+
+			customerId: "",
+
+			searchFm: {
+				firstCategoryCode: "",
+			},
+
+			form: {
+				pid: "",
+				categoryName: "",
+			},
+
+			rules: {
+				categoryName: [
+					{
+						required: true,
+						message: "栏目名称不能为空",
+						trigger: "blur",
+					},
+				],
+			},
+		};
+	},
+	computed: {
+		tableHeight() {
+			const h = this.clientHeight - this.sHeight + this.iframeHeigh;
+			const _h = this.clientHeight - this.sHeight;
+			return this.$store.state.inIframe ? h : _h;
+		},
+
+		...mapGetters(["clientHeight", "iframeHeight"]),
+	},
+	async created() {
+		this.customerId = localStorage.getItem("customerId");
+		this.getTableData();
+		this.pageLoading = true;
+	},
+	mounted() {
+		this.$nextTick(() => {
+			// this.sHeight = this.$refs.searchCard.$el.offsetHeight + 280;
+			this.sHeight = 280;
+			console.log("tableHeight", this.tableHeight);
+		});
+	},
+	methods: {
+		handleFilterSpan(row, item) {
+			let _val = "";
+			if (item.options && item.options.length > 0) {
+				item.options.forEach((n) => {
+					if (n.value === row[item.columnName]) _val = n.label;
+				});
+			}
+			return _val || row[item.columnName];
+		},
+
+		resetForm(formName) {
+			this.searchFm.firstCategoryCode = "";
+			this.handleSearch();
+		},
+
+		handleSearch(val) {
+			console.log("searchhh--", val);
+			this.getTableData();
+		},
+
+		handleAdd(type, addType, row) {
+			console.log(type, addType, row);
+			this.addLevel = type;
+			this.addType = addType;
+			if (type == "2") {
+				this.form = {
+					pid: row.id,
+					categoryName: "",
+				};
+			}
+			this.dialogVisible = true;
+		},
+
+		handlerCancle() {
+			this.dialogVisible = false;
+		},
+
+		async handleLook(row) {
+			const params = {};
+			this.$http
+				.get(`/gov/voice/categoryDict/${row.id}`, params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.getTableData();
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+
+		async handleEdit(row, addType) {
+			this.form = { ...row };
+			this.addLevel = row.level;
+			this.addType = addType;
+			this.dialogVisible = true;
+		},
+
+		async addLevelFirst() {
+			const _form = { categoryName: this.form.categoryName, pid: "" };
+			await this.$http
+				.post("/gov/voice/categoryDict/save", _form)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.dialogVisible = false;
+						this.getTableData();
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+			this.btnLoading = false;
+		},
+
+		async addLevelChild() {
+			const _form = {
+				categoryName: this.form.categoryName,
+				pid: this.form.pid,
+			};
+			await this.$http
+				.post("/gov/voice/categoryDict/save", _form)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.dialogVisible = false;
+						this.getTableData();
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+			this.btnLoading = false;
+		},
+
+		async editCate() {
+			const _form = {
+				categoryName: this.form.categoryName,
+				id: this.form.id,
+				pid: this.form.pid,
+			};
+			await this.$http
+				.post("/gov/voice/categoryDict/update", _form)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.dialogVisible = false;
+						this.getTableData();
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+			this.btnLoading = false;
+		},
+
+		handleSUbmit() {
+			this.$refs.ruleForm.validate(async (valid) => {
+				if (valid) {
+					this.btnLoading = true;
+					if (this.addType == "add") {
+						if (this.addLevel == "1") this.addLevelFirst();
+						else this.addLevelChild();
+					} else this.editCate();
+				} else {
+					console.log("error submit!!");
+					return false;
+				}
+			});
+		},
+
+		handleDel(row) {
+			this.$http
+				.post("/gov/voice/categoryDict/delete", [row.id])
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.$message.success("删除成功");
+						this.getTableData();
+					}
+				})
+				.catch((err) => {
+					return this.$message.error("网络错误");
+				});
+		},
+
+		sortData() {
+			const _data = this.tableData.map((item, index) => {
+				return {
+					id: item.id,
+					sort: index,
+				};
+			});
+			this.$http
+				.post("/gov/voice/categoryDict/update", _data)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						// this.getTableData()
+					}
+				})
+				.catch((err) => {
+					console.log("row4", err);
+					return this.$message.error("网络错误");
+				});
+		},
+
+		async getTableData() {
+			this.tableLoading = true;
+			let params = {
+				pageNo: 1,
+				pageSize: 1000,
+			};
+
+			await this.$http
+				.get("/gov/voice/categoryDict/tree", params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.tableData = res.data.map((item, index) => {
+							return {
+								...item,
+								index: index + 1,
+								hasBtn: true,
+								level: 1,
+								children: item.children.map((n) => {
+									return {
+										...n,
+										level: 2,
+										hasBtn: item.usableFlag,
+									};
+								}),
+							};
+						});
+						this.total = res.data.total;
+
+						this.firstCategoryOptions = res.data.map((item) => ({
+							value: item.id,
+							label: item.categoryName,
+						}));
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+			this.tableLoading = false;
+		},
+	},
+};
 </script>
 
 <style lang="scss" scoped>
 .resi-container .resi-card-table {
-  ::v-deep .el-table {
-    th {
-      color: #fff;
-      background-color: rgba(33, 149, 254, 1);
-    }
-
-    .cell {
-      span:nth-of-type(3) {
-        display: inline-block;
-        width: 90%;
-        word-break: break-all;
-      }
-    }
-  }
+	::v-deep .el-table {
+		th {
+			color: #fff;
+			background-color: rgba(33, 149, 254, 1);
+		}
+
+		.cell {
+			span:nth-of-type(3) {
+				display: inline-block;
+				width: 90%;
+				word-break: break-all;
+			}
+		}
+	}
 }
 .resi-table {
-  ::v-deep .el-button--text {
-    text-decoration: underline;
-  }
-  ::v-deep .btn-color-del {
-    margin-left: 10px;
-    color: rgba(213, 16, 16, 1);
-  }
-  ::v-deep .btn-color-edit {
-    color: rgba(0, 167, 169, 1);
-  }
+	::v-deep .el-button--text {
+		text-decoration: underline;
+	}
+	::v-deep .btn-color-del {
+		margin-left: 10px;
+		color: rgba(213, 16, 16, 1);
+	}
+	::v-deep .btn-color-edit {
+		color: rgba(0, 167, 169, 1);
+	}
 }
-</style>
 
-<style lang="scss" scoped>
 .resi-row-btn {
-  display: flex;
-  margin-bottom: 13px;
-  ::v-deep .el-button {
-    // margin-left: 10px;
-    border: 0;
-  }
-  ::v-deep .el-select {
-    margin-right: 10px;
-  }
-  .el-button--success {
-    background: rgba(34, 193, 195, 1);
-  }
+	display: flex;
+	margin-bottom: 13px;
+	::v-deep .el-button {
+		// margin-left: 10px;
+		border: 0;
+	}
+	::v-deep .el-select {
+		margin-right: 10px;
+	}
+	.el-button--success {
+		background: rgba(34, 193, 195, 1);
+	}
 }
 .avatar-uploader {
-  ::v-deep .el-upload {
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
-  .el-upload:hover {
-    border-color: #409eff;
-  }
-  .avatar {
-    width: 70px;
-    height: 70px;
-    display: block;
-  }
-  .avatar-uploader-icon {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    font-size: 28px;
-    color: #8c939d;
-    width: 70px;
-    height: 70px;
-    line-height: 70px;
-    text-align: center;
-  }
+	::v-deep .el-upload {
+		cursor: pointer;
+		position: relative;
+		overflow: hidden;
+	}
+	.el-upload:hover {
+		border-color: #409eff;
+	}
+	.avatar {
+		width: 70px;
+		height: 70px;
+		display: block;
+	}
+	.avatar-uploader-icon {
+		border: 1px dashed #d9d9d9;
+		border-radius: 6px;
+		font-size: 28px;
+		color: #8c939d;
+		width: 70px;
+		height: 70px;
+		line-height: 70px;
+		text-align: center;
+	}
 }
 
 .resi-btns {
-  margin-top: 20px;
-  text-align: center;
+	margin-top: 20px;
+	text-align: center;
 }
 </style>
diff --git a/src/views/modules/visual/cpts/map/index.vue b/src/views/modules/visual/cpts/map/index.vue
index 5c121d0..2307e4b 100644
--- a/src/views/modules/visual/cpts/map/index.vue
+++ b/src/views/modules/visual/cpts/map/index.vue
@@ -348,7 +348,7 @@ export default {
       scene.on("loaded", async () => {
         if (mapType == "td") {
           this.iniMapBase(scene);
-        } else if (mapType == "tdzw") {
+        } else if (mapType == "tdzw") { 
           this.iniMapBase2(scene);
         }