From bf8ae5458507d8d7aa2a4dfc30c6d505722c0623 Mon Sep 17 00:00:00 2001 From: wang_yp <357754663@qq.com> Date: Tue, 18 Mar 2025 23:59:00 +0800 Subject: [PATCH] fix(staff) --- README.md | 18 +- package.json | 2 +- src/components/form/featch_select.tsx | 3 +- src/pages/home/homeBottom/bot.less | 1 + src/pages/home/homeBottom/ec.tsx | 21 +- src/pages/home/homeBottom/which_video.tsx | 1 + src/pages/home/homeLeft/turn.tsx | 67 +++-- src/pages/home/homeRigrt/ac.tsx | 6 +- src/pages/home/homeRigrt/kanban.less | 3 +- src/pages/home/homeRigrt/kanban.tsx | 271 ++++++++------------- src/pages/materialMgmt/material.tsx | 2 +- src/pages/materialMgmt/material_column.tsx | 1 + src/pages/poverPage/index.tsx | 135 +++++----- src/pages/poverPage/pv.less | 1 - src/pages/signin/column.tsx | 23 +- src/pages/user/user_config.tsx | 36 ++- src/store/home.ts | 4 + 17 files changed, 279 insertions(+), 316 deletions(-) diff --git a/README.md b/README.md index 3708155..69dcd47 100644 --- a/README.md +++ b/README.md @@ -43,20 +43,4 @@ You don’t have to ever use `eject`. The curated feature set is suitable for sm You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). -To learn React, check out the [React documentation](https://reactjs.org/). -添加的数据 - -1、队伍属性管理 添加队伍 -2、个人身份管理 添加身份 -3、组织架构通过部门来组织 - - -首页： -1、组织架构 用户数量统计，党员数量统计 -2、武装力量 根据队伍统计 -3、年度训练 按照年度统计类别，次数 (任务发布时，可选择多个类别) - -4、物资管理 -5、档案管理 - -6、评优争先 \ No newline at end of file +To learn React, check out the [React documentation](https://reactjs.org/). \ No newline at end of file diff --git a/package.json b/package.json index a88a462..f0db4ab 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "build": "node scripts/build.js", "test": "node scripts/test.js" }, - "proxy":"https://www.hswzct.cn:12016", + "proxy":"http://127.0.0.1:12214", "eslintConfig": { "extends": [ "react-app", diff --git a/src/components/form/featch_select.tsx b/src/components/form/featch_select.tsx index db520df..0b7c02b 100644 --- a/src/components/form/featch_select.tsx +++ b/src/components/form/featch_select.tsx @@ -14,6 +14,7 @@ const DebounceSelect = < key?: string; label: React.ReactNode; value: string | number; + head_img?: string; } = any >({ fetchOptions, @@ -35,7 +36,6 @@ const DebounceSelect = < if (fetchId !== fetchRef.current) { return; } - setOptions(newOptions); setFetching(false); }); @@ -51,7 +51,6 @@ const DebounceSelect = < onSearch={debounceFetcher} notFoundContent={fetching ? : null} {...props} - options={options} /> ); diff --git a/src/pages/home/homeBottom/bot.less b/src/pages/home/homeBottom/bot.less index 653ee6d..a5b7ae2 100644 --- a/src/pages/home/homeBottom/bot.less +++ b/src/pages/home/homeBottom/bot.less @@ -95,6 +95,7 @@ .ec_right_end{ position: absolute; left: 0; + cursor: pointer; right: 0; bottom: 20px; color: #fff; diff --git a/src/pages/home/homeBottom/ec.tsx b/src/pages/home/homeBottom/ec.tsx index 407ac91..6890584 100644 --- a/src/pages/home/homeBottom/ec.tsx +++ b/src/pages/home/homeBottom/ec.tsx @@ -1,4 +1,4 @@ -import { Modal } from "antd"; +import { Modal, Space } from "antd"; import { Store } from "antd/es/form/interface"; import { inject, observer } from "mobx-react"; import { useState } from "react"; @@ -9,6 +9,10 @@ import DebounceSelect from "@/components/form/featch_select"; interface UserValue { label: string; value: string; + head_img: string; + age: number; + grid_letter_user: number; + pos_held: string; } const Ec = (props: Store) => { const [isModalOpen, setIsModalOpen] = useState(false); @@ -27,6 +31,8 @@ const Ec = (props: Store) => { return res.data.record.map((item) => ({ label: item.user_name, value: item.identity, + identity: item.identity, + head_img:item.head_img, })); }); } @@ -60,13 +66,18 @@ const Ec = (props: Store) => { onChange={(newValue) => { setValue(newValue as UserValue[]); }} + optionRender={(item:any) => { + return + {item.label} + + + }} style={{ width: "100%" }} /> -

{value.map((item: any) => { return (
-
姓名：{item.label} : 未在线
+
姓名：{item.label}
点击呼叫： {
- + > */}