浏览代码

update header bar

master
Alex Cheung 1年前
父节点
当前提交
8162ee6904
共有 8 个文件被更改,包括 73 次插入31 次删除
  1. +7
    -4
      src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
  2. +4
    -1
      src/pages/PublicNotice/ListPanel/index.js
  3. +4
    -1
      src/pages/PublicNoticeDetail/index.js
  4. +6
    -0
      src/pages/PublicNoticeDetail_GLD/ClientDetailCard.js
  5. +4
    -1
      src/pages/PublicNoticeDetail_GLD/index.js
  6. +40
    -22
      src/pages/PublicNoticeSearch_GLD/index.js
  7. +4
    -1
      src/pages/gldDashboard/index.js
  8. +4
    -1
      src/pages/publicDashboard/index.js

+ 7
- 4
src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js 查看文件

@@ -28,10 +28,13 @@ const PublicNoticeApplyForm = ({loadedData, selections}) => {


const BackgroundHead = { const BackgroundHead = {
backgroundImage: `url(${titleBackgroundImg})`, backgroundImage: `url(${titleBackgroundImg})`,
width: '100%',
height: '100%',
backgroundSize:'cover'
}
width: 'auto',
height: 'auto',
backgroundSize:'contain',
backgroundRepeat: 'no-repeat',
backgroundColor: '#0C489E',
backgroundPosition: 'right'
}
// React.useEffect(()=>{ // React.useEffect(()=>{
// setFormData(loadedData); // setFormData(loadedData);
// },[]); // },[]);


+ 4
- 1
src/pages/PublicNotice/ListPanel/index.js 查看文件

@@ -40,7 +40,10 @@ const PublicNotice = () => {
backgroundImage: `url(${titleBackgroundImg})`, backgroundImage: `url(${titleBackgroundImg})`,
width: '100%', width: '100%',
height: '100%', height: '100%',
backgroundSize: 'cover'
backgroundSize:'contain',
backgroundRepeat: 'no-repeat',
backgroundColor: '#0C489E',
backgroundPosition: 'right'
} }


useEffect(() => { useEffect(() => {


+ 4
- 1
src/pages/PublicNoticeDetail/index.js 查看文件

@@ -46,7 +46,10 @@ const DashboardDefault = () => {
backgroundImage: `url(${titleBackgroundImg})`, backgroundImage: `url(${titleBackgroundImg})`,
width: '100%', width: '100%',
height: '100%', height: '100%',
backgroundSize:'cover'
backgroundSize:'contain',
backgroundRepeat: 'no-repeat',
backgroundColor: '#0C489E',
backgroundPosition: 'right'
} }
// const appNo = "G2023-343" // const appNo = "G2023-343"




+ 6
- 0
src/pages/PublicNoticeDetail_GLD/ClientDetailCard.js 查看文件

@@ -65,8 +65,14 @@ const ClientDetailCard = (
currentApplicationDetailData.type == "ORG"? currentApplicationDetailData.type == "ORG"?
window.open('/orgUser/'+ currentApplicationDetailData.id, "_blank", "noreferrer"): window.open('/orgUser/'+ currentApplicationDetailData.id, "_blank", "noreferrer"):
window.open('/indUser/'+ currentApplicationDetailData.id, "_blank", "noreferrer"); window.open('/indUser/'+ currentApplicationDetailData.id, "_blank", "noreferrer");
window.addEventListener("focus", onFocus)
}; };


const onFocus = () => {
window.removeEventListener("focus", onFocus)
location.reload();
}

// useEffect(() => { // useEffect(() => {
// //upload latest data to parent // //upload latest data to parent
// const values = getValues(); // const values = getValues();


+ 4
- 1
src/pages/PublicNoticeDetail_GLD/index.js 查看文件

@@ -70,7 +70,10 @@ const PublicNoticeDetail_GLD = () => {
backgroundImage: `url(${titleBackgroundImg})`, backgroundImage: `url(${titleBackgroundImg})`,
width: '100%', width: '100%',
height: '100%', height: '100%',
backgroundSize:'cover'
backgroundSize:'contain',
backgroundRepeat: 'no-repeat',
backgroundColor: '#0C489E',
backgroundPosition: 'right'
} }


const title = groupNo!=null?("Application / "+appNo+", "+gazetteIssue+", "+issueNum+" , "+groupNo):("Application / "+appNo+", "+gazetteIssue+", "+issueNum) const title = groupNo!=null?("Application / "+appNo+", "+gazetteIssue+", "+issueNum+" , "+groupNo):("Application / "+appNo+", "+gazetteIssue+", "+issueNum)


+ 40
- 22
src/pages/PublicNoticeSearch_GLD/index.js 查看文件

@@ -1,6 +1,8 @@
// material-ui // material-ui
import { import {
Grid
Grid,
Typography,
Stack
} from '@mui/material'; } from '@mui/material';
import MainCard from "components/MainCard"; import MainCard from "components/MainCard";
import * as UrlUtils from "utils/ApiPathConst"; import * as UrlUtils from "utils/ApiPathConst";
@@ -12,6 +14,17 @@ import Loadable from 'components/Loadable';
const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent'))); const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent')));
const SearchForm = Loadable(React.lazy(() => import('./SearchForm'))); const SearchForm = Loadable(React.lazy(() => import('./SearchForm')));
const EventTable = Loadable(React.lazy(() => import('./DataGrid'))); const EventTable = Loadable(React.lazy(() => import('./DataGrid')));
import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'

