Browse Source

fix:修改导入EXA接口及响应

pull/74/head
xjf 1 month ago
parent
commit
2bf38607fb
  1. 18
      src/views/exa/config/CreateBatchModal.vue
  2. 15
      src/views/exa/config/EXAModal.vue
  3. 2
      src/views/exa/exa.data.ts

18
src/views/exa/config/CreateBatchModal.vue

@ -120,7 +120,23 @@ async function handleSubmit() {
closeModal()
// loding
setModalProps({ loading: false, confirmLoading: false })
createMessage.success(`成功创建${data.data.createNames.length}个测点`)
// :
// {
// "code": 0,
// "data": {
// "createNames": [],
// "updateNames": [],
// "failureNames": {
// "gbqegj": "",
// "sdgew": ""
// }
// },
// "msg": ""
// }
createMessage.info(`成功创建${data.data.createNames.length}个测点,有${Object.keys(data.data.failureNames).length}个测点创建失败`)
}
catch (e) {
console.log(e)

15
src/views/exa/config/EXAModal.vue

@ -6,6 +6,7 @@ import { useMessage } from '@/hooks/web/useMessage'
import { BasicForm, useForm } from '@/components/Form'
import { BasicModal, useModalInner } from '@/components/Modal'
import { createEXAPoint, getGroup } from '@/api/alert/exa'
import {parserJsonc} from "@antfu/eslint-config";
const emit = defineEmits(['success', 'register'])
const { t } = useI18n()
@ -44,7 +45,7 @@ async function getGroupListSelect() {
const list = [] as any
// //
res.forEach((item) => {
list.push({ label: item.GroupName, value: item.GroupName })
list.push({ label: item[0], value: item[0] })
})
groupList.value = list
@ -65,12 +66,20 @@ async function handleSubmit() {
const createResult = await createEXAPoint(values)
closeModal()
if (createResult === '1') {
let parsedResult;
try {
parsedResult = JSON.parse(createResult);
} catch (e) {
createMessage.error('返回结果格式错误');
return;
}
console.log(parsedResult)
if (parsedResult.ReturnValue == 1) {
createMessage.success(t('common.successText'))
emit('success')
}
else if (createResult === '-20') {
else if (parsedResult.ReturnValue == -20) {
createMessage.info('点号已存在')
}

2
src/views/exa/exa.data.ts

@ -77,7 +77,7 @@ export const formSchema: FormSchema[] = [
field: 'GroupName',
component: 'Select',
componentProps: {
options: getDictOptions(DICT_TYPE.COMMON_STATUS),
options: [],
},
required: true,

Loading…
Cancel
Save