更新

src/pages/InstallExe/exeDialog/CoreArea.tsx

@@ -97,7 +97,7 @@ const CoreArea: FC<PageProps> = ({
     let sysName = localStorage.getItem(`${urlParams?.fileType}`);
     if (sysName) {
       let info = JSON.parse(sysName)
-      if (password !== info.GBasePassword) {
+      if (password != info.GBasePassword) {
         message.error('密码错误！');
         return true;
       }

src/pages/Register/PositionManage/UnitLocation/index.less

@@ -0,0 +1,19 @@
+.earthWarp {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: url('../../../../assets/images/googleEarth/startBG.jpg') no-repeat;
+  background-size: 100% 100%;
+  background-position: center;
+  object-fit: cover;
+
+  .earthCon {
+    width: 500px;
+    height: 500px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}

src/pages/Register/PositionManage/UnitLocation/index.tsx

@@ -8,8 +8,10 @@ export default function Page() {
   const [visibility, setVisibility] = useState<boolean>(false);
 
   return (
-    <div>
+    <div className={styles.earthWarp}>
-      <div onClick={() => setVisibility(true)}>单位位置管理</div>
+      <div  className={styles.earthCon} onClick={() => setVisibility(true)}>
+        <div className={styles.marker}></div>
+      </div>
 
       {/* 开机认证 */}
       <Modal

src/pages/Register/RegisterManage/DeviceRegister/AdminsTab/index.tsx

@@ -263,7 +263,7 @@ export default function Page() {
         <div className='ml20' style={{ height: 'auto', width: '27%', marginTop: 8 }}>
           <div className='mb10'>设备照片</div>
           <div style={{ height: "calc(50% - 27px)", border: '1px solid #d8d8d8', background: '#fff' }}>
-            <img src="" style={{ width: '100%', height: '100%' }} />
+            <img src={require('../../../../../assets/images/device_img.png')} style={{ width: '100%', height: '100%' }} />
           </div>
           <div className='mb10 mt20'>备注</div>
           <TextArea

src/pages/Register/RegisterManage/DeviceRegister/DeviceTab/index.tsx

@@ -5,10 +5,15 @@ import { Form, Input, Pagination, Select, Table, message } from 'antd';
 import { useEffect, useState } from 'react';
 import styles from './index.less'
 import { deviceHardEditOrAdd, deviceHardPage } from '@/services/register';
+import { useParams, history } from 'umi';
 
 const { TextArea } = Input;
 
 export default function Page() {
+  const urlParams = useParams();
+  let sysData = localStorage.getItem(`${urlParams?.fileType}`);
+  let info = sysData ? JSON.parse(sysData) : null;
+  
   const [tableData, setTableData] = useState([]);
   const [pageNumber, setPageNumber] = useState(1);
   const [pageSize, setpageSize] = useState(10);
@@ -115,7 +120,15 @@ export default function Page() {
                         ]}>
                       </Select>
                     </Form.Item>
-                    <ButtonComp text={'定位'} style={{ margin: '20px 0 0px 20px' }} onClick={() => { }} />
+                    <ButtonComp text={'定位'} style={{ margin: '20px 0 0px 20px' }} onClick={() => {
+                      let obj: any = {
+                        selectVal: 6,
+                        active: 2,
+                        activeName: '位置管理',
+                      }
+                      localStorage.setItem(`${urlParams?.fileType}`, JSON.stringify({ ...info, layoutInfo: obj }))
+                      history.push(`/registerManage/unitLocation/${urlParams?.fileType}${location?.search}`)
+                    }} />
                   </div>
                   <div className='flex_aiC'>
                     <Form.Item name="deviceName" label="设备名称" rules={[{ required: true, message: '请输入设备名称' }]}>
@@ -219,7 +232,7 @@ export default function Page() {
         <div className='ml20' style={{ height: 'auto', width: '30%', marginTop: 8 }}>
           <div className='mb10'>设备照片</div>
           <div style={{ height: 'calc(50% - 27px)', border: '1px solid #d8d8d8', background: '#fff' }}>
-            <img src="" style={{ width: '100%', height: '100%' }} />
+            <img src={require('../../../../../assets/images/device_img.png')} style={{ width: '100%', height: '100%' }} />
           </div>
           <div className='mb10 mt20'>备注</div>
           <TextArea