fix: 修改bug

src/components/FSelectDevice/index.tsx

@@ -53,7 +53,7 @@ const FSelectDevice = connect((props: Props) => {
       }),
       dataIndex: 'registryTime',
       width: '200px',
-      render: (text: any) => (text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '/'),
+      render: (text: any) => (text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : ''),
       sorter: true,
     },
     {

src/pages/device/Firmware/Task/Save/index.tsx

@@ -89,6 +89,7 @@ const Save = (props: Props) => {
     });
     if (resp.status === 200) {
       onlyMessage('保存成功！');
+      props.save();
     } else {
       onlyMessage('保存失败！', 'error');
     }

src/pages/init-home/index.less

@@ -22,12 +22,12 @@
 
       .left {
         width: 30px;
-        height: 100%;
+        height: 1000px;
       }
 
       .right {
-        width: calc(100% - 50px);
-        height: 1200px;
+        width: calc(100% - 70px);
+        // height: 1200px;
 
         .collapseTitle {
           display: flex;
@@ -44,5 +44,21 @@
         }
       }
     }
+
+    ::-webkit-scrollbar {
+      width: 12px;
+    }
+
+    /* 滚动槽 */
+    ::-webkit-scrollbar-track {
+      background: #f2f2f2;
+      border-radius: 8px;
+    }
+
+    /* 滚动条滑块 */
+    ::-webkit-scrollbar-thumb {
+      background: #cecece;
+      border-radius: 8px;
+    }
   }
 }

src/pages/init-home/index.tsx

@@ -1,22 +1,26 @@
 import { TitleComponent } from '@/components';
-import { Button, Collapse, Steps } from 'antd';
+import { Button, Collapse, Spin, Steps } from 'antd';
 import styles from './index.less';
 import Basis from './components/basis';
 import Menu from './components/menu';
 import Role from './components/role';
 import Data from './components/data';
 import Service from './service';
+import { useState } from 'react';
 
 export const service = new Service();
 
 const InitHome = () => {
+  const [loadings, setLoadings] = useState<boolean>(false);
+  const [current, setCurrent] = useState<number>(0);
+
   return (
     <div className={styles.init}>
       <TitleComponent data={'系统初始化'} />
       <div className={styles.box}>
         <div className={styles.container}>
           <div className={styles.left}>
-            <Steps direction="vertical" current={1} percent={60} style={{ height: '100%' }}>
+            <Steps direction="vertical" current={current} percent={60} style={{ height: '100%' }}>
               <Steps.Step />
               <Steps.Step />
               <Steps.Step />
@@ -24,52 +28,62 @@ const InitHome = () => {
             </Steps>
           </div>
           <div className={styles.right}>
-            <Collapse defaultActiveKey={['1', '2', '3', '4']}>
-              <Collapse.Panel
-                header={
-                  <div className={styles.collapseTitle}>
-                    基本信息
-                    <div className={styles.collapseDesc}>
-                      配置平台名称、登录背景图、主题色等基本信息
+            <Spin spinning={loadings}>
+              <Collapse defaultActiveKey={['1', '2', '3', '4']}>
+                <Collapse.Panel
+                  header={
+                    <div className={styles.collapseTitle}>
+                      基本信息
+                      <div className={styles.collapseDesc}>
+                        配置平台名称、登录背景图、主题色等基本信息
+                      </div>
+                    </div>
+                  }
+                  key="1"
+                >
+                  <Basis getData={() => {}} />
+                </Collapse.Panel>
+                <Collapse.Panel
+                  header={
+                    <div className={styles.collapseTitle}>
+                      菜单初始化<div className={styles.collapseDesc}>初始化菜单数据</div>
+                    </div>
+                  }
+                  key="2"
+                >
+                  <Menu />
+                </Collapse.Panel>
+                <Collapse.Panel
+                  header={
+                    <div className={styles.collapseTitle}>
+                      角色初始化<div className={styles.collapseDesc}>初始化内置角色与权限数据</div>
+                    </div>
+                  }
+                  key="3"
+                >
+                  <Role />
+                </Collapse.Panel>
+                <Collapse.Panel
+                  header={
+                    <div className={styles.collapseTitle}>
+                      初始数据<div className={styles.collapseDesc}>初始化设备接入示例数据</div>
                     </div>
-                  </div>
-                }
-                key="1"
-              >
-                <Basis getData={() => {}} />
-              </Collapse.Panel>
-              <Collapse.Panel
-                header={
-                  <div className={styles.collapseTitle}>
-                    菜单初始化<div className={styles.collapseDesc}>初始化菜单数据</div>
-                  </div>
-                }
-                key="2"
-              >
-                <Menu />
-              </Collapse.Panel>
-              <Collapse.Panel
-                header={
-                  <div className={styles.collapseTitle}>
-                    角色初始化<div className={styles.collapseDesc}>初始化内置角色与权限数据</div>
-                  </div>
-                }
-                key="3"
-              >
-                <Role />
-              </Collapse.Panel>
-              <Collapse.Panel
-                header={
-                  <div className={styles.collapseTitle}>
-                    初始数据<div className={styles.collapseDesc}>初始化设备接入示例数据</div>
-                  </div>
-                }
-                key="4"
-              >
-                <Data isTrigger={false} onChange={() => {}} />
-              </Collapse.Panel>
-            </Collapse>
-            <Button type="primary" style={{ marginTop: 20 }}>
+                  }
+                  key="4"
+                >
+                  <Data isTrigger={false} onChange={() => {}} />
+                </Collapse.Panel>
+              </Collapse>
+            </Spin>
+            <Button
+              type="primary"
+              style={{ marginTop: 20 }}
+              loading={loadings}
+              onClick={() => {
+                setLoadings(true);
+                setCurrent(0);
+              }}
+            >
               确认
             </Button>
           </div>

src/pages/rule-engine/Alarm/Config/Save/input.tsx

@@ -106,7 +106,7 @@ const InputSave = (props: Props) => {
       state: {
         title: '状态',
         type: 'string',
-        required: true,
+        // required: true,
         'x-decorator': 'FormItem',
         'x-component': 'Switch',
         default: false,

src/pages/rule-engine/Alarm/Config/Save/output.tsx

@@ -103,7 +103,7 @@ const OutputSave = (props: Props) => {
       state: {
         title: '状态',
         type: 'string',
-        required: true,
+        // required: true,
         'x-decorator': 'FormItem',
         'x-component': 'Switch',
         default: false,