Skip to content

C
CivWeb
Commit e1f44abd authored by 杨思琦's avatar 杨思琦
Browse files
Options

Merge branch 'dev' into 'master'

Dev See merge request !32
parents 12c3832a 579f0834
Pipeline #79134 waiting for manual action with stages
          Hide whitespace changes
          Inline Side-by-side
          Showing with 321 additions and 308 deletions
          src/containers/App/store/reducer.js
          View file @ e1f44abd
          ...@@ -42,9 +42,7 @@ const proxy = require('../../../../config/proxy'); ...@@ -42,9 +42,7 @@ const proxy = require('../../../../config/proxy');
          const keywordStorage = new Storage(`__global_search_keywords__micro_${window.location.hostname}`); const keywordStorage = new Storage(`__global_search_keywords__micro_${window.location.hostname}`);
          const recentVisitedStorage = new Storage(`__global_recent_visited__micro_${window.location.hostname}`); const recentVisitedStorage = new Storage(`__global_recent_visited__micro_${window.location.hostname}`);
          const recentProductStorage = new Storage(`__global__recent_product__micro_${window.location.hostname}`); const recentProductStorage = new Storage(`__global__recent_product__micro_${window.location.hostname}`);
          const currentProduct = `__global__recent_productIndex__micro_${window.location.hostname}_${params.getParams('client') || const currentProduct = `__global__recent_productIndex__micro_${window.location.hostname}_${sessionStorage.getItem('client') || params.getParams('client') || 'city'}`;
          sessionStorage.getItem('client') ||
          'city'}`;
          sessionStorage.setItem(currentProduct, 0); sessionStorage.setItem(currentProduct, 0);
          Cookies.set('loginMode', Cookies.get('loginMode') || 'pdw'); Cookies.set('loginMode', Cookies.get('loginMode') || 'pdw');
          export const initialState = fromJS({ export const initialState = fromJS({
          ...@@ -102,27 +100,27 @@ const appReducer = (state = initialState, action) => { ...@@ -102,27 +100,27 @@ const appReducer = (state = initialState, action) => {
          const { homepage } = window.globalConfig; const { homepage } = window.globalConfig;
          const modulePkg = {}; const modulePkg = {};
          window.globalConfig && window.globalConfig.products && Array.isArray(window.globalConfig.products) && window.globalConfig.products.map(item => { window.globalConfig && window.globalConfig.products && Array.isArray(window.globalConfig.products) && window.globalConfig.products.map(item => {
          modulePkg[item.PackageName] = item; modulePkg[item.PackageName] = item;
          }); });
          config.widgets =transformWidgets(config.widgets); config.widgets = transformWidgets(config.widgets);
          // const pickMenus = memoized(() => ) // const pickMenus = memoized(() => )
          const generMenu = generMainRoutes(config.widgets || [], null, 0, modulePkg); const generMenu = generMainRoutes(config.widgets || [], null, 0, modulePkg);
          let flatMenu = []; let flatMenu = [];
          if (generMenu) { if (generMenu) {
          const flat = state.toJS(); const flat = state.toJS();
          const data =_.uniqBy(generFlatRoutes(generMenu || [], null, null, modulePkg), 'path'); const data = _.uniqBy(generFlatRoutes(generMenu || [], null, null, modulePkg), 'path');
          if(_.isEqualWith(flat.flatMenu, data, (value, other) => { if (_.isEqualWith(flat.flatMenu, data, (value, other) => {
          if(value.path === other.path) { if (value.path === other.path) {
          return true return true
          } }
          })) { })) {
          flatMenu = data flatMenu = data
          } else { } else {
          flatMenu = flat.flatMenu flatMenu = flat.flatMenu
          } }
          const index = flatMenu.findIndex(item => item.name === '首页'); const index = flatMenu.findIndex(item => item.name === '首页');
          if(index === -1) { if (index === -1) {
          flatMenu.push({ flatMenu.push({
          path: `/${homepage}`, path: `/${homepage}`,
          href: `/${homepage}`, href: `/${homepage}`,
          ...@@ -141,7 +139,7 @@ const appReducer = (state = initialState, action) => { ...@@ -141,7 +139,7 @@ const appReducer = (state = initialState, action) => {
          return currentPath === decodeURI(homepage); return currentPath === decodeURI(homepage);
          }); });
          let currentMenuIndex = 0; let currentMenuIndex = 0;
          if (home) { if (home) {
          ...@@ -204,9 +202,10 @@ const appReducer = (state = initialState, action) => { ...@@ -204,9 +202,10 @@ const appReducer = (state = initialState, action) => {
          recentVisited: [], recentVisited: [],
          }); });
          case GET_CURRENT_INDEX: case GET_CURRENT_INDEX:
          sessionStorage.setItem(currentProduct, action.data) const currentProductNew = `__global__recent_productIndex__micro_${window.location.hostname}_${sessionStorage.getItem('client') || window.globalConfig?.client || 'city'}`;
          sessionStorage.setItem(currentProductNew, action.data)
          return state.merge({ return state.merge({
          currentMenuIndex: Number(sessionStorage.getItem(currentProduct)), currentMenuIndex: Number(sessionStorage.getItem(currentProductNew)),
          }); });
          case SLIDER_MENU_MODE: case SLIDER_MENU_MODE:
          return state.merge({ return state.merge({
          ......
          src/layouts/BasicLayout.js
          View file @ e1f44abd
          ...@@ -227,76 +227,6 @@ const renderSite = ({ data, config, loading, setLoading, action, actionRef, setM ...@@ -227,76 +227,6 @@ const renderSite = ({ data, config, loading, setLoading, action, actionRef, setM
          ); );
          }; };
          // const renderIntegration = (inData, loginAction, props) => {
          // const [visible, setVisible] = useState(false);
          // if (inData.length <= 1) {
          // return <></>
          // }
          // let choiceOne = inData?.find(function (a) {
          // return a.url?.indexOf(window?.globalConfig?.client) >= 0
          // })
          // //切换集成站点
          // const checkIntegration = (val, loginAction, props) => {
          // if (val.subType == '外链') {
          // window.open(val.url, "_blank");
          // } else {
          // let cli = val.url?.indexOf('client=') >= 0 ? val.url.split('client=')[1] : '';
          // const config = props.global;
          // config.uiwidgets = [];
          // config.widgets = [];
          // config.allWidgets = [];
          // if (cli) {
          // config.client = cli;
          // }
          // props.instance && props.instance.updateConfig(config);
          // loginAction && loginAction.getUserInfoAndConfig('', true, val.type, cli);
          // // props.history.push(`/?client=${cli}`);
          // // props.updateCurrentIndex(0);
          // // defaultApp();
          // }
          // }
          // return (
          // <>
          // <Popover
          // placement="bottomLeft"
          // trigger="click"
          // visible={visible}
          // content={
          // <div className={layoutStyles.integrationList}>
          // {
          // inData && inData.map((val) => (
          // <p onClick={() => checkIntegration(val, loginAction, props)}>{val.name}</p>
          // ))
          // }
          // </div>
          // }
          // arrowPointAtCenter
          // overlayClassName={classNames(layoutStyles.stationsWrapper, layoutStyles.stationsTop2)}
          // onVisibleChange={visible => setVisible(visible)}
          // >
          // {inData.length > 1 ? (
          // <div className={layoutStyles.toggleSite}>
          // <img src={require('../assets/basic/site.png')} className={layoutStyles.site} />
          // <span className={layoutStyles.name}>{choiceOne?.name ?? ''}</span>
          // <ArrowIcon
          // className={layoutStyles.arrow}
          // style={{
          // transform: !visible ? `rotate(0deg)` : `rotate(180deg)`,
          // }}
          // />
          // </div>
          // ) : null}
          // </Popover>
          // </>
          // )
          // }
          // import defaultProps from '../defaultProps'; // import defaultProps from '../defaultProps';
          const pickRoutes = memoized((routes, pathname, locale) => { const pickRoutes = memoized((routes, pathname, locale) => {
          const matches = matchRoutes(routes, { pathname }); const matches = matchRoutes(routes, { pathname });
          ...@@ -564,9 +494,39 @@ const Layout = props => { ...@@ -564,9 +494,39 @@ const Layout = props => {
          //切换集成站点 //切换集成站点
          const checkIntegration = (val, loginAction, props) => { const checkIntegration = (val, loginAction, props) => {
          if (val.subType == '外链') { if (val.subType == '外链') {
          window.open(val.url, "_blank"); if (val.paramValue == 'ticket') {
          //获取临时token
          appService.getTicketByToken({ token: window.globalConfig?.token }).then(res => {
          if (res.code === 0) {
          setVisible(false);
          let url = val.url + (val.url.indexOf('?') > 0 ? '&' : '?') + val.paramName + '=' + res.data;
          window.open(url, "_blank");
          } else {
          setVisible(false);
          notification.error({
          message: '提示',
          duration: 3,
          description: res.msg,
          });
          }
          });
          } else {
          setVisible(false);
          let url = val.url + (val.url.indexOf('?') > 0 ? '&' : '?') + val.paramName + '=' + window.globalConfig?.token;
          window.open(url, "_blank");
          }
          } else { } else {
          let cli = val.url?.indexOf('client=') >= 0 ? val.url.split('client=')[1] : ''; let cli = val.url?.indexOf('client=') >= 0 ? val.url.split('client=')[1] : '';
          Cookies.set('client', cli, {
          expires: 86400000 / (24 * 60 * 60 * 1000),
          path: '/',
          });
          sessionStorage.setItem('client', cli);
          const currentProduct = `__global__recent_productIndex__micro_${window.location.hostname}_${window.globalConfig?.client ?? 'city'}`;
          sessionStorage.removeItem(currentProduct);
          const currentProductNew = `__global__recent_productIndex__micro_${window.location.hostname}_${cli || 'city'}`;
          sessionStorage.setItem(currentProductNew, 0);
          setIntegrationLoading(true); setIntegrationLoading(true);
          const config = props.global; const config = props.global;
          config.uiwidgets = []; config.uiwidgets = [];
          ...@@ -576,7 +536,7 @@ const Layout = props => { ...@@ -576,7 +536,7 @@ const Layout = props => {
          config.client = cli; config.client = cli;
          } }
          props.instance && props.instance.updateConfig(config); props.instance && props.instance.updateConfig(config);
          loginAction && loginAction.getUserInfoAndConfig('', true, val.type, cli); loginAction && loginAction.getUserInfoAndConfig('', true, val.type);
          // props.history.push(`/?client=${cli}`); // props.history.push(`/?client=${cli}`);
          // props.updateCurrentIndex(0); // props.updateCurrentIndex(0);
          // defaultApp(); // defaultApp();
          ......
          src/pages/bootpage/integration/index.js
          View file @ e1f44abd
          ...@@ -8,6 +8,7 @@ import { useDocumentTitle } from '@ant-design/pro-utils'; ...@@ -8,6 +8,7 @@ import { useDocumentTitle } from '@ant-design/pro-utils';
          import defaultSetting from '@wisdom-utils/components/lib/AppLayout/layouts/defaultSettings'; import defaultSetting from '@wisdom-utils/components/lib/AppLayout/layouts/defaultSettings';
          import { actionCreators } from '@/containers/App/store'; import { actionCreators } from '@/containers/App/store';
          import LoginAction from '@/pages/user/login/login'; import LoginAction from '@/pages/user/login/login';
          import Cookies from 'js-cookie';
          import { defaultApp } from '@/micro'; import { defaultApp } from '@/micro';
          import { appService } from '@/api'; import { appService } from '@/api';
          import { SERVICE_INTERFACE_SUCCESS_CODE } from '@/constants'; import { SERVICE_INTERFACE_SUCCESS_CODE } from '@/constants';
          ...@@ -24,6 +25,7 @@ const Integration = props => { ...@@ -24,6 +25,7 @@ const Integration = props => {
          const [client, setClient] = useState(''); const [client, setClient] = useState('');
          //子站跳转
          const handlePage = (item, loginAction) => { const handlePage = (item, loginAction) => {
          let count = 1; let count = 1;
          setPercentBottom(-40 + Math.ceil(Math.random() * 8 * count)); setPercentBottom(-40 + Math.ceil(Math.random() * 8 * count));
          ...@@ -41,9 +43,37 @@ const Integration = props => { ...@@ -41,9 +43,37 @@ const Integration = props => {
          }, 3000); }, 3000);
          if (item.subType == '外链') { if (item.subType == '外链') {
          window.open(item.url, "_blank"); if (item.paramValue == 'ticket') {
          //获取临时token
          appService.getTicketByToken({ token: window.globalConfig?.token }).then(res => {
          if (res.code === 0) {
          let url = item.url + (item.url.indexOf('?') > 0 ? '&' : '?') + item.paramName + '=' + res.data;
          window.open(url, "_blank");
          } else {
          notification.error({
          message: '提示',
          duration: 3,
          description: res.msg,
          });
          }
          });
          } else {
          let url = item.url + (item.url.indexOf('?') > 0 ? '&' : '?') + item.paramName + '=' + window.globalConfig?.token;
          window.open(url, "_blank");
          }
          } else { } else {
          let cli = item.url?.indexOf('client=') >= 0 ? item.url.split('client=')[1] : ''; let cli = item.url?.indexOf('client=') >= 0 ? item.url.split('client=')[1] : '';
          Cookies.set('client', cli, {
          expires: 86400000 / (24 * 60 * 60 * 1000),
          path: '/',
          });
          sessionStorage.setItem('client', cli);
          const currentProduct = `__global__recent_productIndex__micro_${window.location.hostname}_${window.globalConfig?.client ?? 'city'}`;
          sessionStorage.removeItem(currentProduct);
          const currentProductNew = `__global__recent_productIndex__micro_${window.location.hostname}_${cli || 'city'}`;
          sessionStorage.setItem(currentProductNew, 0);
          setClient(cli); setClient(cli);
          setCurrentType(item.name); setCurrentType(item.name);
          ...@@ -55,7 +85,7 @@ const Integration = props => { ...@@ -55,7 +85,7 @@ const Integration = props => {
          config.client = cli config.client = cli
          } }
          // props.instance && props.instance.updateConfig(config); props.instance && props.instance.updateConfig(config);
          loginAction && loginAction.getUserInfoAndConfig('', true, item.type, cli); loginAction && loginAction.getUserInfoAndConfig('', true, item.type, cli);
          } }
          }; };
          ......
          src/pages/user/login/login.js
          View file @ e1f44abd
          ...@@ -911,19 +911,11 @@ class Login { ...@@ -911,19 +911,11 @@ class Login {
          }); });
          } }
          getUserInfoAndConfig(failCallback, flag, industry, client) { getUserInfoAndConfig(failCallback, flag, industry) {
          const { token: tk } = this.globalConfig; const { token: tk } = this.globalConfig;
          const token = tk || Cookies.get('token'); const token = tk || Cookies.get('token');
          const site = Cookies.get('site'); const site = Cookies.get('site');
          const self = this; const self = this;
          if (client) {
          self.globalConfig.client = client;
          Cookies.set('client', client, {
          expires: 86400000 / (24 * 60 * 60 * 1000),
          path: '/',
          });
          sessionStorage.setItem('client', client);
          }
          /* eslint-disable */ /* eslint-disable */
          let _industrySite = null; let _industrySite = null;
          ......
          src/pages/user/login/template/project/queshan/index.js
          View file @ e1f44abd
          ...@@ -8,12 +8,13 @@ import { actionCreators } from '@/containers/App/store'; ...@@ -8,12 +8,13 @@ import { actionCreators } from '@/containers/App/store';
          import QRCode from 'qrcode.react'; import QRCode from 'qrcode.react';
          import classnames from 'classnames'; import classnames from 'classnames';
          import moment from 'moment'; import moment from 'moment';
          import QueueAnim from 'rc-queue-anim';
          import defaultSetting from '../../../../../../../config/defaultSetting'; import defaultSetting from '../../../../../../../config/defaultSetting';
          import LoginAction from '../../../login'; import LoginAction from '../../../login';
          import styles from './index.less'; import styles from './index.less';
          import Account from '../../../js/useAccount'; import Account from '../../../js/useAccount';
          import { defaultApp } from '../../../../../../micro'; import { defaultApp } from '../../../../../../micro';
          import logoPng from './images/12.png'; import logoPng from './images/qeushan_12.png';
          import qrcodePng from './images/10.png'; import qrcodePng from './images/10.png';
          const PopOvercontent = () => { const PopOvercontent = () => {
          ...@@ -40,175 +41,178 @@ const Login = forwardRef((props, _ref) => { ...@@ -40,175 +41,178 @@ const Login = forwardRef((props, _ref) => {
          const handleSubmit = values => { const handleSubmit = values => {
          /* eslint-disable */ /* eslint-disable */
          action && action &&
          (type === 'Account' (type === 'Account'
          ? action.loginHandler(values.userName, values.password, null, autoLogin, sliVerify) ? action.loginHandler(values.userName, values.password, null, autoLogin, sliVerify)
          : type === 'Mobile' : type === 'Mobile'
          ? action.phoneLoginFormHandler(values.mobile, values.captcha) ? action.phoneLoginFormHandler(values.mobile, values.captcha)
          : null); : null);
          setSubmitting(true); setSubmitting(true);
          props.updateCurrentIndex && props.updateCurrentIndex(-1); 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}`);
          // window.share.event.emit('triggerMicro', props.global);
          // initMicroApps();
          defaultApp();
          });
          action &&
          action.events.on('loginError', event => {
          setVisible(false);
          setSubmitting(false);
          });
          action &&
          action.events.on('loginVisible', status => {
          setVisible(status);
          });
          return () => {
          action && action.events && action.events.removeAllListeners('loginSuccess');
          action && action.events && action.events.removeAllListeners('loginError');
          action && action.events && action.events.removeAllListeners('loginVisible');
          };
          }, [props.loginMode]);
          useEffect(() => { useEffect(() => {
          action &&
          action.events.on('loginSuccess', event => {
          setSubmitting(false);
          props.updateCurrentIndex && props.updateCurrentIndex(0);
          props.history.push(`/?client=${props.global.client}`);
          // window.share.event.emit('triggerMicro', props.global);
          // initMicroApps();
          defaultApp();
          });
          action &&
          action.events.on('loginError', event => {
          setVisible(false);
          setSubmitting(false); setSubmitting(false);
          }, [visible]); });
          action &&
          action.events.on('loginVisible', status => {
          setVisible(status);
          });
          return () => {
          action && action.events && action.events.removeAllListeners('loginSuccess');
          action && action.events && action.events.removeAllListeners('loginError');
          action && action.events && action.events.removeAllListeners('loginVisible');
          };
          }, [props.loginMode]);
          useEffect(() => {
          setSubmitting(false);
          }, [visible]);
          const renderPlatform = () => { const renderPlatform = () => {
          const template = props.global.loginTemplate; const template = props.global.loginTemplate;
          const params = { const params = {
          fromRef: formRef, fromRef: formRef,
          type, type,
          setType, setType,
          status, status,
          submitting, submitting,
          autoLogin, autoLogin,
          setAutoLogin, setAutoLogin,
          action, action,
          onSubmit: handleSubmit, onSubmit: handleSubmit,
          loginMode: props.loginMode, loginMode: props.loginMode,
          updateLoginMode: props.updateLoginMode, updateLoginMode: props.updateLoginMode,
          welcome: null, welcome: null,
          };
          return <Account {...params} />;
          }; };
          /* eslint-disable */ return <Account {...params} />;
          };
          /* eslint-disable */
          const handleWeek =() => { const handleWeek = () => {
          const weekOfDay = Number(moment().format('E')); const weekOfDay = Number(moment().format('E'));
          let weekDayName = '' let weekDayName = '';
          switch(weekOfDay){ switch (weekOfDay) {
          case 1: case 1:
          weekDayName = '周一' weekDayName = '周一';
          break break;
          case 2: case 2:
          weekDayName = '周二' weekDayName = '周二';
          break break;
          case 3: case 3:
          weekDayName = '周三' weekDayName = '周三';
          break break;
          case 4: case 4:
          weekDayName = '周四' weekDayName = '周四';
          break break;
          case 5: case 5:
          weekDayName = '周五' weekDayName = '周五';
          break break;
          case 6: case 6:
          weekDayName = '周六' weekDayName = '周六';
          break break;
          case 0: case 0:
          weekDayName = '周日' weekDayName = '周日';
          break break;
          default: default:
          weekDayName = '' weekDayName = '';
          }
          return weekDayName
          } }
          return weekDayName;
          };
          useEffect(()=>{ useEffect(() => {
          const timer = setInterval(() => { const timer = setInterval(() => {
          setDateObj({ setDateObj({
          curTime: moment().format('HH:mm:ss'), curTime: moment().format('HH:mm:ss'),
          week: handleWeek(), week: handleWeek(),
          date: moment().format('YYYY/MM/DD') date: moment().format('YYYY/MM/DD'),
          }); });
          }, 1000); }, 1000);
          return () => { return () => {
          clearInterval(timer); clearInterval(timer);
          }; };
          }, []) }, []);
          return ( return (
          <HelmetProvider> <HelmetProvider>
          <Helmet> <Helmet>
          <title>{props.global.title || defaultSetting.title}</title> <title>{props.global.title || defaultSetting.title}</title>
          <meta name="description" content={props.global.title || defaultSetting.title} /> <meta name="description" content={props.global.title || defaultSetting.title} />
          </Helmet> </Helmet>
          <div className={classnames(styles.queshanlogin, "queshan")}> <div className={classnames(styles.queshanlogin, 'queshan')}>
          <div className={styles['inner-wrapper']}> <QueueAnim type="scale" duration={1000}>
          <div className={styles['inner-center']}> <div className={styles['inner-wrapper']} key={'innerwrapper'}>
          <div className={classnames(styles['inner-bg'], styles['login-part'])} ref={loginFormRef}> <div className={styles['inner-center']}>
          {renderPlatform()} <div className={classnames(styles['inner-bg'], styles['login-part'], 'queshanLogin')} ref={loginFormRef}>
          </div> {renderPlatform()}
          </div> </div>
          </div>
          </div> </div>
          <div className={styles['login-header']}> </QueueAnim>
          <div className={styles['left-title']}> <div className={styles['login-header']}>
          <img src={logoPng} alt='logo' className={styles['logo-png']}/> <QueueAnim type="left" key="logintitle">
          {/* <div className={styles['cn-title']}>南宁市二次供水管理平台</div> */} <div className={styles['left-title']}>
          </div> <img src={logoPng} alt="logo" className={styles['logo-png']} />
          <div className={styles['right-timebox']}> </div>
          <div className={styles['curr-time']}>{dateObj.curTime}</div> </QueueAnim>
          <div className={styles['curr-week-date']}> <QueueAnim type="right" key="logintime">
          <div className={styles['curr-week']}>{dateObj.week}</div> <div className={styles['right-timebox']}>
          <div className={styles['curr-date']}>{dateObj.date}</div> <div className={styles['curr-time']}>{dateObj.curTime}</div>
          </div> <div className={styles['curr-week-date']}>
          </div> <div className={styles['curr-week']}>{dateObj.week}</div>
          </div> <div className={styles['curr-date']}>{dateObj.date}</div>
          <div className={styles['copyright']}> </div>
          <div className={styles['copyrightName']}>Copyright © 2023 熊猫智慧水务 All Rights Reserved.</div>
          <div className={styles['line-tree']}></div>
          <Popover content={PopOvercontent} title="扫码下载APP" trigger="click" overlayClassName={'popover-style'}>
          <img src={qrcodePng} alt="APP" className={styles['qrcode-box']}/>
          </Popover>
          </div>
          <Modal centered visible={visible} width={340} footer={null} closable={false} bodyStyle={{ padding: '15px' }}>
          <div ref={sliVerify} />
          </Modal>
          </div> </div>
          </HelmetProvider> </QueueAnim>
          ); </div>
          <div className={styles['copyright']}>
          <div className={styles['copyrightName']}>Copyright © 2023 熊猫智慧水务 All Rights Reserved.</div>
          <div className={styles['line-tree']} />
          <Popover content={PopOvercontent} title="扫码下载APP" trigger="click" overlayClassName={'popover-style'}>
          <img src={qrcodePng} alt="APP" className={styles['qrcode-box']} />
          </Popover>
          </div>
          <Modal centered visible={visible} width={340} footer={null} closable={false} bodyStyle={{ padding: '15px' }}>
          <div ref={sliVerify} />
          </Modal>
          </div>
          </HelmetProvider>
          );
          }); });
          const mapStateToProps = state => ({ const mapStateToProps = state => ({
          global: state.getIn(['global', 'globalConfig']), global: state.getIn(['global', 'globalConfig']),
          loginMode: state.getIn(['global', 'loginMode']), loginMode: state.getIn(['global', 'loginMode']),
          }); });
          const mapDispatchToProps = dispatch => ({ const mapDispatchToProps = dispatch => ({
          updateConfig(config) { updateConfig(config) {
          dispatch(actionCreators.getConfig(config)); dispatch(actionCreators.getConfig(config));
          }, },
          createContext(data) { createContext(data) {
          dispatch(actionCreators.createContext(data)); dispatch(actionCreators.createContext(data));
          }, },
          updateLoginMode(mode) { updateLoginMode(mode) {
          dispatch(actionCreators.changeLoginMode(mode)); dispatch(actionCreators.changeLoginMode(mode));
          }, },
          updateCurrentIndex(index) { updateCurrentIndex(index) {
          dispatch(actionCreators.updateCurrentIndex(index)); dispatch(actionCreators.updateCurrentIndex(index));
          }, },
          }); });
          export default connect( export default connect(
          mapStateToProps, mapStateToProps,
          mapDispatchToProps, mapDispatchToProps,
          )(withRouter(Login)); )(withRouter(Login));
          src/pages/user/login/template/project/queshan/index.less
          View file @ e1f44abd
          .queshanlogin { .queshanlogin {
          width: 100%; width: 100%;
          height: 100%; height: 100%;
          background: url('./images/5.png') no-repeat; background: url('./images/queshan_bg.png') no-repeat center center;
          background-size: 100% 100%; background-size: 100% 100%;
          background-clip: border-box; background-clip: border-box;
          position: relative; position: relative;
          ...@@ -16,8 +15,8 @@ ...@@ -16,8 +15,8 @@
          width: 100%; width: 100%;
          // height: 100%; // height: 100%;
          padding-top: 280px; padding-top: 280px;
          &>div { &>div {
          width: 70%; width: 70%;
          margin: 0 auto; margin: 0 auto;
          ...@@ -36,8 +35,8 @@ ...@@ -36,8 +35,8 @@
          // margin-bottom: 100px; // margin-bottom: 100px;
          } }
          .title-image{ .title-image {
          background: url('./images/3.png') no-repeat; background: url('./images/queshan_3.png') no-repeat;
          width: 466px; width: 466px;
          height: 42px; height: 42px;
          background-size: 100% 100%; background-size: 100% 100%;
          ...@@ -57,20 +56,20 @@ ...@@ -57,20 +56,20 @@
          -webkit-box-shadow: none; -webkit-box-shadow: none;
          box-shadow: none; box-shadow: none;
          } }
          .inner-center { .inner-center {
          position: relative; position: relative;
          width: 543px; width: 543px;
          height: 615px; height: 615px;
          background: rgba(255,255,255, 1); background: rgba(255, 255, 255, 1);
          // border: 1px solid #FFFFFF; // border: 1px solid #FFFFFF;
          // box-shadow: 0px 15px 15px 3px rgba(140,142,145,0.52); // box-shadow: 0px 15px 15px 3px rgba(140,142,145,0.52);
          border-radius: 10px; border-radius: 10px;
          background: url(./images/6.png) no-repeat; background: url(./images/queshan_6.png) no-repeat;
          } }
          .welcome-title{ .welcome-title {
          width: 100%; width: 100%;
          height: 100px; height: 100px;
          background: linear-gradient(0deg, rgba(9, 128, 238, 1) 0%, rgba(0, 182, 251, 1) 100%); background: linear-gradient(0deg, rgba(9, 128, 238, 1) 0%, rgba(0, 182, 251, 1) 100%);
          ...@@ -82,13 +81,13 @@ ...@@ -82,13 +81,13 @@
          margin-bottom: 40px; margin-bottom: 40px;
          } }
          .welcome-bg{ .welcome-bg {
          background: url('./images/4.png') no-repeat; background: url('./images/4.png') no-repeat;
          width: 358px; width: 358px;
          height: 35px; height: 35px;
          background-size: 100% 100%; background-size: 100% 100%;
          } }
          .formgroup2 { .formgroup2 {
          display: flex; display: flex;
          align-items: center; align-items: center;
          ...@@ -107,7 +106,7 @@ ...@@ -107,7 +106,7 @@
          cursor: pointer; cursor: pointer;
          position: relative; position: relative;
          } }
          .APPCtext { .APPCtext {
          font-size: 14px; font-size: 14px;
          font-family: Microsoft YaHei; font-family: Microsoft YaHei;
          ...@@ -117,7 +116,7 @@ ...@@ -117,7 +116,7 @@
          opacity: 0.75; opacity: 0.75;
          } }
          .login-header{ .login-header {
          width: 100%; width: 100%;
          position: absolute; position: absolute;
          top: 0; top: 0;
          ...@@ -127,26 +126,31 @@ ...@@ -127,26 +126,31 @@
          justify-content: space-between; justify-content: space-between;
          align-items: center; align-items: center;
          box-shadow: 0px 1px 3px 0px rgba(0, 73, 188, 0.24); box-shadow: 0px 1px 3px 0px rgba(0, 73, 188, 0.24);
          .left-title{
          .left-title {
          display: flex; display: flex;
          justify-content: center; justify-content: center;
          align-items: center; align-items: center;
          .cn-title{
          .cn-title {
          font-size: 28px; font-size: 28px;
          font-weight: 400; font-weight: 400;
          color: #FFFFFF; color: #FFFFFF;
          } }
          .logo-png{
          .logo-png {
          width: 372px; width: 372px;
          margin-right: 20px; margin-right: 20px;
          } }
          } }
          .right-timebox{
          .right-timebox {
          display: flex; display: flex;
          justify-content: center; justify-content: center;
          align-items: center; align-items: center;
          height: 60px; height: 60px;
          .curr-time{
          .curr-time {
          width: 160px; width: 160px;
          font-size: 40px; font-size: 40px;
          font-family: Microsoft YaHei; font-family: Microsoft YaHei;
          ...@@ -154,15 +158,18 @@ ...@@ -154,15 +158,18 @@
          color: #FFFFFF; color: #FFFFFF;
          text-align: center; text-align: center;
          } }
          .curr-week-date{
          .curr-week-date {
          margin-left: 10px; margin-left: 10px;
          .curr-week{
          .curr-week {
          font-size: 16px; font-size: 16px;
          font-family: Microsoft YaHei; font-family: Microsoft YaHei;
          font-weight: 400; font-weight: 400;
          color: #FFFFFF; color: #FFFFFF;
          } }
          .curr-date{
          .curr-date {
          font-size: 14px; font-size: 14px;
          font-family: Microsoft YaHei; font-family: Microsoft YaHei;
          font-weight: 400; font-weight: 400;
          ...@@ -171,7 +178,8 @@ ...@@ -171,7 +178,8 @@
          } }
          } }
          } }
          .copyright{
          .copyright {
          position: absolute; position: absolute;
          bottom: 50px; bottom: 50px;
          width: 100%; width: 100%;
          ...@@ -185,32 +193,53 @@ ...@@ -185,32 +193,53 @@
          justify-content: center; justify-content: center;
          align-items: center; align-items: center;
          } }
          .qrcode-box{
          .qrcode-box {
          width: 19px; width: 19px;
          height: 19px; height: 19px;
          cursor: pointer; cursor: pointer;
          } }
          .copyrightName{
          .copyrightName {
          font-size: 14px; font-size: 14px;
          color: rgba(105,164,252,1); color: rgba(105, 164, 252, 1);
          font-weight: 500; font-weight: 500;
          } }
          .line-tree{ .line-tree {
          width: 1px; width: 1px;
          height: 14px; height: 14px;
          background: rgba(105,164,252,1); background: rgba(105, 164, 252, 1);
          margin: 0 10px; margin: 0 10px;
          } }
          } }
          :global{ :global {
          .queshan{ .queshanLogin {
          input:-webkit-autofill {
          box-shadow: 0 0 0 1000px rgba(1,12,47,0.1) inset;
          -webkit-text-fill-color: #fff;
          }
          input:-internal-autofill-previewed,
          input:-internal-autofill-selected {
          -webkit-text-fill-color: #807c7c !important;
          transition: background-color 5000s ease-out 0.5s !important;
          background-color: transparent !important;
          }
          .panda-console-base-input-password-icon.anticon {
          color: #fff !important;
          }
          }
          .queshan {
          .@{ant-prefix}-input-affix-wrapper-lg { .@{ant-prefix}-input-affix-wrapper-lg {
          background-color: transparent; background-color: transparent!important;
          } }
          .@{ant-prefix}-input-affix-wrapper { .@{ant-prefix}-input-affix-wrapper {
          ...@@ -218,9 +247,9 @@ ...@@ -218,9 +247,9 @@
          border-bottom: 1px solid #076aca; border-bottom: 1px solid #076aca;
          } }
          .@{ant-prefix}-input-affix-wrapper > input.@{ant-prefix}-input { .@{ant-prefix}-input-affix-wrapper>input.@{ant-prefix}-input {
          background: transparent; background: transparent!important;
          color: #FFFFFF; color: #FFFFFF!important;
          padding-left: 20px; padding-left: 20px;
          } }
          ...@@ -229,50 +258,56 @@ ...@@ -229,50 +258,56 @@
          border-bottom: 1px solid #076aca; border-bottom: 1px solid #076aca;
          } }
          .@{ant-prefix}-input-affix-wrapper:focus, .@{ant-prefix}-input-affix-wrapper-focused { .@{ant-prefix}-input-affix-wrapper:focus,
          .@{ant-prefix}-input-affix-wrapper-focused {
          border: none; border: none;
          border-bottom: 1px solid #076aca; border-bottom: 1px solid #076aca;
          } }
          .@{ant-prefix}-input-affix-wrapper:focus, .@{ant-prefix}-input-affix-wrapper-focused { .@{ant-prefix}-input-affix-wrapper:focus,
          .@{ant-prefix}-input-affix-wrapper-focused {
          box-shadow: none; box-shadow: none;
          } }
          .@{ant-prefix}-input-affix-wrapper-status-error:not(.@{ant-prefix}-input-affix-wrapper-disabled):not(.@{ant-prefix}-input-affix-wrapper-borderless).@{ant-prefix}-input-affix-wrapper, .@{ant-prefix}-input-affix-wrapper-status-error:not(.@{ant-prefix}-input-affix-wrapper-disabled):not(.@{ant-prefix}-input-affix-wrapper-borderless).@{ant-prefix}-input-affix-wrapper:hover{ .@{ant-prefix}-input-affix-wrapper-status-error:not(.@{ant-prefix}-input-affix-wrapper-disabled):not(.@{ant-prefix}-input-affix-wrapper-borderless).@{ant-prefix}-input-affix-wrapper,
          .@{ant-prefix}-input-affix-wrapper-status-error:not(.@{ant-prefix}-input-affix-wrapper-disabled):not(.@{ant-prefix}-input-affix-wrapper-borderless).@{ant-prefix}-input-affix-wrapper:hover {
          background: transparent; background: transparent;
          } }
          .@{ant-prefix}-input-affix-wrapper-status-error:not(.@{ant-prefix}-input-affix-wrapper-disabled):not(.@{ant-prefix}-input-affix-wrapper-borderless).@{ant-prefix}-input-affix-wrapper:focus, .@{ant-prefix}-input-affix-wrapper-status-error:not(.@{ant-prefix}-input-affix-wrapper-disabled):not(.@{ant-prefix}-input-affix-wrapper-borderless).@{ant-prefix}-input-affix-wrapper-focused { .@{ant-prefix}-input-affix-wrapper-status-error:not(.@{ant-prefix}-input-affix-wrapper-disabled):not(.@{ant-prefix}-input-affix-wrapper-borderless).@{ant-prefix}-input-affix-wrapper:focus,
          .@{ant-prefix}-input-affix-wrapper-status-error:not(.@{ant-prefix}-input-affix-wrapper-disabled):not(.@{ant-prefix}-input-affix-wrapper-borderless).@{ant-prefix}-input-affix-wrapper-focused {
          box-shadow: none; box-shadow: none;
          } }
          .@{ant-prefix}-checkbox + span { .@{ant-prefix}-checkbox+span {
          color: #FFFFFF; color: #FFFFFF;
          } }
          .@{ant-prefix}src-pages-user-login-components-login-index-login .@{ant-prefix}src-pages-user-login-components-login-index-prefixIcon{ .@{ant-prefix}src-pages-user-login-components-login-index-login .@{ant-prefix}src-pages-user-login-components-login-index-prefixIcon {
          color: #FFFFFF; color: #FFFFFF;
          } }
          .@{ant-prefix}src-pages-user-login-components-login-index-login .@{ant-prefix}src-pages-user-login-components-login-index-submit { .@{ant-prefix}src-pages-user-login-components-login-index-login .@{ant-prefix}src-pages-user-login-components-login-index-submit {
          border-radius: 20px; border-radius: 20px;
          } }
          } }
          .popover-style{
          .@{ant-prefix}-popover-inner-content{ .popover-style {
          .@{ant-prefix}-popover-inner-content {
          display: flex; display: flex;
          justify-content: center; justify-content: center;
          align-items: center; align-items: center;
          } }
          .@{ant-prefix}-popover-title{
          .@{ant-prefix}-popover-title {
          display: flex; display: flex;
          justify-content: center; justify-content: center;
          align-items: center; align-items: center;
          } }
          } }
          } }
          @keyframes waving { @keyframes waving {
          from { from {
          ...@@ -292,12 +327,4 @@ ...@@ -292,12 +327,4 @@
          to { to {
          left: -9999px; left: -9999px;
          } }
          } }
          \ No newline at end of file
          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