修改ip全局黑白名单页面

This commit is contained in:
wang_lei
2019-09-02 13:49:37 +08:00
parent b5fe0a21ee
commit ff25788040
8 changed files with 110 additions and 48 deletions
@@ -54,7 +54,7 @@
import OpnInterfaceInf from './opninterfaceinf'
import OpnInterfaceGroupInf from './opninterfacegroupinf'
import OpnBackendServerInf from './opnbackendserverinf'
import OpnStrategyMng from './opnstrategy-mng'
//import OpnStrategyMng from './opnstrategy-mng'
import OpnStrategyIpInf from './opnstrategyipinf'
export default {
@@ -71,7 +71,7 @@
OpnInterfaceInf,
OpnInterfaceGroupInf,
OpnBackendServerInf,
OpnStrategyMng,
//OpnStrategyMng,
OpnStrategyIpInf
},
activated() {
@@ -1,6 +1,6 @@
<template>
<el-dialog
:title="!dataForm.id ? '新增' : '修改'"
:title="title"
:close-on-click-modal="false"
:visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
@@ -182,21 +182,21 @@
visible: false,
dataForm: {
id: 0,
gateway_id: ' ',
strategy_id: ' ',
name: ' ',
type: ' ',
unit_time_type: ' ',
unit_time: ' ',
request_times: ' ',
priority: ' ',
begin_time: ' ',
end_time: ' ',
period_type: ' ',
begin_period: ' ',
end_period: ' ',
status: ' ',
remark: ' '
gateway_id: '',
strategy_id: '',
name: '',
type: '',
unit_time_type: '',
unit_time: '',
request_times: '',
priority: '',
begin_time: '',
end_time: '',
period_type: '',
begin_period: '',
end_period: '',
status: '',
remark: ''
},
dataRule: {
gateway_id: [
@@ -6,7 +6,6 @@
</el-form-item>
<el-form-item>
<el-button @click="getDataList01()">查询</el-button>
<el-button v-if="isAuth('opn:opnstrategyflowinf:query')" type="primary" @click="queryHandle()">查看</el-button>
<el-button v-if="isAuth('opn:opnstrategyflowinf:add')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
<el-button
v-if="isAuth('opn:opnstrategyflowinf:delete')"
@@ -25,11 +24,18 @@
height="400"
>
<el-table-column fixed type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="标识"></el-table-column>
<el-table-column prop="id" header-align="center" type="index" align="center" label="标识"></el-table-column>
<el-table-column prop="gateway_id" header-align="center" align="center" label="网关标识"></el-table-column>
<el-table-column prop="strategy_id" header-align="center" align="center" label="策略标识"></el-table-column>
<el-table-column prop="name" header-align="center" align="center" label="名称"></el-table-column>
<el-table-column prop="type" header-align="center" align="center" column-key="flow_typ" :formatter="dict.formatter" label="访问类型"></el-table-column>
<el-table-column prop="status" header-align="center" align="center" column-key="ip_status"
:formatter="dict.formatter" label="状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.status === '1'" size="small">有效</el-tag>
<el-tag v-else size="small" type="danger">无效</el-tag>
</template>
</el-table-column>
<el-table-column
prop="unit_time_type"
header-align="center"
@@ -60,10 +66,17 @@
></el-table-column>
<el-table-column prop="begin_period" header-align="center" align="center" label="开始周期"></el-table-column>
<el-table-column prop="end_period" header-align="center" align="center" label="结束周期"></el-table-column>
<el-table-column prop="status" header-align="center" align="center" column-key="ip_status" :formatter="dict.formatter" label="状态"></el-table-column>
<el-table-column prop="remark" header-align="center" align="center" label="备注"></el-table-column>
<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
<template slot-scope="scope">
<el-button v-if="isAuth('opn:opnstrategyflowinf:update')" type="text" size="small"
@click="addOrUpdateHandle(scope.row.id)">
<el-tag v-if="scope.row.status === 1" size="small">有效</el-tag>
<el-tag v-else size="small" type="danger">无效</el-tag>
</el-button>
<el-button v-if="isAuth('opn:opnstrategyflowinf:query')" type="text" size="small"
@click="queryHandle(scope.row.id)">查看
</el-button>
<el-button v-if="isAuth('opn:opnstrategyflowinf:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-button v-if="isAuth('opn:opnstrategyflowinf:delete')" type="text" size="small" @click="deleteHandle(scope.row)">删除</el-button>
</template>
@@ -162,6 +175,7 @@
addOrUpdateHandle(id) {
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.title = !id ? '新增' : '修改'
this.$refs.addOrUpdate.readonly = false
this.$refs.addOrUpdate.init(id)
})
@@ -170,6 +184,7 @@
queryHandle(id) {
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.title = '查看'
this.$refs.addOrUpdate.readonly = true
this.$refs.addOrUpdate.init(id)
})
@@ -13,7 +13,8 @@
<el-form-item label="状态" prop="status">
<!--<el-input v-model="dataForm.status" placeholder="状态(1-有效,0-无效)" style="width:170px"></el-input>-->
<el-select placeholder="请选择" v-model="dataForm.status" style="width:170px;">
<el-option v-for="item in dict.get('status')" :key="item.value" :label="item.label" :value="item.value"></el-option>
<el-option v-for="item in dict.get('ip_status')" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -20,7 +20,8 @@
<el-table-column prop="id" header-align="center" align="center" v-if="show" label="标识"></el-table-column>
<el-table-column prop="gateway_id" header-align="center" align="center" label="网关标识"></el-table-column>
<el-table-column prop="name" header-align="center" align="center" label="名称"></el-table-column>
<el-table-column prop="status" header-align="center" align="center" label="状态" column-key="status" :formatter="dict.formatter"></el-table-column>
<el-table-column prop="status" header-align="center" align="center" label="状态" column-key="ip_status"
:formatter="dict.formatter"></el-table-column>
<el-table-column prop="remark" header-align="center" align="center" label="备注"></el-table-column>
<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
<template slot-scope="scope">
@@ -1,6 +1,6 @@
<template>
<el-dialog
:title="!dataForm.id ? '新增' : '修改'"
:title="title"
:close-on-click-modal="false"
:visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
@@ -10,6 +10,14 @@
<el-form-item label="网关标识" prop="gateway_id">
<el-input :readonly="readonly" oninput="value=value.replace(/[^\d.]/g,'')" v-model="dataForm.gateway_id"
placeholder="网关标识" style="width:170px"/>
<!--<template>
<el-select v-model="dataForm.gateway_id" style="width:170px" placeholder="请选择" @change="queryHandle" v-if="isAuth('opn:opnstrategyipinf:query')" >
<el-option v-for="item in dataList" :key="item.value" :label="item.label" :value="item">
</el-option>
</el-select>
</template>-->
</el-form-item>
</el-col>
<el-col :span="12">
@@ -27,31 +35,35 @@
</el-col>
<el-col :span="12">
<el-form-item label="类型" prop="type">
<!--<el-input :readonly="readonly" v-model="dataForm.type" placeholder="类型(0-不设置,1-黑名单,2-白名单)" style="width:170px"></el-input>
-->
<el-select placeholder="请选择" v-model="dataForm.type" style="width:170px;">
<el-option
v-for="item in dict.get('type')"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
<el-option v-for="item in dict.get('type')" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="row-bg">
<el-col :span="12">
<el-form-item label="黑名单" prop="black_ip">
<!--<el-form-item label="黑名单" prop="black_ip">
<el-input :readonly="readonly" v-model="dataForm.black_ip" placeholder="黑名单" style="width:170px"></el-input>
</el-form-item>-->
<el-form-item v-if="dataForm.type == 1" label="黑名单" prop="black_ip">
<el-input :readonly="readonly" v-model="dataForm.black_ip" placeholder="黑名单" style="width:170px"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="白名单" prop="white_ip">
<el-form-item v-if="dataForm.type == 2" label="白名单" prop="white_ip">
<el-input :readonly="readonly" v-model="dataForm.white_ip" placeholder="白名单" style="width:170px"></el-input>
</el-form-item>
</el-col>
<!--<el-col :span="12">
&lt;!&ndash;<el-form-item label="白名单" prop="white_ip">
<el-input :readonly="readonly" v-model="dataForm.white_ip" placeholder="白名单" style="width:170px"></el-input>
</el-form-item>&ndash;&gt;
<el-form-item v-if="dataForm.type == 2" label="白名单" prop="black_ip">
<el-inpu :readonly="readonly" v-model="dataForm.white_ip" placeholder="白名单" style="width:170px" ></el-inpu>
</el-form-item>
</el-col>-->
</el-row>
<el-row type="flex" class="row-bg">
<el-col :span="12">
@@ -126,7 +138,24 @@
remark: [
{required: true, message: '备注不能为空', trigger: 'blur'}
]
}
}/*,
options: [{
value: '选项1',
label: '黄金糕'
}, {
value: '选项2',
label: '双皮奶'
}, {
value: '选项3',
label: '蚵仔煎'
}, {
value: '选项4',
label: '龙须面'
}, {
value: '选项5',
label: '北京烤鸭'
}],
value: ''*/
}
},
methods: {
@@ -6,14 +6,14 @@
</el-form-item>
<el-form-item>
<el-button @click="getDataList01()">查询</el-button>
<el-button v-if="isAuth('opn:opnstrategyipinf:query')" type="primary" @click="queryHandle()">查看</el-button>
<el-button v-if="isAuth('opn:opnstrategyipinf:add')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
<el-button
v-if="isAuth('opn:opnstrategyipinf:delete')"
type="danger"
@click="deleteHandle()"
:disabled="dataListSelections.length <= 0"
>批量删除</el-button>
>批量删除
</el-button>
</el-form-item>
</el-form>
<el-table
@@ -29,15 +29,30 @@
<el-table-column prop="gateway_id" header-align="center" align="center" label="网关标识"></el-table-column>
<el-table-column prop="strategy_id" header-align="center" align="center" label="策略标识"></el-table-column>
<el-table-column prop="name" header-align="center" align="center" label="名称"></el-table-column>
<el-table-column prop="type" header-align="center" align="center" column-key="type" :formatter="dict.formatter" label="类型"></el-table-column>
<el-table-column prop="type" header-align="center" align="center" column-key="type" :formatter="dict.formatter"
label="类型"></el-table-column>
<el-table-column prop="black_ip" header-align="center" align="center" label="黑名单"></el-table-column>
<el-table-column prop="white_ip" header-align="center" align="center" label="白名单"></el-table-column>
<el-table-column prop="status" header-align="center" align="center" column-key="ip_status" :formatter="dict.formatter" label="状态"></el-table-column>
<!--<el-table-column prop="status" header-align="center" align="center" column-key="ip_status" :formatter="dict.formatter" label="状态"></el-table-column>-->
<el-table-column prop="status" header-align="center" align="center" column-key="ip_status"
:formatter="dict.formatter" label="状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.status === '1'" size="small">有效</el-tag>
<el-tag v-else size="small" type="danger">无效</el-tag>
</template>
</el-table-column>
<el-table-column prop="remark" header-align="center" align="center" label="备注"></el-table-column>
<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
<template slot-scope="scope">
<el-button v-if="isAuth('opn:opnstrategyipinf:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-button v-if="isAuth('opn:opnstrategyipinf:delete')" type="text" size="small" @click="deleteHandle(scope.row)">删除</el-button>
<el-button v-if="isAuth('opn:opnstrategyipinf:query')" type="text" size="small"
@click="queryHandle(scope.row.id)">查看
</el-button>
<el-button v-if="isAuth('opn:opnstrategyipinf:update')" type="text" size="small"
@click="addOrUpdateHandle(scope.row.id)">修改
</el-button>
<el-button v-if="isAuth('opn:opnstrategyipinf:delete')" type="text" size="small"
@click="deleteHandle(scope.row)">删除
</el-button>
</template>
</el-table-column>
</el-table>
@@ -58,7 +73,7 @@
<script>
import AddOrUpdate from './opnstrategyipinf-add-or-update'
import { isGDASucc, getDictValue } from '@/utils'
import {isGDASucc, getDictValue} from '@/utils'
export default {
data() {
@@ -99,7 +114,7 @@
'tot_rec_num': this.totalPage,
'search': this.dataForm.search
})
}).then(({ data }) => {
}).then(({data}) => {
if (isGDASucc(data)) {
if (data.data) {
this.dataList = data.data
@@ -134,6 +149,7 @@
addOrUpdateHandle(id) {
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.title = !id ? '新增' : '修改'
this.$refs.addOrUpdate.readonly = false
this.$refs.addOrUpdate.init(id)
})
@@ -142,6 +158,7 @@
queryHandle(id) {
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.title = '查看'
this.$refs.addOrUpdate.readonly = true
this.$refs.addOrUpdate.init(id)
})
@@ -167,7 +184,7 @@
data: this.$http.adornData({
'ids': ids.join(',')
}, false)
}).then(({ data }) => {
}).then(({data}) => {
if (isGDASucc(data)) {
this.$message({
message: '操作成功',
@@ -60,7 +60,6 @@ public class OpnStrategyIpInfListAction extends BaseAction {
pageEntity.setTot_rec_num(NumberUtils.toInt(root.getData("totalrows")));
List<OpnStrategyIpInfDO> list = opnStrategyIpInfMapper.selectPage(pageEntity, entity);
PageResultT resultT = new PageResultT();
resultT.setPageEntity(pageEntity);
if (list == null || list.isEmpty()) {