apps/web-ele/.env.development

@@ -22,3 +22,6 @@ VITE_DEVTOOLS=false
 
 # 是否注入全局loading
 VITE_INJECT_APP_LOADING=true
+
+# 移动端考试分享地址
+VITE_MOBILE_EXAM_URL=http://localhost:9000/%23/pages/knowledge/exam/start?id={id}

apps/web-ele/.env.production

@@ -18,3 +18,6 @@ VITE_INJECT_APP_LOADING=true
 
 # 打包后是否生成dist.zip
 VITE_ARCHIVER=true
+
+# 移动端考试分享地址
+VITE_MOBILE_EXAM_URL=http://39.164.159.226:8087/%23/pages/knowledge/exam/start?id={id}

apps/web-ele/src/components/knowledgemain/index.vue

@@ -1,19 +1,35 @@
 <script lang="ts" setup>
-//@ts-ignore
-import { computed, onMounted, ref, defineProps } from 'vue';
-import { Clock, DArrowLeft, Expand, HomeFilled } from '@element-plus/icons-vue';
-import { ElIcon, ElTree } from 'element-plus';
+// @ts-ignore
+import { computed, defineProps, onMounted, ref } from 'vue';
+
+import { Clock, Expand, HomeFilled } from '@element-plus/icons-vue';
+import { ElIcon, ElMessage, ElTree } from 'element-plus';
+
+import { queryKnowledgeCategory } from '#/api/knowledge/category';
 import {
   getKnowledgeContentDetail,
   queryKnowledgeContentlist,
 } from '#/api/knowledge/content';
