sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.jsspisoft.com/ry-das

Browse Source
This commit is contained in:
zhouhuang 2024-11-21 09:06:49 +08:00
commit 046527c76e
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/dasadmin/src/views/backend/logRecord/index.vue
View File

@ -628,7 +628,7 @@ const getFileData = (url: string) => {
const fileKeyEnums: any = {} const fileKeyEnums: any = {}
const getFileKeyEnum = () => { const getFileKeyEnum = () => {
return new Promise((resolve) => { return new Promise((resolve,reject) => {
getFileKeyEnumsReq({ getFileKeyEnumsReq({
madeinfactory: curTreeData.value.madeinFactory, madeinfactory: curTreeData.value.madeinFactory,
model: curTreeData.value.model, model: curTreeData.value.model,
@ -639,6 +639,8 @@ const getFileKeyEnum = () => {
}) })
resolve(true) resolve(true)
} }
}).catch(()=>{
reject(false)
}) })
}) })
} }

4
ui/dasadmin/src/views/backend/malfunction/index.vue
View File

@ -633,7 +633,7 @@ const getFileData = (url: string) => {
const fileKeyEnums: any = {} const fileKeyEnums: any = {}
const getFileKeyEnum = () => { const getFileKeyEnum = () => {
return new Promise((resolve) => { return new Promise((resolve,reject) => {
getFileKeyEnumsReq({ getFileKeyEnumsReq({
madeinfactory: curTreeData.value.madeinFactory, madeinfactory: curTreeData.value.madeinFactory,
model: curTreeData.value.model, model: curTreeData.value.model,
@ -644,6 +644,8 @@ const getFileKeyEnum = () => {
}) })
resolve(true) resolve(true)
} }
}).catch(()=>{
reject(false)
}) })
}) })
} }

12
ui/dasadmin/src/views/backend/node/protocol.vue
View File

@ -810,11 +810,11 @@ const formColumnList: formColumnType[] = [
list: [ list: [
{ {
label: 'TCP', label: 'TCP',
value: '0', value: '1',
}, },
{ {
label: 'UDP', label: 'UDP',
value: '1', value: '2',
}, },
], ],
}, },
@ -907,11 +907,11 @@ const formColumnList: formColumnType[] = [
list: [ list: [
{ {
label: 'TCP', label: 'TCP',
value: '0', value: '1',
}, },
{ {
label: 'UDP', label: 'UDP',
value: '1', value: '2',
}, },
], ],
}, },
@ -1025,11 +1025,11 @@ const formColumnList: formColumnType[] = [
list: [ list: [
{ {
label: 'TCP', label: 'TCP',
value: '0', value: '1',
}, },
{ {
label: 'UDP', label: 'UDP',
value: '1', value: '2',
}, },
], ],
}, },