diff --git a/src/pages/archives/archivesFolder.tsx b/src/pages/archives/archivesFolder.tsx index 9b1041c..4d13e32 100644 --- a/src/pages/archives/archivesFolder.tsx +++ b/src/pages/archives/archivesFolder.tsx @@ -6,10 +6,12 @@ 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"; const { Option } = Select; const ArchivesFolder = (props: Store) => { const { folderStore, acStore } = props; @@ -48,9 +50,10 @@ const ArchivesFolder = (props: Store) => { setIsModalOpen(false); }; - + const remove = (id: string) => { + folderStore.deleteItem(id); + }; - const onFinishFailed = () => {}; return (
@@ -63,14 +66,27 @@ const ArchivesFolder = (props: Store) => { {Array.from({ length: folderStore.list?.length ?? 0 }, (_, i) => (
- //folderHandle(folderStore.list[i]) - nav("/admin/archives/folder/" + folderStore.list[i].identity) - } - style={{ cursor: "pointer", width: "120px" }} + style={{ + cursor: "pointer", + width: "120px", + position: "relative", + }} > - + { + remove(folderStore.list[i].id); + }} + className="close_icon" + /> + + nav("/admin/archives/folder/" + folderStore.list[i].identity) + } + />

{folderStore.list[i].folder_name}

diff --git a/src/pages/archives/preview.less b/src/pages/archives/preview.less index 3bf7e13..ea11fa5 100644 --- a/src/pages/archives/preview.less +++ b/src/pages/archives/preview.less @@ -1,19 +1,19 @@ -.preview_container{ +.preview_container { width: 100%; height: 100%; display: flex; align-items: start; - .preview_center{ + .preview_center { width: 10px; } - .preview_left{ + .preview_left { width: 10%; height: 100%; - .select{ + .select { background-color: red; color: #fff; } - >span{ + > span { display: block; padding-left: 10px; cursor: pointer; @@ -21,8 +21,21 @@ line-height: 35px; } } - .preview_right{ + .preview_right { width: 75%; height: 100%; } +} +.folder_box { + .close_icon { + position: absolute; + top: 10px; + right: 0px; + display: none; + } +} +.folder_box:hover{ + .close_icon { + display: inline-block; + } } \ No newline at end of file diff --git a/src/pages/home/homeLeft/turn.tsx b/src/pages/home/homeLeft/turn.tsx index ac0cc48..982c24a 100644 --- a/src/pages/home/homeLeft/turn.tsx +++ b/src/pages/home/homeLeft/turn.tsx @@ -11,7 +11,9 @@ const Turn = (props: Store) => { const [folderList, setfolderList] = useState([]); const [imageList, setImageList] = useState([]); const [imageUrl, setImageUrl] = useState([]); - + const [taskId, setTaskId] = useState([]); + const [folderId, setFolderId] = useState([]); + const initChart = (data) => { var myChart = echarts.init(document.getElementById("xunlian")); trunEchatConfig(data) && myChart.setOption(trunEchatConfig(data)); @@ -30,13 +32,11 @@ const Turn = (props: Store) => { setisModalOpen(true); }; const getFolderhandler = (id: string) => { - // trainingStore.getlist(); folderStore?.getFolderList(id).then((res) => { setfolderList(res?.data?.record ?? []); }); }; const getAehandler = async (id: string) => { - // trainingStore.getlist(); await folderStore?.getAlist(id).then(() => { folderStore.alist?.forEach((elem) => { elem.url = elem.file_url; @@ -73,8 +73,12 @@ const Turn = (props: Store) => { {trainingStore.list?.map((item) => { return (

{ + setTaskId(item.identity); getFolderhandler(item.archives_category_identity); }} > @@ -90,8 +94,12 @@ const Turn = (props: Store) => { {folderList?.map((item) => { return (

{ + setFolderId(item.identity) getAehandler(item.identity); }} > @@ -107,9 +115,9 @@ const Turn = (props: Store) => { {imageList?.map((item) => { return ( { - setImageUrl(item.file_url) - }} + onClick={() => { + setImageUrl(item.file_url); + }} style={{ width: "80px", height: "80px" }} src={item.file_url} alt="" @@ -120,7 +128,11 @@ const Turn = (props: Store) => {

- +
diff --git a/src/pages/poverPage/index.tsx b/src/pages/poverPage/index.tsx index 692ca6d..4d1e08a 100644 --- a/src/pages/poverPage/index.tsx +++ b/src/pages/poverPage/index.tsx @@ -69,13 +69,6 @@ const PoverPage = (props:Store) => { 基干民兵
-
- -
-
120人
- 基干民兵 -
-
diff --git a/src/pages/poverPage/pv.less b/src/pages/poverPage/pv.less index 691e6eb..4d270fa 100644 --- a/src/pages/poverPage/pv.less +++ b/src/pages/poverPage/pv.less @@ -17,6 +17,7 @@ .content-right { width: 85%; height: 100%; + overflow: auto; text-align: center; color: #fff; } diff --git a/src/pages/poverPage/pvTable.tsx b/src/pages/poverPage/pvTable.tsx index a2eb815..f701c76 100644 --- a/src/pages/poverPage/pvTable.tsx +++ b/src/pages/poverPage/pvTable.tsx @@ -25,17 +25,17 @@ const PvTable = () => { console.log(e)}> 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + wang_yp + 党员 + 杨公社区 + √ + + + + √ + √ + √ + √ diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx index 0334ee3..a5f47a3 100644 --- a/src/pages/user/user.tsx +++ b/src/pages/user/user.tsx @@ -1,4 +1,4 @@ -import { Button, Space, Modal, FormInstance } from "antd"; +import { Button, Space, Modal, FormInstance, Form, Select } from "antd"; import { inject, observer } from "mobx-react"; import BTable from "@/components/b_table"; import { useEffect, useState } from "react"; @@ -7,9 +7,10 @@ import SimpleForm from "@/components/form/simple_form"; import React from "react"; import { columns, defaultConfig } from "./user_config"; import "./user.less"; +const { Option } = Select; const User = (props: Store) => { - const { usrStore } = props; + const { usrStore ,depStore} = props; const [isModalOpen, setIsModalOpen] = useState(false); const [projectConfig, setProjectConfig] = useState([]); const formRef = React.useRef(null); @@ -17,6 +18,7 @@ const User = (props: Store) => { const [team, setTeam] = useState(null); const [per, setPer] = useState(null); const [userId, setId] = useState(null); + const [depList, setDeplist] = useState([]); const actionWidget = (any, record) => { return ( @@ -78,8 +80,6 @@ const User = (props: Store) => { data[index].label = data[index].name; data[index].value = data[index].identity; } - console.log(data); - setTeam(data) }); usrStore.getPer().then((res) => { @@ -90,8 +90,12 @@ const User = (props: Store) => { } setPer(data) }); + + depStore.getlist().then(() => { + setDeplist(depStore.list); + }); - }, [usrStore]); + }, [usrStore,depStore]); const addHandler = () => { setProjectConfig(defaultConfig(team,per)); @@ -146,11 +150,30 @@ const User = (props: Store) => { onFinish={onFinish} initialValues={true} onFinishFailed={onFinishFailed} - /> + > + <> + + + + +
); }; -export default inject("usrStore")(observer(User)); +export default inject("usrStore","depStore")(observer(User)); diff --git a/src/pages/user/user_config.tsx b/src/pages/user/user_config.tsx index fff84ef..5662f73 100644 --- a/src/pages/user/user_config.tsx +++ b/src/pages/user/user_config.tsx @@ -171,6 +171,120 @@ export const defaultConfig =(team,per)=> ], rules: [{ required: true, message: "是否退役军人不能为空" }], }, + { + type: FormType.date, + label: "入伍时间", + name: "vet_in_time", + value: "", + }, + { + type: FormType.date, + label: "退伍时间", + name: "vet_out_time", + value: "", + }, + { + type: FormType.radio, + label: "单位类型", + name: "o_type", + value: 0, + radioData: [ + { + key: "机关单位", + val: 1, + }, + { + key: "企事业单位", + val: 2, + }, + ], + rules: [{ required: true, message: "单位类型不能为空" }], + }, + { + type: FormType.radio, + label: "积极力量", + name: "a_member", + value: 0, + radioData: [ + { + key: "是", + val: 1, + }, + { + key: "否", + val: 2, + }, + ], + rules: [{ required: true, message: "积极力量不能为空" }], + }, + { + type: FormType.radio, + label: "专业队伍", + name: "p_team", + value: 0, + radioData: [ + { + key: "是", + val: 1, + }, + { + key: "否", + val: 2, + }, + ], + rules: [{ required: true, message: "专业队伍不能为空" }], + }, + { + type: FormType.radio, + label: "民兵类型", + name: "militia_type", + value: 0, + radioData: [ + { + key: "基干民兵", + val: 1, + }, + { + key: "普通民兵", + val: 2, + }, + ], + rules: [{ required: true, message: "民兵类型不能为空" }], + }, + { + type: FormType.radio, + label: "是否为社干力量", + name: "c_member", + value: 0, + radioData: [ + { + key: "是", + val: 1, + }, + { + key: "否", + val: 2, + }, + ], + rules: [{ required: true, message: "请选择" }], + }, + { + type: FormType.radio, + label: "三方力量", + name: "o_member", + value: 0, + radioData: [ + { + key: "是", + val: 1, + }, + { + key: "否", + val: 2, + }, + ], + rules: [{ required: true, message: "请选择" }], + }, { type: FormType.textarea,