fix: 修改bug
This commit is contained in:
parent
6d34772678
commit
6bbd698bb5
|
@ -282,6 +282,18 @@ const validatorVersionOrder = async (_: Record<string, any>, value: string) => {
|
|||
}
|
||||
};
|
||||
|
||||
const validatorVersionValue = async (_rule:any,value:any) => {
|
||||
return new Promise (async(resolve,reject)=>{
|
||||
const posReg = /^[1-9]\d*$/;
|
||||
if(posReg.test(value.toString())){
|
||||
return resolve('');
|
||||
}else {
|
||||
return reject('请输入1~99999之间的正整数');
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
}
|
||||
const { resetFields, validate, validateInfos } = useForm(
|
||||
formData,
|
||||
reactive({
|
||||
|
@ -297,6 +309,7 @@ const { resetFields, validate, validateInfos } = useForm(
|
|||
versionOrder: [
|
||||
{ required: true, message: '请输入版本序号' },
|
||||
{ validator: validatorVersionOrder, trigger: 'blur' },
|
||||
{ validator: validatorVersionValue, trigger: 'change'}
|
||||
],
|
||||
signMethod: [{ required: true, message: '请选择签名方式' }],
|
||||
sign: [
|
||||
|
|
|
@ -135,7 +135,7 @@ const validateAddress = (_rule: any, value: string): Promise<any> => {
|
|||
const sizeValidator = (_rule:any, value: number):Promise<any> =>{
|
||||
return new Promise(async(resolve,reject)=>{
|
||||
const posReg = /^[1-9]\d*$/;
|
||||
if(posReg.test(value.toString()) && value >= 0 && value <=65535 ){
|
||||
if(posReg.test(value.toString()) && value > 0 && value <=65535 ){
|
||||
return resolve('');
|
||||
}else {
|
||||
return reject(_rule.message);
|
||||
|
|
|
@ -241,7 +241,42 @@ const params = ref<Record<string, any>>({});
|
|||
* @param params
|
||||
*/
|
||||
const handleSearch = (e: any) => {
|
||||
params.value = e;
|
||||
if(e.terms[0]?.terms[0]?.column === "gbChannelId"){
|
||||
params.value = {terms: [
|
||||
{
|
||||
column: "id$gb28181-cascade-channel",
|
||||
value: [
|
||||
{
|
||||
column: "gb_channel_id",
|
||||
termType : e.terms[0]?.terms[0]?.termType,
|
||||
value: e.terms[0]?.terms[0]?.value
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
terms: [
|
||||
{
|
||||
column: "id$gb28181-cascade-channel",
|
||||
value: [
|
||||
{
|
||||
column: "gb_channel_id",
|
||||
termType: "isnull",
|
||||
value: "1"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
column: "channelId",
|
||||
termType : e.terms[0]?.terms[0]?.termType,
|
||||
value: e.terms[0]?.terms[0]?.value
|
||||
}
|
||||
],
|
||||
type: "or"
|
||||
}
|
||||
]}
|
||||
}else{
|
||||
params.value = e;
|
||||
}
|
||||
};
|
||||
|
||||
const listRef = ref();
|
||||
|
|
|
@ -291,7 +291,7 @@ const handleSubmit = () => {
|
|||
media_password,
|
||||
media_username,
|
||||
manufacturer,
|
||||
ptzType,
|
||||
// ptzType,
|
||||
...extraFormData
|
||||
} = formData.value;
|
||||
if (media_url || media_password || media_username) {
|
||||
|
|
Loading…
Reference in New Issue