diff --git a/src/views/configManage/neManage/index.vue b/src/views/configManage/neManage/index.vue index 4bb4f381..986f93e7 100644 --- a/src/views/configManage/neManage/index.vue +++ b/src/views/configManage/neManage/index.vue @@ -106,12 +106,7 @@ let tableColumns: ColumnsType = [ title: 'IP地址', dataIndex: 'ip', align: 'center', - }, - { - title: '网元地址', - dataIndex: 'neAddress', - align: 'center', - }, + }, { title: '端口', dataIndex: 'port', @@ -564,6 +559,11 @@ function fnRecordStop(row: Record) { * 记录多项选择 */ function fnRecordMore(type: string | number, row: Record) { + if (type === 'delete') { + fnRecordDelete(row); + return + } + if (type === 'export') { fnRecordExport(row); } @@ -764,9 +764,9 @@ onMounted(() => { - - - + + + @@ -792,14 +792,14 @@ onMounted(() => { {{ t('views.configManage.neManage.start') }} - - - {{ t('views.configManage.neManage.restart') }} - {{ t('views.configManage.neManage.stop') }} + + + {{ t('common.deleteText') }} + diff --git a/src/views/configManage/softwareManage/components/software-history.vue b/src/views/configManage/softwareManage/components/software-history.vue index 8d815282..2dc3ddce 100644 --- a/src/views/configManage/softwareManage/components/software-history.vue +++ b/src/views/configManage/softwareManage/components/software-history.vue @@ -4,12 +4,10 @@ import { SizeType } from 'ant-design-vue/lib/config-provider'; import { ColumnsType } from 'ant-design-vue/lib/table'; import { listNeVersion } from '@/api/configManage/softwareManage'; import { parseDateToStr } from '@/utils/date-utils'; -import useDictStore from '@/store/modules/dict'; import useNeInfoStore from '@/store/modules/neinfo'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import useI18n from '@/hooks/useI18n'; const { t } = useI18n(); -const { getDict } = useDictStore(); const emit = defineEmits(['ok', 'cancel', 'update:visible']); const props = defineProps({ title: { @@ -22,14 +20,6 @@ const props = defineProps({ }, }); -/**字典数据 */ -let dict: { - /**状态 */ - neVersionStatus: DictType[]; -} = reactive({ - neVersionStatus: [], -}); - /**开始结束时间 */ let queryRangePicker = ref<[string, string]>(['', '']); @@ -184,12 +174,6 @@ function fnModalCancel() { /**显示弹框时初始数据 */ function init() { - // 初始字典数据 - Promise.allSettled([getDict('ne_version_status')]).then(resArr => { - if (resArr[0].status === 'fulfilled') { - dict.neVersionStatus = resArr[0].value; - } - }); // 查询参数重置 fnQueryReset(); } @@ -246,17 +230,6 @@ watch( > - - - - - - @@ -284,11 +257,6 @@ watch( :scroll="{ y: 400, x: true }" :pagination="tablePagination" > - diff --git a/src/views/configManage/softwareManage/index.vue b/src/views/configManage/softwareManage/index.vue index 759eedd4..46408caf 100644 --- a/src/views/configManage/softwareManage/index.vue +++ b/src/views/configManage/softwareManage/index.vue @@ -189,6 +189,14 @@ const fileModalStateFrom = Form.useForm( * 文件对话框弹出显示为 下发或激活 */ function fnFileModalVisible(type: string | number, row: Record) { + if (type === 'download') { + fnDownloadFile(row); + return; + } + if (type === 'delete') { + fnRecordDelete(row); + return; + } if (type === 'send') { fileModalState.title = t('views.configManage.softwareManage.sendTitle'); fileModalState.content = t( @@ -689,15 +697,25 @@ onMounted(() => {