const BackgroundHead = {
backgroundImage: `url(${titleBackgroundImg})`,
width: '100%',
height: '100%',
backgroundSize:'contain',
backgroundRepeat: 'no-repeat',
backgroundColor: '#0C489E',
backgroundPosition: 'right'
}


// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //


@@ -66,29 +79,34 @@ const UserSearchPage_Individual = () => {
!onReady ? !onReady ?
<LoadingComponent/> <LoadingComponent/>
: :
<Grid container rowSpacing={4.5} columnSpacing={2.75}>
{/*row 1*/}
<Grid item xs={12} md={12} lg={12}>
<SearchForm
applySearch={applySearch}
orgComboData={orgCombo}
searchCriteria={searchCriteria}
/>
</Grid>
{/*row 2*/}
<Grid item xs={12} md={12} lg={12}>
<MainCard elevation={0}
border={false}
content={false}
>
<EventTable
recordList={record}
<Grid container sx={{minHeight: '85vh',backgroundColor:'#ffffff'}} direction="column">
<Grid item xs={12}>
<div style={BackgroundHead}>
<Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
<Typography ml={15} color='#FFF' variant="h4">Application</Typography>
</Stack>
</div>
</Grid>
{/*row 1*/}
<Grid item xs={12} md={12} lg={12}>
<SearchForm
applySearch={applySearch}
orgComboData={orgCombo}
searchCriteria={searchCriteria}
/> />
</MainCard>
</Grid>
{/*row 2*/}
<Grid item xs={12} md={12} lg={12}>
<MainCard elevation={0}
border={false}
content={false}
>
<EventTable
recordList={record}
/>
</MainCard>
</Grid>
</Grid> </Grid>

</Grid>

); );
}; };




+ 4
- 1
src/pages/gldDashboard/index.js 查看文件

@@ -15,7 +15,10 @@ const DashboardDefault = () => {
backgroundImage: `url(${titleBackgroundImg})`, backgroundImage: `url(${titleBackgroundImg})`,
width: '100%', width: '100%',
height: '100%', height: '100%',
backgroundSize:'cover'
backgroundSize:'contain',
backgroundRepeat: 'no-repeat',
backgroundColor: '#0C489E',
backgroundPosition: 'right'
} }
return ( return (
<Grid container sx={{minHeight: '90vh'}} direction="column"> <Grid container sx={{minHeight: '90vh'}} direction="column">


+ 4
- 1
src/pages/publicDashboard/index.js 查看文件

@@ -19,7 +19,10 @@ const DashboardDefault = () => {
backgroundImage: `url(${titleBackgroundImg})`, backgroundImage: `url(${titleBackgroundImg})`,
width: '100%', width: '100%',
height: '100%', height: '100%',
backgroundSize:'cover'
backgroundSize:'contain',
backgroundRepeat: 'no-repeat',
backgroundColor: '#0C489E',
backgroundPosition: 'right'
} }
return ( return (
<Grid container sx={{minHeight: '90vh'}} direction="column"> <Grid container sx={{minHeight: '90vh'}} direction="column">


正在加载...
取消
保存