From 77fc8ce739357f3e88ae4374a89e81a4fd105170 Mon Sep 17 00:00:00 2001 From: wang_yp <357754663@qq.com> Date: Fri, 15 Nov 2024 10:47:17 +0800 Subject: [PATCH] fix(amap):shouye --- src/model/userModel.ts | 1 + src/pages/archives/archivesFolder.tsx | 95 +++++++++++++++++---------- src/pages/archives/file_list.tsx | 53 ++++++--------- src/pages/dep/index.tsx | 4 +- src/pages/emergency/em_column.tsx | 7 +- src/pages/emergency/index.tsx | 18 +++-- src/pages/training/training.tsx | 2 +- src/store/baseStore.ts | 1 - 8 files changed, 99 insertions(+), 82 deletions(-) diff --git a/src/model/userModel.ts b/src/model/userModel.ts index ca9716c..75475d2 100644 --- a/src/model/userModel.ts +++ b/src/model/userModel.ts @@ -23,6 +23,7 @@ export interface UserDataType { identity: string; archives_category_identity:string; supplies_status:number + accomplish:any } export interface TagDataType { diff --git a/src/pages/archives/archivesFolder.tsx b/src/pages/archives/archivesFolder.tsx index 4d13e32..062dcfa 100644 --- a/src/pages/archives/archivesFolder.tsx +++ b/src/pages/archives/archivesFolder.tsx @@ -1,26 +1,34 @@ // 档案管理 -import { Button, Space, Modal, FormInstance, Flex } from "antd"; +import { + Button, + Space, + Modal, + FormInstance, + GetProps, + Tree, + Row, + Col, +} from "antd"; import { inject, observer } from "mobx-react"; import { useEffect, useState } from "react"; import { Store } from "antd/lib/form/interface"; import SimpleForm from "@/components/form/simple_form"; import React from "react"; -import MinusCircleOutlined from "@ant-design/icons/lib/icons/MinusCircleOutlined"; -import FolderTwoTone from "@ant-design/icons/FolderOpenTwoTone"; import { folderConfig } from "./archives_conf"; import { Form, Select } from "antd"; -import { useNavigate } from "react-router"; import "./preview.less"; +import DirectoryTree from "antd/lib/tree/DirectoryTree"; +import FileListPage from "@/pages/archives/file_list"; const { Option } = Select; const ArchivesFolder = (props: Store) => { const { folderStore, acStore } = props; - const nav = useNavigate(); const [isModalOpen, setIsModalOpen] = useState(false); - const [projectConfig, setProjectConfig] = useState([]); const formRef = React.useRef(null); + const [tagId, setId] = useState(null); + const [folderId, setFolderId] = useState(null); const [catList, setCatList] = useState(null); // 仓库列表 const onFinish = (values: any) => { let data = values; @@ -55,6 +63,14 @@ const ArchivesFolder = (props: Store) => { }; const onFinishFailed = () => {}; + type DirectoryTreeProps = GetProps; + const onSelect: DirectoryTreeProps["onSelect"] = (keys, info:any) => { + setFolderId(info.node.identity); + }; + + const onExpand: DirectoryTreeProps["onExpand"] = (keys, info) => { + // console.log("Trigger Expand", keys, info); + }; return (
@@ -63,36 +79,45 @@ const ArchivesFolder = (props: Store) => { 创建文件夹 - - {Array.from({ length: folderStore.list?.length ?? 0 }, (_, i) => ( -
+ + + + + { + return ( + <> + {nodeData.folder_name} + { + e?.stopPropagation(); + console.log("new") + }} + > + 新建 + + { + e?.stopPropagation(); + remove(nodeData.id); + }} + > + 删除 + + + ); }} - > - { - remove(folderStore.list[i].id); - }} - className="close_icon" - /> - - nav("/admin/archives/folder/" + folderStore.list[i].identity) - } - /> -

- {folderStore.list[i].folder_name} -

-
- ))} - + /> + + + { - const { folderStore,archivesStore } = props; - const { id } = useParams(); +const FileListPage = (props: any) => { + const { folderStore, archivesStore, id } = props; const [fileList, setFileList] = useState([]); useEffect(() => { folderStore.getAlist(id).then((res) => { - setFileList(folderStore.alist) + setFileList(folderStore.alist); }); - }, [folderStore,id]); - const saveHandler = ()=>{ - fileList.forEach((item)=>{ - item.file_url= item.url; - item.file_type= item.type; - }) - archivesStore.save(id,fileList); - } + }, [folderStore, id]); + const saveHandler = () => { + fileList.forEach((item) => { + item.file_url = item.url; + item.file_type = item.type; + }); + archivesStore.save(id, fileList); + }; return (
-
- +
{ setFileList(v); }} @@ -51,5 +39,4 @@ const FileListPage = (props: Store) => {
); }; -//export default FileListPage; -export default inject("archivesStore","folderStore")(observer(FileListPage)); +export default inject("archivesStore", "folderStore")(observer(FileListPage)); diff --git a/src/pages/dep/index.tsx b/src/pages/dep/index.tsx index cca5908..b5f3432 100644 --- a/src/pages/dep/index.tsx +++ b/src/pages/dep/index.tsx @@ -106,7 +106,7 @@ const Dep = (props: Store) => {
- - - {/* */} [ label: "任务描述", name: "desc", value: "", - rules: [{ required: true, message: "请输入任务描述!" }], }, { type: FormType.input, label: "目标位置", name: "target_location", value: "", - rules: [{ required: true, message: "请输入任务描述!" }], + rules: [{ required: true, message: "请输入目标位置!" }], }, { type: FormType.map, label: "坐标信息", name: "marker", value: "", - rules: [{ required: true, message: "请输入任务描述!" }], + rules: [{ required: true, message: "坐标信息不能为空!" }], }, { type: FormType.cehckboxGroup, @@ -35,6 +34,6 @@ export const EmConfig = (userList) => [ name: "user_id", value: [], checkboxData: userList, - rules: [{ required: true, message: "请选择参与人员!" }], + rules: [{ required: true, message: "参与人员不能为空!" }], }, ]; diff --git a/src/pages/emergency/index.tsx b/src/pages/emergency/index.tsx index a74a607..b6d966c 100644 --- a/src/pages/emergency/index.tsx +++ b/src/pages/emergency/index.tsx @@ -68,9 +68,9 @@ const Emergency = (props: Store) => { edit(record); }} > - 编辑 + 编辑 - {record.status === 0 ? ( + {record.accomplish === 1 ? (