From 01204ca96d545cce04314dddc296d6cd9a737c68 Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Thu, 26 Dec 2024 09:11:53 +0800
Subject: [PATCH] =?UTF-8?q?feat():=20=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                |    2 +-
 .env.production                 |    2 +-
 public/index.html               |    2 +-
 src/models/auth/_.ts            |    6 +-
 src/setupProxy.js               |    4 +-
 src/views/AppRouters.tsx        |    5 +-
 src/views/TestLine/drpOption.js | 1388 ++++++++++++++++++++++++++++---
 src/views/TestLine/index.js     | 1258 +++++++++++++++++++++++++++-
 src/views/TestLine/toolbar.js   |   39 +-
 9 files changed, 2578 insertions(+), 128 deletions(-)

diff --git a/.env.development b/.env.development
index 16f3f9d..1ae2d0d 100644
--- a/.env.development
+++ b/.env.development
@@ -1 +1 @@
-PUBLIC_URL=/ykz
\ No newline at end of file
+PUBLIC_URL=/test
\ No newline at end of file
diff --git a/.env.production b/.env.production
index c4afaa8..e1ee32d 100644
--- a/.env.production
+++ b/.env.production
@@ -1,2 +1,2 @@
 GENERATE_SOURCEMAP=false
-PUBLIC_URL=/ykz
\ No newline at end of file
+PUBLIC_URL=/test
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 5e9bb96..27a6c4b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -29,7 +29,7 @@
   <script type="text/javascript" src="%PUBLIC_URL%/popmotion.xl.min.js"></script>
   <script type="text/javascript" src="%PUBLIC_URL%/imouplayer.js"></script>
   <script src="%PUBLIC_URL%/h5Player/h5player.min.js"></script>
