修改合并错误

src/views/cees/user/CeesUserList.vue

@@ -16,15 +16,15 @@
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button>批量操作
+          <a-button
+            >批量操作
             <Icon icon="mdi:chevron-down" />
           </a-button>
         </a-dropdown>
         <!-- 高级查询 -->
         <super-query :config="superQueryConfig" @search="handleSuperQuery" />
         <!-- 新增生成账号按钮 -->
-        <a-button type="primary" @click="showAutoGenerateForm = true" preIcon="ant-design:plus-outlined"> 生成账号
+        <a-button type="primary" @click="showAutoGenerateForm = true" preIcon="ant-design:plus-outlined"> 生成账号 </a-button>
-        </a-button>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -49,8 +49,14 @@
     <CeesUserModal @register="registerModal" @success="handleSuccess" />
 
     <!-- 生成账号表单 -->
-    <a-modal v-model:visible="showAutoGenerateForm" title="生成账号" @ok="handleAutoGenerate"
+    <a-modal
-      @cancel="showAutoGenerateForm = false" :width="600" :bodyStyle="{ padding: '24px' }">
+      v-model:visible="showAutoGenerateForm"
+      title="生成账号"
+      @ok="handleAutoGenerate"
+      @cancel="showAutoGenerateForm = false"
+      :width="600"
+      :bodyStyle="{ padding: '24px' }"
+    >
       <a-form :model="autoGenerateForm" layout="vertical">
         <!-- 新增生成规律按钮 -->
         <a-form-item class="form-item-custom" style="text-align: right">
@@ -58,8 +64,7 @@
         </a-form-item>
 
         <a-form-item label="账号类型" class="form-item-custom">
-          <a-select v-model="autoGenerateForm.group" placeholder="请选择账号类型" @change="handleGroupChange"
+          <a-select v-model="autoGenerateForm.group" placeholder="请选择账号类型" @change="handleGroupChange" class="select-custom">
-            class="select-custom">
             <a-select-option v-for="item in autoGeneratType" :key="item.id" :value="item.value">
               {{ item.name }}
             </a-select-option>
@@ -67,8 +72,7 @@
         </a-form-item>
 
         <a-form-item v-if="isDisplay" label="专业" class="form-item-custom">
-          <a-select v-model="autoGenerateForm.majorId" placeholder="请选择专业" @change="handleMajorChange"
+          <a-select v-model="autoGenerateForm.majorId" placeholder="请选择专业" @change="handleMajorChange" class="select-custom">
-            class="select-custom">
             <a-select-option v-for="item in majors" :key="item.id" :value="item.value">
               {{ item.name }}
             </a-select-option>
@@ -76,8 +80,13 @@
         </a-form-item>
 
         <a-form-item label="账号数量" class="form-item-custom">
-          <a-input-number v-model="autoGenerateForm.num" :min="1" placeholder="请输入账号数量" @change="handleNumChange"
+          <a-input-number
-            class="input-number-custom" />
+            v-model="autoGenerateForm.num"
+            :min="1"
+            placeholder="请输入账号数量"
+            @change="handleNumChange"
+            class="input-number-custom"
+          />
         </a-form-item>
       </a-form>
 
@@ -126,16 +135,6 @@
   } from './CeesUser.api';
   import { downloadFile } from '/@/utils/common/renderUtils';
   import { useUserStore } from '/@/store/modules/user';
-  import { message } from 'ant-design-vue';
-import { ref, onMounted, reactive } from 'vue';
-import { BasicTable, useTable, TableAction } from '/@/components/Table';
-import { useModal } from '/@/components/Modal';
-import { useListPage } from '/@/hooks/system/useListPage';
-import CeesUserModal from './components/CeesUserModal.vue';
-import { columns, searchFormSchema, superQuerySchema, updateGroupOptions } from './CeesUser.data';
-import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, saveOrUpdate, getGroup, generateAccount } from './CeesUser.api';
-import { downloadFile } from '/@/utils/common/renderUtils';
-import { useUserStore } from '/@/store/modules/user';
   import { message } from 'ant-design-vue';
 
   // 表单相关状态
@@ -224,7 +223,7 @@ const handleMajorChange = (value) => {
   };
   const handleNumChange = (value) => {
     autoGenerateForm.num = value;
-}
+  };
 
   const autoGenerateForm = reactive({
     group: undefined, // 账号类型
@@ -237,7 +236,7 @@ const autoGeneratType = ref([
     { id: 1, name: '行政人员', value: 1 },
     { id: 2, name: '研究生', value: 2 },
     { id: 2, name: '本校老师', value: 3 },
-  { id: 3, name: "外校老师", value: 4 }
+    { id: 3, name: '外校老师', value: 4 },
   ]);
 
   // 专业选项
@@ -250,32 +249,32 @@ const majors = ref([
 
   // 生成账号逻辑
   const handleAutoGenerate = () => {
-  console.log(autoGenerateForm)
+    console.log(autoGenerateForm);
     if (autoGenerateForm.group == undefined) {
       message.warning('请选择身份', 1.5);
-    return
+      return;
     }
     if (autoGenerateForm.majorId == undefined && isDisplay.value == true) {
       message.warning('请选择专业', 1.5);
-    return
+      return;
     }
     if (autoGenerateForm.num == undefined) {
       message.warning('请输入账号数量', 1.5);
-    return
+      return;
     }
     //     账号数量小于500并且大于0
     if (autoGenerateForm.num <= 0) {
       message.warning('账号数量必须大于0', 1.5);
-    return
+      return;
     }
     if (autoGenerateForm.num > 500) {
       message.warning('账号数量不能大于500', 1.5);
-    return
+      return;
     }
     // 调用生成账号的 API 或逻辑
     try {
       generateAccount(autoGenerateForm).then((res) => {
-      console.log(res)
+        console.log(res);
         if (res.code == 200) {
           message.success(res.message, 1.5);
           //清空表单
@@ -285,8 +284,7 @@ const handleAutoGenerate = () => {
         } else {
           message.error(res.message, 1.5);
         }
-
+      });
-    })
     } catch (error) {
       // 处理失败逻辑
       message.error('账号生成失败，请重试');