Browse Source

后台代理修改

zhaojijng 2 years ago
parent
commit
5ffe2e5895

+ 4 - 1
config/config.ts

@@ -7,7 +7,10 @@ import proxy from './proxy';
 import routes from './routes';
 
 const { REACT_APP_ENV } = process.env;
-
+// let envValus = REACT_APP_ENV.split('-');
+// let env = envValus[0];
+// console.log('env', REACT_APP_ENV);
+//debugger;
 export default defineConfig({
   hash: true,
   antd: {},

+ 3 - 2
config/proxy.ts

@@ -9,15 +9,16 @@
 export default {
   dev: {
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
-    '/api': {
+    '/sgadmin/duoduo-service/': {
       target: 'https://duoduoenv.sagacloud.cn/',
       // target: 'http://192.168.12.13:52011/',
       changeOrigin: true,
       pathRewrite: {
-        '^/api': '',
+        '^/sgadmin/duoduo-service': '/duoduo-service',
       },
     },
   },
+
   test: {
     '/api/': {
       target: 'http://192.168.0.14:52015/',

+ 4 - 1
src/components/map/index.tsx

@@ -11,9 +11,10 @@ type MapProps = {
   selFloorId?: string;
   render: (item: API.MapInfo, index: number) => React.ReactNode;
   mapList: API.MapInfo[];
+  mapSize: any;
 };
 
-const Map: React.FC<MapProps> = ({ type, searchText, selFloorId, render, mapList }) => {
+const Map: React.FC<MapProps> = ({ type, searchText, selFloorId, render, mapList, mapSize }) => {
   //useModel 注释掉 不用啦 晚会删
   // const { mapList, getMapListData } = useModel('map');
   //   useEffect(() => {
@@ -132,6 +133,8 @@ const Map: React.FC<MapProps> = ({ type, searchText, selFloorId, render, mapList
         className={cx(mapstyles.map, { [mapstyles.equipmentMap]: type == 'equipment' })}
         style={{
           transform: `translate(${translateX}px,${translateY}px) scale(${mscale},${mscale})`,
+          width: mapSize.width,
+          height: mapSize.height,
         }}
       >
         {mapList.map(function (item, index) {

+ 2 - 0
src/layouts/index.jsx

@@ -50,6 +50,8 @@ export default (props) => {
 
   useEffect(() => {
     document.querySelector('#root').addEventListener('click', closeNotify, true);
+    const { REACT_APP_ENV } = process.env;
+    console.log('REACT_APP_ENV', REACT_APP_ENV);
     return () => {
       console.log('layout-useEffect-off');
       document.querySelector('#root').removeEventListener('click', closeNotify, true);

+ 2 - 2
src/models/spaceFunc.ts

@@ -43,8 +43,8 @@ export default function () {
       }
     }
   }, []);
-  //const projectId = 'Pj1101080259';
-  const projectId = 'Pj3301100002';
+  const projectId = 'Pj1101080259';
+  //const projectId = 'Pj3301100002';
   return {
     getSpaceFunc,
     projectId,

+ 8 - 0
src/pages/Environment/index.tsx

@@ -96,6 +96,8 @@ const Environment: React.FC = () => {
   const [selNav, setSelNav] = useState<navigatorItem>(navigatorList[0]);
   const [selNavId, setSelNavId] = useState<string>(navigatorList[0].id);
   const [mapList, setMapList] = useState<API.MapInfo[]>([]);
+  const [mapSize, setMapSize] = useState<any>({});
+
   const [envirMapList, setEnvirMapList] = useState<API.MapInfo[]>([]);
   const [mapCombineList, setMapCombineList] = useState<any[]>([]);
   const { getSpaceFunc } = useModel('spaceFunc');
@@ -147,6 +149,11 @@ const Environment: React.FC = () => {
         .then((res) => {
           setLoading(false);
           var data: API.MapInfo[] = (res.data || {}).spaceList || [];
+          var mapSize = {
+            width: (res.data || {}).width,
+            height: (res.data || {}).height,
+          };
+          setMapSize(mapSize);
           setMapList(data);
         })
         .catch(() => {
@@ -261,6 +268,7 @@ const Environment: React.FC = () => {
           type={'enviroment'}
           searchText={searchText}
           mapList={mapCombineList}
+          mapSize={mapSize}
           render={(item: API.MapInfo, index: number) => {
             return (
               <div

+ 8 - 1
src/pages/Equipment/index.tsx

@@ -87,6 +87,8 @@ const Environment: React.FC = () => {
     },
   ]);
   const [mapList, setMapList] = useState<API.MapInfo[]>([]);
+  const [mapSize, setMapSize] = useState<any>({});
+
   const [equipMapList, setEquipMapList] = useState<any[]>([]);
   const [timeMapList, setTimeMapList] = useState<any[]>([]);
   const [selNav, setSelNav] = useState<navigatorItem>(navigatorList[0]);
@@ -218,7 +220,11 @@ const Environment: React.FC = () => {
         .then((res) => {
           setLoading(false);
           var data: API.MapInfo[] = (res.data || {}).spaceList || [];
-
+          var mapSize = {
+            width: (res.data || {}).width,
+            height: (res.data || {}).height,
+          };
+          setMapSize(mapSize);
           setMapList(data);
           //setSelNav(navigatorList[0]); //每当重新请求地图时 让选中导航的默认是第一个
         })
@@ -380,6 +386,7 @@ const Environment: React.FC = () => {
           <Map
             searchText={searchText}
             mapList={mapCombineList}
+            mapSize={mapSize}
             type={'equipment'}
             render={(item, index) => {
               return (

+ 7 - 0
src/pages/Runtime/index.tsx

@@ -28,6 +28,7 @@ const Runtime: React.FC = () => {
   const [searchText, setSearchText] = useState<{ text: any }>();
   const [runtimeNav, setRuntimeNav] = useState<runtimeNavType>({});
   const [mapList, setMapList] = useState<API.MapInfo[]>([]);
+  const [mapSize, setMapSize] = useState<any>({});
   const [mapCombineList, setMapCombineList] = useState<any[]>([]);
   const [selFloorId, setSelFloorId] = useState<string>();
   const [selTime, setSelTime] = useState<string>(moment().format('YYYYMMDD'));
@@ -58,6 +59,11 @@ const Runtime: React.FC = () => {
         .then((res) => {
           setLoading(false);
           var data: API.MapInfo[] = (res.data || {}).spaceList || [];
+          var mapSize = {
+            width: (res.data || {}).width,
+            height: (res.data || {}).height,
+          };
+          setMapSize(mapSize);
           setMapList(data);
         })
         .catch(() => {
@@ -186,6 +192,7 @@ const Runtime: React.FC = () => {
         <Map
           searchText={searchText}
           mapList={mapCombineList}
+          mapSize={mapSize}
           type={'runtime'}
           render={(item, index) => {
             return (

+ 26 - 20
src/services/ant-design-pro/environment.ts

@@ -2,7 +2,7 @@
 import { request } from 'umi';
 
 export async function getMapList(body: any, options?: { [key: string]: any }) {
-  return request<API.MapInfoRes>('/api/duoduo-service/setup-service/map/queryMapInfo', {
+  return request<API.MapInfoRes>('/sgadmin/duoduo-service/setup-service/map/queryMapInfo', {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -13,18 +13,21 @@ export async function getMapList(body: any, options?: { [key: string]: any }) {
 }
 export async function getBuildingList(body: any, options?: { [key: string]: any }) {
   //debugger;
-  return request<API.BuildFloorList>('/api/duoduo-service/object-service/object/building/query', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
+  return request<API.BuildFloorList>(
+    '/sgadmin/duoduo-service/object-service/object/building/query',
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      ...(options || {}),
+      data: body,
     },
-    ...(options || {}),
-    data: body,
-  });
+  );
 }
 export async function getFloorList(body: any, options?: { [key: string]: any }) {
   // debugger;
-  return request<API.BuildFloorList>('/api/duoduo-service/object-service/object/floor/query', {
+  return request<API.BuildFloorList>('/sgadmin/duoduo-service/object-service/object/floor/query', {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -36,7 +39,7 @@ export async function getFloorList(body: any, options?: { [key: string]: any })
 export async function queryDeviceTimeManage(params: any, options?: { [key: string]: any }) {
   //  '/api3/duoduo-service/setup-service/deviceManage/queryDeviceTimeManage'
   return request<API.DeviceTimeType>(
-    '/api/duoduo-service/setup-service/deviceManage/queryDeviceTimeManage',
+    '/sgadmin/duoduo-service/setup-service/deviceManage/queryDeviceTimeManage',
     {
       method: 'GET',
       params: {
@@ -53,7 +56,7 @@ function commonParams() {
 // chart
 export async function queryPropertyData(params: any, options?: { [key: string]: any }) {
   return request<API.DeviceTimeType>(
-    `/api/duoduo-service/duoduoenv-service/spaceAdjust/queryPropertyData?${commonParams()}`,
+    `/sgadmin/duoduo-service/duoduoenv-service/spaceAdjust/queryPropertyData?${commonParams()}`,
     {
       method: 'GET',
       params: params,
@@ -64,7 +67,7 @@ export async function queryPropertyData(params: any, options?: { [key: string]:
 export async function queryEnvironmentParam(body: any, otherParam: { [key: string]: any }) {
   //api/duoduo-service/object-service/object/floor/queryParam
   return request<API.EnvironmentParam>(
-    `/api/duoduo-service/object-service/object/floor/queryParam?endTime=${otherParam.endTime}&startTime=${otherParam.startTime}&param=${otherParam.param}`,
+    `/sgadmin/duoduo-service/object-service/object/floor/queryParam?endTime=${otherParam.endTime}&startTime=${otherParam.startTime}&param=${otherParam.param}`,
     {
       method: 'POST',
       headers: {
@@ -78,7 +81,7 @@ export async function queryEnvironmentParam(body: any, otherParam: { [key: strin
 export async function queryEquipStatistics(params: any, options?: { [key: string]: any }) {
   //
   return request<API.EnvironmentParam>(
-    `/api/duoduo-service/object-service/object/equipment/queryEquipStatistics`,
+    `/sgadmin/duoduo-service/object-service/object/equipment/queryEquipStatistics`,
     {
       method: 'GET',
       headers: {
@@ -94,12 +97,15 @@ export async function queryEquipStatistics(params: any, options?: { [key: string
 
 export async function querySpace(body: any, options?: { [key: string]: any }) {
   //
-  return request<API.EnvironmentParam>(`/api/duoduo-service/object-service/object/space/query`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
+  return request<API.EnvironmentParam>(
+    `/sgadmin/duoduo-service/object-service/object/space/query`,
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      ...(options || {}),
+      data: body,
     },
-    ...(options || {}),
-    data: body,
-  });
+  );
 }

+ 9 - 9
src/services/ant-design-pro/equipment.js

@@ -11,7 +11,7 @@ function getProjectId() {
 //窗帘  设置设备
 //窗帘  设置设备
 export const setEquipeHttp = (params) => {
-    return request(`/api/duoduo-service/duoduoenv-service/object/eqp/infocode/set?${commonParams()}`, {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/object/eqp/infocode/set?${commonParams()}`, {
         method: 'POST',
         isNotShowErrorToast: true,
         errorSave: true,
@@ -24,7 +24,7 @@ export const setEquipeHttp = (params) => {
 
 //窗帘 获取设备
 export const getObjectDataEqpGroupHttp = (params) => {
-    return request(`/api/duoduo-service/duoduoenv-service/object/objectDataEqpGroup/query?${commonParams()}`, {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/object/objectDataEqpGroup/query?${commonParams()}`, {
         method: 'POST',
         isNotShowErrorToast: true,
         errorSave: true,
@@ -36,7 +36,7 @@ export const getObjectDataEqpGroupHttp = (params) => {
 
 // 灯的状态
 export const getLampHttp = (params) => {
-    return request(`/api/duoduo-service/duoduoenv-service/light/status/query?${commonParams()}&spaceId=${params}`, {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/light/status/query?${commonParams()}&spaceId=${params}`, {
         isNotShowErrorToast: true,
         errorSave: true,
         method: 'GET',
@@ -49,7 +49,7 @@ export const getLampHttp = (params) => {
 
 // 批量 开关灯
 export const setallLampHttp = (params) => {
-    return request(`/api/duoduo-service/duoduoenv-service/light/onoff/set?${commonParams()}`, {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/light/onoff/set?${commonParams()}`, {
         method: 'POST',
         isNotShowErrorToast: true,
         errorSave: true,
@@ -62,7 +62,7 @@ export const setallLampHttp = (params) => {
 
 // 开关失败时 定时查询灯状态
 export const getStatusHttp = (params) => {
-    return request(`/api/duoduo-service/duoduoenv-service/light/onoff/setSatus?${commonParams()}`, {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/light/onoff/setSatus?${commonParams()}`, {
         method: 'POST',
         isNotShowErrorToast: true,
         errorSave: true,
@@ -76,7 +76,7 @@ export const getStatusHttp = (params) => {
 
 //  空调 - 调节文案/空调信息
 export const getFeedbackDocumentsHttp = (params) => {
-    return request(`/api/duoduo-service/duoduoenv-service/custom/feedback/documents?${commonParams()}`, {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/custom/feedback/documents?${commonParams()}`, {
         isNotShowErrorToast: true,
         errorSave: true,
         method: 'POST',
@@ -89,7 +89,7 @@ export const getFeedbackDocumentsHttp = (params) => {
 
 //  空调 调节
 export const changeAirHttp = (params) => {
-    return request(`/api/duoduo-service/duoduoenv-service/custom/feedbackCreate/v2?${commonParams()}`, {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/custom/feedbackCreate/v2?${commonParams()}`, {
         method: 'POST',
         isNotShowErrorToast: true,
         errorSave: true,
@@ -102,7 +102,7 @@ export const changeAirHttp = (params) => {
 
 // 空间环境质量
 export const getSpaceAdjustList = (params) => {
-    return request(`/api/duoduo-service/duoduoenv-service/space/property?${commonParams()}`, {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/space/property?${commonParams()}`, {
         method: 'POST',
         isNotShowErrorToast: true,
         errorSave: true,
@@ -114,7 +114,7 @@ export const getSpaceAdjustList = (params) => {
 }
 //  批量空调 调节
 export const changeAllAirHttp = (body) => {
-    return request(`/api/duoduo-service/duoduoenv-service/custom/feedbackCreate/v2Batch?${commonParams()}`, {
+    return request(`/sgadmin/duoduo-service/duoduoenv-service/custom/feedbackCreate/v2Batch?${commonParams()}`, {
         method: 'POST',
         isNotShowErrorToast: true,
         errorSave: true,