Merge branch 'new-1.0' of http://62.234.217.137:3000/Big-Data-Lab/CEES-manage into new-1.0

# Conflicts:
#	src/views/cees/user/CeesUserList.vue

src/views/cees/user/CeesUserList.vue

@@ -52,6 +52,11 @@
     <a-modal 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">
+          <a-button type="primary" @click="showGenerateRuleModal = true">生成规律</a-button>
+        </a-form-item>
+
         <a-form-item label="账号类型" class="form-item-custom">
           <a-select v-model="autoGenerateForm.group" placeholder="请选择账号类型" @change="handleGroupChange"
             class="select-custom">
@@ -75,11 +80,53 @@
             class="input-number-custom" />
         </a-form-item>
       </a-form>
+
+      <!-- 生成规律设置对话框 -->
+      <a-modal
+        v-model:visible="showGenerateRuleModal"
+        title="设置生成规律"
+        @ok="handleGenerateRuleOk"
+        @cancel="showGenerateRuleModal = false"
+        :width="400"
+        :centered="true"
+        :bodyStyle="{ padding: '24px', display: 'flex', flexDirection: 'column', alignItems: 'center' }"
+      >
+        <a-form ref="generateRuleFormRef" :rules="generateRuleRules" :model="generateRuleForm" layout="vertical" style="width: 100%">
+          <a-form-item name="groupType" label="账号类型第几位" style="width: 100%">
+            <a-input-number v-model:value="generateRuleForm.groupType" :min="1" placeholder="请输入账号类型的位置" style="width: 100%" />
+          </a-form-item>
+
+          <a-form-item name="majorId" label="学科ID第几位" style="width: 100%">
+            <a-input-number v-model:value="generateRuleForm.majorId" :min="1" placeholder="请输入学科ID的位置" style="width: 100%" />
+          </a-form-item>
+        </a-form>
+      </a-modal>
     </a-modal>
   </div>
 </template>
 
 <script lang="ts" name="org.jeecg.modules-ceesUser" setup>
+  import { ref, onMounted, reactive, watch, nextTick } 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,
+    getGenerativeRules,
+    updateGenerateRule,
+  } 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';
@@ -91,10 +138,78 @@ import { downloadFile } from '/@/utils/common/renderUtils';
 import { useUserStore } from '/@/store/modules/user';
 import { message } from 'ant-design-vue';
 
-// 表单相关状态
-const showAutoGenerateForm = ref(false); // 控制表单显示
-const isDisplay = ref(false);
+  // 表单相关状态
+  const showAutoGenerateForm = ref(false); // 控制表单显示
+  const isDisplay = ref(false);
 
+  // 定义模态框的显示状态
+  const showGenerateRuleModal = ref(false);
+  // 定义生成规律表单数据
+  const generateRuleForm = ref({
+    groupType: undefined,
+    majorId: undefined,
+    id: undefined,
+  });
+  // 1. 表单引用
+  const generateRuleFormRef = ref(null);
+  // 2. 校验规则
+  const generateRuleRules = {
+    groupType: [
+      { required: true, message: '账号类型位置不能为空', trigger: 'blur' },
+      { type: 'number', max: 8, message: '不能大于8', trigger: 'blur' },
+      { validator: validateDifferent, trigger: 'blur' },
+    ],
+    majorId: [
+      { required: true, message: '学科ID位置不能为空', trigger: 'blur' },
+      { type: 'number', max: 8, message: '不能大于8', trigger: 'blur' },
+      { validator: validateDifferent, trigger: 'blur' },
+    ],
+  };
+  // 3. 自定义校验方法：两个值不能相同
+  function validateDifferent(_, value) {
+    if (value === generateRuleForm.value.groupType && value === generateRuleForm.value.majorId) {
+      return Promise.reject(new Error('账号类型位置和学科ID位置不能相同'));
+    }
+    return Promise.resolve();
+  }
+  // 从数据库中获取默认值
+  const fetchDefaultValues = async () => {
+    try {
+      const response = await getGenerativeRules();
+      console.log('response', response);
+      const data = response.GenerativeRules;
+      console.log('data', data);
+
+      generateRuleForm.value.groupType = data.groupType;
+      generateRuleForm.value.majorId = data.majorId;
+      generateRuleForm.value.id = data.id;
+      //console.log('generateRuleForm', generateRuleForm.value);
+      await nextTick(); // 确保数据更新后视图能够重新渲染
+    } catch (error) {
+      console.error('获取默认值失败', error);
+    }
+  };
+
+  // 定义方法
+  const handleGenerateRuleOk = async () => {
+    await generateRuleFormRef.value.validate();
+    showGenerateRuleModal.value = false;
+    console.log('generateRuleForm', generateRuleForm.value);
+    try {
+      const res = await updateGenerateRule(generateRuleForm.value); // 等待异步操作完成
+      console.log('data', res);
+      if (res === '更新成功') {
+        message.success('更改规则成功');
+        console.log('data', res);
+      } else {
+        message.error('更改失败');
+      }
+    } catch (error) {
+      // 处理失败逻辑
+      message.error('更改失败, 请重试！');
+      console.error('请求失败:', error); // 打印错误信息方便调试
+    }
+  };
 const handleGroupChange = (value) => {
   autoGenerateForm.group = value;
   if (value != 1) {
@@ -219,6 +334,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
 
 const groupOptions = ref<{ label: string; value: number }[]>([]);
 onMounted(async () => {
+  fetchDefaultValues();
   try {
     const res = await getGroup();
     groupOptions.value = res.map((group) => ({