Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

.umirc.ts

@@ -69,6 +69,11 @@ export default defineConfig({
       path: '/home/energy/:projectId',
       component: './Home/EnergyCostComparison',
     },
+    {
+      name: '能耗详情',
+      path: '/home/energy/detail/:projectId',
+      component: './Home/EnergyCostDetail',
+    },
     {
       name: '药耗监测',
       path: '/home/chem-cost/:projectId',

src/components/ManagementPage/chartModule.js

@@ -121,6 +121,12 @@ const ChartModule = (props) => {
           option.grid.right = 30;
           option.yAxis = { ...option.yAxis[0], name: yName };
           option.series = dataList.map((item) => {
+            item.data.forEach((dataItem) => {
+              if (String(dataItem).length * 10 + 40 > option.grid.left) {
+                console.log(String(dataItem).length * 10 + 45);
+                option.grid.left = String(dataItem).length * 10 + 45;
+              }
+            });
             return {
               ...option.series[item.type],
               name: item.name,

src/global.less

@@ -226,10 +226,10 @@ input[type='reset'] {
 .password-eye {
   display: inline-block;
   vertical-align: middle;
-  width: 0.3rem;
-  height: 0.3rem;
+  width: 0.6rem;
+  height: 0.35rem;
   background: url('@/assets/icon-eye1.png') no-repeat center;
-  background-size: 0.3rem;
+  background-size: 0.4rem;
   &.open {
     background-image: url('@/assets/icon-eye2.png');
   }

src/pages/Home/EnergyCostComparison.js

@@ -4,7 +4,8 @@ import PageContent from '@/components/PageContent';
 import PageTitle from '@/components/PageTitle';
 import { getComparisonData } from '@/services/OperationManagement';
 import { UnityAction } from '@/utils/utils';
-import { useParams } from '@umijs/max';
+import { LineChartOutlined } from '@ant-design/icons';
+import { history, useParams } from '@umijs/max';
 import { message } from 'antd';
 import dayjs from 'dayjs';
 import { useEffect, useState } from 'react';
@@ -72,6 +73,9 @@ const CostComparison = () => {
     // 大于10，保留两位
     // 大于100，保留一位
     // 大于1000，不保留
+    if (maxValue === 0) {
+      return 2;
+    }
     let fixed = 0;
     if (maxValue < 1) {
       const decimal = maxValue.toFixed(100).toString().split('.')[1];
@@ -201,13 +205,13 @@ const CostComparison = () => {
       elecUsed.chartType = 'bar';
       setChartData([elecPerCost, elecUsed]);
 
-      var curElecPerCost = actualElecPerCost?.find((item) =>
+      let curElecPerCost = actualElecPerCost?.find((item) =>
         dayjs().isSame(item?.month, 'month'),
       );
       if (curElecPerCost)
         setElecPerCost(curElecPerCost?.value.toFixed(elecPerCostFixed));
 
-      var curElecUsed = actualElecUsed?.find((item) =>
+      let curElecUsed = actualElecUsed?.find((item) =>
         dayjs().isSame(item?.month, 'month'),
       );
       if (curElecUsed)
@@ -221,6 +225,10 @@ const CostComparison = () => {
     createChartData();
   }, []);
 
+  const goEnergyDetail = () => {
+    history.push(`/home/energy/detail/${projectId}`);
+  };
+
   return (
     <PageContent closeable={false}>
       <PageTitle onReturn={() => UnityAction.sendMsg('menuItem', '首页')}>
@@ -230,14 +238,55 @@ const CostComparison = () => {
             e.stopPropagation();
             setOpen(!open);
           }}
-          style={{ marginLeft: 10 }}
+          style={{ marginLeft: '0.1rem' }}
           className={`password-eye ${open ? 'open' : ''}`}
         ></div>
       </PageTitle>
-
-      <div className="card-box" style={{ padding: '0.2rem' }}>
+      <div
+        className="card-box"
+        style={{ padding: '0.2rem', position: 'relative' }}
+      >
+        <LineChartOutlined
+          style={{
+            fontSize: '0.4rem',
+            position: 'absolute',
+            right: '0.3rem',
+            color: '#0139f1',
+          }}
+          onClick={goEnergyDetail}
+        />
         <div className={styles.curEnergyCost}>
-          <div className={styles.item}>
+          <div
+            className={styles.item}
+            style={{
+              borderRight: '1px solid #eaeaea',
+              borderBottom: '1px solid #eaeaea',
+            }}
+          >
+            <div className={styles.value}>
+              {open ? curElecPerCost : '***'}
+              <span className={styles.unit}>kWh/t</span>
+            </div>
+            <div className={styles.name}>近一天吨水电耗</div>
+          </div>
+          <div
+            className={styles.item}
+            style={{
+              borderBottom: '1px solid #eaeaea',
+            }}
+          >
+            <div className={styles.value}>
+              {open ? curElecUsed : '***'}
+              <span className={styles.unit}>kWh</span>
+            </div>
+            <div className={styles.name}>近一天实际用电量</div>
+          </div>
+          <div
+            className={styles.item}
+            style={{
+              borderRight: '1px solid #eaeaea',
+            }}
+          >
             <div className={styles.value}>
               {open ? curElecPerCost : '***'}
               <span className={styles.unit}>kWh/t</span>

src/pages/Home/EnergyCostDetail.js

@@ -0,0 +1,325 @@
+// 能耗详情
+
+import ChartModule from '@/components/ManagementPage/chartModule';
+import PageContent from '@/components/PageContent';
+import PageTitle from '@/components/PageTitle';
+import {
+  queryAccumulativeEnergy,
+  queryChartList,
+  queryEnergyConfig,
+  queryEnergyWaterChart,
+} from '@/services/OperationManagement';
+import { ArrowDownOutlined, ArrowUpOutlined } from '@ant-design/icons';
+import { useParams, useRequest } from '@umijs/max';
+import { Spin } from 'antd';
+import dayjs from 'dayjs';
+import { useMemo } from 'react';
+import styles from './manage.less';
+
+const EnergyCostDetail = () => {
+  const { projectId } = useParams();
+
+  const TIMER = 3600000;
+
+  // 全场概况
+  const { data: allFactoryData, loading: allFacLoading } = useRequest(
+    queryEnergyConfig,
+    {
+      defaultParams: [projectId],
+      pollingInterval: TIMER,
+    },
+  );
+
+  // 当日累计能耗、吨水电耗、环比
+  const { data: energyData, loading: energyLoading } = useRequest(
+    queryAccumulativeEnergy,
+    {
+      defaultParams: [projectId],
+      pollingInterval: TIMER,
+    },
+  );
+
+  // 吨水电耗折线图
+  const { data: chartData, loading: chartLosding } = useRequest(
+    queryEnergyWaterChart,
+    {
+      defaultParams: [
+        {
+          project_id: Number(projectId),
+          start_time: dayjs().startOf('day').format('YYYY-MM-DD 00:00:00'),
+          end_time: dayjs().format('YYYY-MM-DD 23:59:59'),
+        },
+      ],
+      pollingInterval: TIMER,
+      formatResult(data) {
+        const tempData = data.data;
+        if (!tempData) {
+          return null;
+        }
+        return {
+          xData: tempData?.map((item) => item.data_time) || [],
+          dataList: [
+            {
+              type: 0,
+              name: '吨水电耗',
+              data: tempData?.map((item) => item.value) || [],
+            },
+          ],
+        };
+      },
+    },
+  );
+
+  // 电量折线图
+  const { data: electricChartData, loading: electricLosding } = useRequest(
+    () =>
+      queryChartList({
+        project_id: Number(projectId),
+        metric_code: 'plant_electricity',
+        start_time: dayjs().startOf('day').format('YYYY-MM-DD 00:00:00'),
+        end_time: dayjs().format('YYYY-MM-DD 23:59:59'),
+      }),
+    {
+      pollingInterval: TIMER,
+      formatResult(data) {
+        if (!data?.data) return null;
+        const tempData = data.data;
+        const reversedData = tempData.reverse();
+        return {
+          xData: reversedData?.map((item) => item.data_time) || [],
+          dataList: [
+            {
+              type: 2,
+              name: '实际',
+              data: reversedData?.map((item) => item.value) || [],
+            },
+          ],
+        };
+      },
+    },
+  );
+
+  // 全场概况  包括两个折线图的y 轴名称
+  const allFactory = useMemo(() => {
+    const data = allFactoryData || {
+      voltage: '-',
+      transformer: '-',
+      capacity: '-',
+      runtime_capacity: '-',
+      voltage_unit: 'kV',
+      transformer_unit: '台',
+      capacity_unit: 'kVA',
+      runtime_capacity_unit: 'kVA',
+      energy_unit: 'kWh/t',
+      energy_water_unit: 'kWh',
+    };
+    return [
+      {
+        title: '电量等级',
+        data: data.voltage,
+        unit: data.voltage_unit,
+        color: '#eb0ce2',
+      },
+      {
+        title: '变压器台数',
+        data: data.transformer,
+        unit: data.transformer_unit,
+        color: '#eb8c0c',
+      },
+      {
+        title: '装机容器',
+        data: data.capacity,
+        unit: data.capacity_unit,
+        color: '#0cafeb',
+      },
+      {
+        title: '运行容器',
+        data: data.runtime_capacity,
+        unit: data.runtime_capacity_unit,
+        color: '#50bb0a',
+      },
+    ];
+  }, [allFactoryData]);
+
+  const powerData = useMemo(() => {
+    const power = energyData || {
+      energy_change: '-',
+      energy_water_change: '-',
+      today_energy: '-',
+      today_energy_water: '-',
+      yesterday_energy: '-',
+      yesterday_energy_water: '-',
+    };
+
+    return [
+      {
+        title: '当日吨水电耗',
+        data:
+          typeof power.today_energy_water == 'string'
+            ? power.today_energy_water
+            : power.today_energy_water?.toFixed(2),
+        unit: 'kWh/t',
+        color: '#eb0ce2',
+      },
+      {
+        title: '昨日吨水电耗',
+        data:
+          typeof power.yesterday_energy_water == 'string'
+            ? power.yesterday_energy_water
+            : power.yesterday_energy_water?.toFixed(2),
+        unit: 'kWh/t',
+        color: '#eb8c0c',
+      },
+      {
+        title: '环比增长',
+        data:
+          typeof power.energy_water_change == 'string'
+            ? power.energy_water_change
+            : power.energy_water_change?.toFixed(2),
+        unit: '%',
+        icon: power.energy_water_change >= 0 ? 1 : 2,
+      },
+      {
+        title: '当日用电',
+        data: power.today_energy,
+        unit: 'kWh',
+        color: '#eb0ce2',
+      },
+      {
+        title: '昨日用电',
+        data: power.yesterday_energy,
+        unit: 'kWh',
+        color: '#eb8c0c',
+      },
+      {
+        title: '环比增长',
+        data:
+          typeof power.energy_change == 'string'
+            ? power.energy_change
+            : power.energy_change?.toFixed(2),
+        unit: '%',
+        icon: power.energy_change >= 0 ? 1 : 2,
+      },
+    ];
+  }, [energyData]);
+
+  const loading = useMemo(() => allFacLoading, [allFacLoading]);
+
+  return (
+    <PageContent closeable={false}>
+      <PageTitle returnable>能耗数据</PageTitle>
+      <Spin spinning={loading}>
+        <div className={styles.infoContainer}>
+          <div>
+            <SubTitle title="全厂概览" />
+            <div style={{ display: 'flex' }}>
+              {allFactory.map((item, index) => (
+                <DataCard key={`all_${index}`} {...item} type={4} />
+              ))}
+            </div>
+          </div>
+          <div>
+            <SubTitle title="用电概况" />
+            <div style={{ display: 'flex', flexWrap: 'wrap' }}>
+              {powerData.map((item, index) => (
+                <DataCard key={`power_${index}`} {...item} type={3} />
+              ))}
+            </div>
+          </div>
+          <div>
+            <SubTitle title="吨水电耗" />
+            <div style={{ height: '3rem' }}>
+              {chartData && allFactoryData && (
+                <ChartModule
+                  yName={allFactoryData?.energy_water_unit || 'kWh'}
+                  xData={chartData.xData}
+                  dataList={chartData.dataList}
+                />
+              )}
+            </div>
+          </div>
+          <div>
+            <SubTitle title="电量" />
+            <div style={{ height: '3rem' }}>
+              {electricChartData && allFactoryData && (
+                <ChartModule
+                  yName={allFactoryData?.energy_unit || 'kWh/t'}
+                  xData={electricChartData.xData}
+                  dataList={electricChartData.dataList}
+                />
+              )}
+            </div>
+          </div>
+        </div>
+      </Spin>
+    </PageContent>
+  );
+};
+
+export default EnergyCostDetail;
+
+const DataCard = ({ title, data, unit, icon, color, type }) => {
+  const width = Math.floor(100 / type - 2) + '%';
+  return (
+    <div style={{ width }} className={`${styles.itemContent} card-box`}>
+      <div style={{ fontSize: '0.26rem' }}>{title}</div>
+      <div style={{ position: 'relative' }}>
+        <span
+          style={{ color: !icon ? color : icon === 1 ? 'red' : '#50bb0a' }}
+          className={styles.data}
+        >
+          {data}
+        </span>
+        {unit}
+        {icon === 1 && (
+          <ArrowUpOutlined
+            style={{
+              height: '0.2rem',
+              color: 'red',
+              position: 'absolute',
+              fontSize: '0.34rem',
+              right: '0.4rem',
+            }}
+          />
+        )}
+        {icon === 2 && (
+          <ArrowDownOutlined
+            style={{
+              height: '0.2rem',
+              color: '#50bb0a',
+              position: 'absolute',
+              fontSize: '0.36rem',
+              right: '0.4rem',
+            }}
+          />
+        )}
+      </div>
+    </div>
+  );
+};
+
+const SubTitle = ({ title }) => {
+  return (
+    <div
+      style={{
+        display: 'flex',
+        justifyContent: 'flex-start',
+        alignItems: 'center',
+        marginBottom: '0.2rem',
+        fontSize: '0.28rem',
+        fontWeight: '600',
+      }}
+    >
+      <div
+        style={{
+          width: '0.15rem',
+          height: '0.15rem',
+          background: '#0139f1',
+          marginRight: '0.1rem',
+          borderRadius: '0.16rem',
+        }}
+      />
+      {title}
+    </div>
+  );
+};

src/pages/Home/WaterAmtMng.js

@@ -6,19 +6,24 @@ import PageTitle from '@/components/PageTitle';
 import { queryChartListByCode } from '@/services/OperationManagement';
 import { UnityAction } from '@/utils/utils';
 import { useParams, useRequest } from '@umijs/max';
-import { Spin, Table } from 'antd';
+import { Button, DatePicker, Spin, Table } from 'antd';
 import dayjs from 'dayjs';
-import { useMemo } from 'react';
+import { useMemo, useState } from 'react';
+import styles from './index.less';
+
+const { RangePicker } = DatePicker;
 
 const WaterAmtMng = () => {
   const { projectId } = useParams();
 
+  const [filter, setFilter] = useState([dayjs().subtract(1, 'day'), dayjs()]);
+
   const { data, loading, run } = useRequest(
     (date) =>
       queryChartListByCode(
         {
-          start_time: date.s_time,
-          end_time: date.e_time,
+          start_time: date?.s_time,
+          end_time: date?.e_time,
           project_id: Number(projectId),
           order: 1,
         },
@@ -49,6 +54,7 @@ const WaterAmtMng = () => {
     },
     {
       title: '预测出水水量(t)',
+      key: '-',
       // dataIndex: '',
       render: () => '-',
     },
@@ -74,7 +80,26 @@ const WaterAmtMng = () => {
   }, [data]);
 
   const onSearch = (date) => {
-    run(date);
+    if (date === null) {
+      setFilter([]);
+      return;
+    }
+    if ('string' === typeof date) {
+      setFilter([]);
+      run({
+        s_time: dayjs().subtract(1, date).format('YYYY-MM-DD 00:00:00'),
+        e_time: dayjs().format('YYYY-MM-DD 23:59:59'),
+      });
+    } else {
+      const [s_time, e_time] = date.map((time) =>
+        dayjs(time).format('YYYY-MM-DD'),
+      );
+
+      run({
+        s_time: dayjs(s_time).format('YYYY-MM-DD 00:00:00'),
+        e_time: dayjs(e_time).format('YYYY-MM-DD 23:59:59'),
+      });
+    }
   };
 
   return (
@@ -82,30 +107,73 @@ const WaterAmtMng = () => {
       <PageTitle onReturn={() => UnityAction.sendMsg('menuItem', '首页')}>
         水量监测
       </PageTitle>
-      <div className="card-box" style={{ padding: '0.2rem' }}>
-        <div className="section-title">
-          <div className="section-line"></div>
-          数据曲线
-        </div>
-        <Spin spinning={loading}>
-          <div style={{ height: '5rem', marginTop: 20 }}>
-            <ChartModule yName="水量(t)" xData={xData} dataList={dataList} />
+      <Spin spinning={loading}>
+        <div className={styles.timeSelectBox}>
+          <div className={styles.timeBtn}>
+            <Button
+              type="primary"
+              shape="round"
+              onClick={() => {
+                onSearch('day');
+              }}
+            >
+              近一天
+            </Button>
+            <Button
+              type="primary"
+              shape="round"
+              onClick={() => {
+                onSearch('week');
+              }}
+            >
+              近一周
+            </Button>
+            <Button
+              type="primary"
+              shape="round"
+              onClick={() => {
+                onSearch('month');
+              }}
+            >
+              近一个月
+            </Button>
+          </div>
+          <div style={{ fontSize: '0.3rem' }}>
+            <RangePicker
+              allowClear
+              value={filter}
+              onChange={(time) => {
+                onSearch(time);
+              }}
+            />
           </div>
-        </Spin>
-        <div style={{ marginTop: 30 }}>
+        </div>
+        <div className="card-box" style={{ padding: '0.2rem' }}>
           <div className="section-title">
             <div className="section-line"></div>
-            数据列表
+            数据曲线
+          </div>
+          <Spin spinning={loading}>
+            <div style={{ height: '5rem', marginTop: 20 }}>
+              <ChartModule yName="水量(t)" xData={xData} dataList={dataList} />
+            </div>
+          </Spin>
+          <div style={{ marginTop: 30 }}>
+            <div className="section-title">
+              <div className="section-line"></div>
+              数据列表
+            </div>
+            <Table
+              loading={loading}
+              columns={columns}
+              rowKey="time"
+              style={{ marginTop: 20 }}
+              pagination={false}
+              dataSource={data?.sort((a, b) => b?.time?.localeCompare(a?.time))}
+            />
           </div>
-          <Table
-            loading={loading}
-            columns={columns}
-            style={{ marginTop: 20 }}
-            pagination={false}
-            dataSource={data?.sort((a, b) => b?.time?.localeCompare(a?.time))}
-          />
         </div>
-      </div>
+      </Spin>
     </PageContent>
   );
 };

src/pages/Home/index.less

@@ -339,3 +339,23 @@
     color: #3b3b3b;
   }
 }
+
+.timeSelectBox {
+  padding: 0.1rem 0;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+
+  .timeBtn > * {
+    margin-right: 0.1rem;
+  }
+  .timeBtn {
+    margin-right: 0.1rem;
+  }
+
+  :global {
+    .ant-btn {
+      height: 0.5rem;
+    }
+  }
+}

src/pages/Home/manage.less

@@ -4,16 +4,20 @@
   font-size: 0.24rem;
   color: #02a7f0;
 }
+
+.infoContainer > * {
+  margin-bottom: 0.2rem;
+}
+
 .itemContent {
   margin: 0.06rem 0.06rem;
   text-align: center;
   flex-grow: 1;
-  background-color: #2f62ae;
   width: 20%;
   padding: 0.1rem 0;
   .data {
     color: palevioletred;
-    font-size: 0.24rem;
+    font-size: 0.26rem;
     margin-right: 0.06rem;
   }
 }
@@ -54,11 +58,13 @@
 }
 .curEnergyCost {
   display: flex;
+  flex-wrap: wrap;
   justify-content: center;
   align-items: center;
   margin: 0.4rem 0.4rem 0 0.4rem;
   .item {
     width: 50%;
+    padding: 0.1rem;
     letter-spacing: 0.02rem;
     position: relative;
     font-size: 0.24rem;

src/services/OperationManagement.js

@@ -66,11 +66,11 @@ export async function querySectionCode(processId, type, project_id) {
 
 /**
  *
- * @param {*} data
- * @param {*} data.project_id
- * @param {*} data.metric_code
- * @param {*} data.start_time
- * @param {*} data.end_time
+ * @param {object} data
+ * @param {number} data.project_id
+ * @param {string} data.metric_code
+ * @param {string} data.start_time
+ * @param {string} data.end_time
  * @returns
  */
 export async function queryChartList(data) {