fix: 修复监督检查诸多bug

12 months ago · 2d6a1f6308
13 changed files with 155 additions and 24 deletions
--- a/src/api/dike/index.js
+++ b/src/api/dike/index.js
@ -335,6 +335,7 @@ export function delSuperviseWayItemData(id){

 // 监督检查-新增任务
 export function addNewSuperviseWayTasksData(data){
+  console.log('新增任务 >>>>>  ', data)
  return request({
    url: `/run/df/superviseTask`,
    method: 'post',
@ -352,6 +353,7 @@ export function getSuperviseWayTaskDetailsData(id){

 // 监督检查-修改任务
 export function putSuperviseWayTaskDetailsData(data){
+  console.log('修改任务 >>>>>  ', data)
  return request({
    url: `/run/df/superviseTask`,
    method: 'put',
--- a/src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue
+++ b/src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue
@ -149,7 +149,7 @@ export default {
 <style scoped lang="scss">
 .body {
  width: 100%;
-  min-height: calc(100vh - 56px);
+  min-height: calc(100vh - 2px);
  padding-left: 24px;

  .top-title {
--- a/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue
+++ b/src/views/dike/runManage/supervisionInspetion/methodsManage/index.vue
@ -10,6 +10,7 @@ export default {
  name: "InspectionItems",
  data() {
    return {
+      tableHeight: null,
      tableData: [], // 检查列表
      pageData: {
        pageNum: 1, // 当前页
@ -75,6 +76,14 @@ export default {
          this.$message.error("复制失败");
        });
    },
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
    // 获取列表数据
    getTableData() {
      getSuperviseWayList({
@ -121,6 +130,7 @@ export default {
  },
  created() {},
  mounted() {
+    this.tableHeight = document.documentElement.clientHeight - 250;
    // 获取列表数据
    this.getTableData();
  },
@ -139,7 +149,7 @@ export default {
        v-hasPermi="['df:run:sup:meth:add']"
        >添加</el-button
      >
-      <el-table class="table" height="640" :data="tableData" border>
+      <el-table class="table" :height="tableHeight" :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="发布时间">
@ -211,7 +221,8 @@ export default {
        :page-sizes="pageData.pageSizes"
        layout="total, prev, pager, next, sizes, jumper"
        :total="pageData.total"
-        @size-change="getTableData()"
+        @size-change="(e) => handlePageSizeChange(e)"
+        @current-change="(e) => handleCurrentPageChange(e)"
      >
      </el-pagination>
    </div>
@ -221,7 +232,7 @@ export default {
 <style scoped lang="less">
 .body {
  width: 100%;
-  min-height: calc(100vh - 56px);
+  min-height: calc(100vh - 6px);
  padding-left: 24px;

  .top-title {
--- a/src/views/dike/runManage/supervisionInspetion/methodsManage/itemsDetails.vue
+++ b/src/views/dike/runManage/supervisionInspetion/methodsManage/itemsDetails.vue
@ -276,7 +276,7 @@ export default {
 <style scoped lang="scss">
 .body {
  width: 100%;
-  min-height: calc(100vh - 56px);
+  min-height: calc(100vh - 6px);
  padding-left: 24px;

  .top-title {
--- a/src/views/dike/runManage/supervisionInspetion/methodsManage/itemsList.vue
+++ b/src/views/dike/runManage/supervisionInspetion/methodsManage/itemsList.vue
@ -159,7 +159,7 @@ export default {
 <style scoped lang="scss">
 .body {
  width: 100%;
-  min-height: calc(100vh - 56px);
+  min-height: calc(100vh - 6px);
  padding-left: 24px;

  .top-title {
--- a/src/views/dike/runManage/supervisionInspetion/tasksManage/tasksDetails.vue
+++ b/src/views/dike/runManage/supervisionInspetion/tasksManage/tasksDetails.vue
@ -48,7 +48,7 @@ export default {
      rules: {
        name: [
          { required: true, message: "请输入名称", trigger: "blur" },
-          { max: 20, message: "名称最长为20个字符", trigger: "blur" },
+          { max: 50, message: "名称最长为50个字符", trigger: "blur" },
        ],
        dikeCode: [
          { required: true, message: "请选择堤防", trigger: "change" },
@ -202,6 +202,54 @@ export default {
    handleDel(row) {
      console.log("row >>>>>  ", row);
    },
+    // 返回二次确认
+    handleBack() {
+      this.$confirm("是否保存再返回？", "提示", {
+        confirmButtonText: "保存",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$refs.ruleForm.validate((valid) => {
+            if (valid) {
+              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);
+                  }
+                });
+              }
+            } else {
+              throw new Error("校验未通过");
+            }
+          });
+        })
+        .catch((err) => {
+          console.warn("取消 >>>>> ", err);
+          if (err === "cancel") {
+            this.$router.go(-1);
+          }
+        });
+    },
    // 提交表单
    handleSubmit() {
      this.$refs.ruleForm.validate((valid) => {
@ -240,13 +288,7 @@ export default {
                });
              }
            })
-            .catch(() => {
-              // 取消提交
-              this.$message({
-                type: "info",
-                message: "已取消提交",
-              });
-            });
+            .catch(() => {});
        } else {
          console.log("error submit!!");
          return false;
@ -283,6 +325,7 @@ export default {
          <el-form-item label-width="120px" label="检查任务名称" prop="name">
            <el-input
              style="width: 240px"
+              :maxlength="50"
              v-model="ruleForm.name"
              placeholder="请输入"
            />
@ -396,7 +439,7 @@ export default {
        size="small"
        >确认</el-button
      >
-      <el-button @click="$router.go(-1)" size="small">返回</el-button>
+      <el-button @click="handleBack" size="small">返回</el-button>
    </div>
  </div>
 </template>
--- a/src/views/dike/runManage/waterRainReport/testReportManage/index.vue
+++ b/src/views/dike/runManage/waterRainReport/testReportManage/index.vue
@ -1,7 +1,7 @@
 <!-- 测试报告管理页 -->
 <template>
  <div class="patrol-manage-page">
-    <div class="top-title">水雨情测报</div>
+    <div class="top-title">{{ $router.currentRoute.meta.title }}</div>
    <div class="table-box">
      <div class="top-search">
        <!-- <span>起/终点所在地：</span>
@ -93,7 +93,8 @@
        :page-sizes="pageData.pageSizes"
        layout="total, prev, pager, next, sizes, jumper"
        :total="pageData.total"
-        @size-change="getTableData()"
+        @size-change="(e) => handlePageSizeChange(e)"
+        @current-change="(e) => handleCurrentPageChange(e)"
      >
      </el-pagination>
    </div>
@ -143,6 +144,14 @@ export default {
    this.getTreeData();
  },
  methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
    // 获取列表信息
    getTableData() {
      getDikeWaterRainProjectList({
--- a/src/views/sluice/runManage/supervisionInspetion/methodsManage/details.vue
+++ b/src/views/sluice/runManage/supervisionInspetion/methodsManage/details.vue
@ -149,7 +149,7 @@ export default {
 <style scoped lang="scss">
 .body {
  width: 100%;
-  min-height: calc(100vh - 56px);
+  min-height: calc(100vh - 2px);
  padding-left: 24px;

  .top-title {
--- a/src/views/sluice/runManage/supervisionInspetion/methodsManage/index.vue
+++ b/src/views/sluice/runManage/supervisionInspetion/methodsManage/index.vue
@ -75,6 +75,14 @@ export default {
          this.$message.error("复制失败");
        });
    },
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
    // 获取列表数据
    getTableData() {
      getSuperviseWayList({
@ -210,7 +218,8 @@ export default {
        :page-sizes="pageData.pageSizes"
        layout="total, prev, pager, next, sizes, jumper"
        :total="pageData.total"
-        @size-change="getTableData()"
+        @size-change="(e) => handlePageSizeChange(e)"
+        @current-change="(e) => handleCurrentPageChange(e)"
      >
      </el-pagination>
    </div>
@ -220,7 +229,7 @@ export default {
 <style scoped lang="less">
 .body {
  width: 100%;
-  min-height: calc(100vh - 56px);
+  min-height: calc(100vh - 6px);
  padding-left: 24px;

  .top-title {
--- a/src/views/sluice/runManage/supervisionInspetion/methodsManage/itemsDetails.vue
+++ b/src/views/sluice/runManage/supervisionInspetion/methodsManage/itemsDetails.vue
@ -276,7 +276,7 @@ export default {
 <style scoped lang="scss">
 .body {
  width: 100%;
-  min-height: calc(100vh - 56px);
+  min-height: calc(100vh - 6px);
  padding-left: 24px;

  .top-title {
--- a/src/views/sluice/runManage/supervisionInspetion/methodsManage/itemsList.vue
+++ b/src/views/sluice/runManage/supervisionInspetion/methodsManage/itemsList.vue
@ -159,7 +159,7 @@ export default {
 <style scoped lang="scss">
 .body {
  width: 100%;
-  min-height: calc(100vh - 56px);
+  min-height: calc(100vh - 6px);
  padding-left: 24px;

  .top-title {
--- a/src/views/sluice/runManage/supervisionInspetion/tasksManage/tasksDetails.vue
+++ b/src/views/sluice/runManage/supervisionInspetion/tasksManage/tasksDetails.vue
@ -202,6 +202,54 @@ export default {
    handleDel(row) {
      console.log("row >>>>>  ", row);
    },
+    // 返回二次确认
+    handleBack() {
+      this.$confirm("是否保存再返回？", "提示", {
+        confirmButtonText: "保存",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$refs.ruleForm.validate((valid) => {
+            if (valid) {
+              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);
+                  }
+                });
+              }
+            } else {
+              throw new Error("校验未通过");
+            }
+          });
+        })
+        .catch((err) => {
+          console.warn("取消 >>>>> ", err);
+          if (err === "cancel") {
+            this.$router.go(-1);
+          }
+        });
+    },
    // 提交表单
    handleSubmit() {
      this.$refs.ruleForm.validate((valid) => {
@ -396,7 +444,7 @@ export default {
        size="small"
        >确认</el-button
      >
-      <el-button @click="$router.go(-1)" size="small">返回</el-button>
+      <el-button @click="handleBack" size="small">返回</el-button>
    </div>
  </div>
 </template>
--- a/src/views/sluice/runManage/waterRainReport/testReportManage/index.vue
+++ b/src/views/sluice/runManage/waterRainReport/testReportManage/index.vue
@ -77,7 +77,8 @@
        :page-sizes="pageData.pageSizes"
        layout="total, prev, pager, next, sizes, jumper"
        :total="pageData.total"
-        @size-change="getTableData()"
+        @size-change="(e) => handlePageSizeChange(e)"
+        @current-change="(e) => handleCurrentPageChange(e)"
      >
      </el-pagination>
    </div>
@ -122,6 +123,14 @@ export default {
    this.getTreeData();
  },
  methods: {
+    handleCurrentPageChange(page) {
+      this.pageData.pageNum = page;
+      this.getTableData();
+    },
+    handlePageSizeChange(pageSize) {
+      this.pageData.pageSize = pageSize;
+      this.getTableData();
+    },
    // 获取列表信息
    getTableData() {
      getSluiceWaterRainProjectList({