diff --git a/src/api/longoPeration/RiverSection.js b/src/api/longoPeration/RiverSection.js
index df9b339..0ff8e42 100644
--- a/src/api/longoPeration/RiverSection.js
+++ b/src/api/longoPeration/RiverSection.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request';
-// 河道信息
+// 河道信息-搜索
 export function riverSectionpage(query) {
   return request({
     url: '/business/riverSection/page',
@@ -8,7 +8,7 @@
   });
 }
 
-// 新增
+// 河道信息-新增
 export function riverSectionadd(data) {
   return request({
     url: '/business/riverSection/add',
@@ -17,7 +17,7 @@
   });
 }
 
-// 修改
+// 河道信息-修改
 export function riverSectionedit(data) {
   return request({
     url: '/business/riverSection/edit',
@@ -26,7 +26,7 @@
   });
 }
 
-// 删除
+// 河道信息-删除
 export function riverSectiondelete(id) {
   return request({
     url: '/business/riverSection/' + id,
@@ -34,10 +34,45 @@
   });
 }
 
-// // 详情接口
+// 河道信息-详情接口
 export function riverSectionID(id) {
   return request({
     url: '/business/riverSection/' + id,
     method: 'get',
   });
 }
+
+// 供水厂-搜索
+export function waterCompPage(query) {
+  return request({
+    url: '/business/riverSection/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 供水厂-新增
+export function waterCompAdd(data) {
+  return request({
+    url: '/business/riverSection/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 供水厂-修改
+export function waterCompEdit(data) {
+  return request({
+    url: '/business/riverSection/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 供水厂-删除
+export function waterCompDelete(id) {
+  return request({
+    url: '/business/riverSection/' + id,
+    method: 'delete',
+  });
+}

diff --git a/src/api/longoPeration/RiverSection.js b/src/api/longoPeration/RiverSection.js
index df9b339..0ff8e42 100644
--- a/src/api/longoPeration/RiverSection.js
+++ b/src/api/longoPeration/RiverSection.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request';
-// 河道信息
+// 河道信息-搜索
 export function riverSectionpage(query) {
   return request({
     url: '/business/riverSection/page',
@@ -8,7 +8,7 @@
   });
 }
 
-// 新增
+// 河道信息-新增
 export function riverSectionadd(data) {
   return request({
     url: '/business/riverSection/add',
@@ -17,7 +17,7 @@
   });
 }
 
-// 修改
+// 河道信息-修改
 export function riverSectionedit(data) {
   return request({
     url: '/business/riverSection/edit',
@@ -26,7 +26,7 @@
   });
 }
 
-// 删除
+// 河道信息-删除
 export function riverSectiondelete(id) {
   return request({
     url: '/business/riverSection/' + id,
@@ -34,10 +34,45 @@
   });
 }
 
-// // 详情接口
+// 河道信息-详情接口
 export function riverSectionID(id) {
   return request({
     url: '/business/riverSection/' + id,
     method: 'get',
   });
 }
+
+// 供水厂-搜索
+export function waterCompPage(query) {
+  return request({
+    url: '/business/riverSection/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 供水厂-新增
+export function waterCompAdd(data) {
+  return request({
+    url: '/business/riverSection/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 供水厂-修改
+export function waterCompEdit(data) {
+  return request({
+    url: '/business/riverSection/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 供水厂-删除
+export function waterCompDelete(id) {
+  return request({
+    url: '/business/riverSection/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index 4d45981..4802772 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -418,10 +418,21 @@
   .el-tree-node__content > .el-checkbox {
     margin-right: 8px;
   }
+  .el-tree-node {
+    .el-tree-node__children {
+      .el-tree-node__expand-icon {
+        visibility: hidden;
+      }
+    }
+    .el-tree-node__content .is-leaf {
+      visibility: hidden;
+    }
+  }
 }
 .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
   background-color: $mainColor2 !important;
 }
+
 .el-input-number__decrease,
 .el-input-number__increase {
   background-color: $mainColor1 !important;

diff --git a/src/api/longoPeration/RiverSection.js b/src/api/longoPeration/RiverSection.js
index df9b339..0ff8e42 100644
--- a/src/api/longoPeration/RiverSection.js
+++ b/src/api/longoPeration/RiverSection.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request';
-// 河道信息
+// 河道信息-搜索
 export function riverSectionpage(query) {
   return request({
     url: '/business/riverSection/page',
@@ -8,7 +8,7 @@
   });
 }
 
-// 新增
+// 河道信息-新增
 export function riverSectionadd(data) {
   return request({
     url: '/business/riverSection/add',
@@ -17,7 +17,7 @@
   });
 }
 
-// 修改
+// 河道信息-修改
 export function riverSectionedit(data) {
   return request({
     url: '/business/riverSection/edit',
@@ -26,7 +26,7 @@
   });
 }
 
-// 删除
+// 河道信息-删除
 export function riverSectiondelete(id) {
   return request({
     url: '/business/riverSection/' + id,
@@ -34,10 +34,45 @@
   });
 }
 
-// // 详情接口
+// 河道信息-详情接口
 export function riverSectionID(id) {
   return request({
     url: '/business/riverSection/' + id,
     method: 'get',
   });
 }
+
+// 供水厂-搜索
+export function waterCompPage(query) {
+  return request({
+    url: '/business/riverSection/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 供水厂-新增
+export function waterCompAdd(data) {
+  return request({
+    url: '/business/riverSection/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 供水厂-修改
+export function waterCompEdit(data) {
+  return request({
+    url: '/business/riverSection/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 供水厂-删除
+export function waterCompDelete(id) {
+  return request({
+    url: '/business/riverSection/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index 4d45981..4802772 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -418,10 +418,21 @@
   .el-tree-node__content > .el-checkbox {
     margin-right: 8px;
   }
+  .el-tree-node {
+    .el-tree-node__children {
+      .el-tree-node__expand-icon {
+        visibility: hidden;
+      }
+    }
+    .el-tree-node__content .is-leaf {
+      visibility: hidden;
+    }
+  }
 }
 .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
   background-color: $mainColor2 !important;
 }
+
 .el-input-number__decrease,
 .el-input-number__increase {
   background-color: $mainColor1 !important;
diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js
index 62bb3b7..e2da556 100644
--- a/src/components/Echarts/pieChart_1.js
+++ b/src/components/Echarts/pieChart_1.js
@@ -867,7 +867,7 @@
     },
     grid: {
       top: '40px',
-      left: '40px',
+      left: '10%',
       right: '40px',
       bottom: '30%',
     },
@@ -891,11 +891,11 @@
     xAxis: [
       {
         type: 'category',
-        //boundaryGap: false,
+        boundaryGap: true,
         axisLabel: {
           formatter: '{value} ',
           color: '#00D1FF',
-          rotate: 20,
+          rotate: 45,
         },
         axisLine: {
           show: true,

diff --git a/src/api/longoPeration/RiverSection.js b/src/api/longoPeration/RiverSection.js
index df9b339..0ff8e42 100644
--- a/src/api/longoPeration/RiverSection.js
+++ b/src/api/longoPeration/RiverSection.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request';
-// 河道信息
+// 河道信息-搜索
 export function riverSectionpage(query) {
   return request({
     url: '/business/riverSection/page',
@@ -8,7 +8,7 @@
   });
 }
 
-// 新增
+// 河道信息-新增
 export function riverSectionadd(data) {
   return request({
     url: '/business/riverSection/add',
@@ -17,7 +17,7 @@
   });
 }
 
-// 修改
+// 河道信息-修改
 export function riverSectionedit(data) {
   return request({
     url: '/business/riverSection/edit',
@@ -26,7 +26,7 @@
   });
 }
 
-// 删除
+// 河道信息-删除
 export function riverSectiondelete(id) {
   return request({
     url: '/business/riverSection/' + id,
@@ -34,10 +34,45 @@
   });
 }
 
-// // 详情接口
+// 河道信息-详情接口
 export function riverSectionID(id) {
   return request({
     url: '/business/riverSection/' + id,
     method: 'get',
   });
 }
+
+// 供水厂-搜索
+export function waterCompPage(query) {
+  return request({
+    url: '/business/riverSection/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 供水厂-新增
+export function waterCompAdd(data) {
+  return request({
+    url: '/business/riverSection/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 供水厂-修改
+export function waterCompEdit(data) {
+  return request({
+    url: '/business/riverSection/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 供水厂-删除
+export function waterCompDelete(id) {
+  return request({
+    url: '/business/riverSection/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index 4d45981..4802772 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -418,10 +418,21 @@
   .el-tree-node__content > .el-checkbox {
     margin-right: 8px;
   }
+  .el-tree-node {
+    .el-tree-node__children {
+      .el-tree-node__expand-icon {
+        visibility: hidden;
+      }
+    }
+    .el-tree-node__content .is-leaf {
+      visibility: hidden;
+    }
+  }
 }
 .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
   background-color: $mainColor2 !important;
 }
+
 .el-input-number__decrease,
 .el-input-number__increase {
   background-color: $mainColor1 !important;
diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js
index 62bb3b7..e2da556 100644
--- a/src/components/Echarts/pieChart_1.js
+++ b/src/components/Echarts/pieChart_1.js
@@ -867,7 +867,7 @@
     },
     grid: {
       top: '40px',
-      left: '40px',
+      left: '10%',
       right: '40px',
       bottom: '30%',
     },
@@ -891,11 +891,11 @@
     xAxis: [
       {
         type: 'category',
-        //boundaryGap: false,
+        boundaryGap: true,
         axisLabel: {
           formatter: '{value} ',
           color: '#00D1FF',
-          rotate: 20,
+          rotate: 45,
         },
         axisLine: {
           show: true,
diff --git a/src/views/document/fileManagement/list/index.vue b/src/views/document/fileManagement/list/index.vue
index 04c4098..e908171 100644
--- a/src/views/document/fileManagement/list/index.vue
+++ b/src/views/document/fileManagement/list/index.vue
@@ -13,7 +13,6 @@
             check-strictly
             clearable
             style="width: 100%"
-            class="fileTreeSel"
           />
         </el-form-item>
         <el-form-item label="文件标签:" prop="fileTag">
@@ -199,11 +198,4 @@
     margin-bottom: 15px;
   }
 }
-.fileTreeSel {
-  .el-tree-node__children {
-    .el-tree-node__expand-icon {
-      visibility: hidden;
-    }
-  }
-}
 </style>

diff --git a/src/api/longoPeration/RiverSection.js b/src/api/longoPeration/RiverSection.js
index df9b339..0ff8e42 100644
--- a/src/api/longoPeration/RiverSection.js
+++ b/src/api/longoPeration/RiverSection.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request';
-// 河道信息
+// 河道信息-搜索
 export function riverSectionpage(query) {
   return request({
     url: '/business/riverSection/page',
@@ -8,7 +8,7 @@
   });
 }
 
-// 新增
+// 河道信息-新增
 export function riverSectionadd(data) {
   return request({
     url: '/business/riverSection/add',
@@ -17,7 +17,7 @@
   });
 }
 
-// 修改
+// 河道信息-修改
 export function riverSectionedit(data) {
   return request({
     url: '/business/riverSection/edit',
@@ -26,7 +26,7 @@
   });
 }
 
-// 删除
+// 河道信息-删除
 export function riverSectiondelete(id) {
   return request({
     url: '/business/riverSection/' + id,
@@ -34,10 +34,45 @@
   });
 }
 
-// // 详情接口
+// 河道信息-详情接口
 export function riverSectionID(id) {
   return request({
     url: '/business/riverSection/' + id,
     method: 'get',
   });
 }
+
+// 供水厂-搜索
+export function waterCompPage(query) {
+  return request({
+    url: '/business/riverSection/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 供水厂-新增
+export function waterCompAdd(data) {
+  return request({
+    url: '/business/riverSection/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 供水厂-修改
+export function waterCompEdit(data) {
+  return request({
+    url: '/business/riverSection/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 供水厂-删除
+export function waterCompDelete(id) {
+  return request({
+    url: '/business/riverSection/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index 4d45981..4802772 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -418,10 +418,21 @@
   .el-tree-node__content > .el-checkbox {
     margin-right: 8px;
   }
+  .el-tree-node {
+    .el-tree-node__children {
+      .el-tree-node__expand-icon {
+        visibility: hidden;
+      }
+    }
+    .el-tree-node__content .is-leaf {
+      visibility: hidden;
+    }
+  }
 }
 .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
   background-color: $mainColor2 !important;
 }
+
 .el-input-number__decrease,
 .el-input-number__increase {
   background-color: $mainColor1 !important;
diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js
index 62bb3b7..e2da556 100644
--- a/src/components/Echarts/pieChart_1.js
+++ b/src/components/Echarts/pieChart_1.js
@@ -867,7 +867,7 @@
     },
     grid: {
       top: '40px',
-      left: '40px',
+      left: '10%',
       right: '40px',
       bottom: '30%',
     },
@@ -891,11 +891,11 @@
     xAxis: [
       {
         type: 'category',
-        //boundaryGap: false,
+        boundaryGap: true,
         axisLabel: {
           formatter: '{value} ',
           color: '#00D1FF',
-          rotate: 20,
+          rotate: 45,
         },
         axisLine: {
           show: true,
diff --git a/src/views/document/fileManagement/list/index.vue b/src/views/document/fileManagement/list/index.vue
index 04c4098..e908171 100644
--- a/src/views/document/fileManagement/list/index.vue
+++ b/src/views/document/fileManagement/list/index.vue
@@ -13,7 +13,6 @@
             check-strictly
             clearable
             style="width: 100%"
-            class="fileTreeSel"
           />
         </el-form-item>
         <el-form-item label="文件标签:" prop="fileTag">
@@ -199,11 +198,4 @@
     margin-bottom: 15px;
   }
 }
-.fileTreeSel {
-  .el-tree-node__children {
-    .el-tree-node__expand-icon {
-      visibility: hidden;
-    }
-  }
-}
 </style>
diff --git a/src/views/floodSys/assetManage/StorageaFacilities.vue b/src/views/floodSys/assetManage/StorageaFacilities.vue
deleted file mode 100644
index 59323f8..0000000
--- a/src/views/floodSys/assetManage/StorageaFacilities.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<template>
-  <div class="publicContainer">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="名称:" prop="searchContent">
-        <el-input v-model="queryParams.searchContent" placeholder="请输入名称" clearable style="width: 180px" />
-      </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <!-- <el-button type="primary" icon="Plus" @click="handleAdd">新增</el-button> -->
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <!-- 按钮区域 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
-    </el-row>
-    <!-- 表格 -->
-    <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
-      <el-table-column type="index" width="55" label="序号" />
-      <el-table-column label="名称" prop="q" />
-      <el-table-column label="编码" prop="w" />
-      <el-table-column label="水面面积（k㎡）" prop="e" />
-      <el-table-column label="水体规模（万m³）" prop="r" />
-      <el-table-column label="湖底高程（米）" prop="t" />
-      <el-table-column label="正常水位（米）" prop="y" />
-      <el-table-column label="调蓄规模（万m³）" prop="u" />
-      <el-table-column label="gis空间数据" prop="i" />
-
-      <el-table-column label="操作" width="240">
-        <template #default="scope">
-          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row, 'view')">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row, 'view')">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-    <!-- 新增弹窗 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body :close-on-click-modal="false">
-      <el-form ref="roleRef" :model="form" :rules="rules" label-width="140px" :disabled="multiple">
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="名称:" prop="w">
-              <el-input v-model="form.w" placeholder="请输入名称" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="编码:" prop="w">
-              <el-input v-model="form.w" placeholder="请输入编码" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="水面面积（k㎡）:" prop="lon">
-              <el-input-number v-model="form.lon" placeholder="请输入水面面积（k㎡）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="水体规模（万m³）:" prop="lat">
-              <el-input-number v-model="form.lat" placeholder="请输入水体规模（万m³）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="湖底高程（米）:" prop="lon">
-              <el-input-number v-model="form.lon" placeholder="请输入湖底高程（米）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="正常水位（米）:" prop="lat">
-              <el-input-number v-model="form.lat" placeholder="请输入正常水位（米）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="调蓄规模（万m³）:" prop="lat">
-              <el-input-number v-model="form.lat" placeholder="请输入调蓄规模（万m³）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="gis空间数据:" prop="w">
-              <el-input type="textarea" v-model="form.w" placeholder="请输入gis空间数据" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-<script setup name="StorageaFacilities">
-const { proxy } = getCurrentInstance();
-const open = ref(false);
-const multiple = ref(false);
-const showSearch = ref(true);
-const Xcfrequency = ref([
-  {
-    value: 'tian',
-    label: '天',
-  },
-  {
-    value: 'zhou',
-    label: '周',
-  },
-]);
-const loading = ref(true);
-const total = ref(0);
-const title = ref('');
-const dataList = ref([]);
-const AllData = reactive({
-  id: '',
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    caseType: 1,
-    handleStatus: '',
-    searchContent: '',
-  },
-  rules: {
-    id: [{ required: true, message: '请输入', trigger: 'blur' }],
-    eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }],
-  },
-});
-const { queryParams, form, rules } = toRefs(AllData);
-//搜索
-function handleQuery() {
-  getList();
-}
-//重置
-function resetQuery() {
-  proxy.resetForm('queryRef');
-  handleQuery();
-}
-// 新增
-function handleAdd() {
-  title.value = '新增调蓄设施';
-  open.value = true;
-  form.value = {};
-  multiple.value = false;
-  form.value.fileTag = Xcfrequency.value[0].value;
-}
-// 新增中取消事件
-function cancel() {
-  open.value = false;
-  proxy.resetForm('roleRef');
-}
-
-// 巡查频率下拉框点击事件
-function changeStation(value) {
-  // console.log(value, 'value');
-}
-
-//查看详情操作
-function handleDetail(row) {
-  open.value = true;
-  title.value = '查看调蓄设施';
-  multiple.value = true;
-  form.value = row;
-}
-// 修改按钮操作
-function handleUpdate(row) {
-  open.value = true;
-  title.value = '修改调蓄设施';
-  multiple.value = false;
-  form.value = { ...row };
-}
-
-/** 搜索列表 */
-const getList = async () => {
-  // loading.value = true;
-  loading.value = false;
-};
-
-onMounted(() => {
-  getList();
-});
-</script>
-<style scoped lang="scss">
-.dituclass {
-  width: 100%;
-  height: 300px;
-  // background: red;
-  margin-bottom: 10px;
-  border: 1px solid #004565;
-}
-</style>

diff --git a/src/api/longoPeration/RiverSection.js b/src/api/longoPeration/RiverSection.js
index df9b339..0ff8e42 100644
--- a/src/api/longoPeration/RiverSection.js
+++ b/src/api/longoPeration/RiverSection.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request';
-// 河道信息
+// 河道信息-搜索
 export function riverSectionpage(query) {
   return request({
     url: '/business/riverSection/page',
@@ -8,7 +8,7 @@
   });
 }
 
-// 新增
+// 河道信息-新增
 export function riverSectionadd(data) {
   return request({
     url: '/business/riverSection/add',
@@ -17,7 +17,7 @@
   });
 }
 
-// 修改
+// 河道信息-修改
 export function riverSectionedit(data) {
   return request({
     url: '/business/riverSection/edit',
@@ -26,7 +26,7 @@
   });
 }
 
-// 删除
+// 河道信息-删除
 export function riverSectiondelete(id) {
   return request({
     url: '/business/riverSection/' + id,
@@ -34,10 +34,45 @@
   });
 }
 
-// // 详情接口
+// 河道信息-详情接口
 export function riverSectionID(id) {
   return request({
     url: '/business/riverSection/' + id,
     method: 'get',
   });
 }
+
+// 供水厂-搜索
+export function waterCompPage(query) {
+  return request({
+    url: '/business/riverSection/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 供水厂-新增
+export function waterCompAdd(data) {
+  return request({
+    url: '/business/riverSection/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 供水厂-修改
+export function waterCompEdit(data) {
+  return request({
+    url: '/business/riverSection/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 供水厂-删除
+export function waterCompDelete(id) {
+  return request({
+    url: '/business/riverSection/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index 4d45981..4802772 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -418,10 +418,21 @@
   .el-tree-node__content > .el-checkbox {
     margin-right: 8px;
   }
+  .el-tree-node {
+    .el-tree-node__children {
+      .el-tree-node__expand-icon {
+        visibility: hidden;
+      }
+    }
+    .el-tree-node__content .is-leaf {
+      visibility: hidden;
+    }
+  }
 }
 .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
   background-color: $mainColor2 !important;
 }
+
 .el-input-number__decrease,
 .el-input-number__increase {
   background-color: $mainColor1 !important;
diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js
index 62bb3b7..e2da556 100644
--- a/src/components/Echarts/pieChart_1.js
+++ b/src/components/Echarts/pieChart_1.js
@@ -867,7 +867,7 @@
     },
     grid: {
       top: '40px',
-      left: '40px',
+      left: '10%',
       right: '40px',
       bottom: '30%',
     },
@@ -891,11 +891,11 @@
     xAxis: [
       {
         type: 'category',
-        //boundaryGap: false,
+        boundaryGap: true,
         axisLabel: {
           formatter: '{value} ',
           color: '#00D1FF',
-          rotate: 20,
+          rotate: 45,
         },
         axisLine: {
           show: true,
diff --git a/src/views/document/fileManagement/list/index.vue b/src/views/document/fileManagement/list/index.vue
index 04c4098..e908171 100644
--- a/src/views/document/fileManagement/list/index.vue
+++ b/src/views/document/fileManagement/list/index.vue
@@ -13,7 +13,6 @@
             check-strictly
             clearable
             style="width: 100%"
-            class="fileTreeSel"
           />
         </el-form-item>
         <el-form-item label="文件标签:" prop="fileTag">
@@ -199,11 +198,4 @@
     margin-bottom: 15px;
   }
 }
-.fileTreeSel {
-  .el-tree-node__children {
-    .el-tree-node__expand-icon {
-      visibility: hidden;
-    }
-  }
-}
 </style>
diff --git a/src/views/floodSys/assetManage/StorageaFacilities.vue b/src/views/floodSys/assetManage/StorageaFacilities.vue
deleted file mode 100644
index 59323f8..0000000
--- a/src/views/floodSys/assetManage/StorageaFacilities.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<template>
-  <div class="publicContainer">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="名称:" prop="searchContent">
-        <el-input v-model="queryParams.searchContent" placeholder="请输入名称" clearable style="width: 180px" />
-      </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <!-- <el-button type="primary" icon="Plus" @click="handleAdd">新增</el-button> -->
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <!-- 按钮区域 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
-    </el-row>
-    <!-- 表格 -->
-    <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
-      <el-table-column type="index" width="55" label="序号" />
-      <el-table-column label="名称" prop="q" />
-      <el-table-column label="编码" prop="w" />
-      <el-table-column label="水面面积（k㎡）" prop="e" />
-      <el-table-column label="水体规模（万m³）" prop="r" />
-      <el-table-column label="湖底高程（米）" prop="t" />
-      <el-table-column label="正常水位（米）" prop="y" />
-      <el-table-column label="调蓄规模（万m³）" prop="u" />
-      <el-table-column label="gis空间数据" prop="i" />
-
-      <el-table-column label="操作" width="240">
-        <template #default="scope">
-          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row, 'view')">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row, 'view')">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-    <!-- 新增弹窗 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body :close-on-click-modal="false">
-      <el-form ref="roleRef" :model="form" :rules="rules" label-width="140px" :disabled="multiple">
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="名称:" prop="w">
-              <el-input v-model="form.w" placeholder="请输入名称" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="编码:" prop="w">
-              <el-input v-model="form.w" placeholder="请输入编码" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="水面面积（k㎡）:" prop="lon">
-              <el-input-number v-model="form.lon" placeholder="请输入水面面积（k㎡）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="水体规模（万m³）:" prop="lat">
-              <el-input-number v-model="form.lat" placeholder="请输入水体规模（万m³）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="湖底高程（米）:" prop="lon">
-              <el-input-number v-model="form.lon" placeholder="请输入湖底高程（米）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="正常水位（米）:" prop="lat">
-              <el-input-number v-model="form.lat" placeholder="请输入正常水位（米）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="调蓄规模（万m³）:" prop="lat">
-              <el-input-number v-model="form.lat" placeholder="请输入调蓄规模（万m³）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="gis空间数据:" prop="w">
-              <el-input type="textarea" v-model="form.w" placeholder="请输入gis空间数据" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-<script setup name="StorageaFacilities">
-const { proxy } = getCurrentInstance();
-const open = ref(false);
-const multiple = ref(false);
-const showSearch = ref(true);
-const Xcfrequency = ref([
-  {
-    value: 'tian',
-    label: '天',
-  },
-  {
-    value: 'zhou',
-    label: '周',
-  },
-]);
-const loading = ref(true);
-const total = ref(0);
-const title = ref('');
-const dataList = ref([]);
-const AllData = reactive({
-  id: '',
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    caseType: 1,
-    handleStatus: '',
-    searchContent: '',
-  },
-  rules: {
-    id: [{ required: true, message: '请输入', trigger: 'blur' }],
-    eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }],
-  },
-});
-const { queryParams, form, rules } = toRefs(AllData);
-//搜索
-function handleQuery() {
-  getList();
-}
-//重置
-function resetQuery() {
-  proxy.resetForm('queryRef');
-  handleQuery();
-}
-// 新增
-function handleAdd() {
-  title.value = '新增调蓄设施';
-  open.value = true;
-  form.value = {};
-  multiple.value = false;
-  form.value.fileTag = Xcfrequency.value[0].value;
-}
-// 新增中取消事件
-function cancel() {
-  open.value = false;
-  proxy.resetForm('roleRef');
-}
-
-// 巡查频率下拉框点击事件
-function changeStation(value) {
-  // console.log(value, 'value');
-}
-
-//查看详情操作
-function handleDetail(row) {
-  open.value = true;
-  title.value = '查看调蓄设施';
-  multiple.value = true;
-  form.value = row;
-}
-// 修改按钮操作
-function handleUpdate(row) {
-  open.value = true;
-  title.value = '修改调蓄设施';
-  multiple.value = false;
-  form.value = { ...row };
-}
-
-/** 搜索列表 */
-const getList = async () => {
-  // loading.value = true;
-  loading.value = false;
-};
-
-onMounted(() => {
-  getList();
-});
-</script>
-<style scoped lang="scss">
-.dituclass {
-  width: 100%;
-  height: 300px;
-  // background: red;
-  margin-bottom: 10px;
-  border: 1px solid #004565;
-}
-</style>
diff --git a/src/views/floodSys/assetManage/WaterSupplyWaterPlants.vue b/src/views/floodSys/assetManage/WaterSupplyWaterPlants.vue
index 6dac42b..ab0397f 100644
--- a/src/views/floodSys/assetManage/WaterSupplyWaterPlants.vue
+++ b/src/views/floodSys/assetManage/WaterSupplyWaterPlants.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- 水厂管理 -->
   <div class="publicContainer">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
       <el-form-item label="水厂名称:" prop="searchContent">
@@ -7,14 +8,11 @@
       <el-form-item label="建设时间" prop="date">
         <el-date-picker type="month" v-model="queryParams.date" value-format="YYYY-MM" placeholder="请选择日期"></el-date-picker>
       </el-form-item>
-
       <el-form-item label="投入使用时间" prop="date">
         <el-date-picker type="month" v-model="queryParams.date" value-format="YYYY-MM" placeholder="请选择投入使用时间"></el-date-picker>
       </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -26,7 +24,7 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
     <!-- 表格 -->
-    <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
+    <el-table :data="tableData" v-loading="tableLoading" stripe :max-height="580">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="水厂名称" prop="q" />
       <el-table-column label="编码" prop="w" />
@@ -44,7 +42,7 @@
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
           <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row, 'view')">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row, 'view')">删除</el-button>
+          <el-button link type="danger" icon="Delete" @click="deleteData(scope.row, 'view')">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -54,11 +52,11 @@
       :total="total"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+      @pagination="getDataList"
     />
     <!-- 新增弹窗 -->
     <el-dialog :title="title" v-model="open" width="800px" append-to-body :close-on-click-modal="false">
-      <el-form ref="roleRef" :model="form" :rules="rules" label-width="130px" :disabled="multiple">
+      <el-form ref="ruleForm" :model="form" :rules="rules" label-width="130px">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="水厂名称:" prop="w">
@@ -79,10 +77,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="水源情况:" prop="fileTag1">
-              <el-select v-model="form.fileTag1" placeholder="请选择水源情况" clearable style="width: 100%">
-                <el-option v-for="dict in document_tag" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
+            <el-form-item label="水源情况:" prop="fileTag">
+              <el-input v-model="form.fileTag" placeholder="请输入水源情况" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -160,24 +156,14 @@
   </div>
 </template>
 <script setup name="WaterSupplyWaterPlants">
+import { waterCompPage, waterCompAdd, waterCompEdit, waterCompDelete } from '@/api/longoPeration/RiverSection';
 const { proxy } = getCurrentInstance();
 const open = ref(false);
-const multiple = ref(false);
 const showSearch = ref(true);
-const Xcfrequency = ref([
-  {
-    value: 'tian',
-    label: '天',
-  },
-  {
-    value: 'zhou',
-    label: '周',
-  },
-]);
-const loading = ref(true);
+const tableLoading = ref(true);
 const total = ref(0);
 const title = ref('');
-const dataList = ref([]);
+const tableData = ref([]);
 const AllData = reactive({
   id: '',
   form: {},
@@ -196,8 +182,16 @@
 const { queryParams, form, rules } = toRefs(AllData);
 //搜索
 function handleQuery() {
-  getList();
+  getDataList();
 }
+//获取列表数据
+const getDataList = async () => {
+  tableLoading.value = true;
+  const res = await waterCompPage(queryParams.value);
+  tableLoading.value = false;
+  tableData.value = res.data;
+  total.value = res.total;
+};
 //重置
 function resetQuery() {
   proxy.resetForm('queryRef');
@@ -208,51 +202,58 @@
   title.value = '新增水厂供水';
   open.value = true;
   form.value = {};
-  multiple.value = false;
-  form.value.fileTag = Xcfrequency.value[0].value;
+}
+async function submitForm() {
+  proxy.$refs['ruleForm'].validate(valid => {
+    if (valid) {
+      if (formData.value.id != undefined) {
+        waterCompEdit(formData.value).then(() => {
+          proxy.$modal.msgSuccess('修改成功');
+          showDialog.value = false;
+          getDataList();
+        });
+      } else {
+        waterCompAdd(formData.value).then(() => {
+          proxy.$modal.msgSuccess('新增成功');
+          showDialog.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 // 新增中取消事件
 function cancel() {
   open.value = false;
-  proxy.resetForm('roleRef');
-}
-
-// 巡查频率下拉框点击事件
-function changeStation(value) {
-  // console.log(value, 'value');
+  proxy.resetForm('ruleForm');
 }
 
 //查看详情操作
 function handleDetail(row) {
   open.value = true;
   title.value = '查看水厂供水';
-  multiple.value = true;
   form.value = row;
 }
 // 修改按钮操作
 function handleUpdate(row) {
   open.value = true;
   title.value = '修改水厂供水';
-  multiple.value = false;
   form.value = { ...row };
 }
-
-/** 搜索列表 */
-const getList = async () => {
-  // loading.value = true;
-  loading.value = false;
-};
+function deleteData(row) {
+  proxy.$modal
+    .confirm('是否确认删除？')
+    .then(async () => {
+      const res = await waterCompDelete(row.id);
+      if (res?.code !== 200) return;
+      proxy.$modal.msgSuccess('操作成功！');
+      getDataList();
+    })
+    .catch(() => {});
+}
 
 onMounted(() => {
-  getList();
+  getDataList();
 });
 </script>
-<style scoped lang="scss">
-.dituclass {
-  width: 100%;
-  height: 300px;
-  // background: red;
-  margin-bottom: 10px;
-  border: 1px solid #004565;
-}
-</style>
+<style scoped lang="scss"></style>

diff --git a/src/api/longoPeration/RiverSection.js b/src/api/longoPeration/RiverSection.js
index df9b339..0ff8e42 100644
--- a/src/api/longoPeration/RiverSection.js
+++ b/src/api/longoPeration/RiverSection.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request';
-// 河道信息
+// 河道信息-搜索
 export function riverSectionpage(query) {
   return request({
     url: '/business/riverSection/page',
@@ -8,7 +8,7 @@
   });
 }
 
-// 新增
+// 河道信息-新增
 export function riverSectionadd(data) {
   return request({
     url: '/business/riverSection/add',
@@ -17,7 +17,7 @@
   });
 }
 
-// 修改
+// 河道信息-修改
 export function riverSectionedit(data) {
   return request({
     url: '/business/riverSection/edit',
@@ -26,7 +26,7 @@
   });
 }
 
-// 删除
+// 河道信息-删除
 export function riverSectiondelete(id) {
   return request({
     url: '/business/riverSection/' + id,
@@ -34,10 +34,45 @@
   });
 }
 
-// // 详情接口
+// 河道信息-详情接口
 export function riverSectionID(id) {
   return request({
     url: '/business/riverSection/' + id,
     method: 'get',
   });
 }
+
+// 供水厂-搜索
+export function waterCompPage(query) {
+  return request({
+    url: '/business/riverSection/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 供水厂-新增
+export function waterCompAdd(data) {
+  return request({
+    url: '/business/riverSection/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 供水厂-修改
+export function waterCompEdit(data) {
+  return request({
+    url: '/business/riverSection/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 供水厂-删除
+export function waterCompDelete(id) {
+  return request({
+    url: '/business/riverSection/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index 4d45981..4802772 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -418,10 +418,21 @@
   .el-tree-node__content > .el-checkbox {
     margin-right: 8px;
   }
+  .el-tree-node {
+    .el-tree-node__children {
+      .el-tree-node__expand-icon {
+        visibility: hidden;
+      }
+    }
+    .el-tree-node__content .is-leaf {
+      visibility: hidden;
+    }
+  }
 }
 .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
   background-color: $mainColor2 !important;
 }
+
 .el-input-number__decrease,
 .el-input-number__increase {
   background-color: $mainColor1 !important;
diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js
index 62bb3b7..e2da556 100644
--- a/src/components/Echarts/pieChart_1.js
+++ b/src/components/Echarts/pieChart_1.js
@@ -867,7 +867,7 @@
     },
     grid: {
       top: '40px',
-      left: '40px',
+      left: '10%',
       right: '40px',
       bottom: '30%',
     },
@@ -891,11 +891,11 @@
     xAxis: [
       {
         type: 'category',
-        //boundaryGap: false,
+        boundaryGap: true,
         axisLabel: {
           formatter: '{value} ',
           color: '#00D1FF',
-          rotate: 20,
+          rotate: 45,
         },
         axisLine: {
           show: true,
diff --git a/src/views/document/fileManagement/list/index.vue b/src/views/document/fileManagement/list/index.vue
index 04c4098..e908171 100644
--- a/src/views/document/fileManagement/list/index.vue
+++ b/src/views/document/fileManagement/list/index.vue
@@ -13,7 +13,6 @@
             check-strictly
             clearable
             style="width: 100%"
-            class="fileTreeSel"
           />
         </el-form-item>
         <el-form-item label="文件标签:" prop="fileTag">
@@ -199,11 +198,4 @@
     margin-bottom: 15px;
   }
 }
-.fileTreeSel {
-  .el-tree-node__children {
-    .el-tree-node__expand-icon {
-      visibility: hidden;
-    }
-  }
-}
 </style>
diff --git a/src/views/floodSys/assetManage/StorageaFacilities.vue b/src/views/floodSys/assetManage/StorageaFacilities.vue
deleted file mode 100644
index 59323f8..0000000
--- a/src/views/floodSys/assetManage/StorageaFacilities.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<template>
-  <div class="publicContainer">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="名称:" prop="searchContent">
-        <el-input v-model="queryParams.searchContent" placeholder="请输入名称" clearable style="width: 180px" />
-      </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <!-- <el-button type="primary" icon="Plus" @click="handleAdd">新增</el-button> -->
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <!-- 按钮区域 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
-    </el-row>
-    <!-- 表格 -->
-    <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
-      <el-table-column type="index" width="55" label="序号" />
-      <el-table-column label="名称" prop="q" />
-      <el-table-column label="编码" prop="w" />
-      <el-table-column label="水面面积（k㎡）" prop="e" />
-      <el-table-column label="水体规模（万m³）" prop="r" />
-      <el-table-column label="湖底高程（米）" prop="t" />
-      <el-table-column label="正常水位（米）" prop="y" />
-      <el-table-column label="调蓄规模（万m³）" prop="u" />
-      <el-table-column label="gis空间数据" prop="i" />
-
-      <el-table-column label="操作" width="240">
-        <template #default="scope">
-          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row, 'view')">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row, 'view')">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-    <!-- 新增弹窗 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body :close-on-click-modal="false">
-      <el-form ref="roleRef" :model="form" :rules="rules" label-width="140px" :disabled="multiple">
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="名称:" prop="w">
-              <el-input v-model="form.w" placeholder="请输入名称" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="编码:" prop="w">
-              <el-input v-model="form.w" placeholder="请输入编码" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="水面面积（k㎡）:" prop="lon">
-              <el-input-number v-model="form.lon" placeholder="请输入水面面积（k㎡）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="水体规模（万m³）:" prop="lat">
-              <el-input-number v-model="form.lat" placeholder="请输入水体规模（万m³）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="湖底高程（米）:" prop="lon">
-              <el-input-number v-model="form.lon" placeholder="请输入湖底高程（米）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="正常水位（米）:" prop="lat">
-              <el-input-number v-model="form.lat" placeholder="请输入正常水位（米）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="调蓄规模（万m³）:" prop="lat">
-              <el-input-number v-model="form.lat" placeholder="请输入调蓄规模（万m³）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="gis空间数据:" prop="w">
-              <el-input type="textarea" v-model="form.w" placeholder="请输入gis空间数据" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-<script setup name="StorageaFacilities">
-const { proxy } = getCurrentInstance();
-const open = ref(false);
-const multiple = ref(false);
-const showSearch = ref(true);
-const Xcfrequency = ref([
-  {
-    value: 'tian',
-    label: '天',
-  },
-  {
-    value: 'zhou',
-    label: '周',
-  },
-]);
-const loading = ref(true);
-const total = ref(0);
-const title = ref('');
-const dataList = ref([]);
-const AllData = reactive({
-  id: '',
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    caseType: 1,
-    handleStatus: '',
-    searchContent: '',
-  },
-  rules: {
-    id: [{ required: true, message: '请输入', trigger: 'blur' }],
-    eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }],
-  },
-});
-const { queryParams, form, rules } = toRefs(AllData);
-//搜索
-function handleQuery() {
-  getList();
-}
-//重置
-function resetQuery() {
-  proxy.resetForm('queryRef');
-  handleQuery();
-}
-// 新增
-function handleAdd() {
-  title.value = '新增调蓄设施';
-  open.value = true;
-  form.value = {};
-  multiple.value = false;
-  form.value.fileTag = Xcfrequency.value[0].value;
-}
-// 新增中取消事件
-function cancel() {
-  open.value = false;
-  proxy.resetForm('roleRef');
-}
-
-// 巡查频率下拉框点击事件
-function changeStation(value) {
-  // console.log(value, 'value');
-}
-
-//查看详情操作
-function handleDetail(row) {
-  open.value = true;
-  title.value = '查看调蓄设施';
-  multiple.value = true;
-  form.value = row;
-}
-// 修改按钮操作
-function handleUpdate(row) {
-  open.value = true;
-  title.value = '修改调蓄设施';
-  multiple.value = false;
-  form.value = { ...row };
-}
-
-/** 搜索列表 */
-const getList = async () => {
-  // loading.value = true;
-  loading.value = false;
-};
-
-onMounted(() => {
-  getList();
-});
-</script>
-<style scoped lang="scss">
-.dituclass {
-  width: 100%;
-  height: 300px;
-  // background: red;
-  margin-bottom: 10px;
-  border: 1px solid #004565;
-}
-</style>
diff --git a/src/views/floodSys/assetManage/WaterSupplyWaterPlants.vue b/src/views/floodSys/assetManage/WaterSupplyWaterPlants.vue
index 6dac42b..ab0397f 100644
--- a/src/views/floodSys/assetManage/WaterSupplyWaterPlants.vue
+++ b/src/views/floodSys/assetManage/WaterSupplyWaterPlants.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- 水厂管理 -->
   <div class="publicContainer">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
       <el-form-item label="水厂名称:" prop="searchContent">
@@ -7,14 +8,11 @@
       <el-form-item label="建设时间" prop="date">
         <el-date-picker type="month" v-model="queryParams.date" value-format="YYYY-MM" placeholder="请选择日期"></el-date-picker>
       </el-form-item>
-
       <el-form-item label="投入使用时间" prop="date">
         <el-date-picker type="month" v-model="queryParams.date" value-format="YYYY-MM" placeholder="请选择投入使用时间"></el-date-picker>
       </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -26,7 +24,7 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
     <!-- 表格 -->
-    <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
+    <el-table :data="tableData" v-loading="tableLoading" stripe :max-height="580">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="水厂名称" prop="q" />
       <el-table-column label="编码" prop="w" />
@@ -44,7 +42,7 @@
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
           <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row, 'view')">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row, 'view')">删除</el-button>
+          <el-button link type="danger" icon="Delete" @click="deleteData(scope.row, 'view')">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -54,11 +52,11 @@
       :total="total"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+      @pagination="getDataList"
     />
     <!-- 新增弹窗 -->
     <el-dialog :title="title" v-model="open" width="800px" append-to-body :close-on-click-modal="false">
-      <el-form ref="roleRef" :model="form" :rules="rules" label-width="130px" :disabled="multiple">
+      <el-form ref="ruleForm" :model="form" :rules="rules" label-width="130px">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="水厂名称:" prop="w">
@@ -79,10 +77,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="水源情况:" prop="fileTag1">
-              <el-select v-model="form.fileTag1" placeholder="请选择水源情况" clearable style="width: 100%">
-                <el-option v-for="dict in document_tag" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
+            <el-form-item label="水源情况:" prop="fileTag">
+              <el-input v-model="form.fileTag" placeholder="请输入水源情况" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -160,24 +156,14 @@
   </div>
 </template>
 <script setup name="WaterSupplyWaterPlants">
+import { waterCompPage, waterCompAdd, waterCompEdit, waterCompDelete } from '@/api/longoPeration/RiverSection';
 const { proxy } = getCurrentInstance();
 const open = ref(false);
-const multiple = ref(false);
 const showSearch = ref(true);
-const Xcfrequency = ref([
-  {
-    value: 'tian',
-    label: '天',
-  },
-  {
-    value: 'zhou',
-    label: '周',
-  },
-]);
-const loading = ref(true);
+const tableLoading = ref(true);
 const total = ref(0);
 const title = ref('');
-const dataList = ref([]);
+const tableData = ref([]);
 const AllData = reactive({
   id: '',
   form: {},
@@ -196,8 +182,16 @@
 const { queryParams, form, rules } = toRefs(AllData);
 //搜索
 function handleQuery() {
-  getList();
+  getDataList();
 }
+//获取列表数据
+const getDataList = async () => {
+  tableLoading.value = true;
+  const res = await waterCompPage(queryParams.value);
+  tableLoading.value = false;
+  tableData.value = res.data;
+  total.value = res.total;
+};
 //重置
 function resetQuery() {
   proxy.resetForm('queryRef');
@@ -208,51 +202,58 @@
   title.value = '新增水厂供水';
   open.value = true;
   form.value = {};
-  multiple.value = false;
-  form.value.fileTag = Xcfrequency.value[0].value;
+}
+async function submitForm() {
+  proxy.$refs['ruleForm'].validate(valid => {
+    if (valid) {
+      if (formData.value.id != undefined) {
+        waterCompEdit(formData.value).then(() => {
+          proxy.$modal.msgSuccess('修改成功');
+          showDialog.value = false;
+          getDataList();
+        });
+      } else {
+        waterCompAdd(formData.value).then(() => {
+          proxy.$modal.msgSuccess('新增成功');
+          showDialog.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 // 新增中取消事件
 function cancel() {
   open.value = false;
-  proxy.resetForm('roleRef');
-}
-
-// 巡查频率下拉框点击事件
-function changeStation(value) {
-  // console.log(value, 'value');
+  proxy.resetForm('ruleForm');
 }
 
 //查看详情操作
 function handleDetail(row) {
   open.value = true;
   title.value = '查看水厂供水';
-  multiple.value = true;
   form.value = row;
 }
 // 修改按钮操作
 function handleUpdate(row) {
   open.value = true;
   title.value = '修改水厂供水';
-  multiple.value = false;
   form.value = { ...row };
 }
-
-/** 搜索列表 */
-const getList = async () => {
-  // loading.value = true;
-  loading.value = false;
-};
+function deleteData(row) {
+  proxy.$modal
+    .confirm('是否确认删除？')
+    .then(async () => {
+      const res = await waterCompDelete(row.id);
+      if (res?.code !== 200) return;
+      proxy.$modal.msgSuccess('操作成功！');
+      getDataList();
+    })
+    .catch(() => {});
+}
 
 onMounted(() => {
-  getList();
+  getDataList();
 });
 </script>
-<style scoped lang="scss">
-.dituclass {
-  width: 100%;
-  height: 300px;
-  // background: red;
-  margin-bottom: 10px;
-  border: 1px solid #004565;
-}
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/floodSys/assetManage/pipelineInfo.vue b/src/views/floodSys/assetManage/pipelineInfo.vue
index 10fffad..6800c2e 100644
--- a/src/views/floodSys/assetManage/pipelineInfo.vue
+++ b/src/views/floodSys/assetManage/pipelineInfo.vue
@@ -7,8 +7,8 @@
           <el-option v-for="dict in pipeline_type" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="所在道路名称" prop="roadName">
-        <el-input v-model="queryParams.roadName" placeholder="请输入所在道路名称" clearable @keyup.enter="handleQuery" />
+      <el-form-item label="所在道路" prop="roadName">
+        <el-input v-model="queryParams.roadName" placeholder="请输入所在道路" clearable @keyup.enter="handleQuery" style="width: 200px" />
       </el-form-item>
       <el-form-item label="管道材质" prop="pipelineTexture">
         <el-input v-model="queryParams.pipelineTexture" placeholder="请输入管道材质" clearable @keyup.enter="handleQuery" />
@@ -76,7 +76,7 @@
       </el-table-column>
       <el-table-column label="起点编号" prop="startPointNumber" />
       <el-table-column label="终点编号" prop="endPointNumber" />
-      <el-table-column label="所在道路名称" prop="roadName" />
+      <el-table-column label="所在道路" prop="roadName" />
       <el-table-column label="管道材质" prop="pipelineTexture" />
       <el-table-column label="水流方向" prop="flowDirection">
         <template #default="scope">
@@ -127,6 +127,13 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="24">
+            <el-form-item label="所属道路" prop="roadName">
+              <el-input v-model="form.roadName" placeholder="请输入所在道路" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="管道材质" prop="pipelineTexture">
               <el-input v-model="form.pipelineTexture" placeholder="请输入管道材质" />
@@ -277,7 +284,7 @@
           </div>
         </div>
         <div class="flex flex-r">
-          <div class="detail-label flex flex-align-center">所在道路名称</div>
+          <div class="detail-label flex flex-align-center">所在道路</div>
           <div class="detail-value flex flex-align-center">
             {{ dialogFormDetail.roadName }}
           </div>
@@ -505,6 +512,7 @@
     layingType: null,
     sectionType: null,
     pipelineTexture: null,
+    roadName: null,
     ownershipUnits: null,
     operationalUnits: null,
     startOriginalX: null,
@@ -558,6 +566,7 @@
     layingType: null,
     sectionType: null,
     pipelineTexture: null,
+    roadName: null,
     ownershipUnits: null,
     operationalUnits: null,
     startOriginalX: null,

diff --git a/src/api/longoPeration/RiverSection.js b/src/api/longoPeration/RiverSection.js
index df9b339..0ff8e42 100644
--- a/src/api/longoPeration/RiverSection.js
+++ b/src/api/longoPeration/RiverSection.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request';
-// 河道信息
+// 河道信息-搜索
 export function riverSectionpage(query) {
   return request({
     url: '/business/riverSection/page',
@@ -8,7 +8,7 @@
   });
 }
 
-// 新增
+// 河道信息-新增
 export function riverSectionadd(data) {
   return request({
     url: '/business/riverSection/add',
@@ -17,7 +17,7 @@
   });
 }
 
-// 修改
+// 河道信息-修改
 export function riverSectionedit(data) {
   return request({
     url: '/business/riverSection/edit',
@@ -26,7 +26,7 @@
   });
 }
 
-// 删除
+// 河道信息-删除
 export function riverSectiondelete(id) {
   return request({
     url: '/business/riverSection/' + id,
@@ -34,10 +34,45 @@
   });
 }
 
-// // 详情接口
+// 河道信息-详情接口
 export function riverSectionID(id) {
   return request({
     url: '/business/riverSection/' + id,
     method: 'get',
   });
 }
+
+// 供水厂-搜索
+export function waterCompPage(query) {
+  return request({
+    url: '/business/riverSection/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 供水厂-新增
+export function waterCompAdd(data) {
+  return request({
+    url: '/business/riverSection/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 供水厂-修改
+export function waterCompEdit(data) {
+  return request({
+    url: '/business/riverSection/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 供水厂-删除
+export function waterCompDelete(id) {
+  return request({
+    url: '/business/riverSection/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index 4d45981..4802772 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -418,10 +418,21 @@
   .el-tree-node__content > .el-checkbox {
     margin-right: 8px;
   }
+  .el-tree-node {
+    .el-tree-node__children {
+      .el-tree-node__expand-icon {
+        visibility: hidden;
+      }
+    }
+    .el-tree-node__content .is-leaf {
+      visibility: hidden;
+    }
+  }
 }
 .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
   background-color: $mainColor2 !important;
 }
+
 .el-input-number__decrease,
 .el-input-number__increase {
   background-color: $mainColor1 !important;
diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js
index 62bb3b7..e2da556 100644
--- a/src/components/Echarts/pieChart_1.js
+++ b/src/components/Echarts/pieChart_1.js
@@ -867,7 +867,7 @@
     },
     grid: {
       top: '40px',
-      left: '40px',
+      left: '10%',
       right: '40px',
       bottom: '30%',
     },
@@ -891,11 +891,11 @@
     xAxis: [
       {
         type: 'category',
-        //boundaryGap: false,
+        boundaryGap: true,
         axisLabel: {
           formatter: '{value} ',
           color: '#00D1FF',
-          rotate: 20,
+          rotate: 45,
         },
         axisLine: {
           show: true,
diff --git a/src/views/document/fileManagement/list/index.vue b/src/views/document/fileManagement/list/index.vue
index 04c4098..e908171 100644
--- a/src/views/document/fileManagement/list/index.vue
+++ b/src/views/document/fileManagement/list/index.vue
@@ -13,7 +13,6 @@
             check-strictly
             clearable
             style="width: 100%"
-            class="fileTreeSel"
           />
         </el-form-item>
         <el-form-item label="文件标签:" prop="fileTag">
@@ -199,11 +198,4 @@
     margin-bottom: 15px;
   }
 }
-.fileTreeSel {
-  .el-tree-node__children {
-    .el-tree-node__expand-icon {
-      visibility: hidden;
-    }
-  }
-}
 </style>
diff --git a/src/views/floodSys/assetManage/StorageaFacilities.vue b/src/views/floodSys/assetManage/StorageaFacilities.vue
deleted file mode 100644
index 59323f8..0000000
--- a/src/views/floodSys/assetManage/StorageaFacilities.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<template>
-  <div class="publicContainer">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="名称:" prop="searchContent">
-        <el-input v-model="queryParams.searchContent" placeholder="请输入名称" clearable style="width: 180px" />
-      </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <!-- <el-button type="primary" icon="Plus" @click="handleAdd">新增</el-button> -->
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <!-- 按钮区域 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
-    </el-row>
-    <!-- 表格 -->
-    <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
-      <el-table-column type="index" width="55" label="序号" />
-      <el-table-column label="名称" prop="q" />
-      <el-table-column label="编码" prop="w" />
-      <el-table-column label="水面面积（k㎡）" prop="e" />
-      <el-table-column label="水体规模（万m³）" prop="r" />
-      <el-table-column label="湖底高程（米）" prop="t" />
-      <el-table-column label="正常水位（米）" prop="y" />
-      <el-table-column label="调蓄规模（万m³）" prop="u" />
-      <el-table-column label="gis空间数据" prop="i" />
-
-      <el-table-column label="操作" width="240">
-        <template #default="scope">
-          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row, 'view')">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row, 'view')">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-    <!-- 新增弹窗 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body :close-on-click-modal="false">
-      <el-form ref="roleRef" :model="form" :rules="rules" label-width="140px" :disabled="multiple">
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="名称:" prop="w">
-              <el-input v-model="form.w" placeholder="请输入名称" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="编码:" prop="w">
-              <el-input v-model="form.w" placeholder="请输入编码" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="水面面积（k㎡）:" prop="lon">
-              <el-input-number v-model="form.lon" placeholder="请输入水面面积（k㎡）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="水体规模（万m³）:" prop="lat">
-              <el-input-number v-model="form.lat" placeholder="请输入水体规模（万m³）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="湖底高程（米）:" prop="lon">
-              <el-input-number v-model="form.lon" placeholder="请输入湖底高程（米）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="正常水位（米）:" prop="lat">
-              <el-input-number v-model="form.lat" placeholder="请输入正常水位（米）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="调蓄规模（万m³）:" prop="lat">
-              <el-input-number v-model="form.lat" placeholder="请输入调蓄规模（万m³）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="gis空间数据:" prop="w">
-              <el-input type="textarea" v-model="form.w" placeholder="请输入gis空间数据" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-<script setup name="StorageaFacilities">
-const { proxy } = getCurrentInstance();
-const open = ref(false);
-const multiple = ref(false);
-const showSearch = ref(true);
-const Xcfrequency = ref([
-  {
-    value: 'tian',
-    label: '天',
-  },
-  {
-    value: 'zhou',
-    label: '周',
-  },
-]);
-const loading = ref(true);
-const total = ref(0);
-const title = ref('');
-const dataList = ref([]);
-const AllData = reactive({
-  id: '',
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    caseType: 1,
-    handleStatus: '',
-    searchContent: '',
-  },
-  rules: {
-    id: [{ required: true, message: '请输入', trigger: 'blur' }],
-    eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }],
-  },
-});
-const { queryParams, form, rules } = toRefs(AllData);
-//搜索
-function handleQuery() {
-  getList();
-}
-//重置
-function resetQuery() {
-  proxy.resetForm('queryRef');
-  handleQuery();
-}
-// 新增
-function handleAdd() {
-  title.value = '新增调蓄设施';
-  open.value = true;
-  form.value = {};
-  multiple.value = false;
-  form.value.fileTag = Xcfrequency.value[0].value;
-}
-// 新增中取消事件
-function cancel() {
-  open.value = false;
-  proxy.resetForm('roleRef');
-}
-
-// 巡查频率下拉框点击事件
-function changeStation(value) {
-  // console.log(value, 'value');
-}
-
-//查看详情操作
-function handleDetail(row) {
-  open.value = true;
-  title.value = '查看调蓄设施';
-  multiple.value = true;
-  form.value = row;
-}
-// 修改按钮操作
-function handleUpdate(row) {
-  open.value = true;
-  title.value = '修改调蓄设施';
-  multiple.value = false;
-  form.value = { ...row };
-}
-
-/** 搜索列表 */
-const getList = async () => {
-  // loading.value = true;
-  loading.value = false;
-};
-
-onMounted(() => {
-  getList();
-});
-</script>
-<style scoped lang="scss">
-.dituclass {
-  width: 100%;
-  height: 300px;
-  // background: red;
-  margin-bottom: 10px;
-  border: 1px solid #004565;
-}
-</style>
diff --git a/src/views/floodSys/assetManage/WaterSupplyWaterPlants.vue b/src/views/floodSys/assetManage/WaterSupplyWaterPlants.vue
index 6dac42b..ab0397f 100644
--- a/src/views/floodSys/assetManage/WaterSupplyWaterPlants.vue
+++ b/src/views/floodSys/assetManage/WaterSupplyWaterPlants.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- 水厂管理 -->
   <div class="publicContainer">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
       <el-form-item label="水厂名称:" prop="searchContent">
@@ -7,14 +8,11 @@
       <el-form-item label="建设时间" prop="date">
         <el-date-picker type="month" v-model="queryParams.date" value-format="YYYY-MM" placeholder="请选择日期"></el-date-picker>
       </el-form-item>
-
       <el-form-item label="投入使用时间" prop="date">
         <el-date-picker type="month" v-model="queryParams.date" value-format="YYYY-MM" placeholder="请选择投入使用时间"></el-date-picker>
       </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -26,7 +24,7 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
     <!-- 表格 -->
-    <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
+    <el-table :data="tableData" v-loading="tableLoading" stripe :max-height="580">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="水厂名称" prop="q" />
       <el-table-column label="编码" prop="w" />
@@ -44,7 +42,7 @@
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
           <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row, 'view')">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row, 'view')">删除</el-button>
+          <el-button link type="danger" icon="Delete" @click="deleteData(scope.row, 'view')">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -54,11 +52,11 @@
       :total="total"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+      @pagination="getDataList"
     />
     <!-- 新增弹窗 -->
     <el-dialog :title="title" v-model="open" width="800px" append-to-body :close-on-click-modal="false">
-      <el-form ref="roleRef" :model="form" :rules="rules" label-width="130px" :disabled="multiple">
+      <el-form ref="ruleForm" :model="form" :rules="rules" label-width="130px">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="水厂名称:" prop="w">
@@ -79,10 +77,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="水源情况:" prop="fileTag1">
-              <el-select v-model="form.fileTag1" placeholder="请选择水源情况" clearable style="width: 100%">
-                <el-option v-for="dict in document_tag" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
+            <el-form-item label="水源情况:" prop="fileTag">
+              <el-input v-model="form.fileTag" placeholder="请输入水源情况" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -160,24 +156,14 @@
   </div>
 </template>
 <script setup name="WaterSupplyWaterPlants">
+import { waterCompPage, waterCompAdd, waterCompEdit, waterCompDelete } from '@/api/longoPeration/RiverSection';
 const { proxy } = getCurrentInstance();
 const open = ref(false);
-const multiple = ref(false);
 const showSearch = ref(true);
-const Xcfrequency = ref([
-  {
-    value: 'tian',
-    label: '天',
-  },
-  {
-    value: 'zhou',
-    label: '周',
-  },
-]);
-const loading = ref(true);
+const tableLoading = ref(true);
 const total = ref(0);
 const title = ref('');
-const dataList = ref([]);
+const tableData = ref([]);
 const AllData = reactive({
   id: '',
   form: {},
@@ -196,8 +182,16 @@
 const { queryParams, form, rules } = toRefs(AllData);
 //搜索
 function handleQuery() {
-  getList();
+  getDataList();
 }
+//获取列表数据
+const getDataList = async () => {
+  tableLoading.value = true;
+  const res = await waterCompPage(queryParams.value);
+  tableLoading.value = false;
+  tableData.value = res.data;
+  total.value = res.total;
+};
 //重置
 function resetQuery() {
   proxy.resetForm('queryRef');
@@ -208,51 +202,58 @@
   title.value = '新增水厂供水';
   open.value = true;
   form.value = {};
-  multiple.value = false;
-  form.value.fileTag = Xcfrequency.value[0].value;
+}
+async function submitForm() {
+  proxy.$refs['ruleForm'].validate(valid => {
+    if (valid) {
+      if (formData.value.id != undefined) {
+        waterCompEdit(formData.value).then(() => {
+          proxy.$modal.msgSuccess('修改成功');
+          showDialog.value = false;
+          getDataList();
+        });
+      } else {
+        waterCompAdd(formData.value).then(() => {
+          proxy.$modal.msgSuccess('新增成功');
+          showDialog.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 // 新增中取消事件
 function cancel() {
   open.value = false;
-  proxy.resetForm('roleRef');
-}
-
-// 巡查频率下拉框点击事件
-function changeStation(value) {
-  // console.log(value, 'value');
+  proxy.resetForm('ruleForm');
 }
 
 //查看详情操作
 function handleDetail(row) {
   open.value = true;
   title.value = '查看水厂供水';
-  multiple.value = true;
   form.value = row;
 }
 // 修改按钮操作
 function handleUpdate(row) {
   open.value = true;
   title.value = '修改水厂供水';
-  multiple.value = false;
   form.value = { ...row };
 }
-
-/** 搜索列表 */
-const getList = async () => {
-  // loading.value = true;
-  loading.value = false;
-};
+function deleteData(row) {
+  proxy.$modal
+    .confirm('是否确认删除？')
+    .then(async () => {
+      const res = await waterCompDelete(row.id);
+      if (res?.code !== 200) return;
+      proxy.$modal.msgSuccess('操作成功！');
+      getDataList();
+    })
+    .catch(() => {});
+}
 
 onMounted(() => {
-  getList();
+  getDataList();
 });
 </script>
-<style scoped lang="scss">
-.dituclass {
-  width: 100%;
-  height: 300px;
-  // background: red;
-  margin-bottom: 10px;
-  border: 1px solid #004565;
-}
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/floodSys/assetManage/pipelineInfo.vue b/src/views/floodSys/assetManage/pipelineInfo.vue
index 10fffad..6800c2e 100644
--- a/src/views/floodSys/assetManage/pipelineInfo.vue
+++ b/src/views/floodSys/assetManage/pipelineInfo.vue
@@ -7,8 +7,8 @@
           <el-option v-for="dict in pipeline_type" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="所在道路名称" prop="roadName">
-        <el-input v-model="queryParams.roadName" placeholder="请输入所在道路名称" clearable @keyup.enter="handleQuery" />
+      <el-form-item label="所在道路" prop="roadName">
+        <el-input v-model="queryParams.roadName" placeholder="请输入所在道路" clearable @keyup.enter="handleQuery" style="width: 200px" />
       </el-form-item>
       <el-form-item label="管道材质" prop="pipelineTexture">
         <el-input v-model="queryParams.pipelineTexture" placeholder="请输入管道材质" clearable @keyup.enter="handleQuery" />
@@ -76,7 +76,7 @@
       </el-table-column>
       <el-table-column label="起点编号" prop="startPointNumber" />
       <el-table-column label="终点编号" prop="endPointNumber" />
-      <el-table-column label="所在道路名称" prop="roadName" />
+      <el-table-column label="所在道路" prop="roadName" />
       <el-table-column label="管道材质" prop="pipelineTexture" />
       <el-table-column label="水流方向" prop="flowDirection">
         <template #default="scope">
@@ -127,6 +127,13 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="24">
+            <el-form-item label="所属道路" prop="roadName">
+              <el-input v-model="form.roadName" placeholder="请输入所在道路" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="管道材质" prop="pipelineTexture">
               <el-input v-model="form.pipelineTexture" placeholder="请输入管道材质" />
@@ -277,7 +284,7 @@
           </div>
         </div>
         <div class="flex flex-r">
-          <div class="detail-label flex flex-align-center">所在道路名称</div>
+          <div class="detail-label flex flex-align-center">所在道路</div>
           <div class="detail-value flex flex-align-center">
             {{ dialogFormDetail.roadName }}
           </div>
@@ -505,6 +512,7 @@
     layingType: null,
     sectionType: null,
     pipelineTexture: null,
+    roadName: null,
     ownershipUnits: null,
     operationalUnits: null,
     startOriginalX: null,
@@ -558,6 +566,7 @@
     layingType: null,
     sectionType: null,
     pipelineTexture: null,
+    roadName: null,
     ownershipUnits: null,
     operationalUnits: null,
     startOriginalX: null,
diff --git a/src/views/floodSys/floodOneMap/tabRightFX.vue b/src/views/floodSys/floodOneMap/tabRightFX.vue
index 07376ee..e917a5b 100644
--- a/src/views/floodSys/floodOneMap/tabRightFX.vue
+++ b/src/views/floodSys/floodOneMap/tabRightFX.vue
@@ -11,7 +11,7 @@
 
       <div class="selectTitle">
         <div class="name">河道水位</div>
-        <el-select v-model="riverIndex" style="margin: 0px 10px 0px 10px; width: 220px" size="small" @change="changeRiver">
+        <el-select v-model="riverIndex" style="margin: 0px 10px 0px 10px" size="small" @change="changeRiver">
           <el-option :label="item.stName" :value="item.stCode" v-for="item in riverLists" :key="item.stCode"></el-option>
         </el-select>
       </div>
@@ -66,7 +66,9 @@
 import { nextTick } from 'vue';
 import bus from '@/bus';
 import { ElLoading } from 'element-plus';
-import { rainTrend, waterloggingRisk, riverRisk, geometryDurationData } from '@/api/floodSys/oneMap';
+import { rainTrend, waterloggingRisk, geometryDurationData } from '@/api/floodSys/oneMap';
+import { getoneRiverRisk } from '@/api/dataAnalysis/syntherticData';
+import { listrtuSiteInfo } from '@/api/dataAnalysis/rtuSiteInfo';
 import LineChart from '@/components/Echarts/lineOneChart.vue'; //折线图
 import xiaoganCityBoundary from '@/assets/geojson/xiaoganCityBoundary.json';
 
@@ -77,7 +79,7 @@
 const tableArea = ref(null);
 const riverIndex = ref(null);
 const riverLists = ref([]);
-// const loadingRiver = ref(true);
+const loadingRiver = ref(true);
 const dialogShow = ref(false);
 const refresh = ref(1);
 const timer = ref(null);
@@ -114,7 +116,7 @@
     let times = [];
     if (Boolean(datas.dateRange.length)) {
       datas.dateRange.forEach(i => {
-        times.push(i.substr(0, 16));
+        times.push(i.substr(5, 11));
       });
     }
     chartOption.floodOneMapFXrain.legend.data = ['近24h实测雨量', '未来24h预报雨量'];
@@ -142,42 +144,51 @@
   riverIndex.value = val;
   getRiverData();
 }
-// 河湖风险研判echarts
+
 let chartRiver = null;
 async function getRiverData() {
   if (!!chartRiver) chartRiver.dispose();
+  loadingRiver.value = true;
   chartRiver = echarts.init(document.getElementById('chartTwo'));
-  // echarts赋值
-  let arrs = riverLists.value.filter(item => item.stCode == riverIndex.value);
-  console.log(arrs);
-  chartOption.floodOneMapFXYP.xAxis[0].data = arrs[0].riverX;
-  chartOption.floodOneMapFXYP.series[1].data = arrs[0].riverY;
-  chartOption.floodOneMapFXYP.series[1].markLine.data[0].yAxis = arrs[0].sfZ;
-  chartOption.floodOneMapFXYP.series[1].markLine.data[0].label.formatter = '设防水位 ' + arrs[0].sfZ + 'm';
-  let arrs2 = [];
-  arrs[0].riverX.map(item => {
-    arrs2.push(arrs[0].z);
-  });
-  chartOption.floodOneMapFXYP.series[0].data = arrs2;
-  if (arrs[0].riverX.length == 0) {
-    chartOption.floodOneMapFXYP.graphic.invisible = false; //暂无数据
-  } else {
-    chartOption.floodOneMapFXYP.graphic.invisible = true; //暂无数据
+  let params = {
+    riverCode: riverIndex.value,
+  };
+  let res = await getoneRiverRisk(params);
+  if (res && res.code == 200) {
+    let datas = res.data;
+    console.log(datas, 'datas');
+    // if (datas.propertyMonitorXList.length == 0) return;
+    // echarts赋值
+    chartOption.floodOneMapFXYP.xAxis[0].data = datas.riverX; //x轴
+    chartOption.floodOneMapFXYP.series[1].data = datas.riverY; //河床高度
+    chartOption.floodOneMapFXYP.series[1].markLine.data[0].yAxis = datas.sfZ; //设防水位
+    chartOption.floodOneMapFXYP.series[1].markLine.data[0].label.formatter = '设防水位 ' + datas.sfZ + 'm';
+    let arrs2 = [];
+    datas.riverX.map(item => {
+      arrs2.push(Number(datas.z) + Number(datas.gcZ) + 1);
+    });
+    chartOption.floodOneMapFXYP.series[0].data = arrs2; //当前水位
+
+    if (datas.riverX.length == 0) {
+      chartOption.floodOneMapFXYP.graphic.invisible = false; //暂无数据
+    } else {
+      chartOption.floodOneMapFXYP.graphic.invisible = true; //暂无数据
+    }
+    chartRiver.clear();
+    chartRiver.setOption(chartOption.floodOneMapFXYP);
+    loadingRiver.value = false;
   }
-  chartRiver.clear();
-  chartRiver.setOption(chartOption.floodOneMapFXYP);
 }
+
 // 获取河湖风险研判下拉框值
 async function getRiverSelect() {
-  // loadingRiver.value = true;
-  let res = await riverRisk();
+  let res = await listrtuSiteInfo({ siteType: 'water_level' });
   if (res && res.code == 200) {
     let datas = res.data;
     riverLists.value = datas;
     riverIndex.value = datas[0].stCode;
     changeRiver(riverIndex.value);
   }
-  // loadingRiver.value = false;
 }
 
 //积水预报表格
@@ -263,7 +274,7 @@
         });
         addCityBoundary();
         initEcharts(); //未来气象预报
-        getRiverSelect(); //河湖风险研判
+        getRiverSelect(); //河湖风险研判获取列表
         getWaterLogging(); //积水预报
       });
       newfiberMapbox.map.on('click', e => {

diff --git a/src/api/longoPeration/RiverSection.js b/src/api/longoPeration/RiverSection.js
index df9b339..0ff8e42 100644
--- a/src/api/longoPeration/RiverSection.js
+++ b/src/api/longoPeration/RiverSection.js
@@ -1,5 +1,5 @@
 import request from '@/utils/request';
-// 河道信息
+// 河道信息-搜索
 export function riverSectionpage(query) {
   return request({
     url: '/business/riverSection/page',
@@ -8,7 +8,7 @@
   });
 }
 
-// 新增
+// 河道信息-新增
 export function riverSectionadd(data) {
   return request({
     url: '/business/riverSection/add',
@@ -17,7 +17,7 @@
   });
 }
 
-// 修改
+// 河道信息-修改
 export function riverSectionedit(data) {
   return request({
     url: '/business/riverSection/edit',
@@ -26,7 +26,7 @@
   });
 }
 
-// 删除
+// 河道信息-删除
 export function riverSectiondelete(id) {
   return request({
     url: '/business/riverSection/' + id,
@@ -34,10 +34,45 @@
   });
 }
 
-// // 详情接口
+// 河道信息-详情接口
 export function riverSectionID(id) {
   return request({
     url: '/business/riverSection/' + id,
     method: 'get',
   });
 }
+
+// 供水厂-搜索
+export function waterCompPage(query) {
+  return request({
+    url: '/business/riverSection/page',
+    method: 'get',
+    params: query,
+  });
+}
+
+// 供水厂-新增
+export function waterCompAdd(data) {
+  return request({
+    url: '/business/riverSection/add',
+    method: 'post',
+    data: data,
+  });
+}
+
+// 供水厂-修改
+export function waterCompEdit(data) {
+  return request({
+    url: '/business/riverSection/edit',
+    method: 'put',
+    data: data,
+  });
+}
+
+// 供水厂-删除
+export function waterCompDelete(id) {
+  return request({
+    url: '/business/riverSection/' + id,
+    method: 'delete',
+  });
+}
diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss
index 4d45981..4802772 100644
--- a/src/assets/styles/element-ui.scss
+++ b/src/assets/styles/element-ui.scss
@@ -418,10 +418,21 @@
   .el-tree-node__content > .el-checkbox {
     margin-right: 8px;
   }
+  .el-tree-node {
+    .el-tree-node__children {
+      .el-tree-node__expand-icon {
+        visibility: hidden;
+      }
+    }
+    .el-tree-node__content .is-leaf {
+      visibility: hidden;
+    }
+  }
 }
 .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
   background-color: $mainColor2 !important;
 }
+
 .el-input-number__decrease,
 .el-input-number__increase {
   background-color: $mainColor1 !important;
diff --git a/src/components/Echarts/pieChart_1.js b/src/components/Echarts/pieChart_1.js
index 62bb3b7..e2da556 100644
--- a/src/components/Echarts/pieChart_1.js
+++ b/src/components/Echarts/pieChart_1.js
@@ -867,7 +867,7 @@
     },
     grid: {
       top: '40px',
-      left: '40px',
+      left: '10%',
       right: '40px',
       bottom: '30%',
     },
@@ -891,11 +891,11 @@
     xAxis: [
       {
         type: 'category',
-        //boundaryGap: false,
+        boundaryGap: true,
         axisLabel: {
           formatter: '{value} ',
           color: '#00D1FF',
-          rotate: 20,
+          rotate: 45,
         },
         axisLine: {
           show: true,
diff --git a/src/views/document/fileManagement/list/index.vue b/src/views/document/fileManagement/list/index.vue
index 04c4098..e908171 100644
--- a/src/views/document/fileManagement/list/index.vue
+++ b/src/views/document/fileManagement/list/index.vue
@@ -13,7 +13,6 @@
             check-strictly
             clearable
             style="width: 100%"
-            class="fileTreeSel"
           />
         </el-form-item>
         <el-form-item label="文件标签:" prop="fileTag">
@@ -199,11 +198,4 @@
     margin-bottom: 15px;
   }
 }
-.fileTreeSel {
-  .el-tree-node__children {
-    .el-tree-node__expand-icon {
-      visibility: hidden;
-    }
-  }
-}
 </style>
diff --git a/src/views/floodSys/assetManage/StorageaFacilities.vue b/src/views/floodSys/assetManage/StorageaFacilities.vue
deleted file mode 100644
index 59323f8..0000000
--- a/src/views/floodSys/assetManage/StorageaFacilities.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<template>
-  <div class="publicContainer">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="名称:" prop="searchContent">
-        <el-input v-model="queryParams.searchContent" placeholder="请输入名称" clearable style="width: 180px" />
-      </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <!-- <el-button type="primary" icon="Plus" @click="handleAdd">新增</el-button> -->
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-    <!-- 按钮区域 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
-    </el-row>
-    <!-- 表格 -->
-    <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
-      <el-table-column type="index" width="55" label="序号" />
-      <el-table-column label="名称" prop="q" />
-      <el-table-column label="编码" prop="w" />
-      <el-table-column label="水面面积（k㎡）" prop="e" />
-      <el-table-column label="水体规模（万m³）" prop="r" />
-      <el-table-column label="湖底高程（米）" prop="t" />
-      <el-table-column label="正常水位（米）" prop="y" />
-      <el-table-column label="调蓄规模（万m³）" prop="u" />
-      <el-table-column label="gis空间数据" prop="i" />
-
-      <el-table-column label="操作" width="240">
-        <template #default="scope">
-          <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
-          <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row, 'view')">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row, 'view')">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-    <!-- 新增弹窗 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body :close-on-click-modal="false">
-      <el-form ref="roleRef" :model="form" :rules="rules" label-width="140px" :disabled="multiple">
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="名称:" prop="w">
-              <el-input v-model="form.w" placeholder="请输入名称" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="编码:" prop="w">
-              <el-input v-model="form.w" placeholder="请输入编码" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="水面面积（k㎡）:" prop="lon">
-              <el-input-number v-model="form.lon" placeholder="请输入水面面积（k㎡）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="水体规模（万m³）:" prop="lat">
-              <el-input-number v-model="form.lat" placeholder="请输入水体规模（万m³）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="湖底高程（米）:" prop="lon">
-              <el-input-number v-model="form.lon" placeholder="请输入湖底高程（米）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="正常水位（米）:" prop="lat">
-              <el-input-number v-model="form.lat" placeholder="请输入正常水位（米）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="调蓄规模（万m³）:" prop="lat">
-              <el-input-number v-model="form.lat" placeholder="请输入调蓄规模（万m³）" style="width: 100%" controls-position="right" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="gis空间数据:" prop="w">
-              <el-input type="textarea" v-model="form.w" placeholder="请输入gis空间数据" clearable style="width: 100%" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-<script setup name="StorageaFacilities">
-const { proxy } = getCurrentInstance();
-const open = ref(false);
-const multiple = ref(false);
-const showSearch = ref(true);
-const Xcfrequency = ref([
-  {
-    value: 'tian',
-    label: '天',
-  },
-  {
-    value: 'zhou',
-    label: '周',
-  },
-]);
-const loading = ref(true);
-const total = ref(0);
-const title = ref('');
-const dataList = ref([]);
-const AllData = reactive({
-  id: '',
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    caseType: 1,
-    handleStatus: '',
-    searchContent: '',
-  },
-  rules: {
-    id: [{ required: true, message: '请输入', trigger: 'blur' }],
-    eventDescription: [{ required: true, message: '请输入', trigger: 'blur' }],
-  },
-});
-const { queryParams, form, rules } = toRefs(AllData);
-//搜索
-function handleQuery() {
-  getList();
-}
-//重置
-function resetQuery() {
-  proxy.resetForm('queryRef');
-  handleQuery();
-}
-// 新增
-function handleAdd() {
-  title.value = '新增调蓄设施';
-  open.value = true;
-  form.value = {};
-  multiple.value = false;
-  form.value.fileTag = Xcfrequency.value[0].value;
-}
-// 新增中取消事件
-function cancel() {
-  open.value = false;
-  proxy.resetForm('roleRef');
-}
-
-// 巡查频率下拉框点击事件
-function changeStation(value) {
-  // console.log(value, 'value');
-}
-
-//查看详情操作
-function handleDetail(row) {
-  open.value = true;
-  title.value = '查看调蓄设施';
-  multiple.value = true;
-  form.value = row;
-}
-// 修改按钮操作
-function handleUpdate(row) {
-  open.value = true;
-  title.value = '修改调蓄设施';
-  multiple.value = false;
-  form.value = { ...row };
-}
-
-/** 搜索列表 */
-const getList = async () => {
-  // loading.value = true;
-  loading.value = false;
-};
-
-onMounted(() => {
-  getList();
-});
-</script>
-<style scoped lang="scss">
-.dituclass {
-  width: 100%;
-  height: 300px;
-  // background: red;
-  margin-bottom: 10px;
-  border: 1px solid #004565;
-}
-</style>
diff --git a/src/views/floodSys/assetManage/WaterSupplyWaterPlants.vue b/src/views/floodSys/assetManage/WaterSupplyWaterPlants.vue
index 6dac42b..ab0397f 100644
--- a/src/views/floodSys/assetManage/WaterSupplyWaterPlants.vue
+++ b/src/views/floodSys/assetManage/WaterSupplyWaterPlants.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- 水厂管理 -->
   <div class="publicContainer">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
       <el-form-item label="水厂名称:" prop="searchContent">
@@ -7,14 +8,11 @@
       <el-form-item label="建设时间" prop="date">
         <el-date-picker type="month" v-model="queryParams.date" value-format="YYYY-MM" placeholder="请选择日期"></el-date-picker>
       </el-form-item>
-
       <el-form-item label="投入使用时间" prop="date">
         <el-date-picker type="month" v-model="queryParams.date" value-format="YYYY-MM" placeholder="请选择投入使用时间"></el-date-picker>
       </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -26,7 +24,7 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getDataList"></right-toolbar>
     </el-row>
     <!-- 表格 -->
-    <el-table :data="dataList" v-loading="loading" stripe :max-height="580">
+    <el-table :data="tableData" v-loading="tableLoading" stripe :max-height="580">
       <el-table-column type="index" width="55" label="序号" />
       <el-table-column label="水厂名称" prop="q" />
       <el-table-column label="编码" prop="w" />
@@ -44,7 +42,7 @@
         <template #default="scope">
           <el-button link icon="View" type="primary" @click="handleDetail(scope.row, 'view')">查看</el-button>
           <el-button link type="warning" icon="Edit" @click="handleUpdate(scope.row, 'view')">修改</el-button>
-          <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row, 'view')">删除</el-button>
+          <el-button link type="danger" icon="Delete" @click="deleteData(scope.row, 'view')">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -54,11 +52,11 @@
       :total="total"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+      @pagination="getDataList"
     />
     <!-- 新增弹窗 -->
     <el-dialog :title="title" v-model="open" width="800px" append-to-body :close-on-click-modal="false">
-      <el-form ref="roleRef" :model="form" :rules="rules" label-width="130px" :disabled="multiple">
+      <el-form ref="ruleForm" :model="form" :rules="rules" label-width="130px">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="水厂名称:" prop="w">
@@ -79,10 +77,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="水源情况:" prop="fileTag1">
-              <el-select v-model="form.fileTag1" placeholder="请选择水源情况" clearable style="width: 100%">
-                <el-option v-for="dict in document_tag" :key="dict.value" :label="dict.label" :value="dict.value" />
-              </el-select>
+            <el-form-item label="水源情况:" prop="fileTag">
+              <el-input v-model="form.fileTag" placeholder="请输入水源情况" clearable style="width: 100%" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -160,24 +156,14 @@
   </div>
 </template>
 <script setup name="WaterSupplyWaterPlants">
+import { waterCompPage, waterCompAdd, waterCompEdit, waterCompDelete } from '@/api/longoPeration/RiverSection';
 const { proxy } = getCurrentInstance();
 const open = ref(false);
-const multiple = ref(false);
 const showSearch = ref(true);
-const Xcfrequency = ref([
-  {
-    value: 'tian',
-    label: '天',
-  },
-  {
-    value: 'zhou',
-    label: '周',
-  },
-]);
-const loading = ref(true);
+const tableLoading = ref(true);
 const total = ref(0);
 const title = ref('');
-const dataList = ref([]);
+const tableData = ref([]);
 const AllData = reactive({
   id: '',
   form: {},
@@ -196,8 +182,16 @@
 const { queryParams, form, rules } = toRefs(AllData);
 //搜索
 function handleQuery() {
-  getList();
+  getDataList();
 }
+//获取列表数据
+const getDataList = async () => {
+  tableLoading.value = true;
+  const res = await waterCompPage(queryParams.value);
+  tableLoading.value = false;
+  tableData.value = res.data;
+  total.value = res.total;
+};
 //重置
 function resetQuery() {
   proxy.resetForm('queryRef');
@@ -208,51 +202,58 @@
   title.value = '新增水厂供水';
   open.value = true;
   form.value = {};
-  multiple.value = false;
-  form.value.fileTag = Xcfrequency.value[0].value;
+}
+async function submitForm() {
+  proxy.$refs['ruleForm'].validate(valid => {
+    if (valid) {
+      if (formData.value.id != undefined) {
+        waterCompEdit(formData.value).then(() => {
+          proxy.$modal.msgSuccess('修改成功');
+          showDialog.value = false;
+          getDataList();
+        });
+      } else {
+        waterCompAdd(formData.value).then(() => {
+          proxy.$modal.msgSuccess('新增成功');
+          showDialog.value = false;
+          getDataList();
+        });
+      }
+    }
+  });
 }
 // 新增中取消事件
 function cancel() {
   open.value = false;
-  proxy.resetForm('roleRef');
-}
-
-// 巡查频率下拉框点击事件
-function changeStation(value) {
-  // console.log(value, 'value');
+  proxy.resetForm('ruleForm');
 }
 
 //查看详情操作
 function handleDetail(row) {
   open.value = true;
   title.value = '查看水厂供水';
-  multiple.value = true;
   form.value = row;
 }
 // 修改按钮操作
 function handleUpdate(row) {
   open.value = true;
   title.value = '修改水厂供水';
-  multiple.value = false;
   form.value = { ...row };
 }
-
-/** 搜索列表 */
-const getList = async () => {
-  // loading.value = true;
-  loading.value = false;
-};
+function deleteData(row) {
+  proxy.$modal
+    .confirm('是否确认删除？')
+    .then(async () => {
+      const res = await waterCompDelete(row.id);
+      if (res?.code !== 200) return;
+      proxy.$modal.msgSuccess('操作成功！');
+      getDataList();
+    })
+    .catch(() => {});
+}
 
 onMounted(() => {
-  getList();
+  getDataList();
 });
 </script>
-<style scoped lang="scss">
-.dituclass {
-  width: 100%;
-  height: 300px;
-  // background: red;
-  margin-bottom: 10px;
-  border: 1px solid #004565;
-}
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/floodSys/assetManage/pipelineInfo.vue b/src/views/floodSys/assetManage/pipelineInfo.vue
index 10fffad..6800c2e 100644
--- a/src/views/floodSys/assetManage/pipelineInfo.vue
+++ b/src/views/floodSys/assetManage/pipelineInfo.vue
@@ -7,8 +7,8 @@
           <el-option v-for="dict in pipeline_type" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="所在道路名称" prop="roadName">
-        <el-input v-model="queryParams.roadName" placeholder="请输入所在道路名称" clearable @keyup.enter="handleQuery" />
+      <el-form-item label="所在道路" prop="roadName">
+        <el-input v-model="queryParams.roadName" placeholder="请输入所在道路" clearable @keyup.enter="handleQuery" style="width: 200px" />
       </el-form-item>
       <el-form-item label="管道材质" prop="pipelineTexture">
         <el-input v-model="queryParams.pipelineTexture" placeholder="请输入管道材质" clearable @keyup.enter="handleQuery" />
@@ -76,7 +76,7 @@
       </el-table-column>
       <el-table-column label="起点编号" prop="startPointNumber" />
       <el-table-column label="终点编号" prop="endPointNumber" />
-      <el-table-column label="所在道路名称" prop="roadName" />
+      <el-table-column label="所在道路" prop="roadName" />
       <el-table-column label="管道材质" prop="pipelineTexture" />
       <el-table-column label="水流方向" prop="flowDirection">
         <template #default="scope">
@@ -127,6 +127,13 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="24">
+            <el-form-item label="所属道路" prop="roadName">
+              <el-input v-model="form.roadName" placeholder="请输入所在道路" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="管道材质" prop="pipelineTexture">
               <el-input v-model="form.pipelineTexture" placeholder="请输入管道材质" />
@@ -277,7 +284,7 @@
           </div>
         </div>
         <div class="flex flex-r">
-          <div class="detail-label flex flex-align-center">所在道路名称</div>
+          <div class="detail-label flex flex-align-center">所在道路</div>
           <div class="detail-value flex flex-align-center">
             {{ dialogFormDetail.roadName }}
           </div>
@@ -505,6 +512,7 @@
     layingType: null,
     sectionType: null,
     pipelineTexture: null,
+    roadName: null,
     ownershipUnits: null,
     operationalUnits: null,
     startOriginalX: null,
@@ -558,6 +566,7 @@
     layingType: null,
     sectionType: null,
     pipelineTexture: null,
+    roadName: null,
     ownershipUnits: null,
     operationalUnits: null,
     startOriginalX: null,
diff --git a/src/views/floodSys/floodOneMap/tabRightFX.vue b/src/views/floodSys/floodOneMap/tabRightFX.vue
index 07376ee..e917a5b 100644
--- a/src/views/floodSys/floodOneMap/tabRightFX.vue
+++ b/src/views/floodSys/floodOneMap/tabRightFX.vue
@@ -11,7 +11,7 @@
 
       <div class="selectTitle">
         <div class="name">河道水位</div>
-        <el-select v-model="riverIndex" style="margin: 0px 10px 0px 10px; width: 220px" size="small" @change="changeRiver">
+        <el-select v-model="riverIndex" style="margin: 0px 10px 0px 10px" size="small" @change="changeRiver">
           <el-option :label="item.stName" :value="item.stCode" v-for="item in riverLists" :key="item.stCode"></el-option>
         </el-select>
       </div>
@@ -66,7 +66,9 @@
 import { nextTick } from 'vue';
 import bus from '@/bus';
 import { ElLoading } from 'element-plus';
-import { rainTrend, waterloggingRisk, riverRisk, geometryDurationData } from '@/api/floodSys/oneMap';
+import { rainTrend, waterloggingRisk, geometryDurationData } from '@/api/floodSys/oneMap';
+import { getoneRiverRisk } from '@/api/dataAnalysis/syntherticData';
+import { listrtuSiteInfo } from '@/api/dataAnalysis/rtuSiteInfo';
 import LineChart from '@/components/Echarts/lineOneChart.vue'; //折线图
 import xiaoganCityBoundary from '@/assets/geojson/xiaoganCityBoundary.json';
 
@@ -77,7 +79,7 @@
 const tableArea = ref(null);
 const riverIndex = ref(null);
 const riverLists = ref([]);
-// const loadingRiver = ref(true);
+const loadingRiver = ref(true);
 const dialogShow = ref(false);
 const refresh = ref(1);
 const timer = ref(null);
@@ -114,7 +116,7 @@
     let times = [];
     if (Boolean(datas.dateRange.length)) {
       datas.dateRange.forEach(i => {
-        times.push(i.substr(0, 16));
+        times.push(i.substr(5, 11));
       });
     }
     chartOption.floodOneMapFXrain.legend.data = ['近24h实测雨量', '未来24h预报雨量'];
@@ -142,42 +144,51 @@
   riverIndex.value = val;
   getRiverData();
 }
-// 河湖风险研判echarts
+
 let chartRiver = null;
 async function getRiverData() {
   if (!!chartRiver) chartRiver.dispose();
+  loadingRiver.value = true;
   chartRiver = echarts.init(document.getElementById('chartTwo'));
-  // echarts赋值
-  let arrs = riverLists.value.filter(item => item.stCode == riverIndex.value);
-  console.log(arrs);
-  chartOption.floodOneMapFXYP.xAxis[0].data = arrs[0].riverX;
-  chartOption.floodOneMapFXYP.series[1].data = arrs[0].riverY;
-  chartOption.floodOneMapFXYP.series[1].markLine.data[0].yAxis = arrs[0].sfZ;
-  chartOption.floodOneMapFXYP.series[1].markLine.data[0].label.formatter = '设防水位 ' + arrs[0].sfZ + 'm';
-  let arrs2 = [];
-  arrs[0].riverX.map(item => {
-    arrs2.push(arrs[0].z);
-  });
-  chartOption.floodOneMapFXYP.series[0].data = arrs2;
-  if (arrs[0].riverX.length == 0) {
-    chartOption.floodOneMapFXYP.graphic.invisible = false; //暂无数据
-  } else {
-    chartOption.floodOneMapFXYP.graphic.invisible = true; //暂无数据
+  let params = {
+    riverCode: riverIndex.value,
+  };
+  let res = await getoneRiverRisk(params);
+  if (res && res.code == 200) {
+    let datas = res.data;
+    console.log(datas, 'datas');
+    // if (datas.propertyMonitorXList.length == 0) return;
+    // echarts赋值
+    chartOption.floodOneMapFXYP.xAxis[0].data = datas.riverX; //x轴
+    chartOption.floodOneMapFXYP.series[1].data = datas.riverY; //河床高度
+    chartOption.floodOneMapFXYP.series[1].markLine.data[0].yAxis = datas.sfZ; //设防水位
+    chartOption.floodOneMapFXYP.series[1].markLine.data[0].label.formatter = '设防水位 ' + datas.sfZ + 'm';
+    let arrs2 = [];
+    datas.riverX.map(item => {
+      arrs2.push(Number(datas.z) + Number(datas.gcZ) + 1);
+    });
+    chartOption.floodOneMapFXYP.series[0].data = arrs2; //当前水位
+
+    if (datas.riverX.length == 0) {
+      chartOption.floodOneMapFXYP.graphic.invisible = false; //暂无数据
+    } else {
+      chartOption.floodOneMapFXYP.graphic.invisible = true; //暂无数据
+    }
+    chartRiver.clear();
+    chartRiver.setOption(chartOption.floodOneMapFXYP);
+    loadingRiver.value = false;
   }
-  chartRiver.clear();
-  chartRiver.setOption(chartOption.floodOneMapFXYP);
 }
+
 // 获取河湖风险研判下拉框值
 async function getRiverSelect() {
-  // loadingRiver.value = true;
-  let res = await riverRisk();
+  let res = await listrtuSiteInfo({ siteType: 'water_level' });
   if (res && res.code == 200) {
     let datas = res.data;
     riverLists.value = datas;
     riverIndex.value = datas[0].stCode;
     changeRiver(riverIndex.value);
   }
-  // loadingRiver.value = false;
 }
 
 //积水预报表格
@@ -263,7 +274,7 @@
         });
         addCityBoundary();
         initEcharts(); //未来气象预报
-        getRiverSelect(); //河湖风险研判
+        getRiverSelect(); //河湖风险研判获取列表
         getWaterLogging(); //积水预报
       });
       newfiberMapbox.map.on('click', e => {
diff --git a/src/views/floodSys/scada/plcPointInfo/tableDalgo.vue b/src/views/floodSys/scada/plcPointInfo/tableDalgo.vue
index 3555874..070f679 100644
--- a/src/views/floodSys/scada/plcPointInfo/tableDalgo.vue
+++ b/src/views/floodSys/scada/plcPointInfo/tableDalgo.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="water-analysis-page">
     <div class="top">
-      <el-form label-width="auto" :rules="plcPointInfoRules" inline ref="ruleForm" :model="FormList" :disabled="typeList.type == 1">
+      <el-form label-width="120px" :rules="plcPointInfoRules" inline ref="ruleForm" :model="FormList" :disabled="typeList.type == 1">
         <el-form-item
           :label="i.label"
-          :style="{ width: i.prop == 'fileList1' ? '93%' : '45%' }"
+          style="width: 45%"
           :prop="i.prop"
           v-for="i in plcPointInfoForm"
           :disabled="typeList.type == 1 || typeList.type == 2"