Commit ec58374f authored by derong.zhang's avatar derong.zhang

优化文案

parent fa976fcc
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<Input v-model="ipsetName" type="text" placeholder="请输入名称" style="width: 70%" /> <Input v-model="ipsetName" type="text" placeholder="请输入名称" style="width: 70%" />
</FormItem> </FormItem>
<FormItem prop="alladdcontent" label="列表:"> <FormItem prop="alladdcontent" label="列表:">
<Input v-model="ipsetContent" type="text" placeholder="请输入名称" style="width: 70%" /> <Input v-model="ipsetContent" type="text" placeholder="请输入" style="width: 70%" />
</FormItem> </FormItem>
</Form> </Form>
<div class="alladdbtn"> <div class="alladdbtn">
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<Modal v-model="addUrlIpsetModal" :mask-closable = 'false' :footer-hide='true'> <Modal v-model="addUrlIpsetModal" :mask-closable = 'false' :footer-hide='true'>
<Form ref="formInline" :model="formInline" :rules="ruleInline" style="margin-top:20px" :label-width="80"> <Form ref="formInline" :model="formInline" :rules="ruleInline" style="margin-top:20px" :label-width="80">
<FormItem prop="alladdcontent" label="路径:"> <FormItem prop="alladdcontent" label="路径:">
<Input v-model="urlIpsetPath" type="text" placeholder="请输入名称" style="width: 70%" /> <Input v-model="urlIpsetPath" type="text" placeholder="请输入" style="width: 70%" />
</FormItem> </FormItem>
<FormItem prop="alladdcontent" label="集合:"> <FormItem prop="alladdcontent" label="集合:">
<Select v-model="urlIpsetName" style="width:70%" @on-change="selectserver"> <Select v-model="urlIpsetName" style="width:70%" @on-change="selectserver">
...@@ -1609,7 +1609,7 @@ export default { ...@@ -1609,7 +1609,7 @@ export default {
let arr = (data && data.body) || []; let arr = (data && data.body) || [];
arr = arr.filter((x, index,self)=>self.indexOf(x)===index) arr = arr.filter((x, index,self)=>self.indexOf(x)===index)
arr.map(item => { arr.map(item => {
this.ipsetList.push(item.ip_set_name) this.ipsetList.push(item.name)
}) })
this.ipsetList = this.ipsetList.filter((x, index,self) => self.indexOf(x) === index) this.ipsetList = this.ipsetList.filter((x, index,self) => self.indexOf(x) === index)
}) })
...@@ -1635,6 +1635,26 @@ export default { ...@@ -1635,6 +1635,26 @@ export default {
}); });
return return
} }
// console.log(this.ipsetContent, typeof(this.ipsetContent))
// 判断是否有【】
// let reg = /\[\]/g
// // 判断是否是IP字段
// // let re=/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
// // if (!re.test(this.ipsetContent)) {
// // this.$Notice.error({
// // title: '提示',
// // desc: ' 输入格式不正确',
// // });
// // return
// // }
// console.log(!reg.test(this.ipsetContent), 999)
// if (!reg.test(this.ipsetContent)) {
// this.$Notice.error({
// title: '提示',
// desc: ' 输入格式不正确',
// });
// return
// }
let keys = this.ipsetData.some(item => { let keys = this.ipsetData.some(item => {
return item.name === this.ipsetName return item.name === this.ipsetName
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment