!4 全局token

Merge pull request !4 from emSui/develop

src/api/index.js

@@ -1,9 +1,9 @@
 import { request } from '@umijs/max';
-import loginStore from '../store/login.store';
+// import loginStore from '../store/login.store';
 
 // 获取登陆人
 export function getCurrentUser() {
-  let token = loginStore.token
+  // let token = loginStore.token
   return request('/api/user/getCurrentUser', {
     method: 'get'
   });
@@ -49,7 +49,7 @@ export function queryUserMenu() {
 
 // 基本图层
 // 获取图层明细点位数据/热力图数据
-export function getLayerPoints( params ) {
+export function getLayerPointsApi( params ) {
   return request('/api/basicMap/getLayerPoints', {
     method: 'GET',
     params: params
@@ -112,8 +112,8 @@ export function createPoint( data ) {
 }
 
 // 获取基础图层菜单栏
-export function getBasicLayerMenu( params ) {
+export function getBasicLayerMenuApi( params ) {
-  return request('/api/basicMap/createPoint', {
+  return request('/api/basicMap/getBasicLayerMenu', {
     method: 'get',
     params: params
   });
@@ -126,6 +126,48 @@ export function queryUserLayers() {
   });
 }
 
+// 获取省
+export function getAllProvinceApi() {
+  return request('/api/mapCommon/getAllProvince', {
+    method: 'get',
+  });
+}
+
+// 获取市
+export function getCityByProvinceApi( params ) {
+  return request('/api/mapCommon/getCityByProvince', {
+    method: 'get',
+    params: params
+  });
+}
+
+// 获取区
+export function getDistrictByCityApi( params ) {
+  return request('/api/mapCommon/getDistrictByCity', {
+    method: 'get',
+    params: params
+  });
+}
+
+// 获取围栏图层数据
+export function getLayerShapesApi( params ) {
+  return request('/api/basicMap/getLayerShapes', {
+    method: 'get',
+    params: params
+  });
+}
+
+// 获取围栏图层数据
+export function getPointByAddressApi( params ) {
+  return request('/api/mapCommon/getPointByAddress', {
+    method: 'get',
+    params: params
+  });
+}
+
+
+
+
 
 
 

src/pages/BaseMap/LayerData/index.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import { Tree, Button, Modal, Form, Input, Radio, message, Menu } from 'antd';
-import axios from 'axios';
 import {
   DownOutlined,
   EyeOutlined,
@@ -9,7 +8,7 @@ import {
   UnorderedListOutlined,
 } from '@ant-design/icons';
 import SetLogoImagePath from './SetLogoImagePath'
-import { createLayer } from '../../../api';
+import { createLayer, getBasicLayerMenuApi } from '../../../api';
 import '../../../index.less';
 import { label } from 'three/examples/jsm/nodes/Nodes.js';
 
@@ -34,21 +33,15 @@ class LayerData extends React.Component {
 
     // 获取基础图层菜单栏，获取列表数据
     getBasicLayerMenu = (adcode) => {
-        return axios.get('/api/basicMap/getBasicLayerMenu', {
+        return getBasicLayerMenuApi({adcode: adcode}).then((e) => {
-            params: {
+            let basicLayeData = e.data;
-                adcode: adcode
+            let basicLayeList = [];
-            }
+            for (var i in basicLayeData) {
-        }).then((e) => {
+                basicLayeList.push({
-            let basicLayeData = e.data.data;
+                    key: basicLayeData[i].id,
-
+                    title : basicLayeData[i].name,
-            // MenuData
+                    selectable: false,
-            let menuDataList = [];
+                    children: this.getLayerList(basicLayeData[i].layerList),
-            for (var m in basicLayeData) {
-                menuDataList.push({
-                    key: basicLayeData[m].id,
-                    label: basicLayeData[m].name,
-                    icon: <UnorderedListOutlined/>,
-                    children: this.getLayerList(basicLayeData[m].layerList),
                 })
             }
             this.setState ({

src/pages/BaseMap/index.js

@@ -1,11 +1,10 @@
 import React from 'react';
 import { Select, Input, Card, Col, Row, Button, message, Modal, Spin, Form } from 'antd';
-import axios from 'axios';
 import LayerData from './LayerData';
 // import LayerList from './LayerList';
 import { AimOutlined } from '@ant-design/icons';
 import Header from '../../components/Header/index.js';
-import { createPoint, queryUserLayers } from '../../api';
+import { createPoint, queryUserLayers, getLayerPointsApi, getAllProvinceApi, getCityByProvinceApi, getDistrictByCityApi, getLayerShapesApi, getPointByAddressApi } from '../../api';
 
 import { GaodeMap ,Scene, Heatmap, PolygonLayer, Marker, MarkerLayer, Popup, MouseLocation } from '@antv/l7';
 // import { DrawPoint, DrawEvent } from '@antv/l7-draw';
@@ -115,14 +114,11 @@ class BaseMap extends React.Component{
     getLayerPoints = (layerId, selected, nodeType) => {
         if (selected) {
             this.startLoading();
-            return axios.get('/api/basicMap/getLayerPoints', {
+            getLayerPointsApi({
-                params: {
+                adcode: this.state.districtAdcode || this.state.cityAdcode || this.state.provinceAdcode,
-                    adcode: this.state.districtAdcode || this.state.cityAdcode || this.state.provinceAdcode,
+                layerId: layerId
-                    layerId: layerId
-                }
             }).then((e) => {
-                let layerPointsData = e.data.data || [];
+                let layerPointsData = e.data || [];
-                // 处理返回的数据
                 layerPointsData = layerPointsData.map((item) => {
                     item.lng = item.location.split(',')[0];
                     item.lat = item.location.split(',')[1];
@@ -266,13 +262,11 @@ class BaseMap extends React.Component{
     // 获取围栏图层数据
     getLayerShapes = (layerId, selected, adcode) => {
         if (selected) {
-            return axios.get('/api/basicMap/getLayerShapes', {
+            return getLayerShapesApi({
-                params: {
+                adcode: adcode || this.state.districtAdcode || this.state.cityAdcode || this.state.provinceAdcode,
-                    adcode: adcode || this.state.districtAdcode || this.state.cityAdcode || this.state.provinceAdcode,
+                layerId: layerId
-                    layerId: layerId
-                }
             }).then((e) => {
-                let positionBorderData = e.data.data;
+                let positionBorderData = e.data;
                 this.setPolygon(positionBorderData, layerId);
             });
         } else {
@@ -341,8 +335,8 @@ class BaseMap extends React.Component{
 
     // 获取省
     getAllProvince = () => {
-        return axios.get('/api/mapCommon/getAllProvince').then((e) => {
+        return getAllProvinceApi().then((e) => {
-            let provinceData = e.data.data;
+            let provinceData = e.data;
             let provinceList = [];
             for (var i in provinceData) {
                 provinceList.push({
@@ -389,13 +383,8 @@ class BaseMap extends React.Component{
     }
      // 获取市
      getCityByProvince = (provinceAdcode) => {
-        return axios.get('/api/mapCommon/getCityByProvince', {
+        return getCityByProvinceApi({provinceAdcode: provinceAdcode}).then((e) => {
-            params: {
+            let cityData = e.data;
-                provinceAdcode: provinceAdcode
-            }
-        }).then((e) => {
-            console.log("e:", e)
-            let cityData = e.data.data;
             let cityList = [];
             for (var i in cityData) {
                 cityList.push({
@@ -439,12 +428,8 @@ class BaseMap extends React.Component{
     }
      // 获取区
      getDistrictByCity = (cityAdcode) => {
-        return axios.get('/api/mapCommon/getDistrictByCity', {
+        return getDistrictByCityApi({cityAdcode: cityAdcode}).then((e) => {
-            params: {
+            let districtData = e.data;
-                cityAdcode: cityAdcode
-            }
-        }).then((e) => {
-            let districtData = e.data.data;
             let districtList = [];
             for (var i in districtData) {
                 districtList.push({
@@ -524,14 +509,8 @@ class BaseMap extends React.Component{
                 return false;
             }else{
                 address = this.state.provinceLabel +  this.state.cityLabel + address;
-                console.log("address:", address)
+                return getPointByAddressApi({address: address}).then((e) => {
-                return axios.get('/api/mapCommon/getPointByAddress', {
+                    let coordinate = e.data;
-                    params: {
-                        address: address
-                    }
-                }).then((e) => {
-                    let coordinate = e.data.data;
-                    console.log("coordinate:", coordinate.location)
                     if(coordinate === ""||coordinate === null){
                         errorSearchAddress();
                     }else{

src/pages/Login/passwordLogin.js

@@ -3,6 +3,7 @@ import { useNavigate } from 'react-router-dom';
 import { passwordLogin } from '../../api';
 import '../../index.less';
 import loginStore from '../../store/login.store';
+import { setToken } from '../../utils/token'
 
 function Login (e) {
   let navigate = useNavigate();
@@ -11,10 +12,12 @@ function Login (e) {
     passwordLogin({phone: values.phone, password: values.password}).then((e) => {
         if (!e.success) {
             message.error(e.message);
-          } else {
+          } else {debugger
-            let setToken = loginStore;
+            // let setToken = loginStore;
-            setToken.setAuthName(e.data.username);
+            // setToken.setAuthName(e.data.username);
-            setToken.setToken(e.data.token)
+            // setToken.setToken(e.data.token)
+            setToken(e.data.token)
+            loginStore.setAuthName(e.data.username)
             navigate('/home');
           }
     })

src/store/login.store.js

@@ -8,17 +8,17 @@ class LoginStore {
         makeAutoObservable(this)
     }
     // token
-    get isLoggedIn() {
+    // get isLoggedIn() {
-        return !!this.token;
+    //     return !!this.token;
-      }
+    //   }
-    setToken = (data) => {
+    // setToken = (data) => {
-       this.token = data;
+    //    this.token = data;
-       localStorage.setItem('authToken', data);
+    //    localStorage.setItem('authToken', data);
-    }
+    // }
-    clearToken() {
+    // clearToken() {
-        this.token = null;
+    //     this.token = null;
-        localStorage.removeItem('authToken');
+    //     localStorage.removeItem('authToken');
-    }
+    // }
     // 登录名
     get authName() {
         return !!this.authName;