diff --git a/jeecgboot-vue3-master/src/views/anncomgrotop/AnnComGroTop.api.ts b/jeecgboot-vue3-master/src/views/anncomgrotop/AnnComGroTop.api.ts
new file mode 100644
index 000000000..1bebbfe97
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotop/AnnComGroTop.api.ts
@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/anncomgrotop/annComGroTop/list',
+  save='/anncomgrotop/annComGroTop/add',
+  edit='/anncomgrotop/annComGroTop/edit',
+  deleteOne = '/anncomgrotop/annComGroTop/delete',
+  deleteBatch = '/anncomgrotop/annComGroTop/deleteBatch',
+  importExcel = '/anncomgrotop/annComGroTop/importExcel',
+  exportXls = '/anncomgrotop/annComGroTop/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotop/AnnComGroTop.data.ts b/jeecgboot-vue3-master/src/views/anncomgrotop/AnnComGroTop.data.ts
new file mode 100644
index 000000000..eae8a0627
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotop/AnnComGroTop.data.ts
@@ -0,0 +1,74 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '年度',
+    align: "center",
+    dataIndex: 'annid_dictText'
+  },
+  {
+    title: '年度比赛项目',
+    align: "center",
+    dataIndex: 'annComP_dictText'
+  },
+  {
+    title: '专家组',
+    align: "center",
+    dataIndex: 'annComPG_dictText'
+  },
+  {
+    title: '题目',
+    align: "center",
+    dataIndex: 'topid_dictText'
+  },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '年度',
+    field: 'annid',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "annual,annual_name,id"
+    },
+  },
+  {
+    label: '年度比赛项目',
+    field: 'annComP',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "annual_comp_point,obj_name,id"
+    },
+  },
+  {
+    label: '专家组',
+    field: 'annComPG',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "annual_comp_group,name,id"
+    },
+  },
+  {
+    label: '题目',
+    field: 'topid',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "topic,name,id"
+    },
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotop/AnnComGroTopList.vue b/jeecgboot-vue3-master/src/views/anncomgrotop/AnnComGroTopList.vue
new file mode 100644
index 000000000..2941fa942
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotop/AnnComGroTopList.vue
@@ -0,0 +1,240 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+<!--        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button>批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{text}">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{text}">
+        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <AnnComGroTopModal ref="registerModal" @success="handleSuccess"></AnnComGroTopModal>
+  </div>
+</template>
+
+<script lang="ts" name="anncomgrotop-annComGroTop" setup>
+  import { ref, reactive } from 'vue';
+  import { useRoute,useRouter } from 'vue-router';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './AnnComGroTop.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './AnnComGroTop.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import AnnComGroTopModal from './components/AnnComGroTopModal.vue'
+
+  const route = useRoute();
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '专家组年度比赛项目题目',
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 140,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, {ndbsxzid:route.query.id});
+      },
+    },
+    exportConfig: {
+      name: "专家组年度比赛项目题目",
+      url: getExportUrl,
+      params: queryParam,
+    },
+	  importConfig: {
+	    url: getImportUrl,
+	    success: handleSuccess
+	  },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+/*      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },*/
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      },
+      {
+        label: '绑定报名编号',
+        onClick: bdbmbh.bind(null, record),
+        //this.$Router.push
+      },
+    ];
+  }
+  const router = useRouter();
+  /**
+   * 绑定报名编号事件
+   */
+  function bdbmbh(record: Recordable) {
+    //console.log(record.annalComp)
+    //let ndbsid = record.annalComp;
+    let id= record.id;
+    router.push({ path: '/anncomgrotopp/AnnComGroTopPList', query: {id} })
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ]
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotop/AnnComGroTop_menu_insert.sql b/jeecgboot-vue3-master/src/views/anncomgrotop/AnnComGroTop_menu_insert.sql
new file mode 100644
index 000000000..f06a27954
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotop/AnnComGroTop_menu_insert.sql
@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/anncomgrotop文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
+VALUES ('2023102310307550470', NULL, '专家组年度比赛项目题目', '/anncomgrotop/annComGroTopList', 'anncomgrotop/AnnComGroTopList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-10-23 10:30:47', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023102310307560471', '2023102310307550470', '添加专家组年度比赛项目题目', NULL, NULL, 0, NULL, NULL, 2, 'anncomgrotop:ann_com_gro_top:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-23 10:30:47', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023102310307560472', '2023102310307550470', '编辑专家组年度比赛项目题目', NULL, NULL, 0, NULL, NULL, 2, 'anncomgrotop:ann_com_gro_top:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-23 10:30:47', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023102310307560473', '2023102310307550470', '删除专家组年度比赛项目题目', NULL, NULL, 0, NULL, NULL, 2, 'anncomgrotop:ann_com_gro_top:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-23 10:30:47', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023102310307560474', '2023102310307550470', '批量删除专家组年度比赛项目题目', NULL, NULL, 0, NULL, NULL, 2, 'anncomgrotop:ann_com_gro_top:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-23 10:30:47', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023102310307560475', '2023102310307550470', '导出excel_专家组年度比赛项目题目', NULL, NULL, 0, NULL, NULL, 2, 'anncomgrotop:ann_com_gro_top:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-23 10:30:47', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023102310307560476', '2023102310307550470', '导入excel_专家组年度比赛项目题目', NULL, NULL, 0, NULL, NULL, 2, 'anncomgrotop:ann_com_gro_top:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-23 10:30:47', NULL, NULL, 0, 0, '1', 0);
\ No newline at end of file
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotop/components/AnnComGroTopForm.vue b/jeecgboot-vue3-master/src/views/anncomgrotop/components/AnnComGroTopForm.vue
new file mode 100644
index 000000000..9e37d1521
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotop/components/AnnComGroTopForm.vue
@@ -0,0 +1,146 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="24">
+          <a-form-item label="年度" v-bind="validateInfos.annid">
+	          <j-dict-select-tag v-model:value="formData.annid" dictCode="annual,annual_name,id" placeholder="请选择年度" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="年度比赛项目" v-bind="validateInfos.annComP">
+	          <j-dict-select-tag v-model:value="formData.annComP" dictCode="annual_comp_point,obj_name,id" placeholder="请选择年度比赛项目" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="专家组" v-bind="validateInfos.annComPG">
+	          <j-dict-select-tag v-model:value="formData.annComPG" dictCode="annual_comp_group,name,id" placeholder="请选择专家组" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="题目" v-bind="validateInfos.topid">
+	          <j-dict-select-tag v-model:value="formData.topid" dictCode="topic,name,id" placeholder="请选择题目" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../AnnComGroTop.api';
+  import { Form } from 'ant-design-vue';
+  
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: ()=>{} },
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    annid: '',   
+    annComP: '',   
+    annComPG: '',   
+    topid: '',   
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      //赋值
+      Object.assign(formData, record);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    min-height: 500px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+</style>
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotop/components/AnnComGroTopModal.vue b/jeecgboot-vue3-master/src/views/anncomgrotop/components/AnnComGroTopModal.vue
new file mode 100644
index 000000000..9a3fe1aea
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotop/components/AnnComGroTopModal.vue
@@ -0,0 +1,76 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <AnnComGroTopForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></AnnComGroTopForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import AnnComGroTopForm from './TopicList.vue'
+
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '设置题目';
+    visible.value = true;
+/*    nextTick(() => {
+      registerForm.value.add();
+    });*/
+  }
+
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+    registerForm.value.searchReset();
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotop/components/Topic.api.ts b/jeecgboot-vue3-master/src/views/anncomgrotop/components/Topic.api.ts
new file mode 100644
index 000000000..61add094e
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotop/components/Topic.api.ts
@@ -0,0 +1,84 @@
+import {defHttp} from '/@/utils/http/axios';
+import {useMessage} from "/@/hooks/web/useMessage";
+
+const {createConfirm} = useMessage();
+
+enum Api {
+  list = '/topic/topic/szlist',
+  list1 = '/topic/topic/list1',
+  list2 = '/topic/topic/list2',
+  list3 = '/topic/topic/list3',
+  select = '/topic/topic/select',
+  save = '/topic/topic/szadd',
+  edit = '/topic/topic/edit',
+  deleteOne = '/topic/topic/delete',
+  deleteBatch = '/topic/topic/deleteBatch',
+  importExcel = '/topic/topic/importExcel',
+  exportXls = '/topic/topic/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({url: Api.list, params});
+export const list1 = (params) => defHttp.get({url: Api.list1, params});
+export const list2 = (params) => defHttp.get({url: Api.list2, params});
+export const list3 = (params) => defHttp.get({url: Api.list3, params});
+export const Update = (params) => defHttp.post({url: Api.edit, params});
+export const select = (params) => defHttp.post({url: Api.select, params});
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params, handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({
+        url: Api.deleteBatch,
+        data: params
+      }, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.get({url: url, params}, {isTransformResponse: false});
+}
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotop/components/Topic.data.ts b/jeecgboot-vue3-master/src/views/anncomgrotop/components/Topic.data.ts
new file mode 100644
index 000000000..78cd0d0c6
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotop/components/Topic.data.ts
@@ -0,0 +1,120 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '年度比赛项目',
+    align: "center",
+    dataIndex: 'annualCompid_dictText'
+  },
+  {
+    title: '题目编号',
+    align: "center",
+    dataIndex: 'number'
+  },
+  {
+    title: '题目名称',
+    align: "center",
+    dataIndex: 'name'
+  },
+  {
+    title: '是否启用',
+    align: "center",
+    dataIndex: 'isopen',
+    customRender:({text}) => {
+      return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]);
+    },
+  },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+  {
+    label: "年度比赛项目",
+    field: 'annualCompid',
+    component: 'JSearchSelect',
+    colProps: {span: 6},
+  },
+  {
+    label: "题目名称",
+    field: 'name',
+    component: 'Input',
+    colProps: {span: 6},
+  },
+
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '年度比赛项目',
+    field: 'annualCompid',
+    component: 'JPopup',
+    componentProps: ({ formActionType }) => {
+      const {setFieldsValue} = formActionType;
+      return{
+        setFieldsValue:setFieldsValue,
+        code:"point",
+        fieldConfig: [
+          { source: 'id', target: 'annualCompid' },
+          { source: 'obj_name', target: 'annualCompid_dictText' },
+        ],
+        multi:true
+      }
+    },
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: true, message: '请输入年度比赛项目id!'},
+      ];
+    },
+  },
+  {
+    label: '题目编号',
+    field: 'number',
+    component: 'Input',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: true, message: '请输入题目编号!'},
+      ];
+    },
+  },
+  {
+    label: '题目名称',
+    field: 'name',
+    component: 'Input',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: true, message: '请输入题目名称!'},
+      ];
+    },
+  },
+  {
+    label: '题目简介及其要求',
+    field: 'info',
+    component: 'InputTextArea',
+  },
+  {
+    label: '题目状态',
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "topic_status"
+    },
+  },
+  {
+    label: '开关',
+    field: 'isopen',
+    component: 'JSwitch',
+    componentProps:{
+    },
+  },
+  // TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotop/components/TopicList.vue b/jeecgboot-vue3-master/src/views/anncomgrotop/components/TopicList.vue
new file mode 100644
index 000000000..8eeaaedaf
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotop/components/TopicList.vue
@@ -0,0 +1,249 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+                <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+                <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+                <a-dropdown v-if="selectedRowKeys.length > 0">
+                  <template #overlay>
+                    <a-menu>
+                      <a-menu-item key="1" @click="batchHandleDelete">
+                        <Icon icon="ant-design:delete-outlined"></Icon>
+                        删除
+                      </a-menu-item>
+                    </a-menu>
+                  </template>
+                  <a-button>批量操作
+                    <Icon icon="mdi:chevron-down"></Icon>
+                  </a-button>
+                </a-dropdown>-->
+      </template>
+      <!--操作栏-->
+      <!--      <template #action="{ record }">
+              <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+            </template>-->
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <!--      <template #pcaSlot="{text}">
+              {{ getAreaTextByCode(text) }}
+            </template>
+            <template #fileSlot="{text}">
+              <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+              <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+            </template>-->
+    </BasicTable>
+    <!-- 表单区域 -->
+  </div>
+</template>
+
+<script lang="ts" name="topic-topic" setup>
+import { ref, reactive,defineExpose } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { useListPage } from '/@/hooks/system/useListPage';
+import {columns} from './Topic.data';
+import { list, deleteOne, batchDelete, getImportUrl, getExportUrl,saveOrUpdate } from './Topic.api';
+import { downloadFile } from '/@/utils/common/renderUtils';
+import { useRoute } from 'vue-router';
+import {getValueType} from "../../../utils";
+import {useMessage} from "../../../hooks/web/useMessage";
+
+const formRef = ref();
+const queryParam = reactive<any>({});
+const toggleSearchStatus = ref<boolean>(false);
+const registerModal = ref();
+const route = useRoute();
+const emit = defineEmits(['register', 'ok']);
+
+//注册table数据
+const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+  tableProps: {
+    title: '专家表',
+    api: list,
+    columns,
+    canResize:false,
+    useSearchForm: false,
+    showActionColumn:false,
+    /*      actionColumn: {
+            width: 120,
+            fixed: 'right',
+          },*/
+    beforeFetch: (params) => {
+      return Object.assign(params, {ndbsxzid:route.query.id});
+    },
+  },
+  exportConfig: {
+    name: "题目管理",
+    url: getExportUrl,
+    params: queryParam,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+});
+const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+const labelCol = reactive({
+  xs: { span: 24 },
+  sm: { span: 7 },
+});
+const wrapperCol = reactive({
+  xs: { span: 24 },
+  sm: { span: 16 },
+});
+const { createMessage } = useMessage();
+const confirmLoading = ref<boolean>(false);
+
+/**
+ * 新增事件
+ */
+function handleAdd() {
+  registerModal.value.disableSubmit = false;
+  registerModal.value.add();
+}
+
+/**
+ * 编辑事件
+ */
+function handleEdit(record: Recordable) {
+  registerModal.value.disableSubmit = false;
+  registerModal.value.edit(record);
+}
+
+/**
+ * 详情
+ */
+function handleDetail(record: Recordable) {
+  registerModal.value.disableSubmit = true;
+  registerModal.value.edit(record);
+}
+
+/**
+ * 删除事件
+ */
+async function handleDelete(record) {
+  await deleteOne({ id: record.id }, handleSuccess);
+}
+
+/**
+ * 提交数据
+ */
+async function submitForm() {
+  let srk = selectedRowKeys.value.toString();
+  if(srk==""||srk==null){
+    createMessage.warning("请选择至少一条进行绑定");
+  }else{
+    await saveOrUpdate({ids:selectedRowKeys.value.toString(),ndbsxzid:route.query.id}, false)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+}
+defineExpose({
+  submitForm,
+  searchReset,
+});
+
+/**
+ * 批量删除事件
+ */
+async function batchHandleDelete() {
+  await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+}
+
+/**
+ * 成功回调
+ */
+function handleSuccess() {
+  (selectedRowKeys.value = []) && reload();
+}
+
+/**
+ * 操作栏
+ */
+function getTableAction(record) {
+  return [
+    {
+      label: '编辑',
+      onClick: handleEdit.bind(null, record),
+    },
+  ];
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+      }
+    }
+  ]
+}
+
+/**
+ * 查询
+ */
+function searchQuery() {
+  reload();
+}
+
+/**
+ * 重置
+ */
+function searchReset() {
+  formRef.value.resetFields();
+  selectedRowKeys.value = [];
+  //刷新数据
+  reload();
+}
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotopp/AnnComGroTopP.api.ts b/jeecgboot-vue3-master/src/views/anncomgrotopp/AnnComGroTopP.api.ts
new file mode 100644
index 000000000..9e9ab5232
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotopp/AnnComGroTopP.api.ts
@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/anncomgrotopp/annComGroTopP/list',
+  save='/anncomgrotopp/annComGroTopP/add',
+  edit='/anncomgrotopp/annComGroTopP/edit',
+  deleteOne = '/anncomgrotopp/annComGroTopP/delete',
+  deleteBatch = '/anncomgrotopp/annComGroTopP/deleteBatch',
+  importExcel = '/anncomgrotopp/annComGroTopP/importExcel',
+  exportXls = '/anncomgrotopp/annComGroTopP/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotopp/AnnComGroTopP.data.ts b/jeecgboot-vue3-master/src/views/anncomgrotopp/AnnComGroTopP.data.ts
new file mode 100644
index 000000000..65c20717e
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotopp/AnnComGroTopP.data.ts
@@ -0,0 +1,50 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '题目',
+    align: "center",
+    dataIndex: 'topid_dictText'
+  },
+  {
+    title: '报名编号',
+    align: "center",
+    dataIndex: 'bmcode'
+  },
+];
+
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '专家组年度比赛项目题目',
+    field: 'annComGroTopid',
+    component: 'Input',
+  },
+  {
+    label: '题目',
+    field: 'topid',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "topic,name,id"
+    },
+  },
+  {
+    label: '报名编号',
+    field: 'bmcode',
+    component: 'Input',
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotopp/AnnComGroTopPList.vue b/jeecgboot-vue3-master/src/views/anncomgrotopp/AnnComGroTopPList.vue
new file mode 100644
index 000000000..789f5c377
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotopp/AnnComGroTopPList.vue
@@ -0,0 +1,225 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+<!--        <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button>批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown>
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <template #pcaSlot="{text}">
+        {{ getAreaTextByCode(text) }}
+      </template>
+      <template #fileSlot="{text}">
+        <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+        <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <AnnComGroTopPModal ref="registerModal" @success="handleSuccess"></AnnComGroTopPModal>
+  </div>
+</template>
+
+<script lang="ts" name="anncomgrotopp-annComGroTopP" setup>
+  import { ref, reactive } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { columns } from './AnnComGroTopP.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './AnnComGroTopP.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import AnnComGroTopPModal from './components/AnnComGroTopPModal.vue'
+  import { useRoute } from 'vue-router';
+
+  const route = useRoute();
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: '专家组年度比赛项目题目报名编号',
+      api: list,
+      columns,
+      canResize:false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 120,
+        fixed: 'right',
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, {xmtmid:route.query.id});
+      },
+    },
+    exportConfig: {
+      name: "专家组年度比赛项目题目报名编号",
+      url: getExportUrl,
+      params: queryParam,
+    },
+	  importConfig: {
+	    url: getImportUrl,
+	    success: handleSuccess
+	  },
+  });
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+/*      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },*/
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ]
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotopp/AnnComGroTopP_menu_insert.sql b/jeecgboot-vue3-master/src/views/anncomgrotopp/AnnComGroTopP_menu_insert.sql
new file mode 100644
index 000000000..f4eb8d6aa
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotopp/AnnComGroTopP_menu_insert.sql
@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/anncomgrotopp文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
+VALUES ('2023102408569760310', NULL, '专家组年度比赛项目题目报名编号', '/anncomgrotopp/annComGroTopPList', 'anncomgrotopp/AnnComGroTopPList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-10-24 08:56:31', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023102408569760311', '2023102408569760310', '添加专家组年度比赛项目题目报名编号', NULL, NULL, 0, NULL, NULL, 2, 'anncomgrotopp:ann_com_gro_top_p:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-24 08:56:31', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023102408569760312', '2023102408569760310', '编辑专家组年度比赛项目题目报名编号', NULL, NULL, 0, NULL, NULL, 2, 'anncomgrotopp:ann_com_gro_top_p:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-24 08:56:31', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023102408569760313', '2023102408569760310', '删除专家组年度比赛项目题目报名编号', NULL, NULL, 0, NULL, NULL, 2, 'anncomgrotopp:ann_com_gro_top_p:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-24 08:56:31', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023102408569760314', '2023102408569760310', '批量删除专家组年度比赛项目题目报名编号', NULL, NULL, 0, NULL, NULL, 2, 'anncomgrotopp:ann_com_gro_top_p:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-24 08:56:31', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023102408569760315', '2023102408569760310', '导出excel_专家组年度比赛项目题目报名编号', NULL, NULL, 0, NULL, NULL, 2, 'anncomgrotopp:ann_com_gro_top_p:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-24 08:56:31', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2023102408569760316', '2023102408569760310', '导入excel_专家组年度比赛项目题目报名编号', NULL, NULL, 0, NULL, NULL, 2, 'anncomgrotopp:ann_com_gro_top_p:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-24 08:56:31', NULL, NULL, 0, 0, '1', 0);
\ No newline at end of file
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotopp/components/AnnComGroTopPForm.vue b/jeecgboot-vue3-master/src/views/anncomgrotopp/components/AnnComGroTopPForm.vue
new file mode 100644
index 000000000..e3cb7a261
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotopp/components/AnnComGroTopPForm.vue
@@ -0,0 +1,140 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="24">
+          <a-form-item label="专家组年度比赛项目题目" v-bind="validateInfos.annComGroTopid">
+            <a-input v-model:value="formData.annComGroTopid" placeholder="请输入专家组年度比赛项目题目" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="题目" v-bind="validateInfos.topid">
+	          <j-dict-select-tag v-model:value="formData.topid" dictCode="topic,name,id" placeholder="请选择题目" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="报名编号" v-bind="validateInfos.bmcode">
+            <a-input v-model:value="formData.bmcode" placeholder="请输入报名编号" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../AnnComGroTopP.api';
+  import { Form } from 'ant-design-vue';
+  
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: ()=>{} },
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    annComGroTopid: '',   
+    topid: '',   
+    bmcode: '',   
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: true });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      //赋值
+      Object.assign(formData, record);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    min-height: 500px !important;
+    overflow-y: auto;
+    padding: 24px 24px 24px 24px;
+  }
+</style>
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotopp/components/AnnComGroTopPModal.vue b/jeecgboot-vue3-master/src/views/anncomgrotopp/components/AnnComGroTopPModal.vue
new file mode 100644
index 000000000..ae5d3c3c9
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotopp/components/AnnComGroTopPModal.vue
@@ -0,0 +1,76 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <AnnComGroTopPForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></AnnComGroTopPForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import AnnComGroTopPForm from './ChaoseTopicPersionList.vue'
+
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '绑定报名编号';
+    visible.value = true;
+/*    nextTick(() => {
+      registerForm.value.add();
+    });*/
+  }
+
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+    registerForm.value.searchReset();
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotopp/components/ChaoseTopicPersion.api.ts b/jeecgboot-vue3-master/src/views/anncomgrotopp/components/ChaoseTopicPersion.api.ts
new file mode 100644
index 000000000..f8e58c6aa
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotopp/components/ChaoseTopicPersion.api.ts
@@ -0,0 +1,82 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/chooseTopicPersion/chaoseTopicPersion/bmbhlist',
+  watch = '/chooseTopicPersion/chaoseTopicPersion/watch',
+  list4 = '/topic/topic/list4',
+  save='/chooseTopicPersion/chaoseTopicPersion/bmbhadd',
+  edit='/chooseTopicPersion/chaoseTopicPersion/edit',
+  edit1='/chooseTopicPersion/chaoseTopicPersion/edit1',
+  deleteOne = '/chooseTopicPersion/chaoseTopicPersion/delete',
+  deleteBatch = '/chooseTopicPersion/chaoseTopicPersion/deleteBatch',
+  importExcel = '/chooseTopicPersion/chaoseTopicPersion/importExcel',
+  exportXls = '/chooseTopicPersion/chaoseTopicPersion/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+export const list4 = (params) => defHttp.get({ url: Api.list4, params });
+export const watch = (params) => defHttp.get({ url: Api.watch, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+export const update = (params) => {
+  return defHttp.post({ url: Api.edit1, params });
+}
+export const update1 = (params) => {
+  return defHttp.post({ url: Api.edit1, params }, { isTransformResponse: false });
+}
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.get({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotopp/components/ChaoseTopicPersion.data.ts b/jeecgboot-vue3-master/src/views/anncomgrotopp/components/ChaoseTopicPersion.data.ts
new file mode 100644
index 000000000..95aff3c74
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotopp/components/ChaoseTopicPersion.data.ts
@@ -0,0 +1,55 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '报名编号',
+    align: "center",
+    dataIndex: 'bmcode'
+  },
+  {
+    title: '题目',
+    align: "center",
+    dataIndex: 'timul_dictText'
+  },
+  {
+    title: '状态',
+    align: "center",
+    dataIndex: 'status_dictText'
+  }
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '报名编号',
+    field: 'bmcode',
+    component: 'Input',
+  },
+  {
+    label: '题目',
+    field: 'timul',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "topic,name,id"
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode: "choose_topic_persion_status"
+    },
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+  {
+    label: '',
+    field: 'id',
+    component: 'Input',
+    show: false,
+  },
+];
diff --git a/jeecgboot-vue3-master/src/views/anncomgrotopp/components/ChaoseTopicPersionList.vue b/jeecgboot-vue3-master/src/views/anncomgrotopp/components/ChaoseTopicPersionList.vue
new file mode 100644
index 000000000..5a02f9cf4
--- /dev/null
+++ b/jeecgboot-vue3-master/src/views/anncomgrotopp/components/ChaoseTopicPersionList.vue
@@ -0,0 +1,250 @@
+<template>
+  <div>
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+                <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+                <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+                <a-dropdown v-if="selectedRowKeys.length > 0">
+                  <template #overlay>
+                    <a-menu>
+                      <a-menu-item key="1" @click="batchHandleDelete">
+                        <Icon icon="ant-design:delete-outlined"></Icon>
+                        删除
+                      </a-menu-item>
+                    </a-menu>
+                  </template>
+                  <a-button>批量操作
+                    <Icon icon="mdi:chevron-down"></Icon>
+                  </a-button>
+                </a-dropdown>-->
+      </template>
+      <!--操作栏-->
+      <!--      <template #action="{ record }">
+              <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+            </template>-->
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+        <div v-html="text"></div>
+      </template>
+      <!--省市区字段回显插槽-->
+      <!--      <template #pcaSlot="{text}">
+              {{ getAreaTextByCode(text) }}
+            </template>
+            <template #fileSlot="{text}">
+              <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+              <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+            </template>-->
+    </BasicTable>
+    <!-- 表单区域 -->
+  </div>
+</template>
+
+<script lang="ts" name="chooseTopicPersion-chaoseTopicPersion" setup>
+  import { ref, reactive,defineExpose } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import {columns} from './ChaoseTopicPersion.data';
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl,saveOrUpdate } from './ChaoseTopicPersion.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import { useRoute } from 'vue-router';
+  import {getValueType} from "../../../utils";
+  import {useMessage} from "../../../hooks/web/useMessage";
+
+
+
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const toggleSearchStatus = ref<boolean>(false);
+  const registerModal = ref();
+  const route = useRoute();
+  const emit = defineEmits(['register', 'ok']);
+//注册table数据
+const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
+  tableProps: {
+    title: '比赛选题',
+    api: list,
+    columns,
+    canResize:false,
+    useSearchForm: false,
+    showActionColumn:false,
+    /*      actionColumn: {
+            width: 120,
+            fixed: 'right',
+          },*/
+    beforeFetch: (params) => {
+      return Object.assign(params, {xmtmid:route.query.id});
+    },
+  },
+  exportConfig: {
+    name: "比赛选题",
+    url: getExportUrl,
+    params: queryParam,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+});
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const labelCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 7 },
+  });
+  const wrapperCol = reactive({
+    xs: { span: 24 },
+    sm: { span: 16 },
+  });
+  const { createMessage } = useMessage();
+  const confirmLoading = ref<boolean>(false);
+
+  /**
+   * 新增事件
+   */
+  function handleAdd() {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerModal.value.disableSubmit = false;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerModal.value.disableSubmit = true;
+    registerModal.value.edit(record);
+  }
+
+  /**
+   * 删除事件
+   */
+  async function handleDelete(record) {
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    let srk = selectedRowKeys.value.toString();
+    if(srk==""||srk==null){
+      createMessage.warning("请选择至少一条进行绑定");
+    }else{
+      await saveOrUpdate({ids:selectedRowKeys.value.toString(),xmtmid:route.query.id}, false)
+        .then((res) => {
+          if (res.success) {
+            createMessage.success(res.message);
+            emit('ok');
+          } else {
+            createMessage.warning(res.message);
+          }
+        })
+        .finally(() => {
+          confirmLoading.value = false;
+        });
+    }
+  }
+  defineExpose({
+    submitForm,
+    searchReset,
+  });
+
+  /**
+   * 批量删除事件
+   */
+  async function batchHandleDelete() {
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record) {
+    return [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+    ];
+  }
+
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ]
+  }
+
+  /**
+   * 查询
+   */
+  function searchQuery() {
+    reload();
+  }
+
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+
+
+</script>
+
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      width: calc(50% - 15px);
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+  }
+</style>
diff --git a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue
index 8cac3c888..f5963ec00 100644
--- a/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue
+++ b/jeecgboot-vue3-master/src/views/annualcompgroup/AnnualCompGroupList.vue
@@ -201,6 +201,11 @@
         onClick: bdcy.bind(null, record),
         //this.$Router.push
       },
+      {
+        label: '设置题目',
+        onClick: sztm.bind(null, record),
+        //this.$Router.push
+      },
     ]
   }
 
@@ -214,6 +219,16 @@
     router.push({ path: '/expgroup/ExpGroupList', query: {id} })
   }
 
+  /**
+   * 设置题目事件
+   */
+  function sztm(record: Recordable) {
+    //console.log(record.annalComp)
+    //let ndbsid = record.annalComp;
+    let id= record.id;
+    router.push({ path: '/anncomgrotop/AnnComGroTopList', query: {id} })
+  }
+
   /**
    * 查询
    */