From 1e09b147f84337bcf4d0a106cf246c2ad9d16236 Mon Sep 17 00:00:00 2001 From: lxl <lixuliang_hd@126.com> Date: 星期二, 20 九月 2022 18:18:56 +0800 Subject: [PATCH] 第六个 --- src/assets/lang/zh.js | 24 +++- src/views/maintenance/blackwhiteList.vue | 255 ++++++++++++++++++++++-------------------- src/assets/lang/en.js | 37 +++++ src/components/navMenu.vue | 9 src/router/index.js | 27 ---- 5 files changed, 189 insertions(+), 163 deletions(-) diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js index 6e238bb..9e70448 100644 --- a/src/assets/lang/en.js +++ b/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', diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js index 58d2ce7..9e192ef 100644 --- a/src/assets/lang/zh.js +++ b/src/assets/lang/zh.js @@ -62,13 +62,13 @@ logLog: '鐧诲綍鏃ュ織', operationLog: '鎿嶄綔鏃ュ織', databaseMonitoring: '鏁版嵁搴撶洃鎺�', -<<<<<<< HEAD blackwhiteList: "榛�/鐧藉悕鍗�", BWL: { blackList: "榛戝悕鍗�", whiteList: "鐧藉悕鍗�", blackListIP: '榛戝悕鍗旾P', - blackListIPInfo: '杈撳叆IP鏌ヨ', + whiteListIP: '鐧藉悕鍗旾P', + 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: '缁煎悎灞曠ず', diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue index d768658..504277f 100644 --- a/src/components/navMenu.vue +++ b/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> diff --git a/src/router/index.js b/src/router/index.js index 635ad39..29d9e48 100644 --- a/src/router/index.js +++ b/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, // 鏍囪瘑璇ヨ矾鐢辨槸鍚﹂渶瑕佺櫥褰� }, }, diff --git a/src/views/maintenance/blackwhiteList.vue b/src/views/maintenance/blackwhiteList.vue index a706941..c646894 100644 --- a/src/views/maintenance/blackwhiteList.vue +++ b/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> {{ - $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> {{ + $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> {{ + $t("operatManage.BWL.search") + }}</el-button + > + </el-form-item> + <el-form-item> + <el-button @click="onSubmit" + ><i class="el-icon-delete"></i> {{ + $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: { -- Gitblit v1.9.3