diff --git a/src/api/tool/file.ts b/src/api/tool/file.ts index d19717cd..25b468ba 100644 --- a/src/api/tool/file.ts +++ b/src/api/tool/file.ts @@ -241,6 +241,7 @@ export async function uploadFileToNE( neType, neId, }, + timeout: 30_000, }); return transferToNeFileRes; } diff --git a/src/views/neUser/pcf/index.vue b/src/views/neUser/pcf/index.vue index 63389fda..3ad0f5ad 100644 --- a/src/views/neUser/pcf/index.vue +++ b/src/views/neUser/pcf/index.vue @@ -280,10 +280,28 @@ function fnModalVisibleByEdit(row?: Record) { getRule(neID, row.imsi) .then(res => { if (res.code === RESULT_CODE_SUCCESS) { - Object.assign(modalState.from, res.data, { - pccRules: res.data.pccRules.split('|'), - sessRules: res.data.sessRules.split('|'), - }); + Object.assign(modalState.from, res.data); + + let pccRules = res.data.pccRules; + if (!pccRules) { + pccRules = []; + } else if (pccRules.includes('|')) { + pccRules = pccRules.split('|'); + } else { + pccRules = [pccRules]; + } + modalState.from.pccRules = pccRules; + let sessRules = res.data.sessRules; + if (!sessRules) { + sessRules = []; + } else if (sessRules.includes('|')) { + sessRules = sessRules.split('|'); + } else { + sessRules = [sessRules]; + } + modalState.from.sessRules = sessRules; + console.log(modalState.from); + modalState.title = t('views.neUser.pcf.updateTitle', { imsi: row.imsi, }); @@ -309,8 +327,23 @@ function fnModalOk() { const from = JSON.parse(JSON.stringify(modalState.from)); from.neId = queryParams.neId || '-'; from.rfsp = Number(from.rfsp) || 0; - from.pccRules = modalState.from.pccRules.join('|'); - from.sessRules = modalState.from.sessRules.join('|'); + console.log(from); + let pccRules = modalState.from.pccRules; + if (Array.isArray(pccRules)) { + pccRules = pccRules.join('|'); + } else { + pccRules = ''; + } + from.pccRules = pccRules; + + let sessRules = modalState.from.sessRules; + if (Array.isArray(sessRules)) { + sessRules = sessRules.join('|'); + } else { + sessRules = ''; + } + from.sessRules = sessRules; + let validateArr = ['imsi', 'msisdn']; if (modalState.isBatch) { validateArr.push('num'); @@ -988,7 +1021,6 @@ onMounted(() => { v-model:value="modalState.from.pccRules" allow-clear mode="tags" - :token-separators="['|']" :options="pcfRuleOption.pccOpt" :title="t('views.neUser.pcf.pccRuleTip')" /> @@ -1000,7 +1032,6 @@ onMounted(() => { v-model:value="modalState.from.sessRules" allow-clear mode="tags" - :token-separators="['|']" :options="pcfRuleOption.sessOpt" :title="t('views.neUser.pcf.sessRuleTip')" />