Browse Source

Merge branch 'master' of http://39.106.8.246:3003/sagacloud/sagacloud-manager-control

zhaojijng 2 years ago
parent
commit
b658069967

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

@@ -39,7 +39,6 @@ export default ({
       };
       arr.push(params);
     }
-    console.log(arr, 'paramsArrparamsArr');
     return arr;
   };
   const handleCurtain = (setType, id, index) => {
@@ -47,7 +46,6 @@ export default ({
     if (nowTime - preTime <= 2000) return; // 请求间隔 2秒
     changePreTime(Date.now());
     const paramsArr = sendData(setType, id);
-    console.log(paramsArr, '1111');
     setEquipeHttp(paramsArr);
     if (setType == 'EquipOffSet') {
       setDownFlag(true);

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

@@ -8,9 +8,10 @@ import LampEq from './lampEq';
 import CurtainEq from './curtainEq';
 import { getSpaceAdjustList } from '@/services/ant-design-pro/equipment';
 import { useRef } from 'react';
+import { useModel } from 'umi';
 
 export default ({ onClose, showSpace }) => {
-  const projectId = 'Pj1101080259';
+  const { projectId } = useModel('spaceFunc');
   const envArr = [
     {
       name: '温度',
@@ -101,8 +102,6 @@ export default ({ onClose, showSpace }) => {
         spaceId: showSpace.id,
         projectId: projectId,
       },
-      pubname: 'sagacareAndtenantslink',
-      openid: '9a1ecfbacb6b4f249bf2dd3ec7793ead', // userId
     };
     getSpaceAdjustList(paramsObj).then((res) => {
       res.content &&
@@ -204,6 +203,7 @@ export default ({ onClose, showSpace }) => {
   };
 
   useEffect(() => {
+    getData();
     timer = setInterval(() => {
       getData();
     }, 1000 * 60 * 5);

+ 1 - 4
src/services/ant-design-pro/equipment.js

@@ -1,7 +1,4 @@
 import { request } from 'umi';
-
-const API = 'https://duoduoenv.sagacloud.cn';
-
 function commonParams() {
     return `openid=9a1ecfbacb6b4f249bf2dd3ec7793ead&pubname=sagacareAndtenantslink&projectId=Pj1101080259&userName=%E5%AE%89%E5%B0%8F%E9%9C%9E&userPhone=17611228068&userId=9a1ecfbacb6b4f249bf2dd3ec7793ead`;
     //   return `openid=9a1ecfbacb6b4f249bf2dd3ec7793ead&pubname=sagacareAndtenantslink&projectId=Pj1101080259&userName=anxiaoxia&userPhone=17611228068
@@ -109,7 +106,7 @@ export const getSpaceAdjustList = (params) => {
         method: 'POST',
         isNotShowErrorToast: true,
         errorSave: true,
-        data: JSON.stringify({ ...params, criteria: { ...params.criteria, projectId: getProjectId() } }),
+        data: params,
         headers: {
             'Content-Type': 'application/json',
         },