Merge branch 'main' of http://18.167.251.121:10003/aidlab/FiDA_Front

src/components/Canvas/FlowCanvas/flow-canvas.vue

@@ -62,6 +62,7 @@
 			<threeModel :currentData="currentData" />
 		</template>
 	</baseModal>
+	<Assistant />
 </template>
 
 <script setup lang="ts">
@@ -69,6 +70,7 @@
 	import { computed, ref, watch, onMounted, nextTick, provide, onBeforeUnmount } from 'vue'
 	import { useLayout } from '@/utils/treeDiagram'
 	import { NODE_TYPE, NODE_COMPONENT } from './tools/index.d'
+	import Assistant from '@/components/Assistant/assistant.vue'
 	// 组件
 	import headerTools from './components/header-tools.vue'
 	import zoom from '../components/zoom.vue'

src/components/Canvas/components/fullscreen-dialog.vue

@@ -11,7 +11,6 @@
 	>
 		<slot></slot>
 		<my-info />
-		<Assistant />
 		<div class="close-btn" @click="close">
 			<svg-icon name="back-white" color="#fff" size="18" />
 		</div>
@@ -21,7 +20,6 @@
 <script setup lang="ts">
 	import { ref, watch } from 'vue'
 	import MyInfo from '@/components/MyInfo.vue'
-	import Assistant from '@/components/Assistant/assistant.vue'
 	const props = defineProps({
 		modelValue: { default: false, type: Boolean },
 		transitionTime: { default: 300, type: Number },