Merge branch 'dev' into 'master'

src/assets/images/commonMenu/退出.svg

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 25 26" style="enable-background:new 0 0 25 26;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+	<g>
+		<path class="st0" d="M19.82,3.9c-0.67-0.57-1.5-0.57-2.09-0.16c-0.67,0.41-0.92,1.06-0.75,1.79c0,0.65,0.5,0.98,1,1.3
+			c3.51,2.68,4.51,7.15,2.42,11.05c-1.84,3.41-6.01,5.28-9.85,4.47c-3.92-0.81-6.93-4.31-7.01-8.21c-0.08-3.01,1.08-5.44,3.59-7.31
+			c0.92-0.73,1.09-1.79,0.42-2.52C6.89,3.49,5.88,3.41,4.88,4.14c-4.17,3.17-5.93,8.69-4.26,13.41C2.3,22.59,7.05,26,12.48,26
+			C19.32,26,25,20.64,25,13.89C25.08,9.75,23.24,6.42,19.82,3.9L19.82,3.9z M19.82,3.9"/>
+	</g>
+	<path class="st0" d="M11.89,13.73c1.25,0.41,2.34-0.41,2.34-1.79V1.95C14.31,0.73,13.56,0,12.48,0c-1,0-1.75,0.73-1.84,1.79v10.24
+		C10.73,12.92,11.23,13.49,11.89,13.73L11.89,13.73z M11.89,13.73"/>
+</g>
+</svg>

src/pages/system/iframe/TabWidget.js

@@ -18,9 +18,13 @@ const TabWidget = props => {
       <div className={styles['oper-wrap']}>
         <div className={styles['oper-btn']}>
           {isFullscreen ? (
-            <FullscreenExitOutlined className={styles['btn-fullscreen_exit']} onClick={handleExitFullScreen} />
+            <span className={styles['btn-fullscreen_exit']} onClick={handleExitFullScreen} />
           ) : (
-            <FullscreenOutlined className={styles['btn-fullscreen']} onClick={handleFullScreen} />
+            <FullscreenOutlined
+              className={styles['btn-fullscreen']}
+              style={{ width: '1.2rem', height: '1.2rem' }}
+              onClick={handleFullScreen}
+            />
           )}
         </div>
       </div>

src/pages/system/iframe/index.less

@@ -22,13 +22,21 @@
       color: #FFF;
       position: absolute;
       top: 10px;
-      right: -100%;
+      right: 15px;
       transition: right ease-in-out 0.8s;
     }
     
-    &:hover {
-      .oper-btn {
-        right: 20px;
+    .btn-fullscreen_exit {
+      display: block;
+      width: 1.2rem;
+      height: 1.2rem;
+      background-image: url('../../../assets/images/commonMenu/退出.svg');
+    }
+
+    .btn-fullscreen {
+      svg {
+        width: 1.2rem;
+        height: 1.2rem;
       }
     }
   }

src/pages/system/previews/preview.js

 import React, { useEffect, useState } from 'react';
 import { FullscreenExitOutlined, FullscreenOutlined } from '@ant-design/icons';
 import { notification } from 'antd';
-import Empty from '@wisdom-components/empty';
 import classnames from 'classnames';
 import { cloudService } from '@/api';
 import useFullScreen from '../iframe/useFullScreen';

src/pages/user/login/index.js

@@ -8,6 +8,7 @@
  */
 import React, { useEffect } from 'react';
 import BaseLogin from './template/baseLogin';
+import ChangShuiJiChang from './template/changShuiJiChang';
 import NewYear from './template/newYear';
 import baseLoginNewYear from './template/baseLoginNewYear';
 import InfoLogin from './template/infoLogin';
@@ -60,6 +61,7 @@ const LoginTemplate = {
   '项目 - 威信.html': WeixinLogin,
   '全景图.html': PanoramaLogin,
   '项目 - 江西.html': JiangXi,
+  '项目 - 长水机场.html': ChangShuiJiChang,
   default: BaseLogin,
 };
 /* eslint-disable */