瀏覽代碼

再次为了合入大方做修改目录结构

zhaojijng 2 年之前
父節點
當前提交
14a80d7e2d

+ 1 - 1
src/app.tsx

@@ -2,7 +2,7 @@ import { PageLoading } from '@ant-design/pro-layout';
 import { history, useModel } from 'umi';
 import { checkToken, reFreshCheckToken } from '@/services/sagacare_service/environment';
 import { projectObj } from '@/config/api.js';
-import UserStorage from '@/config/sagacare_user';
+import UserStorage from '@/config/sagacare/sagacare_user';
 const loginPath = '/noAuth';
 
 /** 获取用户信息比较慢的时候会展示一个 loading */

+ 0 - 173
src/assets/css/map.less

@@ -1,173 +0,0 @@
-.spinnclass {
-  // height: calc(100% - 245px);
-}
-
-:global {
-  .ant-spin-container {
-    height: 100%;
-  }
-}
-
-.mapwrap {
-  position: relative;
-  // height: calc(100% - 285px);
-  height: 100%;
-  overflow: hidden;
-  .mapControl {
-    position: absolute;
-    right: 20px;
-    bottom: 20px;
-    z-index: 1;
-
-    .zoom {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: 40px;
-      height: 40px;
-      margin-bottom: 7px;
-      font-size: 25px;
-      background: #fff;
-      border-radius: 4px;
-      cursor: pointer;
-    }
-    .zoom:hover {
-      box-shadow: 0 0 2px rgba(0, 0, 0, 0.05), 0 4px 15px rgba(0, 0, 0, 0.05);
-    }
-    .zoom.disable {
-      opacity: 0.4;
-    }
-  }
-}
-.map {
-  position: relative;
-  width: 3000px;
-  height: 1200px;
-  transform-origin: 0% 0%;
-  cursor: pointer;
-  .houseWrap {
-    position: absolute;
-    box-sizing: border-box;
-    padding: 3px;
-  }
-  .house {
-    position: relative;
-    box-sizing: border-box;
-    width: 100%;
-    height: 100%;
-    border: 2px solid #fff;
-    border-radius: 6px;
-    // .noDevice {
-    //   position: absolute;
-    //   top: 0;
-    //   left: 0;
-    //   box-sizing: border-box;
-    //   width: 100%;
-    //   height: 100%;
-    //   padding: 4px;
-    //   white-space: nowrap;
-    //   //   background: rgba(255, 255, 255, 0.8);
-    //   .noText {
-    //     padding: 4px 6px;
-    //     background-color: #ccc;
-    //     border-radius: 5px;
-    //   }
-    // }
-    .allDevice {
-      position: absolute;
-      top: 6px;
-      left: 6px;
-      z-index: 1;
-      display: flex;
-      width: 100%;
-      .icon {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 22px;
-        height: 22px;
-        margin-right: 3px;
-        color: #fff;
-        font-size: 11px;
-        background: transparent;
-        border-radius: 22px;
-      }
-    }
-    .allTime {
-      position: absolute;
-      top: 4px;
-      left: 4px;
-      z-index: 1;
-      display: flex;
-      width: 100%;
-      color: #4d5262;
-      font-size: 10px;
-      text-shadow: -1px 0 white, 0 1px white, 1px 0 white, 0 -1px white;
-      .overworkTime {
-        color: #5e8bcf;
-      }
-      .meetTime {
-        color: #00dc23;
-      }
-    }
-    .content {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      height: 100%;
-      .name {
-        box-sizing: border-box;
-        width: 100%;
-        padding: 0 3px;
-        color: #000;
-        font-size: 13px;
-        text-align: center;
-        //text-shadow: 1px 1px 1px #fff;
-        text-shadow: -1px 0 white, 0 1px white, 1px 0 white, 0 -1px white;
-      }
-    }
-    .contentDiv {
-      display: inline-block;
-      //   padding: 6px;
-      text-align: center;
-    }
-  }
-
-  .notclick {
-    background: url(../images/bg_disable.png) repeat;
-    border-color: #dfe3ed;
-    cursor: default;
-    .contentDiv {
-      background-color: #eceff4;
-    }
-  }
-
-  .searchSel {
-    border-color: rgba(77, 148, 255, 0.8);
-  }
-}
-
-.equipmentMap {
-  .house {
-    cursor: pointer;
-    .showModal {
-      position: absolute;
-      right: 6px;
-      bottom: 7px;
-      z-index: 2;
-      display: flex;
-      display: none;
-      align-items: center;
-      justify-content: center;
-      width: 22px;
-      height: 22px;
-      font-size: 12px;
-      background: #fff;
-      border-radius: 22px;
-    }
-    &:hover .showModal {
-      display: flex;
-    }
-  }
-}

