liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release_20221216' into 'master'

Browse Source 
【生产】12.16版本同步到Master

See merge request eshop/fe_service_ebtp_frontend!92
This commit is contained in:
jl-zhoujl2
2022-12-23 11:34:34 +00:00
parent bb9013a612 8a4ea088bb
commit b177d2fee5
7 changed files with 188 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/router_transfer.ts
View File

@ -75,6 +75,11 @@ export default [
path: '/CommonApproval',
component: './LoadingPage/MiddleLoading/CommonApproval',
},
//2.0和3.0选择页
{
path: '/ChoiceLogin',
component: './LoadingPage/MiddleLoading/ChoiceLogin',
},
//跨工程跳转中间页结束
{
name: 'index_1',

BIN
src/assets/choiceLogin/chionceLoginPic01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 71 KiB

BIN
src/assets/choiceLogin/chionceLoginPic02.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 108 KiB

BIN
src/assets/choiceLogin/choiceLoginBg.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 118 KiB

130
src/assets/zjl_style.less
View File

@ -2,10 +2,12 @@
.common {
padding: 0px 24px;
}
//操作栏颜色
.operation {
// margin-right: 8px;
}
// .card-title-button .ant-card-head-title {
// padding: 10px 0px;
// }
@ -17,15 +19,18 @@
color: #b30000;
// margin-right: 8px;
}
.revenue .ant-tabs-content-holder {
margin-top: 0px;
}
.revenue .ant-tabs-top > .ant-tabs-nav,
.ant-tabs-bottom > .ant-tabs-nav,
.ant-tabs-top > div > .ant-tabs-nav,
.ant-tabs-bottom > div > .ant-tabs-nav {
.revenue .ant-tabs-top>.ant-tabs-nav,
.ant-tabs-bottom>.ant-tabs-nav,
.ant-tabs-top>div>.ant-tabs-nav,
.ant-tabs-bottom>div>.ant-tabs-nav {
margin: 0;
}
// .ant-pro-card-body {
// padding: 0;
// }
@ -33,17 +38,21 @@
.confirm .ant-pro-table .ant-pro-table-search {
padding: 16px 0px 0px 0px;
}
.notice .ant-pro-table-list-toolbar-container {
padding: 0px 0px 16px;
}
.erf-title-flex {
display: flex;
justify-content: space-between;
}
.erf-title-left {
height: 32px;
line-height: 32px;
}
.erf-delete {
color: #1890ff !important;
background: rgba(0, 0, 0, 0) !important;
@ -55,6 +64,7 @@
font-weight: 600;
line-height: 56px;
}
.CM_span {
text-indent: 2em;
// line-height: 24px;
@ -79,10 +89,12 @@
float: left;
line-height: 44px;
}
//日历组件专用样式
.calendar-dashboard .ant-picker-calendar .ant-picker-panel .ant-picker-body {
padding: 0px;
}
.calendar-dashboard .ant-picker-calendar-full .ant-picker-panel .ant-picker-calendar-date {
margin: 0 0 1px 1px;
padding: 0px 8px 0px;
@ -93,6 +105,7 @@
border-right: 1px solid #f0f0f0;
border-radius: 0px
}
.calendar-dashboard .ant-picker-calendar-full .ant-picker-panel .ant-picker-calendar-date-content {
position: static;
width: auto;
@ -102,34 +115,42 @@
color: rgba(0, 0, 0, 0.85);
line-height: 1.5715;
text-align: center;
}
}
.calendar-dashboard .ant-picker-calendar-full .ant-picker-panel .ant-picker-cell-selected .ant-picker-calendar-date,
.calendar-dashboard .ant-picker-calendar-full .ant-picker-panel .ant-picker-cell-selected:hover .ant-picker-calendar-date,
.calendar-dashboard .ant-picker-calendar-full .ant-picker-panel .ant-picker-cell-selected .ant-picker-calendar-date-today,
.calendar-dashboard .ant-picker-calendar-full .ant-picker-panel .ant-picker-cell-selected:hover .ant-picker-calendar-date-today {
background: #fff1f0;
}
.calendar-dashboard .ant-picker-calendar-full .ant-picker-panel .ant-picker-calendar-date-today {
border-color: #b30000;
}
.calendar-dashboard .ant-picker-calendar-full .ant-picker-panel .ant-picker-body th {
padding: 0 0px 5px 0;
text-align: center;
}
.calendar-dashboard .ant-picker-calendar-full .ant-picker-panel .ant-picker-body td {
text-align: center;
}
.calendar-dashboard .ant-tag {
margin-right: 0px;
line-height: 19px;
}
.calendar-dashboard .ant-picker-cell {
cursor: default;
}
.notice-detail-html p {
margin: 0;
padding: 0;
}
.notice-detail-file {
font-size: 17px;
color: #7c7c7c;
@ -138,26 +159,125 @@
top: 5px;
vertical-align: top;
}
.notice-detail-noticefile {
margin-top: 20px;
.ant-spin-nested-loading {
display: inline-block;
}
}
.baseinf-top {
background-color: #ffffff;
padding: 20px;
overflow: auto;
}
.baseinf-bottom-btn {
margin-top: 40px;
text-align: center;
}
.calibration-panel {
.ant-collapse-content-box {
padding: 0px 16px;
}
}
.question-form .ant-space {
min-width: 50%;
}
.choiceLoginContent-common {
float: left;
width: 385px;
height: 400px;
background-color: rgba(255, 255, 255, 0.8);
text-align: center;
padding: 24px;
cursor: pointer;
transition: all .5s;
&:hover {
box-shadow: 0 6px 16px -8px #ffffff14, 0 9px 28px #ffffff0d, 0 12px 48px 16px #ffffff08;
background-color: rgba(255, 255, 255, 0.9);
}
}
.choiceLoginBody {
padding: 0;
margin: 0;
list-style: none;
border: 0;
text-decoration: none;
font-family: 'Microsoft YaHei UI';
background-image: url("~@/assets/choiceLogin/choiceLoginBg.jpg");
background-size: 100% 100%;
background-repeat: no-repeat;
height: 100%;
-moz-user-select: none;
-webkit-user-select: none;
user-select: none;
.choiceLoginBlock {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
.choiceLoginContent {
width: 778px;
height: 400px;
}
.contentLeft {
.choiceLoginContent-common;
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
margin-right: 4px;
}
.contentLeft img {
margin-bottom: 9px
}
.contentRight {
.choiceLoginContent-common;
border-top-right-radius: 10px;
border-bottom-right-radius: 10px;
margin-left: 4px;
}
.contentLeft h4,
.contentRight h4 {
font-size: 22px;
color: #333;
line-height: 32px;
font-weight: normal;
}
.loginMassage {
width: 778px;
margin-top: 16px;
&>p:first-child {
text-indent: 0;
}
&>p {
font-size: 18px;
color: #eaeaea;
line-height: 32px;
text-indent: 2em;
margin-top: 0;
margin-bottom: 0;
&>span {
color: #ffde52;
font-weight: bold;
}
}
}
}
}

