From 6f547d926fff4ac05785444317026758a5ef21e0 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期六, 25 二月 2023 17:29:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/LFWEB_NEW
---
src/views/maintenance/blackwhiteList.vue | 76 ++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 35 deletions(-)
diff --git a/src/views/maintenance/blackwhiteList.vue b/src/views/maintenance/blackwhiteList.vue
index 897260a..b6f440a 100644
--- a/src/views/maintenance/blackwhiteList.vue
+++ b/src/views/maintenance/blackwhiteList.vue
@@ -18,21 +18,23 @@
prop="blackListIP"
>
<el-input
+ size="small"
style="width: 200px"
v-model="queryInfo.ip"
- :placeholder="$t('operatManage.BWL.listIPInfo')"
+ :placeholder="$t('operatManage.BWL.blackListIPHolder')"
/>
</el-form-item>
- <el-form-item
- :label="$t('operatManage.BWL.interceptionNumber')"
- prop="visit"
- >
- <el-input
- style="width: 200px"
- v-model="queryInfo.visit"
- :placeholder="$t('operatManage.BWL.interceptionNumber')"
- />
- </el-form-item>
+<!-- <el-form-item-->
+<!-- :label="$t('operatManage.BWL.interceptionNumber')"-->
+<!-- prop="visit"-->
+<!-- >-->
+<!-- <el-input-->
+<!-- size="small"-->
+<!-- style="width: 200px"-->
+<!-- v-model="queryInfo.visit"-->
+<!-- :placeholder="$t('operatManage.BWL.interceptionNumber')"-->
+<!-- />-->
+<!-- </el-form-item>-->
</div>
<div>
<el-form-item>
@@ -82,7 +84,7 @@
:data="BTableData"
@selection-change="blackSelectionChange"
style="width: 100%"
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
>
<el-table-column type="selection" width="55" />
<el-table-column
@@ -138,7 +140,7 @@
</template>
</el-table-column>
</el-table>
- <div class="pagination_box">
+ <div class="pagination_box" style="margin-top: 10px">
<el-pagination
@size-change="BhandleSizeChange"
@current-change="BhandleCurrentChange"
@@ -162,21 +164,23 @@
prop="ip"
>
<el-input
+ size="small"
style="width: 200px"
v-model="queryInfo.ip"
- :placeholder="$t('operatManage.BWL.listIPInfo')"
+ :placeholder="$t('operatManage.BWL.whiteListIPHolder')"
/>
</el-form-item>
- <el-form-item
- :label="$t('operatManage.BWL.interceptionNumber')"
- prop="visit"
- >
- <el-input
- style="width: 200px"
- v-model="queryInfo.visit"
- :placeholder="$t('operatManage.BWL.interceptionNumber')"
- />
- </el-form-item>
+<!-- <el-form-item-->
+<!-- :label="$t('operatManage.BWL.interceptionNumber')"-->
+<!-- prop="visit"-->
+<!-- >-->
+<!-- <el-input-->
+<!-- size="small"-->
+<!-- style="width: 200px"-->
+<!-- v-model="queryInfo.visit"-->
+<!-- :placeholder="$t('operatManage.BWL.interceptionNumber')"-->
+<!-- />-->
+<!-- </el-form-item>-->
</div>
<div>
<el-form-item>
@@ -225,7 +229,7 @@
:data="WTableData"
@selection-change="blackSelectionChange"
style="width: 100%"
- height="calc(100% - 57px)"
+ height="calc(100% - 45px)"
>
<el-table-column type="selection" width="55" />
<el-table-column
@@ -282,7 +286,7 @@
</el-table-column>
</el-table>
- <div class="pagination_box">
+ <div class="pagination_box" style="margin-top: 10px">
<el-pagination
@size-change="WhandleSizeChange"
@current-change="WhandleCurrentChange"
@@ -302,7 +306,7 @@
:visible.sync="InsertFormdialog"
top="2vh"
>
-
+
<el-form ref="insertform" :model="insertform" label-position="top">
<el-form-item
:label-width="formLabelWidth"
@@ -335,7 +339,7 @@
/>
</el-form-item>
</el-form>
-
+
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="insertFromDataClose">{{
$t("common.close")
@@ -459,7 +463,7 @@
this.$nextTick(() => {
const rect = this.$refs.container.getBoundingClientRect();
this.tableHeight = `${rect.height + 40}px`;
- this.styleVar["height"] = `calc(100% - ${rect.height + 40}px)`;
+ this.styleVar["height"] = `calc(100% - ${rect.height + 0}px)`;
});
},
editFromDataClose() {
@@ -730,26 +734,28 @@
.logLog_box {
height: 98%;
width: 98%;
- padding: 1%;
+ padding: 0.5% 1%;
.el-input {
width: 300px;
}
.inquire {
- padding: 8px;
- margin-top: 20px;
+ padding:0 8px;
+ //margin-top: 20px;
border-radius: 5px;
- margin-bottom: 20px;
+ //margin-bottom: 20px;
.el-form-item {
margin: 5px;
}
}
.el-tabs {
- height: calc(100% - 70px);
+ //height: calc(100% - 70px);
+ height: calc(100% - 30px);
}
/deep/ .el-tabs__content {
- height: calc(100% - 49px);
+ height: calc(100% - 54px);
+ //height: calc(100% - 49px);
}
/deep/ .el-tab-pane {
height: 100%;
--
Gitblit v1.9.3