Explorar o código

获取spaceId 的不对 bug修改

zhaojijng %!s(int64=2) %!d(string=hai) anos
pai
achega
ae72fe37d4

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

@@ -272,7 +272,7 @@ const Environment: React.FC = () => {
         return ele.id == spaceId;
       });
 
-      var combine = Object.assign({}, filterSpace[0], mitem);
+      var combine = Object.assign({}, mitem, filterSpace[0]);
       combineList.push(combine);
     });
 

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

@@ -429,7 +429,7 @@ const Environment: React.FC = () => {
       var filterSpace3 = hasPersonList.filter((ele) => {
         return ele.id == spaceId;
       });
-      var combine = Object.assign({}, filterSpace3[0], filterSpace1[0], filterSpace2[0], mitem);
+      var combine = Object.assign({}, filterSpace3[0], filterSpace2[0], mitem, filterSpace1[0]);
 
       combineList.push(combine);
     });

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

@@ -233,7 +233,7 @@ const Runtime: React.FC = () => {
         return ele.id == spaceId;
       });
 
-      var combine = Object.assign({}, filterSpace[0], mitem);
+      var combine = Object.assign({}, mitem, filterSpace[0]);
       combineList.push(combine);
     });