52
src/pages/LoadingPage/MiddleLoading/ChoiceLogin.tsx Normal file
View File

@ -0,0 +1,52 @@
import React, { useEffect, useRef } from 'react';
import '@/assets/zjl_style.less';
import chionceLoginPic01 from '@/assets/choiceLogin/chionceLoginPic01.png';
import chionceLoginPic02 from '@/assets/choiceLogin/chionceLoginPic02.png';
import { history } from 'umi';
import { getToSecondUrl } from '../service';
export default () => {
const urlRef = useRef(null);
//跳转到2.0
const contentLeftClick = async () => {
urlRef.current && window.open(urlRef.current);
}
//跳转到3.0
const contentRightClick = () => {
history.replace({ pathname: '/Dashboard' });
}
useEffect(() => {
const getUrl = async () => {
const response = await getToSecondUrl();
if (response?.success) {
urlRef.current = response?.data;
}
}
getUrl();
}, [])
return (
<div className="choiceLoginBody">
<div className="choiceLoginBlock">
<div className="choiceLoginContent">
<div className="contentLeft" onClick={contentLeftClick}>
<img src={chionceLoginPic01} alt="联通电子招投标交易平台" />
<h4>联通电子招投标<br />交易平台</h4>
</div>
<div className="contentRight" onClick={contentRightClick}>
<img src={chionceLoginPic02} alt="联通智慧供应链招标采购中心" />
<h4>联通智慧供应链<br />招标采购中心</h4>
</div>
</div>
{/* <div className="loginMassage">
<p><span>重要提示：</span></p>
<p>2021年，<span>联通集团总部、31个省分公司</span>已全部上线联通智慧供应链平台。</p>
<p>2022年6月13日，<span>联通软件研究院、联通集团财务有限公司</span>上线联通智慧供应链平台。</p>
<p>自上线之日起，集团总部、省分公司及上述子公司新发起的公开招标、邀请招标、公开比选、单一来源采购、竞争性谈判等采购业务将在<span>智慧供应链平台招标采购中心</span>进行操作，在途项目仍按照原流程在交易平台执行并完成线上归档。联通子公司采购业务不受影响，仍按原流程执行。</p>
</div> */}
</div>
</div>
)
}

6
src/pages/LoadingPage/service.ts
View File

@ -66,5 +66,11 @@ export async function getDictionaries() {
export async function getProjectById(id?: any) {
return request('/api/biz-service-ebtp-project/v1/projectRecord/' + id);
}
/**
* 获取跳转2.0的URL
*/
export async function getToSecondUrl() {
return request('/api/core-service-ebtp-userinfo/zglt/v1/getUrl');
}