feature/ecologyChart
Chengliang 3 years ago
parent 8152c798ca
commit e8d142ed5a

@ -2,7 +2,7 @@
* @Author: Chengliang 1546584672@qq.com * @Author: Chengliang 1546584672@qq.com
* @Date: 2022-08-04 10:22:55 * @Date: 2022-08-04 10:22:55
* @LastEditors: Chengliang 1546584672@qq.com * @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 * @FilePath: /org-chart-frant/.umirc.ts
* @Description: ,`customMade`, koroFileHeader : https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: ,`customMade`, koroFileHeader : https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
@ -26,7 +26,7 @@ export default defineConfig({
proxy: { proxy: {
'/api': { '/api': {
// 标识需要进行转换的请求的url // 标识需要进行转换的请求的url
target: 'http://221.226.25.34:8088/api', // 服务端域名 / http://localhost:8686 target: 'http://192.168.1.67:9002', // 服务端域名 / http://localhost:8686
changeOrigin: true, // 允许域名进行转换 changeOrigin: true, // 允许域名进行转换
pathRewrite: { '^/api': '' }, // 将请求url里的ci去掉 pathRewrite: { '^/api': '' }, // 将请求url里的ci去掉
}, },

@ -22,6 +22,7 @@ export class TopBar extends React.Component {
this.state = { this.state = {
fclasslist: [], fclasslist: [],
companylist: [], companylist: [],
deptartmentList: [],
requestData: { requestData: {
date: moment(new Date()).format('YYYY-MM-DD'), date: moment(new Date()).format('YYYY-MM-DD'),
fclass: '0', fclass: '0',
@ -33,6 +34,7 @@ export class TopBar extends React.Component {
} }
handleFormChange(payload) { handleFormChange(payload) {
debugger;
let requestData = { ...this.state.requestData, ...payload }; let requestData = { ...this.state.requestData, ...payload };
this.setState({ requestData }); this.setState({ requestData });
} }

@ -17,7 +17,7 @@ export default function companyPage() {
let orgChart = null; let orgChart = null;
let topBarSearchRequest = null; let topBarSearchRequest = null;
const [hasRight, setHasRight] = useState(''); const [hasRight, setHasRight] = useState('true');
// //
function onNodeClick(nodeId) { function onNodeClick(nodeId) {
@ -90,7 +90,7 @@ export default function companyPage() {
moment(new Date()).format('YYYY-MM-DD'), moment(new Date()).format('YYYY-MM-DD'),
).then((data) => { ).then((data) => {
setData(data.data); setData(data.data);
setHasRight(data?.hasRight); //setHasRight(data?.hasRight);
}); });
}, [true]); }, [true]);

@ -24,7 +24,7 @@ export default function userPage() {
let orgChart = null; let orgChart = null;
let progressBtnRef = null; let progressBtnRef = null;
const [hasRight, setHasRight] = useState(''); const [hasRight, setHasRight] = useState('true');
// //
function onNodeClick(nodeId) { function onNodeClick(nodeId) {
@ -94,7 +94,7 @@ export default function userPage() {
moment(new Date()).format('YYYY-MM-DD'), moment(new Date()).format('YYYY-MM-DD'),
).then((data) => { ).then((data) => {
setData(data.data); setData(data.data);
setHasRight(data?.hasRight); //setHasRight(data?.hasRight);
}); });
}, [true]); }, [true]);

Loading…
Cancel
Save