diff --git a/src/layout/MainLayout/index.js b/src/layout/MainLayout/index.js index 8675276..bba7653 100644 --- a/src/layout/MainLayout/index.js +++ b/src/layout/MainLayout/index.js @@ -55,10 +55,10 @@ const MainLayout = () => { }, [drawerOpen]); return ( - +
{/* */} - + {/* */} {/* */} diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js index cfe2537..af4f010 100644 --- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js +++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js @@ -4,7 +4,8 @@ import { Typography, Button, RadioGroup, - Dialog, DialogTitle, DialogContent, DialogActions + Dialog, DialogTitle, DialogContent, DialogActions, + Stack } from '@mui/material'; import { useFormik } from 'formik'; import * as yup from 'yup'; @@ -12,6 +13,7 @@ import * as React from "react"; import * as HttpUtils from "utils/HttpUtils"; import * as UrlUtils from "utils/ApiPathConst"; import * as FieldUtils from "utils/FieldUtils"; +import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' import {useNavigate} from "react-router-dom"; @@ -24,6 +26,12 @@ const PublicNoticeApplyForm = ({loadedData, selections}) => { const [attachment, setAttachment] = React.useState({}); const navigate=useNavigate(); + const BackgroundHead = { + backgroundImage: `url(${titleBackgroundImg})`, + width: '100%', + height: '100%', + backgroundSize:'cover' + } // React.useEffect(()=>{ // setFormData(loadedData); // },[]); @@ -85,13 +93,20 @@ const PublicNoticeApplyForm = ({loadedData, selections}) => { return ( - - - 申請公共啟事 + + +
+ + 申請公共啟事 + +
-
+ {/* + 申請公共啟事 + */} + - + {FieldUtils.getTextField({ label:"聯絡人:", @@ -195,7 +210,7 @@ const PublicNoticeApplyForm = ({loadedData, selections}) => {
setIsWarningPopUp(false)} > - Warning + 注意 {warningText} diff --git a/src/pages/PublicNotice/ListPanel/index.js b/src/pages/PublicNotice/ListPanel/index.js index 514b950..1171814 100644 --- a/src/pages/PublicNotice/ListPanel/index.js +++ b/src/pages/PublicNotice/ListPanel/index.js @@ -4,7 +4,8 @@ import { Typography, Tab, Box, - Button + Button, + Stack } from '@mui/material'; import { TabPanel, TabContext, TabList } from '@mui/lab'; @@ -20,6 +21,7 @@ const BaseGrid = Loadable(lazy(() => import('./BaseGrid'))); const PendingPaymentTab = Loadable(lazy(() => import('./PendingPaymentTab'))); const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingComponent'))); const SearchTab = Loadable(lazy(() => import('./SearchPublicNoticeTab'))); +import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -33,6 +35,12 @@ const PublicNotice = () => { const [selectedTab, setSelectedTab] = useState("1"); const navigate = useNavigate(); + const BackgroundHead = { + backgroundImage: `url(${titleBackgroundImg})`, + width: '100%', + height: '100%', + backgroundSize:'cover' + } useEffect(() => { loadData(); @@ -71,15 +79,23 @@ const PublicNotice = () => { isLoading ? : - - - 我的公共啟事 + + +
+ + 我的公共啟事 + +
- - + + + + + + {/*col 2*/} - +