diff --git a/.umirc.ts b/.umirc.ts index 4d7dd26..6e46cf4 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -2,7 +2,7 @@ * @Author: Chengliang 1546584672@qq.com * @Date: 2023-08-16 11:22:18 * @LastEditors: Chengliang 1546584672@qq.com - * @LastEditTime: 2023-08-17 13:59:41 + * @LastEditTime: 2023-08-24 15:58:29 * @FilePath: /org-chart-frant/.umirc.ts * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -27,7 +27,7 @@ export default defineConfig({ proxy: { '/api': { // 标识需要进行转换的请求的url - target: 'http://127.0.0.1:8686/api', // 服务端域名 / http://localhost:8686 + target: 'http://127.0.0.1:8686/api', // 服务端域名 //target: 'http://221.226.25.34:11080/api', changeOrigin: true, // 允许域名进行转换 pathRewrite: { '^/api': '' }, // 将请求url里的ci去掉 diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..f6bce9c Binary files /dev/null and b/dist.zip differ diff --git a/src/components/drawer/index.jsx b/src/components/drawer/index.jsx index 789c545..e102ee1 100644 --- a/src/components/drawer/index.jsx +++ b/src/components/drawer/index.jsx @@ -181,8 +181,8 @@ export default class DrawerComponents extends React.Component { 工号: dataSource[i].workCode, 姓名: dataSource[i].lastName, 性别: dataSource[i].sex, - 部门: dataSource[i].departmentId, - 分部: dataSource[i].subcompanyid1, + 部门: dataSource[i].departmentName, + 分部: dataSource[i].subcompanyName, 岗位: dataSource[i].jobTitle, 手机号: dataSource[i].mobile, }; diff --git a/src/pages/dragTree.jsx b/src/pages/dragTree.jsx index c403c27..ba718fb 100644 --- a/src/pages/dragTree.jsx +++ b/src/pages/dragTree.jsx @@ -194,6 +194,7 @@ const DragTree = () => { * @param {*} nodeData */ const onCancel = (nodeData) => { + setShowCanceled(0); const extend = nodeData.type == '1' ? 'comp' : 'dept'; fetch(`/api/bs/hrmorganization/${extend}/updateForbiddenTagById`, { method: 'POST', @@ -209,11 +210,18 @@ const DragTree = () => { .then((res) => { if (res.code == 200) { const data = [...gData]; - loop(data, nodeData.key, (item, index, arr) => { - arr.splice(index, 1); - }); + if (nodeData.canceled != '0') { + message.success('恢复成功', 2); + loop(data, nodeData.key, (item, index, arr) => { + arr[index].canceled = '0'; + }); + } else { + loop(data, nodeData.key, (item, index, arr) => { + arr.splice(index, 1); + }); + message.success('封存成功', 2); + } setGData(data); - message.success('封存成功', 2); } else { message.warning(res.msg, 2); } diff --git a/src/pages/user.jsx b/src/pages/user.jsx index 9d8658a..3955f2f 100644 --- a/src/pages/user.jsx +++ b/src/pages/user.jsx @@ -99,9 +99,8 @@ export default function userPage() { // 获取数据 useEffect(() => { document.cookie = - 'ecology_JSessionid=aaaO70i_jp5alhVYlecOy; JSESSIONID=aaaO70i_jp5alhVYlecOy; __randcode__=0c210b8f-0f12-4d02-bd51-6aece5794350; Systemlanguid=7; languageidweaver=7; loginidweaver=sysadmin; loginuuids=1'; + 'ecology_JSessionid=aaaX333ODS20gePpBTCOy; JSESSIONID=aaaX333ODS20gePpBTCOy; Systemlanguid=7; languageidweaver=7; loginuuids=1; loginidweaver=sysadmin; __randcode__=6359f5f6-7958-4201-8982-fdc38c5348b7'; d3.json( - // "/user/data" '/api/bs/hrmorganization/orgchart/userData?fclass=0&fisvitual=0&root=0&level=3&id=0', ).then((data) => { setData(data.data);