Merge branch 'release' into dev

src/views/plan/index/edit.vue

@@ -240,6 +240,7 @@ const defaultContent = ref([
 const selectType = (value: any) => {
 	state.ruleForm.planTypes = value.map((item: any) => {
 		return { planTypeName: item.name, planTypeId: item.id, planTypeSpliceName: item.spliceName };
+  //   return { name: item.name, id: item.id, spliceName: item.spliceName };
 	});
 	state.ruleForm.planTypeId = value.map((item: any) => item.id);
 	ruleFormRef.value.validateField('planTypeId');

src/views/todo/seats/accept/Knowledge.vue

@@ -76,7 +76,7 @@
 <script setup lang="ts" name="orderAcceptKnowledge">
 // 定义变量内容
 import { onMounted, reactive, defineAsyncComponent, ref, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { formatDate } from '@/utils/formatTime';
 import { knowledgeRetrieval, knowledgeRetrievalAccept } from '@/api/knowledge/retrieval';
 import { throttle } from '@/utils/tools';
@@ -157,11 +157,11 @@ const knowledgeRetrievalPaged = throttle(async () => {
 		}
 		state.loading = false;
 	} catch (error) {
+    console.log(error)
 		state.loading = false;
 	}
 }, 300);
-const router = useRouter(); // 路由
-const route = useRoute(); // 路由
+const router = useRouter(); //
 // 预览知识
 const onPreview = (row: any) => {
 	router.push({
@@ -197,6 +197,7 @@ const querySearch = async (name: string) => {
 		}
 		state.loading = false;
 	} catch (error) {
+    console.log(error)
 		state.loading = false;
 	}
 };
@@ -219,7 +220,7 @@ const changeYYType = (row: any) => {
 };
 watch(
 	() => props.formData.hotspotId,
-	(val: any) => {
+	() => {
 		knowledgeRetrievalPaged();
 	},
 	{ immediate: true, deep: true }