wang_yp
/
ball_admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dilog

This commit is contained in:
wang_yp 2024-10-05 01:36:14 +08:00
parent 3d3f2fd89e
commit acad2d3431
27 changed files with 156 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
git.sh
View File

@ -12,4 +12,21 @@ git push
# scp -r ./card/ root@81.68.81.205:/mnt/www/html/shouka
# rm -rf card/
# rm -rf card/
# task
# pc
# 1、首页统计
# 1、组织架构，组织架构图
# 2、武装力量 报表
# 3、年度训练 查看档案
# 4、物资管理 处突
# 5、档案管理 报表
# 6、评优
# 7
# 2、物资借用以及归还
# 3、任务关联档案
# app
# 1、退伍军人 列表 详情 申请领取光荣牌
# 2、接收任务
# 3、任务列表

13
src/pages/archives/archive.tsx
View File

@ -19,14 +19,14 @@ const Archive = (props: Store) => {
// 获取物资列表
useEffect(() => {
folderStore.getlist().then(() => {
setStash(folderStore.list)
setStash(folderStore.list);
setProjectConfig(defaultConfig);
});
}, [folderStore]);
// 获取分类
useEffect(() => {
archivesStore.getlist()
archivesStore.getlist();
}, [archivesStore]);
const column_widget = (any, record) => {
@ -106,10 +106,12 @@ const Archive = (props: Store) => {
/>
<Modal
title={!record?.id ? "添加档案" : "编辑档案"}
width={1200}
width={600}
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setIsModalOpen(false);
}}
@ -156,7 +158,4 @@ const Archive = (props: Store) => {
);
};
export default inject(
"archivesStore",
"folderStore"
)(observer(Archive));
export default inject("archivesStore", "folderStore")(observer(Archive));

4
src/pages/archives/archivesCat.tsx
View File

@ -90,10 +90,12 @@ const ArchivesCat = (props: Store) => {
/>
<Modal
title={!record?.id ? "添加档案类别" : "编辑档案类别"}
width={1200}
width={600}
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setIsModalOpen(false);
}}

6
src/pages/archives/archivesFolder.tsx
View File

