From 2a8e134fd47b9195335bbd8d928fcdbe118cb7ca Mon Sep 17 00:00:00 2001 From: wang_yp <357754663@qq.com> Date: Thu, 21 Nov 2024 03:13:31 +0800 Subject: [PATCH] first commit --- package-lock.json | 522 +++++++++++----------- package.json | 2 +- src/components/form/simple_form.tsx | 2 +- src/components/video_select.tsx | 67 +++ src/pages/archives/file_list.tsx | 49 +- src/pages/emergency/em_column.tsx | 4 +- src/pages/home/home.tsx | 1 - src/pages/home/homeBottom/dispath.tsx | 24 +- src/pages/home/homeBottom/ec.tsx | 1 + src/pages/home/homeBottom/emr.tsx | 146 +++--- src/pages/home/homeBottom/which_video.tsx | 97 +++- src/pages/home/homeRigrt/ac.tsx | 2 - src/pages/home/homeRigrt/wz.tsx | 33 +- src/pages/home/home_video.tsx | 8 + src/pages/home/video.tsx | 35 +- src/pages/poverPage/index.tsx | 43 +- src/store/home.ts | 4 +- src/util/config.ts | 3 +- 18 files changed, 607 insertions(+), 436 deletions(-) create mode 100644 src/components/video_select.tsx create mode 100644 src/pages/home/home_video.tsx diff --git a/package-lock.json b/package-lock.json index 935b0ba..fe0c4f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-react": "^1.0.6", "ali-oss": "^6.18.1", - "antd": "^5.20.6", + "antd": "^5.21.6", "axios": "^1.2.1", "babel-jest": "^27.4.2", "babel-loader": "^8.2.3", @@ -136,9 +136,9 @@ } }, "node_modules/@ant-design/cssinjs": { - "version": "1.21.1", - "resolved": "https://registry.npmmirror.com/@ant-design/cssinjs/-/cssinjs-1.21.1.tgz", - "integrity": "sha512-tyWnlK+XH7Bumd0byfbCiZNK43HEubMoCcu9VxwsAwiHdHTgWa+tMN0/yvxa+e8EzuFP1WdUNNPclRpVtD33lg==", + "version": "1.22.0", + "resolved": "https://registry.npmmirror.com/@ant-design/cssinjs/-/cssinjs-1.22.0.tgz", + "integrity": "sha512-W9XSFeRPR0mAN3OuxfuS/xhENCYKf+8s+QyNNER0FSWoK9OpISTag6CCweg6lq0hASQ/2Vcza0Z8/kGivCP0Ng==", "dependencies": { "@babel/runtime": "^7.11.1", "@emotion/hash": "^0.8.0", @@ -146,7 +146,7 @@ "classnames": "^2.3.1", "csstype": "^3.1.3", "rc-util": "^5.35.0", - "stylis": "^4.3.3" + "stylis": "^4.3.4" }, "peerDependencies": { "react": ">=16.0.0", @@ -154,9 +154,9 @@ } }, "node_modules/@ant-design/cssinjs-utils": { - "version": "1.1.0", - "resolved": "https://registry.npmmirror.com/@ant-design/cssinjs-utils/-/cssinjs-utils-1.1.0.tgz", - "integrity": "sha512-E9nOWObXx7Dy7hdyuYlOFaer/LtPO7oyZVxZphh0CYEslr5EmhJPM3WI0Q2RBHRtYg6dSNqeSK73kvZjPN3IMQ==", + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/@ant-design/cssinjs-utils/-/cssinjs-utils-1.1.1.tgz", + "integrity": "sha512-2HAiyGGGnM0es40SxdszeQAU5iWp41wBIInq+ONTCKjlSKOrzQfnw4JDtB8IBmqE6tQaEKwmzTP2LGdt5DSwYQ==", "dependencies": { "@ant-design/cssinjs": "^1.21.0", "@babel/runtime": "^7.23.2", @@ -179,9 +179,9 @@ } }, "node_modules/@ant-design/icons": { - "version": "5.5.0", - "resolved": "https://registry.npmmirror.com/@ant-design/icons/-/icons-5.5.0.tgz", - "integrity": "sha512-ZaVpZ6TZWuLZsrgaTzk6QNUIZabXD44E8Mxc08+mUr5jL6TBNr2boqfheyrGu1k29U0xEAQ/J6ubPs2b9FeTKQ==", + "version": "5.5.1", + "resolved": "https://registry.npmmirror.com/@ant-design/icons/-/icons-5.5.1.tgz", + "integrity": "sha512-0UrM02MA2iDIgvLatWrj6YTCYe0F/cwXvVE0E2SqGrL7PZireQwgEKTKBisWpZyal5eXZLvuM98kju6YtYne8w==", "dependencies": { "@ant-design/colors": "^7.0.0", "@ant-design/icons-svg": "^4.4.0", @@ -2124,9 +2124,9 @@ "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==" }, "node_modules/@babel/runtime": { - "version": "7.25.6", - "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.25.6.tgz", - "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==", + "version": "7.26.0", + "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.26.0.tgz", + "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -3837,9 +3837,9 @@ } }, "node_modules/@rc-component/trigger": { - "version": "2.2.3", - "resolved": "https://registry.npmmirror.com/@rc-component/trigger/-/trigger-2.2.3.tgz", - "integrity": "sha512-X1oFIpKoXAMXNDYCviOmTfuNuYxE4h5laBsyCqVAVMjNHxoF3/uiyA7XdegK1XbCvBbCZ6P6byWrEoDRpKL8+A==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@rc-component/trigger/-/trigger-2.2.5.tgz", + "integrity": "sha512-F1EJ4KjFpGAHAjuKvOyZB/6IZDkVx0bHl0M4fQM5wXcmm7lgTgVSSnR3bXwdmS6jOJGHOqfDxIJW3WUvwMIXhQ==", "dependencies": { "@babel/runtime": "^7.23.2", "@rc-component/portal": "^1.1.0", @@ -6057,56 +6057,56 @@ } }, "node_modules/antd": { - "version": "5.20.6", - "resolved": "https://registry.npmmirror.com/antd/-/antd-5.20.6.tgz", - "integrity": "sha512-TZFmNenHlh26DelHCJbkB+x1OVulIKsN1f/CnAd2NxZLysXqRvSuLUeHcgccqAnxTy7B03GZ6i1tocGxPCNjgA==", + "version": "5.22.1", + "resolved": "https://registry.npmmirror.com/antd/-/antd-5.22.1.tgz", + "integrity": "sha512-itq8AZwe3IfawZH6SMM5XdbTz1xXGTTqA7sNN0qpEdxcoTpD5nRsCBAMIy+PhwcWFobgFc6ZlF8d7f8eicn0SQ==", "dependencies": { "@ant-design/colors": "^7.1.0", - "@ant-design/cssinjs": "^1.21.0", - "@ant-design/cssinjs-utils": "^1.0.3", - "@ant-design/icons": "^5.4.0", + "@ant-design/cssinjs": "^1.21.1", + "@ant-design/cssinjs-utils": "^1.1.1", + "@ant-design/icons": "^5.5.1", "@ant-design/react-slick": "~1.1.2", - "@babel/runtime": "^7.24.8", + "@babel/runtime": "^7.25.7", "@ctrl/tinycolor": "^3.6.1", "@rc-component/color-picker": "~2.0.1", "@rc-component/mutate-observer": "^1.1.0", "@rc-component/qrcode": "~1.0.0", "@rc-component/tour": "~1.15.1", - "@rc-component/trigger": "^2.2.2", + "@rc-component/trigger": "^2.2.5", "classnames": "^2.5.1", "copy-to-clipboard": "^3.3.3", "dayjs": "^1.11.11", - "rc-cascader": "~3.28.1", + "rc-cascader": "~3.30.0", "rc-checkbox": "~3.3.0", - "rc-collapse": "~3.7.3", - "rc-dialog": "~9.5.2", + "rc-collapse": "~3.9.0", + "rc-dialog": "~9.6.0", "rc-drawer": "~7.2.0", "rc-dropdown": "~4.2.0", - "rc-field-form": "~2.4.0", - "rc-image": "~7.9.0", + "rc-field-form": "~2.5.0", + "rc-image": "~7.11.0", "rc-input": "~1.6.3", - "rc-input-number": "~9.2.0", - "rc-mentions": "~2.15.0", - "rc-menu": "~9.14.1", - "rc-motion": "^2.9.2", - "rc-notification": "~5.6.0", - "rc-pagination": "~4.2.0", - "rc-picker": "~4.6.14", + "rc-input-number": "~9.3.0", + "rc-mentions": "~2.17.0", + "rc-menu": "~9.16.0", + "rc-motion": "^2.9.3", + "rc-notification": "~5.6.2", + "rc-pagination": "~4.3.0", + "rc-picker": "~4.8.0", "rc-progress": "~4.0.0", "rc-rate": "~2.13.0", "rc-resize-observer": "^1.4.0", - "rc-segmented": "~2.3.0", - "rc-select": "~14.15.2", - "rc-slider": "~11.1.5", + "rc-segmented": "~2.5.0", + "rc-select": "~14.16.3", + "rc-slider": "~11.1.7", "rc-steps": "~6.0.1", "rc-switch": "~4.1.0", - "rc-table": "~7.45.7", - "rc-tabs": "~15.1.1", - "rc-textarea": "~1.8.1", - "rc-tooltip": "~6.2.0", - "rc-tree": "~5.9.0", - "rc-tree-select": "~5.23.0", - "rc-upload": "~4.7.0", + "rc-table": "~7.48.1", + "rc-tabs": "~15.4.0", + "rc-textarea": "~1.8.2", + "rc-tooltip": "~6.2.1", + "rc-tree": "~5.10.1", + "rc-tree-select": "~5.24.4", + "rc-upload": "~4.8.1", "rc-util": "^5.43.0", "scroll-into-view-if-needed": "^3.1.0", "throttle-debounce": "^5.0.2" @@ -6236,11 +6236,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/array-tree-filter": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/array-tree-filter/-/array-tree-filter-2.1.0.tgz", - "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw==" - }, "node_modules/array-union": { "version": "2.1.0", "resolved": "https://registry.npmmirror.com/array-union/-/array-union-2.1.0.tgz", @@ -19725,16 +19720,15 @@ } }, "node_modules/rc-cascader": { - "version": "3.28.1", - "resolved": "https://registry.npmmirror.com/rc-cascader/-/rc-cascader-3.28.1.tgz", - "integrity": "sha512-9+8oHIMWVLHxuaapDiqFNmD9KSyKN/P4bo9x/MBuDbyTqP8f2/POmmZxdXWBO3yq/uE3pKyQCXYNUxrNfHRv2A==", + "version": "3.30.0", + "resolved": "https://registry.npmmirror.com/rc-cascader/-/rc-cascader-3.30.0.tgz", + "integrity": "sha512-rrzSbk1Bdqbu+pDwiLCLHu72+lwX9BZ28+JKzoi0DWZ4N29QYFeip8Gctl33QVd2Xg3Rf14D3yAOG76ElJw16w==", "dependencies": { - "@babel/runtime": "^7.12.5", - "array-tree-filter": "^2.1.0", + "@babel/runtime": "^7.25.7", "classnames": "^2.3.1", - "rc-select": "~14.15.0", - "rc-tree": "~5.9.0", - "rc-util": "^5.37.0" + "rc-select": "~14.16.2", + "rc-tree": "~5.10.1", + "rc-util": "^5.43.0" }, "peerDependencies": { "react": ">=16.9.0", @@ -19756,9 +19750,9 @@ } }, "node_modules/rc-collapse": { - "version": "3.7.3", - "resolved": "https://registry.npmmirror.com/rc-collapse/-/rc-collapse-3.7.3.tgz", - "integrity": "sha512-60FJcdTRn0X5sELF18TANwtVi7FtModq649H11mYF1jh83DniMoM4MqY627sEKRCTm4+WXfGDcB7hY5oW6xhyw==", + "version": "3.9.0", + "resolved": "https://registry.npmmirror.com/rc-collapse/-/rc-collapse-3.9.0.tgz", + "integrity": "sha512-swDdz4QZ4dFTo4RAUMLL50qP0EY62N2kvmk2We5xYdRwcRn8WcYtuetCJpwpaCbUfUt5+huLpVxhvmnK+PHrkA==", "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "2.x", @@ -19771,9 +19765,9 @@ } }, "node_modules/rc-dialog": { - "version": "9.5.2", - "resolved": "https://registry.npmmirror.com/rc-dialog/-/rc-dialog-9.5.2.tgz", - "integrity": "sha512-qVUjc8JukG+j/pNaHVSRa2GO2/KbV2thm7yO4hepQ902eGdYK913sGkwg/fh9yhKYV1ql3BKIN2xnud3rEXAPw==", + "version": "9.6.0", + "resolved": "https://registry.npmmirror.com/rc-dialog/-/rc-dialog-9.6.0.tgz", + "integrity": "sha512-ApoVi9Z8PaCQg6FsUzS8yvBEQy0ZL2PkuvAgrmohPkN3okps5WZ5WQWPc1RNuiOKaAYv8B97ACdsFU5LizzCqg==", "dependencies": { "@babel/runtime": "^7.10.1", "@rc-component/portal": "^1.0.0-8", @@ -19818,9 +19812,9 @@ } }, "node_modules/rc-field-form": { - "version": "2.4.0", - "resolved": "https://registry.npmmirror.com/rc-field-form/-/rc-field-form-2.4.0.tgz", - "integrity": "sha512-XZ/lF9iqf9HXApIHQHqzJK5v2w4mkUMsVqAzOyWVzoiwwXEavY6Tpuw7HavgzIoD+huVff4JghSGcgEfX6eycg==", + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/rc-field-form/-/rc-field-form-2.5.1.tgz", + "integrity": "sha512-33hunXwynQJyeae7LS3hMGTXNeRBjiPyPYgB0824EbmLHiXC1EBGyUwRh6xjLRy9c+en5WARYN0gJz5+JAqwig==", "dependencies": { "@babel/runtime": "^7.18.0", "@rc-component/async-validator": "^5.0.3", @@ -19835,14 +19829,14 @@ } }, "node_modules/rc-image": { - "version": "7.9.0", - "resolved": "https://registry.npmmirror.com/rc-image/-/rc-image-7.9.0.tgz", - "integrity": "sha512-l4zqO5E0quuLMCtdKfBgj4Suv8tIS011F5k1zBBlK25iMjjiNHxA0VeTzGFtUZERSA45gvpXDg8/P6qNLjR25g==", + "version": "7.11.0", + "resolved": "https://registry.npmmirror.com/rc-image/-/rc-image-7.11.0.tgz", + "integrity": "sha512-aZkTEZXqeqfPZtnSdNUnKQA0N/3MbgR7nUnZ+/4MfSFWPFHZau4p5r5ShaI0KPEMnNjv4kijSCFq/9wtJpwykw==", "dependencies": { "@babel/runtime": "^7.11.2", "@rc-component/portal": "^1.0.2", "classnames": "^2.2.6", - "rc-dialog": "~9.5.2", + "rc-dialog": "~9.6.0", "rc-motion": "^2.6.2", "rc-util": "^5.34.1" }, @@ -19866,9 +19860,9 @@ } }, "node_modules/rc-input-number": { - "version": "9.2.0", - "resolved": "https://registry.npmmirror.com/rc-input-number/-/rc-input-number-9.2.0.tgz", - "integrity": "sha512-5XZFhBCV5f9UQ62AZ2hFbEY8iZT/dm23Q1kAg0H8EvOgD3UDbYYJAayoVIkM3lQaCqYAW5gV0yV3vjw1XtzWHg==", + "version": "9.3.0", + "resolved": "https://registry.npmmirror.com/rc-input-number/-/rc-input-number-9.3.0.tgz", + "integrity": "sha512-JQ363ywqRyxwgVxpg2z2kja3CehTpYdqR7emJ/6yJjRdbvo+RvfE83fcpBCIJRq3zLp8SakmEXq60qzWyZ7Usw==", "dependencies": { "@babel/runtime": "^7.10.1", "@rc-component/mini-decimal": "^1.0.1", @@ -19882,15 +19876,15 @@ } }, "node_modules/rc-mentions": { - "version": "2.15.0", - "resolved": "https://registry.npmmirror.com/rc-mentions/-/rc-mentions-2.15.0.tgz", - "integrity": "sha512-f5v5i7VdqvBDXbphoqcQWmXDif2Msd2arritVoWybrVDuHE6nQ7XCYsybHbV//WylooK52BFDouFvyaRDtXZEw==", + "version": "2.17.0", + "resolved": "https://registry.npmmirror.com/rc-mentions/-/rc-mentions-2.17.0.tgz", + "integrity": "sha512-sfHy+qLvc+p8jx8GUsujZWXDOIlIimp6YQz7N5ONQ6bHsa2kyG+BLa5k2wuxgebBbH97is33wxiyq5UkiXRpHA==", "dependencies": { "@babel/runtime": "^7.22.5", "@rc-component/trigger": "^2.0.0", "classnames": "^2.2.6", "rc-input": "~1.6.0", - "rc-menu": "~9.14.0", + "rc-menu": "~9.16.0", "rc-textarea": "~1.8.0", "rc-util": "^5.34.1" }, @@ -19900,9 +19894,9 @@ } }, "node_modules/rc-menu": { - "version": "9.14.1", - "resolved": "https://registry.npmmirror.com/rc-menu/-/rc-menu-9.14.1.tgz", - "integrity": "sha512-5wlRb3M8S4yGlWhSoEYJ7ZVRElyScdcpUHxgiLxkeig1tEdyKrnED3B2fhpN0Rrpdp9jyhnmZR/Lwq2fH5VvDQ==", + "version": "9.16.0", + "resolved": "https://registry.npmmirror.com/rc-menu/-/rc-menu-9.16.0.tgz", + "integrity": "sha512-vAL0yqPkmXWk3+YKRkmIR8TYj3RVdEt3ptG2jCJXWNAvQbT0VJJdRyHZ7kG/l1JsZlB+VJq/VcYOo69VR4oD+w==", "dependencies": { "@babel/runtime": "^7.10.1", "@rc-component/trigger": "^2.0.0", @@ -19917,9 +19911,9 @@ } }, "node_modules/rc-motion": { - "version": "2.9.2", - "resolved": "https://registry.npmmirror.com/rc-motion/-/rc-motion-2.9.2.tgz", - "integrity": "sha512-fUAhHKLDdkAXIDLH0GYwof3raS58dtNUmzLF2MeiR8o6n4thNpSDQhOqQzWE4WfFZDCi9VEN8n7tiB7czREcyw==", + "version": "2.9.3", + "resolved": "https://registry.npmmirror.com/rc-motion/-/rc-motion-2.9.3.tgz", + "integrity": "sha512-rkW47ABVkic7WEB0EKJqzySpvDqwl60/tdkY7hWP7dYnh5pm0SzJpo54oW3TDUGXV5wfxXFmMkxrzRRbotQ0+w==", "dependencies": { "@babel/runtime": "^7.11.1", "classnames": "^2.2.1", @@ -19931,9 +19925,9 @@ } }, "node_modules/rc-notification": { - "version": "5.6.1", - "resolved": "https://registry.npmmirror.com/rc-notification/-/rc-notification-5.6.1.tgz", - "integrity": "sha512-Q4ZKES3IBxWmpNnlDiMFYoH6D7MJ1L3n3gp59pnpaMI8gm9Vj+gVRxdInvoYjBoZvEOenxb9MbbKvnFhzJpgvA==", + "version": "5.6.2", + "resolved": "https://registry.npmmirror.com/rc-notification/-/rc-notification-5.6.2.tgz", + "integrity": "sha512-Id4IYMoii3zzrG0lB0gD6dPgJx4Iu95Xu0BQrhHIbp7ZnAZbLqdqQ73aIWH0d0UFcElxwaKjnzNovTjo7kXz7g==", "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "2.x", @@ -19964,9 +19958,9 @@ } }, "node_modules/rc-pagination": { - "version": "4.2.0", - "resolved": "https://registry.npmmirror.com/rc-pagination/-/rc-pagination-4.2.0.tgz", - "integrity": "sha512-V6qeANJsT6tmOcZ4XiUmj8JXjRLbkusuufpuoBw2GiAn94fIixYjFLmbruD1Sbhn8fPLDnWawPp4CN37zQorvw==", + "version": "4.3.0", + "resolved": "https://registry.npmmirror.com/rc-pagination/-/rc-pagination-4.3.0.tgz", + "integrity": "sha512-UubEWA0ShnroQ1tDa291Fzw6kj0iOeF26IsUObxYTpimgj4/qPCWVFl18RLZE+0Up1IZg0IK4pMn6nB3mjvB7g==", "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "^2.3.2", @@ -19978,9 +19972,9 @@ } }, "node_modules/rc-picker": { - "version": "4.6.14", - "resolved": "https://registry.npmmirror.com/rc-picker/-/rc-picker-4.6.14.tgz", - "integrity": "sha512-7DuTfUFdkxmsNpWQ0TWv6FPGna5e6KKC4nxtx3x9xhumLz7jb3fhlDdWQvqEL6tpt9DOb1+N5j+wB+lDOSS9kg==", + "version": "4.8.1", + "resolved": "https://registry.npmmirror.com/rc-picker/-/rc-picker-4.8.1.tgz", + "integrity": "sha512-lj9hXXMSkbjFUIhfQh8XH698ybxnoBOfq7pdM1FvfSyDwdFhdQa7dvsIYwo6Uz7Zp1wVkfw5rOJO3MpdWzoHsg==", "dependencies": { "@babel/runtime": "^7.24.7", "@rc-component/trigger": "^2.0.0", @@ -20062,9 +20056,9 @@ } }, "node_modules/rc-segmented": { - "version": "2.3.0", - "resolved": "https://registry.npmmirror.com/rc-segmented/-/rc-segmented-2.3.0.tgz", - "integrity": "sha512-I3FtM5Smua/ESXutFfb8gJ8ZPcvFR+qUgeeGFQHBOvRiRKyAk4aBE5nfqrxXx+h8/vn60DQjOt6i4RNtrbOobg==", + "version": "2.5.0", + "resolved": "https://registry.npmmirror.com/rc-segmented/-/rc-segmented-2.5.0.tgz", + "integrity": "sha512-B28Fe3J9iUFOhFJET3RoXAPFJ2u47QvLSYcZWC4tFYNGPEjug5LAxEasZlA/PpAxhdOPqGWsGbSj7ftneukJnw==", "dependencies": { "@babel/runtime": "^7.11.1", "classnames": "^2.2.1", @@ -20077,9 +20071,9 @@ } }, "node_modules/rc-select": { - "version": "14.15.2", - "resolved": "https://registry.npmmirror.com/rc-select/-/rc-select-14.15.2.tgz", - "integrity": "sha512-oNoXlaFmpqXYcQDzcPVLrEqS2J9c+/+oJuGrlXeVVX/gVgrbHa5YcyiRUXRydFjyuA7GP3elRuLF7Y3Tfwltlw==", + "version": "14.16.3", + "resolved": "https://registry.npmmirror.com/rc-select/-/rc-select-14.16.3.tgz", + "integrity": "sha512-51+j6s3fJJJXB7E+B6W1hM4Tjzv1B/Decooz9ilgegDBt3ZAth1b/xMwYCTrT5BbG2e53XACQsyDib2+3Ro1fg==", "dependencies": { "@babel/runtime": "^7.10.1", "@rc-component/trigger": "^2.1.1", @@ -20098,9 +20092,9 @@ } }, "node_modules/rc-slider": { - "version": "11.1.6", - "resolved": "https://registry.npmmirror.com/rc-slider/-/rc-slider-11.1.6.tgz", - "integrity": "sha512-LACAaXM0hi+4x4ErDGZLy7weIQwmBIVbIgPE+eDHiHkyzMvKjWHraCG8/B22Y/tCQUPAsP02wBhKhth7mH2PIw==", + "version": "11.1.7", + "resolved": "https://registry.npmmirror.com/rc-slider/-/rc-slider-11.1.7.tgz", + "integrity": "sha512-ytYbZei81TX7otdC0QvoYD72XSlxvTihNth5OeZ6PMXyEDq/vHdWFulQmfDGyXK1NwKwSlKgpvINOa88uT5g2A==", "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.5", @@ -20146,15 +20140,15 @@ } }, "node_modules/rc-table": { - "version": "7.45.7", - "resolved": "https://registry.npmmirror.com/rc-table/-/rc-table-7.45.7.tgz", - "integrity": "sha512-wi9LetBL1t1csxyGkMB2p3mCiMt+NDexMlPbXHvQFmBBAsMxrgNSAPwUci2zDLUq9m8QdWc1Nh8suvrpy9mXrg==", + "version": "7.48.1", + "resolved": "https://registry.npmmirror.com/rc-table/-/rc-table-7.48.1.tgz", + "integrity": "sha512-Z4mDKjWg+xz/Ezdw6ivWcbqRpaJ0QfCORRoRrlrw65KSGZLK8OcTdacH22/fyGb8L4It/0/9qcMm8VrVAk/WBw==", "dependencies": { "@babel/runtime": "^7.10.1", "@rc-component/context": "^1.4.0", "classnames": "^2.2.5", "rc-resize-observer": "^1.1.0", - "rc-util": "^5.37.0", + "rc-util": "^5.41.0", "rc-virtual-list": "^3.14.2" }, "engines": { @@ -20166,14 +20160,14 @@ } }, "node_modules/rc-tabs": { - "version": "15.1.1", - "resolved": "https://registry.npmmirror.com/rc-tabs/-/rc-tabs-15.1.1.tgz", - "integrity": "sha512-Tc7bJvpEdkWIVCUL7yQrMNBJY3j44NcyWS48jF/UKMXuUlzaXK+Z/pEL5LjGcTadtPvVmNqA40yv7hmr+tCOAw==", + "version": "15.4.0", + "resolved": "https://registry.npmmirror.com/rc-tabs/-/rc-tabs-15.4.0.tgz", + "integrity": "sha512-llKuyiAVqmXm2z7OrmhX5cNb2ueZaL8ZyA2P4R+6/72NYYcbEgOXibwHiQCFY2RiN3swXl53SIABi2CumUS02g==", "dependencies": { "@babel/runtime": "^7.11.2", "classnames": "2.x", "rc-dropdown": "~4.2.0", - "rc-menu": "~9.14.0", + "rc-menu": "~9.16.0", "rc-motion": "^2.6.2", "rc-resize-observer": "^1.0.0", "rc-util": "^5.34.1" @@ -20187,9 +20181,9 @@ } }, "node_modules/rc-textarea": { - "version": "1.8.1", - "resolved": "https://registry.npmmirror.com/rc-textarea/-/rc-textarea-1.8.1.tgz", - "integrity": "sha512-bm36N2ZqwZAP60ZQg2OY9mPdqWC+m6UTjHc+CqEZOxb3Ia29BGHazY/s5bI8M4113CkqTzhtFUDNA078ZiOx3Q==", + "version": "1.8.2", + "resolved": "https://registry.npmmirror.com/rc-textarea/-/rc-textarea-1.8.2.tgz", + "integrity": "sha512-UFAezAqltyR00a8Lf0IPAyTd29Jj9ee8wt8DqXyDMal7r/Cg/nDt3e1OOv3Th4W6mKaZijjgwuPXhAfVNTN8sw==", "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.1", @@ -20203,9 +20197,9 @@ } }, "node_modules/rc-tooltip": { - "version": "6.2.0", - "resolved": "https://registry.npmmirror.com/rc-tooltip/-/rc-tooltip-6.2.0.tgz", - "integrity": "sha512-iS/3iOAvtDh9GIx1ulY7EFUXUtktFccNLsARo3NPgLf0QW9oT0w3dA9cYWlhqAKmD+uriEwdWz1kH0Qs4zk2Aw==", + "version": "6.2.1", + "resolved": "https://registry.npmmirror.com/rc-tooltip/-/rc-tooltip-6.2.1.tgz", + "integrity": "sha512-rws0duD/3sHHsD905Nex7FvoUGy2UBQRhTkKxeEvr2FB+r21HsOxcDJI0TzyO8NHhnAA8ILr8pfbSBg5Jj5KBg==", "dependencies": { "@babel/runtime": "^7.11.2", "@rc-component/trigger": "^2.0.0", @@ -20217,9 +20211,9 @@ } }, "node_modules/rc-tree": { - "version": "5.9.0", - "resolved": "https://registry.npmmirror.com/rc-tree/-/rc-tree-5.9.0.tgz", - "integrity": "sha512-CPrgOvm9d/9E+izTONKSngNzQdIEjMox2PBufWjS1wf7vxtvmCWzK1SlpHbRY6IaBfJIeZ+88RkcIevf729cRg==", + "version": "5.10.1", + "resolved": "https://registry.npmmirror.com/rc-tree/-/rc-tree-5.10.1.tgz", + "integrity": "sha512-FPXb3tT/u39mgjr6JNlHaUTYfHkVGW56XaGDahDpEFLGsnPxGcVLNTjcqoQb/GNbSCycl7tD7EvIymwOTP0+Yw==", "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "2.x", @@ -20236,15 +20230,15 @@ } }, "node_modules/rc-tree-select": { - "version": "5.23.0", - "resolved": "https://registry.npmmirror.com/rc-tree-select/-/rc-tree-select-5.23.0.tgz", - "integrity": "sha512-aQGi2tFSRw1WbXv0UVXPzHm09E0cSvUVZMLxQtMv3rnZZpNmdRXWrnd9QkLNlVH31F+X5rgghmdSFF3yZW0N9A==", + "version": "5.24.4", + "resolved": "https://registry.npmmirror.com/rc-tree-select/-/rc-tree-select-5.24.4.tgz", + "integrity": "sha512-MzljkSkk7weKOcE853UtYlXB6uyUEzcEQhhpaCwE6jQPbmBUgGiRURuKWpYUnM/dXrwTTlCK969M6Pgjj35MLA==", "dependencies": { - "@babel/runtime": "^7.10.1", + "@babel/runtime": "^7.25.7", "classnames": "2.x", - "rc-select": "~14.15.0", - "rc-tree": "~5.9.0", - "rc-util": "^5.16.1" + "rc-select": "~14.16.2", + "rc-tree": "~5.10.1", + "rc-util": "^5.43.0" }, "peerDependencies": { "react": "*", @@ -20252,9 +20246,9 @@ } }, "node_modules/rc-upload": { - "version": "4.7.0", - "resolved": "https://registry.npmmirror.com/rc-upload/-/rc-upload-4.7.0.tgz", - "integrity": "sha512-eUwxYNHlsYe5vYhKFAUGrQG95JrnPzY+BmPi1Daq39fWNl/eOc7v4UODuWrVp2LFkQBuV3cMCG/I68iub6oBrg==", + "version": "4.8.1", + "resolved": "https://registry.npmmirror.com/rc-upload/-/rc-upload-4.8.1.tgz", + "integrity": "sha512-toEAhwl4hjLAI1u8/CgKWt30BR06ulPa4iGQSMvSXoHzO88gPCslxqV/mnn4gJU7PDoltGIC9Eh+wkeudqgHyw==", "dependencies": { "@babel/runtime": "^7.18.3", "classnames": "^2.2.5", @@ -20284,9 +20278,9 @@ "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==" }, "node_modules/rc-virtual-list": { - "version": "3.14.5", - "resolved": "https://registry.npmmirror.com/rc-virtual-list/-/rc-virtual-list-3.14.5.tgz", - "integrity": "sha512-ZMOnkCLv2wUN8Jz7yI4XiSLa9THlYvf00LuMhb1JlsQCewuU7ydPuHw1rGVPhe9VZYl/5UqODtNd7QKJ2DMGfg==", + "version": "3.15.0", + "resolved": "https://registry.npmmirror.com/rc-virtual-list/-/rc-virtual-list-3.15.0.tgz", + "integrity": "sha512-dF2YQztqrU3ijAeWOqscTshCEr7vpimzSqAVjO1AyAmaqcHulaXpnGR0ptK5PXfxTUy48VkJOiglMIxlkYGs0w==", "dependencies": { "@babel/runtime": "^7.20.0", "classnames": "^2.2.6", @@ -33937,9 +33931,9 @@ } }, "@ant-design/cssinjs": { - "version": "1.21.1", - "resolved": "https://registry.npmmirror.com/@ant-design/cssinjs/-/cssinjs-1.21.1.tgz", - "integrity": "sha512-tyWnlK+XH7Bumd0byfbCiZNK43HEubMoCcu9VxwsAwiHdHTgWa+tMN0/yvxa+e8EzuFP1WdUNNPclRpVtD33lg==", + "version": "1.22.0", + "resolved": "https://registry.npmmirror.com/@ant-design/cssinjs/-/cssinjs-1.22.0.tgz", + "integrity": "sha512-W9XSFeRPR0mAN3OuxfuS/xhENCYKf+8s+QyNNER0FSWoK9OpISTag6CCweg6lq0hASQ/2Vcza0Z8/kGivCP0Ng==", "requires": { "@babel/runtime": "^7.11.1", "@emotion/hash": "^0.8.0", @@ -33947,13 +33941,13 @@ "classnames": "^2.3.1", "csstype": "^3.1.3", "rc-util": "^5.35.0", - "stylis": "^4.3.3" + "stylis": "^4.3.4" } }, "@ant-design/cssinjs-utils": { - "version": "1.1.0", - "resolved": "https://registry.npmmirror.com/@ant-design/cssinjs-utils/-/cssinjs-utils-1.1.0.tgz", - "integrity": "sha512-E9nOWObXx7Dy7hdyuYlOFaer/LtPO7oyZVxZphh0CYEslr5EmhJPM3WI0Q2RBHRtYg6dSNqeSK73kvZjPN3IMQ==", + "version": "1.1.1", + "resolved": "https://registry.npmmirror.com/@ant-design/cssinjs-utils/-/cssinjs-utils-1.1.1.tgz", + "integrity": "sha512-2HAiyGGGnM0es40SxdszeQAU5iWp41wBIInq+ONTCKjlSKOrzQfnw4JDtB8IBmqE6tQaEKwmzTP2LGdt5DSwYQ==", "requires": { "@ant-design/cssinjs": "^1.21.0", "@babel/runtime": "^7.23.2", @@ -33969,9 +33963,9 @@ } }, "@ant-design/icons": { - "version": "5.5.0", - "resolved": "https://registry.npmmirror.com/@ant-design/icons/-/icons-5.5.0.tgz", - "integrity": "sha512-ZaVpZ6TZWuLZsrgaTzk6QNUIZabXD44E8Mxc08+mUr5jL6TBNr2boqfheyrGu1k29U0xEAQ/J6ubPs2b9FeTKQ==", + "version": "5.5.1", + "resolved": "https://registry.npmmirror.com/@ant-design/icons/-/icons-5.5.1.tgz", + "integrity": "sha512-0UrM02MA2iDIgvLatWrj6YTCYe0F/cwXvVE0E2SqGrL7PZireQwgEKTKBisWpZyal5eXZLvuM98kju6YtYne8w==", "requires": { "@ant-design/colors": "^7.0.0", "@ant-design/icons-svg": "^4.4.0", @@ -35249,9 +35243,9 @@ "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==" }, "@babel/runtime": { - "version": "7.25.6", - "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.25.6.tgz", - "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==", + "version": "7.26.0", + "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.26.0.tgz", + "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==", "requires": { "regenerator-runtime": "^0.14.0" } @@ -36418,9 +36412,9 @@ } }, "@rc-component/trigger": { - "version": "2.2.3", - "resolved": "https://registry.npmmirror.com/@rc-component/trigger/-/trigger-2.2.3.tgz", - "integrity": "sha512-X1oFIpKoXAMXNDYCviOmTfuNuYxE4h5laBsyCqVAVMjNHxoF3/uiyA7XdegK1XbCvBbCZ6P6byWrEoDRpKL8+A==", + "version": "2.2.5", + "resolved": "https://registry.npmmirror.com/@rc-component/trigger/-/trigger-2.2.5.tgz", + "integrity": "sha512-F1EJ4KjFpGAHAjuKvOyZB/6IZDkVx0bHl0M4fQM5wXcmm7lgTgVSSnR3bXwdmS6jOJGHOqfDxIJW3WUvwMIXhQ==", "requires": { "@babel/runtime": "^7.23.2", "@rc-component/portal": "^1.1.0", @@ -38154,56 +38148,56 @@ } }, "antd": { - "version": "5.20.6", - "resolved": "https://registry.npmmirror.com/antd/-/antd-5.20.6.tgz", - "integrity": "sha512-TZFmNenHlh26DelHCJbkB+x1OVulIKsN1f/CnAd2NxZLysXqRvSuLUeHcgccqAnxTy7B03GZ6i1tocGxPCNjgA==", + "version": "5.22.1", + "resolved": "https://registry.npmmirror.com/antd/-/antd-5.22.1.tgz", + "integrity": "sha512-itq8AZwe3IfawZH6SMM5XdbTz1xXGTTqA7sNN0qpEdxcoTpD5nRsCBAMIy+PhwcWFobgFc6ZlF8d7f8eicn0SQ==", "requires": { "@ant-design/colors": "^7.1.0", - "@ant-design/cssinjs": "^1.21.0", - "@ant-design/cssinjs-utils": "^1.0.3", - "@ant-design/icons": "^5.4.0", + "@ant-design/cssinjs": "^1.21.1", + "@ant-design/cssinjs-utils": "^1.1.1", + "@ant-design/icons": "^5.5.1", "@ant-design/react-slick": "~1.1.2", - "@babel/runtime": "^7.24.8", + "@babel/runtime": "^7.25.7", "@ctrl/tinycolor": "^3.6.1", "@rc-component/color-picker": "~2.0.1", "@rc-component/mutate-observer": "^1.1.0", "@rc-component/qrcode": "~1.0.0", "@rc-component/tour": "~1.15.1", - "@rc-component/trigger": "^2.2.2", + "@rc-component/trigger": "^2.2.5", "classnames": "^2.5.1", "copy-to-clipboard": "^3.3.3", "dayjs": "^1.11.11", - "rc-cascader": "~3.28.1", + "rc-cascader": "~3.30.0", "rc-checkbox": "~3.3.0", - "rc-collapse": "~3.7.3", - "rc-dialog": "~9.5.2", + "rc-collapse": "~3.9.0", + "rc-dialog": "~9.6.0", "rc-drawer": "~7.2.0", "rc-dropdown": "~4.2.0", - "rc-field-form": "~2.4.0", - "rc-image": "~7.9.0", + "rc-field-form": "~2.5.0", + "rc-image": "~7.11.0", "rc-input": "~1.6.3", - "rc-input-number": "~9.2.0", - "rc-mentions": "~2.15.0", - "rc-menu": "~9.14.1", - "rc-motion": "^2.9.2", - "rc-notification": "~5.6.0", - "rc-pagination": "~4.2.0", - "rc-picker": "~4.6.14", + "rc-input-number": "~9.3.0", + "rc-mentions": "~2.17.0", + "rc-menu": "~9.16.0", + "rc-motion": "^2.9.3", + "rc-notification": "~5.6.2", + "rc-pagination": "~4.3.0", + "rc-picker": "~4.8.0", "rc-progress": "~4.0.0", "rc-rate": "~2.13.0", "rc-resize-observer": "^1.4.0", - "rc-segmented": "~2.3.0", - "rc-select": "~14.15.2", - "rc-slider": "~11.1.5", + "rc-segmented": "~2.5.0", + "rc-select": "~14.16.3", + "rc-slider": "~11.1.7", "rc-steps": "~6.0.1", "rc-switch": "~4.1.0", - "rc-table": "~7.45.7", - "rc-tabs": "~15.1.1", - "rc-textarea": "~1.8.1", - "rc-tooltip": "~6.2.0", - "rc-tree": "~5.9.0", - "rc-tree-select": "~5.23.0", - "rc-upload": "~4.7.0", + "rc-table": "~7.48.1", + "rc-tabs": "~15.4.0", + "rc-textarea": "~1.8.2", + "rc-tooltip": "~6.2.1", + "rc-tree": "~5.10.1", + "rc-tree-select": "~5.24.4", + "rc-upload": "~4.8.1", "rc-util": "^5.43.0", "scroll-into-view-if-needed": "^3.1.0", "throttle-debounce": "^5.0.2" @@ -38301,11 +38295,6 @@ "is-string": "^1.0.7" } }, - "array-tree-filter": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/array-tree-filter/-/array-tree-filter-2.1.0.tgz", - "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw==" - }, "array-union": { "version": "2.1.0", "resolved": "https://registry.npmmirror.com/array-union/-/array-union-2.1.0.tgz", @@ -48188,16 +48177,15 @@ } }, "rc-cascader": { - "version": "3.28.1", - "resolved": "https://registry.npmmirror.com/rc-cascader/-/rc-cascader-3.28.1.tgz", - "integrity": "sha512-9+8oHIMWVLHxuaapDiqFNmD9KSyKN/P4bo9x/MBuDbyTqP8f2/POmmZxdXWBO3yq/uE3pKyQCXYNUxrNfHRv2A==", + "version": "3.30.0", + "resolved": "https://registry.npmmirror.com/rc-cascader/-/rc-cascader-3.30.0.tgz", + "integrity": "sha512-rrzSbk1Bdqbu+pDwiLCLHu72+lwX9BZ28+JKzoi0DWZ4N29QYFeip8Gctl33QVd2Xg3Rf14D3yAOG76ElJw16w==", "requires": { - "@babel/runtime": "^7.12.5", - "array-tree-filter": "^2.1.0", + "@babel/runtime": "^7.25.7", "classnames": "^2.3.1", - "rc-select": "~14.15.0", - "rc-tree": "~5.9.0", - "rc-util": "^5.37.0" + "rc-select": "~14.16.2", + "rc-tree": "~5.10.1", + "rc-util": "^5.43.0" } }, "rc-checkbox": { @@ -48211,9 +48199,9 @@ } }, "rc-collapse": { - "version": "3.7.3", - "resolved": "https://registry.npmmirror.com/rc-collapse/-/rc-collapse-3.7.3.tgz", - "integrity": "sha512-60FJcdTRn0X5sELF18TANwtVi7FtModq649H11mYF1jh83DniMoM4MqY627sEKRCTm4+WXfGDcB7hY5oW6xhyw==", + "version": "3.9.0", + "resolved": "https://registry.npmmirror.com/rc-collapse/-/rc-collapse-3.9.0.tgz", + "integrity": "sha512-swDdz4QZ4dFTo4RAUMLL50qP0EY62N2kvmk2We5xYdRwcRn8WcYtuetCJpwpaCbUfUt5+huLpVxhvmnK+PHrkA==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "2.x", @@ -48222,9 +48210,9 @@ } }, "rc-dialog": { - "version": "9.5.2", - "resolved": "https://registry.npmmirror.com/rc-dialog/-/rc-dialog-9.5.2.tgz", - "integrity": "sha512-qVUjc8JukG+j/pNaHVSRa2GO2/KbV2thm7yO4hepQ902eGdYK913sGkwg/fh9yhKYV1ql3BKIN2xnud3rEXAPw==", + "version": "9.6.0", + "resolved": "https://registry.npmmirror.com/rc-dialog/-/rc-dialog-9.6.0.tgz", + "integrity": "sha512-ApoVi9Z8PaCQg6FsUzS8yvBEQy0ZL2PkuvAgrmohPkN3okps5WZ5WQWPc1RNuiOKaAYv8B97ACdsFU5LizzCqg==", "requires": { "@babel/runtime": "^7.10.1", "@rc-component/portal": "^1.0.0-8", @@ -48257,9 +48245,9 @@ } }, "rc-field-form": { - "version": "2.4.0", - "resolved": "https://registry.npmmirror.com/rc-field-form/-/rc-field-form-2.4.0.tgz", - "integrity": "sha512-XZ/lF9iqf9HXApIHQHqzJK5v2w4mkUMsVqAzOyWVzoiwwXEavY6Tpuw7HavgzIoD+huVff4JghSGcgEfX6eycg==", + "version": "2.5.1", + "resolved": "https://registry.npmmirror.com/rc-field-form/-/rc-field-form-2.5.1.tgz", + "integrity": "sha512-33hunXwynQJyeae7LS3hMGTXNeRBjiPyPYgB0824EbmLHiXC1EBGyUwRh6xjLRy9c+en5WARYN0gJz5+JAqwig==", "requires": { "@babel/runtime": "^7.18.0", "@rc-component/async-validator": "^5.0.3", @@ -48267,14 +48255,14 @@ } }, "rc-image": { - "version": "7.9.0", - "resolved": "https://registry.npmmirror.com/rc-image/-/rc-image-7.9.0.tgz", - "integrity": "sha512-l4zqO5E0quuLMCtdKfBgj4Suv8tIS011F5k1zBBlK25iMjjiNHxA0VeTzGFtUZERSA45gvpXDg8/P6qNLjR25g==", + "version": "7.11.0", + "resolved": "https://registry.npmmirror.com/rc-image/-/rc-image-7.11.0.tgz", + "integrity": "sha512-aZkTEZXqeqfPZtnSdNUnKQA0N/3MbgR7nUnZ+/4MfSFWPFHZau4p5r5ShaI0KPEMnNjv4kijSCFq/9wtJpwykw==", "requires": { "@babel/runtime": "^7.11.2", "@rc-component/portal": "^1.0.2", "classnames": "^2.2.6", - "rc-dialog": "~9.5.2", + "rc-dialog": "~9.6.0", "rc-motion": "^2.6.2", "rc-util": "^5.34.1" } @@ -48290,9 +48278,9 @@ } }, "rc-input-number": { - "version": "9.2.0", - "resolved": "https://registry.npmmirror.com/rc-input-number/-/rc-input-number-9.2.0.tgz", - "integrity": "sha512-5XZFhBCV5f9UQ62AZ2hFbEY8iZT/dm23Q1kAg0H8EvOgD3UDbYYJAayoVIkM3lQaCqYAW5gV0yV3vjw1XtzWHg==", + "version": "9.3.0", + "resolved": "https://registry.npmmirror.com/rc-input-number/-/rc-input-number-9.3.0.tgz", + "integrity": "sha512-JQ363ywqRyxwgVxpg2z2kja3CehTpYdqR7emJ/6yJjRdbvo+RvfE83fcpBCIJRq3zLp8SakmEXq60qzWyZ7Usw==", "requires": { "@babel/runtime": "^7.10.1", "@rc-component/mini-decimal": "^1.0.1", @@ -48302,23 +48290,23 @@ } }, "rc-mentions": { - "version": "2.15.0", - "resolved": "https://registry.npmmirror.com/rc-mentions/-/rc-mentions-2.15.0.tgz", - "integrity": "sha512-f5v5i7VdqvBDXbphoqcQWmXDif2Msd2arritVoWybrVDuHE6nQ7XCYsybHbV//WylooK52BFDouFvyaRDtXZEw==", + "version": "2.17.0", + "resolved": "https://registry.npmmirror.com/rc-mentions/-/rc-mentions-2.17.0.tgz", + "integrity": "sha512-sfHy+qLvc+p8jx8GUsujZWXDOIlIimp6YQz7N5ONQ6bHsa2kyG+BLa5k2wuxgebBbH97is33wxiyq5UkiXRpHA==", "requires": { "@babel/runtime": "^7.22.5", "@rc-component/trigger": "^2.0.0", "classnames": "^2.2.6", "rc-input": "~1.6.0", - "rc-menu": "~9.14.0", + "rc-menu": "~9.16.0", "rc-textarea": "~1.8.0", "rc-util": "^5.34.1" } }, "rc-menu": { - "version": "9.14.1", - "resolved": "https://registry.npmmirror.com/rc-menu/-/rc-menu-9.14.1.tgz", - "integrity": "sha512-5wlRb3M8S4yGlWhSoEYJ7ZVRElyScdcpUHxgiLxkeig1tEdyKrnED3B2fhpN0Rrpdp9jyhnmZR/Lwq2fH5VvDQ==", + "version": "9.16.0", + "resolved": "https://registry.npmmirror.com/rc-menu/-/rc-menu-9.16.0.tgz", + "integrity": "sha512-vAL0yqPkmXWk3+YKRkmIR8TYj3RVdEt3ptG2jCJXWNAvQbT0VJJdRyHZ7kG/l1JsZlB+VJq/VcYOo69VR4oD+w==", "requires": { "@babel/runtime": "^7.10.1", "@rc-component/trigger": "^2.0.0", @@ -48329,9 +48317,9 @@ } }, "rc-motion": { - "version": "2.9.2", - "resolved": "https://registry.npmmirror.com/rc-motion/-/rc-motion-2.9.2.tgz", - "integrity": "sha512-fUAhHKLDdkAXIDLH0GYwof3raS58dtNUmzLF2MeiR8o6n4thNpSDQhOqQzWE4WfFZDCi9VEN8n7tiB7czREcyw==", + "version": "2.9.3", + "resolved": "https://registry.npmmirror.com/rc-motion/-/rc-motion-2.9.3.tgz", + "integrity": "sha512-rkW47ABVkic7WEB0EKJqzySpvDqwl60/tdkY7hWP7dYnh5pm0SzJpo54oW3TDUGXV5wfxXFmMkxrzRRbotQ0+w==", "requires": { "@babel/runtime": "^7.11.1", "classnames": "^2.2.1", @@ -48339,9 +48327,9 @@ } }, "rc-notification": { - "version": "5.6.1", - "resolved": "https://registry.npmmirror.com/rc-notification/-/rc-notification-5.6.1.tgz", - "integrity": "sha512-Q4ZKES3IBxWmpNnlDiMFYoH6D7MJ1L3n3gp59pnpaMI8gm9Vj+gVRxdInvoYjBoZvEOenxb9MbbKvnFhzJpgvA==", + "version": "5.6.2", + "resolved": "https://registry.npmmirror.com/rc-notification/-/rc-notification-5.6.2.tgz", + "integrity": "sha512-Id4IYMoii3zzrG0lB0gD6dPgJx4Iu95Xu0BQrhHIbp7ZnAZbLqdqQ73aIWH0d0UFcElxwaKjnzNovTjo7kXz7g==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "2.x", @@ -48361,9 +48349,9 @@ } }, "rc-pagination": { - "version": "4.2.0", - "resolved": "https://registry.npmmirror.com/rc-pagination/-/rc-pagination-4.2.0.tgz", - "integrity": "sha512-V6qeANJsT6tmOcZ4XiUmj8JXjRLbkusuufpuoBw2GiAn94fIixYjFLmbruD1Sbhn8fPLDnWawPp4CN37zQorvw==", + "version": "4.3.0", + "resolved": "https://registry.npmmirror.com/rc-pagination/-/rc-pagination-4.3.0.tgz", + "integrity": "sha512-UubEWA0ShnroQ1tDa291Fzw6kj0iOeF26IsUObxYTpimgj4/qPCWVFl18RLZE+0Up1IZg0IK4pMn6nB3mjvB7g==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "^2.3.2", @@ -48371,9 +48359,9 @@ } }, "rc-picker": { - "version": "4.6.14", - "resolved": "https://registry.npmmirror.com/rc-picker/-/rc-picker-4.6.14.tgz", - "integrity": "sha512-7DuTfUFdkxmsNpWQ0TWv6FPGna5e6KKC4nxtx3x9xhumLz7jb3fhlDdWQvqEL6tpt9DOb1+N5j+wB+lDOSS9kg==", + "version": "4.8.1", + "resolved": "https://registry.npmmirror.com/rc-picker/-/rc-picker-4.8.1.tgz", + "integrity": "sha512-lj9hXXMSkbjFUIhfQh8XH698ybxnoBOfq7pdM1FvfSyDwdFhdQa7dvsIYwo6Uz7Zp1wVkfw5rOJO3MpdWzoHsg==", "requires": { "@babel/runtime": "^7.24.7", "@rc-component/trigger": "^2.0.0", @@ -48415,9 +48403,9 @@ } }, "rc-segmented": { - "version": "2.3.0", - "resolved": "https://registry.npmmirror.com/rc-segmented/-/rc-segmented-2.3.0.tgz", - "integrity": "sha512-I3FtM5Smua/ESXutFfb8gJ8ZPcvFR+qUgeeGFQHBOvRiRKyAk4aBE5nfqrxXx+h8/vn60DQjOt6i4RNtrbOobg==", + "version": "2.5.0", + "resolved": "https://registry.npmmirror.com/rc-segmented/-/rc-segmented-2.5.0.tgz", + "integrity": "sha512-B28Fe3J9iUFOhFJET3RoXAPFJ2u47QvLSYcZWC4tFYNGPEjug5LAxEasZlA/PpAxhdOPqGWsGbSj7ftneukJnw==", "requires": { "@babel/runtime": "^7.11.1", "classnames": "^2.2.1", @@ -48426,9 +48414,9 @@ } }, "rc-select": { - "version": "14.15.2", - "resolved": "https://registry.npmmirror.com/rc-select/-/rc-select-14.15.2.tgz", - "integrity": "sha512-oNoXlaFmpqXYcQDzcPVLrEqS2J9c+/+oJuGrlXeVVX/gVgrbHa5YcyiRUXRydFjyuA7GP3elRuLF7Y3Tfwltlw==", + "version": "14.16.3", + "resolved": "https://registry.npmmirror.com/rc-select/-/rc-select-14.16.3.tgz", + "integrity": "sha512-51+j6s3fJJJXB7E+B6W1hM4Tjzv1B/Decooz9ilgegDBt3ZAth1b/xMwYCTrT5BbG2e53XACQsyDib2+3Ro1fg==", "requires": { "@babel/runtime": "^7.10.1", "@rc-component/trigger": "^2.1.1", @@ -48440,9 +48428,9 @@ } }, "rc-slider": { - "version": "11.1.6", - "resolved": "https://registry.npmmirror.com/rc-slider/-/rc-slider-11.1.6.tgz", - "integrity": "sha512-LACAaXM0hi+4x4ErDGZLy7weIQwmBIVbIgPE+eDHiHkyzMvKjWHraCG8/B22Y/tCQUPAsP02wBhKhth7mH2PIw==", + "version": "11.1.7", + "resolved": "https://registry.npmmirror.com/rc-slider/-/rc-slider-11.1.7.tgz", + "integrity": "sha512-ytYbZei81TX7otdC0QvoYD72XSlxvTihNth5OeZ6PMXyEDq/vHdWFulQmfDGyXK1NwKwSlKgpvINOa88uT5g2A==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.5", @@ -48470,36 +48458,36 @@ } }, "rc-table": { - "version": "7.45.7", - "resolved": "https://registry.npmmirror.com/rc-table/-/rc-table-7.45.7.tgz", - "integrity": "sha512-wi9LetBL1t1csxyGkMB2p3mCiMt+NDexMlPbXHvQFmBBAsMxrgNSAPwUci2zDLUq9m8QdWc1Nh8suvrpy9mXrg==", + "version": "7.48.1", + "resolved": "https://registry.npmmirror.com/rc-table/-/rc-table-7.48.1.tgz", + "integrity": "sha512-Z4mDKjWg+xz/Ezdw6ivWcbqRpaJ0QfCORRoRrlrw65KSGZLK8OcTdacH22/fyGb8L4It/0/9qcMm8VrVAk/WBw==", "requires": { "@babel/runtime": "^7.10.1", "@rc-component/context": "^1.4.0", "classnames": "^2.2.5", "rc-resize-observer": "^1.1.0", - "rc-util": "^5.37.0", + "rc-util": "^5.41.0", "rc-virtual-list": "^3.14.2" } }, "rc-tabs": { - "version": "15.1.1", - "resolved": "https://registry.npmmirror.com/rc-tabs/-/rc-tabs-15.1.1.tgz", - "integrity": "sha512-Tc7bJvpEdkWIVCUL7yQrMNBJY3j44NcyWS48jF/UKMXuUlzaXK+Z/pEL5LjGcTadtPvVmNqA40yv7hmr+tCOAw==", + "version": "15.4.0", + "resolved": "https://registry.npmmirror.com/rc-tabs/-/rc-tabs-15.4.0.tgz", + "integrity": "sha512-llKuyiAVqmXm2z7OrmhX5cNb2ueZaL8ZyA2P4R+6/72NYYcbEgOXibwHiQCFY2RiN3swXl53SIABi2CumUS02g==", "requires": { "@babel/runtime": "^7.11.2", "classnames": "2.x", "rc-dropdown": "~4.2.0", - "rc-menu": "~9.14.0", + "rc-menu": "~9.16.0", "rc-motion": "^2.6.2", "rc-resize-observer": "^1.0.0", "rc-util": "^5.34.1" } }, "rc-textarea": { - "version": "1.8.1", - "resolved": "https://registry.npmmirror.com/rc-textarea/-/rc-textarea-1.8.1.tgz", - "integrity": "sha512-bm36N2ZqwZAP60ZQg2OY9mPdqWC+m6UTjHc+CqEZOxb3Ia29BGHazY/s5bI8M4113CkqTzhtFUDNA078ZiOx3Q==", + "version": "1.8.2", + "resolved": "https://registry.npmmirror.com/rc-textarea/-/rc-textarea-1.8.2.tgz", + "integrity": "sha512-UFAezAqltyR00a8Lf0IPAyTd29Jj9ee8wt8DqXyDMal7r/Cg/nDt3e1OOv3Th4W6mKaZijjgwuPXhAfVNTN8sw==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "^2.2.1", @@ -48509,9 +48497,9 @@ } }, "rc-tooltip": { - "version": "6.2.0", - "resolved": "https://registry.npmmirror.com/rc-tooltip/-/rc-tooltip-6.2.0.tgz", - "integrity": "sha512-iS/3iOAvtDh9GIx1ulY7EFUXUtktFccNLsARo3NPgLf0QW9oT0w3dA9cYWlhqAKmD+uriEwdWz1kH0Qs4zk2Aw==", + "version": "6.2.1", + "resolved": "https://registry.npmmirror.com/rc-tooltip/-/rc-tooltip-6.2.1.tgz", + "integrity": "sha512-rws0duD/3sHHsD905Nex7FvoUGy2UBQRhTkKxeEvr2FB+r21HsOxcDJI0TzyO8NHhnAA8ILr8pfbSBg5Jj5KBg==", "requires": { "@babel/runtime": "^7.11.2", "@rc-component/trigger": "^2.0.0", @@ -48519,9 +48507,9 @@ } }, "rc-tree": { - "version": "5.9.0", - "resolved": "https://registry.npmmirror.com/rc-tree/-/rc-tree-5.9.0.tgz", - "integrity": "sha512-CPrgOvm9d/9E+izTONKSngNzQdIEjMox2PBufWjS1wf7vxtvmCWzK1SlpHbRY6IaBfJIeZ+88RkcIevf729cRg==", + "version": "5.10.1", + "resolved": "https://registry.npmmirror.com/rc-tree/-/rc-tree-5.10.1.tgz", + "integrity": "sha512-FPXb3tT/u39mgjr6JNlHaUTYfHkVGW56XaGDahDpEFLGsnPxGcVLNTjcqoQb/GNbSCycl7tD7EvIymwOTP0+Yw==", "requires": { "@babel/runtime": "^7.10.1", "classnames": "2.x", @@ -48531,21 +48519,21 @@ } }, "rc-tree-select": { - "version": "5.23.0", - "resolved": "https://registry.npmmirror.com/rc-tree-select/-/rc-tree-select-5.23.0.tgz", - "integrity": "sha512-aQGi2tFSRw1WbXv0UVXPzHm09E0cSvUVZMLxQtMv3rnZZpNmdRXWrnd9QkLNlVH31F+X5rgghmdSFF3yZW0N9A==", + "version": "5.24.4", + "resolved": "https://registry.npmmirror.com/rc-tree-select/-/rc-tree-select-5.24.4.tgz", + "integrity": "sha512-MzljkSkk7weKOcE853UtYlXB6uyUEzcEQhhpaCwE6jQPbmBUgGiRURuKWpYUnM/dXrwTTlCK969M6Pgjj35MLA==", "requires": { - "@babel/runtime": "^7.10.1", + "@babel/runtime": "^7.25.7", "classnames": "2.x", - "rc-select": "~14.15.0", - "rc-tree": "~5.9.0", - "rc-util": "^5.16.1" + "rc-select": "~14.16.2", + "rc-tree": "~5.10.1", + "rc-util": "^5.43.0" } }, "rc-upload": { - "version": "4.7.0", - "resolved": "https://registry.npmmirror.com/rc-upload/-/rc-upload-4.7.0.tgz", - "integrity": "sha512-eUwxYNHlsYe5vYhKFAUGrQG95JrnPzY+BmPi1Daq39fWNl/eOc7v4UODuWrVp2LFkQBuV3cMCG/I68iub6oBrg==", + "version": "4.8.1", + "resolved": "https://registry.npmmirror.com/rc-upload/-/rc-upload-4.8.1.tgz", + "integrity": "sha512-toEAhwl4hjLAI1u8/CgKWt30BR06ulPa4iGQSMvSXoHzO88gPCslxqV/mnn4gJU7PDoltGIC9Eh+wkeudqgHyw==", "requires": { "@babel/runtime": "^7.18.3", "classnames": "^2.2.5", @@ -48569,9 +48557,9 @@ } }, "rc-virtual-list": { - "version": "3.14.5", - "resolved": "https://registry.npmmirror.com/rc-virtual-list/-/rc-virtual-list-3.14.5.tgz", - "integrity": "sha512-ZMOnkCLv2wUN8Jz7yI4XiSLa9THlYvf00LuMhb1JlsQCewuU7ydPuHw1rGVPhe9VZYl/5UqODtNd7QKJ2DMGfg==", + "version": "3.15.0", + "resolved": "https://registry.npmmirror.com/rc-virtual-list/-/rc-virtual-list-3.15.0.tgz", + "integrity": "sha512-dF2YQztqrU3ijAeWOqscTshCEr7vpimzSqAVjO1AyAmaqcHulaXpnGR0ptK5PXfxTUy48VkJOiglMIxlkYGs0w==", "requires": { "@babel/runtime": "^7.20.0", "classnames": "^2.2.6", diff --git a/package.json b/package.json index d65c592..e755050 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-react": "^1.0.6", "ali-oss": "^6.18.1", - "antd": "^5.20.6", + "antd": "^5.21.6", "axios": "^1.2.1", "babel-jest": "^27.4.2", "babel-loader": "^8.2.3", diff --git a/src/components/form/simple_form.tsx b/src/components/form/simple_form.tsx index b48cc49..1d608b3 100644 --- a/src/components/form/simple_form.tsx +++ b/src/components/form/simple_form.tsx @@ -21,13 +21,13 @@ const SimpleForm = (props: SimpleFormData) => {
{props.childrenPosi ? null : props.children ?? props.children} {props.formDatas.map((v) => { diff --git a/src/components/video_select.tsx b/src/components/video_select.tsx new file mode 100644 index 0000000..353de77 --- /dev/null +++ b/src/components/video_select.tsx @@ -0,0 +1,67 @@ +import homeStore from "@/store/home"; +import { TreeSelect, TreeSelectProps } from "antd"; +import { useEffect, useState } from "react"; + +const VideoSelect = (props) => { + const { changes } = props; + const [value, setValue] = useState(); + const [treeData, setTreeData] = useState>([]); + useEffect(() => { + homeStore.getVideoUrlList().then((res) => { + let valuList: any = []; + res.EasyDarwin.Body.Devices.forEach((element) => { + valuList.push({ + id: element.DeviceID, + pId: 0, + value: element.DeviceID, + title: element.DeviceName, + disableCheckbox: true, + }); + }); + setTreeData(valuList); + }); + }, []); + + const onLoadData: TreeSelectProps["loadData"] = async ({ id }) => { + let reqs = await homeStore.getChannerUrlList(id); + let valuList: any = []; + reqs.EasyDarwin.Body.Channels.forEach((item) => { + valuList.push({ + key: id + "-" + item.ChannelID, + id: id + "-" + item.ChannelID, + pId: id, + value: id + "-" + item.ChannelID, + title: item.Name, + treeExpandAction: true, + }); + }); + + setTreeData((prev)=>{ + return [...prev,...valuList] + }); + }; + + const onChange = (newValue: string) => { + if (newValue.length > 4) return; + setValue(newValue); + changes(newValue); + }; + return ( +
+ +
+ ); +}; + +export default VideoSelect; diff --git a/src/pages/archives/file_list.tsx b/src/pages/archives/file_list.tsx index fe937ba..b8f89e5 100644 --- a/src/pages/archives/file_list.tsx +++ b/src/pages/archives/file_list.tsx @@ -1,8 +1,18 @@ -import { Button, Modal, Space, UploadFile } from "antd"; +import { + Button, + message, + Modal, + Space, + Upload, + UploadFile, + UploadProps, +} from "antd"; import { useEffect, useState } from "react"; import { inject, observer } from "mobx-react"; -import AliUpload from "@/components/ali_upload"; import FileViewer from "@codesmith-99/react-file-preview"; +import { UploadOutlined } from "@ant-design/icons"; +import Config from "@/util/config"; + interface ArchiveUploadFile extends UploadFile { file_type: string | undefined; file_url: string | undefined; @@ -12,7 +22,22 @@ const FileListPage = (props: any) => { const [fileList, setFileList] = useState([]); const [isModalOpen, setIsModalOpen] = useState(false); const [fileNmae, setFileName] = useState(""); - + const bprops: UploadProps = { + name: "file", + action: `${Config.baseUrl}v1/public/fts/upload`, + headers: { + authorization: "authorization-text", + }, + onChange(info) { + if (info.file.status === "done") { + message.success(`${info.file.name} file uploaded successfully`); + console.log("info.fileList", info.fileList); + saveHandler(info.fileList); + } else if (info.file.status === "error") { + message.error(`${info.file.name} file upload failed.`); + } + }, + }; useEffect(() => { folderStore.getAlist(id).then((res) => { setFileList(folderStore.alist); @@ -30,7 +55,6 @@ const FileListPage = (props: any) => { const preView = (imageUrl) => { let fileType = getFileTypeFromUrl(imageUrl); - console.log(imageUrl); switch (fileType) { case "jpeg": return ; @@ -78,25 +102,26 @@ const FileListPage = (props: any) => { return
; } }; - const saveHandler = () => { - fileList.forEach((item) => { + const saveHandler = (files) => { + files.forEach((item) => { item.file_url = item.url; item.file_type = item.type; + item.file_name = item.name; }); - archivesStore.save(id, fileList); + archivesStore.save(id, files); }; return (
- + + +
{fileList?.map((item: any) => { return (
@@ -109,7 +134,7 @@ const FileListPage = (props: any) => { > 预览 - + 下载
); diff --git a/src/pages/emergency/em_column.tsx b/src/pages/emergency/em_column.tsx index 516c9da..bd427b7 100644 --- a/src/pages/emergency/em_column.tsx +++ b/src/pages/emergency/em_column.tsx @@ -30,10 +30,10 @@ export const EmConfig = (userList) => [ }, { type: FormType.cehckboxGroup, - label: "参与人员选择", + label: "参与队伍", name: "user_id", value: [], checkboxData: userList, - rules: [{ required: true, message: "参与人员不能为空!" }], + rules: [{ required: true, message: "参与队伍不能为空!" }], }, ]; diff --git a/src/pages/home/home.tsx b/src/pages/home/home.tsx index 467f839..e666ca9 100644 --- a/src/pages/home/home.tsx +++ b/src/pages/home/home.tsx @@ -7,7 +7,6 @@ import HomeBottom from "@/pages/home/homeBottom/home_bottom"; import image2 from "@/static/title_line@1x.png"; import { SettingOutlined } from "@ant-design/icons"; import { useNavigate } from "react-router"; -import Video from "./video"; import Weather from "./homeLeft/weather"; import Timer from "./homeLeft/timer"; diff --git a/src/pages/home/homeBottom/dispath.tsx b/src/pages/home/homeBottom/dispath.tsx index 23ac5bd..62530a3 100644 --- a/src/pages/home/homeBottom/dispath.tsx +++ b/src/pages/home/homeBottom/dispath.tsx @@ -95,9 +95,12 @@ const Dispath = (props: Store) => { {}} + afterClose={() => { + + }} onOk={() => {}} okText="确定" cancelText="取消" @@ -119,13 +122,14 @@ const Dispath = (props: Store) => { setIsModalOpen(false); }} > -
+
{}} formName="card_basic" colProps={25} subBtnName="提交" + span={4} formDatas={projectConfig} onFinish={onFinish} initialValues={true} @@ -152,7 +156,12 @@ const Dispath = (props: Store) => { {(fields, { add, remove }) => ( <> {fields.map(({ key, name, ...restField }) => ( -
+
{ remove(name)} style={{ position: "absolute", - right: "10px", - bottom: "20px", + top: "66px", + right: "20px", + color: "#fff", }} - onClick={() => remove(name)} />
))} diff --git a/src/pages/home/homeBottom/ec.tsx b/src/pages/home/homeBottom/ec.tsx index 19ac6eb..407ac91 100644 --- a/src/pages/home/homeBottom/ec.tsx +++ b/src/pages/home/homeBottom/ec.tsx @@ -38,6 +38,7 @@ const Ec = (props: Store) => { className="owner_model" width={800} open={isModalOpen} + centered afterClose={() => {}} onOk={() => {}} footer={null} diff --git a/src/pages/home/homeBottom/emr.tsx b/src/pages/home/homeBottom/emr.tsx index 3309b73..ae0dc10 100644 --- a/src/pages/home/homeBottom/emr.tsx +++ b/src/pages/home/homeBottom/emr.tsx @@ -15,9 +15,10 @@ import baseHttp from "@/service/base"; import MinusCircleOutlined from "@ant-design/icons/lib/icons/MinusCircleOutlined"; import { EmConfig } from "@/pages/emergency/em_column"; import { inject, observer } from "mobx-react"; +import VideoSelect from "@/components/video_select"; const Emr = (props: Store) => { - const { emergencyStore,homeStore } = props; + const { emergencyStore, homeStore } = props; const [isModalOpen, setIsModalOpen] = useState(false); const formRef = React.useRef(null); const [projectConfig, setProjectConfig] = useState([]); @@ -35,9 +36,11 @@ const Emr = (props: Store) => { long: values.marker["lng"], lat: values.marker["lat"], }; + console.log(data); + return; emergencyStore.add(data); setIsModalOpen(false); - homeStore.getNewTask() + homeStore.getNewTask(); }; const handleSearch = (newValue: string) => { if (newValue === "") return; @@ -52,10 +55,10 @@ const Emr = (props: Store) => { }; useEffect(() => { emergencyStore.getlist(); - baseHttp.get("/user/list", null).then((res) => { + baseHttp.get("/team/list", null).then((res) => { let data = res.data?.record ?? []; data.forEach((item) => { - item.label = item.account; + item.label = item.name; item.value = item.identity; }); setUserList(data ?? []); @@ -67,17 +70,26 @@ const Emr = (props: Store) => { formRef.current?.resetFields()} onOk={() => formRef.current?.submit()} okText="确定" cancelText="取消" + centered onCancel={() => { setIsModalOpen(false); }} > -
+
{ @@ -92,58 +104,74 @@ const Emr = (props: Store) => { childrenPosi={true} onFinishFailed={onFinishFailed} > - - {(fields, { add, remove }) => ( - <> - {fields.map(({ key, name, ...restField }) => ( - <> - - ({ + value: d.value, + label: d.text, + }))} + /> + + + + + remove(name)} /> + + ))} + +
+ +
+ + + )} + + + { + formRef.current?.setFieldsValue({ task_video: v }); + }} + /> + +
@@ -151,4 +179,4 @@ const Emr = (props: Store) => { ); }; -export default inject("emergencyStore","homeStore")(observer(Emr)); +export default inject("emergencyStore", "homeStore")(observer(Emr)); diff --git a/src/pages/home/homeBottom/which_video.tsx b/src/pages/home/homeBottom/which_video.tsx index 3bb1ed3..96918c0 100644 --- a/src/pages/home/homeBottom/which_video.tsx +++ b/src/pages/home/homeBottom/which_video.tsx @@ -1,24 +1,32 @@ import { Modal } from "antd"; import { inject, observer } from "mobx-react"; import { useState } from "react"; - +import Videos from "@/pages/home/video"; +import Config from "@/util/config"; const WhichVideo = (props) => { const { homeStore } = props; const [isModalOpen, setIsModalOpen] = useState(false); + const [deviceList, setDeviceList] = useState>([]); const [channelList, setChannelList] = useState>([]); + const [deviceId, setDeviceId] = useState(0); + const [channelId, setChannelId] = useState(0); + const [videoUrl, setVideoUrl] = useState(""); const openDispatch = async () => { setIsModalOpen(true); let req = await homeStore.getVideoUrlList(); - let list: Array = []; + setDeviceList(req.EasyDarwin.Body.Devices); + }; + const getChannerList = async (id) => { + let reqs = await homeStore.getChannerUrlList(id); + setChannelList(reqs.EasyDarwin.Body.Channels); + }; - for await (const item of req.EasyDarwin.Body.Devices) { - let reqs = await homeStore.getChannerUrlList(item.DeviceID); - - if (reqs?.EasyDarwin) { - list.push(...reqs?.EasyDarwin?.Body.Channels); - } - } - setChannelList(list); + const getUrl = async (id) => { + let reqs = await homeStore.getChannerStrem(deviceId, id); + if (!reqs.EasyDarwin) return; + let url = Config.videoApis + reqs.EasyDarwin.Body.URL + console.log(url) + setVideoUrl(url); }; return ( <> @@ -27,22 +35,73 @@ const WhichVideo = (props) => { title={"视频查看"} className="owner_model" width={1000} + centered open={isModalOpen} - afterClose={() => {}} + afterClose={() => { + setDeviceList([]); + setChannelList([]); + setVideoUrl(null); + setChannelId(0); + }} onOk={() => {}} footer={null} onCancel={() => { setIsModalOpen(false); }} > -
- {channelList.map((item, index) => { - return ( -
-

{item.Name}

-
- ); - })} +
+
+
+ {deviceList.map((item, index) => { + return ( +
{ + setDeviceId(item.DeviceID); + getChannerList(item.DeviceID); + }} + > +

+ {item.DeviceName} +

+
+ ); + })} +
+
+
+ {channelList.map((item, index) => { + return ( +
{ + setChannelId(item.ChannelID); + getUrl(item.ChannelID); + }} + > +

+ {item.Name} +

+
+ ); + })} +
+
+ { + + } +
+
diff --git a/src/pages/home/homeRigrt/ac.tsx b/src/pages/home/homeRigrt/ac.tsx index 37a9a61..141e645 100644 --- a/src/pages/home/homeRigrt/ac.tsx +++ b/src/pages/home/homeRigrt/ac.tsx @@ -37,7 +37,6 @@ const Ac = (props: Store) => { name: "Access From", type: "pie", radius: ["40%", "60%"], - itemStyle : { normal : { label : { show : false @@ -45,7 +44,6 @@ const Ac = (props: Store) => { labelLine : { show : false } - }, }, label: { backgroundColor: "#F6F8FC", diff --git a/src/pages/home/homeRigrt/wz.tsx b/src/pages/home/homeRigrt/wz.tsx index c55ce31..cb48a33 100644 --- a/src/pages/home/homeRigrt/wz.tsx +++ b/src/pages/home/homeRigrt/wz.tsx @@ -33,14 +33,12 @@ const Wz = (props: Store) => { name: "Access From", type: "pie", radius: ["40%", "60%"], - itemStyle : { - normal : { - label : { - show : false - }, - labelLine : { - show : false - } + normal: { + label: { + show: false, + }, + labelLine: { + show: false, }, }, label: { @@ -61,9 +59,17 @@ const Wz = (props: Store) => { initChart(res.data?.record); }); }, [homeStore]); - return <> -
{setIsModalOpen(true)}} style={{ width: "100%", height: "100%" }} id="wz">
; - +
{ + setIsModalOpen(true); + }} + style={{ width: "100%", height: "100%" }} + id="wz" + >
+ ; + { > - + + ); }; -export default inject("homeStore")(observer(Wz)); \ No newline at end of file +export default inject("homeStore")(observer(Wz)); diff --git a/src/pages/home/home_video.tsx b/src/pages/home/home_video.tsx new file mode 100644 index 0000000..36f7aaf --- /dev/null +++ b/src/pages/home/home_video.tsx @@ -0,0 +1,8 @@ + +const HomeVideo = () => { + return ( +
csacas
+ ); +}; + +export default HomeVideo; \ No newline at end of file diff --git a/src/pages/home/video.tsx b/src/pages/home/video.tsx index 2dd302b..a4ea2fb 100644 --- a/src/pages/home/video.tsx +++ b/src/pages/home/video.tsx @@ -1,5 +1,4 @@ import { Store } from "antd/es/form/interface"; -import { inject, observer } from "mobx-react"; import { useEffect, useRef } from "react"; import videojs from "video.js"; import "video.js/dist/video-js.css"; @@ -10,22 +9,22 @@ const videoJsOptions = { fluid: true, sources: [ { - src: "https://sprh.hswzct.cn:4443/hls/stream_1_0/playlist.m3u8", + src: "", type: "application/x-mpegURL", }, ], }; -const Video = (props: Store) => { - const { homeStore, onReady } = props; +const Videos = (props: Store) => { + const { onReady } = props; const videoRef = useRef(null); const playerRef = useRef(null); // 使用 any 类型 + useEffect(() => { - homeStore.getNewTask(); - }, [homeStore]); - useEffect(() => { + if (!props.url) return; + videoJsOptions.sources[0].src = props.url; if (!playerRef.current && videoRef.current) { - const videoElement = document.createElement("video-js"); - videoElement.classList.add("vjs-big-play-centered"); + const videoElement = document.createElement(`video-js`); + videoElement.classList.add(`vjs-big-play-centered${props.url}`); videoRef.current.appendChild(videoElement); const player = (playerRef.current = videojs( videoElement, @@ -37,26 +36,24 @@ const Video = (props: Store) => { )); } else { const player = playerRef.current; - player?.autoplay(videoJsOptions.autoplay); - player.src(videoJsOptions.sources); + player?.autoplay(videoJsOptions?.autoplay); + player.src(videoJsOptions?.sources); } - }, [videoRef, onReady]); - useEffect(() => { - const player = playerRef.current; return () => { - if (player && !player.isDisposed()) { - player.dispose(); + if (playerRef.current) { + playerRef.current.dispose(); playerRef.current = null; } }; - }, [playerRef]); + }, [videoRef, onReady, props.url]); + return ( <>
-
+
); }; -export default inject("homeStore")(observer(Video)); +export default Videos; diff --git a/src/pages/poverPage/index.tsx b/src/pages/poverPage/index.tsx index 137324b..86b722b 100644 --- a/src/pages/poverPage/index.tsx +++ b/src/pages/poverPage/index.tsx @@ -48,14 +48,13 @@ const PoverPage = (props: Store) => { }, ], }; - option && myChart.setOption(option); + myChart.setOption(option); }; useEffect(() => { usrStore.getPover().then((e) => { - initChart("pover_jg",e.data.o_type_nums,e.data.total); - initChart("pover_jgs",e.data.o_type_num,e.data.total); - initChart("pover1",e.data.a_member,e.data.total); - initChart("pover2",e.data.p_team,e.data.total); + initChart("pover_jg", e.data.o_type_nums, e.data.total); + initChart("pover_jgs", e.data.o_type_num, e.data.total); + initChart("pover1", e.data.a_member, e.data.total); setPover(e.data); }); }, [usrStore]); @@ -88,45 +87,29 @@ const PoverPage = (props: Store) => { 退役军人
-
- -
-
{poverData?.c_member}人
- 社干力量 -
-
-
- -
-
{poverData?.o_member}人
- 三方力量 -
-
-
-
{ - usrStore.setPoverDe(false) - }}> +
+
{ + usrStore.setPoverDe(false); + }} + >
企事业单位

-
+
积极力量
-

-
-
- 专业队伍 -

双流区黄水镇人民武装部基干民兵力量

- {usrStore.poverDetail? : } + {usrStore.poverDetail ? : }
diff --git a/src/store/home.ts b/src/store/home.ts index cac542a..466d6ee 100644 --- a/src/store/home.ts +++ b/src/store/home.ts @@ -17,7 +17,7 @@ class HomeConfig { static taskulist: string = "public/taskInUser" static deviceList: string = "api/v1/devicesconfig" //设备列表 static channerList: string = "api/v1/channelsconfig" //设备列表 - static channelstream: string = "api/v1/channelstream" //设备包活 + static channelstream: string = "api/v1/devices/channelstream" //设备包活 } class HomeStore extends BaseStore { @@ -91,7 +91,7 @@ class HomeStore extends BaseStore { protocol:"HLS" }) console.log(data) - return true + return data; } catch (error) { console.log(error) return false diff --git a/src/util/config.ts b/src/util/config.ts index 1cb0a36..5215ce3 100644 --- a/src/util/config.ts +++ b/src/util/config.ts @@ -1,9 +1,10 @@ class Config { - static baseUrl = "https://rw.quwanya.cn/"; + static baseUrl = "http://127.0.0.1:12214/"; static uploadUrl = "https://rw.quwanya.cn"; static ws = "wss://rw.quwanya.cn/wsadmin?id=admin"; static userStatic = "https://rw.quwanya.cn/uploads/user/"; static videoApi = "https://sprh.hswzct.cn:4443/"; // + static videoApis = "https://sprh.hswzct.cn:4443"; // } export default Config;