fix

apps/web-ele/src/api/exam/question/category.ts

@@ -0,0 +1,55 @@
+import { requestClient } from '#/api/request';
+
+enum Api {
+  base = '/examQuestionCategory/category',
+  deptList = '/system/dept/list',
+  tree = '/examQuestionCategory/category/list',
+}
+
+export interface QuestionCategory {
+  children: QuestionCategory[];
+  id: number;
+  name: string;
+  parentId: number;
+  icon: string;
+  description: string;
+  sortOrder: number;
+  delFlag: string;
+}
+
+/**
+ * 获取试题分类树形图
+ */
+async function questionCategoryTree() {
+  return requestClient.get<QuestionCategory[]>(Api.tree);
+}
+
+async function questionCategoryOne(id: number) {
+  return requestClient.get<QuestionCategory>(`${Api.base}/${id}`);
+}
+// 新增试题分类
+function addQuestionCategory(category: QuestionCategory) {
+  return requestClient.post(Api.base, category, {
+    successMessageMode: 'message',
+  });
+}
+// 修改试题分类
+function updateQuestionCategory(category: QuestionCategory) {
+  return requestClient.put(Api.base, category, {
+    successMessageMode: 'message',
+  });
+}
+// 删除试题分类
+function deleteQuestionCategory(categoryId: number) {
+  return requestClient.delete(`${Api.base}/${categoryId}`, {
+    successMessageMode: 'message',
+  });
+}
+
+export {
+  addQuestionCategory,
+  deleteQuestionCategory,
+  questionCategoryOne,
+  questionCategoryTree,
+  updateQuestionCategory,
+};

apps/web-ele/src/views/examManage/questionBank/cpn/chapter/config-data.tsx

@@ -0,0 +1,45 @@
+import type { FormSchemaGetter } from '#/adapter/form';
+
+import { questionCategoryTree } from '#/api/exam/question/category';
+
+export const drawerFormSchema: FormSchemaGetter = () => [
+  {
+    component: 'Input',
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+    fieldName: 'id',
+  },
+  {
+    component: 'ApiTreeSelect',
+    componentProps: {
+      api: async () => {
+        const data: any = await questionCategoryTree();
+        return data?.rows;
+      },
+      labelField: 'name',
+      valueField: 'id',
+      childrenField: 'children',
+      checkStrictly: true,
+    },
+    dependencies: {
+      if(values: any) {
+        return values.parentId !== 0 || !values.isUpdate;
+      },
+      triggerFields: ['parentId'],
+    },
+    fieldName: 'parentId',
+    label: '上级分类',
+    rules: 'selectRequired',
+  },
+  {
+    component: 'Input',
+    fieldName: 'name',
+    componentProps: {
+      maxlength: 30,
+    },
+    label: '分类名称',
+    rules: 'required',
+  },
+];

apps/web-ele/src/views/examManage/questionBank/cpn/chapter/drawer.vue

