From 5cf2ecf10cc2ced612eff060fe6cf050ac0e6cd5 Mon Sep 17 00:00:00 2001
From: hxh <762326930@qq.com>
Date: Mon, 22 Apr 2024 19:18:01 +0800
Subject: [PATCH 01/23] =?UTF-8?q?fix:=20=E8=BF=98=E5=8E=9F=E7=9B=91?=
 =?UTF-8?q?=E7=9D=A3=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../runManage/supervisionInspetion/index.vue  |   3 +
 .../methodsManage/details.vue                 | 181 +++++
 .../methodsManage/index.vue                   | 293 ++++++++
 .../methodsManage/itemsDetails.vue            | 345 +++++++++
 .../methodsManage/itemsList.vue               | 218 ++++++
 .../projectManage/index.vue                   | 253 +++++++
 .../projectManage/projectReport.vue           | 548 ++++++++++++++
 .../projectManage/projectReportPage.vue       | 382 ++++++++++
 .../questionManage/index.vue                  | 701 ++++++++++++++++++
 .../statisticAnalysis/components/Pie.vue      | 154 ++++
 .../statisticAnalysis/index.vue               | 344 +++++++++
 .../tasksManage/index.vue                     | 221 ++++++
 .../tasksManage/tasksDetails.vue              | 434 +++++++++++
 13 files changed, 4077 insertions(+)
 create mode 100644 src/views/dike/runManage/supervisionInspetion/index.vue
 create mode 100644 src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue
 create mode 100644 src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue
 create mode 100644 src/views/dike/runManage/supervisionInspetion/methodsManage/itemsDetails.vue
 create mode 100644 src/views/dike/runManage/supervisionInspetion/methodsManage/itemsList.vue
 create mode 100644 src/views/dike/runManage/supervisionInspetion/projectManage/index.vue
 create mode 100644 src/views/dike/runManage/supervisionInspetion/projectManage/projectReport.vue
 create mode 100644 src/views/dike/runManage/supervisionInspetion/projectManage/projectReportPage.vue
 create mode 100644 src/views/dike/runManage/supervisionInspetion/questionManage/index.vue
 create mode 100644 src/views/dike/runManage/supervisionInspetion/statisticAnalysis/components/Pie.vue
 create mode 100644 src/views/dike/runManage/supervisionInspetion/statisticAnalysis/index.vue
 create mode 100644 src/views/dike/runManage/supervisionInspetion/tasksManage/index.vue
 create mode 100644 src/views/dike/runManage/supervisionInspetion/tasksManage/tasksDetails.vue

