lxl
2022-09-20 1e09b147f84337bcf4d0a106cf246c2ad9d16236
第六个
已修改5个文件
352 ■■■■ 文件已修改
src/assets/lang/en.js 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/lang/zh.js 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/navMenu.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.js 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/maintenance/blackwhiteList.vue 255 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/lang/en.js
@@ -62,9 +62,39 @@
    logLog: 'ConLog',
    operationLog: 'Operation Log',
    databaseMonitoring: 'Database Monitoring',
<<<<<<< HEAD
    blackwhiteList: "Black/White List"
=======
    blackwhiteList: "Black/White List",
    BWL: {
      blackList: "blackList",
      whiteList: "whiteList",
      blackListIP: 'blackListIP',
      whiteListIP: 'whiteListIP',
      listIPInfo: 'listIPInfo',
      IPState: 'IPState',
      all: 'all',
      validity: 'validity',
      invalidity: 'invalidity',
      interceptionCycle: 'interceptionCycle',
      seconds: 'seconds',
      mins: 'mins',
      hours: 'hours',
      interceptionNumber: 'interceptionNumber',
      change: 'change',
      search: 'search',
      reset: 'reset',
      index: "index",
      serviceName: 'serviceName',
      accessSourceSystem: 'accessSourceSystem',
      IPRequest: 'IPRequest',
      servicesRequestUrl: 'servicesRequestUrl',
      resourceIDRequest: 'resourceIDRequest',
      serviceSystemRequest: 'serviceSystemRequest',
      blackListStatus: 'blackListStatus',
      operate: 'operate',
      effectiveDate: "effectiveDate",
      requestUser: "requestUser",
      tokenInfo: "tokenInfo",
      whiteListStatus: 'whiteListStatus',
    },
    tokentool: 'Token Tool',
    tokentoolObj: {
      first: 'Service List',
@@ -117,7 +147,6 @@
      optionDate: 'optionDate',
      selectTime: 'selectTime',
    },
>>>>>>> eb8b11722d1d778311ae7c4eb47869288e30ade6
  },
  synthesis: {
    synthesis: 'Comprehensive Display',
src/assets/lang/zh.js
@@ -62,13 +62,13 @@
    logLog: '登录日志',
    operationLog: '操作日志',
    databaseMonitoring: '数据库监控',
<<<<<<< HEAD
    blackwhiteList: "黑/白名单",
    BWL: {
      blackList: "黑名单",
      whiteList: "白名单",
      blackListIP: '黑名单IP',
      blackListIPInfo: '输入IP查询',
      whiteListIP: '白名单IP',
      listIPInfo: '输入IP查询',
      IPState: 'IP状态',
      all: '全部',
      validity: '生效',
@@ -79,9 +79,22 @@
      hours: '时',
      interceptionNumber: '拦截次数',
      change: '修改',
      index:"序号",
    }
=======
      search: '搜索',
      reset: '重置',
      index: "序号",
      serviceName: '服务名称',
      accessSourceSystem: '访问来源系统',
      IPRequest: '申请IP',
      servicesRequestUrl: '申请服务Url',
      resourceIDRequest: '申请资源Id',
      serviceSystemRequest: '申请服务系统',
      blackListStatus: '黑名单状态',
      operate: '操作',
      effectiveDate: "生效日期",
      requestUser: "申请人",
      tokenInfo: "token信息",
      whiteListStatus: '白名单状态',
    },
    tokentool: 'Token工具',
    tokentoolObj: {
      first: '服务列表',
@@ -134,7 +147,6 @@
      optionDate: '选择日期',
      selectTime: '选择时间',
    },
