Procházet zdrojové kódy

fix: 地图坐标及应用管理

wzyyy před 3 roky
rodič
revize
03200802e5

+ 2 - 2
src/pages/device/DashBoard/index.tsx

@@ -517,14 +517,14 @@ const DeviceBoard = () => {
                       longitude: item.geometry.coordinates?.[0],
                       latitude: item.geometry.coordinates?.[1],
                     }}
+                    offset={[-10, -34]}
                   >
-                    <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
+                    <div>
                       <div
                         style={{
                           backgroundColor: '#666666',
                           color: 'white',
                           textAlign: 'center',
-                          marginBottom: 5,
                         }}
                       >
                         {item.properties.deviceName}

+ 14 - 14
src/pages/oauth/index.tsx

@@ -140,14 +140,14 @@ const Oauth = () => {
       setIsLogin(false);
       getCode();
       initApplication(data.client_id || params.client_id);
-      // setTimeout(()=>{
-      //   loadingRef.current=false
-      // })
+      setTimeout(() => {
+        loadingRef.current = false;
+      });
     } else {
       setIsLogin(false);
-      // setTimeout(()=>{
-      //   loadingRef.current=false
-      // })
+      setTimeout(() => {
+        loadingRef.current = false;
+      });
     }
   };
 
@@ -187,10 +187,10 @@ const Oauth = () => {
   }, []);
 
   useEffect(() => {
-    // console.log('..............')
+    console.log('..............');
     const init = async () => {
       await Promise.resolve().then(() => {
-        // console.log(1, loadingRef.current)
+        console.log(1, loadingRef.current);
         let redirectUrl;
         const items = {
           client_id: getQueryVariable('client_id'),
@@ -217,12 +217,12 @@ const Oauth = () => {
         });
       });
       // debugger;
-      await Promise.resolve().then(() => {
-        // console.log(2, loadingRef.current)
-        // debugger;
-        loadingRef.current = false;
-        // console.log(3, loadingRef.current)
-      });
+      // await Promise.resolve().then(() => {
+      //   console.log(2, loadingRef.current)
+      //   // debugger;
+      //   loadingRef.current = false;
+      //   console.log(3, loadingRef.current)
+      // });
     };
     init();
   }, [window.location]);

+ 3 - 0
src/pages/system/Apply/Save/index.tsx

@@ -250,6 +250,9 @@ const Save = () => {
     const data: any = await form.submit();
     const list = integrationModesList.map((item) => item.value);
     _.difference(list, data.integrationModes).forEach((item) => {
+      if (item === 'ssoClient') {
+        delete data['sso'];
+      }
       delete data[item];
     });