Selaa lähdekoodia

修改获取spaceId的方式

zhaojijng 2 vuotta sitten
vanhempi
commit
b5926900b6

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

@@ -95,7 +95,7 @@ export default ({ onClose, showSpace, selNav }) => {
               })}
             </div>
             <div className={styles.chart}>
-              <LineChart paramObj={paramObj} spaceId={showSpace.id} />
+              <LineChart paramObj={paramObj} spaceId={showSpace.spaceId} />
             </div>
             <div className={styles.foot}>
               <div className={styles.l}>{paramObj.name}</div>

+ 30 - 25
src/pages/Equipment/components/deviceModal/index.jsx

@@ -98,32 +98,34 @@ export default ({ onClose, showSpace }) => {
   const getData = () => {
     const paramsObj = {
       criteria: {
-        spaceId: showSpace.id,
+        spaceId: showSpace.spaceId,
         projectId: projectObj.projectId,
       },
     };
-    getSpaceAdjustList(paramsObj).then((res) => {
-      res.content &&
-        res.content.forEach((item, idx) => {
-          envArr.forEach((jtem, jdx) => {
-            jtem.describe = checkLevel(item[jtem.id], jtem.id).levelTxt;
-            if (!item[jtem.id] && item[jtem.id] != 0) {
-              jtem.num = '--';
-              return;
-            }
-            if (jtem.id == 'humidity') {
-              jtem.num = item[jtem.id].toFixed(0);
-            } else if (jtem.id == 'hcho') {
-              jtem.num = item[jtem.id].toFixed(2);
-            } else if (jtem.id == 'temperature') {
-              jtem.num = item[jtem.id].toFixed(1);
-            } else {
-              jtem.num = item[jtem.id];
-            }
+    getSpaceAdjustList(paramsObj)
+      .then((res) => {
+        res.content &&
+          res.content.forEach((item, idx) => {
+            envArr.forEach((jtem, jdx) => {
+              jtem.describe = checkLevel(item[jtem.id], jtem.id).levelTxt;
+              if (!item[jtem.id] && item[jtem.id] != 0) {
+                jtem.num = '--';
+                return;
+              }
+              if (jtem.id == 'humidity') {
+                jtem.num = item[jtem.id].toFixed(0);
+              } else if (jtem.id == 'hcho') {
+                jtem.num = item[jtem.id].toFixed(2);
+              } else if (jtem.id == 'temperature') {
+                jtem.num = item[jtem.id].toFixed(1);
+              } else {
+                jtem.num = item[jtem.id];
+              }
+            });
+            setParamList(envArr);
           });
-          setParamList(envArr);
-        });
-    });
+      })
+      .catch((err) => {});
   };
 
   const operateTime = useMemo(() => {
@@ -296,17 +298,20 @@ export default ({ onClose, showSpace }) => {
               <Row gutter={[12, 18]}>
                 {showEqCard('airConditioner') && (
                   <Col span={12}>
-                    <AirEq spaceId={showSpace.id} projectId={projectObj.projectId}></AirEq>
+                    <AirEq spaceId={showSpace.spaceId} projectId={projectObj.projectId}></AirEq>
                   </Col>
                 )}
                 {showEqCard('light') && (
                   <Col span={12}>
-                    <LampEq spaceId={showSpace.id} projectId={projectObj.projectId}></LampEq>
+                    <LampEq spaceId={showSpace.spaceId} projectId={projectObj.projectId}></LampEq>
                   </Col>
                 )}
                 {showEqCard('curtain') && (
                   <Col span={12}>
-                    <CurtainEq spaceId={showSpace.id} projectId={projectObj.projectId}></CurtainEq>
+                    <CurtainEq
+                      spaceId={showSpace.spaceId}
+                      projectId={projectObj.projectId}
+                    ></CurtainEq>
                   </Col>
                 )}
               </Row>

+ 1 - 1
src/pages/Equipment/equipmentControl.js

@@ -61,7 +61,7 @@ export const changeCurtain = (type, itemarr, getDeviceStatus, status) => {
 export const changeAir = (sitem, index, getDeviceStatus) => {
     const itemId = sitem.airConditioner === 0 ? 12 : 10; // 10关闭 12开启
     const paramsObj = {
-        objectId: sitem.id, // 空间id
+        objectId: sitem.spaceId, // 空间id
         valueType: 1, // 固定为1 1
         itemId: itemId,
     };