From a4a94889786392638d2f14fb5ae3e35346dcf716 Mon Sep 17 00:00:00 2001 From: "853931625@qq.com" Date: Thu, 25 Dec 2025 13:35:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E5=8A=A0=E5=AF=86=E5=90=8E=E5=88=A4=E9=87=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jjb.config.js | 9 +++--- .../ChangeView/index.js | 4 +-- .../EnterpriseMiddleground/List/index.js | 4 ++- .../Enterprise/OrganizationStructure/index.js | 2 +- src/pages/Container/Enterprise/Post/index.js | 2 +- .../Container/Enterprise/User/Add/index.js | 2 +- .../Container/Enterprise/User/List/index.js | 10 ++++--- .../Container/Stakeholder/Department/index.js | 2 +- .../Container/Stakeholder/User/Add/index.js | 2 +- .../Container/Stakeholder/User/List/index.js | 13 +++++---- .../User/ResignationReview/index.js | 1 + .../SubsidiaryUser/UserList/index.js | 15 ++++++---- .../ChangeView/index.js | 1 + .../Supervision/Department/index.js | 2 +- .../Supervision/Supervision/Post/index.js | 2 +- .../Supervision/Supervision/User/Add/index.js | 28 ++++++++++--------- .../Supervision/User/List/index.js | 6 ++-- 17 files changed, 61 insertions(+), 44 deletions(-) diff --git a/jjb.config.js b/jjb.config.js index 29c1ba6..5420460 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -11,6 +11,7 @@ module.exports = { // 接口服务地址 API_HOST: "http://192.168.20.100:30140", + // API_HOST: "https://gbs-gateway.qhdsafety.com", }, production: { // 应用后端分支名称，部署上线需要 @@ -26,8 +27,8 @@ module.exports = { contextInject: { // 应用Key appKey: "", - fileUrl: "http://192.168.20.240:9787/mnt/", - // fileUrl: "https://jpfz.qhdsafety.com/gbsFileTest/", + // fileUrl: "http://192.168.20.240:9787/mnt/", + fileUrl: "https://jpfz.qhdsafety.com/gbsFileTest/", }, // public/index.html注入全局变量 windowInject: { @@ -42,9 +43,7 @@ module.exports = { }, }, // 注入js链接集合 - scripts: [ - "https://api.map.baidu.com/api?v=1.0&type=webgl&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr", - ], + scripts: [], }, // 开发服务 server: { diff --git a/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js b/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js index 8035f68..a965625 100644 --- a/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js +++ b/src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js @@ -13,10 +13,9 @@ function ChangeView(props) { useEffect(() => { props["getChangerRecordInfoById"]({ corpinfoId: queryParams["corpinfoId"], userId: queryParams["id"] }).then((res) => { - if(res.data){ + if (res.data) { setInfo(res.data); } - }); }, []); @@ -140,6 +139,7 @@ function ChangeView(props) { /> {queryParams["type"] === "disposal" ? "未完成工作" : "工作交接"} @@ -57,7 +59,7 @@ function List(props) { borderRight: "10px solid #f1f1f2", paddingRight: "10px", marginRight: "10px", - height: "100vh", + height: "calc(100dvh - 112px)", }} > diff --git a/src/pages/Container/Enterprise/OrganizationStructure/index.js b/src/pages/Container/Enterprise/OrganizationStructure/index.js index 22c7aaf..ecd3d6d 100644 --- a/src/pages/Container/Enterprise/OrganizationStructure/index.js +++ b/src/pages/Container/Enterprise/OrganizationStructure/index.js @@ -108,7 +108,7 @@ function OrganizationStructure(props) { borderRight: "10px solid #f1f1f2", paddingRight: "10px", marginRight: "10px", - height: "100vh", + height: "calc(100dvh - 112px)", }} > diff --git a/src/pages/Container/Enterprise/Post/index.js b/src/pages/Container/Enterprise/Post/index.js index 4b78670..7ca0906 100644 --- a/src/pages/Container/Enterprise/Post/index.js +++ b/src/pages/Container/Enterprise/Post/index.js @@ -69,7 +69,7 @@ function Post(props) { borderRight: "10px solid #f1f1f2", paddingRight: "10px", marginRight: "10px", - height: "100vh", + height: "calc(100dvh - 112px)", }} > diff --git a/src/pages/Container/Enterprise/User/Add/index.js b/src/pages/Container/Enterprise/User/Add/index.js index 96a74ed..8593bca 100644 --- a/src/pages/Container/Enterprise/User/Add/index.js +++ b/src/pages/Container/Enterprise/User/Add/index.js @@ -179,7 +179,7 @@ function Add(props) { return; } props["verifyUser"]({ - userIdCard: debouncedUserIdCard, + userIdCard: btoa(debouncedUserIdCard), id: queryParams["id"] ?? "", }).then((res) => { if (!res.success) { diff --git a/src/pages/Container/Enterprise/User/List/index.js b/src/pages/Container/Enterprise/User/List/index.js index f033e23..9bc6704 100644 --- a/src/pages/Container/Enterprise/User/List/index.js +++ b/src/pages/Container/Enterprise/User/List/index.js @@ -40,6 +40,7 @@ function List(props) { const { downloadBlob } = useDownloadBlob(); const [selectedRowKeys, setSelectedRowKeys] = useState([]); const { importFile } = useImportFile(); + const [treeKey, setTreeKey] = useState(0); const { tableProps, getData } = useTable(props["userList"], { form, transform: (formData) => { @@ -105,6 +106,7 @@ function List(props) { if (res.success) { message.success("导入成功"); getData(); + setTreeKey(prev => prev + 1); } }); }; @@ -125,10 +127,10 @@ function List(props) { borderRight: "10px solid #f1f1f2", paddingRight: "10px", marginRight: "10px", - height: "100vh", + height: "calc(100dvh - 112px)", }} > - +
@@ -211,11 +213,11 @@ function List(props) { dataIndex: "name", }, { - title: "部门", + title: "所属部门", dataIndex: "departmentName", }, { - title: "岗位", + title: "所属岗位", dataIndex: "postName", }, // { diff --git a/src/pages/Container/Stakeholder/Department/index.js b/src/pages/Container/Stakeholder/Department/index.js index 7c2a71f..be4355f 100644 --- a/src/pages/Container/Stakeholder/Department/index.js +++ b/src/pages/Container/Stakeholder/Department/index.js @@ -123,7 +123,7 @@ function Department(props) { borderRight: "10px solid #f1f1f2", paddingRight: "10px", marginRight: "10px", - height: "100vh", + height: "calc(100dvh - 112px)", }} > diff --git a/src/pages/Container/Stakeholder/User/Add/index.js b/src/pages/Container/Stakeholder/User/Add/index.js index 2cf952c..0ff00a2 100644 --- a/src/pages/Container/Stakeholder/User/Add/index.js +++ b/src/pages/Container/Stakeholder/User/Add/index.js @@ -190,7 +190,7 @@ function Add(props) { return; } props["verifyUser"]({ - userIdCard: debouncedUserIdCard, + userIdCard: btoa(debouncedUserIdCard), id: queryParams["id"] ?? "", }).then((res) => { if (!res.success) { diff --git a/src/pages/Container/Stakeholder/User/List/index.js b/src/pages/Container/Stakeholder/User/List/index.js index f163d4d..f792ca8 100644 --- a/src/pages/Container/Stakeholder/User/List/index.js +++ b/src/pages/Container/Stakeholder/User/List/index.js @@ -91,7 +91,7 @@ function List(props) { borderRight: "10px solid #f1f1f2", paddingRight: "10px", marginRight: "10px", - height: "100vh", + height: "calc(100dvh - 112px)", }} > @@ -105,10 +105,10 @@ function List(props) { name: "likeName", label: "姓名", }, - { - name: "likeUserIdCard", - label: "身份证号", - }, + // { + // name: "likeUserIdCard", + // label: "身份证号", + // }, ]} onFinish={getData} @@ -165,6 +165,7 @@ function List(props) { && (
{queryParams["type"] === "disposal" ? "未完成工作" : "工作交接"}
setDepartmentData(data)} /> diff --git a/src/pages/Container/Supervision/Supervision/Post/index.js b/src/pages/Container/Supervision/Supervision/Post/index.js index 02c0d52..deb8131 100644 --- a/src/pages/Container/Supervision/Supervision/Post/index.js +++ b/src/pages/Container/Supervision/Supervision/Post/index.js @@ -65,7 +65,7 @@ function Post(props) { borderRight: "10px solid #f1f1f2", paddingRight: "10px", marginRight: "10px", - height: "100vh", + height: "calc(100dvh - 112px)", }} > diff --git a/src/pages/Container/Supervision/Supervision/User/Add/index.js b/src/pages/Container/Supervision/Supervision/User/Add/index.js index 8e346f0..a83c083 100644 --- a/src/pages/Container/Supervision/Supervision/User/Add/index.js +++ b/src/pages/Container/Supervision/Supervision/User/Add/index.js @@ -55,6 +55,18 @@ function Add(props) { const debouncedUsernameValue = useDebounce(usernameValue, 600); const debouncedPhoneValueValue = useDebounce(phoneValue, 600); + const fnChoiceDepartment = async (event) => { + form.setFieldsValue({ + postId: undefined, + }); + // setDepartmentName(event[0].name) + props["postAll"]({ + corpFlag: 1, + departmentId: event[event.length - 1].id, + }).then((res) => { + setPostData(res.data); + }); + }; // const { loading: getFileLoading, getFile } = useGetFile(); const { loading: uploadFileLoading, uploadFile } = useUploadFile(); useEffect(() => { @@ -152,18 +164,7 @@ function Add(props) { }); } }; - const fnChoiceDepartment = async (event) => { - form.setFieldsValue({ - postId: undefined, - }); - // setDepartmentName(event[0].name) - props["postAll"]({ - corpFlag: 1, - departmentId: event[event.length - 1].id, - }).then((res) => { - setPostData(res.data); - }); - }; + // 校验身份证重复 useEffect(() => { if (!debouncedUserIdCard) { @@ -175,8 +176,9 @@ function Add(props) { ]); return; } + props["verifyUser"]({ - userIdCard: debouncedUserIdCard, + userIdCard: btoa(debouncedUserIdCard), id: queryParams["id"] ?? "", }).then((res) => { if (!res.success) { diff --git a/src/pages/Container/Supervision/Supervision/User/List/index.js b/src/pages/Container/Supervision/Supervision/User/List/index.js index 7144d3e..cc8dbb3 100644 --- a/src/pages/Container/Supervision/Supervision/User/List/index.js +++ b/src/pages/Container/Supervision/Supervision/User/List/index.js @@ -32,6 +32,7 @@ function List(props) { const [rolesData, setRolesData] = useState([]); const { downloadBlob } = useDownloadBlob(); const { importFile } = useImportFile(); + const [treeKey, setTreeKey] = useState(0); const [form] = Form.useForm(); const { tableProps, getData } = useTable(props["userList"], { form, @@ -104,6 +105,7 @@ function List(props) { if (res.success) { message.success("导入成功"); getData(); + setTreeKey(prev => prev + 1); } }); // message.success("导入成功"); @@ -124,10 +126,10 @@ function List(props) { borderRight: "10px solid #f1f1f2", paddingRight: "10px", marginRight: "10px", - height: "100vh", + height: "calc(100dvh - 112px)", }} > - +