>>>>>>> eb8b11722d1d778311ae7c4eb47869288e30ade6
  },
  synthesis: {
    synthesis: '综合展示',
src/components/navMenu.vue
@@ -102,13 +102,12 @@
              <el-menu-item index="databaseMonitoring">{{
                $t("operatManage.databaseMonitoring")
              }}</el-menu-item>
<<<<<<< HEAD
              <el-menu-item index="blackwhiteList">{{
                $t("operatManage.blackwhiteList")
=======
              <el-menu-item index="blackwhiteList"
                >{{ $t("operatManage.blackwhiteList") }}
              </el-menu-item>
              <el-menu-item index="tokentool">{{
                $t("operatManage.tokentool")
>>>>>>> eb8b11722d1d778311ae7c4eb47869288e30ade6
              }}</el-menu-item>
            </el-submenu>
          </el-submenu>
src/router/index.js
@@ -1,4 +1,3 @@
<<<<<<< HEAD
import Vue from "vue";
import VueRouter from "vue-router";
import Home from "../views/Home.vue";
@@ -18,26 +17,8 @@
import systemMonitoring from "@/views/maintenance/systemMonitoring.vue"; //系统监控
import databaseMonitoring from "@/views/maintenance/databaseMonitoring.vue"; //数据库监控
import parameterConfiguration from "@/views/maintenance/parameterConfiguration.vue"; //参数配置
=======
import Vue from 'vue';
import VueRouter from 'vue-router';
import Home from '../views/Home.vue';
import login from '../components/login';
import Synthesis from '../views/Synthesis/index.vue'; //综合展示
import Thematic from '../views/Thematic/index.vue'; //专题地图
import Archive from '../views/Archive/index.vue'; //资料馆
import userManagement from '@/views/maintenance/userManagement.vue'; //用户管理
import menuSettings from '@/views/maintenance/menuSettings.vue'; //菜单设置
import rests from '@/views/maintenance/rests.vue'; //其他
import authorityManagement from '@/views/maintenance/authorityManagement.vue'; //权限管理
import safetyManagement from '@/views/maintenance/safetyManagement.vue'; //安全管理
import operationLog from '@/views/maintenance/operationLog.vue'; //操作日志
import logLog from '@/views/maintenance/logLog.vue'; //登录日志
import systemMonitoring from '@/views/maintenance/systemMonitoring.vue'; //系统监控
import databaseMonitoring from '@/views/maintenance/databaseMonitoring.vue'; //数据库监控
import tokentool from '@/views/maintenance/tokentool.vue'; //token 工具
import parameterConfiguration from '@/views/maintenance/parameterConfiguration.vue'; //参数配置
>>>>>>> eb8b11722d1d778311ae7c4eb47869288e30ade6
//数据管理模块
import catalogueManage from '../views/datamanage/catalogueManage.vue'; //数据管理-目录管理
@@ -228,7 +209,6 @@
        },
      },
      {
<<<<<<< HEAD
        path: "/eventlogManage",
        component: eventlogManage,
        name: "eventlogManage",
@@ -239,13 +219,10 @@
      },
      {
        path: "/logLog",
=======
        path: '/logLog',
>>>>>>> eb8b11722d1d778311ae7c4eb47869288e30ade6
        component: logLog,
        name: 'logLog',
        meta: {
<<<<<<< HEAD
          title: "事件日志管理",
          requireAuth: true, // 标识该路由是否需要登录
        },
@@ -256,9 +233,7 @@
        name: "blackwhiteList",
        meta: {
          title: "黑/白名单",
=======
          title: '登录日志',
>>>>>>> eb8b11722d1d778311ae7c4eb47869288e30ade6
          requireAuth: true, // 标识该路由是否需要登录
        },
      },
src/views/maintenance/blackwhiteList.vue
@@ -8,10 +8,7 @@
    ></My-bread>
    <el-divider />
    <el-tabs v-model="activeName" @tab-click="handleClick">
      <el-tab-pane
        :label="$t('operatManage.BWL.blackList')"
        :name="$t('operatManage.BWL.blackList')"
      >
      <el-tab-pane :label="$t('operatManage.BWL.blackList')" name="first">
        <div class="inquire">
          <el-form ref="ruleForm" :model="form" :inline="true">
            <el-form-item
@@ -20,7 +17,7 @@
            >
              <el-input
                v-model="form.blackListIP"
                :placeholder="$t('operatManage.BWL.blackListIPInfo')"
                :placeholder="$t('operatManage.BWL.listIPInfo')"
              />
            </el-form-item>
            <el-form-item
@@ -63,9 +60,21 @@
              />
            </el-form-item>
            <el-form-item>
              <el-button @click="onSubmit">{{
                $t("operatManage.BWL.change")
              }}</el-button>
            </el-form-item>
            <el-form-item>
              <el-button @click="onSubmit"
                ><i class="el-icon-search"></i> &nbsp;{{
                  $t("operatManage.BWL.change")
                  $t("operatManage.BWL.search")
                }}</el-button
              >
            </el-form-item>
            <el-form-item>
              <el-button @click="onSubmit"
                ><i class="el-icon-delete"></i> &nbsp;{{
                  $t("operatManage.BWL.reset")
                }}</el-button
              >
            </el-form-item>
@@ -81,43 +90,44 @@
            />
            <el-table-column
              align="center"
              prop="username"
              :label="$t('operatManage.BWL.username')"
              prop="serviceName"
              :label="$t('operatManage.BWL.serviceName')"
            />
            <el-table-column
              align="center"
              prop="ip"
              :label="$t('operatManage.BWL.ip')"
              prop="accessSourceSystem"
              :label="$t('operatManage.BWL.accessSourceSystem')"
            />
            <el-table-column
              align="center"
              prop="IPState"
              :label="$t('operatManage.BWL.IPState')"
              prop="IPRequest"
              :label="$t('operatManage.BWL.IPRequest')"
            />
            <el-table-column
              align="center"
              prop="largeModuleName"
              :label="$t('operatManage.BWL.largeModuleName')"
              prop="servicesRequestUrl"
              :label="$t('operatManage.BWL.servicesRequestUrl')"
            />
            <el-table-column
              align="center"
              prop="resourceIDRequest"
              :label="$t('operatManage.BWL.resourceIDRequest')"
            />
            <el-table-column
              align="center"
              prop="smallModuleName"
              :label="$t('operatManage.BWL.smallModuleName')"
              prop="serviceSystemRequest"
              :label="$t('operatManage.BWL.serviceSystemRequest')"
            />
            <el-table-column
              align="center"
              prop="resourceName"
              :label="$t('operatManage.BWL.resourceName')"
              prop="blackListStatus"
              :label="$t('operatManage.BWL.blackListStatus')"
            />
            <el-table-column
              align="center"
              prop="date"
              :label="$t('operatManage.BWL.date')"
            />
            <el-table-column
              align="center"
              prop="operationType"
              :label="$t('operatManage.BWL.operationType')"
              prop="operate"
              :label="$t('operatManage.BWL.operate')"
            />
          </el-table>
          <div style="margin-top: 40px" class="pagination_box">
@@ -128,13 +138,105 @@
              :page-sizes="[10, 20, 30, 40]"
              :page-size="10"
              layout="total, sizes, prev, pager, next, jumper"
              :total="9"
              :total="0"
            >
            </el-pagination>
          </div>
        </div>
      </el-tab-pane>
      <el-tab-pane label="配置管理" name="second">配置管理</el-tab-pane>
      <el-tab-pane :label="$t('operatManage.BWL.whiteList')" name="second"
        ><div class="inquire">
          <el-form ref="ruleForm" :model="form" :inline="true">
            <el-form-item
              :label="$t('operatManage.BWL.whiteListIP')"
              prop="whiteListIP"
            >
              <el-input
                v-model="form.blackListIP"
                :placeholder="$t('operatManage.BWL.listIPInfo')"
              />
            </el-form-item>
            <el-form-item
              :label="$t('operatManage.BWL.IPState')"
              prop="IPState"
            >
              <el-select v-model="form.IPState">
                <el-option :label="$t('operatManage.BWL.all')" value="0" />
                <el-option :label="$t('operatManage.BWL.validity')" value="1" />
                <el-option
                  :label="$t('operatManage.BWL.invalidity')"
                  value="2"
                />
              </el-select>
            </el-form-item>
            <el-form-item>
              <el-button @click="onSubmit"
                ><i class="el-icon-search"></i> &nbsp;{{
                  $t("operatManage.BWL.search")
                }}</el-button
              >
            </el-form-item>
            <el-form-item>
              <el-button @click="onSubmit"
                ><i class="el-icon-delete"></i> &nbsp;{{
                  $t("operatManage.BWL.reset")
                }}</el-button
              >
            </el-form-item>
          </el-form>
        </div>
        <div class="table_box">
          <el-table :data="tableData" stripe style="width: 100%" height="99%">
            <el-table-column
              align="center"
              type="index"
              :label="$t('operatManage.BWL.index')"
              width="70px"
            />
            <el-table-column
              align="center"
              prop="whiteListIP"
              :label="$t('operatManage.BWL.whiteListIP')"
            />
            <el-table-column
              align="center"
              prop="effectiveDate"
              :label="$t('operatManage.BWL.effectiveDate')"
            />
            <el-table-column
              align="center"
              prop="requestUser"
              :label="$t('operatManage.BWL.requestUser')"
            />
            <el-table-column
              align="center"
              prop="tokenInfo"
              :label="$t('operatManage.BWL.tokenInfo')"
            />
            <el-table-column
              align="center"
              prop="whiteListStatus"
              :label="$t('operatManage.BWL.whiteListStatus')"
            />
            <el-table-column
              align="center"
              prop="operate"
              :label="$t('operatManage.BWL.operate')"
            />
          </el-table>
          <div style="margin-top: 40px" class="pagination_box">
            <el-pagination
              @size-change="handleSizeChange"
              @current-change="handleCurrentChange"
              :current-page="currentPage"
              :page-sizes="[10, 20, 30, 40]"
              :page-size="10"
              layout="total, sizes, prev, pager, next, jumper"
              :total="0"
            >
            </el-pagination>
          </div></div
      ></el-tab-pane>
    </el-tabs>
  </div>
</template>
@@ -150,107 +252,16 @@
  data() {
    return {
      activeName: this.$t("operatManage.BWL.blackList"),
      activeName: "first",
      currentPage: 1,
      form: {
        blackListIP: "",
        IPState: this.$t("operatManage.BWL.all"),
        IPState: "",
        interceptionCycle: "",
        unit: this.$t("operatManage.BWL.seconds"),
        unit: "",
        interceptionNumber: "",
      },
      tableData: [
        {
          username: "管理员",
          ip: "221.182.31.12",
          date: "2022-08-05",
          IPState: "",
          largeModuleName: "运维监控",
          smallModuleName: "资源操作日志",
          resourceName: "",
          operationType: "查询",
        },
        {
          date: "2022-08-05",
          username: "管理员",
          IPState: "",
          largeModuleName: "运维监控",
          smallModuleName: "资源操作日志",
          resourceName: "",
          operationType: "查询",
          ip: "221.182.31.12",
        },
        {
          date: "2022-08-05",
          username: "管理员",
          IPState: "",
          largeModuleName: "运维监控",
          smallModuleName: "资源操作日志",
          resourceName: "",
          operationType: "查询",
          ip: "221.182.31.12",
        },
        {
          date: "2022-08-05",
          username: "管理员",
          IPState: "",
          largeModuleName: "运维监控",
          smallModuleName: "资源操作日志",
          resourceName: "",
          operationType: "查询",
          ip: "221.182.31.12",
        },
        {
          date: "2022-08-05",
          username: "管理员",
          IPState: "",
          largeModuleName: "运维监控",
          smallModuleName: "资源操作日志",
          resourceName: "",
          operationType: "查询",
          ip: "221.182.31.12",
        },
        {
          date: "2022-08-05",
          username: "管理员",
          IPState: "",
          largeModuleName: "运维监控",
          smallModuleName: "资源操作日志",
          resourceName: "",
          operationType: "查询",
          ip: "221.182.31.12",
        },
        {
          date: "2022-08-05",
          username: "管理员",
          IPState: "",
          largeModuleName: "运维监控",
          smallModuleName: "资源操作日志",
          resourceName: "",
          operationType: "查询",
          ip: "221.182.31.12",
        },
        {
          date: "2022-08-05",
          username: "管理员",
          IPState: "",
          largeModuleName: "运维监控",
          smallModuleName: "资源操作日志",
          resourceName: "",
          operationType: "查询",
          ip: "221.182.31.12",
        },
        {
          date: "2022-08-05",
          username: "管理员",
          IPState: "",
          largeModuleName: "运维监控",
          smallModuleName: "资源操作日志",
          resourceName: "",
          operationType: "查询",
          ip: "221.182.31.12",
        },
      ],
      tableData: [],
    };
  },
  methods: {