浏览代码

改变projectId的存储方式

zhaojijng 2 年之前
父节点
当前提交
2af2693d50

+ 8 - 3
src/app.tsx

@@ -1,7 +1,7 @@
 import { PageLoading } from '@ant-design/pro-layout';
 import { history, useModel } from 'umi';
 import { checkToken, reFreshCheckToken } from '@/services/sgservice/environment';
-import { projectId } from '@/config/api.js';
+import { projectObj } from '@/config/api.js';
 import UserStorage from '@/config/user';
 const loginPath = '/noAuth';
 
@@ -50,10 +50,12 @@ export async function getInitialState(): Promise<{
     } catch (err) {
       history.push(loginPath);
     }
+
     if (resUser) {
       //获取用户信息 并储存
       var userObj = UserStorage.getInstance();
       userObj.setUser(resUser);
+
       return resUser;
     } else {
       history.push(loginPath);
@@ -62,15 +64,18 @@ export async function getInitialState(): Promise<{
   };
 
   let currentUser = {};
-  //之江项目 验证token
-  if (projectId == 'Pj3301100002') {
+  //projectId = 'Pj1101080259';
+  if (projectObj.projectId == 'Pj3301100002') {
+    //之江项目 验证token
     currentUser = await fetchUser();
   } else {
+    //非之江项目
     let tempUser = {
       name: '行政测试',
       phone: '17611228068',
       id: '9a1ecfbacb6b4f249bf2dd3ec7793ead',
     };
+
     var userObj = UserStorage.getInstance();
     userObj.setUser(tempUser);
   }

+ 3 - 2
src/config/api.js

@@ -1,3 +1,4 @@
 export const BASE_PATH = '/api';
-export const projectId = 'Pj3301100002';//之江
-//export const projectId = 'Pj1101080259';
+//export const projectId = 'Pj3301100002';//之江
+//export const projectId = 'Pj1101080259';//Pj1101080259
+export const projectObj = { projectId: 'Pj1101080259' };

+ 2 - 2
src/pages/Environment/index.tsx

@@ -7,7 +7,7 @@ import TopNavigator from '@/sgcomponents/topNavigator';
 import ChartModal from './components/chartModal';
 import moment from 'moment';
 import { getMapList, queryEnvironmentParam } from '@/services/sgservice/environment';
-import { projectId } from '@/config/api.js';
+import { projectObj } from '@/config/api.js';
 import { equipImageMap } from '@/config/image.js';
 import { Spin } from 'antd';
 import Icon from '@/tenants-ui/SgIcon';
@@ -163,7 +163,7 @@ const Environment: React.FC = () => {
   useEffect(() => {
     if (selNavId && selFloorId) {
       //setLoading(true);
-      var floorParams = [{ id: selFloorId, projectId: projectId }];
+      var floorParams = [{ id: selFloorId, projectId: projectObj.projectId }];
       var endTime = moment();
       var startTime = moment().subtract(30, 'minutes');
       var startStr = startTime.format('YYYYMMDDHHmmss');

+ 5 - 5
src/pages/Equipment/components/deviceModal/index.jsx

@@ -9,7 +9,7 @@ import CurtainEq from './curtainEq';
 import { getSpaceAdjustList } from '@/services/sgservice/equipment';
 import { useRef } from 'react';
 import { useModel } from 'umi';
-import { projectId } from '@/config/api.js';
+import { projectObj } from '@/config/api.js';
 
 export default ({ onClose, showSpace }) => {
   const envArr = [
@@ -99,7 +99,7 @@ export default ({ onClose, showSpace }) => {
     const paramsObj = {
       criteria: {
         spaceId: showSpace.id,
-        projectId: projectId,
+        projectId: projectObj.projectId,
       },
     };
     getSpaceAdjustList(paramsObj).then((res) => {
@@ -257,17 +257,17 @@ export default ({ onClose, showSpace }) => {
               <Row gutter={[12, 18]}>
                 {showEqCard('airConditioner') && (
                   <Col span={12}>
-                    <AirEq spaceId={showSpace.id} projectId={projectId}></AirEq>
+                    <AirEq spaceId={showSpace.id} projectId={projectObj.projectId}></AirEq>
                   </Col>
                 )}
                 {showEqCard('light') && (
                   <Col span={12}>
-                    <LampEq spaceId={showSpace.id} projectId={projectId}></LampEq>
+                    <LampEq spaceId={showSpace.id} projectId={projectObj.projectId}></LampEq>
                   </Col>
                 )}
                 {showEqCard('curtain') && (
                   <Col span={12}>
-                    <CurtainEq spaceId={showSpace.id} projectId={projectId}></CurtainEq>
+                    <CurtainEq spaceId={showSpace.id} projectId={projectObj.projectId}></CurtainEq>
                   </Col>
                 )}
               </Row>

+ 3 - 3
src/pages/Equipment/components/topNavRight/index.tsx

@@ -6,7 +6,7 @@ import { EllipsisOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
 import styles from './index.less';
 //import { equipImageMap } from '@/config/image.js';
 import type { navigatorItem } from '@/pages/Environment/index';
-import { projectId } from '@/config/api.js';
+import { projectObj } from '@/config/api.js';
 
 import { changeCurtain, changeAllAir, changeLight } from '@/pages/Equipment/equipmentControl';
 
@@ -67,7 +67,7 @@ const TopNavRight: React.FC<topNavRightProps> = ({
         //如果是空调
         if (filterSpaceArr.length == 0) return;
         if (selNavObj.id == 'airConditioner') {
-          changeAllAir(filterSpaceArr, getDeviceStatus, '打开', projectId);
+          changeAllAir(filterSpaceArr, getDeviceStatus, '打开', projectObj.projectId);
         }
         if (selNavObj.id == 'light') {
           changeLight('all', filterSpaceArr, getDeviceStatus, '打开');
@@ -116,7 +116,7 @@ const TopNavRight: React.FC<topNavRightProps> = ({
 
         //如果是空调
         if (selNavObj.id == 'airConditioner') {
-          changeAllAir(filterSpaceArr, getDeviceStatus, '关闭', projectId);
+          changeAllAir(filterSpaceArr, getDeviceStatus, '关闭', projectObj.projectId);
         }
         if (selNavObj.id == 'light') {
           changeLight('all', filterSpaceArr, getDeviceStatus, '关闭');

+ 2 - 2
src/pages/Equipment/index.tsx

@@ -18,7 +18,7 @@ import { ExclamationCircleOutlined } from '@ant-design/icons';
 import { equipImageMap } from '@/config/image.js';
 import Icon from '@/tenants-ui/SgIcon';
 import type { navigatorItem } from '@/pages/Environment/index';
-import { projectId } from '@/config/api.js';
+import { projectObj } from '@/config/api.js';
 import {
   getMapList,
   queryEquipStatistics,
@@ -251,7 +251,7 @@ const Environment: React.FC = () => {
     //setLoading(true);
     return queryEquipStatistics({
       floorId: selFloorId,
-      projectId: projectId,
+      projectId: projectObj.projectId,
     })
       .then((res) => {
         // setLoading(false);

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

@@ -56,7 +56,6 @@ const Runtime: React.FC = () => {
       getMapList({
         floorId: selFloorId,
         //floorId: 'Fl11010802593241ec348ecb4148806b9034c8957454',
-        projectId: '',
       })
         .then((res) => {
           setLoading(false);

+ 2 - 2
src/services/sgservice/environment.ts

@@ -1,6 +1,6 @@
 /** 登录接口 POST /api/login/account */
 import { request } from 'umi';
-import { projectId } from '@/config/api';
+import { projectObj } from '@/config/api';
 import UserStorage from '@/config/user';
 
 export async function getMapList(body: any, options?: { [key: string]: any }) {
@@ -59,7 +59,7 @@ export async function queryDeviceTimeManage(params: any, options?: { [key: strin
 }
 
 function getProjectId() {
-  const id = projectId;
+  const id = projectObj.projectId;
   return id;
 }
 

+ 2 - 2
src/services/sgservice/equipment.js

@@ -1,10 +1,10 @@
 import { request } from 'umi';
-import { projectId } from '@/config/api.js';
+import { projectObj } from '@/config/api.js';
 import UserStorage from '@/config/user';
 
 function getProjectId() {
     //const id = window.localStorage.getItem('localProjectId')
-    const id = projectId
+    const id = projectObj.projectId
     return id;
 }
 

+ 2 - 2
src/sgcomponents/SearchInput/index.tsx

@@ -10,7 +10,7 @@ type mapResType = {
   [key: string]: any;
 };
 import { querySpace } from '@/services/sgservice/environment';
-import { projectId } from '@/config/api.js';
+import { projectObj } from '@/config/api.js';
 const { Option } = Select;
 
 type SearchInputProps = {
@@ -32,7 +32,7 @@ const SearchInput: React.FC<SearchInputProps> = () => {
       setLoading(true);
       var paramsObj = {
         criteria: {
-          projectId: projectId,
+          projectId: projectObj.projectId,
           localName: {
             $like: `%${value}%`,
           },

+ 7 - 3
src/sgcomponents/topNavigator/index.tsx

@@ -5,8 +5,10 @@ import { Select } from 'antd';
 
 import type { navigatorItem } from '@/pages/Environment/index';
 import { getBuildingList, getFloorList } from '@/services/sgservice/environment';
-import { projectId } from '@/config/api.js';
+import { projectObj } from '@/config/api.js';
 import { useModel } from 'umi';
+import UserStorage from '@/config/user';
+
 export type topNavigatorProps = {
   navigatorList?: navigatorItem[];
   type: string;
@@ -61,11 +63,13 @@ const TopNavigator: React.FC<topNavigatorProps> = ({
 
   //请求建筑的接口
   useEffect(() => {
-    //console.log('TopNavigator----getBuildingList');
+    var userObj = UserStorage.getInstance();
+    const user = userObj.getUser();
+    console.log('TopNavigator----getBuildingList', user, projectObj.projectId);
     if (buildList.length == 0) {
       getBuildingList({
         criteria: {
-          projectId: projectId,
+          projectId: projectObj.projectId,
         },
         orders: [
           {