+ 3 - 2
src/assets/icons/iconfont.css

@@ -1,7 +1,8 @@
 @font-face {
   font-family: 'iconfont'; /* Project id 3184967 */
-  src: url('./iconfont.woff2') format('woff2'), url('./iconfont.woff') format('woff'),
-    url('./iconfont.ttf') format('truetype');
+  src: url('~@/assets/icons/sagacare/iconfont.woff2') format('woff2'),
+    url('~@/assets/icons/sagacare/iconfont.woff') format('woff'),
+    url('~@/assets/icons/sagacare/iconfont.ttf') format('truetype');
 }
 
 .iconfont {

src/assets/icons/iconfont.json → src/assets/icons/sagacare/iconfont.json


src/assets/icons/iconfont.ttf → src/assets/icons/sagacare/iconfont.ttf


src/assets/icons/iconfont.woff → src/assets/icons/sagacare/iconfont.woff


src/assets/icons/iconfont.woff2 → src/assets/icons/sagacare/iconfont.woff2


src/assets/images/bg_disable.png → src/assets/images/page-equipment/bg_disable.png


+ 1 - 1
src/config/api.js

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

src/config/sagacare_image.js → src/config/sagacare/sagacare_image.js


src/config/sagacare_user.ts → src/config/sagacare/sagacare_user.ts


+ 1 - 1
src/global.less

@@ -3,7 +3,7 @@
 @import './assets/css/antd-tenants.less';
 @import './assets/css/antd-reset.less';
 
-@import './assets/icons/iconfont.css';
+@import './assets/icons/sagacare/iconfont.css';
 
 html,
 body,

+ 1 - 1
src/pages/Environment/components/chartModal/index.jsx

@@ -3,7 +3,7 @@ import { Modal, Form } from 'antd';
 import Icon from '@/tenants-ui/SgIcon';
 import styles from './index.less';
 import cx from 'classnames';
-import { equipImageMap } from '@/config/sagacare_image.js';
+import { equipImageMap } from '@/config/sagacare/sagacare_image.js';
 import LineChart from './lineChart';
 
 export default ({ onClose, showSpace, selNav }) => {

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

@@ -8,13 +8,13 @@ import ChartModal from './components/chartModal';
 import moment from 'moment';
 import { getMapList, queryEnvironmentParam } from '@/services/sagacare_service/environment';
 import { projectObj } from '@/config/api.js';
-import { equipImageMap } from '@/config/sagacare_image.js';
+import { equipImageMap } from '@/config/sagacare/sagacare_image.js';
 import { Spin } from 'antd';
 import Icon from '@/tenants-ui/SgIcon';
 
 import cx from 'classnames';
 import styles from './index.less';
-import mapstyles from '@/assets/css/map.less';
+import mapstyles from '@/sagacare_components/map/index.less';
 
 export type navigatorItem = {
   name: string;

+ 1 - 1
src/pages/Equipment/components/deviceModal/airEq/index.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect, useRef } from 'react';
 import { message } from 'antd';
 import styles from './index.less';
 import commonStyles from '../common.less';
-import { equipImageMap } from '@/config/sagacare_image.js';
+import { equipImageMap } from '@/config/sagacare/sagacare_image.js';
 import AnSwitch from '../anSwitch';
 import { getFeedbackDocumentsHttp, changeAirHttp } from '@/services/sagacare_service/equipment';
 

+ 1 - 1
src/pages/Equipment/components/deviceModal/curtainEq/curtainBtn.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useCallback, useRef } from 'react';
 import commonStyles from '../common.less';
-import { equipImageMap } from '@/config/sagacare_image.js';
+import { equipImageMap } from '@/config/sagacare/sagacare_image.js';
 import { setEquipeHttp } from '@/services/sagacare_service/equipment';
 
 const { curtain_close_icon_row, curtain_open_icon_row } = equipImageMap;

+ 1 - 1
src/pages/Equipment/components/deviceModal/curtainEq/index.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import styles from './index.less';
 import commonStyles from '../common.less';
-import { equipImageMap } from '@/config/sagacare_image.js';
+import { equipImageMap } from '@/config/sagacare/sagacare_image.js';
 import CurtainBtn from './curtainBtn';
 import { getObjectDataEqpGroupHttp } from '@/services/sagacare_service/equipment';
 

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

@@ -2,7 +2,7 @@ import React, { useState, useEffect, useMemo } from 'react';
 import { Modal, Row, Col } from 'antd';
 import Icon from '@/tenants-ui/SgIcon';
 import styles from './index.less';
-import { equipImageMap } from '@/config/sagacare_image.js';
+import { equipImageMap } from '@/config/sagacare/sagacare_image.js';
 import AirEq from './airEq';
 import LampEq from './lampEq';
 import CurtainEq from './curtainEq';

+ 1 - 1
src/pages/Equipment/components/deviceModal/lampEq/index.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect, useCallback, useRef } from 'react';
 import { message } from 'antd';
 import styles from './index.less';
 import commonStyles from '../common.less';
