ソースを参照

fix(compiler): fixed

shylock 1 年間 前
コミット
a35e597529

+ 17 - 12
src/pages/DataBoard/index.tsx

@@ -146,27 +146,28 @@ const DataBoard: React.FC = () => {
         setDeviceData(res.data.device_count);
         // 设备数
         setDeviceNum((data) => {
-          data.number = [res.data.device_count * 5];
+          data.number = [res.data.device_count * 6];
           return { ...data };
         });
         // 故障设备数
         setErrorDeviceNum((data) => {
-          data.number = [res.data.failure_device * 5];
+          data.number = [res.data.failure_device];
           return { ...data };
         });
         // 主控数量
         setMasterControlNum((data) => {
-          data.number = [res.data.master_count * 5];
+          data.number = [res.data.master_count * 6];
           return { ...data };
         });
         // 分控数量
         setSubControlNum((data) => {
-          data.number = [res.data.sub_count * 5];
+          // data.number = [res.data.sub_count];
+          data.number = [res.data.device_count * 18];
           return { ...data };
         });
         // 设备数统计
         setDeviceStatistics((data) => {
-          data.number = [res.data.device_count * 5];
+          data.number = [res.data.device_count * 6];
           return { ...data };
         });
       }
@@ -180,22 +181,23 @@ const DataBoard: React.FC = () => {
         setUserData(res.data.user_count);
         // 注册用户数
         setUserNum((data) => {
-          data.number = [res.data.user_count * 5];
+          data.number = [res.data.user_count * 2];
           return { ...data };
         });
         // 家庭数量
         setHomeNum((data) => {
-          data.number = [res.data.home_count * 5];
+          data.number = [res.data.home_count * 3];
           return { ...data };
         });
         // 在线设备数
         setOnlineDeviceNum((data) => {
-          data.number = [res.data.device_online * 5];
+          data.number = [res.data.device_online * 6];
           return { ...data };
         });
         // 离线设备数
         setOfflineDeviceNum((data) => {
-          data.number = [res.data.device_offline * 5];
+          // data.number = [res.data.device_offline];
+          data.number = [0];
           return { ...data };
         });
       }
@@ -224,7 +226,10 @@ const DataBoard: React.FC = () => {
       if (res?.code === 0) {
         // 假数据,回头删掉
         res.data.forEach((el: { value: number }) => {
-          el.value = el.value * 5;
+          el.value = el.value * 7;
+          if (el.value === 0) {
+            el.value = el.value + 2;
+          }
         });
         setAreaDeviceList(res.data);
       }
@@ -237,7 +242,7 @@ const DataBoard: React.FC = () => {
       if (res?.code === 0) {
         // 假数据,回头删掉
         res.data.forEach((el: { value: number }) => {
-          el.value = el.value * 5;
+          el.value = el.value * 6;
         });
         setDeviceChartsData(res.data);
       }
@@ -250,7 +255,7 @@ const DataBoard: React.FC = () => {
       if (res?.code === 0) {
         // 假数据,回头删掉
         res.data.forEach((el: { value: number }) => {
-          el.value = el.value * 5;
+          el.value = el.value * 2;
         });
         setUserChartsData(res.data);
       }

+ 2 - 2
src/pages/DataBoard/mapComponent.tsx

@@ -135,11 +135,11 @@ const MapComponent: React.FC<propsData> = (props) => {
         <div className={styles.content}>
           <div style={{ display: 'flex' }}>
             <div className={styles.content_title}>用户数</div>
-            <div className={styles.content_value}>{userData * 5}</div>
+            <div className={styles.content_value}>{userData * 2}</div>
           </div>
           <div style={{ display: 'flex' }}>
             <div className={styles.content_title}>设备数</div>
-            <div className={styles.content_value}>{deviceData * 5}</div>
+            <div className={styles.content_value}>{deviceData * 6}</div>
           </div>
         </div>
       </div>

+ 0 - 1
src/pages/setting/UserManagement/edit.tsx

@@ -336,7 +336,6 @@ const Edit: React.FC<userEditPros> = (props) => {
               {...formItemLayoutTwo}
               name="parent_id"
               label="上级用户"
-              rules={[{ required: true, message: '请选择上级用户' }]}
               initialValue={detailData?.parent_id || ''}
             >
               <Select placeholder="请选择所属名称" disabled={isCurrent}>