diff --git a/src/views/dike/runManage/supervisionInspetion/index.vue b/src/views/dike/runManage/supervisionInspetion/index.vue
new file mode 100644
index 0000000..98240ae
--- /dev/null
+++ b/src/views/dike/runManage/supervisionInspetion/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <router-view />
+</template>
diff --git a/src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue b/src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue
new file mode 100644
index 0000000..6b207de
--- /dev/null
+++ b/src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue
@@ -0,0 +1,181 @@
+<template>
+  <div class="body slider-right">
+    <div class="top-title">监督检测办法管理</div>
+    <div class="method-details-page">
+      <div class="flex justify-between items-center">
+        <el-upload
+          v-if="$route.query.mode != 'preview'"
+          action="#"
+          class="avatar-uploader"
+          :http-request="handleUpload"
+          :auto-upload="true"
+          :before-upload="beforeUpload"
+          :showFileList="false"
+          accept=".PDF"
+          :limit="1"
+        >
+          <el-button type="primary">{{
+            detailsData.superviseCheckWay ? "重新上传" : "上传文件"
+          }}</el-button>
+        </el-upload>
+        <div v-else>&nbsp;</div>
+        <span v-if="editName && $route.query.mode === 'edit'">
+          <el-input
+            class="input"
+            v-model="detailsData.name"
+            :maxlength="50"
+          ></el-input>
+          <i
+            class="el-icon-check cursor-pointer ml-4 font-16"
+            style="color: #409eff"
+            @click="handleSaveName"
+          ></i>
+        </span>
+        <span v-else
+          >{{ detailsData.name }}
+          <i
+            v-if="$route.query.mode === 'edit'"
+            class="el-icon-edit cursor-pointer ml-4 font-16"
+            style="color: #409eff"
+            @click="editName = !editName"
+          ></i
+        ></span>
+        <el-button @click="$router.go(-1)">返回</el-button>
+      </div>
+      <div class="pdf-preview">
+        <object
+          v-if="detailsData.superviseCheckWay"
+          class="pdf-box"
+          :data="detailsData.superviseCheckWay"
+          type="application/pdf"
+        ></object>
+        <div v-else style="color: #333">暂无文件，请上传</div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { uploadFileData } from "@/api/system/upload";
+import { getSuperviseWayDetails, postSuperviseWayData } from "@/api/dike";
+
+export default {
+  data() {
+    return {
+      detailsData: {
+        superviseCheckWay: "",
+        status: "",
+        name: "",
+      },
+      editName: false,
+    };
+  },
+  created() {
+    if (this.$route.query.id) {
+      this.initData();
+    }
+  },
+  methods: {
+    initData() {
+      getSuperviseWayDetails(this.$route.query.id).then((res) => {
+        if (res.data) {
+          this.$set(this.detailsData, "name", res.data.name);
+          this.$set(
+            this.detailsData,
+            "superviseCheckWay",
+            res.data.superviseCheckWay
+          );
+          this.$set(this.detailsData, "status", res.data.status);
+        }
+      });
+    },
+    handleSaveName() {
+      if (!this.detailsData.name) {
+        this.$message.warning("请输入名称");
+        return;
+      }
+      postSuperviseWayData({
+        id: this.$route.query.id || null,
+        name: this.detailsData.name,
+        superviseCheckWay: this.detailsData.superviseCheckWay,
+        status: this.detailsData.status ? this.detailsData.status : null,
+      })
+        .then((res) => {
+          this.editName = false;
+          this.$message.success("修改成功");
+        })
+        .catch(() => {
+          this.$message.error("修改失败");
+        });
+    },
+    // 上传前
+    beforeUpload(e) {
+      console.log("上传前e >>>>>  ", e);
+      if (e.type.indexOf("pdf") < 0) {
+        this.$message.warning("只允许上传pdf");
+        return false;
+      }
+      return true;
+    },
+    // 文件上传
+    async handleUpload(e) {
+      try {
+        const { file } = e;
+        let formData = new FormData();
+        formData.append("file", file);
+        const res = await uploadFileData(formData);
+        if (res?.url) {
+          let data = {
+            id: this.$route.query.id || null,
+            name: file.name.split(".")[0],
+            superviseCheckWay: res.url,
+            status: this.detailsData.status ? this.detailsData.status : null,
+          };
+          const res2 = await postSuperviseWayData(data);
+          if (res2) {
+            this.detailsData.superviseCheckWay = res.url;
+            this.detailsData.name = file.name.split(".")[0];
+            this.$message.success("新增成功");
+          }
+        } else {
+          this.$message.error("新增失败");
+        }
+      } catch (error) {
+        this.$message.error("新增失败");
+      }
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.body {
+  width: 100%;
+  min-height: calc(100vh - 56px);
+  padding-left: 24px;
+
+  .top-title {
+    height: 40px;
+    background-color: white;
+    display: flex;
+    padding-left: 16px;
+    align-items: center;
+    font-weight: 600;
+  }
+  .method-details-page {
+    margin-top: 20px;
+    background-color: #fff;
+    padding: 20px;
+    height: calc(100% - 56px);
+    .pdf-preview {
+      height: calc(100% - 50px);
+      margin-top: 20px;
+      .pdf-box {
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+  .input {
+    width: 200px;
+  }
+}
+</style>
diff --git a/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue b/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue
new file mode 100644
index 0000000..4f86384
--- /dev/null
+++ b/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue
@@ -0,0 +1,293 @@
+<!-- 监督检查办法管理-水闸 -->
+<script>
+import {
+  getSuperviseWayList,
+  postSuperviseWayData,
+  copySuperviseWayData,
+} from "@/api/dike";
+
+export default {
+  name: "InspectionItems",
+  data() {
+    return {
+      tableData: [], // 检查列表
+      pageData: {
+        pageNum: 1, // 当前页
+        pageSize: 10, // 请求数量
+        pageSizes: [10, 20, 50, 100],
+        total: 0, // 总数量
+      },
+    };
+  },
+  watch: {},
+  methods: {
+    // 跳转新增办法页面
+    handleAddMethod() {
+      this.$router.push("methodManageDetails");
+    },
+    // 跳转编辑办法页面
+    handleEditMethod(row) {
+      this.$router.push({
+        path: "methodManageDetails",
+        query: {
+          id: row.id,
+          mode: "edit",
+        },
+      });
+    },
+    // 跳转预览办法页面
+    handlePreviewMethod(row) {
+      this.$router.push({
+        path: "methodManageDetails",
+        query: {
+          id: row.id,
+          mode: "preview",
+        },
+      });
+    },
+    // 导出文件
+    handleExportMethod(row) {
+      if (row.superviseCheckWay && /^http/.test(row.superviseCheckWay)) {
+        fetch(row.superviseCheckWay)
+          .then((response) => response.blob())
+          .then((blob) => {
+            const url = URL.createObjectURL(blob);
+            const a = document.createElement("a");
+            a.href = url;
+            a.setAttribute("download", row.name);
+            document.body.appendChild(a);
+            a.click();
+            document.body.removeChild(a);
+            URL.revokeObjectURL(url);
+          });
+      } else {
+        this.$message("文件路径格式不正确");
+      }
+    },
+    // 复制办法
+    handleCopyMethod(row) {
+      copySuperviseWayData(row.id)
+        .then((res) => {
+          this.$message.success("复制成功");
+          this.getTableData();
+        })
+        .catch(() => {
+          this.$message.error("复制失败");
+        });
+    },
+    // 获取列表数据
+    getTableData() {
+      getSuperviseWayList({
+        data: {
+          timeView: {
+            timeField: "create_time",
+          },
+        },
+        params: {
+          orderBy: "create_time",
+          sort: "desc",
+        },
+        pageSize: this.pageData.pageSize,
+        pageNum: this.pageData.pageNum,
+      }).then((res) => {
+        if (res) {
+          this.tableData = res.records;
+          this.pageData.total = res.total;
+        }
+      });
+    },
+    // 跳转办法配置
+    handleToItemsList(row) {
+      this.$router.push({
+        path: "methodsItemsList",
+        query: {
+          id: row.id,
+        },
+      });
+    },
+    handleChangeStatus(row, status) {
+      postSuperviseWayData({
+        id: row.id,
+        status,
+      })
+        .then((res) => {
+          this.$message.success("修改成功");
+          this.getTableData();
+        })
+        .catch((err) => {
+          this.$message.error("修改失败");
+        });
+    },
+  },
+  created() {},
+  mounted() {
+    // 获取列表数据
+    this.getTableData();
+  },
+};
+</script>
+
+<template>
+  <div class="body slider-right">
+    <div class="top-title">基础信息管理</div>
+    <div class="table-box">
+      <el-button
+        class="search-btn"
+        style="margin-right: 16px; margin-bottom: 8px; float: right"
+        type="success"
+        @click="handleAddMethod()"
+        v-hasPermi="['df:run:sup:meth:add']"
+        >添加</el-button
+      >
+      <el-table class="table" height="640" :data="tableData" border>
+        <el-table-column type="index" align="center" label="序号" width="60" />
+        <el-table-column prop="name" align="center" label="名称" />
+        <el-table-column prop="createTime" align="center" label="发布时间">
+        </el-table-column>
+        <el-table-column prop="updateTime" align="center" label="更新时间" />
+        <el-table-column prop="status" align="center" label="当前状态">
+          <template #default="{ row }">
+            <el-popconfirm
+              title="确定停用吗"
+              v-if="row.status == '0'"
+              @confirm="handleChangeStatus(row, '1')"
+            >
+              <span slot="reference" class="status-start">启用状态</span>
+            </el-popconfirm>
+            <el-popconfirm
+              title="确定启用吗"
+              v-if="row.status == '1'"
+              @confirm="handleChangeStatus(row, '0')"
+            >
+              <span slot="reference" class="status-stop">停用状态</span>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+        <el-table-column prop="address" align="center" label="操作">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="handleEditMethod(scope.row)"
+              v-hasPermi="['df:run:sup:meth:edit']"
+              >编辑</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-hasPermi="['df:run:sup:meth:view']"
+              @click="handlePreviewMethod(scope.row)"
+              >预览</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="handleExportMethod(scope.row)"
+              v-hasPermi="['df:run:sup:meth:down']"
+              >导出</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="handleCopyMethod(scope.row)"
+              v-hasPermi="['df:run:sup:meth:edit']"
+              >复制</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="handleToItemsList(scope.row)"
+              v-hasPermi="['df:run:sup:meth:config']"
+              >配置数据项</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        background
+        class="pagination"
+        style="margin-top: 16px; margin-right: 16px; float: right"
+        :current-page="pageData.pageNum"
+        :page-sizes="pageData.pageSizes"
+        layout="total, prev, pager, next, sizes, jumper"
+        :total="pageData.total"
+        @size-change="getTableData()"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="less">
+.body {
+  width: 100%;
+  min-height: calc(100vh - 56px);
+  padding-left: 24px;
+
+  .top-title {
+    height: 40px;
+    background-color: white;
+    display: flex;
+    padding-left: 16px;
+    align-items: center;
+    font-weight: 600;
+  }
+
+  .table-box {
+    width: 100%;
+    min-height: calc(100vh - 56px - 64px);
+    margin-top: 24px;
+    padding: 16px;
+    background-color: white;
+
+    .top-search {
+      margin-bottom: 8px;
+
+      .search-input {
+        width: 202px;
+        margin-right: 10px;
+      }
+    }
+
+    .table {
+      height: calc(680px - 34px);
+    }
+  }
+
+  .search-btn {
+    margin-left: 10px;
+    background-color: #37b29e;
+    border: none;
+
+    &:hover {
+      background-color: #5ac6b9;
+    }
+
+    &:active {
+      background-color: #2b8070;
+    }
+  }
+
+  .status-start {
+    color: #36b29e;
+    background: #ebf7f5;
+    padding: 2px 4px;
+    border-radius: 2px;
+    cursor: pointer;
+  }
+  .status-stop {
+    color: #f13939;
+    background: #feebeb;
+    padding: 2px 4px;
+    border-radius: 2px;
+    cursor: pointer;
+  }
+}
+
+/deep/.el-input__count {
+  height: 15px;
+  line-height: 15px;
+  margin-right: 10px;
+  margin-bottom: -4px;
+}
+</style>
diff --git a/src/views/dike/runManage/supervisionInspetion/methodsManage/itemsDetails.vue b/src/views/dike/runManage/supervisionInspetion/methodsManage/itemsDetails.vue
new file mode 100644
index 0000000..073eadc
--- /dev/null
+++ b/src/views/dike/runManage/supervisionInspetion/methodsManage/itemsDetails.vue
@@ -0,0 +1,345 @@
+<template>
+  <div class="body slider-right">
+    <div class="top-title">基础信息管理</div>
+    <div class="method-details-page">
+      <div class="flex justify-between items-center">
+        <span v-if="editTitle">
+          <el-input class="input" v-model="itemName"></el-input>
+          <i
+            class="el-icon-check cursor-pointer ml-4 font-16"
+            style="color: #409eff"
+            @click="handleSaveTitle"
+          ></i>
+        </span>
+        <span v-else
+          >{{ itemName }}
+          <i
+            class="el-icon-edit cursor-pointer ml-4 font-16"
+            style="color: #409eff"
+            @click="editTitle = !editTitle"
+          ></i
+        ></span>
+        <el-button @click="$router.go(-1)" size="small">返回</el-button>
+      </div>
+      <div class="flex items-center mt-12">
+        <span class="flex-shrink-0 font-14">内容检索</span>
+        <el-input
+          style="width: 180px; margin-left: 12px"
+          v-model="searchVal"
+          placeholder="请输入"
+        />
+        <el-button
+          type="primary"
+          size="small"
+          class="!ml-10"
+          @click="handleSearch"
+          >检索</el-button
+        >
+      </div>
+      <div class="table-box">
+        <el-row class="item-row">
+          <el-col :span="2">
+            <div class="item-row-content">序号</div>
+          </el-col>
+          <el-col :span="3">
+            <div class="item-row-content">检查项目</div>
+          </el-col>
+          <el-col :span="9">
+            <div class="item-row-content">问题描述</div>
+          </el-col>
+          <el-col :span="8">
+            <div class="item-row-content item-row-content2">
+              <div class="title-1">问题等级</div>
+              <div class="flex w-full title-2">
+                <div class="w-33 justify-center flex items-center pt-4 pb-4">
+                  一般
+                </div>
+                <div class="w-33 justify-center flex items-center pt-4 pb-4">
+                  较重
+                </div>
+                <div class="flex-1 justify-center flex items-center pt-4 pb-4">
+                  严重
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="2">
+            <div class="item-row-content">操作</div>
+          </el-col>
+        </el-row>
+        <el-row
+          class="item-row color-333"
+          v-for="(item, index) in questList"
+          :key="index"
+        >
+          <el-col :span="2">
+            <div class="item-row-content">{{ index + 1 }}</div>
+          </el-col>
+          <el-col :span="3">
+            <div class="item-row-content">{{ item.projectName }}</div>
+          </el-col>
+          <el-col :span="9">
+            <div class="item-row-content">
+              <el-input
+                v-if="item.edit"
+                v-model="item.content"
+                :maxlength="500"
+              ></el-input>
+              <div v-else>{{ item.content }}</div>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <div class="item-row-content item-row-content2">
+              <div class="flex w-full title-2 h-full">
+                <div class="w-33 text-center flex items-center p-10">
+                  <el-input
+                    v-if="item.edit"
+                    v-model="item.sameGrade"
+                    :maxlength="100"
+                  ></el-input>
+                  <div v-else class="word-break">{{ item.sameGrade }}</div>
+                </div>
+                <div class="w-33 text-center flex items-center p-10">
+                  <el-input
+                    v-if="item.edit"
+                    v-model="item.heavyGrade"
+                    :maxlength="100"
+                  ></el-input>
+                  <div v-else class="word-break">{{ item.heavyGrade }}</div>
+                </div>
+                <div class="flex-1 text-center flex items-center p-10">
+                  <el-input
+                    v-if="item.edit"
+                    v-model="item.seriousGrade"
+                    :maxlength="100"
+                  ></el-input>
+                  <div v-else class="word-break">{{ item.seriousGrade }}</div>
+                </div>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="2">
+            <div class="item-row-content">
+              <el-button
+                type="text"
+                v-if="index == questList.length - 1"
+                @click="handleAddNewItem"
+                >添加</el-button
+              >
+              <el-button type="text" v-if="!item.edit" @click="item.edit = true"
+                >修改</el-button
+              >
+              <el-button type="text" v-else @click="handleSaveItem(item)"
+                >保存</el-button
+              >
+              <el-button
+                type="text"
+                v-if="questList.length > 1"
+                @click="handleDelItem(item, index)"
+                >删除</el-button
+              >
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {
+  getSuperviseWayItemDetailsData,
+  getSuperviseWayItemDetailsListData,
+  addSuperviseWayItemDetailsItemData,
+  updateSuperviseWayItemDetailsItemData,
+  updateSuperviseWayItemData,
+  delSuperviseWayItemDetailsItemData,
+} from "@/api/dike";
+export default {
+  data() {
+    return {
+      itemName: "",
+      editTitle: false,
+      searchVal: "",
+      questList: [],
+    };
+  },
+  created() {
+    this.initData();
+  },
+  methods: {
+    initData() {
+      getSuperviseWayItemDetailsData(this.$route.query.id).then((res) => {
+        this.itemName = res?.data?.name;
+        getSuperviseWayItemDetailsListData({
+          projectId: this.$route.query.id,
+          content: this.searchVal,
+        }).then((res2) => {
+          this.questList = res2.data.map((v) => {
+            return {
+              ...v,
+              edit: false,
+            };
+          });
+          if (this.questList.length <= 0) {
+            this.questList.push({
+              projectName: this.itemName,
+              content: "",
+              sameGrade: "",
+              heavyGrade: "",
+              seriousGrade: "",
+              edit: true,
+            });
+          }
+        });
+      });
+    },
+    handleAddNewItem() {
+      this.questList.push({
+        projectName: this.itemName,
+        content: "",
+        sameGrade: "",
+        heavyGrade: "",
+        seriousGrade: "",
+        edit: true,
+      });
+    },
+    handleSaveItem(item) {
+      if (!item.content) {
+        this.$message.warning("请填写问题描述");
+        return;
+      }
+      if (item.id) {
+        updateSuperviseWayItemDetailsItemData({
+          ...item,
+          projectName: this.itemName,
+          projectId: this.$route.query.id,
+        })
+          .then((res) => {
+            item.edit = false;
+          })
+          .catch(() => {
+            this.$message.error("修改失败");
+          });
+      } else {
+        addSuperviseWayItemDetailsItemData({
+          ...item,
+          projectName: this.itemName,
+          projectId: this.$route.query.id,
+        })
+          .then((res) => {
+            if (res.data) {
+              item.id = res.data.id;
+            }
+            item.edit = false;
+          })
+          .catch(() => {
+            this.$message.error("保存失败");
+          });
+      }
+    },
+    // 删除问题项
+    handleDelItem(item) {
+      if (!item.id) {
+        this.questList.splice(index, 1);
+      } else {
+        this.$confirm("是否删除该问题项", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            delSuperviseWayItemDetailsItemData(item.id).then((res) => {
+              this.questList = this.questList.filter((v) => v.id !== item.id);
+            });
+          })
+          .catch(() => {});
+      }
+    },
+    handleSaveTitle() {
+      updateSuperviseWayItemData({
+        id: this.$route.query.id,
+        name: this.itemName,
+      }).then((res) => {
+        this.$message.success("修改成功");
+        this.editTitle = !this.editTitle;
+        this.questList.forEach((item) => {
+          item.projectName = this.itemName;
+        });
+      });
+    },
+    handleSearch() {
+      this.initData();
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.body {
+  width: 100%;
+  min-height: calc(100vh - 56px);
+  padding-left: 24px;
+
+  .top-title {
+    height: 40px;
+    background-color: white;
+    display: flex;
+    padding-left: 16px;
+    align-items: center;
+    font-weight: 600;
+  }
+  .method-details-page {
+    margin-top: 20px;
+    background-color: #fff;
+    padding: 20px;
+    height: calc(100% - 16px);
+    .table-box {
+      border: 1px solid #ccc;
+      border-radius: 4px;
+      margin-top: 12px;
+      .item-row {
+        display: flex;
+        .el-col {
+          box-sizing: border-box;
+        }
+        .item-row-content {
+          padding: 10px;
+          border: 1px solid #ccc;
+          height: 100%;
+          display: flex;
+          align-items: center;
+          flex-wrap: wrap;
+        }
+        .item-row-content2 {
+          padding: 0;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          .title-1 {
+            width: 100%;
+            padding: 4px;
+            text-align: center;
+            border-bottom: 2px solid #ccc;
+          }
+          .title-2 {
+            // border-top: 1px solid #ccc;
+            & > *:nth-of-type(2) {
+              border-left: 2px solid #ccc;
+              border-right: 2px solid #ccc;
+            }
+          }
+        }
+      }
+    }
+  }
+  .input {
+    width: 200px;
+  }
+  .w-33 {
+    width: 33%;
+  }
+
+  .color-333 {
+    color: #333;
+  }
+}
+</style>
diff --git a/src/views/dike/runManage/supervisionInspetion/methodsManage/itemsList.vue b/src/views/dike/runManage/supervisionInspetion/methodsManage/itemsList.vue
new file mode 100644
index 0000000..f124bda
--- /dev/null
+++ b/src/views/dike/runManage/supervisionInspetion/methodsManage/itemsList.vue
@@ -0,0 +1,218 @@
+<template>
+  <div class="body slider-right">
+    <div class="top-title">基础信息管理</div>
+    <div class="items-list-page">
+      <div class="pl-20 pr-20 pt-20 flex justify-between">
+        <el-button type="primary" @click="handleAddNew">新增项目</el-button>
+        <el-button @click="$router.go(-1)">返回</el-button>
+      </div>
+      <div class="items-list-box">
+        <div
+          v-for="item in listData"
+          :key="item.id"
+          class="items-list-item"
+          @click="handleToItemsSetting(item)"
+        >
+          <div class="font-14 font-bold">{{ item.name }}</div>
+          <div class="font-12 mt-18">更新时间：{{ item.updateTime }}</div>
+          <div class="font-12 mt-6">
+            最后更新: {{ getCreator(item.updateUid) }}
+          </div>
+          <i
+            class="el-icon-error font-14 del-btn"
+            @click.stop="handleDel(item)"
+          ></i>
+        </div>
+        <div
+          v-if="!listData || !listData.length"
+          style="color: #333"
+          class="text-center pt-30"
+        >
+          -暂无数据-
+        </div>
+      </div>
+    </div>
+
+    <!-- 弹窗 -->
+    <el-dialog
+      title="新增项目"
+      @close="handleClose"
+      :visible.sync="showAddDialog"
+      :close-on-click-modal="false"
+      width="640px"
+    >
+      <el-form
+        :model="ruleForm"
+        :rules="rules"
+        ref="ruleForm"
+        label-width="60px"
+        class=""
+      >
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="ruleForm.name" :maxlength="100"></el-input>
+        </el-form-item>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="handleClose()">取 消</el-button>
+        <el-button size="mini" type="primary" @click="submitForm()"
+          >保存</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  addSuperviseWayItemData,
+  getSuperviseWayItemListData,
+  delSuperviseWayItemDetailsData,
+} from "@/api/dike";
+import { listUser } from "@/api/system/user";
+export default {
+  data() {
+    return {
+      showAddDialog: false,
+      listData: [],
+      personnelList: [],
+      ruleForm: {
+        name: "",
+      },
+      rules: {
+        name: [{ required: true, message: "请输入项目名称", trigger: "blur" }],
+      },
+    };
+  },
+  created() {
+    this.getUser();
+    this.initData();
+  },
+  methods: {
+    initData() {
+      getSuperviseWayItemListData(this.$route.query.id).then((res) => {
+        this.listData = res.data || [];
+      });
+    },
+    getUser() {
+      listUser({
+        data: {
+          timeView: {
+            timeField: "create_time",
+          },
+        },
+        pageSize: 50,
+        pageNum: 1,
+      }).then((res) => {
+        this.personnelList = res.records;
+      });
+    },
+    getCreator(id) {
+      const creator = this.personnelList.find((item) => item.id === id);
+      return creator ? creator.nickName : "";
+    },
+    handleAddNew() {
+      this.showAddDialog = true;
+    },
+    handleClose() {
+      this.$refs.ruleForm.resetFields();
+      this.showAddDialog = false;
+    },
+    submitForm() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          addSuperviseWayItemData({
+            wayId: this.$route.query.id,
+            name: this.ruleForm.name,
+          }).then((res) => {
+            this.listData.push(res.data);
+            this.$refs.ruleForm.resetFields();
+            this.showAddDialog = false;
+          });
+        }
+      });
+    },
+    handleDel(row) {
+      // 二次确认
+      this.$confirm("此操作将永久删除该项目, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delSuperviseWayItemDetailsData(row.id).then((res) => {
+            this.initData();
+          });
+        })
+        .catch(() => {});
+    },
+    handleToItemsSetting(row) {
+      this.$router.push({
+        path: "methodsItemsDetails",
+        query: {
+          id: row.id,
+        },
+      });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.body {
+  width: 100%;
+  min-height: calc(100vh - 56px);
+  padding-left: 24px;
+
+  .top-title {
+    height: 40px;
+    background-color: white;
+    display: flex;
+    padding-left: 16px;
+    align-items: center;
+    font-weight: 600;
+  }
+  .items-list-page {
+    margin-top: 20px;
+    background-color: #fff;
+    height: calc(100% - 56px);
+  }
+  .input {
+    width: 200px;
+  }
+  .items-list-box {
+    display: grid;
+    padding: 16px 20px 24px;
+    overflow-y: auto;
+    transition: all 0.5s;
+    grid-template-columns: repeat(auto-fill, 240px);
+    grid-template-rows: repeat(auto-fill, 160px);
+    gap: 16px;
+    .items-list-item {
+      position: relative;
+      width: 240px;
+      height: 120px;
+      padding: 20px;
+      box-sizing: border-box;
+      border: 1px solid #eee;
+      border-radius: 10px;
+      cursor: pointer;
+      &:hover {
+        box-shadow: 0 0 10px #eee;
+        .del-btn {
+          display: block;
+        }
+      }
+
+      .del-btn {
+        display: none;
+        position: absolute;
+        font-size: 24px;
+        z-index: 1;
+        right: -8px;
+        top: -8px;
+        font-weight: 600;
+        color: #999;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/dike/runManage/supervisionInspetion/projectManage/index.vue b/src/views/dike/runManage/supervisionInspetion/projectManage/index.vue
new file mode 100644
index 0000000..04997a4
--- /dev/null
+++ b/src/views/dike/runManage/supervisionInspetion/projectManage/index.vue
@@ -0,0 +1,253 @@
+<!-- 监督检查工程管理 -->
+<script>
+import dayjs from "dayjs";
+import {
+  delSuperviseWayItemData,
+  getSuperviseWayTaskListData,
+} from "@/api/dike";
+export default {
+  name: "projectManage",
+  data() {
+    return {
+      searchTaskName: "",
+      searchManageName: "",
+      searchProjectName: "",
+      paramsData: {
+        name: "",
+        type: null,
+        dikeName: "",
+        selectLevel: "",
+        selectType: "",
+      },
+      tableData: [], // 检查列表
+      pageData: {
+        pageNum: 1, // 当前页
+        pageSize: 10, // 请求数量
+        pageSizes: [10, 20, 50, 100],
+        total: 0, // 总数量
+      },
+    };
+  },
+  methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
+    // 查看
+    handleCheck(row) {
+      this.$router.push({
+        path: "supervisionProjectReport",
+        query: {
+          type: "preview",
+          wayId: row.wayId,
+          id: row.id,
+        },
+      });
+    },
+    // 跳转编辑页面
+    handleEdit(row) {
+      this.$router.push({
+        path: "supervisionProjectReport",
+        query: {
+          type: "edit",
+          wayId: row.wayId,
+          id: row.id,
+        },
+      });
+    },
+    // 跳转报告页面
+    handleCheckReport(row) {
+      this.$router.push({
+        path: "supervisionProjectReportPage",
+        query: {
+          wayId: row.wayId,
+          id: row.id,
+        },
+      });
+    },
+    // 计算doneTime距离此刻剩余多少天
+    calcDeadLine(time) {
+      if (!time) return "-";
+      let days = dayjs(time).diff(dayjs(), "day");
+      let seconds = 0;
+      if (days <= 0) {
+        seconds = dayjs(time).diff(dayjs(), "second");
+      }
+      return days > 0
+        ? days
+        : seconds > 0
+        ? 1
+        : dayjs(time).diff(dayjs(), "day") - 1;
+    },
+    // 获取列表数据
+    getTableData() {
+      getSuperviseWayTaskListData({
+        data: {
+          name: this.searchTaskName || null,
+          dikeName: this.searchProjectName || null,
+          engineeringManagementUnit: this.searchManageName || null,
+        },
+        pageSize: this.pageData.pageSize,
+        pageNum: this.pageData.pageNum,
+      }).then((res) => {
+        if (res) {
+          this.tableData = res.records.map((item) => {
+            if (item.state != "1") {
+              item.deadTime = this.calcDeadLine(item.doneTime);
+            }
+            return item;
+          });
+          this.pageData.total = res.total;
+        }
+      });
+    },
+    // 重置搜索
+    resetSearch() {
+      this.searchTaskName = null;
+      this.searchManageName = null;
+      this.searchProjectName = null;
+      this.getTableData();
+    },
+  },
+  mounted() {
+    // 获取列表数据
+    this.getTableData();
+  },
+};
+</script>
+
+<template>
+  <div class="body slider-right">
+    <div class="top-title">基础信息管理</div>
+    <div class="table-box">
+      <span>任务名称：</span>
+      <el-input
+        class="search-input ml-10"
+        v-model="searchTaskName"
+        placeholder="请输入名称"
+      />
+      <span class="ml-10">管理单位：</span>
+      <el-input
+        class="search-input ml-10"
+        v-model="searchManageName"
+        placeholder="请输入"
+      />
+      <span class="ml-10">工程对象：</span>
+      <el-input
+        class="search-input ml-10"
+        v-model="searchProjectName"
+        placeholder="请输入"
+      />
+      <el-button class="search-btn" type="success" @click="getTableData()"
+        >搜索</el-button
+      >
+      <el-button class="search-btn" @click="resetSearch">重置</el-button>
+      <el-table class="table mt-16" height="640" :data="tableData" border>
+        <el-table-column type="index" align="center" label="序号" width="60" />
+        <el-table-column prop="name" align="center" label="检查任务" />
+        <el-table-column
+          prop="engineeringManagementUnit"
+          align="center"
+          label="管理单位"
+        />
+        <el-table-column prop="dikeName" align="center" label="工程对象">
+        </el-table-column>
+        <el-table-column prop="doneTime" align="center" label="完成时间">
+          <template slot-scope="scope">
+            <span v-if="scope.row.state == '1'">完成</span>
+            <span
+              v-else
+              :class="{
+                'warning-time':
+                  scope.row.deadTime != '-' && scope.row.deadTime <= 1,
+              }"
+              >{{ scope.row.deadTime }}天</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column prop="operate" align="center" label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="handleCheck(scope.row)"
+              >查看</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.state != '1'"
+              @click="handleEdit(scope.row)"
+              >巡查</el-button
+            >
+            <el-button
+              v-else
+              type="text"
+              size="small"
+              @click="handleCheckReport(scope.row)"
+              >报告</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        background
+        class="pagination"
+        style="margin-top: 16px; margin-right: 16px; float: right"
+        :current-page="pageData.pageNum"
+        :page-sizes="pageData.pageSizes"
+        layout="total, prev, pager, next, sizes, jumper"
+        :total="pageData.total"
+        @size-change="(e) => handlePageSizeChange(e)"
+        @current-change="(e) => handleCurrentPageChange(e)"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="less">
+.body {
+  width: 100%;
+  min-height: calc(100vh - 56px);
+  padding-left: 24px;
+
+  .top-title {
+    height: 40px;
+    background-color: white;
+    display: flex;
+    padding-left: 16px;
+    align-items: center;
+    font-weight: 600;
+  }
+
+  .table-box {
+    width: 100%;
+    min-height: calc(100vh - 56px - 64px);
+    margin-top: 24px;
+    padding: 16px;
+    background-color: white;
+
+    .top-search {
+      margin-bottom: 8px;
+    }
+
+    .table {
+      height: calc(680px - 34px);
+    }
+  }
+  .search-input {
+    width: 202px;
+    margin-right: 10px;
+  }
+
+  .search-btn {
+    margin-left: 10px;
+  }
+
+  .warning-time {
+    color: red;
+  }
+}
+</style>
diff --git a/src/views/dike/runManage/supervisionInspetion/projectManage/projectReport.vue b/src/views/dike/runManage/supervisionInspetion/projectManage/projectReport.vue
new file mode 100644
index 0000000..8690f0e
--- /dev/null
+++ b/src/views/dike/runManage/supervisionInspetion/projectManage/projectReport.vue
@@ -0,0 +1,548 @@
+<!-- 监督检查工程管理 -->
+<script>
+import { cloneDeep } from "lodash";
+import { uploadFileData } from "@/api/system/upload";
+import { listUser } from "@/api/management";
+import {
+  getEnableSuperviseWayData,
+  getSuperviseEngineeringReportDetailsData,
+  addSuperviseEngineeringReportData,
+} from "@/api/dike";
+export default {
+  name: "projectReport",
+  data() {
+    return {
+      activeName: "",
+      currentItem: null,
+      problemList: [],
+      personnelList: [],
+      formData: {
+        patrolName: "",
+        patrolUid: "",
+        problemList: [],
+        state: "",
+        taskId: "",
+        weather: "",
+      },
+    };
+  },
+  computed: {
+    // 进度条
+    calcStep() {
+      if (this.problemList.length) {
+        let sum = this.problemList.reduce((prev, cur) => {
+          return prev + cur.children.length;
+        }, 0);
+        let hasDoneLevel = this.problemList.reduce((prev, cur) => {
+          return (
+            prev +
+            cur.children.reduce((prev2, cur2) => {
+              return prev2 + (cur2.level ? 1 : 0);
+            }, 0)
+          );
+        }, 0);
+        console.log("hasDoneLevel >>>>>  ", hasDoneLevel);
+        return Math.floor((hasDoneLevel / sum) * 100);
+      } else {
+        return 0;
+      }
+    },
+    isDisabled() {
+      return (
+        this.formData.state === "1" || this.$route.query.type === "preview"
+      );
+    },
+    // 巡查人员
+    computedPatrolUid: {
+      get() {
+        return this.formData.patrolUid?.split(",").filter((v) => v) || [];
+      },
+      set(val) {
+        this.formData.patrolUid = val?.join(",") || "";
+        this.formData.patrolName = this.personnelList
+          .filter((v) => val.includes(v.id))
+          .map((v) => v.nickName)
+          .join(",");
+      },
+    },
+  },
+  methods: {
+    // 搜索用户
+    searchUser(e = null) {
+      listUser({
+        data: {
+          timeView: {
+            timeField: "create_time",
+          },
+        },
+        cv: {
+          name: "nickName",
+          type: "like",
+          value: e,
+        },
+        pageSize: 100,
+        pageNum: 1,
+      }).then((res) => {
+        this.personnelList = res.records;
+      });
+    },
+    async initData() {
+      const enableData = await getEnableSuperviseWayData({
+        wayId: this.$route.query.wayId,
+      });
+      if (enableData?.data?.itemList?.length) {
+        // 已完成提交状态的数据需要从详情中展示对应的部位
+        let newProblemList = [];
+        let list = [];
+        enableData.data.itemList.forEach((item, index) => {
+          if (index === 0) {
+            list.push({
+              id: item.id,
+              projectId: item.projectId,
+              projectName: item.projectName,
+
+              children: [
+                {
+                  ...item,
+                  projectItemId: item.id,
+                  problemDescribe: "",
+                  siteSituationRecords: "",
+                  siteSituationRecordsArr: [],
+                  level: null,
+                },
+              ],
+            });
+          } else {
+            let exitItem = list.find((v) => v.projectId === item.projectId);
+            if (!exitItem) {
+              list.push({
+                id: item.id,
+                projectId: item.projectId,
+                projectName: item.projectName,
+
+                children: [
+                  {
+                    ...item,
+                    projectItemId: item.id,
+                    problemDescribe: "",
+                    siteSituationRecords: "",
+                    siteSituationRecordsArr: [],
+                    level: null,
+                  },
+                ],
+              });
+            } else {
+              exitItem.children.push({
+                ...item,
+                projectItemId: item.id,
+                problemDescribe: "",
+                siteSituationRecords: "",
+                siteSituationRecordsArr: [],
+                level: null,
+              });
+            }
+          }
+        });
+        this.activeName = list[0]?.projectId || "";
+        const detailRes = await getSuperviseEngineeringReportDetailsData(
+          this.$route.query.id
+        );
+        if (detailRes?.data && list.length) {
+          const { data } = detailRes;
+          this.formData.patrolName = data.patrolName;
+          this.formData.patrolUid = data.patrolUid;
+          this.formData.state = data.state;
+          this.formData.taskId = data.taskId;
+          this.formData.weather = data.weather;
+          this.formData.problemList = [];
+          const { problemList } = data;
+          list.forEach((item) => {
+            let exitItem = problemList?.find(
+              (v) => v.projectId === item.projectId
+            );
+            if (exitItem) {
+              item.newId = item.id === exitItem.id ? null : exitItem.id;
+
+              let itemTemp = cloneDeep(item);
+              itemTemp.children = [];
+              item.children.forEach((item2) => {
+                let exitItem2 = problemList.find(
+                  (v) => v.projectItemId === item2.id
+                );
+                if (exitItem2) {
+                  itemTemp.children.push(exitItem2);
+                  item2.projectName = exitItem2.projectName;
+                  item2.level = exitItem2.level;
+                  item2.newId = item2.id === exitItem2.id ? null : exitItem2.id;
+                  item2.problemDescribe = exitItem2.problemDescribe;
+                  item2.siteSituationRecords = exitItem2.siteSituationRecords;
+                  item2.siteSituationRecordsArr = exitItem2.siteSituationRecords
+                    ? exitItem2.siteSituationRecords.split(",")
+                    : [];
+                  exitItem2.siteSituationRecordsArr =
+                    exitItem2.siteSituationRecords
+                      ? exitItem2.siteSituationRecords.split(",")
+                      : [];
+                }
+              });
+              if (data.state === "1") {
+                newProblemList.push(itemTemp);
+              }
+            }
+          });
+          this.problemList = data.state === "1" ? newProblemList : list;
+        }
+      }
+    },
+    // 选中某个项目
+    handleClickItem(item) {
+      this.currentItem = item;
+    },
+    // 上传前
+    beforeUpload(e) {
+      console.log("beforeUpload >>>>>  ", e);
+      if (this.currentItem.siteSituationRecordsArr?.length >= 99) {
+        this.$message.warning("最多上传99张图片");
+        return false;
+      }
+      return true;
+    },
+    handleUpload(e) {
+      const { file } = e;
+      let fData = new FormData();
+      fData.append("file", file);
+      uploadFileData(fData)
+        .then((res) => {
+          this.currentItem.siteSituationRecordsArr.push(res.url);
+        })
+        .catch((err) => {
+          console.log("err >>>>>  ", err);
+        });
+    },
+    // 处理提交数据
+    dealFormData() {
+      this.formData.taskId = this.$route.query.id;
+      this.problemList.forEach((item) => {
+        if (item.children.length) {
+          item.children.forEach((item2) => {
+            let problemItem = {
+              id: item2.newId || null,
+              level: item2.level,
+              problemDescribe: item2.problemDescribe,
+              siteSituationRecords:
+                item2.siteSituationRecordsArr?.join(",") || "",
+              projectId: item2.projectId,
+              projectItemId: item2.projectItemId,
+            };
+            this.formData.problemList.push(problemItem);
+          });
+        }
+      });
+      return cloneDeep(this.formData);
+    },
+    handleSave() {
+      let data = this.dealFormData();
+      data.state = "0";
+      addSuperviseEngineeringReportData(data).then((res) => {
+        this.$message({
+          type: "success",
+          message: "保存成功",
+        });
+      });
+    },
+    handleSubmit() {
+      if (this.calcStep < 100) {
+        this.$message.warning("检查进度未达到100%，请检查");
+        return;
+      }
+      if (!this.formData.patrolUid) {
+        this.$message.warning("请选择巡查人员");
+        return;
+      }
+      // 二次确认提交
+      this.$confirm("是否确认提交?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let data = this.dealFormData();
+          data.state = "1";
+          addSuperviseEngineeringReportData(data).then((res) => {
+            this.$message({
+              type: "success",
+              message: "提交成功",
+            });
+            this.formData.state = "1";
+            this.$router.go(-1);
+          });
+        })
+        .catch(() => {});
+    },
+  },
+  created() {
+    this.searchUser();
+    this.initData();
+  },
+  mounted() {},
+};
+</script>
+
+<template>
+  <div class="body slider-right">
+    <div class="top-title">工程问题上报</div>
+    <div class="table-box">
+      <div class="step-box">
+        <div
+          class="bar"
+          :style="{
+            left: `-${100 - calcStep}%`,
+            backgroundColor: `rgb(${255 - (255 * calcStep) / 100},${
+              0 + (255 * calcStep) / 100
+            },0)`,
+          }"
+        ></div>
+        <div style="position: relative; z-index: 1" class="pl-4 font-14">
+          检查进度 {{ calcStep }}%
+        </div>
+      </div>
+      <div class="flex items-center mb-12">
+        <div>巡查人员</div>
+        <el-select
+          :disabled="isDisabled"
+          style="width: 240px"
+          class="ml-4"
+          v-model="computedPatrolUid"
+          multiple
+          filterable
+          remote
+          :remote-method="searchUser"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in personnelList"
+            :key="item.id"
+            :label="item.nickName"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+        <div class="ml-24">天气</div>
+        <el-input
+          :disabled="isDisabled"
+          class="ml-4"
+          style="width: 240px"
+          :maxlength="100"
+          v-model="formData.weather"
+          placeholder="请输入"
+        />
+      </div>
+      <template v-if="problemList.length">
+        <el-tabs v-model="activeName" type="card">
+          <el-tab-pane
+            v-for="item in problemList"
+            :key="item.id"
+            :label="item.projectName"
+            :name="item.projectId"
+            class="question-box"
+          >
+            <div
+              class="question-row w-full"
+              v-for="item2 in item.children"
+              :key="item2.id"
+            >
+              <div class="flex">
+                <div class="question-col flex-shrink-0">问题</div>
+                <div class="question-col flex-1">
+                  {{ item2.content }}
+                  <el-tooltip class="tooltip" effect="dark" placement="left">
+                    <div slot="content">
+                      <div>一般：{{ item2.sameGrade || " " }}；</div>
+                      <div>较重：{{ item2.heavyGrade || " " }}；</div>
+                      <div>严重：{{ item2.seriousGrade || " " }}；</div>
+                    </div>
+                    <i
+                      class="el-icon-warning font-20"
+                      style="color: #e6a23c"
+                    ></i>
+                  </el-tooltip>
+                </div>
+              </div>
+              <div class="question-select">
+                <el-button
+                  :disabled="isDisabled"
+                  :type="item2.level === '0' ? 'primary' : ''"
+                  @click="item2.level = '0'"
+                  >无</el-button
+                >
+                <el-button
+                  :disabled="isDisabled"
+                  :type="item2.level === '1' ? 'primary' : ''"
+                  @click="item2.level = '1'"
+                  >一般</el-button
+                >
+                <el-button
+                  :disabled="isDisabled"
+                  :type="item2.level === '2' ? 'primary' : ''"
+                  @click="item2.level = '2'"
+                  >较重</el-button
+                >
+                <el-button
+                  :disabled="isDisabled"
+                  :type="item2.level === '3' ? 'primary' : ''"
+                  @click="item2.level = '3'"
+                  >严重</el-button
+                >
+              </div>
+              <div
+                class="question-row w-full"
+                v-if="['2', '3'].includes(item2.level)"
+              >
+                <div class="question-col flex-shrink-0">描述</div>
+                <div class="question-col flex-1">
+                  <el-input
+                    type="textarea"
+                    v-model="item2.problemDescribe"
+                    :rows="4"
+                    :maxlength="500"
+                    :disabled="isDisabled"
+                    placeholder="请输入内容"
+                  />
+                </div>
+              </div>
+              <div
+                class="question-row w-full"
+                v-if="['2', '3'].includes(item2.level)"
+              >
+                <div class="question-col flex-shrink-0">照片</div>
+                <div class="question-col flex-1">
+                  <div class="flex flex-wrap">
+                    <div
+                      class="w-100 h-100 mr-12 mb-12"
+                      v-for="(url, urlIndex) in item2.siteSituationRecordsArr"
+                      :key="urlIndex"
+                    >
+                      <el-image
+                        style="width: 200px; min-height: 100px; height: auto"
+                        :src="url"
+                        :preview-src-list="[url]"
+                      >
+                        <template #error>
+                          <div
+                            class="w-full flex justify-center items-center"
+                            style="
+                              height: 100px;
+                              border: 1px solid #f0f0f0;
+                              font-style: italic;
+                              color: #ccc;
+                            "
+                          >
+                            图片加载失败
+                          </div>
+                        </template>
+                      </el-image>
+                    </div>
+                  </div>
+                  <el-upload
+                    action="#"
+                    :disabled="isDisabled"
+                    :http-request="handleUpload"
+                    :auto-upload="true"
+                    :before-upload="beforeUpload"
+                    :showFileList="false"
+                    accept=".jpg,.png,.jpeg"
+                    :limit="99"
+                  >
+                    <el-button
+                      type="primary"
+                      @click="handleClickItem(item2)"
+                      :disabled="isDisabled"
+                      >上传</el-button
+                    >
+                  </el-upload>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+        <div class="mt-30 flex justify-end" v-if="!isDisabled">
+          <el-button class="mr-12" @click="handleSave">保存</el-button>
+          <el-button type="primary" @click="handleSubmit">提交</el-button>
+        </div>
+      </template>
+      <div v-else class="font-14 pt-20">-暂无数据-</div>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="less">
+.body {
+  width: 100%;
+  min-height: calc(100vh - 56px);
+  padding-left: 24px;
+
+  .top-title {
+    height: 40px;
+    background-color: white;
+    display: flex;
+    padding-left: 16px;
+    align-items: center;
+    font-weight: 600;
+  }
+
+  .table-box {
+    width: 100%;
+    height: calc(100vh - 56px - 64px);
+    margin-top: 24px;
+    padding: 16px;
+    background-color: white;
+    overflow: auto;
+    .step-box {
+      position: relative;
+      height: 32px;
+      width: 120px;
+      background-color: #f0f0f0;
+      border: 1px solid #999;
+      border-radius: 2px;
+      float: right;
+      display: flex;
+      align-items: center;
+      overflow: hidden;
+      .bar {
+        position: absolute;
+        top: 0;
+        left: -50%;
+        z-index: 0;
+        height: 100%;
+        width: 100%;
+        background-color: #1890ff;
+        border-radius: 2px;
+        transition: 0.5s all;
+      }
+    }
+
+    .question-box {
+      border: 1px solid #f0f0f0;
+      .question-row {
+        .question-col {
+          position: relative;
+          padding: 10px;
+          border-bottom: 1px solid #f0f0f0;
+          &:not(:last-child) {
+            border-right: 1px solid #f0f0f0;
+          }
+          .tooltip {
+            position: absolute;
+            top: 2px;
+            right: 2px;
+          }
+        }
+        .question-select {
+          padding: 10px;
+          border-bottom: 1px solid #f0f0f0;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/dike/runManage/supervisionInspetion/projectManage/projectReportPage.vue b/src/views/dike/runManage/supervisionInspetion/projectManage/projectReportPage.vue
new file mode 100644
index 0000000..18dac2a
--- /dev/null
+++ b/src/views/dike/runManage/supervisionInspetion/projectManage/projectReportPage.vue
@@ -0,0 +1,382 @@
+<template>
+  <div class="report-page">
+    <div class="sticky-top flex justify-between">
+      <el-button v-hasPermi="['df:run:sup:project:down']" type="primary" @click="handleDownPdf">下载报告</el-button>
+      <el-button @click="$router.go(-1)">返回</el-button>
+    </div>
+    <div class="flex justify-center mt-16">
+      <div class="p-20" ref="pdfRef">
+        <div class="table-box border-l-t font-14">
+          <div class="text-center font-16 border-b-r p-10">
+            {{ formData.name }}
+          </div>
+          <div class="flex border-l-t w-full">
+            <div class="flex flex-1">
+              <div class="label border-b-r p-10 w-100">巡查时间</div>
+              <div class="value border-b-r flex-1 p-10">
+                {{ formData.showStartTime }} - {{ formData.showDoneTime }}
+              </div>
+            </div>
+            <div class="flex flex-1">
+              <div class="label border-b-r p-10 w-100">天气</div>
+              <div class="value border-b-r flex-1 p-10">
+                {{ formData.weather || "-" }}
+              </div>
+            </div>
+          </div>
+          <div class="flex border-l-t w-full">
+            <div class="flex flex-1">
+              <div class="label border-b-r p-10 w-100">检查人员</div>
+              <div class="value border-b-r flex-1 p-10">
+                {{ formData.patrolName || "-" }}
+              </div>
+            </div>
+          </div>
+          <div class="flex border-l-t w-full">
+            <div class="flex flex-1">
+              <div class="label border-b-r p-10 w-100">管理单位</div>
+              <div class="value border-b-r flex-1 p-10">
+                {{ formData.engineeringManagementUnit }}
+              </div>
+            </div>
+            <div class="flex flex-1">
+              <div class="label border-b-r p-10 w-100">堤防名称</div>
+              <div class="value border-b-r flex-1 p-10">
+                {{ formData.dikeName || "-" }}
+              </div>
+            </div>
+          </div>
+          <div class="flex border-l-t w-full">
+            <div
+              class="flex-1 border-b-r p-10 w-full flex justify-center items-center"
+            >
+              检查内容
+            </div>
+            <div class="w-300">
+              <div class="label border-b-r p-6 text-center">问题等级</div>
+              <div class="flex flex-shrink-0">
+                <div class="flex-1 border-b-r p-6 text-center">无</div>
+                <div class="flex-1 border-b-r p-6 text-center">一般</div>
+                <div class="flex-1 border-b-r p-6 text-center">较重</div>
+                <div class="flex-1 border-b-r p-6 text-center">严重</div>
+              </div>
+            </div>
+          </div>
+          <div class="border-l-t w-full">
+            <div v-for="(item, index) in problemList" :key="index" class="flex">
+              <div class="w-p-10 border-b-r">
+                <div class="flex items-center p-10">{{ item.projectName }}</div>
+              </div>
+              <div class="w-p-90">
+                <div
+                  v-for="(item2, index2) in item.children"
+                  :key="index2 + '0'"
+                  class="w-full flex"
+                >
+                  <div class="flex-1 border-b-r p-10">{{ item2.content }}</div>
+                  <div class="w-300 flex flex-shrink-0">
+                    <div
+                      class="flex-1 border-b-r p-10 flex justify-center items-center"
+                    >
+                      <i class="el-icon-check" v-if="item2.level === '0'"></i>
+                    </div>
+                    <div
+                      class="flex-1 border-b-r p-10 flex justify-center items-center"
+                    >
+                      <i class="el-icon-check" v-if="item2.level === '1'"></i>
+                    </div>
+                    <div
+                      class="flex-1 border-b-r p-10 flex justify-center items-center"
+                    >
+                      <i class="el-icon-check" v-if="item2.level === '2'"></i>
+                    </div>
+                    <div
+                      class="flex-1 border-b-r p-10 flex justify-center items-center"
+                    >
+                      <i class="el-icon-check" v-if="item2.level === '3'"></i>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="border-l-t w-full">
+            <div class="flex">
+              <div class="w-p-10 border-b-r">
+                <div class="flex items-center p-10">问题描述</div>
+              </div>
+              <div class="w-p-90 border-b-r p-10">
+                {{
+                  formData.describeTotal && formData.describeTotal.slice(0, -1)
+                }}
+              </div>
+            </div>
+          </div>
+          <div class="border-l-t w-full">
+            <div class="flex">
+              <div class="w-p-10 border-b-r">
+                <div class="flex items-center p-10">现场记录情况</div>
+              </div>
+              <div class="w-p-90 border-b-r p-10">
+                <el-image
+                  v-for="item in formData.pictures"
+                  :src="item"
+                  :key="item"
+                  style="width: auto"
+                  class="mb-10 mr-10"
+                  :preview-src-list="[item]"
+                >
+                  <template #error>
+                    <div
+                      class="w-full flex justify-center items-center"
+                      style="
+                        height: 100px;
+                        border: 1px solid #f0f0f0;
+                        font-style: italic;
+                        color: #ccc;
+                        padding: 10px;
+                      "
+                    >
+                      图片加载失败
+                    </div>
+                  </template>
+                </el-image>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="w-full" style="height: 200px">
+      <!-- 占位 -->
+    </div>
+  </div>
+</template>
+<script>
+import html2canvas from "html2canvas";
+import { jsPDF } from "jspdf";
+import dayjs from "dayjs";
+import { cloneDeep } from "lodash";
+import {
+  getEnableSuperviseWayData,
+  getSuperviseEngineeringReportDetailsData,
+} from "@/api/dike";
+
+import { Loading } from "element-ui";
+export default {
+  data() {
+    return {
+      problemList: [],
+      formData: {},
+      loadingInstance: null,
+    };
+  },
+  created() {
+    this.initData();
+  },
+  methods: {
+    // 初始化数据
+    async initData() {
+      const enableData = await getEnableSuperviseWayData({
+        wayId: this.$route.query.wayId,
+      });
+      if (enableData) {
+        let newProblemList = [];
+        let list = [];
+        enableData.data?.itemList?.forEach((item, index) => {
+          if (index === 0) {
+            list.push({
+              id: item.id,
+              projectId: item.projectId,
+              projectName: item.projectName,
+              children: [
+                {
+                  ...item,
+                  projectItemId: item.id,
+                  problemDescribe: "",
+                  siteSituationRecords: "",
+                  siteSituationRecordsArr: [],
+                  level: null,
+                },
+              ],
+            });
+          } else {
+            let exitItem = list.find((v) => v.projectId === item.projectId);
+            if (!exitItem) {
+              list.push({
+                id: item.id,
+                projectId: item.projectId,
+                projectName: item.projectName,
+
+                children: [
+                  {
+                    ...item,
+                    projectItemId: item.id,
+                    problemDescribe: "",
+                    siteSituationRecords: "",
+                    siteSituationRecordsArr: [],
+                    level: null,
+                  },
+                ],
+              });
+            } else {
+              exitItem.children.push({
+                ...item,
+                projectItemId: item.id,
+                problemDescribe: "",
+                siteSituationRecords: "",
+                siteSituationRecordsArr: [],
+                level: null,
+              });
+            }
+          }
+        });
+        const detailRes = await getSuperviseEngineeringReportDetailsData(
+          this.$route.query.id
+        );
+        if (detailRes?.data && list.length) {
+          const { data } = detailRes;
+          this.formData = { ...data };
+          if (this.formData.startTime) {
+            this.formData.showStartTime = dayjs(this.formData.startTime).format(
+              "YYYY年MM月DD日"
+            );
+          }
+          if (this.formData.doneTime) {
+            this.formData.showDoneTime = dayjs(this.formData.doneTime).format(
+              "YYYY年MM月DD日"
+            );
+          }
+          this.formData.problemList = [];
+          this.formData.pictures = [];
+          // 产品说描述拼接一起
+          this.formData.describeTotal = "";
+          const { problemList } = data;
+          list.forEach((item) => {
+            let exitItem = problemList.find(
+              (v) => v.projectId === item.projectId
+            );
+            if (exitItem) {
+              let itemTemp = cloneDeep(item);
+              itemTemp.children = [];
+              item.children.forEach((item2) => {
+                let exitItem2 = problemList.find(
+                  (v) => v.projectItemId === item2.id
+                );
+                if (exitItem2) {
+                  if (exitItem2.problemDescribe) {
+                    this.formData.describeTotal +=
+                      exitItem2.problemDescribe + "，";
+                  }
+                  if (exitItem2.siteSituationRecords) {
+                    this.formData.pictures.push(
+                      ...exitItem2.siteSituationRecords.split(",")
+                    );
+                  }
+                  itemTemp.children.push(exitItem2);
+                }
+              });
+              newProblemList.push(itemTemp);
+            }
+          });
+
+          this.problemList = newProblemList;
+        }
+      }
+    },
+    // 下载报告
+    handleDownPdf() {
+      this.loadingInstance = Loading.service({
+        lock: true,
+        text: "正在生成PDF中...",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+      // A4纸pdf宽高
+      const PDF_W = 592.28;
+      const PDF_H = 841.89;
+      html2canvas(this.$refs.pdfRef, {
+        useCORS: true,
+        scale: 2,
+      })
+        .then((canvas) => {
+          const width = canvas.width;
+          const height = canvas.height;
+          const pageHeight = (width / PDF_W) * PDF_H;
+          let leftHeight = height;
+          let position = 0;
+          var pageData = canvas.toDataURL("image/jpeg", 1.0);
+
+          const imgWidth = PDF_W;
+          const imgHeight = (PDF_W / width) * height;
+
+          let pdf = new jsPDF(undefined, "pt", "a4");
+          if (height < pageHeight) {
+            pdf.addImage(pageData, "JPEG", 0, position, imgWidth, imgHeight);
+          } else {
+            while (leftHeight > 0) {
+              pdf.addImage(pageData, "JPEG", 0, position, imgWidth, imgHeight);
+              leftHeight -= pageHeight;
+              position -= PDF_H;
+              if (leftHeight > 0) {
+                pdf.addPage();
+              }
+            }
+          }
+          let save = pdf.save("检查报告.pdf");
+          this.loadingInstance.close();
+        })
+        .catch((e) => {
+          console.log("e >>>>>  ", e);
+          this.loadingInstance.close();
+        });
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.report-page {
+  background-color: #fff;
+  height: 100%;
+  overflow: auto;
+  .table-box {
+    width: 1184px;
+  }
+  .sticky-top {
+    position: sticky;
+    top: 0;
+    background-color: #fff;
+    padding: 10px 24px;
+    z-index: 2;
+  }
+}
+.border-l-t {
+  border-left: 1px solid #ccc;
+  border-top: 1px solid #ccc;
+}
+.border-b-r {
+  border-bottom: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+}
+.w-100 {
+  width: 100px;
+}
+.w-300 {
+  width: 300px;
+}
+.w-p-10 {
+  width: 10%;
+}
+.w-p-50 {
+  width: 50%;
+}
+.w-p-40 {
+  width: 40%;
+}
+.w-p-60 {
+  width: 60%;
+}
+.w-p-90 {
+  width: 90%;
+}
+</style>
diff --git a/src/views/dike/runManage/supervisionInspetion/questionManage/index.vue b/src/views/dike/runManage/supervisionInspetion/questionManage/index.vue
new file mode 100644
index 0000000..395b4b4
--- /dev/null
+++ b/src/views/dike/runManage/supervisionInspetion/questionManage/index.vue
@@ -0,0 +1,701 @@
+<!-- 监督检查工程管理 -->
+<script>
+import dayjs from "dayjs";
+import { regionData, codeToText, TextToCode } from "element-china-area-data";
+import { uploadFileData } from "@/api/system/upload";
+
+import {
+  getSuperviseEngineeringProblemListData,
+  updateSuperviseEngineeringProblemStatusAndData,
+  getSuperviseEngineeringProblemDetailsData,
+} from "@/api/dike";
+export default {
+  name: "projectManage",
+  data() {
+    return {
+      dealDialogVisible: false,
+      checkDialogVisible: false,
+      searchTaskName: "",
+      searchManageName: "",
+      searchProjectName: "",
+      currentItem: null,
+      engScalOptions: [],
+      wagaTypeOptions: [],
+      checkDetailData: {},
+      levelMap: {
+        0: "无",
+        1: "一般",
+        2: "较重",
+        3: "严重",
+      },
+      paramsData: {
+        name: "",
+        type: null,
+        dikeName: "",
+        selectLevel: "",
+        selectType: "",
+      },
+      dealForm: {
+        id: "",
+        handleRecord: "",
+        fileList: [],
+      },
+      tableData: [], // 检查列表
+      pageData: {
+        pageNum: 1, // 当前页
+        pageSize: 10, // 请求数量
+        pageSizes: [10, 20, 50, 100],
+        total: 0, // 总数量
+      },
+    };
+  },
+  methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
+    // 查看
+    handleCheck(row) {
+      this.checkDialogVisible = true;
+      getSuperviseEngineeringProblemDetailsData(row.id).then((res) => {
+        this.checkDetailData = res?.data || {};
+        if (this.checkDetailData.problemDto?.siteSituationRecords) {
+          this.checkDetailData.problemDto.siteSituationRecordsArr =
+            this.checkDetailData.problemDto.siteSituationRecords.split(",");
+        }
+        if (this.checkDetailData.problemDto?.handleSituationRecords) {
+          this.checkDetailData.problemDto.handleSituationRecordsArr =
+            this.checkDetailData.problemDto.handleSituationRecords.split(",");
+        }
+        if (this.checkDetailData.doneTime) {
+          this.checkDetailData.showDoneTime = dayjs(
+            this.checkDetailData.doneTime
+          ).format("YYYY年MM月DD日");
+        }
+      });
+    },
+    // 跳转编辑页面
+    handleEdit(row) {
+      this.$router.push({
+        path: "supervisionProjectReport",
+        query: {
+          type: "edit",
+          wayId: row.wayId,
+          id: row.id,
+        },
+      });
+    },
+    handleClose(done) {
+      this.dealDialogVisible = false;
+    },
+    // 确认提交处理表单
+    submitDeal() {
+      this.$refs.dealForm.validate((valid) => {
+        if (valid) {
+          updateSuperviseEngineeringProblemStatusAndData({
+            id: this.dealForm.id,
+            status: "2",
+            handleRecord: this.dealForm.handleRecord,
+            handleSituationRecords: this.dealForm.fileList.join(","), // 现场情况
+          }).then((res) => {
+            if (res) {
+              this.$message({
+                type: "success",
+                message: "处理成功",
+              });
+              this.getTableData();
+              this.dealForm.fileList = [];
+              this.dealForm.handleRecord = "";
+              this.dealForm.id = "";
+              this.$refs.dealForm.resetFields();
+              this.dealDialogVisible = false;
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+    // 跳转报告页面
+    handleCheckReport(row) {
+      this.$router.push({
+        path: "supervisionProjectReportPage",
+        query: {
+          wayId: row.wayId,
+          id: row.id,
+        },
+      });
+    },
+    // 类型字典翻译
+    problemLevelFormat(level) {
+      if (!level) return "";
+      let levelMap = {
+        0: "无",
+        1: "一般",
+        2: "较重",
+        3: "严重",
+      };
+      return levelMap[level];
+    },
+    // 获取列表数据
+    getTableData() {
+      getSuperviseEngineeringProblemListData({
+        data: {
+          timeView: {
+            timeField: "create_time",
+          },
+          name: this.searchTaskName || null,
+          engineeringManagementUnit: this.searchManageName || null,
+          dikeName: this.searchProjectName || null,
+        },
+        params: {
+          orderBy: "create_time",
+          sort: "desc",
+        },
+        pageSize: this.pageData.pageSize,
+        pageNum: this.pageData.pageNum,
+      }).then((res) => {
+        if (res) {
+          this.tableData = res.records;
+          this.pageData.total = res.total;
+        }
+      });
+    },
+    // 重置搜索
+    resetSearch() {
+      this.searchTaskName = null;
+      this.searchManageName = null;
+      this.searchProjectName = null;
+      this.getTableData();
+    },
+    // 下发
+    handleSendDown(row) {
+      this.$confirm("是否确认下发？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          updateSuperviseEngineeringProblemStatusAndData({
+            id: row.id,
+            status: "1",
+          }).then((res) => {
+            if (res) {
+              this.$message({
+                type: "success",
+                message: "下发成功",
+              });
+              this.getTableData();
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    // 处理-弹窗提交问题详情和图片
+    handleDeal(row) {
+      this.dealDialogVisible = true;
+      this.dealForm.id = row.id;
+    },
+    // 确认
+    handleConfirm(row) {
+      this.$confirm("是否确认？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          updateSuperviseEngineeringProblemStatusAndData({
+            id: row.id,
+            status: "3",
+          }).then((res) => {
+            if (res) {
+              this.$message({
+                type: "success",
+                message: "确认成功",
+              });
+              this.getTableData();
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    // 上传前
+    beforeUpload(e) {
+      console.log("beforeUpload >>>>>  ", e);
+      if (this.dealForm.fileList?.length >= 99) {
+        this.$message.warning("最多上传99张图片");
+        return false;
+      }
+      return true;
+    },
+    handleUpload(e) {
+      const { file } = e;
+      let fData = new FormData();
+      fData.append("file", file);
+      uploadFileData(fData)
+        .then((res) => {
+          this.dealForm.fileList.push(res.url);
+        })
+        .catch((err) => {
+          console.log("err >>>>>  ", err);
+        });
+    },
+
+    formatAdcd(adcd) {
+      if (adcd) {
+        let provinceCode = adcd.slice(0, 2);
+        let cityCode = adcd.slice(2, 4);
+        let areaCode = adcd.slice(4, 6);
+        if (areaCode != "00") {
+          return (
+            codeToText[provinceCode] +
+            "-" +
+            codeToText[provinceCode + cityCode] +
+            "-" +
+            codeToText[provinceCode + cityCode + areaCode]
+          );
+        } else if (cityCode != "00") {
+          return (
+            codeToText[provinceCode] + "-" + codeToText[provinceCode + cityCode]
+          );
+        } else {
+          return codeToText[provinceCode];
+        }
+      }
+    },
+  },
+  created() {},
+  mounted() {
+    // 获取列表数据
+    this.getTableData();
+  },
+};
+</script>
+
+<template>
+  <div class="body slider-right">
+    <div class="top-title">基础信息管理</div>
+    <div class="table-box">
+      <span>任务名称：</span>
+      <el-input
+        class="search-input ml-10"
+        v-model="searchTaskName"
+        placeholder="请输入名称"
+      />
+      <span class="ml-10">管理单位：</span>
+      <el-input
+        class="search-input ml-10"
+        v-model="searchManageName"
+        placeholder="请输入"
+      />
+      <span class="ml-10">工程对象：</span>
+      <el-input
+        class="search-input ml-10"
+        v-model="searchProjectName"
+        placeholder="请输入"
+      />
+      <el-button class="search-btn" type="success" @click="getTableData()"
+        >搜索</el-button
+      >
+      <el-button class="search-btn" @click="resetSearch">重置</el-button>
+      <el-table class="table mt-16" height="640" :data="tableData" border>
+        <el-table-column type="index" align="center" label="序号" width="60" />
+        <el-table-column prop="projectName" align="center" label="检查项目" />
+        <el-table-column prop="name" align="center" label="任务名称" />
+        <el-table-column prop="adcdStart" align="center" label="起点行政区划">
+          <template #default="{ row }">{{
+            formatAdcd(row.adcdStart)
+          }}</template>
+        </el-table-column>
+        <el-table-column prop="adcdEnd" align="center" label="终点行政区划">
+          <template #default="{ row }">{{ formatAdcd(row.adcdEnd) }}</template>
+        </el-table-column>
+        <el-table-column
+          prop="dikeName"
+          align="center"
+          label="工程"
+        ></el-table-column>
+        <el-table-column
+          prop="engineeringManagementUnit"
+          align="center"
+          label="管理单位"
+        />
+        <el-table-column
+          prop="content"
+          align="center"
+          label="检查内容"
+        ></el-table-column>
+        <el-table-column prop="level" align="center" label="问题等级">
+          <template slot-scope="scope">
+            <span>{{ levelMap[scope.row.level] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="operate" align="center" label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="handleCheck(scope.row)"
+              >查看</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-if="scope.row.status == '0'"
+              @click="handleSendDown(scope.row)"
+              >下发</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              @click="handleDeal(scope.row)"
+              v-else-if="scope.row.status == '1'"
+              >处理</el-button
+            >
+            <el-button
+              type="text"
+              size="small"
+              v-else-if="scope.row.status == '2'"
+              @click="handleConfirm(scope.row)"
+              >确认</el-button
+            >
+            <el-button
+              type="text"
+              :disabled="true"
+              size="small"
+              v-else-if="scope.row.status == '3'"
+              >完成</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        background
+        class="pagination"
+        style="margin-top: 16px; margin-right: 16px; float: right"
+        :current-page="pageData.pageNum"
+        :page-sizes="pageData.pageSizes"
+        layout="total, prev, pager, next, sizes, jumper"
+        :total="pageData.total"
+        @size-change="(e) => handlePageSizeChange(e)"
+        @current-change="(e) => handleCurrentPageChange(e)"
+      >
+      </el-pagination>
+    </div>
+
+    <!-- 处理弹窗 -->
+    <el-dialog title="问题处理" :visible.sync="dealDialogVisible" width="680px">
+      <el-form ref="dealForm" :model="dealForm" label-width="80px">
+        <el-form-item label="问题描述">
+          <el-input
+            type="textarea"
+            :rows="4"
+            placeholder="请输入问题描述"
+            v-model="dealForm.handleRecord"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="现场情况">
+          <div
+            class="w-120 h-100 mr-12 mb-12"
+            v-for="(item, index) in dealForm.fileList"
+            :key="index"
+          >
+            <el-image
+              style="width: 200px; min-height: 100px; height: auto"
+              :src="item"
+              :preview-src-list="[item]"
+            >
+              <template #error>
+                <div
+                  class="w-full flex justify-center items-center"
+                  style="
+                    height: 100px;
+                    border: 1px solid #f0f0f0;
+                    font-style: italic;
+                    color: #ccc;
+                  "
+                >
+                  图片加载失败
+                </div>
+              </template>
+            </el-image>
+          </div>
+          <el-upload
+            action="#"
+            :http-request="handleUpload"
+            :auto-upload="true"
+            :before-upload="beforeUpload"
+            :showFileList="false"
+            accept=".jpg,.png,.jpeg"
+            :limit="99"
+          >
+            <el-button type="primary">上传</el-button>
+          </el-upload>
+        </el-form-item>
+        <el-form-item class="flex justify-end">
+          <el-button @click="handleClose">取消</el-button>
+          <el-button type="primary" @click="submitDeal">提交</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+
+    <!-- 查看弹窗 -->
+    <el-dialog
+      title="问题详情"
+      :visible.sync="checkDialogVisible"
+      width="860px"
+    >
+      <div class="table-container">
+        <!-- 下发和处理状态内容 -->
+        <div class="flex">
+          <div class="flex-1">
+            <div class="flex border-l-t">
+              <div class="w-120 p-10 border-b-r label-text">任务名称</div>
+              <div class="flex-1 p-10 border-b-r text-center value-text">
+                {{ checkDetailData.name }}
+              </div>
+            </div>
+            <div class="flex border-l-t">
+              <div class="w-120 p-10 border-b-r label-text">检查时间</div>
+              <div class="flex-1 p-10 border-b-r text-center value-text">
+                {{ checkDetailData.showDoneTime }}
+              </div>
+              <div class="w-120 p-10 border-b-r label-text">天气</div>
+              <div class="flex-1 p-10 border-b-r text-center value-text">
+                {{ checkDetailData.weather }}
+              </div>
+            </div>
+            <div class="flex border-l-t">
+              <div class="w-120 p-10 border-b-r label-text">检查人员</div>
+              <div class="flex-1 p-10 border-b-r text-center value-text">
+                {{ checkDetailData.patrolName }}
+              </div>
+            </div>
+            <div class="flex border-l-t">
+              <div class="w-120 p-10 border-b-r label-text">管理单位</div>
+              <div class="flex-1 p-10 border-b-r text-center value-text">
+                {{ checkDetailData.engineeringManagementUnit }}
+              </div>
+              <div class="w-120 p-10 border-b-r label-text">堤防名称</div>
+              <div class="flex-1 p-10 border-b-r text-center value-text">
+                {{ checkDetailData.dikeName }}
+              </div>
+            </div>
+            <div class="flex border-l-t">
+              <div class="w-120 p-10 border-b-r label-text">检查项目</div>
+              <div class="flex-1 p-10 border-b-r text-center value-text">
+                {{
+                  checkDetailData.problemDto &&
+                  checkDetailData.problemDto.projectName
+                }}
+              </div>
+              <div class="w-120 p-10 border-b-r label-text">问题等级</div>
+              <div class="flex-1 p-10 border-b-r text-center value-text">
+                {{
+                  problemLevelFormat(
+                    checkDetailData.problemDto &&
+                      checkDetailData.problemDto.level
+                  )
+                }}
+              </div>
+            </div>
+            <div class="flex border-l-t">
+              <div class="w-120 p-10 border-b-r label-text">检查内容</div>
+              <div class="flex-1 p-10 border-b-r value-text">
+                {{ checkDetailData.content }}
+              </div>
+            </div>
+            <div class="flex border-l-t">
+              <div class="w-120 p-10 border-b-r label-text">问题描述</div>
+              <div class="flex-1 p-10 border-b-r value-text">
+                {{
+                  checkDetailData.problemDto &&
+                  checkDetailData.problemDto.problemDescribe
+                }}
+              </div>
+            </div>
+            <div class="flex border-l-t">
+              <div class="w-120 p-10 border-b-r label-text">现场记录情况</div>
+              <div class="flex-1 p-10 border-b-r">
+                <template v-if="checkDetailData.problemDto">
+                  <el-image
+                    v-for="item in checkDetailData.problemDto
+                      .siteSituationRecordsArr"
+                    style="width: 200px; min-height: 100px; height: auto"
+                    :src="item"
+                    :key="item"
+                    class="mr-10 mb-10"
+                    :preview-src-list="[item]"
+                  ></el-image>
+                </template>
+              </div>
+            </div>
+          </div>
+          <!-- <div
+            class="w-40 flex-shrink-0 border-l-t border-b-r flex justify-center items-center font-12 color-red"
+          >
+            注：下发和处理状态查看内容
+          </div> -->
+        </div>
+        <!-- 确认状态内容 -->
+        <div
+          class="flex"
+          v-if="
+            checkDetailData.problemDto &&
+            ['2', '3'].includes(checkDetailData.problemDto.status)
+          "
+        >
+          <div class="flex-1">
+            <div class="flex border-l-t">
+              <div class="w-120 p-10 border-b-r label-text">处理人员</div>
+              <div class="flex-1 p-10 border-b-r text-center value-text">
+                {{
+                  checkDetailData.problemDto &&
+                  checkDetailData.problemDto.handleName
+                }}
+              </div>
+              <div class="w-120 p-10 border-b-r label-text">处理时间</div>
+              <div class="flex-1 p-10 border-b-r text-center value-text">
+                {{
+                  checkDetailData.problemDto &&
+                  checkDetailData.problemDto.handleTime
+                }}
+              </div>
+            </div>
+            <div class="flex border-l-t">
+              <div class="w-120 p-10 border-b-r label-text">处理记录</div>
+              <div class="flex-1 p-10 border-b-r value-text">
+                {{
+                  checkDetailData.problemDto &&
+                  checkDetailData.problemDto.handleRecord
+                }}
+              </div>
+            </div>
+            <div class="flex border-l-t">
+              <div class="w-120 p-10 border-b-r label-text">现场处理情况</div>
+              <div class="flex-1 p-10 border-b-r">
+                <el-image
+                  v-for="item in checkDetailData.problemDto
+                    .handleSituationRecordsArr"
+                  style="width: 200px; min-height: 100px; height: auto"
+                  :src="item"
+                  :key="item"
+                  class="mr-10 mb-10"
+                  :preview-src-list="[item]"
+                ></el-image>
+              </div>
+            </div>
+          </div>
+          <!-- <div
+            class="w-40 flex-shrink-0 border-l-t border-b-r flex justify-center items-center font-12 color-red"
+          >
+            注：确认状态内容
+          </div> -->
+        </div>
+        <!-- 完成状态内容 -->
+        <div
+          class="flex"
+          v-if="
+            checkDetailData.problemDto &&
+            ['3'].includes(checkDetailData.problemDto.status)
+          "
+        >
+          <div class="flex-1">
+            <div class="flex border-l-t">
+              <div class="w-120 p-10 border-b-r label-text">复核人员</div>
+              <div class="flex-1 p-10 border-b-r text-center value-text">
+                {{
+                  checkDetailData.problemDto &&
+                  checkDetailData.problemDto.confirmName
+                }}
+              </div>
+              <div class="w-120 p-10 border-b-r label-text">处理时间</div>
+              <div class="flex-1 p-10 border-b-r text-center value-text">
+                {{
+                  checkDetailData.problemDto &&
+                  checkDetailData.problemDto.confirmTime
+                }}
+              </div>
+            </div>
+          </div>
+          <!-- <div
+            class="w-40 flex-shrink-0 border-l-t border-b-r flex justify-center items-center font-12 color-red"
+          >
+            完成状态内容
+          </div> -->
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<style scoped lang="less">
+.body {
+  width: 100%;
+  min-height: calc(100vh - 56px);
+  padding-left: 24px;
+
+  .top-title {
+    height: 40px;
+    background-color: white;
+    display: flex;
+    padding-left: 16px;
+    align-items: center;
+    font-weight: 600;
+  }
+
+  .table-box {
+    width: 100%;
+    min-height: calc(100vh - 56px - 64px);
+    margin-top: 24px;
+    padding: 16px;
+    background-color: white;
+
+    .top-search {
+      margin-bottom: 8px;
+    }
+
+    .table {
+      height: calc(680px - 34px);
+    }
+  }
+  .search-input {
+    width: 202px;
+    margin-right: 10px;
+  }
+
+  .search-btn {
+    margin-left: 10px;
+  }
+
+  .warning-time {
+    color: red;
+  }
+
+  .label-text {
+    color: #999;
+  }
+  .value-text {
+    color: #333;
+  }
+
+  .w-40 {
+    width: 40px;
+  }
+  .w-120 {
+    width: 120px;
+  }
+  .border-l-t {
+    border-left: 1px solid #f0f0f0;
+    border-top: 1px solid #f0f0f0;
+  }
+  .border-b-r {
+    border-bottom: 1px solid #f0f0f0;
+    border-right: 1px solid #f0f0f0;
+  }
+  .color-red {
+    color: red;
+  }
+}
+</style>
diff --git a/src/views/dike/runManage/supervisionInspetion/statisticAnalysis/components/Pie.vue b/src/views/dike/runManage/supervisionInspetion/statisticAnalysis/components/Pie.vue
new file mode 100644
index 0000000..2e676f3
--- /dev/null
+++ b/src/views/dike/runManage/supervisionInspetion/statisticAnalysis/components/Pie.vue
@@ -0,0 +1,154 @@
+<template>
+  <div class="pie-component">
+    <div class="title">{{ title }}</div>
+    <div ref="pieEle" class="canvas"></div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+
+export default {
+  data() {
+    return {
+      myChart: null,
+    };
+  },
+  props: {
+    title: {
+      type: String,
+      default: "",
+    },
+    echartsTitle: {
+      type: String,
+      default: "",
+    },
+    itemData: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  mounted() {
+    this.initEcharts();
+  },
+  watch: {
+    itemData() {
+      this.initEcharts();
+    },
+  },
+  methods: {
+    initEcharts() {
+      const colorList = ["#28CE8E", "#165DFF", "#FFAB00", "#F86220"];
+      let sum = 0;
+      let seriesData = this.itemData.map((item, index) => {
+        if (!isNaN(item.value)) sum += item.value;
+        return {
+          name: item.text,
+          value: item.value,
+          itemStyle: {
+            color: colorList[index],
+          },
+        };
+      });
+      if (!this.myChart) {
+        this.myChart = echarts.init(this.$refs.pieEle);
+      }
+      let option = {
+        title: {
+          left: "29%",
+          top: "38%",
+          text: sum,
+          textAlign: "center",
+          textStyle: {
+            fontSize: 18,
+            fontWeight: "bold",
+            textAlign: "center",
+            color: "#333",
+          },
+          subtext: this.echartsTitle,
+          subtextStyle: {
+            fontSize: 14,
+            textAlign: "center",
+            color: "#666",
+          },
+        },
+        legend: {
+          // type: "scroll",
+          orient: "vertical",
+          left: "60%",
+          top: 20,
+          bottom: 20,
+          data: seriesData,
+          formatter: function (name) {
+            return `{a|${name}}\n{b|${
+              seriesData.find((item) => item.name === name).value
+            }}`;
+          },
+          itemWidth: 4,
+          itemHeight: 50,
+          itemGap: 25,
+          itemStyle: {
+            borderJoin: "round",
+          },
+          textStyle: {
+            fontSize: 16,
+            rich: {
+              a: {
+                fontSize: 12,
+                lineHeight: 20,
+              },
+              b: {
+                fontSize: 18,
+                fontWeight: "bold",
+              },
+            },
+          },
+          label: {},
+        },
+        tooltip: {
+          trigger: "item",
+        },
+        series: [
+          {
+            name: "",
+            type: "pie",
+            radius: ["50%", "75%"],
+            center: ["30%", "50%"],
+            label: {
+              show: false,
+              position: "center",
+            },
+            emphasis: {
+              label: {
+                show: false,
+                fontSize: 16,
+                fontWeight: "bold",
+              },
+            },
+            labelLine: {
+              show: false,
+            },
+            data: seriesData,
+          },
+        ],
+      };
+      this.myChart.setOption(option);
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.pie-component {
+  border: 1px solid #e5e5e5;
+  border-radius: 5px;
+
+  .title {
+    padding: 10px;
+    border-bottom: 1px solid #e5e5e5;
+  }
+  .canvas {
+    width: 500px;
+    height: 200px;
+    padding: 10px;
+  }
+}
+</style>
diff --git a/src/views/dike/runManage/supervisionInspetion/statisticAnalysis/index.vue b/src/views/dike/runManage/supervisionInspetion/statisticAnalysis/index.vue
new file mode 100644
index 0000000..7ad070f
--- /dev/null
+++ b/src/views/dike/runManage/supervisionInspetion/statisticAnalysis/index.vue
@@ -0,0 +1,344 @@
+<!-- 监督检查-统计分析 -->
+<script>
+import {
+  getSuperviseWayTaskListData,
+  getSuperviseStatisticTotal,
+} from "@/api/dike";
+import { getAreasData } from "@/api/areas";
+import Pie from "./components/Pie.vue";
+
+export default {
+  name: "InspectionItems",
+  components: {
+    Pie,
+  },
+  data() {
+    return {
+      areasOptionProps: {
+        emitPath: false,
+        checkStrictly: true, //选择任意一级
+      },
+      areasOptions: [],
+      riverLocationList: [], // 流域数据
+      tasksList: [], // 任务列表数据
+      projectTypeOptions: [], // 工程类型
+      paramsData: {
+        riverLocation: "",
+        dikeType: "",
+        adcdStart: "",
+        taskId: "",
+      },
+      questionLevelList: [],
+    };
+  },
+  methods: {
+    // 获取列表数据
+    initData() {
+      getSuperviseStatisticTotal({
+        dikeType: this.paramsData.dikeType || null,
+        adcdStart: this.paramsData.adcdStart || null,
+        taskId: this.paramsData.taskId || null,
+        riverLocation: this.paramsData.riverLocation || null,
+      }).then((res) => {
+        let list = [
+          {
+            text: "问题总数",
+            key: "problemTotal",
+            value: 0,
+          },
+          {
+            text: "一般问题",
+            key: "same",
+            value: 0,
+          },
+          {
+            text: "较重问题",
+            key: "heavy",
+            value: 0,
+          },
+          {
+            text: "严重问题",
+            key: "serious",
+            value: 0,
+          },
+          {
+            text: "特别严重问题",
+            key: "superSerious",
+            value: 0,
+          },
+          {
+            text: "问题处置",
+            key: "problemDispose",
+            value: 0,
+          },
+          {
+            text: "下发",
+            key: "distributeCount",
+            value: 0,
+          },
+          {
+            text: "处置",
+            key: "handleCount",
+            value: 0,
+          },
+          {
+            text: "确认",
+            key: "confirmCount",
+            value: 0,
+          },
+          {
+            text: "完成",
+            key: "finishCount",
+            value: 0,
+          },
+        ];
+        if (res?.data) {
+          list.forEach((item) => {
+            item.value = res.data[item.key] || 0;
+          });
+        }
+        this.questionLevelList = list;
+      });
+    },
+    handleChangeType() {
+      this.remoteOptions = [];
+      this.paramsData = {
+        wagaType: "",
+        adcdStart: "",
+        remoteValue: "",
+      };
+      if (this.typeSelect === "") {
+        this.initData();
+      }
+    },
+    handleChangeQuery() {
+      this.initData();
+    },
+    handleGetRemoteRiverLocationData() {
+      // 获取远程搜索数据
+      // api({
+      //   data: {
+      //     name: query,
+      //   },
+      //   pageSize: 20,
+      //   pageNum: 1,
+      // }).then((res) => {
+      //   if (res) {
+      //     this.remoteOptions = res.records.map((item) => {
+      //       return {
+      //         label: item.name,
+      //         value: item.id,
+      //       };
+      //     });
+      //   }
+      // });
+    },
+    // 获取远程搜索数据
+    handleGetRemoteTasksData(query) {
+      getSuperviseWayTaskListData({
+        data: {
+          name: query,
+        },
+        pageSize: 20,
+        pageNum: 1,
+      }).then((res) => {
+        if (res) {
+          this.tasksList = res.records.map((item) => {
+            return {
+              label: item.name,
+              value: item.id,
+            };
+          });
+        }
+      });
+    },
+    // 获取行政区划数据
+    getTreeData() {
+      getAreasData().then((items) => {
+        let res = [];
+        let getChildren = (res, pid) => {
+          for (const i of items.data) {
+            if (i.parentid === pid) {
+              const newItem = {
+                label: i.name,
+                value: i.id,
+              };
+              if (i.layer != 3) newItem.children = [];
+              res.push(newItem);
+              getChildren(newItem.children, newItem.value);
+            }
+          }
+        };
+        getChildren(res, items.data[0].parentid);
+        this.areasOptions = res;
+      });
+    },
+  },
+  created() {
+    // 水闸类型
+    this.getDicts("embankment_type").then((response) => {
+      this.projectTypeOptions = response.data;
+    });
+  },
+  mounted() {
+    this.getTreeData();
+    this.initData();
+  },
+};
+</script>
+
+<template>
+  <div class="body slider-right">
+    <div class="top-title">统计分析</div>
+    <div class="table-box">
+      <div class="flex title-box justify-between items-center">
+        <div class="title">监督检查任务统计分析</div>
+        <div class="select-box flex items-center font-14">
+          <span class="mr-12">所属流域</span>
+          <el-select
+            size="mini"
+            class="statistic-analysis-select-style"
+            v-model="paramsData.riverLocation"
+            filterable
+            link
+            remote
+            placeholder="请输入关键词"
+            :remote-method="handleGetRemoteRiverLocationData"
+            @focus="handleGetRemoteRiverLocationData('')"
+            @change="handleChangeQuery"
+          >
+            <el-option label="全部" value=""> </el-option>
+            <el-option
+              v-for="item in riverLocationList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <span class="ml-32 mr-12">工程类型</span>
+          <el-select
+            size="mini"
+            class="statistic-analysis-select-style"
+            v-model="paramsData.dikeType"
+            filterable
+            @change="handleChangeQuery"
+            placeholder="请选择"
+          >
+            <el-option label="全部" value=""> </el-option>
+            <el-option
+              v-for="item in projectTypeOptions"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            >
+            </el-option>
+          </el-select>
+          <span class="ml-32 mr-12">行政区划</span>
+          <el-cascader
+            size="mini"
+            class="statistic-analysis-select-style"
+            :options="areasOptions"
+            v-model="paramsData.adcdStart"
+            :props="areasOptionProps"
+            placeholder="请选择行政区划"
+            clearable
+            @change="handleChangeQuery"
+          >
+          </el-cascader>
+          <span class="ml-32 mr-12">监督检查任务</span>
+          <el-select
+            size="mini"
+            class="statistic-analysis-select-style"
+            v-model="paramsData.taskId"
+            filterable
+            link
+            remote
+            placeholder="请输入关键词"
+            :remote-method="handleGetRemoteTasksData"
+            @focus="handleGetRemoteTasksData('')"
+            @change="handleChangeQuery"
+          >
+            <el-option label="全部" value=""> </el-option>
+            <el-option
+              v-for="item in tasksList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+      </div>
+
+      <!-- 问题列表 -->
+      <div class="question-box" v-if="questionLevelList.length">
+        <Pie
+          title="问题统计"
+          echartsTitle="问题总数"
+          :itemData="questionLevelList.slice(1, 5)"
+          ref="pieRef1"
+          class="question-item"
+        ></Pie>
+        <Pie
+          ref="pieRef2"
+          title="处理统计"
+          echartsTitle="问题处置"
+          class="question-item ml-20"
+          :itemData="questionLevelList.slice(6, 10)"
+        ></Pie>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="less">
+.body {
+  width: 100%;
+  min-height: calc(100vh - 56px);
+  padding-left: 24px;
+  .top-title {
+    height: 40px;
+    background-color: white;
+    display: flex;
+    padding-left: 16px;
+    align-items: center;
+    font-weight: 600;
+  }
+
+  .table-box {
+    width: 100%;
+    min-height: calc(100vh - 56px - 64px);
+    margin-top: 24px;
+    background-color: white;
+    .title-box {
+      padding: 16px;
+      border-bottom: 1px solid #f0f0f0;
+      .title {
+        padding-left: 20px;
+        position: relative;
+        &::before {
+          position: absolute;
+          left: 0;
+          top: 0;
+          content: "";
+          width: 4px;
+          height: 16px;
+          background-color: #1890ff;
+        }
+      }
+    }
+    .question-box {
+      display: flex;
+      flex-wrap: wrap;
+      padding: 24px;
+      .question-item {
+        flex: 1;
+        min-width: 250px;
+        margin-right: 10px;
+        margin-bottom: 12px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/dike/runManage/supervisionInspetion/tasksManage/index.vue b/src/views/dike/runManage/supervisionInspetion/tasksManage/index.vue
new file mode 100644
index 0000000..ccb82db
--- /dev/null
+++ b/src/views/dike/runManage/supervisionInspetion/tasksManage/index.vue
@@ -0,0 +1,221 @@
+<!-- 监督检查任务管理 -->
+<script>
+import {
+  delSuperviseWayItemData,
+  getSuperviseWayTaskListData,
+} from "@/api/dike";
+export default {
+  name: "InspectionItems",
+  data() {
+    return {
+      searchTaskName: "",
+      searchManageName: "",
+      paramsData: {
+        name: "",
+        type: null,
+        dikeName: "",
+        selectLevel: "",
+        selectType: "",
+      },
+      tableData: [], // 检查列表
+      pageData: {
+        pageNum: 1, // 当前页
+        pageSize: 10, // 请求数量
+        pageSizes: [10, 20, 50, 100],
+        total: 0, // 总数量
+      },
+    };
+  },
+  methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
+    // 跳转任务新增页面
+    handleGoDetails() {
+      this.$router.push({
+        path: "supervisionTasksDetails",
+        query: {
+          type: "add",
+        },
+      });
+    },
+    // 跳转任务编辑页面
+    handleEdit(row) {
+      this.$router.push({
+        path: "supervisionTasksDetails",
+        query: {
+          type: "edit",
+          id: row.id,
+        },
+      });
+    },
+    // 获取列表数据
+    getTableData() {
+      getSuperviseWayTaskListData({
+        data: {
+          timeView: {
+            timeField: "create_time",
+          },
+          name: this.searchTaskName || null,
+          engineeringManagementUnit: this.searchManageName || null,
+        },
+        params: {
+          orderBy: "create_time",
+          sort: "desc",
+        },
+        pageSize: this.pageData.pageSize,
+        pageNum: this.pageData.pageNum,
+      }).then((res) => {
+        if (res) {
+          this.tableData = res.records;
+          this.pageData.total = res.total;
+        }
+      });
+    },
+    // 重置搜索
+    resetSearch() {
+      this.searchTaskName = null;
+      this.searchManageName = null;
+      this.getTableData();
+    },
+    // 删除
+    handleDel(row) {
+      this.$confirm("是否删除该条数据？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delSuperviseWayItemData(row.id).then((res) => {
+            if (res) {
+              this.$message.success("删除成功");
+              this.getTableData();
+            }
+          });
+        })
+        .catch(() => {});
+    },
+  },
+  created() {
+    this.getDicts("embankment_type").then((response) => {
+      this.dikeTypeList = response.data;
+    });
+  },
+  mounted() {
+    // 获取列表数据
+    this.getTableData();
+  },
+};
+</script>
+
+<template>
+  <div class="body slider-right">
+    <div class="top-title">基础信息管理</div>
+    <div class="table-box">
+      <span>任务名称：</span>
+      <el-input
+        class="search-input ml-10"
+        v-model="searchTaskName"
+        placeholder="请输入名称"
+      />
+      <span class="ml-10">管理单位：</span>
+      <el-input
+        class="search-input ml-10"
+        v-model="searchManageName"
+        placeholder="请输入"
+      />
+      <el-button class="search-btn" type="success" @click="getTableData()"
+        >搜索</el-button
+      >
+      <el-button class="search-btn" @click="resetSearch">重置</el-button>
+      <el-button
+        class="search-btn"
+        style="margin-right: 16px; margin-bottom: 8px; float: right"
+        type="success"
+        v-hasPermi="['df:run:sup:task:add']"
+        @click="handleGoDetails()"
+        >添加</el-button
+      >
+      <el-table class="table mt-16" height="640" :data="tableData" border>
+        <el-table-column type="index" align="center" label="序号" width="60" />
+        <el-table-column prop="name" align="center" label="检查任务" />
+        <el-table-column prop="createTime" align="center" label="创建时间">
+        </el-table-column>
+        <el-table-column prop="updateTime" align="center" label="更新时间" />
+        <el-table-column
+          prop="engineeringManagementUnit"
+          align="center"
+          label="管理单位"
+        />
+        <el-table-column prop="operate" align="center" label="操作">
+          <template slot-scope="scope">
+            <el-button v-hasPermi="['df:run:sup:task:edit']" type="text" size="small" @click="handleEdit(scope.row)"
+              >编辑</el-button
+            >
+            <el-button v-hasPermi="['df:run:sup:task:delete']" type="text" size="small" @click="handleDel(scope.row)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        background
+        class="pagination"
+        style="margin-top: 16px; margin-right: 16px; float: right"
+        :current-page="pageData.pageNum"
+        :page-sizes="pageData.pageSizes"
+        layout="total, prev, pager, next, sizes, jumper"
+        :total="pageData.total"
+        @size-change="(e) => handlePageSizeChange(e)"
+        @current-change="(e) => handleCurrentPageChange(e)"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="less">
+.body {
+  width: 100%;
+  min-height: calc(100vh - 56px);
+  padding-left: 24px;
+
+  .top-title {
+    height: 40px;
+    background-color: white;
+    display: flex;
+    padding-left: 16px;
+    align-items: center;
+    font-weight: 600;
+  }
+
+  .table-box {
+    width: 100%;
+    min-height: calc(100vh - 56px - 64px);
+    margin-top: 24px;
+    padding: 16px;
+    background-color: white;
+
+    .top-search {
+      margin-bottom: 8px;
+    }
+
+    .table {
+      height: calc(680px - 34px);
+    }
+  }
+  .search-input {
+    width: 202px;
+    margin-right: 10px;
+  }
+
+  .search-btn {
+    margin-left: 10px;
+  }
+}
+</style>
diff --git a/src/views/dike/runManage/supervisionInspetion/tasksManage/tasksDetails.vue b/src/views/dike/runManage/supervisionInspetion/tasksManage/tasksDetails.vue
new file mode 100644
index 0000000..acd3160
--- /dev/null
+++ b/src/views/dike/runManage/supervisionInspetion/tasksManage/tasksDetails.vue
@@ -0,0 +1,434 @@
+<!-- 监督检查任务新增 -->
+<script>
+import dayjs from "dayjs";
+import { listUser } from "@/api/management";
+import {
+  getRunProjectList,
+  getEnableSuperviseWayData,
+  addNewSuperviseWayTasksData,
+  getSuperviseWayTaskDetailsData,
+  putSuperviseWayTaskDetailsData,
+} from "@/api/dike";
+
+export default {
+  name: "tasksDetails",
+  data() {
+    return {
+      searchDikeName: "",
+      paramsData: {
+        name: "",
+        type: null,
+        dikeName: "",
+        selectLevel: "",
+        selectType: "",
+      },
+      dialogVisible: false,
+      prohibitEditing: false,
+      enableSupervisionWayData: [], //启用中的检查项
+      personnelList: [], // 人员列表
+      projectList: [], // 工程列表
+      tableData: [], // 检查列表
+      pageData: {
+        pageNum: 1, // 当前页
+        pageSize: 10, // 请求数量
+        pageSizes: [10, 20, 50, 100],
+        total: 0, // 总数量
+      },
+      ruleForm: {
+        name: "",
+        dikeCode: "",
+        dikeName: "",
+        inspectorsName: "",
+        inspectors: "",
+        startTime: "",
+        doneTime: "",
+        content: "",
+        wayId: "",
+      },
+      rules: {
+        name: [
+          { required: true, message: "请输入名称", trigger: "blur" },
+          { max: 20, message: "名称最长为20个字符", trigger: "blur" },
+        ],
+        dikeCode: [
+          { required: true, message: "请选择堤防", trigger: "change" },
+        ],
+        doneTime: [
+          { required: true, message: "请选择时间", trigger: "change" },
+        ],
+        inspectors: [
+          { required: true, message: "请选择检查人员", trigger: "change" },
+        ],
+      },
+    };
+  },
+  computed: {
+    // 计算巡查人员
+    computedInspectorsId: {
+      get() {
+        return this.ruleForm.inspectors?.split(",")?.filter((v) => !!v) || [];
+      },
+      set(val) {
+        this.ruleForm.inspectors = val.join(",");
+        this.ruleForm.inspectorsName = this.personnelList
+          .filter((v) => val.includes(v.id))
+          .map((v) => v.nickName)
+          .join(",");
+      },
+    },
+    // 计算dikeCode
+    computedDikeCode: {
+      get() {
+        return this.ruleForm.dikeCode?.split(",")?.filter((v) => !!v) || [];
+      },
+      set(val) {
+        this.ruleForm.dikeCode = val.join(",");
+        this.ruleForm.dikeName = this.projectList
+          .filter((v) => val.includes(v.dikeCode))
+          .map((v) => v.dikeName)
+          .join(",");
+      },
+    },
+    // 计算时间差
+    computedTimes: {
+      get() {
+        return [this.ruleForm.startTime || "", this.ruleForm.doneTime || ""];
+      },
+      set(val) {
+        this.ruleForm.startTime = val[0] ? val[0] + " 00:00:00" : "";
+        this.ruleForm.doneTime = val[1] ? val[1] + " 23:59:59" : "";
+      },
+    },
+    // 计算任务工时
+    computedTaskTimes() {
+      if (this.ruleForm.startTime && this.ruleForm.doneTime) {
+        return (
+          dayjs(this.ruleForm.doneTime).diff(
+            dayjs(this.ruleForm.startTime),
+            "day"
+          ) + 1
+        );
+      }
+      return "";
+    },
+  },
+  methods: {
+    // 获取启用中的检查项数据
+    getTableData(wayId) {
+      getEnableSuperviseWayData({ wayId: wayId }).then((res) => {
+        if (res) {
+          this.ruleForm.wayId = res.data?.id;
+          this.enableSupervisionWayData = res.data?.itemList || [];
+        }
+      });
+    },
+    // 获取详情
+    getDetails() {
+      getSuperviseWayTaskDetailsData(this.$route.query.id).then((res) => {
+        if (res) {
+          this.ruleForm = res.data;
+          this.ruleForm.wayId = res.data?.wayId;
+          this.getTableData(res.data?.wayId);
+        }
+      });
+    },
+    // 打开新增弹窗
+    openAddDialog() {},
+    // 搜索用户
+    searchUser(e = null) {
+      listUser({
+        data: {
+          timeView: {
+            timeField: "create_time",
+          },
+        },
+        cv: {
+          name: "nickName",
+          type: "like",
+          value: e,
+        },
+        pageSize: 100,
+        pageNum: 1,
+      }).then((res) => {
+        this.personnelList = res.records;
+      });
+    },
+    // 重置校验
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.dialogVisible = false;
+    },
+    // 关闭dialog
+    handleClose(ruleForm = "ruleForm") {
+      console.log("关闭");
+      this.$refs[ruleForm].resetFields();
+      this.ruleForm = {
+        dikeCode: [],
+        dikeName: "",
+        name: "",
+        type: "",
+        instruction: "",
+        month: "",
+        details: [],
+        cycleType: "",
+        isReminder: true,
+        selectUser: [],
+        otherConfig: {
+          selectUser: [],
+          week: "",
+          day: "",
+        },
+        week: 1,
+        date: 1,
+        reminderTime: "",
+      };
+    },
+
+    // 获取工程列表
+    getProjectList() {
+      getRunProjectList({
+        data: {
+          pageNum: this.pageData.pageNum,
+          pageSize: this.pageData.pageSize,
+          dikeName: "",
+        },
+      }).then((res) => {
+        if (res) {
+          this.projectList = res.records;
+        }
+      });
+    },
+    // 删除
+    handleDel(row) {
+      console.log("row >>>>>  ", row);
+    },
+    // 提交表单
+    handleSubmit() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          // 提交表单，二次确认
+          this.$confirm("确认提交吗？", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              if (this.$route.query.id) {
+                // 编辑
+                putSuperviseWayTaskDetailsData(
+                  this.ruleForm,
+                  this.$route.query.id
+                ).then((res) => {
+                  if (res) {
+                    this.$message({
+                      message: "提交成功",
+                      type: "success",
+                    });
+                    this.$router.go(-1);
+                  }
+                });
+              } else {
+                // 新增
+                addNewSuperviseWayTasksData(this.ruleForm).then((res) => {
+                  if (res) {
+                    this.$message({
+                      message: "提交成功",
+                      type: "success",
+                    });
+                    this.$router.go(-1);
+                  }
+                });
+              }
+            })
+            .catch(() => {
+              // 取消提交
+              this.$message({
+                type: "info",
+                message: "已取消提交",
+              });
+            });
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+  },
+  created() {
+    this.getProjectList();
+    this.searchUser();
+  },
+  mounted() {
+    if (this.$route.query.id) {
+      this.getDetails();
+    } else {
+      this.getTableData();
+    }
+  },
+};
+</script>
+
+<template>
+  <div class="body slider-right">
+    <div class="top-title">基础信息管理</div>
+    <div class="content-box">
+      <div class="title">新增/编辑检查项</div>
+      <div class="font-14">
+        <el-form
+          :model="ruleForm"
+          :rules="rules"
+          ref="ruleForm"
+          label-width="100px"
+        >
+          <el-form-item label-width="120px" label="检查任务名称" prop="name">
+            <el-input
+              style="width: 240px"
+              v-model="ruleForm.name"
+              placeholder="请输入"
+            />
+          </el-form-item>
+          <el-form-item label-width="120px" label="堤防名称" prop="dikeCode">
+            <el-select
+              style="width: 240px"
+              multiple
+              v-model="computedDikeCode"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in projectList"
+                :key="item.id"
+                :label="item.dikeName"
+                :value="item.dikeCode"
+              >
+              </el-option>
+            </el-select>
+            <span class="ml-24">堤防代码</span>
+            <el-input
+              style="width: 240px"
+              class="ml-12"
+              :value="ruleForm.dikeCode"
+              placeholder="请选择"
+              :disabled="true"
+            />
+          </el-form-item>
+          <el-form-item
+            label-width="120px"
+            label="开始结束时间"
+            prop="doneTime"
+          >
+            <el-date-picker
+              v-model="computedTimes"
+              type="daterange"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            >
+            </el-date-picker>
+            <span class="ml-24">任务工时</span>
+            <el-input
+              style="width: 240px"
+              class="ml-12"
+              :value="computedTaskTimes"
+              placeholder="请选择开始结束时间"
+              :disabled="true"
+            />
+          </el-form-item>
+          <el-form-item label-width="120px" label="检查人员" prop="inspectors">
+            <el-select
+              style="width: 240px"
+              v-model="computedInspectorsId"
+              multiple
+              filterable
+              remote
+              :remote-method="searchUser"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in personnelList"
+                :key="item.id"
+                :label="item.nickName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label-width="120px" label="检查任务背景" prop="content">
+            <el-input
+              v-model="ruleForm.content"
+              type="textarea"
+              :rows="5"
+              :maxlength="500"
+              placeholder=" 请输入"
+            />
+          </el-form-item>
+        </el-form>
+        <el-table
+          style="margin-bottom: 22px"
+          max-height="330"
+          :data="enableSupervisionWayData"
+          border
+        >
+          <el-table-column
+            type="index"
+            align="center"
+            label="序号"
+            width="50"
+          />
+          <el-table-column
+            width="300"
+            prop="projectName"
+            align="center"
+            label="检查部位"
+          >
+          </el-table-column>
+          <el-table-column prop="content" align="center" label="检查内容">
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="bottom-btns flex justify-between">
+      <el-button
+        style="width: 120px"
+        type="primary"
+        @click="handleSubmit"
+        size="small"
+        >确认</el-button
+      >
+      <el-button @click="$router.go(-1)" size="small">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="less">
+.body {
+  width: 100%;
+  min-height: calc(100vh - 56px);
+  padding-left: 24px;
+
+  .top-title {
+    height: 40px;
+    background-color: white;
+    display: flex;
+    padding-left: 16px;
+    align-items: center;
+    font-weight: 600;
+  }
+
+  .content-box {
+    width: 100%;
+    height: calc(100vh - 56px - 64px);
+    margin-top: 24px;
+    overflow: auto;
+    padding: 16px;
+    padding-bottom: 56px;
+    background-color: white;
+    .title {
+      font-size: 16px;
+      font-weight: 700;
+      margin-bottom: 12px;
+    }
+  }
+}
+</style>

From 976639d3d996fb56540e2d01c22a67872677477c Mon Sep 17 00:00:00 2001
From: ruancuihong <2806986110@qq.com>
Date: Thu, 25 Apr 2024 16:08:33 +0800
Subject: [PATCH 02/23] =?UTF-8?q?fix:=20=E6=9C=AA=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warnInfo/components/forecastDetail.vue    |  408 ++++-
 .../fourPredictions/warnInfo/index.vue        |  279 ++-
 .../fourPredictions/warnInfo/js/detailData.js | 1516 ++++++++++++-----
 3 files changed, 1507 insertions(+), 696 deletions(-)

diff --git a/src/views/aiSupervision/fourPredictions/warnInfo/components/forecastDetail.vue b/src/views/aiSupervision/fourPredictions/warnInfo/components/forecastDetail.vue
index 2ec07fb..0580833 100644
--- a/src/views/aiSupervision/fourPredictions/warnInfo/components/forecastDetail.vue
+++ b/src/views/aiSupervision/fourPredictions/warnInfo/components/forecastDetail.vue
@@ -1,72 +1,60 @@
 <template>
     <div class="forecast-detail-wrapper">
-        <div class="detail-title">预报详情</div>
-        <div class="select-content">
-            <span>预报类型</span>
-            <el-select v-model="selectValue" placeholder="请选择">
-                <el-option v-for="item in selectOptions" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
-            </el-select>
-            <el-radio-group v-model="radioValue">
-                <el-radio v-for="item in radioOptions" :key="item.label" :label="item.label">{{ item.name }}</el-radio>
-            </el-radio-group>
-        </div>
-        <div class="analysis-content">
-            <div class="echarts-content" id="chart"></div>
-            <div class="warn-analysis">
-
+        <div class="title-content">
+            <div class="detail-title">预报详情</div>
+            <div class="select-content">
+                <span class="select-type">预报类型</span>
+                <el-select v-model="selectValue" placeholder="请选择" @change="changeType">
+                    <el-option v-for="item in selectOptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                </el-select>
+                <el-radio-group v-model="radioValue" v-show="!isCheckbox" @change="changeProject">
+                    <el-radio v-for="item in radioOptions" :key="item.label" :label="item.label">{{ item.name
+                        }}</el-radio>
+                </el-radio-group>
+                <el-checkbox-group v-model="checkedValue" v-show="isCheckbox" @change="changeCheckProject">
+                    <el-checkbox v-for="item in radioOptions" :key="item.label" :label="item.label">{{ item.name
+                        }}</el-checkbox>
+                </el-checkbox-group>
             </div>
         </div>
         <div v-if="analysisList.length">
             <div class="analysis-content" v-for="(item, index) in analysisList" :key="index">
                 <div class="echarts-content">
                     <span class="title-name">{{ item.chartData.chartName }}</span>
-                    <div class="echarts-box" :id="item.chartId" :ref="item.chartId" :style="{ 'zoom': zoom, 'width': 'calc(951px /' + zoom + ')', height: 'calc(260px / ' + zoom + ')' }"></div>
+                    <div class="echarts-box" :id="item.chartId" :ref="item.chartId"
+                        :style="{ 'zoom': zoom, 'width': 'calc(951px /' + zoom + ')', height: 'calc(260px / ' + zoom + ')' }">
+                    </div>
                 </div>
                 <div class="warn-analysis">
                     <span class="title-name">{{ item.tableName }}</span>
-                    <el-table height="258" :data="item.tableData" border>
-                        <el-table-column prop="projectName" align="center" label="站点名称">
-                        </el-table-column>
-                        <el-table-column prop="warningType" align="center" label="预警类型">
-                        </el-table-column>
-                        <el-table-column prop="warningStatus" align="center" label="预警状态">
+                    <el-table height="258" max-height="258" style="width: 100%" v-if="!loading" :data="item.tableData"
+                        border class="table-fixed">
+                        <el-table-column v-for="(items, indexs) in analysisTableColumnData" :key="indexs"
+                            :prop="items.prop" align="center" :label="items.label" :fixed="items.fixed || false"
+                            :width="items.width || 110">
                             <template slot-scope="scope">
-                                <div @click="openWarnDeal(scope.row)"
+                                <div @click="openWarnDeal(scope.row)" v-if="items.prop === 'warningStatus'"
                                     :class="{ 'green-span': scope.row.warningStatus !== '1' }" class="default-span">
                                     {{ scope.row.warningStatus === '1' ? '处理中' : '已处理' }}
                                 </div>
+                                <div v-else>{{ scope.row[`${items.prop}`] }}</div>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="warningInfo" align="center" label="预报">
-                        </el-table-column>
                     </el-table>
                 </div>
             </div>
         </div>
         <div class="water-leve-forecast">
-            <span class="title-name">{{warnDetailData.wranTypeName}}</span>
-            <el-table height="235" :data="flowTableData" border>
-                <el-table-column prop="projectName" align="center" label="工程名称">
-                </el-table-column>
-                <el-table-column prop="projectID" align="center" label="ID">
-                </el-table-column>
-                <el-table-column prop="rainFlow" align="center" label="预报雨量">
-                </el-table-column>
-                <el-table-column prop="waterFlow" align="center" label="预报来水量">
-                </el-table-column>
-                <el-table-column prop="outFlow" align="center" label="预报出库流量">
-                </el-table-column>
-                <el-table-column prop="water" align="center" label="预报水位">
-                </el-table-column>
-                <el-table-column prop="flow" align="center" label="河道流量">
-                </el-table-column>
-                <el-table-column prop="warningTime" align="center" label="预报时间">
+            <span class="title-name">{{ warnDetailData.wranTypeName }}</span>
+            <el-table height="235" v-if="!loading" :data="flowTableData" border class="table-fixed">
+                <el-table-column v-for="(item, index) in flowTableColumnData" :key="index" :prop="item.prop"
+                    align="center" :label="item.label">
                 </el-table-column>
             </el-table>
         </div>
-        <el-drawer title="预警处理详情" class="drawer-wrapper" size="300px" :visible.sync="drawerVisible" :append-to-body="true" @close="closeDrawer"
-            :with-header="true">
+        <el-drawer title="预警处理详情" class="drawer-wrapper" size="300px" :visible.sync="drawerVisible"
+            :append-to-body="true" @close="closeDrawer" :with-header="true">
             <div class="warn-deal-content">
                 <el-steps direction="vertical" :active="active">
                     <el-step title="超汛限预警">
@@ -96,17 +84,16 @@
                     <el-step title="预警处置">
                         <template slot="description">
                             <div class="step-description" v-if="active === 2">
-                                <el-form :model="dynamicValidateForm" :label-position="'top'" ref="dynamicValidateForm" label-width="100px" class="demo-dynamic">
-                                    <el-form-item
-                                      prop="wranDesc"
-                                      label="处置描述"
-                                      :rules="[
-                                        { required: true, message: '请输入处置描述', trigger: 'blur' }
-                                        ]"
-                                    >
-                                    <el-input v-model="dynamicValidateForm.wranDesc" type="textarea" :disabled="active !== 2 || isSuccessDeal" :autosize="{ minRows: 6, maxRows: 10 }"></el-input>
+                                <el-form :model="dynamicValidateForm" :label-position="'top'" ref="dynamicValidateForm"
+                                    label-width="100px" class="demo-dynamic">
+                                    <el-form-item prop="wranDesc" label="处置描述" :rules="[
+                    { required: true, message: '请输入处置描述', trigger: 'blur' }
+                ]">
+                                        <el-input v-model="dynamicValidateForm.wranDesc" type="textarea"
+                                            :disabled="active !== 2 || isSuccessDeal"
+                                            :autosize="{ minRows: 6, maxRows: 10 }"></el-input>
                                     </el-form-item>
-                                  </el-form>
+                                </el-form>
                             </div>
                         </template>
                     </el-step>
@@ -115,52 +102,275 @@
                     <el-button style="margin-top: 12px;" @click="closeDrawer">取消</el-button>
                     <el-button style="margin-top: 12px;" @click="upStep" v-if="active !== 0">上一步</el-button>
                     <el-button style="margin-top: 12px;" @click="nextStep" v-if="active !== 2">下一步</el-button>
-                    <el-button type="primary" style="margin-top: 12px;" @click="submitForm()" v-if="active === 2 && !isSuccessDeal">提交</el-button>
-                    <el-button style="margin-top: 12px;" @click="submitForm()" v-if="active === 2 && isSuccessDeal">关闭</el-button>
+                    <el-button type="primary" style="margin-top: 12px;" @click="submitForm()"
+                        v-if="active === 2 && !isSuccessDeal">提交</el-button>
+                    <el-button style="margin-top: 12px;" @click="submitForm()"
+                        v-if="active === 2 && isSuccessDeal">关闭</el-button>
                 </div>
             </div>
         </el-drawer>
     </div>
 </template>
-
 <script>
+import * as echarts from 'echarts';
+import { WARNTYPE } from "../js/detailData";
 export default {
+    props: {
+        warnItem: {
+            type: Array,
+            default: () => []
+        }
+    },
     data () {
         return {
-            selectOptions: [{
-                value: '1',
-                label: '工程水位预报'
-            }, {
-                value: '2',
-                label: '河道水位预报'
-            }, {
-                value: '3',
-                label: '工程降雨量预报'
-            }, {
-                value: '4',
-                label: '水库出库流量预报'
-            }, {
-                value: '5',
-                label: '流域来水量预报'
-            }, {
-                value: '6',
-                label: '河道流量预报'
-            }],
+            selectOptions: WARNTYPE,
             selectValue: '1',
-            radioOptions: [{
-                label: 1,
-                name: '飞来峡水库'
-            }, {
-                label: 2,
-                name: '龙潭水库'
-            }],
-            radioValue: 1
+            radioOptions: [],
+            radioValue: '1',
+            flowTableData: [],
+            zoom: 1,
+            isCheckbox: false,
+            checkedValue: ['1'],
+            warnDetailData: {},
+            analysisList: [],
+            drawerVisible: false,
+            active: 0,
+            dynamicValidateForm: {
+                wranDesc: ''
+            },
+            warnDealData: [
+                {
+                    name: 'ID',
+                    value: '4001523562'
+                },
+                {
+                    name: '姓名',
+                    value: '张为民'
+                },
+                {
+                    name: '职位',
+                    value: '工程师'
+                },
+                {
+                    name: '单位',
+                    value: '水科院'
+                },
+                {
+                    name: '联系方式',
+                    value: '15025468255'
+                },
+                {
+                    name: '年龄',
+                    value: '41'
+                },
+                {
+                    name: '性别',
+                    value: '男'
+                },
+                {
+                    name: '剩余处理时间',
+                    value: '1小时'
+                },
+            ],
+            isSuccessDeal: false,
+            analysisTableColumnData: [],
+            flowTableColumnData: [],
+            loading: false
         };
     },
-    methods: {
-        handleNodeClick (data) {
-            console.log(data);
+    watch: {
+        warnItem (value) {
+            if (value.length) {
+                this.init()
+            }
         }
+    },
+    mounted () {
+        this.init()
+        this.zoom = 1 / document.body.style.zoom;
+        window.onresize = () => {
+            this.zoom = 1 / document.body.style.zoom;
+            this.initChart()
+        };
+    },
+    methods: {
+        init () {
+            this.resetData()
+            if (!this.warnItem.length) return
+            this.loading = true
+            this.warnDetailData = this.warnItem.find(item => item.warnType === this.selectValue)
+            const { warnTypeList, checkbox, analysisTableData, flowTableData, flowWaterChartData, analysisTableName, analysisTableColumnData, flowTableColumnData } = this.warnDetailData
+            this.radioOptions = warnTypeList
+            this.flowTableData = flowTableData
+            this.isCheckbox = checkbox
+            this.analysisTableColumnData = analysisTableColumnData
+            this.flowTableColumnData = flowTableColumnData
+            if (checkbox) {
+                this.checkedValue.forEach(elem => {
+                    let chart = flowWaterChartData.find(item => item.id === elem)
+                    this.analysisList.push({ chartId: 'chart' + elem, chartData: chart, tableName: analysisTableName, tableData: analysisTableData })
+                });
+            } else {
+                let chart = flowWaterChartData.find(item => item.id === this.radioValue)
+                this.analysisList.push({ chartId: 'chart' + this.radioValue, chartData: chart, tableName: analysisTableName, tableData: analysisTableData })
+            }
+            this.$nextTick(() => {
+                this.initChart()
+                this.loading = false
+            });
+
+        },
+        changeProject (data) {
+            this.loading = true
+            this.radioValue = data
+            this.checkedValue = ['1']
+            this.analysisList = []
+            let chart = this.warnDetailData.flowWaterChartData.find(item => item.id === data)
+            this.analysisList.push({ chartId: 'chart' + data, chartData: chart, tableName: this.warnDetailData.analysisTableName, tableData: this.warnDetailData.analysisTableData })
+            this.$nextTick(() => {
+                this.initChart()
+                this.loading = false
+            });
+        },
+        changeCheckProject (data) {
+            this.loading = true
+            this.radioValue = '1'
+            this.checkedValue = data
+            this.analysisList = []
+            data.forEach(elem => {
+                let chart = this.warnDetailData.flowWaterChartData.find(item => item.id === elem)
+                this.analysisList.push({ chartId: 'chart' + elem, chartData: chart, tableName: this.warnDetailData.analysisTableName, tableData: this.warnDetailData.analysisTableData })
+            });
+            this.$nextTick(() => {
+                this.initChart()
+                this.loading = false
+            });
+        },
+        changeType (val) {
+            this.resetData()
+            this.loading = true
+            this.warnDetailData = this.warnItem.find(item => item.warnType === this.selectValue)
+            const { warnTypeList, checkbox, analysisTableData, flowTableData, flowWaterChartData, analysisTableName, analysisTableColumnData, flowTableColumnData } = this.warnDetailData
+            this.radioOptions = warnTypeList
+            this.flowTableData = flowTableData
+            this.isCheckbox = checkbox
+            this.analysisTableColumnData = analysisTableColumnData
+            this.flowTableColumnData = flowTableColumnData
+            this.selectValue = val
+            this.radioValue = '1'
+            this.checkedValue = ['1']
+            if (checkbox) {
+                this.checkedValue.forEach(elem => {
+                    let chart = flowWaterChartData.find(item => item.id === elem)
+                    this.analysisList.push({ chartId: 'chart' + elem, chartData: chart, tableName: analysisTableName, tableData: analysisTableData })
+                });
+            } else {
+                let chart = flowWaterChartData.find(item => item.id === this.radioValue)
+                this.analysisList.push({ chartId: 'chart' + this.radioValue, chartData: chart, tableName: analysisTableName, tableData: analysisTableData })
+            }
+            this.$nextTick(() => {
+                this.initChart()
+                this.loading = false
+            });
+        },
+        resetData () {
+            this.analysisList = []
+            this.analysisTableColumnData = []
+            this.flowTableColumnData = []
+            this.radioOptions = []
+            this.flowTableData = []
+            this.isCheckbox = false
+        },
+        initChart () {
+            this.analysisList.forEach((data) => {
+                let chart = echarts.init(document.getElementById(data.chartId));
+                chart.clear();
+                let series = []
+                let yAxis = []
+                let tooltip = {}
+                let chartData = data.chartData
+                if (!chartData) chartData = this.warnItem[0].flowWaterChartData
+                if (chartData.toolTipTrigger) {
+                    tooltip.trigger = chartData.toolTipTrigger
+                }
+                chartData.YData.forEach(item => {
+                    series.push(
+                        {
+                            name: item.unit,
+                            data: item.Data,
+                            type: item.barType,
+                            smooth: true,
+                            yAxisIndex: item.yAxisIndex,
+                            itemStyle: {
+                                opacity: item.opacity
+                            },
+                            barWidth: item.barWidth
+                        }
+                    )
+                    yAxis.push({
+                        name: item.yAxisName,
+                        alignTicks: item.alignTicks,
+                        type: item.yAxisType
+                    })
+                })
+
+                let option = {
+                    tooltip: tooltip,
+                    legend: {
+                        right: 'center',
+                        top: '2%'
+                    },
+                    xAxis: {
+                        type: 'category',
+                        boundaryGap: false,
+                        axisLine: { onZero: false },
+                        data: chartData.XData.map(function (str) {
+                            return str.replace(' ', '\n');
+                        })
+                    },
+                    yAxis: yAxis,
+                    grid: {
+                        top: '15%',
+                        bottom: '14%',
+                        left: '5%',
+                        right: '5%'
+                    },
+                    series: series
+                }
+                chart.setOption(option);
+                this.$refs[data.chartId] = chart;
+            });
+        },
+        openWarnDeal (item) {
+            this.drawerVisible = true
+            this.isSuccessDeal = item.warningStatus !== '1'
+            this.resetForm()
+            this.dynamicValidateForm.wranDesc = item.warningStatus === '1' ? '' : '预警信息处置'
+        },
+        nextStep () {
+            if (this.active++ > 2) this.active = 0;
+        },
+        upStep () {
+            if (this.active-- < 0) this.active = 0;
+        },
+        closeDrawer () {
+            this.drawerVisible = false
+            this.active = 0
+            this.resetForm()
+        },
+        submitForm () {
+            this.$refs['dynamicValidateForm'].validate((valid) => {
+                if (valid) {
+                    this.drawerVisible = false
+                    this.active = 0
+                } else {
+                    return false;
+                }
+            });
+        },
+        resetForm () {
+            this.$refs['dynamicValidateForm']?.resetFields();
+        },
     }
 };
 </script>
@@ -249,6 +459,7 @@ export default {
         margin-bottom: 16px;
         border-top: 1px solid #E5E5E5;
         border-bottom: 1px solid #E5E5E5;
+
         .echarts-content {
             width: 951px;
             height: 320px;
@@ -261,9 +472,11 @@ export default {
         }
 
         .warn-analysis {
-          flex: 1;
+            flex: 1;
             height: 300px;
+            padding-right: 16px;
             border-right: 1px solid #E5E5E5;
+            overflow: hidden;
         }
     }
 
@@ -303,6 +516,12 @@ export default {
     .green-span {
         color: #31A08E;
     }
+
+    ::v-deep.table-fixed {
+        .el-table__body-wrapper {
+            height: calc(100% - 44px) !important;
+        }
+    }
 }
 
 ::v-deep.drawer-wrapper {
@@ -325,6 +544,7 @@ export default {
 
         .step-description {
             margin-bottom: 10px;
+
             .description-item {
                 height: 22px;
                 font-family: 思源黑体;
@@ -333,20 +553,24 @@ export default {
                 line-height: 22px;
                 letter-spacing: 0px;
                 margin-bottom: 4px;
+
                 .item-name {
                     color: rgba(0, 0, 0, 0.55);
                 }
+
                 .item-value {
                     color: rgba(0, 0, 0, 0.85);
                 }
             }
         }
+
         .el-step__icon-inner {
             font-size: 14px;
             font-weight: normal;
             line-height: 22px;
             letter-spacing: 0px;
         }
+
         .el-step__title.is-success,
         .el-step__title.is-process,
         .el-step__title.is-wait,
@@ -358,25 +582,31 @@ export default {
             letter-spacing: 0px;
             color: rgba(0, 0, 0, 0.85);
         }
+
         .el-step__head.is-finish {
             .el-step__icon-inner {
                 color: #36B29E;
             }
         }
+
         .el-step__head.is-process {
             color: #fff;
+
             .el-step__icon.is-text {
                 background: #36B29E;
                 border-color: #36B29E;
             }
         }
+
         .el-step__head.is-wait {
             color: #fff;
+
             .el-step__icon.is-text {
                 background: #CDCDCD;
                 border-color: #CDCDCD;
             }
         }
+
         .el-form-item--medium .el-form-item__label {
             font-size: 14px;
             font-weight: 500;
@@ -384,10 +614,12 @@ export default {
             letter-spacing: 0px;
             color: rgba(0, 0, 0, 0.85);
         }
+
         .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:before {
             content: '';
             margin-right: 0px;
         }
+
         .detail-footer {
             position: absolute;
             bottom: 0px;
diff --git a/src/views/aiSupervision/fourPredictions/warnInfo/index.vue b/src/views/aiSupervision/fourPredictions/warnInfo/index.vue
index 66eced9..a2eae7f 100644
--- a/src/views/aiSupervision/fourPredictions/warnInfo/index.vue
+++ b/src/views/aiSupervision/fourPredictions/warnInfo/index.vue
@@ -129,166 +129,135 @@ export default {
 </script>
 
 <template>
-  <div class="warn-wrapper">
-    <!-- 预警信息管理 -->
-    <Tree :data="treeData" :defaultProps="defaultProps" :showInput="false" :default-checked-keys="defaultCheckedKeys"
-      show-checkbox no-checkbox node-key="id" ref="warnTreeRef" class="warn-tree">
-      <template v-slot:default="{ node, data }">
-        <span class="name">{{ data.name }}</span>
-      </template>
-      <template v-slot:right="{ node, data }">
-        <el-dropdown @command="handleCommand($event, data)" v-if="data && !data.children">
-          <span class="btn-item">
-            <i class="el-icon-more"></i>
-          </span>
-          <template #dropdown>
-            <el-dropdown-menu class="dropdown-menu">
-              <el-dropdown-item class="right-menu" command="infoSetting">
-                预演信息配置
-              </el-dropdown-item>
-            </el-dropdown-menu>
+  <div class="slider-right">
+    <div class="top-title">预警预报信息管理</div>
+    <div class="table-box">
+      <el-form
+        inline
+        :model="searchForm"
+        ref="searchForm"
+        class="demo-ruleForm"
+      >
+        <el-form-item label="水工程对象类型:" prop="enginType">
+          <el-select v-model="searchForm.enginType" @change="handleEngin" placeholder="请选择">
+            <el-option
+              v-for="item in enginTypeList"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+              :key="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="行政区划" prop="adcd">
+          <el-cascader
+            :options="areasOptions"
+            v-model="searchForm.adcd"
+            :props="areasOptionProps"
+            placeholder="请选择行政区划"
+            clearable
+            size="small"
+          >
+          </el-cascader>
+        </el-form-item>
+        <el-form-item prop="value">
+          <el-input
+            v-model="searchForm.value"
+            class="search-input"
+            placeholder="请输入水工程名称或者编号"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button class="search-btn" type="success" @click="search"
+          >查询</el-button
+          >
+          <el-button @click="resetSearch">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table height="625" :data="tableData" border>
+        <el-table-column type="index" align="center" label="序号" width="100">
+        </el-table-column>
+        <el-table-column prop="projectName" align="center" label="项目名">
+        </el-table-column>
+        <el-table-column prop="code" align="center" label="编码">
+        </el-table-column>
+        <el-table-column prop="enginName" align="center" label="工程名">
+        </el-table-column>
+        <el-table-column prop="id" align="center" label="ID">
+        </el-table-column>
+        <el-table-column align="center" label="工程类型">
+          <template slot-scope="scope">
+            {{ scope.row.enginType | filterembankment }}
           </template>
-        </el-dropdown>
-      </template>
-
-    </Tree>
-    <forecastDetail></forecastDetail>
+        </el-table-column>
+        <el-table-column prop="updateTime" align="center" label="最新预报时间">
+        </el-table-column>
+        <el-table-column prop="foresee" align="center" label="预见期">
+          <template slot-scope="scope">
+            {{ scope.row.foresee + "天" }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="address" align="center" label="操作">
+          <template slot-scope="scope">
+            <el-button
+              style="margin-right: 16px"
+              @click="handleGoManage(scope.row)"
+              type="text"
+              size="small"
+            >预报预警信息管理</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        background
+        class="pagination"
+        style="margin-top: 16px; margin-right: 16px; float: right"
+        :current-page="pageData.pageNum"
+        :page-sizes="pageData.pageSizes"
+        layout="total, prev, pager, next, sizes, jumper"
+        :total="pageData.total"
+        @current-change="(e) => handleCurrentPageChange(e)"
+        @size-change="(e) => handlePageSizeChange(e)"
+      >
+      </el-pagination>
+    </div>
   </div>
 </template>
-<script>
-import forecastDetail from './components/forecastDetail.vue'
-import Tree from './components/Tree.vue'
-export default {
-  components: { Tree, forecastDetail },
-  data () {
-    return {
-      treeData: [
-        {
-          "id": "1752932766908338178",
-          "parentId": "root",
-          "name": "全部",
-          "userId": 1,
-          "children": [
-            {
-              "id": "1759857493740810240",
-              "parentId": "1752932766908338178",
-              "name": "2024年预报方案",
-              "userId": 1,
-              "children": [
-                {
-                  "id": "1759858444149125122",
-                  "name": "4月12号",
-                  "level": 2,
-                  "children": [
-                    {
-                      "id": "1759858444149125142",
-                      "name": "预报方案1",
-                      "level": 3
-                    },
-                    {
-                      "id": "1759458444149125142",
-                      "name": "预报方案2",
-                      "level": 3
-                    }
-                  ]
-                },
-                {
-                  "id": "1776817687412244481",
-                  "name": "4月13号",
-                  "level": 2,
-                  "children": [
-                    {
-                      "id": "1759858444142125142",
-                      "name": "预报方案1",
-                      "level": 3
-                    },
-                    {
-                      "id": "1759468444149125142",
-                      "name": "预报方案2",
-                      "level": 3
-                    }
-                  ]
-                }
-              ],
-              "level": 1
-            },
-            {
-              "id": "1759857493700810240",
-              "parentId": "1752932766908338178",
-              "name": "2023年预报方案",
-              "userId": 1,
-              "children": [
-                {
-                  "id": "1759858444109125122",
-                  "name": "4月15号",
-                  "level": 2,
-                  "children": [
-                    {
-                      "id": "1759858484149125142",
-                      "name": "预报方案1",
-                      "level": 3
-                    },
-                    {
-                      "id": "1759458444142125142",
-                      "name": "预报方案2",
-                      "level": 3
-                    }
-                  ]
-                },
-                {
-                  "id": "1776817687412244481",
-                  "name": "4月17号",
-                  "level": 2,
-                  "children": [
-                    {
-                      "id": "1759858544142125142",
-                      "name": "预报方案1",
-                      "level": 3
-                    },
-                    {
-                      "id": "1759468444749125142",
-                      "name": "预报方案2",
-                      "level": 3
-                    }
-                  ]
-                }
-              ],
-              "level": 1
-            }
-          ],
-          "level": 0
-        }
-      ],
-      defaultProps: {
-        children: "children",
-        label: "name",
-        // isLeaf: "isLeaf",
-      },
-      defaultCheckedKeys: [],
-      draw: null,
-      _poiTreeData: {},
-      checkedKeys: [],
-      entityFeatures: [],
-      childArr: [],
-    };
-  },
-  methods: {
-    handleCommand (node, data) {
-      console.log(node, data, 'node, data');
-    }
-  },
-};
-</script>
-<style lang="scss" scoped>
-.warn-wrapper {
-  width: 100%;
-  height: 100%;
+
+<style scoped lang="less">
+.top-title {
+  height: 50px;
+  background-color: white;
   display: flex;
-  justify-content: space-between;
+  padding-left: 16px;
+  align-items: center;
+  font-weight: 600;
 }
 
-.warn-tree {
-  width: 350px !important;
-  background-color: aliceblue;
+.table-box {
+  width: 100%;
+  height: calc(100% - 50px - 24px);
+  margin-top: 24px;
+  padding: 16px;
+  background-color: white;
+
+  .search-input {
+    width: 300px;
+    margin-right: 10px;
+  }
+
+  .search-btn {
+    margin-left: 10px;
+    background-color: #37b29e;
+    border: none;
+
+    &:hover {
+      background-color: #5ac6b9;
+    }
+
+    &:active {
+      background-color: #2b8070;
+    }
+  }
 }
 </style>
diff --git a/src/views/aiSupervision/fourPredictions/warnInfo/js/detailData.js b/src/views/aiSupervision/fourPredictions/warnInfo/js/detailData.js
index 031033f..bf25498 100644
--- a/src/views/aiSupervision/fourPredictions/warnInfo/js/detailData.js
+++ b/src/views/aiSupervision/fourPredictions/warnInfo/js/detailData.js
@@ -121,7 +121,9 @@ export const WARNTYPE = [{
     label: '河道流量预报',
     checkbox : false
 }]
-// 预报方案
+/**
+ * 预报方案
+ */
 export const wranPlan = [
     {
         planId: "1759858444149125142",
@@ -134,127 +136,177 @@ export const wranPlan = [
                 checkbox: false,
                 warnTypeList:[{  label: '1', name: '飞来峡水库'}],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName',
+                        width: 110,
+                        // fixed: 'left'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType',
+                        width: 110,
+                        fixed: false
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus',
+                        width: 110  
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWater',
+                        width: 110  
+                    },
+                    {
+                        label: '警戒水位',
+                        prop: 'warningWater',
+                        width: 110  
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime',
+                        width: 110  
+                    }
+                ],
                 analysisTableData: [
                     {
                         projectName: '南门口水位测站1',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站2',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站3',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站4',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站5',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站6',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站7',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }
                 ],
-                flowTableData: [
+                flowTableColumnData: [
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }, 
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: 'ID',
+                        prop: 'ID'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
                     },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
+                flowTableData: [
+                    {
+                        projectName: '南门口水位测站1',
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
+                    }, 
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
+                    },
                 ],
                 flowWaterChartData: [
                     {
@@ -315,25 +367,60 @@ export const wranPlan = [
                     }
                 ],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWater'
+                    },
+                    {
+                        label: '警戒水位',
+                        prop: 'warningWater'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [
                     {
                         projectName: '南门口水位测站1',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站2',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站3',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站4',
                         warningType: '超警戒水位',
@@ -343,100 +430,104 @@ export const wranPlan = [
                         projectName: '南门口水位测站5',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站6',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站7',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }
                 ],
-                flowTableData: [
+                flowTableColumnData: [
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }, 
+                        label: '河道名称',
+                        prop: 'projectName'
+                    },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: 'ID',
+                        prop: 'ID'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报流量',
+                        prop: 'forecastflow'
                     },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
+                flowTableData: [
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
+                    }, 
+                    {
+                        projectName: '南门口水位测站1',
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
+                    },
                 ],
                 flowWaterChartData: [
                     {
@@ -459,7 +550,7 @@ export const wranPlan = [
                                 Data: [10, 32, 11, 34, 90, 30, 20],
                                 unit: '降雨量',
                                 barType: 'line',
-                                yAxisIndex: 1,
+                                yAxisIndex: 0,
                                 yAxisName: '雨量:mm',
                                 yAxisType: 'value',
                                 alignTicks: true,
@@ -499,7 +590,7 @@ export const wranPlan = [
                                 Data: [10, 32, 11, 34, 90, 30, 20],
                                 unit: '降雨量',
                                 barType: 'line',
-                                yAxisIndex: 1,
+                                yAxisIndex: 0,
                                 yAxisName: '雨量:mm',
                                 yAxisType: 'value',
                                 alignTicks: true,
@@ -541,128 +632,162 @@ export const wranPlan = [
                     }
                 ],
                 analysisTableName: '降雨预报详情',
+                analysisTableColumnData: [
+                    {
+                        label: '工程名',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预报范围',
+                        prop: 'forecastRange'
+                    },
+                    {
+                        label: '降雨量',
+                        prop: 'rainfall'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [
                     {
                         projectName: '南门口水位测站1',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastRange: 200,
+                        rainfall: 1008,
+                        forecastTime: '04/09 12:00'
                     },
                     {
-                        projectName: '南门口水位测站2',
+                        projectName: '飞来峡水库FLX1201',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastRange: 200,
+                        rainfall: 1008,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站3',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastRange: 200,
+                        rainfall: 1008,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站4',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastRange: 200,
+                        rainfall: 1008,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站5',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastRange: 200,
+                        rainfall: 1008,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站6',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastRange: 200,
+                        rainfall: 1008,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站7',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastRange: 200,
+                        rainfall: 1008,
+                        forecastTime: '04/09 12:00'
                     }
                 ],
-                flowTableData: [
+                flowTableColumnData: [
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }, 
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: 'ID',
+                        prop: 'ID'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
                     },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
+                flowTableData: [
+                    {
+                        projectName: '南门口水位测站1',
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
+                    }, 
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
+                    },
                 ],
                 flowWaterChartData: [
                     {
@@ -767,128 +892,179 @@ export const wranPlan = [
                     },
                 ],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '设计最大流量',
+                        prop: 'designMaxFlow'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [
                     {
                         projectName: '南门口水位测站1',
-                        warningType: '超警戒水位',
+                        warningType: '超设计泄放流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastOutflow: 2458,
+                        designMaxFlow: 2000,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站2',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超设计泄放流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastOutflow: 2458,
+                        designMaxFlow: 2000,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站3',
-                        warningType: '超警戒水位',
+                        warningType: '超设计泄放流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastOutflow: 2458,
+                        designMaxFlow: 2000,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站4',
-                        warningType: '超警戒水位',
+                        warningType: '超设计泄放流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastOutflow: 2458,
+                        designMaxFlow: 2000,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站5',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超设计泄放流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastOutflow: 2458,
+                        designMaxFlow: 2000,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站6',
-                        warningType: '超警戒水位',
+                        warningType: '超设计泄放流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastOutflow: 2458,
+                        designMaxFlow: 2000,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站7',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超设计泄放流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastOutflow: 2458,
+                        designMaxFlow: 2000,
+                        forecastTime: '04/09 12:00'
                     }
                 ],
-                flowTableData: [
+                flowTableColumnData: [
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }, 
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: 'ID',
+                        prop: 'ID'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '库容',
+                        prop: 'storageCapacity'
                     },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
+                flowTableData: [
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
+                    }, 
+                    {
+                        projectName: '南门口水位测站1',
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
+                    },
                 ],
                 flowWaterChartData: [
                     {
@@ -960,128 +1136,175 @@ export const wranPlan = [
                     }
                 ],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报流量',
+                        prop: 'forecastflow'
+                    },
+                    {
+                        label: '警戒流量',
+                        prop: 'warnFlow'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [
                     {
                         projectName: '南门口水位测站1',
-                        warningType: '超警戒水位',
+                        warningType: '超警戒流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站2',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超警戒流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站3',
-                        warningType: '超警戒水位',
+                        warningType: '超警戒流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站4',
-                        warningType: '超警戒水位',
+                        warningType: '超警戒流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站5',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超警戒流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站6',
-                        warningType: '超警戒水位',
+                        warningType: '超警戒流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站7',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超警戒流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }
                 ],
-                flowTableData: [
+                flowTableColumnData: [
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }, 
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: 'ID',
+                        prop: 'ID'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
                     },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
+                flowTableData: [
+                    {
+                        projectName: '南门口水位测站1',
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
+                    }, 
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
+                    },
                 ],
                 flowWaterChartData: [
                     {
@@ -1182,128 +1405,179 @@ export const wranPlan = [
                     }
                 ],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报流量',
+                        prop: 'forecastflow'
+                    },
+                    {
+                        label: '警戒流量',
+                        prop: 'warnFlow'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [
                     {
                         projectName: '南门口水位测站1',
-                        warningType: '超警戒水位',
+                        warningType: '超警戒流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站2',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超警戒流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站3',
-                        warningType: '超警戒水位',
+                        warningType: '超警戒流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站4',
-                        warningType: '超警戒水位',
+                        warningType: '超警戒流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站5',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超警戒流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站6',
-                        warningType: '超警戒水位',
+                        warningType: '超警戒流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站7',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超警戒流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }
                 ],
-                flowTableData: [
+                flowTableColumnData: [
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }, 
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: 'ID',
+                        prop: 'ID'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
                     },
+                    {
+                        label: '河道流量',
+                        prop: 'riverwayFlow'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
+                flowTableData: [
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        riverwayFlow: 2456.15,
+                        forecastTime: '04/09 12:00'
+                    }, 
+                    {
+                        projectName: '南门口水位测站1',
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        riverwayFlow: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        riverwayFlow: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        riverwayFlow: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        riverwayFlow: 2456.15,
+                        forecastTime: '04/09 12:00'
+                    },
                 ],
                 flowWaterChartData: [
                     {
@@ -1402,7 +1676,63 @@ export const wranPlan = [
                 checkbox: false,
                 warnTypeList:[{  label: '1', name: '飞来峡水库'}],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWater'
+                    },
+                    {
+                        label: '警戒水位',
+                        prop: 'warningWater'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableData: [],
+                flowTableColumnData: [
+                    {
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: 'ID',
+                        prop: 'ID'
+                    },
+                    {
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
+                    },
+                    {
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 flowTableData: [],
                 flowWaterChartData: [
                     {
@@ -1455,8 +1785,64 @@ export const wranPlan = [
                     }
                 ],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWater'
+                    },
+                    {
+                        label: '警戒水位',
+                        prop: 'warningWater'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [],
+                flowTableColumnData: [
+                    {
+                        label: '河道名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: 'ID',
+                        prop: 'ID'
+                    },
+                    {
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
+                    },
+                    {
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报流量',
+                        prop: 'forecastflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 flowTableData: [],
                 flowWaterChartData: [
                     {
@@ -1545,8 +1931,56 @@ export const wranPlan = [
                     }
                 ],
                 analysisTableName: '降雨预报详情',
+                analysisTableColumnData: [
+                    {
+                        label: '工程名',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预报范围',
+                        prop: 'forecastRange'
+                    },
+                    {
+                        label: '降雨量',
+                        prop: 'rainfall'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [],
+                flowTableColumnData: [
+                    {
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: 'ID',
+                        prop: 'ID'
+                    },
+                    {
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
+                    },
+                    {
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 flowTableData: [],
                 flowWaterChartData: [
                     {
@@ -1627,8 +2061,68 @@ export const wranPlan = [
                     },
                 ],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '设计最大流量',
+                        prop: 'designMaxFlow'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [],
+                flowTableColumnData: [
+                    {
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: 'ID',
+                        prop: 'ID'
+                    },
+                    {
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
+                    },
+                    {
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '库容',
+                        prop: 'storageCapacity'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 flowTableData: [],
                 flowWaterChartData: [
                     {
@@ -1692,8 +2186,64 @@ export const wranPlan = [
                     }
                 ],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报流量',
+                        prop: 'forecastflow'
+                    },
+                    {
+                        label: '警戒流量',
+                        prop: 'warnFlow'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [],
+                flowTableColumnData: [
+                    {
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: 'ID',
+                        prop: 'ID'
+                    },
+                    {
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
+                    },
+                    {
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 flowTableData: [],
                 flowWaterChartData: [
                     {
@@ -1778,8 +2328,68 @@ export const wranPlan = [
                     }
                 ],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报流量',
+                        prop: 'forecastflow'
+                    },
+                    {
+                        label: '警戒流量',
+                        prop: 'warnFlow'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [],
+                flowTableColumnData: [
+                    {
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: 'ID',
+                        prop: 'ID'
+                    },
+                    {
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
+                    },
+                    {
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '河道流量',
+                        prop: 'riverwayFlow'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 flowTableData: [],
                 flowWaterChartData: [
                     {

From f620b6b035b2dcf8ee56a872e76f16f36e2bf73a Mon Sep 17 00:00:00 2001
From: ruancuihong <2806986110@qq.com>
Date: Tue, 7 May 2024 19:05:19 +0800
Subject: [PATCH 03/23] =?UTF-8?q?fix:=20=E6=BC=8F=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warnInfo/components/forecastDetail.vue    |  156 +-
 .../fourPredictions/warnInfo/index.vue        |   86 +-
 .../fourPredictions/warnInfo/js/detailData.js | 1516 ++++++++++++-----
 3 files changed, 1184 insertions(+), 574 deletions(-)

diff --git a/src/views/aiSupervision/fourPredictions/warnInfo/components/forecastDetail.vue b/src/views/aiSupervision/fourPredictions/warnInfo/components/forecastDetail.vue
index 4e7eb8d..0580833 100644
--- a/src/views/aiSupervision/fourPredictions/warnInfo/components/forecastDetail.vue
+++ b/src/views/aiSupervision/fourPredictions/warnInfo/components/forecastDetail.vue
@@ -22,52 +22,39 @@
             <div class="analysis-content" v-for="(item, index) in analysisList" :key="index">
                 <div class="echarts-content">
                     <span class="title-name">{{ item.chartData.chartName }}</span>
-                    <div class="echarts-box" :id="item.chartId" :ref="item.chartId" :style="{ 'zoom': zoom, 'width': 'calc(951px /' + zoom + ')', height: 'calc(260px / ' + zoom + ')' }"></div>
+                    <div class="echarts-box" :id="item.chartId" :ref="item.chartId"
+                        :style="{ 'zoom': zoom, 'width': 'calc(951px /' + zoom + ')', height: 'calc(260px / ' + zoom + ')' }">
+                    </div>
                 </div>
                 <div class="warn-analysis">
                     <span class="title-name">{{ item.tableName }}</span>
-                    <el-table height="258" :data="item.tableData" border>
-                        <el-table-column prop="projectName" align="center" label="站点名称">
-                        </el-table-column>
-                        <el-table-column prop="warningType" align="center" label="预警类型">
-                        </el-table-column>
-                        <el-table-column prop="warningStatus" align="center" label="预警状态">
+                    <el-table height="258" max-height="258" style="width: 100%" v-if="!loading" :data="item.tableData"
+                        border class="table-fixed">
+                        <el-table-column v-for="(items, indexs) in analysisTableColumnData" :key="indexs"
+                            :prop="items.prop" align="center" :label="items.label" :fixed="items.fixed || false"
+                            :width="items.width || 110">
                             <template slot-scope="scope">
-                                <div @click="openWarnDeal(scope.row)"
+                                <div @click="openWarnDeal(scope.row)" v-if="items.prop === 'warningStatus'"
                                     :class="{ 'green-span': scope.row.warningStatus !== '1' }" class="default-span">
                                     {{ scope.row.warningStatus === '1' ? '处理中' : '已处理' }}
                                 </div>
+                                <div v-else>{{ scope.row[`${items.prop}`] }}</div>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="warningInfo" align="center" label="预报">
-                        </el-table-column>
                     </el-table>
                 </div>
             </div>
         </div>
         <div class="water-leve-forecast">
-            <span class="title-name">{{warnDetailData.wranTypeName}}</span>
-            <el-table height="235" :data="flowTableData" border>
-                <el-table-column prop="projectName" align="center" label="工程名称">
-                </el-table-column>
-                <el-table-column prop="projectID" align="center" label="ID">
-                </el-table-column>
-                <el-table-column prop="rainFlow" align="center" label="预报雨量">
-                </el-table-column>
-                <el-table-column prop="waterFlow" align="center" label="预报来水量">
-                </el-table-column>
-                <el-table-column prop="outFlow" align="center" label="预报出库流量">
-                </el-table-column>
-                <el-table-column prop="water" align="center" label="预报水位">
-                </el-table-column>
-                <el-table-column prop="flow" align="center" label="河道流量">
-                </el-table-column>
-                <el-table-column prop="warningTime" align="center" label="预报时间">
+            <span class="title-name">{{ warnDetailData.wranTypeName }}</span>
+            <el-table height="235" v-if="!loading" :data="flowTableData" border class="table-fixed">
+                <el-table-column v-for="(item, index) in flowTableColumnData" :key="index" :prop="item.prop"
+                    align="center" :label="item.label">
                 </el-table-column>
             </el-table>
         </div>
-        <el-drawer title="预警处理详情" class="drawer-wrapper" size="300px" :visible.sync="drawerVisible" :append-to-body="true" @close="closeDrawer"
-            :with-header="true">
+        <el-drawer title="预警处理详情" class="drawer-wrapper" size="300px" :visible.sync="drawerVisible"
+            :append-to-body="true" @close="closeDrawer" :with-header="true">
             <div class="warn-deal-content">
                 <el-steps direction="vertical" :active="active">
                     <el-step title="超汛限预警">
@@ -97,17 +84,16 @@
                     <el-step title="预警处置">
                         <template slot="description">
                             <div class="step-description" v-if="active === 2">
-                                <el-form :model="dynamicValidateForm" :label-position="'top'" ref="dynamicValidateForm" label-width="100px" class="demo-dynamic">
-                                    <el-form-item
-                                      prop="wranDesc"
-                                      label="处置描述"
-                                      :rules="[
-                                        { required: true, message: '请输入处置描述', trigger: 'blur' }
-                                        ]"
-                                    >
-                                    <el-input v-model="dynamicValidateForm.wranDesc" type="textarea" :disabled="active !== 2 || isSuccessDeal" :autosize="{ minRows: 6, maxRows: 10 }"></el-input>
+                                <el-form :model="dynamicValidateForm" :label-position="'top'" ref="dynamicValidateForm"
+                                    label-width="100px" class="demo-dynamic">
+                                    <el-form-item prop="wranDesc" label="处置描述" :rules="[
+                    { required: true, message: '请输入处置描述', trigger: 'blur' }
+                ]">
+                                        <el-input v-model="dynamicValidateForm.wranDesc" type="textarea"
+                                            :disabled="active !== 2 || isSuccessDeal"
+                                            :autosize="{ minRows: 6, maxRows: 10 }"></el-input>
                                     </el-form-item>
-                                  </el-form>
+                                </el-form>
                             </div>
                         </template>
                     </el-step>
@@ -116,8 +102,10 @@
                     <el-button style="margin-top: 12px;" @click="closeDrawer">取消</el-button>
                     <el-button style="margin-top: 12px;" @click="upStep" v-if="active !== 0">上一步</el-button>
                     <el-button style="margin-top: 12px;" @click="nextStep" v-if="active !== 2">下一步</el-button>
-                    <el-button type="primary" style="margin-top: 12px;" @click="submitForm()" v-if="active === 2 && !isSuccessDeal">提交</el-button>
-                    <el-button style="margin-top: 12px;" @click="submitForm()" v-if="active === 2 && isSuccessDeal">关闭</el-button>
+                    <el-button type="primary" style="margin-top: 12px;" @click="submitForm()"
+                        v-if="active === 2 && !isSuccessDeal">提交</el-button>
+                    <el-button style="margin-top: 12px;" @click="submitForm()"
+                        v-if="active === 2 && isSuccessDeal">关闭</el-button>
                 </div>
             </div>
         </el-drawer>
@@ -184,7 +172,10 @@ export default {
                     value: '1小时'
                 },
             ],
-            isSuccessDeal: false
+            isSuccessDeal: false,
+            analysisTableColumnData: [],
+            flowTableColumnData: [],
+            loading: false
         };
     },
     watch: {
@@ -204,13 +195,16 @@ export default {
     },
     methods: {
         init () {
+            this.resetData()
             if (!this.warnItem.length) return
+            this.loading = true
             this.warnDetailData = this.warnItem.find(item => item.warnType === this.selectValue)
-            const { warnTypeList, checkbox, analysisTableData, flowTableData, flowWaterChartData, analysisTableName } = this.warnDetailData
+            const { warnTypeList, checkbox, analysisTableData, flowTableData, flowWaterChartData, analysisTableName, analysisTableColumnData, flowTableColumnData } = this.warnDetailData
             this.radioOptions = warnTypeList
             this.flowTableData = flowTableData
             this.isCheckbox = checkbox
-            this.analysisList = []
+            this.analysisTableColumnData = analysisTableColumnData
+            this.flowTableColumnData = flowTableColumnData
             if (checkbox) {
                 this.checkedValue.forEach(elem => {
                     let chart = flowWaterChartData.find(item => item.id === elem)
@@ -222,9 +216,12 @@ export default {
             }
             this.$nextTick(() => {
                 this.initChart()
+                this.loading = false
             });
+
         },
         changeProject (data) {
+            this.loading = true
             this.radioValue = data
             this.checkedValue = ['1']
             this.analysisList = []
@@ -232,9 +229,11 @@ export default {
             this.analysisList.push({ chartId: 'chart' + data, chartData: chart, tableName: this.warnDetailData.analysisTableName, tableData: this.warnDetailData.analysisTableData })
             this.$nextTick(() => {
                 this.initChart()
+                this.loading = false
             });
         },
         changeCheckProject (data) {
+            this.loading = true
             this.radioValue = '1'
             this.checkedValue = data
             this.analysisList = []
@@ -244,18 +243,22 @@ export default {
             });
             this.$nextTick(() => {
                 this.initChart()
+                this.loading = false
             });
         },
         changeType (val) {
+            this.resetData()
+            this.loading = true
             this.warnDetailData = this.warnItem.find(item => item.warnType === this.selectValue)
-            const { warnTypeList, checkbox, analysisTableData, flowTableData, flowWaterChartData, analysisTableName } = this.warnDetailData
+            const { warnTypeList, checkbox, analysisTableData, flowTableData, flowWaterChartData, analysisTableName, analysisTableColumnData, flowTableColumnData } = this.warnDetailData
             this.radioOptions = warnTypeList
             this.flowTableData = flowTableData
             this.isCheckbox = checkbox
+            this.analysisTableColumnData = analysisTableColumnData
+            this.flowTableColumnData = flowTableColumnData
             this.selectValue = val
             this.radioValue = '1'
             this.checkedValue = ['1']
-            this.analysisList = []
             if (checkbox) {
                 this.checkedValue.forEach(elem => {
                     let chart = flowWaterChartData.find(item => item.id === elem)
@@ -267,8 +270,17 @@ export default {
             }
             this.$nextTick(() => {
                 this.initChart()
+                this.loading = false
             });
         },
+        resetData () {
+            this.analysisList = []
+            this.analysisTableColumnData = []
+            this.flowTableColumnData = []
+            this.radioOptions = []
+            this.flowTableData = []
+            this.isCheckbox = false
+        },
         initChart () {
             this.analysisList.forEach((data) => {
                 let chart = echarts.init(document.getElementById(data.chartId));
@@ -341,24 +353,24 @@ export default {
         upStep () {
             if (this.active-- < 0) this.active = 0;
         },
-        closeDrawer() {
+        closeDrawer () {
             this.drawerVisible = false
             this.active = 0
             this.resetForm()
         },
-        submitForm() {
-        this.$refs['dynamicValidateForm'].validate((valid) => {
-          if (valid) {
-            this.drawerVisible = false
-            this.active = 0
-          } else {
-            return false;
-          }
-        });
-      },
-      resetForm() {
-        this.$refs['dynamicValidateForm']?.resetFields();
-      },
+        submitForm () {
+            this.$refs['dynamicValidateForm'].validate((valid) => {
+                if (valid) {
+                    this.drawerVisible = false
+                    this.active = 0
+                } else {
+                    return false;
+                }
+            });
+        },
+        resetForm () {
+            this.$refs['dynamicValidateForm']?.resetFields();
+        },
     }
 };
 </script>
@@ -447,6 +459,7 @@ export default {
         margin-bottom: 16px;
         border-top: 1px solid #E5E5E5;
         border-bottom: 1px solid #E5E5E5;
+
         .echarts-content {
             width: 951px;
             height: 320px;
@@ -459,9 +472,11 @@ export default {
         }
 
         .warn-analysis {
-          flex: 1;
+            flex: 1;
             height: 300px;
+            padding-right: 16px;
             border-right: 1px solid #E5E5E5;
+            overflow: hidden;
         }
     }
 
@@ -501,6 +516,12 @@ export default {
     .green-span {
         color: #31A08E;
     }
+
+    ::v-deep.table-fixed {
+        .el-table__body-wrapper {
+            height: calc(100% - 44px) !important;
+        }
+    }
 }
 
 ::v-deep.drawer-wrapper {
@@ -523,6 +544,7 @@ export default {
 
         .step-description {
             margin-bottom: 10px;
+
             .description-item {
                 height: 22px;
                 font-family: 思源黑体;
@@ -531,20 +553,24 @@ export default {
                 line-height: 22px;
                 letter-spacing: 0px;
                 margin-bottom: 4px;
+
                 .item-name {
                     color: rgba(0, 0, 0, 0.55);
                 }
+
                 .item-value {
                     color: rgba(0, 0, 0, 0.85);
                 }
             }
         }
+
         .el-step__icon-inner {
             font-size: 14px;
             font-weight: normal;
             line-height: 22px;
             letter-spacing: 0px;
         }
+
         .el-step__title.is-success,
         .el-step__title.is-process,
         .el-step__title.is-wait,
@@ -556,25 +582,31 @@ export default {
             letter-spacing: 0px;
             color: rgba(0, 0, 0, 0.85);
         }
+
         .el-step__head.is-finish {
             .el-step__icon-inner {
                 color: #36B29E;
             }
         }
+
         .el-step__head.is-process {
             color: #fff;
+
             .el-step__icon.is-text {
                 background: #36B29E;
                 border-color: #36B29E;
             }
         }
+
         .el-step__head.is-wait {
             color: #fff;
+
             .el-step__icon.is-text {
                 background: #CDCDCD;
                 border-color: #CDCDCD;
             }
         }
+
         .el-form-item--medium .el-form-item__label {
             font-size: 14px;
             font-weight: 500;
@@ -582,10 +614,12 @@ export default {
             letter-spacing: 0px;
             color: rgba(0, 0, 0, 0.85);
         }
+
         .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:before {
             content: '';
             margin-right: 0px;
         }
+
         .detail-footer {
             position: absolute;
             bottom: 0px;
diff --git a/src/views/aiSupervision/fourPredictions/warnInfo/index.vue b/src/views/aiSupervision/fourPredictions/warnInfo/index.vue
index a2eae7f..8cd5415 100644
--- a/src/views/aiSupervision/fourPredictions/warnInfo/index.vue
+++ b/src/views/aiSupervision/fourPredictions/warnInfo/index.vue
@@ -1,4 +1,3 @@
-
 <!-- 预警预报信息管理 -->
 <script>
 import { getAreasData } from "@/api/areas/index";
@@ -6,7 +5,7 @@ import { ENGINTYPE, TABELLIST } from "../const";
 let that;
 export default {
   name: "warnInfo",
-  data() {
+  data () {
     return {
       searchForm: {
         enginType: "1",
@@ -28,37 +27,37 @@ export default {
       },
     };
   },
-  created() {
+  created () {
     that = this;
   },
   filters: {
     // 过滤类型
-    filterembankment(price) {
+    filterembankment (price) {
       const data = that.enginTypeList.filter((res) => res.dictValue == price);
       return data[0] ? data[0].dictLabel : "/";
     },
   },
   methods: {
-    handleGoManage(row) {
+    handleGoManage (row) {
       this.$router.push({
         path: "warnInfoDetail",
         query: { id: row.id },
       });
     },
-    handleCurrentPageChange(page) {
+    handleCurrentPageChange (page) {
       this.pageData.pageNum = page;
       this.getTableData();
     },
-    handlePageSizeChange(pageSize) {
+    handlePageSizeChange (pageSize) {
       this.pageData.pageSize = pageSize;
       this.getTableData();
     },
-    search() {
+    search () {
       this.pageData.pageNum = 1;
       this.getTableData();
     },
     // 重置搜索
-    resetSearch() {
+    resetSearch () {
       this.pageData.pageNum = 1;
       if (!this.$refs["searchForm"]) return;
       this.$refs["searchForm"].resetFields();
@@ -66,7 +65,7 @@ export default {
     },
 
     // 获取地区树数据
-    getTreeData() {
+    getTreeData () {
       getAreasData().then((items) => {
         this.adcdOptions = items.data;
         if (items?.data) {
@@ -89,11 +88,11 @@ export default {
         }
       });
     },
-    handleEngin() {
+    handleEngin () {
       this.getTableData()
     },
     // 获取列表数据
-    getTableData() {
+    getTableData () {
       console.log(this.searchForm);
       const list = TABELLIST.filter(res => {
         let filter = true
@@ -110,7 +109,7 @@ export default {
           if (
             !res.enginName.includes(this.searchForm.value) &&
             !res.code.includes(this.searchForm.value)
-            ) {
+          ) {
             filter = false
           }
         }
@@ -120,7 +119,7 @@ export default {
       this.tableData = list
     }
   },
-  async mounted() {
+  async mounted () {
     this.getTreeData()
     this.getTableData()
 
@@ -132,44 +131,23 @@ export default {
   <div class="slider-right">
     <div class="top-title">预警预报信息管理</div>
     <div class="table-box">
-      <el-form
-        inline
-        :model="searchForm"
-        ref="searchForm"
-        class="demo-ruleForm"
-      >
+      <el-form inline :model="searchForm" ref="searchForm" class="demo-ruleForm">
         <el-form-item label="水工程对象类型:" prop="enginType">
           <el-select v-model="searchForm.enginType" @change="handleEngin" placeholder="请选择">
-            <el-option
-              v-for="item in enginTypeList"
-              :label="item.dictLabel"
-              :value="item.dictValue"
-              :key="item.id"
-            ></el-option>
+            <el-option v-for="item in enginTypeList" :label="item.dictLabel" :value="item.dictValue"
+              :key="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="行政区划" prop="adcd">
-          <el-cascader
-            :options="areasOptions"
-            v-model="searchForm.adcd"
-            :props="areasOptionProps"
-            placeholder="请选择行政区划"
-            clearable
-            size="small"
-          >
+          <el-cascader :options="areasOptions" v-model="searchForm.adcd" :props="areasOptionProps" placeholder="请选择行政区划"
+            clearable size="small">
           </el-cascader>
         </el-form-item>
         <el-form-item prop="value">
-          <el-input
-            v-model="searchForm.value"
-            class="search-input"
-            placeholder="请输入水工程名称或者编号"
-          ></el-input>
+          <el-input v-model="searchForm.value" class="search-input" placeholder="请输入水工程名称或者编号"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button class="search-btn" type="success" @click="search"
-          >查询</el-button
-          >
+          <el-button class="search-btn" type="success" @click="search">查询</el-button>
           <el-button @click="resetSearch">重置</el-button>
         </el-form-item>
       </el-form>
@@ -198,27 +176,15 @@ export default {
         </el-table-column>
         <el-table-column prop="address" align="center" label="操作">
           <template slot-scope="scope">
-            <el-button
-              style="margin-right: 16px"
-              @click="handleGoManage(scope.row)"
-              type="text"
-              size="small"
-            >预报预警信息管理</el-button
-            >
+            <el-button style="margin-right: 16px" @click="handleGoManage(scope.row)" type="text"
+              size="small">预报预警信息管理</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        background
-        class="pagination"
-        style="margin-top: 16px; margin-right: 16px; float: right"
-        :current-page="pageData.pageNum"
-        :page-sizes="pageData.pageSizes"
-        layout="total, prev, pager, next, sizes, jumper"
-        :total="pageData.total"
-        @current-change="(e) => handleCurrentPageChange(e)"
-        @size-change="(e) => handlePageSizeChange(e)"
-      >
+      <el-pagination background class="pagination" style="margin-top: 16px; margin-right: 16px; float: right"
+        :current-page="pageData.pageNum" :page-sizes="pageData.pageSizes"
+        layout="total, prev, pager, next, sizes, jumper" :total="pageData.total"
+        @current-change="(e) => handleCurrentPageChange(e)" @size-change="(e) => handlePageSizeChange(e)">
       </el-pagination>
     </div>
   </div>
diff --git a/src/views/aiSupervision/fourPredictions/warnInfo/js/detailData.js b/src/views/aiSupervision/fourPredictions/warnInfo/js/detailData.js
index 031033f..bf25498 100644
--- a/src/views/aiSupervision/fourPredictions/warnInfo/js/detailData.js
+++ b/src/views/aiSupervision/fourPredictions/warnInfo/js/detailData.js
@@ -121,7 +121,9 @@ export const WARNTYPE = [{
     label: '河道流量预报',
     checkbox : false
 }]
-// 预报方案
+/**
+ * 预报方案
+ */
 export const wranPlan = [
     {
         planId: "1759858444149125142",
@@ -134,127 +136,177 @@ export const wranPlan = [
                 checkbox: false,
                 warnTypeList:[{  label: '1', name: '飞来峡水库'}],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName',
+                        width: 110,
+                        // fixed: 'left'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType',
+                        width: 110,
+                        fixed: false
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus',
+                        width: 110  
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWater',
+                        width: 110  
+                    },
+                    {
+                        label: '警戒水位',
+                        prop: 'warningWater',
+                        width: 110  
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime',
+                        width: 110  
+                    }
+                ],
                 analysisTableData: [
                     {
                         projectName: '南门口水位测站1',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站2',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站3',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站4',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站5',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站6',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站7',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }
                 ],
-                flowTableData: [
+                flowTableColumnData: [
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }, 
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: 'ID',
+                        prop: 'ID'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
                     },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
+                flowTableData: [
+                    {
+                        projectName: '南门口水位测站1',
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
+                    }, 
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
+                    },
                 ],
                 flowWaterChartData: [
                     {
@@ -315,25 +367,60 @@ export const wranPlan = [
                     }
                 ],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWater'
+                    },
+                    {
+                        label: '警戒水位',
+                        prop: 'warningWater'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [
                     {
                         projectName: '南门口水位测站1',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站2',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站3',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站4',
                         warningType: '超警戒水位',
@@ -343,100 +430,104 @@ export const wranPlan = [
                         projectName: '南门口水位测站5',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站6',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站7',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastWater: '12.0',
+                        warningWater: '11.8',
+                        forecastTime: '04/09 12:00'
                     }
                 ],
-                flowTableData: [
+                flowTableColumnData: [
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }, 
+                        label: '河道名称',
+                        prop: 'projectName'
+                    },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: 'ID',
+                        prop: 'ID'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报流量',
+                        prop: 'forecastflow'
                     },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
+                flowTableData: [
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
+                    }, 
+                    {
+                        projectName: '南门口水位测站1',
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
+                    },
                 ],
                 flowWaterChartData: [
                     {
@@ -459,7 +550,7 @@ export const wranPlan = [
                                 Data: [10, 32, 11, 34, 90, 30, 20],
                                 unit: '降雨量',
                                 barType: 'line',
-                                yAxisIndex: 1,
+                                yAxisIndex: 0,
                                 yAxisName: '雨量:mm',
                                 yAxisType: 'value',
                                 alignTicks: true,
@@ -499,7 +590,7 @@ export const wranPlan = [
                                 Data: [10, 32, 11, 34, 90, 30, 20],
                                 unit: '降雨量',
                                 barType: 'line',
-                                yAxisIndex: 1,
+                                yAxisIndex: 0,
                                 yAxisName: '雨量:mm',
                                 yAxisType: 'value',
                                 alignTicks: true,
@@ -541,128 +632,162 @@ export const wranPlan = [
                     }
                 ],
                 analysisTableName: '降雨预报详情',
+                analysisTableColumnData: [
+                    {
+                        label: '工程名',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预报范围',
+                        prop: 'forecastRange'
+                    },
+                    {
+                        label: '降雨量',
+                        prop: 'rainfall'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [
                     {
                         projectName: '南门口水位测站1',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastRange: 200,
+                        rainfall: 1008,
+                        forecastTime: '04/09 12:00'
                     },
                     {
-                        projectName: '南门口水位测站2',
+                        projectName: '飞来峡水库FLX1201',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastRange: 200,
+                        rainfall: 1008,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站3',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastRange: 200,
+                        rainfall: 1008,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站4',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastRange: 200,
+                        rainfall: 1008,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站5',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastRange: 200,
+                        rainfall: 1008,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站6',
                         warningType: '超警戒水位',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastRange: 200,
+                        rainfall: 1008,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站7',
                         warningType: '超警戒水位',
                         warningStatus: '1',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastRange: 200,
+                        rainfall: 1008,
+                        forecastTime: '04/09 12:00'
                     }
                 ],
-                flowTableData: [
+                flowTableColumnData: [
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }, 
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: 'ID',
+                        prop: 'ID'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
                     },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
+                flowTableData: [
+                    {
+                        projectName: '南门口水位测站1',
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
+                    }, 
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        forecastTime: '04/09 12:00'
+                    },
                 ],
                 flowWaterChartData: [
                     {
@@ -767,128 +892,179 @@ export const wranPlan = [
                     },
                 ],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '设计最大流量',
+                        prop: 'designMaxFlow'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [
                     {
                         projectName: '南门口水位测站1',
-                        warningType: '超警戒水位',
+                        warningType: '超设计泄放流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastOutflow: 2458,
+                        designMaxFlow: 2000,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站2',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超设计泄放流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastOutflow: 2458,
+                        designMaxFlow: 2000,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站3',
-                        warningType: '超警戒水位',
+                        warningType: '超设计泄放流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastOutflow: 2458,
+                        designMaxFlow: 2000,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站4',
-                        warningType: '超警戒水位',
+                        warningType: '超设计泄放流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastOutflow: 2458,
+                        designMaxFlow: 2000,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站5',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超设计泄放流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastOutflow: 2458,
+                        designMaxFlow: 2000,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站6',
-                        warningType: '超警戒水位',
+                        warningType: '超设计泄放流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastOutflow: 2458,
+                        designMaxFlow: 2000,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站7',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超设计泄放流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastOutflow: 2458,
+                        designMaxFlow: 2000,
+                        forecastTime: '04/09 12:00'
                     }
                 ],
-                flowTableData: [
+                flowTableColumnData: [
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }, 
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: 'ID',
+                        prop: 'ID'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '库容',
+                        prop: 'storageCapacity'
                     },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
+                flowTableData: [
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
+                    }, 
+                    {
+                        projectName: '南门口水位测站1',
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
+                    },
                 ],
                 flowWaterChartData: [
                     {
@@ -960,128 +1136,175 @@ export const wranPlan = [
                     }
                 ],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报流量',
+                        prop: 'forecastflow'
+                    },
+                    {
+                        label: '警戒流量',
+                        prop: 'warnFlow'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [
                     {
                         projectName: '南门口水位测站1',
-                        warningType: '超警戒水位',
+                        warningType: '超警戒流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站2',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超警戒流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站3',
-                        warningType: '超警戒水位',
+                        warningType: '超警戒流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站4',
-                        warningType: '超警戒水位',
+                        warningType: '超警戒流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站5',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超警戒流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站6',
-                        warningType: '超警戒水位',
+                        warningType: '超警戒流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站7',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超警戒流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }
                 ],
-                flowTableData: [
+                flowTableColumnData: [
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }, 
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: 'ID',
+                        prop: 'ID'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
                     },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
+                flowTableData: [
+                    {
+                        projectName: '南门口水位测站1',
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
+                    }, 
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        storageCapacity: 2456.15,
+                        forecastTime: '04/09 12:00'
+                    },
                 ],
                 flowWaterChartData: [
                     {
@@ -1182,128 +1405,179 @@ export const wranPlan = [
                     }
                 ],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报流量',
+                        prop: 'forecastflow'
+                    },
+                    {
+                        label: '警戒流量',
+                        prop: 'warnFlow'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [
                     {
                         projectName: '南门口水位测站1',
-                        warningType: '超警戒水位',
+                        warningType: '超警戒流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站2',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超警戒流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站3',
-                        warningType: '超警戒水位',
+                        warningType: '超警戒流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站4',
-                        warningType: '超警戒水位',
+                        warningType: '超警戒流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站5',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超警戒流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站6',
-                        warningType: '超警戒水位',
+                        warningType: '超警戒流量',
                         warningStatus: '2',
-                        warningInfo: '12'
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }, {
                         projectName: '南门口水位测站7',
-                        warningType: '超警戒水位',
-                        warningStatus: '1',
-                        warningInfo: '12'
+                        warningType: '超警戒流量',
+                        warningStatus: '2',
+                        warningInfo: '12',
+                        forecastflow: 2504,
+                        warnFlow: 2400,
+                        forecastTime: '04/09 12:00'
                     }
                 ],
-                flowTableData: [
+                flowTableColumnData: [
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }, 
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: 'ID',
+                        prop: 'ID'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
                     },
                     {
-                        projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
                     },
+                    {
+                        label: '河道流量',
+                        prop: 'riverwayFlow'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
+                flowTableData: [
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        riverwayFlow: 2456.15,
+                        forecastTime: '04/09 12:00'
+                    }, 
+                    {
+                        projectName: '南门口水位测站1',
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        riverwayFlow: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        riverwayFlow: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        riverwayFlow: 2456.15,
+                        forecastTime: '04/09 12:00'
                     },
                     {
                         projectName: '南门口水位测站1',
-                        projectID: 'BHA10000001',
-                        rainFlow: '200',
-                        waterFlow: '1002',
-                        outFlow: '820',
-                        water: '12.5',
-                        flow: '8',
-                        warningTime: '04/09 12:00'
-                    }
+                        ID: 'BHA10000001',
+                        forecastRainfall: 200,
+                        forecastInflow: 1008,
+                        forecastOutflow: 820,
+                        forecastWaterLevel: 12.5,
+                        riverwayFlow: 2456.15,
+                        forecastTime: '04/09 12:00'
+                    },
                 ],
                 flowWaterChartData: [
                     {
@@ -1402,7 +1676,63 @@ export const wranPlan = [
                 checkbox: false,
                 warnTypeList:[{  label: '1', name: '飞来峡水库'}],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWater'
+                    },
+                    {
+                        label: '警戒水位',
+                        prop: 'warningWater'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableData: [],
+                flowTableColumnData: [
+                    {
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: 'ID',
+                        prop: 'ID'
+                    },
+                    {
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
+                    },
+                    {
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 flowTableData: [],
                 flowWaterChartData: [
                     {
@@ -1455,8 +1785,64 @@ export const wranPlan = [
                     }
                 ],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWater'
+                    },
+                    {
+                        label: '警戒水位',
+                        prop: 'warningWater'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [],
+                flowTableColumnData: [
+                    {
+                        label: '河道名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: 'ID',
+                        prop: 'ID'
+                    },
+                    {
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
+                    },
+                    {
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报流量',
+                        prop: 'forecastflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 flowTableData: [],
                 flowWaterChartData: [
                     {
@@ -1545,8 +1931,56 @@ export const wranPlan = [
                     }
                 ],
                 analysisTableName: '降雨预报详情',
+                analysisTableColumnData: [
+                    {
+                        label: '工程名',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预报范围',
+                        prop: 'forecastRange'
+                    },
+                    {
+                        label: '降雨量',
+                        prop: 'rainfall'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [],
+                flowTableColumnData: [
+                    {
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: 'ID',
+                        prop: 'ID'
+                    },
+                    {
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
+                    },
+                    {
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 flowTableData: [],
                 flowWaterChartData: [
                     {
@@ -1627,8 +2061,68 @@ export const wranPlan = [
                     },
                 ],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '设计最大流量',
+                        prop: 'designMaxFlow'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [],
+                flowTableColumnData: [
+                    {
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: 'ID',
+                        prop: 'ID'
+                    },
+                    {
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
+                    },
+                    {
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '库容',
+                        prop: 'storageCapacity'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 flowTableData: [],
                 flowWaterChartData: [
                     {
@@ -1692,8 +2186,64 @@ export const wranPlan = [
                     }
                 ],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报流量',
+                        prop: 'forecastflow'
+                    },
+                    {
+                        label: '警戒流量',
+                        prop: 'warnFlow'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [],
+                flowTableColumnData: [
+                    {
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: 'ID',
+                        prop: 'ID'
+                    },
+                    {
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
+                    },
+                    {
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 flowTableData: [],
                 flowWaterChartData: [
                     {
@@ -1778,8 +2328,68 @@ export const wranPlan = [
                     }
                 ],
                 analysisTableName: '预警分析',
+                analysisTableColumnData: [
+                    {
+                        label: '站点名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: '预警类型',
+                        prop: 'warningType'
+                    },
+                    {
+                        label: '预警状态',
+                        prop: 'warningStatus'
+                    },
+                    {
+                        label: '预报流量',
+                        prop: 'forecastflow'
+                    },
+                    {
+                        label: '警戒流量',
+                        prop: 'warnFlow'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 analysisTableHeadData: [],
                 analysisTableData: [],
+                flowTableColumnData: [
+                    {
+                        label: '工程名称',
+                        prop: 'projectName'
+                    },
+                    {
+                        label: 'ID',
+                        prop: 'ID'
+                    },
+                    {
+                        label: '预报雨量',
+                        prop: 'forecastRainfall'
+                    },
+                    {
+                        label: '预报来水量',
+                        prop: 'forecastInflow'
+                    },
+                    {
+                        label: '预报出库流量',
+                        prop: 'forecastOutflow'
+                    },
+                    {
+                        label: '预报水位',
+                        prop: 'forecastWaterLevel'
+                    },
+                    {
+                        label: '河道流量',
+                        prop: 'riverwayFlow'
+                    },
+                    {
+                        label: '预报时间',
+                        prop: 'forecastTime'
+                    }
+                ],
                 flowTableData: [],
                 flowWaterChartData: [
                     {

From 89404aad8ec174d807483584d328f68ab644acc9 Mon Sep 17 00:00:00 2001
From: hxh <762326930@qq.com>
Date: Wed, 8 May 2024 15:14:03 +0800
Subject: [PATCH 04/23] =?UTF-8?q?cicd:=20=E4=BF=AE=E6=94=B9ng=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/nginx.conf.tmpl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/deploy/nginx.conf.tmpl b/deploy/nginx.conf.tmpl
index fc498be..0008a45 100644
--- a/deploy/nginx.conf.tmpl
+++ b/deploy/nginx.conf.tmpl
@@ -47,6 +47,10 @@ http {
         charset utf-8;
         client_max_body_size ${NGINX_MAX_BODY_SIZE};
 
+        location /mobileH5 {
+            return 301 http://shuili-h5.product.dev.com:30115?$args;
+        }
+
         location / {
             root   /usr/share/nginx/html;
             index  index.html index.htm;
@@ -67,7 +71,7 @@ http {
         
 
         location /thinking {
-             rewrite ^/thinking/(.*)$ /tianhui-admin-web/$1 break;
+            rewrite ^/thinking/(.*)$ /tianhui-admin-web/$1 break;
             proxy_pass ${API_SERVER};
         }
 

From 2dabb8177d46741edc50c3abd1e69ec919e4286e Mon Sep 17 00:00:00 2001
From: hejunjie <hejunjie@datametatech.com>
Date: Thu, 18 Jul 2024 16:16:46 +0800
Subject: [PATCH 05/23] =?UTF-8?q?fix:=20=E8=A1=8C=E6=94=BF=E5=8C=BA?=
 =?UTF-8?q?=E5=88=92=E8=BF=87=E6=BB=A4=E6=8E=89=E7=AC=AC=E4=B8=80=E5=B1=82?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dike/runManage/maintenance/maintenancePlan/index.vue | 3 ++-
 .../dike/runManage/maintenance/maintenancePlanAccept/index.vue | 1 +
 .../dike/runManage/maintenance/maintenancePlanAudit/index.vue  | 1 +
 .../dike/runManage/maintenance/maintenanceRecords/index.vue    | 1 +
 .../sluice/runManage/maintenance/maintenancePlan/index.vue     | 1 +
 .../runManage/maintenance/maintenancePlanAccept/index.vue      | 1 +
 .../runManage/maintenance/maintenancePlanAudit/index.vue       | 1 +
 .../sluice/runManage/maintenance/maintenanceRecords/index.vue  | 1 +
 8 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
index 499da06..00aa455 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
@@ -68,8 +68,9 @@ export default {
             if (i.parentid === pid) {
               const newItem = {
                 label: i.name,
-                value: i.id,
+                value: i.id
               };
+              if (i.parentid === items.data[0].parentid) newItem.disabled = true;
               if (i.layer != 3) newItem.children = [];
               res.push(newItem);
               getChildren(newItem.children, newItem.value);
diff --git a/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue b/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
index af0c214..f1f643f 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
@@ -73,6 +73,7 @@ export default {
                 label: i.name,
                 value: i.id,
               };
+              if (i.parentid === items.data[0].parentid) newItem.disabled = true;
               if (i.layer != 3) newItem.children = [];
               res.push(newItem);
               getChildren(newItem.children, newItem.value);
diff --git a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
index 5fc5dc4..5f59868 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
@@ -75,6 +75,7 @@ export default {
                 label: i.name,
                 value: i.id,
               };
+              if (i.parentid === items.data[0].parentid) newItem.disabled = true;
               if (i.layer != 3) newItem.children = [];
               res.push(newItem);
               getChildren(newItem.children, newItem.value);
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
index d1ffbc8..a772483 100644
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
@@ -100,6 +100,7 @@ export default {
                 label: i.name,
                 value: i.id,
               };
+              if (i.parentid === items.data[0].parentid) newItem.disabled = true;
               if (i.layer != 3) newItem.children = [];
               res.push(newItem);
               getChildren(newItem.children, newItem.value);
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
index 0e929c8..b9aac02 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
@@ -69,6 +69,7 @@ export default {
                 label: i.name,
                 value: i.id,
               };
+              if (i.parentid === items.data[0].parentid) newItem.disabled = true;
               if (i.layer != 3) newItem.children = [];
               res.push(newItem);
               getChildren(newItem.children, newItem.value);
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
index bf122fc..e5a7b0f 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
@@ -70,6 +70,7 @@ export default {
                 label: i.name,
                 value: i.id,
               };
+              if (i.parentid === items.data[0].parentid) newItem.disabled = true;
               if (i.layer != 3) newItem.children = [];
               res.push(newItem);
               getChildren(newItem.children, newItem.value);
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
index 443a33d..a7a1cca 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
@@ -66,6 +66,7 @@ export default {
                 label: i.name,
                 value: i.id,
               };
+              if (i.parentid === items.data[0].parentid) newItem.disabled = true;
               if (i.layer != 3) newItem.children = [];
               res.push(newItem);
               getChildren(newItem.children, newItem.value);
diff --git a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
index a12129d..c18da2c 100644
--- a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
@@ -99,6 +99,7 @@ export default {
                 label: i.name,
                 value: i.id,
               };
+              if (i.parentid === items.data[0].parentid) newItem.disabled = true;
               if (i.layer != 3) newItem.children = [];
               res.push(newItem);
               getChildren(newItem.children, newItem.value);

From 6e0a158c8180ffe464f438b398b0c817380147a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=98=9F=E6=B7=AE?= <hxh@datametatech.com>
Date: Mon, 22 Jul 2024 06:30:27 +0000
Subject: [PATCH 06/23] =?UTF-8?q?Revert=20"fix:=20=E8=A1=8C=E6=94=BF?=
 =?UTF-8?q?=E5=8C=BA=E5=88=92=E8=BF=87=E6=BB=A4=E6=8E=89=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E5=B1=82=E6=95=B0=E6=8D=AE"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2dabb8177d46741edc50c3abd1e69ec919e4286e
---
 src/views/dike/runManage/maintenance/maintenancePlan/index.vue | 3 +--
 .../dike/runManage/maintenance/maintenancePlanAccept/index.vue | 1 -
 .../dike/runManage/maintenance/maintenancePlanAudit/index.vue  | 1 -
 .../dike/runManage/maintenance/maintenanceRecords/index.vue    | 1 -
 .../sluice/runManage/maintenance/maintenancePlan/index.vue     | 1 -
 .../runManage/maintenance/maintenancePlanAccept/index.vue      | 1 -
 .../runManage/maintenance/maintenancePlanAudit/index.vue       | 1 -
 .../sluice/runManage/maintenance/maintenanceRecords/index.vue  | 1 -
 8 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
index f350dfd..0d41b42 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
@@ -79,9 +79,8 @@ export default {
             if (i.parentid === pid) {
               const newItem = {
                 label: i.name,
-                value: i.id
+                value: i.id,
               };
-              if (i.parentid === items.data[0].parentid) newItem.disabled = true;
               if (i.layer != 3) newItem.children = [];
               res.push(newItem);
               getChildren(newItem.children, newItem.value);
diff --git a/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue b/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
index 7fd0d5b..a622445 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
@@ -85,7 +85,6 @@ export default {
                 label: i.name,
                 value: i.id,
               };
-              if (i.parentid === items.data[0].parentid) newItem.disabled = true;
               if (i.layer != 3) newItem.children = [];
               res.push(newItem);
               getChildren(newItem.children, newItem.value);
diff --git a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
index 1d04b16..95eb0b4 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
@@ -87,7 +87,6 @@ export default {
                 label: i.name,
                 value: i.id,
               };
-              if (i.parentid === items.data[0].parentid) newItem.disabled = true;
               if (i.layer != 3) newItem.children = [];
               res.push(newItem);
               getChildren(newItem.children, newItem.value);
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
index 8dc5b96..ced8a16 100644
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
@@ -112,7 +112,6 @@ export default {
                 label: i.name,
                 value: i.id,
               };
-              if (i.parentid === items.data[0].parentid) newItem.disabled = true;
               if (i.layer != 3) newItem.children = [];
               res.push(newItem);
               getChildren(newItem.children, newItem.value);
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
index 4b3c558..dcb7edf 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
@@ -81,7 +81,6 @@ export default {
                 label: i.name,
                 value: i.id,
               };
-              if (i.parentid === items.data[0].parentid) newItem.disabled = true;
               if (i.layer != 3) newItem.children = [];
               res.push(newItem);
               getChildren(newItem.children, newItem.value);
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
index 8b906f8..4987567 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
@@ -82,7 +82,6 @@ export default {
                 label: i.name,
                 value: i.id,
               };
-              if (i.parentid === items.data[0].parentid) newItem.disabled = true;
               if (i.layer != 3) newItem.children = [];
               res.push(newItem);
               getChildren(newItem.children, newItem.value);
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
index 1f158ec..0135c38 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
@@ -78,7 +78,6 @@ export default {
                 label: i.name,
                 value: i.id,
               };
-              if (i.parentid === items.data[0].parentid) newItem.disabled = true;
               if (i.layer != 3) newItem.children = [];
               res.push(newItem);
               getChildren(newItem.children, newItem.value);
diff --git a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
index ac5822c..512c182 100644
--- a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
@@ -111,7 +111,6 @@ export default {
                 label: i.name,
                 value: i.id,
               };
-              if (i.parentid === items.data[0].parentid) newItem.disabled = true;
               if (i.layer != 3) newItem.children = [];
               res.push(newItem);
               getChildren(newItem.children, newItem.value);

From d7a43d73b50a6c0836c1c1d78c6a109702028092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=98=9F=E6=B7=AE?= <hxh@datametatech.com>
Date: Mon, 9 Dec 2024 13:49:02 +0000
Subject: [PATCH 07/23] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9ng=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/nginx.conf.tmpl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/deploy/nginx.conf.tmpl b/deploy/nginx.conf.tmpl
index 0008a45..abd62e4 100644
--- a/deploy/nginx.conf.tmpl
+++ b/deploy/nginx.conf.tmpl
@@ -74,7 +74,14 @@ http {
             rewrite ^/thinking/(.*)$ /tianhui-admin-web/$1 break;
             proxy_pass ${API_SERVER};
         }
-
+        location /sgcyy-slgcyxgl/api {
+            rewrite ^/sgcyy-slgcyxgl/api/(.*)$ /tianhui-admin-web/$1 break;
+            proxy_pass ${API_SERVER};
+        }
+        location /sgcyy-slgcyxgl/thinking {
+            rewrite ^/sgcyy-slgcyxgl/thinking/(.*)$ /tianhui-admin-web/$1 break;
+            proxy_pass ${API_SERVER};
+        }
     }
 }
 

From 8e5a94147da1a7c1cf91e66a25f4b494bdbbac2c Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Thu, 13 Feb 2025 15:02:21 +0800
Subject: [PATCH 08/23] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production | 2 +-
 vue.config.js   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.env.production b/.env.production
index 774c9f3..3e476e6 100644
--- a/.env.production
+++ b/.env.production
@@ -2,5 +2,5 @@
 ENV = 'admin'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/api'
+VUE_APP_BASE_API = '/sgcyy-slgcyxgl/api'
 VUE_APP_FAST_BASE_URL = 'http://192.168.1.20:9080/'
diff --git a/vue.config.js b/vue.config.js
index 9e011ab..49176d6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -18,7 +18,8 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
+  //publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
+  publicPath: './',
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）

From 99baa7e31ffe2f92c14044027172cfd467bd5b8c Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Thu, 13 Feb 2025 17:01:16 +0800
Subject: [PATCH 09/23] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/RouteDetail.vue                    | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue b/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
index 79a925f..42d1ef0 100644
--- a/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
+++ b/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
@@ -112,7 +112,11 @@
                   :class="{ 'cursor-not-allowed': !canEdit }"
                   @click="handleDraw('billboard', 'pos_start.svg')"
                 >
-                  <img class="icon" :src="`${baseUrl}/icons/pos_start.svg`" alt="" />
+                  <img
+                    class="icon"
+                    :src="`${baseUrl}/icons/pos_start.svg`"
+                    alt=""
+                  />
                   设定起点
                 </div>
                 <div
@@ -120,7 +124,11 @@
                   :class="{ 'cursor-not-allowed': !canEdit }"
                   @click="handleDraw('billboard', 'pos_end.svg')"
                 >
-                  <img class="icon" :src="`${baseUrl}/icons/pos_end.svg`" alt="" />
+                  <img
+                    class="icon"
+                    :src="getImgUrl(`${baseUrl}/icons/pos_end.svg`)"
+                    alt=""
+                  />
                   设定终点
                 </div>
                 <div
@@ -271,6 +279,9 @@ export default {
   },
   mounted() {},
   methods: {
+    getImgUrl(url) {
+      return window.location.host + url;
+    },
     handleDraw(type, iconName) {
       if (!this.canEdit) return;
       this.$refs.syMapRef.draw(type, iconName);

From 16526db1c6c7d7e1734753d7caf7a23a9e59d680 Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Thu, 13 Feb 2025 17:08:10 +0800
Subject: [PATCH 10/23] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0yarn=E5=BF=BD?=
 =?UTF-8?q?=E7=95=A5=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/Dockerfile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/deploy/Dockerfile b/deploy/Dockerfile
index c142182..352fa1a 100644
--- a/deploy/Dockerfile
+++ b/deploy/Dockerfile
@@ -6,15 +6,16 @@ COPY . /root
 # yum install -y devtoolset-8-gcc devtoolset-8-gcc-c++  && \
 # source /opt/rh/devtoolset-8/enable && \
 RUN yarn config set strict-peer-dependencies false && \
-yarn config set sass_binary_site https://npmmirror.com/mirrors/node-sass && \
-yarn config set registry http://172.16.32.57:8931/repository/npm-group/ && \
-yarn cache clean && \
-yarn install --verbose && \
-yarn run build
+  yarn config set ignore-engines true && \
+  yarn config set sass_binary_site https://npmmirror.com/mirrors/node-sass && \
+  yarn config set registry http://172.16.32.57:8931/repository/npm-group/ && \
+  yarn cache clean && \
+  yarn install --verbose && \
+  yarn run build
 
 # Second stage: minimal runtime environment
 FROM registry.datameta.com:8180/public/nginx:1.25-alpine
- 
+
 COPY --from=builder /root/dist /usr/share/nginx/html
 
 WORKDIR /

From 6626ede6b90cc3fdc3d0628691a005fc3770d5a2 Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Thu, 13 Feb 2025 18:03:06 +0800
Subject: [PATCH 11/23] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9ng=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/nginx.conf.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deploy/nginx.conf.tmpl b/deploy/nginx.conf.tmpl
index abd62e4..a48848f 100644
--- a/deploy/nginx.conf.tmpl
+++ b/deploy/nginx.conf.tmpl
@@ -54,6 +54,7 @@ http {
         location / {
             root   /usr/share/nginx/html;
             index  index.html index.htm;
+            try_files $uri $uri/ /index.html;
         }
 
         error_page   500 502 503 504  /50x.html;

From 2a45d3994199a11e6fa49b34071a8e3f3b8966de Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Thu, 13 Feb 2025 18:29:45 +0800
Subject: [PATCH 12/23] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vue.config.js b/vue.config.js
index 3a07f41..8a35170 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -18,7 +18,9 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: "./",
+  // publicPath: "./",
+  // TODO 测试
+  publicPath: "/sgcyy-slgcyxgl",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）

From da7d06f1eb817ee37027e18bd1b90f79eb442dca Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Thu, 13 Feb 2025 18:36:27 +0800
Subject: [PATCH 13/23] =?UTF-8?q?fix:=20=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 8a35170..53f20ae 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -18,9 +18,9 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  // publicPath: "./",
+  publicPath: "./",
   // TODO 测试
-  publicPath: "/sgcyy-slgcyxgl",
+  // publicPath: "/sgcyy-slgcyxgl",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）

From 65230e0382ef74ad70844ddb0b17bf511b19accd Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Thu, 13 Feb 2025 18:42:57 +0800
Subject: [PATCH 14/23] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9publicPath?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 53f20ae..8a35170 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -18,9 +18,9 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: "./",
+  // publicPath: "./",
   // TODO 测试
-  // publicPath: "/sgcyy-slgcyxgl",
+  publicPath: "/sgcyy-slgcyxgl",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）

From 38585821a211e541d1c1475f7040e8daca89537a Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Thu, 13 Feb 2025 18:49:39 +0800
Subject: [PATCH 15/23] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionRouteManage/components/RouteDetail.vue         | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue b/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
index 42d1ef0..a49352c 100644
--- a/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
+++ b/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
@@ -126,7 +126,7 @@
                 >
                   <img
                     class="icon"
-                    :src="getImgUrl(`${baseUrl}/icons/pos_end.svg`)"
+                    :src="`${baseUrl}/icons/pos_end.svg`"
                     alt=""
                   />
                   设定终点
@@ -279,9 +279,6 @@ export default {
   },
   mounted() {},
   methods: {
-    getImgUrl(url) {
-      return window.location.host + url;
-    },
     handleDraw(type, iconName) {
       if (!this.canEdit) return;
       this.$refs.syMapRef.draw(type, iconName);

From a31e7651f7f5c62f0830c14f118219b37d4dde92 Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Thu, 13 Feb 2025 18:55:36 +0800
Subject: [PATCH 16/23] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9publicPath?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 3 +++
 .env.production  | 7 +++++--
 vue.config.js    | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index d5af85a..b2d8da4 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,9 @@
 # 开发环境配置
 ENV = 'development'
 
+# 服务路径
+VUE_APP_BASE_URL = /
+
 # 开发环境
 # VUE_APP_BASE_API = 'http://192.168.1.113:8081/data-admin/'
 # VUE_APP_BASE_API = 'http://192.168.1.20:19084/data-admin/'
diff --git a/.env.production b/.env.production
index eddcd02..f9dbda9 100644
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,9 @@
 # 生产环境配置
 ENV = 'admin'
 
+# 服务路径
+VUE_APP_BASE_URL = /sgcyy-slgcyxgl
+
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/sgcyy-slgcyxgl/thinking'
-VUE_APP_FAST_BASE_URL = 'http://192.168.1.20:9080/'
+VUE_APP_BASE_API = /${VUE_APP_BASE_URL}/thinking
+VUE_APP_FAST_BASE_URL = http://192.168.1.20:9080/
diff --git a/vue.config.js b/vue.config.js
index 3a07f41..3a4aeb4 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -18,7 +18,7 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: "./",
+  publicPath: process.env.VUE_APP_BASE_URL || "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）

From c802b4694f350485835f34dc8f055f4fcb2fd2d4 Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Thu, 13 Feb 2025 19:00:34 +0800
Subject: [PATCH 17/23] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 5 ++++-
 .env.production  | 7 +++++--
 vue.config.js    | 4 +---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.env.development b/.env.development
index d5af85a..5cc0ba1 100644
--- a/.env.development
+++ b/.env.development
@@ -1,11 +1,14 @@
 # 开发环境配置
 ENV = 'development'
 
+# 服务路径
+VUE_APP_BASE_URL = /
+
 # 开发环境
 # VUE_APP_BASE_API = 'http://192.168.1.113:8081/data-admin/'
 # VUE_APP_BASE_API = 'http://192.168.1.20:19084/data-admin/'
 
-VUE_APP_BASE_API = '/thinking'
+VUE_APP_BASE_API = /thinking
 
 VUE_APP_FAST_BASE_URL = 'http://192.168.1.20:9080/'
 
diff --git a/.env.production b/.env.production
index eddcd02..d39f936 100644
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,9 @@
 # 生产环境配置
 ENV = 'admin'
 
+# 服务路径
+VUE_APP_BASE_URL = /sgcyy-slgcyxgl
+
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/sgcyy-slgcyxgl/thinking'
-VUE_APP_FAST_BASE_URL = 'http://192.168.1.20:9080/'
+VUE_APP_BASE_API = ${VUE_APP_BASE_URL}/thinking
+VUE_APP_FAST_BASE_URL = http://192.168.1.20:9080/
diff --git a/vue.config.js b/vue.config.js
index 8a35170..7b2c861 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -18,9 +18,7 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  // publicPath: "./",
-  // TODO 测试
-  publicPath: "/sgcyy-slgcyxgl",
+  publicPath: process.env.VUE_APP_BASE_URL || '/',
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）

From 5e5e457e5d6f8721ec8a048234684039391b84c6 Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Fri, 14 Feb 2025 10:30:10 +0800
Subject: [PATCH 18/23] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/SyMixMap.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/components/SyMixMap.vue b/src/views/components/SyMixMap.vue
index f0398f1..8e05935 100644
--- a/src/views/components/SyMixMap.vue
+++ b/src/views/components/SyMixMap.vue
@@ -265,7 +265,7 @@ export default {
         entries.graphicsList.forEach(item=>{
           let graphicItem
           if(item.type === 'billboard'){
-            graphicItem = new sycim.Billboard(item.position, `/icons/${item.icon}`);
+            graphicItem = new sycim.Billboard(item.position, `${baseUrl}/icons/${item.icon}`);
             graphicItem.setStyle({
               canEdit: this.canEdit,
               horizontalOrigin: sycim.HorizontalOrigin.CENTER,
@@ -309,7 +309,7 @@ export default {
     draw(type, iconName){
       let plotOptions = {
         scale: 1,
-        image: `/icons/${iconName}`,
+        image: `${baseUrl}/icons/${iconName}`,
         material: sycim.Cesium.Color.fromCssColorString('#36B29E'),
         horizontalOrigin: sycim.HorizontalOrigin.CENTER,
         verticalOrigin: sycim.VerticalOrigin.BOTTOM,
@@ -326,7 +326,7 @@ export default {
           if (graphic) {
             let graphicItem
             if(type === 'billboard'){
-              graphicItem = new sycim.Billboard(graphic.position, `/icons/${iconName}`);
+              graphicItem = new sycim.Billboard(graphic.position, `${baseUrl}/icons/${iconName}`);
               graphicItem.setStyle({
                 canEdit: true,
                 horizontalOrigin: sycim.HorizontalOrigin.CENTER,
@@ -385,7 +385,7 @@ export default {
       let graphicItem
       if (type === 'billboard') {
         // 添加点
-        graphicItem = new sycim.Billboard(position, `/mobileH5/icons/${iconName}`)
+        graphicItem = new sycim.Billboard(position, `${baseUrl}/icons/${iconName}`)
         graphicItem.setStyle({
           canEdit: false,
           horizontalOrigin: sycim.HorizontalOrigin.CENTER,

From 81fd4f82b6ba9d292224fdde2c611b3383e00148 Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Fri, 14 Feb 2025 10:36:51 +0800
Subject: [PATCH 19/23] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=982?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/SyMixMap.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/components/SyMixMap.vue b/src/views/components/SyMixMap.vue
index 8e05935..3772c8f 100644
--- a/src/views/components/SyMixMap.vue
+++ b/src/views/components/SyMixMap.vue
@@ -105,6 +105,7 @@ export default {
   },
   data() {
     return {
+      baseUrl: process.env.BASE_URL,
       defaultHeight: 50000,
       defaultLineWidth: 6,
       isFullScreen: false,
@@ -265,7 +266,7 @@ export default {
         entries.graphicsList.forEach(item=>{
           let graphicItem
           if(item.type === 'billboard'){
-            graphicItem = new sycim.Billboard(item.position, `${baseUrl}/icons/${item.icon}`);
+            graphicItem = new sycim.Billboard(item.position, `${this.baseUrl}/icons/${item.icon}`);
             graphicItem.setStyle({
               canEdit: this.canEdit,
               horizontalOrigin: sycim.HorizontalOrigin.CENTER,
@@ -309,7 +310,7 @@ export default {
     draw(type, iconName){
       let plotOptions = {
         scale: 1,
-        image: `${baseUrl}/icons/${iconName}`,
+        image: `${this.baseUrl}/icons/${iconName}`,
         material: sycim.Cesium.Color.fromCssColorString('#36B29E'),
         horizontalOrigin: sycim.HorizontalOrigin.CENTER,
         verticalOrigin: sycim.VerticalOrigin.BOTTOM,
@@ -326,7 +327,7 @@ export default {
           if (graphic) {
             let graphicItem
             if(type === 'billboard'){
-              graphicItem = new sycim.Billboard(graphic.position, `${baseUrl}/icons/${iconName}`);
+              graphicItem = new sycim.Billboard(graphic.position, `${this.baseUrl}/icons/${iconName}`);
               graphicItem.setStyle({
                 canEdit: true,
                 horizontalOrigin: sycim.HorizontalOrigin.CENTER,
@@ -385,7 +386,7 @@ export default {
       let graphicItem
       if (type === 'billboard') {
         // 添加点
-        graphicItem = new sycim.Billboard(position, `${baseUrl}/icons/${iconName}`)
+        graphicItem = new sycim.Billboard(position, `${this.baseUrl}/icons/${iconName}`)
         graphicItem.setStyle({
           canEdit: false,
           horizontalOrigin: sycim.HorizontalOrigin.CENTER,

From ca5f882983072b7cb4f728420bdd37679b66e3da Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Fri, 14 Feb 2025 10:42:27 +0800
Subject: [PATCH 20/23] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=983?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/SyMixMap.vue                               | 2 +-
 .../inspectionRouteManage/components/RouteDetail.vue            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/components/SyMixMap.vue b/src/views/components/SyMixMap.vue
index 3772c8f..2bd6211 100644
--- a/src/views/components/SyMixMap.vue
+++ b/src/views/components/SyMixMap.vue
@@ -105,7 +105,7 @@ export default {
   },
   data() {
     return {
-      baseUrl: process.env.BASE_URL,
+      baseUrl: process.env.BASE_URL === "/" ? "" : process.env.BASE_URL,
       defaultHeight: 50000,
       defaultLineWidth: 6,
       isFullScreen: false,
diff --git a/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue b/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
index a49352c..9800cde 100644
--- a/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
+++ b/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
@@ -207,7 +207,7 @@ export default {
   },
   data() {
     return {
-      baseUrl: process.env.BASE_URL,
+      baseUrl: process.env.BASE_URL === "/" ? "" : process.env.BASE_URL,
       formData: {
         dikeName: "",
         dikeCode: "",

From 240528970c86de8190b622e587801f19a754ddb0 Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Fri, 14 Feb 2025 11:30:14 +0800
Subject: [PATCH 21/23] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E8=B7=AF=E5=BE=84=E9=97=AE=E9=A2=984?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/SyMixMap.vue                      | 10 +++++-----
 .../inspectionRouteManage/components/RouteDetail.vue   |  6 +++---
 .../inspectionRouteManage/components/RouteDetail.vue   |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/components/SyMixMap.vue b/src/views/components/SyMixMap.vue
index 2bd6211..dd4032a 100644
--- a/src/views/components/SyMixMap.vue
+++ b/src/views/components/SyMixMap.vue
@@ -105,7 +105,7 @@ export default {
   },
   data() {
     return {
-      baseUrl: process.env.BASE_URL === "/" ? "" : process.env.BASE_URL,
+      baseUrl: process.env.BASE_URL,
       defaultHeight: 50000,
       defaultLineWidth: 6,
       isFullScreen: false,
@@ -266,7 +266,7 @@ export default {
         entries.graphicsList.forEach(item=>{
           let graphicItem
           if(item.type === 'billboard'){
-            graphicItem = new sycim.Billboard(item.position, `${this.baseUrl}/icons/${item.icon}`);
+            graphicItem = new sycim.Billboard(item.position, `${this.baseUrl}icons/${item.icon}`);
             graphicItem.setStyle({
               canEdit: this.canEdit,
               horizontalOrigin: sycim.HorizontalOrigin.CENTER,
@@ -310,7 +310,7 @@ export default {
     draw(type, iconName){
       let plotOptions = {
         scale: 1,
-        image: `${this.baseUrl}/icons/${iconName}`,
+        image: `${this.baseUrl}icons/${iconName}`,
         material: sycim.Cesium.Color.fromCssColorString('#36B29E'),
         horizontalOrigin: sycim.HorizontalOrigin.CENTER,
         verticalOrigin: sycim.VerticalOrigin.BOTTOM,
@@ -327,7 +327,7 @@ export default {
           if (graphic) {
             let graphicItem
             if(type === 'billboard'){
-              graphicItem = new sycim.Billboard(graphic.position, `${this.baseUrl}/icons/${iconName}`);
+              graphicItem = new sycim.Billboard(graphic.position, `${this.baseUrl}icons/${iconName}`);
               graphicItem.setStyle({
                 canEdit: true,
                 horizontalOrigin: sycim.HorizontalOrigin.CENTER,
@@ -386,7 +386,7 @@ export default {
       let graphicItem
       if (type === 'billboard') {
         // 添加点
-        graphicItem = new sycim.Billboard(position, `${this.baseUrl}/icons/${iconName}`)
+        graphicItem = new sycim.Billboard(position, `${this.baseUrl}icons/${iconName}`)
         graphicItem.setStyle({
           canEdit: false,
           horizontalOrigin: sycim.HorizontalOrigin.CENTER,
diff --git a/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue b/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
index 9800cde..18c65a9 100644
--- a/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
+++ b/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
@@ -114,7 +114,7 @@
                 >
                   <img
                     class="icon"
-                    :src="`${baseUrl}/icons/pos_start.svg`"
+                    :src="`${baseUrl}icons/pos_start.svg`"
                     alt=""
                   />
                   设定起点
@@ -126,7 +126,7 @@
                 >
                   <img
                     class="icon"
-                    :src="`${baseUrl}/icons/pos_end.svg`"
+                    :src="`${baseUrl}icons/pos_end.svg`"
                     alt=""
                   />
                   设定终点
@@ -207,7 +207,7 @@ export default {
   },
   data() {
     return {
-      baseUrl: process.env.BASE_URL === "/" ? "" : process.env.BASE_URL,
+      baseUrl: process.env.BASE_URL,
       formData: {
         dikeName: "",
         dikeCode: "",
diff --git a/src/views/sluice/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue b/src/views/sluice/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
index a8a996a..47eadd3 100644
--- a/src/views/sluice/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
+++ b/src/views/sluice/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
@@ -114,7 +114,7 @@
                 >
                   <img
                     class="icon"
-                    :src="`${baseUrl}/icons/pos_start.svg`"
+                    :src="`${baseUrl}icons/pos_start.svg`"
                     alt=""
                   />
                   设定起点
@@ -126,7 +126,7 @@
                 >
                   <img
                     class="icon"
-                    :src="`${baseUrl}/icons/pos_end.svg`"
+                    :src="`${baseUrl}icons/pos_end.svg`"
                     alt=""
                   />
                   设定终点

From 01a33d86f45d155bead998be558560d09bf692ec Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Thu, 20 Feb 2025 18:11:02 +0800
Subject: [PATCH 22/23] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=B0=B4?=
 =?UTF-8?q?=E5=BA=93=E6=A0=91=E5=BD=A2=E5=B1=95=E7=A4=BA=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reservoir/safeOperation/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/reservoir/safeOperation/index.vue b/src/views/reservoir/safeOperation/index.vue
index 0e23691..a15a4a3 100644
--- a/src/views/reservoir/safeOperation/index.vue
+++ b/src/views/reservoir/safeOperation/index.vue
@@ -125,7 +125,7 @@ export default {
       showTreeBox: false,
       defaultProps: {
         children: "layers",
-        label: "text",
+        label: "nameCn",
       },
       layerList: [],
       checkList: [],

From 4fdbc02988c0d74942a039dde6ba3bb3e02ddec2 Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Fri, 21 Feb 2025 09:24:42 +0800
Subject: [PATCH 23/23] =?UTF-8?q?fix:=20=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reservoir/safeOperation/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/reservoir/safeOperation/index.vue b/src/views/reservoir/safeOperation/index.vue
index a15a4a3..10bf566 100644
--- a/src/views/reservoir/safeOperation/index.vue
+++ b/src/views/reservoir/safeOperation/index.vue
@@ -41,7 +41,7 @@
         >
           <template #default="{ node, data }">
             <div class="flex items-center">
-              <span>{{ data.text }}</span>
+              <span>{{ data.nameCn || data.text }}</span>
               <img
                 v-if="checkList.find((v) => v === data.id)"
                 class="my-icon ml-4"