@@ -0,0 +1,88 @@
+<script setup lang="ts">
+import type { Department } from '#/api/system/dept/model';
+
+import { defineEmits, ref } from 'vue';
+
+import { useVbenDrawer } from '@vben/common-ui';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  addQuestionCategory,
+  questionCategoryOne,
+  updateQuestionCategory,
+} from '#/api/exam/question/category';
+
+import { drawerFormSchema } from './config-data';
+
+const emit = defineEmits<{ reload: [] }>();
+
+const [Form, formApi] = useVbenForm({
+  // 不显示提交和重置按钮
+  showDefaultActions: false,
+  // 垂直布局，label和input在不同行，值为vertical
+  // 水平布局，label和input在同一行
+  layout: 'horizontal',
+  schema: drawerFormSchema(),
+});
+const isUpdateRef = ref<boolean>(false);
+const [Drawer, drawerApi] = useVbenDrawer({
+  async onOpenChange(isOpen) {
+    if (!isOpen) {
+      return;
+    }
+    try {
+      drawerApi.drawerLoading(true);
+      let { id, isUpdate, parentId } = drawerApi.getData();
+      isUpdateRef.value = isUpdate;
+      if (isUpdate) {
+        const deptData = await questionCategoryOne(id);
+        await formApi.setValues({ ...deptData, isUpdate });
+      } else {
+        // 如果父节点是0的话说明是根节点，将本节点id复制给根节点用于侧拉显示根节点。
+        if (parentId === 0) {
+          parentId = id;
+        }
+        await formApi.setValues({ parentId, isUpdate });
+      }
+    } catch (error) {
+      console.error(error);
+    } finally {
+      drawerApi.drawerLoading(false);
+    }
+  },
+  onClosed() {
+    formApi.resetForm();
+  },
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    try {
+      this.confirmLoading = true;
+      const data = await formApi.getValues<Department>();
+      // 动态判断调用新增还是修改
+      isUpdateRef.value
+        ? await updateQuestionCategory(data)
+        : await addQuestionCategory(data);
+      emit('reload');
+      drawerApi.close();
+    } catch (error) {
+      console.error(error);
+    } finally {
+      this.confirmLoading = false;
+    }
+  },
+});
+</script>
+
+<template>
+  <Drawer :title="isUpdateRef ? '编辑' : '新增'">
+    <Form />
+  </Drawer>
+</template>
+<style scoped lang="scss">
+:deep(.el-input-number) {
+  width: 100%;
+}
+</style>

apps/web-ele/src/views/examManage/questionBank/index.vue

@@ -1,28 +1,37 @@
 <script lang="ts" setup>
 import type { VbenFormProps } from '@vben/common-ui';
+
 import type { VxeGridProps } from '#/adapter/vxe-table';
 
-import { ref, onMounted } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import { Page } from '@vben/common-ui';
-import { useVbenVxeGrid } from '#/adapter/vxe-table';
+
+import { Page, useVbenDrawer } from '@vben/common-ui';
 
 import {
-  Plus,
-  Edit,
-  Delete,
   DArrowLeft,
+  Delete,
+  Edit,
   Expand,
+  Plus,
 } from '@element-plus/icons-vue';
 import {
-  ElTree,
   ElButton,
   ElIcon,
   ElMessage,
-  ElSpace,
   ElMessageBox,
+  ElSpace,
+  ElTree,
 } from 'element-plus';
 
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteQuestionCategory,
+  questionCategoryTree,
+} from '#/api/exam/question/category';
+
+import ChapterDrawer from './cpn/chapter/drawer.vue';
+
 // 路由实例
 const router = useRouter();
 const route = useRoute();
@@ -32,39 +41,10 @@ const classId = route.params.classId;
 const isCollapse = ref(false);
 
 // 章节数据
-const chapterData = ref([
-  {
-    id: 1,
-    label: '第一章 基础知识',
-    children: [
-      { id: 2, label: '1.1 概述', saved: true },
-      { id: 3, label: '1.2 基本概念', saved: false },
-      { id: 4, label: '1.3 核心原理', saved: true },
-    ],
-  },
-  {
-    id: 5,
-    label: '第二章 进阶知识',
-    children: [
-      { id: 6, label: '2.1 高级特性', saved: true },
-      { id: 7, label: '2.2 最佳实践', saved: true },
-    ],
-  },
-  {
-    id: 8,
-    label: '第三章 案例分析',
-    children: [
-      { id: 9, label: '3.1 案例一', saved: false },
-      { id: 10, label: '3.2 案例二', saved: true },
-    ],
-  },
-]);
+const chapterData = ref([]);
 
 // 选中的章节
