src/components/ManagementPage/chartModule.js

@@ -69,6 +69,9 @@ const ChartModule = (props) => {
         ...option.legend.textStyle,
         ...legend.textStyle,
       };
+      if (legend.right) {
+        option.legend.right = legend.right;
+      }
     }
     let series = [];
     switch (chartType) {
@@ -210,7 +213,7 @@ const defaultOption = {
     trigger: 'axis',
     textStyle: {
       fontSize: 24,
-      // color: 
+      // color:
     },
   },
   grid: {
@@ -437,7 +440,7 @@ const defaultOption = {
     // icon:'arrow',
     // width:'2',
     itemHeight: 0, // 远点宽度为0不显示原点
-    // right: '10%',
+    // right: '30%',
     data: ['进水水量', '预测出水量', '实际出水量'],
     lineStyle: {},
     textStyle: {

src/pages/SmartOps/operationManage/CostAnalysis/CostAnalysis.js

@@ -180,7 +180,9 @@ const CostAnalysis = () => {
           </Button>
         </div>
         <div style={{ height: '3.5rem', marginBottom: '0.1rem' }}>
-          {data?.chartData && <ChartModule {...data.chartData} />}
+          {data?.chartData && (
+            <ChartModule {...data.chartData} legend={{ right: '30%' }} />
+          )}
         </div>
       </div>
       <div style={{ marginTop: '0.2rem' }}>

src/pages/SmartOps/predictionAnalysis/PredictionAnalysis.js

@@ -1,15 +1,9 @@
 import { queryMembraneList } from '@/services/SmartOps';
+import { UnityAction } from '@/utils/utils';
 import { RightOutlined } from '@ant-design/icons';
 import { history, useParams, useRequest } from '@umijs/max';
 import styles from './PredictionAnalysis.less';
 
-const UFList = [
-  { label: '超滤模组A (UF-4001A)' },
-  { label: '超滤模组A (UF-4001B)' },
-  { label: '超滤模组A (UF-4001C)' },
-  { label: '超滤模组A (UF-4001D)' },
-];
-
 const PredictionAnalysis = () => {
   const { projectId } = useParams();
 
@@ -24,6 +18,16 @@ const PredictionAnalysis = () => {
   });
 
   const toDetail = (code) => {
+    const devs = {};
+    deviceList.forEach((item) => {
+      devs[item.device_code] = 0;
+    });
+    const msg = {
+      SysName: '超滤工艺单元',
+      SysDevs: devs,
+    };
+    UnityAction.sendMsg('ProcessAnalysisDetail', JSON.stringify(msg));
+
     history.push(`/smart-ops/prediction/${projectId}?code=${code}`);
   };
 

src/pages/SmartOps/predictionAnalysis/PredictionAnalysis.less

@@ -20,7 +20,7 @@
 .detailDeviceName {
   color: #4089ff;
   background-color: #dce7f9;
-  font-size: 0.26rem;
+  font-size: 0.28rem;
   padding: 0.4rem 0.2rem;
   border-radius: 0.2rem;
 }
@@ -48,13 +48,13 @@
 .dateTabs {
   display: flex;
   border: 0.01rem solid #d5d5d5;
-  height: 0.6rem;
+  height: 0.45rem;
   .dateTabsItem {
-    width: 1.28rem;
+    width: 1rem;
     text-align: center;
     cursor: pointer;
     border-right: 0.01rem solid #d5d5d5;
-    line-height: 0.6rem;
+    line-height: 0.45rem;
     font-size: 0.24rem;
     font-weight: 400;
     color: #4a4a4a;

src/pages/SmartOps/predictionAnalysis/PredictionDetail.js

@@ -1,7 +1,8 @@
 import PageContent from '@/components/PageContent';
 import PageTitle from '@/components/PageTitle';
 import { queryMembrane, queryMembraneList } from '@/services/SmartOps';
-import { useLocation, useParams, useRequest } from '@umijs/max';
+import { UnityAction } from '@/utils/utils';
+import { history, useLocation, useParams, useRequest } from '@umijs/max';
 import { DatePicker, Empty, Form, Spin } from 'antd';
 import dayjs from 'dayjs';
 import * as echarts from 'echarts';
@@ -36,7 +37,7 @@ const PredictionDetail = () => {
     defaultParams: [{ project_id: projectId, type: 'uf' }],
     formatResult: (result) => {
       if (result?.data?.list) {
-        console.log(result.data.list.find((item) => item.device_code === code));
+        UnityAction.sendMsg('SynDev', code);
         setCurrentDevice(
           result.data.list.find((item) => item.device_code === code),
         );
@@ -45,11 +46,16 @@ const PredictionDetail = () => {
     },
   });
 
+  const handleBackClick = () => {
+    UnityAction.sendMsg('ProcessAnalysisDetailBack');
+    history.back();
+  };
+
   return (
     <PageContent closeable={false}>
-      <PageTitle returnable>预测分析</PageTitle>
+      <PageTitle onReturn={handleBackClick}>预测分析</PageTitle>
       <div className={styles.detailDeviceName}>
-        超滤工艺单元：{currentDevice.device_name}（{currentDevice.device_code}）
+        超滤工艺单元: {currentDevice.device_name}（{currentDevice.device_code}）
       </div>
       <div className={styles.detailDevice}>
         <div className={styles.detailDeviceTitle}>跨膜压差</div>
@@ -525,7 +531,7 @@ const ChartContent = (props) => {
       <Form layout="inline" className={styles.form}>
         <RangePicker
           inputReadOnly
-          style={{ width: '5.4rem' }}
+          style={{ width: '5.7rem' }}
           allowClear={false}
           defaultValue={time}
           // value={time}