Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

src/components/PageContent/index.js

@@ -1,13 +1,18 @@
+import { UnityAction } from '@/utils/utils';
 import { CloseOutlined } from '@ant-design/icons';
 import styles from './index.less';
 
 export default (props) => {
   const { children, style, closeable = true } = props;
 
+  const handleClose = () => {
+    UnityAction.sendMsg('closePage');
+  };
+
   return (
     <div className={styles.page} style={style}>
       {closeable && (
-          <CloseOutlined className={styles.close} />
+        <CloseOutlined onClick={handleClose} className={styles.close} />
       )}
 
       {children}

src/pages/Menu/index.js

@@ -29,7 +29,7 @@ const menuList = [
     path: (projectId) => `/task-manage/${projectId}`,
   },
   {
-    name: '智能监控',
+    name: '智能管控',
     path: (projectId) => `/hardware-controller/${projectId}`,
   },
   {