-const selectedChapter = ref({
-  id: '1',
-  label: '第一章 基础知识',
-});
+const selectedChapter = ref({});
 
 // 模拟试题数据
 const mockQuestionData = ref([
@@ -223,38 +203,38 @@ const gridOptions: VxeGridProps = {
       query: async ({ page }, formValues = {}) => {
         // 模拟API请求
         console.log('查询参数:', formValues, page);
-        
+
         // 模拟搜索过滤
         let filteredData = [...mockQuestionData.value];
-        
+
         if (formValues.content) {
-          filteredData = filteredData.filter(item => 
-            item.content.includes(formValues.content)
+          filteredData = filteredData.filter((item) =>
+            item.content.includes(formValues.content),
           );
         }
-        
+
         if (formValues.reminder) {
-          filteredData = filteredData.filter(item => 
-            item.reminder === formValues.reminder
+          filteredData = filteredData.filter(
+            (item) => item.reminder === formValues.reminder,
           );
         }
-        
+
         if (formValues.difficulty) {
-          filteredData = filteredData.filter(item => 
-            item.difficulty === formValues.difficulty
+          filteredData = filteredData.filter(
+            (item) => item.difficulty === formValues.difficulty,
           );
         }
-        
+
         // 模拟分页
         const start = (page.currentPage - 1) * page.pageSize;
         const end = start + page.pageSize;
         const paginatedData = filteredData.slice(start, end);
         console.log('分页数据:', paginatedData);
-        
+
         // 确保返回格式正确，使用 items 作为数据键
-        return { 
-          items: paginatedData, 
-          total: filteredData.length 
+        return {
+          items: paginatedData,
+          total: filteredData.length,
         };
       },
     },
@@ -286,18 +266,27 @@ const handleChapterClick = (node) => {
 };
 
 // 添加章节
-const addChapter = (parentId = null) => {
-  ElMessage.info('添加章节功能待实现');
+const addChapter = (chapter: any) => {
+  chapterVbenDrawerApi.setData({ ...chapter, isUpdate: false }).open();
 };
 
 // 编辑章节
-const editChapter = (node) => {
-  ElMessage.info('编辑章节功能待实现');
+const editChapter = (chapter: any) => {
+  chapterVbenDrawerApi.setData({ ...chapter, isUpdate: true }).open();
 };
 
 // 删除章节
-const deleteChapter = (node) => {
-  ElMessage.info('删除章节功能待实现');
+const deleteChapter = (chapter: any) => {
+  // ElMessage.info('删除章节功能待实现');
+  // 二次确认
+  ElMessageBox.confirm('确认删除该章节吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    await deleteQuestionCategory(chapter.id);
+    await getChapterTree();
+  });
 };
 
 // 新增试题
@@ -324,7 +313,7 @@ const editQuestion = (row) => {
 
 // 预览试题
 const previewQuestion = (row) => {
-  // 跳转到预览页面，并传递试题ID 
+  // 跳转到预览页面，并传递试题ID
   router.push(`/examManage/questionBank/questionPreview?id=${row.id}`);
 };
 
@@ -340,7 +329,7 @@ const deleteHandle = () => {
   if (ids.length <= 0) {
     return;
   }
-  
+
   ElMessageBox.confirm(`确认删除选中的${ids.length}条数据吗?`, '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -352,9 +341,22 @@ const deleteHandle = () => {
   });
 };
 
+const [ChapterVbenDrawer, chapterVbenDrawerApi] = useVbenDrawer({
+  connectedComponent: ChapterDrawer,
+});
+
+const getChapterTree = async () => {
+  const { rows } = await questionCategoryTree();
+  chapterData.value = rows;
+};
+
 // 页面加载时获取数据
 onMounted(() => {
   // 默认选中第一个章节
+
+  // 获取试题分类树形图
+  getChapterTree().then();
+
   if (chapterData.value.length > 0) {
     handleChapterClick(chapterData.value[0]);
   }
@@ -364,22 +366,22 @@ onMounted(() => {
 <template>
   <Page :auto-content-height="true">
     <div class="knowledge-detail">
-
       <!-- 主体内容区 -->
       <div class="main-content">
         <!-- 左侧目录 -->
-        <div class="left-sidebar" :class="{ 'collapsed': isCollapse }">
+        <div class="left-sidebar" :class="{ collapsed: isCollapse }">
           <!-- 折叠按钮 -->
           <div class="collapse-btn" @click="isCollapse = true">
             <ElIcon><DArrowLeft /></ElIcon>
           </div>
-          
+
           <div class="sidebar-content">
             <!-- 章节树 -->
             <div class="chapter-tree">
               <ElTree
                 :data="chapterData"
                 node-key="id"
+                :props="{ label: 'name' }"
                 default-expand-all
                 :expand-on-click-node="false"
                 @node-click="handleChapterClick"
@@ -392,8 +394,8 @@ onMounted(() => {
                         type="text"
                         size="small"
                         circle
-                        @click.stop="addQuestion"
-                        title="添加题目"
+                        @click.stop="addChapter"
+                        title="添加章节"
                       >
                         <ElIcon><Plus /></ElIcon>
                       </ElButton>
@@ -425,8 +427,15 @@ onMounted(() => {
 
         <!-- 中间内容 -->
         <div class="center-content">
-          <ElIcon v-if="isCollapse" :size="20" class="collapse-control-btn" @click="isCollapse = false"><Expand /></ElIcon>
-          
+          <ElIcon
+            v-if="isCollapse"
+            :size="20"
+            class="collapse-control-btn"
+            @click="isCollapse = false"
+          >
+            <Expand />
+          </ElIcon>
+
           <!-- 题目列表区域 -->
           <div class="question-list">
             <!-- 试题列表 -->
@@ -442,33 +451,20 @@ onMounted(() => {
                   >
                     批量删除
                   </ElButton>
-                  <ElButton
-                    type="primary"
-                    @click="addQuestion"
-                  >
+                  <ElButton type="primary" @click="addQuestion">
                     新增试题
                   </ElButton>
-                  <ElButton
-                    type="primary"
-                    @click="importQuestions"
-                  >
+                  <ElButton type="primary" @click="importQuestions">
                     导入
                   </ElButton>
-                  <ElButton
-                    type="primary"
-                    @click="exportQuestions"
-                  >
+                  <ElButton type="primary" @click="exportQuestions">
                     导出
                   </ElButton>
                 </ElSpace>
               </template>
               <template #action="{ row }">
                 <div class="action-buttons">
-                  <ElButton
-                    type="text"
-                    size="small"
-                    @click="editQuestion(row)"
-                  >
+                  <ElButton type="text" size="small" @click="editQuestion(row)">
                     <ElIcon><Edit /></ElIcon>
                     编辑
                   </ElButton>
@@ -495,6 +491,7 @@ onMounted(() => {
         </div>
       </div>
     </div>
+    <ChapterVbenDrawer @reload="getChapterTree" />
   </Page>
 </template>
 
@@ -630,12 +627,3 @@ onMounted(() => {
   gap: 8px;
 }
 </style>
-
-
-
-
-
-
-
-
-

apps/web-ele/src/views/workflow/register.ts

@@ -1,12 +1,10 @@
-import { defineAsyncComponent, markRaw } from 'vue';
-
 /**
  * 这里定义流程描述组件
  */
 
-const LeaveDescription = defineAsyncComponent(
-  () => import('#/views/workflow/leave/leave-description.vue'),
-);
+// const LeaveDescription = defineAsyncComponent(
+//   () => import('#/views/workflow/leave/leave-description.vue'),
+// );
 
 /**
  * key为流程的路径(task.formPath) value为要显示的组件
@@ -15,7 +13,7 @@ export const flowComponentsMap = {
   /**
    * 请假申请 详情
    */
-  '/workflow/leaveEdit/index': markRaw(LeaveDescription),
+  '/workflow/leaveEdit/index': null,
 };
 
 export type FlowComponentsMapMapKey = keyof typeof flowComponentsMap;

apps/web-ele/src/views/workflow/task/allTaskWaiting.vue

@@ -8,6 +8,7 @@ import { computed, nextTick, onMounted, ref, useTemplateRef } from 'vue';
 import { Page } from '@vben/common-ui';
 import { useTabs } from '@vben/hooks';
 
+<<<<<<< HEAD
 import { Filter, Refresh } from '@element-plus/icons-vue';
 import {
   ElButton,
@@ -18,6 +19,20 @@ import {
   ElPopover,
   ElTooltip,
 } from 'element-plus';
+=======
+// import {
+//   Empty,
+//   Form,
+//   FormItem,
+//   Input,
+//   InputSearch,
+//   Popover,
+//   Segmented,
+//   Spin,
+//   Tooltip,
+//   TreeSelect,
+// } from 'ant-design-vue';
+>>>>>>> 0a5e399be8a3dc56c82fd915b6765781a5d30748
 import { cloneDeep, debounce, uniqueId } from 'lodash-es';
 
 import { categoryTree } from '#/api/workflow/category';

apps/web-ele/src/views/workflow/task/myDocument.vue

@@ -7,6 +7,7 @@ import { computed, onMounted, ref, useTemplateRef } from 'vue';
 import { Page } from '@vben/common-ui';
 import { useTabs } from '@vben/hooks';
 
+<<<<<<< HEAD
 import { Filter, Refresh } from '@element-plus/icons-vue';
 import {
   ElButton,
@@ -18,11 +19,23 @@ import {
   ElPopover,
   ElTooltip,
 } from 'element-plus';
+=======
+// import {
+//   ElButton,
+//   ElEmpty,
+//   ElForm,
+//   ElFormItem,
+//   ElInput,
+//   ElMessage,
+//   ElPopover,
+//   ElSpin,
+//   ElTooltip,
+// } from 'element-plus';
+>>>>>>> 0a5e399be8a3dc56c82fd915b6765781a5d30748
 import { cloneDeep, debounce } from 'lodash-es';
 
 import { pageByCurrent } from '#/api/workflow/instance';
 
-import { ApprovalCard, ApprovalPanel } from '../components';
 import { bottomOffset } from './constant';
 
 const emptyImage = ElEmpty.PRESENTED_IMAGE_SIMPLE;

apps/web-ele/src/views/workflow/task/taskCopyList.vue

@@ -6,7 +6,21 @@ import { computed, onMounted, ref, useTemplateRef } from 'vue';
 
 import { Page } from '@vben/common-ui';
 
+<<<<<<< HEAD
 import { ElEmpty, ElMessage } from 'element-plus';
+=======
+// import {
+//   Empty,
+//   Form,
+//   FormItem,
+//   Input,
+//   InputSearch,
+//   Popover,
+//   Spin,
+//   Tooltip,
+//   TreeSelect,
+// } from 'ant-design-vue';
+>>>>>>> 0a5e399be8a3dc56c82fd915b6765781a5d30748
 import { cloneDeep, debounce } from 'lodash-es';
 
 import { pageByTaskCopy } from '#/api/workflow/task';

apps/web-ele/src/views/workflow/task/taskFinish.vue

@@ -6,6 +6,7 @@ import { computed, onMounted, ref, useTemplateRef } from 'vue';
 
 import { Page } from '@vben/common-ui';
 
+<<<<<<< HEAD
 import { Filter, Refresh } from '@element-plus/icons-vue';
 import {
   ElButton,
@@ -17,6 +18,19 @@ import {
   ElPopover,
   ElTooltip,
 } from 'element-plus';
+=======
+// import {
+//   Empty,
+//   Form,
+//   FormItem,
+//   Input,
+//   InputSearch,
+//   Popover,
+//   Spin,
+//   Tooltip,
+//   TreeSelect,
+// } from 'ant-design-vue';
+>>>>>>> 0a5e399be8a3dc56c82fd915b6765781a5d30748
 import { cloneDeep, debounce } from 'lodash-es';
 
 import { pageByTaskFinish } from '#/api/workflow/task';

apps/web-ele/src/views/workflow/task/taskWaiting.vue

@@ -7,6 +7,7 @@ import { computed, onMounted, ref, useTemplateRef } from 'vue';
 import { Page } from '@vben/common-ui';
 import { useTabs } from '@vben/hooks';
 
+<<<<<<< HEAD
 import { Filter, Refresh } from '@element-plus/icons-vue';
 import {
   ElButton,
@@ -18,6 +19,19 @@ import {
   ElPopover,
   ElTooltip,
 } from 'element-plus';
+=======
+// import {
+//   Empty,
+//   Form,
+//   FormItem,
+//   Input,
+//   InputSearch,
+//   Popover,
+//   Spin,
+//   Tooltip,
+//   TreeSelect,
+// } from 'ant-design-vue';
+>>>>>>> 0a5e399be8a3dc56c82fd915b6765781a5d30748
 import { cloneDeep, debounce } from 'lodash-es';
 
 import { pageByTaskWait } from '#/api/workflow/task';