北江大堤需求

1 month ago · 1bd082b8a9
8 changed files with 220 additions and 65 deletions
--- a/src/components/linkNameSelect/linkDike.vue
+++ b/src/components/linkNameSelect/linkDike.vue
@ -61,6 +61,7 @@ export default {
        pageSize: 10,
        ids: null,
        data: {
+          status:6,
          dikeName: null,
          dikeCode: null,
        },
--- a/src/components/linkNameSelect/linkSluice.vue
+++ b/src/components/linkNameSelect/linkSluice.vue
@ -106,6 +106,7 @@ export default {
        pageSize: 10,
        ids: null,
        data: {
+          status:6,
          wagaName: null,
          wagaCode: null,
        },
--- a/src/components/myUpload/index.vue
+++ b/src/components/myUpload/index.vue
@ -63,7 +63,7 @@ export default {

    // 点击预览的文件进行下载
    handlePreview(file) {
-      // console.log(file);
+      console.log(file);
      getFileStream({ fileName: file.fileName }).then((res) => {
        const blob = new Blob([res], {
          // type类型后端返回来的数据中会有，根据自己实际进行修改
--- a/src/utils/request.js
+++ b/src/utils/request.js
@ -48,7 +48,7 @@ service.interceptors.response.use(
          type: 'warning'
        }).then(() => {
          store.dispatch('LogOut').then(() => {
-            location.href = '/';
+            location.href = 'https://210.76.82.26/wr-portal';
          });
        });
      }
@ -59,7 +59,7 @@ service.interceptors.response.use(
          type: 'warning'
        }).then(() => {
          store.dispatch('LogOut').then(() => {
-            location.href = '/';
+            location.href = 'https://210.76.82.26/wr-portal';
          });
        });
      } else if (code !== 200) {
--- a/src/views/dike/engineeringCondition/dikeBaseInfo/options/historyOverflowsRecords.vue
+++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/historyOverflowsRecords.vue
@ -1,5 +1,60 @@
 <template>
  <div class="app-container">
+<!--    <el-descriptions-->
+<!--      class="margin-top"-->
+<!--      :column="2"-->
+<!--      border-->
+<!--      :labelStyle="{-->
+<!--        'text-align': 'left',-->
+<!--        width: '180px',-->
+<!--        height: '50px',-->
+<!--      }"-->
+<!--      :contentStyle="{ minWidth: '350px' }"-->
+<!--    >-->
+<!--      <el-descriptions-item>-->
+<!--        <template slot="label"> 堤防代码 </template>-->
+<!--        {{ dikeCode }}-->
+<!--      </el-descriptions-item>-->
+<!--      <el-descriptions-item>-->
+<!--        <template slot="label"> 记录更新时间 </template>-->
+<!--        {{ this.form.updateDate }}-->
+<!--      </el-descriptions-item>-->
+<!--      <el-descriptions-item>-->
+<!--        <template slot="label"> 决溢地点 </template>-->
+<!--        {{ this.form.brspPl }}-->
+<!--      </el-descriptions-item>-->
+<!--      <el-descriptions-item>-->
+<!--        <template slot="label"> 决溢时间 </template>-->
+<!--        {{ this.form.brspDatetime }}-->
+<!--      </el-descriptions-item>-->
+<!--      <el-descriptions-item>-->
+<!--        <template slot="label"> 决溢形式 </template>-->
+<!--        {{ this.form.brspForm }}-->
+<!--      </el-descriptions-item>-->
+<!--&lt;!&ndash;      <el-descriptions-item>&ndash;&gt;-->
+<!--&lt;!&ndash;        <template slot="label"> 决溢损失 </template>&ndash;&gt;-->
+<!--&lt;!&ndash;        {{ this.form.brspLs }}&ndash;&gt;-->
+<!--&lt;!&ndash;      </el-descriptions-item>&ndash;&gt;-->
+<!--&lt;!&ndash;      <el-descriptions-item>&ndash;&gt;-->
+<!--&lt;!&ndash;        <template slot="label"> 修复日期 </template>&ndash;&gt;-->
+<!--&lt;!&ndash;        {{ this.form.rpTime }}&ndash;&gt;-->
+<!--&lt;!&ndash;      </el-descriptions-item>&ndash;&gt;-->
+<!--&lt;!&ndash;      <el-descriptions-item>&ndash;&gt;-->
+<!--&lt;!&ndash;        <template slot="label"> 淹没范围 </template>&ndash;&gt;-->
+<!--&lt;!&ndash;        {{ this.form.inRn }}&ndash;&gt;-->
+<!--&lt;!&ndash;      </el-descriptions-item>&ndash;&gt;-->
+<!--      <el-descriptions-item>-->
+<!--        <template slot="label"> 备注 </template>-->
+<!--        {{ this.form.note }}-->
+<!--      </el-descriptions-item>-->
+<!--    </el-descriptions>-->
+    <el-dialog
+      :title="viewTitle"
+      :visible.sync="viewOpen"
+      width="1200px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
      <el-descriptions
        class="margin-top"
        :column="2"
@ -48,6 +103,93 @@
          {{ this.form.note }}
        </el-descriptions-item>
      </el-descriptions>
+    </el-dialog>
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" fixed />
+      <el-table-column
+        label="序号"
+        type="index"
+        width="50"
+        align="center"
+        fixed
+      />
+      <el-table-column
+        label="堤防代码"
+        align="center"
+        prop="dikeCode"
+        min-width="120"
+      />
+      <el-table-column
+        label="记录更新时间"
+        align="center"
+        prop="updateDate"
+        min-width="120"
+      />
+      <el-table-column
+        label="决溢地点"
+        align="center"
+        prop="brspPl"
+        min-width="120"
+      />
+      <el-table-column
+        label="决溢时间"
+        align="center"
+        prop="brspDatetime"
+        min-width="120"
+      />
+      <el-table-column
+        label=""
+        align="决溢形式"
+        prop="brspForm"
+        min-width="120"
+      />
+      <!-- <el-table-column
+        label="责任人类型"
+        align="center"
+        prop="personResponsibleType"
+        :formatter="personResponsibleTypeFormat"
+        min-width="120"
+      /> -->
+
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="180"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="viewInFo(scope.row)"
+            v-hasPermi="['yg:fzr:view']"
+          >查看</el-button
+          >
+          <!-- <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['yg:fzr:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['yg:fzr:remove']"
+            >删除</el-button
+          > -->
+        </template>
+      </el-table-column>
+    </el-table>

    <!-- <div class="btnList">
      <el-button type="primary" @click="submitForm">确 定</el-button>
@ -72,7 +214,7 @@ export default {
  data() {
    return {
      // 遮罩层
-      loading: true,
+      loading: false,
      // 选中数组
      ids: [],
      // 非单个禁用
@ -81,6 +223,10 @@ export default {
      multiple: true,
      // 显示搜索条件
      showSearch: true,
+      tableData:[],
+      viewTitle: "",
+      // 是否显示弹出层
+      viewOpen: false,
      // 总条数
      total: 0,
      // 决溢记录表格数据
@ -128,12 +274,19 @@ export default {
    this.getList();
  },
  methods: {
+    viewInFo(row) {
+      this.form = row;
+      this.viewTitle = "历史决溢记录信息";
+      this.viewOpen = true;
+    },
    /** 查询决溢记录列表 */
    getList() {
      this.queryParams.data.dikeCode = this.dikeCode;
      listJyjl(this.queryParams).then((response) => {
        if (response.records[0]) {
          this.form = response.records[0];
+          this.tableData=response.record;
+          this.loading=false
        }
      });
    },
--- a/src/views/dike/engineeringCondition/dikeBaseInfo/options/index.vue
+++ b/src/views/dike/engineeringCondition/dikeBaseInfo/options/index.vue
@ -27,14 +27,14 @@
        <basePage ref="basePage" />
      </el-tab-pane>

-      <el-tab-pane
-        label="堤防横断面"
-        name="dikeCrossSection"
-        :disabled="!routeList[1].isEdit"
-        :lazy="true"
-      >
-        <dikeCrossSection :dikeCode="this.formData.dikeCode" />
-      </el-tab-pane>
+<!--      <el-tab-pane-->
+<!--        label="堤防横断面"-->
+<!--        name="dikeCrossSection"-->
+<!--        :disabled="!routeList[1].isEdit"-->
+<!--        :lazy="true"-->
+<!--      >-->
+<!--        <dikeCrossSection :dikeCode="this.formData.dikeCode" />-->
+<!--      </el-tab-pane>-->
      <el-tab-pane
        label="堤防横断面特征值"
        name="dikeCrossSectionTrait"
@ -43,14 +43,14 @@
      >
        <dikeCrossSectionTrait :dikeCode="this.formData.dikeCode" />
      </el-tab-pane>
-      <el-tab-pane
-        label="水文特征"
-        name="hydrologicalCharacteristics"
-        :disabled="!routeList[1].isEdit"
-        :lazy="true"
-      >
-        <hydrologicalCharacteristics :dikeCode="this.formData.dikeCode" />
-      </el-tab-pane>
+<!--      <el-tab-pane-->
+<!--        label="水文特征"-->
+<!--        name="hydrologicalCharacteristics"-->
+<!--        :disabled="!routeList[1].isEdit"-->
+<!--        :lazy="true"-->
+<!--      >-->
+<!--        <hydrologicalCharacteristics :dikeCode="this.formData.dikeCode" />-->
+<!--      </el-tab-pane>-->

      <el-tab-pane
        label="管理体制"
--- a/src/views/dike/safetyManage/declarationManage/declare/components/listPage/index.vue
+++ b/src/views/dike/safetyManage/declarationManage/declare/components/listPage/index.vue
@ -1338,7 +1338,7 @@ export default {
              }
            });
          } else {
-            this.chartEleGetData();
+            // this.chartEleGetData();
            addJbxx(this.form).then((response) => {
              if (response.code === 200) {
                this.msgSuccess("新增成功");
--- a/src/views/dike/safetyManage/declarationManage/declare/index.vue
+++ b/src/views/dike/safetyManage/declarationManage/declare/index.vue
@ -11,7 +11,7 @@
      </el-breadcrumb-item>
    </el-breadcrumb>
 <!--    <dataCharts ref="dataCharts" />-->
-    <listPage :chartEleGetData="chartEleGetData" />
+    <listPage  />
  </div>
 </template>
 <script>
@ -42,7 +42,7 @@ export default {
  //   },
  // },
  mounted() {
-    this.chartEleGetData = this.$refs.dataCharts?.getData;
+    // this.chartEleGetData = this.$refs.dataCharts?.getData;
  },
 };
 </script>