From fac2e588686b2621d013f919fdaf97146ea387fb Mon Sep 17 00:00:00 2001
From: "2192596591@qq.com" <2192596591@qq.com>
Date: Mon, 16 Mar 2026 10:16:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=91=84=E5=83=8F=E5=A4=B4?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/teacher/teacherStatistics.ts  |   57 +-
 src/api/types/teacher/teacherStatistics.ts    |   18 +
 .../components/custom-componet/myEditor.vue   |   47 +-
 .../layout/base-panel/imageModel.vue          |   87 +-
 .../components/mt-edit/index.vue              |  225 ++-
 .../components/vue-xq-test/vue-camera.vue     |   54 +
 .../components/vue-xq-test/vue-img-test.vue   |   70 -
 .../components/vue-xq-test/vue-img.vue        |    8 +-
 .../vue-xq-test/vue-three-groundFloor.vue     | 1522 -----------------
 .../vue-xq-test/vue-three-machine.vue         |  312 ----
 .../vue-xq-test/vue-three-pipeline.vue        |  243 ---
 .../vue-xq-test/vue-three-scene.vue           |  473 -----
 .../vue-xq-test/vue-three-smokeSiren.vue      |  388 -----
 .../components/vue-xq-test/vue-three-test.vue |  323 ----
 .../teacherStatistics/utils/dataFormatter.ts  |    3 +-
 15 files changed, 352 insertions(+), 3478 deletions(-)
 create mode 100644 src/views/teacher/teacherStatistics/components/vue-xq-test/vue-camera.vue
 delete mode 100644 src/views/teacher/teacherStatistics/components/vue-xq-test/vue-img-test.vue
 delete mode 100644 src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-groundFloor.vue
 delete mode 100644 src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-machine.vue
 delete mode 100644 src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-pipeline.vue
 delete mode 100644 src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-scene.vue
 delete mode 100644 src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-smokeSiren.vue
 delete mode 100644 src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-test.vue

diff --git a/src/api/modules/teacher/teacherStatistics.ts b/src/api/modules/teacher/teacherStatistics.ts
index 9ed093e..6733544 100644
--- a/src/api/modules/teacher/teacherStatistics.ts
+++ b/src/api/modules/teacher/teacherStatistics.ts
@@ -1,9 +1,64 @@
 import http from '@/api';
 import { ADMIN_MODULE } from '@/api/helper/prefix';
 import type { IPage } from '@/api/types';
-import type { TeacherStatisticsQuery, TeacherStatisticsRow, TeacherStatisticsForm } from '@/api/types/teacher/teacherStatistics';
+import type { TeacherStatisticsQuery, TeacherStatisticsRow, TeacherStatisticsForm ,FileStorageQue,FileEntityDTO} from '@/api/types/teacher/teacherStatistics';
 import type { UploadRawFile } from 'element-plus/es/components/upload/src/upload';
 import type { AxiosRequestConfig } from 'axios';
