Merge pull request 'fix:修改数据库某些字段,对应修改实体类' (#74) from dev-xjf into master

Reviewed-on: http://120.26.116.243:3000/root/alert-front/pulls/74

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)

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('点号已存在')
     }
 

src/views/exa/config/index.vue

@@ -32,8 +32,13 @@ const [registerTable, { getForm, reload, getDataSource, updateTableDataRecord }]
     labelWidth: 150,
     schemas: searchFormSchema,
     showResetButton: false,
+
     actionColOptions: {
-      span: 6,
+      span: 10,
+      style: {
+        textAlign: 'left' ,
+        marginLeft: '10px',
+      },
     },
   },
   useSearchForm: true,
@@ -105,8 +110,8 @@ async function handleDelete(record: Recordable) {
 <template>
   <div>
     <BasicTable @register="registerTable">
-      <template #form-advanceBefore>
+      <template #form-advanceAfter>
-        <Space style="margin-right: 10%;">
+        <Space >
           <a-button v-auth="['system:role:create']" type="primary" :pre-icon="IconEnum.ADD" @click="handleCreate">
             {{ t('action.create') }}
           </a-button>

src/views/exa/exa.data.ts

@@ -46,7 +46,8 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Input',
     defaultValue: '',
     required: true,
-    colProps: { span: 8 },
+    colProps: { span: 12
+    },
   },
 
 ]
@@ -76,7 +77,7 @@ export const formSchema: FormSchema[] = [
     field: 'GroupName',
     component: 'Select',
     componentProps: {
-      options: getDictOptions(DICT_TYPE.COMMON_STATUS),
+      options: [],
     },
     required: true,