Merge branch 'master' of http://192.168.20.39:8989/r/LFWEB_NEW

Surpriseplus

2023-03-06 28bd61701bb409257ea0dd3c78f32bd0b45ebbd5

 src/views/maintenance/blackwhiteList.vue

@@ -84,6 +84,7 @@
        <div class="table_box subpage_Div" :style="styleVar">
          <el-table
            :data="BTableData"
            border
            @selection-change="blackSelectionChange"
            style="width: 100%"
            height="calc(100% - 45px)"
@@ -231,6 +232,7 @@
        <div class="table_box subpage_Div" :style="styleVar">
          <el-table
            :data="WTableData"
            border
            @selection-change="blackSelectionChange"
            style="width: 100%"
            height="calc(100% - 45px)"
@@ -308,6 +310,7 @@
    <el-dialog
      :title="$t('common.append')"
      :visible.sync="InsertFormdialog"
      :before-close="handleClose"
    >

      <el-form ref="insertform" :model="insertform" label-position="top">
@@ -356,6 +359,7 @@
      :title="$t('common.update')"
      style="overflow: hidden"
      :visible.sync="updateFormdialog"
      :before-close="handleCloseEdit"
    >
      <el-form ref="editfrom" :model="editfrom" label-position="top">
        <el-form-item :label-width="formLabelWidth" label="IP地址">
@@ -469,10 +473,16 @@
      });
    },
    editFromDataClose() {
      this.updateFormdialog = false;
      this.$nextTick(() => {
        this.editForm = JSON.parse(this.initialForm);
      });
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.updateFormdialog = false;
          this.$nextTick(() => {
            this.editForm = JSON.parse(this.initialForm);
          });
          this.BGetList();
          this.WGetList();
        })
        .catch((_) => { });
    },
    queryBlackInfo() {
      let searchData = {
@@ -600,8 +610,12 @@
      this.InsertFormdialog = true;
    },
    insertFromDataClose() {
      this.InsertFormdialog = false;
      this.insertform = {};
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.InsertFormdialog = false;
          this.insertform = {};
        })
        .catch((_) => { });
    },
    async insertFromData() {
      var count = await blacklistSelectCount(this.insertform);
@@ -713,6 +727,20 @@
          break;
      }
    },
    handleClose() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.InsertFormdialog = false
        })
        .catch((_) => { });
    },
    handleCloseEdit() {
      this.$confirm("关闭后无法保存，是否关闭?")
        .then((_) => {
          this.updateFormdialog = false
        })
        .catch((_) => { });
    },
  },
  mounted() {
    window.addEventListener("resize", this.onResize);