Inicio Explorar Axuda
Rexistro Iniciar sesión
yf_nkx
/
agmp_iot_jetlinks_ui
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

Merge wzy

Next wzy
XieYongHong %!s(int64=3) %!d(string=hai) anos
pai
0490394dd1 a594651c79
achega
e8f2a387be
Modificáronse 6 ficheiros con 36 adicións e 16 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 4 0
      src/app.tsx
  2. 1 1
      src/pages/document.ejs
  3. 22 12
      src/pages/home/index.tsx
  4. 1 1
      src/pages/notice/Config/Log/index.tsx
  5. 1 1
      src/pages/notice/Template/Log/index.tsx
  6. 7 1
      src/pages/user/Login/index.tsx

+ 4 - 0
src/app.tsx
Ver ficheiro 

@@ -241,6 +241,10 @@ const MenuItemIcon = (
 
 // ProLayout 支持的api https://procomponents.ant.design/components/layout
 
 // ProLayout 支持的api https://procomponents.ant.design/components/layout
 
 export const layout: RunTimeLayoutConfig = ({ initialState }) => {
 
 export const layout: RunTimeLayoutConfig = ({ initialState }) => {
 
   // console.log({ ...initialState });
 
   // console.log({ ...initialState });
 
+  // let ico:any = document.querySelector('link[rel="icon"]')
 
+  // if(ico!==null){
 
+  //   ico.href='https://t9.baidu.com/it/u=2615841454,1925018474&fm=218&app=126&size=f242,150&n=0&f=JPEG&fmt=auto?s=A0B46032495267E15A7D35CE000070A2&sec=1657645200&t=b98ebc7ac3073c248e57894e899d7ac1'
 
+  // }
 
   return {
 
   return {
 
     navTheme: 'light',
 
     navTheme: 'light',
 
     headerTheme: 'light',
 
     headerTheme: 'light',

+ 1 - 1
src/pages/document.ejs
Ver ficheiro 

@@ -13,7 +13,7 @@
 
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
 
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
 
     />
 
     />
 
     <title>Jetlinks</title>
 
     <title>Jetlinks</title>
 
-    <link rel="icon" href="<%= context.config.publicPath + 'favicon.ico' %>" type="image/x-icon" />
 
+    <link rel="icon" id="ico" href="<%= context.config.publicPath + 'favicon.ico' %>" type="image/x-icon" />
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <noscript>
 
     <noscript>

+ 22 - 12
src/pages/home/index.tsx
Ver ficheiro 

@@ -22,18 +22,18 @@ const Home = () => {
 
     comprehensive: <Comprehensive />,
 
     comprehensive: <Comprehensive />,
 
   };
 
   };
 
 
 
-  useEffect(() => {
 
-    service.queryView().then((resp) => {
 
-      setLoading(false);
 
-      if (resp.status === 200) {
 
-        if (resp.result.length == 0) {
 
-          setCurrent('init');
 
-        } else {
 
-          setCurrent(resp.result[0]?.content);
 
-        }
 
-      }
 
-    });
 
-  }, []);
 
+  // useEffect(() => {
 
+  //   service.queryView().then((resp) => {
 
+  //     // setLoading(false);
 
+  //     if (resp.status === 200) {
 
+  //       if (resp.result.length == 0) {
 
+  //         setCurrent('init');
 
+  //       } else {
 
+  //         setCurrent(resp.result[0]?.content);
 
+  //       }
 
+  //     }
 
+  //   });
 
+  // }, []);
 
   useEffect(() => {
 
   useEffect(() => {
 
     service.userDetail().then((res) => {
 
     service.userDetail().then((res) => {
 
       if (res.status === 200) {
 
       if (res.status === 200) {
 
@@ -49,6 +49,16 @@ const Home = () => {
 
           .then((response) => {
 
           .then((response) => {
 
             if (response.status === 200) {
 
             if (response.status === 200) {
 
               setDetail(response.result?.data);
 
               setDetail(response.result?.data);
 
+              service.queryView().then((resp) => {
 
+                setLoading(false);
 
+                if (resp.status === 200) {
 
+                  if (resp.result.length == 0) {
 
+                    setCurrent('init');
 
+                  } else {
 
+                    setCurrent(resp.result[0]?.content);
 
+                  }
 
+                }
 
+              });
 
             }
 
             }
 
           });
 
           });
 
       }
 
       }

+ 1 - 1
src/pages/notice/Config/Log/index.tsx
Ver ficheiro 

@@ -114,7 +114,7 @@ const Log = observer(() => {
 
           pageSize: 5,
 
           pageSize: 5,
 
         }}
 
         }}
 
         columns={columns}
 
         columns={columns}
 
-        request={async (params) => service.getHistoryLog(state.current?.id || '', params)}
 
+        request={async (params) => service.getHistoryLog(state.current?.id || '', { ...params, sorts: [{ name: 'notifyTime', order: 'desc' }] })}
 
       />
 
       />
 
     </Modal>
 
     </Modal>
 
   );
 
   );

+ 1 - 1
src/pages/notice/Template/Log/index.tsx
Ver ficheiro 

@@ -118,7 +118,7 @@ const Log = observer(() => {
 
         }
 
         }
 
         params={param}
 
         params={param}
 
         columns={columns}
 
         columns={columns}
 
-        request={async (params) => service.getHistoryLog(state.current?.id || '', params)}
 
+        request={async (params) => service.getHistoryLog(state.current?.id || '', { ...params, sorts: [{ name: 'notifyTime', order: 'desc' }] })}
 
       />
 
       />
 
     </Modal>
 
     </Modal>
 
   );
 
   );

+ 7 - 1
src/pages/user/Login/index.tsx
Ver ficheiro 

@@ -56,9 +56,15 @@ const Login: React.FC = () => {
 
   const getCode = () => {
 
   const getCode = () => {
 
     delete loginForm.values?.verifyCode;
 
     delete loginForm.values?.verifyCode;
 
     loginRef.current = loginForm.values;
 
     loginRef.current = loginForm.values;
 
+    // setLoading(false);
 
     Service.captchaConfig()
 
     Service.captchaConfig()
 
       .pipe(
 
       .pipe(
 
-        filter((r) => r.enabled),
 
+        filter((r) => {
 
+          if(!r.enabled){
 
+            setLoading(false)
 
+          }
 
+          return r.enabled
 
+        }),
 
         mergeMap(Service.getCaptcha),
 
         mergeMap(Service.getCaptcha),
 
         catchError(() => message.error('系统开小差，请稍后重试')),
 
         catchError(() => message.error('系统开小差，请稍后重试')),
 
       )
 
       )