Renxy 1 rok pred
rodič
commit
834228f252

+ 1 - 0
src/pages/DeviceManager/sparePart.js

@@ -1,5 +1,6 @@
 import PageContent from '@/components/PageContent';
 import PageTitle from '@/components/PageTitle';
+import { queryMainChartList } from '@/services/StorageManagement';
 import { RightOutlined } from '@ant-design/icons';
 import { useNavigate, useParams, useRequest } from '@umijs/max';
 import { Space, Spin } from 'antd';

+ 17 - 2
src/pages/DeviceManager/storage.js

@@ -2,7 +2,10 @@ import BarChartModule from '@/components/ManagementPage/BarChartModule';
 import PieChartModule from '@/components/ManagementPage/PieChartModule';
 import RadarChartModule from '@/components/ManagementPage/RadarChartModule';
 import ModuleTitle from '@/components/ManagementPage/moduleTitle';
-import { queryMainChartList } from '@/services/StorageManagement';
+import {
+  queryMainChartList,
+  queryStoreGetWarning,
+} from '@/services/StorageManagement';
 import { useNavigate, useRequest } from '@umijs/max';
 import { Button, Empty, Spin } from 'antd';
 import dayjs from 'dayjs';
@@ -36,6 +39,18 @@ const StorageOverview = ({ projectId }) => {
     },
   ];
 
+  const { data: warningData, loading: loadingWarn } = useRequest(
+    queryStoreGetWarning,
+    {
+      defaultParams: [{ project_id: projectId * 1 }],
+      formatResult: (res) => {
+        const data = res.data;
+        const { check_notice, inventory_notice } = res.data;
+        return check_notice + inventory_notice;
+      },
+    },
+  );
+
   const { data, loading } = useRequest(
     () =>
       queryMainChartList({
@@ -128,7 +143,7 @@ const StorageOverview = ({ projectId }) => {
   return (
     <Spin className="content-title" spinning={loading}>
       <div className={`card-box ${styles.tipContent}`}>
-        <span>备品报告:当前库存状态良好,暫无需要补充货物。</span>
+        <span>备品报告:{warningData}</span>
         <Button type="primary" onClick={goDetail}>
           详情
         </Button>

+ 4 - 10
src/pages/Projects/index.js

@@ -70,21 +70,15 @@ const Projects = () => {
                   <div className={styles.itemCon}>
                     <div className={styles.line} />
                     <div className={styles.valueCon}>
-                      <span className={styles.value}>
-                        {item.WaterIn}
-                        {/* <div className={styles.valueCon}>m3/h</div> */}
-                      </span>
-                      <div>进水流量(m3/h)</div>
+                      <span className={styles.value}>{item.WaterIn}</span>
+                      <div>进水流量(m³/h)</div>
                     </div>
                   </div>
                   <div className={styles.itemCon}>
                     <div className={styles.line} />
                     <div className={styles.valueCon}>
-                      <span className={styles.value}>
-                        {item.WaterOut}
-                        {/* <div className={styles.valueCon}>m3/h</div> */}
-                      </span>
-                      <div>出水流量(m3/h)</div>
+                      <span className={styles.value}>{item.WaterOut}</span>
+                      <div>出水流量(m³/h)</div>
                     </div>
                   </div>
                 </div>

+ 4 - 2
src/pages/SystemDaily/index.js

@@ -15,10 +15,12 @@ const SystemDaily = (props) => {
       const result = {
         ...data,
         task_percent:
-          data.push_task !== 0 ? data.push_complete_task / data.push_task : 0,
+          data.push_task !== 0
+            ? (data.push_complete_task / data.push_task).toFixed(2)
+            : 0,
         work_percent:
           data.work_order_task !== 0
-            ? data.work_order_complete_task / data.work_order_task
+            ? (data.work_order_complete_task / data.work_order_task).toFixed(2)
             : 0,
       };
       return result;

+ 13 - 0
src/services/StorageManagement.js

@@ -210,3 +210,16 @@ export async function queryStoreExport(data) {
   return request(`/api/store/v1/store/export?${stringify(data)}`);
   return res;
 }
+
+/**
+ *  库存预警消息
+ *  @param {*} data
+ *  @param {*} data.project_id
+ */
+export async function queryStoreGetWarning(data) {
+  var res = await request(`/api/store/v1/store/get-warning`, {
+    method: 'POST',
+    data: data,
+  });
+  return res;
+}