Merge branch 'master' of http://192.168.1.222:3000/hnsh-smart-steward/smart-steward-admin

apps/web-ele/src/api/knowledge/category.ts

@@ -13,6 +13,10 @@ export function addKnowledgeCategory(data: any) {
 export function queryKnowledgeCategory(params: any) {
   return requestClient.get(Api.queryknowledgeCategory, { params });
 }
+//详情
+export function queryKnowledgeCategoryDetail(ids: any) {
+  return requestClient.get(`${Api.baseknowledgeCategory}/${ids}`);
+}
 //修改知识库分类
 export function editKnowledgeCategory(data: any) {
   return requestClient.put(Api.baseknowledgeCategory, data, {

apps/web-ele/src/api/schedule/index.ts

@@ -5,6 +5,7 @@ enum Api {
   executorApi = '/system/user/stationList',
   // queryrgasstation = '/system/user/stationList',
   queryrtodoaskslist = '/scheduleTasks/tasks/allList',
+  setPlanTime = '/scheduleTasks/tasks/setPlanTime',
 }
 
 export function transferTask(data: any) {
@@ -41,6 +42,11 @@ export function queryExecutorList(params: any) {
 export function queryGasStationList(params: any) {
   return requestClient.get(Api.executorApi, { params });
 }
+
+//修改计划时间
+export function setPlanTimeAPI(params: any) {
+  return requestClient.get(`${Api.setPlanTime}/${params.taskId}`, {params});
+}
 // //查询知识库查看记录列表
 // export function queryrecord(params: any) {
 //   return requestClient.get(Api.queryrecord, params);

apps/web-ele/src/app.vue

@@ -1,17 +1,52 @@
 <script lang="ts" setup>
 import { useElementPlusDesignTokens } from '@vben/hooks';
-
 import { ElConfigProvider } from 'element-plus';
-
 import { elementLocale } from '#/locales';
+// @ts-ignore
+import { useVbenModal } from '@vben/common-ui';
 
 defineOptions({ name: 'App' });
 
 useElementPlusDesignTokens();
+
+const [AIModal, AIModalApi] = useVbenModal({
+  title: 'AI Assistant',
+  showCancelBtn: false,
+});
+const handleAIModal = () => {
+  AIModalApi.open();
+};
 </script>
 
 <template>
   <ElConfigProvider :locale="elementLocale">
     <RouterView />
+    <div class="ai-icon" @click="handleAIModal">
+      <img src="/AIimgs.gif" alt="AI Assistant" />
+    </div>
+    <AIModal />
   </ElConfigProvider>
 </template>
+
+<style scoped lang="scss">
+.ai-icon {
+  position: fixed;
+  bottom: 30px;
+  right: 30px;
+  z-index: 9999;
+  width: 100px;
+  height: 100px;
+  border-radius: 50%;
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+
+.ai-icon img {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+</style>

apps/web-ele/src/router/routes/local.ts

@@ -111,7 +111,7 @@ const localRoutes: RouteRecordStringComponent[] = [
       hideInMenu: true,
     },
     name: 'KnowledgeDetail',
-    path: '/knowledge/detail/:classId/:classname/:classicon',
+    path: '/knowledge/detail/:classId',
   },
   {
     component: '/knowledge/edit/index',

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

@@ -1,6 +1,8 @@
 <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,6 +17,7 @@ import {
 } from '#/api/exam/question/question';
 // @ts-ignore
 import TinymceEditor from '#/components/tinymce/src/editor.vue';
+import knowledgemain from '#/components/knowledgemain/index.vue';
 // @ts-ignore
 const { closeCurrentTab } = useTabs();
 
@@ -262,6 +265,18 @@ onMounted(() => {
   loadQuestionData();
   fetchCategories();
 });
+
+const [quoteModal, quoteModalApi] = useVbenModal({
+  title: '引用试题',
+  showCancelBtn: false,
+  class: 'quote-modal',
+  // onConfirm:()=>{
+  // }
+});
+
+const handleQuote = () => {
+  quoteModalApi.open();
+};
 </script>
 
 <template>
@@ -511,7 +526,9 @@ onMounted(() => {
           </h3>
           <div class="mb-2 flex items-center gap-2">
             <!--TODO: 引用功能未实现-->
-            <el-button type="default" plain size="small"> 引用 </el-button>
+            <el-button type="default" plain size="small" @click="handleQuote">
+              引用
+            </el-button>
           </div>
           <TinymceEditor
             v-model="formData.analysis"
@@ -531,6 +548,9 @@ onMounted(() => {
         </div>
       </div>
     </div>
+    <quoteModal>
+      <knowledgemain :classId="id" />
+    </quoteModal>
   </div>
 </template>
 
@@ -557,4 +577,7 @@ onMounted(() => {
 :deep(.el-textarea__inner:focus) {
   box-shadow: none;
 }
+:global(.quote-modal) {
+  min-width: 70% !important;
+}
 </style>

apps/web-ele/src/views/knowledge/detail/index.vue

@@ -44,6 +44,7 @@ import {
   getKnowledgeContentDetail,
   queryKnowledgeContentlist,
 } from '#/api/knowledge/content';
+import { queryKnowledgeCategoryDetail } from '#/api/knowledge/category';
 import {
   addrecord,
   queryPublishRecordlist,
@@ -60,9 +61,7 @@ const userId = userStore.userInfo?.userId;
 // 路由实例
 const router = useRouter();
 const route = useRoute();
-const { classId, classname, classicon } = route.params;
-console.log(route.params);
-
+const { classId } = route.params;
 // 菜单折叠状态
 const isCollapse = ref(false);
 
@@ -78,6 +77,7 @@ const commentsloading = ref(true);
 const centerloading = ref(false);
 const isEdit = ref(false);
 const ChapterId = ref(null);
+const KnowledgeDetails = ref({}) as any;
 // 查询章节数据
 const chapterDatafn = async () => {
   chapterDataloading.value = true;
@@ -85,7 +85,6 @@ const chapterDatafn = async () => {
     const res = await queryKnowledgeContentlist(classId);
     if (res.code === 200) {
       console.log('章节数据', res.data);
-
       chapterData.value = res.data || [];
       handleChapterClick({ id: chapterData.value[0]?.id });
     }
@@ -134,7 +133,18 @@ const queryrecordfn = async () => {
     commentsloading.value = false;
   }
 };
+// 查询知识分类详情
+const queryKnowledgeCategoryDetailfn = async () => {
+  try {
+    const res = await queryKnowledgeCategoryDetail(classId);
+    KnowledgeDetails.value = res;
+  } catch (error) {
+    console.log(error);
+  }
+};
+
 onMounted(() => {
+  queryKnowledgeCategoryDetailfn();
   chapterDatafn();
   querycommentfn();
   addrecordfn();
@@ -169,7 +179,7 @@ const toggleCollapse = () => {
 // 提醒弹框
 const notificationDialogVisible = ref(false);
 const notificationContent = ref('');
-const notificationRecipients = ref([]);
+const notificationRecipients = ref([]) as any;
 
 // 打开提醒弹框
 const openNotificationDialog = () => {
@@ -237,7 +247,7 @@ const formatTime = (d: Date) =>
   d.toLocaleTimeString('zh-CN', { hour: '2-digit', minute: '2-digit' });
 const computedEditHistoryData = computed(() => {
   const dayMap = new Map<string, any[]>();
-  editHistoryData.value.forEach((item:any) => {
+  editHistoryData.value.forEach((item: any) => {
     const day = formatDayOffset(item.createTime);
     if (!dayMap.has(day)) dayMap.set(day, []);
     dayMap.get(day)!.push({
@@ -258,7 +268,7 @@ const queryPublishRecordlistfn = async () => {
   try {
     const res = await queryPublishRecordlist({
       categoryId: classId,
-      contentId:ChapterId.value
+      contentId: ChapterId.value,
     });
     editHistoryData.value = res?.rows || [];
   } catch (error) {
@@ -299,7 +309,7 @@ const selectHistoryRecord = (record: any) => {
 };
 
 // 点击章节
-const handleChapterClick = async (node:any) => {
+const handleChapterClick = async (node: any) => {
   centerloading.value = true;
   ChapterId.value = node.id;
   if (!isEdit.value) isEdit.value = true;
@@ -338,7 +348,7 @@ const addEditDialogVisible = ref(false);
 const addiseditTitle = ref('');
 const editvaloraddId = ref({});
 // 添加章节
-const addChapter = (data) => {
+const addChapter = (data: any) => {
   addEditDialogVisible.value = true;
   addiseditTitle.value = '新增章节';
   editvaloraddId.value = {
@@ -348,14 +358,14 @@ const addChapter = (data) => {
   };
 };
 // 编辑章节
-const editChapter = (node) => {
+const editChapter = (node: any) => {
   addEditDialogVisible.value = true;
   addiseditTitle.value = '编辑章节';
   editvaloraddId.value = node;
 };
 
 // 删除章节
-const deleteChapter = async (node) => {
+const deleteChapter = async (node: any) => {
   try {
     await deleteKnowledgeContent(node.id);
     await chapterDatafn();
@@ -374,7 +384,9 @@ const submitComment = async () => {
     await addComment({
       targetId: Number(classId),
       targetType: 'knowledge',
-      attachments: commentImages.value.map((item) => item.fileName).join(','),
+      attachments: commentImages.value
+        .map((item: any) => item.fileName)
+        .join(','),
       content: newComment.value,
     });
     newComment.value = '';
@@ -446,11 +458,11 @@ const handleUploadSuccess = (file: any) => {
   }
 };
 // 移除上传的图片
-const removeImage = (index: number) => {
+const removeImage = (index: any) => {
   commentImages.value = [];
   uploadRef?.value?.clearFiles();
 };
-const navigateToEdit = (id: number) => {
+const navigateToEdit = (id: any) => {
   router.push(`/knowledge/detail/edit/${id}/${ChapterId.value}`);
 };
 const addMenu = () => {
@@ -522,7 +534,7 @@ const isImage = (url: string) => {
   if (!url) return false;
   try {
     const cleanUrl = url.split('?')[0];
-    const ext = cleanUrl.split('.').pop()?.toLowerCase() ?? '';
+    const ext = cleanUrl?.split('.').pop()?.toLowerCase() ?? '';
     return imageExt.has(ext);
   } catch {
     return false;
@@ -537,7 +549,7 @@ const nonImageList = computed(() => {
     : selectedChapter.value.attachmentUrl
       ? [selectedChapter.value.attachmentUrl]
       : [];
-  const result = urls.filter((u) => !isImage(u));
+  const result = urls.filter((u: any) => !isImage(u));
   return result;
 });
 </script>
@@ -597,16 +609,16 @@ const nonImageList = computed(() => {
             <div class="knowledge-info">
               <div class="knowledge-icon">
                 <span
-                  v-if="classicon?.includes('iconfont')"
-                  :class="classicon?.split(',')[0] || ''"
+                  v-if="KnowledgeDetails?.icon?.includes('iconfont')"
+                  :class="KnowledgeDetails?.icon?.split(',')[0] || ''"
                   :style="{
-                    color: `#${classicon?.split(',')[1] || ''}`,
+                    color: `${KnowledgeDetails?.icon?.split(',')[1] || ''}`,
                     fontSize: '30px',
                   }"
                 ></span>
-                <img v-else :src="classicon" alt="" />
+                <img v-else :src="KnowledgeDetails?.iconUrl?.[0] || ''" alt="" />
               </div>
-              <div class="knowledge-title">{{ classname }}</div>
+              <div class="knowledge-title">{{ KnowledgeDetails?.name }}</div>
             </div>
 
             <!-- 主页按钮 -->

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

@@ -68,17 +68,17 @@ const selectedCategory = ref<FormData>({
 
 // 跳转到详情页
 const navigateToDetail = (id: number) => {
-  const category = categories.value.find((item: any) => item.id === id);
-  const cleaned = category?.icon?.replace(/#/g, '');
-  // console.log(cleaned);
-  if (cleaned.includes('iconfont')) {
-    router.push(`/knowledge/detail/${id}/${category.name}/${cleaned}`);
-  } else {
-    const iconUrl = category?.iconUrl?.[0] || '';
-    router.push(
-      `/knowledge/detail/${id}/${category.name}/${encodeURIComponent(iconUrl)}`,
-    );
-  }
+  router.push(`/knowledge/detail/${id}`);
+  // const category = categories.value.find((item: any) => item.id === id);
+  // const cleaned = category?.icon?.replace(/#/g, '');
+  // if (cleaned.includes('iconfont')) {
+  //   router.push(`/knowledge/detail/${id}/${category.name}/${cleaned}`);
+  // } else {
+  //   const iconUrl = category?.iconUrl?.[0] || '';
+  //   router.push(
+  //     `/knowledge/detail/${id}/${category.name}/${encodeURIComponent(iconUrl)}`,
+  //   );
+  // }
 };
 
 // 打开创建抽屉

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

@@ -20,7 +20,12 @@ import {
 import { keyBy } from 'lodash-es';
 
 // @ts-ignore
-import { closeTask, getTaskDetail, transferTask } from '#/api/schedule';
+import {
+  closeTask,
+  getTaskDetail,
+  transferTask,
+  setPlanTimeAPI,
+} from '#/api/schedule';
 // @ts-ignore
 import { confirmDoneTask, handleLicense } from '#/api/task/confirm';
 // @ts-ignore
@@ -545,6 +550,38 @@ const [PageModal, pageModalApi] = useVbenModal({
 onMounted(async () => {
   await init();
 });
+const PlannedTimeValue = ref('') as any;
+const [PlannedTimeModal, plannedTimeModalApi] = useVbenModal({
+  title: '修改计划时间',
+  showCancelBtn: false,
+  contentClass:'plannedTimeModalclass',
+  onConfirm: async () => {
+    if (
+      new Date(PlannedTimeValue.value).getTime() <
+        new Date(taskInfo.value.startTime).getTime() ||
+      new Date(PlannedTimeValue.value).getTime() >
+        new Date(taskInfo.value.endTime).getTime()
+    ) {
+      ElMessage.error('计划时间必须在任务开始时间和结束时间之间');
+      return;
+    }
+    try {
+      await setPlanTimeAPI({
+        taskId: taskId.value,
+        planTime: PlannedTimeValue.value,
+      });
+      await init();
+      ElMessage.success('修改计划时间成功');
+      plannedTimeModalApi.close();
+    } catch {
+      ElMessage.error('修改计划时间失败');
+    }
+  },
+});
+const handlePlannedTimeClick = () => {
+  PlannedTimeValue.value = taskInfo.value.displayDate;
+  plannedTimeModalApi.open();
+};
 </script>
 
 <template>
@@ -665,7 +702,9 @@ onMounted(async () => {
               {{ taskInfo.executorName || '-' }}
             </ElDescriptionsItem>
             <ElDescriptionsItem label="计划时间:">
-              {{ taskInfo.displayDate || '-' }}
+              <el-button type="primary" text @click="handlePlannedTimeClick">
+                {{ taskInfo.displayDate || '-' }}
+              </el-button>
             </ElDescriptionsItem>
             <ElDescriptionsItem label="创建:">
               {{ taskInfo.createBy || '' }}
@@ -942,7 +981,17 @@ onMounted(async () => {
         }"
       />
     </ExecutorModal>
-
+    <PlannedTimeModal>
+      <div>
+        <span>计划时间：</span>
+        <el-date-picker
+          v-model="PlannedTimeValue"
+          type="datetime"
+          placeholder="请选择计划时间"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </div>
+    </PlannedTimeModal>
     <DealDrawer class="w-3/5" @reload="refreshTab()" />
     <PageModal>
       <!-- 应急防护月检 -->
@@ -975,6 +1024,10 @@ onMounted(async () => {
   box-shadow: none !important;
   // background: transparent !important;
 }
+
+:global(.plannedTimeModalclass) {
+  min-height: 0px !important;
+}
 .boxdev :deep(.el-card__header) {
   padding-top: 18px !important;
   padding-bottom: 4px !important;

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

@@ -525,7 +525,7 @@ const createWorkOrderDrawerEvent = () => {
               <ElOption
                 v-for="item in gasstationlist"
                 :key="`${item.userId}-${item.stationId}`"
-                :label="`${item.nickName}-${item.stationName}`"
+                :label="`${item.nickName}-${item.postName}-${item.stationName}`"
                 :value="`${item.userId}-${item.stationId}`"
               />
             </ElSelect>