-import { queryKnowledgeCategoryDetail } from '#/api/knowledge/category';
+
 const props = defineProps({
-  classId: {
-    type: String,
-    default: '',
+  // classId: {
+  //   type: String,
+  //   default: '',
+  // },
+  data: {
+    type: Object,
+    default: () => ({}),
   },
 });
+
+const selectedCategoryInfo = ref({
+  categoryId: '',
+  categoryName: '',
+  contentId: '',
+  contentPath: '', // 分类路径，例如：1/2/3
+  contentNamePath: '', // 分类名称路径，例如：分类1/分类2/分类3
+}) as any;
+const selectedCategoryId = ref(props.data?.categoryId || '');
 // 菜单折叠状态
 const isCollapse = ref(false);
 // 章节数据
@@ -24,36 +40,62 @@ const isEdit = ref(false);
 const ChapterId = ref(null);
 const KnowledgeDetails = ref({}) as any;
 // 查询章节数据
-const chapterDatafn = async () => {
+const chapterDatafn = async ({ initContentId }: any) => {
   chapterDataloading.value = true;
+  // 初始化选择数据
+  selectedCategoryInfo.value = {
+    categoryId: '',
+    categoryName: '',
+    contentId: '',
+    contentPath: '', // 分类路径，例如：1/2/3
+    contentNamePath: '', // 分类名称路径，例如：分类1/分类2/分类3
+  };
   try {
-    const res = await queryKnowledgeContentlist(props.classId);
+    const res = await queryKnowledgeContentlist(selectedCategoryId.value);
+    KnowledgeDetails.value = categoryList.value.find(
+      (item: any) => item.id === selectedCategoryId.value,
+    );
+    if (KnowledgeDetails.value) {
+      selectedCategoryInfo.value = {
+        categoryId: selectedCategoryId.value,
+        categoryName: KnowledgeDetails.value.name,
+        contentId: initContentId,
+        contentPath: '', // 分类路径，例如：1/2/3
+        contentNamePath: '', // 分类名称路径，例如：分类1/分类2/分类3
+      };
+    }
     if (res.code === 200) {
-      console.log('章节数据', res.data);
       chapterData.value = res.data || [];
       if (chapterData.value.length > 0) {
-        handleChapterClick({ id: chapterData.value[0]?.id });
+        handleChapterClick({ id: initContentId || chapterData.value[0]?.id });
       }
     }
-  } catch (error) {
-    console.log(error);
+  } catch {
+    // 处理异常
   } finally {
     chapterDataloading.value = false;
   }
 };
-// 查询知识分类详情
-const queryKnowledgeCategoryDetailfn = async () => {
+
+const categoryList = ref([]) as any;
+// 查询知识分类列表
+const queryKnowledgeCategoryListfn = async () => {
   try {
-    const res = await queryKnowledgeCategoryDetail(props.classId);
-    KnowledgeDetails.value = res;
+    const res = await queryKnowledgeCategory({
+      pageSize: 10_000,
+    });
+    categoryList.value = res.rows || [];
   } catch (error) {
-    console.log(error);
+    console.error(error);
   }
 };
 
 onMounted(() => {
-  queryKnowledgeCategoryDetailfn();
-  chapterDatafn();
+  queryKnowledgeCategoryListfn();
+  if (props.data?.categoryId) {
+    selectedCategoryId.value = props.data?.categoryId;
+    chapterDatafn({ initContentId: props.data?.contentId });
+  }
 });
 // 选中的章节
 const selectedChapter = ref({}) as any;
@@ -65,7 +107,6 @@ const handleChapterClick = async (node: any) => {
   try {
     const res = await getKnowledgeContentDetail(node.id);
     if (res.code === 200) {
-      console.log('点击章节', res.data);
       selectedChapter.value = {
         id: res.data.id,
         label: res.data.title,
@@ -74,33 +115,13 @@ const handleChapterClick = async (node: any) => {
         attachmentUrl: res.data.attachmentUrl,
       };
     }
-  } catch (error) {
-    console.log(error);
+  } catch {
+    //
   } finally {
     centerloading.value = false;
   }
 };
-// 递归查找节点路径
-const findNodePath = (
-  data: any[],
-  targetId: number,
-  path: any[] = [],
-): any[] | null => {
-  for (let i = 0; i < data.length; i++) {
-    const node = data[i];
-    const currentPath = [...path, { data, index: i }];
-    if (node.id === targetId) {
-      return currentPath;
-    }
-    if (node.children && node.children.length > 0) {
-      const result = findNodePath(node.children, targetId, currentPath);
-      if (result) {
-        return result;
-      }
-    }
-  }
-  return null;
-};
+
 const imageExt = new Set(['bmp', 'gif', 'jpeg', 'jpg', 'png', 'svg', 'webp']);
 const isImage = (url: string) => {
   if (!url) return false;
@@ -124,6 +145,78 @@ const nonImageList = computed(() => {
   const result = urls.filter((u: any) => !isImage(u));
   return result;
 });
+
+interface Category {
+  id: string;
+  title: string;
+  parentId: null | string;
+  children?: Category[];
+}
+
+// 通过递归方式获取分类路径和分类名称路径
+const getCategoryPath = (
+  chapterId: string,
+): { namePath: string; path: string } => {
+  // 递归搜索函数
+  const findPath = (
+    categories: Category[],
+    targetId: string,
+  ): Category[] | null => {
+    for (const category of categories) {
+      if (category.id === targetId) {
+        return [category];
+      }
+
+      if (category.children && category.children.length > 0) {
+        const childPath = findPath(category.children, targetId);
+        if (childPath) {
+          return [category, ...childPath];
+        }
+      }
+    }
+    return null;
+  };
+
+  // 查找路径
+  const pathArray = findPath(chapterData.value, chapterId);
+
+  if (!pathArray || pathArray.length === 0) {
+    return { path: '', namePath: '' };
+  }
+
+  // 构建路径字符串
+  const path = `${pathArray.map((item) => item.id).join('/')}`;
+  const namePath = `${pathArray.map((item) => item.title).join('/')}`;
+
+  return { path, namePath };
+};
+
+const confirmSelection = () => {
+  // 处理确认选择的逻辑
+  if (!selectedCategoryId.value) {
+    ElMessage.error('请选择分类');
+    return;
+  }
+  if (!selectedChapter.value.id) {
+    ElMessage.error('请选择章节');
+    return;
+  }
+
+  const { path, namePath }: any = getCategoryPath(selectedChapter.value.id);
+
+  const result = {
+    categoryId: selectedCategoryId.value,
+    categoryName: selectedCategoryInfo.value.categoryName,
+    contentId: selectedChapter.value.id,
+    contentPath: path,
+    contentNamePath: namePath,
+  };
+  return result;
+};
+
+defineExpose({
+  confirmSelection,
+});
 </script>
 
 <template>
@@ -136,14 +229,24 @@ const nonImageList = computed(() => {
         :class="{ collapsed: isCollapse }"
         v-loading="chapterDataloading"
       >
-        <!-- 折叠按钮 -->
-        <div class="collapse-btn" @click="isCollapse = true">
-          <ElIcon><DArrowLeft /></ElIcon>
+        <div class="m-5">
+          <ElSelect
+            v-model="selectedCategoryId"
+            placeholder="请选择分类"
+            @change="chapterDatafn"
+          >
+            <ElOption
+              v-for="item in categoryList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </ElSelect>
         </div>
 
         <div class="sidebar-content">
           <!-- 知识库信息 -->
-          <div class="knowledge-info">
+          <!-- <div class="knowledge-info" v-if="selectedCategoryId">
             <div class="knowledge-icon">
               <span
                 v-if="KnowledgeDetails?.icon?.includes('iconfont')"
@@ -156,15 +259,12 @@ const nonImageList = computed(() => {
               <img v-else :src="KnowledgeDetails?.iconUrl?.[0] || ''" alt="" />
             </div>
             <div class="knowledge-title">{{ KnowledgeDetails?.name }}</div>
-          </div>
+          </div> -->
 
           <!-- 主页按钮 -->
-          <div class="home-btn">
+          <div class="home-btn" v-if="selectedCategoryId">
             <ElIcon><HomeFilled /></ElIcon>
             <span :class="{ collapsed: isCollapse }">主页</span>
-            <!-- <ElIcon style="margin-left: 120px" @click="addMenu">
-                <Plus />
-              </ElIcon> -->
           </div>
 
           <!-- 章节树 -->
@@ -175,7 +275,7 @@ const nonImageList = computed(() => {
               :props="{ label: 'title', children: 'children' }"
               default-expand-all
               :expand-on-click-node="false"
-              :current-node-key="chapterData[0]?.id"
+              :current-node-key="ChapterId"
               highlight-current
               @node-click="handleChapterClick"
             >
@@ -208,15 +308,15 @@ const nonImageList = computed(() => {
         <div class="content-header">
           <h2 class="content-title">{{ selectedChapter.label }}</h2>
           <div class="content-meta">
-            <ElIcon class="meta-icon" v-if="selectedChapter.updatedTime"
-              ><Clock
-            /></ElIcon>
+            <ElIcon class="meta-icon" v-if="selectedChapter.updatedTime">
+              <Clock />
+            </ElIcon>
             <span>{{ selectedChapter.updatedTime }}</span>
           </div>
         </div>
 
         <!-- 内容主体 -->
-        <div class="content-body">
+        <div class="content-body" v-if="selectedCategoryId">
           <div class="content-text" v-html="selectedChapter.content"></div>
           <!-- 附件 -->
           <div class="content-attachments">
@@ -296,6 +396,7 @@ const nonImageList = computed(() => {
             </div>
           </div>
         </div>
+        <!-- <div v-else>暂无数据</div> -->
       </div>
     </div>
   </div>

apps/web-ele/src/views/examManage/exam/cpn/edit/drawer.vue

@@ -27,6 +27,23 @@ const emit = defineEmits<{ reload: [] }>();
 // 抽屉可见性
 const drawerVisible = ref(false);
 
+const clearForm = () => {
+  Object.assign(examForm, {
+    examName: '',
+    categoryId: '',
+    remark: '',
+    paperId: '',
+    passScore: '',
+    examStartTime: '',
+    examEndTime: '',
+    examDuration: '',
+    executorCount: 0, // 模拟已选择23人
+    executorUsers: [],
+    paperCategoryId: '',
+  });
+  selectedPapers.value = [];
+};
+
 const isUpdateRef = ref<boolean>(false);
 const [Drawer, drawerApi] = useVbenDrawer({
   async onOpenChange(isOpen: any) {
@@ -72,6 +89,7 @@ const [Drawer, drawerApi] = useVbenDrawer({
   },
   onClosed() {
     // formApi.resetForm();
+    clearForm();
   },
   async onConfirm() {
     try {
@@ -147,6 +165,7 @@ const [Drawer, drawerApi] = useVbenDrawer({
     } catch (error) {
       console.error(error);
     } finally {
+      clearForm();
       this.confirmLoading = false;
     }
   },
@@ -255,6 +274,15 @@ const getPaperCategoryOptions = async () => {
   paperCategoryTree.value = res.rows || [];
 };
 
+const handleStartTimeChange = (val: any) => {
+  examForm.examDuration =
+    val && examForm.examStartTime && examForm.examEndTime
+      ? dayjs(examForm.examEndTime)
+          .diff(dayjs(examForm.examStartTime), 'minute')
+          .toString()
+      : '';
+};
+
 onMounted(async () => {
   getCategoryOptions().then();
   getPaperCategoryOptions().then();
@@ -337,30 +365,6 @@ onMounted(async () => {
               </ElInput>
             </ElFormItem> -->
 
-            <!-- 及格分 -->
-            <ElFormItem label="及格分" class="form-item-with-border" required>
-              <ElInput
-                v-model="examForm.passScore"
-                placeholder="请输入及格分"
-                type="number"
-                min="1"
-              >
-                <template #append>分</template>
-              </ElInput>
-            </ElFormItem>
-
-            <!-- 答卷时长 -->
-            <ElFormItem label="答卷时长" class="form-item-with-border" required>
-              <ElInput
-                v-model="examForm.examDuration"
-                placeholder="请输入答卷时长"
-                type="number"
-                min="1"
-              >
-                <template #append>分钟</template>
-              </ElInput>
-            </ElFormItem>
-
             <!-- 考试时间 -->
             <ElFormItem
               label="考试时间"
@@ -371,17 +375,44 @@ onMounted(async () => {
                 v-model="examForm.examStartTime"
                 type="datetime"
                 placeholder="开始时间"
+                @change="handleStartTimeChange"
                 style="width: calc(50% - 15px)"
               />
               <span style="margin: 0 6px">至</span>
               <ElDatePicker
                 v-model="examForm.examEndTime"
                 type="datetime"
+                @change="handleStartTimeChange"
                 placeholder="结束时间"
                 style="width: calc(50% - 15px)"
               />
             </ElFormItem>
 
+            <!-- 答卷时长 -->
+            <ElFormItem label="答卷时长" class="form-item-with-border" required>
+              <ElInput
+                v-model="examForm.examDuration"
+                placeholder="请输入答卷时长"
+                type="number"
+                min="1"
+                disabled
+              >
+                <template #append>分钟</template>
+              </ElInput>
+            </ElFormItem>
+
+            <!-- 及格分 -->
+            <ElFormItem label="及格分" class="form-item-with-border" required>
+              <ElInput
+                v-model="examForm.passScore"
+                placeholder="请输入及格分"
+                type="number"
+                min="1"
+              >
+                <template #append>分</template>
+              </ElInput>
+            </ElFormItem>
+
             <!-- 考试执行人 -->
             <ElFormItem
               label="考试执行人"

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

@@ -36,6 +36,7 @@ import { deleteExam, examList } from '#/api/exam/exam/exam';
 // @ts-ignore
 import PaperPreview from '#/components/paper';
 // @ts-ignore
+// @ts-ignore
 
 import { queryFormSchema, tableColumns } from './config-data';
 // @ts-ignore
@@ -258,8 +259,17 @@ const updateExam = (row: any) => {
 
 const generateLink = (row: any) => {
   const link = `${window.location.origin}/examin/${row.id}`;
-  const { copy } = useClipboard({ legacy: true, source: link });
-  copy(link);
+  const mobileLink = `${import.meta.env.VITE_MOBILE_EXAM_URL.replace('%23', '#').replace('{id}', row.id)}`;
+  // console.log(import.meta.env.VITE_MOBILE_EXAM_URL, mobileLink);
+  const copyContent = `考试名称：${row.examName}
+开始时间：${row.examStartTime}
+结束时间：${row.examEndTime}
+考试时长：${row.examDuration || 0} 分钟
+电脑端链接：${link}
+移动端链接：${mobileLink}
+  `;
+  const { copy } = useClipboard({ legacy: true, source: copyContent });
+  copy(copyContent);
   ElMessage.success(`已复制到剪贴板`);
 };
 

apps/web-ele/src/views/examManage/myExamPaper/cpn/endexamin/result.vue

@@ -2,8 +2,10 @@
 import { onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 
+// // @ts-ignore
+// import { useVbenModal } from '@vben/common-ui';
 // @ts-ignore
-import { Page } from '@vben/common-ui';
+import { Page, useVbenModal } from '@vben/common-ui';
 
 import { CircleCheckFilled, CircleCloseFilled } from '@element-plus/icons-vue';
 
@@ -13,6 +15,7 @@ import { getAnswerResult } from '#/api/exam/exam/answer';
 import { examPaperDetail } from '#/api/exam/exam/exam';
 // @ts-ignore
 import { getParticipantById } from '#/api/exam/exam/participant';
+import knowledgemain from '#/components/knowledgemain/index.vue';
 
 const route = useRoute();
 const examId = Number(route.params.id || 0);
@@ -54,6 +57,23 @@ const parseJson = (str: string) => {
   }
 };
 
+const knowledgeRef: any = ref(null);
+const selectedCategoryInfo = ref<any>({});
+const [quoteModal, quoteModalApi] = useVbenModal({
+  title: '引用试题',
+  showCancelBtn: false,
+  class: 'quote-modal',
+  onConfirm: () => {
+    const result = knowledgeRef.value.confirmSelection();
+    if (result) {
+      // formData.value = result;
+      // console.log(result);
+      selectedCategoryInfo.value = result;
+      quoteModalApi.close();
+    }
+  },
+});
+
 // 根据paperQuestionId获取答题信息
 const getAnswerByPaperQuestionId = (paperQuestionId: number) => {
   return (
@@ -92,6 +112,11 @@ const getQuestionsByBigIndex = () => {
     .map((key) => grouped[key]);
 };
 
+const handleQuote = (str: string) => {
+  selectedCategoryInfo.value = JSON.parse(str || '{}');
+  quoteModalApi.open();
+};
+
 const init = async () => {
   // 并发请求接口获取数据
   const [examInfoRes, participantRes, answerRes] = await Promise.all([
@@ -281,12 +306,19 @@ onMounted(async () => {
                 </span>
               </div>
               <div class="exam_info_left_content_answer_desc">
-                答案解析：
-                <span class="exam_info_left_content_answer_content">
+                答案解析:
+                <ElLink
+                  v-if="question.info.analysisReference"
+                  type="primary"
+                  @click="handleQuote(question.info.analysisReference)"
+                >
+                  查看引用解析
+                </ElLink>
+                <div class="exam_info_left_content_answer_content">
                   <span
                     v-html="question.info.answerAnalysis || '暂无解析'"
                   ></span>
-                </span>
+                </div>
               </div>
               <div class="exam_info_left_content_answer_title">
                 得分：
@@ -367,6 +399,9 @@ onMounted(async () => {
         </div>
       </div>
     </div>
+    <quoteModal>
+      <knowledgemain ref="knowledgeRef" :data="selectedCategoryInfo" />
+    </quoteModal>
   </Page>
 </template>
 <style lang="scss" scoped>
@@ -463,7 +498,7 @@ onMounted(async () => {
             font-size: 18px;
             font-weight: 500;
             color: #31373d;
-            display: flex;
+            // display: flex;
             align-items: center;
             flex-wrap: wrap;
             span {
@@ -474,6 +509,7 @@ onMounted(async () => {
               }
             }
             .exam_info_left_content_answer_content {
+              margin-top: 12px;
               margin-left: 8px;
               font-size: 16px;
               font-weight: 400;

apps/web-ele/src/views/examManage/myExamPaper/cpn/startexamin/index.vue

@@ -72,7 +72,7 @@ const loadAnswersFromStorage = () => {
 const initCountdown = () => {
   const startTime = examInfo.value.examStartTime;
 
-  const examDuration = examInfo.value.examDuration * 600_000;
+  const examDuration = examInfo.value.examDuration * 60_000;
 
   if (startTime) {
     // 页面刷新或重新进入，根据开始时间计算剩余时间

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

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
+
 // @ts-ignore
 import { useVbenModal } from '@vben/common-ui';
-
 // @ts-ignore
 import { useTabs } from '@vben/hooks';
 
@@ -15,9 +15,9 @@ import {
   updateQuestion,
   // @ts-ignore
 } from '#/api/exam/question/question';
+import knowledgemain from '#/components/knowledgemain/index.vue';
 // @ts-ignore
 import TinymceEditor from '#/components/tinymce/src/editor.vue';
-import knowledgemain from '#/components/knowledgemain/index.vue';
 // @ts-ignore
 const { closeCurrentTab } = useTabs();
 
@@ -25,6 +25,8 @@ const route = useRoute();
 // const router = useRouter();
 const id = route.query.id as string;
 
+const selectedCategoryInfo: any = ref({});
+
 // 分类树形数据
 const categoryTreeData: any = ref([]);
 
@@ -106,7 +108,11 @@ const loadQuestionData = async () => {
         options: question.options ? JSON.parse(question.options) : ['', ''], // 解析JSON字符串为数组
         correctAnswer: JSON.parse(question.correctAnswer), // 解析JSON字符串为数组
         analysis: question.answerAnalysis || '',
+        // analysisReference: question.analysisReference || '',
       };
+      if (question.analysisReference) {
+        selectedCategoryInfo.value = JSON.parse(question.analysisReference);
+      }
     } catch (error) {
       console.error('获取试题详情失败:', error);
     }
@@ -198,6 +204,10 @@ const processQuestionData = () => {
     }
   }
 
+  if (selectedCategoryInfo.value.contentId) {
+    saveData.analysisReference = JSON.stringify(selectedCategoryInfo.value);
+  }
+
   return saveData;
 };
 
@@ -266,12 +276,21 @@ onMounted(() => {
   fetchCategories();
 });
 
+const knowledgeRef: any = ref(null);
+
 const [quoteModal, quoteModalApi] = useVbenModal({
   title: '引用试题',
   showCancelBtn: false,
   class: 'quote-modal',
-  // onConfirm:()=>{
-  // }
+  onConfirm: () => {
+    const result = knowledgeRef.value.confirmSelection();
+    if (result) {
+      // formData.value = result;
+      // console.log(result);
+      selectedCategoryInfo.value = result;
+      quoteModalApi.close();
+    }
+  },
 });
 
 const handleQuote = () => {
@@ -526,10 +545,20 @@ const handleQuote = () => {
           </h3>
           <div class="mb-2 flex items-center gap-2">
             <!--TODO: 引用功能未实现-->
-            <el-button type="default" plain size="small" @click="handleQuote">
+            <el-button
+              v-if="!selectedCategoryInfo.contentNamePath"
+              type="default"
+              plain
+              size="small"
+              @click="handleQuote"
+            >
               引用
             </el-button>
+            <el-link type="primary" :underline="false" @click="handleQuote">
+              {{ selectedCategoryInfo.contentNamePath || '' }}
+            </el-link>
           </div>
+
           <TinymceEditor
             v-model="formData.analysis"
             :height="300"
@@ -549,7 +578,7 @@ const handleQuote = () => {
       </div>
     </div>
     <quoteModal>
-      <knowledgemain :classId="id" />
+      <knowledgemain ref="knowledgeRef" :data="selectedCategoryInfo" />
     </quoteModal>
   </div>
 </template>

apps/web-ele/src/views/knowledge/type/create.vue

@@ -1,21 +1,38 @@
 <script lang="ts" setup>
 import { onMounted, ref, watch } from 'vue';
+
+// @ts-ignore
+import { useVbenModal } from '@vben/common-ui';
+import { useAccessStore } from '@vben/stores';
+
+import { Delete, Upload } from '@element-plus/icons-vue';
 import {
+  ElButton,
   ElForm,
   ElFormItem,
+  ElIcon,
   ElInput,
-  ElSelect,
+  ElMessage,
   ElOption,
+  ElSelect,
   ElUpload,
-  ElMessage,
-  ElButton,
-  ElIcon,
 } from 'element-plus';
-import { Upload, Plus, Delete } from '@element-plus/icons-vue';
-import '#/assets/iconfonts/font/iconfont.css';
-import { useAccessStore } from '@vben/stores';
-import { getUploadAction } from '#/components/upload/config';
+
 import { queryKnowledgeCategory } from '#/api/knowledge/category';
+// @ts-ignore
+import { getPostList } from '#/api/system/post/post';
+// @ts-ignore
+import { SelectUsers } from '#/components/selectUsers';
+import { getUploadAction } from '#/components/upload/config';
+
+import '#/assets/iconfonts/font/iconfont.css';
+// 定义组件的props
+const props = defineProps<{
+  initialData?: FormData;
+  mode: string;
+}>();
+// 定义事件
+const emit = defineEmits(['close', 'save']);
 const accessStore = useAccessStore();
 // 定义表单数据类型
 interface FormData {
@@ -23,32 +40,53 @@ interface FormData {
   description: string;
   upiconname: string;
   icon: string;
-  managers: any[];
-  visibleApps: any[];
+  managePermission: string;
+  managerNames: string;
+  visibleRole: any[];
   visiblePositions: any[];
   association: string;
 }
 
-// 定义组件的props
-const props = defineProps<{
-  mode: string;
-  initialData?: FormData;
-}>();
-
-// 定义事件
-const emit = defineEmits(['close', 'save']);
-
 // 表单引用
 const formRef = ref();
 
+// 选人组件引用
+const userSelectRef: any = ref(null);
+
+// 选人模态框
+const [UserSelectModal, userSelectModalApi] = useVbenModal({
+  title: '选择知识库管理员',
+  width: 1000,
+  height: 800,
+  zIndex: 100_000,
+  closeOnClickModal: false,
+  showCancelBtn: false,
+  onConfirm: async () => {
+    const users = await userSelectRef.value.confirmSelection();
+    if (users?.length) {
+      // 更新表单数据
+      form.value.managePermission = users.map((user: any) => user.id).join(',');
+      form.value.managerNames = users.map((user: any) => user.name).join(',');
+      // 关闭模态框
+      userSelectModalApi.close();
+    }
+  },
+});
+
+// 打开选人模态框
+const openUserSelectModal = () => {
+  userSelectModalApi.open();
+};
+
 // 表单数据
 const form = ref<FormData>({
   name: '',
   description: '',
   upiconname: '',
   icon: '',
-  managers: [],
-  visibleApps: [],
+  managePermission: '',
+  managerNames: '',
+  visibleRole: [],
   visiblePositions: [],
   association: '',
 });
@@ -159,10 +197,29 @@ const createCategory = async () => {
     console.log(error);
   }
 };
+const getPositionList = async () => {
+  try {
+    const res = await getPostList({
+      pageSize: 10_000,
+    });
+    // 将岗位数据转换为选项格式
+    positionList.value =
+      res.rows?.map((item: any) => ({
+        label: item.postName,
+        value: item.postId,
+      })) || [];
+  } catch (error) {
+    console.warn('获取岗位列表失败:', error);
+  }
+};
+const knowledgeList = ref([]) as any;
+// 岗位列表
+const positionList = ref([]) as any;
 onMounted(() => {
   createCategory();
+  getPositionList();
 });
-const knowledgeList = ref([]) as any;
+
 // 上传图片处理
 // const uploadFile = (file: any) => {
 //   // 这里可以添加图片上传逻辑
@@ -199,10 +256,12 @@ const handleDeleteIcon = () => {
 const submitForm = () => {
   // 这里可以添加表单提交逻辑
   formRef.value.validate((valid: any) => {
-    console.log(form.value);
-
     if (valid) {
-      emit('save', form.value);
+      emit('save', {
+        ...form.value,
+        visiblePositions: form.value.visiblePositions.join(','),
+        visibleRole: form.value.visibleRole.join(','),
+      });
       ElMessage.success(props.mode === 'create' ? '创建成功' : '编辑成功');
     } else {
       ElMessage.error('请填写正确的信息');
@@ -302,24 +361,24 @@ const closeForm = () => {
       label="知识库管理员（管理员具有知识库编辑、删除的权限）"
       prop="managers"
     >
-      <ElSelect
-        v-model="form.managers"
-        placeholder="可多选"
-        multiple
-        filterable
+      <ElInput
+        v-model="form.managerNames"
+        disabled
+        placeholder="请选择管理员"
+        readonly
       >
-        <ElOption label="管理员1" value="admin1" />
-        <ElOption label="管理员2" value="admin2" />
-        <ElOption label="管理员3" value="admin3" />
-      </ElSelect>
+        <template #append>
+          <ElButton type="primary" @click="openUserSelectModal">选择</ElButton>
+        </template>
+      </ElInput>
     </ElFormItem>
 
     <!-- 可见范围 -->
     <ElFormItem label="可见范围（可查看该知识库权限）">
       <div class="visible-range" style="width: 100%">
-        <ElFormItem label="端" label-position="right" prop="visibleApps">
+        <ElFormItem label="端" label-position="right" prop="visibleRole">
           <ElSelect
-            v-model="form.visibleApps"
+            v-model="form.visibleRole"
             placeholder="可多选"
             multiple
             filterable
@@ -327,7 +386,7 @@ const closeForm = () => {
           >
             <ElOption label="PC端" value="pc" />
             <ElOption label="移动端" value="mobile" />
-            <ElOption label="小程序" value="miniprogram" />
+            <!-- <ElOption label="小程序" value="miniprogram" /> -->
           </ElSelect>
         </ElFormItem>
         <ElFormItem label="岗位" label-position="right" prop="visiblePositions">
@@ -338,16 +397,23 @@ const closeForm = () => {
             filterable
             style="width: 100%"
           >
-            <ElOption label="经理" value="manager" />
+            <ElOption
+              v-for="item in positionList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+            <!-- <ElOption label="经理" value="manager" />
             <ElOption label="员工" value="employee" />
-            <ElOption label="实习生" value="intern" />
+            <ElOption label="实习生" value="intern" /> -->
+            <!-- <ElSelect> -->
           </ElSelect>
         </ElFormItem>
       </div>
     </ElFormItem>
 
     <!-- 知识库关联 -->
-    <ElFormItem
+    <!-- <ElFormItem
       label="知识库关联（关联后，两个知识库内容同步编辑）"
       prop="association"
     >
@@ -359,7 +425,7 @@ const closeForm = () => {
           :value="String(item.id)"
         />
       </ElSelect>
-    </ElFormItem>
+    </ElFormItem> -->
 
     <!-- 操作按钮 -->
     <div class="form-actions">
@@ -367,6 +433,11 @@ const closeForm = () => {
       <ElButton @click="closeForm">取消</ElButton>
     </div>
   </ElForm>
+
+  <!-- 选择人员模态框 -->
+  <UserSelectModal class="w-[700px]">
+    <SelectUsers ref="userSelectRef" />
+  </UserSelectModal>
 </template>
 
 <style lang="scss" scoped>

apps/web-ele/src/views/schedule/detail/components/gun-check.vue

@@ -157,27 +157,6 @@ const gridOptions: any = {
       query: async () => {
         // 处理数据，确保计算列正确
         const items = props.taskDetail?.records || [];
-        // 计算误差率和平均误差
-        // items.forEach((item: any) => {
-        //   // 计算误差率第一次
-        //   item.errorRateFirst =
-        //     item.actualValueFirst && item.actualValueFirst !== 0
-        //       ? ((item.actualValueFirst - item.machineValueFirst) /
-        //           item.actualValueFirst) *
-        //         1000
-        //       : 0;
-
-        //   // 计算误差率第二次
-        //   item.errorRateSecond =
-        //     item.actualValueSecond && item.actualValueSecond !== 0
-        //       ? ((item.actualValueSecond - item.machineValueSecond) /
-        //           item.actualValueSecond) *
-        //         1000
-        //       : 0;
-
-        //   // 计算平均误差
-        //   item.avgErrorRate = (item.errorRateFirst + item.errorRateSecond) / 2;
-        // });
         return {
           items,
         };

apps/web-ele/src/views/schedule/view/index.vue

@@ -152,16 +152,20 @@ const querytodoaskslistfn = async ({
   try {
     const stationId = searchParams.value.station.split('-')[1];
     const executorId = searchParams.value.station.split('-')[0];
-    const res = await querytodoaskslist({
+    const params: any = {
       showStartTime,
       showEndTime,
       authStatusStr,
-      stationId,
+      // stationId,
       executorId,
-      taskStatusStr: '0,1,3',
+      taskStatusStr: '-1,0,1,3',
       // userId,
       // isOverdue: '0'
-    });
+    };
+    if (stationId && stationId !== '0') {
+      params.stationId = stationId;
+    }
+    const res = await querytodoaskslist(params);
     daylist.value = res || [];
   } catch (error) {
     console.error(error);
@@ -175,19 +179,23 @@ const queryoverduelistfn = async ({ authStatusStr }: any) => {
   try {
     const stationId = searchParams.value.station.split('-')[1];
     const executorId = searchParams.value.station.split('-')[0];
-    const res = await querytodoaskslist({
+    const params: any = {
       authStatusStr,
       status: '2',
       executorId,
-      stationId,
+      // stationId,
       showStartTime: dayjs(currentDate.value).format('YYYY-MM-DD 00:00:00'),
       showEndTime: dayjs(currentDate.value)
         .add(1, 'day')
         .format('YYYY-MM-DD 23:59:59'),
-    });
+    };
+    if (stationId && stationId !== '0') {
+      params.stationId = stationId;
+    }
+    const res = await querytodoaskslist(params);
     overduedaylist.value = res || [];
   } catch (error) {
-    console.log(error);
+    console.error(error);
   } finally {
     mainloing.value = false;
   }
@@ -525,8 +533,8 @@ const createWorkOrderDrawerEvent = () => {
               <ElOption
                 v-for="item in gasstationlist"
                 :key="`${item.userId}-${item.stationId}`"
-                :label="`${item.nickName}-${item.postName}${item.stationName ? '-' + item.stationName : ''}`"
-                :value="`${item.userId}-${item.stationId}`"
+                :label="`${item.nickName}-${item.postName}${item.stationName ? `-${item.stationName}` : ''}`"
+                :value="`${item.userId}-${item.stationId || 0}`"
               />
             </ElSelect>
           </div>