diff --git a/web/client/src/app.js b/web/client/src/app.js
index edef086..9e47938 100644
--- a/web/client/src/app.js
+++ b/web/client/src/app.js
@@ -1,6 +1,6 @@
import React, { useEffect } from 'react';
import {
- Auth, AlarmConfure, Article, Party
+ Auth, AlarmConfure, Article, Party,Personnel
} from './sections';
import Layout from './layout';
@@ -19,7 +19,7 @@ function App(props) {
return (
);
}
diff --git a/web/client/src/index.js b/web/client/src/index.js
index 824a005..442a180 100644
--- a/web/client/src/index.js
+++ b/web/client/src/index.js
@@ -4,4 +4,4 @@ import {
} from 'react-dom';
import App from './app';
-render((), document.getElementById('App'));
+render((), document.getElementById('App'));
diff --git a/web/client/src/layout/components/header/index.js b/web/client/src/layout/components/header/index.js
index 864dc6a..71ae3e8 100644
--- a/web/client/src/layout/components/header/index.js
+++ b/web/client/src/layout/components/header/index.js
@@ -61,7 +61,7 @@ function Header(props) {
{/*
*/}
- 党建工会后台管理
+ 研发看板后台管理
下载模板后填写完整后上传
+
+ {
+ setMsg('')
+ setPostData([])
+ const extNames = file.name.split('.');
+ let isDAE = false;
+ if (extNames.length > 0) {
+ let fileType = extNames[extNames.length - 1].toLowerCase();
+ isDAE = ['xlsx', 'xls'].some((f) => f == fileType);
+ }
+ if (!isDAE) {
+ setMsg(`只能上传 ${['xlsx', 'xls'].join()} 格式的文件!`);
+ return false;
+ }
+ },
+ onChange(info) {
+
+ },
+ customRequest: async (data) => {
+ const { file, onSuccess, onError } = data
+
+ const reader = new FileReader(); // 使用 FileReader 读取数据
+ reader.onload = function (e) { // 数据读取完成后的回调函数
+ const data = new Uint8Array(e.target.result);
+ const workbook = XLSX.read(data, { type: 'array' }); // workbook 是 xlsx 解析 excel 后返回的对象
+
+ const firstSheetName = workbook.SheetNames[0]; // 获取第一个 sheet 的名字
+ const worksheet = workbook.Sheets[firstSheetName]; // 获取第一个 sheet 的内容
+ const res = XLSX.utils.sheet_to_json(worksheet); // 使用 utils 里的方法转换内容为便于使用的数组
+ const error = (msg) => {
+ setMsg(msg)
+ onError({ message: msg })
+ }
+ if (res.length > 1000) {
+ error('一次性上传数据行数应小于1000行，请分批上传')
+ return
+ }
+ if (!res.length) {
+ error('请填写至少一行数据')
+ return
+ }
+ let postData = []
+ const pattern = /^1[3|4|5|6|7|8|9]\d{9}$/
+ for (let i = 0; i < res.length; i++) {
+ let d = res[i]
+ let name = String(d['姓名']).trim();
+ let phone = String(d['手机号码']).trim();
+ let account = String(d['账号']).trim();
+ let peopleCode = d['人员编号'] && String(d['人员编号']).trim();
+ if (!name || !phone || !account || !peopleCode) {
+ error(`第${i + 1} 行有空值，请填写后重新上传`)
+ return
+ }
+ if (!pattern.test(phone)) {
+ error(`第${i + 1} 行手机号码错误`)
+ return
+ }
+ if (name.length > 128 || account.length > 128) {
+ error(`第${i + 1} 行数据字符长度大于 128，请更改后重新上传`)
+ return
+ }
+ if (postData.some(p => p.account == account)) {
+ error(`第${i + 1} 行账号重复，请更改后重新上传`)
+ return
+ }
+ postData.push({
+ name, phone, account, peopleCode
+ })
+ }
+ if (postData.length) {
+ setPostData(postData)
+ }
+ let msg = '文件解析完成，点击确定按钮上传保存！'
+ setMsg(msg)
+ onSuccess({ message: msg })
+ };
+ reader.readAsArrayBuffer(file); // 读取数据
+ },
+ }}>
+
+
+
+ {msg}
+
+
+ )
+}
+
+function mapStateToProps(state) {
+ const { auth, customizeList } = state;
+ return {
+ user: auth.user,
+ }
+}
+
+
+export default connect(mapStateToProps)(ImportUser);
\ No newline at end of file
diff --git a/web/client/src/sections/article/components/modeal.js b/web/client/src/sections/article/components/modeal.js
new file mode 100644
index 0000000..53e5c41
--- /dev/null
+++ b/web/client/src/sections/article/components/modeal.js
@@ -0,0 +1,96 @@
+import React,{useState,useEffect} from 'react'
+import { Modal, Form, Input, Button,DatePicker,Select } from 'antd'
+import dayjs from 'dayjs';
+function modeal(props) {
+ const [form] = Form.useForm();
+ const { visible, handleOk, handleCancel, editData } = props
+ console.log(editData)
+ useEffect(() => {
+ if (editData && visible) {
+ form.setFieldsValue({
+ name_project: editData.name_project,
+ part_people: editData.part_people,
+ build_time: dayjs(editData?.build_time),
+ publish_time: dayjs(editData.publish_time),
+ progress:editData.progress
+ })
+ }
+ }, [editData, visible])
+ return (
+
+
+
+ )
+}
+
+export default modeal
\ No newline at end of file
diff --git a/web/client/src/sections/article/containers/index.js b/web/client/src/sections/article/containers/index.js
index 472a88c..a8dc5de 100644
--- a/web/client/src/sections/article/containers/index.js
+++ b/web/client/src/sections/article/containers/index.js
@@ -7,6 +7,8 @@ import Action from "../actions/index";
import moment from "moment";
import { push } from "react-router-redux";
import { Scroller } from "$components";
+import ProjectModeal from '../components/modeal'
+import ImportModeal from '../components/import_model'
export const Default = (props) => {
const { dispatch } = props;
@@ -14,60 +16,56 @@ export const Default = (props) => {
const [state, setState] = useState(); //状态
const [day, setDay] = useState(); //发布时间
const [counts, setCounts] = useState(); //数据
+ const [visible, setVisible] = useState(false); //弹窗
+ const [editData, setEditData] = useState(); //数据
+ const [importVisible, setImportVisible] = useState(false); //弹窗
+
const tableActionRef = useRef();
+ const dataSore = [{ name_project: '企服v1.0.1', part_people: '投入研发3、测试1', build_time: new Date( ), publish_time: new Date( ), progress: '研发中' }]
const columns = [
{
title: "项目计划",
- dataIndex: "name",
- key: "name",
+ dataIndex: "name_project",
+ key: "name_project",
hideInSearch: true,
render: (dom, record) => {
- return record.title;
+ return record.name_project;
},
},
{
title: "投入人力",
key: "category",
- dataIndex: "category",
+ dataIndex: "part_people",
hideInSearch: true,
render: (dom, record) => {
- return record.type === 0
- ? "活动风采"
- : record.type === 1
- ? "党建资讯"
- : "工会资讯";
+ return record.part_people
},
},
{
title: "构建时间",
- key: "since",
- dataIndex: "createdAt",
+ key: "build_time",
+ dataIndex: "build_time",
hideInSearch: true,
render: (dom, record) => {
- return record.publisher === null ? "SuperAdmin" : record.publisher;
+ return moment(record.build_time).format('YYYY-MM-DD')
},
},
{
title: "发布时间",
- key: "dateRange",
- dataIndex: "createdAtRange",
+ key: "publish_time",
+ dataIndex: "publish_time",
hideInSearch: true,
render: (dom, record) => {
- return record.publisher === null ? "SuperAdmin" : record.publisher;
+ return moment(record.publish_time).format('YYYY-MM-DD')
},
},
{
title: "目前进度",
- dataIndex: "regionName",
- valueType: "select",
+ dataIndex: "progress",
hideInSearch: true,
order: 3,
render: (dom, record) => {
- return record.status === 0
- ? "草稿"
- : record.status === 1
- ? "已发布"
- : "已撤回";
+ return record.progress
},
},
{
@@ -110,7 +108,7 @@ export const Default = (props) => {
type="primary"
style={{ width: "200px" }}
onClick={() => {
- dispatch(push(`article/update/post`));
+ setImportVisible(true)
}}
>
项目信息导入
@@ -119,6 +117,15 @@ export const Default = (props) => {
},
},
];
+ const handleCancel = () => {
+ setVisible(false)
+ }
+ const handOk = () => {
+
+ }
+ const importHandleCancel = () => {
+ setImportVisible(false)
+ }
//删除资讯
const delDataList = (ids, type) => {
dispatch(Action.delDataList(ids)).then((res) => {
@@ -130,8 +137,8 @@ export const Default = (props) => {
};
//编辑
const editor = (record) => {
- dispatch(push(`article/update/put`));
- localStorage.setItem("modifyData", JSON.stringify(record));
+ setVisible(true)
+ setEditData(record)
};
return (
@@ -140,7 +147,7 @@ export const Default = (props) => {
actionRef={tableActionRef}
columns={columns}
options={false}
- dataSource={(counts || {}).data || []}
+ dataSource={dataSore}
search={{
optionRender: false,
collapsed: false,
@@ -173,6 +180,8 @@ export const Default = (props) => {
}}
/>
+
+
下载模板后填写完整后上传
+
+ {
+ setMsg('')
+ setPostData([])
+ const extNames = file.name.split('.');
+ let isDAE = false;
+ if (extNames.length > 0) {
+ let fileType = extNames[extNames.length - 1].toLowerCase();
+ isDAE = ['xlsx', 'xls'].some((f) => f == fileType);
+ }
+ if (!isDAE) {
+ setMsg(`只能上传 ${['xlsx', 'xls'].join()} 格式的文件!`);
+ return false;
+ }
+ },
+ onChange(info) {
+
+ },
+ customRequest: async (data) => {
+ const { file, onSuccess, onError } = data
+
+ const reader = new FileReader(); // 使用 FileReader 读取数据
+ reader.onload = function (e) { // 数据读取完成后的回调函数
+ const data = new Uint8Array(e.target.result);
+ const workbook = XLSX.read(data, { type: 'array' }); // workbook 是 xlsx 解析 excel 后返回的对象
+
+ const firstSheetName = workbook.SheetNames[0]; // 获取第一个 sheet 的名字
+ const worksheet = workbook.Sheets[firstSheetName]; // 获取第一个 sheet 的内容
+ const res = XLSX.utils.sheet_to_json(worksheet); // 使用 utils 里的方法转换内容为便于使用的数组
+ const error = (msg) => {
+ setMsg(msg)
+ onError({ message: msg })
+ }
+ if (res.length > 1000) {
+ error('一次性上传数据行数应小于1000行，请分批上传')
+ return
+ }
+ if (!res.length) {
+ error('请填写至少一行数据')
+ return
+ }
+ let postData = []
+ const pattern = /^1[3|4|5|6|7|8|9]\d{9}$/
+ for (let i = 0; i < res.length; i++) {
+ let d = res[i]
+ let name = String(d['姓名']).trim();
+ let phone = String(d['手机号码']).trim();
+ let account = String(d['账号']).trim();
+ let peopleCode = d['人员编号'] && String(d['人员编号']).trim();
+ if (!name || !phone || !account || !peopleCode) {
+ error(`第${i + 1} 行有空值，请填写后重新上传`)
+ return
+ }
+ if (!pattern.test(phone)) {
+ error(`第${i + 1} 行手机号码错误`)
+ return
+ }
+ if (name.length > 128 || account.length > 128) {
+ error(`第${i + 1} 行数据字符长度大于 128，请更改后重新上传`)
+ return
+ }
+ if (postData.some(p => p.account == account)) {
+ error(`第${i + 1} 行账号重复，请更改后重新上传`)
+ return
+ }
+ postData.push({
+ name, phone, account, peopleCode
+ })
+ }
+ if (postData.length) {
+ setPostData(postData)
+ }
+ let msg = '文件解析完成，点击确定按钮上传保存！'
+ setMsg(msg)
+ onSuccess({ message: msg })
+ };
+ reader.readAsArrayBuffer(file); // 读取数据
+ },
+ }}>
+
+
+
+ {msg}
+
+
+ )
+}
+
+function mapStateToProps(state) {
+ const { auth, customizeList } = state;
+ return {
+ user: auth.user,
+ }
+}
+
+
+export default connect(mapStateToProps)(ImportUser);
\ No newline at end of file
diff --git a/web/client/src/sections/personnel/components/modeal.js b/web/client/src/sections/personnel/components/modeal.js
new file mode 100644
index 0000000..53e5c41
--- /dev/null
+++ b/web/client/src/sections/personnel/components/modeal.js
@@ -0,0 +1,96 @@
+import React,{useState,useEffect} from 'react'
+import { Modal, Form, Input, Button,DatePicker,Select } from 'antd'
+import dayjs from 'dayjs';
+function modeal(props) {
+ const [form] = Form.useForm();
+ const { visible, handleOk, handleCancel, editData } = props
+ console.log(editData)
+ useEffect(() => {
+ if (editData && visible) {
+ form.setFieldsValue({
+ name_project: editData.name_project,
+ part_people: editData.part_people,
+ build_time: dayjs(editData?.build_time),
+ publish_time: dayjs(editData.publish_time),
+ progress:editData.progress
+ })
+ }
+ }, [editData, visible])
+ return (
+
+
+
+ )
+}
+
+export default modeal
\ No newline at end of file
diff --git a/web/client/src/sections/personnel/containers/index.js b/web/client/src/sections/personnel/containers/index.js
new file mode 100644
index 0000000..91d6308
--- /dev/null
+++ b/web/client/src/sections/personnel/containers/index.js
@@ -0,0 +1,186 @@
+import PropTypes from "prop-types";
+import React, { useEffect, useState, useRef } from "react";
+import { connect } from "react-redux";
+import { Button, Popconfirm } from "antd";
+import ProTable from "@ant-design/pro-table";
+import Action from "../actions/index";
+import moment from "moment";
+import { push } from "react-router-redux";
+import { Scroller } from "$components";
+import ProjectModeal from '../components/modeal'
+import ImportModeal from '../components/import_model'
+
+export const Default = (props) => {
+ const { dispatch } = props;
+ const [heading, setHeading] = useState(); //标题
+ const [state, setState] = useState(); //状态
+ const [day, setDay] = useState(); //发布时间
+ const [counts, setCounts] = useState(); //数据
+ const [visible, setVisible] = useState(false); //弹窗
+ const [editData, setEditData] = useState(); //数据
+ const [importVisible, setImportVisible] = useState(false); //弹窗
+
+ const tableActionRef = useRef();
+ const dataSore = [{ name_project: '企服v1.0.1', part_people: '投入研发3、测试1', build_time: new Date( ), publish_time: new Date( ), progress: '研发中' }]
+ const columns = [
+ {
+ title: "人员姓名",
+ dataIndex: "name_project",
+ key: "name_project",
+ hideInSearch: true,
+ render: (dom, record) => {
+ return record.name_project;
+ },
+ },
+ {
+ title: "岗位",
+ key: "category",
+ dataIndex: "part_people",
+ hideInSearch: true,
+ render: (dom, record) => {
+ return record.part_people
+ },
+ },
+ {
+ title: "本周工作计划",
+ key: "build_time",
+ dataIndex: "build_time",
+ hideInSearch: true,
+ render: (dom, record) => {
+ return moment(record.build_time).format('YYYY-MM-DD')
+ },
+ },
+ {
+ title: "操作",
+ key: "since",
+ dataIndex: "createdAt",
+ valueType: "dateTime",
+ hideInSearch: true,
+ render: (dom, record) => {
+ return (
+
+ )
+
+ },
+ },
+ {
+ key: "direction",
+ hideInTable: true,
+ dataIndex: "direction",
+ order: 6,
+ renderFormItem: (item, { type, defaultRender, ...rest }, form) => {
+ return (
+
+ );
+ },
+ },
+ ];
+ const handleCancel = () => {
+ setVisible(false)
+ }
+ const handOk = () => {
+
+ }
+ const importHandleCancel = () => {
+ setImportVisible(false)
+ }
+ //删除资讯
+ const delDataList = (ids, type) => {
+ dispatch(Action.delDataList(ids)).then((res) => {
+ if (res.success) {
+ // 刷新
+ tableActionRef.current.reload();
+ }
+ });
+ };
+ //编辑
+ const editor = (record) => {
+ setVisible(true)
+ setEditData(record)
+ };
+ return (
+
+
+ {
+ let query = {
+ type: -1,
+ searchValue: heading,
+ status: state,
+ page: params.current,
+ limit: params.pageSize,
+ publishTime:
+ day && day.length && day[0].trim() != ""
+ ? JSON.stringify([
+ moment(day[0]).startOf("day"),
+ moment(day[1]).endOf("day"),
+ ])
+ : null,
+ };
+ const res = await dispatch(Action.getDataList(query));
+ setCounts(res.payload.data);
+ return {
+ ...res,
+ total: res.payload.data ? res.payload.data.total : 0,
+ };
+ }}
+ rowKey="id"
+ pagination={{
+ showSizeChanger: true,
+ }}
+ />
+
+
+
+