Merge branch 'oldLogin' into city-zw

src/app.ts

@@ -12,7 +12,7 @@ import { checkBeforeLogin } from './utils/loginUtil/SSO';
 
 //request 配置
 export const request: RequestConfig = {
-  timeout: 10000,
+  timeout: 30000,
   errorConfig,
   requestInterceptors,
   responseInterceptors,

src/models/regionalIndex.ts

@@ -41,7 +41,6 @@ const useRegionalIndex = () => {
     },
   );
 
-
   return {
     areaListDto,
     loading,

src/pages/TheOperationOfTheDistrictCityAndCounty/components/Map/index.tsx

-// import BMapView from '@/components/BMapView';
 import CooglMap from '@/components/CooglMap';
+import services from '@/services';
 import BMapService from '@/utils/mapService';
 import { getColorByIndex } from '@/utils/ui';
 import { useModel } from '@umijs/max';
 import { Space } from 'antd';
-import React, { CSSProperties, Fragment, useRef, useState } from 'react';
+import React, {
+  CSSProperties,
+  Fragment,
+  useEffect,
+  useRef,
+  useState,
+} from 'react';
 import DistrictDetailBar from '../DIstrictDetailBar';
 import styles from './index.less';
 
@@ -14,9 +20,22 @@ const DistrictMap: React.FC = () => {
   const { selectDistrict, areaListDto } = useModel('regionalIndex');
 
   const MapRef = useRef<any>();
+
   /** 是否启用百度地图 */
   const [isBmap, setIsBmap] = useState(false);
 
+  const [data, setData] = useState<any[]>([]);
+
+  useEffect(() => {
+    services.Physicalsign.getObjectPolygon({
+      physicalSignType: 1,
+      objectHierarchy: 1,
+    }).then((res) => {
+      setData(res.data);
+    });
+  }, []);
+
+  const [selectedData, setSelectedData] = useState<any>({});
   /**
    * @description 设置地图视野
    */
@@ -32,83 +51,15 @@ const DistrictMap: React.FC = () => {
       map.setViewport(points);
     }
   };
-  console.log(selectDistrict);
+  console.log(data, selectedData);
+  useEffect(() => {
+    const temp = data.find((v) => v?.objectId === selectDistrict?.objectId);
+
+    setSelectedData(temp);
+  }, [data, selectDistrict]);
 
   return (
     <div className={styles.container}>
-      {/* {isBmap ? (
-        <BMapView
-          zoom={13}
-          ref={MapRef}
-          style={{ width: '100%', height: '110%' }}
-          center={new BMapGL.Point(104.066349, 30.658842)}
-        >
-          {!selectDistrict ? (
-            <Fragment>
-              {areaListDto.map((item, index) => {
-                return (
-                  <Polygon
-                    fillColor={getColorByIndex(Number(item.qualitySign))}
-                    key={index}
-                    strokeColor="#fff"
-                    fillOpacity={0.3}
-                    strokeWeight={2}
-                    path={BMapService.buildPoints(item.points)}
-                  ></Polygon>
-                );
-              })}
-              {areaListDto.map((item, index) => {
-                const point = BMapService.buildPoint(
-                  Number(item.centerX),
-                  Number(item.centerY),
-                );
-
-                return (
-                  <CustomOverlay position={point}>
-                    <div
-                      className={styles.indexMarker}
-                      style={
-                        BMapService.getMakerCSS(
-                          Number(item.qualitySign),
-                        ) as CSSProperties
-                      }
-                    >
-                      {Number(item.qualitySign)}
-                    </div>
-                  </CustomOverlay>
-                );
-              })}
-            </Fragment>
-          ) : (
-            <>
-              <Polygon
-                fillColor={getColorByIndex(Number(selectDistrict?.qualitySign))}
-                strokeColor="#fff"
-                fillOpacity={0.3}
-                strokeWeight={2}
-                path={BMapService.buildPoints(selectDistrict?.points)}
-              ></Polygon>
-              <CustomOverlay
-                position={BMapService.buildPoint(
-                  Number(selectDistrict?.centerX),
-                  Number(selectDistrict?.centerY),
-                )}
-              >
-                <div
-                  className={styles.indexMarker}
-                  style={
-                    BMapService.getMakerCSS(
-                      Number(selectDistrict?.qualitySign),
-                    ) as CSSProperties
-                  }
-                >
-                  {Number(selectDistrict?.qualitySign)}
-                </div>
-              </CustomOverlay>
-            </>
-          )}
-        </BMapView>
-      ) : ( */}
       <CooglMap.MapView
         zoom={13}
         ref={MapRef}
@@ -116,7 +67,8 @@ const DistrictMap: React.FC = () => {
       >
         {!selectDistrict ? (
           <Fragment>
-            {areaListDto.map((item, index) => {
+            {data.map((item, index) => {
+              console.log(item);
               return (
                 <CooglMap.Polygon
                   fillColor={getColorByIndex(Number(item.qualitySign))!}
@@ -128,7 +80,7 @@ const DistrictMap: React.FC = () => {
                 ></CooglMap.Polygon>
               );
             })}
-            {areaListDto.map((item, index) => {
+            {data.map((item, index) => {
               const point = [Number(item.centerX), Number(item.centerY)];
 
               return (
@@ -150,42 +102,37 @@ const DistrictMap: React.FC = () => {
         ) : (
           <>
             <CooglMap.Polygon
-              fillColor={getColorByIndex(Number(selectDistrict?.qualitySign))!}
+              fillColor={getColorByIndex(Number(selectedData?.qualitySign))!}
               strokeColor="#fff"
-              points={selectDistrict?.points}
+              points={selectedData?.points}
               strokeWidth={2}
               fillOpacity={0.2}
             ></CooglMap.Polygon>
             <CooglMap.CustomOverlay
               position={[
-                Number(selectDistrict?.centerX),
-                Number(selectDistrict?.centerY),
+                Number(selectedData?.centerX),
+                Number(selectedData?.centerY),
               ]}
             >
               <div
                 className={styles.indexMarker}
                 style={
                   BMapService.getMakerCSS(
-                    Number(selectDistrict?.qualitySign),
+                    Number(selectedData?.qualitySign),
                   ) as CSSProperties
                 }
               >
-                {Number(selectDistrict?.qualitySign)}
+                {Number(selectedData?.qualitySign)}
               </div>
             </CooglMap.CustomOverlay>
           </>
         )}
       </CooglMap.MapView>
-      {/* )} */}
 
       {selectDistrict && (
         <div className={styles.districtName}>{selectDistrict.objectName}</div>
       )}
       <div className={styles.statusBar}>
-        {/* <Space>
-          <Switch onChange={setIsBmap}></Switch>
-          <div>启用百度地图</div>
-        </Space> */}
         <Space>
           <div className={styles.mark} style={{ backgroundColor: '#F24F4F' }} />
           <div>应急态 &lt;60</div>

src/services/Physicalsign.ts

@@ -70,12 +70,12 @@ export async function getlistTopNItems(
 }
 
 //中观体征地图边界
-export async function getObjectPolygon(): Promise<
-  PhysicalsignApi.Result<PhysicalsignApi.ListTopNItems>
-> {
-  return request(
-    urlProxyApis(`/middlePhysicalSign/getObjectPolygon?objectId=1`),
-  );
+export async function getObjectPolygon(
+  params: any,
+): Promise<PhysicalsignApi.Result<PhysicalsignApi.ListTopNItems>> {
+  return request(urlProxyApis(`/middlePhysicalSign/getObjectPolygon`), {
+    params: params,
+  });
 }
 
 //中观体征县区体征数据
@@ -96,12 +96,10 @@ export async function getGroupObjectPhysicalSignIndex(data: {
 /**
  * @description 获取体征指数对比结果接口
  */
-export async function getComparisonIndexInstance(
-  data: any,
-): Promise<any> {
+export async function getComparisonIndexInstance(data: any): Promise<any> {
   return request(urlProxyApis(`/main/getComparisonIndexInstance`), {
     params: data,
-    timeout:30000
+    timeout: 30000,
   });
 }
 
@@ -162,7 +160,7 @@ export async function getIndexSystem(
   params: any,
 ): Promise<PhysicalsignApi.Result<any>> {
   return request(urlProxyApis(`/physicalSignIndex/getIndexSystem`), {
-    params
+    params,
   });
 }
 
@@ -206,7 +204,7 @@ export async function getIndexInstanceData(
 ): Promise<PhysicalsignApi.Result<any>> {
   return request(urlProxyApis(`/main/getIndexInstance`), {
     params: data,
-    timeout:30000
+    timeout: 30000,
   });
 }
 
@@ -293,12 +291,10 @@ export async function getCityEventGroupBySource(params: {
 }
 
 //获取所有行业情况
-export async function getAllIndutryIndexInstance(
-  params: {
-    physicalSignType: string;  
-    objectId: string;
-  },
-): Promise<PhysicalsignApi.Result<PhysicalsignApi.IndutryIndexInstanceDto>> {
+export async function getAllIndutryIndexInstance(params: {
+  physicalSignType: string;
+  objectId: string;
+}): Promise<PhysicalsignApi.Result<PhysicalsignApi.IndutryIndexInstanceDto>> {
   return request(urlProxyApis(`/zhgl/getAllIndutryIndexInstance`), {
     method: 'GET',
     params,
@@ -306,12 +302,10 @@ export async function getAllIndutryIndexInstance(
 }
 
 //城市运行情况的行业体征
-export async function getCityRunIndutryIndexInstance(
-  params: {
-    physicalSignType: string;  
-    objectId: string;
-  },
-): Promise<PhysicalsignApi.Result<PhysicalsignApi.IndutryIndexInstanceDto>> {
+export async function getCityRunIndutryIndexInstance(params: {
+  physicalSignType: string;
+  objectId: string;
+}): Promise<PhysicalsignApi.Result<PhysicalsignApi.IndutryIndexInstanceDto>> {
   return request(urlProxyApis(`/zhgl/getCityRunIndutryIndexInstance`), {
     method: 'GET',
     params,
@@ -320,10 +314,10 @@ export async function getCityRunIndutryIndexInstance(
 
 //近三十天体征趋势
 export async function TrendAnalysis(
-  params: any
-): Promise<PhysicalsignApi.Result<{indexScore:string,date:string}>> {
+  params: any,
+): Promise<PhysicalsignApi.Result<{ indexScore: string; date: string }>> {
   return request(urlProxyApis(`/physicalsignindexinstance/trendAnalysis`), {
     method: 'GET',
     params,
   });
-}
+}
\ No newline at end of file