-  <title>盐卡引水闸信息化系统</title>
+  <title>测试</title>
 
   <style>
     .lf{
diff --git a/src/models/auth/_.ts b/src/models/auth/_.ts
index fd12618..e6ae893 100644
--- a/src/models/auth/_.ts
+++ b/src/models/auth/_.ts
@@ -187,8 +187,12 @@ export async function loadMenu(): Promise<MenuItem[]> {
   const tree = buildTree(data,0)
   const tree2 = tree?.filter((item:any) =>(item.menuId != "1" && item.menuId != "2" && item.menuId != "3"))
   handelTreeData(tree2,id)
-  return tree2
+  // return tree2
 
+  
+  return [
+    { id: id(), title: '测试', path: '/testLine', icon: 'yzt' },
+  ]
 
   // const id = idgen()
   // return [
diff --git a/src/setupProxy.js b/src/setupProxy.js
index ebd07d0..33a5f1d 100644
--- a/src/setupProxy.js
+++ b/src/setupProxy.js
@@ -3,9 +3,9 @@ const { createProxyMiddleware } = require('http-proxy-middleware');
 module.exports = function (app) {
   //咸丰调度系统
   app.use(
-    '/gunshiApp',
+    '/api',
     createProxyMiddleware({
-       target: 'http://local.gunshiiot.com:18083/',//测试
+       target: 'http://202.103.169.18:10100/',//测试
       // target: 'http://192.168.66.7:24106/',//正式
       // target: 'http://36.139.207.50:18083/',//移动云
       // target: 'http://192.168.66.49:24105/',//移动云
diff --git a/src/views/AppRouters.tsx b/src/views/AppRouters.tsx
index 9307887..3ff22ba 100644
--- a/src/views/AppRouters.tsx
+++ b/src/views/AppRouters.tsx
@@ -26,6 +26,8 @@ import MenuM from './SystemMangant/menuM'
 import TestLine from './TestLine'
 // const HomePage = lazy(() => import('./Home'))
 
+
+
 const AppRouters: React.FC = () => {
   const dispatch = useDispatch<Dispatch>()
 
@@ -37,7 +39,8 @@ const AppRouters: React.FC = () => {
   }, [dispatch])
 
   let element = useRoutes([
-    { path: '/', element: <LoginPage /> },
+    // { path: '/', element: <LoginPage /> },
+    { path: '/', element: <TestLine /> },
     { path: '/home', element: <HomePage /> },
     {
       path: '/mgr',
diff --git a/src/views/TestLine/drpOption.js b/src/views/TestLine/drpOption.js
index 2d28fc3..0432788 100644
--- a/src/views/TestLine/drpOption.js
+++ b/src/views/TestLine/drpOption.js
@@ -1,54 +1,1228 @@
 import * as echarts from 'echarts';
 import moment from 'moment';
 
-export default function drpOption(time = '',tabArr) {
-    
+export default function drpOption(time = '', tabArr) {
+
+    const deadWaterData = [
+        88.25,
+        88.25,
+        88.25,
+        88.26,
+        88.28,
+        88.28,
+        88.29,
+        88.29,
+        88.25,
+        88.29,
+        88.29,
+        88.29,
+        88.29,
+        88.29,
+        88.29,
+        88.29,
+        88.29,
+        88.29,
+        88.29,
+        88.28,
+        88.28,
+        88.28,
+        88.28,
+        88.28,
+        88.28,
+        88.28,
+        88.28,
+        88.28,
+        88.3,
+        88.3,
+        88.31,
+        88.32,
+        88.32,
+        88.32,
+        88.32,
+        88.32,
+        88.32,
+        88.32,
+        88.32,
+        88.32,
+        88.32,
+        88.32,
+        88.32,
+        88.32,
+        88.32,
+        88.32,
+        88.32,
+        88.33,
+        88.34,
+        88.36,
+        88.37,
+        88.38,
+        88.39,
+        88.4,
+        88.4,
+        88.4,
+        88.4,
+        88.4,
+        88.4,
+        88.4,
+        88.4,
+        88.4,
+        88.41,
+        88.42,
+        88.43,
+        88.44,
+        88.45,
+        88.46,
+        88.46,
+        88.47,
+        88.47,
+        88.48,
+        88.48,
+        88.48,
+        88.48,
+        88.49,
+        88.5,
+        88.51,
+        88.52,
+        88.53,
+        88.53,
+        88.53,
+        88.53,
+        88.53,
+        88.53,
+        88.53,
+        88.53,
+        88.53,
+        88.53,
+        88.53,
+        88.53,
+        88.53,
+        88.53,
+        88.53,
+        88.53,
+        88.54,
+        88.55,
+        88.57,
+        88.58,
+        88.59,
+        88.61,
+        88.62,
+        88.63,
+        88.63,
+        88.63,
+        88.63,
+        88.63,
+        88.63,
+        88.63,
+        88.63,
+        88.63,
+        88.63,
+        88.63,
+        88.63,
+        88.63,
+        88.63,
+        88.63,
+        88.63,
+        88.63,
+        88.63,
+        88.64,
+        88.65,
+        88.66,
+        88.67,
+        88.68,
+        88.68,
+        88.68,
+        88.68,
+        88.68,
+        88.68,
+        88.68,
+        88.68,
+        88.68,
+        88.68,
+        88.68,
+        88.68,
+        88.68,
+        88.68,
+        88.68,
+        88.68,
+        88.68,
+        88.68,
+        88.67,
+        88.67,
+        88.67,
+        88.67,
+        88.68,
+        88.69,
+        88.7,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.7,
+        88.7,
+        88.7,
+        88.7,
+        88.7,
+        88.7,
+        88.7,
+        88.7,
+        88.71,
+        88.71,
+        88.72,
+        88.72,
+        88.72,
+        88.72,
+        88.72,
+        88.72,
+        88.72,
+        88.72,
+        88.72,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.71,
+        88.78,
+        88.78,
+        88.78,
+        88.78,
+        88.78,
+        88.78,
+        88.78,
+        88.78,
+        88.78,
+        88.77,
+        88.77,
+        88.77,
+        88.77,
+        88.77,
+        88.77,
+        88.77,
+        88.77,
+        88.77,
+        88.78,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.8,
+        88.81,
+        88.82,
+        88.82,
+        88.83,
+        88.83,
+        88.83,
+        88.83,
+        88.83,
+        88.83,
+        88.83,
+        88.83,
+        88.83,
+        88.83,
+        88.83,
+        88.83,
+        88.83,
+        88.83,
+        88.83,
+        88.83,
+        88.83,
+        88.83,
+        88.83,
+        88.84,
+        88.86,
+        88.87,
+        88.89,
+        88.89,
+        88.9,
+        88.9,
+        88.9,
+        88.9,
+        88.9,
+        88.9,
+        88.9,
+        88.92,
+        88.94,
+        88.95,
+        88.96,
+        88.97,
+        88.96,
+        88.97,
+        88.97,
+        88.97,
+        88.98,
+        88.99,
+        89,
+        89,
+        89.02,
+        89.02,
+        89.03,
+        89.03,
+        89.03,
+        89.03,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.03,
+        89.04,
+        89.05,
+        89.05,
+        89.06,
+        89.06,
+        89.06,
+        89.06,
+        89.06,
+        89.06,
+        89.05,
+        89.05,
+        89.04,
+        89.03,
+        89.03,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.02,
+        89.01,
+        89.01,
+        89,
+        89,
+        88.99,
+        88.98,
+        88.97,
+        88.97,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.97,
+        88.98,
+        88.99,
+        89,
+        89,
+        89.01,
+        89.01,
+        89.01,
+        89.01,
+        89.01,
+        89.01,
+        89.01,
+        89.01,
+        89.01,
+        89.02,
+        89.03,
+        89.05,
+        89.05,
+        89.06,
+        89.06,
+        89.08,
+        89.08,
+        89.09,
+        89.1,
+        89.12,
+        89.12,
+        89.13,
+        89.13,
+        89.14,
+        89.14,
+        89.15,
+        89.15,
+        89.16,
+        89.17,
+        89.18,
+        89.18,
+        89.2,
+        89.2,
+        89.2,
+        89.19,
+        89.18,
+        89.16,
+        89.14,
+        89.14,
+        89.14,
+        89.14,
+        89.13,
+        89.12,
+        89.11,
+        89.09,
+        89.08,
+        89.06,
+        89.05,
+        89.03,
+        89.01,
+        89,
+        88.98,
+        88.98,
+        88.97,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.94,
+        88.94,
+        88.94,
+        88.94,
+        88.94,
+        88.94,
+        88.94,
+        88.94,
+        88.94,
+        88.94,
+        88.94,
+        88.94,
+        88.94,
+        88.94,
+        88.94,
+        88.94,
+        88.94,
+        88.94,
+        88.93,
+        88.93,
+        88.92,
+        88.93,
+        88.94,
+        88.95,
+        88.96,
+        88.97,
+        88.97,
+        88.98,
+        88.98,
+        88.99,
+        88.99,
+        88.99,
+        88.99,
+        89,
+        89,
+        89,
+        89,
+        89,
+        89,
+        89,
+        89,
+        89.01,
+        89.01,
+        89.01,
+        89.01,
+        89.01,
+        89.02,
+        89.01,
+        89.01,
+        89.01,
+        89.01,
+        89.01,
+        89,
+        89,
+        89,
+        89,
+        89,
+        88.99,
+        88.98,
+        88.98,
+        88.98,
+        88.98,
+        88.98,
+        88.98,
+        88.98,
+        88.97,
+        88.97,
+        88.96,
+        88.96,
+        88.96,
+        88.96,
+        88.95,
+        88.95,
+        88.95,
+        88.95,
+        88.95,
+        88.95,
+        88.96,
+        88.96,
+        88.97,
+        88.97,
+        88.98,
+        88.98,
+        88.99,
+        89,
+        89,
+        89,
+        89,
+        89,
+        89,
+        89,
+        89,
+        89,
+        88.99,
+        88.99,
+        88.98,
+        88.98,
+        88.98,
+        88.98,
+        88.98,
+        88.97,
+        88.97,
+        88.97,
+        88.97,
+        88.96,
+        88.96,
+        88.96,
+        88.95,
+        88.95,
+        88.94,
+        88.94,
+        88.94,
+        88.94,
+        88.93,
+        88.93,
+        88.93,
+        88.93,
+        88.93,
+        88.93,
+        88.92,
+        88.92,
+        88.92,
+        88.92,
+        88.92,
+        88.92,
+        88.92,
+        88.92,
+        88.92
+    ];
+    const deadRainData = [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.5,
+        2,
+        0.5,
+        0,
+        0.5,
+        2,
+        2.5,
+        1.5,
+        0,
+        0.5,
+        0.5,
+        1,
+        0.5,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.5,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.5,
+        1,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.5,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.5,
+        0,
+        1.5,
+        0.5,
+        0,
+        1.5,
+        1.5,
+        0,
+        0,
+        0,
+        0,
+        2,
+        0.5,
+        1,
+        2,
+        0.5,
+        1.5,
+        0,
+        0.5,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        2,
+        0,
+        2,
+        0.5,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.5,
+        0.5,
+        0,
+        0.5,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.5,
+        0,
+        3,
+        1.5,
+        2,
+        4,
+        2.5,
+        3,
+        1,
+        1,
+        1,
+        1,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.5,
+        0.5,
+        0,
+        0,
+        0,
+        0.5,
+        0,
+        0.5,
+        0,
+        0,
+        0.5,
+        0,
+        0.5,
+        0,
+        0.5,
+        0,
+        0,
+        0.5,
+        0,
+        1,
+        0.5,
+        1.5,
+        1.5,
+        1.5,
+        1,
+        0.5,
+        0,
+        0,
+        0,
+        0.5,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.5,
+        0,
+        0,
+        0,
+        0,
+        0.5,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0.5,
+        0.5,
+        0.5,
+        0,
+        0.5,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0
+    ];
     const h1DrpData = tabArr.find(item => item.tm == '1小时');
+    const upDeadWaterData = deadWaterData.map((item, i) => ({
+        time: i + 1,
+        value: item
+    }))
+    const upDeadrainData = deadRainData.map((item, i) => ({
+        time: i + 1,
+        value: item
+    }))
 
-        // 水量
-    let water = [
-        { time: "12-24 00:00", value: 480 },
-        { time: "12-24 01:00", value: 500 },
-        { time: "12-24 02:00", value: 450 },
-        { time: "12-24 03:00", value: 520 },
-        { time: "12-24 04:00", value: 490 },
-        { time: "12-24 05:00", value: 550 },
-        { time: "12-24 06:00", value: 580 },
-        { time: "12-24 07:00", value: 560 },
-        { time: "12-24 08:00", value: 530 },
-        { time: "12-24 09:00", value: 590 },
-        { time: "12-24 10:00", value: 540 },
-        { time: "12-24 11:00", value: 600 },
-        { time: "12-24 12:00", value: 620 },
-        { time: "12-24 13:00", value: 650 },
-        { time: "12-24 14:00", value: 680 },
-        { time: "12-24 15:00", value: 630 },
-    ];
-    // 雨量
-    let rain = [
-        { time: "12-24 00:00", value: 3.8 },
-        { time: "12-24 01:00", value: 4 },
-        { time: "12-24 02:00", value: 3.5 },
-        { time: "12-24 03:00", value: 4.2 },
-        { time: "12-24 04:00", value: 3.9 },
-        { time: "12-24 05:00", value: 4.5 },
-        { time: "12-24 06:00", value: 4.8 },
-        { time: "12-24 07:00", value: 4.6 },
-        { time: "12-24 08:00", value: 4.3 },
-        { time: "12-24 09:00", value: 4.9 },
-        { time: "12-24 10:00", value: 4.4 },
-        { time: "12-24 11:00", value: 5.0 },
-        { time: "12-24 12:00", value: 5.2 },
-        { time: "12-24 13:00", value: 5.5 },
-        { time: "12-24 14:00", value: 5.8 },
-        { time: "12-24 15:00", value: 5.3 },
-    ];
-
-    const data = JSON.parse(JSON.stringify(water));
-    const ydata = JSON.parse(JSON.stringify(rain));
+    const data = JSON.parse(JSON.stringify(upDeadWaterData));
+    const ydata = JSON.parse(JSON.stringify(upDeadrainData));
     if (time == "1h") {
-        data.push({ time: "12-24 16:00", value: 420, predict: true })
-        ydata.push({ time: "12-24 16:00", value: h1DrpData?.drp, predict: true })
+        data.push(
+            { time: 601, value: h1DrpData?.rz, predict: true })
+        ydata.push({ time: 601, value: h1DrpData?.drp, predict: true })
     } else if (time == "3h") {
         const wData = [
             { time: "12-24 16:00", value: 420, predict: true },
@@ -56,9 +1230,9 @@ export default function drpOption(time = '',tabArr) {
             { time: "12-24 18:00", value: 480, predict: true },
         ]
         const rData = [
-            { time: "12-24 16:00", value: tabArr.find( item =>item.tm == '1小时')?.drp, predict: true },
-            { time: "12-24 17:00", value: tabArr.find(item =>item.tm == '2小时')?.drp, predict: true },
-            { time: "12-24 18:00", value: tabArr.find(item =>item.tm == '3小时')?.drp, predict: true },
+            { time: "12-24 16:00", value: tabArr.find(item => item.tm == '1小时')?.drp, predict: true },
+            { time: "12-24 17:00", value: tabArr.find(item => item.tm == '2小时')?.drp, predict: true },
+            { time: "12-24 18:00", value: tabArr.find(item => item.tm == '3小时')?.drp, predict: true },
         ]
         data.push(...wData)
         ydata.push(...rData)
@@ -72,17 +1246,17 @@ export default function drpOption(time = '',tabArr) {
             { time: "12-24 21:00", value: 480, predict: true },
         ]
         const h6RData = [
-            { time: "12-24 16:00", value: tabArr.find( item =>item.tm == '1小时')?.drp, predict: true },
-            { time: "12-24 17:00", value: tabArr.find( item =>item.tm == '2小时')?.dr, predict: true },
-            { time: "12-24 18:00", value:  tabArr.find( item =>item.tm == '3小时')?.dr, predict: true },
-            { time: "12-24 19:00", value:  tabArr.find( item =>item.tm == '4小时')?.dr, predict: true },
-            { time: "12-24 20:00", value:  tabArr.find( item =>item.tm == '5小时')?.dr, predict: true },
-            { time: "12-24 21:00", value:  tabArr.find( item =>item.tm == '6小时')?.dr, predict: true },
+            { time: "12-24 16:00", value: tabArr.find(item => item.tm == '1小时')?.drp, predict: true },
+            { time: "12-24 17:00", value: tabArr.find(item => item.tm == '2小时')?.dr, predict: true },
+            { time: "12-24 18:00", value: tabArr.find(item => item.tm == '3小时')?.dr, predict: true },
+            { time: "12-24 19:00", value: tabArr.find(item => item.tm == '4小时')?.dr, predict: true },
+            { time: "12-24 20:00", value: tabArr.find(item => item.tm == '5小时')?.dr, predict: true },
+            { time: "12-24 21:00", value: tabArr.find(item => item.tm == '6小时')?.dr, predict: true },
         ]
 
         data.push(...h6WData)
         ydata.push(...h6RData)
-    } else if(time == "12h") {
+    } else if (time == "12h") {
         const h12WData = [
             { time: "12-24 16:00", value: 420, predict: true },
             { time: "12-24 17:00", value: 450, predict: true },
@@ -98,18 +1272,18 @@ export default function drpOption(time = '',tabArr) {
             { time: "12-25 02:00", value: 480, predict: true },
         ]
         const h12RData = [
-            { time: "12-24 16:00", value: tabArr.find( item =>item.tm == '1小时')?.drp, predict: true },
-            { time: "12-24 17:00", value: tabArr.find( item =>item.tm == '2小时')?.drp, predict: true },
-            { time: "12-24 18:00", value:  tabArr.find( item =>item.tm == '3小时')?.drp, predict: true },
-            { time: "12-24 19:00", value:  tabArr.find( item =>item.tm == '4小时')?.drp, predict: true },
-            { time: "12-24 20:00", value:  tabArr.find( item =>item.tm == '5小时')?.drp, predict: true },
-            { time: "12-24 21:00", value:  tabArr.find( item =>item.tm == '6小时')?.drp, predict: true },
-            { time: "12-24 22:00", value: tabArr.find( item =>item.tm == '7小时')?.drp, predict: true },
-            { time: "12-24 23:00", value: tabArr.find( item =>item.tm == '8小时')?.drp, predict: true },
-            { time: "12-24 24:00", value: tabArr.find( item =>item.tm == '9小时')?.drp, predict: true },
-            { time: "12-25 00:00", value: tabArr.find( item =>item.tm == '10小时')?.drp, predict: true },
-            { time: "12-25 01:00", value: tabArr.find( item =>item.tm == '11小时')?.drp, predict: true },
-            { time: "12-25 02:00", value: tabArr.find( item =>item.tm == '12小时')?.drp, predict: true },
+            { time: "12-24 16:00", value: tabArr.find(item => item.tm == '1小时')?.drp, predict: true },
+            { time: "12-24 17:00", value: tabArr.find(item => item.tm == '2小时')?.drp, predict: true },
+            { time: "12-24 18:00", value: tabArr.find(item => item.tm == '3小时')?.drp, predict: true },
+            { time: "12-24 19:00", value: tabArr.find(item => item.tm == '4小时')?.drp, predict: true },
+            { time: "12-24 20:00", value: tabArr.find(item => item.tm == '5小时')?.drp, predict: true },
+            { time: "12-24 21:00", value: tabArr.find(item => item.tm == '6小时')?.drp, predict: true },
+            { time: "12-24 22:00", value: tabArr.find(item => item.tm == '7小时')?.drp, predict: true },
+            { time: "12-24 23:00", value: tabArr.find(item => item.tm == '8小时')?.drp, predict: true },
+            { time: "12-24 24:00", value: tabArr.find(item => item.tm == '9小时')?.drp, predict: true },
+            { time: "12-25 00:00", value: tabArr.find(item => item.tm == '10小时')?.drp, predict: true },
+            { time: "12-25 01:00", value: tabArr.find(item => item.tm == '11小时')?.drp, predict: true },
+            { time: "12-25 02:00", value: tabArr.find(item => item.tm == '12小时')?.drp, predict: true },
         ]
 
         data.push(...h12WData)
@@ -128,7 +1302,7 @@ export default function drpOption(time = '',tabArr) {
             { time: "12-25 00:00", value: 510, predict: true },
             { time: "12-25 01:00", value: 540, predict: true },
             { time: "12-25 02:00", value: 480, predict: true },
-            
+
             { time: "12-25 03:00", value: 420, predict: true },
             { time: "12-25 04:00", value: 450, predict: true },
             { time: "12-25 05:00", value: 480, predict: true },
@@ -143,31 +1317,31 @@ export default function drpOption(time = '',tabArr) {
             { time: "12-25 14:00", value: 480, predict: true },
         ]
         const h24RData = [
-            { time: "12-24 16:00", value: tabArr.find( item =>item.tm == '1小时')?.drp, predict: true },
-            { time: "12-24 17:00", value: tabArr.find( item =>item.tm == '2小时')?.drp, predict: true },
-            { time: "12-24 18:00", value:  tabArr.find( item =>item.tm == '3小时')?.drp, predict: true },
-            { time: "12-24 19:00", value:  tabArr.find( item =>item.tm == '4小时')?.drp, predict: true },
-            { time: "12-24 20:00", value:  tabArr.find( item =>item.tm == '5小时')?.drp, predict: true },
-            { time: "12-24 21:00", value:  tabArr.find( item =>item.tm == '6小时')?.drp, predict: true },
-            { time: "12-24 22:00", value: tabArr.find( item =>item.tm == '7小时')?.drp, predict: true },
-            { time: "12-24 23:00", value: tabArr.find( item =>item.tm == '8小时')?.drp, predict: true },
-            { time: "12-24 24:00", value: tabArr.find( item =>item.tm == '9小时')?.drp, predict: true },
-            { time: "12-25 00:00", value: tabArr.find( item =>item.tm == '10小时')?.drp, predict: true },
-            { time: "12-25 01:00", value: tabArr.find( item =>item.tm == '11小时')?.drp, predict: true },
-            { time: "12-25 02:00", value: tabArr.find( item =>item.tm == '12小时')?.drp, predict: true },
+            { time: "12-24 16:00", value: tabArr.find(item => item.tm == '1小时')?.drp, predict: true },
+            { time: "12-24 17:00", value: tabArr.find(item => item.tm == '2小时')?.drp, predict: true },
+            { time: "12-24 18:00", value: tabArr.find(item => item.tm == '3小时')?.drp, predict: true },
+            { time: "12-24 19:00", value: tabArr.find(item => item.tm == '4小时')?.drp, predict: true },
+            { time: "12-24 20:00", value: tabArr.find(item => item.tm == '5小时')?.drp, predict: true },
+            { time: "12-24 21:00", value: tabArr.find(item => item.tm == '6小时')?.drp, predict: true },
+            { time: "12-24 22:00", value: tabArr.find(item => item.tm == '7小时')?.drp, predict: true },
+            { time: "12-24 23:00", value: tabArr.find(item => item.tm == '8小时')?.drp, predict: true },
+            { time: "12-24 24:00", value: tabArr.find(item => item.tm == '9小时')?.drp, predict: true },
+            { time: "12-25 00:00", value: tabArr.find(item => item.tm == '10小时')?.drp, predict: true },
+            { time: "12-25 01:00", value: tabArr.find(item => item.tm == '11小时')?.drp, predict: true },
+            { time: "12-25 02:00", value: tabArr.find(item => item.tm == '12小时')?.drp, predict: true },
 
-            { time: "12-25 03:00", value: tabArr.find( item =>item.tm == '13小时')?.drp, predict: true },
-            { time: "12-25 04:00", value: tabArr.find( item =>item.tm == '14小时')?.drp, predict: true },
-            { time: "12-25 05:00", value: tabArr.find( item =>item.tm == '15小时')?.drp, predict: true },
-            { time: "12-25 06:00", value: tabArr.find( item =>item.tm == '16小时')?.drp, predict: true },
-            { time: "12-25 07:00", value: tabArr.find( item =>item.tm == '17小时')?.drp, predict: true },
-            { time: "12-25 08:00", value: tabArr.find( item =>item.tm == '18小时')?.drp, predict: true },
-            { time: "12-25 09:00", value: tabArr.find( item =>item.tm == '19小时')?.drp, predict: true },
-            { time: "12-25 10:00", value: tabArr.find( item =>item.tm == '20小时')?.drp, predict: true },
-            { time: "12-25 11:00", value: tabArr.find( item =>item.tm == '21小时')?.drp, predict: true },
-            { time: "12-25 12:00", value: tabArr.find( item =>item.tm == '22小时')?.drp, predict: true },
-            { time: "12-25 13:00", value: tabArr.find( item =>item.tm == '23小时')?.drp, predict: true },
-            { time: "12-25 14:00", value: tabArr.find( item =>item.tm == '24小时')?.drp, predict: true },
+            { time: "12-25 03:00", value: tabArr.find(item => item.tm == '13小时')?.drp, predict: true },
+            { time: "12-25 04:00", value: tabArr.find(item => item.tm == '14小时')?.drp, predict: true },
+            { time: "12-25 05:00", value: tabArr.find(item => item.tm == '15小时')?.drp, predict: true },
+            { time: "12-25 06:00", value: tabArr.find(item => item.tm == '16小时')?.drp, predict: true },
+            { time: "12-25 07:00", value: tabArr.find(item => item.tm == '17小时')?.drp, predict: true },
+            { time: "12-25 08:00", value: tabArr.find(item => item.tm == '18小时')?.drp, predict: true },
+            { time: "12-25 09:00", value: tabArr.find(item => item.tm == '19小时')?.drp, predict: true },
+            { time: "12-25 10:00", value: tabArr.find(item => item.tm == '20小时')?.drp, predict: true },
+            { time: "12-25 11:00", value: tabArr.find(item => item.tm == '21小时')?.drp, predict: true },
+            { time: "12-25 12:00", value: tabArr.find(item => item.tm == '22小时')?.drp, predict: true },
+            { time: "12-25 13:00", value: tabArr.find(item => item.tm == '23小时')?.drp, predict: true },
+            { time: "12-25 14:00", value: tabArr.find(item => item.tm == '24小时')?.drp, predict: true },
         ]
         data.push(...h24WData)
         ydata.push(...h24RData)
@@ -178,8 +1352,6 @@ export default function drpOption(time = '',tabArr) {
     let data2 = []; //预测水量数据
     let data3 = []; //历史雨量数据
     let data4 = []; //预测雨量数据
-
-
     data.forEach((item) => {
         if (item.predict && time) {
             data2.push([item.time, item.value]);
@@ -195,12 +1367,15 @@ export default function drpOption(time = '',tabArr) {
             data3.push([item.time, item.value]);
         }
     });
+
     const splitLineData1 = data1.at(-1);
     const splitLineData = data1.at(-1);
     const splitLineData2 = data3.at(-1);
 
     // 如果是折线图，此处需要追加实际数据的最后一组数据，如果是柱状图，则不需要。
     data2.unshift(splitLineData1);
+    console.log("splitLineData",splitLineData);
+    
     data4.unshift(splitLineData2);
 
     return {
@@ -220,7 +1395,10 @@ export default function drpOption(time = '',tabArr) {
         },
         xAxis: {
             type: "category",
-            data: data.map(item => item.time),
+            // data: data.map(item => item.time),
+            axisLabel: {
+                interval: 100
+            },
             axisTick: {
                 show: false,
             },
@@ -257,6 +1435,14 @@ export default function drpOption(time = '',tabArr) {
 
             },
         ],
+        dataZoom: [{
+            type: 'slider',//图表下方的伸缩条
+            show: true, //是否显示
+            realtime: true, //拖动时，是否实时更新系列的视图
+            start: 1, //伸缩条开始位置（1-100），可以随时更改
+            end: 100, //伸缩条结束位置（1-100），可以随时更改
+            // y:100
+        }],
         series: [
             {
                 name: "历史水量",
@@ -279,9 +1465,9 @@ export default function drpOption(time = '',tabArr) {
                 yAxisIndex: 0,
                 type: "line",
                 showSymbol: true,
-                data: data2,
+                data:[...data2],
                 smooth: true,
-                itemStyle : { normal: {label : {show: true}}}
+                itemStyle: { normal: { label: { show: true } } }
             },
             {
                 name: "预测雨量",
@@ -290,7 +1476,7 @@ export default function drpOption(time = '',tabArr) {
                 showSymbol: true,
                 data: data4,
                 smooth: true,
-                itemStyle : { normal: {label : {show: true}}}
+                itemStyle: { normal: { label: { show: true } } }
             },
             {
                 type: "line",
@@ -306,15 +1492,15 @@ export default function drpOption(time = '',tabArr) {
                         [
                             // 下面半截绿色的线
                             {
-                                xAxis: splitLineData[0],
+                                xAxis: 599,
                                 yAxis: 0,
                                 lineStyle: {
                                     color: "rgba(46, 224, 85, 1)",
                                 },
                             },
                             {
-                                xAxis: splitLineData[0],
-                                yAxis: splitLineData[1],
+                                xAxis: 599,
+                                yAxis: 89,
                             },
                         ],
                     ],
diff --git a/src/views/TestLine/index.js b/src/views/TestLine/index.js
index bcfcc41..3db359e 100644
--- a/src/views/TestLine/index.js
+++ b/src/views/TestLine/index.js
@@ -4,7 +4,7 @@ import ToolBar from './toolbar'
 import ReactEcharts from 'echarts-for-react';
 import './index.less'
 import drpOption from './drpOption.js'
-
+import { httppost2 } from '../../utils/request';
 
 const TableE = ({count,setEditData,tableData}) => {
   const EditableCell = ({
@@ -17,7 +17,7 @@ const TableE = ({count,setEditData,tableData}) => {
     children,
     ...restProps
   }) => {
-    const inputNode = <InputNumber min={0} style={{ textAlign: "center", flex: 1 }} />;
+    const inputNode = <InputNumber style={{ textAlign: "center", flex: 1 }} />;
     return (
       <td {...restProps}>
         {editing ? (
@@ -188,10 +188,1243 @@ const TableE = ({count,setEditData,tableData}) => {
 
 export default function TestLine() {
   const [form] = Form.useForm()
-  const [searchVal, setSearchVal] = useState({})
+  const [searchVal, setSearchVal] = useState(false)
   const [editData, setEditData] = useState([])
   const [type, setType] = useState({})
   const [tmCount, setTmCount] = useState('')
+  const [tableForm, setTableForm] = useState({})
+  const [tableData, setTableData] = useState([])
+  const options = useMemo(() => {
+    return drpOption(tableForm.time || '1h',tableForm.tabArr || [])
+  }, [tableForm])
+  const getPrejectRain = async(name) => {
+    try {
+      const res = await httppost2('http://202.103.169.18:10100/api/v1/bot/water_infer',
+        {
+          "name": name,
+          "waters": [
+             88.25,
+             88.25,
+             88.25,
+             88.26,
+             88.28,
+             88.28,
+             88.29,
+             88.29,
+             88.25,
+             88.29,
+             88.29,
+             88.29,
+             88.29,
+             88.29,
+             88.29,
+             88.29,
+             88.29,
+             88.29,
+             88.29,
+             88.28,
+             88.28,
+             88.28,
+             88.28,
+             88.28,
+             88.28,
+             88.28,
+             88.28,
+             88.28,
+             88.3,
+             88.3,
+             88.31,
+             88.32,
+             88.32,
+             88.32,
+             88.32,
+             88.32,
+             88.32,
+             88.32,
+             88.32,
+             88.32,
+             88.32,
+             88.32,
+             88.32,
+             88.32,
+             88.32,
+             88.32,
+             88.32,
+             88.33,
+             88.34,
+             88.36,
+             88.37,
+             88.38,
+             88.39,
+             88.4,
+             88.4,
+             88.4,
+             88.4,
+             88.4,
+             88.4,
+             88.4,
+             88.4,
+             88.4,
+             88.41,
+             88.42,
+             88.43,
+             88.44,
+             88.45,
+             88.46,
+             88.46,
+             88.47,
+             88.47,
+             88.48,
+             88.48,
+             88.48,
+             88.48,
+             88.49,
+             88.5,
+             88.51,
+             88.52,
+             88.53,
+             88.53,
+             88.53,
+             88.53,
+             88.53,
+             88.53,
+             88.53,
+             88.53,
+             88.53,
+             88.53,
+             88.53,
+             88.53,
+             88.53,
+             88.53,
+             88.53,
+             88.53,
+             88.54,
+             88.55,
+             88.57,
+             88.58,
+             88.59,
+             88.61,
+             88.62,
+             88.63,
+             88.63,
+             88.63,
+             88.63,
+             88.63,
+             88.63,
+             88.63,
+             88.63,
+             88.63,
+             88.63,
+             88.63,
+             88.63,
+             88.63,
+             88.63,
+             88.63,
+             88.63,
+             88.63,
+             88.63,
+             88.64,
+             88.65,
+             88.66,
+             88.67,
+             88.68,
+             88.68,
+             88.68,
+             88.68,
+             88.68,
+             88.68,
+             88.68,
+             88.68,
+             88.68,
+             88.68,
+             88.68,
+             88.68,
+             88.68,
+             88.68,
+             88.68,
+             88.68,
+             88.68,
+             88.68,
+             88.67,
+             88.67,
+             88.67,
+             88.67,
+             88.68,
+             88.69,
+             88.7,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.7,
+             88.7,
+             88.7,
+             88.7,
+             88.7,
+             88.7,
+             88.7,
+             88.7,
+             88.71,
+             88.71,
+             88.72,
+             88.72,
+             88.72,
+             88.72,
+             88.72,
+             88.72,
+             88.72,
+             88.72,
+             88.72,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.71,
+             88.78,
+             88.78,
+             88.78,
+             88.78,
+             88.78,
+             88.78,
+             88.78,
+             88.78,
+             88.78,
+             88.77,
+             88.77,
+             88.77,
+             88.77,
+             88.77,
+             88.77,
+             88.77,
+             88.77,
+             88.77,
+             88.78,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.8,
+             88.81,
+             88.82,
+             88.82,
+             88.83,
+             88.83,
+             88.83,
+             88.83,
+             88.83,
+             88.83,
+             88.83,
+             88.83,
+             88.83,
+             88.83,
+             88.83,
+             88.83,
+             88.83,
+             88.83,
+             88.83,
+             88.83,
+             88.83,
+             88.83,
+             88.83,
+             88.84,
+             88.86,
+             88.87,
+             88.89,
+             88.89,
+             88.9,
+             88.9,
+             88.9,
+             88.9,
+             88.9,
+             88.9,
+             88.9,
+             88.92,
+             88.94,
+             88.95,
+             88.96,
+             88.97,
+             88.96,
+             88.97,
+             88.97,
+             88.97,
+             88.98,
+             88.99,
+             89,
+             89,
+             89.02,
+             89.02,
+             89.03,
+             89.03,
+             89.03,
+             89.03,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.03,
+             89.04,
+             89.05,
+             89.05,
+             89.06,
+             89.06,
+             89.06,
+             89.06,
+             89.06,
+             89.06,
+             89.05,
+             89.05,
+             89.04,
+             89.03,
+             89.03,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.02,
+             89.01,
+             89.01,
+             89,
+             89,
+             88.99,
+             88.98,
+             88.97,
+             88.97,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.97,
+             88.98,
+             88.99,
+             89,
+             89,
+             89.01,
+             89.01,
+             89.01,
+             89.01,
+             89.01,
+             89.01,
+             89.01,
+             89.01,
+             89.01,
+             89.02,
+             89.03,
+             89.05,
+             89.05,
+             89.06,
+             89.06,
+             89.08,
+             89.08,
+             89.09,
+             89.1,
+             89.12,
+             89.12,
+             89.13,
+             89.13,
+             89.14,
+             89.14,
+             89.15,
+             89.15,
+             89.16,
+             89.17,
+             89.18,
+             89.18,
+             89.2,
+             89.2,
+             89.2,
+             89.19,
+             89.18,
+             89.16,
+             89.14,
+             89.14,
+             89.14,
+             89.14,
+             89.13,
+             89.12,
+             89.11,
+             89.09,
+             89.08,
+             89.06,
+             89.05,
+             89.03,
+             89.01,
+             89,
+             88.98,
+             88.98,
+             88.97,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.94,
+             88.94,
+             88.94,
+             88.94,
+             88.94,
+             88.94,
+             88.94,
+             88.94,
+             88.94,
+             88.94,
+             88.94,
+             88.94,
+             88.94,
+             88.94,
+             88.94,
+             88.94,
+             88.94,
+             88.94,
+             88.93,
+             88.93,
+             88.92,
+             88.93,
+             88.94,
+             88.95,
+             88.96,
+             88.97,
+             88.97,
+             88.98,
+             88.98,
+             88.99,
+             88.99,
+             88.99,
+             88.99,
+             89,
+             89,
+             89,
+             89,
+             89,
+             89,
+             89,
+             89,
+             89.01,
+             89.01,
+             89.01,
+             89.01,
+             89.01,
+             89.02,
+             89.01,
+             89.01,
+             89.01,
+             89.01,
+             89.01,
+             89,
+             89,
+             89,
+             89,
+             89,
+             88.99,
+             88.98,
+             88.98,
+             88.98,
+             88.98,
+             88.98,
+             88.98,
+             88.98,
+             88.97,
+             88.97,
+             88.96,
+             88.96,
+             88.96,
+             88.96,
+             88.95,
+             88.95,
+             88.95,
+             88.95,
+             88.95,
+             88.95,
+             88.96,
+             88.96,
+             88.97,
+             88.97,
+             88.98,
+             88.98,
+             88.99,
+             89,
+             89,
+             89,
+             89,
+             89,
+             89,
+             89,
+             89,
+             89,
+             88.99,
+             88.99,
+             88.98,
+             88.98,
+             88.98,
+             88.98,
+             88.98,
+             88.97,
+             88.97,
+             88.97,
+             88.97,
+             88.96,
+             88.96,
+             88.96,
+             88.95,
+             88.95,
+             88.94,
+             88.94,
+             88.94,
+             88.94,
+             88.93,
+             88.93,
+             88.93,
+             88.93,
+             88.93,
+             88.93,
+             88.92,
+             88.92,
+             88.92,
+             88.92,
+             88.92,
+             88.92,
+             88.92,
+             88.92,
+             88.92
+          ],
+          "rains": [
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0.5,
+             2,
+             0.5,
+             0,
+             0.5,
+             2,
+             2.5,
+             1.5,
+             0,
+             0.5,
+             0.5,
+             1,
+             0.5,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0.5,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0.5,
+             1,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0.5,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0.5,
+             0,
+             1.5,
+             0.5,
+             0,
+             1.5,
+             1.5,
+             0,
+             0,
+             0,
+             0,
+             2,
+             0.5,
+             1,
+             2,
+             0.5,
+             1.5,
+             0,
+             0.5,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             2,
+             0,
+             2,
+             0.5,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0.5,
+             0.5,
+             0,
+             0.5,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0.5,
+             0,
+             3,
+             1.5,
+             2,
+             4,
+             2.5,
+             3,
+             1,
+             1,
+             1,
+             1,
+             0,
+             1,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             1,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0.5,
+             0.5,
+             0,
+             0,
+             0,
+             0.5,
+             0,
+             0.5,
+             0,
+             0,
+             0.5,
+             0,
+             0.5,
+             0,
+             0.5,
+             0,
+             0,
+             0.5,
+             0,
+             1,
+             0.5,
+             1.5,
+             1.5,
+             1.5,
+             1,
+             0.5,
+             0,
+             0,
+             0,
+             0.5,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0.5,
+             0,
+             0,
+             0,
+             0,
+             0.5,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0.5,
+             0.5,
+             0.5,
+             0,
+             0.5,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0,
+             0
+          ]
+       }
+      )
+      if (res.code == 0) {
+        const newArr = res.data?.water_predicts.map(item => ({ drp: '', rz: item, tm: '1小时' }))
+        setTableData(newArr)
+        setTableForm({...tableForm,tabArr:newArr})
+      }
+    } catch (error) {
+      console.log(error);
+      
+    }
+  }
+
+  useEffect(() => {
+    if (searchVal) {
+      getPrejectRain(searchVal.code)
+    }
+  }, [searchVal])
+  
   useEffect(() => {
     let count;
     if (type?.time) {
@@ -206,12 +1439,9 @@ export default function TestLine() {
       setTmCount('')
     }
   }, [type])
-  const [tableForm, setTableForm] = useState({})
-  const options = useMemo(() => {
-    return drpOption(tableForm.time,tableForm.tabArr || [])
-  }, [tableForm])
 
-  const [tableData, setTableData] = useState([])
+
+ 
   const rowObj = {
     "1小时": 420,
     "2小时": 450,
@@ -240,6 +1470,11 @@ export default function TestLine() {
     
 }
   const save = async () => {
+    const all = editData.some(item => !item.drp)
+    if (all) {
+      message.error("所有雨量不能为空")
+      return
+    }
     try {
       setTableForm({ tabArr: editData, time: type.time })
       const newTabl = editData.map(item => ({
@@ -268,11 +1503,12 @@ export default function TestLine() {
           <div className="ant-card-body" style={{ padding: "20px 0 0 0", height: 'calc( 100vh - 400px )' }}>
             
             <div style={{ display: 'flex', columnGap: 20 }}>
-              <div style={{ flex: 1,height: 'calc( 100vh - 400px )' }}>
+              <div style={{ flex: 1,height: 'calc( 100vh - 400px )',padding:10 }}>
               <ReactEcharts option={options} style={{ width: "100%", height: '100%' }} notMerge={true} />
               </div>
-              <div style={{ width: 380 }}>
-              <TableE count={tmCount} setEditData={setEditData} tableData={tableData} />
+              <div style={{ width: 430, marginRight: 30 }}>
+               <Button type="primary" onClick={save} style={{float:'right',marginBottom:10}}>生成</Button>
+               <TableE count={tmCount} setEditData={setEditData} tableData={tableData} />
               </div>
             </div>
           </div>
diff --git a/src/views/TestLine/toolbar.js b/src/views/TestLine/toolbar.js
index 89ca3b3..5cc89c0 100644
--- a/src/views/TestLine/toolbar.js
+++ b/src/views/TestLine/toolbar.js
@@ -6,10 +6,28 @@ import moment from 'moment';
 const { RangePicker } = DatePicker;
 const ToolBar = ({ setSearchVal, setType, save, form1 }) => {
   
-  const types = Array(5).fill(0).map((item,i) => ({
-    label: `${i + 1}#水库`,
-    value: i + 1
-  }))
+  const types = [
+    {
+      label: "hjw",
+      value: "hjw"
+    },
+    {
+      label: "cq",
+      value: "cq"
+    },
+    {
+      label: "sxs",
+      value: "sxs"
+    },
+    {
+      label: "szl",
+      value: "szl"
+    },
+    {
+      label: "wpc",
+      value: "wpc"
+    },
+  ]
 
   const timeType = [
     {
@@ -49,17 +67,20 @@ const ToolBar = ({ setSearchVal, setType, save, form1 }) => {
     save()
   }
 
-  const onValuesChange = (val) =>{
+  const onValuesChange = (val,o) =>{
     if ('time' in val) {
       setSearchVal({time: val.time})
       setType({time: val.time})
       form1.resetFields()
     }
+    if ('code' in val) {
+      setSearchVal(o)
+    }
   }
   useEffect(() => {
     const params = {
-      code: 1,
-      // time:'1h'
+      code: "hjw",
+      time:'1h'
     }
     form.setFieldsValue(params)
     setSearchVal(params)
@@ -77,9 +98,9 @@ const ToolBar = ({ setSearchVal, setType, save, form1 }) => {
           <Form.Item label="预见期" name="time">
             <NormalSelect allowClear style={{ width: '150px' }} options={timeType} /> 
           </Form.Item>
-           <Form.Item>
+           {/* <Form.Item>
             <Button type="primary" htmlType="submit">生成</Button>
-          </Form.Item>
+          </Form.Item> */}
         </Form>
       </div>
     </>