-import { equipImageMap } from '@/config/sagacare_image.js';
+import { equipImageMap } from '@/config/sagacare/sagacare_image.js';
 import AnSwitch from '../anSwitch';
 import { getLampHttp, getStatusHttp, setallLampHttp } from '@/services/sagacare_service/equipment';
 import { setallLamps } from '@/pages/Equipment/checLampStatus.js';

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

@@ -4,7 +4,7 @@ import { Dropdown, Menu, Modal, message } from 'antd';
 import Icon from '@/tenants-ui/SgIcon';
 import { EllipsisOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
 import styles from './index.less';
-//import { equipImageMap } from '@/config/sagacare_image.js';
+//import { equipImageMap } from '@/config/sagacare/sagacare_image.js';
 import type { navigatorItem } from '@/pages/Environment/index';
 import { projectObj } from '@/config/api.js';
 

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

@@ -9,13 +9,13 @@ import TopNavRight from './components/topNavRight';
 import DeviceModal from './components/deviceModal';
 
 import styles from './index.less';
-import mapstyles from '@/assets/css/map.less';
+import mapstyles from '@/sagacare_components/map/index.less';
 import cx from 'classnames';
 import { Spin, Modal, message } from 'antd';
 import moment from 'moment';
 
 import { ExclamationCircleOutlined } from '@ant-design/icons';
-import { equipImageMap } from '@/config/sagacare_image.js';
+import { equipImageMap } from '@/config/sagacare/sagacare_image.js';
 import Icon from '@/tenants-ui/SgIcon';
 import type { navigatorItem } from '@/pages/Environment/index';
 import { projectObj } from '@/config/api.js';

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

@@ -7,7 +7,7 @@ import { FormattedMessage, history, useModel } from 'umi';
 import { Spin } from 'antd';
 import { Popover } from 'antd';
 import styles from './index.less';
-import mapstyles from '@/assets/css/map.less';
+import mapstyles from '@/sagacare_components/map/index.less';
 import Icon from '@/tenants-ui/SgIcon';
 import SearchInput from '@/sagacare_components/SearchInput';
 import moment from 'moment';

+ 173 - 0
src/sagacare_components/map/index.less

@@ -0,0 +1,173 @@
+.spinnclass {
+  // height: calc(100% - 245px);
+}
+
+:global {
+  .ant-spin-container {
+    height: 100%;
+  }
+}
+
+.mapwrap {
+  position: relative;
+  // height: calc(100% - 285px);
+  height: 100%;
+  overflow: hidden;
+  .mapControl {
+    position: absolute;
+    right: 20px;
+    bottom: 20px;
+    z-index: 1;
+
+    .zoom {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 40px;
+      height: 40px;
+      margin-bottom: 7px;
+      font-size: 25px;
+      background: #fff;
+      border-radius: 4px;
+      cursor: pointer;
+    }
+    .zoom:hover {
+      box-shadow: 0 0 2px rgba(0, 0, 0, 0.05), 0 4px 15px rgba(0, 0, 0, 0.05);
+    }
+    .zoom.disable {
+      opacity: 0.4;
+    }
+  }
+}
+.map {
+  position: relative;
+  width: 3000px;
+  height: 1200px;
+  transform-origin: 0% 0%;
+  cursor: pointer;
+  .houseWrap {
+    position: absolute;
+    box-sizing: border-box;
+    padding: 3px;
+  }
+  .house {
+    position: relative;
+    box-sizing: border-box;
+    width: 100%;
+    height: 100%;
+    border: 2px solid #fff;
+    border-radius: 6px;
+    // .noDevice {
+    //   position: absolute;
+    //   top: 0;
+    //   left: 0;
+    //   box-sizing: border-box;
+    //   width: 100%;
+    //   height: 100%;
+    //   padding: 4px;
+    //   white-space: nowrap;
+    //   //   background: rgba(255, 255, 255, 0.8);
+    //   .noText {
+    //     padding: 4px 6px;
+    //     background-color: #ccc;
+    //     border-radius: 5px;
+    //   }
+    // }
+    .allDevice {
+      position: absolute;
+      top: 6px;
+      left: 6px;
+      z-index: 1;
+      display: flex;
+      width: 100%;
+      .icon {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 22px;
+        height: 22px;
+        margin-right: 3px;
+        color: #fff;
+        font-size: 11px;
+        background: transparent;
+        border-radius: 22px;
+      }
+    }
+    .allTime {
+      position: absolute;
+      top: 4px;
+      left: 4px;
+      z-index: 1;
+      display: flex;
+      width: 100%;
+      color: #4d5262;
+      font-size: 10px;
+      text-shadow: -1px 0 white, 0 1px white, 1px 0 white, 0 -1px white;
+      .overworkTime {
+        color: #5e8bcf;
+      }
+      .meetTime {
+        color: #00dc23;
+      }
+    }
+    .content {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      height: 100%;
+      .name {
+        box-sizing: border-box;
+        width: 100%;
+        padding: 0 3px;
+        color: #000;
+        font-size: 13px;
+        text-align: center;
+        //text-shadow: 1px 1px 1px #fff;
+        text-shadow: -1px 0 white, 0 1px white, 1px 0 white, 0 -1px white;
+      }
+    }
+    .contentDiv {
+      display: inline-block;
+      //   padding: 6px;
+      text-align: center;
+    }
+  }
+
+  .notclick {
+    background: url(~@/assets/images/page-equipment/bg_disable.png) repeat;
+    border-color: #dfe3ed;
+    cursor: default;
+    .contentDiv {
+      background-color: #eceff4;
+    }
+  }
+
+  .searchSel {
+    border-color: rgba(77, 148, 255, 0.8);
+  }
+}
+
+.equipmentMap {
+  .house {
+    cursor: pointer;
+    .showModal {
+      position: absolute;
+      right: 6px;
+      bottom: 7px;
+      z-index: 2;
+      display: flex;
+      display: none;
+      align-items: center;
+      justify-content: center;
+      width: 22px;
+      height: 22px;
+      font-size: 12px;
+      background: #fff;
+      border-radius: 22px;
+    }
+    &:hover .showModal {
+      display: flex;
+    }
+  }
+}

+ 1 - 1
src/sagacare_components/map/index.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef } from 'react';
-import mapstyles from '@/assets/css/map.less';
+import mapstyles from './index.less';
 import { useModel } from 'umi';
 
 import cx from 'classnames';

+ 1 - 1
src/sagacare_components/topNavigator/index.tsx

@@ -7,7 +7,7 @@ import type { navigatorItem } from '@/pages/Environment/index';
 import { getBuildingList, getFloorList } from '@/services/sagacare_service/environment';
 import { projectObj } from '@/config/api.js';
 import { useModel } from 'umi';
-import UserStorage from '@/config/sagacare_user';
+import UserStorage from '@/config/sagacare/sagacare_user';
 
 export type topNavigatorProps = {
   navigatorList?: navigatorItem[];

+ 1 - 1
src/services/sagacare_service/environment.ts

@@ -1,7 +1,7 @@
 /** 登录接口 POST /api/login/account */
 import { request } from 'umi';
 import { projectObj } from '@/config/api';
-import UserStorage from '@/config/sagacare_user';
+import UserStorage from '@/config/sagacare/sagacare_user';
 
 export async function getMapList(body: any, options?: { [key: string]: any }) {
   return request<API.MapInfoRes>(

+ 1 - 1
src/services/sagacare_service/equipment copy.js

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

+ 1 - 1
src/services/sagacare_service/equipment.js

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