diff --git a/.umirc.ts b/.umirc.ts index bc06f58..15e5799 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -2,7 +2,7 @@ * @Author: Chengliang 1546584672@qq.com * @Date: 2022-08-04 10:22:55 * @LastEditors: Chengliang 1546584672@qq.com - * @LastEditTime: 2022-09-06 16:46:56 + * @LastEditTime: 2022-12-01 11:53:26 * @FilePath: /org-chart-frant/.umirc.ts * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -26,7 +26,7 @@ export default defineConfig({ proxy: { '/api': { // 标识需要进行转换的请求的url - target: 'http://221.226.25.34:8088/api', // 服务端域名 / http://localhost:8686 + target: 'http://192.168.1.67:9002', // 服务端域名 / http://localhost:8686 changeOrigin: true, // 允许域名进行转换 pathRewrite: { '^/api': '' }, // 将请求url里的ci去掉 }, diff --git a/src/components/topBar/index.jsx b/src/components/topBar/index.jsx index ad49ddd..0df8a85 100644 --- a/src/components/topBar/index.jsx +++ b/src/components/topBar/index.jsx @@ -22,6 +22,7 @@ export class TopBar extends React.Component { this.state = { fclasslist: [], companylist: [], + deptartmentList: [], requestData: { date: moment(new Date()).format('YYYY-MM-DD'), fclass: '0', @@ -33,6 +34,7 @@ export class TopBar extends React.Component { } handleFormChange(payload) { + debugger; let requestData = { ...this.state.requestData, ...payload }; this.setState({ requestData }); } diff --git a/src/pages/company.jsx b/src/pages/company.jsx index 6046a12..926f162 100644 --- a/src/pages/company.jsx +++ b/src/pages/company.jsx @@ -17,7 +17,7 @@ export default function companyPage() { let orgChart = null; let topBarSearchRequest = null; - const [hasRight, setHasRight] = useState(''); + const [hasRight, setHasRight] = useState('true'); // 点击节点 function onNodeClick(nodeId) { @@ -90,7 +90,7 @@ export default function companyPage() { moment(new Date()).format('YYYY-MM-DD'), ).then((data) => { setData(data.data); - setHasRight(data?.hasRight); + //setHasRight(data?.hasRight); }); }, [true]); diff --git a/src/pages/user.jsx b/src/pages/user.jsx index 44b4394..497cff3 100644 --- a/src/pages/user.jsx +++ b/src/pages/user.jsx @@ -24,7 +24,7 @@ export default function userPage() { let orgChart = null; let progressBtnRef = null; - const [hasRight, setHasRight] = useState(''); + const [hasRight, setHasRight] = useState('true'); // 点击节点 function onNodeClick(nodeId) { @@ -94,7 +94,7 @@ export default function userPage() { moment(new Date()).format('YYYY-MM-DD'), ).then((data) => { setData(data.data); - setHasRight(data?.hasRight); + //setHasRight(data?.hasRight); }); }, [true]);