+
+export const File_Url = 'http://127.0.0.1:9991/api'
+
+//http://localhost:8080/data/model/getModelData
+export const getModelData = (params: {menuType:string}) => {
+  return http.post(ADMIN_MODULE + `/data/model/getModelData`, params);
+};
+
+/**
+ * 保存数据模型
+ * @param params 
+ * @returns 
+ */
+export const saveOrUpdateModelData = (params: any) => {
+  return http.post(ADMIN_MODULE + `/data/model/saveOrUpdate/modelData`, params);
+};
+
+
+/**
+ * 删除文件
+ * @param params 
+ * @returns 
+ */
+export const deleteFileByIdApi = (params: { id: string}) => {
+  return http.get(ADMIN_MODULE + `/fileStorage/deleteFileById`, params);
+};
+
+/**
+ * 修改文件名称
+ * @param params 
+ * @returns 
+ */
+export const editFileNameByIdApi = (params: { id: string; fileName: string }) => {
+  return http.post(ADMIN_MODULE + `/fileStorage/editFileNameById`, params);
+};
+
+/**
+ * 获取文件路径
+ * @param url 
+ * @returns 
+ */
+export const getFileObj = (url: string|undefined) => {
+  if(url === undefined) return '';
+  return File_Url+ADMIN_MODULE + url;
+};
+
+/**
+ * 查看图片列表
+ * @param params
+ * @returns {*}
+ */
+export const fileStorageFileListApi = (params: FileStorageQue) => {
+  return http.post<IPage<FileEntityDTO>>(ADMIN_MODULE + `/fileStorage/file/list`, params);
+};
+
 /**
  * 查询列表
  * @param params
diff --git a/src/api/types/teacher/teacherStatistics.ts b/src/api/types/teacher/teacherStatistics.ts
index 994a877..5f70cfe 100644
--- a/src/api/types/teacher/teacherStatistics.ts
+++ b/src/api/types/teacher/teacherStatistics.ts
@@ -1,5 +1,23 @@
 import type { IPageQuery } from '@/api/types';
 
+
+// 文件实体DTO
+export type FileEntityDTO = {
+  id?: string;
+  fileName?: string;
+  addTime?: number;
+  filePath?: string;
+};
+
+// 查询条件
+export type FileStorageQue = IPageQuery & {
+  id?: string;
+  fileName?: string;
+  startTime?: number;
+  endTime?: number;
+};
+
+
 // 查询条件
 export type TeacherStatisticsQuery = IPageQuery & {
   year?: string;
diff --git a/src/views/teacher/teacherStatistics/components/custom-componet/myEditor.vue b/src/views/teacher/teacherStatistics/components/custom-componet/myEditor.vue
index 7507459..8029ac1 100644
--- a/src/views/teacher/teacherStatistics/components/custom-componet/myEditor.vue
+++ b/src/views/teacher/teacherStatistics/components/custom-componet/myEditor.vue
@@ -2,32 +2,32 @@
   <!-- <vueImg /> -->
   <div class="w-1/1 h-100vh">
     <mt-edit
-        :use-thumbnail="true"
-        @on-preview-click="onPreviewClick"
-        @on-return-click="onReturnClick"
-        @on-save-click="onSaveClick"
-        @on-thumbnail-click="onThumbnailClick"
+      :use-thumbnail="true"
+      @on-preview-click="onPreviewClick"
+      @on-return-click="onReturnClick"
+      @on-save-click="onSaveClick"
+      @on-thumbnail-click="onThumbnailClick"
     ></mt-edit>
-
   </div>
 </template>
 
 <script setup lang="ts">
 import type { IExportJson } from '@/views/teacher/teacherStatistics/components/mt-edit/components/types';
 import { useGenThumbnail } from '@/views/teacher/teacherStatistics/components/mt-edit/composables/thumbnail';
-import  MtEdit  from '@/views/teacher/teacherStatistics/components/mt-edit';
-import {getCurrentInstance, onBeforeUnmount} from 'vue';
-import {leftAsideStore} from "@/views/teacher/teacherStatistics/components/mt-edit/store/left-aside";
+import MtEdit from '@/views/teacher/teacherStatistics/components/mt-edit';
+import { getCurrentInstance, onBeforeUnmount } from 'vue';
+import { leftAsideStore } from '@/views/teacher/teacherStatistics/components/mt-edit/store/left-aside';
 
 // xq 组件
 import vueSignalGaudy from '@/views/teacher/teacherStatistics/components/vue-xq-test/vue-signal-gaudy.vue';
 import VueImg from '@/views/teacher/teacherStatistics/components/vue-xq-test/vue-img.vue';
-
+// F:\vue\workspace\Real-time-monitoring-frontend\src\views\teacher\teacherStatistics\components\vue-xq-test\vue-camera.vue
+import VueCamera from '@/views/teacher/teacherStatistics/components/vue-xq-test/vue-camera.vue';
 
 const instance = getCurrentInstance();
 instance?.appContext.app.component('vue-my-signal-gaudy', vueSignalGaudy);
 instance?.appContext.app.component('vue-my-img', VueImg);
-
+instance?.appContext.app.component('vue-my-camera', VueCamera);
 
 leftAsideStore.registerConfig('工作组件', [
   {
@@ -72,7 +72,7 @@ leftAsideStore.registerConfig('工作组件', [
       }
     }
   },
-    {
+  {
     id: 'vue-my-img',
     title: '图形组件',
     type: 'vue',
@@ -85,6 +85,19 @@ leftAsideStore.registerConfig('工作组件', [
       }
     }
   },
+  {
+    id: 'vue-my-camera',
+    title: '监控组件',
+    type: 'vue',
+    thumbnail: '/svgs/image.svg',
+    props: {
+      moduleId: {
+        type: 'upload',
+        val: '--',
+        title: '绑定'
+      }
+    }
+  }
 ]);
 
 const electrical_modules_files = import.meta.glob('./assets/svgs/electrical/**.svg', {
@@ -121,8 +134,7 @@ for (const key in electrical_stroke_modules_files) {
     id: name,
     title: name,
     type: 'svg',
-    thumbnail:
-        'data:image/svg+xml;utf8,' + encodeURIComponent(electrical_stroke_modules_files[key]),
+    thumbnail: 'data:image/svg+xml;utf8,' + encodeURIComponent(electrical_stroke_modules_files[key]),
     svg: electrical_stroke_modules_files[key],
     props: {
       stroke: {
@@ -134,13 +146,12 @@ for (const key in electrical_stroke_modules_files) {
   });
 }
 
-
 const onPreviewClick = (exportJson: IExportJson) => {
   sessionStorage.setItem('exportJson', JSON.stringify(exportJson));
   // const routeUrl = router.resolve({
   //   name: 'preview'
   // });
- // window.open(routeUrl.href, '_blank');
+  // window.open(routeUrl.href, '_blank');
 };
 const onSaveClick = (e: IExportJson) => {
   console.log(e, '这是要保存的数据');
@@ -153,6 +164,4 @@ const onThumbnailClick = () => {
 };
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/views/teacher/teacherStatistics/components/mt-edit/components/layout/base-panel/imageModel.vue b/src/views/teacher/teacherStatistics/components/mt-edit/components/layout/base-panel/imageModel.vue
index 6464f1c..c4568a2 100644
--- a/src/views/teacher/teacherStatistics/components/mt-edit/components/layout/base-panel/imageModel.vue
+++ b/src/views/teacher/teacherStatistics/components/mt-edit/components/layout/base-panel/imageModel.vue
@@ -48,7 +48,7 @@
 
           <el-upload
             accept="image/*"
-            :action="BASE_URL + '/fileStorage/saveFile'"
+            :action="File_Url+'/admin' + '/fileStorage/saveFile'"
             :on-success="saveImageSuccess"
             :show-file-list="false"
             style="width: 100%; padding: 0 10px"
@@ -77,31 +77,11 @@
 
       <el-table-column v-if="isEdit || isDelete || isBinding" fixed="right" label="操作">
         <template #default="scope">
-          <el-button
-            v-if="isEdit"
-            link
-            type="primary"
-            size="small"
-            @click="transmitFileEditName(scope.row.name, scope.row.id)"
-          >
+          <el-button v-if="isEdit" link type="primary" size="small" @click="transmitFileEditName(scope.row.name, scope.row.id)">
             编辑
           </el-button>
-          <el-button
-            v-if="isDelete"
-            link
-            type="danger"
-            size="small"
-            @click="deleteFileById(scope.row.id)"
-            >删除</el-button
-          >
-          <el-button
-            v-if="isBinding"
-            link
-            type="success"
-            size="small"
-            @click="bindingImg(scope.row)"
-            >绑定</el-button
-          >
+          <el-button v-if="isDelete" link type="danger" size="small" @click="deleteFileById(scope.row.id)">删除</el-button>
+          <el-button v-if="isBinding" link type="success" size="small" @click="bindingImg(scope.row)">绑定</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -138,19 +118,24 @@
   </el-dialog>
 
   <!-- 独立的图片预览浮层 -->
-  <el-image-viewer
-    v-if="previewVisible"
-    :url-list="[currentPreviewUrl]"
-    :z-index="3000"
-    @close="previewVisible = false"
-  />
+  <el-image-viewer v-if="previewVisible" :url-list="[currentPreviewUrl]" :z-index="3000" @close="previewVisible = false" />
 </template>
 
 <script setup lang="ts">
 import { reactive, computed, ref, onMounted } from 'vue';
 import { ElDialog, ElButton, ElMessage } from 'element-plus';
-import {BASE_URL, modelApi} from "@/views/teacher/teacherStatistics/utils/request";
-import {formatFilePath, formatTimestamp} from "@/views/teacher/teacherStatistics/utils/dataFormatter";
+import { ADMIN_MODULE } from '@/api/helper/prefix';
+import { BASE_URL, modelApi } from '@/views/teacher/teacherStatistics/utils/request';
+import { formatFilePath, formatTimestamp } from '@/views/teacher/teacherStatistics/utils/dataFormatter';
+// src/api/modules/teacher/teacherStatistics.ts
+import { fileStorageFileListApi,getFileObj,File_Url,editFileNameByIdApi,deleteFileByIdApi } from '@/api/modules/teacher/teacherStatistics';
+import type {
+  TeacherStatisticsQuery,
+  TeacherStatisticsRow,
+  TeacherStatisticsForm,
+  FileStorageQue,
+  FileEntityDTO
+} from '@/api/types/teacher/teacherStatistics';
 
 const props = defineProps({
   dialogImageVisible: {
@@ -185,7 +170,7 @@ const bindingImg = (obj: any) => {
 
 const visible = computed({
   get: () => props.dialogImageVisible,
-  set: (val) => emit('updateDialogImageVisible', val)
+  set: val => emit('updateDialogImageVisible', val)
 });
 
 const form = reactive({
@@ -212,10 +197,8 @@ async function fileEditName() {
     id: editFileId.value,
     fileName: editFileName.value
   };
-  const response = await modelApi.fileStorage_editFileNameById_post(endJson);
-  response.code == 200
-    ? ElMessage.success(response.data)
-    : ElMessage.error(response.message + '，请联系管理员');
+  const response = await editFileNameByIdApi(endJson);
+  response.code == '0000' ? ElMessage.success(response.data||'') : ElMessage.error(response.message + '，请联系管理员');
   loadFileList();
 
   //end
@@ -229,10 +212,8 @@ async function deleteFileById(fileId: string) {
   let endJson = {
     id: fileId
   };
-  const response = await modelApi.fileStorage_deleteFileById_get(endJson);
-  response.code == 200
-    ? ElMessage.success(response.data)
-    : ElMessage.error(response.message + '，请联系管理员');
+  const response = await deleteFileByIdApi(endJson);
+  response.code == '0000' ? ElMessage.success(response.data||'') : ElMessage.error(response.message + '，请联系管理员');
   loadFileList();
 }
 
@@ -279,16 +260,16 @@ function showPreview(url: string) {
 // 获取文件列表
 async function loadFileList() {
   elDialogLoading.value = true;
-  let endJson = {
-    pageNum: currentPage.value,
-    pageSize: pageSize.value,
-    id: form.fileId,
-    fileName: form.fileName,
-    startTime: form.fileDate ? new Date(form.fileDate[0]).getTime() : null,
-    endTime: form.fileDate ? new Date(form.fileDate[1]).getTime() : null
+  let endJson: FileStorageQue = {
+    page: currentPage.value || 1,
+    limit: pageSize.value || 4,
+    id: form.fileId || undefined,
+    fileName: form.fileName || undefined,
+    startTime: form.fileDate ? new Date(form.fileDate[0]).getTime() : undefined,
+    endTime: form.fileDate ? new Date(form.fileDate[1]).getTime() : undefined
   };
-  console.log('endJson:', endJson);
-  const response = await modelApi.fileStorage_file_list_post(endJson);
+  // const response = await modelApi.fileStorage_file_list_post(endJson);
+  const response = await fileStorageFileListApi(endJson);
   tableData.value = [];
   if (!response.data) {
     elDialogLoading.value = false;
@@ -296,13 +277,13 @@ async function loadFileList() {
   }
   pageTotal.value = response.data.total;
   currentPage.value = response.data.current;
-  pageSize.value = response.data.size;
+  pageSize.value = response.data.limit;
 
-  response.data.list.forEach((value: any) => {
+  response.data.rows.forEach((value: FileEntityDTO) => {
     let date = formatTimestamp(value.addTime);
     let id = value.id;
     let name = value.fileName;
-    let imgUrl = formatFilePath(BASE_URL, value.filePath);
+    let imgUrl = getFileObj(value.filePath);
     tableData.value.push({ date, id, name, imgUrl });
   });
   elDialogLoading.value = false;
diff --git a/src/views/teacher/teacherStatistics/components/mt-edit/index.vue b/src/views/teacher/teacherStatistics/components/mt-edit/index.vue
index d0dcfa4..e90373a 100644
--- a/src/views/teacher/teacherStatistics/components/mt-edit/index.vue
+++ b/src/views/teacher/teacherStatistics/components/mt-edit/index.vue
@@ -6,7 +6,8 @@
         height="45px"
         class="dark:bg-myDarkBgColor cb-border p-0 select-none"
         @mousedown="mainPanelRef?.stopListenerKeyDown()"
-      >    <!-- 头部2 -->
+      >
+        <!-- 头部2 -->
         <header-panel
           v-model:leftAside="aside_state.left_show"
           v-model:rightAside="aside_state.right_show"
@@ -55,10 +56,7 @@
         </el-aside>
 
         <!-- 中间2 渲染组件 -->
-        <el-main
-          class="dark:bg-myMainDarkBgColor"
-          @mousedown="mainPanelRef?.beginListenerKeyDown()"
-        >
+        <el-main class="dark:bg-myMainDarkBgColor" @mousedown="mainPanelRef?.beginListenerKeyDown()">
           <main-panel
             ref="mainPanelRef"
             :group-enabled="header_group_enabled"
@@ -90,11 +88,7 @@
     </el-container>
 
     <!-- 导入数据 -->
-    <el-dialog
-      v-model="import_visible"
-      title="数据导入"
-      @close="mainPanelRef?.beginListenerKeyDown()"
-    >
+    <el-dialog v-model="import_visible" title="数据导入" @close="mainPanelRef?.beginListenerKeyDown()">
       <import-json ref="importJsonRef"></import-json>
       <template #footer>
         <el-button type="primary" @click="onImportYes">确定</el-button>
@@ -102,11 +96,7 @@
     </el-dialog>
 
     <!-- 导出数据 -->
-    <el-dialog
-      v-model="export_visible"
-      title="数据导出"
-      @close="mainPanelRef?.beginListenerKeyDown()"
-    >
+    <el-dialog v-model="export_visible" title="数据导出" @close="mainPanelRef?.beginListenerKeyDown()">
       <export-json
         :done-json="objectDeepClone(globalStore.done_json)"
         :canvas-cfg="globalStore.canvasCfg"
@@ -123,12 +113,20 @@
       ></done-tree>
     </el-drawer>
 
+    <!-- xxxx -->
+    <el-dialog v-model="drawerVisible" title="数据模型" width="35%">
+      <span>注意：保存后会覆盖之前的模型文件</span>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="doSaveModel">保存</el-button>
+          <el-button @click="loadModel" type="primary"> 加载</el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <!-- end -->
+
     <!-- 数据模型 -->
-    <el-drawer v-model="drawerVisible" :modal="false" title="数据模型文件121" modal-penetrable>
-      <!-- <button @click="testData">组装数据</button> -->
-      <!-- <el-button @click="resetSelection">重置</el-button> -->
-      <!-- <el-button @click="getNode">测试</el-button> -->
-      <!-- @check="handleCheck" -->
+    <!-- <el-drawer v-model="drawerVisible" :modal="false" title="数据模型文件121" modal-penetrable>
       <el-tree-v2
         style="max-width: 600px; height: 100px"
         :data="treeData"
@@ -146,21 +144,17 @@
             <FolderOpened v-else />
           </el-icon>
           <span class="prefix" :class="{ 'is-leaf': node.isLeaf }">{{ node.label }}</span>
-          <!-- <span>{{ node.label }}</span> -->
         </template>
       </el-tree-v2>
 
       <template #footer>
         <div class="drawer-footer">
-          <el-button >保存模型11</el-button>
-          <el-button  v-loading.fullscreen.lock="fullscreenLoading"
-            >加载模型2</el-button
-          >
-          <!-- <el-button @click="coverModel"> 覆盖模型 </el-button> -->
-          <el-button > 移除模型 </el-button>
+          <el-button @click="doSaveModel">保存模型11</el-button>
+          <el-button @click="loadModel" v-loading.fullscreen.lock="fullscreenLoading">加载模型2</el-button>
+          <el-button> 移除模型 </el-button>
         </div>
       </template>
-    </el-drawer>
+    </el-drawer> -->
 
     <!-- 数据保存弹框 -->
     <el-dialog v-model="dialogFormVisible" title="数据模型保存" width="500">
@@ -168,12 +162,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="dialogFormVisible = false">取消</el-button>
-          <el-button
-            type="primary"
-            v-loading.fullscreen.lock="fullscreenLoading"
-          >
-            确定
-          </el-button>
+          <el-button type="primary" v-loading.fullscreen.lock="fullscreenLoading"> 确定 </el-button>
         </div>
       </template>
     </el-dialog>
@@ -198,19 +187,9 @@ import LeftAside from '@/views/teacher/teacherStatistics/components/mt-edit/comp
 import MainPanel from '@/views/teacher/teacherStatistics/components/mt-edit/components/layout/main-panel/index.vue';
 import RightAside from '@/views/teacher/teacherStatistics/components/mt-edit/components/layout/right-aside/index.vue';
 import { leftAsideStore } from '@/views/teacher/teacherStatistics/components/mt-edit/store/left-aside';
-import {
-  ElContainer,
-  ElHeader,
-  ElAside,
-  ElMain,
-  ElDialog,
-  ElDrawer,
-  ElButton,
-  ElMessage,
-  ElTreeV2
-} from 'element-plus';
+import { ElContainer, ElHeader, ElAside, ElMain, ElDialog, ElDrawer, ElButton, ElMessage, ElTreeV2 } from 'element-plus';
 import { globalStore } from '@/views/teacher/teacherStatistics/components/mt-edit/store/global';
-import {computed, reactive, ref, useSlots, onMounted, getCurrentInstance, onBeforeUnmount} from 'vue';
+import { computed, reactive, ref, useSlots, onMounted, getCurrentInstance, onBeforeUnmount } from 'vue';
 import DoneTree from '@/views/teacher/teacherStatistics/components/mt-edit/components/done-tree/index.vue';
 import { cacheStore } from './store/cache';
 import ExportJson from '@/views/teacher/teacherStatistics/components/mt-edit/components/export-json/index.vue';
@@ -219,6 +198,7 @@ import { objectDeepClone } from './utils';
 import { genExportJson, useExportJsonToDoneJson } from './composables';
 import type { IExportJson } from './components/types';
 import imageModel from '@/views/teacher/teacherStatistics/components/mt-edit/components/layout/base-panel/imageModel.vue';
+import { saveOrUpdateModelData, getModelData } from '@/api/modules/teacher/teacherStatistics';
 
 interface Tree {
   id: string;
@@ -286,15 +266,13 @@ const header_group_enabled = computed(() => {
 });
 const header_un_group_enabled = computed(() => {
   if (globalStore.selected_items_id.length === 1) {
-    const item = globalStore.done_json.find((f) => f.id === globalStore.selected_items_id[0]);
+    const item = globalStore.done_json.find(f => f.id === globalStore.selected_items_id[0]);
     return item?.type === 'group';
   }
   return false;
 });
 const header_align_enabled = computed(() => {
-  const selected_items = globalStore.done_json.filter(
-    (f) => globalStore.selected_items_id.includes(f.id) && f.type !== 'sys-line'
-  );
+  const selected_items = globalStore.done_json.filter(f => globalStore.selected_items_id.includes(f.id) && f.type !== 'sys-line');
   return selected_items.length > 1;
 });
 const import_visible = ref(false);
@@ -317,21 +295,13 @@ const onTreeUpdateSelectedItemsId = (id: string) => {
   globalStore.setSingleSelect(id);
 };
 const onDoneTreeUpdateSelectedIdHide = (id: string) => {
-  const item = globalStore.done_json.find((f) => f.id === id);
+  const item = globalStore.done_json.find(f => f.id === id);
   if (item) {
     item.hide = !item.hide;
   }
 };
 const onAlignSelected = (
-  type:
-    | 'left'
-    | 'horizontally'
-    | 'right'
-    | 'top'
-    | 'vertically'
-    | 'bottom'
-    | 'horizontal-distribution'
-    | 'vertical-distribution'
+  type: 'left' | 'horizontally' | 'right' | 'top' | 'vertically' | 'bottom' | 'horizontal-distribution' | 'vertical-distribution'
 ) => {
   mainPanelRef.value?.onAlignSelected(type);
 };
@@ -357,22 +327,137 @@ const onImportYes = async () => {
   }
 };
 
+// 保存数据模型
+async function doSaveModel() {
+  fullscreenLoading.value = true;
+
+  const { exportJson } = genExportJson(globalStore.canvasCfg, globalStore.gridCfg, globalStore.done_json);
+
+  let endJson = {
+    menuType: menuType.value,
+    canvasCfg: exportJson.canvasCfg,
+    gridCfg: exportJson.gridCfg,
+    json: exportJson.json
+  };
+
+  try {
+    const response = await saveOrUpdateModelData(endJson);
+    // const response = await modelApi.saveOrUpdate_modelData_post(endJson);
+    if (response.code == '0000') {
+      fullscreenLoading.value = false;
+      dialogFormVisible.value = false;
+      ElMessage.success('数据模型保存成功');
+      drawerVisible.value = false;
+    } else {
+      fullscreenLoading.value = false;
+      dialogFormVisible.value = false;
+      console.error('保存失败：', response.code, response.message);
+      // 尝试获取错误详情
+      console.error('服务器返回错误信息：', response.message);
+      ElMessage.error(`数据模型保存失败: ${response.code} - ${response.message}`);
+      drawerVisible.value = false;
+    }
+  } catch (error) {
+    drawerVisible.value = false;
+    fullscreenLoading.value = false;
+    dialogFormVisible.value = false;
+    console.error('请求错误：', error);
+    ElMessage.error('网络请求失败');
+  }
+}
+
+function saveModel() {
+  let nodes = treeRef.value?.getCheckedNodes();
+  console.log(nodes?.length);
+  if (nodes?.length === 0) {
+    ElMessage.warning('请至少选择一个模型文件');
+  } else {
+    dialogFormVisible.value = true;
+    fileName.value = nodes?.[0].label;
+    menuType.value = nodes?.[0].id;
+  }
+}
+
+async function loadModel() {
+  fullscreenLoading.value = false;
+  let endJson = {
+    menuType: ''
+  };
+  console.log('请求数据类型：', typeof JSON.stringify(endJson));
+
+  try {
+    const response = await getModelData(endJson);
+    // const response = await modelApi.model_getModelData_post(endJson);
+    console.log('响应状态：', typeof response);
+    if (response.code == '0000') {
+      ElMessage.success('请求数据成功');
+      const result = response.data;
+      const { canvasCfg, gridCfg, importDoneJson } = useExportJsonToDoneJson(result as IExportJson);
+      globalStore.canvasCfg = canvasCfg;
+      globalStore.gridCfg = gridCfg;
+      globalStore.setGlobalStoreDoneJson(importDoneJson);
+      fullscreenLoading.value = false;
+      drawerVisible.value = false;
+    } else {
+      fullscreenLoading.value = false;
+      ElMessage.error(`数据模型加载失败: ${response.code} - ${response.message}`);
+      drawerVisible.value = false;
+    }
+  } catch (error) {
+    fullscreenLoading.value = false;
+    console.error('请求错误：', error);
+    ElMessage.error('网络请求失败');
+    drawerVisible.value = false;
+  }
+}
+
+// async function loadModel() {
+//   fullscreenLoading.value = false;
+//   let nodes = treeRef.value?.getCheckedNodes();
+//   console.log(nodes?.length);
+//   if (nodes?.length != 0) {
+//     // if (nodes?.length === 0) {
+//     fullscreenLoading.value = false;
+//     ElMessage.warning('请至少选择一个模型文件');
+//   } else {
+//     let endJson = {
+//       menuType: ''
+//       // menuType: nodes?.[0].id
+//     };
+//     console.log('请求数据类型：', typeof JSON.stringify(endJson));
+
+//     try {
+//       const response = await getModelData(endJson);
+//       // const response = await modelApi.model_getModelData_post(endJson);
+//       console.log('响应状态：', typeof response);
+//       if (response.code == '0000') {
+//         ElMessage.success('请求数据成功');
+//         const result = response.data;
+//         const { canvasCfg, gridCfg, importDoneJson } = useExportJsonToDoneJson(result as IExportJson);
+//         globalStore.canvasCfg = canvasCfg;
+//         globalStore.gridCfg = gridCfg;
+//         globalStore.setGlobalStoreDoneJson(importDoneJson);
+//         fullscreenLoading.value = false;
+//       } else {
+//         fullscreenLoading.value = false;
+//         ElMessage.error(`数据模型加载失败: ${response.code} - ${response.message}`);
+//       }
+//     } catch (error) {
+//       fullscreenLoading.value = false;
+//       console.error('请求错误：', error);
+//       ElMessage.error('网络请求失败');
+//     }
+//   }
+// }
+
 const onPreviewClick = () => {
   // 获取导出json
-  const { exportJson } = genExportJson(
-    globalStore.canvasCfg,
-    globalStore.gridCfg,
-    globalStore.done_json
-  );
+  const { exportJson } = genExportJson(globalStore.canvasCfg, globalStore.gridCfg, globalStore.done_json);
   emits('onPreviewClick', exportJson);
 };
 const onSaveClick = () => {
   // 获取导出json
-  const { exportJson } = genExportJson(
-    globalStore.canvasCfg,
-    globalStore.gridCfg,
-    globalStore.done_json
-  );
+  const { exportJson } = genExportJson(globalStore.canvasCfg, globalStore.gridCfg, globalStore.done_json);
   emits('onSaveClick', exportJson);
 };
 const onThumbnailClick = () => {
diff --git a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-camera.vue b/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-camera.vue
new file mode 100644
index 0000000..c9be779
--- /dev/null
+++ b/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-camera.vue
@@ -0,0 +1,54 @@
+<template>
+  <div class="main-img" @click="customDraggingVisible = true">
+    <el-button type="primary" :icon="VideoCamera" class="full-size-btn" />
+  </div>
+  
+  <teleport to="body">
+    <el-dialog 
+      v-model="customDraggingVisible" 
+      class="custom-dragging-style" 
+      title="摄像机画面" 
+      width="500" 
+      :modal="false"
+      draggable
+    >
+      <span>这是摄像机画面。尝试拖动它看看效果！</span>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="customDraggingVisible = false">Cancel</el-button>
+          <el-button type="primary" @click="customDraggingVisible = false"> Confirm </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </teleport>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import { VideoCamera } from '@element-plus/icons-vue';
+
+const customDraggingVisible = ref(false);
+</script>
+
+<style scoped>
+:global(.custom-dragging-style.is-dragging) {
+  border: 2px dashed var(--el-color-primary);
+  opacity: 0.65;
+}
+
+.main-img {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.full-size-btn {
+  width: 100%;
+  height: 100%;
+  padding: 0;
+  min-width: 100%;
+  min-height: 100%;
+}
+</style>
diff --git a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-img-test.vue b/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-img-test.vue
deleted file mode 100644
index 68bc726..0000000
--- a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-img-test.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<template>
-  <el-upload class="upload-demo" action="http://localhost:8080/data/model/saveImage">
-    <el-button type="primary">Click to upload</el-button>
-  </el-upload>
-
-  <button @click="getImages">获取图片</button>
-
-  <!-- style="max-width: 300px" -->
-  <div class="img-container">
-    <img
-      draggable="false"
-      style="max-width: 300px"
-      class="display-img"
-      :src="displayImageUrl"
-      alt="Display Image"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { ref, onUnmounted } from 'vue';
-import { ElMessage, ElMessageBox } from 'element-plus';
-import type { UploadProps, UploadUserFile } from 'element-plus';
-
-let displayImageUrl = ref<string>('');
-async function getImages() {
-  console.log('获取图片');
-  const response = await fetch('http://localhost:8080/data/model/getImageUrl', {
-    method: 'GET',
-    headers: {
-      'Content-Type': 'application/json',
-      Accept: '*/*'
-    }
-  });
-
-  // 后端返回JSON格式数据，包含file字段
-  const data = await response.json();
-
-  // 检查data.file是否为base64编码的图片数据
-  if (data.file && typeof data.file === 'string') {
-    // 如果是base64格式，直接使用
-    if (data.file.startsWith('data:image')) {
-      displayImageUrl.value = data.file;
-    } else {
-      // 如果只是base64编码的数据，添加必要的前缀
-      displayImageUrl.value = `data:image/png;base64,${data.file}`;
-    }
-  }
-
-  console.log('获取图片数据:', displayImageUrl.value);
-}
-
-// 清理函数，组件卸载时释放图片URL资源
-onUnmounted(() => {
-  if (displayImageUrl.value) {
-    URL.revokeObjectURL(displayImageUrl.value);
-  }
-});
-
-const fileList = ref<UploadUserFile[]>([
-  {
-    name: 'element-plus-logo.svg',
-    url: 'https://element-plus.org/images/element-plus-logo.svg'
-  },
-  {
-    name: 'element-plus-logo2.svg',
-    url: 'https://element-plus.org/images/element-plus-logo.svg'
-  }
-]);
-</script>
diff --git a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-img.vue b/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-img.vue
index 55fd348..4165e2e 100644
--- a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-img.vue
+++ b/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-img.vue
@@ -20,6 +20,7 @@ import { ref, onMounted, onUnmounted, watch } from 'vue';
 import emitter from '@/views/teacher/teacherStatistics/utils/emitter';
 import { Picture } from '@element-plus/icons-vue';
 import { modelApi, BASE_URL } from '@/views/teacher/teacherStatistics/utils/request';
+import { fileStorageFileListApi,getFileObj,File_Url,editFileNameByIdApi,deleteFileByIdApi } from '@/api/modules/teacher/teacherStatistics';
 import { formatFilePath } from '@/views/teacher/teacherStatistics/utils/dataFormatter';
 
 // const displayImageUrl = ref<string | null>(null);
