Commit ea618bd8 authored by 杨思琦's avatar 杨思琦

Merge branch 'master' into devNew

parents a4ef307c 757c3608
......@@ -175,7 +175,8 @@
"sha1": "^1.1.1",
"sm4js": "^0.0.6",
"styled-components": "4.2.0",
"swiper": "6.8.4"
"swiper": "6.8.4",
"xlsx": "^0.17.3"
},
"devDependencies": {
"@babel/cli": "7.4.3",
......
......@@ -38,6 +38,9 @@
},
{
"title": "项目 - 铁门关"
},
{
"title": "项目 - 太湖"
}
]
}
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
......@@ -9,6 +9,7 @@ import PandaBootPage from './panda';
import IntegrationPage from './integration';
import IntegrationPage2 from './integration2';
import TaihuPage from './project/taihu';
import JimusaerPage from './project/jimusaer';
export const guidePage = [
// type 为true 则需要 功能配置 isPanda 为true
{
......@@ -23,6 +24,10 @@ export const guidePage = [
label: '太湖集成登录',
value: 'taihuPage',
},
{
label: '吉尔木萨集成登录',
value: 'jimusaerPage',
},
{
label: '演示环境(旧版)',
type: true,
......@@ -40,4 +45,5 @@ export const BootPageTemplate = {
integration2: IntegrationPage2,
demonstration: Demonstration,
taihuPage: TaihuPage,
jimusaerPage:JimusaerPage,
};
{
"业务中心": [
{
"name": "综合管理门户",
"english": "Management Portal",
"label": "",
"url": ""
},
{
"name": "综合外业工单",
"english": "Field Work Order",
"url": ""
},
{
"name": "综合业务大屏",
"english": "Business Large Screen",
"url": ""
}
],
"智慧管网": [
{
"name": "管网GIS系统",
"label": "",
"url": "",
"english": "Pipeline GIS"
},
{
"name": "管网采集系统",
"url": "",
"english": "Pipeline Collection"
},
{
"name": "管网一张图",
"url": "",
"english": "Pipe Network"
}
],
"综合调度": [
{
"name": "管网运行监测",
"label": "",
"url": "",
"english": "Pipeline Operation"
},
{
"name": "调度事物管理",
"url": "",
"english": "Scheduling Management"
},
{
"name": "报警管理平台",
"url": "",
"english": "Alarm Management"
}
],
"智慧营销": [
{
"name": "营业收费",
"label": "",
"url": "",
"english": "Operating Fees"
},
{
"name": "抄表管理",
"url": "",
"english": "Meter Reading"
},
{
"name": "网上营业厅",
"url": "",
"english": "Online Business Hall"
}
],
"基础平台": [
{
"name": "物联统一接入平台",
"url": "",
"english": "IoT Unified Access"
},
{
"name": "综合后台管理平台",
"url": "",
"english": "Integrated Backend"
},
{
"name": "GIS服务平台",
"url": "",
"english": "GIS Service "
},
{
"name": "Web组态平台",
"url": "",
"english": "Web Configuration"
}
],
"标题": "吉尔木萨县智慧水务管控平台"
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
......@@ -7,17 +7,17 @@ import React, { useRef, useEffect, useState, useMemo } from 'react';
import backImg from '@/assets/images/demonstration/返回.png';
import arrowLeftImg from '@/assets/images/demonstration/左箭头.png';
import LoadPage from '@/components/LoadPage';
import icon1 from '@/assets/images/integration/taihu/综合管控_arrow.png';
import icon2 from '@/assets/images/integration/taihu/智慧应用_arrow.png';
import icon3 from '@/assets/images/integration/taihu/支撑平台_arrow.png';
import icon1 from '@/assets/images/integration/taihu2/综合管控_arrow.png';
import icon2 from '@/assets/images/integration/taihu2/智慧应用_arrow.png';
import icon3 from '@/assets/images/integration/taihu2/支撑平台_arrow.png';
import useFullScreen from '../../demonstration/components/useFullScreen';
import defaultConfig from './data.json';
import styles from './integration.less';
import styles from './index.less';
import Iframe from '../../demonstration/components/Iframe';
const boxWidth = 1920;
const boxHeight = 1008;
const Integration = props => {
const boxHeight = 930;
const IntegrationTaihu = props => {
const [ref, isFullscreen, handleFullScreen, handleExitFullScreen] = useFullScreen(false);
const timer2 = useRef(null);
const timer3 = useRef(null);
......@@ -33,14 +33,14 @@ const Integration = props => {
};
const [boxSize, setBoxSize] = useState({
scale: 1,
boxHeight: 1008,
boxHeight: 930,
});
const [linkUrl, setLinkUrl] = useState('');
const [jumpLoading, setJumpLoading] = useState(false);
const [progressValue2, setProgressValue2] = useState(0);
const [showBackBtn, setShowBackBtn] = useState(true); // 是否显示iframe 返回按钮,三维平台用
const configName = '集成配置文件';
const configName = '太湖集成配置文件';
const [configData, setConfigData] = useState(defaultConfig);
......@@ -191,7 +191,7 @@ const Integration = props => {
}, []);
return (
<div className={classNames(styles.integration, 'integration')} ref={ref}>
<div className={classNames(styles.integrationTaihu, 'integrationTaihu')} ref={ref}>
{jumpLoading ? (
<div className={styles.integrationJumpLoad} key="jumpLoading">
<div style={{ width: '285px' }}>
......@@ -200,7 +200,7 @@ const Integration = props => {
</div>
) : null}
{!linkUrl ? (
<div className={styles.integration_exit} onClick={exit}>
<div className={styles.integrationTaihu_exit} onClick={exit}>
<Button type="text" style={{ color: '#fff', fontSize: '24px' }}>
{isFullscreen ? <FullscreenExitOutlined /> : <FullscreenOutlined />}
</Button>
......@@ -215,12 +215,12 @@ const Integration = props => {
transform: `scale(${boxSize.scale}) translate(-50%,-50%)`,
}}
>
<div className={styles.integration_title}>
<div className={styles.integration_title_left} />
<div className={styles.integration_title_text}>
<div className={styles.integrationTaihu_title}>
{/* <div className={styles.integrationTaihu_title_left} /> */}
<div className={styles.integrationTaihu_title_text}>
<span>{configData?.['标题'] || '智慧水务综合监控平台'}</span>
</div>
<div className={styles.integration_title_right} />
{/* <div className={styles.integrationTaihu_title_right} /> */}
</div>
<div className={styles.integration_row} type="综合管控">
<div className={styles.integration_row_title} type="综合管控">
......@@ -259,6 +259,7 @@ const Integration = props => {
智慧应用
<img src={icon2} alt="" />
</div>
<div className={styles.integration_row_right2}>
<div className={styles.integration_row_list} type="智慧生产调度">
<div className={styles.integration_row_list_title} type="智慧生产调度">
- 智慧生产调度 -
......@@ -345,6 +346,7 @@ const Integration = props => {
</div>
</div>
</div>
</div>
<div className={styles.integration_row} type="支撑平台">
<div className={styles.integration_row_title} type="支撑平台">
支撑平台
......@@ -424,4 +426,4 @@ const Integration = props => {
</div>
);
};
export default Integration;
export default IntegrationTaihu;
This diff is collapsed.
......@@ -2,7 +2,7 @@
* @Author: 634665781 634665781@qq.com
* @Date: 2022-07-08 14:28:01
* @LastEditors: Please set LastEditors
* @LastEditTime: 2024-07-20 20:07:23
* @LastEditTime: 2024-07-31 16:44:10
* @FilePath: \CivWeb\src\pages\user\login\index.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
......@@ -56,6 +56,7 @@ import FengqiuLogin from './template/project/fengqiu';
import DiantouLogin from './template/project/diantou';
import ChangchunLogin from './template/project/changchun';
import TiemenguanLogin from './template/project/tiemenguan';
import TaihuLogin from './template/project/taihu';
import { AppInitState } from '../../../render';
const LoginTemplate = {
'新春.html': baseLoginNewYear,
......@@ -109,6 +110,7 @@ const LoginTemplate = {
'项目 - 店头.html': DiantouLogin,
'项目 - 长春.html': ChangchunLogin,
'项目 - 铁门关.html': TiemenguanLogin,
'项目 - 太湖.html': TaihuLogin,
default: BaseLogin,
};
/* eslint-disable */
......
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
/*
* 功能名称: 太湖登录页
* 功能路径:
* 功能参数:
*/
import React, { forwardRef, useEffect, useRef, useState } from 'react';
import $ from 'jquery';
import { Modal, Popover } from 'antd';
import QRCode from 'qrcode.react';
import { Helmet, HelmetProvider } from 'react-helmet-async';
import { connect } from 'react-redux';
import { useHistory, withRouter } from '@wisdom-utils/runtime';
import { actionCreators } from '@/containers/App/store';
import classnames from 'classnames';
import moment from 'moment';
import QueueAnim from 'rc-queue-anim';
import defaultSetting from '../../../../../../../config/defaultSetting';
import LoginAction from '../../../login';
import styles from './index.less';
import Account from '../../../js/useAccount';
import { defaultApp } from '../../../../../../micro';
import logo from './images/logo.png';
import qrcodePng from './images/扫码.png';
import bg from './images/背景.jpg';
const Cripples = require('@/assets/js/ripples/jquery.ripples');
const PopOvercontent = () => {
const qrcodes = window.globalConfig && window.globalConfig.qrcode;
if (qrcodes) {
return <QRCode value={qrcodes} />;
}
return <span>手持APP下载未配置</span>;
};
const Login = forwardRef((props, _ref) => {
const sliVerify = useRef();
const loginFormRef = useRef();
const formRef = useRef(null);
const [status, setStatus] = useState('normal');
const [show, setShow] = useState(false);
const [autoLogin, setAutoLogin] = useState(false);
const [submitting, setSubmitting] = useState(false);
const [type, setType] = useState('Account');
const [visible, setVisible] = useState(false);
const history = useHistory();
const [action, setAction] = useState(() => new LoginAction(Object.assign({}, props, { history }), setVisible, false));
const [dateObj, setDateObj] = useState({});
const handleSubmit = values => {
/* eslint-disable */
action &&
(type === 'Account'
? action.loginHandler(values.userName, values.password, null, autoLogin, sliVerify)
: type === 'Mobile'
? action.phoneLoginFormHandler(values.mobile, values.captcha)
: null);
setSubmitting(true);
props.updateCurrentIndex && props.updateCurrentIndex(-1);
};
useEffect(() => {
action &&
action.events.on('loginSuccess', event => {
setSubmitting(false);
props.updateCurrentIndex && props.updateCurrentIndex(0);
props.history.push(`/?client=${props.global.client}`);
defaultApp();
});
action &&
action.events.on('loginError', event => {
setVisible(false);
setSubmitting(false);
});
action &&
action.events.on('loginVisible', status => {
setVisible(status);
});
action.events.on('loginHomePage', () => {
props.history.push(`/homePage`);
});
action.events.on('loginIndustry', () => {
props.history.push(`/industry`);
});
return () => {
action && action.events && action.events.removeAllListeners('loginSuccess');
action && action.events && action.events.removeAllListeners('loginError');
action && action.events && action.events.removeAllListeners('loginVisible');
action && action.events && action.events.removeAllListeners('loginHomePage');
action && action.events && action.events.removeAllListeners('loginIndustry');
};
}, [props.loginMode]);
useEffect(() => {
setSubmitting(false);
}, [visible]);
const renderPlatform = () => {
const template = props.global.loginTemplate;
const params = {
fromRef: formRef,
type,
setType,
status,
submitting,
autoLogin,
setAutoLogin,
action,
onSubmit: handleSubmit,
loginMode: props.loginMode,
updateLoginMode: props.updateLoginMode,
welcome: null,
};
return <Account {...params} />;
};
/* eslint-disable */
const handleWeek = () => {
const weekOfDay = Number(moment().format('E'));
let weekDayName = '';
switch (weekOfDay) {
case 1:
weekDayName = '周一';
break;
case 2:
weekDayName = '周二';
break;
case 3:
weekDayName = '周三';
break;
case 4:
weekDayName = '周四';
break;
case 5:
weekDayName = '周五';
break;
case 6:
weekDayName = '周六';
break;
case 7:
weekDayName = '周日';
break;
default:
weekDayName = '';
}
return weekDayName;
};
const onShow = () => {
if (!show) {
setShow(true);
}
};
useEffect(() => {
setTimeout(() => {
onShow();
}, 300);
setTimeout(() => {
$('.CarouselRipples').ripples({
resolution: 800,
dropRadius: 20, //px
perturbance: 2,
});
}, 1000);
}, []);
useEffect(() => {
return () => {};
}, [show]);
useEffect(() => {
const timer = setInterval(() => {
setDateObj({
curTime: moment().format('HH:mm:ss'),
week: handleWeek(),
date: moment().format('YYYY/MM/DD'),
});
}, 1000);
return () => {
clearInterval(timer);
};
}, []);
return (
<HelmetProvider>
<Helmet>
<title>{props.global.title || defaultSetting.title}</title>
<meta name="description" content={props.global.title || defaultSetting.title} />
</Helmet>
<div
className={classnames(styles.fengqiuLogin, 'fengqiuLogin')}
onClick={onShow}
style={{ background: `url(${bg}) no-repeat center center`, backgroundSize: '100%' }}
>
{show ? (
<div className={classnames(styles['wrapper'])}>
<QueueAnim type="scale" duration={1000}>
<div key={'innerwrapper'} className={classnames(styles['inner-wrapper'])}>
<div className={styles['inner-center']}>
<div className={styles['welcome-title']}>
安全优质供水 用心服务万家 </div>
<div className={classnames(styles['inner-bg'], styles['login-part'])} ref={loginFormRef}>
{renderPlatform()}
</div>
</div>
<Popover
content={PopOvercontent}
title="扫码下载APP"
placement="right"
overlayClassName={'popover-style'}
>
<img src={qrcodePng} alt="APP" className={styles['qrcode-box']} />
</Popover>
</div>
</QueueAnim>
<div key="loginheader" className={classnames(styles['login-header'])}>
<QueueAnim type="left">
<div key="logintitle" className={styles['left-title']}>
<div>
<img
src={
props.global &&
props.global.transformDevAssetsBaseURL &&
props.global.transformDevAssetsBaseURL(props.global.logo)
}
alt="logo"
/>
</div>
<div className={styles['cn-title']}>{props.global.title || defaultSetting.title}</div>
</div>
</QueueAnim>
<QueueAnim type="right">
<div key="logintime" className={styles['right-timebox']}>
<div className={styles['curr-time']}>{dateObj.curTime}</div>
<div className={styles['curr-week-date']}>
<div className={styles['curr-week']}>{dateObj.week}</div>
<div className={styles['curr-date']}>{dateObj.date}</div>
</div>
</div>
</QueueAnim>
</div>
</div>
) : null}
<div className={classnames(styles.CarouselRipples, 'CarouselRipples')} data-ripple="ripple" />
<Modal centered visible={visible} width={340} footer={null} closable={false} bodyStyle={{ padding: '15px' }}>
<div ref={sliVerify} />
</Modal>
</div>
</HelmetProvider>
);
});
const mapStateToProps = state => ({
global: state.getIn(['global', 'globalConfig']),
loginMode: state.getIn(['global', 'loginMode']),
});
const mapDispatchToProps = dispatch => ({
updateConfig(config) {
dispatch(actionCreators.getConfig(config));
},
createContext(data) {
dispatch(actionCreators.createContext(data));
},
updateLoginMode(mode) {
dispatch(actionCreators.changeLoginMode(mode));
},
updateCurrentIndex(index) {
dispatch(actionCreators.updateCurrentIndex(index));
},
});
export default connect(
mapStateToProps,
mapDispatchToProps,
)(withRouter(Login));
.fengqiuLogin {
width: 100%;
height: 100%;
position: relative;
min-height: 7.0rem;
overflow: hidden;
display: flex;
justify-content: center;
align-items: center;
.caseHide {
display: none !important;
}
.inner-bg {
width: 100%;
height: 100%;
&>div {
width: 80%;
margin: 0 10% 10%;
}
}
.inner-wrapper {
position: absolute;
display: flex;
justify-content: center;
align-items: center;
top: 250px;
left: calc(50% - 268.5px);
z-index: 50;
}
.inner-bg .title {
font-size: 27px;
font-weight: bold;
color: rgba(255, 255, 255, 1);
letter-spacing: 2px;
}
.form-control:focus {
border-color: #66afe9;
outline: 0;
-webkit-box-shadow: none;
box-shadow: none;
}
.inner-center {
position: relative;
width: 545px;
height: 340px;
border: 1px solid #FDFDFD;
box-shadow: 0px 6px 18px 0px rgba(25, 61, 79, 0.35);
border-radius: 15px;
z-index: 2;
backdrop-filter: blur(6px);
}
.welcome-title {
height: 105px;
border-radius: 8px 8px 0px 0px;
text-align: center;
line-height: 60px;
font-size: 40px;
font-weight: bold;
color: #008EFE;
padding-top: 25px;
text-shadow: #FFFFFF 1.5px 0 0, #FFFFFF 0 1.5px 0, #FFFFFF -1.5px 0 0, #FFFFFF 0 -1.5px 0;
font-family: '楷体';
}
.formgroup2 {
display: flex;
align-items: center;
display: flex;
margin: 0px 5.5%;
margin-bottom: 10%;
align-items: center;
margin-bottom: 40px;
}
.APPcodeBox {
width: 100%;
display: flex;
flex-flow: column;
align-items: center;
cursor: pointer;
position: relative;
}
.APPCtext {
font-size: 14px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #000000;
line-height: 30px;
opacity: 0.75;
}
.login-header {
box-sizing: border-box;
width: 100%;
position: absolute;
top: 0;
left: 0;
height: 82px;
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 22px;
z-index: 50;
// border-bottom: 1px solid rgba(255, 255, 255, 0.12);
.left-title {
display: flex;
justify-content: flex-start;
align-items: center;
img {
// width: 55px;
height: 40px;
}
.cn-title {
font-size: 42px;
// font-family: 宋体;
font-weight: 400;
color: #333;
line-height: 55px;
text-shadow: 0px 1px 10px #A3AFC7;
line-height: 1;
margin-left: 10px;
}
}
.right-timebox {
display: flex;
justify-content: center;
align-items: center;
height: 60px;
.curr-time {
width: 140px;
font-size: 34px;
font-family: Microsoft YaHei;
font-weight: 300;
color: #333;
text-align: right;
}
.curr-week-date {
margin-left: 10px;
.curr-week {
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #333;
}
.curr-date {
font-size: 14px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #333;
}
}
}
}
.copyright {
position: absolute;
bottom: 7%;
width: 100%;
margin: 0 auto;
font-size: 12px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #F1F6FD;
text-align: center;
}
.qrcode-box {
position: absolute;
bottom: 0;
right: -23px;
width: 23px;
height: 23px;
background: #FFFFFF;
opacity: 0.8;
cursor: pointer;
}
}
& :global {
.fengqiuLogin {
.panda-console-base-btn {
border-radius: 20px;
}
}
.popover-style {
.@{ant-prefix}-popover-inner-content {
display: flex;
justify-content: center;
align-items: center;
}
.@{ant-prefix}-popover-title {
display: flex;
justify-content: center;
align-items: center;
}
}
}
:global {
.popover-style {
.@{ant-prefix}-popover-inner-content {
display: flex;
justify-content: center;
align-items: center;
}
.@{ant-prefix}-popover-title {
display: flex;
justify-content: center;
align-items: center;
}
}
}
.CarouselRipples {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
z-index: 1;
}
& :global {
.CarouselRipples:before {
content: '';
display: inline-block;
vertical-align: middle;
height: 100%;
}
}
\ No newline at end of file
......@@ -17,7 +17,7 @@ import JumpThirdLink from '../pages/system/iframe/JumpThirdLink';
import IntegratedLogin from '../pages/system/iframe/IntegratedLogin';
import IntegratedLoginPage from '../pages/integratedLogin'; // 集成登录管理
import ThirdParty from '../pages/thirdParty'; // 集成登录自定义跳转
import JimusaerPage from '../pages/bootpage/template/project/jimusaer/index';
import PrevieView from '../pages/system/previews/preview';
const Login = React.lazy(() => import('../pages/user/login'));
export const dyRoutes = (routes, layout, theme) => {
......@@ -125,6 +125,9 @@ export const dyRoutes = (routes, layout, theme) => {
if (/page\/integratedLoginPage/.test(path)) {
return <IntegratedLoginPage {...routeConfig} />;
}
if (/page\/jimusaerPage/.test(path)) {
return <JimusaerPage {...routeConfig} />;
}
},
},
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment