王旭
2022-10-11 a7b9af3cc54aa0d4bbc9aee2583c88a26090613b
黑白名单列表接口对接
已修改7个文件
244 ■■■■■ 文件已修改
src/api/api.js 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/lang/en.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/lang/zh.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/maintenance/blackwhiteList.vue 196 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/maintenance/eventlogManage.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/maintenance/logLog.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/maintenance/operationLog.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/api.js
@@ -174,15 +174,15 @@
//请求目录树数据
export function queryDirTree() {
  return service.get('/dir/selectDirAll');
  return request.get('/dir/selectDirAll');
}
//更新单条目录树
export function updateDirTree(params) {
  return service.post('/dir/updateDir', params);
  return request.post('/dir/updateDir', params);
}
//更新整体目录树
export function updateDirTrees(params) {
  return service.post('/dir/updateDirs', params);
  return request.post('/dir/updateDirs', params);
}
//请求菜单栏数据
export function queryMenuTree() {
@@ -198,23 +198,22 @@
}
//请求单位树
export function queryDepTree() {
  return service.get('/dep/selectDepAll');
  return request.get('/dep/selectDepAll');
}
//更新单条单位数据
export function updateDepTree(params) {
  return service.post('/dep/updateDep', params);
  return request.post('/dep/updateDep', params);
}
//更新整体单位树
export function updateDepTrees(params) {
  return service.post('/dep/updateDeps', params);
  return request.post('/dep/updateDeps', params);
}
// 请求用户管理数据
export function queryPageUser(pageIndex, pageSize) {
  return service.get(
    '/user/selectByPageAndCount?pageIndex=' +
      pageIndex +
      '&pageSize=' +
      pageSize
  );
export function queryPageUser(params) {
  return request.get('/user/selectByPageAndCount', { params: params });
}
//黑白名单列表
export function blacklistSelectByPageAndCount(params) {
  return request.get('/blacklist/selectByPageAndCount', { params: params });
}
src/assets/lang/en.js
@@ -201,6 +201,12 @@
      requestUser: 'requestUser',
      tokenInfo: 'tokenInfo',
      whiteListStatus: 'whiteListStatus',
      PageView: 'PageView',
      description: 'description',
      creator: 'creator',
      creationTime: 'creationTime',
      update: 'update',
      UpdateTime: 'UpdateTime',
    },
    tokentool: 'Token Tool',
    tokentoolObj: {
src/assets/lang/zh.js
@@ -201,6 +201,12 @@
      requestUser: '申请人',
      tokenInfo: 'token信息',
      whiteListStatus: '白名单状态',
      PageView: '访问次数',
      description: '描述',
      creator: '创建人',
      creationTime: '创建时间',
      update: '更新人',
      UpdateTime: '更新时间',
    },
    tokentool: 'Token工具',
    tokentoolObj: {
src/views/maintenance/blackwhiteList.vue
@@ -81,7 +81,7 @@
          </el-form>
        </div>
        <div class="table_box">
          <el-table :data="tableData" stripe style="width: 100%" height="99%">
          <el-table :data="BTableData" stripe style="width: 100%" height="85%">
            <el-table-column
              align="center"
              type="index"
@@ -89,56 +89,45 @@
              width="70px"
            />
            <el-table-column
              align="center"
              prop="serviceName"
              :label="$t('operatManage.BWL.serviceName')"
              prop="ip"
              :label="$t('operatManage.BWL.whiteListIP')"
            />
            <el-table-column
              align="center"
              prop="accessSourceSystem"
              :label="$t('operatManage.BWL.accessSourceSystem')"
              prop="visit"
              :label="$t('operatManage.BWL.PageView')"
            />
            <el-table-column
              align="center"
              prop="IPRequest"
              :label="$t('operatManage.BWL.IPRequest')"
              prop="descr"
              :label="$t('operatManage.BWL.description')"
            />
            <el-table-column
              align="center"
              prop="servicesRequestUrl"
              :label="$t('operatManage.BWL.servicesRequestUrl')"
            />
            <el-table-column
              align="center"
              prop="resourceIDRequest"
              :label="$t('operatManage.BWL.resourceIDRequest')"
              prop="createUser"
              :label="$t('operatManage.BWL.creator')"
            />
            <el-table-column
              align="center"
              prop="serviceSystemRequest"
              :label="$t('operatManage.BWL.serviceSystemRequest')"
              :formatter="formatData"
              prop="createTime"
              :label="$t('operatManage.BWL.creationTime')"
            />
            <el-table-column
              align="center"
              prop="blackListStatus"
              :label="$t('operatManage.BWL.blackListStatus')"
              prop="updateUser"
              :label="$t('operatManage.BWL.update')"
            />
            <el-table-column
              align="center"
              prop="operate"
              :label="$t('operatManage.BWL.operate')"
              :formatter="formatData"
              prop="updateTime"
              :label="$t('operatManage.BWL.UpdateTime')"
            />
          </el-table>
          <div style="margin-top: 40px" class="pagination_box">
            <el-pagination
              @size-change="handleSizeChange"
              @current-change="handleCurrentChange"
              :current-page="currentPage"
              @size-change="BhandleSizeChange"
              @current-change="BhandleCurrentChange"
              :current-page="BListData.pageIndex"
              :page-sizes="[10, 20, 30, 40]"
              :page-size="10"
              :page-size="BListData.pageSize"
              layout="total, sizes, prev, pager, next, jumper"
              :total="0"
              :total="Bcount"
            >
            </el-pagination>
          </div>
@@ -186,7 +175,7 @@
          </el-form>
        </div>
        <div class="table_box">
          <el-table :data="tableData" stripe style="width: 100%" height="99%">
          <el-table :data="WTableData" stripe style="width: 100%" height="85%">
            <el-table-column
              align="center"
              type="index"
@@ -194,45 +183,45 @@
              width="70px"
            />
            <el-table-column
              align="center"
              prop="whiteListIP"
              prop="ip"
              :label="$t('operatManage.BWL.whiteListIP')"
            />
            <el-table-column
              align="center"
              prop="effectiveDate"
              :label="$t('operatManage.BWL.effectiveDate')"
              prop="visit"
              :label="$t('operatManage.BWL.PageView')"
            />
            <el-table-column
              align="center"
              prop="requestUser"
              :label="$t('operatManage.BWL.requestUser')"
              prop="descr"
              :label="$t('operatManage.BWL.description')"
            />
            <el-table-column
              align="center"
              prop="tokenInfo"
              :label="$t('operatManage.BWL.tokenInfo')"
              prop="createUser"
              :label="$t('operatManage.BWL.creator')"
            />
            <el-table-column
              align="center"
              prop="whiteListStatus"
              :label="$t('operatManage.BWL.whiteListStatus')"
              :formatter="formatData"
              prop="createTime"
              :label="$t('operatManage.BWL.creationTime')"
            />
            <el-table-column
              align="center"
              prop="operate"
              :label="$t('operatManage.BWL.operate')"
              prop="updateUser"
              :label="$t('operatManage.BWL.update')"
            />
            <el-table-column
              :formatter="formatData"
              prop="updateTime"
              :label="$t('operatManage.BWL.UpdateTime')"
            />
          </el-table>
          <div style="margin-top: 40px" class="pagination_box">
            <el-pagination
              @size-change="handleSizeChange"
              @current-change="handleCurrentChange"
              :current-page="currentPage"
              @size-change="WhandleSizeChange"
              @current-change="WhandleCurrentChange"
              :current-page="WListData.pageIndex"
              :page-sizes="[10, 20, 30, 40]"
              :page-size="10"
              :page-size="WListData.pageSize"
              layout="total, sizes, prev, pager, next, jumper"
              :total="0"
              :total="Wcount"
            >
            </el-pagination>
          </div></div
@@ -243,7 +232,7 @@
  
  <script>
import MyBread from "../../components/MyBread.vue";
import { blacklistSelectByPageAndCount } from "../../api/api";
export default {
  //import引入的组件需要注入到对象中才能使用
  components: {
@@ -261,18 +250,73 @@
        unit: "",
        interceptionNumber: "",
      },
      tableData: [],
      BTableData: [],
      WTableData: [],
      BListData: {
        pageIndex: 1,
        pageSize: 10,
        type: 1,
      },
      WListData: {
        pageIndex: 1,
        pageSize: 10,
        type: 2,
      },
      Wcount: 0,
      Bcount: 0,
    };
  },
  methods: {
    //格式化时间
    add0(m) {
      return m < 10 ? "0" + m : m;
    },
    //格式化时间
    format(shijianchuo) {
      //shijianchuo是整数,否则要parseInt转换
      var time = new Date(shijianchuo);
      var y = time.getFullYear();
      var m = time.getMonth() + 1;
      var d = time.getDate();
      var h = time.getHours();
      var mm = time.getMinutes();
      var s = time.getSeconds();
      return (
        y + "-" + this.add0(m) + "-" + this.add0(d)
        // " " +
        // this.add0(h) +
        // ":" +
        // this.add0(mm) +
        // ":" +
        // this.add0(s)
      );
    },
    //格式化列表
    formatData(row, column) {
      let data = row[column.property];
      if (data == null) {
        return data;
      }
      return this.format(data);
    },
    handleClick(tab, event) {
      console.log(tab, event);
    },
    handleSizeChange(val) {
      console.log(`每页 ${val} 条`);
    WhandleSizeChange(val) {
      this.WListData.pageSize = val;
      this.getList();
    },
    handleCurrentChange(val) {
      console.log(`当前页: ${val}`);
    WhandleCurrentChange(val) {
      this.WListData.pageIndex = val;
      this.getList();
    },
    BhandleSizeChange(val) {
      this.BListData.pageSize = val;
      this.getList();
    },
    BhandleCurrentChange(val) {
      this.BListData.pageIndex = val;
      this.getList();
    },
    onSubmit() {
      console.log("submit!");
@@ -280,8 +324,29 @@
    resetForm(formName) {
      this.$refs[formName].resetFields();
    },
    async WGetList() {
      const data = await blacklistSelectByPageAndCount(this.WListData);
      if (data.code != 200) {
        return this.$message.error("列表调用失败");
      }
      this.WTableData = data.result;
      this.Wcount = data.count;
    },
    async BGetList() {
      const data = await blacklistSelectByPageAndCount(this.BListData);
      console.log(data);
      if (data.code != 200) {
        return this.$message.error("列表调用失败");
      }
      this.BTableData = data.result;
      this.Bcount = data.count;
    },
  },
  created() {},
  created() {
    this.BGetList();
    this.WGetList();
  },
};
</script>
  <style lang="less" scoped>
@@ -308,10 +373,15 @@
    background: #fff;
    border-radius: 5px;
    border: 1px solid rgb(202, 201, 204);
    overflow: auto;
    height: 70%;
  }
  .text-center {
    text-align: center;
  }
  .el-tab-pane {
    height: 82vh;
  }
}
</style>
  
src/views/maintenance/eventlogManage.vue
@@ -94,7 +94,7 @@
      </el-form>
    </div>
    <div class="table_box">
      <el-table :data="tableData" stripe style="width: 100%" height="99%">
      <el-table :data="tableData" stripe style="width: 100%" height="85%">
        <el-table-column
          align="center"
          type="index"
@@ -290,7 +290,8 @@
    }
  }
  .table_box {
    height: 65%;
   overflow: auto;
    height: 70%;
    padding: 10px;
    background: #fff;
    border-radius: 5px;
src/views/maintenance/logLog.vue
@@ -86,7 +86,7 @@
    </div>
    <!-- 表格显示 -->
    <div class="table_box">
      <el-table :data="tableData" stripe style="width: 100%">
      <el-table :data="tableData" stripe style="width: 100%" height="85%">
        <el-table-column
          width="150"
          type="index"
@@ -290,6 +290,8 @@
    background: #fff;
    border-radius: 5px;
    border: 1px solid rgb(202, 201, 204);
    overflow: auto;
    height: 70%;
  }
  .text-center {
    text-align: center;
src/views/maintenance/operationLog.vue
@@ -100,7 +100,7 @@
      </el-form>
    </div>
    <div class="table_box">
      <el-table :data="tableData" stripe style="width: 100%" height="550">
      <el-table :data="tableData" stripe style="width: 100%" height="85%">
        <!-- <el-table-column type="selection" width="55" /> -->
        <el-table-column
          :label="$t('operatManage.operationLogObj.num')"