@ -57,7 +57,7 @@ const ArchivesFolder = (props: Store) => {
const folderHandle = (e) => {
folderStore.getAlist(e.identity).then((res) => {
setIsModalOpenArchives(true);
})
});
};
const onFinishFailed = () => {};
return (
@ -72,7 +72,7 @@ const ArchivesFolder = (props: Store) => {
{Array.from({ length: folderStore.list?.length ?? 0 }, (_, i) => (
<div
key={i}
onClick={()=>folderHandle(folderStore.list[i])}
onClick={() => folderHandle(folderStore.list[i])}
style={{ cursor: "pointer", width: "120px" }}
>
<FolderTwoTone rotate={-270} style={{ fontSize: "80px" }} />
@ -98,6 +98,8 @@ const ArchivesFolder = (props: Store) => {
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
onCancel={cancelHandler}
okText="确定"
cancelText="取消"
>
<SimpleForm
formRef={formRef}

2
src/pages/dep/index.tsx
View File

@ -141,6 +141,8 @@ const Dep = (props: Store) => {
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setId(null);
setIsModalOpen(false);

2
src/pages/emergency/index.tsx
View File

@ -173,6 +173,8 @@ const Emergency = (props: Store) => {
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setId(null);
setIsModalOpen(false);

32
src/pages/home/homeBottom/dispath.tsx
View File

@ -39,23 +39,21 @@ const Dispath = (props: Store) => {
const [userList, setUserList] = useState<any>([]);
useEffect(() => {
try {
trainingCatStore.getlist().then(() => {
setStashList(trainingCatStore.list);
});
baseHttp.get("/user/list", null).then((res) => {
let data = res.data?.record ?? [];
data.forEach((item) => {
item.label = item.account;
item.value = item.identity;
try {
trainingCatStore.getlist().then(() => {
setStashList(trainingCatStore.list);
});
setUserList(data ?? []);
});
} catch (error) {
console.log(error);
}
baseHttp.get("/user/list", null).then((res) => {
let data = res.data?.record ?? [];
data.forEach((item) => {
item.label = item.account;
item.value = item.identity;
});
setUserList(data ?? []);
});
} catch (error) {
console.log(error);
}
}, [trainingCatStore]);
const onFinish = (values: any) => {
@ -77,6 +75,8 @@ const Dispath = (props: Store) => {
open={isModalOpen}
afterClose={() => {}}
onOk={() => {}}
okText="确定"
cancelText="取消"
footer={[
<Button key="return" ghost onClick={handleCancle}>
取消

20
src/pages/home/homeLeft/home_left.tsx
View File

@ -59,15 +59,15 @@ const HomeLeft = () => {
}, []);
// const openDispatch = () => {
// 位置移动
// MapUtl.makerList[0].setPosition([103.55, 30.342]);
// var m = MapUtl.amap;
// var newIcon = new m.Icon({
// image: "//a.amap.com/jsapi_demos/static/demo-center/icons/dir-marker.png", //Icon 的图像
// size: new m.Size(25, 34), // 图标大小
// anchor: new m.Pixel(12, 32), // 图标锚点
// });
// MapUtl.makerList[0].setIcon(newIcon);
// 位置移动
// MapUtl.makerList[0].setPosition([103.55, 30.342]);
// var m = MapUtl.amap;
// var newIcon = new m.Icon({
// image: "//a.amap.com/jsapi_demos/static/demo-center/icons/dir-marker.png", //Icon 的图像
// size: new m.Size(25, 34), // 图标大小
// anchor: new m.Pixel(12, 32), // 图标锚点
// });
// MapUtl.makerList[0].setIcon(newIcon);
// };
return (
@ -96,6 +96,8 @@ const HomeLeft = () => {
width={"80%"}
open={isModalOpen}
afterClose={() => {}}
okText="确定"
cancelText="取消"
onOk={() => {}}
onCancel={() => {
setIsModalOpen(false);

4
src/pages/home/homeLeft/orgin.tsx
View File

@ -29,11 +29,13 @@ const Orgin = () => {
title={"组织架构"}
className="owner_model"
width={"80%"}
okText="确定"
cancelText="取消"
open={isModalOpen}
onCancel={handleCancel}
footer={null}
>
<OrgChart />
<OrgChart />
</Modal>
</>
);

4
src/pages/home/homeLeft/pover.tsx
View File

@ -35,9 +35,7 @@ const Pover = () => {
type: "bar",
barWidth: 10, // 设置柱子粗细
itemStyle: {
normal: {
barBorderRadius: [5, 5, 0, 0],
},
borderRadius: [5, 5, 0, 0],
},
},
],

9
src/pages/leaveApproval/level.tsx
View File

@ -33,7 +33,7 @@ const Leave = (props: Store) => {
leaveStore.access(record.id, { status: 1 });
};
const column_widget = (any, record) => {
if (record.status===0){
if (record.status === 0) {
return (
<Space wrap>
<Button
@ -58,7 +58,6 @@ const Leave = (props: Store) => {
);
}
return <div></div>;
};
return (
<>
@ -70,9 +69,9 @@ const Leave = (props: Store) => {
title: "操作",
dataIndex: "id",
ellipsis: {
showTitle: false
showTitle: false,
},
render: (any, record) => column_widget(any, record)
render: (any, record) => column_widget(any, record),
},
]}
dataSource={leaveStore.list}
@ -86,6 +85,8 @@ const Leave = (props: Store) => {
onCancel={() => {
setIsModalOpen(false);
}}
okText="确定"
cancelText="取消"
>
<SimpleForm
formRef={formRef}

6
src/pages/leaveApproval/levelCat.tsx
View File

@ -6,7 +6,7 @@ import { Store } from "antd/lib/form/interface";
import SimpleForm from "@/components/form/simple_form";
import React from "react";
import { columns, defaultCatConfig } from "./levcat_column";
const LeaveCat = (props: Store) => {
const { leaveCategoryStore } = props;
const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
@ -50,7 +50,7 @@ const LeaveCat = (props: Store) => {
const onFinish = (values: any) => {
let data = {
...values,
pid:values.pid??0
pid: values.pid ?? 0,
};
if (!record?.id) {
leaveCategoryStore.add(data);
@ -97,6 +97,8 @@ const LeaveCat = (props: Store) => {
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setIsModalOpen(false);
}}

2
src/pages/materialMgmt/material.tsx
View File

@ -126,6 +126,8 @@ const Material = (props: Store) => {
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setIsModalOpen(false);
}}

6
src/pages/materialMgmt/materialCat.tsx
View File

@ -6,7 +6,7 @@ import { Store } from "antd/lib/form/interface";
import SimpleForm from "@/components/form/simple_form";
import React from "react";
import { columns, defaultConfig } from "./mcat_column";
const MaterialCat = (props: Store) => {
const { materialCatStore } = props;
const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
@ -50,7 +50,7 @@ const MaterialCat = (props: Store) => {
const onFinish = (values: any) => {
let data = {
...values,
pid:values.pid??0
pid: values.pid ?? 0,
};
if (!record?.id) {
materialCatStore.add(data);
@ -97,6 +97,8 @@ const MaterialCat = (props: Store) => {
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setIsModalOpen(false);
}}

2
src/pages/patrol/index.tsx
View File

@ -197,6 +197,8 @@ const Patrol = (props: Store) => {
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setId(null);
setIsModalOpen(false);

4
src/pages/persMgmt/index.tsx
View File

@ -6,7 +6,7 @@ import { Store } from "antd/lib/form/interface";
import SimpleForm from "@/components/form/simple_form";
import React from "react";
import { columns, defaultConfig } from "./pers_column";
const PersMgmt = (props: Store) => {
const { persMgmtStore } = props;
const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
@ -98,6 +98,8 @@ const PersMgmt = (props: Store) => {
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setIsModalOpen(false);
}}

2
src/pages/polRegulations/regulations.tsx
View File

@ -111,6 +111,8 @@ const Regulations = (props: Store) => {
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setIsModalOpen(false);
}}

8
src/pages/polRegulations/regulationsCat.tsx
View File

@ -73,7 +73,7 @@ const RegulationsCat = (props: Store) => {
setIsModalOpen(true);
}}
>
添加物资分类
添加类别
</Button>
</Space>
<BTable
@ -92,11 +92,13 @@ const RegulationsCat = (props: Store) => {
dataSource={regulationsCatStore.list}
/>
<Modal
title={!record?.id ? "添加个人属性" : "编辑个人属性"}
width={1200}
title={!record?.id ? "添加分类" : "编辑分类"}
width={600}
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setIsModalOpen(false);
}}

10
src/pages/politicalStudy/index.tsx
View File

@ -50,15 +50,15 @@ const PoliticalStudy = (props: Store) => {
const onFinish = (values: any) => {
let data = {
...values,
score:Number(values.score)
}
if (values.file_url){
score: Number(values.score),
};
if (values.file_url) {
data.file_url = values.file_url[0].url;
}
if (!record?.id) {
politicalStudyStore.add(data);
} else {
politicalStudyStore.putItem(record.id,data);
politicalStudyStore.putItem(record.id, data);
}
setIsModalOpen(false);
};
@ -100,6 +100,8 @@ const PoliticalStudy = (props: Store) => {
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setIsModalOpen(false);
}}

25
src/pages/storage/index.tsx
View File

@ -22,8 +22,23 @@ const Storage = (props: Store) => {
const column_widget = (any, record) => {
return (
<Space wrap>
<Button type="dashed" size="small" onClick={() => {edit(record)}}>编辑</Button>
<Button type="dashed" danger size="small" onClick={() => {storageStore.deleteItem(record.id)}}>
<Button
type="dashed"
size="small"
onClick={() => {
edit(record);
}}
>
编辑
</Button>
<Button
type="dashed"
danger
size="small"
onClick={() => {
storageStore.deleteItem(record.id);
}}
>
删除
</Button>
</Space>
@ -40,9 +55,9 @@ const Storage = (props: Store) => {
stash_identity: id,
};
if (!record?.id) {
storageStore.add(data,{stash_identity:id});
storageStore.add(data, { stash_identity: id });
} else {
storageStore.putItem(record.id, data,{stash_identity:id});
storageStore.putItem(record.id, data, { stash_identity: id });
}
setIsModalOpen(false);
};
@ -84,6 +99,8 @@ const Storage = (props: Store) => {
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setIsModalOpen(false);
}}

14
src/pages/tag/tag.tsx
View File

@ -25,7 +25,15 @@ const Tag = (props: Store) => {
<div>
<Space direction="vertical">
<Space wrap>
<Button type="dashed" size="small" onClick={() => {edit(record);}}>编辑</Button>
<Button
type="dashed"
size="small"
onClick={() => {
edit(record);
}}
>
编辑
</Button>
<Button
type="dashed"
danger
@ -57,7 +65,7 @@ const Tag = (props: Store) => {
if (!tagId) {
tagStore.add(values);
} else {
tagStore.putItem(tagId,values);
tagStore.putItem(tagId, values);
}
setIsModalOpen(false);
};
@ -104,6 +112,8 @@ const Tag = (props: Store) => {
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setId(null);
setIsModalOpen(false);

2
src/pages/teamMgmt/index.tsx
View File

@ -98,6 +98,8 @@ const TeamMgmt = (props: Store) => {
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setIsModalOpen(false);
}}

4
src/pages/training/training.tsx
View File

@ -161,6 +161,8 @@ const Trainings = (props: Store) => {
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setId(null);
setIsModalOpen(false);
@ -209,7 +211,7 @@ const Trainings = (props: Store) => {
setIsModalOpenUser(false);
}}
>
<TraningUser/>
<TraningUser />
</Modal>
</Space>
</div>

15
src/pages/training/trainingCat.tsx
View File

@ -7,7 +7,6 @@
// };
// export default TrainingCat;
import { Button, Space, Modal, FormInstance } from "antd";
import { inject, observer } from "mobx-react";
import type { ColumnsType } from "antd/es/table";
@ -48,7 +47,7 @@ const TrainingCat = (props: Store) => {
danger
size="small"
onClick={() => {
dele(record)
dele(record);
}}
>
删除
@ -57,12 +56,12 @@ const TrainingCat = (props: Store) => {
),
},
];
const dele = (record)=>{
const dele = (record) => {
trainingCatStore.deleteItem(record.identity);
}
};
const edit = (record) => {
setProjectConfig(defaultConfig);
setIsModalOpen(true);
formRef.current?.setFieldsValue(record);
setRecord(record);
@ -122,11 +121,13 @@ const TrainingCat = (props: Store) => {
dataSource={trainingCatStore.list}
/>
<Modal
title={!tagId ? "任务发布" : "任务编辑"}
width={1200}
title={!tagId ? "添加分类" : "分类编辑"}
width={600}
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setId(null);
setIsModalOpen(false);

8
src/pages/training/traningUser.tsx
View File

@ -26,9 +26,9 @@ const TraningUser = (props: Store) => {
});
}
let res = trainingStore.setUserScore(arr);
if (res){
message.success("积分设置成功")
setIsModalOpenUser(false);
if (res) {
message.success("积分设置成功");
setIsModalOpenUser(false);
}
};
const _columns: ColumnsType<UserDataType> = [
@ -74,6 +74,8 @@ const TraningUser = (props: Store) => {
width={300}
open={isModalOpenUser}
onOk={() => okhandler()}
okText="确定"
cancelText="取消"
afterClose={() => setKeys([])}
onCancel={() => {
setIsModalOpenUser(false);

6
src/pages/user/user.tsx
View File

@ -89,9 +89,9 @@ const User = (props: Store) => {
{
title: "操作",
dataIndex: "id",
fixed: 'right',
fixed: "right",
ellipsis: { showTitle: false },
render: (any, record)=>actionWidget(any, record),
render: (any, record) => actionWidget(any, record),
},
]}
dataSource={usrStore.list}
@ -102,6 +102,8 @@ const User = (props: Store) => {
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setId(null);
setIsModalOpen(false);

2
src/pages/whseMgmt/index.tsx
View File

@ -107,6 +107,8 @@ const WhseMgmt = (props: Store) => {
open={isModalOpen}
afterClose={() => formRef.current?.resetFields()}
onOk={() => formRef.current?.submit()}
okText="确定"
cancelText="取消"
onCancel={() => {
setIsModalOpen(false);
}}