@@ -53,12 +54,13 @@ async function loadFileList(fileId: string) {
   let endJson = {
     id: fileId
   };
-  const response = await modelApi.fileStorage_file_list_post(endJson);
+  // const response = await modelApi.fileStorage_file_list_post(endJson);
+  const response = await fileStorageFileListApi(endJson);
   if (!response.data) {
     return;
   }
-  response.data.list.forEach((value: any) => {
-    imgUrl.value = formatFilePath(BASE_URL, value.filePath);
+  response.data.rows.forEach((value: any) => {
+    imgUrl.value = formatFilePath(File_Url+'/admin', value.filePath);
   });
   console.log('imgUrl:', imgUrl);
 }
diff --git a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-groundFloor.vue b/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-groundFloor.vue
deleted file mode 100644
index 86433fb..0000000
--- a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-groundFloor.vue
+++ /dev/null
@@ -1,1522 +0,0 @@
-<template>
-  <div class="scene-wrapper">
-    <div ref="containerRef" class="container" />
-
-    <!-- 固定位置的控制按钮 -->
-    <div class="control-buttons">
-      <el-button
-        type="warning"
-        @click="tranlate(new Vector3(0, 14, 13.5), new Vector3(0, 0, 0))"
-        :icon="Refresh"
-      />
-      <!-- <el-button type="primary" @click="displayModel('area_oneFloor')" :icon="Bell" />
-      <el-button type="warning" @click="displayModel('smokeDetector')" :icon="Compass" />
-      <el-button type="warning" @click="displayModel('acoustoOptic')" :icon="MagicStick" />
-      <el-button type="warning" @click="displayModel('manual')" :icon="Star" /> -->
-      <!-- 1:左右 2:上下 3:前后 -->
-      <!-- <el-button type="warning" @click="displayModel('refresh')" :icon="Refresh" />
-      <el-button
-        type="warning"
-        @click="meshControllerArr[0].controller.startMalfunction()"
-        :icon="Refresh"
-      />
-      <el-button
-        type="warning"
-        @click="meshControllerArr[0].controller.restore()"
-        :icon="Refresh"
-      /> -->
-    </div>
-
-    <div class="control-panel" v-show="cardisOpen">
-      <el-card class="card" v-show="cardisOpen" shadow="hover" :body-style="{ padding: '10px' }">
-        <h2 class="cardHead">{{ getModelDroupName(moduleType) }}</h2>
-
-        <div class="cardBody">
-          <!--  <el-row :gutter="0" class="info-row">
-            <el-col :span="8">厂家</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">海湾公司</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">投运日期</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">2014-08-08</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">电源电压</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">220V AC</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">布设位置</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">35kV高压室</el-tag>
-            </el-col>
-          </el-row>
-
-           <el-row :gutter="0" class="info-row">
-            <el-col :span="8">供电电压</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">18-30V DC</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">输出电流</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">5A</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">IP等级</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">IP30</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">相对湿度</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">5% ~ 95%</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">接线方式</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">两线制(L+、L-)</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">尺寸</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">350mm x 225mm x 125mm</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">报警灵敏度</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">0.005% 至 20%obs/m</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">运行条件</el-col>
-            <el-col :span="16">
-              <el-tag ref="conditionTagRef" type="primary"> 探测器环境(-5°C至45°C) </el-tag>
-            </el-col>
-          </el-row> -->
-
-          <!-- bindingInfo -->
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">绑定设备</el-col>
-            <el-col :span="14" :offset="1"
-              ><el-button
-                type="primary"
-                class="operation-btn"
-                size="small"
-                @click="dialogTableVisible = true"
-                >绑定</el-button
-              ></el-col
-            >
-          </el-row>
-
-          <el-row :gutter="0" class="info-row" v-if="bindingInfo.id">
-            <el-col :span="8">设备ID</el-col>
-            <el-col :span="14" :offset="1">
-              <el-tag type="primary" size="small">{{ bindingInfo.id }}</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row" v-if="bindingInfo.id">
-            <el-col :span="8">设备名称</el-col>
-            <el-col :span="14" :offset="1">
-              <el-tag type="primary" size="small">{{ bindingInfo.name }}</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row" v-if="bindingInfo.id">
-            <el-col :span="8">设备状态</el-col>
-            <el-col :span="14" :offset="1">
-              <el-tag size="small" :type="bindingInfo.eState === 0 ? 'success' : 'warning'">
-                {{ bindingInfo.eState === 0 ? '正常' : '故障' }}
-              </el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row" v-if="bindingInfo.id">
-            <el-col :span="8">当前状态</el-col>
-            <el-col :span="14" :offset="1">
-              <el-tag size="small" v-if="bindingInfo.currentState === 0" type="success"
-                >运行</el-tag
-              >
-              <el-tag size="small" v-else-if="bindingInfo.currentState === 1" type="info"
-                >停止</el-tag
-              >
-              <el-tag size="small" v-else type="error">报警</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row" v-if="bindingInfo.id">
-            <el-col :span="8">详细信息</el-col>
-            <el-col :span="14" :offset="1">
-              <el-button
-                type="primary"
-                class="operation-btn"
-                size="small"
-                @click="dialogFacilityInfoVisible = true"
-                >查看</el-button
-              ></el-col
-            >
-          </el-row>
-
-          <el-row :gutter="0" class="info-row" v-if="bindingInfo.id">
-            <el-col :span="6">
-              <el-button type="primary" size="small" @click="operationController('restore')"
-                >还原</el-button
-              ></el-col
-            >
-            <el-col :span="6">
-              <el-button type="warning" size="small" @click="operationController('alarm')"
-                >告警</el-button
-              ></el-col
-            >
-            <el-col :span="6">
-              <el-button @click="operationController('fault')" type="danger" size="small"
-                >故障</el-button
-              ></el-col
-            >
-            <el-col :span="6">
-              <el-button @click="operationController('stop')" type="info" size="small"
-                >停止</el-button
-              ></el-col
-            >
-          </el-row>
-          <el-row :gutter="0" class="equipment-row">
-            <el-col :span="24">
-              <div class="equipment-wrapper">
-                <vueThreeEquipment :moduleType="moduleType" />
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-      </el-card>
-    </div>
-  </div>
-
-  <el-dialog
-    v-model="dialogFacilityInfoVisible"
-    title="设备详细信息"
-    width="800"
-    top="3vh"
-    append-to-body
-  >
-    <el-card class="card" v-show="cardisOpen" shadow="hover" :body-style="{ padding: '10px' }">
-      <el-row :gutter="0" class="info-row">
-        <el-col :span="8">厂家</el-col>
-        <el-col :span="16">
-          <el-tag type="primary">海湾公司</el-tag>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="0" class="info-row">
-        <el-col :span="8">投运日期</el-col>
-        <el-col :span="16">
-          <el-tag type="primary">2014-08-08</el-tag>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="0" class="info-row">
-        <el-col :span="8">电源电压</el-col>
-        <el-col :span="16">
-          <el-tag type="primary">220V AC</el-tag>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="0" class="info-row">
-        <el-col :span="8">布设位置</el-col>
-        <el-col :span="16">
-          <el-tag type="primary">35kV高压室</el-tag>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="0" class="info-row">
-        <el-col :span="8">供电电压</el-col>
-        <el-col :span="16">
-          <el-tag type="primary">18-30V DC</el-tag>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="0" class="info-row">
-        <el-col :span="8">输出电流</el-col>
-        <el-col :span="16">
-          <el-tag type="primary">5A</el-tag>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="0" class="info-row">
-        <el-col :span="8">IP等级</el-col>
-        <el-col :span="16">
-          <el-tag type="primary">IP30</el-tag>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="0" class="info-row">
-        <el-col :span="8">相对湿度</el-col>
-        <el-col :span="16">
-          <el-tag type="primary">5% ~ 95%</el-tag>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="0" class="info-row">
-        <el-col :span="8">接线方式</el-col>
-        <el-col :span="16">
-          <el-tag type="primary">两线制(L+、L-)</el-tag>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="0" class="info-row">
-        <el-col :span="8">尺寸</el-col>
-        <el-col :span="16">
-          <el-tag type="primary">350mm x 225mm x 125mm</el-tag>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="0" class="info-row">
-        <el-col :span="8">报警灵敏度</el-col>
-        <el-col :span="16">
-          <el-tag type="primary">0.005% 至 20%obs/m</el-tag>
-        </el-col>
-      </el-row>
-
-      <el-row :gutter="0" class="info-row">
-        <el-col :span="8">运行条件</el-col>
-        <el-col :span="16">
-          <el-tag ref="conditionTagRef" type="primary"> 探测器环境(-5°C至45°C) </el-tag>
-        </el-col>
-      </el-row>
-    </el-card>
-  </el-dialog>
-
-  <el-dialog v-model="dialogTableVisible" title="设备绑定" width="850" top="3vh" append-to-body>
-    <el-table :data="arr" style="width: 100%" max-height="500" class="full-height-table">
-      <el-table-column prop="floorName" label="房间" />
-      <el-table-column prop="id" label="设备ID" />
-      <el-table-column prop="name" label="设备名称" />
-
-      <el-table-column prop="isBinding" label="是否绑定">
-        <template #default="{ row }">
-          <el-tag :type="row.isBinding ? 'primary' : 'info'">
-            {{ row.isBinding ? '绑定' : '待绑' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="设备状态">
-        <template #default="{ row }">
-          <el-tag :type="row.eState === 0 ? 'success' : 'warning'">
-            {{ row.eState === 0 ? '正常' : '故障' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="当前状态">
-        <template #default="{ row }">
-          <el-tag v-if="row.currentState === 0" type="success">运行</el-tag>
-          <el-tag v-else-if="row.currentState === 1" type="info">停止</el-tag>
-          <el-tag v-else type="error">报警</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作">
-        <template #default="{ row }">
-          <el-button type="primary" class="operation-btn" @click="bindDevice(row)">
-            绑定
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-  </el-dialog>
-</template>
-
-<script lang="ts" setup>
-import { Star, Bell, MagicStick, Refresh, Compass } from '@element-plus/icons-vue';
-import { ElMessage } from 'element-plus';
-import { onMounted, onUnmounted, ref, reactive } from 'vue';
-import {
-  AxesHelper,
-  Color,
-  PerspectiveCamera,
-  Scene,
-  WebGLRenderer,
-  AmbientLight,
-  DirectionalLight,
-  PointLight,
-  Vector2,
-  Raycaster,
-  CanvasTexture,
-  SpriteMaterial,
-  Sprite,
-  Box3,
-  Vector3,
-  Mesh,
-  BoxHelper,
-  ConeGeometry,
-  SphereGeometry,
-  MeshBasicMaterial,
-  TextureLoader,
-  Group
-} from 'three';
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
-import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
-// // import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader'; // 未使用 // 暂时未使用
-import gsap from 'gsap';
-import vueThreeEquipment from '@/components/three-components/vue-three-equipment.vue'; // 暂时注释掉未找到的组件
-import { modelApi } from '@/utils/request';
-import emitter from '@/utils/emitter';
-
-// 导入全局类型定义
-/// <reference path="../../../global.d.ts" />
-
-// 定义 Rec 相关的类型
-interface RecRuntimeData {
-  double: number;
-  node: {
-    name: string;
-  };
-}
-
-interface RecServiceType {
-  service: {
-    node: {
-      runtimes: Record<string, RecRuntimeData>;
-    };
-  };
-}
-
-interface ExtendedParentWindow extends Window {
-  Rec?: RecServiceType;
-}
-
-const containerRef = ref<HTMLDivElement>();
-const dialogTableVisible = ref(false);
-let dialogFacilityInfoVisible = ref(false);
-
-// 场景
-const scene = new Scene();
-
-// 创建摄像机
-const camera = new PerspectiveCamera(
-  45,
-  containerRef.value?.clientWidth! / containerRef.value?.clientHeight!,
-  0.1,
-  100
-);
-camera.position.set(0, 14, 13.5);
-camera.lookAt(0, 0, 0);
-
-// const axesHelper = new AxesHelper(100);
-// scene.add(axesHelper);
-
-// 渲染器
-const renderer = new WebGLRenderer({
-  antialias: true, // 启用抗锯齿
-  alpha: true, // 启用透明背景
-  preserveDrawingBuffer: true // 保持绘图缓冲区
-});
-renderer.setClearColor(new Color('#131519'));
-renderer.setSize(containerRef.value?.clientWidth!, containerRef.value?.clientHeight!);
-renderer.shadowMap.enabled = true;
-renderer.setPixelRatio(window.devicePixelRatio || 1); // 设置像素比率
-
-// 轨道摄像机
-const orbitControls = new OrbitControls(camera, renderer.domElement);
-orbitControls.autoRotate = false;
-orbitControls.autoRotateSpeed = 5;
-orbitControls.dampingFactor = 0.1;
-orbitControls.enableDamping = true;
-orbitControls.enableRotate = true;
-orbitControls.minDistance = 10;
-orbitControls.maxPolarAngle = Math.PI * 0.5;
-
-// 物体
-// scene.add(new AxesHelper(20));
-
-// 环境光：增强整体亮度
-const ambientLight = new AmbientLight('#ffffff', 1.8); // 强度从 0.6 提高到 1.0
-scene.add(ambientLight);
-
-// 平行光
-const directionalLight = new DirectionalLight('#ffffff', 1.8); // 强度从 0.2 提高到 0.8
-scene.add(directionalLight);
-directionalLight.position.set(20, 20, 10);
-
-// // 点光源
-const pointLight = new PointLight('#ffffff', 1.8, 1000); // 强度从 0.5 提高到 1.0
-scene.add(pointLight);
-pointLight.position.set(0, 40, 0);
-
-function addSprite(text: string, color: string, position: Vector3) {
-  const canvas = document.createElement('canvas');
-  canvas.width = 150;
-  canvas.height = 150;
-  const ctx = canvas.getContext('2d');
-  if (ctx) {
-    ctx.fillStyle = color; // rgba(0,0,0,.7)
-    ctx.fillRect(0, 0, 150, 60);
-    ctx.fillStyle = 'white';
-    ctx.font = '24px 黑体';
-    ctx.textAlign = 'center';
-    ctx.textBaseline = 'middle';
-    ctx.fillText(text, 75, 30);
-  }
-
-  const texture = new CanvasTexture(canvas);
-  const material = new SpriteMaterial({ map: texture });
-  const sprite = new Sprite(material);
-
-  sprite.position.set(position.x, position.y + 0.7, position.z);
-  scene.add(sprite);
-  return sprite;
-}
-
-// 创建一个悬浮的框
-// const ctx = canvas.getContext('2d');
-// if (ctx) {
-//   ctx.fillStyle = 'rgba(0,0,0,.7)';
-//   ctx.fillRect(0, 0, 200, 100);
-//   ctx.fillStyle = 'white';
-//   ctx.font = '21px 黑体';
-//   ctx.textAlign = 'center';
-//   ctx.textBaseline = 'middle';
-// }
-// const scaleFactor = 5;
-// const texture = new CanvasTexture(canvas);
-// const material = new SpriteMaterial({ map: texture });
-
-// const sprite1 = new Sprite(material);
-// sprite1.scale.set(scaleFactor, scaleFactor, scaleFactor);
-// sprite1.position.set(-9.644502679789724, 5.815449539931501 + 0.5, 21.66345220492572);
-
-//区域集合 - 修改为包含多种类型
-let areaOneFloorArr: (Mesh | Sprite | BoxHelper)[] = [];
-//光感报警器
-let acoustoOpticArr: Mesh[] = [];
-//手动报警器
-let manualArr: Mesh[] = [];
-// 烟雾探测器
-let smokeDetectorArr: Mesh[] = [];
-// 移动目标的集合
-let moveArr: Mesh[] = []; // 只包含Mesh类型用于射线检测
-
-interface meshController {
-  meshName: string;
-  targetMesh: any;
-  geometry: Mesh;
-  sprite: any;
-  controller: any;
-}
-
-// node楼层节点
-interface FloorNode {
-  roomId: string;
-  floorName: string;
-  eqpList: EquipmentNode[];
-}
-
-//node
-interface EquipmentNode {
-  id: string; //设备ID
-  name: string; //设备名称
-  eState: number; //设备状态  0正常  1故障
-  isBinding: boolean; //是否绑定
-  currentState: number; //当前状态 0运行  1停止  2报警
-  operation: boolean; //操作  true屏蔽  false取消屏蔽
-}
-
-let arr = ref<any[]>([]);
-//数据初始化
-async function dataInit() {
-  const response = await modelApi.oneRoomFor_Equipment_get();
-  if (response.code == 200 && response.data && response.data.length > 0) {
-    response.data.forEach((floor: any) => {
-      floor.eqpList.forEach((eqp: any) => {
-        let currentState = 1;
-        //故障
-        if (
-          (window.parent as ExtendedParentWindow).Rec?.service.node.runtimes[eqp.nodes[1]].double !=
-          1
-        )
-          currentState = 1;
-        else if (
-          (window.parent as ExtendedParentWindow).Rec?.service.node.runtimes[eqp.nodes[2]].double ==
-          1
-        )
-          currentState = 2;
-        else if (
-          (window.parent as ExtendedParentWindow).Rec?.service.node.runtimes[eqp.nodes[1]].double ==
-          1
-        )
-          currentState = 0;
-
-        let eqpNode: EquipmentNode = {
-          id: eqp.id,
-          name:
-            (window.parent as ExtendedParentWindow).Rec?.service.node.runtimes[eqp.nodes[0]].node
-              .name || '',
-          eState:
-            (window.parent as ExtendedParentWindow).Rec?.service.node.runtimes[eqp.nodes[0]]
-              .double || 0,
-          currentState: currentState,
-          isBinding: eqp.isBinding,
-          operation:
-            (window.parent as ExtendedParentWindow).Rec?.service.node.runtimes[eqp.nodes[3]]
-              .double == 1
-        };
-        arr.value.push({
-          ...eqpNode,
-          floorName: floor.roomName,
-          roomId: floor.roomId
-        });
-      });
-    });
-    ElMessage.success('获取接口数据成功');
-  } else {
-    ElMessage.error('获取接口数据失败');
-  }
-}
-dataInit();
-
-function operationController(controller: string) {
-  console.log(bindingObj, controller);
-  console.log(meshControllerArr);
-  let obj = meshControllerArr.find((item) => item.meshName === bindingObj.name);
-  if (obj) {
-    if (controller == 'restore') {
-      obj.controller.restore();
-    } else if (controller == 'alarm') {
-      obj.controller.startAlarm();
-    } else if (controller == 'fault') {
-      obj.controller.startMalfunction();
-    } else if (controller == 'stop') {
-      obj.controller.stop();
-    }
-  }
-}
-
-let bindingArr: any[] = [];
-async function getListBinding() {
-  const response = await modelApi.getListBinding_get();
-  if (response.code == 200 && response.data && response.data.length > 0) {
-    bindingArr = response.data;
-  } else {
-    ElMessage.error('获取接口数据失败');
-  }
-}
-getListBinding();
-
-let meshControllerArr: meshController[] = [];
-const loader = new GLTFLoader();
-const textureLoader = new TextureLoader();
-//alpha贴图
-// F:\vue\workspace\maotu-webtopo\public\models\texture\alpha.png
-const material = new MeshBasicMaterial({ color: 0x409eff, transparent: true, opacity: 0.3 });
-const alphaTexture = textureLoader.load('/models/texture/alpha01.png');
-const alphaMaterial = new MeshBasicMaterial({
-  color: 0x409eff,
-  alphaMap: alphaTexture, //alpha贴图
-  transparent: true // 允许透明
-});
-// const dracoLoader = new DRACOLoader();
-// loader.setDRACOLoader(dracoLoader);
-//public\models\groundFloor\ground_floor.gltf
-let bindingColor = 'rgba(33,61,91,0.70)';
-loader.load('/models/groundFloor/ground_floor08.gltf', (gltf: any) => {
-  gltf.scene.children.forEach((child: Mesh) => {
-    // 区域
-    if (child.name.includes('area_oneFloor')) {
-      const duckGeometry = child.geometry;
-      duckGeometry.computeBoundingBox();
-      duckGeometry.center();
-      const duckBox = duckGeometry.boundingBox?.clone() || new Box3();
-      child.updateWorldMatrix(true, true);
-      duckBox.applyMatrix4(child.matrixWorld);
-      const duckBoxHelper = new BoxHelper(child, 0xf0f0f0);
-      // 设置包围盒材质的透明度
-      (duckBoxHelper.material as any).transparent = true;
-      (duckBoxHelper.material as any).opacity = 0.38; // 50%透明度
-      scene.add(duckBoxHelper);
-
-      // 获取child对象的世界坐标
-      // 添加精灵
-      const worldPosition = new Vector3();
-      child.getWorldPosition(worldPosition);
-
-      // 创建文字精灵
-      const canvas = document.createElement('canvas');
-      // 提高Canvas分辨率以获得更清晰的文字
-      const scale = window.devicePixelRatio || 1;
-      canvas.width = 512 * scale;
-      canvas.height = 256 * scale;
-      canvas.style.width = '512px';
-      canvas.style.height = '256px';
-
-      const ctx = canvas.getContext('2d');
-
-      if (ctx) {
-        // 缩放上下文以匹配设备像素比率
-        ctx.scale(scale, scale);
-
-        // 设置文字样式
-        ctx.fillStyle = 'rgba(0, 0, 0, 0)';
-        ctx.fillRect(0, 0, 512, 256);
-        ctx.fillStyle = 'white';
-        ctx.textAlign = 'center';
-        ctx.textBaseline = 'middle';
-
-        // 使用更大的字体和更清晰的字体族
-        ctx.font = '24px 微软雅黑, Arial, sans-serif';
-        ctx.fillText(getAreaOneFloorGetName(child.name), 256, 128);
-      }
-
-      // 创建精灵材质和对象
-      const texture = new CanvasTexture(canvas);
-      const spriteMaterial = new SpriteMaterial({ map: texture });
-      const sprite = new Sprite(spriteMaterial);
-
-      // 设置精灵大小和位置
-      sprite.scale.set(4, 2, 1); // 调整大小以适配新的Canvas尺寸
-      sprite.position.copy(worldPosition);
-      sprite.position.y += 1.5; // 稍微抬高一点
-      scene.add(sprite);
-
-      sprite.visible = false;
-      duckBoxHelper.visible = false;
-      child.visible = false;
-
-      areaOneFloorArr.push(sprite); // 将精灵也加入数组
-      areaOneFloorArr.push(duckBoxHelper);
-      areaOneFloorArr.push(child);
-      moveArr.push(child as any);
-    } else if (child.name.includes('acoustoOptic')) {
-      let acoustoPosition = child.position;
-      const geometry = new SphereGeometry(0.6, 20, 16);
-
-      const sphere = new Mesh(geometry, material);
-      sphere.position.set(acoustoPosition.x, acoustoPosition.y, acoustoPosition.z);
-      scene.add(sphere);
-
-      let text = '未绑定';
-      let color = 'rgba(0,0,0,.5)';
-      //如果bindingArr集合中的objId和child.name匹配，则设置文字
-      if (bindingArr.some((item: any) => item.objId === child.name)) {
-        text = '已绑定';
-        // rgba(45,72,31,0.70)  rgba(33,61,91,0.70)  rgba(33,61,91,0.70)
-        color = bindingColor;
-      }
-      let sprite = addSprite(
-        text,
-        color,
-        new Vector3(acoustoPosition.x, acoustoPosition.y - 0.2, acoustoPosition.z + 0.3)
-      );
-
-      child.visible = true;
-      sphere.visible = true;
-      acoustoOpticArr.push(sphere);
-      acoustoOpticArr.push(child);
-
-      meshControllerArr.push({
-        meshName: child.name,
-        targetMesh: child,
-        geometry: sphere,
-        sprite: sprite,
-        controller: setupAlarmEffect(sphere)
-      });
-      moveArr.push(child as any);
-    } else if (child.name.includes('manual')) {
-      let manualPosition = child.position;
-      const geometry = new SphereGeometry(0.6, 20, 16);
-      const sphere = new Mesh(geometry, material);
-      let text = '未绑定';
-      let color = 'rgba(0,0,0,.5)';
-      //如果bindingArr集合中的objId和child.name匹配，则设置文字
-      if (bindingArr.some((item: any) => item.objId === child.name)) {
-        text = '已绑定';
-        // rgba(45,72,31,0.70)  rgba(33,61,91,0.70)  rgba(33,61,91,0.70)
-        color = bindingColor;
-      }
-      let sprite = addSprite(
-        text,
-        color,
-        new Vector3(manualPosition.x, manualPosition.y - 0.2, manualPosition.z - 0.3)
-      );
-
-      sphere.position.set(manualPosition.x, manualPosition.y, manualPosition.z);
-      scene.add(sphere);
-      child.visible = true;
-      sphere.visible = true;
-
-      manualArr.push(sphere);
-      manualArr.push(child);
-
-      meshControllerArr.push({
-        meshName: child.name,
-        targetMesh: child,
-        geometry: sphere,
-        sprite: sprite,
-        controller: setupAlarmEffect(sphere)
-      });
-
-      moveArr.push(child as any);
-    } else if (child.name.includes('smokeDetecto')) {
-      console.log('@@aaa:', bindingArr);
-      // 烟感报警器
-      let smokePosition = child.position;
-
-      const geometry = new ConeGeometry(1.8, 1.2, 16, 1, true);
-      const cone = new Mesh(geometry, alphaMaterial);
-      cone.position.set(smokePosition.x, smokePosition.y - 0.5, smokePosition.z + 0.028);
-
-      let text = '未绑定';
-      let color = 'rgba(0,0,0,.5)';
-      //如果bindingArr集合中的objId和child.name匹配，则设置文字
-      if (bindingArr.some((item: any) => item.objId === child.name)) {
-        text = '已绑定';
-        // rgba(45,72,31,0.70)  rgba(33,61,91,0.70)  rgba(33,61,91,0.70)
-        color = bindingColor;
-      }
-      // let text:string[] = ['x：'+child.position.x.toString() , 'y：'+child.position.y.toString() , 'z：'+child.position.z.toString()];
-      // console.log(child.name+'  x：'+child.position.x.toString() , 'y：'+child.position.y.toString() , 'z：'+child.position.z.toString());
-      // 烟感报警器
-      let sprite = addSprite(text, color, cone.position);
-
-      scene.add(cone);
-      cone.visible = true;
-      child.visible = true;
-
-      smokeDetectorArr.push(cone);
-      smokeDetectorArr.push(child);
-
-      meshControllerArr.push({
-        meshName: child.name,
-        targetMesh: child,
-        geometry: cone,
-        sprite: sprite,
-        controller: setupAlarmEffect(cone)
-      });
-
-      moveArr.push(child as any);
-    }
-  });
-  scene.add(gltf.scene);
-});
-
-// 安全的报警效果设置函数
-function setupAlarmEffect(object: Mesh) {
-  // 安全检查 material 是否存在
-  if (!object.material) {
-    console.warn('对象没有材质属性:', object);
-    return;
-  }
-
-  // 处理材质可能是数组的情况
-  const materialArray = Array.isArray(object.material) ? object.material : [object.material];
-  const firstMaterial = materialArray[0];
-
-  // 保存原始材质
-  // 确保材质有color属性
-  if (!('color' in firstMaterial)) {
-    console.warn('材质没有color属性:', firstMaterial);
-    return;
-  }
-
-  const originalMaterial = firstMaterial.clone();
-  const alarmMaterial = firstMaterial.clone();
-  (alarmMaterial as any).color.set(0xe6a23c);
-  const faultMaterial = firstMaterial.clone();
-  (faultMaterial as any).color.set(0xf56c6c);
-
-  let isAlarming = false;
-  let isMalfunctioning = false;
-  let isRestoring = false;
-  let alarmInterval: number | null = null;
-
-  // 报警控制函数 - 渐变闪烁版本
-  function startAlarm() {
-    // if (isAlarming) return;
-    // isAlarming = true;
-
-    object.material = alarmMaterial;
-    object.visible = true;
-    // 保存原始颜色
-    // const originalColor = object.material.color.clone();
-
-    const tl = gsap.timeline({ repeat: -1, yoyo: true });
-
-    // 只在黄色和透明之间切换，不显示原始颜色
-    tl.to(object.material, {
-      opacity: 0.7, // 完全不透明的黄色
-      duration: 0.5,
-      ease: 'sine.inOut'
-    }).to(object.material, {
-      opacity: 0.2, // 半透明的黄色
-      duration: 0.5,
-      ease: 'sine.inOut'
-    });
-    // object._alarmTimeline = tl;
-    // object._originalColor = originalColor; // 保存原始颜色用于恢复
-  }
-
-  //故障
-  function startMalfunction() {
-    // if (isMalfunctioning) return;
-    // isMalfunctioning = true;
-
-    object.material = faultMaterial;
-    object.visible = true;
-    // 保存原始颜色
-    // const originalColor = object.material.color.clone();
-
-    const tl = gsap.timeline({ repeat: -1, yoyo: true });
-
-    // 只在黄色和透明之间切换，不显示原始颜色
-    tl.to(object.material, {
-      opacity: 0.7, // 完全不透明的黄色
-      duration: 0.5,
-      ease: 'sine.inOut'
-    }).to(object.material, {
-      opacity: 0.2, // 半透明的黄色
-      duration: 0.5,
-      ease: 'sine.inOut'
-    });
-    // object._alarmTimeline = tl;
-    // object._originalColor = originalColor; // 保存原始颜色用于恢复
-  }
-
-  //还原
-  function restore() {
-    // if (!isRestoring) return;
-    // isRestoring = true;
-
-    if (alarmInterval !== null) {
-      clearInterval(alarmInterval);
-      alarmInterval = null;
-    }
-
-    // 恢复原始状态
-    object.visible = true;
-    object.material = originalMaterial;
-  }
-
-  //停止 - 隐藏对象以节约性能
-  function stop() {
-    // 停止所有动画
-    if (alarmInterval !== null) {
-      clearInterval(alarmInterval);
-      alarmInterval = null;
-    }
-
-    // 隐藏对象
-    object.visible = false;
-
-    // 也可以设置材质完全透明
-    // object.material.opacity = 0;
-    // object.material.transparent = true;
-  }
-
-  // 扩展对象类型以支持动态方法
-  (object as any).startAlarm = startAlarm;
-  (object as any).restore = restore;
-  (object as any).startMalfunction = startMalfunction;
-  (object as any).stop = stop;
-
-  // 返回对象本身，支持链式调用
-  return object;
-}
-
-function getAreaOneFloorGetName(areaOneFloorName: string): string {
-  switch (areaOneFloorName) {
-    case 'area_oneFloor_35kV':
-      return '35kV高压室';
-    case 'area_oneFloor_220kV':
-      return '220kV保护室';
-    case 'area_oneFloor_14':
-      return '蓄电池室';
-    case 'area_oneFloor_3':
-      return '站用电柜室';
-    case 'area_oneFloor_13':
-      return '380kV配电室';
-    case 'area_oneFloor_4':
-      return '1站用变室';
-    case 'area_oneFloor_6':
-      return '消弧线圈1室';
-    case 'area_oneFloor_7':
-      return '2号接地变室';
-    case 'area_oneFloor_8':
-      return '消弧线圈3室';
-    case 'area_oneFloor_9':
-      return '2站用变室';
-    case 'area_oneFloor_10':
-      return '110kV电缆间';
-    case 'area_oneFloor_12':
-      return '安全工器具间';
-    case 'area_oneFloor_11':
-      return '消弧线圈4室';
-    default:
-      return '未知';
-  }
-}
-
-function animate() {
-  requestAnimationFrame(animate);
-  orbitControls.update();
-  renderer.render(scene, camera);
-}
-
-// ResizeObserver 监听容器尺寸变化
-let resizeObserver: ResizeObserver | null = null;
-
-//补间动画
-const timeline1 = gsap.timeline();
-const timeline2 = gsap.timeline();
-
-//相机移动
-function tranlate(position: Vector3, target: Vector3) {
-  timeline1.to(camera.position, {
-    x: position.x,
-    y: position.y,
-    z: position.z,
-    duration: 1,
-    ease: 'power2.inOut'
-  });
-
-  timeline2.to(orbitControls.target, {
-    x: target.x,
-    y: target.y,
-    z: target.z,
-    duration: 1,
-    ease: 'power2.inOut'
-  });
-}
-
-function displayModel(modelName: string) {
-  tranlate(new Vector3(0, 14, 13.5), new Vector3(0, 0, 0));
-  if (modelName === 'area_oneFloor') {
-    areaOneFloorArr.forEach((obj) => {
-      obj.visible = true;
-    });
-    acoustoOpticArr.forEach((obj) => {
-      obj.visible = false;
-    });
-    manualArr.forEach((obj) => {
-      obj.visible = false;
-    });
-    smokeDetectorArr.forEach((obj) => {
-      obj.visible = false;
-    });
-  } else if (modelName === 'acoustoOptic') {
-    areaOneFloorArr.forEach((obj) => {
-      obj.visible = false;
-    });
-    acoustoOpticArr.forEach((obj) => {
-      obj.visible = true;
-    });
-    manualArr.forEach((obj) => {
-      obj.visible = false;
-    });
-    smokeDetectorArr.forEach((obj) => {
-      obj.visible = false;
-    });
-  } else if (modelName === 'manual') {
-    areaOneFloorArr.forEach((obj) => {
-      obj.visible = false;
-    });
-    acoustoOpticArr.forEach((obj) => {
-      obj.visible = false;
-    });
-    manualArr.forEach((obj) => {
-      obj.visible = true;
-    });
-    smokeDetectorArr.forEach((obj) => {
-      obj.visible = false;
-    });
-  } else if (modelName === 'smokeDetector') {
-    areaOneFloorArr.forEach((obj) => {
-      obj.visible = false;
-    });
-    acoustoOpticArr.forEach((obj) => {
-      obj.visible = false;
-    });
-    manualArr.forEach((obj) => {
-      obj.visible = false;
-    });
-    smokeDetectorArr.forEach((obj) => {
-      obj.visible = true;
-    });
-  } else if (modelName === 'refresh') {
-    areaOneFloorArr.forEach((obj) => {
-      obj.visible = false;
-    });
-    acoustoOpticArr.forEach((obj) => {
-      obj.visible = false;
-    });
-    manualArr.forEach((obj) => {
-      obj.visible = false;
-    });
-    smokeDetectorArr.forEach((obj) => {
-      obj.visible = false;
-    });
-  }
-}
-
-// 绑定
-async function bindDevice(row: any) {
-  if (!bindingObj) ElMessage.warning('请选择要绑定的模型');
-  let id = null;
-  if (bindingObj.bindingMap && bindingObj.bindingMap.id) id = bindingObj.bindingMap.id;
-
-  const response = await modelApi.binding_post({ id, objId: bindingObj.name, facilityId: row.id });
-  if (response.code == 200 && response.data == true) {
-    emitter.emit('binding-data-update');
-    // bindingObj.name
-    // 根据 meshName 匹配并修改 sprite 颜色
-    const matchedController = meshControllerArr.find((item) => item.meshName === bindingObj.name);
-    if (matchedController && matchedController.sprite) {
-      // 获取原来 sprite 的位置
-      debugger;
-      const oldPosition = matchedController.sprite.position.clone();
-      // 移除原来的 sprite
-      scene.remove(matchedController.sprite);
-      // 创建新的淡绿色精灵，位置保持一致
-      const newSprite = addSprite(
-        '已绑定',
-        bindingColor,
-        new Vector3(oldPosition.x, oldPosition.y - 0.7, oldPosition.z)
-      );
-      // 更新控制器中的sprite引用
-      matchedController.sprite = newSprite;
-    }
-
-    ElMessage.success('绑定成功');
-  } else ElMessage.error('绑定失败');
-  dialogTableVisible.value = false;
-}
-
-async function getBinding(objId: string | null, facilityId: string | null) {
-  const response = await modelApi.getBinding_post({ objId: objId, facilityId: facilityId });
-  if (response.code == 200 && response.data) {
-    return response.data;
-  }
-  return null;
-}
-
-let bindingInfo: any = reactive({});
-//获取绑定信息
-function getBindingInfo(facilityId: string) {
-  console.log('获取绑定信息:', facilityId, arr);
-  for (const item of arr.value) {
-    if (item.id == facilityId) {
-      // 使用 Object.assign 保持响应式
-      Object.assign(bindingInfo, {
-        currentState: item.currentState,
-        eState: item.eState,
-        floorName: item.floorName,
-        id: item.id,
-        name: item.name,
-        operation: item.operation,
-        roomId: item.roomId
-      });
-      break;
-    }
-  }
-}
-
-function clearBoxHelper(boxHelper: BoxHelper | null) {
-  // 正确的资源清理顺序
-  if (boxHelper) {
-    scene.remove(boxHelper); // 从场景中移除
-    boxHelper.geometry.dispose(); // 释放几何体内存
-    if (boxHelper.material) {
-      if (Array.isArray(boxHelper.material)) {
-        boxHelper.material.forEach((material) => material.dispose());
-      } else {
-        boxHelper.material.dispose();
-      }
-    }
-    boxHelper = null; // 清空引用
-  }
-}
-
-//绑定的元素
-let bindingObj: any = null;
-let boxHelper = <BoxHelper | null>null;
-
-let cardisOpen = ref(false);
-let moduleType = ref('');
-onMounted(() => {
-  const container = containerRef.value!;
-  container.appendChild(renderer.domElement);
-
-  // 初始化摄像机和渲染器尺寸
-  camera.aspect = container.clientWidth / container.clientHeight;
-  camera.updateProjectionMatrix();
-  renderer.setSize(container.clientWidth, container.clientHeight);
-
-  // 监听容器尺寸变化
-  resizeObserver = new ResizeObserver(() => {
-    camera.aspect = container.clientWidth / container.clientHeight;
-    camera.updateProjectionMatrix();
-    renderer.setSize(container.clientWidth, container.clientHeight);
-  });
-  resizeObserver.observe(container);
-
-  // 创建射线检测器
-  const raycaster = new Raycaster();
-  const mouse = new Vector2();
-
-  // 添加点击事件监听
-  renderer.domElement.addEventListener('click', async (event: MouseEvent) => {
-    const rect = container.getBoundingClientRect();
-    const x = event.clientX - rect.left;
-    const y = event.clientY - rect.top;
-
-    mouse.x = (x / container.clientWidth) * 2 - 1;
-    mouse.y = -(y / container.clientHeight) * 2 + 1;
-
-    raycaster.setFromCamera(mouse, camera);
-    // 合并所有需要检测的数组并过滤出Mesh类型
-    const targetObjects = [...moveArr].filter((obj) => obj.visible);
-    const intersects = raycaster.intersectObjects(targetObjects, true);
-
-    // const targetScenes = scene.children.filter((obj) => obj.name == 'Scene');
-    // console.log('targetScenes[0].children:', targetScenes[0].children);
-    // const intersects = raycaster.intersectObjects(targetScenes[0].children, true);
-
-    if (intersects.length > 0) {
-      let position: Vector3 | undefined;
-      let x = 0;
-      let y = 0;
-      let z = 0;
-      let targetObj: any;
-      if (
-        intersects[0].object.name.includes('acoustoSon') ||
-        intersects[0].object.name.includes('manualSon') ||
-        intersects[0].object.name.includes('smokeSon')
-      ) {
-        targetObj = intersects[0].object.parent;
-        position = intersects[0].object.parent?.position || new Vector3(0, 0, 0);
-        x = -0.3;
-        y = 0.5;
-        z = 0.5;
-      } else {
-        targetObj = intersects[0].object;
-        position = intersects[0].object.position;
-        x = -1;
-        y = 3;
-        z = 3;
-      }
-      targetObj.bindingMap = await getBinding(targetObj.name, null);
-      cardisOpen.value = true;
-      moduleType.value = targetObj.name;
-      bindingObj = targetObj;
-      if (targetObj.bindingMap) getBindingInfo(targetObj.bindingMap.facilityId);
-      else
-        Object.keys(bindingInfo).forEach((key) => {
-          delete bindingInfo[key];
-        });
-      if (position) {
-        tranlate(
-          new Vector3(position.x + x, position.y + y, position.z + z),
-          new Vector3(position.x, position.y, position.z)
-        );
-      }
-      clearBoxHelper(boxHelper);
-      // 创建包围盒辅助器
-      boxHelper = new BoxHelper(targetObj, 0xffff00);
-      scene.add(boxHelper);
-    } else {
-      cardisOpen.value = false;
-      moduleType.value = '';
-      bindingObj = null;
-      clearBoxHelper(boxHelper);
-      // 清空对象而不是重新创建
-      Object.keys(bindingInfo).forEach((key) => {
-        delete bindingInfo[key];
-      });
-    }
-  });
-
-  animate();
-});
-
-function getModelDroupName(moduleType: string): string {
-  if (moduleType.includes('acoustoOptic')) return '声光报警器';
-  else if (moduleType.includes('manual')) return '手动报警器';
-  else if (moduleType.includes('smokeDetector')) return '烟感报警器';
-  else return '未知';
-}
-
-emitter.on('binding-obj-facility-move', async (value: any) => {
-  const response = await getBinding(null, value);
-  if (!response) ElMessage.warning('该数据未绑定模型');
-  else {
-    console.log('getBinding:', response);
-    let targetObj: any;
-    let targetControllerObj: any;
-    targetObj = moveArr.find((obj) => obj.name === response.objId);
-    cardisOpen.value = true;
-    targetObj.visible = true;
-
-    //meshControllerArr
-    moduleType.value = targetObj.name;
-
-    targetControllerObj = meshControllerArr.find((obj) => obj.meshName === response.objId);
-    targetControllerObj.geometry.visible = true;
-
-    getBindingInfo(response.facilityId);
-    clearBoxHelper(boxHelper);
-    // 创建包围盒辅助器
-    boxHelper = new BoxHelper(targetObj, 0xffff00);
-    scene.add(boxHelper);
-
-    // position
-    let position = targetObj?.position;
-    if (position) {
-      tranlate(
-        new Vector3(position.x - 0.3, position.y + 0.5, position.z + 0.5),
-        new Vector3(position.x, position.y, position.z)
-      );
-    }
-  }
-});
-
-onUnmounted(() => {
-  console.log('删除');
-  if (resizeObserver) {
-    resizeObserver.disconnect();
-    resizeObserver = null;
-  }
-  emitter.off('binding-obj-facility-move');
-});
-</script>
-
-<style scoped>
-.scene-wrapper {
-  position: relative;
-  width: 100%;
-  height: 100%;
-}
-
-.container {
-  width: 100%;
-  height: 100%;
-  position: relative;
-}
-
-.control-panel {
-  position: absolute;
-  top: 50%;
-  right: 2%;
-  transform: translateY(-50%); /* 垂直居中 */
-  display: flex;
-  flex-direction: column;
-  gap: 20px;
-  z-index: 101;
-  align-items: flex-end; /* 改为右对齐 */
-  /* background: rgba(0, 0, 0, 0.7); */
-  width: 35%;
-  height: 70%;
-}
-
-.control-buttons {
-  position: absolute;
-  top: 50%;
-  left: 2%;
-  transform: translateY(-50%); /* 垂直居中 */
-  display: flex;
-  flex-direction: column;
-  gap: 20px;
-  z-index: 100;
-  align-items: flex-start; /* 确保所有按钮左对齐 */
-}
-
-/* Element Plus圆形按钮样式调整 */
-.control-buttons :deep(.el-button) {
-  width: 40px !important;
-  height: 40px !important;
-  min-width: 40px !important;
-  padding: 0 !important;
-  display: flex !important;
-  align-items: center !important;
-  margin: 0 !important;
-  box-sizing: border-box !important;
-}
-
-.control-btn {
-  padding: 8px 16px;
-  background: rgba(0, 0, 0, 0.7);
-  color: white;
-  border: 1px solid #4fc3f7;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 14px;
-  transition: all 0.3s ease;
-  min-width: 80px;
-}
-
-.card {
-  /* height: 100%; */
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  margin: 0;
-  padding: 0;
-
-  background-color: rgba(0, 0, 0, 0.5) !important;
-  backdrop-filter: blur(5px);
-  border: none;
-  box-shadow: 0 2px 12px rgba(255, 0, 0, 0.1);
-}
-
-.card :deep(.el-card__body) {
-  flex: 1;
-  overflow-y: auto;
-  padding: 10px;
-}
-
-.cardHead {
-  margin: 0 0 15px 0;
-  padding: 0;
-  font-size: 16px;
-  font-weight: bold;
-  text-align: center;
-  color: #ffffff;
-}
-
-.cardBody {
-  font-size: 12px;
-  width: 100%;
-}
-
-.info-row {
-  margin-bottom: 5px;
-  display: flex;
-  align-items: center;
-  width: 100%;
-  font-size: 12px;
-
-  /* border: 1px solid red; */
-  margin-bottom: 5px !important;
-  padding: 0 !important;
-}
-
-/* 让组件继承父容器宽度 */
-.full-width-component {
-  width: 100% !important;
-  max-width: 100% !important;
-}
-
-.equipment-container {
-  width: 100%;
-  height: auto;
-}
-
-/* 确保设备组件行与信息行宽度一致 */
-.equipment-row {
-  width: 100%;
-  margin-top: 10px; /* 与其他行保持间距 */
-}
-
-/* 确保设备组件继承父容器宽度 */
-.equipment-wrapper {
-  width: 100% !important;
-  height: 150px; /* 设置固定高度或根据需要调整 */
-  position: relative;
-}
-
-.equipment-wrapper :deep(.div3D) {
-  width: 100% !important;
-  height: 100% !important;
-}
-
-.equipment-component {
-  width: 100% !important;
-  display: block !important;
-  box-sizing: border-box;
-}
-
-/* 确保所有行都有相同的宽度基准 */
-.info-row,
-.equipment-row {
-  max-width: 100%;
-  box-sizing: border-box;
-}
-
-/* 控制标签文字大小 */
-.info-row :deep(.el-tag) {
-  font-size: 10.5px;
-}
-
-/* 统一内边距 */
-.cardBody {
-  /* padding: 10px; */
-}
-
-.cardBody .el-row {
-  width: 100%;
-  margin-bottom: 2px;
-}
-
-/* 控制表头文字大小 */
-.full-height-table :deep(.el-table__header th) {
-  font-size: 13px;
-  font-weight: bold;
-}
-
-/* 控制表格内容文字大小 */
-.full-height-table :deep(.el-table__body td) {
-  font-size: 11.5px;
-  color: 12px;
-}
-
-/* 控制标签文字大小 */
-.full-height-table :deep(.el-tag) {
-  font-size: 11px;
-}
-
-/* 控制按钮文字大小 */
-.full-height-table :deep(.el-button) {
-  font-size: 11px;
-}
-
-.operation-btn {
-  font-size: 10px;
-  width: 50px;
-  min-width: 55px;
-  height: 20px;
-  padding: 8px 12px;
-}
-
-.info-row :deep(.el-col) {
-  display: flex;
-  align-items: center;
-}
-
-.info-row :deep(.el-tag) {
-  justify-content: left;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  max-width: 100%;
-  display: flex;
-  align-items: center;
-  /* height: 100%; */
-}
-</style>
diff --git a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-machine.vue b/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-machine.vue
deleted file mode 100644
index ea8975a..0000000
--- a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-machine.vue
+++ /dev/null
@@ -1,312 +0,0 @@
-<template>
-  <div
-    id="plane"
-    :style="{
-      left: infoRef.style.left + 'px',
-      top: infoRef.style.top + 'px',
-      display: infoRef.style.display
-    }"
-  >
-    <p>机柜名称：{{ infoRef.curCabinet.name }}</p>
-    <p>机柜温度：{{ infoRef.curCabinet.temperature }}°</p>
-    <p>使用情况：{{ infoRef.curCabinet.count }}/{{ infoRef.curCabinet.capacity }}</p>
-  </div>
-  <div ref="containerRef" class="container"></div>
-</template>
-
-<script setup lang="ts">
-import {
-  WebGLRenderer,
-  PerspectiveCamera,
-  Scene,
-  Color,
-  Texture,
-  Mesh,
-  TextureLoader,
-  MeshBasicMaterial,
-  Raycaster,
-  Vector2,
-  MeshStandardMaterial,
-  Object3D,
-  RepeatWrapping
-} from 'three';
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
-import { ref, reactive, onMounted, onUnmounted, watchEffect } from 'vue';
-import TWEEN from '@tweenjs/tween.js';
-import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
-
-const containerRef = ref<HTMLDivElement>();
-const rendererRef = ref<WebGLRenderer>();
-const cameraRef = ref<PerspectiveCamera>();
-const controlRef = ref<OrbitControls>();
-const maps: Map<string, Texture> = new Map();
-const cabinets: Mesh[] = [];
-const scene = new Scene();
-
-const raycaster = new Raycaster();
-const pointer = new Vector2();
-const curCabinetRef = ref<Mesh | null>();
-const infoRef = reactive({
-  style: { left: 0, top: 0, display: 'none' },
-  curCabinet: {
-    name: 'Loading……',
-    temperature: 0,
-    capacity: 0,
-    count: 0
-  }
-});
-
-// 初始化相机
-function initCamera() {
-  const container = containerRef.value!;
-  cameraRef.value = new PerspectiveCamera(
-    45,
-    container.clientWidth / container.clientHeight, // 使用容器宽高比
-    0.1,
-    1000
-  );
-  const start = { x: 0, y: 0, z: 0 };
-  new TWEEN.Tween(start)
-    .to({ x: 0, y: 10, z: 15 }, 800)
-    .easing(TWEEN.Easing.Quadratic.InOut)
-    .onUpdate(() => {
-      const { x, y, z } = start;
-      cameraRef.value?.position.set(x, y, z);
-    })
-    .start();
-  controlRef.value = new OrbitControls(cameraRef.value, rendererRef.value?.domElement);
-  controlRef.value.autoRotate = false;
-  controlRef.value.autoRotateSpeed = 1;
-  controlRef.value.dampingFactor = 0.2;
-  controlRef.value.rotateSpeed = 0.3; // 降低旋转速度（默认为 1.0）
-
-  controlRef.value.enableDamping = true;
-  controlRef.value.enableRotate = true;
-
-  controlRef.value.minDistance = 10;
-  controlRef.value.maxPolarAngle = Math.PI * 0.5;
-}
-
-// 初始化渲染器
-function initRenderer() {
-  const container = containerRef.value!;
-  rendererRef.value = new WebGLRenderer({
-    antialias: true, // 启用抗锯齿
-    alpha: true // 启用透明背景
-  });
-  rendererRef.value.setClearColor(new Color('#212d36'));
-  rendererRef.value.setSize(container.clientWidth, container.clientHeight); // 使用容器尺寸
-  rendererRef.value.shadowMap.enabled = true;
-}
-
-// 渲染循环
-function render() {
-  requestAnimationFrame(render);
-  if (cameraRef.value) {
-    rendererRef.value?.render(scene, cameraRef.value);
-  }
-  controlRef.value?.update();
-  TWEEN.update();
-}
-
-// 纹理加载
-function crtTexture(imgName: string) {
-  let curTexture = maps.get(imgName);
-  if (!curTexture) {
-    curTexture = new TextureLoader().load('/models/' + imgName);
-    curTexture.flipY = false;
-    curTexture.wrapS = RepeatWrapping;
-    curTexture.wrapT = RepeatWrapping;
-    maps.set(imgName, curTexture);
-  }
-  return curTexture;
-}
-
-// 材质切换
-function changeMat(obj: Mesh, map: Texture | null, color: Color) {
-  if (map) {
-    obj.material = new MeshBasicMaterial({
-      map: crtTexture(map.name)
-    });
-  } else {
-    obj.material = new MeshBasicMaterial({ color });
-  }
-}
-
-// 鼠标交互逻辑
-function onMouseOverCabinet({ name }: { name: string }) {
-  infoRef.style.display = 'block';
-  infoRef.curCabinet.name = name;
-  infoRef.curCabinet.temperature = Math.round(Math.random() * 100);
-  const capacity = Math.ceil(200 * Math.random());
-  infoRef.curCabinet.capacity = capacity;
-  infoRef.curCabinet.count = capacity - 5;
-}
-
-function onMouseOutCabinet() {
-  infoRef.style.display = 'none';
-}
-
-//原逻辑
-function onMouseMoveCabinet(left: number, top: number) {
-  infoRef.style.left = left;
-  infoRef.style.top = top;
-}
-
-//原逻辑
-// function selectCabinet(x: number, y: number) {
-//   const container = rendererRef.value!.domElement;
-//   const { width, height } = container;
-//   pointer.set((x / width) * 2 - 1, -(y / height) * 2 + 1);
-//   if (cameraRef.value) {
-//     raycaster.setFromCamera(pointer, cameraRef.value);
-//   }
-//   const intersect = raycaster.intersectObjects(cabinets)[0];
-//   let intersectObj = intersect ? (intersect.object as Mesh) : null;
-
-//   if (curCabinetRef.value && curCabinetRef.value !== intersectObj) {
-//     const material = curCabinetRef.value.material as MeshBasicMaterial;
-//     material.setValues({
-//       map: maps.get('cabinet.jpg')
-//     });
-//   }
-
-//   if (intersectObj) {
-//     onMouseMoveCabinet(x, y);
-//     if (intersectObj !== curCabinetRef.value) {
-//       curCabinetRef.value = intersectObj;
-//       const material = intersectObj.material as MeshBasicMaterial;
-//       material.setValues({
-//         map: maps.get('cabinet-hover.jpg')
-//       });
-//       onMouseOverCabinet(intersectObj);
-//     }
-//   } else if (curCabinetRef.value) {
-//     curCabinetRef.value = null;
-//     onMouseOutCabinet();
-//   }
-// }
-
-function selectCabinet(x: number, y: number) {
-  const container = rendererRef.value!.domElement;
-  const { width, height } = container;
-
-  // 鼠标坐标转裁剪坐标（注意：Y 轴翻转）
-  pointer.set((x / width) * 2 - 1, -(y / height) * 2 + 1);
-
-  if (cameraRef.value) {
-    raycaster.setFromCamera(pointer, cameraRef.value);
-  }
-
-  const intersect = raycaster.intersectObjects(cabinets)[0];
-  let intersectObj = intersect ? (intersect.object as Mesh) : null;
-
-  if (curCabinetRef.value && curCabinetRef.value !== intersectObj) {
-    const material = curCabinetRef.value.material as MeshBasicMaterial;
-    material.setValues({
-      map: maps.get('cabinet.jpg')
-    });
-  }
-
-  if (intersectObj) {
-    onMouseMoveCabinet(x, y);
-    if (intersectObj !== curCabinetRef.value) {
-      curCabinetRef.value = intersectObj;
-      const material = intersectObj.material as MeshBasicMaterial;
-      material.setValues({
-        map: maps.get('cabinet-hover.jpg')
-      });
-      onMouseOverCabinet(intersectObj);
-    }
-  } else if (curCabinetRef.value) {
-    curCabinetRef.value = null;
-    onMouseOutCabinet();
-  }
-}
-
-//原逻辑
-// function mouseMove({ clientX, clientY }: { clientX: number; clientY: number }) {
-//   console.log('mouseMove', clientX, clientY);
-//   selectCabinet(clientX, clientY);
-// }
-
-function mouseMove(event: MouseEvent) {
-  const container = containerRef.value!;
-  const rect = container.getBoundingClientRect(); // 获取容器相对于视口的位置
-  const x = event.clientX - rect.left; // 相对于容器的 X 坐标
-  const y = event.clientY - rect.top; // 相对于容器的 Y 坐标
-
-  selectCabinet(x, y);
-}
-
-// 尺寸变化监听
-let resizeObserver: ResizeObserver | null = null;
-
-onMounted(() => {
-  crtTexture('cabinet-hover.jpg');
-  containerRef.value!.onmousemove = mouseMove;
-
-  const loader = new GLTFLoader();
-  loader.load('/models/machineRoom.gltf', (gltf: any) => {
-    gltf.scene.children.forEach((obj: Object3D) => {
-      console.log('obj', obj);
-      if (obj instanceof Mesh) {
-        const { map, color } = obj.material as MeshStandardMaterial;
-        changeMat(obj, map, color);
-        if (obj.name.includes('cabinet')) {
-          cabinets.push(obj);
-        }
-      }
-    });
-    scene.add(...gltf.scene.children);
-  });
-
-  initRenderer();
-  initCamera();
-  render();
-
-  // 监听容器尺寸变化
-  resizeObserver = new ResizeObserver(() => {
-    const container = containerRef.value!;
-    cameraRef.value!.aspect = container.clientWidth / container.clientHeight;
-    cameraRef.value!.updateProjectionMatrix();
-    rendererRef.value!.setSize(container.clientWidth, container.clientHeight);
-  });
-  resizeObserver.observe(containerRef.value!);
-});
-
-onUnmounted(() => {
-  // 清理 ResizeObserver
-  if (resizeObserver) {
-    resizeObserver.disconnect();
-    resizeObserver = null;
-  }
-});
-
-watchEffect(() => {
-  if (rendererRef.value) {
-    containerRef.value?.append(rendererRef.value.domElement);
-  }
-});
-</script>
-
-<style scoped>
-.container {
-  position: relative; /* 确保容器定位正确 */
-  width: 100%;
-  height: 100%;
-  overflow: hidden; /* 防止滚动条干扰 */
-}
-
-#plane {
-  position: absolute;
-  top: 0;
-  left: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-  color: #b1acac;
-  padding: 0 18px;
-  transform: translate(12px, -100%);
-  display: block;
-  z-index: 9999; /* 提高层级，确保在最上层 */
-}
-</style>
diff --git a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-pipeline.vue b/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-pipeline.vue
deleted file mode 100644
index e19fc0f..0000000
--- a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-pipeline.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<template>
-  <div ref="containerRef" class="container"></div>
-</template>
-
-<script lang="ts" setup>
-import { onMounted, onUnmounted, ref } from 'vue';
-import {
-  AxesHelper,
-  Color,
-  PerspectiveCamera,
-  Scene,
-  WebGLRenderer,
-  AmbientLight,
-  DirectionalLight,
-  PointLight,
-  MeshStandardMaterial,
-  Vector2,
-  Raycaster,
-  CanvasTexture,
-  SpriteMaterial,
-  Sprite,
-  Box3,
-  Vector3,
-  Mesh
-} from 'three';
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
-import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
-import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader';
-
-const containerRef = ref<HTMLDivElement>();
-
-// 场景
-const scene = new Scene();
-
-// 创建摄像机
-const camera = new PerspectiveCamera(
-  45,
-  containerRef.value?.clientWidth! / containerRef.value?.clientHeight!,
-  0.1,
-  1000
-);
-camera.position.set(-10, 10, 20);
-camera.lookAt(scene.position);
-
-// 渲染器
-const renderer = new WebGLRenderer({
-  antialias: true, // 启用抗锯齿
-  alpha: true, // 启用透明背景
-  preserveDrawingBuffer: true // 保持绘图缓冲区
-});
-renderer.setClearColor(new Color('#131519'));
-renderer.setSize(containerRef.value?.clientWidth!, containerRef.value?.clientHeight!);
-renderer.shadowMap.enabled = true;
-renderer.setPixelRatio(window.devicePixelRatio || 1); // 设置像素比率
-
-// 轨道摄像机
-const orbitControls = new OrbitControls(camera, renderer.domElement);
-orbitControls.autoRotate = false;
-orbitControls.autoRotateSpeed = 5;
-orbitControls.dampingFactor = 0.1;
-orbitControls.enableDamping = true;
-orbitControls.enableRotate = true;
-orbitControls.minDistance = 10;
-orbitControls.maxPolarAngle = Math.PI * 0.5;
-
-// 物体
-scene.add(new AxesHelper(20));
-
-// 环境光：增强整体亮度
-const ambientLight = new AmbientLight('#ffffff', 1.2); // 强度从 0.6 提高到 1.0
-scene.add(ambientLight);
-
-// 平行光
-const directionalLight = new DirectionalLight('#ffffff', 1.4); // 强度从 0.2 提高到 0.8
-scene.add(directionalLight);
-directionalLight.position.set(20, 20, 10);
-
-// // 点光源
-const pointLight = new PointLight('#ffffff', 1.4, 1800); // 强度从 0.5 提高到 1.0
-scene.add(pointLight);
-pointLight.position.set(0, 40, 0);
-
-// 创建一个悬浮的框
-const canvas = document.createElement('canvas');
-canvas.width = 250;
-canvas.height = 250;
-const ctx = canvas.getContext('2d');
-if (ctx) {
-  ctx.fillStyle = 'rgba(0,0,0,.7)';
-  ctx.fillRect(0, 0, 200, 100);
-  ctx.fillStyle = 'white';
-  ctx.font = '21px 黑体';
-  ctx.textAlign = 'center';
-  ctx.textBaseline = 'middle';
-  ctx.fillText('遥测：100111', 100, 30);
-  ctx.fillText('温度：25℃', 90, 65);
-}
-const scaleFactor = 5;
-const texture = new CanvasTexture(canvas);
-const material = new SpriteMaterial({ map: texture });
-
-const sprite1 = new Sprite(material);
-sprite1.scale.set(scaleFactor, scaleFactor, scaleFactor);
-sprite1.position.set(-9.644502679789724, 5.815449539931501 + 0.5, 21.66345220492572);
-
-function animate() {
-  requestAnimationFrame(animate);
-  orbitControls.update();
-  renderer.render(scene, camera);
-}
-
-const arr = [
-  'Layer0073',
-  'Layer0043',
-  'Layer0097',
-  'Layer0098',
-  'Layer0096',
-  'Layer0099',
-  'Layer00100',
-  'Layer0095',
-  'Layer0072'
-];
-
-let pitchObj = ref<Mesh | null>(null);
-let pitchMaterial = ref<any>(null);
-
-// ResizeObserver 监听容器尺寸变化
-let resizeObserver: ResizeObserver | null = null;
-
-onMounted(() => {
-  const container = containerRef.value!;
-  container.appendChild(renderer.domElement);
-
-  // 初始化摄像机和渲染器尺寸
-  camera.aspect = container.clientWidth / container.clientHeight;
-  camera.updateProjectionMatrix();
-  renderer.setSize(container.clientWidth, container.clientHeight);
-
-  // 监听容器尺寸变化
-  resizeObserver = new ResizeObserver(() => {
-    camera.aspect = container.clientWidth / container.clientHeight;
-    camera.updateProjectionMatrix();
-    renderer.setSize(container.clientWidth, container.clientHeight);
-  });
-  resizeObserver.observe(container);
-
-  const loader = new GLTFLoader();
-  const dracoLoader = new DRACOLoader();
-  loader.setDRACOLoader(dracoLoader);
-  loader.load('/models/pipeline/new_model.glb', (gltf: any) => {
-    gltf.scene.children.forEach((child: any) => {
-      console.log(child.name, child);
-      //特殊处理平面
-      if (child.name === '平面') {
-        child.position.set(child.position.x, child.position.y - 45, child.position.z);
-        child.material = new MeshStandardMaterial({
-          color: new Color('#FFFFFF')
-        });
-      }
-      if (child.children && child.children.length > 0) {
-        child.traverse((child1: any) => {
-          if (child1.isMesh && arr.includes(child1.name)) {
-            const box = new Box3().setFromObject(child1);
-            const worldPosition = new Vector3();
-            child1.getWorldPosition(worldPosition);
-
-            const sprite = new Sprite(material.clone());
-            sprite.scale.set(scaleFactor, scaleFactor, scaleFactor);
-            sprite.position.set(
-              worldPosition.x * 0.05,
-              (worldPosition.y + box.min.y / 4) * 0.05,
-              worldPosition.z * 0.05
-            );
-
-            scene.add(sprite);
-          }
-        });
-      }
-    });
-
-    gltf.scene.scale.set(0.05, 0.05, 0.05);
-    scene.add(gltf.scene);
-  });
-
-  // 创建射线检测器
-  const raycaster = new Raycaster();
-  const mouse = new Vector2();
-
-  // 添加点击事件监听
-  renderer.domElement.addEventListener('mousedown', (event: MouseEvent) => {
-    const rect = container.getBoundingClientRect();
-    const x = event.clientX - rect.left;
-    const y = event.clientY - rect.top;
-
-    mouse.x = (x / container.clientWidth) * 2 - 1;
-    mouse.y = -(y / container.clientHeight) * 2 + 1;
-
-    raycaster.setFromCamera(mouse, camera);
-
-    const intersects = raycaster.intersectObjects(scene.children, true);
-    console.log(intersects);
-    if (intersects.length > 0) {
-      console.log('点击了物体', intersects[0].object.name);
-      // 类型守卫：确保点击的对象是Mesh类型
-      if (arr.includes(intersects[0].object.name) && (intersects[0].object as any).isMesh) {
-        const clickedMesh = intersects[0].object as Mesh;
-
-        if (pitchObj.value) pitchObj.value.material = pitchMaterial.value;
-
-        pitchObj.value = clickedMesh;
-        // 安全地克隆材质
-        if (clickedMesh.material) {
-          pitchMaterial.value = Array.isArray(clickedMesh.material)
-            ? clickedMesh.material[0].clone()
-            : clickedMesh.material.clone();
-        }
-        console.log(intersects[0]);
-        clickedMesh.material = new MeshStandardMaterial({
-          color: new Color('#973939')
-        });
-      } else {
-        if (pitchObj.value && pitchMaterial.value) pitchObj.value.material = pitchMaterial.value;
-      }
-    }
-  });
-
-  animate();
-});
-
-onUnmounted(() => {
-  if (resizeObserver) {
-    resizeObserver.disconnect();
-    resizeObserver = null;
-  }
-});
-</script>
-
-<style scoped>
-.container {
-  width: 100%;
-  height: 100%;
-}
-</style>
diff --git a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-scene.vue b/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-scene.vue
deleted file mode 100644
index 8f0a4d8..0000000
--- a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-scene.vue
+++ /dev/null
@@ -1,473 +0,0 @@
-<template>
-  <div class="scene-wrapper">
-    <div ref="containerRef" class="container" />
-
-    <!-- 固定位置的控制按钮 -->
-    <div class="control-buttons">
-      <el-button type="primary" @click="displayModel('group_sd')" :icon="Bell" />
-      <el-button type="danger" @click="displayModel('group_voice')" :icon="MagicStick" />
-      <el-button type="warning" @click="displayModel('group_manual')" :icon="Star" />
-      <el-button type="warning" @click="displayModel('all')" :icon="Compass" />
-
-      <el-button type="warning" @click="camera.position.set(-50, 45, -140)" :icon="Refresh" />
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import {
-  Check,
-  Delete,
-  Edit,
-  Message,
-  Search,
-  Star,
-  Bell,
-  MagicStick,
-  Refresh,
-  Compass
-} from '@element-plus/icons-vue';
-import { onMounted, onUnmounted, ref, nextTick } from 'vue';
-import {
-  AxesHelper,
-  Color,
-  PerspectiveCamera,
-  Scene,
-  WebGLRenderer,
-  AmbientLight,
-  DirectionalLight,
-  PointLight,
-  MeshStandardMaterial,
-  Vector2,
-  Raycaster,
-  CanvasTexture,
-  SpriteMaterial,
-  Sprite,
-  Box3,
-  Vector3,
-  HemisphereLight,
-  Mesh
-} from 'three';
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
-import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
-import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader';
-
-const containerRef = ref<HTMLDivElement>();
-const conditionTagRef = ref<any>();
-const showTooltip = ref(false);
-
-// 场景
-const scene = new Scene();
-
-// 创建摄像机
-const camera = new PerspectiveCamera(
-  45,
-  containerRef.value?.clientWidth! / containerRef.value?.clientHeight!,
-  0.1,
-  1000
-);
-camera.position.set(-50, 45, -140);
-camera.lookAt(scene.position);
-
-const axesHelper = new AxesHelper(100);
-scene.add(axesHelper);
-
-// 渲染器
-const renderer = new WebGLRenderer({
-  antialias: true, // 启用抗锯齿
-  alpha: true, // 启用透明背景
-  preserveDrawingBuffer: true // 保持绘图缓冲区
-});
-renderer.setClearColor(new Color('#131519'));
-renderer.setSize(containerRef.value?.clientWidth!, containerRef.value?.clientHeight!);
-renderer.shadowMap.enabled = true;
-renderer.setPixelRatio(window.devicePixelRatio || 1); // 设置像素比率
-
-// 轨道摄像机
-const orbitControls = new OrbitControls(camera, renderer.domElement);
-orbitControls.autoRotate = false;
-orbitControls.autoRotateSpeed = 5;
-orbitControls.dampingFactor = 0.1;
-orbitControls.enableDamping = true;
-orbitControls.enableRotate = true;
-orbitControls.minDistance = 10;
-orbitControls.maxPolarAngle = Math.PI * 0.5;
-
-// 物体
-scene.add(new AxesHelper(20));
-
-// 环境光：增强整体亮度
-const ambientLight = new AmbientLight('#ffffff', 1.8); // 强度从 0.6 提高到 1.0
-scene.add(ambientLight);
-
-// 平行光
-const directionalLight = new DirectionalLight('#ffffff', 1.8); // 强度从 0.2 提高到 0.8
-scene.add(directionalLight);
-directionalLight.position.set(20, 20, 10);
-
-// // 点光源
-const pointLight = new PointLight('#ffffff', 1.8, 1800); // 强度从 0.5 提高到 1.0
-scene.add(pointLight);
-pointLight.position.set(0, 40, 0);
-
-// 创建一个悬浮的框
-// const ctx = canvas.getContext('2d');
-// if (ctx) {
-//   ctx.fillStyle = 'rgba(0,0,0,.7)';
-//   ctx.fillRect(0, 0, 200, 100);
-//   ctx.fillStyle = 'white';
-//   ctx.font = '21px 黑体';
-//   ctx.textAlign = 'center';
-//   ctx.textBaseline = 'middle';
-// }
-// const scaleFactor = 5;
-// const texture = new CanvasTexture(canvas);
-// const material = new SpriteMaterial({ map: texture });
-
-// const sprite1 = new Sprite(material);
-// sprite1.scale.set(scaleFactor, scaleFactor, scaleFactor);
-// sprite1.position.set(-9.644502679789724, 5.815449539931501 + 0.5, 21.66345220492572);
-
-function animate() {
-  requestAnimationFrame(animate);
-  orbitControls.update();
-  renderer.render(scene, camera);
-}
-
-let pitchObj = ref<any>();
-let pitchMaterial = ref<any>();
-
-// ResizeObserver 监听容器尺寸变化
-let resizeObserver: ResizeObserver | null = null;
-
-let groupSdArrs: any[] = [];
-let groupVoiceArrs: any[] = [];
-let groupManualArrs: any[] = [];
-
-function displayModel(modelName: string) {
-  if (modelName === 'group_sd') {
-    groupSdArrs.forEach((obj) => {
-      obj.visible = true;
-    });
-    groupVoiceArrs.forEach((obj) => {
-      obj.visible = false;
-    });
-    groupManualArrs.forEach((obj) => {
-      obj.visible = false;
-    });
-  } else if (modelName === 'group_voice') {
-    groupVoiceArrs.forEach((obj) => {
-      obj.visible = true;
-    });
-    groupSdArrs.forEach((obj) => {
-      obj.visible = false;
-    });
-    groupManualArrs.forEach((obj) => {
-      obj.visible = false;
-    });
-  } else if (modelName === 'group_manual') {
-    groupManualArrs.forEach((obj) => {
-      obj.visible = true;
-    });
-
-    groupVoiceArrs.forEach((obj) => {
-      obj.visible = false;
-    });
-    groupSdArrs.forEach((obj) => {
-      obj.visible = false;
-    });
-  } else if (modelName === 'all') {
-    groupSdArrs.forEach((obj) => {
-      obj.visible = true;
-    });
-    groupVoiceArrs.forEach((obj) => {
-      obj.visible = true;
-    });
-    groupManualArrs.forEach((obj) => {
-      obj.visible = true;
-    });
-  }
-}
-
-onMounted(() => {
-  const container = containerRef.value!;
-  container.appendChild(renderer.domElement);
-
-  // 初始化摄像机和渲染器尺寸
-  camera.aspect = container.clientWidth / container.clientHeight;
-  camera.updateProjectionMatrix();
-  renderer.setSize(container.clientWidth, container.clientHeight);
-
-  // 监听容器尺寸变化
-  resizeObserver = new ResizeObserver(() => {
-    camera.aspect = container.clientWidth / container.clientHeight;
-    camera.updateProjectionMatrix();
-    renderer.setSize(container.clientWidth, container.clientHeight);
-  });
-  resizeObserver.observe(container);
-
-  const loader = new GLTFLoader();
-  const dracoLoader = new DRACOLoader();
-  loader.setDRACOLoader(dracoLoader);
-  //public\models\scene\backe_edit_6.glb
-  loader.load('/models/scene/backe_edit_10.glb', (gltf: any) => {
-    console.log(gltf.scene.children);
-    gltf.scene.children.forEach((child: any) => {
-      //存储物体元
-      if (child.name && child.name.includes('group_sd')) {
-        groupSdArrs.push(child); //烟感报警器
-      } else if (child.name && child.name.includes('group_voice')) {
-        groupVoiceArrs.push(child); // 光感报警器
-      } else if (child.name && child.name.includes('group_manual')) {
-        groupManualArrs.push(child); // 手动报警器
-      }
-
-      //烟感报警器 精灵
-      if (child.name && child.name.includes('group_sd_g')) {
-        // 确保child对象存在且是有效的3D对象
-        if (child && typeof child.updateWorldMatrix === 'function') {
-          try {
-            const box = new Box3().setFromObject(child);
-            const size = box.getSize(new Vector3());
-            const center = box.getCenter(new Vector3());
-            // console.log('锥体尺寸:', size);
-            // console.log('锥体中心:', center);
-
-            // 生成随机遥测数据
-            const randomTelemetry = Math.floor(Math.random() * 9000) + 1000;
-            const canvas = document.createElement('canvas');
-            canvas.width = 250;
-            canvas.height = 250;
-            const ctx = canvas.getContext('2d');
-            if (ctx) {
-              ctx.fillStyle = 'rgba(0,0,0,.7)';
-              ctx.fillRect(0, 0, 200, 100);
-              ctx.fillStyle = 'white';
-              ctx.font = '21px 黑体';
-              ctx.textAlign = 'center';
-              ctx.textBaseline = 'middle';
-            }
-            const scaleFactor = 5;
-            const texture = new CanvasTexture(canvas);
-            const material = new SpriteMaterial({ map: texture });
-
-            // 确保ctx存在后再绘制文
-            if (ctx) {
-              ctx.fillText(`遥测：${randomTelemetry}`, 100, 30);
-              ctx.fillText(`名称：烟感报警器`, 100, 65);
-            }
-            const sprite = new Sprite(material);
-            sprite.scale.set(scaleFactor, scaleFactor, scaleFactor);
-            sprite.position.set(center.x - 0.5, center.y + (size.y * 2) / 3, center.z);
-            groupSdArrs.push(sprite); //集合添加烟感报警器 精灵
-            scene.add(sprite);
-          } catch (error) {
-            console.error('处理锥体时出错:', error);
-          }
-        } else {
-          console.warn('无效的3D对象:', child);
-        }
-      }
-
-      //光感报警器 精灵
-      if (child.name && child.name.includes('group_voice_g')) {
-        // 确保child对象存在且是有效的3D对象
-        if (child && typeof child.updateWorldMatrix === 'function') {
-          try {
-            const box = new Box3().setFromObject(child);
-            const size = box.getSize(new Vector3());
-            const center = box.getCenter(new Vector3());
-            // console.log('锥体尺寸:', size);
-            // console.log('锥体中心:', center);
-
-            // 生成随机遥测数据
-            const randomTelemetry = Math.floor(Math.random() * 9000) + 1000;
-            const canvas = document.createElement('canvas');
-            canvas.width = 250;
-            canvas.height = 250;
-            const ctx = canvas.getContext('2d');
-            if (ctx) {
-              ctx.fillStyle = 'rgba(0,0,0,.7)';
-              ctx.fillRect(0, 0, 200, 100);
-              ctx.fillStyle = 'white';
-              ctx.font = '21px 黑体';
-              ctx.textAlign = 'center';
-              ctx.textBaseline = 'middle';
-            }
-            const scaleFactor = 5;
-            const texture = new CanvasTexture(canvas);
-            const material = new SpriteMaterial({ map: texture });
-
-            // 确保ctx存在后再绘制文
-            if (ctx) {
-              ctx.fillText(`遥测：${randomTelemetry}`, 100, 30);
-              ctx.fillText(`名称：光感报警器`, 100, 65);
-            }
-            const sprite = new Sprite(material);
-            sprite.scale.set(scaleFactor, scaleFactor, scaleFactor);
-            sprite.position.set(center.x - 5, center.y + (size.y * 1) / 3, center.z);
-            groupVoiceArrs.push(sprite); //集合添加烟感报警器 精灵
-            scene.add(sprite);
-          } catch (error) {
-            console.error('处理锥体时出错:', error);
-          }
-        } else {
-          console.warn('无效的3D对象:', child);
-        }
-      }
-
-      //手动报警器 精灵
-      if (child.name && child.name.includes('group_manual_g')) {
-        // 确保child对象存在且是有效的3D对象
-        if (child && typeof child.updateWorldMatrix === 'function') {
-          try {
-            const box = new Box3().setFromObject(child);
-            const size = box.getSize(new Vector3());
-            const center = box.getCenter(new Vector3());
-            // console.log('锥体尺寸:', size);
-            // console.log('锥体中心:', center);
-
-            // 生成随机遥测数据
-            const randomTelemetry = Math.floor(Math.random() * 9000) + 1000;
-            const canvas = document.createElement('canvas');
-            canvas.width = 250;
-            canvas.height = 250;
-            const ctx = canvas.getContext('2d');
-            if (ctx) {
-              ctx.fillStyle = 'rgba(0,0,0,.7)';
-              ctx.fillRect(0, 0, 200, 100);
-              ctx.fillStyle = 'white';
-              ctx.font = '21px 黑体';
-              ctx.textAlign = 'center';
-              ctx.textBaseline = 'middle';
-            }
-            const scaleFactor = 5;
-            const texture = new CanvasTexture(canvas);
-            const material = new SpriteMaterial({ map: texture });
-
-            // 确保ctx存在后再绘制文
-            if (ctx) {
-              ctx.fillText(`遥测：${randomTelemetry}`, 100, 30);
-              ctx.fillText(`名称：手动报警器`, 100, 65);
-            }
-            const sprite = new Sprite(material);
-            sprite.scale.set(scaleFactor, scaleFactor, scaleFactor);
-            sprite.position.set(center.x + 5, center.y + (size.y * 1) / 3, center.z - 5);
-            groupManualArrs.push(sprite); //集合添加烟感报警器 精灵
-            scene.add(sprite);
-          } catch (error) {
-            console.error('处理锥体时出错:', error);
-          }
-        } else {
-          console.warn('无效的3D对象:', child);
-        }
-      }
-    });
-
-    gltf.scene.scale.set(1, 1, 1);
-    scene.add(gltf.scene);
-  });
-
-  // 创建射线检测器
-  const raycaster = new Raycaster();
-  const mouse = new Vector2();
-
-  // 添加点击事件监听
-  renderer.domElement.addEventListener('mousedown', (event: MouseEvent) => {
-    const rect = container.getBoundingClientRect();
-    const x = event.clientX - rect.left;
-    const y = event.clientY - rect.top;
-
-    mouse.x = (x / container.clientWidth) * 2 - 1;
-    mouse.y = -(y / container.clientHeight) * 2 + 1;
-
-    raycaster.setFromCamera(mouse, camera);
-
-    const intersects = raycaster.intersectObjects(scene.children, true);
-  });
-
-  animate();
-});
-
-onUnmounted(() => {
-  if (resizeObserver) {
-    resizeObserver.disconnect();
-    resizeObserver = null;
-  }
-});
-</script>
-
-<style scoped>
-.scene-wrapper {
-  position: relative;
-  width: 100%;
-  height: 100%;
-}
-
-.container {
-  width: 100%;
-  height: 100%;
-  position: relative;
-}
-
-.control-buttons {
-  position: absolute;
-  top: 25%;
-  left: 2%;
-  display: flex;
-  flex-direction: column;
-  gap: 20px;
-  z-index: 100;
-  align-items: flex-start; /* 确保所有按钮左对齐 */
-}
-
-/* Element Plus圆形按钮样式调整 */
-.control-buttons :deep(.el-button) {
-  width: 40px !important;
-  height: 40px !important;
-  min-width: 40px !important;
-  padding: 0 !important;
-  display: flex !important;
-  align-items: center !important; /* 垂直居中 */
-  margin: 0 !important;
-  /* 确保所有按钮尺寸一致 */
-  box-sizing: border-box !important;
-}
-
-.control-btn {
-  padding: 8px 16px;
-  background: rgba(0, 0, 0, 0.7);
-  color: white;
-  border: 1px solid #4fc3f7;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 14px;
-  transition: all 0.3s ease;
-  min-width: 80px;
-}
-
-/* .control-btn:hover {
-  background: rgba(79, 195, 247, 0.3);
-  transform: translateY(-2px);
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.3);
-}
-
-.control-btn:active {
-  transform: translateY(0);
-} */
-
-/* 响应式调整 */
-/* @media (max-width: 768px) {
-  .control-buttons {
-    top: 10px;
-    right: 10px;
-    gap: 8px;
-  }
-
-  .control-btn {
-    padding: 6px 12px;
-    font-size: 12px;
-    min-width: 70px;
-  }
-} */
-</style>
diff --git a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-smokeSiren.vue b/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-smokeSiren.vue
deleted file mode 100644
index b0a8929..0000000
--- a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-smokeSiren.vue
+++ /dev/null
@@ -1,388 +0,0 @@
-<template>
-  <!-- <div ref="containerRef" class="container" /> -->
-
-  <el-row class="main-container">
-    <el-col :span="10" style="height: 100%">
-      <div ref="containerRef" class="container" />
-    </el-col>
-    <el-col :span="14" class="info-col">
-      <el-card class="card" :body-style="{ padding: '10px' }">
-        <h2 class="cardHead">单个装置基本信息</h2>
-
-        <div class="cardBody">
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">厂家：</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">海湾公司</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">投运日期</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">2014-08-08</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">电源电压：</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">220V AC</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">布设位置</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">35kV高压室</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">供电电压</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">18-30V DC</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">输出电流：</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">5A</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">IP等级</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">IP30</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">相对湿度：</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">5% ~ 95%</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">接线方式</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">两线制(L+、L-)</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">尺寸(长x高x宽)</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">350mm x 225mm x 125mm</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">报警灵敏度范围</el-col>
-            <el-col :span="16">
-              <el-tag type="primary">0.005% 至 20%obs/m</el-tag>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="0" class="info-row">
-            <el-col :span="8">运行条件</el-col>
-            <el-col :span="16">
-              <el-tag ref="conditionTagRef" type="primary" @mouseenter="checkOverflow">
-                探测器环境(-5°C至45°C) / 采样空气(-20°C至60°C) / 湿度(5%至95%RH)
-              </el-tag>
-            </el-col>
-          </el-row>
-        </div>
-      </el-card>
-    </el-col>
-  </el-row>
-</template>
-
-<script lang="ts" setup>
-import { onMounted, onUnmounted, ref, nextTick } from 'vue';
-import {
-  AxesHelper,
-  Color,
-  PerspectiveCamera,
-  Scene,
-  WebGLRenderer,
-  AmbientLight,
-  DirectionalLight,
-  PointLight,
-  MeshStandardMaterial,
-  Vector2,
-  Raycaster,
-  CanvasTexture,
-  SpriteMaterial,
-  Sprite,
-  Box3,
-  Vector3,
-  HemisphereLight
-} from 'three';
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
-import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
-import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader';
-
-const containerRef = ref<HTMLDivElement>();
-const conditionTagRef = ref<any>();
-const showTooltip = ref(false);
-
-// 检查文本是否溢出
-const checkOverflow = () => {
-  nextTick(() => {
-    if (conditionTagRef.value) {
-      const element = conditionTagRef.value.$el || conditionTagRef.value;
-      showTooltip.value = element.scrollWidth > element.clientWidth;
-    }
-  });
-};
-
-// 场景
-const scene = new Scene();
-
-// 创建摄像机
-const camera = new PerspectiveCamera(
-  45,
-  containerRef.value?.clientWidth! / containerRef.value?.clientHeight!,
-  0.1,
-  1000
-);
-camera.position.set(-40, 20, 30);
-camera.lookAt(scene.position);
-
-// 渲染器
-const renderer = new WebGLRenderer({
-  antialias: true, // 启用抗锯齿
-  alpha: true, // 启用透明背景
-  preserveDrawingBuffer: true // 保持绘图缓冲区
-});
-renderer.setClearColor(new Color('#131519'));
-renderer.setSize(containerRef.value?.clientWidth!, containerRef.value?.clientHeight!);
-renderer.shadowMap.enabled = true;
-renderer.setPixelRatio(window.devicePixelRatio || 1); // 设置像素比率
-
-// 轨道摄像机
-const orbitControls = new OrbitControls(camera, renderer.domElement);
-orbitControls.autoRotate = false;
-orbitControls.autoRotateSpeed = 5;
-orbitControls.dampingFactor = 0.1;
-orbitControls.enableDamping = true;
-orbitControls.enableRotate = true;
-orbitControls.minDistance = 10;
-orbitControls.maxPolarAngle = Math.PI * 0.5;
-
-// 物体
-scene.add(new AxesHelper(20));
-
-// 环境光：增强整体亮度
-const ambientLight = new AmbientLight('#ffffff', 1.8); // 强度从 0.6 提高到 1.0
-scene.add(ambientLight);
-
-// 平行光
-const directionalLight = new DirectionalLight('#ffffff', 1.8); // 强度从 0.2 提高到 0.8
-scene.add(directionalLight);
-directionalLight.position.set(20, 20, 10);
-
-// // 点光源
-const pointLight = new PointLight('#ffffff', 1.8, 1800); // 强度从 0.5 提高到 1.0
-scene.add(pointLight);
-pointLight.position.set(0, 40, 0);
-
-// 创建一个悬浮的框
-const canvas = document.createElement('canvas');
-canvas.width = 250;
-canvas.height = 250;
-const ctx = canvas.getContext('2d');
-if (ctx) {
-  ctx.fillStyle = 'rgba(0,0,0,.7)';
-  ctx.fillRect(0, 0, 200, 100);
-  ctx.fillStyle = 'white';
-  ctx.font = '21px 黑体';
-  ctx.textAlign = 'center';
-  ctx.textBaseline = 'middle';
-  ctx.fillText('遥测：100111', 100, 30);
-  ctx.fillText('温度：25℃', 90, 65);
-}
-const scaleFactor = 5;
-const texture = new CanvasTexture(canvas);
-const material = new SpriteMaterial({ map: texture });
-
-const sprite1 = new Sprite(material);
-sprite1.scale.set(scaleFactor, scaleFactor, scaleFactor);
-sprite1.position.set(-9.644502679789724, 5.815449539931501 + 0.5, 21.66345220492572);
-
-function animate() {
-  requestAnimationFrame(animate);
-  orbitControls.update();
-  renderer.render(scene, camera);
-}
-
-let pitchObj = ref<any>();
-let pitchMaterial = ref<any>();
-
-// ResizeObserver 监听容器尺寸变化
-let resizeObserver: ResizeObserver | null = null;
-
-onMounted(() => {
-  const container = containerRef.value!;
-  container.appendChild(renderer.domElement);
-
-  // 初始化摄像机和渲染器尺寸
-  camera.aspect = container.clientWidth / container.clientHeight;
-  camera.updateProjectionMatrix();
-  renderer.setSize(container.clientWidth, container.clientHeight);
-
-  // 监听容器尺寸变化
-  resizeObserver = new ResizeObserver(() => {
-    camera.aspect = container.clientWidth / container.clientHeight;
-    camera.updateProjectionMatrix();
-    renderer.setSize(container.clientWidth, container.clientHeight);
-  });
-  resizeObserver.observe(container);
-
-  const loader = new GLTFLoader();
-  const dracoLoader = new DRACOLoader();
-  loader.setDRACOLoader(dracoLoader);
-  loader.load('/models/smokeSiren/smokeSiren.glb', (gltf: any) => {
-    console.log('3D:', gltf);
-
-    // 计算模型的边界框
-    // const box = new Box3().setFromObject(gltf.scene);
-    // const size = box.getSize(new Vector3());
-    // const center = box.getCenter(new Vector3());
-
-    // console.log('模型边界框信息:');
-    // console.log('最小点:', box.min);
-    // console.log('最大点:', box.max);
-    // console.log('中心点坐标:', center);
-    // console.log('尺寸 (宽×高×深):', size);
-    // console.log('宽度 (X轴):', size.x);
-    // console.log('高度 (Y轴):', size.y);
-    // console.log('深度 (Z轴):', size.z);
-
-    // const sprite = new Sprite(material);
-    // sprite.scale.set(scaleFactor, scaleFactor, scaleFactor);
-    // sprite.position.set(size.x / 2 - 5, size.y / 2 - 5, size.z / 2);
-    // scene.add(sprite);
-
-    gltf.scene.scale.set(1, 1, 1);
-    scene.add(gltf.scene);
-  });
-
-  // 创建射线检测器
-  const raycaster = new Raycaster();
-  const mouse = new Vector2();
-
-  // 添加点击事件监听
-  renderer.domElement.addEventListener('mousedown', (event: MouseEvent) => {
-    const rect = container.getBoundingClientRect();
-    const x = event.clientX - rect.left;
-    const y = event.clientY - rect.top;
-
-    mouse.x = (x / container.clientWidth) * 2 - 1;
-    mouse.y = -(y / container.clientHeight) * 2 + 1;
-
-    raycaster.setFromCamera(mouse, camera);
-
-    const intersects = raycaster.intersectObjects(scene.children, true);
-  });
-
-  animate();
-});
-
-onUnmounted(() => {
-  if (resizeObserver) {
-    resizeObserver.disconnect();
-    resizeObserver = null;
-  }
-});
-</script>
-
-<style scoped>
-.main-container {
-  height: 100%;
-  width: 100%;
-  margin: 0;
-  padding: 0;
-}
-
-.container {
-  width: 100%;
-  height: 100%;
-  position: relative; /* 确保定位上下文 */
-}
-
-.info-col {
-  height: 100%;
-  overflow: hidden;
-}
-
-.card {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  margin: 0;
-  padding: 0;
-}
-
-.card :deep(.el-card__body) {
-  flex: 1;
-  overflow-y: auto;
-  padding: 10px;
-}
-
-.cardHead {
-  margin: 0 0 15px 0;
-  padding: 0;
-  font-size: 16px;
-  font-weight: bold;
-  text-align: center;
-  color: #ffffff;
-}
-
-.cardBody {
-  font-size: 12px;
-}
-
-.info-row {
-  margin-bottom: 8px;
-  display: flex;
-  align-items: center;
-}
-
-.info-row :deep(.el-col) {
-  display: flex;
-  align-items: center;
-}
-
-.info-row :deep(.el-tag) {
-  /* width: 100%; */
-  justify-content: left;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  max-width: 100%;
-  display: flex;
-  align-items: center;
-  height: 100%;
-}
-
-.ellipsis-tag {
-  width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  display: flex;
-  align-items: center;
-  height: 100%;
-}
-
-.condition-tag {
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-}
-</style>
diff --git a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-test.vue b/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-test.vue
deleted file mode 100644
index 50a2f37..0000000
--- a/src/views/teacher/teacherStatistics/components/vue-xq-test/vue-three-test.vue
+++ /dev/null
@@ -1,323 +0,0 @@
-<template>
-  <div class="scene-wrapper">
-    <div ref="containerRef" class="container" />
-
-    <!-- 固定位置的控制按钮 -->
-    <div class="control-buttons">
-      <el-button type="primary" @click="displayModel('group_sd')" :icon="Bell" />
-      <el-button type="danger" @click="displayModel('group_voice')" :icon="MagicStick" />
-      <el-button type="warning" @click="displayModel('group_manual')" :icon="Star" />
-      <el-button type="warning" @click="displayModel('all')" :icon="Compass" />
-
-      <el-button type="warning" @click="camera.position.set(-50, 45, -140)" :icon="Refresh" />
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import {
-  Check,
-  Delete,
-  Edit,
-  Message,
-  Search,
-  Star,
-  Bell,
-  MagicStick,
-  Refresh,
-  Compass
-} from '@element-plus/icons-vue';
-import { onMounted, onUnmounted, ref, nextTick } from 'vue';
-import {
-  AxesHelper,
-  Color,
-  PerspectiveCamera,
-  Scene,
-  WebGLRenderer,
-  AmbientLight,
-  DirectionalLight,
-  PointLight,
-  MeshStandardMaterial,
-  Vector2,
-  Raycaster,
-  CanvasTexture,
-  SpriteMaterial,
-  Sprite,
-  Box3,
-  Vector3,
-  HemisphereLight,
-  Mesh
-} from 'three';
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
-import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader';
-import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader';
-
-const containerRef = ref<HTMLDivElement>();
-const conditionTagRef = ref<any>();
-const showTooltip = ref(false);
-
-// 场景
-const scene = new Scene();
-
-// 创建摄像机
-const camera = new PerspectiveCamera(
-  45,
-  containerRef.value?.clientWidth! / containerRef.value?.clientHeight!,
-  0.1,
-  1000
-);
-camera.position.set(-50, 45, -140);
-camera.lookAt(scene.position);
-
-const axesHelper = new AxesHelper(100);
-scene.add(axesHelper);
-
-// 渲染器
-const renderer = new WebGLRenderer({
-  antialias: true, // 启用抗锯齿
-  alpha: true, // 启用透明背景
-  preserveDrawingBuffer: true // 保持绘图缓冲区
-});
-renderer.setClearColor(new Color('#131519'));
-renderer.setSize(containerRef.value?.clientWidth!, containerRef.value?.clientHeight!);
-renderer.shadowMap.enabled = true;
-renderer.setPixelRatio(window.devicePixelRatio || 1); // 设置像素比率
-
-// 轨道摄像机
-const orbitControls = new OrbitControls(camera, renderer.domElement);
-orbitControls.autoRotate = false;
-orbitControls.autoRotateSpeed = 5;
-orbitControls.dampingFactor = 0.1;
-orbitControls.enableDamping = true;
-orbitControls.enableRotate = true;
-orbitControls.minDistance = 10;
-orbitControls.maxPolarAngle = Math.PI * 0.5;
-
-// 物体
-scene.add(new AxesHelper(20));
-
-// 环境光：增强整体亮度
-const ambientLight = new AmbientLight('#ffffff', 1.8); // 强度从 0.6 提高到 1.0
-scene.add(ambientLight);
-
-// 平行光
-const directionalLight = new DirectionalLight('#ffffff', 1.8); // 强度从 0.2 提高到 0.8
-scene.add(directionalLight);
-directionalLight.position.set(20, 20, 10);
-
-// // 点光源
-const pointLight = new PointLight('#ffffff', 1.8, 1800); // 强度从 0.5 提高到 1.0
-scene.add(pointLight);
-pointLight.position.set(0, 40, 0);
-
-// 创建一个悬浮的框
-// const ctx = canvas.getContext('2d');
-// if (ctx) {
-//   ctx.fillStyle = 'rgba(0,0,0,.7)';
-//   ctx.fillRect(0, 0, 200, 100);
-//   ctx.fillStyle = 'white';
-//   ctx.font = '21px 黑体';
-//   ctx.textAlign = 'center';
-//   ctx.textBaseline = 'middle';
-// }
-// const scaleFactor = 5;
-// const texture = new CanvasTexture(canvas);
-// const material = new SpriteMaterial({ map: texture });
-
-// const sprite1 = new Sprite(material);
-// sprite1.scale.set(scaleFactor, scaleFactor, scaleFactor);
-// sprite1.position.set(-9.644502679789724, 5.815449539931501 + 0.5, 21.66345220492572);
-
-function animate() {
-  requestAnimationFrame(animate);
-  orbitControls.update();
-  renderer.render(scene, camera);
-}
-
-let pitchObj = ref<any>();
-let pitchMaterial = ref<any>();
-
-// ResizeObserver 监听容器尺寸变化
-let resizeObserver: ResizeObserver | null = null;
-
-let groupSdArrs: any[] = [];
-let groupVoiceArrs: any[] = [];
-let groupManualArrs: any[] = [];
-
-function displayModel(modelName: string) {
-  if (modelName === 'group_sd') {
-    groupSdArrs.forEach((obj) => {
-      obj.visible = true;
-    });
-    groupVoiceArrs.forEach((obj) => {
-      obj.visible = false;
-    });
-    groupManualArrs.forEach((obj) => {
-      obj.visible = false;
-    });
-  } else if (modelName === 'group_voice') {
-    groupVoiceArrs.forEach((obj) => {
-      obj.visible = true;
-    });
-    groupSdArrs.forEach((obj) => {
-      obj.visible = false;
-    });
-    groupManualArrs.forEach((obj) => {
-      obj.visible = false;
-    });
-  } else if (modelName === 'group_manual') {
-    groupManualArrs.forEach((obj) => {
-      obj.visible = true;
-    });
-
-    groupVoiceArrs.forEach((obj) => {
-      obj.visible = false;
-    });
-    groupSdArrs.forEach((obj) => {
-      obj.visible = false;
-    });
-  } else if (modelName === 'all') {
-    groupSdArrs.forEach((obj) => {
-      obj.visible = true;
-    });
-    groupVoiceArrs.forEach((obj) => {
-      obj.visible = true;
-    });
-    groupManualArrs.forEach((obj) => {
-      obj.visible = true;
-    });
-  }
-}
-
-onMounted(() => {
-  const container = containerRef.value!;
-  container.appendChild(renderer.domElement);
-
-  // 初始化摄像机和渲染器尺寸
-  camera.aspect = container.clientWidth / container.clientHeight;
-  camera.updateProjectionMatrix();
-  renderer.setSize(container.clientWidth, container.clientHeight);
-
-  // 监听容器尺寸变化
-  resizeObserver = new ResizeObserver(() => {
-    camera.aspect = container.clientWidth / container.clientHeight;
-    camera.updateProjectionMatrix();
-    renderer.setSize(container.clientWidth, container.clientHeight);
-  });
-  resizeObserver.observe(container);
-
-  const loader = new GLTFLoader();
-  const dracoLoader = new DRACOLoader();
-  loader.setDRACOLoader(dracoLoader);
-  //public\models\scene\test.glb
-  loader.load('/models/scene/test.glb', (gltf: any) => {
-    console.log(gltf.scene.children);
-    gltf.scene.scale.set(1, 1, 1);
-    scene.add(gltf.scene);
-  });
-
-  // public\models\texture\alpha01.png
-
-  // 创建射线检测器
-  const raycaster = new Raycaster();
-  const mouse = new Vector2();
-
-  // 添加点击事件监听
-  renderer.domElement.addEventListener('mousedown', (event: MouseEvent) => {
-    const rect = container.getBoundingClientRect();
-    const x = event.clientX - rect.left;
-    const y = event.clientY - rect.top;
-
-    mouse.x = (x / container.clientWidth) * 2 - 1;
-    mouse.y = -(y / container.clientHeight) * 2 + 1;
-
-    raycaster.setFromCamera(mouse, camera);
-
-    const intersects = raycaster.intersectObjects(scene.children, true);
-  });
-
-  animate();
-});
-
-onUnmounted(() => {
-  if (resizeObserver) {
-    resizeObserver.disconnect();
-    resizeObserver = null;
-  }
-});
-</script>
-
-<style scoped>
-.scene-wrapper {
-  position: relative;
-  width: 100%;
-  height: 100%;
-}
-
-.container {
-  width: 100%;
-  height: 100%;
-  position: relative;
-}
-
-.control-buttons {
-  position: absolute;
-  top: 25%;
-  left: 2%;
-  display: flex;
-  flex-direction: column;
-  gap: 20px;
-  z-index: 100;
-  align-items: flex-start; /* 确保所有按钮左对齐 */
-}
-
-/* Element Plus圆形按钮样式调整 */
-.control-buttons :deep(.el-button) {
-  width: 40px !important;
-  height: 40px !important;
-  min-width: 40px !important;
-  padding: 0 !important;
-  display: flex !important;
-  align-items: center !important; /* 垂直居中 */
-  margin: 0 !important;
-  /* 确保所有按钮尺寸一致 */
-  box-sizing: border-box !important;
-}
-
-.control-btn {
-  padding: 8px 16px;
-  background: rgba(0, 0, 0, 0.7);
-  color: white;
-  border: 1px solid #4fc3f7;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 14px;
-  transition: all 0.3s ease;
-  min-width: 80px;
-}
-
-/* .control-btn:hover {
-  background: rgba(79, 195, 247, 0.3);
-  transform: translateY(-2px);
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.3);
-}
-
-.control-btn:active {
-  transform: translateY(0);
-} */
-
-/* 响应式调整 */
-/* @media (max-width: 768px) {
-  .control-buttons {
-    top: 10px;
-    right: 10px;
-    gap: 8px;
-  }
-
-  .control-btn {
-    padding: 6px 12px;
-    font-size: 12px;
-    min-width: 70px;
-  }
-} */
-</style>
diff --git a/src/views/teacher/teacherStatistics/utils/dataFormatter.ts b/src/views/teacher/teacherStatistics/utils/dataFormatter.ts
index 2189e74..2a31554 100644
--- a/src/views/teacher/teacherStatistics/utils/dataFormatter.ts
+++ b/src/views/teacher/teacherStatistics/utils/dataFormatter.ts
@@ -7,7 +7,8 @@
  * @param timestamp 时间戳（毫秒）
  * @returns 格式化后的时间字符串
  */
-export function formatTimestamp(timestamp: number): string {
+export function formatTimestamp(timestamp: number | undefined): string {
+  if (timestamp === undefined) return '-.-';
   const date = new Date(timestamp);
   const year = date.getFullYear();
   const month = String(date.getMonth() + 1).padStart(2, '0');