refactor: Notice 读取userId

feature/price_manager
Lei OT 1 year ago
parent 5b30aec3e5
commit bf8c45033b

@ -1,22 +1,22 @@
import { NavLink, useParams } from 'react-router-dom'; import { NavLink, useParams } from 'react-router-dom';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { Row, Col, Space, Typography, Divider } from 'antd'; import { Row, Col, Space, Typography, Divider } from 'antd';
import { useStore } from '@/stores/StoreContext.js';
import * as comm from '@/utils/commons'; import * as comm from '@/utils/commons';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { fetchNoticeDetail } from '@/stores/Notice'; import { fetchNoticeDetail } from '@/stores/Notice';
import useAuthStore from '@/stores/Auth';
const { Title, Paragraph } = Typography; const { Title, Paragraph } = Typography;
function Detail() { function Detail() {
const { t } = useTranslation(); const { t } = useTranslation();
const { authStore } = useStore();
const { CCP_BLID } = useParams(); const { CCP_BLID } = useParams();
const [userId, ] = useAuthStore((state) => [state.loginUser.userId]);
const [noticeInfo, setNoticeInfo] = useState({}); const [noticeInfo, setNoticeInfo] = useState({});
useEffect(() => { useEffect(() => {
// console.info("notice detail .useEffect " + CCP_BLID); // console.info("notice detail .useEffect " + CCP_BLID);
fetchNoticeDetail(authStore.login.userId, CCP_BLID).then((res) => { fetchNoticeDetail(userId, CCP_BLID).then((res) => {
setNoticeInfo(res); setNoticeInfo(res);
}); });
}, []); }, []);

@ -1,20 +1,20 @@
import { NavLink } from "react-router-dom"; import { NavLink } from "react-router-dom";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Row, Col, Space, Typography, Badge, List } from "antd"; import { Row, Col, Space, Typography, Badge, List } from "antd";
import { useStore } from "@/stores/StoreContext.js";
import useNoticeStore, { fetchBulletinList } from '@/stores/Notice'; import useNoticeStore, { fetchBulletinList } from '@/stores/Notice';
import useAuthStore from '@/stores/Auth';
function Index() { function Index() {
const { authStore } = useStore(); const [userId, ] = useAuthStore((state) => [state.loginUser.userId]);
const getBulletinUnReadCount = useNoticeStore((state) => state.getBulletinUnReadCount); const getBulletinUnReadCount = useNoticeStore((state) => state.getBulletinUnReadCount);
const [noticeList, setNoticeList] = useState([]); const [noticeList, setNoticeList] = useState([]);
useEffect(() => { useEffect(() => {
// console.info("notice.useEffect", authStore.login.userId); // console.info("notice.useEffect", authStore.login.userId);
fetchBulletinList(authStore.login.userId).then(data => { fetchBulletinList(userId).then(data => {
setNoticeList(data); setNoticeList(data);
}); });
getBulletinUnReadCount(authStore.login.userId); // getBulletinUnReadCount(userId); //
}, []); }, []);
return ( return (

@ -325,11 +325,11 @@ function Index() {
DMC Assessment Criteria DMC Assessment Criteria
</Typography.Title> </Typography.Title>
</Divider> </Divider>
<Table dataSource={DMCData_customer_satisfaction} columns={columns_DMC_customer_satisfaction} pagination={false} bordered /> <Table key={'cs'} dataSource={DMCData_customer_satisfaction} columns={columns_DMC_customer_satisfaction} pagination={false} bordered />
<br /> <br />
<Table dataSource={DMCData_sopport_local} columns={columns_DMC_sopport_local} pagination={false} bordered /> <Table key={'sl'} dataSource={DMCData_sopport_local} columns={columns_DMC_sopport_local} pagination={false} bordered />
<br /> <br />
<Table dataSource={DMCData_pricing} columns={columns_DMC_pricing} pagination={false} bordered /> <Table key={'p'} dataSource={DMCData_pricing} columns={columns_DMC_pricing} pagination={false} bordered />
<Divider orientation='right'> <Divider orientation='right'>
<Typography.Title level={3} type='danger'> <Typography.Title level={3} type='danger'>
Final Scores: {evaluationScores.FinalScores} Final Scores: {evaluationScores.FinalScores}

Loading…
Cancel
Save